diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
| commit | c504e5d19d940926b3ddcf62c983d66f49f3cbb2 (patch) | |
| tree | ec955e58bcac2cb93b9f8c10786b23f61d40cd7e | |
| parent | 72789cefce7b17419815f600fbd18238d89afcc9 (diff) | |
| parent | 1737f98af6667560e3e4f930312f9b5002649d04 (diff) | |
| download | nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.gz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.bz2 nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.lz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.xz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.zst nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.zip | |
Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'
Conflicts: nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix nixpkgs/pkgs/development/node-packages/default.nix nixpkgs/pkgs/development/python-modules/priority/deadline.patch
2620 files changed, 58860 insertions, 34014 deletions
diff --git a/nixpkgs/.github/CODEOWNERS b/nixpkgs/.github/CODEOWNERS index a64b6918c499..50263b7ff7f0 100644 --- a/nixpkgs/.github/CODEOWNERS +++ b/nixpkgs/.github/CODEOWNERS @@ -231,3 +231,8 @@ # Cinnamon /pkgs/desktops/cinnamon @mkg20001 + +#nim +/pkgs/development/compilers/nim @ehmry +/pkgs/development/nim-packages @ehmry +/pkgs/top-level/nim-packages.nix @ehmry diff --git a/nixpkgs/.github/labeler.yml b/nixpkgs/.github/labeler.yml index ff831042461c..780843a2a553 100644 --- a/nixpkgs/.github/labeler.yml +++ b/nixpkgs/.github/labeler.yml @@ -72,6 +72,12 @@ - nixos/**/* - pkgs/os-specific/linux/nixos-rebuild/**/* +"6.topic: nim": + - doc/languages-frameworks/nim.section.md + - pkgs/development/compilers/nim/* + - pkgs/development/nim-packages/**/* + - pkgs/top-level/nim-packages.nix + "6.topic: ocaml": - doc/languages-frameworks/ocaml.section.md - pkgs/development/compilers/ocaml/**/* diff --git a/nixpkgs/doc/builders/fetchers.chapter.md b/nixpkgs/doc/builders/fetchers.chapter.md index 30d065344852..b1b00106b6c9 100644 --- a/nixpkgs/doc/builders/fetchers.chapter.md +++ b/nixpkgs/doc/builders/fetchers.chapter.md @@ -1,8 +1,16 @@ # Fetchers {#chap-pkgs-fetchers} -When using Nix, you will frequently need to download source code and other files from the internet. Nixpkgs comes with a few helper functions that allow you to fetch fixed-output derivations in a structured way. +When using Nix, you will frequently need to download source code and other files from the internet. For this purpose, Nix provides the [_fixed output derivation_](https://nixos.org/manual/nix/stable/#fixed-output-drvs) feature and Nixpkgs provides various functions that implement the actual fetching from various protocols and services. -The two fetcher primitives are `fetchurl` and `fetchzip`. Both of these have two required arguments, a URL and a hash. The hash is typically `sha256`, although many more hash algorithms are supported. Nixpkgs contributors are currently recommended to use `sha256`. This hash will be used by Nix to identify your source. A typical usage of fetchurl is provided below. +## Caveats + +Because fixed output derivations are _identified_ by their hash, a common mistake is to update a fetcher's URL or a version parameter, without updating the hash. **This will cause the old contents to be used.** So remember to always invalidate the hash argument. + +For those who develop and maintain fetcheres, a similar problem arises with changes to the implementation of a fetcher. These may cause a fixed output derivation to fail, but won't normally be caught by tests because the supposed output is already in the store or cache. For the purpose of testing, you can use a trick that is embodied by the [`invalidateFetcherByDrvHash`](#sec-pkgs-invalidateFetcherByDrvHash) function. It uses the derivation `name` to create a unique output path per fetcher implementation, defeating the caching precisely where it would be harmful. + +## `fetchurl` and `fetchzip` {#fetchurl} + +Two basic fetchers are `fetchurl` and `fetchzip`. Both of these have two required arguments, a URL and a hash. The hash is typically `sha256`, although many more hash algorithms are supported. Nixpkgs contributors are currently recommended to use `sha256`. This hash will be used by Nix to identify your source. A typical usage of fetchurl is provided below. ```nix { stdenv, fetchurl }: @@ -20,7 +28,7 @@ The main difference between `fetchurl` and `fetchzip` is in how they store the c `fetchpatch` works very similarly to `fetchurl` with the same arguments expected. It expects patch files as a source and performs normalization on them before computing the checksum. For example it will remove comments or other unstable parts that are sometimes added by version control systems and can change over time. -Other fetcher functions allow you to add source code directly from a VCS such as subversion or git. These are mostly straightforward nambes based on the name of the command used with the VCS system. Because they give you a working repository, they act most like `fetchzip`. +Most other fetchers return a directory rather than a single file. ## `fetchsvn` {#fetchsvn} diff --git a/nixpkgs/doc/builders/packages/linux.section.md b/nixpkgs/doc/builders/packages/linux.section.md index 1b8d6eda749d..d8f0d0ad445f 100644 --- a/nixpkgs/doc/builders/packages/linux.section.md +++ b/nixpkgs/doc/builders/packages/linux.section.md @@ -16,7 +16,7 @@ How to add a new (major) version of the Linux kernel to Nixpkgs: 1. Copy the old Nix expression (e.g. `linux-2.6.21.nix`) to the new one (e.g. `linux-2.6.22.nix`) and update it. -2. Add the new kernel to `all-packages.nix` (e.g., create an attribute `kernel_2_6_22`). +2. Add the new kernel to the `kernels` attribute set in `linux-kernels.nix` (e.g., create an attribute `kernel_2_6_22`). 3. Now we’re going to update the kernel configuration. First unpack the kernel. Then for each supported platform (`i686`, `x86_64`, `uml`) do the following: @@ -36,6 +36,6 @@ How to add a new (major) version of the Linux kernel to Nixpkgs: 5. Copy `.config` over the new config file (e.g. `config-2.6.22-i686-smp`). -4. Test building the kernel: `nix-build -A kernel_2_6_22`. If it compiles, ship it! For extra credit, try booting NixOS with it. +4. Test building the kernel: `nix-build -A linuxKernel.kernels.kernel_2_6_22`. If it compiles, ship it! For extra credit, try booting NixOS with it. -5. It may be that the new kernel requires updating the external kernel modules and kernel-dependent packages listed in the `linuxPackagesFor` function in `all-packages.nix` (such as the NVIDIA drivers, AUFS, etc.). If the updated packages aren’t backwards compatible with older kernels, you may need to keep the older versions around. +5. It may be that the new kernel requires updating the external kernel modules and kernel-dependent packages listed in the `linuxPackagesFor` function in `linux-kernels.nix` (such as the NVIDIA drivers, AUFS, etc.). If the updated packages aren’t backwards compatible with older kernels, you may need to keep the older versions around. diff --git a/nixpkgs/doc/builders/special.xml b/nixpkgs/doc/builders/special.xml index 8902ce5c8132..2f84599cdd4f 100644 --- a/nixpkgs/doc/builders/special.xml +++ b/nixpkgs/doc/builders/special.xml @@ -7,4 +7,5 @@ </para> <xi:include href="special/fhs-environments.section.xml" /> <xi:include href="special/mkshell.section.xml" /> + <xi:include href="special/invalidateFetcherByDrvHash.section.xml" /> </chapter> diff --git a/nixpkgs/doc/builders/special/invalidateFetcherByDrvHash.section.md b/nixpkgs/doc/builders/special/invalidateFetcherByDrvHash.section.md new file mode 100644 index 000000000000..7c2f03a64b7b --- /dev/null +++ b/nixpkgs/doc/builders/special/invalidateFetcherByDrvHash.section.md @@ -0,0 +1,31 @@ + +## `invalidateFetcherByDrvHash` {#sec-pkgs-invalidateFetcherByDrvHash} + +Use the derivation hash to invalidate the output via name, for testing. + +Type: `(a@{ name, ... } -> Derivation) -> a -> Derivation` + +Normally, fixed output derivations can and should be cached by their output +hash only, but for testing we want to re-fetch everytime the fetcher changes. + +Changes to the fetcher become apparent in the drvPath, which is a hash of +how to fetch, rather than a fixed store path. +By inserting this hash into the name, we can make sure to re-run the fetcher +every time the fetcher changes. + +This relies on the assumption that Nix isn't clever enough to reuse its +database of local store contents to optimize fetching. + +You might notice that the "salted" name derives from the normal invocation, +not the final derivation. `invalidateFetcherByDrvHash` has to invoke the fetcher +function twice: once to get a derivation hash, and again to produce the final +fixed output derivation. + +Example: + + tests.fetchgit = invalidateFetcherByDrvHash fetchgit { + name = "nix-source"; + url = "https://github.com/NixOS/nix"; + rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; + sha256 = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY="; + }; diff --git a/nixpkgs/doc/languages-frameworks/coq.section.md b/nixpkgs/doc/languages-frameworks/coq.section.md index 39b60d83ac7d..a5155aedaf52 100644 --- a/nixpkgs/doc/languages-frameworks/coq.section.md +++ b/nixpkgs/doc/languages-frameworks/coq.section.md @@ -28,12 +28,12 @@ The recommended way of defining a derivation for a Coq library, is to use the `c * `domain` (optional, defaults to `"github.com"`), domains including the strings `"github"` or `"gitlab"` in their names are automatically supported, otherwise, one must change the `fetcher` argument to support them (cf `pkgs/development/coq-modules/heq/default.nix` for an example), * `releaseRev` (optional, defaults to `(v: v)`), provides a default mapping from release names to revision hashes/branch names/tags, * `displayVersion` (optional), provides a way to alter the computation of `name` from `pname`, by explaining how to display version numbers, -* `namePrefix` (optional), provides a way to alter the computation of `name` from `pname`, by explaining which dependencies must occur in `name`, +* `namePrefix` (optional, defaults to `[ "coq" ]`), provides a way to alter the computation of `name` from `pname`, by explaining which dependencies must occur in `name`, * `extraBuildInputs` (optional), by default `buildInputs` just contains `coq`, this allows to add more build inputs, * `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `coq.ocamlPackages` attribute can be used in `extraBuildInputs` to depend on the same package set Coq was built against. * `useDune2ifVersion` (optional, default to `(x: false)` uses Dune2 to build the package if the provided predicate evaluates to true on the version, e.g. `useDune2if = versions.isGe "1.1"` will use dune if the version of the package is greater or equal to `"1.1"`, * `useDune2` (optional, defaults to `false`) uses Dune2 to build the package if set to true, the presence of this attribute overrides the behavior of the previous one. -* `opam-name` (optional, defaults to `coq-` followed by the value of `pname`), name of the Dune package to build. +* `opam-name` (optional, defaults to concatenating with a dash separator the components of `namePrefix` and `pname`), name of the Dune package to build. * `enableParallelBuilding` (optional, defaults to `true`), since it is activated by default, we provide a way to disable it. * `extraInstallFlags` (optional), allows to extend `installFlags` which initializes the variable `COQMF_COQLIB` so as to install in the proper subdirectory. Indeed Coq libraries should be installed in `$(out)/lib/coq/${coq.coq-version}/user-contrib/`. Such directories are automatically added to the `$COQPATH` environment variable by the hook defined in the Coq derivation. * `setCOQBIN` (optional, defaults to `true`), by default, the environment variable `$COQBIN` is set to the current Coq's binary, but one can disable this behavior by setting it to `false`, diff --git a/nixpkgs/doc/languages-frameworks/index.xml b/nixpkgs/doc/languages-frameworks/index.xml index 49cdf94a44ab..b010f27cac02 100644 --- a/nixpkgs/doc/languages-frameworks/index.xml +++ b/nixpkgs/doc/languages-frameworks/index.xml @@ -23,7 +23,9 @@ <xi:include href="javascript.section.xml" /> <xi:include href="lua.section.xml" /> <xi:include href="maven.section.xml" /> + <xi:include href="nim.section.xml" /> <xi:include href="ocaml.section.xml" /> + <xi:include href="octave.section.xml" /> <xi:include href="perl.section.xml" /> <xi:include href="php.section.xml" /> <xi:include href="python.section.xml" /> diff --git a/nixpkgs/doc/languages-frameworks/nim.section.md b/nixpkgs/doc/languages-frameworks/nim.section.md new file mode 100644 index 000000000000..16dce61d71c9 --- /dev/null +++ b/nixpkgs/doc/languages-frameworks/nim.section.md @@ -0,0 +1,91 @@ +# Nim {#nim} + +## Overview {#nim-overview} + +The Nim compiler, a builder function, and some packaged libraries are available +in Nixpkgs. Until now each compiler release has been effectively backwards +compatible so only the latest version is available. + +## Nim program packages in Nixpkgs {#nim-program-packages-in-nixpkgs} + +Nim programs can be built using `nimPackages.buildNimPackage`. In the +case of packages not containing exported library code the attribute +`nimBinOnly` should be set to `true`. + +The following example shows a Nim program that depends only on Nim libraries: + +```nix +{ lib, nimPackages, fetchurl }: + +nimPackages.buildNimPackage rec { + pname = "hottext"; + version = "1.4"; + + nimBinOnly = true; + + src = fetchurl { + url = "https://git.sr.ht/~ehmry/hottext/archive/v${version}.tar.gz"; + sha256 = "sha256-hIUofi81zowSMbt1lUsxCnVzfJGN3FEiTtN8CEFpwzY="; + }; + + buildInputs = with nimPackages; [ + bumpy + chroma + flatty + nimsimd + pixie + sdl2 + typography + vmath + zippy + ]; +} + +``` + +## Nim library packages in Nixpkgs {#nim-library-packages-in-nixpkgs} + + +Nim libraries can also be built using `nimPackages.buildNimPackage`, but +often the product of a fetcher is sufficient to satisfy a dependency. +The `fetchgit`, `fetchFromGitHub`, and `fetchNimble` functions yield an +output that can be discovered during the `configurePhase` of `buildNimPackage`. + +Nim library packages are listed in +[pkgs/top-level/nim-packages.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/nim-packages.nix) and implemented at +[pkgs/development/nim-packages](https://github.com/NixOS/nixpkgs/tree/master/pkgs/development/nim-packages). + +The following example shows a Nim library that propagates a dependency on a +non-Nim package: +```nix +{ lib, buildNimPackage, fetchNimble, SDL2 }: + +buildNimPackage rec { + pname = "sdl2"; + version = "2.0.4"; + src = fetchNimble { + inherit pname version; + hash = "sha256-Vtcj8goI4zZPQs2TbFoBFlcR5UqDtOldaXSH/+/xULk="; + }; + propagatedBuildInputs = [ SDL2 ]; +} +``` + +## `buildNimPackage` parameters {#buildnimpackage-parameters} + +All parameters from `stdenv.mkDerivation` function are still supported. The +following are specific to `buildNimPackage`: + +* `nimBinOnly ? false`: If `true` then build only the programs listed in + the Nimble file in the packages sources. +* `nimbleFile`: Specify the Nimble file location of the package being built + rather than discover the file at build-time. +* `nimRelease ? true`: Build the package in *release* mode. +* `nimDefines ? []`: A list of Nim defines. Key-value tuples are not supported. +* `nimFlags ? []`: A list of command line arguments to pass to the Nim compiler. + Use this to specify defines with arguments in the form of `-d:${name}=${value}`. +* `nimDoc` ? false`: Build and install HTML documentation. + +* `buildInputs` ? []: The packages listed here will be searched for `*.nimble` + files which are used to populate the Nim library path. Otherwise the standard + behavior is in effect. diff --git a/nixpkgs/doc/languages-frameworks/octave.section.md b/nixpkgs/doc/languages-frameworks/octave.section.md new file mode 100644 index 000000000000..ff872f4a7558 --- /dev/null +++ b/nixpkgs/doc/languages-frameworks/octave.section.md @@ -0,0 +1,100 @@ +# Octave {#sec-octave} + +## Introduction {#ssec-octave-introduction} + +Octave is a modular scientific programming language and environment. +A majority of the packages supported by Octave from their [website](https://octave.sourceforge.io/packages.php) are packaged in nixpkgs. + +## Structure {#ssec-octave-structure} + +All Octave add-on packages are available in two ways: +1. Under the top-level `Octave` attribute, `octave.pkgs`. +2. As a top-level attribute, `octavePackages`. + +## Packaging Octave Packages {#ssec-octave-packaging} + +Nixpkgs provides a function `buildOctavePackage`, a generic package builder function for any Octave package that complies with the Octave's current packaging format. + +All Octave packages are defined in [pkgs/top-level/octave-packages.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/octave-packages.nix) rather than `pkgs/all-packages.nix`. +Each package is defined in their own file in the [pkgs/development/octave-modules](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/octave-modules) directory. +Octave packages are made available through `all-packages.nix` through both the attribute `octavePackages` and `octave.pkgs`. +You can test building an Octave package as follows: + +```ShellSession +$ nix-build -A octavePackages.symbolic +``` + +When building Octave packages with `nix-build`, the `buildOctavePackage` function adds `octave-octaveVersion` to; the start of the package's name attribute. + +This can be required when installing the package using `nix-env`: + +```ShellSession +$ nix-env -i octave-6.2.0-symbolic +``` + +Although, you can also install it using the attribute name: + +```ShellSession +$ nix-env -i -A octavePackages.symbolic +``` + +You can build Octave with packages by using the `withPackages` passed-through function. + +```ShellSession +$ nix-shell -p 'octave.withPackages (ps: with ps; [ symbolic ])' +``` + +This will also work in a `shell.nix` file. + +```nix +{ pkgs ? import <nixpkgs> { }}: + +pkgs.mkShell { + nativeBuildInputs = with pkgs; [ + (octave.withPackages (opkgs: with opkgs; [ symbolic ])) + ]; +} +``` + +### `buildOctavePackage` Steps {#sssec-buildOctavePackage-steps} + +The `buildOctavePackage` does several things to make sure things work properly. + +1. Sets the environment variable `OCTAVE_HISTFILE` to `/dev/null` during package compilation so that the commands run through the Octave interpreter directly are not logged. +2. Skips the configuration step, because the packages are stored as gzipped tarballs, which Octave itself handles directly. +3. Change the hierarchy of the tarball so that only a single directory is at the top-most level of the tarball. +4. Use Octave itself to run the `pkg build` command, which unzips the tarball, extracts the necessary files written in Octave, and compiles any code written in C++ or Fortran, and places the fully compiled artifact in `$out`. + +`buildOctavePackage` is built on top of `stdenv` in a standard way, allowing most things to be customized. + +### Handling Dependencies {#sssec-octave-handling-dependencies} + +In Octave packages, there are four sets of dependencies that can be specified: + +`nativeBuildInputs` +: Just like other packages, `nativeBuildInputs` is intended for architecture-dependent build-time-only dependencies. + +`buildInputs` +: Like other packages, `buildInputs` is intended for architecture-independent build-time-only dependencies. + +`propagatedBuildInputs` +: Similar to other packages, `propagatedBuildInputs` is intended for packages that are required for both building and running of the package. +See [Symbolic](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/octave-modules/symbolic/default.nix) for how this works and why it is needed. + +`requiredOctavePackages` +: This is a special dependency that ensures the specified Octave packages are dependent on others, and are made available simultaneously when loading them in Octave. + +### Installing Octave Packages {#sssec-installing-octave-packages} + +By default, the `buildOctavePackage` function does _not_ install the requested package into Octave for use. +The function will only build the requested package. +This is due to Octave maintaining an text-based database about which packages are installed where. +To this end, when all the requested packages have been built, the Octave package and all its add-on packages are put together into an environment, similar to Python. + +1. First, all the Octave binaries are wrapped with the environment variable `OCTAVE_SITE_INITFILE` set to a file in `$out`, which is required for Octave to be able to find the non-standard package database location. +2. Because of the way `buildEnv` works, all tarballs that are present (which should be all Octave packages to install) should be removed. +3. The path down to the default install location of Octave packages is recreated so that Nix-operated Octave can install the packages. +4. Install the packages into the `$out` environment while writing package entries to the database file. +This database file is unique for each different (according to Nix) environment invocation. +5. Rewrite the Octave-wide startup file to read from the list of packages installed in that particular environment. +6. Wrap any programs that are required by the Octave packages so that they work with all the paths defined within the environment. diff --git a/nixpkgs/doc/languages-frameworks/python.section.md b/nixpkgs/doc/languages-frameworks/python.section.md index 987ea1af9daa..cc1a7083dc25 100644 --- a/nixpkgs/doc/languages-frameworks/python.section.md +++ b/nixpkgs/doc/languages-frameworks/python.section.md @@ -1513,7 +1513,7 @@ If you need to change a package's attribute(s) from `configuration.nix` you coul python = super.python.override { packageOverrides = python-self: python-super: { twisted = python-super.twisted.overrideAttrs (oldAttrs: { - src = super.fetchPipy { + src = super.fetchPypi { pname = "twisted"; version = "19.10.0"; sha256 = "7394ba7f272ae722a74f3d969dcf599bc4ef093bc392038748a490f1724a515d"; diff --git a/nixpkgs/doc/languages-frameworks/rust.section.md b/nixpkgs/doc/languages-frameworks/rust.section.md index 9de9a06465f8..b2f045b11b32 100644 --- a/nixpkgs/doc/languages-frameworks/rust.section.md +++ b/nixpkgs/doc/languages-frameworks/rust.section.md @@ -20,7 +20,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 }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "ripgrep"; @@ -116,22 +116,44 @@ is updated after every change to `Cargo.lock`. Therefore, a `Cargo.lock` file using the `cargoLock` argument. For example: ```nix -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "myproject"; version = "1.0.0"; cargoLock = { lockFile = ./Cargo.lock; - } + }; # ... } ``` This will retrieve the dependencies using fixed-output derivations from -the specified lockfile. Note that setting `cargoLock.lockFile` doesn't -add a `Cargo.lock` to your `src`, and a `Cargo.lock` is still required -to build a rust package. A simple fix is to use: +the specified lockfile. + +One caveat is that `Cargo.lock` cannot be patched in the `patchPhase` +because it runs after the dependencies have already been fetched. If +you need to patch or generate the lockfile you can alternatively set +`cargoLock.lockFileContents` to a string of its contents: + +```nix +rustPlatform.buildRustPackage { + pname = "myproject"; + version = "1.0.0"; + + cargoLock = let + fixupLockFile = path: f (builtins.readFile path); + in { + lockFileContents = fixupLockFile ./Cargo.lock; + }; + + # ... +} +``` + +Note that setting `cargoLock.lockFile` or `cargoLock.lockFileContents` +doesn't add a `Cargo.lock` to your `src`, and a `Cargo.lock` is still +required to build a rust package. A simple fix is to use: ```nix postPatch = '' diff --git a/nixpkgs/doc/stdenv/multiple-output.chapter.md b/nixpkgs/doc/stdenv/multiple-output.chapter.md index d04f83302ac4..62bf543e51e5 100644 --- a/nixpkgs/doc/stdenv/multiple-output.chapter.md +++ b/nixpkgs/doc/stdenv/multiple-output.chapter.md @@ -79,7 +79,7 @@ A commonly adopted convention in `nixpkgs` is that executables provided by the p The `glibc` package is a deliberate single exception to the “binaries first” convention. The `glibc` has `libs` as its first output allowing the libraries provided by `glibc` to be referenced directly (e.g. `${stdenv.glibc}/lib/ld-linux-x86-64.so.2`). The executables provided by `glibc` can be accessed via its `bin` attribute (e.g. `${stdenv.glibc.bin}/bin/ldd`). -The reason for why `glibc` deviates from the convention is because referencing a library provided by `glibc` is a very common operation among Nix packages. For instance, third-party executables packaged by Nix are typically patched and relinked with the relevant version of `glibc` libraries from Nix packages (please see the documentation on [patchelf](https://github.com/NixOS/patchelf/blob/master/README) for more details). +The reason for why `glibc` deviates from the convention is because referencing a library provided by `glibc` is a very common operation among Nix packages. For instance, third-party executables packaged by Nix are typically patched and relinked with the relevant version of `glibc` libraries from Nix packages (please see the documentation on [patchelf](https://github.com/NixOS/patchelf) for more details). ### File type groups {#multiple-output-file-type-groups} diff --git a/nixpkgs/doc/using/overlays.chapter.md b/nixpkgs/doc/using/overlays.chapter.md index 037580583b6b..d2e3b49a6aa9 100644 --- a/nixpkgs/doc/using/overlays.chapter.md +++ b/nixpkgs/doc/using/overlays.chapter.md @@ -138,6 +138,8 @@ All programs that are built with [MPI](https://en.wikipedia.org/wiki/Message_Pas - [MPICH](https://www.mpich.org/), attribute name `mpich` +- [MVAPICH](https://mvapich.cse.ohio-state.edu/), attribute name `mvapich` + To provide MPI enabled applications that use `MPICH`, instead of the default `Open MPI`, simply use the following overlay: ```nix diff --git a/nixpkgs/lib/generators.nix b/nixpkgs/lib/generators.nix index bcb0f371a9b5..0cec4d2dd620 100644 --- a/nixpkgs/lib/generators.nix +++ b/nixpkgs/lib/generators.nix @@ -35,6 +35,8 @@ rec { ("generators.mkValueStringDefault: " + "${t} not supported: ${toPretty {} v}"); in if isInt v then toString v + # convert derivations to store paths + else if lib.isDerivation v then toString v # we default to not quoting strings else if isString v then v # isString returns "1", which is not a good default @@ -169,7 +171,7 @@ rec { # converts { a.b.c = 5; } to { "a.b".c = 5; } for toINI gitFlattenAttrs = let recurse = path: value: - if isAttrs value then + if isAttrs value && !lib.isDerivation value then lib.mapAttrsToList (name: value: recurse ([ name ] ++ path) value) value else if length path > 1 then { ${concatStringsSep "." (lib.reverseList (tail path))}.${head path} = value; diff --git a/nixpkgs/lib/sources.nix b/nixpkgs/lib/sources.nix index 407829b547b0..ae2df7235213 100644 --- a/nixpkgs/lib/sources.nix +++ b/nixpkgs/lib/sources.nix @@ -43,7 +43,9 @@ let lib.hasSuffix ".o" baseName || lib.hasSuffix ".so" baseName || # Filter out nix-build result symlinks - (type == "symlink" && lib.hasPrefix "result" baseName) + (type == "symlink" && lib.hasPrefix "result" baseName) || + # Filter out sockets and other types of files we can't have in the store. + (type == "unknown") ); # Filters a source tree removing version control files and directories using cleanSourceWith diff --git a/nixpkgs/maintainers/maintainer-list.nix b/nixpkgs/maintainers/maintainer-list.nix index 628a42ce1f00..892f671d3b0d 100644 --- a/nixpkgs/maintainers/maintainer-list.nix +++ b/nixpkgs/maintainers/maintainer-list.nix @@ -462,6 +462,12 @@ githubId = 2335822; name = "Alexandre Esteves"; }; + alexnortung = { + name = "alexnortung"; + email = "alex_nortung@live.dk"; + github = "alexnortung"; + githubId = 1552267; + }; alexvorobiev = { email = "alexander.vorobiev@gmail.com"; github = "alexvorobiev"; @@ -730,6 +736,12 @@ githubId = 1771266; name = "Vo Anh Duy"; }; + anirrudh = { + email = "anik597@gmail.com"; + github = "anirrudh"; + githubId = 6091755; + name = "Anirrudh Krishnan"; + }; ankhers = { email = "me@ankhers.dev"; github = "ankhers"; @@ -1376,6 +1388,12 @@ githubId = 28444296; name = "Benjamin Hougland"; }; + billewanick = { + email = "bill@ewanick.com"; + github = "billewanick"; + githubId = 13324165; + name = "Bill Ewanick"; + }; binarin = { email = "binarin@binarin.ru"; github = "binarin"; @@ -1841,6 +1859,12 @@ githubId = 1762540; name = "Changlin Li"; }; + chanley = { + email = "charlieshanley@gmail.com"; + github = "charlieshanley"; + githubId = 8228888; + name = "Charlie Hanley"; + }; CharlesHD = { email = "charleshdespointes@gmail.com"; github = "CharlesHD"; @@ -1897,6 +1921,12 @@ githubId = 3086255; name = "Barry Moore II"; }; + chisui = { + email = "chisui.pd@gmail.com"; + github = "chisui"; + githubId = 4526429; + name = "Philipp Dargel"; + }; chivay = { email = "hubert.jasudowicz@gmail.com"; github = "chivay"; @@ -2719,6 +2749,12 @@ githubId = 40633781; name = "Sergei S."; }; + dit7ya = { + email = "7rat13@gmail.com"; + github = "dit7ya"; + githubId = 14034137; + name = "Mostly Void"; + }; dizfer = { email = "david@izquierdofernandez.com"; github = "dizfer"; @@ -4275,6 +4311,12 @@ githubId = 731722; name = "Ryan Scheel"; }; + hawkw = { + email = "eliza@elizas.website"; + github = "hawkw"; + githubId = 2796466; + name = "Eliza Weisman"; + }; hax404 = { email = "hax404foogit@hax404.de"; github = "hax404"; @@ -4417,6 +4459,12 @@ fingerprint = "D618 7A03 A40A 3D56 62F5 4B46 03EF BF83 9A5F DC15"; }]; }; + hleboulanger = { + email = "hleboulanger@protonmail.com"; + name = "Harold Leboulanger"; + github = "thbkrhsw"; + githubId = 33122; + }; hlolli = { email = "hlolli@gmail.com"; github = "hlolli"; @@ -4541,6 +4589,16 @@ githubId = 2789926; name = "Imran Hossain"; }; + iagoq = { + email = "18238046+iagocq@users.noreply.github.com"; + github = "iagocq"; + githubId = 18238046; + name = "Iago Manoel Brito"; + keys = [{ + longkeyid = "rsa4096/0x35D39F9A9A1BC8DA"; + fingerprint = "DF90 9D58 BEE4 E73A 1B8C 5AF3 35D3 9F9A 9A1B C8DA"; + }]; + }; iammrinal0 = { email = "nixpkgs@mrinalpurohit.in"; github = "iammrinal0"; @@ -4661,6 +4719,12 @@ githubId = 993484; name = "Greg Hale"; }; + imgabe = { + email = "gabrielpmonte@hotmail.com"; + github = "imgabe"; + githubId = 24387926; + name = "Gabriel Pereira"; + }; imlonghao = { email = "nixos@esd.cc"; github = "imlonghao"; @@ -4787,6 +4851,12 @@ githubId = 26877687; name = "Yurii Izorkin"; }; + j0xaf = { + email = "j0xaf@j0xaf.de"; + name = "Jörn Gersdorf"; + github = "j0xaf"; + githubId = 932697; + }; j0hax = { name = "Johannes Arnold"; email = "johannes.arnold@stud.uni-hannover.de"; @@ -5131,6 +5201,12 @@ githubId = 9866621; name = "Jack"; }; + jkarlson = { + email = "jekarlson@gmail.com"; + github = "jkarlson"; + githubId = 1204734; + name = "Emil Karlson"; + }; jlesquembre = { email = "jl@lafuente.me"; github = "jlesquembre"; @@ -5448,6 +5524,12 @@ githubId = 39434424; name = "Felix Springer"; }; + junjihashimoto = { + email = "junji.hashimoto@gmail.com"; + github = "junjihashimoto"; + githubId = 2469618; + name = "Junji Hashimoto"; + }; justinas = { email = "justinas@justinas.org"; github = "justinas"; @@ -7603,6 +7685,12 @@ githubId = 6455574; name = "Matt Votava"; }; + mvs = { + email = "mvs@nya.yt"; + github = "illdefined"; + githubId = 772914; + name = "Mikael Voss"; + }; maxwilson = { email = "nixpkgs@maxwilson.dev"; github = "mwilsoncoding"; @@ -8582,7 +8670,7 @@ githubId = 1719781; name = "Pablo Ovelleiro Corral"; keys = [{ - longkeyid = "sa4096/0x823A6154426408D3"; + longkeyid = "rsa4096/0x823A6154426408D3"; fingerprint = "D03B 218C AE77 1F77 D7F9 20D9 823A 6154 4264 08D3"; }]; }; @@ -9140,6 +9228,12 @@ githubId = 546296; name = "Eric Ren"; }; + renesat = { + name = "Ivan Smolyakov"; + email = "smol.ivan97@gmail.com"; + github = "renesat"; + githubId = 11363539; + }; renzo = { email = "renzocarbonara@gmail.com"; github = "k0001"; @@ -9804,12 +9898,6 @@ githubId = 11613056; name = "Scott Dier"; }; - sdll = { - email = "sasha.delly@gmail.com"; - github = "sdll"; - githubId = 17913919; - name = "Sasha Illarionov"; - }; SeanZicari = { email = "sean.zicari@gmail.com"; github = "SeanZicari"; @@ -12470,6 +12558,16 @@ fingerprint = "61AE D40F 368B 6F26 9DAE 3892 6861 6B2D 8AC4 DCC5"; }]; }; + zenithal = { + name = "zenithal"; + email = "i@zenithal.me"; + github = "ZenithalHourlyRate"; + githubId = 19512674; + keys = [{ + longkeyid = "rsa4096/0x87E17EEF9B18B6C9"; + fingerprint = "1127 F188 280A E312 3619 3329 87E1 7EEF 9B18 B6C9"; + }]; + }; zeri = { name = "zeri"; email = "68825133+zeri42@users.noreply.github.com"; @@ -12498,4 +12596,11 @@ github = "rski"; githubId = 2960312; }; + mbprtpmnr = { + name = "mbprtpmnr"; + email = "mbprtpmnr@pm.me"; + github = "mbprtpmnr"; + githubId = 88109321; + }; + } diff --git a/nixpkgs/maintainers/scripts/haskell/dependencies.nix b/nixpkgs/maintainers/scripts/haskell/dependencies.nix new file mode 100644 index 000000000000..f0620902c0ee --- /dev/null +++ b/nixpkgs/maintainers/scripts/haskell/dependencies.nix @@ -0,0 +1,10 @@ +# Nix script to calculate the Haskell dependencies of every haskellPackage. Used by ./hydra-report.hs. +let + pkgs = import ../../.. {}; + inherit (pkgs) lib; + getDeps = _: pkg: { + deps = builtins.filter (x: !isNull x) (map (x: x.pname or null) (pkg.propagatedBuildInputs or [])); + broken = (pkg.meta.hydraPlatforms or [null]) == []; + }; +in + lib.mapAttrs getDeps pkgs.haskellPackages diff --git a/nixpkgs/maintainers/scripts/haskell/hydra-report.hs b/nixpkgs/maintainers/scripts/haskell/hydra-report.hs index fd6430d43c9a..0d22a670366d 100755 --- a/nixpkgs/maintainers/scripts/haskell/hydra-report.hs +++ b/nixpkgs/maintainers/scripts/haskell/hydra-report.hs @@ -26,6 +26,8 @@ Because step 1) is quite expensive and takes roughly ~5 minutes the result is ca {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TupleSections #-} {-# OPTIONS_GHC -Wall #-} +{-# LANGUAGE ViewPatterns #-} +{-# LANGUAGE TupleSections #-} import Control.Monad (forM_, (<=<)) import Control.Monad.Trans (MonadIO (liftIO)) @@ -41,7 +43,7 @@ import Data.List.NonEmpty (NonEmpty, nonEmpty) import qualified Data.List.NonEmpty as NonEmpty import Data.Map.Strict (Map) import qualified Data.Map.Strict as Map -import Data.Maybe (fromMaybe, mapMaybe) +import Data.Maybe (fromMaybe, mapMaybe, isNothing) import Data.Monoid (Sum (Sum, getSum)) import Data.Sequence (Seq) import qualified Data.Sequence as Seq @@ -70,6 +72,12 @@ import System.Directory (XdgDirectory (XdgCache), getXdgDirectory) import System.Environment (getArgs) import System.Process (readProcess) import Prelude hiding (id) +import Data.List (sortOn) +import Control.Concurrent.Async (concurrently) +import Control.Exception (evaluate) +import qualified Data.IntMap.Strict as IntMap +import qualified Data.IntSet as IntSet +import Data.Bifunctor (second) newtype JobsetEvals = JobsetEvals { evals :: Seq Eval @@ -134,20 +142,17 @@ hydraEvalCommand = "hydra-eval-jobs" hydraEvalParams :: [String] hydraEvalParams = ["-I", ".", "pkgs/top-level/release-haskell.nix"] -handlesCommand :: FilePath -handlesCommand = "nix-instantiate" - -handlesParams :: [String] -handlesParams = ["--eval", "--strict", "--json", "-"] +nixExprCommand :: FilePath +nixExprCommand = "nix-instantiate" -handlesExpression :: String -handlesExpression = "with import ./. {}; with lib; zipAttrsWith (_: builtins.head) (mapAttrsToList (_: v: if v ? github then { \"${v.email}\" = v.github; } else {}) (import maintainers/maintainer-list.nix))" +nixExprParams :: [String] +nixExprParams = ["--eval", "--strict", "--json"] -- | This newtype is used to parse a Hydra job output from @hydra-eval-jobs@. -- The only field we are interested in is @maintainers@, which is why this -- is just a newtype. -- --- Note that there are occassionally jobs that don't have a maintainers +-- Note that there are occasionally jobs that don't have a maintainers -- field, which is why this has to be @Maybe Text@. newtype Maintainers = Maintainers { maintainers :: Maybe Text } deriving stock (Generic, Show) @@ -195,13 +200,49 @@ type EmailToGitHubHandles = Map Text Text -- @@ type MaintainerMap = Map Text (NonEmpty Text) --- | Generate a mapping of Hydra job names to maintainer GitHub handles. +-- | Information about a package which lists its dependencies and whether the +-- package is marked broken. +data DepInfo = DepInfo { + deps :: Set Text, + broken :: Bool +} + deriving stock (Generic, Show) + deriving anyclass (FromJSON, ToJSON) + +-- | Map from package names to their DepInfo. This is the data we get out of a +-- nix call. +type DependencyMap = Map Text DepInfo + +-- | Map from package names to its broken state, number of reverse dependencies (fst) and +-- unbroken reverse dependencies (snd). +type ReverseDependencyMap = Map Text (Int, Int) + +-- | Calculate the (unbroken) reverse dependencies of a package by transitively +-- going through all packages if it’s a dependency of them. +calculateReverseDependencies :: DependencyMap -> ReverseDependencyMap +calculateReverseDependencies depMap = Map.fromDistinctAscList $ zip keys (zip (rdepMap False) (rdepMap True)) + where + -- This code tries to efficiently invert the dependency map and calculate + -- it’s transitive closure by internally identifying every pkg with it’s index + -- in the package list and then using memoization. + keys = Map.keys depMap + pkgToIndexMap = Map.fromDistinctAscList (zip keys [0..]) + intDeps = zip [0..] $ (\DepInfo{broken,deps} -> (broken,mapMaybe (`Map.lookup` pkgToIndexMap) $ Set.toList deps)) <$> Map.elems depMap + rdepMap onlyUnbroken = IntSet.size <$> resultList + where + resultList = go <$> [0..] + oneStepMap = IntMap.fromListWith IntSet.union $ (\(key,(_,deps)) -> (,IntSet.singleton key) <$> deps) <=< filter (\(_, (broken,_)) -> not (broken && onlyUnbroken)) $ intDeps + go pkg = IntSet.unions (oneStep:((resultList !!) <$> IntSet.toList oneStep)) + where oneStep = IntMap.findWithDefault mempty pkg oneStepMap + +-- | Generate a mapping of Hydra job names to maintainer GitHub handles. Calls +-- hydra-eval-jobs and the nix script ./maintainer-handles.nix. getMaintainerMap :: IO MaintainerMap getMaintainerMap = do hydraJobs :: HydraJobs <- - readJSONProcess hydraEvalCommand hydraEvalParams "" "Failed to decode hydra-eval-jobs output: " + readJSONProcess hydraEvalCommand hydraEvalParams "Failed to decode hydra-eval-jobs output: " handlesMap :: EmailToGitHubHandles <- - readJSONProcess handlesCommand handlesParams handlesExpression "Failed to decode nix output for lookup of github handles: " + readJSONProcess nixExprCommand ("maintainers/scripts/haskell/maintainer-handles.nix":nixExprParams) "Failed to decode nix output for lookup of github handles: " pure $ Map.mapMaybe (splitMaintainersToGitHubHandles handlesMap) hydraJobs where -- Split a comma-spearated string of Maintainers into a NonEmpty list of @@ -211,6 +252,12 @@ getMaintainerMap = do splitMaintainersToGitHubHandles handlesMap (Maintainers maint) = nonEmpty . mapMaybe (`Map.lookup` handlesMap) . Text.splitOn ", " $ fromMaybe "" maint +-- | Get the a map of all dependencies of every package by calling the nix +-- script ./dependencies.nix. +getDependencyMap :: IO DependencyMap +getDependencyMap = + readJSONProcess nixExprCommand ("maintainers/scripts/haskell/dependencies.nix":nixExprParams) "Failed to decode nix output for lookup of dependencies: " + -- | Run a process that produces JSON on stdout and and decode the JSON to a -- data type. -- @@ -219,11 +266,10 @@ readJSONProcess :: FromJSON a => FilePath -- ^ Filename of executable. -> [String] -- ^ Arguments - -> String -- ^ stdin to pass to the process -> String -- ^ String to prefix to JSON-decode error. -> IO a -readJSONProcess exe args input err = do - output <- readProcess exe args input +readJSONProcess exe args err = do + output <- readProcess exe args "" let eitherDecodedOutput = eitherDecodeStrict' . encodeUtf8 . Text.pack $ output case eitherDecodedOutput of Left decodeErr -> error $ err <> decodeErr <> "\nRaw: '" <> take 1000 output <> "'" @@ -264,7 +310,13 @@ platformIcon (Platform x) = case x of data BuildResult = BuildResult {state :: BuildState, id :: Int} deriving (Show, Eq, Ord) newtype Platform = Platform {platform :: Text} deriving (Show, Eq, Ord) newtype Table row col a = Table (Map (row, col) a) -type StatusSummary = Map Text (Table Text Platform BuildResult, Set Text) +data SummaryEntry = SummaryEntry { + summaryBuilds :: Table Text Platform BuildResult, + summaryMaintainers :: Set Text, + summaryReverseDeps :: Int, + summaryUnbrokenReverseDeps :: Int +} +type StatusSummary = Map Text SummaryEntry instance (Ord row, Ord col, Semigroup a) => Semigroup (Table row col a) where Table l <> Table r = Table (Map.unionWith (<>) l r) @@ -275,11 +327,11 @@ instance Functor (Table row col) where instance Foldable (Table row col) where foldMap f (Table a) = foldMap f a -buildSummary :: MaintainerMap -> Seq Build -> StatusSummary -buildSummary maintainerMap = foldl (Map.unionWith unionSummary) Map.empty . fmap toSummary +buildSummary :: MaintainerMap -> ReverseDependencyMap -> Seq Build -> StatusSummary +buildSummary maintainerMap reverseDependencyMap = foldl (Map.unionWith unionSummary) Map.empty . fmap toSummary where - unionSummary (Table l, l') (Table r, r') = (Table $ Map.union l r, l' <> r') - toSummary Build{finished, buildstatus, job, id, system} = Map.singleton name (Table (Map.singleton (set, Platform system) (BuildResult state id)), maintainers) + unionSummary (SummaryEntry (Table lb) lm lr lu) (SummaryEntry (Table rb) rm rr ru) = SummaryEntry (Table $ Map.union lb rb) (lm <> rm) (max lr rr) (max lu ru) + toSummary Build{finished, buildstatus, job, id, system} = Map.singleton name (SummaryEntry (Table (Map.singleton (set, Platform system) (BuildResult state id))) maintainers reverseDeps unbrokenReverseDeps) where state :: BuildState state = case (finished, buildstatus) of @@ -297,6 +349,7 @@ buildSummary maintainerMap = foldl (Map.unionWith unionSummary) Map.empty . fmap name = maybe packageName NonEmpty.last splitted set = maybe "" (Text.intercalate "." . NonEmpty.init) splitted maintainers = maybe mempty (Set.fromList . toList) (Map.lookup job maintainerMap) + (reverseDeps, unbrokenReverseDeps) = Map.findWithDefault (0,0) name reverseDependencyMap readBuildReports :: IO (Eval, UTCTime, Seq Build) readBuildReports = do @@ -339,25 +392,29 @@ makeSearchLink evalId linkLabel query = "[" <> linkLabel <> "](" <> "https://hyd statusToNumSummary :: StatusSummary -> NumSummary statusToNumSummary = fmap getSum . foldMap (fmap Sum . jobTotals) -jobTotals :: (Table Text Platform BuildResult, a) -> Table Platform BuildState Int -jobTotals (Table mapping, _) = getSum <$> Table (Map.foldMapWithKey (\(_, platform) (BuildResult buildstate _) -> Map.singleton (platform, buildstate) (Sum 1)) mapping) +jobTotals :: SummaryEntry -> Table Platform BuildState Int +jobTotals (summaryBuilds -> Table mapping) = getSum <$> Table (Map.foldMapWithKey (\(_, platform) (BuildResult buildstate _) -> Map.singleton (platform, buildstate) (Sum 1)) mapping) details :: Text -> [Text] -> [Text] details summary content = ["<details><summary>" <> summary <> " </summary>", ""] <> content <> ["</details>", ""] -printBuildSummary :: Eval -> UTCTime -> StatusSummary -> Text +printBuildSummary :: Eval -> UTCTime -> StatusSummary -> [(Text, Int)] -> Text printBuildSummary Eval{id, jobsetevalinputs = JobsetEvalInputs{nixpkgs = Nixpkgs{revision}}} fetchTime - summary = + summary + topBrokenRdeps = Text.unlines $ - headline <> totals + headline <> [""] <> tldr <> ((" * "<>) <$> (errors <> warnings)) <> [""] + <> totals <> optionalList "#### Maintained packages with build failure" (maintainedList fails) <> optionalList "#### Maintained packages with failed dependency" (maintainedList failedDeps) <> optionalList "#### Maintained packages with unknown error" (maintainedList unknownErr) <> optionalHideableList "#### Unmaintained packages with build failure" (unmaintainedList fails) <> optionalHideableList "#### Unmaintained packages with failed dependency" (unmaintainedList failedDeps) <> optionalHideableList "#### Unmaintained packages with unknown error" (unmaintainedList unknownErr) + <> optionalHideableList "#### Top 50 broken packages, sorted by number of reverse dependencies" (brokenLine <$> topBrokenRdeps) + <> ["","*:arrow_heading_up:: The number of packages that depend (directly or indirectly) on this package (if any). If two numbers are shown the first (lower) number considers only packages which currently have enabled hydra jobs, i.e. are not marked broken. The second (higher) number considers all packages.*",""] <> footer where footer = ["*Report generated with [maintainers/scripts/haskell/hydra-report.hs](https://github.com/NixOS/nixpkgs/blob/haskell-updates/maintainers/scripts/haskell/hydra-report.sh)*"] @@ -365,7 +422,7 @@ printBuildSummary [ "#### Build summary" , "" ] - <> printTable "Platform" (\x -> makeSearchLink id (platform x <> " " <> platformIcon x) ("." <> platform x)) (\x -> showT x <> " " <> icon x) showT (statusToNumSummary summary) + <> printTable "Platform" (\x -> makeSearchLink id (platform x <> " " <> platformIcon x) ("." <> platform x)) (\x -> showT x <> " " <> icon x) showT numSummary headline = [ "### [haskell-updates build report from hydra](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates)" , "*evaluation [" @@ -380,24 +437,49 @@ printBuildSummary <> Text.pack (formatTime defaultTimeLocale "%Y-%m-%d %H:%M UTC" fetchTime) <> "*" ] - jobsByState predicate = Map.filter (predicate . foldl' min Success . fmap state . fst) summary + brokenLine (name, rdeps) = "[" <> name <> "](https://search.nixos.org/packages?channel=unstable&show=haskellPackages." <> name <> "&query=haskellPackages." <> name <> ") :arrow_heading_up: " <> Text.pack (show rdeps) + numSummary = statusToNumSummary summary + jobsByState predicate = Map.filter (predicate . worstState) summary + worstState = foldl' min Success . fmap state . summaryBuilds fails = jobsByState (== Failed) failedDeps = jobsByState (== DependencyFailed) unknownErr = jobsByState (\x -> x > DependencyFailed && x < TimedOut) - withMaintainer = Map.mapMaybe (\(x, m) -> (x,) <$> nonEmpty (Set.toList m)) - withoutMaintainer = Map.mapMaybe (\(x, m) -> if Set.null m then Just x else Nothing) + withMaintainer = Map.mapMaybe (\e -> (summaryBuilds e,) <$> nonEmpty (Set.toList (summaryMaintainers e))) + withoutMaintainer = Map.mapMaybe (\e -> if Set.null (summaryMaintainers e) then Just e else Nothing) optionalList heading list = if null list then mempty else [heading] <> list optionalHideableList heading list = if null list then mempty else [heading] <> details (showT (length list) <> " job(s)") list maintainedList = showMaintainedBuild <=< Map.toList . withMaintainer - unmaintainedList = showBuild <=< Map.toList . withoutMaintainer - showBuild (name, table) = printJob id name (table, "") + unmaintainedList = showBuild <=< sortOn (\(snd -> x) -> (negate (summaryUnbrokenReverseDeps x), negate (summaryReverseDeps x))) . Map.toList . withoutMaintainer + showBuild (name, entry) = printJob id name (summaryBuilds entry, Text.pack (if summaryReverseDeps entry > 0 then " :arrow_heading_up: " <> show (summaryUnbrokenReverseDeps entry) <>" | "<> show (summaryReverseDeps entry) else "")) showMaintainedBuild (name, (table, maintainers)) = printJob id name (table, Text.intercalate " " (fmap ("@" <>) (toList maintainers))) + tldr = case (errors, warnings) of + ([],[]) -> [":green_circle: **Ready to merge**"] + ([],_) -> [":yellow_circle: **Potential issues**"] + _ -> [":red_circle: **Branch not mergeable**"] + warnings = + if' (Unfinished > maybe Success worstState maintainedJob) "`maintained` jobset failed." <> + if' (Unfinished == maybe Success worstState mergeableJob) "`mergeable` jobset is not finished." <> + if' (Unfinished == maybe Success worstState maintainedJob) "`maintained` jobset is not finished." + errors = + if' (isNothing mergeableJob) "No `mergeable` job found." <> + if' (isNothing maintainedJob) "No `maintained` job found." <> + if' (Unfinished > maybe Success worstState mergeableJob) "`mergeable` jobset failed." <> + if' (outstandingJobs (Platform "x86_64-linux") > 100) "Too much outstanding jobs on x86_64-linux." <> + if' (outstandingJobs (Platform "aarch64-linux") > 100) "Too much outstanding jobs on aarch64-linux." + if' p e = if p then [e] else mempty + outstandingJobs platform | Table m <- numSummary = Map.findWithDefault 0 (platform, Unfinished) m + maintainedJob = Map.lookup "maintained" summary + mergeableJob = Map.lookup "mergeable" summary printMaintainerPing :: IO () printMaintainerPing = do - maintainerMap <- getMaintainerMap + (maintainerMap, (reverseDependencyMap, topBrokenRdeps)) <- concurrently getMaintainerMap do + depMap <- getDependencyMap + rdepMap <- evaluate . calculateReverseDependencies $ depMap + let tops = take 50 . sortOn (negate . snd) . fmap (second fst) . filter (\x -> maybe False broken $ Map.lookup (fst x) depMap) . Map.toList $ rdepMap + pure (rdepMap, tops) (eval, fetchTime, buildReport) <- readBuildReports - putStrLn (Text.unpack (printBuildSummary eval fetchTime (buildSummary maintainerMap buildReport))) + putStrLn (Text.unpack (printBuildSummary eval fetchTime (buildSummary maintainerMap reverseDependencyMap buildReport) topBrokenRdeps)) printMarkBrokenList :: IO () printMarkBrokenList = do diff --git a/nixpkgs/maintainers/scripts/haskell/maintainer-handles.nix b/nixpkgs/maintainers/scripts/haskell/maintainer-handles.nix new file mode 100644 index 000000000000..08c6bc4c96af --- /dev/null +++ b/nixpkgs/maintainers/scripts/haskell/maintainer-handles.nix @@ -0,0 +1,7 @@ +# Nix script to lookup maintainer github handles from their email address. Used by ./hydra-report.hs. +let + pkgs = import ../../.. {}; + maintainers = import ../../maintainer-list.nix; + inherit (pkgs) lib; + mkMailGithubPair = _: maintainer: if maintainer ? github then { "${maintainer.email}" = maintainer.github; } else {}; +in lib.zipAttrsWith (_: builtins.head) (lib.mapAttrsToList mkMailGithubPair maintainers) diff --git a/nixpkgs/maintainers/scripts/haskell/merge-and-open-pr.sh b/nixpkgs/maintainers/scripts/haskell/merge-and-open-pr.sh new file mode 100755 index 000000000000..d73c09122350 --- /dev/null +++ b/nixpkgs/maintainers/scripts/haskell/merge-and-open-pr.sh @@ -0,0 +1,118 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p git gh -I nixpkgs=. +# +# Script to merge the currently open haskell-updates PR into master, bump the +# Stackage version and Hackage versions, and open the next haskell-updates PR. + +set -eu -o pipefail + +# exit after printing first argument to this function +function die { + # echo the first argument + echo "ERROR: $1" + echo "Aborting!" + + exit 1 +} + +function help { + echo "Usage: $0 HASKELL_UPDATES_PR_NUM" + echo "Merge the currently open haskell-updates PR into master, and open the next one." + echo + echo " -h, --help print this help" + echo " HASKELL_UPDATES_PR_NUM number of the currently open PR on NixOS/nixpkgs" + echo " for the haskell-updates branch" + echo + echo "Example:" + echo " \$ $0 137340" + + exit 1 +} + +# Read in the current haskell-updates PR number from the command line. +while [[ $# -gt 0 ]]; do + key="$1" + + case $key in + -h|--help) + help + ;; + *) + curr_haskell_updates_pr_num="$1" + shift + ;; + esac +done + +if [[ -z "${curr_haskell_updates_pr_num-}" ]] ; then + die "You must pass the current haskell-updates PR number as the first argument to this script." +fi + +# Make sure you have gh authentication setup. +if ! gh auth status 2>/dev/null ; then + die "You must setup the \`gh\` command. Run \`gh auth login\`." +fi + +# Fetch nixpkgs to get an up-to-date origin/haskell-updates branch. +echo "Fetching origin..." +git fetch origin >/dev/null + +# Make sure we are currently on a local haskell-updates branch. +curr_branch="$(git rev-parse --abbrev-ref HEAD)" +if [[ "$curr_branch" != "haskell-updates" ]]; then + die "Current branch is not called \"haskell-updates\"." +fi + +# Make sure our local haskell-updates branch is on the same commit as +# origin/haskell-updates. +curr_branch_commit="$(git rev-parse haskell-updates)" +origin_haskell_updates_commit="$(git rev-parse origin/haskell-updates)" +if [[ "$curr_branch_commit" != "$origin_haskell_updates_commit" ]]; then + die "Current branch is not at the same commit as origin/haskell-updates" +fi + +# Merge the current open haskell-updates PR. +echo "Merging https://github.com/NixOS/nixpkgs/pull/${curr_haskell_updates_pr_num}..." +gh pr merge --repo NixOS/nixpkgs --merge "$curr_haskell_updates_pr_num" + +# Update stackage, Hackage hashes, and regenerate Haskell package set +echo "Updating Stackage..." +./maintainers/scripts/haskell/update-stackage.sh --do-commit +echo "Updating Hackage hashes..." +./maintainers/scripts/haskell/update-hackage.sh --do-commit +echo "Regenerating Hackage packages..." +./maintainers/scripts/haskell/regenerate-hackage-packages.sh --do-commit + +# Push these new commits to the haskell-updates branch +echo "Pushing commits just created to the haskell-updates branch" +git push + +# Open new PR +new_pr_body=$(cat <<EOF +### This Merge + +This PR is the regular merge of the \`haskell-updates\` branch into \`master\`. + +This branch is being continually built and tested by hydra at https://hydra.nixos.org/jobset/nixpkgs/haskell-updates. + +We roughly aim to merge these \`haskell-updates\` PRs at least once every two weeks. See the @NixOS/haskell [team calendar](https://cloud.maralorn.de/apps/calendar/p/Mw5WLnzsP7fC4Zky) for who is currently in charge of this branch. + +### haskellPackages Workflow Summary + +Our workflow is currently described in [\`pkgs/development/haskell-modules/HACKING.md\`](https://github.com/NixOS/nixpkgs/blob/haskell-updates/pkgs/development/haskell-modules/HACKING.md). + +The short version is this: +* We regularly update the Stackage and Hackage pins on \`haskell-updates\` (normally at the beginning of a merge window). +* The community fixes builds of Haskell packages on that branch. +* We aim at at least one merge of \`haskell-updates\` into \`master\` every two weeks. +* We only do the merge if the [\`mergeable\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/mergeable) job is succeeding on hydra. +* If a [\`maintained\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/maintained) package is still broken at the time of merge, we will only merge if the maintainer has been pinged 7 days in advance. (If you care about a Haskell package, become a maintainer!) + +--- + +This is the follow-up to #${curr_haskell_updates_pr_num}. Come to [#haskell:nixos.org](https://matrix.to/#/#haskell:nixos.org) if you have any questions. +EOF +) + +echo "Opening a PR for the next haskell-updates merge cycle" +gh pr create --repo NixOS/nixpkgs --base master --head haskell-updates --title "haskellPackages: update stackage and hackage" --body "$new_pr_body" diff --git a/nixpkgs/maintainers/scripts/rebuild-amount.sh b/nixpkgs/maintainers/scripts/rebuild-amount.sh index ca89e08073e8..bedd352db5f3 100755 --- a/nixpkgs/maintainers/scripts/rebuild-amount.sh +++ b/nixpkgs/maintainers/scripts/rebuild-amount.sh @@ -4,123 +4,130 @@ set -e # --print: avoid dependency on environment optPrint= if [ "$1" == "--print" ]; then - optPrint=true - shift + optPrint=true + shift fi if [ "$#" != 1 ] && [ "$#" != 2 ]; then - cat <<-EOF - Usage: $0 [--print] commit-spec [commit-spec] - You need to be in a git-controlled nixpkgs tree. - The current state of the tree will be used if the second commit is missing. - EOF - exit 1 + cat <<EOF + Usage: $0 [--print] from-commit-spec [to-commit-spec] + You need to be in a git-controlled nixpkgs tree. + The current state of the tree will be used if the second commit is missing. + + Examples: + effect of latest commit: + $ $0 HEAD^ + $ $0 --print HEAD^ + effect of the whole patch series for 'staging' branch: + $ $0 origin/staging staging +EOF + exit 1 fi # A slightly hacky way to get the config. parallel="$(echo 'config.rebuild-amount.parallel or false' | nix-repl . 2>/dev/null \ - | grep -v '^\(nix-repl.*\)\?$' | tail -n 1 || true)" + | grep -v '^\(nix-repl.*\)\?$' | tail -n 1 || true)" -echo "Estimating rebuild amount by counting changed Hydra jobs." +echo "Estimating rebuild amount by counting changed Hydra jobs (parallel=${parallel:-unset})." toRemove=() cleanup() { - rm -rf "${toRemove[@]}" + rm -rf "${toRemove[@]}" } trap cleanup EXIT SIGINT SIGQUIT ERR MKTEMP='mktemp --tmpdir nix-rebuild-amount-XXXXXXXX' nixexpr() { - cat <<-EONIX - let - lib = import $1/lib; - hydraJobs = import $1/pkgs/top-level/release.nix - # Compromise: accuracy vs. resources needed for evaluation. - { supportedSystems = cfg.systems or [ "x86_64-linux" "x86_64-darwin" ]; }; - cfg = (import $1 {}).config.rebuild-amount or {}; - - recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; }; - - # hydraJobs leaves recurseForDerivations as empty attrmaps; - # that would break nix-env and we also need to recurse everywhere. - tweak = lib.mapAttrs - (name: val: - if name == "recurseForDerivations" then true - else if lib.isAttrs val && val.type or null != "derivation" - then recurseIntoAttrs (tweak val) - else val - ); - - # Some of these contain explicit references to platform(s) we want to avoid; - # some even (transitively) depend on ~/.nixpkgs/config.nix (!) - blacklist = [ - "tarball" "metrics" "manual" - "darwin-tested" "unstable" "stdenvBootstrapTools" - "moduleSystem" "lib-tests" # these just confuse the output - ]; - - in - tweak (builtins.removeAttrs hydraJobs blacklist) - EONIX + cat <<EONIX + let + lib = import $1/lib; + hydraJobs = import $1/pkgs/top-level/release.nix + # Compromise: accuracy vs. resources needed for evaluation. + { supportedSystems = cfg.systems or [ "x86_64-linux" "x86_64-darwin" ]; }; + cfg = (import $1 {}).config.rebuild-amount or {}; + + recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; }; + + # hydraJobs leaves recurseForDerivations as empty attrmaps; + # that would break nix-env and we also need to recurse everywhere. + tweak = lib.mapAttrs + (name: val: + if name == "recurseForDerivations" then true + else if lib.isAttrs val && val.type or null != "derivation" + then recurseIntoAttrs (tweak val) + else val + ); + + # Some of these contain explicit references to platform(s) we want to avoid; + # some even (transitively) depend on ~/.nixpkgs/config.nix (!) + blacklist = [ + "tarball" "metrics" "manual" + "darwin-tested" "unstable" "stdenvBootstrapTools" + "moduleSystem" "lib-tests" # these just confuse the output + ]; + + in + tweak (builtins.removeAttrs hydraJobs blacklist) +EONIX } # Output packages in tree $2 that weren't in $1. # Changing the output hash or name is taken as a change. # Extra nix-env parameters can be in $3 newPkgs() { - # We use files instead of pipes, as running multiple nix-env processes - # could eat too much memory for a standard 4GiB machine. - local -a list - for i in 1 2; do - local l="$($MKTEMP)" - list[$i]="$l" - toRemove+=("$l") - - local expr="$($MKTEMP)" - toRemove+=("$expr") - nixexpr "${!i}" > "$expr" - - nix-env -f "$expr" -qaP --no-name --out-path --show-trace $3 \ - | sort > "${list[$i]}" & - - if [ "$parallel" != "true" ]; then - wait - fi - done - - wait - comm -13 "${list[@]}" + # We use files instead of pipes, as running multiple nix-env processes + # could eat too much memory for a standard 4GiB machine. + local -a list + for i in 1 2; do + local l="$($MKTEMP)" + list[$i]="$l" + toRemove+=("$l") + + local expr="$($MKTEMP)" + toRemove+=("$expr") + nixexpr "${!i}" > "$expr" + + nix-env -f "$expr" -qaP --no-name --out-path --show-trace $3 \ + | sort > "${list[$i]}" & + + if [ "$parallel" != "true" ]; then + wait + fi + done + + wait + comm -13 "${list[@]}" } # Prepare nixpkgs trees. declare -a tree for i in 1 2; do - if [ -n "${!i}" ]; then # use the given commit - dir="$($MKTEMP -d)" - tree[$i]="$dir" - toRemove+=("$dir") - - git clone --shared --no-checkout --quiet . "${tree[$i]}" - (cd "${tree[$i]}" && git checkout --quiet "${!i}") - else #use the current tree - tree[$i]="$(pwd)" - fi + if [ -n "${!i}" ]; then # use the given commit + dir="$($MKTEMP -d)" + tree[$i]="$dir" + toRemove+=("$dir") + + git clone --shared --no-checkout --quiet . "${tree[$i]}" + (cd "${tree[$i]}" && git checkout --quiet "${!i}") + else #use the current tree + tree[$i]="$(pwd)" + fi done newlist="$($MKTEMP)" toRemove+=("$newlist") # Notes: -# - the evaluation is done on x86_64-linux, like on Hydra. -# - using $newlist file so that newPkgs() isn't in a sub-shell (because of toRemove) +# - the evaluation is done on x86_64-linux, like on Hydra. +# - using $newlist file so that newPkgs() isn't in a sub-shell (because of toRemove) newPkgs "${tree[1]}" "${tree[2]}" '--argstr system "x86_64-linux"' > "$newlist" # Hacky: keep only the last word of each attribute path and sort. sed -n 's/\([^. ]*\.\)*\([^. ]*\) .*$/\2/p' < "$newlist" \ - | sort | uniq -c + | sort | uniq -c if [ -n "$optPrint" ]; then - echo - cat "$newlist" + echo + cat "$newlist" fi diff --git a/nixpkgs/maintainers/team-list.nix b/nixpkgs/maintainers/team-list.nix index df0c9ce7cf61..9171c10da460 100644 --- a/nixpkgs/maintainers/team-list.nix +++ b/nixpkgs/maintainers/team-list.nix @@ -164,6 +164,14 @@ with lib.maintainers; { scope = "Maintain Kodi and related packages."; }; + mate = { + members = [ + j03 + romildo + ]; + scope = "Maintain Mate desktop environment and related packages."; + }; + matrix = { members = [ ma27 diff --git a/nixpkgs/nixos/doc/manual/configuration/linux-kernel.chapter.md b/nixpkgs/nixos/doc/manual/configuration/linux-kernel.chapter.md index aad6d49c72c3..1d06543d4f1e 100644 --- a/nixpkgs/nixos/doc/manual/configuration/linux-kernel.chapter.md +++ b/nixpkgs/nixos/doc/manual/configuration/linux-kernel.chapter.md @@ -5,13 +5,18 @@ option `boot.kernelPackages`. For instance, this selects the Linux 3.10 kernel: ```nix -boot.kernelPackages = pkgs.linuxPackages_3_10; +boot.kernelPackages = pkgs.linuxKernel.packages.linux_3_10; ``` Note that this not only replaces the kernel, but also packages that are specific to the kernel version, such as the NVIDIA video drivers. This ensures that driver packages are consistent with the kernel. +While `pkgs.linuxKernel.packages` contains all available kernel packages, +you may want to use one of the unversioned `pkgs.linuxPackages_*` aliases +such as `pkgs.linuxPackages_latest`, that are kept up to date with new +versions. + The default Linux kernel configuration should be fine for most users. You can see the configuration of your current kernel with the following command: @@ -25,14 +30,13 @@ If you want to change the kernel configuration, you can use the instance, to enable support for the kernel debugger KGDB: ```nix -nixpkgs.config.packageOverrides = pkgs: - { linux_3_4 = pkgs.linux_3_4.override { - extraConfig = - '' - KGDB y - ''; - }; +nixpkgs.config.packageOverrides = pkgs: pkgs.lib.recursiveUpdate pkgs { + linuxKernel.kernels.linux_5_10 = pkgs.linuxKernel.kernels.linux_5_10.override { + extraConfig = '' + KGDB y + ''; }; +}; ``` `extraConfig` takes a list of Linux kernel configuration options, one @@ -72,16 +76,17 @@ available parameters, run `sysctl -a`. The first step before compiling the kernel is to generate an appropriate `.config` configuration. Either you pass your own config via the -`configfile` setting of `linuxManualConfig`: +`configfile` setting of `linuxKernel.manualConfig`: ```nix -custom-kernel = super.linuxManualConfig { - inherit (super) stdenv hostPlatform; - inherit (linux_4_9) src; - version = "${linux_4_9.version}-custom"; - - configfile = /home/me/my_kernel_config; - allowImportFromDerivation = true; +custom-kernel = let base_kernel = linuxKernel.kernels.linux_4_9; + in super.linuxKernel.manualConfig { + inherit (super) stdenv hostPlatform; + inherit (base_kernel) src; + version = "${base_kernel.version}-custom"; + + configfile = /home/me/my_kernel_config; + allowImportFromDerivation = true; }; ``` diff --git a/nixpkgs/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml b/nixpkgs/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml index f804d0a3b8c2..a1d6815af29c 100644 --- a/nixpkgs/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml +++ b/nixpkgs/nixos/doc/manual/from_md/configuration/linux-kernel.chapter.xml @@ -6,7 +6,7 @@ selects the Linux 3.10 kernel: </para> <programlisting language="bash"> -boot.kernelPackages = pkgs.linuxPackages_3_10; +boot.kernelPackages = pkgs.linuxKernel.packages.linux_3_10; </programlisting> <para> Note that this not only replaces the kernel, but also packages that @@ -15,6 +15,13 @@ boot.kernelPackages = pkgs.linuxPackages_3_10; kernel. </para> <para> + While <literal>pkgs.linuxKernel.packages</literal> contains all + available kernel packages, you may want to use one of the + unversioned <literal>pkgs.linuxPackages_*</literal> aliases such as + <literal>pkgs.linuxPackages_latest</literal>, that are kept up to + date with new versions. + </para> + <para> The default Linux kernel configuration should be fine for most users. You can see the configuration of your current kernel with the following command: @@ -29,14 +36,13 @@ zcat /proc/config.gz enable support for the kernel debugger KGDB: </para> <programlisting language="bash"> -nixpkgs.config.packageOverrides = pkgs: - { linux_3_4 = pkgs.linux_3_4.override { - extraConfig = - '' - KGDB y - ''; - }; +nixpkgs.config.packageOverrides = pkgs: pkgs.lib.recursiveUpdate pkgs { + linuxKernel.kernels.linux_5_10 = pkgs.linuxKernel.kernels.linux_5_10.override { + extraConfig = '' + KGDB y + ''; }; +}; </programlisting> <para> <literal>extraConfig</literal> takes a list of Linux kernel @@ -82,16 +88,17 @@ boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120; The first step before compiling the kernel is to generate an appropriate <literal>.config</literal> configuration. Either you pass your own config via the <literal>configfile</literal> setting - of <literal>linuxManualConfig</literal>: + of <literal>linuxKernel.manualConfig</literal>: </para> <programlisting language="bash"> -custom-kernel = super.linuxManualConfig { - inherit (super) stdenv hostPlatform; - inherit (linux_4_9) src; - version = "${linux_4_9.version}-custom"; +custom-kernel = let base_kernel = linuxKernel.kernels.linux_4_9; + in super.linuxKernel.manualConfig { + inherit (super) stdenv hostPlatform; + inherit (base_kernel) src; + version = "${base_kernel.version}-custom"; - configfile = /home/me/my_kernel_config; - allowImportFromDerivation = true; + configfile = /home/me/my_kernel_config; + allowImportFromDerivation = true; }; </programlisting> <para> diff --git a/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index b18e29191470..8af8f1dd6437 100644 --- a/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -39,6 +39,13 @@ </listitem> <listitem> <para> + spark now defaults to spark 3, updated from 2. A + <link xlink:href="https://spark.apache.org/docs/latest/core-migration-guide.html#upgrading-from-core-24-to-30">migration + guide</link> is available. + </para> + </listitem> + <listitem> + <para> Activation scripts can now opt int to be run when running <literal>nixos-rebuild dry-activate</literal> and detect the dry activation by reading <literal>$NIXOS_ACTION</literal>. @@ -48,6 +55,32 @@ actions. </para> </listitem> + <listitem> + <para> + bash now defaults to major version 5. + </para> + </listitem> + <listitem> + <para> + Systemd was updated to version 249 (from 247). + </para> + </listitem> + <listitem> + <para> + Pantheon desktop has been updated to version 6. Due to changes + of screen locker, if locking doesn’t work for you, please try + <literal>gsettings set org.gnome.desktop.lockdown disable-lock-screen false</literal>. + </para> + </listitem> + <listitem> + <para> + <literal>kubernetes-helm</literal> now defaults to 3.7.0, + which introduced some breaking changes to the experimental OCI + manifest format. See + <link xlink:href="https://github.com/helm/community/blob/main/hips/hip-0006.md">HIP + 6</link> for more details. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-21.11-new-services"> @@ -85,6 +118,13 @@ </listitem> <listitem> <para> + <link xlink:href="https://owncast.online/">owncast</link>, + self-hosted video live streaming solution. Available at + <link xlink:href="options.html#opt-services.owncast">services.owncast</link>. + </para> + </listitem> + <listitem> + <para> <link xlink:href="https://sr.ht">sourcehut</link>, a collection of tools useful for software development. Available as @@ -116,6 +156,13 @@ </listitem> <listitem> <para> + <link xlink:href="https://github.com/evilsocket/opensnitch">opensnitch</link>, + an application firewall. Available as + <link linkend="opt-services.opensnitch.enable">services.opensnitch</link>. + </para> + </listitem> + <listitem> + <para> <link xlink:href="https://www.snapraid.it/">snapraid</link>, a backup program for disk arrays. Available as <link linkend="opt-snapraid.enable">snapraid</link>. @@ -182,8 +229,6 @@ <link linkend="opt-services.isso.enable">isso</link> </para> </listitem> - </itemizedlist> - <itemizedlist spacing="compact"> <listitem> <para> <link xlink:href="https://www.navidrome.org/">navidrome</link>, @@ -192,8 +237,6 @@ <link linkend="opt-services.navidrome.enable">navidrome</link>. </para> </listitem> - </itemizedlist> - <itemizedlist> <listitem> <para> <link xlink:href="https://docs.fluidd.xyz/">fluidd</link>, a @@ -239,6 +282,37 @@ <link xlink:href="options.html#opt-programs.git.enable">programs.git</link>. </para> </listitem> + <listitem> + <para> + <link xlink:href="https://domainaware.github.io/parsedmarc/">parsedmarc</link>, + a service which parses incoming + <link xlink:href="https://dmarc.org/">DMARC</link> reports and + stores or sends them to a downstream service for further + analysis. Documented in + <link linkend="module-services-parsedmarc">its manual + entry</link>. + </para> + </listitem> + <listitem> + <para> + <link xlink:href="https://spark.apache.org/">spark</link>, a + unified analytics engine for large-scale data processing. + </para> + </listitem> + <listitem> + <para> + <link xlink:href="https://github.com/JoseExposito/touchegg">touchegg</link>, + a multi-touch gesture recognizer. Available as + <link linkend="opt-services.touchegg.enable">services.touchegg</link>. + </para> + </listitem> + <listitem> + <para> + <link xlink:href="https://github.com/pantheon-tweaks/pantheon-tweaks">pantheon-tweaks</link>, + an unofficial system settings panel for Pantheon. Available as + <link linkend="opt-programs.pantheon-tweaks.enable">programs.pantheon-tweaks</link>. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-21.11-incompatibilities"> @@ -246,6 +320,16 @@ <itemizedlist> <listitem> <para> + The <literal>security.wrappers</literal> option now requires + to always specify an owner, group and whether the + setuid/setgid bit should be set. This is motivated by the fact + that before NixOS 21.11, specifying either setuid or setgid + but not owner/group resulted in wrappers owned by + nobody/nogroup, which is unsafe. + </para> + </listitem> + <listitem> + <para> The <literal>paperless</literal> module and package have been removed. All users should migrate to the successor <literal>paperless-ng</literal> instead. The Paperless project @@ -358,6 +442,33 @@ Superuser created successfully. </listitem> <listitem> <para> + <link xlink:href="options.html#opt-users.users._name_.group">users.users.<name>.group</link> + no longer defaults to <literal>nogroup</literal>, which was + insecure. Out-of-tree modules are likely to require + adaptation: instead of + </para> + <programlisting language="bash"> +{ + users.users.foo = { + isSystemUser = true; + }; +} +</programlisting> + <para> + also create a group for your user: + </para> + <programlisting language="bash"> +{ + users.users.foo = { + isSystemUser = true; + group = "foo"; + }; + users.groups.foo = {}; +} +</programlisting> + </listitem> + <listitem> + <para> <literal>services.geoip-updater</literal> was broken and has been replaced by <link xlink:href="options.html#opt-services.geoipupdate.enable">services.geoipupdate</link>. @@ -927,6 +1038,19 @@ Superuser created successfully. file</link> format. </para> </listitem> + <listitem> + <para> + The <literal>datadog-agent</literal>, + <literal>datadog-integrations-core</literal> and + <literal>datadog-process-agent</literal> packages were + upgraded from 6.11.2 to 7.30.2, git-2018-09-18 to 7.30.1 and + 6.11.1 to 7.30.2, respectively. As a result + <literal>services.datadog-agent</literal> has had breaking + changes to the configuration file. For details, see the + <link xlink:href="https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst">upstream + changelog</link>. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-21.11-notable-changes"> @@ -934,6 +1058,20 @@ Superuser created successfully. <itemizedlist> <listitem> <para> + The linux kernel package infrastructure was moved out of + <literal>all-packages.nix</literal>, and restructured. Linux + related functions and attributes now live under the + <literal>pkgs.linuxKernel</literal> attribute set. In + particular the versioned <literal>linuxPackages_*</literal> + package sets (such as <literal>linuxPackages_5_4</literal>) + and kernels from <literal>pkgs</literal> were moved there and + now live under <literal>pkgs.linuxKernel.packages.*</literal>. + The unversioned ones (such as + <literal>linuxPackages_latest</literal>) remain untouched. + </para> + </listitem> + <listitem> + <para> The setting <link xlink:href="options.html#opt-services.openssh.logLevel"><literal>services.openssh.logLevel</literal></link> <literal>"VERBOSE"</literal> @@ -953,6 +1091,14 @@ Superuser created successfully. </listitem> <listitem> <para> + The + <link xlink:href="options.html#opt-services.xserver.extraLayouts"><literal>services.xserver.extraLayouts</literal></link> + no longer cause additional rebuilds when a layout is added or + modified. + </para> + </listitem> + <listitem> + <para> Sway: The terminal emulator <literal>rxvt-unicode</literal> is no longer installed by default via <literal>programs.sway.extraPackages</literal>. The current @@ -991,8 +1137,8 @@ Superuser created successfully. The wordpress module provides a new interface which allows to use different webservers with the new option <link xlink:href="options.html#opt-services.wordpress.webserver"><literal>services.wordpress.webserver</literal></link>. - Currently <literal>httpd</literal> and - <literal>nginx</literal> are supported. The definitions of + Currently <literal>httpd</literal>, <literal>caddy</literal> + and <literal>nginx</literal> are supported. The definitions of wordpress sites should now be set in <link xlink:href="options.html#opt-services.wordpress.sites"><literal>services.wordpress.sites</literal></link>. </para> @@ -1004,6 +1150,22 @@ Superuser created successfully. </listitem> <listitem> <para> + The dokuwiki module provides a new interface which allows to + use different webservers with the new option + <link xlink:href="options.html#opt-services.dokuwiki.webserver"><literal>services.dokuwiki.webserver</literal></link>. + Currently <literal>caddy</literal> and + <literal>nginx</literal> are supported. The definitions of + dokuwiki sites should now be set in + <link xlink:href="options.html#opt-services.dokuwiki.sites"><literal>services.dokuwiki.sites</literal></link>. + </para> + <para> + Sites definitions that use the old interface are automatically + migrated in the new option. This backward compatibility will + be removed in 22.05. + </para> + </listitem> + <listitem> + <para> The order of NSS (host) modules has been brought in line with upstream recommendations: </para> @@ -1122,6 +1284,24 @@ Superuser created successfully. </listitem> <listitem> <para> + MariaDB was upgraded from 10.5.x to 10.6.x. Please read the + <link xlink:href="https://mariadb.com/kb/en/changes-improvements-in-mariadb-106/">upstream + release notes</link> for changes and upgrade instructions. + </para> + </listitem> + <listitem> + <para> + The MariaDB C client library, also known as libmysqlclient or + mariadb-connector-c, was upgraded from 3.1.x to 3.2.x. While + this should hopefully not have any impact, this upgrade comes + with some changes to default behavior, so you might want to + review the + <link xlink:href="https://mariadb.com/kb/en/changes-and-improvements-in-mariadb-connector-c-32/">upstream + release notes</link>. + </para> + </listitem> + <listitem> + <para> GNOME desktop environment now enables <literal>QGnomePlatform</literal> as the Qt platform theme, which should avoid crashes when opening file chooser dialogs @@ -1157,6 +1337,19 @@ Superuser created successfully. directories, thus increasing the purity of the build. </para> </listitem> + <listitem> + <para> + Three new options, + <link linkend="opt-xdg.mime.addedAssociations">xdg.mime.addedAssociations</link>, + <link linkend="opt-xdg.mime.defaultApplications">xdg.mime.defaultApplications</link>, + and + <link linkend="opt-xdg.mime.removedAssociations">xdg.mime.removedAssociations</link> + have been added to the + <link linkend="opt-xdg.mime.enable">xdg.mime</link> module to + allow the configuration of + <literal>/etc/xdg/mimeapps.list</literal>. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md b/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md index 3dc15449c772..f22a532972be 100644 --- a/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md @@ -14,21 +14,33 @@ In addition to numerous new and upgraded packages, this release has the followin - PostgreSQL now defaults to major version 13. +- spark now defaults to spark 3, updated from 2. A [migration guide](https://spark.apache.org/docs/latest/core-migration-guide.html#upgrading-from-core-24-to-30) is available. + - Activation scripts can now opt int to be run when running `nixos-rebuild dry-activate` and detect the dry activation by reading `$NIXOS_ACTION`. This allows activation scripts to output what they would change if the activation was really run. The users/modules activation script supports this and outputs some of is actions. +- bash now defaults to major version 5. + +- Systemd was updated to version 249 (from 247). + +- Pantheon desktop has been updated to version 6. Due to changes of screen locker, if locking doesn't work for you, please try `gsettings set org.gnome.desktop.lockdown disable-lock-screen false`. + +- `kubernetes-helm` now defaults to 3.7.0, which introduced some breaking changes to the experimental OCI manifest format. See [HIP 6](https://github.com/helm/community/blob/main/hips/hip-0006.md) for more details. + ## New Services {#sec-release-21.11-new-services} - [btrbk](https://digint.ch/btrbk/index.html), a backup tool for btrfs subvolumes, taking advantage of btrfs specific capabilities to create atomic snapshots and transfer them incrementally to your backup locations. Available as [services.btrbk](options.html#opt-services.brtbk.instances). - [clipcat](https://github.com/xrelkd/clipcat/), an X11 clipboard manager written in Rust. Available at [services.clipcat](options.html#o -pt-services.clipcat.enable). + pt-services.clipcat.enable). - [geoipupdate](https://github.com/maxmind/geoipupdate), a GeoIP database updater from MaxMind. Available as [services.geoipupdate](options.html#opt-services.geoipupdate.enable). - [Kea](https://www.isc.org/kea/), ISCs 2nd generation DHCP and DDNS server suite. Available at [services.kea](options.html#opt-services.kea). +- [owncast](https://owncast.online/), self-hosted video live streaming solution. Available at [services.owncast](options.html#opt-services.owncast). + - [sourcehut](https://sr.ht), a collection of tools useful for software development. Available as [services.sourcehut](options.html#opt-services.sourcehut.enable). - [ucarp](https://download.pureftpd.org/pub/ucarp/README), an userspace implementation of the Common Address Redundancy Protocol (CARP). Available as [networking.ucarp](options.html#opt-networking.ucarp.enable). @@ -37,6 +49,8 @@ pt-services.clipcat.enable). - [vikunja](https://vikunja.io), a to-do list app. Available as [services.vikunja](#opt-services.vikunja.enable). +- [opensnitch](https://github.com/evilsocket/opensnitch), an application firewall. Available as [services.opensnitch](#opt-services.opensnitch.enable). + - [snapraid](https://www.snapraid.it/), a backup program for disk arrays. Available as [snapraid](#opt-snapraid.enable). @@ -58,8 +72,8 @@ pt-services.clipcat.enable). - [isso](https://posativ.org/isso/), a commenting server similar to Disqus. Available as [isso](#opt-services.isso.enable) -* [navidrome](https://www.navidrome.org/), a personal music streaming server with -subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable). +- [navidrome](https://www.navidrome.org/), a personal music streaming server with + subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable). - [fluidd](https://docs.fluidd.xyz/), a Klipper web interface for managing 3d printers using moonraker. Available as [fluidd](#opt-services.fluidd.enable). @@ -73,8 +87,21 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable - [git](https://git-scm.com), a distributed version control system. Available as [programs.git](options.html#opt-programs.git.enable). +- [parsedmarc](https://domainaware.github.io/parsedmarc/), a service + which parses incoming [DMARC](https://dmarc.org/) reports and stores + or sends them to a downstream service for further analysis. + Documented in [its manual entry](#module-services-parsedmarc). + +- [spark](https://spark.apache.org/), a unified analytics engine for large-scale data processing. + +- [touchegg](https://github.com/JoseExposito/touchegg), a multi-touch gesture recognizer. Available as [services.touchegg](#opt-services.touchegg.enable). + +- [pantheon-tweaks](https://github.com/pantheon-tweaks/pantheon-tweaks), an unofficial system settings panel for Pantheon. Available as [programs.pantheon-tweaks](#opt-programs.pantheon-tweaks.enable). + ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} +- The `security.wrappers` option now requires to always specify an owner, group and whether the setuid/setgid bit should be set. + This is motivated by the fact that before NixOS 21.11, specifying either setuid or setgid but not owner/group resulted in wrappers owned by nobody/nogroup, which is unsafe. - The `paperless` module and package have been removed. All users should migrate to the successor `paperless-ng` instead. The Paperless project [has been @@ -82,46 +109,49 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable and advises all users to use `paperless-ng` instead. Users can use the `services.paperless-ng` module as a replacement while noting the following incompatibilities: - - `services.paperless.ocrLanguages` has no replacement. Users should migrate to [`services.paperless-ng.extraConfig`](options.html#opt-services.paperless-ng.extraConfig) instead: - ```nix - { - services.paperless-ng.extraConfig = { - # Provide languages as ISO 639-2 codes - # separated by a plus (+) sign. - # https://en.wikipedia.org/wiki/List_of_ISO_639-2_codes - PAPERLESS_OCR_LANGUAGE = "deu+eng+jpn"; # German & English & Japanse - }; - } - ``` - - - If you previously specified `PAPERLESS_CONSUME_MAIL_*` settings in - `services.paperless.extraConfig` you should remove those options now. You - now *must* define those settings in the admin interface of paperless-ng. - - - Option `services.paperless.manage` no longer exists. - Use the script at `${services.paperless-ng.dataDir}/paperless-ng-manage` instead. - Note that this script only exists after the `paperless-ng` service has been - started at least once. - - - After switching to the new system configuration you should run the Django - management command to reindex your documents and optionally create a user, - if you don't have one already. - - To do so, enter the data directory (the value of - `services.paperless-ng.dataDir`, `/var/lib/paperless` by default), switch - to the paperless user and execute the management command like below: - ``` - $ cd /var/lib/paperless - $ su paperless -s /bin/sh - $ ./paperless-ng-manage document_index reindex - # if not already done create a user account, paperless-ng requires a login - $ ./paperless-ng-manage createsuperuser - Username (leave blank to use 'paperless'): my-user-name - Email address: me@example.com - Password: ********** - Password (again): ********** - Superuser created successfully. - ``` + + - `services.paperless.ocrLanguages` has no replacement. Users should migrate to [`services.paperless-ng.extraConfig`](options.html#opt-services.paperless-ng.extraConfig) instead: + + ```nix + { + services.paperless-ng.extraConfig = { + # Provide languages as ISO 639-2 codes + # separated by a plus (+) sign. + # https://en.wikipedia.org/wiki/List_of_ISO_639-2_codes + PAPERLESS_OCR_LANGUAGE = "deu+eng+jpn"; # German & English & Japanse + }; + } + ``` + + - If you previously specified `PAPERLESS_CONSUME_MAIL_*` settings in + `services.paperless.extraConfig` you should remove those options now. You + now _must_ define those settings in the admin interface of paperless-ng. + + - Option `services.paperless.manage` no longer exists. + Use the script at `${services.paperless-ng.dataDir}/paperless-ng-manage` instead. + Note that this script only exists after the `paperless-ng` service has been + started at least once. + + - After switching to the new system configuration you should run the Django + management command to reindex your documents and optionally create a user, + if you don't have one already. + + To do so, enter the data directory (the value of + `services.paperless-ng.dataDir`, `/var/lib/paperless` by default), switch + to the paperless user and execute the management command like below: + + ``` + $ cd /var/lib/paperless + $ su paperless -s /bin/sh + $ ./paperless-ng-manage document_index reindex + # if not already done create a user account, paperless-ng requires a login + $ ./paperless-ng-manage createsuperuser + Username (leave blank to use 'paperless'): my-user-name + Email address: me@example.com + Password: ********** + Password (again): ********** + Superuser created successfully. + ``` - The `staticjinja` package has been upgraded from 1.0.4 to 4.1.0 @@ -131,6 +161,25 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable - The `erigon` ethereum node has moved it's database location in `2021-08-03`, users upgrading must manually move their chaindata (see [release notes](https://github.com/ledgerwatch/erigon/releases/tag/v2021.08.03)). +- [users.users.<name>.group](options.html#opt-users.users._name_.group) no longer defaults to `nogroup`, which was insecure. Out-of-tree modules are likely to require adaptation: instead of + ```nix + { + users.users.foo = { + isSystemUser = true; + }; + } + ``` + also create a group for your user: + ```nix + { + users.users.foo = { + isSystemUser = true; + group = "foo"; + }; + users.groups.foo = {}; + } + ``` + - `services.geoip-updater` was broken and has been replaced by [services.geoipupdate](options.html#opt-services.geoipupdate.enable). - PHP 7.3 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 21.11 release. @@ -199,28 +248,32 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable * The `bitwarden_rs` packages and modules were renamed to `vaultwarden` [following upstream](https://github.com/dani-garcia/vaultwarden/discussions/1642). More specifically, - * `pkgs.bitwarden_rs`, `pkgs.bitwarden_rs-sqlite`, `pkgs.bitwarden_rs-mysql` and + - `pkgs.bitwarden_rs`, `pkgs.bitwarden_rs-sqlite`, `pkgs.bitwarden_rs-mysql` and `pkgs.bitwarden_rs-postgresql` were renamed to `pkgs.vaultwarden`, `pkgs.vaultwarden-sqlite`, `pkgs.vaultwarden-mysql` and `pkgs.vaultwarden-postgresql`, respectively. - * Old names are preserved as aliases for backwards compatibility, but may be removed in the future. - * The `bitwarden_rs` executable was also renamed to `vaultwarden` in all packages. - * `pkgs.bitwarden_rs-vault` was renamed to `pkgs.vaultwarden-vault`. - * `pkgs.bitwarden_rs-vault` is preserved as an alias for backwards compatibility, but may be removed in the future. - * The static files were moved from `/usr/share/bitwarden_rs` to `/usr/share/vaultwarden`. + - Old names are preserved as aliases for backwards compatibility, but may be removed in the future. + - The `bitwarden_rs` executable was also renamed to `vaultwarden` in all packages. + + - `pkgs.bitwarden_rs-vault` was renamed to `pkgs.vaultwarden-vault`. - * The `services.bitwarden_rs` config module was renamed to `services.vaultwarden`. - * `services.bitwarden_rs` is preserved as an alias for backwards compatibility, but may be removed in the future. + - `pkgs.bitwarden_rs-vault` is preserved as an alias for backwards compatibility, but may be removed in the future. + - The static files were moved from `/usr/share/bitwarden_rs` to `/usr/share/vaultwarden`. - * `systemd.services.bitwarden_rs`, `systemd.services.backup-bitwarden_rs` and `systemd.timers.backup-bitwarden_rs` + - The `services.bitwarden_rs` config module was renamed to `services.vaultwarden`. + + - `services.bitwarden_rs` is preserved as an alias for backwards compatibility, but may be removed in the future. + + - `systemd.services.bitwarden_rs`, `systemd.services.backup-bitwarden_rs` and `systemd.timers.backup-bitwarden_rs` were renamed to `systemd.services.vaultwarden`, `systemd.services.backup-vaultwarden` and `systemd.timers.backup-vaultwarden`, respectively. - * Old names are preserved as aliases for backwards compatibility, but may be removed in the future. - * `users.users.bitwarden_rs` and `users.groups.bitwarden_rs` were renamed to `users.users.vaultwarden` and + - Old names are preserved as aliases for backwards compatibility, but may be removed in the future. + + - `users.users.bitwarden_rs` and `users.groups.bitwarden_rs` were renamed to `users.users.vaultwarden` and `users.groups.vaultwarden`, respectively. - * The data directory remains located at `/var/lib/bitwarden_rs`, for backwards compatibility. + - The data directory remains located at `/var/lib/bitwarden_rs`, for backwards compatibility. - `yggdrasil` was upgraded to a new major release with breaking changes, see [upstream changelog](https://github.com/yggdrasil-network/yggdrasil-go/releases/tag/v0.4.0). @@ -233,6 +286,7 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable - `tt-rss` was upgraded to the commit on 2021-06-21, which has breaking changes. If you use `services.tt-rss.extraConfig` you should migrate to the `putenv`-style configuration. See [this Discourse post](https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337) in the tt-rss forums for more details. - The following Visual Studio Code extensions were renamed to keep the naming convention uniform. + - `bbenoist.Nix` -> `bbenoist.nix` - `CoenraadS.bracket-pair-colorizer` -> `coenraads.bracket-pair-colorizer` - `golang.Go` -> `golang.go` @@ -252,12 +306,12 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable - The `yambar` package has been split into `yambar` and `yambar-wayland`, corresponding to the xorg and wayland backend respectively. Please switch to `yambar-wayland` if you are on wayland. - The `services.minio` module gained an additional option `consoleAddress`, that -configures the address and port the web UI is listening, it defaults to `:9001`. -To be able to access the web UI this port needs to be opened in the firewall. + configures the address and port the web UI is listening, it defaults to `:9001`. + To be able to access the web UI this port needs to be opened in the firewall. - The `varnish` package was upgraded from 6.3.x to 6.5.x. `varnish60` for the last LTS release is also still available. -- The `kubernetes` package was upgraded to 1.22. The `kubernetes.apiserver.kubeletHttps` option was removed and HTTPS is always used. +- The `kubernetes` package was upgraded to 1.22. The `kubernetes.apiserver.kubeletHttps` option was removed and HTTPS is always used. - The attribute `linuxPackages_latest_hardened` was dropped because the hardened patches lag behind the upstream kernel which made version bumps harder. If you want to use @@ -271,12 +325,22 @@ To be able to access the web UI this port needs to be opened in the firewall. - The `todoman` package was upgraded from 3.9.0 to 4.0.0. This introduces breaking changes in the [configuration file](https://todoman.readthedocs.io/en/stable/configure.html#configuration-file) format. +- The `datadog-agent`, `datadog-integrations-core` and `datadog-process-agent` packages + were upgraded from 6.11.2 to 7.30.2, git-2018-09-18 to 7.30.1 and 6.11.1 to 7.30.2, + respectively. As a result `services.datadog-agent` has had breaking changes to the + configuration file. For details, see the [upstream changelog](https://github.com/DataDog/datadog-agent/blob/main/CHANGELOG.rst). + ## Other Notable Changes {#sec-release-21.11-notable-changes} +- The linux kernel package infrastructure was moved out of `all-packages.nix`, and restructured. Linux related functions and attributes now live under the `pkgs.linuxKernel` attribute set. + In particular the versioned `linuxPackages_*` package sets (such as `linuxPackages_5_4`) and kernels from `pkgs` were moved there and now live under `pkgs.linuxKernel.packages.*`. The unversioned ones (such as `linuxPackages_latest`) remain untouched. + - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. However, if [`services.fail2ban.enable`](options.html#opt-services.fail2ban.enable) is `true`, the `fail2ban` will override the verbosity to `"VERBOSE"`, so that `fail2ban` can observe the failed login attempts from the SSH logs. +- The [`services.xserver.extraLayouts`](options.html#opt-services.xserver.extraLayouts) no longer cause additional rebuilds when a layout is added or modified. + - Sway: The terminal emulator `rxvt-unicode` is no longer installed by default via `programs.sway.extraPackages`. The current default configuration uses `alacritty` (and soon `foot`) so this is only an issue when using a customized configuration and not installing `rxvt-unicode` explicitly. - `python3` now defaults to Python 3.9. Python 3.9 introduces many deprecation warnings, please look at the [What's New In Python 3.9 post](https://docs.python.org/3/whatsnew/3.9.html) for more information. @@ -285,7 +349,11 @@ To be able to access the web UI this port needs to be opened in the firewall. - The `claws-mail` package now references the new GTK+ 3 release branch, major version 4. To use the GTK+ 2 releases, one can install the `claws-mail-gtk2` package. -- The wordpress module provides a new interface which allows to use different webservers with the new option [`services.wordpress.webserver`](options.html#opt-services.wordpress.webserver). Currently `httpd` and `nginx` are supported. The definitions of wordpress sites should now be set in [`services.wordpress.sites`](options.html#opt-services.wordpress.sites). +- The wordpress module provides a new interface which allows to use different webservers with the new option [`services.wordpress.webserver`](options.html#opt-services.wordpress.webserver). Currently `httpd`, `caddy` and `nginx` are supported. The definitions of wordpress sites should now be set in [`services.wordpress.sites`](options.html#opt-services.wordpress.sites). + + Sites definitions that use the old interface are automatically migrated in the new option. This backward compatibility will be removed in 22.05. + +- The dokuwiki module provides a new interface which allows to use different webservers with the new option [`services.dokuwiki.webserver`](options.html#opt-services.dokuwiki.webserver). Currently `caddy` and `nginx` are supported. The definitions of dokuwiki sites should now be set in [`services.dokuwiki.sites`](options.html#opt-services.dokuwiki.sites). Sites definitions that use the old interface are automatically migrated in the new option. This backward compatibility will be removed in 22.05. @@ -323,6 +391,10 @@ To be able to access the web UI this port needs to be opened in the firewall. - `lib.formats.yaml`'s `generate` will not generate JSON anymore, but instead use more of the YAML-specific syntax. +- MariaDB was upgraded from 10.5.x to 10.6.x. Please read the [upstream release notes](https://mariadb.com/kb/en/changes-improvements-in-mariadb-106/) for changes and upgrade instructions. + +- The MariaDB C client library, also known as libmysqlclient or mariadb-connector-c, was upgraded from 3.1.x to 3.2.x. While this should hopefully not have any impact, this upgrade comes with some changes to default behavior, so you might want to review the [upstream release notes](https://mariadb.com/kb/en/changes-and-improvements-in-mariadb-connector-c-32/). + - GNOME desktop environment now enables `QGnomePlatform` as the Qt platform theme, which should avoid crashes when opening file chooser dialogs in Qt apps by using XDG desktop portal. Additionally, it will make the apps fit better visually. - `rofi` has been updated from '1.6.1' to '1.7.0', one important thing is the removal of the old xresources based configuration setup. Read more [in rofi's changelog](https://github.com/davatorium/rofi/blob/cb12e6fc058f4a0f4f/Changelog#L1). @@ -331,3 +403,5 @@ To be able to access the web UI this port needs to be opened in the firewall. - `lua` and `luajit` interpreters have been patched to avoid looking into /usr/lib directories, thus increasing the purity of the build. + +- Three new options, [xdg.mime.addedAssociations](#opt-xdg.mime.addedAssociations), [xdg.mime.defaultApplications](#opt-xdg.mime.defaultApplications), and [xdg.mime.removedAssociations](#opt-xdg.mime.removedAssociations) have been added to the [xdg.mime](#opt-xdg.mime.enable) module to allow the configuration of `/etc/xdg/mimeapps.list`. diff --git a/nixpkgs/nixos/lib/testing-python.nix b/nixpkgs/nixos/lib/testing-python.nix index 43b4f9b159b2..7c8c64211f18 100644 --- a/nixpkgs/nixos/lib/testing-python.nix +++ b/nixpkgs/nixos/lib/testing-python.nix @@ -257,105 +257,18 @@ rec { inherit test driver driverInteractive nodes; }; - runInMachine = - { drv - , machine - , preBuild ? "" - , postBuild ? "" - , qemu_pkg ? pkgs.qemu_test - , ... # ??? - }: - let - build-vms = import ./build-vms.nix { - inherit system pkgs minimal specialArgs extraConfigurations; - }; - - vm = build-vms.buildVM { } - [ - machine - { - key = "run-in-machine"; - networking.hostName = "client"; - nix.readOnlyStore = false; - virtualisation.writableStore = false; - } - ]; - - buildrunner = writeText "vm-build" '' - source $1 - - ${coreutils}/bin/mkdir -p $TMPDIR - cd $TMPDIR - - exec $origBuilder $origArgs - ''; - - testScript = '' - start_all() - client.wait_for_unit("multi-user.target") - ${preBuild} - client.succeed("env -i ${bash}/bin/bash ${buildrunner} /tmp/xchg/saved-env >&2") - ${postBuild} - client.succeed("sync") # flush all data before pulling the plug - ''; - - testDriver = pythonTestDriver { inherit qemu_pkg; }; - vmRunCommand = writeText "vm-run" '' - xchg=vm-state-client/xchg - ${coreutils}/bin/mkdir $out - ${coreutils}/bin/mkdir -p $xchg + abortForFunction = functionName: abort ''The ${functionName} function was + removed because it is not an essential part of the NixOS testing + infrastructure. It had no usage in NixOS or Nixpkgs and it had no designated + maintainer. You are free to reintroduce it by documenting it in the manual + and adding yourself as maintainer. It was removed in + https://github.com/NixOS/nixpkgs/pull/137013 + ''; - for i in $passAsFile; do - i2=''${i}Path - _basename=$(${coreutils}/bin/basename ''${!i2}) - ${coreutils}/bin/cp ''${!i2} $xchg/$_basename - eval $i2=/tmp/xchg/$_basename - ${coreutils}/bin/ls -la $xchg - done - - unset i i2 _basename - export | ${gnugrep}/bin/grep -v '^xchg=' > $xchg/saved-env - unset xchg - - export tests='${testScript}' - ${testDriver}/bin/nixos-test-driver --keep-vm-state ${vm.config.system.build.vm}/bin/run-*-vm - ''; # */ - - in - lib.overrideDerivation drv (attrs: { - requiredSystemFeatures = [ "kvm" ]; - builder = "${bash}/bin/sh"; - args = [ "-e" vmRunCommand ]; - origArgs = attrs.args; - origBuilder = attrs.builder; - }); - - - runInMachineWithX = { require ? [ ], ... } @ args: - let - client = - { ... }: - { - inherit require; - imports = [ - ../tests/common/auto.nix - ]; - virtualisation.memorySize = 1024; - services.xserver.enable = true; - test-support.displayManager.auto.enable = true; - services.xserver.displayManager.defaultSession = "none+icewm"; - services.xserver.windowManager.icewm.enable = true; - }; - in - runInMachine ({ - machine = client; - preBuild = - '' - client.wait_for_x() - ''; - } // args); + runInMachine = abortForFunction "runInMachine"; + runInMachineWithX = abortForFunction "runInMachineWithX"; simpleTest = as: (makeTest as).test; diff --git a/nixpkgs/nixos/modules/config/console.nix b/nixpkgs/nixos/modules/config/console.nix index c5150305bd85..98f942ee63f5 100644 --- a/nixpkgs/nixos/modules/config/console.nix +++ b/nixpkgs/nixos/modules/config/console.nix @@ -116,7 +116,11 @@ in { console.keyMap = with config.services.xserver; mkIf cfg.useXkbConfig (pkgs.runCommand "xkb-console-keymap" { preferLocalBuild = true; } '' - '${pkgs.ckbcomp}/bin/ckbcomp' -model '${xkbModel}' -layout '${layout}' \ + '${pkgs.ckbcomp}/bin/ckbcomp' \ + ${optionalString (config.environment.sessionVariables ? XKB_CONFIG_ROOT) + "-I${config.environment.sessionVariables.XKB_CONFIG_ROOT}" + } \ + -model '${xkbModel}' -layout '${layout}' \ -option '${xkbOptions}' -variant '${xkbVariant}' > "$out" ''); } diff --git a/nixpkgs/nixos/modules/config/krb5/default.nix b/nixpkgs/nixos/modules/config/krb5/default.nix index c2302451d702..6db2a7e40391 100644 --- a/nixpkgs/nixos/modules/config/krb5/default.nix +++ b/nixpkgs/nixos/modules/config/krb5/default.nix @@ -84,7 +84,7 @@ in { type = types.package; default = pkgs.krb5Full; defaultText = "pkgs.krb5Full"; - example = literalExample "pkgs.heimdalFull"; + example = literalExample "pkgs.heimdal"; description = '' The Kerberos implementation that will be present in <literal>environment.systemPackages</literal> after enabling this diff --git a/nixpkgs/nixos/modules/config/malloc.nix b/nixpkgs/nixos/modules/config/malloc.nix index fc35993b5a81..84da5643004f 100644 --- a/nixpkgs/nixos/modules/config/malloc.nix +++ b/nixpkgs/nixos/modules/config/malloc.nix @@ -30,6 +30,15 @@ let vulnerabilities, while maintaining good performance. ''; }; + + mimalloc = { + libPath = "${pkgs.mimalloc}/lib/libmimalloc.so"; + description = '' + A compact and fast general purpose allocator, which may + optionally be built with mitigations against various heap + vulnerabilities. + ''; + }; }; providerConf = providers.${cfg.provider}; @@ -91,7 +100,10 @@ in "abstractions/base" = '' r /etc/ld-nix.so.preload, r ${config.environment.etc."ld-nix.so.preload".source}, - mr ${providerLibPath}, + include "${pkgs.apparmorRulesFromClosure { + name = "mallocLib"; + baseRules = ["mr $path/lib/**.so*"]; + } [ mallocLib ] }" ''; }; }; diff --git a/nixpkgs/nixos/modules/config/users-groups.nix b/nixpkgs/nixos/modules/config/users-groups.nix index d88162558e66..8e2db9107a11 100644 --- a/nixpkgs/nixos/modules/config/users-groups.nix +++ b/nixpkgs/nixos/modules/config/users-groups.nix @@ -123,7 +123,7 @@ let group = mkOption { type = types.str; apply = x: assert (builtins.stringLength x < 32 || abort "Group name '${x}' is longer than 31 characters which is not allowed!"); x; - default = "nogroup"; + default = ""; description = "The user's primary group."; }; @@ -640,6 +640,16 @@ in { Exactly one of users.users.${user.name}.isSystemUser and users.users.${user.name}.isNormalUser must be set. ''; } + { + assertion = user.group != ""; + message = '' + users.users.${user.name}.group is unset. This used to default to + nogroup, but this is unsafe. For example you can create a group + for this user with: + users.users.${user.name}.group = "${user.name}"; + users.groups.${user.name} = {}; + ''; + } ] )); diff --git a/nixpkgs/nixos/modules/config/xdg/mime.nix b/nixpkgs/nixos/modules/config/xdg/mime.nix index 4cdb3f30994b..9b6dd4cab5f5 100644 --- a/nixpkgs/nixos/modules/config/xdg/mime.nix +++ b/nixpkgs/nixos/modules/config/xdg/mime.nix @@ -1,9 +1,17 @@ { config, lib, pkgs, ... }: with lib; + +let + cfg = config.xdg.mime; + associationOptions = with types; attrsOf ( + coercedTo (either (listOf str) str) (x: concatStringsSep ";" (toList x)) str + ); +in + { meta = { - maintainers = teams.freedesktop.members; + maintainers = teams.freedesktop.members ++ (with maintainers; [ figsoda ]); }; options = { @@ -16,9 +24,63 @@ with lib; <link xlink:href="https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html">XDG MIME Applications specification</link>. ''; }; + + xdg.mime.addedAssociations = mkOption { + type = associationOptions; + default = {}; + example = { + "application/pdf" = "firefox.desktop"; + "text/xml" = [ "nvim.desktop" "codium.desktop" ]; + }; + description = '' + Adds associations between mimetypes and applications. See the + <link xlink:href="https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html#associations"> + specifications</link> for more information. + ''; + }; + + xdg.mime.defaultApplications = mkOption { + type = associationOptions; + default = {}; + example = { + "application/pdf" = "firefox.desktop"; + "image/png" = [ "sxiv.desktop" "gimp.desktop" ]; + }; + description = '' + Sets the default applications for given mimetypes. See the + <link xlink:href="https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html#default"> + specifications</link> for more information. + ''; + }; + + xdg.mime.removedAssociations = mkOption { + type = associationOptions; + default = {}; + example = { + "audio/mp3" = [ "mpv.desktop" "umpv.desktop" ]; + "inode/directory" = "codium.desktop"; + }; + description = '' + Removes associations between mimetypes and applications. See the + <link xlink:href="https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html#associations"> + specifications</link> for more information. + ''; + }; }; - config = mkIf config.xdg.mime.enable { + config = mkIf cfg.enable { + environment.etc."xdg/mimeapps.list" = mkIf ( + cfg.addedAssociations != {} + || cfg.defaultApplications != {} + || cfg.removedAssociations != {} + ) { + text = generators.toINI { } { + "Added Associations" = cfg.addedAssociations; + "Default Applications" = cfg.defaultApplications; + "Removed Associations" = cfg.removedAssociations; + }; + }; + environment.pathsToLink = [ "/share/mime" ]; environment.systemPackages = [ diff --git a/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix index 123f487baf93..054c8c74a76b 100644 --- a/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix +++ b/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix @@ -93,7 +93,7 @@ in boot.initrd.availableKernelModules = [ "vfat" "reiserfs" ]; - boot.kernelPackages = pkgs.linuxPackages_3_10; + boot.kernelPackages = pkgs.linuxKernel.packages.linux_3_10; boot.kernelParams = [ "console=tty1" ]; boot.postBootCommands = diff --git a/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball-pc.nix b/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball-pc.nix index a79209d7dfef..674fb6c8a33c 100644 --- a/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball-pc.nix +++ b/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball-pc.nix @@ -114,7 +114,7 @@ in # To be able to use the systemTarball to catch troubles. boot.crashDump = { enable = true; - kernelPackages = pkgs.linuxPackages_3_4; + kernelPackages = pkgs.linuxKernel.packages.linux_3_4; }; # No grub for the tarball. diff --git a/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix index 95579f3ca06d..458e313a3f75 100644 --- a/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix +++ b/nixpkgs/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix @@ -111,7 +111,7 @@ in # "console=ttyS0,115200n8" # serial console ]; - boot.kernelPackages = pkgs.linuxPackages_3_4; + boot.kernelPackages = pkgs.linuxKernel.packages.linux_3_4; boot.supportedFilesystems = [ "reiserfs" ]; diff --git a/nixpkgs/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix b/nixpkgs/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix index 83850f4c1158..103d6787a03c 100644 --- a/nixpkgs/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix +++ b/nixpkgs/nixos/modules/installer/sd-card/sd-image-raspberrypi.nix @@ -12,7 +12,7 @@ boot.loader.generic-extlinux-compatible.enable = true; boot.consoleLogLevel = lib.mkDefault 7; - boot.kernelPackages = pkgs.linuxPackages_rpi1; + boot.kernelPackages = pkgs.linuxKernel.packages.linux_rpi1; sdImage = { populateFirmwareCommands = let diff --git a/nixpkgs/nixos/modules/installer/tools/tools.nix b/nixpkgs/nixos/modules/installer/tools/tools.nix index f79ed3493dfb..2f3b0cdd48f2 100644 --- a/nixpkgs/nixos/modules/installer/tools/tools.nix +++ b/nixpkgs/nixos/modules/installer/tools/tools.nix @@ -104,7 +104,20 @@ in }; }; - config = { + options.system.disableInstallerTools = mkOption { + internal = true; + type = types.bool; + default = false; + description = '' + Disable nixos-rebuild, nixos-generate-config, nixos-installer + and other NixOS tools. This is useful to shrink embedded, + read-only systems which are not expected to be rebuild or + reconfigure themselves. Use at your own risk! + ''; + }; + + config = lib.mkIf (!config.system.disableInstallerTools) { + system.nixos-generate-config.configuration = mkDefault '' # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page diff --git a/nixpkgs/nixos/modules/misc/documentation.nix b/nixpkgs/nixos/modules/misc/documentation.nix index 51b310745604..233332e2d414 100644 --- a/nixpkgs/nixos/modules/misc/documentation.nix +++ b/nixpkgs/nixos/modules/misc/documentation.nix @@ -172,11 +172,11 @@ in description = '' Whether to install documentation targeted at developers. <itemizedlist> - <listitem><para>This includes man pages targeted at developers if <option>man.enable</option> is + <listitem><para>This includes man pages targeted at developers if <option>documentation.man.enable</option> is set (this also includes "devman" outputs).</para></listitem> - <listitem><para>This includes info pages targeted at developers if <option>info.enable</option> + <listitem><para>This includes info pages targeted at developers if <option>documentation.info.enable</option> is set (this also includes "devinfo" outputs).</para></listitem> - <listitem><para>This includes other pages targeted at developers if <option>doc.enable</option> + <listitem><para>This includes other pages targeted at developers if <option>documentation.doc.enable</option> is set (this also includes "devdoc" outputs).</para></listitem> </itemizedlist> ''; @@ -190,10 +190,10 @@ in <itemizedlist> <listitem><para>This includes man pages like <citerefentry><refentrytitle>configuration.nix</refentrytitle> - <manvolnum>5</manvolnum></citerefentry> if <option>man.enable</option> is + <manvolnum>5</manvolnum></citerefentry> if <option>documentation.man.enable</option> is set.</para></listitem> <listitem><para>This includes the HTML manual and the <command>nixos-help</command> command if - <option>doc.enable</option> is set.</para></listitem> + <option>documentation.doc.enable</option> is set.</para></listitem> </itemizedlist> ''; }; diff --git a/nixpkgs/nixos/modules/misc/ids.nix b/nixpkgs/nixos/modules/misc/ids.nix index 93ea73f303cb..a3e491a38329 100644 --- a/nixpkgs/nixos/modules/misc/ids.nix +++ b/nixpkgs/nixos/modules/misc/ids.nix @@ -46,7 +46,7 @@ in messagebus = 4; # D-Bus haldaemon = 5; #disk = 6; # unused - vsftpd = 7; + #vsftpd = 7; # dynamically allocated ass of 2021-09-14 ftp = 8; bitlbee = 9; #avahi = 10; # removed 2019-05-22 @@ -83,14 +83,14 @@ in #fourstore = 42; # dropped in 20.03 #fourstorehttp = 43; # dropped in 20.03 virtuoso = 44; - rtkit = 45; + #rtkit = 45; # dynamically allocated 2021-09-03 dovecot2 = 46; dovenull2 = 47; prayer = 49; mpd = 50; clamav = 51; fprot = 52; - bind = 53; + # bind = 53; #dynamically allocated as of 2021-09-03 wwwrun = 54; #adm = 55; # unused spamd = 56; @@ -134,13 +134,13 @@ in firebird = 95; #keys = 96; # unused #haproxy = 97; # dynamically allocated as of 2020-03-11 - mongodb = 98; + #mongodb = 98; #dynamically allocated as of 2021-09-03 #openldap = 99; # dynamically allocated as of PR#94610 #users = 100; # unused - cgminer = 101; + # cgminer = 101; #dynamically allocated as of 2021-09-17 munin = 102; - logcheck = 103; - nix-ssh = 104; + #logcheck = 103; #dynamically allocated as of 2021-09-17 + #nix-ssh = 104; #dynamically allocated as of 2021-09-03 dictd = 105; couchdb = 106; #searx = 107; # dynamically allocated as of 2020-10-27 @@ -149,11 +149,11 @@ in systemd-journal-gateway = 110; #notbit = 111; # unused aerospike = 111; - ngircd = 112; + #ngircd = 112; #dynamically allocated as of 2021-09-03 #btsync = 113; # unused - minecraft = 114; + #minecraft = 114; #dynamically allocated as of 2021-09-03 vault = 115; - rippled = 116; + # rippled = 116; #dynamically allocated as of 2021-09-18 murmur = 117; foundationdb = 118; newrelic = 119; @@ -169,19 +169,19 @@ in mopidy = 130; #docker = 131; # unused gdm = 132; - dhcpd = 133; + #dhcpd = 133; # dynamically allocated as of 2021-09-03 siproxd = 134; mlmmj = 135; - neo4j = 136; + #neo4j = 136;# dynamically allocated as of 2021-09-03 riemann = 137; riemanndash = 138; - radvd = 139; - zookeeper = 140; - dnsmasq = 141; + #radvd = 139;# dynamically allocated as of 2021-09-03 + #zookeeper = 140;# dynamically allocated as of 2021-09-03 + #dnsmasq = 141;# dynamically allocated as of 2021-09-03 #uhub = 142; # unused yandexdisk = 143; mxisd = 144; # was once collectd - consul = 145; + #consul = 145;# dynamically allocated as of 2021-09-03 mailpile = 146; redmine = 147; #seeks = 148; # removed 2020-06-21 @@ -192,7 +192,7 @@ in systemd-resolve = 153; systemd-timesync = 154; liquidsoap = 155; - etcd = 156; + #etcd = 156;# dynamically allocated as of 2021-09-03 hbase = 158; opentsdb = 159; scollector = 160; @@ -201,26 +201,26 @@ in peerflix = 163; #chronos = 164; # removed 2020-08-15 gitlab = 165; - tox-bootstrapd = 166; + # tox-bootstrapd = 166; removed 2021-09-15 cadvisor = 167; nylon = 168; - apache-kafka = 169; + #apache-kafka = 169;# dynamically allocated as of 2021-09-03 #panamax = 170; # unused exim = 172; #fleet = 173; # unused #input = 174; # unused sddm = 175; - tss = 176; + #tss = 176; # dynamically allocated as of 2021-09-17 #memcached = 177; removed 2018-01-03 - ntp = 179; + #ntp = 179; # dynamically allocated as of 2021-09-17 zabbix = 180; #redis = 181; removed 2018-01-03 - unifi = 183; + #unifi = 183; dynamically allocated as of 2021-09-17 uptimed = 184; - zope2 = 185; - ripple-data-api = 186; + #zope2 = 185; # dynamically allocated as of 2021-09-18 + #ripple-data-api = 186; dynamically allocated as of 2021-09-17 mediatomb = 187; - rdnssd = 188; + #rdnssd = 188; #dynamically allocated as of 2021-09-18 ihaskell = 189; i2p = 190; lambdabot = 191; @@ -231,20 +231,20 @@ in skydns = 197; # ripple-rest = 198; # unused, removed 2017-08-12 # nix-serve = 199; # unused, removed 2020-12-12 - tvheadend = 200; + #tvheadend = 200; # dynamically allocated as of 2021-09-18 uwsgi = 201; gitit = 202; riemanntools = 203; subsonic = 204; riak = 205; - shout = 206; + #shout = 206; # dynamically allocated as of 2021-09-18 gateone = 207; namecoin = 208; #lxd = 210; # unused - kibana = 211; + #kibana = 211;# dynamically allocated as of 2021-09-03 xtreemfs = 212; calibre-server = 213; - heapster = 214; + #heapster = 214; #dynamically allocated as of 2021-09-17 bepasty = 215; # pumpio = 216; # unused, removed 2018-02-24 nm-openvpn = 217; @@ -258,13 +258,13 @@ in rspamd = 225; # rmilter = 226; # unused, removed 2019-08-22 cfdyndns = 227; - gammu-smsd = 228; + # gammu-smsd = 228; #dynamically allocated as of 2021-09-17 pdnsd = 229; octoprint = 230; avahi-autoipd = 231; - nntp-proxy = 232; + # nntp-proxy = 232; #dynamically allocated as of 2021-09-17 mjpg-streamer = 233; - radicale = 234; + #radicale = 234;# dynamically allocated as of 2021-09-03 hydra-queue-runner = 235; hydra-www = 236; syncthing = 237; @@ -272,14 +272,14 @@ in taskd = 240; # factorio = 241; # DynamicUser = true # emby = 242; # unusued, removed 2019-05-01 - graylog = 243; + #graylog = 243;# dynamically allocated as of 2021-09-03 sniproxy = 244; nzbget = 245; mosquitto = 246; - toxvpn = 247; + #toxvpn = 247; # dynamically allocated as of 2021-09-18 # squeezelite = 248; # DynamicUser = true turnserver = 249; - smokeping = 250; + #smokeping = 250;# dynamically allocated as of 2021-09-03 gocd-agent = 251; gocd-server = 252; terraria = 253; @@ -366,7 +366,7 @@ in messagebus = 4; # D-Bus haldaemon = 5; disk = 6; - vsftpd = 7; + #vsftpd = 7; # dynamically allocated as of 2021-09-14 ftp = 8; bitlbee = 9; #avahi = 10; # removed 2019-05-22 @@ -524,7 +524,7 @@ in #fleet = 173; # unused input = 174; sddm = 175; - tss = 176; + #tss = 176; #dynamically allocateda as of 2021-09-20 #memcached = 177; # unused, removed 2018-01-03 #ntp = 179; # unused zabbix = 180; @@ -554,7 +554,7 @@ in #shout = 206; #unused gateone = 207; namecoin = 208; - lxd = 210; # unused + #lxd = 210; # unused #kibana = 211; xtreemfs = 212; calibre-server = 213; @@ -573,7 +573,7 @@ in cfdyndns = 227; pdnsd = 229; octoprint = 230; - radicale = 234; + #radicale = 234;# dynamically allocated as of 2021-09-03 syncthing = 237; caddy = 239; taskd = 240; @@ -585,7 +585,7 @@ in #toxvpn = 247; # unused #squeezelite = 248; #unused turnserver = 249; - smokeping = 250; + #smokeping = 250;# dynamically allocated as of 2021-09-03 gocd-agent = 251; gocd-server = 252; terraria = 253; diff --git a/nixpkgs/nixos/modules/module-list.nix b/nixpkgs/nixos/modules/module-list.nix index d145df05da32..4bd6fc030fc8 100644 --- a/nixpkgs/nixos/modules/module-list.nix +++ b/nixpkgs/nixos/modules/module-list.nix @@ -171,6 +171,7 @@ ./programs/npm.nix ./programs/noisetorch.nix ./programs/oblogout.nix + ./programs/pantheon-tweaks.nix ./programs/partition-manager.nix ./programs/plotinus.nix ./programs/proxychains.nix @@ -201,6 +202,7 @@ ./programs/vim.nix ./programs/wavemon.nix ./programs/waybar.nix + ./programs/weylus.nix ./programs/wireshark.nix ./programs/wshowkeys.nix ./programs/xfs_quota.nix @@ -297,6 +299,7 @@ ./services/cluster/kubernetes/pki.nix ./services/cluster/kubernetes/proxy.nix ./services/cluster/kubernetes/scheduler.nix + ./services/cluster/spark/default.nix ./services/computing/boinc/client.nix ./services/computing/foldingathome/client.nix ./services/computing/slurm/slurm.nix @@ -341,6 +344,7 @@ ./services/desktops/accountsservice.nix ./services/desktops/bamf.nix ./services/desktops/blueman.nix + ./services/desktops/cpupower-gui.nix ./services/desktops/dleyna-renderer.nix ./services/desktops/dleyna-server.nix ./services/desktops/pantheon/files.nix @@ -558,6 +562,7 @@ ./services/misc/octoprint.nix ./services/misc/ombi.nix ./services/misc/osrm.nix + ./services/misc/owncast.nix ./services/misc/packagekit.nix ./services/misc/paperless-ng.nix ./services/misc/parsoid.nix @@ -623,6 +628,7 @@ ./services/monitoring/munin.nix ./services/monitoring/nagios.nix ./services/monitoring/netdata.nix + ./services/monitoring/parsedmarc.nix ./services/monitoring/prometheus/default.nix ./services/monitoring/prometheus/alertmanager.nix ./services/monitoring/prometheus/exporters.nix @@ -898,6 +904,7 @@ ./services/search/elasticsearch-curator.nix ./services/search/hound.nix ./services/search/kibana.nix + ./services/search/meilisearch.nix ./services/search/solr.nix ./services/security/certmgr.nix ./services/security/cfssl.nix @@ -914,6 +921,7 @@ ./services/security/nginx-sso.nix ./services/security/oauth2_proxy.nix ./services/security/oauth2_proxy_nginx.nix + ./services/security/opensnitch.nix ./services/security/privacyidea.nix ./services/security/physlock.nix ./services/security/shibboleth-sp.nix @@ -1026,7 +1034,7 @@ ./services/web-servers/shellinabox.nix ./services/web-servers/tomcat.nix ./services/web-servers/traefik.nix - ./services/web-servers/trafficserver.nix + ./services/web-servers/trafficserver/default.nix ./services/web-servers/ttyd.nix ./services/web-servers/uwsgi.nix ./services/web-servers/varnish/default.nix @@ -1055,6 +1063,7 @@ ./services/x11/gdk-pixbuf.nix ./services/x11/imwheel.nix ./services/x11/redshift.nix + ./services/x11/touchegg.nix ./services/x11/urserver.nix ./services/x11/urxvtd.nix ./services/x11/window-managers/awesome.nix diff --git a/nixpkgs/nixos/modules/programs/atop.nix b/nixpkgs/nixos/modules/programs/atop.nix index b45eb16e3eaf..918c228b3f52 100644 --- a/nixpkgs/nixos/modules/programs/atop.nix +++ b/nixpkgs/nixos/modules/programs/atop.nix @@ -141,8 +141,15 @@ in // mkService cfg.atopgpu.enable "atopgpu" [ atop ]; timers = mkTimer cfg.atopRotateTimer.enable "atop-rotate" [ atop ]; }; - security.wrappers = - lib.mkIf cfg.setuidWrapper.enable { atop = { source = "${atop}/bin/atop"; }; }; + + security.wrappers = lib.mkIf cfg.setuidWrapper.enable { + atop = + { setuid = true; + owner = "root"; + group = "root"; + source = "${atop}/bin/atop"; + }; + }; } ); } diff --git a/nixpkgs/nixos/modules/programs/bandwhich.nix b/nixpkgs/nixos/modules/programs/bandwhich.nix index 1cffb5fa2765..610d602ad2cc 100644 --- a/nixpkgs/nixos/modules/programs/bandwhich.nix +++ b/nixpkgs/nixos/modules/programs/bandwhich.nix @@ -22,8 +22,10 @@ in { config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ bandwhich ]; security.wrappers.bandwhich = { - source = "${pkgs.bandwhich}/bin/bandwhich"; + owner = "root"; + group = "root"; capabilities = "cap_net_raw,cap_net_admin+ep"; + source = "${pkgs.bandwhich}/bin/bandwhich"; }; }; } diff --git a/nixpkgs/nixos/modules/programs/captive-browser.nix b/nixpkgs/nixos/modules/programs/captive-browser.nix index d7684d08c6c7..4e8abdeecf0b 100644 --- a/nixpkgs/nixos/modules/programs/captive-browser.nix +++ b/nixpkgs/nixos/modules/programs/captive-browser.nix @@ -105,11 +105,15 @@ in ); security.wrappers.udhcpc = { + owner = "root"; + group = "root"; capabilities = "cap_net_raw+p"; source = "${pkgs.busybox}/bin/udhcpc"; }; security.wrappers.captive-browser = { + owner = "root"; + group = "root"; capabilities = "cap_net_raw+p"; source = pkgs.writeShellScript "captive-browser" '' export PREV_CONFIG_HOME="$XDG_CONFIG_HOME" diff --git a/nixpkgs/nixos/modules/programs/ccache.nix b/nixpkgs/nixos/modules/programs/ccache.nix index d672e1da017a..35a4373f6128 100644 --- a/nixpkgs/nixos/modules/programs/ccache.nix +++ b/nixpkgs/nixos/modules/programs/ccache.nix @@ -28,7 +28,9 @@ in { # "nix-ccache --show-stats" and "nix-ccache --clear" security.wrappers.nix-ccache = { + owner = "nobody"; group = "nixbld"; + setuid = false; setgid = true; source = pkgs.writeScript "nix-ccache.pl" '' #!${pkgs.perl}/bin/perl diff --git a/nixpkgs/nixos/modules/programs/firejail.nix b/nixpkgs/nixos/modules/programs/firejail.nix index ad4ef1a39459..9384b01b3674 100644 --- a/nixpkgs/nixos/modules/programs/firejail.nix +++ b/nixpkgs/nixos/modules/programs/firejail.nix @@ -81,7 +81,12 @@ in { }; config = mkIf cfg.enable { - security.wrappers.firejail.source = "${lib.getBin pkgs.firejail}/bin/firejail"; + security.wrappers.firejail = + { setuid = true; + owner = "root"; + group = "root"; + source = "${lib.getBin pkgs.firejail}/bin/firejail"; + }; environment.systemPackages = [ pkgs.firejail ] ++ [ wrappedBins ]; }; diff --git a/nixpkgs/nixos/modules/programs/gamemode.nix b/nixpkgs/nixos/modules/programs/gamemode.nix index 03949bf98df6..102788f5b019 100644 --- a/nixpkgs/nixos/modules/programs/gamemode.nix +++ b/nixpkgs/nixos/modules/programs/gamemode.nix @@ -56,6 +56,8 @@ in polkit.enable = true; wrappers = mkIf cfg.enableRenice { gamemoded = { + owner = "root"; + group = "root"; source = "${pkgs.gamemode}/bin/gamemoded"; capabilities = "cap_sys_nice+ep"; }; diff --git a/nixpkgs/nixos/modules/programs/iftop.nix b/nixpkgs/nixos/modules/programs/iftop.nix index a98a9a8187d4..c74714a9a6d6 100644 --- a/nixpkgs/nixos/modules/programs/iftop.nix +++ b/nixpkgs/nixos/modules/programs/iftop.nix @@ -11,8 +11,10 @@ in { config = mkIf cfg.enable { environment.systemPackages = [ pkgs.iftop ]; security.wrappers.iftop = { - source = "${pkgs.iftop}/bin/iftop"; + owner = "root"; + group = "root"; capabilities = "cap_net_raw+p"; + source = "${pkgs.iftop}/bin/iftop"; }; }; } diff --git a/nixpkgs/nixos/modules/programs/iotop.nix b/nixpkgs/nixos/modules/programs/iotop.nix index 5512dbc62f72..b7c1c69f9ddd 100644 --- a/nixpkgs/nixos/modules/programs/iotop.nix +++ b/nixpkgs/nixos/modules/programs/iotop.nix @@ -10,8 +10,10 @@ in { }; config = mkIf cfg.enable { security.wrappers.iotop = { - source = "${pkgs.iotop}/bin/iotop"; + owner = "root"; + group = "root"; capabilities = "cap_net_admin+p"; + source = "${pkgs.iotop}/bin/iotop"; }; }; } diff --git a/nixpkgs/nixos/modules/programs/kbdlight.nix b/nixpkgs/nixos/modules/programs/kbdlight.nix index 58e45872fac8..8a2a0057cf2d 100644 --- a/nixpkgs/nixos/modules/programs/kbdlight.nix +++ b/nixpkgs/nixos/modules/programs/kbdlight.nix @@ -11,6 +11,11 @@ in config = mkIf cfg.enable { environment.systemPackages = [ pkgs.kbdlight ]; - security.wrappers.kbdlight.source = "${pkgs.kbdlight.out}/bin/kbdlight"; + security.wrappers.kbdlight = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.kbdlight.out}/bin/kbdlight"; + }; }; } diff --git a/nixpkgs/nixos/modules/programs/liboping.nix b/nixpkgs/nixos/modules/programs/liboping.nix index 4e4c235ccde4..4433f9767d6e 100644 --- a/nixpkgs/nixos/modules/programs/liboping.nix +++ b/nixpkgs/nixos/modules/programs/liboping.nix @@ -13,8 +13,10 @@ in { security.wrappers = mkMerge (map ( exec: { "${exec}" = { - source = "${pkgs.liboping}/bin/${exec}"; + owner = "root"; + group = "root"; capabilities = "cap_net_raw+p"; + source = "${pkgs.liboping}/bin/${exec}"; }; } ) [ "oping" "noping" ]); diff --git a/nixpkgs/nixos/modules/programs/msmtp.nix b/nixpkgs/nixos/modules/programs/msmtp.nix index 217060e6b3b3..9c067bdc9695 100644 --- a/nixpkgs/nixos/modules/programs/msmtp.nix +++ b/nixpkgs/nixos/modules/programs/msmtp.nix @@ -78,6 +78,8 @@ in { source = "${pkgs.msmtp}/bin/sendmail"; setuid = false; setgid = false; + owner = "root"; + group = "root"; }; environment.etc."msmtprc".text = let diff --git a/nixpkgs/nixos/modules/programs/mtr.nix b/nixpkgs/nixos/modules/programs/mtr.nix index 75b710c1584f..63516c58440e 100644 --- a/nixpkgs/nixos/modules/programs/mtr.nix +++ b/nixpkgs/nixos/modules/programs/mtr.nix @@ -31,8 +31,10 @@ in { environment.systemPackages = with pkgs; [ cfg.package ]; security.wrappers.mtr-packet = { - source = "${cfg.package}/bin/mtr-packet"; + owner = "root"; + group = "root"; capabilities = "cap_net_raw+p"; + source = "${cfg.package}/bin/mtr-packet"; }; }; } diff --git a/nixpkgs/nixos/modules/programs/noisetorch.nix b/nixpkgs/nixos/modules/programs/noisetorch.nix index 5f3b0c8f5d1e..bca68b0064c0 100644 --- a/nixpkgs/nixos/modules/programs/noisetorch.nix +++ b/nixpkgs/nixos/modules/programs/noisetorch.nix @@ -18,8 +18,10 @@ in { config = mkIf cfg.enable { security.wrappers.noisetorch = { - source = "${cfg.package}/bin/noisetorch"; + owner = "root"; + group = "root"; capabilities = "cap_sys_resource=+ep"; + source = "${cfg.package}/bin/noisetorch"; }; }; } diff --git a/nixpkgs/nixos/modules/programs/pantheon-tweaks.nix b/nixpkgs/nixos/modules/programs/pantheon-tweaks.nix new file mode 100644 index 000000000000..0b8a19ea22c0 --- /dev/null +++ b/nixpkgs/nixos/modules/programs/pantheon-tweaks.nix @@ -0,0 +1,19 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + meta = { + maintainers = teams.pantheon.members; + }; + + ###### interface + options = { + programs.pantheon-tweaks.enable = mkEnableOption "Pantheon Tweaks, an unofficial system settings panel for Pantheon"; + }; + + ###### implementation + config = mkIf config.programs.pantheon-tweaks.enable { + services.xserver.desktopManager.pantheon.extraSwitchboardPlugs = [ pkgs.pantheon-tweaks ]; + }; +} diff --git a/nixpkgs/nixos/modules/programs/plotinus.nix b/nixpkgs/nixos/modules/programs/plotinus.nix index e3549c79588b..2c90a41ba029 100644 --- a/nixpkgs/nixos/modules/programs/plotinus.nix +++ b/nixpkgs/nixos/modules/programs/plotinus.nix @@ -30,7 +30,7 @@ in ###### implementation config = mkIf cfg.enable { - environment.variables.XDG_DATA_DIRS = [ "${pkgs.plotinus}/share/gsettings-schemas/${pkgs.plotinus.name}" ]; + environment.sessionVariables.XDG_DATA_DIRS = [ "${pkgs.plotinus}/share/gsettings-schemas/${pkgs.plotinus.name}" ]; environment.variables.GTK3_MODULES = [ "${pkgs.plotinus}/lib/libplotinus.so" ]; }; } diff --git a/nixpkgs/nixos/modules/programs/shadow.nix b/nixpkgs/nixos/modules/programs/shadow.nix index 386ded9d98b6..e021f184179d 100644 --- a/nixpkgs/nixos/modules/programs/shadow.nix +++ b/nixpkgs/nixos/modules/programs/shadow.nix @@ -43,6 +43,13 @@ let ''; + mkSetuidRoot = source: + { setuid = true; + owner = "root"; + group = "root"; + inherit source; + }; + in { @@ -109,14 +116,14 @@ in }; security.wrappers = { - su.source = "${pkgs.shadow.su}/bin/su"; - sg.source = "${pkgs.shadow.out}/bin/sg"; - newgrp.source = "${pkgs.shadow.out}/bin/newgrp"; - newuidmap.source = "${pkgs.shadow.out}/bin/newuidmap"; - newgidmap.source = "${pkgs.shadow.out}/bin/newgidmap"; + su = mkSetuidRoot "${pkgs.shadow.su}/bin/su"; + sg = mkSetuidRoot "${pkgs.shadow.out}/bin/sg"; + newgrp = mkSetuidRoot "${pkgs.shadow.out}/bin/newgrp"; + newuidmap = mkSetuidRoot "${pkgs.shadow.out}/bin/newuidmap"; + newgidmap = mkSetuidRoot "${pkgs.shadow.out}/bin/newgidmap"; } // lib.optionalAttrs config.users.mutableUsers { - chsh.source = "${pkgs.shadow.out}/bin/chsh"; - passwd.source = "${pkgs.shadow.out}/bin/passwd"; + chsh = mkSetuidRoot "${pkgs.shadow.out}/bin/chsh"; + passwd = mkSetuidRoot "${pkgs.shadow.out}/bin/passwd"; }; }; } diff --git a/nixpkgs/nixos/modules/programs/singularity.nix b/nixpkgs/nixos/modules/programs/singularity.nix index 6ac64a81fc24..db935abe4bb4 100644 --- a/nixpkgs/nixos/modules/programs/singularity.nix +++ b/nixpkgs/nixos/modules/programs/singularity.nix @@ -16,7 +16,12 @@ in { config = mkIf cfg.enable { environment.systemPackages = [ singularity ]; - security.wrappers.singularity-suid.source = "${singularity}/libexec/singularity/bin/starter-suid.orig"; + security.wrappers.singularity-suid = + { setuid = true; + owner = "root"; + group = "root"; + source = "${singularity}/libexec/singularity/bin/starter-suid.orig"; + }; systemd.tmpfiles.rules = [ "d /var/singularity/mnt/session 0770 root root -" "d /var/singularity/mnt/final 0770 root root -" diff --git a/nixpkgs/nixos/modules/programs/slock.nix b/nixpkgs/nixos/modules/programs/slock.nix index 0e1281e62cd7..ce80fcc5d4a8 100644 --- a/nixpkgs/nixos/modules/programs/slock.nix +++ b/nixpkgs/nixos/modules/programs/slock.nix @@ -21,6 +21,11 @@ in config = mkIf cfg.enable { environment.systemPackages = [ pkgs.slock ]; - security.wrappers.slock.source = "${pkgs.slock.out}/bin/slock"; + security.wrappers.slock = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.slock.out}/bin/slock"; + }; }; } diff --git a/nixpkgs/nixos/modules/programs/ssmtp.nix b/nixpkgs/nixos/modules/programs/ssmtp.nix index 8b500f0383f4..e28a14538ecd 100644 --- a/nixpkgs/nixos/modules/programs/ssmtp.nix +++ b/nixpkgs/nixos/modules/programs/ssmtp.nix @@ -181,6 +181,8 @@ in source = "${pkgs.ssmtp}/bin/sendmail"; setuid = false; setgid = false; + owner = "root"; + group = "root"; }; }; diff --git a/nixpkgs/nixos/modules/programs/traceroute.nix b/nixpkgs/nixos/modules/programs/traceroute.nix index 4eb0be3f0e0b..6e04057ac503 100644 --- a/nixpkgs/nixos/modules/programs/traceroute.nix +++ b/nixpkgs/nixos/modules/programs/traceroute.nix @@ -19,8 +19,10 @@ in { config = mkIf cfg.enable { security.wrappers.traceroute = { - source = "${pkgs.traceroute}/bin/traceroute"; + owner = "root"; + group = "root"; capabilities = "cap_net_raw+p"; + source = "${pkgs.traceroute}/bin/traceroute"; }; }; } diff --git a/nixpkgs/nixos/modules/programs/udevil.nix b/nixpkgs/nixos/modules/programs/udevil.nix index ba5670f9dfe9..0dc08c435df4 100644 --- a/nixpkgs/nixos/modules/programs/udevil.nix +++ b/nixpkgs/nixos/modules/programs/udevil.nix @@ -9,6 +9,11 @@ in { options.programs.udevil.enable = mkEnableOption "udevil"; config = mkIf cfg.enable { - security.wrappers.udevil.source = "${lib.getBin pkgs.udevil}/bin/udevil"; + security.wrappers.udevil = + { setuid = true; + owner = "root"; + group = "root"; + source = "${lib.getBin pkgs.udevil}/bin/udevil"; + }; }; } diff --git a/nixpkgs/nixos/modules/programs/wavemon.nix b/nixpkgs/nixos/modules/programs/wavemon.nix index ac665fe4a023..e5ccacba75d4 100644 --- a/nixpkgs/nixos/modules/programs/wavemon.nix +++ b/nixpkgs/nixos/modules/programs/wavemon.nix @@ -21,8 +21,10 @@ in { config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ wavemon ]; security.wrappers.wavemon = { - source = "${pkgs.wavemon}/bin/wavemon"; + owner = "root"; + group = "root"; capabilities = "cap_net_admin+ep"; + source = "${pkgs.wavemon}/bin/wavemon"; }; }; } diff --git a/nixpkgs/nixos/modules/programs/weylus.nix b/nixpkgs/nixos/modules/programs/weylus.nix new file mode 100644 index 000000000000..ea92c77e7c32 --- /dev/null +++ b/nixpkgs/nixos/modules/programs/weylus.nix @@ -0,0 +1,47 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.weylus; +in +{ + options.programs.weylus = with types; { + enable = mkEnableOption "weylus"; + + openFirewall = mkOption { + type = bool; + default = false; + description = '' + Open ports needed for the functionality of the program. + ''; + }; + + users = mkOption { + type = listOf str; + default = [ ]; + description = '' + To enable stylus and multi-touch support, the user you're going to use must be added to this list. + These users can synthesize input events system-wide, even when another user is logged in - untrusted users should not be added. + ''; + }; + + package = mkOption { + type = package; + default = pkgs.weylus; + defaultText = "pkgs.weylus"; + description = "Weylus package to install."; + }; + }; + config = mkIf cfg.enable { + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ 1701 9001 ]; + }; + + hardware.uinput.enable = true; + + users.groups.uinput.members = cfg.users; + + environment.systemPackages = [ cfg.package ]; + }; +} diff --git a/nixpkgs/nixos/modules/programs/wshowkeys.nix b/nixpkgs/nixos/modules/programs/wshowkeys.nix index 09b008af1d5d..f7b71d2bb0c8 100644 --- a/nixpkgs/nixos/modules/programs/wshowkeys.nix +++ b/nixpkgs/nixos/modules/programs/wshowkeys.nix @@ -17,6 +17,11 @@ in { }; config = mkIf cfg.enable { - security.wrappers.wshowkeys.source = "${pkgs.wshowkeys}/bin/wshowkeys"; + security.wrappers.wshowkeys = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.wshowkeys}/bin/wshowkeys"; + }; }; } diff --git a/nixpkgs/nixos/modules/security/chromium-suid-sandbox.nix b/nixpkgs/nixos/modules/security/chromium-suid-sandbox.nix index b83dbc4202a8..bb99c053f718 100644 --- a/nixpkgs/nixos/modules/security/chromium-suid-sandbox.nix +++ b/nixpkgs/nixos/modules/security/chromium-suid-sandbox.nix @@ -28,6 +28,11 @@ in config = mkIf cfg.enable { environment.systemPackages = [ sandbox ]; - security.wrappers.${sandbox.passthru.sandboxExecutableName}.source = "${sandbox}/bin/${sandbox.passthru.sandboxExecutableName}"; + security.wrappers.${sandbox.passthru.sandboxExecutableName} = + { setuid = true; + owner = "root"; + group = "root"; + source = "${sandbox}/bin/${sandbox.passthru.sandboxExecutableName}"; + }; }; } diff --git a/nixpkgs/nixos/modules/security/doas.nix b/nixpkgs/nixos/modules/security/doas.nix index 27f6870aaf37..35f618b03e8e 100644 --- a/nixpkgs/nixos/modules/security/doas.nix +++ b/nixpkgs/nixos/modules/security/doas.nix @@ -241,9 +241,12 @@ in } ]; - security.wrappers = { - doas.source = "${doas}/bin/doas"; - }; + security.wrappers.doas = + { setuid = true; + owner = "root"; + group = "root"; + source = "${doas}/bin/doas"; + }; environment.systemPackages = [ doas diff --git a/nixpkgs/nixos/modules/security/duosec.nix b/nixpkgs/nixos/modules/security/duosec.nix index c47be80b9dc3..bbe246fe229e 100644 --- a/nixpkgs/nixos/modules/security/duosec.nix +++ b/nixpkgs/nixos/modules/security/duosec.nix @@ -186,7 +186,12 @@ in config = mkIf (cfg.ssh.enable || cfg.pam.enable) { environment.systemPackages = [ pkgs.duo-unix ]; - security.wrappers.login_duo.source = "${pkgs.duo-unix.out}/bin/login_duo"; + security.wrappers.login_duo = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.duo-unix.out}/bin/login_duo"; + }; system.activationScripts = { login_duo = mkIf cfg.ssh.enable '' diff --git a/nixpkgs/nixos/modules/security/lock-kernel-modules.nix b/nixpkgs/nixos/modules/security/lock-kernel-modules.nix index fc9e7939d814..065587bc286e 100644 --- a/nixpkgs/nixos/modules/security/lock-kernel-modules.nix +++ b/nixpkgs/nixos/modules/security/lock-kernel-modules.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, pkgs, lib, ... }: with lib; @@ -13,7 +13,7 @@ with lib; default = false; description = '' Disable kernel module loading once the system is fully initialised. - Module loading is disabled until the next reboot. Problems caused + Module loading is disabled until the next reboot. Problems caused by delayed module loading can be fixed by adding the module(s) in question to <option>boot.kernelModules</option>. ''; @@ -29,20 +29,30 @@ with lib; else [ x.fsType ] else []) config.system.build.fileSystems; - systemd.services.disable-kernel-module-loading = rec { + systemd.services.disable-kernel-module-loading = { description = "Disable kernel module loading"; + wants = [ "systemd-udevd.service" ]; wantedBy = [ config.systemd.defaultUnit ]; - after = [ "systemd-udev-settle.service" "firewall.service" "systemd-modules-load.service" ] ++ wantedBy; + after = + [ "firewall.service" + "systemd-modules-load.service" + config.systemd.defaultUnit + ]; unitConfig.ConditionPathIsReadWrite = "/proc/sys/kernel"; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStart = "/bin/sh -c 'echo -n 1 >/proc/sys/kernel/modules_disabled'"; - }; + serviceConfig = + { Type = "oneshot"; + RemainAfterExit = true; + TimeoutSec = 180; + }; + + script = '' + ${pkgs.udev}/bin/udevadm settle + echo -n 1 >/proc/sys/kernel/modules_disabled + ''; }; }; } diff --git a/nixpkgs/nixos/modules/security/pam.nix b/nixpkgs/nixos/modules/security/pam.nix index 163d75d7caf2..8b1f653d4e2c 100644 --- a/nixpkgs/nixos/modules/security/pam.nix +++ b/nixpkgs/nixos/modules/security/pam.nix @@ -869,9 +869,10 @@ in security.wrappers = { unix_chkpwd = { - source = "${pkgs.pam}/sbin/unix_chkpwd.orig"; - owner = "root"; setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.pam}/sbin/unix_chkpwd.orig"; }; }; diff --git a/nixpkgs/nixos/modules/security/pam_usb.nix b/nixpkgs/nixos/modules/security/pam_usb.nix index c695ba075ca9..51d81e823f86 100644 --- a/nixpkgs/nixos/modules/security/pam_usb.nix +++ b/nixpkgs/nixos/modules/security/pam_usb.nix @@ -32,8 +32,18 @@ in # Make sure pmount and pumount are setuid wrapped. security.wrappers = { - pmount.source = "${pkgs.pmount.out}/bin/pmount"; - pumount.source = "${pkgs.pmount.out}/bin/pumount"; + pmount = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.pmount.out}/bin/pmount"; + }; + pumount = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.pmount.out}/bin/pumount"; + }; }; environment.systemPackages = [ pkgs.pmount ]; diff --git a/nixpkgs/nixos/modules/security/polkit.nix b/nixpkgs/nixos/modules/security/polkit.nix index f556cca23cdc..d9c58152f1fa 100644 --- a/nixpkgs/nixos/modules/security/polkit.nix +++ b/nixpkgs/nixos/modules/security/polkit.nix @@ -83,8 +83,18 @@ in security.pam.services.polkit-1 = {}; security.wrappers = { - pkexec.source = "${pkgs.polkit.bin}/bin/pkexec"; - polkit-agent-helper-1.source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1"; + pkexec = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.polkit.bin}/bin/pkexec"; + }; + polkit-agent-helper-1 = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1"; + }; }; systemd.tmpfiles.rules = [ diff --git a/nixpkgs/nixos/modules/security/rtkit.nix b/nixpkgs/nixos/modules/security/rtkit.nix index a7b27cbcf215..ad8746808e85 100644 --- a/nixpkgs/nixos/modules/security/rtkit.nix +++ b/nixpkgs/nixos/modules/security/rtkit.nix @@ -35,9 +35,12 @@ with lib; services.dbus.packages = [ pkgs.rtkit ]; users.users.rtkit = - { uid = config.ids.uids.rtkit; + { + isSystemUser = true; + group = "rtkit"; description = "RealtimeKit daemon"; }; + users.groups.rtkit = {}; }; diff --git a/nixpkgs/nixos/modules/security/tpm2.nix b/nixpkgs/nixos/modules/security/tpm2.nix index 27f9b58c9755..d37425166f88 100644 --- a/nixpkgs/nixos/modules/security/tpm2.nix +++ b/nixpkgs/nixos/modules/security/tpm2.nix @@ -146,6 +146,7 @@ in { # Create the tss user and group only if the default value is used users.users.${cfg.tssUser} = lib.mkIf (cfg.tssUser == "tss") { isSystemUser = true; + group = "tss"; }; users.groups.${cfg.tssGroup} = lib.mkIf (cfg.tssGroup == "tss") {}; @@ -172,7 +173,7 @@ in { BusName = "com.intel.tss2.Tabrmd"; ExecStart = "${cfg.abrmd.package}/bin/tpm2-abrmd"; User = "tss"; - Group = "nogroup"; + Group = "tss"; }; }; diff --git a/nixpkgs/nixos/modules/security/wrappers/default.nix b/nixpkgs/nixos/modules/security/wrappers/default.nix index 1e65f4515155..2697ab0bde8f 100644 --- a/nixpkgs/nixos/modules/security/wrappers/default.nix +++ b/nixpkgs/nixos/modules/security/wrappers/default.nix @@ -5,85 +5,140 @@ let parentWrapperDir = dirOf wrapperDir; - programs = - (lib.mapAttrsToList - (n: v: (if v ? program then v else v // {program=n;})) - wrappers); - securityWrapper = pkgs.callPackage ./wrapper.nix { inherit parentWrapperDir; }; + fileModeType = + let + # taken from the chmod(1) man page + symbolic = "[ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+"; + numeric = "[-+=]?[0-7]{0,4}"; + mode = "((${symbolic})(,${symbolic})*)|(${numeric})"; + in + lib.types.strMatching mode + // { description = "file mode string"; }; + + wrapperType = lib.types.submodule ({ name, config, ... }: { + options.source = lib.mkOption + { type = lib.types.path; + description = "The absolute path to the program to be wrapped."; + }; + options.program = lib.mkOption + { type = with lib.types; nullOr str; + default = name; + description = '' + The name of the wrapper program. Defaults to the attribute name. + ''; + }; + options.owner = lib.mkOption + { type = lib.types.str; + description = "The owner of the wrapper program."; + }; + options.group = lib.mkOption + { type = lib.types.str; + description = "The group of the wrapper program."; + }; + options.permissions = lib.mkOption + { type = fileModeType; + default = "u+rx,g+x,o+x"; + example = "a+rx"; + description = '' + The permissions of the wrapper program. The format is that of a + symbolic or numeric file mode understood by <command>chmod</command>. + ''; + }; + options.capabilities = lib.mkOption + { type = lib.types.commas; + default = ""; + description = '' + A comma-separated list of capabilities to be given to the wrapper + program. For capabilities supported by the system check the + <citerefentry> + <refentrytitle>capabilities</refentrytitle> + <manvolnum>7</manvolnum> + </citerefentry> + manual page. + + <note><para> + <literal>cap_setpcap</literal>, which is required for the wrapper + program to be able to raise caps into the Ambient set is NOT raised + to the Ambient set so that the real program cannot modify its own + capabilities!! This may be too restrictive for cases in which the + real program needs cap_setpcap but it at least leans on the side + security paranoid vs. too relaxed. + </para></note> + ''; + }; + options.setuid = lib.mkOption + { type = lib.types.bool; + default = false; + description = "Whether to add the setuid bit the wrapper program."; + }; + options.setgid = lib.mkOption + { type = lib.types.bool; + default = false; + description = "Whether to add the setgid bit the wrapper program."; + }; + }); + ###### Activation script for the setcap wrappers mkSetcapProgram = { program , capabilities , source - , owner ? "nobody" - , group ? "nogroup" - , permissions ? "u+rx,g+x,o+x" + , owner + , group + , permissions , ... }: assert (lib.versionAtLeast (lib.getVersion config.boot.kernelPackages.kernel) "4.3"); '' - cp ${securityWrapper}/bin/security-wrapper $wrapperDir/${program} - echo -n "${source}" > $wrapperDir/${program}.real + cp ${securityWrapper}/bin/security-wrapper "$wrapperDir/${program}" + echo -n "${source}" > "$wrapperDir/${program}.real" # Prevent races - chmod 0000 $wrapperDir/${program} - chown ${owner}.${group} $wrapperDir/${program} + chmod 0000 "$wrapperDir/${program}" + chown ${owner}.${group} "$wrapperDir/${program}" # Set desired capabilities on the file plus cap_setpcap so # the wrapper program can elevate the capabilities set on # its file into the Ambient set. - ${pkgs.libcap.out}/bin/setcap "cap_setpcap,${capabilities}" $wrapperDir/${program} + ${pkgs.libcap.out}/bin/setcap "cap_setpcap,${capabilities}" "$wrapperDir/${program}" # Set the executable bit - chmod ${permissions} $wrapperDir/${program} + chmod ${permissions} "$wrapperDir/${program}" ''; ###### Activation script for the setuid wrappers mkSetuidProgram = { program , source - , owner ? "nobody" - , group ? "nogroup" - , setuid ? false - , setgid ? false - , permissions ? "u+rx,g+x,o+x" + , owner + , group + , setuid + , setgid + , permissions , ... }: '' - cp ${securityWrapper}/bin/security-wrapper $wrapperDir/${program} - echo -n "${source}" > $wrapperDir/${program}.real + cp ${securityWrapper}/bin/security-wrapper "$wrapperDir/${program}" + echo -n "${source}" > "$wrapperDir/${program}.real" # Prevent races - chmod 0000 $wrapperDir/${program} - chown ${owner}.${group} $wrapperDir/${program} + chmod 0000 "$wrapperDir/${program}" + chown ${owner}.${group} "$wrapperDir/${program}" - chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" $wrapperDir/${program} + chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" "$wrapperDir/${program}" ''; mkWrappedPrograms = builtins.map - (s: if (s ? capabilities) - then mkSetcapProgram - ({ owner = "root"; - group = "root"; - } // s) - else if - (s ? setuid && s.setuid) || - (s ? setgid && s.setgid) || - (s ? permissions) - then mkSetuidProgram s - else mkSetuidProgram - ({ owner = "root"; - group = "root"; - setuid = true; - setgid = false; - permissions = "u+rx,g+x,o+x"; - } // s) - ) programs; + (opts: + if opts.capabilities != "" + then mkSetcapProgram opts + else mkSetuidProgram opts + ) (lib.attrValues wrappers); in { imports = [ @@ -95,45 +150,42 @@ in options = { security.wrappers = lib.mkOption { - type = lib.types.attrs; + type = lib.types.attrsOf wrapperType; default = {}; example = lib.literalExample '' - { sendmail.source = "/nix/store/.../bin/sendmail"; - ping = { - source = "${pkgs.iputils.out}/bin/ping"; - owner = "nobody"; - group = "nogroup"; - capabilities = "cap_net_raw+ep"; - }; + { + # a setuid root program + doas = + { setuid = true; + owner = "root"; + group = "root"; + source = "''${pkgs.doas}/bin/doas"; + }; + + # a setgid program + locate = + { setgid = true; + owner = "root"; + group = "mlocate"; + source = "''${pkgs.locate}/bin/locate"; + }; + + # a program with the CAP_NET_RAW capability + ping = + { owner = "root"; + group = "root"; + capabilities = "cap_net_raw+ep"; + source = "''${pkgs.iputils.out}/bin/ping"; + }; } ''; description = '' - This option allows the ownership and permissions on the setuid - wrappers for specific programs to be overridden from the - default (setuid root, but not setgid root). - - <note> - <para>The sub-attribute <literal>source</literal> is mandatory, - it must be the absolute path to the program to be wrapped. - </para> - - <para>The sub-attribute <literal>program</literal> is optional and - can give the wrapper program a new name. The default name is the same - as the attribute name itself.</para> - - <para>Additionally, this option can set capabilities on a - wrapper program that propagates those capabilities down to the - wrapped, real program.</para> - - <para>NOTE: cap_setpcap, which is required for the wrapper - program to be able to raise caps into the Ambient set is NOT - raised to the Ambient set so that the real program cannot - modify its own capabilities!! This may be too restrictive for - cases in which the real program needs cap_setpcap but it at - least leans on the side security paranoid vs. too - relaxed.</para> - </note> + This option effectively allows adding setuid/setgid bits, capabilities, + changing file ownership and permissions of a program without directly + modifying it. This works by creating a wrapper program under the + <option>security.wrapperDir</option> directory, which is then added to + the shell <literal>PATH</literal>. ''; }; @@ -151,13 +203,31 @@ in ###### implementation config = { - security.wrappers = { - # These are mount related wrappers that require the +s permission. - fusermount.source = "${pkgs.fuse}/bin/fusermount"; - fusermount3.source = "${pkgs.fuse3}/bin/fusermount3"; - mount.source = "${lib.getBin pkgs.util-linux}/bin/mount"; - umount.source = "${lib.getBin pkgs.util-linux}/bin/umount"; - }; + assertions = lib.mapAttrsToList + (name: opts: + { assertion = opts.setuid || opts.setgid -> opts.capabilities == ""; + message = '' + The security.wrappers.${name} wrapper is not valid: + setuid/setgid and capabilities are mutually exclusive. + ''; + } + ) wrappers; + + security.wrappers = + let + mkSetuidRoot = source: + { setuid = true; + owner = "root"; + group = "root"; + inherit source; + }; + in + { # These are mount related wrappers that require the +s permission. + fusermount = mkSetuidRoot "${pkgs.fuse}/bin/fusermount"; + fusermount3 = mkSetuidRoot "${pkgs.fuse3}/bin/fusermount3"; + mount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/mount"; + umount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/umount"; + }; boot.specialFileSystems.${parentWrapperDir} = { fsType = "tmpfs"; @@ -179,19 +249,15 @@ in ]}" ''; - ###### setcap activation script + ###### wrappers activation script system.activationScripts.wrappers = lib.stringAfter [ "specialfs" "users" ] '' - # Look in the system path and in the default profile for - # programs to be wrapped. - WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin - chmod 755 "${parentWrapperDir}" # We want to place the tmpdirs for the wrappers to the parent dir. wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX) - chmod a+rx $wrapperDir + chmod a+rx "$wrapperDir" ${lib.concatStringsSep "\n" mkWrappedPrograms} @@ -199,16 +265,44 @@ in # Atomically replace the symlink # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/ old=$(readlink -f ${wrapperDir}) - if [ -e ${wrapperDir}-tmp ]; then - rm --force --recursive ${wrapperDir}-tmp + if [ -e "${wrapperDir}-tmp" ]; then + rm --force --recursive "${wrapperDir}-tmp" fi - ln --symbolic --force --no-dereference $wrapperDir ${wrapperDir}-tmp - mv --no-target-directory ${wrapperDir}-tmp ${wrapperDir} - rm --force --recursive $old + ln --symbolic --force --no-dereference "$wrapperDir" "${wrapperDir}-tmp" + mv --no-target-directory "${wrapperDir}-tmp" "${wrapperDir}" + rm --force --recursive "$old" else # For initial setup - ln --symbolic $wrapperDir ${wrapperDir} + ln --symbolic "$wrapperDir" "${wrapperDir}" fi ''; + + ###### wrappers consistency checks + system.extraDependencies = lib.singleton (pkgs.runCommandLocal + "ensure-all-wrappers-paths-exist" { } + '' + # make sure we produce output + mkdir -p $out + + echo -n "Checking that Nix store paths of all wrapped programs exist... " + + declare -A wrappers + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: + "wrappers['${n}']='${v.source}'") wrappers)} + + for name in "''${!wrappers[@]}"; do + path="''${wrappers[$name]}" + if [[ "$path" =~ /nix/store ]] && [ ! -e "$path" ]; then + test -t 1 && echo -ne '\033[1;31m' + echo "FAIL" + echo "The path $path does not exist!" + echo 'Please, check the value of `security.wrappers."'$name'".source`.' + test -t 1 && echo -ne '\033[0m' + exit 1 + fi + done + + echo "OK" + ''); }; } diff --git a/nixpkgs/nixos/modules/services/backup/automysqlbackup.nix b/nixpkgs/nixos/modules/services/backup/automysqlbackup.nix index e3a8d1f79934..4fcaf9eb9301 100644 --- a/nixpkgs/nixos/modules/services/backup/automysqlbackup.nix +++ b/nixpkgs/nixos/modules/services/backup/automysqlbackup.nix @@ -73,6 +73,7 @@ in services.automysqlbackup.config = mapAttrs (name: mkDefault) { mysql_dump_username = user; mysql_dump_host = "localhost"; + mysql_dump_socket = "/run/mysqld/mysqld.sock"; backup_dir = "/var/backup/mysql"; db_exclude = [ "information_schema" "performance_schema" ]; mailcontent = "stdout"; diff --git a/nixpkgs/nixos/modules/services/backup/borgbackup.nix b/nixpkgs/nixos/modules/services/backup/borgbackup.nix index ccbc7726392d..c4174286fc0b 100644 --- a/nixpkgs/nixos/modules/services/backup/borgbackup.nix +++ b/nixpkgs/nixos/modules/services/backup/borgbackup.nix @@ -169,6 +169,7 @@ let (map (mkAuthorizedKey cfg false) cfg.authorizedKeys ++ map (mkAuthorizedKey cfg true) cfg.authorizedKeysAppendOnly); useDefaultShell = true; + group = cfg.group; isSystemUser = true; }; groups.${cfg.group} = { }; diff --git a/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix b/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix index 33d217ba60ed..08b214181806 100644 --- a/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix +++ b/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix @@ -5,28 +5,33 @@ with lib; let cfg = config.services.kubernetes; - defaultContainerdConfigFile = pkgs.writeText "containerd.toml" '' - version = 2 - root = "/var/lib/containerd" - state = "/run/containerd" - oom_score = 0 - - [grpc] - address = "/run/containerd/containerd.sock" + defaultContainerdSettings = { + version = 2; + root = "/var/lib/containerd"; + state = "/run/containerd"; + oom_score = 0; + + grpc = { + address = "/run/containerd/containerd.sock"; + }; - [plugins."io.containerd.grpc.v1.cri"] - sandbox_image = "pause:latest" + plugins."io.containerd.grpc.v1.cri" = { + sandbox_image = "pause:latest"; - [plugins."io.containerd.grpc.v1.cri".cni] - bin_dir = "/opt/cni/bin" - max_conf_num = 0 + cni = { + bin_dir = "/opt/cni/bin"; + max_conf_num = 0; + }; - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" + containerd.runtimes.runc = { + runtime_type = "io.containerd.runc.v2"; + }; - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes."io.containerd.runc.v2".options] - SystemdCgroup = true - ''; + containerd.runtimes."io.containerd.runc.v2".options = { + SystemdCgroup = true; + }; + }; + }; mkKubeConfig = name: conf: pkgs.writeText "${name}-kubeconfig" (builtins.toJSON { apiVersion = "v1"; @@ -248,7 +253,7 @@ in { (mkIf cfg.kubelet.enable { virtualisation.containerd = { enable = mkDefault true; - configFile = mkDefault defaultContainerdConfigFile; + settings = mapAttrsRecursive (name: mkDefault) defaultContainerdSettings; }; }) diff --git a/nixpkgs/nixos/modules/services/cluster/spark/default.nix b/nixpkgs/nixos/modules/services/cluster/spark/default.nix new file mode 100644 index 000000000000..bbfe0489f115 --- /dev/null +++ b/nixpkgs/nixos/modules/services/cluster/spark/default.nix @@ -0,0 +1,162 @@ +{config, pkgs, lib, ...}: +let + cfg = config.services.spark; +in +with lib; +{ + options = { + services.spark = { + master = { + enable = mkEnableOption "Spark master service"; + bind = mkOption { + type = types.str; + description = "Address the spark master binds to."; + default = "127.0.0.1"; + example = "0.0.0.0"; + }; + restartIfChanged = mkOption { + type = types.bool; + description = '' + Automatically restart master service on config change. + This can be set to false to defer restarts on clusters running critical applications. + Please consider the security implications of inadvertently running an older version, + and the possibility of unexpected behavior caused by inconsistent versions across a cluster when disabling this option. + ''; + default = true; + }; + extraEnvironment = mkOption { + type = types.attrsOf types.str; + description = "Extra environment variables to pass to spark master. See spark-standalone documentation."; + default = {}; + example = { + SPARK_MASTER_WEBUI_PORT = 8181; + SPARK_MASTER_OPTS = "-Dspark.deploy.defaultCores=5"; + }; + }; + }; + worker = { + enable = mkEnableOption "Spark worker service"; + workDir = mkOption { + type = types.path; + description = "Spark worker work dir."; + default = "/var/lib/spark"; + }; + master = mkOption { + type = types.str; + description = "Address of the spark master."; + default = "127.0.0.1:7077"; + }; + restartIfChanged = mkOption { + type = types.bool; + description = '' + Automatically restart worker service on config change. + This can be set to false to defer restarts on clusters running critical applications. + Please consider the security implications of inadvertently running an older version, + and the possibility of unexpected behavior caused by inconsistent versions across a cluster when disabling this option. + ''; + default = true; + }; + extraEnvironment = mkOption { + type = types.attrsOf types.str; + description = "Extra environment variables to pass to spark worker."; + default = {}; + example = { + SPARK_WORKER_CORES = 5; + SPARK_WORKER_MEMORY = "2g"; + }; + }; + }; + confDir = mkOption { + type = types.path; + description = "Spark configuration directory. Spark will use the configuration files (spark-defaults.conf, spark-env.sh, log4j.properties, etc) from this directory."; + default = "${cfg.package}/lib/${cfg.package.untarDir}/conf"; + defaultText = literalExample "\${cfg.package}/lib/\${cfg.package.untarDir}/conf"; + }; + logDir = mkOption { + type = types.path; + description = "Spark log directory."; + default = "/var/log/spark"; + }; + package = mkOption { + type = types.package; + description = "Spark package."; + default = pkgs.spark; + defaultText = "pkgs.spark"; + example = literalExample ''pkgs.spark.overrideAttrs (super: rec { + pname = "spark"; + version = "2.4.4"; + + src = pkgs.fetchzip { + url = "mirror://apache/spark/"''${pname}-''${version}/''${pname}-''${version}-bin-without-hadoop.tgz"; + sha256 = "1a9w5k0207fysgpxx6db3a00fs5hdc2ncx99x4ccy2s0v5ndc66g"; + }; + })''; + }; + }; + }; + config = lib.mkIf (cfg.worker.enable || cfg.master.enable) { + environment.systemPackages = [ cfg.package ]; + systemd = { + services = { + spark-master = lib.mkIf cfg.master.enable { + path = with pkgs; [ procps openssh nettools ]; + description = "spark master service."; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + restartIfChanged = cfg.master.restartIfChanged; + environment = cfg.master.extraEnvironment // { + SPARK_MASTER_HOST = cfg.master.bind; + SPARK_CONF_DIR = cfg.confDir; + SPARK_LOG_DIR = cfg.logDir; + }; + serviceConfig = { + Type = "forking"; + User = "spark"; + Group = "spark"; + WorkingDirectory = "${cfg.package}/lib/${cfg.package.untarDir}"; + ExecStart = "${cfg.package}/lib/${cfg.package.untarDir}/sbin/start-master.sh"; + ExecStop = "${cfg.package}/lib/${cfg.package.untarDir}/sbin/stop-master.sh"; + TimeoutSec = 300; + StartLimitBurst=10; + Restart = "always"; + }; + }; + spark-worker = lib.mkIf cfg.worker.enable { + path = with pkgs; [ procps openssh nettools rsync ]; + description = "spark master service."; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + restartIfChanged = cfg.worker.restartIfChanged; + environment = cfg.worker.extraEnvironment // { + SPARK_MASTER = cfg.worker.master; + SPARK_CONF_DIR = cfg.confDir; + SPARK_LOG_DIR = cfg.logDir; + SPARK_WORKER_DIR = cfg.worker.workDir; + }; + serviceConfig = { + Type = "forking"; + User = "spark"; + WorkingDirectory = "${cfg.package}/lib/${cfg.package.untarDir}"; + ExecStart = "${cfg.package}/lib/${cfg.package.untarDir}/sbin/start-worker.sh spark://${cfg.worker.master}"; + ExecStop = "${cfg.package}/lib/${cfg.package.untarDir}/sbin/stop-worker.sh"; + TimeoutSec = 300; + StartLimitBurst=10; + Restart = "always"; + }; + }; + }; + tmpfiles.rules = [ + "d '${cfg.worker.workDir}' - spark spark - -" + "d '${cfg.logDir}' - spark spark - -" + ]; + }; + users = { + users.spark = { + description = "spark user."; + group = "spark"; + isSystemUser = true; + }; + groups.spark = { }; + }; + }; +} diff --git a/nixpkgs/nixos/modules/services/databases/influxdb.nix b/nixpkgs/nixos/modules/services/databases/influxdb.nix index dd5d69b1147a..3b8c00929ba9 100644 --- a/nixpkgs/nixos/modules/services/databases/influxdb.nix +++ b/nixpkgs/nixos/modules/services/databases/influxdb.nix @@ -185,6 +185,7 @@ in users.users = optionalAttrs (cfg.user == "influxdb") { influxdb = { uid = config.ids.uids.influxdb; + group = "influxdb"; description = "Influxdb daemon user"; }; }; diff --git a/nixpkgs/nixos/modules/services/databases/memcached.nix b/nixpkgs/nixos/modules/services/databases/memcached.nix index ca7b20eb049a..1c06937e2f30 100644 --- a/nixpkgs/nixos/modules/services/databases/memcached.nix +++ b/nixpkgs/nixos/modules/services/databases/memcached.nix @@ -67,7 +67,9 @@ in users.users = optionalAttrs (cfg.user == "memcached") { memcached.description = "Memcached server user"; memcached.isSystemUser = true; + memcached.group = "memcached"; }; + users.groups = optionalAttrs (cfg.user == "memcached") { memcached = {}; }; environment.systemPackages = [ memcached ]; diff --git a/nixpkgs/nixos/modules/services/databases/mongodb.nix b/nixpkgs/nixos/modules/services/databases/mongodb.nix index db1e5fedf50d..5121e0415db1 100644 --- a/nixpkgs/nixos/modules/services/databases/mongodb.nix +++ b/nixpkgs/nixos/modules/services/databases/mongodb.nix @@ -123,9 +123,11 @@ in users.users.mongodb = mkIf (cfg.user == "mongodb") { name = "mongodb"; - uid = config.ids.uids.mongodb; + isSystemUser = true; + group = "mongodb"; description = "MongoDB server user"; }; + users.groups.mongodb = mkIf (cfg.user == "mongodb") {}; environment.systemPackages = [ mongodb ]; diff --git a/nixpkgs/nixos/modules/services/databases/neo4j.nix b/nixpkgs/nixos/modules/services/databases/neo4j.nix index 53760bb24c4a..2a30923538db 100644 --- a/nixpkgs/nixos/modules/services/databases/neo4j.nix +++ b/nixpkgs/nixos/modules/services/databases/neo4j.nix @@ -651,10 +651,12 @@ in { environment.systemPackages = [ cfg.package ]; users.users.neo4j = { - uid = config.ids.uids.neo4j; + isSystemUser = true; + group = "neo4j"; description = "Neo4j daemon user"; home = cfg.directories.home; }; + users.groups.neo4j = {}; }; meta = { diff --git a/nixpkgs/nixos/modules/services/databases/redis.nix b/nixpkgs/nixos/modules/services/databases/redis.nix index 8873f6d00e0b..1b9358c81a12 100644 --- a/nixpkgs/nixos/modules/services/databases/redis.nix +++ b/nixpkgs/nixos/modules/services/databases/redis.nix @@ -246,6 +246,7 @@ in { users.users.redis = { description = "Redis database user"; + group = "redis"; isSystemUser = true; }; users.groups.redis = {}; diff --git a/nixpkgs/nixos/modules/services/desktops/cpupower-gui.nix b/nixpkgs/nixos/modules/services/desktops/cpupower-gui.nix new file mode 100644 index 000000000000..f66afc0a3dc1 --- /dev/null +++ b/nixpkgs/nixos/modules/services/desktops/cpupower-gui.nix @@ -0,0 +1,56 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.cpupower-gui; +in { + options = { + services.cpupower-gui = { + enable = mkOption { + type = lib.types.bool; + default = false; + example = true; + description = '' + Enables dbus/systemd service needed by cpupower-gui. + These services are responsible for retrieving and modifying cpu power + saving settings. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.cpupower-gui ]; + services.dbus.packages = [ pkgs.cpupower-gui ]; + systemd.user = { + services.cpupower-gui-user = { + description = "Apply cpupower-gui config at user login"; + wantedBy = [ "graphical-session.target" ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.cpupower-gui}/bin/cpupower-gui config"; + }; + }; + }; + systemd.services = { + cpupower-gui = { + description = "Apply cpupower-gui config at boot"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.cpupower-gui}/bin/cpupower-gui config"; + }; + }; + cpupower-gui-helper = { + description = "cpupower-gui system helper"; + aliases = [ "dbus-org.rnd2.cpupower_gui.helper.service" ]; + serviceConfig = { + Type = "dbus"; + BusName = "org.rnd2.cpupower_gui.helper"; + ExecStart = "${pkgs.cpupower-gui}/lib/cpupower-gui/cpupower-gui-helper"; + }; + }; + }; + }; +} diff --git a/nixpkgs/nixos/modules/services/desktops/gnome/gnome-keyring.nix b/nixpkgs/nixos/modules/services/desktops/gnome/gnome-keyring.nix index cda44bab8bfa..d821da164beb 100644 --- a/nixpkgs/nixos/modules/services/desktops/gnome/gnome-keyring.nix +++ b/nixpkgs/nixos/modules/services/desktops/gnome/gnome-keyring.nix @@ -52,8 +52,10 @@ with lib; security.pam.services.login.enableGnomeKeyring = true; security.wrappers.gnome-keyring-daemon = { - source = "${pkgs.gnome.gnome-keyring}/bin/gnome-keyring-daemon"; + owner = "root"; + group = "root"; capabilities = "cap_ipc_lock=ep"; + source = "${pkgs.gnome.gnome-keyring}/bin/gnome-keyring-daemon"; }; }; diff --git a/nixpkgs/nixos/modules/services/desktops/gsignond.nix b/nixpkgs/nixos/modules/services/desktops/gsignond.nix index 5ab9add9f32d..465acd73fa64 100644 --- a/nixpkgs/nixos/modules/services/desktops/gsignond.nix +++ b/nixpkgs/nixos/modules/services/desktops/gsignond.nix @@ -9,7 +9,7 @@ let in { - meta.maintainers = pkgs.pantheon.maintainers; + meta.maintainers = teams.pantheon.members; ###### interface diff --git a/nixpkgs/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json b/nixpkgs/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json index 46697ece4483..e5e7517e38d4 100644 --- a/nixpkgs/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json +++ b/nixpkgs/nixos/modules/services/desktops/pipewire/bluez-hardware.conf.json @@ -34,6 +34,13 @@ ] }, { + "name": "D50s", + "address": "~^00:13:ef:", + "no-features": [ + "hw-volume" + ] + }, + { "name": "JBL Endurance RUN BT", "no-features": [ "msbc-alt1", @@ -45,6 +52,18 @@ "name": "JBL LIVE650BTNC" }, { + "name": "Motorola DC800", + "no-features": [ + "sbc-xq" + ] + }, + { + "name": "Motorola S305", + "no-features": [ + "sbc-xq" + ] + }, + { "name": "Soundcore Life P2-L", "no-features": [ "msbc-alt1", @@ -191,47 +210,35 @@ }, { "sysname": "Linux", - "release": "~^5\\.(8|9|10)\\.", + "release": "~^5\\.(8|9)\\.", "no-features": [ "msbc-alt1" ] }, { "sysname": "Linux", - "release": "~^5\\.10\\.(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50)($|[^0-9])" - }, - { - "sysname": "Linux", - "release": "~^5\\.10\\.", + "release": "~^5\\.10\\.(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|51|52|53|54|55|56|57|58|59|60|61)($|[^0-9])", "no-features": [ "msbc-alt1" ] }, { "sysname": "Linux", - "release": "~^5\\.12\\.(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17)($|[^0-9])" - }, - { - "sysname": "Linux", - "release": "~^5\\.12\\.", + "release": "~^5\\.12\\.(18|19)($|[^0-9])", "no-features": [ "msbc-alt1" ] }, { "sysname": "Linux", - "release": "~^5\\.13\\.(1|2)($|[^0-9])" - }, - { - "sysname": "Linux", - "release": "~^5\\.13\\.", + "release": "~^5\\.13\\.(3|4|5|6|7|8|9|10|11|12|13)($|[^0-9])", "no-features": [ "msbc-alt1" ] }, { "sysname": "Linux", - "release": "~^5\\.14\\.", + "release": "~^5\\.14($|[^0-9])", "no-features": [ "msbc-alt1" ] diff --git a/nixpkgs/nixos/modules/services/display-managers/greetd.nix b/nixpkgs/nixos/modules/services/display-managers/greetd.nix index c3072bf09964..d4f5dc267d09 100644 --- a/nixpkgs/nixos/modules/services/display-managers/greetd.nix +++ b/nixpkgs/nixos/modules/services/display-managers/greetd.nix @@ -99,7 +99,12 @@ in systemd.defaultUnit = "graphical.target"; - users.users.greeter.isSystemUser = true; + users.users.greeter = { + isSystemUser = true; + group = "greeter"; + }; + + users.groups.greeter = {}; }; meta.maintainers = with maintainers; [ queezle ]; diff --git a/nixpkgs/nixos/modules/services/games/minecraft-server.nix b/nixpkgs/nixos/modules/services/games/minecraft-server.nix index eb9288fca586..458e57fef846 100644 --- a/nixpkgs/nixos/modules/services/games/minecraft-server.nix +++ b/nixpkgs/nixos/modules/services/games/minecraft-server.nix @@ -167,8 +167,10 @@ in { description = "Minecraft server service user"; home = cfg.dataDir; createHome = true; - uid = config.ids.uids.minecraft; + isSystemUser = true; + group = "minecraft"; }; + users.groups.minecraft = {}; systemd.services.minecraft-server = { description = "Minecraft Server Service"; diff --git a/nixpkgs/nixos/modules/services/hardware/tcsd.nix b/nixpkgs/nixos/modules/services/hardware/tcsd.nix index 0d36bce357ba..c549a6775013 100644 --- a/nixpkgs/nixos/modules/services/hardware/tcsd.nix +++ b/nixpkgs/nixos/modules/services/hardware/tcsd.nix @@ -149,12 +149,10 @@ in users.users = optionalAttrs (cfg.user == "tss") { tss = { group = "tss"; - uid = config.ids.uids.tss; + isSystemUser = true; }; }; - users.groups = optionalAttrs (cfg.group == "tss") { - tss.gid = config.ids.gids.tss; - }; + users.groups = optionalAttrs (cfg.group == "tss") { tss = {}; }; }; } diff --git a/nixpkgs/nixos/modules/services/logging/graylog.nix b/nixpkgs/nixos/modules/services/logging/graylog.nix index af70d27fcf99..5e20a10f2490 100644 --- a/nixpkgs/nixos/modules/services/logging/graylog.nix +++ b/nixpkgs/nixos/modules/services/logging/graylog.nix @@ -128,10 +128,12 @@ in users.users = mkIf (cfg.user == "graylog") { graylog = { - uid = config.ids.uids.graylog; + isSystemUser = true; + group = "graylog"; description = "Graylog server daemon user"; }; }; + users.groups = mkIf (cfg.user == "graylog") {}; systemd.tmpfiles.rules = [ "d '${cfg.messageJournalDir}' - ${cfg.user} - - -" diff --git a/nixpkgs/nixos/modules/services/logging/logcheck.nix b/nixpkgs/nixos/modules/services/logging/logcheck.nix index 4296b2270c29..348ed8adf903 100644 --- a/nixpkgs/nixos/modules/services/logging/logcheck.nix +++ b/nixpkgs/nixos/modules/services/logging/logcheck.nix @@ -215,12 +215,16 @@ in users.users = optionalAttrs (cfg.user == "logcheck") { logcheck = { - uid = config.ids.uids.logcheck; + group = "logcheck"; + isSystemUser = true; shell = "/bin/sh"; description = "Logcheck user account"; extraGroups = cfg.extraGroups; }; }; + users.groups = optionalAttrs (cfg.user == "logcheck") { + logcheck = {}; + }; system.activationScripts.logcheck = '' mkdir -m 700 -p /var/{lib,lock}/logcheck diff --git a/nixpkgs/nixos/modules/services/mail/exim.nix b/nixpkgs/nixos/modules/services/mail/exim.nix index 8927d84b478c..25b533578c94 100644 --- a/nixpkgs/nixos/modules/services/mail/exim.nix +++ b/nixpkgs/nixos/modules/services/mail/exim.nix @@ -104,7 +104,12 @@ in gid = config.ids.gids.exim; }; - security.wrappers.exim.source = "${cfg.package}/bin/exim"; + security.wrappers.exim = + { setuid = true; + owner = "root"; + group = "root"; + source = "${cfg.package}/bin/exim"; + }; systemd.services.exim = { description = "Exim Mail Daemon"; diff --git a/nixpkgs/nixos/modules/services/mail/mail.nix b/nixpkgs/nixos/modules/services/mail/mail.nix index fed313e4738e..fcc7ff6db91b 100644 --- a/nixpkgs/nixos/modules/services/mail/mail.nix +++ b/nixpkgs/nixos/modules/services/mail/mail.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, options, lib, ... }: with lib; @@ -11,6 +11,7 @@ with lib; services.mail = { sendmailSetuidWrapper = mkOption { + type = types.nullOr options.security.wrappers.type.nestedTypes.elemType; default = null; internal = true; description = '' diff --git a/nixpkgs/nixos/modules/services/mail/opensmtpd.nix b/nixpkgs/nixos/modules/services/mail/opensmtpd.nix index c838d3b949db..ef7d53e7d927 100644 --- a/nixpkgs/nixos/modules/services/mail/opensmtpd.nix +++ b/nixpkgs/nixos/modules/services/mail/opensmtpd.nix @@ -103,12 +103,15 @@ in { }; security.wrappers.smtpctl = { + owner = "nobody"; group = "smtpq"; + setuid = false; setgid = true; source = "${cfg.package}/bin/smtpctl"; }; - services.mail.sendmailSetuidWrapper = mkIf cfg.setSendmail security.wrappers.smtpctl; + services.mail.sendmailSetuidWrapper = mkIf cfg.setSendmail + (security.wrappers.smtpctl // { program = "sendmail"; }); systemd.tmpfiles.rules = [ "d /var/spool/smtpd 711 root - - -" diff --git a/nixpkgs/nixos/modules/services/mail/postfix.nix b/nixpkgs/nixos/modules/services/mail/postfix.nix index 9b0a5bba2feb..2b8edb9c51f8 100644 --- a/nixpkgs/nixos/modules/services/mail/postfix.nix +++ b/nixpkgs/nixos/modules/services/mail/postfix.nix @@ -673,6 +673,7 @@ in services.mail.sendmailSetuidWrapper = mkIf config.services.postfix.setSendmail { program = "sendmail"; source = "${pkgs.postfix}/bin/sendmail"; + owner = "nobody"; group = setgidGroup; setuid = false; setgid = true; @@ -681,6 +682,7 @@ in security.wrappers.mailq = { program = "mailq"; source = "${pkgs.postfix}/bin/mailq"; + owner = "nobody"; group = setgidGroup; setuid = false; setgid = true; @@ -689,6 +691,7 @@ in security.wrappers.postqueue = { program = "postqueue"; source = "${pkgs.postfix}/bin/postqueue"; + owner = "nobody"; group = setgidGroup; setuid = false; setgid = true; @@ -697,6 +700,7 @@ in security.wrappers.postdrop = { program = "postdrop"; source = "${pkgs.postfix}/bin/postdrop"; + owner = "nobody"; group = setgidGroup; setuid = false; setgid = true; diff --git a/nixpkgs/nixos/modules/services/misc/airsonic.nix b/nixpkgs/nixos/modules/services/misc/airsonic.nix index 490f6c5a5c06..c1ce515750b0 100644 --- a/nixpkgs/nixos/modules/services/misc/airsonic.nix +++ b/nixpkgs/nixos/modules/services/misc/airsonic.nix @@ -165,10 +165,12 @@ in { users.users.airsonic = { description = "Airsonic service user"; + group = "airsonic"; name = cfg.user; home = cfg.home; createHome = true; isSystemUser = true; }; + users.groups.airsonic = {}; }; } diff --git a/nixpkgs/nixos/modules/services/misc/apache-kafka.nix b/nixpkgs/nixos/modules/services/misc/apache-kafka.nix index 69dfadfe54e0..8bc307311a42 100644 --- a/nixpkgs/nixos/modules/services/misc/apache-kafka.nix +++ b/nixpkgs/nixos/modules/services/misc/apache-kafka.nix @@ -120,10 +120,12 @@ in { environment.systemPackages = [cfg.package]; users.users.apache-kafka = { - uid = config.ids.uids.apache-kafka; + isSystemUser = true; + group = "apache-kafka"; description = "Apache Kafka daemon user"; home = head cfg.logDirs; }; + users.groups.apache-kafka = {}; systemd.tmpfiles.rules = map (logDir: "d '${logDir}' 0700 apache-kafka - - -") cfg.logDirs; diff --git a/nixpkgs/nixos/modules/services/misc/cgminer.nix b/nixpkgs/nixos/modules/services/misc/cgminer.nix index 662570f9451f..5afc1546efa9 100644 --- a/nixpkgs/nixos/modules/services/misc/cgminer.nix +++ b/nixpkgs/nixos/modules/services/misc/cgminer.nix @@ -86,7 +86,7 @@ in config = mkOption { default = {}; - type = (types.either types.bool types.int); + type = types.attrsOf (types.either types.bool types.int); description = "Additional config"; example = { auto-fan = true; @@ -110,10 +110,14 @@ in users.users = optionalAttrs (cfg.user == "cgminer") { cgminer = { - uid = config.ids.uids.cgminer; + isSystemUser = true; + group = "cgminer"; description = "Cgminer user"; }; }; + users.groups = optionalAttrs (cfg.user == "cgminer") { + cgminer = {}; + }; environment.systemPackages = [ cfg.package ]; diff --git a/nixpkgs/nixos/modules/services/misc/docker-registry.nix b/nixpkgs/nixos/modules/services/misc/docker-registry.nix index e212f581c28a..cb68a29c530b 100644 --- a/nixpkgs/nixos/modules/services/misc/docker-registry.nix +++ b/nixpkgs/nixos/modules/services/misc/docker-registry.nix @@ -151,7 +151,9 @@ in { home = cfg.storagePath; } else {}) // { + group = "docker-registry"; isSystemUser = true; }; + users.groups.docker-registry = {}; }; } diff --git a/nixpkgs/nixos/modules/services/misc/etcd.nix b/nixpkgs/nixos/modules/services/misc/etcd.nix index eb266f043ebc..2b667fab6b04 100644 --- a/nixpkgs/nixos/modules/services/misc/etcd.nix +++ b/nixpkgs/nixos/modules/services/misc/etcd.nix @@ -187,9 +187,11 @@ in { environment.systemPackages = [ pkgs.etcd ]; users.users.etcd = { - uid = config.ids.uids.etcd; + isSystemUser = true; + group = "etcd"; description = "Etcd daemon user"; home = cfg.dataDir; }; + users.groups.etcd = {}; }; } diff --git a/nixpkgs/nixos/modules/services/misc/gammu-smsd.nix b/nixpkgs/nixos/modules/services/misc/gammu-smsd.nix index 552725f1384d..d4bb58d81dde 100644 --- a/nixpkgs/nixos/modules/services/misc/gammu-smsd.nix +++ b/nixpkgs/nixos/modules/services/misc/gammu-smsd.nix @@ -202,8 +202,8 @@ in { config = mkIf cfg.enable { users.users.${cfg.user} = { description = "gammu-smsd user"; - uid = config.ids.uids.gammu-smsd; - extraGroups = [ "${cfg.device.group}" ]; + isSystemUser = true; + group = cfg.device.group; }; environment.systemPackages = with cfg.backend; [ gammuPackage ] diff --git a/nixpkgs/nixos/modules/services/misc/gitlab.nix b/nixpkgs/nixos/modules/services/misc/gitlab.nix index 805deeee0c04..c1a1491b3cee 100644 --- a/nixpkgs/nixos/modules/services/misc/gitlab.nix +++ b/nixpkgs/nixos/modules/services/misc/gitlab.nix @@ -821,6 +821,40 @@ in { ''; }; + logrotate = { + enable = mkOption { + type = types.bool; + default = true; + description = '' + Enable rotation of log files. + ''; + }; + + frequency = mkOption { + type = types.str; + default = "daily"; + description = "How often to rotate the logs."; + }; + + keep = mkOption { + type = types.int; + default = 30; + description = "How many rotations to keep."; + }; + + extraConfig = mkOption { + type = types.lines; + default = '' + copytruncate + compress + ''; + description = '' + Extra logrotate config options for this path. Refer to + <link xlink:href="https://linux.die.net/man/8/logrotate"/> for details. + ''; + }; + }; + extraConfig = mkOption { type = types.attrs; default = {}; @@ -932,6 +966,21 @@ in { ensureUsers = singleton { name = cfg.databaseUsername; }; }; + # Enable rotation of log files + services.logrotate = { + enable = cfg.logrotate.enable; + paths = { + gitlab = { + path = "${cfg.statePath}/log/*.log"; + user = cfg.user; + group = cfg.group; + frequency = cfg.logrotate.frequency; + keep = cfg.logrotate.keep; + extraConfig = cfg.logrotate.extraConfig; + }; + }; + }; + # The postgresql module doesn't currently support concepts like # objects owners and extensions; for now we tack on what's needed # here. diff --git a/nixpkgs/nixos/modules/services/misc/gpsd.nix b/nixpkgs/nixos/modules/services/misc/gpsd.nix index fafea10daba7..6494578f7647 100644 --- a/nixpkgs/nixos/modules/services/misc/gpsd.nix +++ b/nixpkgs/nixos/modules/services/misc/gpsd.nix @@ -88,6 +88,7 @@ in users.users.gpsd = { inherit uid; + group = "gpsd"; description = "gpsd daemon user"; home = "/var/empty"; }; diff --git a/nixpkgs/nixos/modules/services/misc/home-assistant.nix b/nixpkgs/nixos/modules/services/misc/home-assistant.nix index 73ec3b9a17a2..800bea4ff571 100644 --- a/nixpkgs/nixos/modules/services/misc/home-assistant.nix +++ b/nixpkgs/nixos/modules/services/misc/home-assistant.nix @@ -310,11 +310,13 @@ in { "serial_pm" "sms" "upb" + "usb" "velbus" "w800rf32" "xbee" "zha" "zwave" + "zwave_js" ]; in { ExecStart = "${package}/bin/hass --runner --config '${cfg.configDir}'"; diff --git a/nixpkgs/nixos/modules/services/misc/mame.nix b/nixpkgs/nixos/modules/services/misc/mame.nix index 4b9a04be7c29..dd6c5ef9aa00 100644 --- a/nixpkgs/nixos/modules/services/misc/mame.nix +++ b/nixpkgs/nixos/modules/services/misc/mame.nix @@ -45,8 +45,10 @@ in environment.systemPackages = [ pkgs.mame ]; security.wrappers."${mame}" = { - source = "${pkgs.mame}/bin/${mame}"; + owner = "root"; + group = "root"; capabilities = "cap_net_admin,cap_net_raw+eip"; + source = "${pkgs.mame}/bin/${mame}"; }; systemd.services.mame = { diff --git a/nixpkgs/nixos/modules/services/misc/nix-ssh-serve.nix b/nixpkgs/nixos/modules/services/misc/nix-ssh-serve.nix index 1764c6d79649..d5c64fdb2647 100644 --- a/nixpkgs/nixos/modules/services/misc/nix-ssh-serve.nix +++ b/nixpkgs/nixos/modules/services/misc/nix-ssh-serve.nix @@ -44,9 +44,11 @@ in { users.users.nix-ssh = { description = "Nix SSH store user"; - uid = config.ids.uids.nix-ssh; + isSystemUser = true; + group = "nix-ssh"; useDefaultShell = true; }; + users.groups.nix-ssh = {}; services.openssh.enable = true; diff --git a/nixpkgs/nixos/modules/services/misc/owncast.nix b/nixpkgs/nixos/modules/services/misc/owncast.nix new file mode 100644 index 000000000000..0852335238fd --- /dev/null +++ b/nixpkgs/nixos/modules/services/misc/owncast.nix @@ -0,0 +1,98 @@ +{ lib, pkgs, config, ... }: +with lib; +let cfg = config.services.owncast; +in { + + options.services.owncast = { + + enable = mkEnableOption "owncast"; + + dataDir = mkOption { + type = types.str; + default = "/var/lib/owncast"; + description = '' + The directory where owncast stores its data files. If left as the default value this directory will automatically be created before the owncast server starts, otherwise the sysadmin is responsible for ensuring the directory exists with appropriate ownership and permissions. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open the appropriate ports in the firewall for owncast. + ''; + }; + + user = mkOption { + type = types.str; + default = "owncast"; + description = "User account under which owncast runs."; + }; + + group = mkOption { + type = types.str; + default = "owncast"; + description = "Group under which owncast runs."; + }; + + listen = mkOption { + type = types.str; + default = "127.0.0.1"; + example = "0.0.0.0"; + description = "The IP address to bind the owncast web server to."; + }; + + port = mkOption { + type = types.port; + default = 8080; + description = '' + TCP port where owncast web-gui listens. + ''; + }; + + rtmp-port = mkOption { + type = types.port; + default = 1935; + description = '' + TCP port where owncast rtmp service listens. + ''; + }; + + }; + + config = mkIf cfg.enable { + + systemd.services.owncast = { + description = "A self-hosted live video and web chat server"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = mkMerge [ + { + User = cfg.user; + Group = cfg.group; + WorkingDirectory = cfg.dataDir; + ExecStart = "${pkgs.owncast}/bin/owncast -webserverport ${toString cfg.port} -rtmpport ${toString cfg.rtmp-port} -webserverip ${cfg.listen}"; + Restart = "on-failure"; + } + (mkIf (cfg.dataDir == "/var/lib/owncast") { + StateDirectory = "owncast"; + }) + ]; + }; + + users.users = mkIf (cfg.user == "owncast") { + owncast = { + isSystemUser = true; + group = cfg.group; + description = "owncast system user"; + }; + }; + + users.groups = mkIf (cfg.group == "owncast") { owncast = { }; }; + + networking.firewall = + mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.rtmp-port ] ++ optional (cfg.listen != "127.0.0.1") cfg.port; }; + + }; + meta = { maintainers = with lib.maintainers; [ MayNiklas ]; }; +} diff --git a/nixpkgs/nixos/modules/services/misc/ripple-data-api.nix b/nixpkgs/nixos/modules/services/misc/ripple-data-api.nix index 9fab462f7e3b..93eba98b7d30 100644 --- a/nixpkgs/nixos/modules/services/misc/ripple-data-api.nix +++ b/nixpkgs/nixos/modules/services/misc/ripple-data-api.nix @@ -187,7 +187,9 @@ in { users.users.ripple-data-api = { description = "Ripple data api user"; - uid = config.ids.uids.ripple-data-api; + isSystemUser = true; + group = "ripple-data-api"; }; + users.groups.ripple-data-api = {}; }; } diff --git a/nixpkgs/nixos/modules/services/misc/rippled.nix b/nixpkgs/nixos/modules/services/misc/rippled.nix index 2fce3b9dc94c..8cdfe0875d89 100644 --- a/nixpkgs/nixos/modules/services/misc/rippled.nix +++ b/nixpkgs/nixos/modules/services/misc/rippled.nix @@ -407,12 +407,14 @@ in config = mkIf cfg.enable { - users.users.rippled = - { description = "Ripple server user"; - uid = config.ids.uids.rippled; + users.users.rippled = { + description = "Ripple server user"; + isSystemUser = true; + group = "rippled"; home = cfg.databasePath; createHome = true; }; + users.groups.rippled = {}; systemd.services.rippled = { after = [ "network.target" ]; diff --git a/nixpkgs/nixos/modules/services/misc/safeeyes.nix b/nixpkgs/nixos/modules/services/misc/safeeyes.nix index 1e748195e41a..638218d8bb00 100644 --- a/nixpkgs/nixos/modules/services/misc/safeeyes.nix +++ b/nixpkgs/nixos/modules/services/misc/safeeyes.nix @@ -26,12 +26,16 @@ in config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.safeeyes ]; + systemd.user.services.safeeyes = { description = "Safeeyes"; wantedBy = [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ]; + path = [ pkgs.alsa-utils ]; + startLimitIntervalSec = 350; startLimitBurst = 10; serviceConfig = { diff --git a/nixpkgs/nixos/modules/services/misc/weechat.nix b/nixpkgs/nixos/modules/services/misc/weechat.nix index b71250f62e0f..9ac2b0ea490c 100644 --- a/nixpkgs/nixos/modules/services/misc/weechat.nix +++ b/nixpkgs/nixos/modules/services/misc/weechat.nix @@ -52,7 +52,12 @@ in wants = [ "network.target" ]; }; - security.wrappers.screen.source = "${pkgs.screen}/bin/screen"; + security.wrappers.screen = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.screen}/bin/screen"; + }; }; meta.doc = ./weechat.xml; diff --git a/nixpkgs/nixos/modules/services/misc/zookeeper.nix b/nixpkgs/nixos/modules/services/misc/zookeeper.nix index 1d12e81a9eca..0e5880983e44 100644 --- a/nixpkgs/nixos/modules/services/misc/zookeeper.nix +++ b/nixpkgs/nixos/modules/services/misc/zookeeper.nix @@ -148,9 +148,11 @@ in { }; users.users.zookeeper = { - uid = config.ids.uids.zookeeper; + isSystemUser = true; + group = "zookeeper"; description = "Zookeeper daemon user"; home = cfg.dataDir; }; + users.groups.zookeeper = {}; }; } diff --git a/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix b/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix index b25a53435d06..ea9eca180902 100644 --- a/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix +++ b/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix @@ -51,7 +51,7 @@ in { options.services.datadog-agent = { enable = mkOption { description = '' - Whether to enable the datadog-agent v6 monitoring service + Whether to enable the datadog-agent v7 monitoring service ''; default = false; type = types.bool; @@ -61,7 +61,7 @@ in { default = pkgs.datadog-agent; defaultText = "pkgs.datadog-agent"; description = '' - Which DataDog v6 agent package to use. Note that the provided + Which DataDog v7 agent package to use. Note that the provided package is expected to have an overridable `pythonPackages`-attribute which configures the Python environment with the Datadog checks. @@ -274,7 +274,7 @@ in { path = [ ]; script = '' export DD_API_KEY=$(head -n 1 ${cfg.apiKeyFile}) - ${pkgs.datadog-process-agent}/bin/agent --config /etc/datadog-agent/datadog.yaml + ${pkgs.datadog-process-agent}/bin/process-agent --config /etc/datadog-agent/datadog.yaml ''; }); diff --git a/nixpkgs/nixos/modules/services/monitoring/graphite.nix b/nixpkgs/nixos/modules/services/monitoring/graphite.nix index 9213748d3c9a..502afce5233b 100644 --- a/nixpkgs/nixos/modules/services/monitoring/graphite.nix +++ b/nixpkgs/nixos/modules/services/monitoring/graphite.nix @@ -561,6 +561,7 @@ in { ) { users.users.graphite = { uid = config.ids.uids.graphite; + group = "graphite"; description = "Graphite daemon user"; home = dataDir; }; diff --git a/nixpkgs/nixos/modules/services/monitoring/heapster.nix b/nixpkgs/nixos/modules/services/monitoring/heapster.nix index 0a9dfa12eaa5..1bf7203d6823 100644 --- a/nixpkgs/nixos/modules/services/monitoring/heapster.nix +++ b/nixpkgs/nixos/modules/services/monitoring/heapster.nix @@ -50,8 +50,10 @@ in { }; users.users.heapster = { - uid = config.ids.uids.heapster; + isSystemUser = true; + group = "heapster"; description = "Heapster user"; }; + users.groups.heapster = {}; }; } diff --git a/nixpkgs/nixos/modules/services/monitoring/incron.nix b/nixpkgs/nixos/modules/services/monitoring/incron.nix index dc97af58562e..255e1d9e30ba 100644 --- a/nixpkgs/nixos/modules/services/monitoring/incron.nix +++ b/nixpkgs/nixos/modules/services/monitoring/incron.nix @@ -71,7 +71,12 @@ in environment.systemPackages = [ pkgs.incron ]; - security.wrappers.incrontab.source = "${pkgs.incron}/bin/incrontab"; + security.wrappers.incrontab = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.incron}/bin/incrontab"; + }; # incron won't read symlinks environment.etc."incron.d/system" = { diff --git a/nixpkgs/nixos/modules/services/monitoring/netdata.nix b/nixpkgs/nixos/modules/services/monitoring/netdata.nix index 561ce3eec625..3ea84ca815f4 100644 --- a/nixpkgs/nixos/modules/services/monitoring/netdata.nix +++ b/nixpkgs/nixos/modules/services/monitoring/netdata.nix @@ -9,9 +9,9 @@ let mkdir -p $out/libexec/netdata/plugins.d ln -s /run/wrappers/bin/apps.plugin $out/libexec/netdata/plugins.d/apps.plugin ln -s /run/wrappers/bin/cgroup-network $out/libexec/netdata/plugins.d/cgroup-network - ln -s /run/wrappers/bin/freeipmi.plugin $out/libexec/netdata/plugins.d/freeipmi.plugin ln -s /run/wrappers/bin/perf.plugin $out/libexec/netdata/plugins.d/perf.plugin ln -s /run/wrappers/bin/slabinfo.plugin $out/libexec/netdata/plugins.d/slabinfo.plugin + ln -s /run/wrappers/bin/freeipmi.plugin $out/libexec/netdata/plugins.d/freeipmi.plugin ''; plugins = [ @@ -211,44 +211,47 @@ in { systemd.enableCgroupAccounting = true; - security.wrappers."apps.plugin" = { - source = "${cfg.package}/libexec/netdata/plugins.d/apps.plugin.org"; - capabilities = "cap_dac_read_search,cap_sys_ptrace+ep"; - owner = cfg.user; - group = cfg.group; - permissions = "u+rx,g+x,o-rwx"; - }; + security.wrappers = { + "apps.plugin" = { + source = "${cfg.package}/libexec/netdata/plugins.d/apps.plugin.org"; + capabilities = "cap_dac_read_search,cap_sys_ptrace+ep"; + owner = cfg.user; + group = cfg.group; + permissions = "u+rx,g+x,o-rwx"; + }; - security.wrappers."cgroup-network" = { - source = "${cfg.package}/libexec/netdata/plugins.d/cgroup-network.org"; - capabilities = "cap_setuid+ep"; - owner = cfg.user; - group = cfg.group; - permissions = "u+rx,g+x,o-rwx"; - }; + "cgroup-network" = { + source = "${cfg.package}/libexec/netdata/plugins.d/cgroup-network.org"; + capabilities = "cap_setuid+ep"; + owner = cfg.user; + group = cfg.group; + permissions = "u+rx,g+x,o-rwx"; + }; - security.wrappers."freeipmi.plugin" = { - source = "${cfg.package}/libexec/netdata/plugins.d/freeipmi.plugin.org"; - capabilities = "cap_dac_override,cap_fowner+ep"; - owner = cfg.user; - group = cfg.group; - permissions = "u+rx,g+x,o-rwx"; - }; + "perf.plugin" = { + source = "${cfg.package}/libexec/netdata/plugins.d/perf.plugin.org"; + capabilities = "cap_sys_admin+ep"; + owner = cfg.user; + group = cfg.group; + permissions = "u+rx,g+x,o-rwx"; + }; - security.wrappers."perf.plugin" = { - source = "${cfg.package}/libexec/netdata/plugins.d/perf.plugin.org"; - capabilities = "cap_sys_admin+ep"; - owner = cfg.user; - group = cfg.group; - permissions = "u+rx,g+x,o-rwx"; - }; + "slabinfo.plugin" = { + source = "${cfg.package}/libexec/netdata/plugins.d/slabinfo.plugin.org"; + capabilities = "cap_dac_override+ep"; + owner = cfg.user; + group = cfg.group; + permissions = "u+rx,g+x,o-rwx"; + }; - security.wrappers."slabinfo.plugin" = { - source = "${cfg.package}/libexec/netdata/plugins.d/slabinfo.plugin.org"; - capabilities = "cap_dac_override+ep"; - owner = cfg.user; - group = cfg.group; - permissions = "u+rx,g+x,o-rwx"; + } // optionalAttrs (cfg.package.withIpmi) { + "freeipmi.plugin" = { + source = "${cfg.package}/libexec/netdata/plugins.d/freeipmi.plugin.org"; + capabilities = "cap_dac_override,cap_fowner+ep"; + owner = cfg.user; + group = cfg.group; + permissions = "u+rx,g+x,o-rwx"; + }; }; security.pam.loginLimits = [ @@ -258,6 +261,7 @@ in { users.users = optionalAttrs (cfg.user == defaultUser) { ${defaultUser} = { + group = defaultUser; isSystemUser = true; }; }; diff --git a/nixpkgs/nixos/modules/services/monitoring/parsedmarc.md b/nixpkgs/nixos/modules/services/monitoring/parsedmarc.md new file mode 100644 index 000000000000..d93134a4cc76 --- /dev/null +++ b/nixpkgs/nixos/modules/services/monitoring/parsedmarc.md @@ -0,0 +1,113 @@ +# parsedmarc {#module-services-parsedmarc} +[parsedmarc](https://domainaware.github.io/parsedmarc/) is a service +which parses incoming [DMARC](https://dmarc.org/) reports and stores +or sends them to a downstream service for further analysis. In +combination with Elasticsearch, Grafana and the included Grafana +dashboard, it provides a handy overview of DMARC reports over time. + +## Basic usage {#module-services-parsedmarc-basic-usage} +A very minimal setup which reads incoming reports from an external +email address and saves them to a local Elasticsearch instance looks +like this: + +```nix +services.parsedmarc = { + enable = true; + settings.imap = { + host = "imap.example.com"; + user = "alice@example.com"; + password = "/path/to/imap_password_file"; + watch = true; + }; + provision.geoIp = false; # Not recommended! +}; +``` + +Note that GeoIP provisioning is disabled in the example for +simplicity, but should be turned on for fully functional reports. + +## Local mail +Instead of watching an external inbox, a local inbox can be +automatically provisioned. The recipient's name is by default set to +`dmarc`, but can be configured in +[services.parsedmarc.provision.localMail.recipientName](options.html#opt-services.parsedmarc.provision.localMail.recipientName). You +need to add an MX record pointing to the host. More concretely: for +the example to work, an MX record needs to be set up for +`monitoring.example.com` and the complete email address that should be +configured in the domain's dmarc policy is +`dmarc@monitoring.example.com`. + +```nix +services.parsedmarc = { + enable = true; + provision = { + localMail = { + enable = true; + hostname = monitoring.example.com; + }; + geoIp = false; # Not recommended! + }; +}; +``` + +## Grafana and GeoIP +The reports can be visualized and summarized with parsedmarc's +official Grafana dashboard. For all views to work, and for the data to +be complete, GeoIP databases are also required. The following example +shows a basic deployment where the provisioned Elasticsearch instance +is automatically added as a Grafana datasource, and the dashboard is +added to Grafana as well. + +```nix +services.parsedmarc = { + enable = true; + provision = { + localMail = { + enable = true; + hostname = url; + }; + grafana = { + datasource = true; + dashboard = true; + }; + }; +}; + +# Not required, but recommended for full functionality +services.geoipupdate = { + settings = { + AccountID = 000000; + LicenseKey = "/path/to/license_key_file"; + }; +}; + +services.grafana = { + enable = true; + addr = "0.0.0.0"; + domain = url; + rootUrl = "https://" + url; + protocol = "socket"; + security = { + adminUser = "admin"; + adminPasswordFile = "/path/to/admin_password_file"; + secretKeyFile = "/path/to/secret_key_file"; + }; +}; + +services.nginx = { + enable = true; + recommendedTlsSettings = true; + recommendedOptimisation = true; + recommendedGzipSettings = true; + recommendedProxySettings = true; + upstreams.grafana.servers."unix:/${config.services.grafana.socket}" = {}; + virtualHosts.${url} = { + root = config.services.grafana.staticRootPath; + enableACME = true; + forceSSL = true; + locations."/".tryFiles = "$uri @grafana"; + locations."@grafana".proxyPass = "http://grafana"; + }; +}; +users.users.nginx.extraGroups = [ "grafana" ]; +``` diff --git a/nixpkgs/nixos/modules/services/monitoring/parsedmarc.nix b/nixpkgs/nixos/modules/services/monitoring/parsedmarc.nix new file mode 100644 index 000000000000..e6a72dea0260 --- /dev/null +++ b/nixpkgs/nixos/modules/services/monitoring/parsedmarc.nix @@ -0,0 +1,537 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.parsedmarc; + ini = pkgs.formats.ini {}; +in +{ + options.services.parsedmarc = { + + enable = lib.mkEnableOption '' + parsedmarc, a DMARC report monitoring service + ''; + + provision = { + localMail = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether Postfix and Dovecot should be set up to receive + mail locally. parsedmarc will be configured to watch the + local inbox as the automatically created user specified in + <xref linkend="opt-services.parsedmarc.provision.localMail.recipientName" /> + ''; + }; + + recipientName = lib.mkOption { + type = lib.types.str; + default = "dmarc"; + description = '' + The DMARC mail recipient name, i.e. the name part of the + email address which receives DMARC reports. + + A local user with this name will be set up and assigned a + randomized password on service start. + ''; + }; + + hostname = lib.mkOption { + type = lib.types.str; + default = config.networking.fqdn; + defaultText = "config.networking.fqdn"; + example = "monitoring.example.com"; + description = '' + The hostname to use when configuring Postfix. + + Should correspond to the host's fully qualified domain + name and the domain part of the email address which + receives DMARC reports. You also have to set up an MX record + pointing to this domain name. + ''; + }; + }; + + geoIp = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether to enable and configure the <link + linkend="opt-services.geoipupdate.enable">geoipupdate</link> + service to automatically fetch GeoIP databases. Not crucial, + but recommended for full functionality. + + To finish the setup, you need to manually set the <xref + linkend="opt-services.geoipupdate.settings.AccountID" /> and + <xref linkend="opt-services.geoipupdate.settings.LicenseKey" /> + options. + ''; + }; + + elasticsearch = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether to set up and use a local instance of Elasticsearch. + ''; + }; + + grafana = { + datasource = lib.mkOption { + type = lib.types.bool; + default = cfg.provision.elasticsearch && config.services.grafana.enable; + apply = x: x && cfg.provision.elasticsearch; + description = '' + Whether the automatically provisioned Elasticsearch + instance should be added as a grafana datasource. Has no + effect unless + <xref linkend="opt-services.parsedmarc.provision.elasticsearch" /> + is also enabled. + ''; + }; + + dashboard = lib.mkOption { + type = lib.types.bool; + default = config.services.grafana.enable; + description = '' + Whether the official parsedmarc grafana dashboard should + be provisioned to the local grafana instance. + ''; + }; + }; + }; + + settings = lib.mkOption { + description = '' + Configuration parameters to set in + <filename>parsedmarc.ini</filename>. For a full list of + available parameters, see + <link xlink:href="https://domainaware.github.io/parsedmarc/#configuration-file" />. + ''; + + type = lib.types.submodule { + freeformType = ini.type; + + options = { + general = { + save_aggregate = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Save aggregate report data to Elasticsearch and/or Splunk. + ''; + }; + + save_forensic = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Save forensic report data to Elasticsearch and/or Splunk. + ''; + }; + }; + + imap = { + host = lib.mkOption { + type = lib.types.str; + default = "localhost"; + description = '' + The IMAP server hostname or IP address. + ''; + }; + + port = lib.mkOption { + type = lib.types.port; + default = 993; + description = '' + The IMAP server port. + ''; + }; + + ssl = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Use an encrypted SSL/TLS connection. + ''; + }; + + user = lib.mkOption { + type = with lib.types; nullOr str; + default = null; + description = '' + The IMAP server username. + ''; + }; + + password = lib.mkOption { + type = with lib.types; nullOr path; + default = null; + description = '' + The path to a file containing the IMAP server password. + ''; + }; + + watch = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Use the IMAP IDLE command to process messages as they arrive. + ''; + }; + + delete = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Delete messages after processing them, instead of archiving them. + ''; + }; + }; + + smtp = { + host = lib.mkOption { + type = with lib.types; nullOr str; + default = null; + description = '' + The SMTP server hostname or IP address. + ''; + }; + + port = lib.mkOption { + type = with lib.types; nullOr port; + default = null; + description = '' + The SMTP server port. + ''; + }; + + ssl = lib.mkOption { + type = with lib.types; nullOr bool; + default = null; + description = '' + Use an encrypted SSL/TLS connection. + ''; + }; + + user = lib.mkOption { + type = with lib.types; nullOr str; + default = null; + description = '' + The SMTP server username. + ''; + }; + + password = lib.mkOption { + type = with lib.types; nullOr path; + default = null; + description = '' + The path to a file containing the SMTP server password. + ''; + }; + + from = lib.mkOption { + type = with lib.types; nullOr str; + default = null; + description = '' + The <literal>From</literal> address to use for the + outgoing mail. + ''; + }; + + to = lib.mkOption { + type = with lib.types; nullOr (listOf str); + default = null; + description = '' + The addresses to send outgoing mail to. + ''; + }; + }; + + elasticsearch = { + hosts = lib.mkOption { + default = []; + type = with lib.types; listOf str; + apply = x: if x == [] then null else lib.concatStringsSep "," x; + description = '' + A list of Elasticsearch hosts to push parsed reports + to. + ''; + }; + + user = lib.mkOption { + type = with lib.types; nullOr str; + default = null; + description = '' + Username to use when connecting to Elasticsearch, if + required. + ''; + }; + + password = lib.mkOption { + type = with lib.types; nullOr path; + default = null; + description = '' + The path to a file containing the password to use when + connecting to Elasticsearch, if required. + ''; + }; + + ssl = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to use an encrypted SSL/TLS connection. + ''; + }; + + cert_path = lib.mkOption { + type = lib.types.path; + default = "/etc/ssl/certs/ca-certificates.crt"; + description = '' + The path to a TLS certificate bundle used to verify + the server's certificate. + ''; + }; + }; + + kafka = { + hosts = lib.mkOption { + default = []; + type = with lib.types; listOf str; + apply = x: if x == [] then null else lib.concatStringsSep "," x; + description = '' + A list of Apache Kafka hosts to publish parsed reports + to. + ''; + }; + + user = lib.mkOption { + type = with lib.types; nullOr str; + default = null; + description = '' + Username to use when connecting to Kafka, if + required. + ''; + }; + + password = lib.mkOption { + type = with lib.types; nullOr path; + default = null; + description = '' + The path to a file containing the password to use when + connecting to Kafka, if required. + ''; + }; + + ssl = lib.mkOption { + type = with lib.types; nullOr bool; + default = null; + description = '' + Whether to use an encrypted SSL/TLS connection. + ''; + }; + + aggregate_topic = lib.mkOption { + type = with lib.types; nullOr str; + default = null; + example = "aggregate"; + description = '' + The Kafka topic to publish aggregate reports on. + ''; + }; + + forensic_topic = lib.mkOption { + type = with lib.types; nullOr str; + default = null; + example = "forensic"; + description = '' + The Kafka topic to publish forensic reports on. + ''; + }; + }; + + }; + + }; + }; + + }; + + config = lib.mkIf cfg.enable { + + services.elasticsearch.enable = lib.mkDefault cfg.provision.elasticsearch; + + services.geoipupdate = lib.mkIf cfg.provision.geoIp { + enable = true; + settings = { + EditionIDs = [ + "GeoLite2-ASN" + "GeoLite2-City" + "GeoLite2-Country" + ]; + DatabaseDirectory = "/var/lib/GeoIP"; + }; + }; + + services.dovecot2 = lib.mkIf cfg.provision.localMail.enable { + enable = true; + protocols = [ "imap" ]; + }; + + services.postfix = lib.mkIf cfg.provision.localMail.enable { + enable = true; + origin = cfg.provision.localMail.hostname; + config = { + myhostname = cfg.provision.localMail.hostname; + mydestination = cfg.provision.localMail.hostname; + }; + }; + + services.grafana = { + declarativePlugins = with pkgs.grafanaPlugins; + lib.mkIf cfg.provision.grafana.dashboard [ + grafana-worldmap-panel + grafana-piechart-panel + ]; + + provision = { + enable = cfg.provision.grafana.datasource || cfg.provision.grafana.dashboard; + datasources = + let + pkgVer = lib.getVersion config.services.elasticsearch.package; + esVersion = + if lib.versionOlder pkgVer "7" then + "60" + else if lib.versionOlder pkgVer "8" then + "70" + else + throw "When provisioning parsedmarc grafana datasources: unknown Elasticsearch version."; + in + lib.mkIf cfg.provision.grafana.datasource [ + { + name = "dmarc-ag"; + type = "elasticsearch"; + access = "proxy"; + url = "localhost:9200"; + jsonData = { + timeField = "date_range"; + inherit esVersion; + }; + } + { + name = "dmarc-fo"; + type = "elasticsearch"; + access = "proxy"; + url = "localhost:9200"; + jsonData = { + timeField = "date_range"; + inherit esVersion; + }; + } + ]; + dashboards = lib.mkIf cfg.provision.grafana.dashboard [{ + name = "parsedmarc"; + options.path = "${pkgs.python3Packages.parsedmarc.dashboard}"; + }]; + }; + }; + + services.parsedmarc.settings = lib.mkMerge [ + (lib.mkIf cfg.provision.elasticsearch { + elasticsearch = { + hosts = [ "localhost:9200" ]; + ssl = false; + }; + }) + (lib.mkIf cfg.provision.localMail.enable { + imap = { + host = "localhost"; + port = 143; + ssl = false; + user = cfg.provision.localMail.recipientName; + password = "${pkgs.writeText "imap-password" "@imap-password@"}"; + watch = true; + }; + }) + ]; + + systemd.services.parsedmarc = + let + # Remove any empty attributes from the config, i.e. empty + # lists, empty attrsets and null. This makes it possible to + # list interesting options in `settings` without them always + # ending up in the resulting config. + filteredConfig = lib.converge (lib.filterAttrsRecursive (_: v: ! builtins.elem v [ null [] {} ])) cfg.settings; + parsedmarcConfig = ini.generate "parsedmarc.ini" filteredConfig; + mkSecretReplacement = file: + lib.optionalString (file != null) '' + replace-secret '${file}' '${file}' /run/parsedmarc/parsedmarc.ini + ''; + in + { + wantedBy = [ "multi-user.target" ]; + after = [ "postfix.service" "dovecot2.service" "elasticsearch.service" ]; + path = with pkgs; [ replace-secret openssl shadow ]; + serviceConfig = { + ExecStartPre = let + startPreFullPrivileges = '' + set -o errexit -o pipefail -o nounset -o errtrace + shopt -s inherit_errexit + + umask u=rwx,g=,o= + cp ${parsedmarcConfig} /run/parsedmarc/parsedmarc.ini + chown parsedmarc:parsedmarc /run/parsedmarc/parsedmarc.ini + ${mkSecretReplacement cfg.settings.smtp.password} + ${mkSecretReplacement cfg.settings.imap.password} + ${mkSecretReplacement cfg.settings.elasticsearch.password} + ${mkSecretReplacement cfg.settings.kafka.password} + '' + lib.optionalString cfg.provision.localMail.enable '' + openssl rand -hex 64 >/run/parsedmarc/dmarc_user_passwd + replace-secret '@imap-password@' '/run/parsedmarc/dmarc_user_passwd' /run/parsedmarc/parsedmarc.ini + echo "Setting new randomized password for user '${cfg.provision.localMail.recipientName}'." + cat <(echo -n "${cfg.provision.localMail.recipientName}:") /run/parsedmarc/dmarc_user_passwd | chpasswd + ''; + in + "+${pkgs.writeShellScript "parsedmarc-start-pre-full-privileges" startPreFullPrivileges}"; + Type = "simple"; + User = "parsedmarc"; + Group = "parsedmarc"; + DynamicUser = true; + RuntimeDirectory = "parsedmarc"; + RuntimeDirectoryMode = 0700; + CapabilityBoundingSet = ""; + PrivateDevices = true; + PrivateMounts = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ]; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictRealtime = true; + RestrictNamespaces = true; + MemoryDenyWriteExecute = true; + LockPersonality = true; + SystemCallArchitectures = "native"; + ExecStart = "${pkgs.python3Packages.parsedmarc}/bin/parsedmarc -c /run/parsedmarc/parsedmarc.ini"; + }; + }; + + users.users.${cfg.provision.localMail.recipientName} = lib.mkIf cfg.provision.localMail.enable { + isNormalUser = true; + description = "DMARC mail recipient"; + }; + }; + + # Don't edit the docbook xml directly, edit the md and generate it: + # `pandoc parsedmarc.md -t docbook --top-level-division=chapter --extract-media=media -f markdown+smart > parsedmarc.xml` + meta.doc = ./parsedmarc.xml; + meta.maintainers = [ lib.maintainers.talyz ]; +} diff --git a/nixpkgs/nixos/modules/services/monitoring/parsedmarc.xml b/nixpkgs/nixos/modules/services/monitoring/parsedmarc.xml new file mode 100644 index 000000000000..7167b52d0357 --- /dev/null +++ b/nixpkgs/nixos/modules/services/monitoring/parsedmarc.xml @@ -0,0 +1,125 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-parsedmarc"> + <title>parsedmarc</title> + <para> + <link xlink:href="https://domainaware.github.io/parsedmarc/">parsedmarc</link> + is a service which parses incoming + <link xlink:href="https://dmarc.org/">DMARC</link> reports and + stores or sends them to a downstream service for further analysis. + In combination with Elasticsearch, Grafana and the included Grafana + dashboard, it provides a handy overview of DMARC reports over time. + </para> + <section xml:id="module-services-parsedmarc-basic-usage"> + <title>Basic usage</title> + <para> + A very minimal setup which reads incoming reports from an external + email address and saves them to a local Elasticsearch instance + looks like this: + </para> + <programlisting language="bash"> +services.parsedmarc = { + enable = true; + settings.imap = { + host = "imap.example.com"; + user = "alice@example.com"; + password = "/path/to/imap_password_file"; + watch = true; + }; + provision.geoIp = false; # Not recommended! +}; +</programlisting> + <para> + Note that GeoIP provisioning is disabled in the example for + simplicity, but should be turned on for fully functional reports. + </para> + </section> + <section xml:id="local-mail"> + <title>Local mail</title> + <para> + Instead of watching an external inbox, a local inbox can be + automatically provisioned. The recipient’s name is by default set + to <literal>dmarc</literal>, but can be configured in + <link xlink:href="options.html#opt-services.parsedmarc.provision.localMail.recipientName">services.parsedmarc.provision.localMail.recipientName</link>. + You need to add an MX record pointing to the host. More + concretely: for the example to work, an MX record needs to be set + up for <literal>monitoring.example.com</literal> and the complete + email address that should be configured in the domain’s dmarc + policy is <literal>dmarc@monitoring.example.com</literal>. + </para> + <programlisting language="bash"> +services.parsedmarc = { + enable = true; + provision = { + localMail = { + enable = true; + hostname = monitoring.example.com; + }; + geoIp = false; # Not recommended! + }; +}; +</programlisting> + </section> + <section xml:id="grafana-and-geoip"> + <title>Grafana and GeoIP</title> + <para> + The reports can be visualized and summarized with parsedmarc’s + official Grafana dashboard. For all views to work, and for the + data to be complete, GeoIP databases are also required. The + following example shows a basic deployment where the provisioned + Elasticsearch instance is automatically added as a Grafana + datasource, and the dashboard is added to Grafana as well. + </para> + <programlisting language="bash"> +services.parsedmarc = { + enable = true; + provision = { + localMail = { + enable = true; + hostname = url; + }; + grafana = { + datasource = true; + dashboard = true; + }; + }; +}; + +# Not required, but recommended for full functionality +services.geoipupdate = { + settings = { + AccountID = 000000; + LicenseKey = "/path/to/license_key_file"; + }; +}; + +services.grafana = { + enable = true; + addr = "0.0.0.0"; + domain = url; + rootUrl = "https://" + url; + protocol = "socket"; + security = { + adminUser = "admin"; + adminPasswordFile = "/path/to/admin_password_file"; + secretKeyFile = "/path/to/secret_key_file"; + }; +}; + +services.nginx = { + enable = true; + recommendedTlsSettings = true; + recommendedOptimisation = true; + recommendedGzipSettings = true; + recommendedProxySettings = true; + upstreams.grafana.servers."unix:/${config.services.grafana.socket}" = {}; + virtualHosts.${url} = { + root = config.services.grafana.staticRootPath; + enableACME = true; + forceSSL = true; + locations."/".tryFiles = "$uri @grafana"; + locations."@grafana".proxyPass = "http://grafana"; + }; +}; +users.users.nginx.extraGroups = [ "grafana" ]; +</programlisting> + </section> +</chapter> diff --git a/nixpkgs/nixos/modules/services/monitoring/tuptime.nix b/nixpkgs/nixos/modules/services/monitoring/tuptime.nix index 17c5c1f56eaf..de80282559ae 100644 --- a/nixpkgs/nixos/modules/services/monitoring/tuptime.nix +++ b/nixpkgs/nixos/modules/services/monitoring/tuptime.nix @@ -36,6 +36,7 @@ in { groups._tuptime.members = [ "_tuptime" ]; users._tuptime = { isSystemUser = true; + group = "_tuptime"; description = "tuptime database owner"; }; }; diff --git a/nixpkgs/nixos/modules/services/monitoring/zabbix-proxy.nix b/nixpkgs/nixos/modules/services/monitoring/zabbix-proxy.nix index 2c8b8b92cb38..8c7a2970e9b3 100644 --- a/nixpkgs/nixos/modules/services/monitoring/zabbix-proxy.nix +++ b/nixpkgs/nixos/modules/services/monitoring/zabbix-proxy.nix @@ -262,7 +262,12 @@ in }; security.wrappers = { - fping.source = "${pkgs.fping}/bin/fping"; + fping = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.fping}/bin/fping"; + }; }; systemd.services.zabbix-proxy = { diff --git a/nixpkgs/nixos/modules/services/network-filesystems/orangefs/server.nix b/nixpkgs/nixos/modules/services/network-filesystems/orangefs/server.nix index 8eb754fe6110..8c55ccf5ffb0 100644 --- a/nixpkgs/nixos/modules/services/network-filesystems/orangefs/server.nix +++ b/nixpkgs/nixos/modules/services/network-filesystems/orangefs/server.nix @@ -193,7 +193,10 @@ in { environment.systemPackages = [ pkgs.orangefs ]; # orangefs daemon will run as user - users.users.orangefs.isSystemUser = true; + users.users.orangefs = { + isSystemUser = true; + group = "orangfs"; + }; users.groups.orangefs = {}; # To format the file system the config file is needed. diff --git a/nixpkgs/nixos/modules/services/networking/bind.nix b/nixpkgs/nixos/modules/services/networking/bind.nix index 480d5a184f25..0c23fb7e40f0 100644 --- a/nixpkgs/nixos/modules/services/networking/bind.nix +++ b/nixpkgs/nixos/modules/services/networking/bind.nix @@ -229,9 +229,11 @@ in users.users.${bindUser} = { - uid = config.ids.uids.bind; + group = bindUser; description = "BIND daemon user"; + isSystemUser = true; }; + users.groups.${bindUser} = {}; systemd.services.bind = { description = "BIND Domain Name Server"; diff --git a/nixpkgs/nixos/modules/services/networking/consul.nix b/nixpkgs/nixos/modules/services/networking/consul.nix index ae7998913ee0..476ca738dd1b 100644 --- a/nixpkgs/nixos/modules/services/networking/consul.nix +++ b/nixpkgs/nixos/modules/services/networking/consul.nix @@ -159,10 +159,12 @@ in users.users.consul = { description = "Consul agent daemon user"; - uid = config.ids.uids.consul; + isSystemUser = true; + group = "consul"; # The shell is needed for health checks shell = "/run/current-system/sw/bin/bash"; }; + users.groups.consul = {}; environment = { etc."consul.json".text = builtins.toJSON configOptions; diff --git a/nixpkgs/nixos/modules/services/networking/coturn.nix b/nixpkgs/nixos/modules/services/networking/coturn.nix index 5f7d2893ae27..12098ec6d338 100644 --- a/nixpkgs/nixos/modules/services/networking/coturn.nix +++ b/nixpkgs/nixos/modules/services/networking/coturn.nix @@ -311,6 +311,7 @@ in { { users.users.turnserver = { uid = config.ids.uids.turnserver; + group = "turnserver"; description = "coturn TURN server user"; }; users.groups.turnserver = diff --git a/nixpkgs/nixos/modules/services/networking/dhcpd.nix b/nixpkgs/nixos/modules/services/networking/dhcpd.nix index 8966deac76cb..54e4f9002859 100644 --- a/nixpkgs/nixos/modules/services/networking/dhcpd.nix +++ b/nixpkgs/nixos/modules/services/networking/dhcpd.nix @@ -212,9 +212,11 @@ in users = { users.dhcpd = { - uid = config.ids.uids.dhcpd; + isSystemUser = true; + group = "dhcpd"; description = "DHCP daemon user"; }; + groups.dhcpd = {}; }; systemd.services = dhcpdService "4" cfg4 // dhcpdService "6" cfg6; diff --git a/nixpkgs/nixos/modules/services/networking/dnscrypt-wrapper.nix b/nixpkgs/nixos/modules/services/networking/dnscrypt-wrapper.nix index 89360f4bf373..400d6e67044e 100644 --- a/nixpkgs/nixos/modules/services/networking/dnscrypt-wrapper.nix +++ b/nixpkgs/nixos/modules/services/networking/dnscrypt-wrapper.nix @@ -217,6 +217,7 @@ in { home = "${dataDir}"; createHome = true; isSystemUser = true; + group = "dnscrypt-wrapper"; }; users.groups.dnscrypt-wrapper = { }; diff --git a/nixpkgs/nixos/modules/services/networking/dnsmasq.nix b/nixpkgs/nixos/modules/services/networking/dnsmasq.nix index 377d7bc57058..59a3ca2f28e3 100644 --- a/nixpkgs/nixos/modules/services/networking/dnsmasq.nix +++ b/nixpkgs/nixos/modules/services/networking/dnsmasq.nix @@ -87,9 +87,11 @@ in services.dbus.packages = [ dnsmasq ]; users.users.dnsmasq = { - uid = config.ids.uids.dnsmasq; + isSystemUser = true; + group = "dnsmasq"; description = "Dnsmasq daemon user"; }; + users.groups.dnsmasq = {}; networking.resolvconf = mkIf cfg.resolveLocalQueries { useLocalResolver = mkDefault true; diff --git a/nixpkgs/nixos/modules/services/networking/flannel.nix b/nixpkgs/nixos/modules/services/networking/flannel.nix index 32a7eb3ed69e..2d67a2a2ad22 100644 --- a/nixpkgs/nixos/modules/services/networking/flannel.nix +++ b/nixpkgs/nixos/modules/services/networking/flannel.nix @@ -164,7 +164,7 @@ in { path = [ pkgs.iptables ]; preStart = optionalString (cfg.storageBackend == "etcd") '' echo "setting network configuration" - until ${pkgs.etcdctl}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}' + until ${pkgs.etcd}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}' do echo "setting network configuration, retry" sleep 1 diff --git a/nixpkgs/nixos/modules/services/networking/git-daemon.nix b/nixpkgs/nixos/modules/services/networking/git-daemon.nix index 98f80dd4bc40..6be72505c216 100644 --- a/nixpkgs/nixos/modules/services/networking/git-daemon.nix +++ b/nixpkgs/nixos/modules/services/networking/git-daemon.nix @@ -107,6 +107,7 @@ in users.users = optionalAttrs (cfg.user == "git") { git = { uid = config.ids.uids.git; + group = "git"; description = "Git daemon user"; }; }; diff --git a/nixpkgs/nixos/modules/services/networking/iodine.nix b/nixpkgs/nixos/modules/services/networking/iodine.nix index 46051d7044b5..f67e2d9a5e71 100644 --- a/nixpkgs/nixos/modules/services/networking/iodine.nix +++ b/nixpkgs/nixos/modules/services/networking/iodine.nix @@ -190,6 +190,7 @@ in users.users.${iodinedUser} = { uid = config.ids.uids.iodined; + group = "iodined"; description = "Iodine daemon user"; }; users.groups.iodined.gid = config.ids.gids.iodined; diff --git a/nixpkgs/nixos/modules/services/networking/morty.nix b/nixpkgs/nixos/modules/services/networking/morty.nix index e110a5c86101..c627feb527b6 100644 --- a/nixpkgs/nixos/modules/services/networking/morty.nix +++ b/nixpkgs/nixos/modules/services/networking/morty.nix @@ -77,7 +77,9 @@ in createHome = true; home = "/var/lib/morty"; isSystemUser = true; + group = "morty"; }; + users.groups.morty = {}; systemd.services.morty = { diff --git a/nixpkgs/nixos/modules/services/networking/ncdns.nix b/nixpkgs/nixos/modules/services/networking/ncdns.nix index d30fe0f6f6d1..c5ea5d950573 100644 --- a/nixpkgs/nixos/modules/services/networking/ncdns.nix +++ b/nixpkgs/nixos/modules/services/networking/ncdns.nix @@ -245,8 +245,10 @@ in users.users.ncdns = { isSystemUser = true; + group = "ncdns"; description = "ncdns daemon user"; }; + users.groups.ncdns = {}; systemd.services.ncdns = { description = "ncdns daemon"; diff --git a/nixpkgs/nixos/modules/services/networking/networkmanager.nix b/nixpkgs/nixos/modules/services/networking/networkmanager.nix index c8861171dd6c..ba13f575c39e 100644 --- a/nixpkgs/nixos/modules/services/networking/networkmanager.nix +++ b/nixpkgs/nixos/modules/services/networking/networkmanager.nix @@ -464,6 +464,7 @@ in { users.users = { nm-openvpn = { uid = config.ids.uids.nm-openvpn; + group = "nm-openvpn"; extraGroups = [ "networkmanager" ]; }; nm-iodine = { diff --git a/nixpkgs/nixos/modules/services/networking/ngircd.nix b/nixpkgs/nixos/modules/services/networking/ngircd.nix index 4b2fa7795922..1b631de3b025 100644 --- a/nixpkgs/nixos/modules/services/networking/ngircd.nix +++ b/nixpkgs/nixos/modules/services/networking/ngircd.nix @@ -52,8 +52,11 @@ in { }; users.users.ngircd = { - uid = config.ids.uids.ngircd; + isSystemUser = true; + group = "ngircd"; description = "ngircd user."; }; + users.groups.ngircd = {}; + }; } diff --git a/nixpkgs/nixos/modules/services/networking/nntp-proxy.nix b/nixpkgs/nixos/modules/services/networking/nntp-proxy.nix index cc061bf6e3b9..0083990cff5a 100644 --- a/nixpkgs/nixos/modules/services/networking/nntp-proxy.nix +++ b/nixpkgs/nixos/modules/services/networking/nntp-proxy.nix @@ -6,8 +6,6 @@ let inherit (pkgs) nntp-proxy; - proxyUser = "nntp-proxy"; - cfg = config.services.nntp-proxy; configBool = b: if b then "TRUE" else "FALSE"; @@ -210,16 +208,18 @@ in config = mkIf cfg.enable { - users.users.${proxyUser} = - { uid = config.ids.uids.nntp-proxy; - description = "NNTP-Proxy daemon user"; - }; + users.users.nntp-proxy = { + isSystemUser = true; + group = "nntp-proxy"; + description = "NNTP-Proxy daemon user"; + }; + users.groups.nntp-proxy = {}; systemd.services.nntp-proxy = { description = "NNTP proxy"; after = [ "network.target" "nss-lookup.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig = { User="${proxyUser}"; }; + serviceConfig = { User="nntp-proxy"; }; serviceConfig.ExecStart = "${nntp-proxy}/bin/nntp-proxy ${confFile}"; preStart = '' if [ ! \( -f ${cfg.sslCert} -a -f ${cfg.sslKey} \) ]; then diff --git a/nixpkgs/nixos/modules/services/networking/ntp/ntpd.nix b/nixpkgs/nixos/modules/services/networking/ntp/ntpd.nix index 861b0db01a48..1dffbd78bbe4 100644 --- a/nixpkgs/nixos/modules/services/networking/ntp/ntpd.nix +++ b/nixpkgs/nixos/modules/services/networking/ntp/ntpd.nix @@ -10,8 +10,6 @@ let stateDir = "/var/lib/ntp"; - ntpUser = "ntp"; - configFile = pkgs.writeText "ntp.conf" '' driftfile ${stateDir}/ntp.drift @@ -27,7 +25,7 @@ let ${cfg.extraConfig} ''; - ntpFlags = "-c ${configFile} -u ${ntpUser}:nogroup ${toString cfg.extraFlags}"; + ntpFlags = "-c ${configFile} -u ntp:ntp ${toString cfg.extraFlags}"; in @@ -119,11 +117,13 @@ in systemd.services.systemd-timedated.environment = { SYSTEMD_TIMEDATED_NTP_SERVICES = "ntpd.service"; }; - users.users.${ntpUser} = - { uid = config.ids.uids.ntp; + users.users.ntp = + { isSystemUser = true; + group = "ntp"; description = "NTP daemon user"; home = stateDir; }; + users.groups.ntp = {}; systemd.services.ntpd = { description = "NTP Daemon"; @@ -135,7 +135,7 @@ in preStart = '' mkdir -m 0755 -p ${stateDir} - chown ${ntpUser} ${stateDir} + chown ntp ${stateDir} ''; serviceConfig = { diff --git a/nixpkgs/nixos/modules/services/networking/ntp/openntpd.nix b/nixpkgs/nixos/modules/services/networking/ntp/openntpd.nix index 67a04d48d308..9f3892e3b538 100644 --- a/nixpkgs/nixos/modules/services/networking/ntp/openntpd.nix +++ b/nixpkgs/nixos/modules/services/networking/ntp/openntpd.nix @@ -61,10 +61,12 @@ in environment.etc."ntpd.conf".text = configFile; users.users.ntp = { - uid = config.ids.uids.ntp; + isSystemUser = true; + group = "ntp"; description = "OpenNTP daemon user"; home = "/var/empty"; }; + users.groups.ntp = {}; systemd.services.openntpd = { description = "OpenNTP Server"; diff --git a/nixpkgs/nixos/modules/services/networking/pleroma.nix b/nixpkgs/nixos/modules/services/networking/pleroma.nix index bd75083a4a78..93ab29b71e5c 100644 --- a/nixpkgs/nixos/modules/services/networking/pleroma.nix +++ b/nixpkgs/nixos/modules/services/networking/pleroma.nix @@ -74,7 +74,7 @@ in { users."${cfg.user}" = { description = "Pleroma user"; home = cfg.stateDir; - extraGroups = [ cfg.group ]; + group = cfg.group; isSystemUser = true; }; groups."${cfg.group}" = {}; diff --git a/nixpkgs/nixos/modules/services/networking/pleroma.xml b/nixpkgs/nixos/modules/services/networking/pleroma.xml index 9ab0be3d947c..ad0a481af28b 100644 --- a/nixpkgs/nixos/modules/services/networking/pleroma.xml +++ b/nixpkgs/nixos/modules/services/networking/pleroma.xml @@ -4,129 +4,185 @@ version="5.0" xml:id="module-services-pleroma"> <title>Pleroma</title> - <para><link xlink:href="https://pleroma.social/">Pleroma</link> is a lightweight activity pub server.</para> - <section xml:id="module-services-pleroma-getting-started"> - <title>Quick Start</title> - <para>To get quickly started, you can use this sample NixOS configuration and adapt it to your use case.</para> - <para><programlisting> - { - security.acme = { - email = "root@tld"; - acceptTerms = true; - certs = { - "social.tld.com" = { - webroot = "/var/www/social.tld.com"; - email = "root@tld"; - group = "nginx"; - }; - }; - }; - services = { - pleroma = { - enable = true; - secretConfigFile = "/var/lib/pleroma/secrets.exs"; - configs = [ - '' - import Config - - config :pleroma, Pleroma.Web.Endpoint, - url: [host: "social.tld.com", scheme: "https", port: 443], - http: [ip: {127, 0, 0, 1}, port: 4000] - - config :pleroma, :instance, - name: "NixOS test pleroma server", - email: "pleroma@social.tld.com", - notify_email: "pleroma@social.tld.com", - limit: 5000, - registrations_open: true - - config :pleroma, :media_proxy, - enabled: false, - redirect_on_failure: true - #base_url: "https://cache.pleroma.social" - - config :pleroma, Pleroma.Repo, - adapter: Ecto.Adapters.Postgres, - username: "pleroma", - password: "${test-db-passwd}", - database: "pleroma", - hostname: "localhost", - pool_size: 10, - prepare: :named, - parameters: [ - plan_cache_mode: "force_custom_plan" - ] - - config :pleroma, :database, rum_enabled: false - config :pleroma, :instance, static_dir: "/var/lib/pleroma/static" - config :pleroma, Pleroma.Uploaders.Local, uploads: "/var/lib/pleroma/uploads" - config :pleroma, configurable_from_database: false - '' - ]; - }; - postgresql = { - enable = true; - package = pkgs.postgresql_12; - }; - nginx = { - enable = true; - addSSL = true; - sslCertificate = "/var/lib/acme/social.tld.com/fullchain.pem"; - sslCertificateKey = "/var/lib/acme/social.tld.com/key.pem"; - root = "/var/www/social.tld.com"; - # ACME endpoint - locations."/.well-known/acme-challenge" = { - root = "/var/www/social.tld.com/"; - }; - virtualHosts."social.tld.com" = { - addSSL = true; - locations."/" = { - proxyPass = "http://127.0.0.1:4000"; - extraConfig = '' - add_header 'Access-Control-Allow-Origin' '*' always; - add_header 'Access-Control-Allow-Methods' 'POST, PUT, DELETE, GET, PATCH, OPTIONS' always; - add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type, Idempotency-Key' always; - add_header 'Access-Control-Expose-Headers' 'Link, X-RateLimit-Reset, X-RateLimit-Limit, X-RateLimit-Remaining, X-Request-Id' always; - if ($request_method = OPTIONS) { - return 204; - } - add_header X-XSS-Protection "1; mode=block"; - add_header X-Permitted-Cross-Domain-Policies none; - add_header X-Frame-Options DENY; - add_header X-Content-Type-Options nosniff; - add_header Referrer-Policy same-origin; - add_header X-Download-Options noopen; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_set_header Host $host; - client_max_body_size 16m; - ''; - }; - }; - }; - }; - }; - </programlisting></para> - <para>Note that you'll need to seed your database and upload your pleroma secrets to the path pointed by <literal>config.pleroma.secretConfigFile</literal>. You can find more informations about how to do that in the <link linkend="module-services-pleroma-generate-config">next</link> section.</para> - </section> + <para> + <link xlink:href="https://pleroma.social/">Pleroma</link> is a lightweight activity pub server.</para> <section xml:id="module-services-pleroma-generate-config"> - <title>Generating the Pleroma Config and Seed the Database</title> - - <para>Before using this service, you'll need to generate your -server configuration and its associated database seed. The -<literal>pleroma_ctl</literal> CLI utility can help you with that. You -can start with <literal>pleroma_ctl instance gen --output config.exs ---output-psql setup.psql</literal>, this will prompt you some -questions and will generate both your config file and database initial -migration. </para> -<para>For more details about this configuration format, please have a look at the <link xlink:href="https://docs-develop.pleroma.social/backend/configuration/cheatsheet/">upstream documentation</link>.</para> -<para>To seed your database, you can use the <literal>setup.psql</literal> file you just generated by running + <title>Generating the Pleroma config</title> + <para>The <literal>pleroma_ctl</literal> CLI utility will prompt you some questions and it will generate an initial config file. This is an example of usage +<programlisting> +<prompt>$ </prompt>mkdir tmp-pleroma +<prompt>$ </prompt>cd tmp-pleroma +<prompt>$ </prompt>nix-shell -p pleroma-otp +<prompt>$ </prompt>pleroma_ctl instance gen --output config.exs --output-psql setup.psql +</programlisting> + </para> + <para>The <literal>config.exs</literal> file can be further customized following the instructions on the <link xlink:href="https://docs-develop.pleroma.social/backend/configuration/cheatsheet/">upstream documentation</link>. Many refinements can be applied also after the service is running.</para> + </section> + <section xml:id="module-services-pleroma-initialize-db"> + <title>Initializing the database</title> + <para>First, the Postgresql service must be enabled in the NixOS configuration +<programlisting> +services.postgresql = { + enable = true; + package = pkgs.postgresql_13; +}; +</programlisting> +and activated with the usual +<programlisting> +<prompt>$ </prompt>nixos-rebuild switch +</programlisting> + </para> + <para>Then you can create and seed the database, using the <literal>setup.psql</literal> file that you generated in the previous section, by running +<programlisting> +<prompt>$ </prompt>sudo -u postgres psql -f setup.psql +</programlisting> + </para> + </section> + <section xml:id="module-services-pleroma-enable"> + <title>Enabling the Pleroma service locally</title> + <para>In this section we will enable the Pleroma service only locally, so its configurations can be improved incrementally.</para> + <para>This is an example of configuration, where <link linkend="opt-services.pleroma.configs">services.pleroma.configs</link> option contains the content of the file <literal>config.exs</literal>, generated <link linkend="module-services-pleroma-generate-config">in the first section</link>, but with the secrets (database password, endpoint secret key, salts, etc.) removed. Removing secrets is important, because otherwise they will be stored publicly in the Nix store. +<programlisting> +services.pleroma = { + enable = true; + secretConfigFile = "/var/lib/pleroma/secrets.exs"; + configs = [ + '' + import Config + + config :pleroma, Pleroma.Web.Endpoint, + url: [host: "pleroma.example.net", scheme: "https", port: 443], + http: [ip: {127, 0, 0, 1}, port: 4000] + + config :pleroma, :instance, + name: "Test", + email: "admin@example.net", + notify_email: "admin@example.net", + limit: 5000, + registrations_open: true + + config :pleroma, :media_proxy, + enabled: false, + redirect_on_failure: true + + config :pleroma, Pleroma.Repo, + adapter: Ecto.Adapters.Postgres, + username: "pleroma", + database: "pleroma", + hostname: "localhost" + + # Configure web push notifications + config :web_push_encryption, :vapid_details, + subject: "mailto:admin@example.net" + + # ... TO CONTINUE ... + '' + ]; +}; +</programlisting> + </para> + <para>Secrets must be moved into a file pointed by <link linkend="opt-services.pleroma.secretConfigFile">services.pleroma.secretConfigFile</link>, in our case <literal>/var/lib/pleroma/secrets.exs</literal>. This file can be created copying the previously generated <literal>config.exs</literal> file and then removing all the settings, except the secrets. This is an example +<programlisting> +# Pleroma instance passwords + +import Config + +config :pleroma, Pleroma.Web.Endpoint, + secret_key_base: "<the secret generated by pleroma_ctl>", + signing_salt: "<the secret generated by pleroma_ctl>" + +config :pleroma, Pleroma.Repo, + password: "<the secret generated by pleroma_ctl>" + +# Configure web push notifications +config :web_push_encryption, :vapid_details, + public_key: "<the secret generated by pleroma_ctl>", + private_key: "<the secret generated by pleroma_ctl>" + +# ... TO CONTINUE ... +</programlisting> + Note that the lines of the same configuration group are comma separated (i.e. all the lines end with a comma, except the last one), so when the lines with passwords are added or removed, commas must be adjusted accordingly.</para> + + <para>The service can be enabled with the usual +<programlisting> +<prompt>$ </prompt>nixos-rebuild switch +</programlisting> + </para> + <para>The service is accessible only from the local <literal>127.0.0.1:4000</literal> port. It can be tested using a port forwarding like this +<programlisting> +<prompt>$ </prompt>ssh -L 4000:localhost:4000 myuser@example.net +</programlisting> +and then accessing <link xlink:href="http://localhost:4000">http://localhost:4000</link> from a web browser.</para> + </section> + <section xml:id="module-services-pleroma-admin-user"> + <title>Creating the admin user</title> + <para>After Pleroma service is running, all <link xlink:href="https://docs-develop.pleroma.social/">Pleroma administration utilities</link> can be used. In particular an admin user can be created with +<programlisting> +<prompt>$ </prompt>pleroma_ctl user new <nickname> <email> --admin --moderator --password <password> +</programlisting> + </para> + </section> + <section xml:id="module-services-pleroma-nginx"> + <title>Configuring Nginx</title> + <para>In this configuration, Pleroma is listening only on the local port 4000. Nginx can be configured as a Reverse Proxy, for forwarding requests from public ports to the Pleroma service. This is an example of configuration, using +<link xlink:href="https://letsencrypt.org/">Let's Encrypt</link> for the TLS certificates <programlisting> - sudo -u postgres psql -f setup.psql -</programlisting></para> - <para>In regard of the pleroma service configuration you also just generated, you'll need to split it in two parts. The "public" part, which do not contain any secrets and thus can be safely stored in the Nix store and its "private" counterpart containing some secrets (database password, endpoint secret key, salts, etc.).</para> +security.acme = { + email = "root@example.net"; + acceptTerms = true; +}; - <para>The public part will live in your NixOS machine configuration in the <link linkend="opt-services.pleroma.configs">services.pleroma.configs</link> option. However, it's up to you to upload the secret pleroma configuration to the path pointed by <link linkend="opt-services.pleroma.secretConfigFile">services.pleroma.secretConfigFile</link>. You can do that manually or rely on a third party tool such as <link xlink:href="https://github.com/DBCDK/morph">Morph</link> or <link xlink:href="https://github.com/NixOS/nixops">NixOps</link>.</para> +services.nginx = { + enable = true; + addSSL = true; + + recommendedTlsSettings = true; + recommendedOptimisation = true; + recommendedGzipSettings = true; + + recommendedProxySettings = false; + # NOTE: if enabled, the NixOS proxy optimizations will override the Pleroma + # specific settings, and they will enter in conflict. + + virtualHosts = { + "pleroma.example.net" = { + http2 = true; + enableACME = true; + forceSSL = true; + + locations."/" = { + proxyPass = "http://127.0.0.1:4000"; + + extraConfig = '' + etag on; + gzip on; + + add_header 'Access-Control-Allow-Origin' '*' always; + add_header 'Access-Control-Allow-Methods' 'POST, PUT, DELETE, GET, PATCH, OPTIONS' always; + add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type, Idempotency-Key' always; + add_header 'Access-Control-Expose-Headers' 'Link, X-RateLimit-Reset, X-RateLimit-Limit, X-RateLimit-Remaining, X-Request-Id' always; + if ($request_method = OPTIONS) { + return 204; + } + add_header X-XSS-Protection "1; mode=block"; + add_header X-Permitted-Cross-Domain-Policies none; + add_header X-Frame-Options DENY; + add_header X-Content-Type-Options nosniff; + add_header Referrer-Policy same-origin; + add_header X-Download-Options noopen; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + + client_max_body_size 16m; + # NOTE: increase if users need to upload very big files + ''; + }; + }; + }; +}; +</programlisting> + </para> </section> </chapter> diff --git a/nixpkgs/nixos/modules/services/networking/radicale.nix b/nixpkgs/nixos/modules/services/networking/radicale.nix index 8c632c319d3c..368259b5b0bf 100644 --- a/nixpkgs/nixos/modules/services/networking/radicale.nix +++ b/nixpkgs/nixos/modules/services/networking/radicale.nix @@ -140,9 +140,12 @@ in { environment.systemPackages = [ pkg ]; - users.users.radicale.uid = config.ids.uids.radicale; + users.users.radicale = { + isSystemUser = true; + group = "radicale"; + }; - users.groups.radicale.gid = config.ids.gids.radicale; + users.groups.radicale = {}; systemd.services.radicale = { description = "A Simple Calendar and Contact Server"; diff --git a/nixpkgs/nixos/modules/services/networking/radvd.nix b/nixpkgs/nixos/modules/services/networking/radvd.nix index 53fac4b7b72d..6e8db55bbf0d 100644 --- a/nixpkgs/nixos/modules/services/networking/radvd.nix +++ b/nixpkgs/nixos/modules/services/networking/radvd.nix @@ -55,9 +55,12 @@ in config = mkIf cfg.enable { users.users.radvd = - { uid = config.ids.uids.radvd; + { + isSystemUser = true; + group = "radvd"; description = "Router Advertisement Daemon User"; }; + users.groups.radvd = {}; systemd.services.radvd = { description = "IPv6 Router Advertisement Daemon"; diff --git a/nixpkgs/nixos/modules/services/networking/rdnssd.nix b/nixpkgs/nixos/modules/services/networking/rdnssd.nix index 469504c43172..fd04bb8108f0 100644 --- a/nixpkgs/nixos/modules/services/networking/rdnssd.nix +++ b/nixpkgs/nixos/modules/services/networking/rdnssd.nix @@ -72,8 +72,10 @@ in users.users.rdnssd = { description = "RDNSSD Daemon User"; - uid = config.ids.uids.rdnssd; + isSystemUser = true; + group = "rdnssd"; }; + users.groups.rdnssd = {}; }; diff --git a/nixpkgs/nixos/modules/services/networking/shout.nix b/nixpkgs/nixos/modules/services/networking/shout.nix index 405808491ea4..cca03a8f88a1 100644 --- a/nixpkgs/nixos/modules/services/networking/shout.nix +++ b/nixpkgs/nixos/modules/services/networking/shout.nix @@ -83,11 +83,13 @@ in { config = mkIf cfg.enable { users.users.shout = { - uid = config.ids.uids.shout; + isSystemUser = true; + group = "shout"; description = "Shout daemon user"; home = shoutHome; createHome = true; }; + users.groups.shout = {}; systemd.services.shout = { description = "Shout web IRC client"; diff --git a/nixpkgs/nixos/modules/services/networking/smokeping.nix b/nixpkgs/nixos/modules/services/networking/smokeping.nix index 4470c18fd533..0f123fd18776 100644 --- a/nixpkgs/nixos/modules/services/networking/smokeping.nix +++ b/nixpkgs/nixos/modules/services/networking/smokeping.nix @@ -259,7 +259,7 @@ in user = mkOption { type = types.str; default = "smokeping"; - description = "User that runs smokeping and (optionally) thttpd"; + description = "User that runs smokeping and (optionally) thttpd. A group of the same name will be created as well."; }; webService = mkOption { type = types.bool; @@ -278,18 +278,23 @@ in } ]; security.wrappers = { - fping.source = "${pkgs.fping}/bin/fping"; - fping6.source = "${pkgs.fping}/bin/fping6"; + fping = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.fping}/bin/fping"; + }; }; environment.systemPackages = [ pkgs.fping ]; users.users.${cfg.user} = { isNormalUser = false; isSystemUser = true; - uid = config.ids.uids.smokeping; + group = cfg.user; description = "smokeping daemon user"; home = smokepingHome; createHome = true; }; + users.groups.${cfg.user} = {}; systemd.services.smokeping = { wantedBy = [ "multi-user.target"]; serviceConfig = { diff --git a/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix b/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix index 04879eb7d82d..311fd5abccad 100644 --- a/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix @@ -410,11 +410,13 @@ in users.users = { sshd = { isSystemUser = true; + group = "sshd"; description = "SSH privilege separation user"; }; } // (optionalAttrs (cfg.authorizedKeysCommand != null) { ${cfg.authorizedKeysCommandUser} = {}; }); + users.groups.sshd = {}; services.openssh.moduliFile = mkDefault "${cfgc.package}/etc/ssh/moduli"; services.openssh.sftpServerExecutable = mkDefault "${cfgc.package}/libexec/sftp-server"; diff --git a/nixpkgs/nixos/modules/services/networking/tinydns.nix b/nixpkgs/nixos/modules/services/networking/tinydns.nix index 79507b2ebcdd..2c44ad49296d 100644 --- a/nixpkgs/nixos/modules/services/networking/tinydns.nix +++ b/nixpkgs/nixos/modules/services/networking/tinydns.nix @@ -32,7 +32,11 @@ with lib; config = mkIf config.services.tinydns.enable { environment.systemPackages = [ pkgs.djbdns ]; - users.users.tinydns.isSystemUser = true; + users.users.tinydns = { + isSystemUser = true; + group = "tinydns"; + }; + users.groups.tinydns = {}; systemd.services.tinydns = { description = "djbdns tinydns server"; diff --git a/nixpkgs/nixos/modules/services/networking/tox-bootstrapd.nix b/nixpkgs/nixos/modules/services/networking/tox-bootstrapd.nix index f88e34827d00..7c13724e084a 100644 --- a/nixpkgs/nixos/modules/services/networking/tox-bootstrapd.nix +++ b/nixpkgs/nixos/modules/services/networking/tox-bootstrapd.nix @@ -3,15 +3,15 @@ with lib; let - home = "/var/lib/tox-bootstrapd"; - PIDFile = "${home}/pid"; + WorkingDirectory = "/var/lib/tox-bootstrapd"; + PIDFile = "${WorkingDirectory}/pid"; pkg = pkgs.libtoxcore; cfg = config.services.toxBootstrapd; cfgFile = builtins.toFile "tox-bootstrapd.conf" '' port = ${toString cfg.port} - keys_file_path = "${home}/keys" + keys_file_path = "${WorkingDirectory}/keys" pid_file_path = "${PIDFile}" ${cfg.extraConfig} ''; @@ -36,7 +36,7 @@ in keysFile = mkOption { type = types.str; - default = "${home}/keys"; + default = "${WorkingDirectory}/keys"; description = "Node key file."; }; @@ -56,13 +56,6 @@ in config = mkIf config.services.toxBootstrapd.enable { - users.users.tox-bootstrapd = - { uid = config.ids.uids.tox-bootstrapd; - description = "Tox bootstrap daemon user"; - inherit home; - createHome = true; - }; - systemd.services.tox-bootstrapd = { description = "Tox DHT bootstrap daemon"; after = [ "network.target" ]; @@ -70,8 +63,10 @@ in serviceConfig = { ExecStart = "${pkg}/bin/tox-bootstrapd --config=${cfgFile}"; Type = "forking"; - inherit PIDFile; - User = "tox-bootstrapd"; + inherit PIDFile WorkingDirectory; + AmbientCapabilities = ["CAP_NET_BIND_SERVICE"]; + DynamicUser = true; + StateDirectory = "tox-bootstrapd"; }; }; diff --git a/nixpkgs/nixos/modules/services/networking/toxvpn.nix b/nixpkgs/nixos/modules/services/networking/toxvpn.nix index 9e97faeebc1e..1765ef3ea2d9 100644 --- a/nixpkgs/nixos/modules/services/networking/toxvpn.nix +++ b/nixpkgs/nixos/modules/services/networking/toxvpn.nix @@ -59,10 +59,12 @@ with lib; users.users = { toxvpn = { - uid = config.ids.uids.toxvpn; + isSystemUser = true; + group = "toxvpn"; home = "/var/lib/toxvpn"; createHome = true; }; }; + users.groups.toxvpn = {}; }; } diff --git a/nixpkgs/nixos/modules/services/networking/tvheadend.nix b/nixpkgs/nixos/modules/services/networking/tvheadend.nix index ccf879996631..19a10a03bd9b 100644 --- a/nixpkgs/nixos/modules/services/networking/tvheadend.nix +++ b/nixpkgs/nixos/modules/services/networking/tvheadend.nix @@ -29,8 +29,10 @@ in description = "Tvheadend Service user"; home = "/var/lib/tvheadend"; createHome = true; - uid = config.ids.uids.tvheadend; + isSystemUser = true; + group = "tvheadend"; }; + users.groups.tvheadend = {}; systemd.services.tvheadend = { description = "Tvheadend TV streaming server"; diff --git a/nixpkgs/nixos/modules/services/networking/unifi.nix b/nixpkgs/nixos/modules/services/networking/unifi.nix index 2e320378cc9a..73170ebfc903 100644 --- a/nixpkgs/nixos/modules/services/networking/unifi.nix +++ b/nixpkgs/nixos/modules/services/networking/unifi.nix @@ -115,10 +115,12 @@ in config = mkIf cfg.enable { users.users.unifi = { - uid = config.ids.uids.unifi; + isSystemUser = true; + group = "unifi"; description = "UniFi controller daemon user"; home = "${stateDir}"; }; + users.groups.unifi = {}; networking.firewall = mkIf cfg.openPorts { # https://help.ubnt.com/hc/en-us/articles/218506997 diff --git a/nixpkgs/nixos/modules/services/networking/vsftpd.nix b/nixpkgs/nixos/modules/services/networking/vsftpd.nix index c57994533c17..5489f74bf032 100644 --- a/nixpkgs/nixos/modules/services/networking/vsftpd.nix +++ b/nixpkgs/nixos/modules/services/networking/vsftpd.nix @@ -282,7 +282,8 @@ in users.users = { "vsftpd" = { - uid = config.ids.uids.vsftpd; + group = "vsftpd"; + isSystemUser = true; description = "VSFTPD user"; home = if cfg.localRoot != null then cfg.localRoot # <= Necessary for virtual users. @@ -297,6 +298,7 @@ in }; }; + users.groups.vsftpd = {}; users.groups.ftp.gid = config.ids.gids.ftp; # If you really have to access root via FTP use mkOverride or userlistDeny diff --git a/nixpkgs/nixos/modules/services/networking/x2goserver.nix b/nixpkgs/nixos/modules/services/networking/x2goserver.nix index 48020fc1ceca..554e51f9d4ff 100644 --- a/nixpkgs/nixos/modules/services/networking/x2goserver.nix +++ b/nixpkgs/nixos/modules/services/networking/x2goserver.nix @@ -88,12 +88,14 @@ in { source = "${pkgs.x2goserver}/lib/x2go/libx2go-server-db-sqlite3-wrapper.pl"; owner = "x2go"; group = "x2go"; + setuid = false; setgid = true; }; security.wrappers.x2goprintWrapper = { source = "${pkgs.x2goserver}/bin/x2goprint"; owner = "x2go"; group = "x2go"; + setuid = false; setgid = true; }; diff --git a/nixpkgs/nixos/modules/services/scheduling/atd.nix b/nixpkgs/nixos/modules/services/scheduling/atd.nix index 37f6651ec4cf..9bb0191ee469 100644 --- a/nixpkgs/nixos/modules/services/scheduling/atd.nix +++ b/nixpkgs/nixos/modules/services/scheduling/atd.nix @@ -58,7 +58,9 @@ in security.pam.services.atd = {}; users.users.atd = - { uid = config.ids.uids.atd; + { + uid = config.ids.uids.atd; + group = "atd"; description = "atd user"; home = "/var/empty"; }; diff --git a/nixpkgs/nixos/modules/services/scheduling/cron.nix b/nixpkgs/nixos/modules/services/scheduling/cron.nix index 3bc31832946b..c28956b3bfeb 100644 --- a/nixpkgs/nixos/modules/services/scheduling/cron.nix +++ b/nixpkgs/nixos/modules/services/scheduling/cron.nix @@ -93,7 +93,12 @@ in { services.cron.enable = mkDefault (allFiles != []); } (mkIf (config.services.cron.enable) { - security.wrappers.crontab.source = "${cronNixosPkg}/bin/crontab"; + security.wrappers.crontab = + { setuid = true; + owner = "root"; + group = "root"; + source = "${cronNixosPkg}/bin/crontab"; + }; environment.systemPackages = [ cronNixosPkg ]; environment.etc.crontab = { source = pkgs.runCommand "crontabs" { inherit allFiles; preferLocalBuild = true; } diff --git a/nixpkgs/nixos/modules/services/scheduling/fcron.nix b/nixpkgs/nixos/modules/services/scheduling/fcron.nix index 42bed21bf25b..acaa995f7395 100644 --- a/nixpkgs/nixos/modules/services/scheduling/fcron.nix +++ b/nixpkgs/nixos/modules/services/scheduling/fcron.nix @@ -136,10 +136,13 @@ in owner = "fcron"; group = "fcron"; setgid = true; + setuid = false; }; fcronsighup = { source = "${pkgs.fcron}/bin/fcronsighup"; + owner = "root"; group = "fcron"; + setuid = true; }; }; systemd.services.fcron = { diff --git a/nixpkgs/nixos/modules/services/search/elasticsearch.nix b/nixpkgs/nixos/modules/services/search/elasticsearch.nix index 1d7a28d5d245..40ebe29c9a60 100644 --- a/nixpkgs/nixos/modules/services/search/elasticsearch.nix +++ b/nixpkgs/nixos/modules/services/search/elasticsearch.nix @@ -5,13 +5,13 @@ with lib; let cfg = config.services.elasticsearch; + es7 = builtins.compareVersions cfg.package.version "7" >= 0; + esConfig = '' network.host: ${cfg.listenAddress} cluster.name: ${cfg.cluster_name} - ${lib.optionalString cfg.single_node '' - discovery.type: single-node - gateway.auto_import_dangling_indices: true - ''} + ${lib.optionalString cfg.single_node "discovery.type: single-node"} + ${lib.optionalString (cfg.single_node && es7) "gateway.auto_import_dangling_indices: true"} http.port: ${toString cfg.port} transport.port: ${toString cfg.tcp_port} @@ -201,6 +201,13 @@ in if [ "$(id -u)" = 0 ]; then chown -R elasticsearch:elasticsearch ${cfg.dataDir}; fi ''; + postStart = '' + # Make sure elasticsearch is up and running before dependents + # are started + while ! ${pkgs.curl}/bin/curl -sS -f http://localhost:${toString cfg.port} 2>/dev/null; do + sleep 1 + done + ''; }; environment.systemPackages = [ cfg.package ]; diff --git a/nixpkgs/nixos/modules/services/search/kibana.nix b/nixpkgs/nixos/modules/services/search/kibana.nix index 2beb265ee5d1..b3093abfa5c5 100644 --- a/nixpkgs/nixos/modules/services/search/kibana.nix +++ b/nixpkgs/nixos/modules/services/search/kibana.nix @@ -199,10 +199,12 @@ in { environment.systemPackages = [ cfg.package ]; users.users.kibana = { - uid = config.ids.uids.kibana; + isSystemUser = true; description = "Kibana service user"; home = cfg.dataDir; createHome = true; + group = "kibana"; }; + users.groups.kibana = {}; }; } diff --git a/nixpkgs/nixos/modules/services/search/meilisearch.md b/nixpkgs/nixos/modules/services/search/meilisearch.md new file mode 100644 index 000000000000..98e7c542cb9a --- /dev/null +++ b/nixpkgs/nixos/modules/services/search/meilisearch.md @@ -0,0 +1,39 @@ +# Meilisearch {#module-services-meilisearch} + +Meilisearch is a lightweight, fast and powerful search engine. Think elastic search with a much smaller footprint. + +## Quickstart + +the minimum to start meilisearch is + +```nix +services.meilisearch.enable = true; +``` + +this will start the http server included with meilisearch on port 7700. + +test with `curl -X GET 'http://localhost:7700/health'` + +## Usage + +you first need to add documents to an index before you can search for documents. + +### Add a documents to the `movies` index + +`curl -X POST 'http://127.0.0.1:7700/indexes/movies/documents' --data '[{"id": "123", "title": "Superman"}, {"id": 234, "title": "Batman"}]'` + +### Search documents in the `movies` index + +`curl 'http://127.0.0.1:7700/indexes/movies/search' --data '{ "q": "botman" }'` (note the typo is intentional and there to demonstrate the typo tolerant capabilities) + +## Defaults + +- The default nixos package doesn't come with the [dashboard](https://docs.meilisearch.com/learn/getting_started/quick_start.html#search), since the dashboard features makes some assets downloads at compile time. + +- Anonimized Analytics sent to meilisearch are disabled by default. + +- Default deployment is development mode. It doesn't require a secret master key. All routes are not protected and accessible. + +## Missing + +- the snapshot feature is not yet configurable from the module, it's just a matter of adding the relevant environment variables. diff --git a/nixpkgs/nixos/modules/services/search/meilisearch.nix b/nixpkgs/nixos/modules/services/search/meilisearch.nix new file mode 100644 index 000000000000..f6210f6f16e1 --- /dev/null +++ b/nixpkgs/nixos/modules/services/search/meilisearch.nix @@ -0,0 +1,132 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.meilisearch; + +in +{ + + meta.maintainers = with maintainers; [ Br1ght0ne happysalada ]; + # Don't edit the docbook xml directly, edit the md and generate it: + # `pandoc meilisearch.md -t docbook --top-level-division=chapter --extract-media=media -f markdown+smart > meilisearch.xml` + meta.doc = ./meilisearch.xml; + + ###### interface + + options.services.meilisearch = { + enable = mkEnableOption "MeiliSearch - a RESTful search API"; + + package = mkOption { + description = "The package to use for meilisearch. Use this if you require specific features to be enabled. The default package has no features."; + default = pkgs.meilisearch; + defaultText = "pkgs.meilisearch"; + type = types.package; + }; + + listenAddress = mkOption { + description = "MeiliSearch listen address."; + default = "127.0.0.1"; + type = types.str; + }; + + listenPort = mkOption { + description = "MeiliSearch port to listen on."; + default = 7700; + type = types.port; + }; + + environment = mkOption { + description = "Defines the running environment of MeiliSearch."; + default = "development"; + type = types.enum [ "development" "production" ]; + }; + + # TODO change this to LoadCredentials once possible + masterKeyEnvironmentFile = mkOption { + description = '' + Path to file which contains the master key. + By doing so, all routes will be protected and will require a key to be accessed. + If no master key is provided, all routes can be accessed without requiring any key. + The format is the following: + MEILI_MASTER_KEY=my_secret_key + ''; + default = null; + type = with types; nullOr path; + }; + + noAnalytics = mkOption { + description = '' + Deactivates analytics. + Analytics allow MeiliSearch to know how many users are using MeiliSearch, + which versions and which platforms are used. + This process is entirely anonymous. + ''; + default = true; + type = types.bool; + }; + + logLevel = mkOption { + description = '' + Defines how much detail should be present in MeiliSearch's logs. + MeiliSearch currently supports four log levels, listed in order of increasing verbosity: + - 'ERROR': only log unexpected events indicating MeiliSearch is not functioning as expected + - 'WARN:' log all unexpected events, regardless of their severity + - 'INFO:' log all events. This is the default value + - 'DEBUG': log all events and including detailed information on MeiliSearch's internal processes. + Useful when diagnosing issues and debugging + ''; + default = "INFO"; + type = types.str; + }; + + maxIndexSize = mkOption { + description = '' + Sets the maximum size of the index. + Value must be given in bytes or explicitly stating a base unit. + For example, the default value can be written as 107374182400, '107.7Gb', or '107374 Mb'. + Default is 100 GiB + ''; + default = "107374182400"; + type = types.str; + }; + + payloadSizeLimit = mkOption { + description = '' + Sets the maximum size of accepted JSON payloads. + Value must be given in bytes or explicitly stating a base unit. + For example, the default value can be written as 107374182400, '107.7Gb', or '107374 Mb'. + Default is ~ 100 MB + ''; + default = "104857600"; + type = types.str; + }; + + }; + + ###### implementation + + config = mkIf cfg.enable { + systemd.services.meilisearch = { + description = "MeiliSearch daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + environment = { + MEILI_DB_PATH = "/var/lib/meilisearch"; + MEILI_HTTP_ADDR = "${cfg.listenAddress}:${toString cfg.listenPort}"; + MEILI_NO_ANALYTICS = toString cfg.noAnalytics; + MEILI_ENV = cfg.environment; + MEILI_DUMPS_DIR = "/var/lib/meilisearch/dumps"; + MEILI_LOG_LEVEL = cfg.logLevel; + MEILI_MAX_INDEX_SIZE = cfg.maxIndexSize; + }; + serviceConfig = { + ExecStart = "${cfg.package}/bin/meilisearch"; + DynamicUser = true; + StateDirectory = "meilisearch"; + EnvironmentFile = mkIf (cfg.masterKeyEnvironmentFile != null) cfg.masterKeyEnvironmentFile; + }; + }; + }; +} diff --git a/nixpkgs/nixos/modules/services/search/meilisearch.xml b/nixpkgs/nixos/modules/services/search/meilisearch.xml new file mode 100644 index 000000000000..c1a73f358c28 --- /dev/null +++ b/nixpkgs/nixos/modules/services/search/meilisearch.xml @@ -0,0 +1,85 @@ +<chapter xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="module-services-meilisearch"> + <title>Meilisearch</title> + <para> + Meilisearch is a lightweight, fast and powerful search engine. Think + elastic search with a much smaller footprint. + </para> + <section xml:id="quickstart"> + <title>Quickstart</title> + <para> + the minimum to start meilisearch is + </para> + <programlisting language="bash"> +services.meilisearch.enable = true; +</programlisting> + <para> + this will start the http server included with meilisearch on port + 7700. + </para> + <para> + test with + <literal>curl -X GET 'http://localhost:7700/health'</literal> + </para> + </section> + <section xml:id="usage"> + <title>Usage</title> + <para> + you first need to add documents to an index before you can search + for documents. + </para> + <section xml:id="add-a-documents-to-the-movies-index"> + <title>Add a documents to the <literal>movies</literal> + index</title> + <para> + <literal>curl -X POST 'http://127.0.0.1:7700/indexes/movies/documents' --data '[{"id": "123", "title": "Superman"}, {"id": 234, "title": "Batman"}]'</literal> + </para> + </section> + <section xml:id="search-documents-in-the-movies-index"> + <title>Search documents in the <literal>movies</literal> + index</title> + <para> + <literal>curl 'http://127.0.0.1:7700/indexes/movies/search' --data '{ "q": "botman" }'</literal> + (note the typo is intentional and there to demonstrate the typo + tolerant capabilities) + </para> + </section> + </section> + <section xml:id="defaults"> + <title>Defaults</title> + <itemizedlist> + <listitem> + <para> + The default nixos package doesn’t come with the + <link xlink:href="https://docs.meilisearch.com/learn/getting_started/quick_start.html#search">dashboard</link>, + since the dashboard features makes some assets downloads at + compile time. + </para> + </listitem> + <listitem> + <para> + Anonimized Analytics sent to meilisearch are disabled by + default. + </para> + </listitem> + <listitem> + <para> + Default deployment is development mode. It doesn’t require a + secret master key. All routes are not protected and + accessible. + </para> + </listitem> + </itemizedlist> + </section> + <section xml:id="missing"> + <title>Missing</title> + <itemizedlist spacing="compact"> + <listitem> + <para> + the snapshot feature is not yet configurable from the module, + it’s just a matter of adding the relevant environment + variables. + </para> + </listitem> + </itemizedlist> + </section> +</chapter> diff --git a/nixpkgs/nixos/modules/services/security/hockeypuck.nix b/nixpkgs/nixos/modules/services/security/hockeypuck.nix index 686634c8add8..2e98624bb2ee 100644 --- a/nixpkgs/nixos/modules/services/security/hockeypuck.nix +++ b/nixpkgs/nixos/modules/services/security/hockeypuck.nix @@ -82,8 +82,10 @@ in { users.users.hockeypuck = { isSystemUser = true; + group = "hockeypuck"; description = "Hockeypuck user"; }; + users.groups.hockeypuck = {}; systemd.services.hockeypuck = { description = "Hockeypuck OpenPGP Key Server"; diff --git a/nixpkgs/nixos/modules/services/security/opensnitch.nix b/nixpkgs/nixos/modules/services/security/opensnitch.nix new file mode 100644 index 000000000000..919346cf2bb1 --- /dev/null +++ b/nixpkgs/nixos/modules/services/security/opensnitch.nix @@ -0,0 +1,24 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + name = "opensnitch"; + cfg = config.services.opensnitch; +in { + options = { + services.opensnitch = { + enable = mkEnableOption "Opensnitch application firewall"; + }; + }; + + config = mkIf cfg.enable { + + systemd = { + packages = [ pkgs.opensnitch ]; + services.opensnitchd.wantedBy = [ "multi-user.target" ]; + }; + + }; +} + diff --git a/nixpkgs/nixos/modules/services/security/physlock.nix b/nixpkgs/nixos/modules/services/security/physlock.nix index da5c22a90a09..760e80f147f7 100644 --- a/nixpkgs/nixos/modules/services/security/physlock.nix +++ b/nixpkgs/nixos/modules/services/security/physlock.nix @@ -38,9 +38,6 @@ in setuid wrapper to allow any user to start physlock as root, which is a minor security risk. Call the physlock binary to use this instead of using the systemd service. - - Note that you might need to relog to have the correct binary in your - PATH upon changing this option. ''; }; @@ -129,7 +126,12 @@ in (mkIf cfg.allowAnyUser { - security.wrappers.physlock = { source = "${pkgs.physlock}/bin/physlock"; user = "root"; }; + security.wrappers.physlock = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.physlock}/bin/physlock"; + }; }) ]); diff --git a/nixpkgs/nixos/modules/services/security/tor.nix b/nixpkgs/nixos/modules/services/security/tor.nix index 9e8f18e93c85..1e1f443905d4 100644 --- a/nixpkgs/nixos/modules/services/security/tor.nix +++ b/nixpkgs/nixos/modules/services/security/tor.nix @@ -1022,7 +1022,7 @@ in ProtectKernelTunables = true; ProtectSystem = "strict"; RemoveIPC = true; - RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" ]; RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; diff --git a/nixpkgs/nixos/modules/services/system/kerberos/heimdal.nix b/nixpkgs/nixos/modules/services/system/kerberos/heimdal.nix index f0e56c7951a4..837c59caa562 100644 --- a/nixpkgs/nixos/modules/services/system/kerberos/heimdal.nix +++ b/nixpkgs/nixos/modules/services/system/kerberos/heimdal.nix @@ -27,7 +27,7 @@ in { # No documentation about correct triggers, so guessing at them. - config = mkIf (cfg.enable && kerberos == pkgs.heimdalFull) { + config = mkIf (cfg.enable && kerberos == pkgs.heimdal) { systemd.services.kadmind = { description = "Kerberos Administration Daemon"; wantedBy = [ "multi-user.target" ]; diff --git a/nixpkgs/nixos/modules/services/system/localtime.nix b/nixpkgs/nixos/modules/services/system/localtime.nix index bb99e5e36ff8..8f23454af9df 100644 --- a/nixpkgs/nixos/modules/services/system/localtime.nix +++ b/nixpkgs/nixos/modules/services/system/localtime.nix @@ -37,7 +37,9 @@ in { users.users.localtimed = { description = "localtime daemon"; isSystemUser = true; + group = "localtimed"; }; + users.groups.localtimed = {}; systemd.services.localtime = { wantedBy = [ "multi-user.target" ]; diff --git a/nixpkgs/nixos/modules/services/torrent/magnetico.nix b/nixpkgs/nixos/modules/services/torrent/magnetico.nix index 7465c10e002c..ada6f9b1e3a9 100644 --- a/nixpkgs/nixos/modules/services/torrent/magnetico.nix +++ b/nixpkgs/nixos/modules/services/torrent/magnetico.nix @@ -172,8 +172,10 @@ in { users.users.magnetico = { description = "Magnetico daemons user"; + group = "magnetico"; isSystemUser = true; }; + users.groups.magnetico = {}; systemd.services.magneticod = { description = "Magnetico DHT crawler"; diff --git a/nixpkgs/nixos/modules/services/torrent/peerflix.nix b/nixpkgs/nixos/modules/services/torrent/peerflix.nix index a74f65984328..3e5f80960dc7 100644 --- a/nixpkgs/nixos/modules/services/torrent/peerflix.nix +++ b/nixpkgs/nixos/modules/services/torrent/peerflix.nix @@ -60,6 +60,10 @@ in { }; }; - users.users.peerflix.uid = config.ids.uids.peerflix; + users.users.peerflix = { + isSystemUser = true; + group = "peerflix"; + }; + users.groups.peerflix = {}; }; } diff --git a/nixpkgs/nixos/modules/services/ttys/getty.nix b/nixpkgs/nixos/modules/services/ttys/getty.nix index 7cf2ff87da26..eb966c37ce7f 100644 --- a/nixpkgs/nixos/modules/services/ttys/getty.nix +++ b/nixpkgs/nixos/modules/services/ttys/getty.nix @@ -131,6 +131,14 @@ in restartIfChanged = false; }; + systemd.services."autovt@" = + { serviceConfig.ExecStart = [ + "" # override upstream default with an empty ExecStart + (gettyCmd "--noclear %I $TERM") + ]; + restartIfChanged = false; + }; + systemd.services."container-getty@" = { serviceConfig.ExecStart = [ "" # override upstream default with an empty ExecStart diff --git a/nixpkgs/nixos/modules/services/video/replay-sorcery.nix b/nixpkgs/nixos/modules/services/video/replay-sorcery.nix index d78e782c7968..7ce5be8a5a1c 100644 --- a/nixpkgs/nixos/modules/services/video/replay-sorcery.nix +++ b/nixpkgs/nixos/modules/services/video/replay-sorcery.nix @@ -44,8 +44,10 @@ in security.wrappers = mkIf cfg.enableSysAdminCapability { replay-sorcery = { - source = "${pkgs.replay-sorcery}/bin/replay-sorcery"; + owner = "root"; + group = "root"; capabilities = "cap_sys_admin+ep"; + source = "${pkgs.replay-sorcery}/bin/replay-sorcery"; }; }; diff --git a/nixpkgs/nixos/modules/services/web-apps/discourse.nix b/nixpkgs/nixos/modules/services/web-apps/discourse.nix index 050e4ee3d329..b28e3cf0deb2 100644 --- a/nixpkgs/nixos/modules/services/web-apps/discourse.nix +++ b/nixpkgs/nixos/modules/services/web-apps/discourse.nix @@ -172,6 +172,15 @@ in }; admin = { + skipCreate = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Do not create the admin account, instead rely on other + existing admin accounts. + ''; + }; + email = lib.mkOption { type = lib.types.str; example = "admin@example.com"; @@ -721,12 +730,24 @@ in lib.optionalString (file != null) '' replace-secret '${file}' '${file}' /run/discourse/config/discourse.conf ''; + + mkAdmin = '' + export ADMIN_EMAIL="${cfg.admin.email}" + export ADMIN_NAME="${cfg.admin.fullName}" + export ADMIN_USERNAME="${cfg.admin.username}" + ADMIN_PASSWORD="$(<${cfg.admin.passwordFile})" + export ADMIN_PASSWORD + discourse-rake admin:create_noninteractively + ''; + in '' set -o errexit -o pipefail -o nounset -o errtrace shopt -s inherit_errexit umask u=rwx,g=rx,o= + rm -rf /var/lib/discourse/tmp/* + cp -r ${cfg.package}/share/discourse/config.dist/* /run/discourse/config/ cp -r ${cfg.package}/share/discourse/public.dist/* /run/discourse/public/ ln -sf /var/lib/discourse/uploads /run/discourse/public/uploads @@ -748,14 +769,9 @@ in ) discourse-rake db:migrate >>/var/log/discourse/db_migration.log - chmod -R u+w /run/discourse/tmp/ + chmod -R u+w /var/lib/discourse/tmp/ - export ADMIN_EMAIL="${cfg.admin.email}" - export ADMIN_NAME="${cfg.admin.fullName}" - export ADMIN_USERNAME="${cfg.admin.username}" - ADMIN_PASSWORD="$(<${cfg.admin.passwordFile})" - export ADMIN_PASSWORD - discourse-rake admin:create_noninteractively + ${lib.optionalString (!cfg.admin.skipCreate) mkAdmin} discourse-rake themes:update discourse-rake uploads:regenerate_missing_optimized @@ -768,7 +784,6 @@ in RuntimeDirectory = map (p: "discourse/" + p) [ "config" "home" - "tmp" "assets/javascripts/plugins" "public" "sockets" @@ -777,6 +792,7 @@ in StateDirectory = map (p: "discourse/" + p) [ "uploads" "backups" + "tmp" ]; StateDirectoryMode = 0750; LogsDirectory = "discourse"; diff --git a/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix b/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix index 685cb4967030..964fef23addf 100644 --- a/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix @@ -1,16 +1,21 @@ -{ config, lib, pkgs, ... }: +{ config, pkgs, lib, ... }: let + inherit (lib) mkDefault mkEnableOption mkForce mkIf mkMerge mkOption types maintainers recursiveUpdate; + inherit (lib) any attrValues concatMapStrings concatMapStringsSep flatten literalExample; + inherit (lib) filterAttrs mapAttrs mapAttrs' mapAttrsToList nameValuePair optional optionalAttrs optionalString; - inherit (lib) mkEnableOption mkForce mkIf mkMerge mkOption optionalAttrs recursiveUpdate types maintainers; - inherit (lib) concatMapStringsSep flatten mapAttrs mapAttrs' mapAttrsToList nameValuePair concatMapStringSep; - - eachSite = config.services.dokuwiki; - + cfg = migrateOldAttrs config.services.dokuwiki; + eachSite = cfg.sites; user = "dokuwiki"; - group = config.services.nginx.group; + webserver = config.services.${cfg.webserver}; + stateDir = hostName: "/var/lib/dokuwiki/${hostName}/data"; + + # Migrate config.services.dokuwiki.<hostName> to config.services.dokuwiki.sites.<hostName> + oldSites = filterAttrs (o: _: o != "sites" && o != "webserver"); + migrateOldAttrs = cfg: cfg // { sites = cfg.sites // oldSites cfg; }; - dokuwikiAclAuthConfig = cfg: pkgs.writeText "acl.auth.php" '' + dokuwikiAclAuthConfig = hostName: cfg: pkgs.writeText "acl.auth-${hostName}.php" '' # acl.auth.php # <?php exit()?> # @@ -19,7 +24,7 @@ let ${toString cfg.acl} ''; - dokuwikiLocalConfig = cfg: pkgs.writeText "local.php" '' + dokuwikiLocalConfig = hostName: cfg: pkgs.writeText "local-${hostName}.php" '' <?php $conf['savedir'] = '${cfg.stateDir}'; $conf['superuser'] = '${toString cfg.superUser}'; @@ -28,11 +33,12 @@ let ${toString cfg.extraConfig} ''; - dokuwikiPluginsLocalConfig = cfg: pkgs.writeText "plugins.local.php" '' + dokuwikiPluginsLocalConfig = hostName: cfg: pkgs.writeText "plugins.local-${hostName}.php" '' <?php ${cfg.pluginsConfig} ''; + pkg = hostName: cfg: pkgs.stdenv.mkDerivation rec { pname = "dokuwiki-${hostName}"; version = src.version; @@ -43,13 +49,13 @@ let cp -r * $out/ # symlink the dokuwiki config - ln -s ${dokuwikiLocalConfig cfg} $out/share/dokuwiki/local.php + ln -s ${dokuwikiLocalConfig hostName cfg} $out/share/dokuwiki/local.php # symlink plugins config - ln -s ${dokuwikiPluginsLocalConfig cfg} $out/share/dokuwiki/plugins.local.php + ln -s ${dokuwikiPluginsLocalConfig hostName cfg} $out/share/dokuwiki/plugins.local.php # symlink acl - ln -s ${dokuwikiAclAuthConfig cfg} $out/share/dokuwiki/acl.auth.php + ln -s ${dokuwikiAclAuthConfig hostName cfg} $out/share/dokuwiki/acl.auth.php # symlink additional plugin(s) and templates(s) ${concatMapStringsSep "\n" (template: "ln -s ${template} $out/share/dokuwiki/lib/tpl/${template.name}") cfg.templates} @@ -57,332 +63,385 @@ let ''; }; - siteOpts = { config, lib, name, ...}: { - options = { - enable = mkEnableOption "DokuWiki web application."; - - package = mkOption { - type = types.package; - default = pkgs.dokuwiki; - description = "Which dokuwiki package to use."; - }; + siteOpts = { config, lib, name, ... }: + { + options = { + package = mkOption { + type = types.package; + default = pkgs.dokuwiki; + description = "Which DokuWiki package to use."; + }; - hostName = mkOption { - type = types.str; - default = "localhost"; - description = "FQDN for the instance."; - }; + stateDir = mkOption { + type = types.path; + default = "/var/lib/dokuwiki/${name}/data"; + description = "Location of the DokuWiki state directory."; + }; - stateDir = mkOption { - type = types.path; - default = "/var/lib/dokuwiki/${name}/data"; - description = "Location of the dokuwiki state directory."; - }; + acl = mkOption { + type = types.nullOr types.lines; + default = null; + example = "* @ALL 8"; + description = '' + Access Control Lists: see <link xlink:href="https://www.dokuwiki.org/acl"/> + Mutually exclusive with services.dokuwiki.aclFile + Set this to a value other than null to take precedence over aclFile option. + + Warning: Consider using aclFile instead if you do not + want to store the ACL in the world-readable Nix store. + ''; + }; - acl = mkOption { - type = types.nullOr types.lines; - default = null; - example = "* @ALL 8"; - description = '' - Access Control Lists: see <link xlink:href="https://www.dokuwiki.org/acl"/> - Mutually exclusive with services.dokuwiki.aclFile - Set this to a value other than null to take precedence over aclFile option. - - Warning: Consider using aclFile instead if you do not - want to store the ACL in the world-readable Nix store. - ''; - }; + aclFile = mkOption { + type = with types; nullOr str; + default = if (config.aclUse && config.acl == null) then "/var/lib/dokuwiki/${name}/acl.auth.php" else null; + description = '' + Location of the dokuwiki acl rules. Mutually exclusive with services.dokuwiki.acl + Mutually exclusive with services.dokuwiki.acl which is preferred. + Consult documentation <link xlink:href="https://www.dokuwiki.org/acl"/> for further instructions. + Example: <link xlink:href="https://github.com/splitbrain/dokuwiki/blob/master/conf/acl.auth.php.dist"/> + ''; + example = "/var/lib/dokuwiki/${name}/acl.auth.php"; + }; - aclFile = mkOption { - type = with types; nullOr str; - default = if (config.aclUse && config.acl == null) then "/var/lib/dokuwiki/${name}/acl.auth.php" else null; - description = '' - Location of the dokuwiki acl rules. Mutually exclusive with services.dokuwiki.acl - Mutually exclusive with services.dokuwiki.acl which is preferred. - Consult documentation <link xlink:href="https://www.dokuwiki.org/acl"/> for further instructions. - Example: <link xlink:href="https://github.com/splitbrain/dokuwiki/blob/master/conf/acl.auth.php.dist"/> - ''; - example = "/var/lib/dokuwiki/${name}/acl.auth.php"; - }; + aclUse = mkOption { + type = types.bool; + default = true; + description = '' + Necessary for users to log in into the system. + Also limits anonymous users. When disabled, + everyone is able to create and edit content. + ''; + }; - aclUse = mkOption { - type = types.bool; - default = true; - description = '' - Necessary for users to log in into the system. - Also limits anonymous users. When disabled, - everyone is able to create and edit content. - ''; - }; + pluginsConfig = mkOption { + type = types.lines; + default = '' + $plugins['authad'] = 0; + $plugins['authldap'] = 0; + $plugins['authmysql'] = 0; + $plugins['authpgsql'] = 0; + ''; + description = '' + List of the dokuwiki (un)loaded plugins. + ''; + }; - pluginsConfig = mkOption { - type = types.lines; - default = '' - $plugins['authad'] = 0; - $plugins['authldap'] = 0; - $plugins['authmysql'] = 0; - $plugins['authpgsql'] = 0; - ''; - description = '' - List of the dokuwiki (un)loaded plugins. - ''; - }; + superUser = mkOption { + type = types.nullOr types.str; + default = "@admin"; + description = '' + You can set either a username, a list of usernames (“admin1,admin2”), + or the name of a group by prepending an @ char to the groupname + Consult documentation <link xlink:href="https://www.dokuwiki.org/config:superuser"/> for further instructions. + ''; + }; - superUser = mkOption { - type = types.nullOr types.str; - default = "@admin"; - description = '' - You can set either a username, a list of usernames (“admin1,admin2”), - or the name of a group by prepending an @ char to the groupname - Consult documentation <link xlink:href="https://www.dokuwiki.org/config:superuser"/> for further instructions. - ''; - }; + usersFile = mkOption { + type = with types; nullOr str; + default = if config.aclUse then "/var/lib/dokuwiki/${name}/users.auth.php" else null; + description = '' + Location of the dokuwiki users file. List of users. Format: + login:passwordhash:Real Name:email:groups,comma,separated + Create passwordHash easily by using:$ mkpasswd -5 password `pwgen 8 1` + Example: <link xlink:href="https://github.com/splitbrain/dokuwiki/blob/master/conf/users.auth.php.dist"/> + ''; + example = "/var/lib/dokuwiki/${name}/users.auth.php"; + }; - usersFile = mkOption { - type = with types; nullOr str; - default = if config.aclUse then "/var/lib/dokuwiki/${name}/users.auth.php" else null; - description = '' - Location of the dokuwiki users file. List of users. Format: - login:passwordhash:Real Name:email:groups,comma,separated - Create passwordHash easily by using:$ mkpasswd -5 password `pwgen 8 1` - Example: <link xlink:href="https://github.com/splitbrain/dokuwiki/blob/master/conf/users.auth.php.dist"/> + disableActions = mkOption { + type = types.nullOr types.str; + default = ""; + example = "search,register"; + description = '' + Disable individual action modes. Refer to + <link xlink:href="https://www.dokuwiki.org/config:action_modes"/> + for details on supported values. ''; - example = "/var/lib/dokuwiki/${name}/users.auth.php"; - }; + }; - disableActions = mkOption { - type = types.nullOr types.str; - default = ""; - example = "search,register"; - description = '' - Disable individual action modes. Refer to - <link xlink:href="https://www.dokuwiki.org/config:action_modes"/> - for details on supported values. - ''; - }; + plugins = mkOption { + type = types.listOf types.path; + default = []; + description = '' + List of path(s) to respective plugin(s) which are copied from the 'plugin' directory. + <note><para>These plugins need to be packaged before use, see example.</para></note> + ''; + example = '' + # Let's package the icalevents plugin + plugin-icalevents = pkgs.stdenv.mkDerivation { + name = "icalevents"; + # Download the plugin from the dokuwiki site + src = pkgs.fetchurl { + url = "https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/2017-06-16/dokuwiki-plugin-icalevents-2017-06-16.zip"; + sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8"; + }; + sourceRoot = "."; + # We need unzip to build this package + buildInputs = [ pkgs.unzip ]; + # Installing simply means copying all files to the output directory + installPhase = "mkdir -p $out; cp -R * $out/"; + }; - extraConfig = mkOption { - type = types.nullOr types.lines; - default = null; - example = '' - $conf['title'] = 'My Wiki'; - $conf['userewrite'] = 1; - ''; - description = '' - DokuWiki configuration. Refer to - <link xlink:href="https://www.dokuwiki.org/config"/> - for details on supported values. - ''; - }; + # And then pass this theme to the plugin list like this: + plugins = [ plugin-icalevents ]; + ''; + }; - plugins = mkOption { - type = types.listOf types.path; - default = []; - description = '' - List of path(s) to respective plugin(s) which are copied from the 'plugin' directory. - <note><para>These plugins need to be packaged before use, see example.</para></note> - ''; - example = '' - # Let's package the icalevents plugin - plugin-icalevents = pkgs.stdenv.mkDerivation { - name = "icalevents"; - # Download the plugin from the dokuwiki site - src = pkgs.fetchurl { - url = "https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/2017-06-16/dokuwiki-plugin-icalevents-2017-06-16.zip"; - sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8"; + templates = mkOption { + type = types.listOf types.path; + default = []; + description = '' + List of path(s) to respective template(s) which are copied from the 'tpl' directory. + <note><para>These templates need to be packaged before use, see example.</para></note> + ''; + example = '' + # Let's package the bootstrap3 theme + template-bootstrap3 = pkgs.stdenv.mkDerivation { + name = "bootstrap3"; + # Download the theme from the dokuwiki site + src = pkgs.fetchurl { + url = "https://github.com/giterlizzi/dokuwiki-template-bootstrap3/archive/v2019-05-22.zip"; + sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6"; + }; + # We need unzip to build this package + buildInputs = [ pkgs.unzip ]; + # Installing simply means copying all files to the output directory + installPhase = "mkdir -p $out; cp -R * $out/"; }; - sourceRoot = "."; - # We need unzip to build this package - nativeBuildInputs = [ pkgs.unzip ]; - # Installing simply means copying all files to the output directory - installPhase = "mkdir -p $out; cp -R * $out/"; - }; - - # And then pass this theme to the plugin list like this: - plugins = [ plugin-icalevents ]; - ''; - }; - templates = mkOption { - type = types.listOf types.path; - default = []; - description = '' - List of path(s) to respective template(s) which are copied from the 'tpl' directory. - <note><para>These templates need to be packaged before use, see example.</para></note> - ''; - example = '' - # Let's package the bootstrap3 theme - template-bootstrap3 = pkgs.stdenv.mkDerivation { - name = "bootstrap3"; - # Download the theme from the dokuwiki site - src = pkgs.fetchurl { - url = "https://github.com/giterlizzi/dokuwiki-template-bootstrap3/archive/v2019-05-22.zip"; - sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6"; - }; - # We need unzip to build this package - nativeBuildInputs = [ pkgs.unzip ]; - # Installing simply means copying all files to the output directory - installPhase = "mkdir -p $out; cp -R * $out/"; - }; - - # And then pass this theme to the template list like this: - templates = [ template-bootstrap3 ]; - ''; - }; + # And then pass this theme to the template list like this: + templates = [ template-bootstrap3 ]; + ''; + }; - poolConfig = mkOption { - type = with types; attrsOf (oneOf [ str int bool ]); - default = { - "pm" = "dynamic"; - "pm.max_children" = 32; - "pm.start_servers" = 2; - "pm.min_spare_servers" = 2; - "pm.max_spare_servers" = 4; - "pm.max_requests" = 500; + poolConfig = mkOption { + type = with types; attrsOf (oneOf [ str int bool ]); + default = { + "pm" = "dynamic"; + "pm.max_children" = 32; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 2; + "pm.max_spare_servers" = 4; + "pm.max_requests" = 500; + }; + description = '' + Options for the DokuWiki PHP pool. See the documentation on <literal>php-fpm.conf</literal> + for details on configuration directives. + ''; }; - description = '' - Options for the dokuwiki PHP pool. See the documentation on <literal>php-fpm.conf</literal> - for details on configuration directives. - ''; - }; - nginx = mkOption { - type = types.submodule ( - recursiveUpdate - (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) {} - ); - default = {}; - example = { - serverAliases = [ - "wiki.\${config.networking.domain}" - ]; - # To enable encryption and let let's encrypt take care of certificate - forceSSL = true; - enableACME = true; + extraConfig = mkOption { + type = types.nullOr types.lines; + default = null; + example = '' + $conf['title'] = 'My Wiki'; + $conf['userewrite'] = 1; + ''; + description = '' + DokuWiki configuration. Refer to + <link xlink:href="https://www.dokuwiki.org/config"/> + for details on supported values. + ''; }; - description = '' - With this option, you can customize the nginx virtualHost settings. - ''; + }; + }; - }; in { # interface options = { services.dokuwiki = mkOption { - type = types.attrsOf (types.submodule siteOpts); + type = types.submodule { + # Used to support old interface + freeformType = types.attrsOf (types.submodule siteOpts); + + # New interface + options.sites = mkOption { + type = types.attrsOf (types.submodule siteOpts); + default = {}; + description = "Specification of one or more DokuWiki sites to serve"; + }; + + options.webserver = mkOption { + type = types.enum [ "nginx" "caddy" ]; + default = "nginx"; + description = '' + Whether to use nginx or caddy for virtual host management. + + Further nginx configuration can be done by adapting <literal>services.nginx.virtualHosts.<name></literal>. + See <xref linkend="opt-services.nginx.virtualHosts"/> for further information. + + Further apache2 configuration can be done by adapting <literal>services.httpd.virtualHosts.<name></literal>. + See <xref linkend="opt-services.httpd.virtualHosts"/> for further information. + ''; + }; + }; default = {}; - description = "Sepcification of one or more dokuwiki sites to serve."; + description = "DokuWiki configuration"; }; + }; # implementation - - config = mkIf (eachSite != {}) { - - warnings = mapAttrsToList (hostName: cfg: mkIf (cfg.superUser == null) "Not setting services.dokuwiki.${hostName} superUser will impair your ability to administer DokuWiki") eachSite; + config = mkIf (eachSite != {}) (mkMerge [{ assertions = flatten (mapAttrsToList (hostName: cfg: [{ assertion = cfg.aclUse -> (cfg.acl != null || cfg.aclFile != null); - message = "Either services.dokuwiki.${hostName}.acl or services.dokuwiki.${hostName}.aclFile is mandatory if aclUse true"; + message = "Either services.dokuwiki.sites.${hostName}.acl or services.dokuwiki.sites.${hostName}.aclFile is mandatory if aclUse true"; } { assertion = cfg.usersFile != null -> cfg.aclUse != false; - message = "services.dokuwiki.${hostName}.aclUse must must be true if usersFile is not null"; + message = "services.dokuwiki.sites.${hostName}.aclUse must must be true if usersFile is not null"; } ]) eachSite); + warnings = mapAttrsToList (hostName: _: ''services.dokuwiki."${hostName}" is deprecated use services.dokuwiki.sites."${hostName}"'') (oldSites cfg); + services.phpfpm.pools = mapAttrs' (hostName: cfg: ( nameValuePair "dokuwiki-${hostName}" { inherit user; - inherit group; + group = webserver.group; + phpEnv = { - DOKUWIKI_LOCAL_CONFIG = "${dokuwikiLocalConfig cfg}"; - DOKUWIKI_PLUGINS_LOCAL_CONFIG = "${dokuwikiPluginsLocalConfig cfg}"; + DOKUWIKI_LOCAL_CONFIG = "${dokuwikiLocalConfig hostName cfg}"; + DOKUWIKI_PLUGINS_LOCAL_CONFIG = "${dokuwikiPluginsLocalConfig hostName cfg}"; } // optionalAttrs (cfg.usersFile != null) { DOKUWIKI_USERS_AUTH_CONFIG = "${cfg.usersFile}"; } //optionalAttrs (cfg.aclUse) { - DOKUWIKI_ACL_AUTH_CONFIG = if (cfg.acl != null) then "${dokuwikiAclAuthConfig cfg}" else "${toString cfg.aclFile}"; + DOKUWIKI_ACL_AUTH_CONFIG = if (cfg.acl != null) then "${dokuwikiAclAuthConfig hostName cfg}" else "${toString cfg.aclFile}"; }; settings = { - "listen.mode" = "0660"; - "listen.owner" = user; - "listen.group" = group; + "listen.owner" = webserver.user; + "listen.group" = webserver.group; } // cfg.poolConfig; - })) eachSite; - - services.nginx = { - enable = true; - virtualHosts = mapAttrs (hostName: cfg: mkMerge [ cfg.nginx { - root = mkForce "${pkg hostName cfg}/share/dokuwiki"; - extraConfig = lib.optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;"; - - locations."~ /(conf/|bin/|inc/|install.php)" = { - extraConfig = "deny all;"; - }; + } + )) eachSite; - locations."~ ^/data/" = { - root = "${cfg.stateDir}"; - extraConfig = "internal;"; - }; + } - locations."~ ^/lib.*\\.(js|css|gif|png|ico|jpg|jpeg)$" = { - extraConfig = "expires 365d;"; - }; + { + systemd.tmpfiles.rules = flatten (mapAttrsToList (hostName: cfg: [ + "d ${stateDir hostName}/attic 0750 ${user} ${webserver.group} - -" + "d ${stateDir hostName}/cache 0750 ${user} ${webserver.group} - -" + "d ${stateDir hostName}/index 0750 ${user} ${webserver.group} - -" + "d ${stateDir hostName}/locks 0750 ${user} ${webserver.group} - -" + "d ${stateDir hostName}/media 0750 ${user} ${webserver.group} - -" + "d ${stateDir hostName}/media_attic 0750 ${user} ${webserver.group} - -" + "d ${stateDir hostName}/media_meta 0750 ${user} ${webserver.group} - -" + "d ${stateDir hostName}/meta 0750 ${user} ${webserver.group} - -" + "d ${stateDir hostName}/pages 0750 ${user} ${webserver.group} - -" + "d ${stateDir hostName}/tmp 0750 ${user} ${webserver.group} - -" + ] ++ lib.optional (cfg.aclFile != null) "C ${cfg.aclFile} 0640 ${user} ${webserver.group} - ${pkg hostName cfg}/share/dokuwiki/conf/acl.auth.php.dist" + ++ lib.optional (cfg.usersFile != null) "C ${cfg.usersFile} 0640 ${user} ${webserver.group} - ${pkg hostName cfg}/share/dokuwiki/conf/users.auth.php.dist" + ) eachSite); - locations."/" = { - priority = 1; - index = "doku.php"; - extraConfig = "try_files $uri $uri/ @dokuwiki;"; - }; + users.users.${user} = { + group = webserver.group; + isSystemUser = true; + }; + } - locations."@dokuwiki" = { - extraConfig = '' + (mkIf (cfg.webserver == "nginx") { + services.nginx = { + enable = true; + virtualHosts = mapAttrs (hostName: cfg: { + serverName = mkDefault hostName; + root = "${pkg hostName cfg}/share/dokuwiki"; + + locations = { + "~ /(conf/|bin/|inc/|install.php)" = { + extraConfig = "deny all;"; + }; + + "~ ^/data/" = { + root = "${stateDir hostName}"; + extraConfig = "internal;"; + }; + + "~ ^/lib.*\.(js|css|gif|png|ico|jpg|jpeg)$" = { + extraConfig = "expires 365d;"; + }; + + "/" = { + priority = 1; + index = "doku.php"; + extraConfig = ''try_files $uri $uri/ @dokuwiki;''; + }; + + "@dokuwiki" = { + extraConfig = '' # rewrites "doku.php/" out of the URLs if you set the userwrite setting to .htaccess in dokuwiki config page rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; rewrite ^/(.*) /doku.php?id=$1&$args last; - ''; - }; + ''; + }; - locations."~ \\.php$" = { - extraConfig = '' + "~ \\.php$" = { + extraConfig = '' try_files $uri $uri/ /doku.php; include ${pkgs.nginx}/conf/fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param REDIRECT_STATUS 200; fastcgi_pass unix:${config.services.phpfpm.pools."dokuwiki-${hostName}".socket}; - ${lib.optionalString (cfg.nginx.addSSL || cfg.nginx.forceSSL || cfg.nginx.onlySSL || cfg.nginx.enableACME) "fastcgi_param HTTPS on;"} - ''; + ''; + }; + }; - }]) eachSite; + }) eachSite; }; + }) - systemd.tmpfiles.rules = flatten (mapAttrsToList (hostName: cfg: [ - "d ${cfg.stateDir}/attic 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/cache 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/index 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/locks 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/media 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/media_attic 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/media_meta 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/meta 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/pages 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/tmp 0750 ${user} ${group} - -" - ] ++ lib.optional (cfg.aclFile != null) "C ${cfg.aclFile} 0640 ${user} ${group} - ${pkg hostName cfg}/share/dokuwiki/conf/acl.auth.php.dist" - ++ lib.optional (cfg.usersFile != null) "C ${cfg.usersFile} 0640 ${user} ${group} - ${pkg hostName cfg}/share/dokuwiki/conf/users.auth.php.dist" - ) eachSite); + (mkIf (cfg.webserver == "caddy") { + services.caddy = { + enable = true; + virtualHosts = mapAttrs' (hostName: cfg: ( + nameValuePair "http://${hostName}" { + extraConfig = '' + root * ${pkg hostName cfg}/share/dokuwiki + file_server - users.users.${user} = { - group = group; - isSystemUser = true; + encode zstd gzip + php_fastcgi unix/${config.services.phpfpm.pools."dokuwiki-${hostName}".socket} + + @restrict_files { + path /data/* /conf/* /bin/* /inc/* /vendor/* /install.php + } + + respond @restrict_files 404 + + @allow_media { + path_regexp path ^/_media/(.*)$ + } + rewrite @allow_media /lib/exe/fetch.php?media=/{http.regexp.path.1} + + @allow_detail { + path /_detail* + } + rewrite @allow_detail /lib/exe/detail.php?media={path} + + @allow_export { + path /_export* + path_regexp export /([^/]+)/(.*) + } + rewrite @allow_export /doku.php?do=export_{http.regexp.export.1}&id={http.regexp.export.2} + + try_files {path} {path}/ /doku.php?id={path}&{query} + ''; + } + )) eachSite; }; - }; + }) - meta.maintainers = with maintainers; [ _1000101 ]; + ]); + meta.maintainers = with maintainers; [ + _1000101 + onny + ]; } diff --git a/nixpkgs/nixos/modules/services/web-apps/mastodon.nix b/nixpkgs/nixos/modules/services/web-apps/mastodon.nix index 5e24bd06ffdb..5bda7d5a5dd2 100644 --- a/nixpkgs/nixos/modules/services/web-apps/mastodon.nix +++ b/nixpkgs/nixos/modules/services/web-apps/mastodon.nix @@ -9,6 +9,13 @@ let RAILS_ENV = "production"; NODE_ENV = "production"; + # mastodon-web concurrency. + WEB_CONCURRENCY = toString cfg.webProcesses; + MAX_THREADS = toString cfg.webThreads; + + # mastodon-streaming concurrency. + STREAMING_CLUSTER_NUM = toString cfg.streamingProcesses; + DB_USER = cfg.database.user; REDIS_HOST = cfg.redis.host; @@ -146,18 +153,41 @@ in { type = lib.types.port; default = 55000; }; + streamingProcesses = lib.mkOption { + description = '' + Processes used by the mastodon-streaming service. + Defaults to the number of CPU cores minus one. + ''; + type = lib.types.nullOr lib.types.int; + default = null; + }; webPort = lib.mkOption { description = "TCP port used by the mastodon-web service."; type = lib.types.port; default = 55001; }; + webProcesses = lib.mkOption { + description = "Processes used by the mastodon-web service."; + type = lib.types.int; + default = 2; + }; + webThreads = lib.mkOption { + description = "Threads per process used by the mastodon-web service."; + type = lib.types.int; + default = 5; + }; sidekiqPort = lib.mkOption { - description = "TCP port used by the mastodon-sidekiq service"; + description = "TCP port used by the mastodon-sidekiq service."; type = lib.types.port; default = 55002; }; + sidekiqThreads = lib.mkOption { + description = "Worker threads used by the mastodon-sidekiq service."; + type = lib.types.int; + default = 25; + }; vapidPublicKeyFile = lib.mkOption { description = '' @@ -524,9 +554,10 @@ in { wantedBy = [ "multi-user.target" ]; environment = env // { PORT = toString(cfg.sidekiqPort); + DB_POOL = toString cfg.sidekiqThreads; }; serviceConfig = { - ExecStart = "${cfg.package}/bin/sidekiq -c 25 -r ${cfg.package}"; + ExecStart = "${cfg.package}/bin/sidekiq -c ${toString cfg.sidekiqThreads} -r ${cfg.package}"; Restart = "always"; RestartSec = 20; EnvironmentFile = "/var/lib/mastodon/.secrets_env"; diff --git a/nixpkgs/nixos/modules/services/web-apps/node-red.nix b/nixpkgs/nixos/modules/services/web-apps/node-red.nix index 4f6850ace214..400790576d67 100644 --- a/nixpkgs/nixos/modules/services/web-apps/node-red.nix +++ b/nixpkgs/nixos/modules/services/web-apps/node-red.nix @@ -114,6 +114,7 @@ in users.users = optionalAttrs (cfg.user == defaultUser) { ${defaultUser} = { isSystemUser = true; + group = defaultUser; }; }; diff --git a/nixpkgs/nixos/modules/services/web-apps/wordpress.nix b/nixpkgs/nixos/modules/services/web-apps/wordpress.nix index 6f1ef815bc46..eb91256045cc 100644 --- a/nixpkgs/nixos/modules/services/web-apps/wordpress.nix +++ b/nixpkgs/nixos/modules/services/web-apps/wordpress.nix @@ -278,7 +278,7 @@ in }; options.webserver = mkOption { - type = types.enum [ "httpd" "nginx" ]; + type = types.enum [ "httpd" "nginx" "caddy" ]; default = "httpd"; description = '' Whether to use apache2 or nginx for virtual host management. @@ -458,5 +458,32 @@ in }; }) + (mkIf (cfg.webserver == "caddy") { + services.caddy = { + enable = true; + virtualHosts = mapAttrs' (hostName: cfg: ( + nameValuePair "http://${hostName}" { + extraConfig = '' + root * /${pkg hostName cfg}/share/wordpress + file_server + + php_fastcgi unix/${config.services.phpfpm.pools."wordpress-${hostName}".socket} + + @uploads { + path_regexp path /uploads\/(.*)\.php + } + rewrite @uploads / + + @wp-admin { + path not ^\/wp-admin/* + } + rewrite @wp-admin {path}/index.php?{query} + ''; + } + )) eachSite; + }; + }) + + ]); } diff --git a/nixpkgs/nixos/modules/services/web-servers/trafficserver.nix b/nixpkgs/nixos/modules/services/web-servers/trafficserver/default.nix index db0e2ac0bd05..341e8b13976a 100644 --- a/nixpkgs/nixos/modules/services/web-servers/trafficserver.nix +++ b/nixpkgs/nixos/modules/services/web-servers/trafficserver/default.nix @@ -8,21 +8,9 @@ let group = config.users.groups.trafficserver.name; getManualUrl = name: "https://docs.trafficserver.apache.org/en/latest/admin-guide/files/${name}.en.html"; - getConfPath = name: "${pkgs.trafficserver}/etc/trafficserver/${name}"; yaml = pkgs.formats.yaml { }; - fromYAML = f: - let - jsonFile = pkgs.runCommand "in.json" - { - nativeBuildInputs = [ pkgs.remarshal ]; - } '' - yaml2json < "${f}" > "$out" - ''; - in - builtins.fromJSON (builtins.readFile jsonFile); - mkYamlConf = name: cfg: if cfg != null then { "trafficserver/${name}.yaml".source = yaml.generate "${name}.yaml" cfg; @@ -73,7 +61,7 @@ in ipAllow = mkOption { type = types.nullOr yaml.type; - default = fromYAML (getConfPath "ip_allow.yaml"); + default = builtins.fromJSON (builtins.readFile ./ip_allow.json); defaultText = "upstream defaults"; example = literalExample { ip_allow = [{ @@ -94,7 +82,7 @@ in logging = mkOption { type = types.nullOr yaml.type; - default = fromYAML (getConfPath "logging.yaml"); + default = builtins.fromJSON (builtins.readFile ./logging.json); defaultText = "upstream defaults"; example = literalExample { }; description = '' diff --git a/nixpkgs/nixos/modules/services/web-servers/trafficserver/ip_allow.json b/nixpkgs/nixos/modules/services/web-servers/trafficserver/ip_allow.json new file mode 100644 index 000000000000..fc2db8037286 --- /dev/null +++ b/nixpkgs/nixos/modules/services/web-servers/trafficserver/ip_allow.json @@ -0,0 +1,36 @@ +{ + "ip_allow": [ + { + "apply": "in", + "ip_addrs": "127.0.0.1", + "action": "allow", + "methods": "ALL" + }, + { + "apply": "in", + "ip_addrs": "::1", + "action": "allow", + "methods": "ALL" + }, + { + "apply": "in", + "ip_addrs": "0/0", + "action": "deny", + "methods": [ + "PURGE", + "PUSH", + "DELETE" + ] + }, + { + "apply": "in", + "ip_addrs": "::/0", + "action": "deny", + "methods": [ + "PURGE", + "PUSH", + "DELETE" + ] + } + ] +} diff --git a/nixpkgs/nixos/modules/services/web-servers/trafficserver/logging.json b/nixpkgs/nixos/modules/services/web-servers/trafficserver/logging.json new file mode 100644 index 000000000000..81e7ba0186c6 --- /dev/null +++ b/nixpkgs/nixos/modules/services/web-servers/trafficserver/logging.json @@ -0,0 +1,37 @@ +{ + "logging": { + "formats": [ + { + "name": "welf", + "format": "id=firewall time=\"%<cqtd> %<cqtt>\" fw=%<phn> pri=6 proto=%<cqus> duration=%<ttmsf> sent=%<psql> rcvd=%<cqhl> src=%<chi> dst=%<shi> dstname=%<shn> user=%<caun> op=%<cqhm> arg=\"%<cqup>\" result=%<pssc> ref=\"%<{Referer}cqh>\" agent=\"%<{user-agent}cqh>\" cache=%<crc>" + }, + { + "name": "squid_seconds_only_timestamp", + "format": "%<cqts> %<ttms> %<chi> %<crc>/%<pssc> %<psql> %<cqhm> %<cquc> %<caun> %<phr>/%<shn> %<psct>" + }, + { + "name": "squid", + "format": "%<cqtq> %<ttms> %<chi> %<crc>/%<pssc> %<psql> %<cqhm> %<cquc> %<caun> %<phr>/%<shn> %<psct>" + }, + { + "name": "common", + "format": "%<chi> - %<caun> [%<cqtn>] \"%<cqtx>\" %<pssc> %<pscl>" + }, + { + "name": "extended", + "format": "%<chi> - %<caun> [%<cqtn>] \"%<cqtx>\" %<pssc> %<pscl> %<sssc> %<sscl> %<cqcl> %<pqcl> %<cqhl> %<pshl> %<pqhl> %<sshl> %<tts>" + }, + { + "name": "extended2", + "format": "%<chi> - %<caun> [%<cqtn>] \"%<cqtx>\" %<pssc> %<pscl> %<sssc> %<sscl> %<cqcl> %<pqcl> %<cqhl> %<pshl> %<pqhl> %<sshl> %<tts> %<phr> %<cfsc> %<pfsc> %<crc>" + } + ], + "logs": [ + { + "filename": "squid", + "format": "squid", + "mode": "binary" + } + ] + } +} diff --git a/nixpkgs/nixos/modules/services/web-servers/zope2.nix b/nixpkgs/nixos/modules/services/web-servers/zope2.nix index 3abd506827c0..ab12e87502eb 100644 --- a/nixpkgs/nixos/modules/services/web-servers/zope2.nix +++ b/nixpkgs/nixos/modules/services/web-servers/zope2.nix @@ -103,7 +103,11 @@ in config = mkIf (cfg.instances != {}) { - users.users.zope2.uid = config.ids.uids.zope2; + users.users.zope2 = { + isSystemUser = true; + group = "zope2"; + }; + users.groups.zope2 = {}; systemd.services = let diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/cde.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/cde.nix index 3f1575a0ca63..24ca82fca796 100644 --- a/nixpkgs/nixos/modules/services/x11/desktop-managers/cde.nix +++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/cde.nix @@ -49,9 +49,10 @@ in { users.groups.mail = {}; security.wrappers = { dtmail = { - source = "${pkgs.cdesktopenv}/bin/dtmail"; - group = "mail"; setgid = true; + owner = "nobody"; + group = "mail"; + source = "${pkgs.cdesktopenv}/bin/dtmail"; }; }; diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 3a7ab64510b5..e3d876e82fdd 100644 --- a/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -65,9 +65,24 @@ in # Wrappers for programs installed by enlightenment that should be setuid security.wrappers = { - enlightenment_ckpasswd.source = "${pkgs.enlightenment.enlightenment}/lib/enlightenment/utils/enlightenment_ckpasswd"; - enlightenment_sys.source = "${pkgs.enlightenment.enlightenment}/lib/enlightenment/utils/enlightenment_sys"; - enlightenment_system.source = "${pkgs.enlightenment.enlightenment}/lib/enlightenment/utils/enlightenment_system"; + enlightenment_ckpasswd = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.enlightenment.enlightenment}/lib/enlightenment/utils/enlightenment_ckpasswd"; + }; + enlightenment_sys = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.enlightenment.enlightenment}/lib/enlightenment/utils/enlightenment_sys"; + }; + enlightenment_system = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.enlightenment.enlightenment}/lib/enlightenment/utils/enlightenment_system"; + }; }; environment.etc."X11/xkb".source = xcfg.xkbDir; diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix index 4bc42525906c..9bb671adbecf 100644 --- a/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -476,6 +476,8 @@ in (mkIf serviceCfg.experimental-features.realtime-scheduling { security.wrappers.".gnome-shell-wrapped" = { source = "${pkgs.gnome.gnome-shell}/bin/.gnome-shell-wrapped"; + owner = "root"; + group = "root"; capabilities = "cap_sys_nice=ep"; }; diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix index e492073b80ff..887d6c91e83b 100644 --- a/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -18,7 +18,7 @@ in meta = { doc = ./pantheon.xml; - maintainers = pkgs.pantheon.maintainers; + maintainers = teams.pantheon.members; }; options = { @@ -134,6 +134,9 @@ in services.accounts-daemon.enable = true; services.bamf.enable = true; services.colord.enable = mkDefault true; + services.fwupd.enable = mkDefault true; + services.touchegg.enable = mkDefault true; + services.touchegg.package = pkgs.pantheon.touchegg; services.tumbler.enable = mkDefault true; services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); services.dbus.packages = with pkgs.pantheon; [ @@ -162,12 +165,11 @@ in isAllowed = true; isSystem = true; }; - # Use gnome-settings-daemon fork services.udev.packages = [ - pkgs.pantheon.elementary-settings-daemon + pkgs.gnome.gnome-settings-daemon338 ]; systemd.packages = [ - pkgs.pantheon.elementary-settings-daemon + pkgs.gnome.gnome-settings-daemon338 ]; programs.dconf.enable = true; networking.networkmanager.enable = mkDefault true; @@ -180,7 +182,6 @@ in gnome.adwaita-icon-theme gtk3.out hicolor-icon-theme - lightlocker onboard qgnomeplatform shared-mime-info @@ -208,15 +209,13 @@ in # Services elementary-capnet-assist - elementary-dpms-helper elementary-notifications elementary-settings-daemon pantheon-agent-geoclue2 pantheon-agent-polkit ]) ++ (gnome.removePackagesByName [ - gnome.geary - gnome.epiphany gnome.gnome-font-viewer + gnome.gnome-settings-daemon338 ] config.environment.pantheon.excludePackages); programs.evince.enable = mkDefault true; @@ -224,9 +223,12 @@ in # Settings from elementary-default-settings environment.sessionVariables.GTK_CSD = "1"; - environment.sessionVariables.GTK3_MODULES = [ "pantheon-filechooser-module" ]; environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini"; + xdg.portal.extraPortals = [ + pkgs.pantheon.elementary-files + ]; + # Override GSettings schemas environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; @@ -254,6 +256,8 @@ in # Default Fonts fonts.fonts = with pkgs; [ + inter + open-dyslexic open-sans roboto-mono ]; @@ -271,14 +275,16 @@ in elementary-camera elementary-code elementary-files + elementary-mail elementary-music elementary-photos - elementary-screenshot-tool + elementary-screenshot elementary-terminal elementary-videos + epiphany ] config.environment.pantheon.excludePackages); - # needed by screenshot-tool + # needed by screenshot fonts.fonts = [ pkgs.pantheon.elementary-redacted-script ]; diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.xml b/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.xml index 7905ceebd9aa..fe0a1c496223 100644 --- a/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.xml +++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.xml @@ -22,7 +22,7 @@ <programlisting> <xref linkend="opt-services.pantheon.apps.enable"/> = false; </programlisting> - You can also use <xref linkend="opt-environment.pantheon.excludePackages"/> to remove any other app (like <package>geary</package>). + You can also use <xref linkend="opt-environment.pantheon.excludePackages"/> to remove any other app (like <package>elementary-mail</package>). </para> </section> <section xml:id="sec-pantheon-wingpanel-switchboard"> @@ -105,8 +105,14 @@ switchboard-with-plugs.override { </term> <listitem> <para> - AppCenter has been available since 20.03, but it is of little use. This is because there is no functioning PackageKit backend for Nix 2.0. In the near future you will be able to install Flatpak applications from AppCenter on NixOS. See this <link xlink:href="https://github.com/NixOS/nixpkgs/issues/70214">issue</link>. + AppCenter has been available since 20.03, but it is of little use. This is because there is no functioning PackageKit backend for Nix 2.0. Starting from 21.11, the Flatpak backend should work so you can install some Flatpak applications using it. See this <link xlink:href="https://github.com/NixOS/nixpkgs/issues/70214">issue</link>. </para> + <para> + To use AppCenter on NixOS, add <literal>pantheon.appcenter</literal> to <xref linkend="opt-environment.systemPackages" />, <link linkend="module-services-flatpak">enable Flatpak support</link> and optionally add the <literal>appcenter</literal> Flatpak remote: + </para> +<screen> +<prompt>$ </prompt>flatpak remote-add --if-not-exists appcenter https://flatpak.elementary.io/repo.flatpakrepo +</screen> </listitem> </varlistentry> </variablelist> diff --git a/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix index aac905fea437..d8dc2675f068 100644 --- a/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -197,12 +197,24 @@ in }; security.wrappers = { - kcheckpass.source = "${lib.getBin libsForQt5.kscreenlocker}/libexec/kcheckpass"; - start_kdeinit.source = "${lib.getBin libsForQt5.kinit}/libexec/kf5/start_kdeinit"; - kwin_wayland = { - source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland"; - capabilities = "cap_sys_nice+ep"; - }; + kcheckpass = + { setuid = true; + owner = "root"; + group = "root"; + source = "${lib.getBin libsForQt5.kscreenlocker}/libexec/kcheckpass"; + }; + start_kdeinit = + { setuid = true; + owner = "root"; + group = "root"; + source = "${lib.getBin libsForQt5.kinit}/libexec/kf5/start_kdeinit"; + }; + kwin_wayland = + { owner = "root"; + group = "root"; + capabilities = "cap_sys_nice+ep"; + source = "${lib.getBin plasma5.kwin}/bin/kwin_wayland"; + }; }; # DDC support diff --git a/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix b/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix index 5c4c6c67fd02..3df576038a9f 100644 --- a/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix @@ -174,9 +174,6 @@ in "systemd-machined.service" # setSessionScript wants AccountsService "accounts-daemon.service" - # Failed to open gpu '/dev/dri/card0': GDBus.Error:org.freedesktop.DBus.Error.AccessDenied: Operation not permitted - # https://github.com/NixOS/nixpkgs/pull/25311#issuecomment-609417621 - "systemd-udev-settle.service" ]; systemd.services.display-manager.after = [ @@ -186,7 +183,6 @@ in "getty@tty${gdm.initialVT}.service" "plymouth-quit.service" "plymouth-start.service" - "systemd-udev-settle.service" ]; systemd.services.display-manager.conflicts = [ "getty@tty${gdm.initialVT}.service" diff --git a/nixpkgs/nixos/modules/services/x11/extra-layouts.nix b/nixpkgs/nixos/modules/services/x11/extra-layouts.nix index 0e2edc6a5309..b1c4e04975f9 100644 --- a/nixpkgs/nixos/modules/services/x11/extra-layouts.nix +++ b/nixpkgs/nixos/modules/services/x11/extra-layouts.nix @@ -79,6 +79,10 @@ let }; }; + xkb_patched = pkgs.xorg.xkeyboardconfig_custom { + layouts = config.services.xserver.extraLayouts; + }; + in { @@ -114,58 +118,14 @@ in config = mkIf (layouts != { }) { - # We don't override xkeyboard_config directly to - # reduce the amount of packages to be recompiled. - # Only the following packages are necessary to set - # a custom layout anyway: - nixpkgs.overlays = lib.singleton (self: super: { - - xkb_patched = self.xorg.xkeyboardconfig_custom { - layouts = config.services.xserver.extraLayouts; - }; - - xorg = super.xorg // { - xorgserver = super.xorg.xorgserver.overrideAttrs (old: { - configureFlags = old.configureFlags ++ [ - "--with-xkb-bin-directory=${self.xorg.xkbcomp}/bin" - "--with-xkb-path=${self.xkb_patched}/share/X11/xkb" - ]; - }); - - setxkbmap = super.xorg.setxkbmap.overrideAttrs (old: { - postInstall = - '' - mkdir -p $out/share - ln -sfn ${self.xkb_patched}/etc/X11 $out/share/X11 - ''; - }); - - xkbcomp = super.xorg.xkbcomp.overrideAttrs (old: { - configureFlags = [ "--with-xkb-config-root=${self.xkb_patched}/share/X11/xkb" ]; - }); - - }; - - ckbcomp = super.ckbcomp.override { - xkeyboard_config = self.xkb_patched; - }; - - xkbvalidate = super.xkbvalidate.override { - libxkbcommon = self.libxkbcommon.override { - xkeyboard_config = self.xkb_patched; - }; - }; - - }); - environment.sessionVariables = { # runtime override supported by multiple libraries e. g. libxkbcommon # https://xkbcommon.org/doc/current/group__include-path.html - XKB_CONFIG_ROOT = "${pkgs.xkb_patched}/etc/X11/xkb"; + XKB_CONFIG_ROOT = "${xkb_patched}/etc/X11/xkb"; }; services.xserver = { - xkbDir = "${pkgs.xkb_patched}/etc/X11/xkb"; + xkbDir = "${xkb_patched}/etc/X11/xkb"; exportConfiguration = config.services.xserver.displayManager.startx.enable || config.services.xserver.displayManager.sx.enable; }; diff --git a/nixpkgs/nixos/modules/services/x11/hardware/libinput.nix b/nixpkgs/nixos/modules/services/x11/hardware/libinput.nix index 439708bc47ed..e2fb7d0918e3 100644 --- a/nixpkgs/nixos/modules/services/x11/hardware/libinput.nix +++ b/nixpkgs/nixos/modules/services/x11/hardware/libinput.nix @@ -163,6 +163,15 @@ let cfg = config.services.xserver.libinput; ''; }; + transformationMatrix = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + A string of 9 space-separated floating point numbers. Sets the transformation matrix to + the 3x3 matrix where the first row is (abc), the second row is (def) and the third row is (ghi). + ''; + }; + disableWhileTyping = mkOption { type = types.bool; default = false; @@ -196,6 +205,7 @@ let cfg = config.services.xserver.libinput; ${optionalString (cfg.${deviceType}.accelSpeed != null) ''Option "AccelSpeed" "${cfg.${deviceType}.accelSpeed}"''} ${optionalString (cfg.${deviceType}.buttonMapping != null) ''Option "ButtonMapping" "${cfg.${deviceType}.buttonMapping}"''} ${optionalString (cfg.${deviceType}.calibrationMatrix != null) ''Option "CalibrationMatrix" "${cfg.${deviceType}.calibrationMatrix}"''} + ${optionalString (cfg.${deviceType}.transformationMatrix != null) ''Option "TransformationMatrix" "${cfg.${deviceType}.transformationMatrix}"''} ${optionalString (cfg.${deviceType}.clickMethod != null) ''Option "ClickMethod" "${cfg.${deviceType}.clickMethod}"''} Option "LeftHanded" "${xorgBool cfg.${deviceType}.leftHanded}" Option "MiddleEmulation" "${xorgBool cfg.${deviceType}.middleEmulation}" @@ -227,6 +237,7 @@ in { "sendEventsMode" "tapping" "tappingDragLock" + "transformationMatrix" "disableWhileTyping" "additionalOptions" ]); diff --git a/nixpkgs/nixos/modules/services/x11/touchegg.nix b/nixpkgs/nixos/modules/services/x11/touchegg.nix new file mode 100644 index 000000000000..fab7fac3f017 --- /dev/null +++ b/nixpkgs/nixos/modules/services/x11/touchegg.nix @@ -0,0 +1,38 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let cfg = config.services.touchegg; + +in { + meta = { + maintainers = teams.pantheon.members; + }; + + ###### interface + options.services.touchegg = { + enable = mkEnableOption "touchegg, a multi-touch gesture recognizer"; + + package = mkOption { + type = types.package; + default = pkgs.touchegg; + defaultText = "pkgs.touchegg"; + description = "touchegg derivation to use."; + }; + }; + + ###### implementation + config = mkIf cfg.enable { + systemd.services.touchegg = { + description = "Touchegg Daemon"; + serviceConfig = { + Type = "simple"; + ExecStart = "${cfg.package}/bin/touchegg --daemon"; + Restart = "on-failure"; + }; + wantedBy = [ "multi-user.target" ]; + }; + + environment.systemPackages = [ cfg.package ]; + }; +} diff --git a/nixpkgs/nixos/modules/services/x11/xserver.nix b/nixpkgs/nixos/modules/services/x11/xserver.nix index ad9bd88f98aa..ee190ac3cc44 100644 --- a/nixpkgs/nixos/modules/services/x11/xserver.nix +++ b/nixpkgs/nixos/modules/services/x11/xserver.nix @@ -738,6 +738,9 @@ in nativeBuildInputs = with pkgs.buildPackages; [ xkbvalidate ]; preferLocalBuild = true; } '' + ${optionalString (config.environment.sessionVariables ? XKB_CONFIG_ROOT) + "export XKB_CONFIG_ROOT=${config.environment.sessionVariables.XKB_CONFIG_ROOT}" + } xkbvalidate "$xkbModel" "$layout" "$xkbVariant" "$xkbOptions" touch "$out" ''); diff --git a/nixpkgs/nixos/modules/system/activation/activation-script.nix b/nixpkgs/nixos/modules/system/activation/activation-script.nix index 548b4de852b7..704fc15fe207 100644 --- a/nixpkgs/nixos/modules/system/activation/activation-script.nix +++ b/nixpkgs/nixos/modules/system/activation/activation-script.nix @@ -18,8 +18,17 @@ let }); systemActivationScript = set: onlyDry: let - set' = filterAttrs (_: v: onlyDry -> v.supportsDryActivation) (mapAttrs (_: v: if isString v then (noDepEntry v) // { supportsDryActivation = false; } else v) set); + set' = mapAttrs (_: v: if isString v then (noDepEntry v) // { supportsDryActivation = false; } else v) set; withHeadlines = addAttributeName set'; + # When building a dry activation script, this replaces all activation scripts + # that do not support dry mode with a comment that does nothing. Filtering these + # activation scripts out so they don't get generated into the dry activation script + # does not work because when an activation script that supports dry mode depends on + # an activation script that does not, the dependency cannot be resolved and the eval + # fails. + withDrySnippets = mapAttrs (a: v: if onlyDry && !v.supportsDryActivation then v // { + text = "#### Activation script snippet ${a} does not support dry activation."; + } else v) withHeadlines; in '' #!${pkgs.runtimeShell} @@ -37,7 +46,7 @@ let # Ensure a consistent umask. umask 0022 - ${textClosureMap id (withHeadlines) (attrNames withHeadlines)} + ${textClosureMap id (withDrySnippets) (attrNames withDrySnippets)} '' + optionalString (!onlyDry) '' # Make this configuration the current configuration. @@ -254,6 +263,7 @@ in script = config.system.userActivationScripts.script; unitConfig.ConditionUser = "!@system"; serviceConfig.Type = "oneshot"; + wantedBy = [ "default.target" ]; }; }; }; diff --git a/nixpkgs/nixos/modules/system/activation/top-level.nix b/nixpkgs/nixos/modules/system/activation/top-level.nix index 616e1422aa8c..dad9acba91af 100644 --- a/nixpkgs/nixos/modules/system/activation/top-level.nix +++ b/nixpkgs/nixos/modules/system/activation/top-level.nix @@ -61,8 +61,8 @@ let substituteInPlace $out/dry-activate --subst-var out chmod u+x $out/activate $out/dry-activate unset activationScript dryActivationScript - ${pkgs.runtimeShell} -n $out/activate - ${pkgs.runtimeShell} -n $out/dry-activate + ${pkgs.stdenv.shell} -n $out/activate + ${pkgs.stdenv.shell} -n $out/dry-activate cp ${config.system.build.bootStage2} $out/init substituteInPlace $out/init --subst-var-by systemConfig $out diff --git a/nixpkgs/nixos/modules/system/boot/kernel.nix b/nixpkgs/nixos/modules/system/boot/kernel.nix index 1a6a9d99d5bb..15a5fd236092 100644 --- a/nixpkgs/nixos/modules/system/boot/kernel.nix +++ b/nixpkgs/nixos/modules/system/boot/kernel.nix @@ -47,7 +47,7 @@ in # We don't want to evaluate all of linuxPackages for the manual # - some of it might not even evaluate correctly. defaultText = "pkgs.linuxPackages"; - example = literalExample "pkgs.linuxPackages_2_6_25"; + example = literalExample "pkgs.linuxKernel.packages.linux_5_10"; description = '' This option allows you to override the Linux kernel used by NixOS. Since things like external kernel module packages are diff --git a/nixpkgs/nixos/modules/system/boot/networkd.nix b/nixpkgs/nixos/modules/system/boot/networkd.nix index 1de58b3d2c4a..bf254be1341b 100644 --- a/nixpkgs/nixos/modules/system/boot/networkd.nix +++ b/nixpkgs/nixos/modules/system/boot/networkd.nix @@ -384,6 +384,7 @@ let "AllMulticast" "Unmanaged" "RequiredForOnline" + "ActivationPolicy" ]) (assertMacAddress "MACAddress") (assertByteFormat "MTUBytes") @@ -402,6 +403,14 @@ let "enslaved" "routable" ])) + (assertValueOneOf "ActivationPolicy" ([ + "up" + "always-up" + "manual" + "always-down" + "down" + "bound" + ])) ]; sectionNetwork = checkUnitConfig "Network" [ diff --git a/nixpkgs/nixos/modules/system/boot/systemd.nix b/nixpkgs/nixos/modules/system/boot/systemd.nix index 644ee9d2e46a..f4413188187e 100644 --- a/nixpkgs/nixos/modules/system/boot/systemd.nix +++ b/nixpkgs/nixos/modules/system/boot/systemd.nix @@ -1056,10 +1056,20 @@ in services.dbus.enable = true; - users.users.systemd-coredump.uid = config.ids.uids.systemd-coredump; - users.users.systemd-network.uid = config.ids.uids.systemd-network; + users.users.systemd-coredump = { + uid = config.ids.uids.systemd-coredump; + group = "systemd-coredump"; + }; + users.groups.systemd-coredump = {}; + users.users.systemd-network = { + uid = config.ids.uids.systemd-network; + group = "systemd-network"; + }; users.groups.systemd-network.gid = config.ids.gids.systemd-network; - users.users.systemd-resolve.uid = config.ids.uids.systemd-resolve; + users.users.systemd-resolve = { + uid = config.ids.uids.systemd-resolve; + group = "systemd-resolve"; + }; users.groups.systemd-resolve.gid = config.ids.gids.systemd-resolve; # Target for ‘charon send-keys’ to hook into. diff --git a/nixpkgs/nixos/modules/system/boot/tmp.nix b/nixpkgs/nixos/modules/system/boot/tmp.nix index 5bb299adb15f..6edafd6695b6 100644 --- a/nixpkgs/nixos/modules/system/boot/tmp.nix +++ b/nixpkgs/nixos/modules/system/boot/tmp.nix @@ -2,6 +2,9 @@ with lib; +let + cfg = config.boot; +in { ###### interface @@ -24,18 +27,28 @@ with lib; ''; }; + boot.tmpOnTmpfsSize = mkOption { + type = types.oneOf [ types.str types.types.ints.positive ]; + default = "50%"; + description = '' + Size of tmpfs in percentage. + Percentage is defined by systemd. + ''; + }; + }; ###### implementation config = { - systemd.mounts = mkIf config.boot.tmpOnTmpfs [ + # When changing remember to update /tmp mount in virtualisation/qemu-vm.nix + systemd.mounts = mkIf cfg.tmpOnTmpfs [ { what = "tmpfs"; where = "/tmp"; type = "tmpfs"; - mountConfig.Options = [ "mode=1777" "strictatime" "rw" "nosuid" "nodev" "size=50%" ]; + mountConfig.Options = [ "mode=1777" "strictatime" "rw" "nosuid" "nodev" "size=${toString cfg.tmpOnTmpfsSize}" ]; } ]; diff --git a/nixpkgs/nixos/modules/tasks/filesystems/ecryptfs.nix b/nixpkgs/nixos/modules/tasks/filesystems/ecryptfs.nix index 12a407cabbfb..8138e6591610 100644 --- a/nixpkgs/nixos/modules/tasks/filesystems/ecryptfs.nix +++ b/nixpkgs/nixos/modules/tasks/filesystems/ecryptfs.nix @@ -7,8 +7,18 @@ with lib; config = mkIf (any (fs: fs == "ecryptfs") config.boot.supportedFilesystems) { system.fsPackages = [ pkgs.ecryptfs ]; security.wrappers = { - "mount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private"; - "umount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private"; + "mount.ecryptfs_private" = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private"; + }; + "umount.ecryptfs_private" = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private"; + }; }; }; } diff --git a/nixpkgs/nixos/modules/tasks/network-interfaces.nix b/nixpkgs/nixos/modules/tasks/network-interfaces.nix index 8f9c66b01572..d934e3cf0224 100644 --- a/nixpkgs/nixos/modules/tasks/network-interfaces.nix +++ b/nixpkgs/nixos/modules/tasks/network-interfaces.nix @@ -1133,11 +1133,16 @@ in # kernel because we need the ambient capability security.wrappers = if (versionAtLeast (getVersion config.boot.kernelPackages.kernel) "4.3") then { ping = { - source = "${pkgs.iputils.out}/bin/ping"; + owner = "root"; + group = "root"; capabilities = "cap_net_raw+p"; + source = "${pkgs.iputils.out}/bin/ping"; }; } else { - ping.source = "${pkgs.iputils.out}/bin/ping"; + setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.iputils.out}/bin/ping"; }; security.apparmor.policies."bin.ping".profile = lib.mkIf config.security.apparmor.policies."bin.ping".enable (lib.mkAfter '' /run/wrappers/bin/ping { diff --git a/nixpkgs/nixos/modules/virtualisation/containerd.nix b/nixpkgs/nixos/modules/virtualisation/containerd.nix index 43cb6273f253..898a66e7b04e 100644 --- a/nixpkgs/nixos/modules/virtualisation/containerd.nix +++ b/nixpkgs/nixos/modules/virtualisation/containerd.nix @@ -53,8 +53,11 @@ in virtualisation.containerd = { args.config = toString containerdConfigChecked; settings = { - plugins.cri.containerd.snapshotter = lib.mkIf config.boot.zfs.enabled "zfs"; - plugins.cri.cni.bin_dir = lib.mkDefault "${pkgs.cni-plugins}/bin"; + plugins."io.containerd.grpc.v1.cri" = { + containerd.snapshotter = + lib.mkIf config.boot.zfs.enabled (lib.mkOptionDefault "zfs"); + cni.bin_dir = lib.mkOptionDefault "${pkgs.cni-plugins}/bin"; + }; }; }; diff --git a/nixpkgs/nixos/modules/virtualisation/libvirtd.nix b/nixpkgs/nixos/modules/virtualisation/libvirtd.nix index f45f1802d91c..3c291397a998 100644 --- a/nixpkgs/nixos/modules/virtualisation/libvirtd.nix +++ b/nixpkgs/nixos/modules/virtualisation/libvirtd.nix @@ -183,6 +183,9 @@ in { }; security.wrappers.qemu-bridge-helper = { + setuid = true; + owner = "root"; + group = "root"; source = "/run/${dirName}/nix-helpers/qemu-bridge-helper"; }; diff --git a/nixpkgs/nixos/modules/virtualisation/lxd.nix b/nixpkgs/nixos/modules/virtualisation/lxd.nix index cde29f7bf59c..6732e244369f 100644 --- a/nixpkgs/nixos/modules/virtualisation/lxd.nix +++ b/nixpkgs/nixos/modules/virtualisation/lxd.nix @@ -158,7 +158,7 @@ in { }; }; - users.groups.lxd.gid = config.ids.gids.lxd; + users.groups.lxd = {}; users.users.root = { subUidRanges = [ { startUid = 1000000; count = 65536; } ]; diff --git a/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix b/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix index d9935bcafb71..b51c29f83d6d 100644 --- a/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix @@ -686,7 +686,7 @@ in fsType = "tmpfs"; neededForBoot = true; # Sync with systemd's tmp.mount; - options = [ "mode=1777" "strictatime" "nosuid" "nodev" ]; + options = [ "mode=1777" "strictatime" "nosuid" "nodev" "size=${toString config.boot.tmpOnTmpfsSize}" ]; }; "/tmp/xchg" = { device = "xchg"; diff --git a/nixpkgs/nixos/modules/virtualisation/spice-usb-redirection.nix b/nixpkgs/nixos/modules/virtualisation/spice-usb-redirection.nix index 4168cebe79b1..255327f2622c 100644 --- a/nixpkgs/nixos/modules/virtualisation/spice-usb-redirection.nix +++ b/nixpkgs/nixos/modules/virtualisation/spice-usb-redirection.nix @@ -14,9 +14,11 @@ config = lib.mkIf config.virtualisation.spiceUSBRedirection.enable { environment.systemPackages = [ pkgs.spice-gtk ]; # For polkit actions - security.wrappers.spice-client-glib-usb-acl-helper ={ - source = "${pkgs.spice-gtk}/bin/spice-client-glib-usb-acl-helper"; + security.wrappers.spice-client-glib-usb-acl-helper = { + owner = "root"; + group = "root"; capabilities = "cap_fowner+ep"; + source = "${pkgs.spice-gtk}/bin/spice-client-glib-usb-acl-helper"; }; }; diff --git a/nixpkgs/nixos/modules/virtualisation/vmware-guest.nix b/nixpkgs/nixos/modules/virtualisation/vmware-guest.nix index 9465a8d6800d..7b25ffc440f8 100644 --- a/nixpkgs/nixos/modules/virtualisation/vmware-guest.nix +++ b/nixpkgs/nixos/modules/virtualisation/vmware-guest.nix @@ -37,6 +37,28 @@ in serviceConfig.ExecStart = "${open-vm-tools}/bin/vmtoolsd"; }; + # Mount the vmblock for drag-and-drop and copy-and-paste. + systemd.mounts = [ + { + description = "VMware vmblock fuse mount"; + documentation = [ "https://github.com/vmware/open-vm-tools/blob/master/open-vm-tools/vmblock-fuse/design.txt" ]; + before = [ "vmware.service" ]; + wants = [ "vmware.service" ]; + what = "${open-vm-tools}/bin/vmware-vmblock-fuse"; + where = "/run/vmblock-fuse"; + type = "fuse"; + options = "subtype=vmware-vmblock,default_permissions,allow_other"; + wantedBy = [ "multi-user.target" ]; + } + ]; + + security.wrappers.vmware-user-suid-wrapper = + { setuid = true; + owner = "root"; + group = "root"; + source = "${open-vm-tools}/bin/vmware-user-suid-wrapper"; + }; + environment.etc.vmware-tools.source = "${open-vm-tools}/etc/vmware-tools/*"; services.xserver = mkIf (!cfg.headless) { diff --git a/nixpkgs/nixos/tests/all-tests.nix b/nixpkgs/nixos/tests/all-tests.nix index 6baa986b2bda..3f19aa397a78 100644 --- a/nixpkgs/nixos/tests/all-tests.nix +++ b/nixpkgs/nixos/tests/all-tests.nix @@ -98,6 +98,7 @@ in deluge = handleTest ./deluge.nix {}; dendrite = handleTest ./dendrite.nix {}; dhparams = handleTest ./dhparams.nix {}; + disable-installer-tools = handleTest ./disable-installer-tools.nix {}; discourse = handleTest ./discourse.nix {}; dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {}; dnscrypt-wrapper = handleTestOn ["x86_64-linux"] ./dnscrypt-wrapper {}; @@ -222,7 +223,6 @@ in krb5 = discoverTests (import ./krb5 {}); ksm = handleTest ./ksm.nix {}; kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {}; - latestKernel.hardened = handleTest ./hardened.nix { latestKernel = true; }; latestKernel.login = handleTest ./login.nix { latestKernel = true; }; leaps = handleTest ./leaps.nix {}; libreddit = handleTest ./libreddit.nix {}; @@ -249,6 +249,7 @@ in matrix-appservice-irc = handleTest ./matrix-appservice-irc.nix {}; matrix-synapse = handleTest ./matrix-synapse.nix {}; mediawiki = handleTest ./mediawiki.nix {}; + meilisearch = handleTest ./meilisearch.nix {}; memcached = handleTest ./memcached.nix {}; metabase = handleTest ./metabase.nix {}; minecraft = handleTest ./minecraft.nix {}; @@ -326,6 +327,7 @@ in openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {}; openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {}; opentabletdriver = handleTest ./opentabletdriver.nix {}; + owncast = handleTest ./owncast.nix {}; image-contents = handleTest ./image-contents.nix {}; orangefs = handleTest ./orangefs.nix {}; os-prober = handleTestOn ["x86_64-linux"] ./os-prober.nix {}; @@ -336,6 +338,7 @@ in pam-u2f = handleTest ./pam-u2f.nix {}; pantheon = handleTest ./pantheon.nix {}; paperless-ng = handleTest ./paperless-ng.nix {}; + parsedmarc = handleTest ./parsedmarc {}; pdns-recursor = handleTest ./pdns-recursor.nix {}; peerflix = handleTest ./peerflix.nix {}; pgjwt = handleTest ./pgjwt.nix {}; @@ -385,7 +388,6 @@ in rspamd = handleTest ./rspamd.nix {}; rss2email = handleTest ./rss2email.nix {}; rsyslogd = handleTest ./rsyslogd.nix {}; - runInMachine = handleTest ./run-in-machine.nix {}; rxe = handleTest ./rxe.nix {}; samba = handleTest ./samba.nix {}; samba-wsdd = handleTest ./samba-wsdd.nix {}; @@ -460,6 +462,7 @@ in unit-php = handleTest ./web-servers/unit-php.nix {}; upnp = handleTest ./upnp.nix {}; usbguard = handleTest ./usbguard.nix {}; + user-activation-scripts = handleTest ./user-activation-scripts.nix {}; uwsgi = handleTest ./uwsgi.nix {}; v2ray = handleTest ./v2ray.nix {}; vault = handleTest ./vault.nix {}; diff --git a/nixpkgs/nixos/tests/atop.nix b/nixpkgs/nixos/tests/atop.nix index 1f8b005041f0..f7a90346f3d7 100644 --- a/nixpkgs/nixos/tests/atop.nix +++ b/nixpkgs/nixos/tests/atop.nix @@ -105,8 +105,6 @@ let assertions = rec { }; in { - name = "atop"; - justThePackage = makeTest { name = "atop-justThePackage"; machine = { diff --git a/nixpkgs/nixos/tests/cntr.nix b/nixpkgs/nixos/tests/cntr.nix index 8cffd97459d0..668470756209 100644 --- a/nixpkgs/nixos/tests/cntr.nix +++ b/nixpkgs/nixos/tests/cntr.nix @@ -9,7 +9,7 @@ let makeTest { name = "cntr-${backend}"; - meta = { maintainers = with lib.maintainers; [ srk mic92 ]; }; + meta = { maintainers = with lib.maintainers; [ sorki mic92 ]; }; nodes = { ${backend} = { pkgs, ... }: { diff --git a/nixpkgs/nixos/tests/disable-installer-tools.nix b/nixpkgs/nixos/tests/disable-installer-tools.nix new file mode 100644 index 000000000000..23c15faa8d33 --- /dev/null +++ b/nixpkgs/nixos/tests/disable-installer-tools.nix @@ -0,0 +1,29 @@ +import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... }: + +{ + name = "disable-installer-tools"; + + machine = + { pkgs, lib, ... }: + { + system.disableInstallerTools = true; + boot.enableContainers = false; + environment.defaultPackages = []; + }; + + testScript = '' + machine.wait_for_unit("multi-user.target") + machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'") + + with subtest("nixos installer tools should not be included"): + machine.fail("which nixos-rebuild") + machine.fail("which nixos-install") + machine.fail("which nixos-generate-config") + machine.fail("which nixos-enter") + machine.fail("which nixos-version") + machine.fail("which nixos-build-vms") + + with subtest("perl should not be included"): + machine.fail("which perl") + ''; +}) diff --git a/nixpkgs/nixos/tests/dokuwiki.nix b/nixpkgs/nixos/tests/dokuwiki.nix index 2664e1500ea4..67657e89f74c 100644 --- a/nixpkgs/nixos/tests/dokuwiki.nix +++ b/nixpkgs/nixos/tests/dokuwiki.nix @@ -33,44 +33,79 @@ let in { name = "dokuwiki"; meta = with pkgs.lib; { - maintainers = with maintainers; [ _1000101 ]; + maintainers = with maintainers; [ + _1000101 + onny + ]; }; - machine = { ... }: { - services.dokuwiki."site1.local" = { - aclUse = false; - superUser = "admin"; + + nodes = { + dokuwiki_nginx = {...}: { + services.dokuwiki = { + sites = { + "site1.local" = { + aclUse = false; + superUser = "admin"; + }; + "site2.local" = { + usersFile = "/var/lib/dokuwiki/site2.local/users.auth.php"; + superUser = "admin"; + templates = [ template-bootstrap3 ]; + plugins = [ plugin-icalevents ]; + }; + }; + }; + + networking.firewall.allowedTCPPorts = [ 80 ]; + networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; }; - services.dokuwiki."site2.local" = { - usersFile = "/var/lib/dokuwiki/site2.local/users.auth.php"; - superUser = "admin"; - templates = [ template-bootstrap3 ]; - plugins = [ plugin-icalevents ]; + + dokuwiki_caddy = {...}: { + services.dokuwiki = { + webserver = "caddy"; + sites = { + "site1.local" = { + aclUse = false; + superUser = "admin"; + }; + "site2.local" = { + usersFile = "/var/lib/dokuwiki/site2.local/users.auth.php"; + superUser = "admin"; + templates = [ template-bootstrap3 ]; + plugins = [ plugin-icalevents ]; + }; + }; + }; + + networking.firewall.allowedTCPPorts = [ 80 ]; + networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; }; - networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; + }; testScript = '' - site_names = ["site1.local", "site2.local"] start_all() - machine.wait_for_unit("phpfpm-dokuwiki-site1.local.service") - machine.wait_for_unit("phpfpm-dokuwiki-site2.local.service") + dokuwiki_nginx.wait_for_unit("nginx") + dokuwiki_caddy.wait_for_unit("caddy") - machine.wait_for_unit("nginx.service") + site_names = ["site1.local", "site2.local"] - machine.wait_for_open_port(80) + for machine in (dokuwiki_nginx, dokuwiki_caddy): + for site_name in site_names: + machine.wait_for_unit(f"phpfpm-dokuwiki-{site_name}") - machine.succeed("curl -sSfL http://site1.local/ | grep 'DokuWiki'") - machine.fail("curl -sSfL 'http://site1.local/doku.php?do=login' | grep 'Login'") + machine.succeed("curl -sSfL http://site1.local/ | grep 'DokuWiki'") + machine.fail("curl -sSfL 'http://site1.local/doku.php?do=login' | grep 'Login'") - machine.succeed("curl -sSfL http://site2.local/ | grep 'DokuWiki'") - machine.succeed("curl -sSfL 'http://site2.local/doku.php?do=login' | grep 'Login'") + machine.succeed("curl -sSfL http://site2.local/ | grep 'DokuWiki'") + machine.succeed("curl -sSfL 'http://site2.local/doku.php?do=login' | grep 'Login'") - machine.succeed( - "echo 'admin:$2y$10$ijdBQMzSVV20SrKtCna8gue36vnsbVm2wItAXvdm876sshI4uwy6S:Admin:admin@example.test:user' >> /var/lib/dokuwiki/site2.local/users.auth.php", - "curl -sSfL -d 'u=admin&p=password' --cookie-jar cjar 'http://site2.local/doku.php?do=login'", - "curl -sSfL --cookie cjar --cookie-jar cjar 'http://site2.local/doku.php?do=login' | grep 'Logged in as: <bdi>Admin</bdi>'", - ) + machine.succeed( + "echo 'admin:$2y$10$ijdBQMzSVV20SrKtCna8gue36vnsbVm2wItAXvdm876sshI4uwy6S:Admin:admin@example.test:user' >> /var/lib/dokuwiki/site2.local/users.auth.php", + "curl -sSfL -d 'u=admin&p=password' --cookie-jar cjar 'http://site2.local/doku.php?do=login'", + "curl -sSfL --cookie cjar --cookie-jar cjar 'http://site2.local/doku.php?do=login' | grep 'Logged in as: <bdi>Admin</bdi>'", + ) ''; }) diff --git a/nixpkgs/nixos/tests/ec2.nix b/nixpkgs/nixos/tests/ec2.nix index df0672480168..aa3c2b7051f6 100644 --- a/nixpkgs/nixos/tests/ec2.nix +++ b/nixpkgs/nixos/tests/ec2.nix @@ -24,6 +24,11 @@ let ln -s vda1 /dev/xvda1 ''; + # In a NixOS test the serial console is occupied by the "backdoor" + # (see testing/test-instrumentation.nix) and is incompatible with + # the configuration in virtualisation/amazon-image.nix. + systemd.services."serial-getty@ttyS0".enable = mkForce false; + # Needed by nixos-rebuild due to the lack of network # access. Determined by trial and error. system.extraDependencies = with pkgs; ( [ diff --git a/nixpkgs/nixos/tests/enlightenment.nix b/nixpkgs/nixos/tests/enlightenment.nix index cc1da649d493..4623574ce92e 100644 --- a/nixpkgs/nixos/tests/enlightenment.nix +++ b/nixpkgs/nixos/tests/enlightenment.nix @@ -11,8 +11,8 @@ import ./make-test-python.nix ({ pkgs, ...} : imports = [ ./common/user-account.nix ]; services.xserver.enable = true; services.xserver.desktopManager.enlightenment.enable = true; - services.xserver.displayManager.lightdm = { - enable = true; + services.xserver.displayManager = { + lightdm.enable = true; autoLogin = { enable = true; user = "alice"; diff --git a/nixpkgs/nixos/tests/hardened.nix b/nixpkgs/nixos/tests/hardened.nix index a0b629086b5a..da7e0972e131 100644 --- a/nixpkgs/nixos/tests/hardened.nix +++ b/nixpkgs/nixos/tests/hardened.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... } : { +import ./make-test-python.nix ({ pkgs, ... } : { name = "hardened"; meta = with pkgs.lib.maintainers; { maintainers = [ joachifm ]; @@ -10,8 +10,6 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... } : { { users.users.alice = { isNormalUser = true; extraGroups = [ "proc" ]; }; users.users.sybil = { isNormalUser = true; group = "wheel"; }; imports = [ ../modules/profiles/hardened.nix ]; - boot.kernelPackages = - lib.mkIf latestKernel pkgs.linuxPackages_latest_hardened; environment.memoryAllocator.provider = "graphene-hardened"; nix.useSandbox = false; virtualisation.emptyDiskImages = [ 4096 ]; @@ -57,6 +55,7 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... } : { # Test kernel module hardening with subtest("No more kernel modules can be loaded"): # note: this better a be module we normally wouldn't load ... + machine.wait_for_unit("disable-kernel-module-loading.service") machine.fail("modprobe dccp") diff --git a/nixpkgs/nixos/tests/herbstluftwm.nix b/nixpkgs/nixos/tests/herbstluftwm.nix index 2c98cceee6a2..7d079f4bfb69 100644 --- a/nixpkgs/nixos/tests/herbstluftwm.nix +++ b/nixpkgs/nixos/tests/herbstluftwm.nix @@ -3,7 +3,6 @@ import ./make-test-python.nix ({ lib, ...} : { meta = { maintainers = with lib.maintainers; [ thibautmarty ]; - timeout = 30; }; machine = { pkgs, lib, ... }: { diff --git a/nixpkgs/nixos/tests/kerberos/heimdal.nix b/nixpkgs/nixos/tests/kerberos/heimdal.nix index 8abae667d043..391a61cc9a90 100644 --- a/nixpkgs/nixos/tests/kerberos/heimdal.nix +++ b/nixpkgs/nixos/tests/kerberos/heimdal.nix @@ -9,7 +9,7 @@ import ../make-test-python.nix ({pkgs, ...}: { }; krb5 = { enable = true; - kerberos = pkgs.heimdalFull; + kerberos = pkgs.heimdal; libdefaults = { default_realm = "FOO.BAR"; }; diff --git a/nixpkgs/nixos/tests/meilisearch.nix b/nixpkgs/nixos/tests/meilisearch.nix new file mode 100644 index 000000000000..c379bda74c59 --- /dev/null +++ b/nixpkgs/nixos/tests/meilisearch.nix @@ -0,0 +1,60 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: + let + listenAddress = "127.0.0.1"; + listenPort = 7700; + apiUrl = "http://${listenAddress}:${toString listenPort}"; + uid = "movies"; + indexJSON = pkgs.writeText "index.json" (builtins.toJSON { inherit uid; }); + moviesJSON = pkgs.runCommand "movies.json" {} '' + sed -n '1,5p;$p' ${pkgs.meilisearch.src}/datasets/movies/movies.json > $out + ''; + in { + name = "meilisearch"; + meta.maintainers = with lib.maintainers; [ Br1ght0ne ]; + + machine = { ... }: { + environment.systemPackages = with pkgs; [ curl jq ]; + services.meilisearch = { + enable = true; + inherit listenAddress listenPort; + }; + }; + + testScript = '' + import json + + start_all() + + machine.wait_for_unit("meilisearch") + machine.wait_for_open_port("7700") + + with subtest("check version"): + version = json.loads(machine.succeed("curl ${apiUrl}/version")) + assert version["pkgVersion"] == "${pkgs.meilisearch.version}" + + with subtest("create index"): + machine.succeed( + "curl -XPOST ${apiUrl}/indexes --data @${indexJSON}" + ) + indexes = json.loads(machine.succeed("curl ${apiUrl}/indexes")) + assert len(indexes) == 1, "index wasn't created" + + with subtest("add documents"): + response = json.loads( + machine.succeed( + "curl -XPOST ${apiUrl}/indexes/${uid}/documents --data @${moviesJSON}" + ) + ) + update_id = response["updateId"] + machine.wait_until_succeeds( + f"curl ${apiUrl}/indexes/${uid}/updates/{update_id} | jq -e '.status == \"processed\"'" + ) + + with subtest("search"): + response = json.loads( + machine.succeed("curl ${apiUrl}/indexes/movies/search?q=hero") + ) + print(response) + assert len(response["hits"]) >= 1, "no results found" + ''; + }) diff --git a/nixpkgs/nixos/tests/minio.nix b/nixpkgs/nixos/tests/minio.nix index e49c517098ae..ad51f738d490 100644 --- a/nixpkgs/nixos/tests/minio.nix +++ b/nixpkgs/nixos/tests/minio.nix @@ -28,7 +28,10 @@ in { machine = { pkgs, ... }: { services.minio = { enable = true; - inherit accessKey secretKey; + rootCredentialsFile = pkgs.writeText "minio-credentials" '' + MINIO_ROOT_USER=${accessKey} + MINIO_ROOT_PASSWORD=${secretKey} + ''; }; environment.systemPackages = [ pkgs.minio-client ]; diff --git a/nixpkgs/nixos/tests/mpv.nix b/nixpkgs/nixos/tests/mpv.nix index bcfc17cf3328..9e44862cb1b4 100644 --- a/nixpkgs/nixos/tests/mpv.nix +++ b/nixpkgs/nixos/tests/mpv.nix @@ -14,7 +14,7 @@ in { environment.systemPackages = [ pkgs.curl - (pkgs.mpv-with-scripts.override { + (pkgs.wrapMpv pkgs.mpv-unwrapped { scripts = [ pkgs.mpvScripts.simple-mpv-webui ]; }) ]; diff --git a/nixpkgs/nixos/tests/mysql/mariadb-galera-mariabackup.nix b/nixpkgs/nixos/tests/mysql/mariadb-galera-mariabackup.nix index 1c73bc854a57..10682c361d1d 100644 --- a/nixpkgs/nixos/tests/mysql/mariadb-galera-mariabackup.nix +++ b/nixpkgs/nixos/tests/mysql/mariadb-galera-mariabackup.nix @@ -4,6 +4,16 @@ 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 iproute2 netcat procps pv socat ]; }; + # Common user configuration + users = { ... }: + { + users.users.testuser = { + isSystemUser = true; + group = "testusers"; + }; + users.groups.testusers = { }; + }; + in { name = "mariadb-galera-mariabackup"; meta = with pkgs.lib.maintainers; { @@ -17,6 +27,7 @@ in { galera_01 = { pkgs, ... }: { + imports = [ users ]; networking = { interfaces.eth1 = { ipv4.addresses = [ @@ -31,7 +42,6 @@ in { firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; firewall.allowedUDPPorts = [ 4567 ]; }; - users.users.testuser = { isSystemUser = true; }; systemd.services.mysql = with pkgs; { path = [ mysqlenv-common mysqlenv-mariabackup ]; }; @@ -75,6 +85,7 @@ in { galera_02 = { pkgs, ... }: { + imports = [ users ]; networking = { interfaces.eth1 = { ipv4.addresses = [ @@ -89,7 +100,6 @@ in { firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; firewall.allowedUDPPorts = [ 4567 ]; }; - users.users.testuser = { isSystemUser = true; }; systemd.services.mysql = with pkgs; { path = [ mysqlenv-common mysqlenv-mariabackup ]; }; @@ -122,6 +132,7 @@ in { galera_03 = { pkgs, ... }: { + imports = [ users ]; networking = { interfaces.eth1 = { ipv4.addresses = [ @@ -136,7 +147,6 @@ in { firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; firewall.allowedUDPPorts = [ 4567 ]; }; - users.users.testuser = { isSystemUser = true; }; systemd.services.mysql = with pkgs; { path = [ mysqlenv-common mysqlenv-mariabackup ]; }; diff --git a/nixpkgs/nixos/tests/mysql/mariadb-galera-rsync.nix b/nixpkgs/nixos/tests/mysql/mariadb-galera-rsync.nix index 709a8b5085cb..701e01e88718 100644 --- a/nixpkgs/nixos/tests/mysql/mariadb-galera-rsync.nix +++ b/nixpkgs/nixos/tests/mysql/mariadb-galera-rsync.nix @@ -4,6 +4,16 @@ let mysqlenv-common = pkgs.buildEnv { name = "mysql-path-env-common"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ bash gawk gnutar inetutils which ]; }; mysqlenv-rsync = pkgs.buildEnv { name = "mysql-path-env-rsync"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ lsof procps rsync stunnel ]; }; + # Common user configuration + users = { ... }: + { + users.users.testuser = { + isSystemUser = true; + group = "testusers"; + }; + users.groups.testusers = { }; + }; + in { name = "mariadb-galera-rsync"; meta = with pkgs.lib.maintainers; { @@ -17,6 +27,7 @@ in { galera_04 = { pkgs, ... }: { + imports = [ users ]; networking = { interfaces.eth1 = { ipv4.addresses = [ @@ -31,7 +42,6 @@ in { firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; firewall.allowedUDPPorts = [ 4567 ]; }; - users.users.testuser = { isSystemUser = true; }; systemd.services.mysql = with pkgs; { path = [ mysqlenv-common mysqlenv-rsync ]; }; @@ -70,6 +80,7 @@ in { galera_05 = { pkgs, ... }: { + imports = [ users ]; networking = { interfaces.eth1 = { ipv4.addresses = [ @@ -84,7 +95,6 @@ in { firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; firewall.allowedUDPPorts = [ 4567 ]; }; - users.users.testuser = { isSystemUser = true; }; systemd.services.mysql = with pkgs; { path = [ mysqlenv-common mysqlenv-rsync ]; }; @@ -116,6 +126,7 @@ in { galera_06 = { pkgs, ... }: { + imports = [ users ]; networking = { interfaces.eth1 = { ipv4.addresses = [ @@ -130,7 +141,6 @@ in { firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; firewall.allowedUDPPorts = [ 4567 ]; }; - users.users.testuser = { isSystemUser = true; }; systemd.services.mysql = with pkgs; { path = [ mysqlenv-common mysqlenv-rsync ]; }; diff --git a/nixpkgs/nixos/tests/mysql/mysql.nix b/nixpkgs/nixos/tests/mysql/mysql.nix index 2ec9c3d50a3c..dce5fa26acf7 100644 --- a/nixpkgs/nixos/tests/mysql/mysql.nix +++ b/nixpkgs/nixos/tests/mysql/mysql.nix @@ -1,4 +1,26 @@ -import ./../make-test-python.nix ({ pkgs, ...} : { +import ./../make-test-python.nix ({ pkgs, ...}: + + +let + # Setup common users + users = { ... }: + { + users.groups.testusers = { }; + + users.users.testuser = { + isSystemUser = true; + group = "testusers"; + }; + + users.users.testuser2 = { + isSystemUser = true; + group = "testusers"; + }; + }; + +in + +{ name = "mysql"; meta = with pkgs.lib.maintainers; { maintainers = [ eelco shlevy ]; @@ -9,8 +31,8 @@ import ./../make-test-python.nix ({ pkgs, ...} : { { pkgs, ... }: { - users.users.testuser = { isSystemUser = true; }; - users.users.testuser2 = { isSystemUser = true; }; + imports = [ users ]; + services.mysql.enable = true; services.mysql.initialDatabases = [ { name = "testdb3"; schema = ./testdb.sql; } @@ -40,12 +62,12 @@ import ./../make-test-python.nix ({ pkgs, ...} : { { pkgs, ... }: { + imports = [ users ]; + # prevent oom: # Kernel panic - not syncing: Out of memory: compulsory panic_on_oom is enabled virtualisation.memorySize = 1024; - users.users.testuser = { isSystemUser = true; }; - users.users.testuser2 = { isSystemUser = true; }; services.mysql.enable = true; services.mysql.initialDatabases = [ { name = "testdb3"; schema = ./testdb.sql; } @@ -75,8 +97,8 @@ import ./../make-test-python.nix ({ pkgs, ...} : { { pkgs, ... }: { - users.users.testuser = { isSystemUser = true; }; - users.users.testuser2 = { isSystemUser = true; }; + imports = [ users ]; + services.mysql.enable = true; services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" '' ALTER USER root@localhost IDENTIFIED WITH unix_socket; diff --git a/nixpkgs/nixos/tests/owncast.nix b/nixpkgs/nixos/tests/owncast.nix new file mode 100644 index 000000000000..e54d2cc5dd48 --- /dev/null +++ b/nixpkgs/nixos/tests/owncast.nix @@ -0,0 +1,21 @@ +{ system ? builtins.currentSystem, config ? { } +, pkgs ? import ../.. { inherit system config; } }: + +with import (nixpkgs + "/nixos/lib/testing-python.nix") { inherit system; }; +makeTest { + name = "owncast"; + meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ MayNiklas ]; }; + + nodes = { + client = { ... }: { + environment.systemPackages = [ curl ]; + services.owncast = { enable = true; }; + }; + }; + + testScript = '' + start_all() + client.wait_for_unit("owncast.service") + client.succeed("curl localhost:8080/api/status") + ''; +} diff --git a/nixpkgs/nixos/tests/pantheon.nix b/nixpkgs/nixos/tests/pantheon.nix index 3894440333c9..20aee2eb7a4c 100644 --- a/nixpkgs/nixos/tests/pantheon.nix +++ b/nixpkgs/nixos/tests/pantheon.nix @@ -1,10 +1,10 @@ -import ./make-test-python.nix ({ pkgs, ...} : +import ./make-test-python.nix ({ pkgs, lib, ...} : { name = "pantheon"; - meta = with pkgs.lib.maintainers; { - maintainers = pkgs.pantheon.maintainers; + meta = with lib; { + maintainers = teams.pantheon.members; }; machine = { ... }: @@ -45,8 +45,8 @@ import ./make-test-python.nix ({ pkgs, ...} : with subtest("Check if pantheon session components actually start"): machine.wait_until_succeeds("pgrep gala") machine.wait_for_window("gala") - machine.wait_until_succeeds("pgrep wingpanel") - machine.wait_for_window("wingpanel") + machine.wait_until_succeeds("pgrep -f io.elementary.wingpanel") + machine.wait_for_window("io.elementary.wingpanel") machine.wait_until_succeeds("pgrep plank") machine.wait_for_window("plank") diff --git a/nixpkgs/nixos/tests/parsedmarc/default.nix b/nixpkgs/nixos/tests/parsedmarc/default.nix new file mode 100644 index 000000000000..d838d3b6a39c --- /dev/null +++ b/nixpkgs/nixos/tests/parsedmarc/default.nix @@ -0,0 +1,224 @@ +# This tests parsedmarc by sending a report to its monitored email +# address and reading the results out of Elasticsearch. + +{ pkgs, ... }@args: +let + inherit (import ../../lib/testing-python.nix args) makeTest; + + dmarcTestReport = builtins.fetchurl { + name = "dmarc-test-report"; + url = "https://github.com/domainaware/parsedmarc/raw/f45ab94e0608088e0433557608d9f4e9517d3afe/samples/aggregate/estadocuenta1.infonacot.gob.mx!example.com!1536853302!1536939702!2940.xml.zip"; + sha256 = "0dq64cj49711kbja27pjl2hy0d3azrjxg91kqrh40x46fkn1dwkx"; + }; + + sendEmail = address: + pkgs.writeScriptBin "send-email" '' + #!${pkgs.python3.interpreter} + import smtplib + from email import encoders + from email.mime.base import MIMEBase + from email.mime.multipart import MIMEMultipart + from email.mime.text import MIMEText + + sender_email = "dmarc_tester@fake.domain" + receiver_email = "${address}" + + message = MIMEMultipart() + message["From"] = sender_email + message["To"] = receiver_email + message["Subject"] = "DMARC test" + + message.attach(MIMEText("Testing parsedmarc", "plain")) + + attachment = MIMEBase("application", "zip") + + with open("${dmarcTestReport}", "rb") as report: + attachment.set_payload(report.read()) + + encoders.encode_base64(attachment) + + attachment.add_header( + "Content-Disposition", + "attachment; filename= estadocuenta1.infonacot.gob.mx!example.com!1536853302!1536939702!2940.xml.zip", + ) + + message.attach(attachment) + text = message.as_string() + + with smtplib.SMTP('localhost') as server: + server.sendmail(sender_email, receiver_email, text) + server.quit() + ''; +in +{ + localMail = makeTest + { + name = "parsedmarc-local-mail"; + meta = with pkgs.lib.maintainers; { + maintainers = [ talyz ]; + }; + + nodes.parsedmarc = + { nodes, ... }: + { + virtualisation.memorySize = 2048; + + services.postfix = { + enableSubmission = true; + enableSubmissions = true; + submissionsOptions = { + smtpd_sasl_auth_enable = "yes"; + smtpd_client_restrictions = "permit"; + }; + }; + + services.parsedmarc = { + enable = true; + provision = { + geoIp = false; + localMail = { + enable = true; + hostname = "localhost"; + }; + }; + }; + + services.elasticsearch.package = pkgs.elasticsearch7-oss; + + environment.systemPackages = [ + (sendEmail "dmarc@localhost") + pkgs.jq + ]; + }; + + testScript = { nodes }: + let + esPort = toString nodes.parsedmarc.config.services.elasticsearch.port; + in '' + parsedmarc.start() + parsedmarc.wait_for_unit("postfix.service") + parsedmarc.wait_for_unit("dovecot2.service") + parsedmarc.wait_for_unit("parsedmarc.service") + parsedmarc.wait_until_succeeds( + "curl -sS -f http://localhost:${esPort}" + ) + + parsedmarc.fail( + "curl -sS -f http://localhost:${esPort}/_search?q=report_id:2940 | jq -e 'if .hits.total.value > 0 then true else null end'" + ) + parsedmarc.succeed("send-email") + parsedmarc.wait_until_succeeds( + "curl -sS -f http://localhost:${esPort}/_search?q=report_id:2940 | jq -e 'if .hits.total.value > 0 then true else null end'" + ) + ''; + }; + + externalMail = + let + certs = import ../common/acme/server/snakeoil-certs.nix; + mailDomain = certs.domain; + parsedmarcDomain = "parsedmarc.fake.domain"; + in + makeTest { + name = "parsedmarc-external-mail"; + meta = with pkgs.lib.maintainers; { + maintainers = [ talyz ]; + }; + + nodes = { + parsedmarc = + { nodes, ... }: + { + virtualisation.memorySize = 2048; + + security.pki.certificateFiles = [ + certs.ca.cert + ]; + + networking.extraHosts = '' + 127.0.0.1 ${parsedmarcDomain} + ${nodes.mail.config.networking.primaryIPAddress} ${mailDomain} + ''; + + services.parsedmarc = { + enable = true; + provision.geoIp = false; + settings.imap = { + host = mailDomain; + port = 993; + ssl = true; + user = "alice"; + password = "${pkgs.writeText "imap-password" "foobar"}"; + watch = true; + }; + }; + + services.elasticsearch.package = pkgs.elasticsearch7-oss; + + environment.systemPackages = [ + pkgs.jq + ]; + }; + + mail = + { nodes, ... }: + { + imports = [ ../common/user-account.nix ]; + + networking.extraHosts = '' + 127.0.0.1 ${mailDomain} + ${nodes.parsedmarc.config.networking.primaryIPAddress} ${parsedmarcDomain} + ''; + + services.dovecot2 = { + enable = true; + protocols = [ "imap" ]; + sslCACert = "${certs.ca.cert}"; + sslServerCert = "${certs.${mailDomain}.cert}"; + sslServerKey = "${certs.${mailDomain}.key}"; + }; + + services.postfix = { + enable = true; + origin = mailDomain; + config = { + myhostname = mailDomain; + mydestination = mailDomain; + }; + enableSubmission = true; + enableSubmissions = true; + submissionsOptions = { + smtpd_sasl_auth_enable = "yes"; + smtpd_client_restrictions = "permit"; + }; + }; + environment.systemPackages = [ (sendEmail "alice@${mailDomain}") ]; + + networking.firewall.allowedTCPPorts = [ 993 ]; + }; + }; + + testScript = { nodes }: + let + esPort = toString nodes.parsedmarc.config.services.elasticsearch.port; + in '' + mail.start() + mail.wait_for_unit("postfix.service") + mail.wait_for_unit("dovecot2.service") + + parsedmarc.start() + parsedmarc.wait_for_unit("parsedmarc.service") + parsedmarc.wait_until_succeeds( + "curl -sS -f http://localhost:${esPort}" + ) + + parsedmarc.fail( + "curl -sS -f http://localhost:${esPort}/_search?q=report_id:2940 | jq -e 'if .hits.total.value > 0 then true else null end'" + ) + mail.succeed("send-email") + parsedmarc.wait_until_succeeds( + "curl -sS -f http://localhost:${esPort}/_search?q=report_id:2940 | jq -e 'if .hits.total.value > 0 then true else null end'" + ) + ''; + }; +} diff --git a/nixpkgs/nixos/tests/postfixadmin.nix b/nixpkgs/nixos/tests/postfixadmin.nix index aba5e3eed102..b2712f4699ae 100644 --- a/nixpkgs/nixos/tests/postfixadmin.nix +++ b/nixpkgs/nixos/tests/postfixadmin.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "postfixadmin"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ globin ]; }; diff --git a/nixpkgs/nixos/tests/prometheus-exporters.nix b/nixpkgs/nixos/tests/prometheus-exporters.nix index c6e8fa5a9ee1..38b93c4087c0 100644 --- a/nixpkgs/nixos/tests/prometheus-exporters.nix +++ b/nixpkgs/nixos/tests/prometheus-exporters.nix @@ -280,6 +280,7 @@ let }; exporterTest = '' wait_for_unit("prometheus-influxdb-exporter.service") + wait_for_open_port(9122) succeed( "curl -XPOST http://localhost:9122/write --data-binary 'influxdb_exporter,distro=nixos,added_in=21.09 value=1'" ) @@ -554,7 +555,11 @@ let WorkingDirectory = "/var/spool/mail"; }; }; - users.users.mailexporter.isSystemUser = true; + users.users.mailexporter = { + isSystemUser = true; + group = "mailexporter"; + }; + users.groups.mailexporter = {}; }; exporterTest = '' wait_for_unit("postfix.service") diff --git a/nixpkgs/nixos/tests/run-in-machine.nix b/nixpkgs/nixos/tests/run-in-machine.nix deleted file mode 100644 index 67840f3e9fe7..000000000000 --- a/nixpkgs/nixos/tests/run-in-machine.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ system ? builtins.currentSystem, - config ? {}, - pkgs ? import ../.. { inherit system config; } -}: - -with import ../lib/testing-python.nix { inherit system pkgs; }; - -let - output = runInMachine { - drv = pkgs.hello; - machine = { ... }: { /* services.sshd.enable = true; */ }; - }; - - test = pkgs.runCommand "verify-output" { inherit output; } '' - if [ ! -e "$output/bin/hello" ]; then - echo "Derivation built using runInMachine produced incorrect output:" >&2 - ls -laR "$output" >&2 - exit 1 - fi - "$output/bin/hello" > "$out" - ''; - -in test // { inherit test; } # To emulate behaviour of makeTest diff --git a/nixpkgs/nixos/tests/spark/default.nix b/nixpkgs/nixos/tests/spark/default.nix new file mode 100644 index 000000000000..254cdec6e6b0 --- /dev/null +++ b/nixpkgs/nixos/tests/spark/default.nix @@ -0,0 +1,28 @@ +import ../make-test-python.nix ({...}: { + name = "spark"; + + nodes = { + worker = { nodes, pkgs, ... }: { + virtualisation.memorySize = 1024; + services.spark.worker = { + enable = true; + master = "master:7077"; + }; + }; + master = { config, pkgs, ... }: { + services.spark.master = { + enable = true; + bind = "0.0.0.0"; + }; + networking.firewall.allowedTCPPorts = [ 22 7077 8080 ]; + }; + }; + + testScript = '' + master.wait_for_unit("spark-master.service") + worker.wait_for_unit("spark-worker.service") + worker.copy_from_host( "${./spark_sample.py}", "/spark_sample.py" ) + assert "<title>Spark Master at spark://" in worker.succeed("curl -sSfkL http://master:8080/") + worker.succeed("spark-submit --master spark://master:7077 --executor-memory 512m --executor-cores 1 /spark_sample.py") + ''; +}) diff --git a/nixpkgs/nixos/tests/spark/spark_sample.py b/nixpkgs/nixos/tests/spark/spark_sample.py new file mode 100644 index 000000000000..c4939451eae0 --- /dev/null +++ b/nixpkgs/nixos/tests/spark/spark_sample.py @@ -0,0 +1,40 @@ +from pyspark.sql import Row, SparkSession +from pyspark.sql import functions as F +from pyspark.sql.functions import udf +from pyspark.sql.types import * +from pyspark.sql.functions import explode + +def explode_col(weight): + return int(weight//10) * [10.0] + ([] if weight%10==0 else [weight%10]) + +spark = SparkSession.builder.getOrCreate() + +dataSchema = [ + StructField("feature_1", FloatType()), + StructField("feature_2", FloatType()), + StructField("bias_weight", FloatType()) +] + +data = [ + Row(0.1, 0.2, 10.32), + Row(0.32, 1.43, 12.8), + Row(1.28, 1.12, 0.23) +] + +df = spark.createDataFrame(spark.sparkContext.parallelize(data), StructType(dataSchema)) + +normalizing_constant = 100 +sum_bias_weight = df.select(F.sum('bias_weight')).collect()[0][0] +normalizing_factor = normalizing_constant / sum_bias_weight +df = df.withColumn('normalized_bias_weight', df.bias_weight * normalizing_factor) +df = df.drop('bias_weight') +df = df.withColumnRenamed('normalized_bias_weight', 'bias_weight') + +my_udf = udf(lambda x: explode_col(x), ArrayType(FloatType())) +df1 = df.withColumn('explode_val', my_udf(df.bias_weight)) +df1 = df1.withColumn("explode_val_1", explode(df1.explode_val)).drop("explode_val") +df1 = df1.drop('bias_weight').withColumnRenamed('explode_val_1', 'bias_weight') + +df1.show() + +assert(df1.count() == 12) diff --git a/nixpkgs/nixos/tests/systemd-confinement.nix b/nixpkgs/nixos/tests/systemd-confinement.nix index e6a308f46d27..8fafb11e1e8c 100644 --- a/nixpkgs/nixos/tests/systemd-confinement.nix +++ b/nixpkgs/nixos/tests/systemd-confinement.nix @@ -44,30 +44,26 @@ import ./make-test-python.nix { { config.confinement.mode = "chroot-only"; testScript = '' with subtest("chroot-only confinement"): - machine.succeed( - 'test "$(chroot-exec ls -1 / | paste -sd,)" = bin,nix', - 'test "$(chroot-exec id -u)" = 0', - "chroot-exec chown 65534 /bin", - ) + paths = machine.succeed('chroot-exec ls -1 / | paste -sd,').strip() + assert_eq(paths, "bin,nix,run") + uid = machine.succeed('chroot-exec id -u').strip() + assert_eq(uid, "0") + machine.succeed("chroot-exec chown 65534 /bin") ''; } { testScript = '' with subtest("full confinement with APIVFS"): - machine.fail( - "chroot-exec ls -l /etc", - "chroot-exec ls -l /run", - "chroot-exec chown 65534 /bin", - ) - machine.succeed( - 'test "$(chroot-exec id -u)" = 0', - "chroot-exec chown 0 /bin", - ) + machine.fail("chroot-exec ls -l /etc") + machine.fail("chroot-exec chown 65534 /bin") + assert_eq(machine.succeed('chroot-exec id -u').strip(), "0") + machine.succeed("chroot-exec chown 0 /bin") ''; } { config.serviceConfig.BindReadOnlyPaths = [ "/etc" ]; testScript = '' with subtest("check existence of bind-mounted /etc"): - machine.succeed('test -n "$(chroot-exec cat /etc/passwd)"') + passwd = machine.succeed('chroot-exec cat /etc/passwd').strip() + assert len(passwd) > 0, "/etc/passwd must not be empty" ''; } { config.serviceConfig.User = "chroot-testuser"; @@ -75,7 +71,8 @@ import ./make-test-python.nix { testScript = '' with subtest("check if User/Group really runs as non-root"): machine.succeed("chroot-exec ls -l /dev") - machine.succeed('test "$(chroot-exec id -u)" != 0') + uid = machine.succeed('chroot-exec id -u').strip() + assert uid != "0", "UID of chroot-testuser shouldn't be 0" machine.fail("chroot-exec touch /bin/test") ''; } @@ -88,10 +85,8 @@ import ./make-test-python.nix { testScript = '' with subtest("check if symlinks are properly bind-mounted"): machine.fail("chroot-exec test -e /etc") - machine.succeed( - "chroot-exec cat ${symlink} >&2", - 'test "$(chroot-exec cat ${symlink})" = "got me"', - ) + text = machine.succeed('chroot-exec cat ${symlink}').strip() + assert_eq(text, "got me") ''; }) { config.serviceConfig.User = "chroot-testuser"; @@ -158,6 +153,9 @@ import ./make-test-python.nix { }; testScript = { nodes, ... }: '' + def assert_eq(a, b): + assert a == b, f"{a} != {b}" + machine.wait_for_unit("multi-user.target") '' + nodes.machine.config.__testSteps; } diff --git a/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix b/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix index 94f17605e001..68836c730729 100644 --- a/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix +++ b/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix @@ -42,6 +42,8 @@ import ./make-test-python.nix ({pkgs, ...}: { # DO NOT COPY THIS TO PRODUCTION AS IS. Think about it at least twice. # Everyone on the "isp" machine will be able to add routes to the kernel. security.wrappers.add-dhcpd-lease = { + owner = "root"; + group = "root"; source = pkgs.writeShellScript "add-dhcpd-lease" '' exec ${pkgs.iproute2}/bin/ip -6 route replace "$1" via "$2" ''; diff --git a/nixpkgs/nixos/tests/tigervnc.nix b/nixpkgs/nixos/tests/tigervnc.nix index c0a52808b279..092eaf238d80 100644 --- a/nixpkgs/nixos/tests/tigervnc.nix +++ b/nixpkgs/nixos/tests/tigervnc.nix @@ -6,7 +6,7 @@ with import ../lib/testing-python.nix { inherit system pkgs; }; makeTest { name = "tigervnc"; - meta = with pkgs.stdenv.lib.maintainers; { + meta = with pkgs.lib.maintainers; { maintainers = [ lheckemann ]; }; diff --git a/nixpkgs/nixos/tests/unbound.nix b/nixpkgs/nixos/tests/unbound.nix index 58a717f98a16..576287a9fe5d 100644 --- a/nixpkgs/nixos/tests/unbound.nix +++ b/nixpkgs/nixos/tests/unbound.nix @@ -145,13 +145,22 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: # user that is permitted to access the unix socket someuser = { isSystemUser = true; + group = "someuser"; extraGroups = [ config.users.users.unbound.group ]; }; # user that is not permitted to access the unix socket - unauthorizeduser = { isSystemUser = true; }; + unauthorizeduser = { + isSystemUser = true; + group = "unauthorizeduser"; + }; + + }; + users.groups = { + someuser = {}; + unauthorizeduser = {}; }; # Used for testing configuration reloading diff --git a/nixpkgs/nixos/tests/user-activation-scripts.nix b/nixpkgs/nixos/tests/user-activation-scripts.nix new file mode 100644 index 000000000000..0de8664c5ef0 --- /dev/null +++ b/nixpkgs/nixos/tests/user-activation-scripts.nix @@ -0,0 +1,33 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "user-activation-scripts"; + meta = with lib.maintainers; { maintainers = [ chkno ]; }; + + machine = { + system.userActivationScripts.foo = "mktemp ~/user-activation-ran.XXXXXX"; + users.users.alice = { + initialPassword = "pass1"; + isNormalUser = true; + }; + }; + + testScript = '' + def verify_user_activation_run_count(n): + machine.succeed( + '[[ "$(find /home/alice/ -name user-activation-ran.\\* | wc -l)" == %s ]]' % n + ) + + + machine.wait_for_unit("multi-user.target") + machine.wait_for_unit("getty@tty1.service") + machine.wait_until_tty_matches(1, "login: ") + machine.send_chars("alice\n") + machine.wait_until_tty_matches(1, "Password: ") + machine.send_chars("pass1\n") + machine.send_chars("touch login-ok\n") + machine.wait_for_file("/home/alice/login-ok") + verify_user_activation_run_count(1) + + machine.succeed("/run/current-system/bin/switch-to-configuration test") + verify_user_activation_run_count(2) + ''; +}) diff --git a/nixpkgs/nixos/tests/wasabibackend.nix b/nixpkgs/nixos/tests/wasabibackend.nix index 1832698ab698..75730fe24d09 100644 --- a/nixpkgs/nixos/tests/wasabibackend.nix +++ b/nixpkgs/nixos/tests/wasabibackend.nix @@ -14,7 +14,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { port = 18332; }; }; - services.bitcoind = { + services.bitcoind."testnet" = { enable = true; testnet = true; rpc.users = { diff --git a/nixpkgs/nixos/tests/wordpress.nix b/nixpkgs/nixos/tests/wordpress.nix index 45c58b5b65c8..f7f39668c86e 100644 --- a/nixpkgs/nixos/tests/wordpress.nix +++ b/nixpkgs/nixos/tests/wordpress.nix @@ -45,6 +45,21 @@ import ./make-test-python.nix ({ pkgs, ... }: networking.firewall.allowedTCPPorts = [ 80 ]; networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; }; + + wp_caddy = { ... }: { + services.wordpress.webserver = "caddy"; + services.wordpress.sites = { + "site1.local" = { + database.tablePrefix = "site1_"; + }; + "site2.local" = { + database.tablePrefix = "site2_"; + }; + }; + + networking.firewall.allowedTCPPorts = [ 80 ]; + networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; + }; }; testScript = '' @@ -54,10 +69,11 @@ import ./make-test-python.nix ({ pkgs, ... }: wp_httpd.wait_for_unit("httpd") wp_nginx.wait_for_unit("nginx") + wp_caddy.wait_for_unit("caddy") site_names = ["site1.local", "site2.local"] - for machine in (wp_httpd, wp_nginx): + for machine in (wp_httpd, wp_nginx, wp_caddy): for site_name in site_names: machine.wait_for_unit(f"phpfpm-wordpress-{site_name}") diff --git a/nixpkgs/pkgs/applications/accessibility/squeekboard/default.nix b/nixpkgs/pkgs/applications/accessibility/squeekboard/default.nix index cca36c38e771..18bcb04c65c9 100644 --- a/nixpkgs/pkgs/applications/accessibility/squeekboard/default.nix +++ b/nixpkgs/pkgs/applications/accessibility/squeekboard/default.nix @@ -14,6 +14,7 @@ , rustPlatform , feedbackd , wrapGAppsHook +, fetchpatch }: stdenv.mkDerivation rec { @@ -37,6 +38,15 @@ stdenv.mkDerivation rec { sha256 = "0148ynzmapxfrlccikf20ikmi0ssbkn9fl5wi6nh6azflv50pzzn"; }; + patches = [ + # remove when updating from 1.14.0 + (fetchpatch { + name = "fix-rust-1.54-build.patch"; + url = "https://gitlab.gnome.org/World/Phosh/squeekboard/-/commit/9cd56185c59ace535a6af26384ef6beca4423816.patch"; + sha256 = "sha256-8rWcfhQmGiwlc2lpkRvJ95XQp1Xg7St+0K85x8nQ0mk="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/nixpkgs/pkgs/applications/audio/bchoppr/default.nix b/nixpkgs/pkgs/applications/audio/bchoppr/default.nix index ec09e62b0944..623aa1584521 100644 --- a/nixpkgs/pkgs/applications/audio/bchoppr/default.nix +++ b/nixpkgs/pkgs/applications/audio/bchoppr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bchoppr"; - version = "1.10.8"; + version = "1.10.10"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "sha256-F2J9TBONluhBuoEnpff3tLZEHFDbmllILqbZvu+PGGI="; + sha256 = "sha256-LNPG/ETRmgPv8LsYVHol4p5oRCvg+dSYVEe61i8Dvz8="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index 492054396702..447bc7d6635d 100644 --- a/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { -not -name '*.so.*' \ -not -name '*.so' \ -not -name '*.jar' \ + -not -name 'jspawnhelper' \ -not -path '*/resources/*' | \ while IFS= read -r f ; do patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $f @@ -58,6 +59,10 @@ stdenv.mkDerivation rec { --suffix LD_LIBRARY_PATH : "${lib.strings.makeLibraryPath buildInputs}" done + find $out -type f -executable -name 'jspawnhelper' | \ + while IFS= read -r f ; do + patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $f + done ''; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/audio/bjumblr/default.nix b/nixpkgs/pkgs/applications/audio/bjumblr/default.nix index ce81415cd5db..5e3919e04d34 100644 --- a/nixpkgs/pkgs/applications/audio/bjumblr/default.nix +++ b/nixpkgs/pkgs/applications/audio/bjumblr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bjumblr"; - version = "1.6.6"; + version = "1.6.8"; src = fetchFromGitHub { owner = "sjaehn"; repo = "BJumblr"; rev = version; - sha256 = "1nbxi54023vck3qgmr385cjzinmdnvz62ywb6bcksmc3shl080mg"; + sha256 = "sha256-qSoGmWUGaMjx/bkiCJ/qb4LBbuFPXXlJ0e9hrFBXzwE="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/audio/bschaffl/default.nix b/nixpkgs/pkgs/applications/audio/bschaffl/default.nix index ed988cbcb67f..eabdad3caa9c 100644 --- a/nixpkgs/pkgs/applications/audio/bschaffl/default.nix +++ b/nixpkgs/pkgs/applications/audio/bschaffl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bschaffl"; - version = "1.4.6"; + version = "1.4.8"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "sha256-tD4LsIXb2II+TNEfzXBviMR2fq/FtCSsaL2YGun1vu0="; + sha256 = "sha256-zczDqJdUAN2oSyIRt9m3OnwOWXlwL4Yod8UMCXs5zM0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/audio/bsequencer/default.nix b/nixpkgs/pkgs/applications/audio/bsequencer/default.nix index 8fb646855952..00f99adf7bac 100644 --- a/nixpkgs/pkgs/applications/audio/bsequencer/default.nix +++ b/nixpkgs/pkgs/applications/audio/bsequencer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bsequencer"; - version = "1.8.8"; + version = "1.8.10"; src = fetchFromGitHub { owner = "sjaehn"; repo = "BSEQuencer"; rev = version; - sha256 = "sha256-OArIMf0XP9CKDdb3H4s8jMzVRjoLFQDPmTS9rS2KW3w="; + sha256 = "sha256-1PSICm5mw37nO3gkHA9MNUH+CFULeOZURjimYEA/dXA="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/audio/libopenmpt/default.nix b/nixpkgs/pkgs/applications/audio/libopenmpt/default.nix index 2edb75d2b803..ef5c080133b0 100644 --- a/nixpkgs/pkgs/applications/audio/libopenmpt/default.nix +++ b/nixpkgs/pkgs/applications/audio/libopenmpt/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchurl, zlib, pkg-config, mpg123, libogg, libvorbis, portaudio, libsndfile, flac -, usePulseAudio ? config.pulseaudio or false, libpulseaudio }: +, usePulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: stdenv.mkDerivation rec { pname = "libopenmpt"; diff --git a/nixpkgs/pkgs/applications/audio/mopidy/iris.nix b/nixpkgs/pkgs/applications/audio/mopidy/iris.nix index 131b2c680b9b..c4e231ad4099 100644 --- a/nixpkgs/pkgs/applications/audio/mopidy/iris.nix +++ b/nixpkgs/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.58.0"; + version = "3.58.2"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1bsmc4p7b6v4mm8fi9zsy0knzdccnz1dc6ckrdr18kw2ji0hiyx2"; + sha256 = "1cni9dd1c97bp92crjhsbwml12z8i6wkmj79zz8qvk46k8ixy3vp"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/plexamp/default.nix b/nixpkgs/pkgs/applications/audio/plexamp/default.nix index 7e1865462e63..81912379de1d 100644 --- a/nixpkgs/pkgs/applications/audio/plexamp/default.nix +++ b/nixpkgs/pkgs/applications/audio/plexamp/default.nix @@ -2,13 +2,13 @@ let pname = "plexamp"; - version = "3.7.0"; + version = "3.7.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "YixaO54+V9RTYS+Of7AVvBtxUEuCdbzlJmyIBj5k8jlD0bvRP1XwIIeADnofKBLAa2ZsmiQunznPLsjQWgr4JA=="; + sha512 = "n+ZFfKYUx6silpH4bGNRdh5JJPchjKNzFLAhZQPecK2DkmygY35/ZYUNSBioqxuGKax+I/mY5podmQ5iD95ohQ=="; }; appimageContents = appimageTools.extractType2 { @@ -34,7 +34,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/31"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/32"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/applications/audio/praat/default.nix b/nixpkgs/pkgs/applications/audio/praat/default.nix index 83456dcb7c8b..75a706cff1ed 100644 --- a/nixpkgs/pkgs/applications/audio/praat/default.nix +++ b/nixpkgs/pkgs/applications/audio/praat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "praat"; - version = "6.1.51"; + version = "6.1.53"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${version}"; - sha256 = "sha256-4goZRNKNFrfKRbGODJMhN6DyOh8U3+nWRDF1VMT7I1E="; + sha256 = "sha256-4GOVrKVHl/Cj0PNx+rcLESn5fbyIsnzaheMOFLlEVMU="; }; configurePhase = '' diff --git a/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix b/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix index 2724f8893372..6abc120379d6 100644 --- a/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix +++ b/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.32"; + version = "1.34"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-U1q4xCOzV7n31WgCTGlEXvZaUT/TP797cOAHkecQaLo="; + sha256 = "sha256-JT3I06qm3oljsySIgK5xP2RC3KAb5QBrNVdip0ds4KE="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/audio/ptcollab/default.nix b/nixpkgs/pkgs/applications/audio/ptcollab/default.nix index 2738a865346e..74ed00dc5aea 100644 --- a/nixpkgs/pkgs/applications/audio/ptcollab/default.nix +++ b/nixpkgs/pkgs/applications/audio/ptcollab/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "ptcollab"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "yuxshao"; repo = "ptcollab"; rev = "v${version}"; - sha256 = "sha256-AeIjc+FoFsTcyWl261GvyySIHP107rL4JkuMXFhnPbk="; + sha256 = "sha256-bFFWPl7yaTwCKz7/f9Vk6mg0roUnig0dFERS4IE4R7g="; }; nativeBuildInputs = [ qmake pkg-config ]; diff --git a/nixpkgs/pkgs/applications/radio/pyradio/default.nix b/nixpkgs/pkgs/applications/audio/pyradio/default.nix index f23359688c6c..ec937565aa24 100644 --- a/nixpkgs/pkgs/applications/radio/pyradio/default.nix +++ b/nixpkgs/pkgs/applications/audio/pyradio/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.8.7.2"; + version = "0.8.9.9"; src = fetchFromGitHub { owner = "coderholic"; repo = pname; rev = version; - sha256 = "0h2sxaqpmc1d1kpvpbcs9wymgzhx25x0x9p7dbyfw9r90i6123q1"; + sha256 = "04asw5alkkf2q5iixswarj6ddb0y4a6ixm7cckl6204jiyxpv6kc"; }; checkPhase = '' diff --git a/nixpkgs/pkgs/applications/audio/qjackctl/default.nix b/nixpkgs/pkgs/applications/audio/qjackctl/default.nix index 7196829afa0e..7d1ec9f99783 100644 --- a/nixpkgs/pkgs/applications/audio/qjackctl/default.nix +++ b/nixpkgs/pkgs/applications/audio/qjackctl/default.nix @@ -5,7 +5,7 @@ }: mkDerivation rec { - version = "0.9.0"; + version = "0.9.4"; pname = "qjackctl"; # some dependencies such as killall have to be installed additionally @@ -14,7 +14,7 @@ mkDerivation rec { owner = "rncbc"; repo = "qjackctl"; rev = "${pname}_${lib.replaceChars ["."] ["_"] version}"; - sha256 = "044kgwk7pfywad4myza0s2kvfkl21zkqq5wgny7n3c43qlcgs3zr"; + sha256 = "sha256-eZKrPQ07Z3pF5dArZ4QSclrRCaPHpPb8S5HANLUS9MM="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/qmidinet/default.nix b/nixpkgs/pkgs/applications/audio/qmidinet/default.nix index 51772cc135b5..556787ca9ea5 100644 --- a/nixpkgs/pkgs/applications/audio/qmidinet/default.nix +++ b/nixpkgs/pkgs/applications/audio/qmidinet/default.nix @@ -1,12 +1,12 @@ { mkDerivation, lib, fetchurl, pkg-config, qtbase, qttools, alsa-lib, libjack2 }: mkDerivation rec { - version = "0.9.1"; + version = "0.9.4"; pname = "qmidinet"; src = fetchurl { url = "mirror://sourceforge/qmidinet/${pname}-${version}.tar.gz"; - sha256 = "sha256-cDgF5hbjy5DzGn4Rlmb76XzRa2wURVwPu2rQRKENxQU="; + sha256 = "sha256-7Ui4kUgYgpPVAaaINrd6WGZoYon5UuHszGVaHafb/p0="; }; hardeningDisable = [ "format" ]; diff --git a/nixpkgs/pkgs/applications/audio/qsynth/default.nix b/nixpkgs/pkgs/applications/audio/qsynth/default.nix index 6d75c32a6667..f9eaa890c57f 100644 --- a/nixpkgs/pkgs/applications/audio/qsynth/default.nix +++ b/nixpkgs/pkgs/applications/audio/qsynth/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "qsynth"; - version = "0.9.1"; + version = "0.9.4"; src = fetchurl { url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz"; - sha256 = "sha256-VNcI5QOVacHBcI6psEvhm7+cOTpwr2pMVXmk7nMXNiY="; + sha256 = "sha256-dlgIkMde7uv4UlMKEPhtZ7MfSTBc7RvHs+Q2yk+G/JM="; }; nativeBuildInputs = [ autoconf pkg-config ]; diff --git a/nixpkgs/pkgs/applications/audio/qtractor/default.nix b/nixpkgs/pkgs/applications/audio/qtractor/default.nix index b1d0928b86a0..cb564d0514b1 100644 --- a/nixpkgs/pkgs/applications/audio/qtractor/default.nix +++ b/nixpkgs/pkgs/applications/audio/qtractor/default.nix @@ -30,11 +30,11 @@ mkDerivation rec { pname = "qtractor"; - version = "0.9.19"; + version = "0.9.23"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-98/trRZRvNRPEA4ASS81qp2rMevpo5TIrtsU1TYMuT0="; + sha256 = "sha256-GgDc7WM4nVGlq+8EcwxJ7MnSPYwAej51IMrN0glCTbQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/audio/sayonara/default.nix b/nixpkgs/pkgs/applications/audio/sayonara/default.nix index 651ac20db220..12a7ab0325eb 100644 --- a/nixpkgs/pkgs/applications/audio/sayonara/default.nix +++ b/nixpkgs/pkgs/applications/audio/sayonara/default.nix @@ -22,13 +22,13 @@ let in mkDerivation rec { pname = "sayonara"; - version = "1.6.0-beta7"; + version = "1.7.0-stable3"; src = fetchFromGitLab { owner = "luciocarreras"; repo = "sayonara-player"; rev = version; - sha256 = "14svszfldx32vn937rszd21rgl31vb5kzs0hnrg41ygx0br61rvd"; + sha256 = "sha256-tJ/8tGNkmTwWRCpPy/h85SP/6QDAgcaKWJdM5MSAXJw="; }; nativeBuildInputs = [ cmake ninja pkg-config qttools ]; diff --git a/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix b/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix index 18bd8170f1db..73f1f650677c 100644 --- a/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix +++ b/nixpkgs/pkgs/applications/audio/sidplayfp/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "sidplayfp"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; rev = "v${version}"; - sha256 = "sha256-IlPZmZpWxMaArkRnqu6JCGxiHU7JczRxiySqzAopfxc="; + sha256 = "sha256-DBZZf3A0AYkeQxQvHGyHHbsQ2EDuxsZnZPbxkWTNcHA="; }; nativeBuildInputs = [ autoreconfHook perl pkg-config ]; diff --git a/nixpkgs/pkgs/applications/audio/snd/default.nix b/nixpkgs/pkgs/applications/audio/snd/default.nix index 4881360b82e6..56d1dacaf9ad 100644 --- a/nixpkgs/pkgs/applications/audio/snd/default.nix +++ b/nixpkgs/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "snd"; - version = "21.1"; + version = "21.7"; src = fetchurl { url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; - sha256 = "1jxvpgx1vqa6bwdzlzyzrjn2swjf9nfhzi9r1r96ivi0870vvjk3"; + sha256 = "sha256-GjaPZmJfodvYvhObGcBDRN0mIyc6Vxycd0BZGHdvoJA="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/audio/songrec/default.nix b/nixpkgs/pkgs/applications/audio/songrec/default.nix index e9944bc0da34..166784a164d7 100644 --- a/nixpkgs/pkgs/applications/audio/songrec/default.nix +++ b/nixpkgs/pkgs/applications/audio/songrec/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "songrec"; - version = "0.1.9"; + version = "0.2.0"; src = fetchFromGitHub { owner = "marin-m"; repo = pname; rev = version; - sha256 = "sha256-2n6bj/JlbOTs3AyQKItacutUl1nmb6YsrXvRSp9C+BA="; + sha256 = "sha256-9fq2P+F7Olm9bUQ1HbH/Lzb5J2mJCma+x/vuH3wf+zY="; }; - cargoSha256 = "sha256-3sr7Rtp34Y2oCI+/6mE6C7jRx0xloiljuP0nlYACfMY="; + cargoSha256 = "sha256-ATlwBMuT8AufkrZNe1+U74hYRN4V88ZDKYvCWV52iyI="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/audio/spotify/default.nix b/nixpkgs/pkgs/applications/audio/spotify/default.nix index fa8174e3a95b..48e6a85f5d25 100644 --- a/nixpkgs/pkgs/applications/audio/spotify/default.nix +++ b/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.67.586.gbb5ef64e"; + version = "1.1.68.628.geb44bd66"; # 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 = "50"; + rev = "52"; deps = [ alsa-lib @@ -80,7 +80,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 = "f29aa4a3f3d6a72f108f350905789f12ab3ae50cf4f4828f021d3be7759b192506c9a397e45309a5ee659578b6e85de80d7d78f994af9ab631c9fb2dc527c242"; + sha512 = "be6f1cb650924eb9e244497374d1dfe6136d28056dbecc7000a03341a4bb4c6ab2c83ec6c707bd6f57afde95262230eafbde08e9c7a7dfcacdf660eb10499f3a"; }; nativeBuildInputs = [ makeWrapper wrapGAppsHook squashfsTools ]; diff --git a/nixpkgs/pkgs/applications/audio/tauon/default.nix b/nixpkgs/pkgs/applications/audio/tauon/default.nix index 530c41ab9220..8213aeb5fe50 100644 --- a/nixpkgs/pkgs/applications/audio/tauon/default.nix +++ b/nixpkgs/pkgs/applications/audio/tauon/default.nix @@ -15,6 +15,7 @@ , opusfile , pango , pulseaudio +, withDiscordRPC ? false }: stdenv.mkDerivation rec { @@ -82,7 +83,7 @@ stdenv.mkDerivation rec { pysdl2 requests send2trash - ]; + ] ++ lib.optional withDiscordRPC pypresence; makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ffmpeg]}" diff --git a/nixpkgs/pkgs/applications/backup/pika-backup/default.nix b/nixpkgs/pkgs/applications/backup/pika-backup/default.nix index fd6c0f0cf835..e0b8b2fca14f 100644 --- a/nixpkgs/pkgs/applications/backup/pika-backup/default.nix +++ b/nixpkgs/pkgs/applications/backup/pika-backup/default.nix @@ -19,20 +19,20 @@ stdenv.mkDerivation rec { pname = "pika-backup"; - version = "0.3.2"; + version = "0.3.5"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "pika-backup"; rev = "v${version}"; - sha256 = "sha256-dKVyvB4s1MZHri0dFJDBUXQKsi2KgP30ZhsJ486M+og="; + sha256 = "sha256-8jT3n+bTNjhm64AMS24Ju+San75ytfqFXloH/TOgO1g="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "1vsh8vqgmfady82d7wfxkknmrp7mq7nizpif2zwg3kqbl964mp3y"; + sha256 = "198bs4z7l22sh8ck7v46s45mj8zpfbg03n1xzc6pnafdd8hf3q15"; }; patches = [ diff --git a/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix b/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix index 16bcc71653bd..832c453ce7cc 100644 --- a/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -35,11 +35,11 @@ let in stdenv.mkDerivation rec { pname = "bisq-desktop"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "0b2rh9sphc9wffkawprrl20frgv0rah7y2k5sfxpjc3shgkqsw80"; + sha256 = "1q250lj0ig6aqd1dfc335z8pjj7qa7l75kws6d78k3wchzmk7jrk"; }; nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg gnutar zip xz ]; diff --git a/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix b/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix index 8bbeda2e0d4e..7a0237ed2b15 100644 --- a/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix @@ -24,10 +24,10 @@ with lib; let - version = "0.21.1"; - majorMinorVersion = versions.majorMinor version; + version = "22.0"; + majorVersion = versions.major version; desktop = fetchurl { - url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorMinorVersion}/debian/bitcoin-qt.desktop"; + url = "https://raw.githubusercontent.com/bitcoin-core/packaging/${majorVersion}.x/debian/bitcoin-qt.desktop"; sha256 = "0cpna0nxcd1dw3nnzli36nf9zj28d2g9jf5y0zl9j18lvanvniha"; }; in @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "caff23449220cf45753f312cefede53a9eac64000bb300797916526236b6a1e0"; + sha256 = "d0e9d089b57048b1555efa7cd5a63a7ed042482045f6f33402b1df425bf9613b"; }; nativeBuildInputs = diff --git a/nixpkgs/pkgs/applications/blockchains/charge-lnd/default.nix b/nixpkgs/pkgs/applications/blockchains/charge-lnd/default.nix index c76da7ae7464..1571e09e3e9a 100644 --- a/nixpkgs/pkgs/applications/blockchains/charge-lnd/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/charge-lnd/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "charge-lnd"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "accumulator"; repo = pname; rev = "v${version}"; - sha256 = "1cj8ggahnbn55wlkxzf5b9n8rvm30mc95vgcw8b60pzs47q6vncp"; + sha256 = "1d1cbpmpppp7z1bmsarwfs314c7ypchlyr4calx0fzxfpxzfks5k"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/applications/blockchains/chia/default.nix b/nixpkgs/pkgs/applications/blockchains/chia/default.nix index 4c596be9f4c8..68da5a6cd4e3 100644 --- a/nixpkgs/pkgs/applications/blockchains/chia/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/chia/default.nix @@ -7,14 +7,14 @@ let chia = python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.2.6"; + version = "1.2.7"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; fetchSubmodules = true; - sha256 = "sha256-Y+cRfx5WE+hb31E975xquuSmNgqr2AvaQnCE70sW91w="; + sha256 = "sha256-yjpBB51EgaJvFdfhC1AG5N7H5u6aJwD1UqJqIv22QpQ="; }; patches = [ @@ -26,6 +26,13 @@ let chia = python3Packages.buildPythonApplication rec { }) ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "==" ">=" + + ln -sf ${cacert}/etc/ssl/certs/ca-bundle.crt mozilla-ca/cacert.pem + ''; + nativeBuildInputs = [ python3Packages.setuptools-scm ]; @@ -75,17 +82,6 @@ let chia = python3Packages.buildPythonApplication rec { "test_using_legacy_keyring" ]; - postPatch = '' - # tweak version requirements to what's available in Nixpkgs - substituteInPlace setup.py \ - --replace "aiohttp==3.7.4" "aiohttp>=3.7.4" \ - --replace "sortedcontainers==2.3.0" "sortedcontainers>=2.3.0" \ - --replace "click==7.1.2" "click>=7.1.2" \ - --replace "clvm==0.9.7" "clvm>=0.9.7" \ - - ln -sf ${cacert}/etc/ssl/certs/ca-bundle.crt mozilla-ca/cacert.pem - ''; - preCheck = '' export HOME=`mktemp -d` ''; diff --git a/nixpkgs/pkgs/applications/blockchains/electrs/default.nix b/nixpkgs/pkgs/applications/blockchains/electrs/default.nix index cf2f4d3d47eb..ec135b7e931d 100644 --- a/nixpkgs/pkgs/applications/blockchains/electrs/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/electrs/default.nix @@ -2,24 +2,30 @@ , rustPlatform , fetchFromGitHub , llvmPackages +, rocksdb }: rustPlatform.buildRustPackage rec { pname = "electrs"; - version = "0.8.10"; + version = "0.8.12"; src = fetchFromGitHub { owner = "romanz"; repo = pname; rev = "v${version}"; - sha256 = "0q7mvpflnzzm88jbsdxgvhk9jr5mvn23hhj2iwy2grnfngxsmz3y"; + sha256 = "0kd5zki9f1pnwscnvd921dw0lc45nfkwk23l33nzdjn005lmsw7v"; }; + cargoSha256 = "1l8dwjwj21crxampzj5c0k98xnisgy3d9c3dkgf5vaybrcp04k85"; + # needed for librocksdb-sys nativeBuildInputs = [ llvmPackages.clang ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - cargoSha256 = "0i8npa840g4kz50n6x40z22x9apq8snw6xgjz4vn2kh67xc4c738"; + # link rocksdb dynamically + ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; + ROCKSDB_LIB_DIR = "${rocksdb}/lib"; + cargoBuildFlags = "--no-default-features"; meta = with lib; { description = "An efficient re-implementation of Electrum Server in Rust"; diff --git a/nixpkgs/pkgs/applications/blockchains/erigon.nix b/nixpkgs/pkgs/applications/blockchains/erigon.nix index cfd3d5da9323..241a9b3f870e 100644 --- a/nixpkgs/pkgs/applications/blockchains/erigon.nix +++ b/nixpkgs/pkgs/applications/blockchains/erigon.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "erigon"; - version = "2021.08.05"; + version = "2021.09.02"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bCREY3UbMgSTu1nVytrYFsGgdMEaMLy5ZGrLqDNu9YM="; + sha256 = "sha256-0rWyDlZjfsZMOqAXs+mgmgz0m4oIN6bZ6Z9U4jWgR0E="; }; - vendorSha256 = "0a0d6n2c0anp36z7kvkadd6zvxzvsywfpk5qv6aq4ji4qd0hlq8q"; + vendorSha256 = "sha256-ardr+6Tz9IzSJPo9/kk7XV+2pIu6ZK3YYlp1zC/7Bno="; runVend = true; # Build errors in mdbx when format hardening is enabled: diff --git a/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 4b3ba00fb960..acf03368d3c6 100644 --- a/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.32.2"; + version = "2.33.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "14agkl6xf0f9s5qldla6p6kzl8zlx61q5m8qy63lq215hrzh9d50"; + sha256 = "1k1h37fbpsib9h8867m2dsfacdjs78gdm61gvrin5gpw1zj10syz"; }; appimageContents = appimageTools.extractType2 { diff --git a/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix b/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix index d8867da5fd56..f5dbfeb5ff9b 100644 --- a/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/mycrypto/default.nix @@ -4,13 +4,13 @@ let pname = "MyCrypto"; - version = "1.7.16"; - hash = "sha256-fvV/dT9tj8/d/kjM0dVj3IC/O7Y/yG8fscDCzUBwHKI="; + version = "1.7.17"; + sha256 = "20eb48989b5ae5e60e438eff6830ac79a0d89ac26dff058097260e747e866444"; # Taken from release's checksums.txt.gpg name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/mycryptohq/mycrypto/releases/download/${version}/linux-x86-64_${version}_MyCrypto.AppImage"; - inherit hash; + inherit sha256; }; appimageContents = appimageTools.extractType2 { diff --git a/nixpkgs/pkgs/applications/blockchains/particl-core/default.nix b/nixpkgs/pkgs/applications/blockchains/particl-core/default.nix index 99bc49e8db33..db2a72f3e552 100644 --- a/nixpkgs/pkgs/applications/blockchains/particl-core/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/particl-core/default.nix @@ -17,11 +17,11 @@ with lib; stdenv.mkDerivation rec { pname = "particl-core"; - version = "0.19.2.5"; + version = "0.19.2.13"; src = fetchurl { url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz"; - sha256 = "sha256-uI4T8h6RvCikk8h/sZmGlj3Uj3Xhu0vDn/fPb6rLcSg="; + sha256 = "sha256-eXlTfSjxOGZi/0/b7myqILJZYNcbK+QqQmq+PVkh1e8="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix b/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix index 8d2da4c36650..a0adc22af7b7 100644 --- a/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "21.7.1"; + version = "21.9.2"; name = "${pname}-${version}"; suffix = { @@ -18,10 +18,9 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; - # sha512 hashes are obtained from latest-linux-arm64.yml and latest-linux.yml - sha512 = { - aarch64-linux = "sha512-GEu1Zx3IQws8wsVsZUaIKvC0kTe8l/BBPSdu5q44tDpszmPugz8G/8FDAO/Ra50dzyiHhRheybZPuf2BBGGb7A=="; - x86_64-linux = "sha512-ghPbQa/MstzfUOWve1KNwB1t9dxK0+eYunBSoShWKpb85hgK69+ncTmhY8HejT28OkjFnGk6h4PWbrnQetj8MA=="; + sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | rg ^sha512 | sed 's/: /-/' + aarch64-linux = "sha512-mgip818sGkrKwF4v2mj/JeTNxBoj7DgdNPoxZ8sp8OvojHB2sa0hm4YXfrzAdPf8CP6d5ChUmwccQyYilGUiOQ=="; + x86_64-linux = "sha512-f02m8Q6ITYhIXH1FS2BA/QYYsdtxklDDNYBXBarj8b1kA+yhDFZ3VL9vy+nZNdPQHQ2yMQreDzpcToXBQ67XyQ=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/nixpkgs/pkgs/applications/blockchains/wasabibackend/create_deps.sh b/nixpkgs/pkgs/applications/blockchains/wasabibackend/create_deps.sh index 814f92a341a6..79bc88ca8996 100644..100755 --- a/nixpkgs/pkgs/applications/blockchains/wasabibackend/create_deps.sh +++ b/nixpkgs/pkgs/applications/blockchains/wasabibackend/create_deps.sh @@ -1,13 +1,26 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p dotnet-sdk_3 nixfmt +#! nix-shell -i bash -p dotnet-sdk_3 jq xmlstarlet curl nixfmt +set -euo pipefail # Run this script to generate deps.nix -# ./create_deps.sh /path/to/package/source/checkout > deps.nix # TODO: consolidate with other dotnet deps generation scripts by which # this script is inspired: # - pkgs/servers/nosql/eventstore/create-deps.sh # - pkgs/development/dotnet-modules/python-language-server/create_deps.sh +# - pkgs/misc/emulators/ryujinx/updater.sh + +cd "$(dirname "${BASH_SOURCE[0]}")" + +deps_file="$(realpath "./deps.nix")" + +exec 2>&1 6> "$deps_file" + +store_src="$( nix-build ../../../.. -A wasabibackend.src --no-out-link )" +src="$(mktemp -d)" +cp -rT "$store_src" "$src" +chmod -R +w "$src" +pushd "$src" URLBASE="https://www.nuget.org/api/v2/package" @@ -30,69 +43,56 @@ DEPS_TEMPLATE=" sha256 = \"%s\"; })" +tmpdir="$(mktemp -d -p "$(pwd)")" # must be under source root +trap 'rm -rf "$tmpdir"' EXIT + +HOME="$tmpdir" dotnet restore --packages "$tmpdir"/.nuget/packages \ + --no-cache --force --runtime linux-x64 \ + WalletWasabi.Backend/WalletWasabi.Backend.csproj >&2 + +mapfile -t repos < <( + xmlstarlet sel -t -v 'configuration/packageSources/add/@value' -n NuGet.config "$tmpdir"/.nuget/NuGet/NuGet.Config | + while IFS= read index + do + curl --compressed -fsL "$index" | \ + jq -r '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"' + done +) + +echo $DEPS_HEADER >&6 + +cd "$tmpdir/.nuget/packages" +for package in * +do + cd "$package" + for version in * + do + found=false + for repo in "${repos[@]}" + do + url="$repo$package/$version/$package.$version.nupkg" + if curl -fsL "$url" -o /dev/null + then + found=true + break + fi + done + + if ! $found + then + echo "couldn't find $package $version" >&2 + exit 1 + fi + + sha256=$(nix-prefetch-url "$url" 2>/dev/null) + + printf "$DEPS_TEMPLATE" $package $version $sha256 >&6 + done + cd .. +done + +echo $DEPS_FOOTER >&6 + +exec 6>&- -function generate_restore_log() { - checkout_path=$1 - >&2 echo "generating restore log for $checkout_path..." - cd $checkout_path - dotnet nuget locals all --clear - dotnet restore -v normal --no-cache WalletWasabi.Backend -r linux-x64 - cd - -} - -function process_restore_log() { - restore_log=$1 - >&2 echo "processing restore log..." - while read line; do - if echo $line | grep -q "^[[:space:]]*Installing"; then - l=$(echo $line | xargs) - l=${l#Installing } - l=${l%.} - echo $l - fi - done < $restore_log -} - -function prefetch_deps() { - processed_log=$1 - >&2 echo "prefetching deps..." - while read line; do - name=$(echo $line | cut -d' ' -f1) - >&2 echo "prefetching '$name' version: $version" - version=$(echo $line | cut -d' ' -f2) - hash=$(nix-prefetch-url "$URLBASE/$name/$version" 2>/dev/null) - echo "$name $version $hash" - done < $processed_log -} - -function generate_deps_expression() { - packages=$1 - >&2 echo "generating deps nix-expression..." - echo $DEPS_HEADER - while read line; do - name=$(echo $line | cut -d' ' -f1) - version=$(echo $line | cut -d' ' -f2) - hash=$(echo $line | cut -d' ' -f3) - printf "$DEPS_TEMPLATE" $name $version $hash - done < $packages - echo $DEPS_FOOTER -} - -function main() { - checkout_path=$1 - tmpdir=$(mktemp -d) - generate_restore_log $checkout_path > $tmpdir/restore.log - process_restore_log $tmpdir/restore.log > $tmpdir/processed.log - prefetch_deps $tmpdir/processed.log > $tmpdir/prefetched.log - generate_deps_expression $tmpdir/prefetched.log > $tmpdir/deps.nix - nixfmt $tmpdir/deps.nix - cat $tmpdir/deps.nix - rm -rf $tmpdir -} - -if [ ! -d "$1" ]; then - >&2 echo "First argument must be a directory, the path to the package source checkout" - exit 1 -fi - -main $@ +nixfmt "$deps_file" diff --git a/nixpkgs/pkgs/applications/blockchains/wasabibackend/deps.nix b/nixpkgs/pkgs/applications/blockchains/wasabibackend/deps.nix index 4d4489efa3cb..47ee3f9bfe59 100644 --- a/nixpkgs/pkgs/applications/blockchains/wasabibackend/deps.nix +++ b/nixpkgs/pkgs/applications/blockchains/wasabibackend/deps.nix @@ -9,948 +9,948 @@ let in [ (fetchNuGet { - name = "System.Xml.XmlSerializer"; - version = "4.0.11"; - sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; - }) - (fetchNuGet { - name = "System.Globalization.Extensions"; - version = "4.3.0"; - sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; - }) - (fetchNuGet { - name = "System.Runtime.Handles"; - version = "4.3.0"; - sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; - }) - (fetchNuGet { - name = "System.Dynamic.Runtime"; - version = "4.0.11"; - sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; + name = "microsoft.aspnetcore.app.runtime.linux-x64"; + version = "3.1.19"; + sha256 = "19z4zrchaxcz0a33c33n1qd11z9khj4323nfzsbzah0xxkkj8ka8"; }) (fetchNuGet { - name = "System.Threading.Overlapped"; - version = "4.0.1"; - sha256 = "0fi79az3vmqdp9mv3wh2phblfjls89zlj6p9nc3i9f6wmfarj188"; + name = "microsoft.aspnetcore.jsonpatch"; + version = "3.1.1"; + sha256 = "0c0aaz9rlh9chc53dnv5jryp0x0415hipaizrmih3kzwd3fmqpml"; }) (fetchNuGet { - name = "System.Security.Principal"; - version = "4.0.1"; - sha256 = "1nbzdfqvzzbgsfdd5qsh94d7dbg2v4sw0yx6himyn52zf8z6007p"; + name = "microsoft.aspnetcore.mvc.newtonsoftjson"; + version = "3.1.1"; + sha256 = "1c2lrlp64kkacnjgdyygr6fqdawk10l8j4qgppii6rq61yjwhcig"; }) (fetchNuGet { - name = "System.Private.DataContractSerialization"; - version = "4.1.1"; - sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r"; + name = "microsoft.build"; + version = "15.3.409"; + sha256 = "0vzq6csp2yys9s96c7i37bjml439rdi47g8f5rzqdr7xf5a1jk81"; }) (fetchNuGet { - name = "Microsoft.Win32.Registry"; - version = "4.0.0"; - sha256 = "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k"; + name = "microsoft.build.framework"; + version = "15.3.409"; + sha256 = "1dhanwb9ihbfay85xj7cwn0byzmmdz94hqfi3q6r1ncwdjd8y1s2"; }) (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.0.1"; - sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; + name = "microsoft.build.runtime"; + version = "15.3.409"; + sha256 = "135ycnqz5jfg61y5zaapgc7xdpjx2aq4icmxb9ph7h5inl445q7q"; }) (fetchNuGet { - name = "System.Reflection.Emit.Lightweight"; - version = "4.0.1"; - sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; + name = "microsoft.build.tasks.core"; + version = "15.3.409"; + sha256 = "135swyygp7cz2civwsz6a7dj7h8bzp7yrybmgxjanxwrw66hm933"; }) (fetchNuGet { - name = "System.Reflection.Emit.ILGeneration"; - version = "4.0.1"; - sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; + name = "microsoft.build.utilities.core"; + version = "15.3.409"; + sha256 = "1p8a0l9sxmjj86qha748qjw2s2n07q8mn41mj5r6apjnwl27ywnf"; }) (fetchNuGet { - name = "System.Globalization.Extensions"; - version = "4.0.1"; - sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; + name = "microsoft.csharp"; + version = "4.3.0"; + sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; - version = "4.0.0"; - sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; + name = "microsoft.csharp"; + version = "4.7.0"; + sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.0.0"; - sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; + name = "microsoft.extensions.apidescription.server"; + version = "3.0.0"; + sha256 = "13a47xcqyi5gz85swxd4mgp7ndgl4kknrvv3xwmbn71hsh953hsh"; }) (fetchNuGet { - name = "System.Security.Cryptography.Cng"; - version = "4.2.0"; - sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; + name = "microsoft.extensions.fileproviders.abstractions"; + version = "2.0.0"; + sha256 = "0d6y5isjy6jpf4w3f3w89cwh9p40glzhwvm7cwhx05wkqd8bk9w4"; }) (fetchNuGet { - name = "System.Security.Cryptography.Csp"; - version = "4.0.0"; - sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; + name = "microsoft.extensions.fileproviders.physical"; + version = "2.0.0"; + sha256 = "0l0l92g7sq4122n139av1pn1jl6wlw92hjmdnr47xdss0ndmwrs3"; }) (fetchNuGet { - name = "Microsoft.VisualStudio.Web.CodeGeneration.Tools"; - version = "2.0.2"; - sha256 = "0fkjm06irs53d77z29i6dwj5pjhgj9ivhad8v39ghnrwasc0ivq6"; + name = "microsoft.extensions.filesystemglobbing"; + version = "2.0.0"; + sha256 = "02lzy6r14ghwfwm384xajq08vv3pl3ww0mi5isrr10vivhijhgg4"; }) (fetchNuGet { - name = "System.Security.Cryptography.OpenSsl"; - version = "4.0.0"; - sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; + name = "microsoft.extensions.logging.abstractions"; + version = "1.0.0"; + sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; }) (fetchNuGet { - name = "Microsoft.VisualStudio.Web.CodeGeneration.Contracts"; - version = "2.0.2"; - sha256 = "1fs6sbjn0chx6rv38d61zgk8mhyyxz44xp4wsfya0lvkckyszyn1"; + name = "microsoft.extensions.primitives"; + version = "2.0.0"; + sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) (fetchNuGet { - name = "runtime.native.System.Net.Http"; - version = "4.0.1"; - sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; + name = "microsoft.netcore.app"; + version = "2.0.5"; + sha256 = "0qb7k624w7l0zhapdp519ymqg84a67r8zyd8cpj42hywsgb0dqv6"; }) (fetchNuGet { - name = "Microsoft.Extensions.FileProviders.Physical"; - version = "2.0.0"; - sha256 = "0l0l92g7sq4122n139av1pn1jl6wlw92hjmdnr47xdss0ndmwrs3"; + name = "microsoft.netcore.app.runtime.linux-x64"; + version = "3.1.19"; + sha256 = "10c9bq1z8j173n9jzamgplbxq101yscwdhksshn1ybisn7cr5g0h"; }) (fetchNuGet { - name = "runtime.native.System.IO.Compression"; - version = "4.1.0"; - sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; + name = "microsoft.netcore.dotnetapphost"; + version = "2.0.5"; + sha256 = "00bsxdg9c8msjxyffvfi8siqk8v2m7ca8fqy1npv7b2pzg3byjws"; }) (fetchNuGet { - name = "Microsoft.NETCore.App"; + name = "microsoft.netcore.dotnethostpolicy"; version = "2.0.5"; - sha256 = "0qb7k624w7l0zhapdp519ymqg84a67r8zyd8cpj42hywsgb0dqv6"; + sha256 = "0v5csskiwpk8kz8wclqad8kcjmxr7ik4w99wl05740qvaag3qysk"; }) (fetchNuGet { - name = "runtime.native.System.Security.Cryptography"; - version = "4.0.0"; - sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; + name = "microsoft.netcore.dotnethostresolver"; + version = "2.0.5"; + sha256 = "1sz2fdp8fdwz21x3lr2m1zhhrbix6iz699fjkwiryqdjl4ygd3hw"; }) (fetchNuGet { - name = "NuGet.Frameworks"; - version = "4.0.0"; - sha256 = "0nar684cm53cvzx28gzl6kmpg9mrfr1yv29323din7xqal4pscgq"; + name = "microsoft.netcore.platforms"; + version = "1.0.1"; + sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { - name = "Microsoft.Build.Runtime"; - version = "15.3.409"; - sha256 = "135ycnqz5jfg61y5zaapgc7xdpjx2aq4icmxb9ph7h5inl445q7q"; + name = "microsoft.netcore.platforms"; + version = "1.1.0"; + sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { - name = "runtime.native.System"; - version = "4.0.0"; - sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; + name = "microsoft.netcore.platforms"; + version = "2.0.1"; + sha256 = "1j2hmnivgb4plni2dd205kafzg6mkg7r4knrd3s7mg75wn2l25np"; }) (fetchNuGet { - name = "System.Buffers"; - version = "4.0.0"; - sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; + name = "microsoft.netcore.platforms"; + version = "3.1.0"; + sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; }) (fetchNuGet { - name = "Microsoft.NETCore.Targets"; + name = "microsoft.netcore.targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { - name = "Newtonsoft.Json"; - version = "10.0.1"; - sha256 = "15ncqic3p2rzs8q8ppi0irl2miq75kilw4lh8yfgjq96id0ds3hv"; + name = "microsoft.netcore.targets"; + version = "1.1.0"; + sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) (fetchNuGet { - name = "Microsoft.NETCore.DotNetAppHost"; - version = "2.0.5"; - sha256 = "00bsxdg9c8msjxyffvfi8siqk8v2m7ca8fqy1npv7b2pzg3byjws"; + name = "microsoft.openapi"; + version = "1.1.4"; + sha256 = "1sn79829nhx6chi2qxsza1801di7zdl5fd983m0jakawzbjhjcb3"; }) (fetchNuGet { - name = "System.Runtime.CompilerServices.Unsafe"; - version = "4.4.0"; - sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; + name = "microsoft.visualstudio.web.codegeneration.contracts"; + version = "2.0.2"; + sha256 = "1fs6sbjn0chx6rv38d61zgk8mhyyxz44xp4wsfya0lvkckyszyn1"; }) (fetchNuGet { - name = "System.Reflection.Emit.Lightweight"; - version = "4.3.0"; - sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; + name = "microsoft.visualstudio.web.codegeneration.tools"; + version = "2.0.2"; + sha256 = "0fkjm06irs53d77z29i6dwj5pjhgj9ivhad8v39ghnrwasc0ivq6"; }) (fetchNuGet { - name = "System.IO.FileSystem"; - version = "4.3.0"; - sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; + name = "microsoft.win32.primitives"; + version = "4.0.1"; + sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) (fetchNuGet { - name = "Microsoft.Extensions.FileSystemGlobbing"; - version = "2.0.0"; - sha256 = "02lzy6r14ghwfwm384xajq08vv3pl3ww0mi5isrr10vivhijhgg4"; + name = "microsoft.win32.registry"; + version = "4.0.0"; + sha256 = "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k"; }) (fetchNuGet { - name = "Microsoft.Extensions.FileProviders.Abstractions"; - version = "2.0.0"; - sha256 = "0d6y5isjy6jpf4w3f3w89cwh9p40glzhwvm7cwhx05wkqd8bk9w4"; + name = "microsoft.win32.registry"; + version = "4.7.0"; + sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; }) (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "2.0.1"; - sha256 = "1j2hmnivgb4plni2dd205kafzg6mkg7r4knrd3s7mg75wn2l25np"; + name = "nbitcoin"; + version = "5.0.47"; + sha256 = "1plri6q83jn80m95np0zxdg3nk2f36z8v42j4sg5wjv8qppp866d"; }) (fetchNuGet { - name = "Microsoft.NETCore.DotNetHostPolicy"; - version = "2.0.5"; - sha256 = "0v5csskiwpk8kz8wclqad8kcjmxr7ik4w99wl05740qvaag3qysk"; + name = "nbitcoin.secp256k1"; + version = "1.0.3"; + sha256 = "08d4db64j1qz8ax9fg8zi6n7g1n53clnkajbbvv2hgaqyfrsnqxj"; }) (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; - version = "4.3.0"; - sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; + name = "netstandard.library"; + version = "1.6.0"; + sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; }) (fetchNuGet { - name = "NETStandard.Library"; + name = "netstandard.library"; version = "2.0.1"; sha256 = "0d44wjxphs1ck838v7dapm0ag0b91zpiy33cr5vflsrwrqgj51dk"; }) (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; - version = "4.3.0"; - sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; + name = "newtonsoft.json"; + version = "10.0.1"; + sha256 = "15ncqic3p2rzs8q8ppi0irl2miq75kilw4lh8yfgjq96id0ds3hv"; }) (fetchNuGet { - name = "System.Collections.Specialized"; - version = "4.3.0"; - sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; + name = "newtonsoft.json"; + version = "11.0.1"; + sha256 = "1z68j07if1xf71lbsrgbia52r812i2dv541sy44ph4dzjjp7pd4m"; }) (fetchNuGet { - name = "System.ComponentModel"; - version = "4.3.0"; - sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; + name = "newtonsoft.json"; + version = "12.0.2"; + sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; }) (fetchNuGet { - name = "System.Collections.NonGeneric"; - version = "4.3.0"; - sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; + name = "newtonsoft.json.bson"; + version = "1.0.2"; + sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) (fetchNuGet { - name = "System.ComponentModel.Primitives"; - version = "4.3.0"; - sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; + name = "nuget.frameworks"; + version = "4.0.0"; + sha256 = "0nar684cm53cvzx28gzl6kmpg9mrfr1yv29323din7xqal4pscgq"; }) (fetchNuGet { - name = "System.Runtime.InteropServices"; - version = "4.3.0"; - sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; + name = "runtime.any.system.collections"; + version = "4.0.11"; + sha256 = "1x44bm1cgv28zmrp095wf9mn8a6a0ivnzp9v14dcbhx06igxzgg0"; }) (fetchNuGet { - name = "NETStandard.Library"; - version = "1.6.0"; - sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; + name = "runtime.any.system.diagnostics.tracing"; + version = "4.1.0"; + sha256 = "041im8hmp1zdgrx6jzyrdch6kshvbddmkar7r2mlm1ksb5c5kwpq"; }) (fetchNuGet { - name = "Microsoft.Build.Framework"; - version = "15.3.409"; - sha256 = "1dhanwb9ihbfay85xj7cwn0byzmmdz94hqfi3q6r1ncwdjd8y1s2"; + name = "runtime.any.system.globalization"; + version = "4.0.11"; + sha256 = "0240rp66pi5bw1xklmh421hj7arwcdmjmgfkiq1cbc6nrm8ah286"; }) (fetchNuGet { - name = "Microsoft.Build.Tasks.Core"; - version = "15.3.409"; - sha256 = "135swyygp7cz2civwsz6a7dj7h8bzp7yrybmgxjanxwrw66hm933"; + name = "runtime.any.system.io"; + version = "4.1.0"; + sha256 = "0kasfkjiml2kk8prnyn1990nhsahnjggvqwszqjdsfwfl43vpcb5"; }) (fetchNuGet { - name = "System.Text.Encoding.CodePages"; - version = "4.0.1"; - sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3"; + name = "runtime.any.system.reflection"; + version = "4.1.0"; + sha256 = "06kcs059d5czyakx75rvlwa2mr86156w18fs7chd03f7084l7mq6"; }) (fetchNuGet { - name = "Microsoft.Build.Utilities.Core"; - version = "15.3.409"; - sha256 = "1p8a0l9sxmjj86qha748qjw2s2n07q8mn41mj5r6apjnwl27ywnf"; + name = "runtime.any.system.reflection.primitives"; + version = "4.0.1"; + sha256 = "1zxrpvixr5fqzkxpnin6g6gjq6xajy1snghz99ds2dwbhm276rhz"; }) (fetchNuGet { - name = "Microsoft.Build"; - version = "15.3.409"; - sha256 = "0vzq6csp2yys9s96c7i37bjml439rdi47g8f5rzqdr7xf5a1jk81"; + name = "runtime.any.system.resources.resourcemanager"; + version = "4.0.1"; + sha256 = "1jmgs7hynb2rff48623wnyb37558bbh1q28k9c249j5r5sgsr5kr"; }) (fetchNuGet { - name = "System.Runtime.Serialization.Formatters"; - version = "4.3.0"; - sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; + name = "runtime.any.system.runtime"; + version = "4.1.0"; + sha256 = "0mjr2bi7wvnkphfjqgkyf8vfyvy15a829jz6mivl6jmksh2bx40m"; }) (fetchNuGet { - name = "System.Runtime.Serialization.Primitives"; - version = "4.3.0"; - sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; + name = "runtime.any.system.runtime.handles"; + version = "4.0.1"; + sha256 = "1kswgqhy34qvc49i981fk711s7knd6z13bp0rin8ms6axkh98nas"; }) (fetchNuGet { - name = "System.ObjectModel"; - version = "4.3.0"; - sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; + name = "runtime.any.system.runtime.interopservices"; + version = "4.1.0"; + sha256 = "0gm8if0hcmp1qys1wmx4970k2x62pqvldgljsyzbjhiy5644vl8z"; }) (fetchNuGet { - name = "System.Diagnostics.Debug"; - version = "4.3.0"; - sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; + name = "runtime.any.system.text.encoding"; + version = "4.0.11"; + sha256 = "0m4vgmzi1ky8xlj0r7xcyazxln3j9dlialnk6d2gmgrfnzf8f9m7"; }) (fetchNuGet { - name = "System.Resources.ResourceManager"; - version = "4.3.0"; - sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; + name = "runtime.any.system.threading.tasks"; + version = "4.0.11"; + sha256 = "1qzdp09qs8br5qxzlm1lgbjn4n57fk8vr1lzrmli2ysdg6x1xzvk"; }) (fetchNuGet { - name = "System.Reflection.Extensions"; - version = "4.3.0"; - sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + name = "runtime.native.system"; + version = "4.0.0"; + sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) (fetchNuGet { - name = "System.Reflection.Emit"; - version = "4.3.0"; - sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; + name = "runtime.native.system.io.compression"; + version = "4.1.0"; + sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; }) (fetchNuGet { - name = "System.Text.Encoding.Extensions"; - version = "4.3.0"; - sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; + name = "runtime.native.system.net.http"; + version = "4.0.1"; + sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; }) (fetchNuGet { - name = "System.Text.Encoding"; - version = "4.3.0"; - sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; + name = "runtime.native.system.security.cryptography"; + version = "4.0.0"; + sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; }) (fetchNuGet { - name = "System.Xml.XmlDocument"; - version = "4.3.0"; - sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; + name = "runtime.unix.system.diagnostics.debug"; + version = "4.0.11"; + sha256 = "05ndbai4vpqrry0ghbfgqc8xblmplwjgndxmdn1zklqimczwjg2d"; }) (fetchNuGet { - name = "System.Reflection.Emit.ILGeneration"; - version = "4.3.0"; - sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; + name = "runtime.unix.system.private.uri"; + version = "4.0.1"; + sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm"; }) (fetchNuGet { - name = "System.Runtime.Numerics"; - version = "4.3.0"; - sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; + name = "runtime.unix.system.runtime.extensions"; + version = "4.1.0"; + sha256 = "0x1cwd7cvifzmn5x1wafvj75zdxlk3mxy860igh3x1wx0s8167y4"; }) (fetchNuGet { - name = "System.Globalization"; - version = "4.3.0"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; + name = "swashbuckle.aspnetcore"; + version = "5.0.0"; + sha256 = "0rn2awmzrsrppk97xbbwk4kq1mys9bygb5xhl6mphbk0hchrvh09"; }) (fetchNuGet { - name = "System.Reflection.TypeExtensions"; - version = "4.3.0"; - sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; + name = "swashbuckle.aspnetcore.swagger"; + version = "5.0.0"; + sha256 = "1341nv8nmh6avs3y7w2szzir5qd0bndxwrkdmvvj3hcxj1126w2f"; }) (fetchNuGet { - name = "System.Threading"; - version = "4.3.0"; - sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; + name = "swashbuckle.aspnetcore.swaggergen"; + version = "5.0.0"; + sha256 = "00swg2avqnb38q2bsxljd34n8rpknp74h9vbn0fdnfds3a32cqr4"; }) (fetchNuGet { - name = "System.Reflection.Primitives"; - version = "4.3.0"; - sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + name = "swashbuckle.aspnetcore.swaggerui"; + version = "5.0.0"; + sha256 = "0d7vjq489rz208j6k3rb7vq6mzxzff3mqg83yk2rqy25vklrsbjd"; }) (fetchNuGet { - name = "System.Linq"; - version = "4.3.0"; - sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; + name = "system.appcontext"; + version = "4.1.0"; + sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) (fetchNuGet { - name = "System.Diagnostics.Tools"; - version = "4.3.0"; - sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; + name = "system.buffers"; + version = "4.0.0"; + sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; }) (fetchNuGet { - name = "Microsoft.NETCore.Targets"; - version = "1.1.0"; - sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; + name = "system.collections"; + version = "4.0.11"; + sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { - name = "System.Collections"; + name = "system.collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "1.1.0"; - sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; + name = "system.collections.concurrent"; + version = "4.0.12"; + sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) (fetchNuGet { - name = "System.IO"; - version = "4.3.0"; - sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; + name = "system.collections.immutable"; + version = "1.2.0"; + sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m"; }) (fetchNuGet { - name = "System.Threading.Tasks.Dataflow"; - version = "4.6.0"; - sha256 = "0a1davr71wssyn4z1hr75lk82wqa0daz0vfwkmg1fm3kckfd72k1"; + name = "system.collections.nongeneric"; + version = "4.0.1"; + sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; }) (fetchNuGet { - name = "System.Xml.XDocument"; + name = "system.collections.nongeneric"; version = "4.3.0"; - sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; + sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) (fetchNuGet { - name = "System.IO.Pipes"; - version = "4.0.0"; - sha256 = "0fxfvcf55s9q8zsykwh8dkq2xb5jcqnml2ycq8srfry2l07h18za"; + name = "system.collections.specialized"; + version = "4.3.0"; + sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) (fetchNuGet { - name = "System.Diagnostics.FileVersionInfo"; - version = "4.0.0"; - sha256 = "1s5vxhy7i09bmw51kxqaiz9zaj9am8wsjyz13j85sp23z267hbv3"; + name = "system.componentmodel"; + version = "4.3.0"; + sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) (fetchNuGet { - name = "System.Threading.Tasks"; + name = "system.componentmodel.primitives"; version = "4.3.0"; - sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; + sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) (fetchNuGet { - name = "System.Diagnostics.Contracts"; + name = "system.componentmodel.typeconverter"; + version = "4.3.0"; + sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; + }) + (fetchNuGet { + name = "system.console"; + version = "4.0.0"; + sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; + }) + (fetchNuGet { + name = "system.diagnostics.contracts"; version = "4.0.1"; sha256 = "0y6dkd9n5k98vzhc3w14r2pbhf10qjn2axpghpmfr6rlxx9qrb9j"; }) (fetchNuGet { - name = "System.Reflection"; - version = "4.3.0"; - sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; + name = "system.diagnostics.debug"; + version = "4.0.11"; + sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) (fetchNuGet { - name = "System.Dynamic.Runtime"; + name = "system.diagnostics.debug"; version = "4.3.0"; - sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; + sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) (fetchNuGet { - name = "System.Runtime.Loader"; + name = "system.diagnostics.diagnosticsource"; version = "4.0.0"; - sha256 = "0lpfi3psqcp6zxsjk2qyahal7zaawviimc8lhrlswhip2mx7ykl0"; + sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; }) (fetchNuGet { - name = "System.Threading.ThreadPool"; - version = "4.0.10"; - sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx"; + name = "system.diagnostics.fileversioninfo"; + version = "4.0.0"; + sha256 = "1s5vxhy7i09bmw51kxqaiz9zaj9am8wsjyz13j85sp23z267hbv3"; }) (fetchNuGet { - name = "System.Runtime.Extensions"; - version = "4.3.0"; - sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; + name = "system.diagnostics.process"; + version = "4.1.0"; + sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s"; }) (fetchNuGet { - name = "System.Runtime.Serialization.Xml"; - version = "4.1.1"; - sha256 = "11747an5gbz821pwahaim3v82gghshnj9b5c4cw539xg5a3gq7rk"; + name = "system.diagnostics.tools"; + version = "4.0.1"; + sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { - name = "System.Text.RegularExpressions"; + name = "system.diagnostics.tools"; version = "4.3.0"; - sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; + sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) (fetchNuGet { - name = "System.Collections.Immutable"; - version = "1.2.0"; - sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m"; + name = "system.diagnostics.tracesource"; + version = "4.0.0"; + sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; }) (fetchNuGet { - name = "Microsoft.CSharp"; - version = "4.3.0"; - sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; + name = "system.diagnostics.tracing"; + version = "4.1.0"; + sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) (fetchNuGet { - name = "System.ComponentModel.TypeConverter"; + name = "system.dynamic.runtime"; + version = "4.0.11"; + sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; + }) + (fetchNuGet { + name = "system.dynamic.runtime"; version = "4.3.0"; - sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; + sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) (fetchNuGet { - name = "System.Reflection.Metadata"; - version = "1.3.0"; - sha256 = "1y5m6kryhjpqqm2g3h3b6bzig13wkiw954x3b7icqjm6xypm1x3b"; + name = "system.globalization"; + version = "4.0.11"; + sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) (fetchNuGet { - name = "System.Xml.ReaderWriter"; + name = "system.globalization"; version = "4.3.0"; - sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; + sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { - name = "System.Linq.Parallel"; + name = "system.globalization.calendars"; version = "4.0.1"; - sha256 = "0i33x9f4h3yq26yvv6xnq4b0v51rl5z8v1bm7vk972h5lvf4apad"; + sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; + }) + (fetchNuGet { + name = "system.globalization.extensions"; + version = "4.0.1"; + sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; }) (fetchNuGet { - name = "System.Linq.Expressions"; + name = "system.globalization.extensions"; version = "4.3.0"; - sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; + sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) (fetchNuGet { - name = "System.Diagnostics.Process"; + name = "system.io"; version = "4.1.0"; - sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s"; + sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { - name = "System.Runtime"; + name = "system.io"; version = "4.3.0"; - sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; - }) - (fetchNuGet { - name = "System.Xml.XmlDocument"; - version = "4.0.1"; - sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; + sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { - name = "Microsoft.Extensions.Primitives"; - version = "2.0.0"; - sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; + name = "system.io.compression"; + version = "4.1.0"; + sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) (fetchNuGet { - name = "Microsoft.NETCore.DotNetHostResolver"; - version = "2.0.5"; - sha256 = "1sz2fdp8fdwz21x3lr2m1zhhrbix6iz699fjkwiryqdjl4ygd3hw"; + name = "system.io.compression.zipfile"; + version = "4.0.1"; + sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; }) (fetchNuGet { - name = "System.Runtime.Serialization.Primitives"; - version = "4.1.1"; - sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; + name = "system.io.filesystem"; + version = "4.0.1"; + sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "1.0.1"; - sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; + name = "system.io.filesystem"; + version = "4.3.0"; + sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) (fetchNuGet { - name = "System.AppContext"; - version = "4.1.0"; - sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; + name = "system.io.filesystem.primitives"; + version = "4.0.1"; + sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) (fetchNuGet { - name = "System.Diagnostics.Debug"; - version = "4.0.11"; - sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; + name = "system.io.filesystem.primitives"; + version = "4.3.0"; + sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) (fetchNuGet { - name = "System.Diagnostics.TraceSource"; + name = "system.io.pipes"; version = "4.0.0"; - sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; + sha256 = "0fxfvcf55s9q8zsykwh8dkq2xb5jcqnml2ycq8srfry2l07h18za"; }) (fetchNuGet { - name = "System.Resources.ResourceManager"; - version = "4.0.1"; - sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; + name = "system.linq"; + version = "4.1.0"; + sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) (fetchNuGet { - name = "System.Globalization.Calendars"; - version = "4.0.1"; - sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; + name = "system.linq"; + version = "4.3.0"; + sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { - name = "System.Xml.XPath"; - version = "4.0.1"; - sha256 = "0fjqgb6y66d72d5n8qq1h213d9nv2vi8mpv8p28j3m9rccmsh04m"; + name = "system.linq.expressions"; + version = "4.1.0"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) (fetchNuGet { - name = "System.Diagnostics.Tools"; - version = "4.0.1"; - sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; + name = "system.linq.expressions"; + version = "4.3.0"; + sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) (fetchNuGet { - name = "System.Text.Encoding.Extensions"; - version = "4.0.11"; - sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; + name = "system.linq.parallel"; + version = "4.0.1"; + sha256 = "0i33x9f4h3yq26yvv6xnq4b0v51rl5z8v1bm7vk972h5lvf4apad"; }) (fetchNuGet { - name = "System.Diagnostics.Tracing"; + name = "system.net.http"; version = "4.1.0"; - sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; + sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; }) (fetchNuGet { - name = "System.Resources.Writer"; - version = "4.0.0"; - sha256 = "07hp218kjdcvpl27djspnixgnacbp9apma61zz3wsca9fx5g3lmv"; + name = "system.net.primitives"; + version = "4.0.11"; + sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; }) (fetchNuGet { - name = "System.Reflection.TypeExtensions"; + name = "system.net.sockets"; version = "4.1.0"; - sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; + sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; }) (fetchNuGet { - name = "System.Collections.NonGeneric"; - version = "4.0.1"; - sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; + name = "system.objectmodel"; + version = "4.0.12"; + sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) (fetchNuGet { - name = "System.Console"; - version = "4.0.0"; - sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; + name = "system.objectmodel"; + version = "4.3.0"; + sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) (fetchNuGet { - name = "System.Security.Cryptography.Primitives"; - version = "4.0.0"; - sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; + name = "system.private.datacontractserialization"; + version = "4.1.1"; + sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r"; }) (fetchNuGet { - name = "System.Runtime.Numerics"; + name = "system.private.uri"; version = "4.0.1"; - sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; + sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j"; }) (fetchNuGet { - name = "Microsoft.Win32.Primitives"; - version = "4.0.1"; - sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; + name = "system.reflection"; + version = "4.1.0"; + sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) (fetchNuGet { - name = "System.IO.Compression.ZipFile"; - version = "4.0.1"; - sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; + name = "system.reflection"; + version = "4.3.0"; + sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) (fetchNuGet { - name = "System.Xml.XPath.XmlDocument"; + name = "system.reflection.emit"; version = "4.0.1"; - sha256 = "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc"; - }) - (fetchNuGet { - name = "System.Net.Sockets"; - version = "4.1.0"; - sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; + sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) (fetchNuGet { - name = "System.Xml.XDocument"; - version = "4.0.11"; - sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; + name = "system.reflection.emit"; + version = "4.3.0"; + sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) (fetchNuGet { - name = "System.Reflection.Extensions"; + name = "system.reflection.emit.ilgeneration"; version = "4.0.1"; - sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; + sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) (fetchNuGet { - name = "System.Runtime.InteropServices.RuntimeInformation"; - version = "4.0.0"; - sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; + name = "system.reflection.emit.ilgeneration"; + version = "4.3.0"; + sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) (fetchNuGet { - name = "System.Resources.Reader"; - version = "4.0.0"; - sha256 = "1jafi73dcf1lalrir46manq3iy6xnxk2z7gpdpwg4wqql7dv3ril"; + name = "system.reflection.emit.lightweight"; + version = "4.0.1"; + sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) (fetchNuGet { - name = "System.Threading.Thread"; - version = "4.0.0"; - sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; + name = "system.reflection.emit.lightweight"; + version = "4.3.0"; + sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) (fetchNuGet { - name = "System.Threading.Timer"; + name = "system.reflection.extensions"; version = "4.0.1"; - sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; + sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; - version = "4.0.1"; - sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; + name = "system.reflection.extensions"; + version = "4.3.0"; + sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; + }) + (fetchNuGet { + name = "system.reflection.metadata"; + version = "1.3.0"; + sha256 = "1y5m6kryhjpqqm2g3h3b6bzig13wkiw954x3b7icqjm6xypm1x3b"; }) (fetchNuGet { - name = "System.IO.FileSystem"; + name = "system.reflection.primitives"; version = "4.0.1"; - sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; + sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) (fetchNuGet { - name = "System.Security.Cryptography.Encoding"; - version = "4.0.0"; - sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; + name = "system.reflection.primitives"; + version = "4.3.0"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) (fetchNuGet { - name = "System.Runtime"; + name = "system.reflection.typeextensions"; version = "4.1.0"; - sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; + sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) (fetchNuGet { - name = "System.Security.Cryptography.Algorithms"; - version = "4.2.0"; - sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; + name = "system.reflection.typeextensions"; + version = "4.3.0"; + sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) (fetchNuGet { - name = "System.Reflection.Primitives"; - version = "4.0.1"; - sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; + name = "system.resources.reader"; + version = "4.0.0"; + sha256 = "1jafi73dcf1lalrir46manq3iy6xnxk2z7gpdpwg4wqql7dv3ril"; }) (fetchNuGet { - name = "System.Runtime.Handles"; + name = "system.resources.resourcemanager"; version = "4.0.1"; - sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; + sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) (fetchNuGet { - name = "System.ObjectModel"; - version = "4.0.12"; - sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; + name = "system.resources.resourcemanager"; + version = "4.3.0"; + sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) (fetchNuGet { - name = "System.Net.Primitives"; - version = "4.0.11"; - sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; + name = "system.resources.writer"; + version = "4.0.0"; + sha256 = "07hp218kjdcvpl27djspnixgnacbp9apma61zz3wsca9fx5g3lmv"; }) (fetchNuGet { - name = "System.Text.Encoding"; - version = "4.0.11"; - sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; + name = "system.runtime"; + version = "4.1.0"; + sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { - name = "System.Collections.Concurrent"; - version = "4.0.12"; - sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; + name = "system.runtime"; + version = "4.3.0"; + sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) (fetchNuGet { - name = "System.IO.Compression"; - version = "4.1.0"; - sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; + name = "system.runtime.compilerservices.unsafe"; + version = "4.4.0"; + sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; }) (fetchNuGet { - name = "System.IO"; + name = "system.runtime.extensions"; version = "4.1.0"; - sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; + sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) (fetchNuGet { - name = "System.Reflection"; - version = "4.1.0"; - sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; + name = "system.runtime.extensions"; + version = "4.3.0"; + sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) (fetchNuGet { - name = "System.Collections"; - version = "4.0.11"; - sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; + name = "system.runtime.handles"; + version = "4.0.1"; + sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) (fetchNuGet { - name = "System.Linq"; - version = "4.1.0"; - sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; + name = "system.runtime.handles"; + version = "4.3.0"; + sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) (fetchNuGet { - name = "System.Globalization"; - version = "4.0.11"; - sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; + name = "system.runtime.interopservices"; + version = "4.1.0"; + sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) (fetchNuGet { - name = "System.Threading"; - version = "4.0.11"; - sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; + name = "system.runtime.interopservices"; + version = "4.3.0"; + sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) (fetchNuGet { - name = "System.Text.RegularExpressions"; - version = "4.1.0"; - sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; + name = "system.runtime.interopservices.runtimeinformation"; + version = "4.0.0"; + sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) (fetchNuGet { - name = "System.Security.Cryptography.X509Certificates"; - version = "4.1.0"; - sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; + name = "system.runtime.loader"; + version = "4.0.0"; + sha256 = "0lpfi3psqcp6zxsjk2qyahal7zaawviimc8lhrlswhip2mx7ykl0"; }) (fetchNuGet { - name = "System.Xml.ReaderWriter"; - version = "4.0.11"; - sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; + name = "system.runtime.numerics"; + version = "4.0.1"; + sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; }) (fetchNuGet { - name = "System.Net.Http"; - version = "4.1.0"; - sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; + name = "system.runtime.numerics"; + version = "4.3.0"; + sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) (fetchNuGet { - name = "System.Runtime.Extensions"; - version = "4.1.0"; - sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; + name = "system.runtime.serialization.formatters"; + version = "4.3.0"; + sha256 = "114j35n8gcvn3sqv9ar36r1jjq0y1yws9r0yk8i6wm4aq7n9rs0m"; }) (fetchNuGet { - name = "System.Threading.Tasks"; - version = "4.0.11"; - sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; + name = "system.runtime.serialization.primitives"; + version = "4.1.1"; + sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) (fetchNuGet { - name = "System.Linq.Expressions"; - version = "4.1.0"; - sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + name = "system.runtime.serialization.primitives"; + version = "4.3.0"; + sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; }) (fetchNuGet { - name = "System.Runtime.InteropServices"; - version = "4.1.0"; - sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; + name = "system.runtime.serialization.xml"; + version = "4.1.1"; + sha256 = "11747an5gbz821pwahaim3v82gghshnj9b5c4cw539xg5a3gq7rk"; }) (fetchNuGet { - name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.1.8"; - sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135"; + name = "system.security.accesscontrol"; + version = "4.7.0"; + sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; }) (fetchNuGet { - name = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "3.1.8"; - sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa"; + name = "system.security.cryptography.algorithms"; + version = "4.2.0"; + sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; }) (fetchNuGet { - name = "Microsoft.CSharp"; - version = "4.7.0"; - sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; + name = "system.security.cryptography.cng"; + version = "4.2.0"; + sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; }) (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; - version = "3.1.0"; - sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; + name = "system.security.cryptography.csp"; + version = "4.0.0"; + sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; }) (fetchNuGet { - name = "Newtonsoft.Json"; - version = "11.0.1"; - sha256 = "1z68j07if1xf71lbsrgbia52r812i2dv541sy44ph4dzjjp7pd4m"; + name = "system.security.cryptography.encoding"; + version = "4.0.0"; + sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; }) (fetchNuGet { - name = "Microsoft.Extensions.Logging.Abstractions"; - version = "1.0.0"; - sha256 = "1sh9bidmhy32gkz6fkli79mxv06546ybrzppfw5v2aq0bda1ghka"; + name = "system.security.cryptography.openssl"; + version = "4.0.0"; + sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; }) (fetchNuGet { - name = "Newtonsoft.Json.Bson"; - version = "1.0.2"; - sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; + name = "system.security.cryptography.primitives"; + version = "4.0.0"; + sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; }) (fetchNuGet { - name = "Microsoft.AspNetCore.JsonPatch"; - version = "3.1.1"; - sha256 = "0c0aaz9rlh9chc53dnv5jryp0x0415hipaizrmih3kzwd3fmqpml"; + name = "system.security.cryptography.x509certificates"; + version = "4.1.0"; + sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; }) (fetchNuGet { - name = "Newtonsoft.Json"; - version = "12.0.2"; - sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; + name = "system.security.principal"; + version = "4.0.1"; + sha256 = "1nbzdfqvzzbgsfdd5qsh94d7dbg2v4sw0yx6himyn52zf8z6007p"; }) (fetchNuGet { - name = "System.Security.Principal.Windows"; + name = "system.security.principal.windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) (fetchNuGet { - name = "System.Security.AccessControl"; - version = "4.7.0"; - sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; + name = "system.text.encoding"; + version = "4.0.11"; + sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { - name = "NBitcoin"; - version = "5.0.47"; - sha256 = "1plri6q83jn80m95np0zxdg3nk2f36z8v42j4sg5wjv8qppp866d"; + name = "system.text.encoding"; + version = "4.3.0"; + sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { - name = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; - version = "3.1.1"; - sha256 = "1c2lrlp64kkacnjgdyygr6fqdawk10l8j4qgppii6rq61yjwhcig"; + name = "system.text.encoding.codepages"; + version = "4.0.1"; + sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3"; }) (fetchNuGet { - name = "Microsoft.Win32.Registry"; - version = "4.7.0"; - sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; + name = "system.text.encoding.extensions"; + version = "4.0.11"; + sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) (fetchNuGet { - name = "NBitcoin.Secp256k1"; - version = "1.0.3"; - sha256 = "08d4db64j1qz8ax9fg8zi6n7g1n53clnkajbbvv2hgaqyfrsnqxj"; + name = "system.text.encoding.extensions"; + version = "4.3.0"; + sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { - name = "Microsoft.OpenApi"; - version = "1.1.4"; - sha256 = "1sn79829nhx6chi2qxsza1801di7zdl5fd983m0jakawzbjhjcb3"; + name = "system.text.regularexpressions"; + version = "4.1.0"; + sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) (fetchNuGet { - name = "Swashbuckle.AspNetCore.SwaggerUI"; - version = "5.0.0"; - sha256 = "0d7vjq489rz208j6k3rb7vq6mzxzff3mqg83yk2rqy25vklrsbjd"; + name = "system.text.regularexpressions"; + version = "4.3.0"; + sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { - name = "Swashbuckle.AspNetCore"; - version = "5.0.0"; - sha256 = "0rn2awmzrsrppk97xbbwk4kq1mys9bygb5xhl6mphbk0hchrvh09"; + name = "system.threading"; + version = "4.0.11"; + sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { - name = "Swashbuckle.AspNetCore.SwaggerGen"; - version = "5.0.0"; - sha256 = "00swg2avqnb38q2bsxljd34n8rpknp74h9vbn0fdnfds3a32cqr4"; + name = "system.threading"; + version = "4.3.0"; + sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) (fetchNuGet { - name = "Microsoft.Extensions.ApiDescription.Server"; - version = "3.0.0"; - sha256 = "13a47xcqyi5gz85swxd4mgp7ndgl4kknrvv3xwmbn71hsh953hsh"; + name = "system.threading.overlapped"; + version = "4.0.1"; + sha256 = "0fi79az3vmqdp9mv3wh2phblfjls89zlj6p9nc3i9f6wmfarj188"; }) (fetchNuGet { - name = "Swashbuckle.AspNetCore.Swagger"; - version = "5.0.0"; - sha256 = "1341nv8nmh6avs3y7w2szzir5qd0bndxwrkdmvvj3hcxj1126w2f"; + name = "system.threading.tasks"; + version = "4.0.11"; + sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) (fetchNuGet { - name = "runtime.unix.System.Private.Uri"; - version = "4.0.1"; - sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm"; + name = "system.threading.tasks"; + version = "4.3.0"; + sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { - name = "runtime.any.System.Text.Encoding"; - version = "4.0.11"; - sha256 = "0m4vgmzi1ky8xlj0r7xcyazxln3j9dlialnk6d2gmgrfnzf8f9m7"; + name = "system.threading.tasks.dataflow"; + version = "4.6.0"; + sha256 = "0a1davr71wssyn4z1hr75lk82wqa0daz0vfwkmg1fm3kckfd72k1"; }) (fetchNuGet { - name = "System.Private.Uri"; - version = "4.0.1"; - sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j"; + name = "system.threading.tasks.extensions"; + version = "4.0.0"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) (fetchNuGet { - name = "runtime.any.System.Runtime.Handles"; - version = "4.0.1"; - sha256 = "1kswgqhy34qvc49i981fk711s7knd6z13bp0rin8ms6axkh98nas"; + name = "system.threading.tasks.extensions"; + version = "4.3.0"; + sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) (fetchNuGet { - name = "runtime.any.System.Reflection.Primitives"; - version = "4.0.1"; - sha256 = "1zxrpvixr5fqzkxpnin6g6gjq6xajy1snghz99ds2dwbhm276rhz"; + name = "system.threading.thread"; + version = "4.0.0"; + sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; }) (fetchNuGet { - name = "runtime.any.System.IO"; - version = "4.1.0"; - sha256 = "0kasfkjiml2kk8prnyn1990nhsahnjggvqwszqjdsfwfl43vpcb5"; + name = "system.threading.threadpool"; + version = "4.0.10"; + sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx"; }) (fetchNuGet { - name = "runtime.any.System.Runtime"; - version = "4.1.0"; - sha256 = "0mjr2bi7wvnkphfjqgkyf8vfyvy15a829jz6mivl6jmksh2bx40m"; + name = "system.threading.timer"; + version = "4.0.1"; + sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) (fetchNuGet { - name = "runtime.any.System.Threading.Tasks"; + name = "system.xml.readerwriter"; version = "4.0.11"; - sha256 = "1qzdp09qs8br5qxzlm1lgbjn4n57fk8vr1lzrmli2ysdg6x1xzvk"; + sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) (fetchNuGet { - name = "runtime.any.System.Diagnostics.Tracing"; - version = "4.1.0"; - sha256 = "041im8hmp1zdgrx6jzyrdch6kshvbddmkar7r2mlm1ksb5c5kwpq"; + name = "system.xml.readerwriter"; + version = "4.3.0"; + sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) (fetchNuGet { - name = "runtime.unix.System.Runtime.Extensions"; - version = "4.1.0"; - sha256 = "0x1cwd7cvifzmn5x1wafvj75zdxlk3mxy860igh3x1wx0s8167y4"; + name = "system.xml.xdocument"; + version = "4.0.11"; + sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) (fetchNuGet { - name = "runtime.any.System.Runtime.InteropServices"; - version = "4.1.0"; - sha256 = "0gm8if0hcmp1qys1wmx4970k2x62pqvldgljsyzbjhiy5644vl8z"; + name = "system.xml.xdocument"; + version = "4.3.0"; + sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) (fetchNuGet { - name = "runtime.any.System.Reflection"; - version = "4.1.0"; - sha256 = "06kcs059d5czyakx75rvlwa2mr86156w18fs7chd03f7084l7mq6"; + name = "system.xml.xmldocument"; + version = "4.0.1"; + sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; }) (fetchNuGet { - name = "runtime.any.System.Collections"; - version = "4.0.11"; - sha256 = "1x44bm1cgv28zmrp095wf9mn8a6a0ivnzp9v14dcbhx06igxzgg0"; + name = "system.xml.xmldocument"; + version = "4.3.0"; + sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) (fetchNuGet { - name = "runtime.any.System.Globalization"; + name = "system.xml.xmlserializer"; version = "4.0.11"; - sha256 = "0240rp66pi5bw1xklmh421hj7arwcdmjmgfkiq1cbc6nrm8ah286"; + sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; }) (fetchNuGet { - name = "runtime.any.System.Resources.ResourceManager"; + name = "system.xml.xpath"; version = "4.0.1"; - sha256 = "1jmgs7hynb2rff48623wnyb37558bbh1q28k9c249j5r5sgsr5kr"; + sha256 = "0fjqgb6y66d72d5n8qq1h213d9nv2vi8mpv8p28j3m9rccmsh04m"; }) (fetchNuGet { - name = "runtime.unix.System.Diagnostics.Debug"; - version = "4.0.11"; - sha256 = "05ndbai4vpqrry0ghbfgqc8xblmplwjgndxmdn1zklqimczwjg2d"; + name = "system.xml.xpath.xmldocument"; + version = "4.0.1"; + sha256 = "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc"; }) ] diff --git a/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/nixpkgs/pkgs/applications/editors/android-studio/default.nix index 0c9bd808b53c..85cd9dd90598 100644 --- a/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -17,8 +17,8 @@ let sha256Hash = "04k7c328bl8ixi8bvp2mm33q2hmv40yc9p5dff5cghyycarwpd3f"; }; latestVersion = { # canary & dev - version = "2021.1.1.11"; # "Android Studio Bumblebee (2021.1.1) Canary 11" - sha256Hash = "0npvb7kr259799bs2bs2drvimmmwb0rdzswbkz8zgi5c2fwjcvvl"; + version = "2021.1.1.12"; # "Android Studio Bumblebee (2021.1.1) Canary 12" + sha256Hash = "1dyn9435s0xbxwj28b0cciz6ry58pgfgba4rbny3jszxi5j3j0r1"; }; in { # Attributes are named by their corresponding release channels diff --git a/nixpkgs/pkgs/applications/editors/apostrophe/default.nix b/nixpkgs/pkgs/applications/editors/apostrophe/default.nix index df0be4ccfbea..e5cfeb964bd7 100644 --- a/nixpkgs/pkgs/applications/editors/apostrophe/default.nix +++ b/nixpkgs/pkgs/applications/editors/apostrophe/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchFromGitLab, meson, ninja, cmake +{ lib, stdenv, fetchFromGitLab, meson, ninja , wrapGAppsHook, pkg-config, desktop-file-utils , appstream-glib, pythonPackages, glib, gobject-introspection , gtk3, webkitgtk, glib-networking, gnome, gspell, texlive -, shared-mime-info, libhandy, fira +, shared-mime-info, libhandy, fira, sassc }: let @@ -13,18 +13,18 @@ let in stdenv.mkDerivation rec { pname = "apostrophe"; - version = "2.4"; + version = "2.5"; src = fetchFromGitLab { - owner = "somas"; + owner = "World"; repo = pname; domain = "gitlab.gnome.org"; rev = "v${version}"; - sha256 = "1qzy3zhi18wf42m034s8kcmx9gl05j620x3hf6rnycq2fvy7g4gz"; + sha256 = "06yfiflmj3ip7ppcz41nb3xpgb5ggw5h74w0v87yaqqkq7qh31lp"; }; - nativeBuildInputs = [ meson ninja cmake pkg-config desktop-file-utils - appstream-glib wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils + appstream-glib wrapGAppsHook sassc ]; buildInputs = [ glib pythonEnv gobject-introspection gtk3 gnome.adwaita-icon-theme webkitgtk gspell texlive @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://gitlab.gnome.org/somas/apostrophe"; + homepage = "https://gitlab.gnome.org/World/apostrophe"; description = "A distraction free Markdown editor for GNU/Linux"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/editors/cudatext/default.nix b/nixpkgs/pkgs/applications/editors/cudatext/default.nix index ad06c80f3a40..ed60c07c8c81 100644 --- a/nixpkgs/pkgs/applications/editors/cudatext/default.nix +++ b/nixpkgs/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.142.0"; + version = "1.143.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "sha256-4kVi921dromMqiAuFjm2EOCDXCq4oT+ijko4/uT4LLs="; + sha256 = "sha256-j8J4OA4J43XIJKBMx8hQy7h1BcKfEhWvpgmpNmi/yrw="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/editors/cudatext/deps.json b/nixpkgs/pkgs/applications/editors/cudatext/deps.json index 49dfd7e8dfe0..83ffea320ae2 100644 --- a/nixpkgs/pkgs/applications/editors/cudatext/deps.json +++ b/nixpkgs/pkgs/applications/editors/cudatext/deps.json @@ -11,28 +11,28 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2021.07.22", - "sha256": "sha256-sAF/klzPa8fCKKBtpj0h9B+zoGDvA80uL4u4VTikUaI=" + "rev": "2021.08.28", + "sha256": "sha256-nFRlSeU2ScPQrLXcd4dt8l9Ct7ceJyKMi97gtxz+S8I=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2021.08.20", - "sha256": "sha256-cVl1HJHLsYTFKQ/Ov+rcP6UAwRJPp7rtmLlZC9S+Jek=" + "rev": "2021.09.03", + "sha256": "sha256-2y1E+52MPkimmozo1Qwpg7Qyhjct3cs76nHlOf/Cs0M=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", - "rev": "2021.08.20", - "sha256": "sha256-PZtP/J4tJN2Egk/Bp/5DtHlV46yRjhcZL9xhDk6xjBk=" + "rev": "2021.09.03", + "sha256": "sha256-pZo+wKnqN2HfDjPeC/WqaE5sdNnpjRN2VKSP8p4Q6Ek=" }, "EControl": { "owner": "Alexey-T", - "rev": "2021.08.12", - "sha256": "sha256-Ht7jfFGlvb7khLD0OekuBvkU9ROyDiyUSe+lLI/Rm64=" + "rev": "2021.09.02", + "sha256": "sha256-i8laXF9IIhVkGZ2rzv7RlZeMxUza5LAXlTOxDj9CzJo=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2021.07.29", - "sha256": "sha256-mCT3F0GPC+Hl7WOtYznxErMTyr9cH4ghaanYMum+3Fg=" + "rev": "2021.09.03", + "sha256": "sha256-XYFnTfRa0n9XF9l/hL6z5RFZgdpVP9o1If4qln905Yc=" }, "Python-for-Lazarus": { "owner": "Alexey-T", @@ -51,7 +51,7 @@ }, "bgrabitmap": { "owner": "bgrabitmap", - "rev": "v11.3.1", - "sha256": "1f95rdpfwqy9fipzybi17nbhq46zj45yjps21p2hplhinrr49n2p" + "rev": "v11.4", + "sha256": "sha256-jZL8lzjua033E76IL0HIk/fihC73ifCb4LqMni7vvb0=" } } diff --git a/nixpkgs/pkgs/applications/editors/eclipse/default.nix b/nixpkgs/pkgs/applications/editors/eclipse/default.nix index 000726dd81aa..dc19191d769a 100644 --- a/nixpkgs/pkgs/applications/editors/eclipse/default.nix +++ b/nixpkgs/pkgs/applications/editors/eclipse/default.nix @@ -16,10 +16,10 @@ assert stdenv ? glibc; let platform_major = "4"; - platform_minor = "19"; + platform_minor = "20"; year = "2021"; - month = "03"; - timestamp = "${year}${month}031800"; + month = "06"; + timestamp = "${year}${month}111600"; gtk = gtk3; in rec { @@ -37,7 +37,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "3j0lmll0glcr9p0hf49jiaq9xr8hadsy0y58wbbkdpldj3rclxr056dkswmiw2bkypfiwrjygbli5qxyp6mz380562hc2kjwijqq476"; + sha512 = "3ggqiwa1nfszdqzdzw1lzs1sdikkvh2fqq10bqjxsq7xdxkis4zix8g4jcjiwlsz5gz98s61gp0k4m5rqsj0krpklxs9ijwq76khc7z"; }; }; @@ -49,7 +49,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "0iqz9a3ixcbmaci6lnspdnzwd2h1fcygi54hmsl89pq3d1k5scyhcl123ixi24csi782w847bn0lq00n0zwras9akmnhsflra4mw5pz"; + sha512 = "38cdhy6v8jmndanvl3bimfs3pnlnl3w066fqrljy2hwki58gqmxxmbld5mphbh9y5kz9b5kiqvhx06sf0l2ywbarxy9wfhynvzb2k17"; }; }; @@ -61,7 +61,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "03v1ly7j9d9qnl3d9rl5a9kp483dz8i8v3cfnh55ksm9fk8iy2fzg6wq178ggnx2z5x9k88a4wk6n647yilh2hgc2l7926imkh2j1ly"; + sha512 = "2chshmn09xdq42nix0jqryhac33xc5sg7nlp2vfmz5km6q4m6mc1k7pw10jmg86zzcvcsdl9k1wkrbcsj5y2gv4cg6rddzsbx9hw3s7"; }; }; @@ -86,7 +86,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-x86_64.tar.gz"; - sha512 = "37m91my121pch12bwpwk5svfqkm7vl07wjx4fkhpy947v5kjf36hm6x0i45swdg7f0hk72y2qz5ka15ki5jv890qy5psj6z7ax9sys7"; + sha512 = "308sszkmp5lkva5hfb1qc5cy9b1wajas96xz5nwjl7dm2fn4saiwg3ifh71hzq59wf337hndlb2c2dp6yczsfp3mzfqmsi5a3z7dchr"; }; }; @@ -98,7 +98,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "3qrnj6krhrqc9rfwlim3v7kshwfhsi050pszw6xdfbj56mzr9whr7l76isbpxd5j0zipgfw3qrzrx379pdp899d35fv284ilvllzl4k"; + sha512 = "1wp3g85bsmv0mbpk76adsz1rzd3vbdn4y4ddv9z41bq96wi9npmybidckvwnrq57lbj8k5g8m0x0f1nhj2rv5bqbsnqjxjpknwa6is0"; }; }; @@ -110,7 +110,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "04k4x9imabxddqlrgajn33ak8i58wcap40ll09xz23d1sxn9a8prh01s06ymgwg6ldg939srphvbz4112p8p0b1hl7m25a02qll91zv"; + sha512 = "35v8kjpdlhbcxncqygx7c1kjqy1644c6rhrasg8gxnrhlc69zblf4nvgzf1894vd13qzpkzzxx0qll49933prnw98dqkrd0wxcx7f49"; }; }; @@ -122,7 +122,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "2yksl3w7yr1a3h4zdpa9zf394r5c185zqxhigdv858ldg46kmr9h0l2c7shbgb16kkybcnrk4x44dhjvh60x8xw6ma05klp4lp9v5va"; + sha512 = "1jj5h69d4814j1mq6fjd47vkswq7bshbh2flgzmn8ibs0ys67x0nd2lm2ksxmvnipj4j9rw3mh9fmw8m0dzpp41c6q8xxfa93c7pqyg"; }; }; @@ -134,7 +134,7 @@ in rec { src = fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz"; - sha512 = "3fhrhwbyqcys56c93s1vl9rbvn269nn5y3cb9f3n1qwgw6i97mim2zy98jl3r8cksf97jwsmqmsqclsgz9v799wcckv81dj1l628382"; + sha512 = "19fr63bdifxqp6imgb4d7v5dnkn9i0n2wmr08xzb0ph425ib936jiw84c2nwnsfnljh0yfj1r3wd36y2nn52fsj6ginl8plc6pi5416"; }; }; diff --git a/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix b/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix index 5937311b5c93..839b079ce7b7 100644 --- a/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix +++ b/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix @@ -248,12 +248,12 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; # find current version at https://www.eclipse.org/cdt/downloads.php - version = "10.2.0"; + version = "10.3.2"; src = fetchzip { stripRoot = false; - url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/10.2/${name}/${name}.zip"; - sha256 = "1r30cbpbzw3dfcsn54p6sqip86dqhydhsppjgaz60b6z138vzx49"; + url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${name}/${name}.zip"; + sha256 = "0zrxgb8mkrzc1zm5225hzn8awj9yl5fd2dcr92692g0yg61nv4jd"; }; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/agda-input/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/agda-input/default.nix new file mode 100644 index 000000000000..a96f7393dfaf --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/agda-input/default.nix @@ -0,0 +1,18 @@ +{ trivialBuild +, haskellPackages +}: + +trivialBuild { + pname = "agda-input"; + + inherit (haskellPackages.Agda) src version; + + postUnpack = '' + mv $sourceRoot/src/data/emacs-mode/agda-input.el $sourceRoot + ''; + + meta = { + inherit (haskellPackages.Agda.meta) homepage license; + description = "Standalone package providing the agda-input method without building Agda."; + }; +} diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/agda2-mode/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/agda2-mode/default.nix new file mode 100644 index 000000000000..2533153bd447 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/agda2-mode/default.nix @@ -0,0 +1,27 @@ +{ trivialBuild +, haskellPackages +}: + +trivialBuild rec { + pname = "agda-mode"; + version = haskellPackages.Agda.version; + + dontUnpack = true; + + # already byte-compiled by Agda builder + buildPhase = '' + agda=`${haskellPackages.Agda}/bin/agda-mode locate` + cp `dirname $agda`/*.el* . + ''; + + meta = { + inherit (haskellPackages.Agda.meta) homepage license; + description = "Agda2-mode for Emacs extracted from Agda package"; + longDescription = '' + Wrapper packages that liberates init.el from `agda-mode locate` magic. + Simply add this to user profile or systemPackages and do `(require + 'agda2)` in init.el. + ''; + }; +} + diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix index a5f06efa33cc..935533b34ae9 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/apheleia/default.nix @@ -1,10 +1,11 @@ { lib , stdenv +, trivialBuild , fetchFromGitHub , emacs }: -stdenv.mkDerivation rec { +trivialBuild rec { pname = "apheleia"; version = "0.0.0+unstable=2021-08-08"; @@ -19,19 +20,6 @@ stdenv.mkDerivation rec { emacs ]; - buildPhase = '' - runHook preBuild - emacs -L . --batch -f batch-byte-compile *.el - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - runHook postInstall - ''; - meta = with lib; { homepage = "https://github.com/raxod502/apheleia"; description = "Asynchronous buffer reformat"; diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix new file mode 100644 index 000000000000..a12eee62fecd --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/bqn-mode/default.nix @@ -0,0 +1,27 @@ +{ lib +, trivialBuild +, fetchFromGitHub +}: + +trivialBuild { + pname = "bqn-mode"; + version = "0.0.0+unstable=-2021-09-15"; + + src = fetchFromGitHub { + owner = "mlochbaum"; + repo = "BQN"; + rev = "fb6ec1d8b083cd2b335828ae22e978b1b13986fa"; + hash = "sha256-57ryT5gb7hToAJOiGjjgU87rmlswjPK9tV1iQzJ4C0Y="; + }; + + postUnpack = '' + sourceRoot="$sourceRoot/editors/emacs" + ''; + + meta = with lib; { + homepage = "https://mlochbaum.github.io/BQN/editors/index.html"; + description = "Emacs mode for BQN"; + license = licenses.gpl3Only; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/cedille/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/cedille/default.nix index f03aa92c3af3..e9a5e9128810 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/cedille/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/cedille/default.nix @@ -1,30 +1,33 @@ -{ stdenv, cedille, emacs }: +{ stdenv +, cedille +, emacs +}: stdenv.mkDerivation { pname = "cedille-mode"; - version = cedille.version; - src = cedille.src; + inherit (cedille) version src; buildInputs = [ emacs ]; dontBuild = true; installPhase = '' + runHook preInstall + install -d $out/share/emacs/site-lisp install se-mode/*.el se-mode/*.elc $out/share/emacs/site-lisp install cedille-mode/*.el cedille-mode/*.elc $out/share/emacs/site-lisp install *.el *.elc $out/share/emacs/site-lisp substituteInPlace $out/share/emacs/site-lisp/cedille-mode.el \ - --replace /usr/bin/cedille ${cedille}/bin/cedille \ + --replace /usr/bin/cedille ${cedille}/bin/cedille + runHook postInstall ''; meta = { + inherit (cedille.meta) + homepage license maintainers platforms; description = "Emacs major mode for Cedille"; - homepage = cedille.meta.homepage; - license = cedille.meta.license ; - platforms = cedille.meta.platforms; - maintainers = cedille.meta.maintainers; }; } diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/color-theme-solarized/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/color-theme-solarized/default.nix index ce85e9be4e9a..feb6c0fa86ca 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/color-theme-solarized/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/color-theme-solarized/default.nix @@ -1,33 +1,38 @@ -{lib, stdenv, fetchzip, emacs, color-theme}: -let - commit = "f3ca8902ea056fb8e46cb09f09c96294e31cd4ee"; -in -stdenv.mkDerivation { - name = "color-theme-solarized-1.0.0"; +{ lib +, trivialBuild +, fetchFromGitHub +, emacs +, color-theme +}: - src = fetchzip { +trivialBuild { + pname = "color-theme-solarized"; + version = "0.0.0+unstable=2017-10-24"; - url = "https://github.com/sellout/emacs-color-theme-solarized/archive/${commit}.zip"; - sha256 = "16d7adqi07lzzr0qipl1fbag9l8kiyr3xrqxi528pimcisbg85d3"; + src = fetchFromGitHub { + owner = "sellout"; + repo = "emacs-color-theme-solarized"; + rev = "f3ca8902ea056fb8e46cb09f09c96294e31cd4ee"; + hash = "sha256-oxX0lo6sxotEiR3nPrKPE9H01HKB3ohB/p8eEHFTp5k="; }; buildInputs = [ emacs ]; propagatedUserEnvPkgs = [ color-theme ]; buildPhase = '' - emacs -L . -L ${color-theme}/share/emacs/site-lisp/elpa/color-theme-* --batch -f batch-byte-compile *.el - ''; + runHook preBuild + + emacs -L . -L ${color-theme}/share/emacs/site-lisp/elpa/color-theme-* \ + --batch -f batch-byte-compile *.el - installPhase = '' - mkdir -p $out/share/emacs/site-lisp - install *.el* $out/share/emacs/site-lisp + runHook postBuild ''; meta = with lib; { - description = "Precision colors for machines and people"; homepage = "http://ethanschoonover.com/solarized"; - maintainers = [ maintainers.samuelrivas ]; + description = "Precision colors for machines and people; Emacs implementation"; license = licenses.mit; - platforms = platforms.all; + maintainers = with maintainers; [ samuelrivas AndersonTorres ]; + inherit (emacs.meta) platforms; }; } diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix index 577f5136326c..84d724c3518b 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix @@ -1,16 +1,33 @@ -{ stdenv, fetchurl, makeWrapper, emacs, tcl, tclx, espeak-ng, lib }: +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, emacs +, tcl +, tclx +, espeak-ng +}: stdenv.mkDerivation rec { pname = "emacspeak"; version = "54.0"; - src = fetchurl { - url = "https://github.com/tvraman/emacspeak/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-wsIqiW4UtgdAhqPqgCKgF37+hAtmAelAEnme1W9PKes="; + src = fetchFromGitHub { + owner = "tvraman"; + repo = pname; + rev = version; + hash= "sha256-aOZ8PmkASJKETPhXhE9WQXyJS7SPe+d97fK/piqqzqc="; }; - nativeBuildInputs = [ makeWrapper emacs ]; - buildInputs = [ tcl tclx espeak-ng ]; + nativeBuildInputs = [ + emacs + makeWrapper + ]; + buildInputs = [ + espeak-ng + tcl + tclx + ]; preConfigure = '' make config @@ -32,11 +49,11 @@ stdenv.mkDerivation rec { --add-flags '-l "${placeholder "out"}/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.elc"' ''; - meta = { + meta = with lib; { homepage = "https://github.com/tvraman/emacspeak/"; description = "Emacs extension that provides spoken output"; - license = lib.licenses.gpl2; - maintainers = [ ]; - platforms = lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix new file mode 100644 index 000000000000..73fd2f4a0a92 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/ement/default.nix @@ -0,0 +1,36 @@ +{ trivialBuild +, lib +, fetchFromGitHub +, curl +, plz +, cl-lib +, ts +}: + +trivialBuild { + pname = "ement"; + version = "unstable-2021-09-16"; + + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "ement.el"; + rev = "c07e914f077199c95b0e7941a421675c95d4687e"; + sha256 = "sha256-kYVb2NrHYC87mY/hFUMAjb4TLJ9A2L2RrHoiAXvRaGg="; + }; + + packageRequires = [ + plz + cl-lib + ts + ]; + + patches = [ + ./handle-nil-images.patch + ]; + + meta = { + description = "Ement.el is a Matrix client for Emacs"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch new file mode 100644 index 000000000000..547fee164056 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/ement/handle-nil-images.patch @@ -0,0 +1,28 @@ +diff --git a/ement.el b/ement.el +index c9596a7..1b33045 100644 +--- a/ement.el ++++ b/ement.el +@@ -682,14 +682,15 @@ can cause undesirable underlining." + "Return a copy of IMAGE set to MAX-WIDTH and MAX-HEIGHT. + IMAGE should be one as created by, e.g. `create-image'." + ;; It would be nice if the image library had some simple functions to do this sort of thing. +- (let ((new-image (cl-copy-list image))) +- (when (fboundp 'imagemagick-types) +- ;; Only do this when ImageMagick is supported. +- ;; FIXME: When requiring Emacs 27+, remove this (I guess?). +- (setf (image-property new-image :type) 'imagemagick)) +- (setf (image-property new-image :max-width) max-width +- (image-property new-image :max-height) max-height) +- new-image)) ++ (when image ++ (let ((new-image (cl-copy-list image))) ++ (when (fboundp 'imagemagick-types) ++ ;; Only do this when ImageMagick is supported. ++ ;; FIXME: When requiring Emacs 27+, remove this (I guess?). ++ (setf (image-property new-image :type) 'imagemagick)) ++ (setf (image-property new-image :max-width) max-width ++ (image-property new-image :max-height) max-height) ++ new-image))) + + ;;;;; Reading/writing sessions + diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix index a92471a9493b..fa7725fbb94c 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix @@ -1,22 +1,23 @@ -{ lib, stdenv, fetchgit }: +{ lib +, trivialBuild +, fetchFromGitHub +, emacs +}: -stdenv.mkDerivation { - name = "ess-R-object-popup-20130302"; +trivialBuild rec { + pname = "ess-R-object-popup"; + version = "1.0"; - src = fetchgit { - url = "https://github.com/myuhe/ess-R-object-popup.el.git"; - rev = "7e1f601bfba72de0fda44d9c82f96028ecbb9948"; - sha256 = "0q8pbaa6wahli6fh0kng5zmnypsxi1fr2bzs2mfk3h8vf4nikpv0"; + src = fetchFromGitHub { + owner = "myuhe"; + repo = "ess-R-object-popup.el"; + rev = "v${version}"; + hash = "sha256-YN8ZLXEbwTFdFfovkV2IXV9v6y/PTgCdiRQqbpRaF2E="; }; - installPhase = '' - mkdir -p $out/share/emacs/site-lisp - cp *.el *.elc $out/share/emacs/site-lisp/ - ''; - meta = { - description = "Popup descriptions of R objects"; homepage = "https://github.com/myuhe/ess-R-object-popup.el"; - platforms = lib.platforms.all; + description = "Popup descriptions of R objects"; + inherit (emacs.meta) platforms; }; } diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix index 74fc1a179219..58c542a57f4f 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/evil-markdown/default.nix @@ -1,46 +1,34 @@ -{ stdenv, fetchFromGitHub, emacs, emacsPackages, lib }: +{ lib +, trivialBuild +, fetchFromGitHub +, emacs +}: -let - runtimeDeps = with emacsPackages; [ - evil - markdown-mode - ]; -in -stdenv.mkDerivation { +trivialBuild rec { pname = "evil-markdown"; - version = "2020-06-01"; + version = "0.0.0+unstable=2021-07-21"; src = fetchFromGitHub { owner = "Somelauw"; repo = "evil-markdown"; - rev = "064fe9b4767470472356d20bdd08e2f30ebbc9ac"; - sha256 = "sha256-Kt2wxG1XCFowavVWtj0urM/yURKegonpZcxTy/+CrJY="; + rev = "8e6cc68af83914b2fa9fd3a3b8472573dbcef477"; + hash = "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8="; }; buildInputs = [ emacs - ] ++ runtimeDeps; - - propagatedUserEnvPkgs = runtimeDeps; + ] ++ propagatedUserEnvPkgs; - buildPhase = '' - runHook preBuild - emacs -L . --batch -f batch-byte-compile *.el - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - runHook postInstall - ''; + propagatedUserEnvPkgs = with emacs.pkgs; [ + evil + markdown-mode + ]; - meta = { - description = "Vim-like keybindings for markdown-mode"; + meta = with lib; { homepage = "https://github.com/Somelauw/evil-markdown"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ leungbk ]; - platforms = emacs.meta.platforms; + description = "Integrates Emacs evil and markdown"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ leungbk ]; + inherit (emacs.meta) platforms; }; } diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/font-lock-plus/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/font-lock-plus/default.nix index 3cea9ae4ef09..019d241f507b 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/font-lock-plus/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/font-lock-plus/default.nix @@ -1,17 +1,22 @@ -{ fetchurl, lib, trivialBuild, writeText }: +{ lib +, fetchFromGitHub +, trivialBuild +}: trivialBuild { - pname = "font-lock+"; - version = "20180101.25"; + pname = "font-lock-plus"; + version = "208+unstable=2018-01-01"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/font-lock%2b.el?revision=25"; - sha256 = "0197yzn4hbjmw5h3m08264b7zymw63pdafph5f3yzfm50q8p7kp4"; - name = "font-lock+.el"; + src = fetchFromGitHub { + owner = "emacsmirror"; + repo = "font-lock-plus"; + rev = "f2c1ddcd4c9d581bd32be88fad026b49f98b6541"; + hash = "sha256-lFmdVMXIIXZ9ZohAJw5rhxpTv017qIyzmpuKOWDdeJ4="; }; - meta = { - homepage = "https://melpa.org/#/font-lock+"; - license = lib.licenses.gpl2Plus; + meta = with lib; { + homepage = "https://github.com/emacsmirror/font-lock-plus"; + description = "Enhancements to standard library font-lock.el"; + license = licenses.gpl2Plus; }; } diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix index b23d36209e61..8b353409c372 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/git-undo/default.nix @@ -2,9 +2,10 @@ , stdenv , fetchFromGitHub , emacs +, trivialBuild }: -stdenv.mkDerivation { +trivialBuild { pname = "git-undo"; version = "0.0.0+unstable=2019-12-21"; @@ -15,28 +16,11 @@ stdenv.mkDerivation { sha256 = "sha256-cVkK9EF6qQyVV3uVqnBEjF8e9nEx/8ixnM8PvxqCyYE="; }; - buildInputs = [ - emacs - ]; - - buildPhase = '' - runHook preBuild - emacs -L . --batch -f batch-byte-compile *.el - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - runHook postInstall - ''; - meta = with lib; { homepage = "https://github.com/jwiegley/git-undo-el"; description = "Revert region to most recent Git-historical version"; license = licenses.gpl2Plus; maintainers = with maintainers; [ leungbk ]; - platforms = emacs.meta.platforms; + inherit (emacs.meta) platforms; }; } diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/helm-words/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/helm-words/default.nix index 0678492500d6..1cc7a23e17d1 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/helm-words/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/helm-words/default.nix @@ -1,23 +1,28 @@ -{ lib, stdenv, fetchgit }: +{ lib +, trivialBuild +, fetchFromGitHub +, dictionary +, emacs +, helm +}: -stdenv.mkDerivation { - name = "helm-words-20190917"; +trivialBuild rec { + pname = "helm-words"; + version = "0.0.0+unstable=2019-03-12"; - src = fetchgit { - url = "https://github.com/pronobis/helm-words.git"; + src = fetchFromGitHub { + owner = "emacsmirror"; + repo = pname; rev = "e6387ece1940a06695b9d910de3d90252efb8d29"; - sha256 = "1ly0mbzlgc26fqvf7rxpmy698g0cf9qldrwrx022ar6r68l1h7xf"; + hash = "sha256-rh8YKDLZZCUE6JnnRnFyDDyUjK+35+M2dkawR/+qwNM="; }; - installPhase = '' - mkdir -p $out/share/emacs/site-lisp - cp *.el *.elc $out/share/emacs/site-lisp/ - ''; + packageRequires = [ helm dictionary ]; - meta = { - description = "Emacs major mode for jade and stylus"; - homepage = "https://github.com/brianc/helm-words"; - license = lib.licenses.gpl3; - platforms = lib.platforms.all; + meta = with lib; { + homepage = "https://github.com/emacsmirror/helm-words"; + description = "Helm extension for looking up words in dictionaries and thesauri"; + license = licenses.gpl3Plus; + inherit (emacs.meta) platforms; }; } diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/ido-ubiquitous/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/ido-ubiquitous/default.nix deleted file mode 100644 index eaa0f2c2a5b1..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/ido-ubiquitous/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchFromGitHub, emacs }: - -let - version = "3.6-4-gb659bf8"; -in -stdenv.mkDerivation { - pname = "ido-ubiquitous"; - inherit version; - - src = fetchFromGitHub { - owner = "DarwinAwardWinner"; - repo = "ido-ubiquitous"; - rev = version; - sha256 = "06r8qpfr60gc673w881m0nplj91b6bfw77bxgl6irz1z9bp7cc4y"; - }; - - buildInputs = [ emacs ]; - - buildPhase = '' - emacs -L . --batch -f batch-byte-compile *.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - ''; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/isearch-plus/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/isearch-plus/default.nix index 1c11a2abff57..c28a17743421 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/isearch-plus/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/isearch-plus/default.nix @@ -1,10 +1,10 @@ { lib -, stdenv +, trivialBuild , fetchFromGitHub , emacs }: -stdenv.mkDerivation { +trivialBuild { pname = "isearch-plus"; version = "3434+unstable=2021-08-23"; @@ -15,28 +15,11 @@ stdenv.mkDerivation { hash = "sha256-kD+Fyps3fc5YK6ATU1nrkKHazGMYJnU2gRcpQZf6A1E="; }; - buildInputs = [ - emacs - ]; - - buildPhase = '' - runHook preBuild - emacs -L . --batch -f batch-byte-compile *.el - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - runHook postInstall - ''; - meta = with lib; { homepage = "https://www.emacswiki.org/emacs/IsearchPlus"; description = "Extensions to isearch"; license = licenses.gpl2Plus; maintainers = with maintainers; [ leungbk AndersonTorres ]; - platforms = emacs.meta.platforms; + inherit (emacs.meta) platforms; }; } diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix index 67a4c87b95d4..067d6f4481f2 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/isearch-prop/default.nix @@ -1,10 +1,11 @@ { lib , stdenv , fetchFromGitHub +, trivialBuild , emacs }: -stdenv.mkDerivation { +trivialBuild { pname = "isearch-prop"; version = "0.0.0+unstable=2019-05-01"; @@ -15,28 +16,11 @@ stdenv.mkDerivation { hash = "sha256-A1Kt4nm7iRV9J5yaLupwiNL5g7ddZvQs79dggmqZ7Rk="; }; - buildInputs = [ - emacs - ]; - - buildPhase = '' - runHook preBuild - emacs -L . --batch -f batch-byte-compile *.el - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - runHook postInstall - ''; - meta = with lib; { homepage = "https://www.emacswiki.org/emacs/IsearchPlus"; description = "Search text- or overlay-property contexts"; license = licenses.gpl3Plus; maintainers = with maintainers; [ leungbk ]; - platforms = emacs.meta.platforms; + inherit (emacs.meta) platforms; }; } diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/jam-mode/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/jam-mode/default.nix index 0fd698ad2c16..09b7877c9deb 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/jam-mode/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/jam-mode/default.nix @@ -1,16 +1,23 @@ -{ trivialBuild, lib, fetchurl }: +{ lib +, trivialBuild +, fetchurl +}: trivialBuild rec { pname = "jam-mode"; version = "0.3"; src = fetchurl { - url = "https://dev.gentoo.org/~ulm/distfiles/jam-mode-${version}.el.xz"; - sha256 = "1jchgiy2rgvnb3swr6ar72yas6pj4inpgpcq78q01q6snflmi2fh"; + url = "https://dev.gentoo.org/~ulm/distfiles/${pname}-${version}.el.xz"; + hash = "sha256-0IlYqbPa4AAwOpjdd20k8hqtvDhZmcz1WHa/LHx8kMk="; }; unpackPhase = '' + runHook preUnpack + xz -cd $src > jam-mode.el + + runHook postUnpack ''; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/llvm-mode/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/llvm-mode/default.nix new file mode 100644 index 000000000000..26f9e25ad665 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/llvm-mode/default.nix @@ -0,0 +1,17 @@ +{ trivialBuild +, llvmPackages +}: + +trivialBuild { + pname = "llvm-mode"; + inherit (llvmPackages.llvm) src version; + + postUnpack = '' + sourceRoot="$sourceRoot/utils/emacs" + ''; + + meta = { + inherit (llvmPackages.llvm.meta) homepage license; + description = "Major mode for the LLVM assembler language"; + }; +} diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index d792793d3643..3f5dd795ccb9 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -42,67 +42,6 @@ }; }; - agda2-mode = trivialBuild { - pname = "agda-mode"; - version = pkgs.haskellPackages.Agda.version; - - dontUnpack = true; - - # already byte-compiled by Agda builder - buildPhase = '' - agda=`${pkgs.haskellPackages.Agda}/bin/agda-mode locate` - cp `dirname $agda`/*.el* . - ''; - - meta = { - description = "Agda2-mode for Emacs extracted from Agda package"; - longDescription = '' - Wrapper packages that liberates init.el from `agda-mode locate` magic. - Simply add this to user profile or systemPackages and do `(require 'agda2)` in init.el. - ''; - homepage = pkgs.haskellPackages.Agda.meta.homepage; - license = pkgs.haskellPackages.Agda.meta.license; - }; - }; - - agda-input = self.trivialBuild { - pname = "agda-input"; - - inherit (pkgs.haskellPackages.Agda) src version; - - postUnpack = "mv $sourceRoot/src/data/emacs-mode/agda-input.el $sourceRoot"; - - meta = { - description = "Standalone package providing the agda-input method without building Agda."; - inherit (pkgs.haskellPackages.Agda.meta) homepage license; - }; - }; - - # may be part of MELPA in the future, see - # https://github.com/mlochbaum/BQN/issues/10#issuecomment-912982874 - bqn-mode = self.trivialBuild { - pname = "bqn-mode"; - version = "unstable-2021-09-04"; - - src = pkgs.fetchFromGitHub { - owner = "mlochbaum"; - repo = "BQN"; - rev = "e623a2fcafdf5fd6c8d31570175284805c4f34d9"; - sha256 = "1a2lpxy3bak4724r0ns4la5d0j6484ngi73kcwp82vgbbpk7lcrp"; - }; - - postUnpack = '' - sourceRoot="$sourceRoot/editors/emacs" - ''; - - meta = { - description = "Emacs mode for BQN"; - license = lib.licenses.gpl3Only; - maintainers = [ lib.maintainers.sternenseemann ]; - homepage = "https://mlochbaum.github.io/BQN/editors/index.html"; - }; - }; - ghc-mod = melpaBuild { pname = "ghc"; version = pkgs.haskellPackages.ghc-mod.version; @@ -154,21 +93,6 @@ }; }; - llvm-mode = trivialBuild { - pname = "llvm-mode"; - inherit (pkgs.llvmPackages.llvm) src version; - - dontConfigure = true; - buildPhase = '' - cp utils/emacs/*.el . - ''; - - meta = { - inherit (pkgs.llvmPackages.llvm.meta) homepage license; - description = "Major mode for the LLVM assembler language."; - }; - }; - matrix-client = let rev = "d2ac55293c96d4c95971ed8e2a3f6f354565c5ed"; in melpaBuild @@ -224,37 +148,17 @@ }; - ott-mode = self.trivialBuild { - pname = "ott-mod"; + agda2-mode = callPackage ./agda2-mode { }; - inherit (pkgs.ott) src version; + agda-input = callPackage ./agda-input{ }; - postUnpack = "mv $sourceRoot/emacs/ott-mode.el $sourceRoot"; + bqn-mode = callPackage ./bqn-mode { }; - meta = { - description = "Standalone package providing ott-mode without building ott and with compiled bytecode."; - inherit (pkgs.haskellPackages.Agda.meta) homepage license; - }; - }; + llvm-mode = callPackage ./llvm-mode { }; - urweb-mode = self.trivialBuild { - pname = "urweb-mode"; + ott-mode = callPackage ./ott-mode { }; - inherit (pkgs.urweb) src version; - - packageRequires = [ - self.cl-lib - self.flycheck - ]; - - postUnpack = "sourceRoot=$sourceRoot/src/elisp"; - - meta = { - description = "Major mode for editing Ur/Web"; - inherit (pkgs.urweb.meta) license homepage; - maintainers = [ lib.maintainers.sternenseemann ]; - }; - }; + urweb-mode = callPackage ./urweb-mode { }; # Packages made the classical callPackage way @@ -262,8 +166,12 @@ ebuild-mode = callPackage ./ebuild-mode { }; + evil-markdown = callPackage ./evil-markdown { }; + emacspeak = callPackage ./emacspeak { }; + ement = callPackage ./ement { }; + ess-R-object-popup = callPackage ./ess-R-object-popup { }; font-lock-plus = callPackage ./font-lock-plus { }; @@ -280,10 +188,10 @@ nano-theme = callPackage ./nano-theme { }; - org-mac-link = callPackage ./org-mac-link { }; - perl-completion = callPackage ./perl-completion { }; + plz = callPackage ./plz { }; + pod-mode = callPackage ./pod-mode { }; power-mode = callPackage ./power-mode { }; @@ -298,15 +206,12 @@ youtube-dl = callPackage ./youtube-dl { }; - zeitgeist = callPackage ./zeitgeist { }; - # From old emacsPackages (pre emacsPackagesNg) cedet = callPackage ./cedet { }; cedille = callPackage ./cedille { cedille = pkgs.cedille; }; color-theme-solarized = callPackage ./color-theme-solarized { }; session-management-for-emacs = callPackage ./session-management-for-emacs { }; hsc3-mode = callPackage ./hsc3 { }; - ido-ubiquitous = callPackage ./ido-ubiquitous { }; prolog-mode = callPackage ./prolog { }; rect-mark = callPackage ./rect-mark { }; sunrise-commander = callPackage ./sunrise-commander { }; diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/mu4e-patch/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/mu4e-patch/default.nix deleted file mode 100644 index 4a436339ebc4..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/mu4e-patch/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchFromGitHub, emacs, lib }: - -stdenv.mkDerivation { - pname = "mu4e-patch"; - version = "2019-05-09"; - - src = fetchFromGitHub { - owner = "seanfarley"; - repo = "mu4e-patch"; - rev = "522da46c1653b1cacc79cde91d6534da7ae9517d"; - sha256 = "sha256-1lV4dDuCdyCUXi/In2DzYJPEHuAc9Jfbz2ZecNZwn4I="; - }; - - buildInputs = [ - emacs - ]; - - buildPhase = '' - runHook preBuild - emacs -L . --batch -f batch-byte-compile *.el - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - runHook postInstall - ''; - - meta = { - description = "Colorize patch emails in mu4e"; - homepage = "https://github.com/seanfarley/mu4e-patch"; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ leungbk ]; - platforms = emacs.meta.platforms; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix index 8034f41a72d6..3bdf1a75f430 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix @@ -1,27 +1,20 @@ { lib -, stdenv +, trivialBuild , fetchFromGitHub , emacs }: -stdenv.mkDerivation rec { +trivialBuild rec { pname = "nano-theme"; - version = "2021-06-05"; + version = "0.0.0+unstable=2021-06-29"; src = fetchFromGitHub { owner = "rougier"; repo = pname; - rev = "99ff1c5e78296a073c6e63b966045e0d83a136e7"; - hash = "sha256-IDVnl4J4hx2mlLaiA+tKxxRGcIyBULr2HBeY/GMHD90="; + rev = "4a231787a32b3019f9f0abb3511a112fd54bf685"; + hash = "sha256-eco9BMKLhPuwFJb5QesbM6g3cZv3FdVvQ9fXq6D3Ifc="; }; - installPhase = '' - runHook preInstall - mkdir -p $out/share/emacs/site-lisp - install *.el $out/share/emacs/site-lisp - runHook postInstall - ''; - meta = { homepage = "https://github.com/rougier/nano-theme"; description = "GNU Emacs / N Λ N O Theme"; diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-mac-link/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-mac-link/default.nix deleted file mode 100644 index a1328d8e8f42..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-mac-link/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, emacs }: - -stdenv.mkDerivation { - pname = "org-mac-link"; - version = "1.2"; - - src = fetchurl { - url = "https://raw.githubusercontent.com/stuartsierra/org-mode/master/contrib/lisp/org-mac-link.el"; - sha256 = "1gkzlfbhg289r1hbqd25szan1wizgk6s99h9xxjip5bjv0jywcx5"; - }; - - dontUnpack = true; - - buildInputs = [ emacs ]; - - buildPhase = '' - cp $src org-mac-link.el - emacs --batch -f batch-byte-compile org-mac-link.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install org-mac-link.el $out/share/emacs/site-lisp - ''; - - meta = { - description = "Insert org-mode links to items selected in various Mac apps"; - homepage = "https://orgmode.org/worg/org-contrib/org-mac-link.html"; - license = lib.licenses.gpl3; - platforms = lib.platforms.all; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/ott-mode/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/ott-mode/default.nix new file mode 100644 index 000000000000..6eeead468ff2 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/ott-mode/default.nix @@ -0,0 +1,19 @@ +{ trivialBuild +, ott +, haskellPackages +}: + +trivialBuild { + pname = "ott-mode"; + + inherit (ott) src version; + + postUnpack = '' + mv $sourceRoot/emacs/ott-mode.el $sourceRoot + ''; + + meta = { + description = "Emacs ott mode (from ott sources)"; + inherit (haskellPackages.Agda.meta) homepage license; + }; +} diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/plz/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/plz/default.nix new file mode 100644 index 000000000000..9992fb877a9f --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/plz/default.nix @@ -0,0 +1,23 @@ +{ trivialBuild, lib, fetchFromGitHub, curl }: + +trivialBuild { + pname = "plz"; + version = "unstable-2021-08-22"; + + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "plz.el"; + rev = "7e456638a651bab3a814e3ea81742dd917509cbb"; + sha256 = "sha256-8kn9ax1AVF6f9iCTqvVeJZihs03pYAhLjUDooG/ubxY="; + }; + + postPatch = '' + substituteInPlace ./plz.el --replace 'plz-curl-program "curl"' 'plz-curl-program "${curl}/bin/curl"' + ''; + + meta = { + description = "plz is an HTTP library for Emacs"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix index 035c906c8ab3..75015a959c2b 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix @@ -1,12 +1,12 @@ { lib -, stdenv +, trivialBuild , fetchFromGitHub , emacs }: -stdenv.mkDerivation rec { +trivialBuild rec { pname = "power-mode"; - version = "2021-06-06"; + version = "0.0.0+unstable=2021-06-06"; src = fetchFromGitHub { owner = "elizagamedev"; @@ -15,15 +15,8 @@ stdenv.mkDerivation rec { hash = "sha256-Wy8o9QTWqvH9cP7xsTpF5QSd4mWNIPXJTadoADKeHWY="; }; - installPhase = '' - runHook preInstall - mkdir -p $out/share/emacs/site-lisp - install *.el $out/share/emacs/site-lisp - runHook postInstall - ''; - meta = { - homepage = "https://github.com/rougier/nano-theme"; + homepage = "https://github.com/elizagamedev/power-mode.el"; description = "Imbue Emacs with power!"; inherit (emacs.meta) platforms; }; diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/prolog/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/prolog/default.nix index deac73a194ed..24df2b0d5dec 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/prolog/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/prolog/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://bruda.ca/_media/emacs/prolog.el"; - sha256 = "oCMzks4xuor8Il8Ll8PXh1zIvMl5qN0RCFJ9yKiHOHU="; + sha256 = "ZzIDFQWPq1vI9z3btgsHgn0axN6uRQn9Tt8TnqGybOk="; }; buildCommand = '' diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/railgun/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/railgun/default.nix index 240a2f29edf3..e49925e057ce 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/railgun/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/railgun/default.nix @@ -1,22 +1,25 @@ -{ lib, stdenv, fetchgit }: +{ lib +, trivialBuild +, fetchFromGitHub +, emacs +}: -stdenv.mkDerivation { - name = "railgun-2012-10-17"; +trivialBuild { + pname = "railgun"; + version= "0.0.0+unstable=2012-10-17"; - src = fetchgit { - url = "https://github.com/mbriggs/railgun.el.git"; + src = fetchFromGitHub { + owner = "mbriggs"; + repo = "railgun.el"; rev = "66aaa1b091baef53a69d0d7425f48d184b865fb8"; - sha256 = "00x09vjd3jz5f73qkf5v1y402zn8vl8dsyfwlq9z646p18ba7gyh"; + hash = "sha256-0L+jFgrXEPMTptx53RDdyH4BiA+7uInHceXL0eROoAM="; }; - installPhase = '' - mkdir -p $out/share/emacs/site-lisp - cp *.el *.elc $out/share/emacs/site-lisp/ - ''; + buildInputs = [ emacs ]; - meta = { - description = "Propel yourself through a rails project with the power of magnets"; + meta = with lib; { homepage = "https://github.com/mbriggs/railgun.el"; - platforms = lib.platforms.all; + description = "Propel yourself through a rails project with the power of magnets"; + inherit (emacs.meta) platforms; }; } diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/rect-mark/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/rect-mark/default.nix index 2214b1448d30..aef7fbf8c9a0 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/rect-mark/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/rect-mark/default.nix @@ -1,35 +1,26 @@ -{ lib, stdenv, fetchurl, emacs }: +{ lib +, trivialBuild +, fetchFromGitHub +, emacs + }: -stdenv.mkDerivation { +trivialBuild rec { pname = "rect-mark"; version = "1.4"; - src = fetchurl { - url = "http://emacswiki.org/emacs/download/rect-mark.el"; - sha256 = "0pyyg53z9irh5jdfvh2qp4pm8qrml9r7lh42wfmdw6c7f56qryh8"; + src = fetchFromGitHub { + owner = "emacsmirror"; + repo = pname; + rev = version; + hash = "sha256-/8T1VTYkKUxlNWXuuS54S5jpl4UxJBbgSuWc17a/VyM="; }; - dontUnpack = true; - buildInputs = [ emacs ]; - buildPhase = '' - cp $src rect-mark.el - emacs --batch -f batch-byte-compile rect-mark.el - ''; - - installPhase = '' - runHook preInstall - install -d $out/share/emacs/site-lisp - install rect-mark.el* $out/share/emacs/site-lisp - runHook postInstall - ''; - - meta = { - description = "Mark a rectangle of text with highlighting"; + meta = with lib; { homepage = "http://emacswiki.org/emacs/RectangleMark"; - license = lib.licenses.gpl2Plus; - - platforms = lib.platforms.all; + description = "Mark a rectangle of text with highlighting"; + license = licenses.gpl2Plus; + inherit (emacs.meta) platforms; }; } diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix index 095d79bdf62b..09889593fe69 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix @@ -1,10 +1,10 @@ { lib -, stdenv +, trivialBuild , fetchFromGitHub , emacs }: -stdenv.mkDerivation rec { +trivialBuild rec { pname = "sunrise-commander"; version = "0.0.0+unstable=2021-07-22"; @@ -19,19 +19,6 @@ stdenv.mkDerivation rec { emacs ]; - buildPhase = '' - runHook preBuild - emacs -q --no-splash --directory=. --batch --file=batch-byte-compile *.el - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/emacs/site-lisp - install *.el* $out/share/emacs/site-lisp - runHook postInstall - ''; - meta = with lib; { homepage = "https://github.com/sunrise-commander/sunrise-commander/"; description = "Orthodox (two-pane) file manager for Emacs"; diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix index 72dbf7a0f476..fee2cca6926a 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "tramp"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { url = "mirror://gnu/tramp/${pname}-${version}.tar.gz"; - sha256 = "sha256-w+6HJA8kFb75Z+7vM1zDnzOnkSSIXKnLVyCcEh+nMGY="; + hash = "sha256-+jjWBcj2dP9Xyj4dzpAX86KnajVa9eFDcjD9xTw6vks="; }; buildInputs = [ @@ -19,10 +19,11 @@ stdenv.mkDerivation rec { texinfo ]; - meta = { + meta = with lib; { homepage = "https://www.gnu.org/software/tramp"; - description = "Transparently access remote files from Emacs. Newer versions than built-in."; - license = lib.licenses.gpl3Plus; + description = "Transparently access remote files from Emacs (latest version)"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres ]; inherit (emacs.meta) platforms; }; } diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/urweb-mode/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/urweb-mode/default.nix new file mode 100644 index 000000000000..6f7e822d81d3 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/urweb-mode/default.nix @@ -0,0 +1,27 @@ +{ lib +, trivialBuild +, urweb +, cl-lib +, flycheck +}: + +trivialBuild { + pname = "urweb-mode"; + + inherit (urweb) src version; + + packageRequires = [ + cl-lib + flycheck + ]; + + postUnpack = '' + sourceRoot=$sourceRoot/src/elisp + ''; + + meta = { + description = "Major mode for editing Ur/Web"; + inherit (urweb.meta) license homepage; + maintainers = [ lib.maintainers.sternenseemann ]; + }; +} diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix index c99693463a64..b0df381b5f95 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/youtube-dl/default.nix @@ -1,8 +1,13 @@ -{ stdenv, fetchFromGitHub, emacs, lib }: +{ lib +, stdenv +, fetchFromGitHub +, trivialBuild +, emacs +}: -stdenv.mkDerivation { +trivialBuild { pname = "youtube-dl"; - version = "2018-10-12"; + version = "0.0.0+unstable=2018-10-12"; src = fetchFromGitHub { owner = "skeeto"; @@ -13,24 +18,11 @@ stdenv.mkDerivation { buildInputs = [ emacs ]; - buildPhase = '' - runHook preBuild - emacs -L . --batch -f batch-byte-compile *.el - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -d $out/share/emacs/site-lisp - install *.el *.elc $out/share/emacs/site-lisp - runHook postInstall - ''; - - meta = { - description = "Emacs frontend to the youtube-dl utility"; + meta = with lib; { + description = "Emacs youtube-dl download manager"; homepage = "https://github.com/skeeto/youtube-dl-emacs"; - license = lib.licenses.unlicense; - maintainers = with lib.maintainers; [ leungbk ]; - platforms = emacs.meta.platforms; + license = licenses.unlicense; + maintainers = with maintainers; [ leungbk ]; + inherit (emacs.meta) platforms; }; } diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/zeitgeist/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/zeitgeist/default.nix deleted file mode 100644 index 67bf7b500ff7..000000000000 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/zeitgeist/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, stdenv, fetchurl, emacs }: - -stdenv.mkDerivation { - name = "zeitgeist-20120221"; - - dontUnpack = true; - - src = fetchurl { - url = "https://raw.githubusercontent.com/alexmurray/dotfiles/master/.emacs.d/vendor/zeitgeist.el"; - sha256 = "0fssx3lp8ar3b1ichbagir7z17habv367l7zz719ipycr24rf1nw"; - }; - - buildInputs = [ emacs ]; - - installPhase = '' - mkdir -p $out/share/emacs/site-lisp - cp $src $out/share/emacs/site-lisp/zeitgeist.el - ''; - - meta = { - description = "Integreate Emacs with Zeitgeist"; - homepage = "http://zeitgeist-project.com/"; - platforms = lib.platforms.all; - }; -} diff --git a/nixpkgs/pkgs/applications/editors/neovim/tests.nix b/nixpkgs/pkgs/applications/editors/neovim/tests.nix index 202b18efb8cf..085fceac1108 100644 --- a/nixpkgs/pkgs/applications/editors/neovim/tests.nix +++ b/nixpkgs/pkgs/applications/editors/neovim/tests.nix @@ -87,10 +87,30 @@ rec { nvim_with_plug = neovim.override { extraName = "-with-plug"; configure.plug.plugins = with pkgs.vimPlugins; [ - vim-go + base16-vim ]; + configure.customRC = '' + color base16-tomorrow-night + set background=dark + ''; }; + run_nvim_with_plug = runTest nvim_with_plug '' + export HOME=$TMPDIR + ${nvim_with_plug}/bin/nvim -i NONE -c 'color base16-tomorrow-night' +quit! + ''; + + + # check that the vim-doc hook correctly generates the tag + # we know for a fact packer has a doc folder + checkForTags = vimPlugins.packer-nvim.overrideAttrs(oldAttrs: { + doInstallCheck = true; + installCheckPhase = '' + [ -f $out/doc/tags ] + ''; + }); + + # nixpkgs should detect that no wrapping is necessary nvimShouldntWrap = wrapNeovim2 "-should-not-wrap" nvimAutoDisableWrap; diff --git a/nixpkgs/pkgs/applications/editors/netbeans/default.nix b/nixpkgs/pkgs/applications/editors/netbeans/default.nix index 00497eebacf9..ae538575367d 100644 --- a/nixpkgs/pkgs/applications/editors/netbeans/default.nix +++ b/nixpkgs/pkgs/applications/editors/netbeans/default.nix @@ -3,7 +3,7 @@ }: let - version = "12.4"; + version = "12.5"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - sha512 = "2jwfyq5ik0pwjd61mh0dhyw4xgpzfmgsjc947xg84n7xmns4mzgb8k5ggrss6hgqiqk7jl3psv7v837c2dxk1xdrdnkzs31cg9symbs"; + sha512 = "3yagspb2clcvd87a9vnpwd64w3afm4kyprqyjccpckysh4php5vhf7dfza3zhs4yzmkikc2pfs7470w54mxz9rcmaixh23h3hlgd1ii"; }; buildCommand = '' diff --git a/nixpkgs/pkgs/applications/editors/rstudio/default.nix b/nixpkgs/pkgs/applications/editors/rstudio/default.nix index 76d9c2e594b2..da7047b90254 100644 --- a/nixpkgs/pkgs/applications/editors/rstudio/default.nix +++ b/nixpkgs/pkgs/applications/editors/rstudio/default.nix @@ -135,7 +135,7 @@ mkDerivation rec { { description = "Set of integrated tools for the R language"; homepage = "https://www.rstudio.com/"; license = licenses.agpl3; - maintainers = with maintainers; [ ehmry changlinli ciil ]; + maintainers = with maintainers; [ changlinli ciil ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/editors/sigil/default.nix b/nixpkgs/pkgs/applications/editors/sigil/default.nix index d3d6e97f3fe2..adbbc05ccce5 100644 --- a/nixpkgs/pkgs/applications/editors/sigil/default.nix +++ b/nixpkgs/pkgs/applications/editors/sigil/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "sigil"; - version = "1.5.1"; + version = "1.7.0"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; rev = version; - sha256 = "sha256-BqNaIsUJE0KmFcmTjJERbclzaRe1dMjareWxUye2se0="; + sha256 = "sha256-a1gstR7qHbzQ3GZ0g/lxUxcHeZ5QgJIvhCV37tqlVfA="; }; pythonPath = with python3Packages; [ lxml ]; diff --git a/nixpkgs/pkgs/applications/editors/texmaker/default.nix b/nixpkgs/pkgs/applications/editors/texmaker/default.nix index 265783fe878f..4c176bab057d 100644 --- a/nixpkgs/pkgs/applications/editors/texmaker/default.nix +++ b/nixpkgs/pkgs/applications/editors/texmaker/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "texmaker"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { url = "http://www.xm1math.net/texmaker/${pname}-${version}.tar.bz2"; - sha256 = "sha256-gANJknSWIMN+B0uAOtPil8EbjyWt4E+xOxOseR87Dd4="; + sha256 = "sha256-UmiW8sGuVhEw7seq6BW53Nqejut3K2VB0NyUzpGnEEQ="; }; buildInputs = [ qtbase qtscript poppler zlib qtwebengine ]; diff --git a/nixpkgs/pkgs/applications/editors/vim/common.nix b/nixpkgs/pkgs/applications/editors/vim/common.nix index 71e7be66b1eb..89d49f5e6285 100644 --- a/nixpkgs/pkgs/applications/editors/vim/common.nix +++ b/nixpkgs/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.2567"; + version = "8.2.3337"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "sha256-FS3TZX7FKnnNpGYKbng2LIfWA9z2jqg7d2HC6t3xYTU="; + sha256 = "sha256-iwSGcLeqXH0bVIXEI5OnotG88Uv8ntycisD9EcHjz/c="; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/editors/vim/configurable.nix b/nixpkgs/pkgs/applications/editors/vim/configurable.nix index 5e1d9dc9cb8b..01561f4c2722 100644 --- a/nixpkgs/pkgs/applications/editors/vim/configurable.nix +++ b/nixpkgs/pkgs/applications/editors/vim/configurable.nix @@ -93,6 +93,16 @@ in stdenv.mkDerivation rec { "--disable-nextaf_check" "--disable-carbon_check" "--disable-gtktest" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "vim_cv_toupper_broken=no" + "--with-tlib=ncurses" + "vim_cv_terminfo=yes" + "vim_cv_tgetent=zero" # it does on native anyway + "vim_cv_tty_group=tty" + "vim_cv_tty_mode=0660" + "vim_cv_getcwd_broken=no" + "vim_cv_stat_ignores_slash=yes" + "vim_cv_memmove_handles_overlap=yes" ] ++ lib.optional (guiSupport == "gtk2" || guiSupport == "gtk3") "--enable-gui=${guiSupport}" ++ lib.optional stdenv.isDarwin diff --git a/nixpkgs/pkgs/applications/editors/vim/default.nix b/nixpkgs/pkgs/applications/editors/vim/default.nix index 2cda81c2588a..d8167f609879 100644 --- a/nixpkgs/pkgs/applications/editors/vim/default.nix +++ b/nixpkgs/pkgs/applications/editors/vim/default.nix @@ -33,8 +33,6 @@ stdenv.mkDerivation { "vim_cv_tty_mode=0660" "vim_cv_getcwd_broken=no" "vim_cv_stat_ignores_slash=yes" - "ac_cv_sizeof_int=4" - "vim_cv_memmove_handles_overlap=yes" "vim_cv_memmove_handles_overlap=yes" ]; diff --git a/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/nixpkgs/pkgs/applications/editors/vscode/generic.nix index 4363f83ba037..7a3f34828ee2 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/generic.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/generic.nix @@ -7,6 +7,9 @@ # Populate passthru.tests , tests +# needed to fix "Save as Root" +, nodePackages, bash + # Attributes inherit from specific versions , version, src, meta, sourceRoot , executableName, longName, shortName, pname, updateScript @@ -108,6 +111,22 @@ let ) ''; + # See https://github.com/NixOS/nixpkgs/issues/49643#issuecomment-873853897 + # linux only because of https://github.com/NixOS/nixpkgs/issues/138729 + postPatch = lib.optionalString stdenv.isLinux '' + # this is a fix for "save as root" functionality + packed="resources/app/node_modules.asar" + unpacked="resources/app/node_modules" + ${nodePackages.asar}/bin/asar extract "$packed" "$unpacked" + substituteInPlace $unpacked/sudo-prompt/index.js \ + --replace "/usr/bin/pkexec" "/run/wrappers/bin/pkexec" \ + --replace "/bin/bash" "${bash}/bin/bash" + rm -rf "$packed" + + # this fixes bundled ripgrep + chmod +x resources/app/node_modules/vscode-ripgrep/bin/rg + ''; + inherit meta; }; diff --git a/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index e6a5a9d5dca7..a9a9fcdf7b4c 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -14,17 +14,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0g49765pnimh107pw3q7dlgd6jcmr5gagsvxrdx8i93mbxb0xm0c"; - x86_64-darwin = "1837fcpllblm970jxsal0ahxsnjmsgydy6g6qn51hp7f797gi7zb"; - aarch64-linux = "1bpmgv6hjyb7jl9v8qyqiyr0brl4xq3wnls2v9hirja6ls1x14cx"; - aarch64-darwin = "0qksfscbiyr2ynw3j86g8wm7myyabkjwx03ik3z6rrv7dffb5yii"; - armv7l-linux = "063p2wy1wl57p43f3md0wp2d981nnb650hyqs9rgqm4mlk2s168g"; + x86_64-linux = "0ma8pysww4r3p73rf94wddxk2ar091yw8mk1gi9jawiqvb9ksx0m"; + x86_64-darwin = "008v7hxv71bvfp52wfx3sg97s54bn2klvy5xfjh48wcaka10vsj0"; + aarch64-linux = "1wi5bmjdjfy1la3lwb3c389cjbn4q12j1214vna9214d8if37dyv"; + aarch64-darwin = "14v0gq4kj0lxa6pwi7nbdpw0l25yfcqydigfzhmwrp8ipbnma62k"; + armv7l-linux = "0h94gzwxknlvfy9gcd0zq4qsjmr9zr22adbfrqm1gvv1aksmgm4b"; }.${system}; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.60.0"; + version = "1.60.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index 27b698c45ba8..fb2417389652 100644 --- a/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/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 = "1l3khnqb8icapnwk4pr4s639dqsvjy1k51km2p9ywnrjdg9byc12"; - x86_64-darwin = "1lb63rz9mzcw5yg3cqi022m1ldvmbxz5z70axc9n6dci8aals663"; - aarch64-linux = "0c0rxzhayklgnaf0r4hj6rwdh5qbb449vi5ja0asfyni4k2nalr5"; - armv7l-linux = "0xs8wsad64cni8vpzfh2aqgdsnsy4hwc25msl79prvh17794k8jy"; + x86_64-linux = "03z6wpzbvf046sl1mjvvcshy5czvr4bq2f3ajlr8bj39y9df93h9"; + x86_64-darwin = "0cs5ikf5dxkg9qkyaq75h0rypil80sk6zmbb0s63191gj6l569yl"; + aarch64-linux = "05ivgn72v05yy3a9qly4qx0qpyjd2r3ygdw978zc8z09694g5x3i"; + armv7l-linux = "044izh9ap5s50k796zjcfk0p997b7sfryshp4gaxh3yf5qs0w7l9"; }.${system}; sourceRoot = { @@ -31,7 +31,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.60.0"; + version = "1.60.1"; pname = "vscodium"; executableName = "codium"; diff --git a/nixpkgs/pkgs/applications/gis/saga/default.nix b/nixpkgs/pkgs/applications/gis/saga/default.nix index 47defd44c640..a702eb54c135 100644 --- a/nixpkgs/pkgs/applications/gis/saga/default.nix +++ b/nixpkgs/pkgs/applications/gis/saga/default.nix @@ -32,11 +32,11 @@ mkDerivation rec { pname = "saga"; - version = "7.9.0"; + version = "7.9.1"; src = fetchurl { url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; - sha256 = "sha256-ob23JbQnBxNO1QA8zUhLjgo5YBR90pwm8JT62bsPBdg="; + sha256 = "sha256-Jq1LhBSeJuq9SlNl/ko5I8+jnjZnLMfGYNNUnzVWo7w="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix b/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix index 316110633891..a8af2dfba655 100644 --- a/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-4"; + version = "7.1.0-6"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "sha256-CvrSeoKaTigR+4egelwLRr2++CQ5OWUePwX9e1/G1GM="; + sha256 = "sha256-rwaMAkbSBTdrJ+OVZfAOBIp1tmC7/TC34w5gBIe+J94="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/nixpkgs/pkgs/applications/graphics/akira/default.nix b/nixpkgs/pkgs/applications/graphics/akira/default.nix index 46e4de27547f..430c582dd793 100644 --- a/nixpkgs/pkgs/applications/graphics/akira/default.nix +++ b/nixpkgs/pkgs/applications/graphics/akira/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { description = "Native Linux Design application built in Vala and GTK"; homepage = "https://github.com/akiraux/Akira"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ Br1ght0ne neonfuz ] ++ pantheon.maintainers; + maintainers = with maintainers; [ Br1ght0ne neonfuz ] ++ teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/graphics/avocode/default.nix b/nixpkgs/pkgs/applications/graphics/avocode/default.nix index 8100824b3743..a2a9dcd4750a 100644 --- a/nixpkgs/pkgs/applications/graphics/avocode/default.nix +++ b/nixpkgs/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.15.0"; + version = "4.15.1"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "sha256-Au1m7CfZkeOczcO/JvIzyVCp6Gn/nhSq0yJOdP8i+0w="; + sha256 = "sha256-Cli1tbe/eHS0yk1OhrSgFwjjGx2jvQSYStkKYj6gk4I="; }; libPath = lib.makeLibraryPath (with xorg; [ diff --git a/nixpkgs/pkgs/applications/graphics/darktable/default.nix b/nixpkgs/pkgs/applications/graphics/darktable/default.nix index 540a74e6524f..50e26677377f 100644 --- a/nixpkgs/pkgs/applications/graphics/darktable/default.nix +++ b/nixpkgs/pkgs/applications/graphics/darktable/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "3.6.0"; + version = "3.6.1"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "sha256:0f8aqwkgw4gs97b5i4ygiqk5zilwq7ax7zwdd31r72zk98cd1g46"; + sha256 = "sha256-or/HwQO4JJRUV6m/7Z5S8Af6HQMPnbyz/wMnhRvkLRQ="; }; nativeBuildInputs = [ cmake ninja llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/graphics/freecad/default.nix b/nixpkgs/pkgs/applications/graphics/freecad/default.nix index ac4050fc8c5b..8f5404cf3ae9 100644 --- a/nixpkgs/pkgs/applications/graphics/freecad/default.nix +++ b/nixpkgs/pkgs/applications/graphics/freecad/default.nix @@ -15,6 +15,7 @@ , libGLU , libXmu , libf2c +, libredwg , libspnav , matplotlib , medfile @@ -61,6 +62,7 @@ mkDerivation rec { ninja pkg-config pyside2-tools + gfortran wrapQtAppsHook ]; @@ -69,7 +71,6 @@ mkDerivation rec { boost coin3d eigen - gfortran gts hdf5 libGLU @@ -131,6 +132,7 @@ mkDerivation rec { qtWrapperArgs = [ "--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1" + "--prefix PATH : ${libredwg}/bin" ]; postFixup = '' diff --git a/nixpkgs/pkgs/applications/graphics/ideogram/default.nix b/nixpkgs/pkgs/applications/graphics/ideogram/default.nix index f78170fde34a..f9b123ddb40b 100644 --- a/nixpkgs/pkgs/applications/graphics/ideogram/default.nix +++ b/nixpkgs/pkgs/applications/graphics/ideogram/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { description = "Insert emoji anywhere, even in non-native apps - designed for elementary OS"; homepage = "https://github.com/cassidyjames/ideogram"; license = licenses.gpl2Plus; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/applications/graphics/krita/default.nix b/nixpkgs/pkgs/applications/graphics/krita/default.nix index 85830f9a0455..3a86d1d4cc73 100644 --- a/nixpkgs/pkgs/applications/graphics/krita/default.nix +++ b/nixpkgs/pkgs/applications/graphics/krita/default.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "krita"; - version = "4.4.5"; + version = "4.4.7"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-S/1ygIcNEGCgDREj2Db8Gltb+KAoZ2Z58CaM1ef7dWg="; + sha256 = "sha256-I6fFxPRCcRU5dyFXZPvGvTb9MuGikrvTaGCXpp4LRRk="; }; nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip_4 makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/graphics/lightburn/default.nix b/nixpkgs/pkgs/applications/graphics/lightburn/default.nix index 5775ba2a5278..cc6c4f42e640 100644 --- a/nixpkgs/pkgs/applications/graphics/lightburn/default.nix +++ b/nixpkgs/pkgs/applications/graphics/lightburn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "lightburn"; - version = "1.0.00"; + version = "1.0.02"; nativeBuildInputs = [ p7zip @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; - sha256 = "sha256-jNqLykVQjer2lps1gnw4fd2FH+ZQrzqQILAsl4Z5Hqk="; + sha256 = "sha256-JaKThw6ubutpOCsO1pVAPVxhhUTKpfYRHjBSu02nlN4="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix b/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix index 9ac853c896e8..a113136c248a 100644 --- a/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix +++ b/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix @@ -19,13 +19,13 @@ assert withOpenCL -> ocl-icd != null; mkDerivation rec { pname = "mandelbulber"; - version = "2.24"; + version = "2.26"; src = fetchFromGitHub { owner = "buddhi1980"; repo = "mandelbulber2"; rev = version; - sha256 = "sha256-JgpYGzD2FsqcCWnOKBiVCxUKqLfT4S++uUBZekhGWmA="; + sha256 = "sha256-RKpg7LBsrBFOlFozoDcALwGeZ9whPiCpFMZF5ljsp7Q="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/graphics/shutter/default.nix b/nixpkgs/pkgs/applications/graphics/shutter/default.nix index e901ee29bf61..c7e55be9f041 100644 --- a/nixpkgs/pkgs/applications/graphics/shutter/default.nix +++ b/nixpkgs/pkgs/applications/graphics/shutter/default.nix @@ -64,13 +64,13 @@ let in stdenv.mkDerivation rec { pname = "shutter"; - version = "0.98"; + version = "0.99"; src = fetchFromGitHub { owner = "shutter-project"; repo = "shutter"; rev = "v${version}"; - sha256 = "sha256-btJVY7+palstydWt5VCdtHwOj6FTXEcsregjaiXbZ5I="; + sha256 = "sha256-n5M+Ggk8ulJQMWjAW+/fC8fbqiBGzsx6IXlYxvf8utA="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/graphics/weylus/default.nix b/nixpkgs/pkgs/applications/graphics/weylus/default.nix new file mode 100644 index 000000000000..54b86c09341e --- /dev/null +++ b/nixpkgs/pkgs/applications/graphics/weylus/default.nix @@ -0,0 +1,58 @@ +{ lib +, dbus +, stdenv +, gst_all_1 +, xorg +, libdrm +, libva +, fetchzip +, copyDesktopItems +, fontconfig +, libpng +, autoPatchelfHook +}: + +stdenv.mkDerivation rec { + pname = "weylus"; + version = "0.11.2"; + + src = fetchzip { + url = "https://github.com/H-M-H/Weylus/releases/download/v${version}/linux.zip"; + sha256 = "sha256-coA8qUpUgRjVBF/0LZgimx61fTTpdck/AO6e+r2uNu0="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + install -Dm755 ./weylus $out/bin/weylus + copyDesktopItems ./weylus.desktop + + runHook postInstall + ''; + + buildInputs = [ + libpng + dbus + libdrm + fontconfig + libva + gst_all_1.gst-plugins-base + # autoPatchelfHook complains if these are missing, even on wayland + xorg.libXft + xorg.libXinerama + xorg.libXcursor + xorg.libXrandr + xorg.libXcomposite + xorg.libXtst + ]; + + nativeBuildInputs = [ copyDesktopItems autoPatchelfHook ]; + + meta = with lib; { + description = "Use your tablet as graphic tablet/touch screen on your computer"; + homepage = "https://github.com/H-M-H/Weylus"; + license = with licenses; [ agpl3Only ]; + maintainers = with maintainers; [ legendofmiracles ]; + }; +} diff --git a/nixpkgs/pkgs/applications/graphics/yacreader/default.nix b/nixpkgs/pkgs/applications/graphics/yacreader/default.nix index 8fdd805803bc..0a25889c2dcd 100644 --- a/nixpkgs/pkgs/applications/graphics/yacreader/default.nix +++ b/nixpkgs/pkgs/applications/graphics/yacreader/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "yacreader"; - version = "9.7.1"; + version = "9.8.2"; src = fetchFromGitHub { owner = "YACReader"; repo = pname; rev = version; - sha256 = "17kzh69sxpyk4n7c2gkbsvr9y4j14azdy1qxzghsbwp7ij4iw9kv"; + sha256 = "sha256-Xvf0xXtMs3x1fPgAvS4GJXrZgDZWhzIgrOF4yECr7/g="; }; nativeBuildInputs = [ qmake pkg-config ]; diff --git a/nixpkgs/pkgs/applications/kde/akonadi-contacts.nix b/nixpkgs/pkgs/applications/kde/akonadi-contacts.nix index ad94c79e0f3c..76c4f3f2c507 100644 --- a/nixpkgs/pkgs/applications/kde/akonadi-contacts.nix +++ b/nixpkgs/pkgs/applications/kde/akonadi-contacts.nix @@ -3,8 +3,8 @@ extra-cmake-modules, qtwebengine, grantlee, grantleetheme, - kdbusaddons, ki18n, kiconthemes, kio, kitemmodels, ktextwidgets, prison, - akonadi, akonadi-mime, kcontacts, kmime, libkleo, + kcmutils, kdbusaddons, ki18n, kiconthemes, kio, kitemmodels, ktextwidgets, + prison, akonadi, akonadi-mime, kcontacts, kmime, libkleo, }: mkDerivation { @@ -17,7 +17,7 @@ mkDerivation { buildInputs = [ qtwebengine grantlee grantleetheme - kdbusaddons ki18n kiconthemes kio kitemmodels ktextwidgets prison + kcmutils kdbusaddons ki18n kiconthemes kio kitemmodels ktextwidgets prison akonadi-mime kcontacts kmime libkleo ]; propagatedBuildInputs = [ akonadi ]; diff --git a/nixpkgs/pkgs/applications/kde/fetch.sh b/nixpkgs/pkgs/applications/kde/fetch.sh index 3208fce8767a..9c7c1975eac8 100644 --- a/nixpkgs/pkgs/applications/kde/fetch.sh +++ b/nixpkgs/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/release-service/21.04.0/src -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/release-service/21.08.1/src -A '*.tar.xz' ) diff --git a/nixpkgs/pkgs/applications/kde/kdeconnect-kde.nix b/nixpkgs/pkgs/applications/kde/kdeconnect-kde.nix index 30bd0731a871..e21a85df0143 100644 --- a/nixpkgs/pkgs/applications/kde/kdeconnect-kde.nix +++ b/nixpkgs/pkgs/applications/kde/kdeconnect-kde.nix @@ -19,12 +19,15 @@ , makeWrapper , pulseaudio-qt , qca-qt5 +, qqc2-desktop-style , qtgraphicaleffects , qtmultimedia , qtquickcontrols2 , qtx11extras , breeze-icons , sshfs +, wayland +, wayland-scanner }: mkDerivation { @@ -46,10 +49,13 @@ mkDerivation { libfakekey pulseaudio-qt qca-qt5 + qqc2-desktop-style qtgraphicaleffects qtmultimedia qtquickcontrols2 qtx11extras + wayland + wayland-scanner # otherwise buttons are blank on non-kde breeze-icons ]; diff --git a/nixpkgs/pkgs/applications/kde/srcs.nix b/nixpkgs/pkgs/applications/kde/srcs.nix index f6dd35c83a38..4f4ab4464a39 100644 --- a/nixpkgs/pkgs/applications/kde/srcs.nix +++ b/nixpkgs/pkgs/applications/kde/srcs.nix @@ -4,1803 +4,1811 @@ { akonadi = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/akonadi-21.04.0.tar.xz"; - sha256 = "1ka1cxwqvcdyy9i1p7v7vrcrs9d1kx892wzq1dw3jrq9x57l5drz"; - name = "akonadi-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/akonadi-21.08.1.tar.xz"; + sha256 = "02abs3mxwna30rgidlndj4jq0swy3id236ckw726vp3r8m9qimd6"; + name = "akonadi-21.08.1.tar.xz"; }; }; akonadi-calendar = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/akonadi-calendar-21.04.0.tar.xz"; - sha256 = "1yf92jx7x19cp95c8nbkgmz5q1cg7096gdwy525df56h3pgbm651"; - name = "akonadi-calendar-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/akonadi-calendar-21.08.1.tar.xz"; + sha256 = "1p8myayr6kfgp805wdpy39f9bjxw1fafv6kn35h1zsl1fgyc4812"; + name = "akonadi-calendar-21.08.1.tar.xz"; }; }; akonadi-calendar-tools = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/akonadi-calendar-tools-21.04.0.tar.xz"; - sha256 = "1g0k1c11lysk3mi6k83lw70d64x543pcdgc9af1hyckb6clzh2gm"; - name = "akonadi-calendar-tools-21.04.0.tar.xz"; - }; - }; - akonadiconsole = { - version = "21.04.0"; - src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/akonadiconsole-21.04.0.tar.xz"; - sha256 = "0l6famxpw64w7gmknx4szsg16hjydp3cr2mp0z0dfzi4m1i64gi7"; - name = "akonadiconsole-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/akonadi-calendar-tools-21.08.1.tar.xz"; + sha256 = "0j8cc0x2bx64crgvprksnmng4yi7fk71s5pfyjrnw8d9xnj7vvvg"; + name = "akonadi-calendar-tools-21.08.1.tar.xz"; }; }; akonadi-contacts = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/akonadi-contacts-21.04.0.tar.xz"; - sha256 = "1130dvx8dpfvqsydhx1qy83bqx4drgb762ycf10cqkjvm6sjg3jh"; - name = "akonadi-contacts-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/akonadi-contacts-21.08.1.tar.xz"; + sha256 = "13sjy2jg4bbg7dm182apppmcpkhmiwhkpnkjhh13dhz8v7488vnc"; + name = "akonadi-contacts-21.08.1.tar.xz"; }; }; akonadi-import-wizard = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/akonadi-import-wizard-21.04.0.tar.xz"; - sha256 = "1idxpymfags4zrqlagndrkp9yvr24vvd4rzm7gm2zxwilw90smdh"; - name = "akonadi-import-wizard-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/akonadi-import-wizard-21.08.1.tar.xz"; + sha256 = "1v0nzaijy6nahjx4j1wsvi8s6s3zk79b8h01n3r6gwilbxklqnqs"; + name = "akonadi-import-wizard-21.08.1.tar.xz"; }; }; akonadi-mime = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/akonadi-mime-21.04.0.tar.xz"; - sha256 = "037v29sq0q46i675n177ny3n5rvndvdpvydbika89gkiyag6hh1v"; - name = "akonadi-mime-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/akonadi-mime-21.08.1.tar.xz"; + sha256 = "15lm1248diqhnv1qldcyyfi1v7w8h13jvwhp80py93hijq07iwz5"; + name = "akonadi-mime-21.08.1.tar.xz"; }; }; akonadi-notes = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/akonadi-notes-21.04.0.tar.xz"; - sha256 = "0l0m3qpqj4g6j58kfc2xc48cwhhf0538h5bw5m8z123pcggp3w20"; - name = "akonadi-notes-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/akonadi-notes-21.08.1.tar.xz"; + sha256 = "1r43pvxpk3f183qaiydxg83xc1y5zss7xgxq5p1vnwgqyifibh3h"; + name = "akonadi-notes-21.08.1.tar.xz"; }; }; akonadi-search = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/akonadi-search-21.04.0.tar.xz"; - sha256 = "189z9vqn05ph7c6sfr413hywrrqs1yn5sj84563bjf3rdzn4zp67"; - name = "akonadi-search-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/akonadi-search-21.08.1.tar.xz"; + sha256 = "1w5vps398kadl6p2jhsj18jqfn4lyysx09jzj6q9cvkvzmq4im6i"; + name = "akonadi-search-21.08.1.tar.xz"; + }; + }; + akonadiconsole = { + version = "21.08.1"; + src = fetchurl { + url = "${mirror}/stable/release-service/21.08.1/src/akonadiconsole-21.08.1.tar.xz"; + sha256 = "1dplpb6z3glps82bzlqhnx29k13m6b7q2wvdlcw9hfqrp2xgzyfk"; + name = "akonadiconsole-21.08.1.tar.xz"; }; }; akregator = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/akregator-21.04.0.tar.xz"; - sha256 = "1px3sxsbhh98822i3yxs9sq019f78njfai07rsyf9wbawa6xj2sm"; - name = "akregator-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/akregator-21.08.1.tar.xz"; + sha256 = "03rv9m3f7vrn80jfdmnbzxsl226s82liyfam1cysxl2skkmvpimm"; + name = "akregator-21.08.1.tar.xz"; }; }; analitza = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/analitza-21.04.0.tar.xz"; - sha256 = "1g4sfcdp13xsbfc1c64pgj7ax75z9cpqgy3sri4cm4qk9d2kkj0i"; - name = "analitza-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/analitza-21.08.1.tar.xz"; + sha256 = "0aagcj2dvm5aq24m6r5z79qsq2ra8xwzj7b1f64kcq8sabw7dbn4"; + name = "analitza-21.08.1.tar.xz"; }; }; ark = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ark-21.04.0.tar.xz"; - sha256 = "034ywf6favaj7cbfmcgz00yrmvpb8vxsw4yq8a7y6f40b590aphf"; - name = "ark-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ark-21.08.1.tar.xz"; + sha256 = "1ss33qizhg325k4hhf8339xg52iv4s32qjm048zhi2jaz54pdnv0"; + name = "ark-21.08.1.tar.xz"; }; }; artikulate = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/artikulate-21.04.0.tar.xz"; - sha256 = "0pbsbhl1phfzrgb393qf60n8k20f1qkda7a0mk6rxp1zj00pg7zw"; - name = "artikulate-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/artikulate-21.08.1.tar.xz"; + sha256 = "0x71m715iw1hv6xy36sd2gzd0cnsbn09wipp02nx2dc161lavnxk"; + name = "artikulate-21.08.1.tar.xz"; }; }; audiocd-kio = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/audiocd-kio-21.04.0.tar.xz"; - sha256 = "1bbdw5gxjzpvvbq28zhazdr2ir1i3diy7rvz77cmw7jlj98x40m0"; - name = "audiocd-kio-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/audiocd-kio-21.08.1.tar.xz"; + sha256 = "1aqzgmpypzska5lgjwjpnbl6q2cbyiirph6h8ph5wnnb992lx8li"; + name = "audiocd-kio-21.08.1.tar.xz"; }; }; baloo-widgets = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/baloo-widgets-21.04.0.tar.xz"; - sha256 = "08y590n7rrha28pyjmf3liishmfjyx422ryd5viwb21g3isdb5ir"; - name = "baloo-widgets-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/baloo-widgets-21.08.1.tar.xz"; + sha256 = "01f0hpgvlwxn3yms6yyi0ykryb78c9plp0q2z0ywk1p4lx4iywhd"; + name = "baloo-widgets-21.08.1.tar.xz"; }; }; blinken = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/blinken-21.04.0.tar.xz"; - sha256 = "00fb1a98f6qs2pjcb2hc4rh2zgnqzhg21dal0rc4ddglm0mvgq27"; - name = "blinken-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/blinken-21.08.1.tar.xz"; + sha256 = "1bfkiwg2cwn4dizwcjb0ynzvvdxndf5172a8z0ch9b2wxlaljh87"; + name = "blinken-21.08.1.tar.xz"; }; }; bomber = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/bomber-21.04.0.tar.xz"; - sha256 = "0fkikbyayd5ickhjwgd57kb89698w9ni89218bc47gkqvgm7zdzy"; - name = "bomber-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/bomber-21.08.1.tar.xz"; + sha256 = "1ppsnnbwsf1y9pavnpxr64k845gx1yn5p1mqswpcqgp9zd58f338"; + name = "bomber-21.08.1.tar.xz"; }; }; bovo = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/bovo-21.04.0.tar.xz"; - sha256 = "1k6k9hkzrnz2802k4pq0aabdbkwwdvqi8c669cjhxwqxrpxhlan3"; - name = "bovo-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/bovo-21.08.1.tar.xz"; + sha256 = "0qs96ds0clbvf7q487h9bq7l4haymdcyxzq8rlfd74qpki9cb9aa"; + name = "bovo-21.08.1.tar.xz"; }; }; calendarsupport = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/calendarsupport-21.04.0.tar.xz"; - sha256 = "0m3x1pimy5sldgzkggwxyv3r0vn802bysf73nf6azgqachj1rm4g"; - name = "calendarsupport-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/calendarsupport-21.08.1.tar.xz"; + sha256 = "0n9mbwdgyc4530g1rn9b393qq8pgpcclcpip9p72q8qc630jsvbw"; + name = "calendarsupport-21.08.1.tar.xz"; }; }; cantor = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/cantor-21.04.0.tar.xz"; - sha256 = "0saz2xapfqmqlh9cmz8vkhsz5ai9fjgzp5y4rg4nc77b6wfwijpp"; - name = "cantor-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/cantor-21.08.1.tar.xz"; + sha256 = "18gl6bw8mnn9sp4jws5b57k9w9scqg53ynw6yrabx2796k0hwfiw"; + name = "cantor-21.08.1.tar.xz"; }; }; cervisia = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/cervisia-21.04.0.tar.xz"; - sha256 = "1r76mdrq4v8f850kgx6wamhhpnvj5giclnfp8ck0f86lqx228xhz"; - name = "cervisia-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/cervisia-21.08.1.tar.xz"; + sha256 = "0dah0lgzpdzxyvccqk2k2qbl5x4dl53qp23d0rxb5cg1ba5h7n2l"; + name = "cervisia-21.08.1.tar.xz"; }; }; dolphin = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/dolphin-21.04.0.tar.xz"; - sha256 = "1gmxrxs4h9bk1lxs2gn0gv44067wk19p8mq85n6dbpry9sfyb229"; - name = "dolphin-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/dolphin-21.08.1.tar.xz"; + sha256 = "1vmk9iaylw427x203ccdjhlbah3dr5fz7l3lc113nczq54kcwpbf"; + name = "dolphin-21.08.1.tar.xz"; }; }; dolphin-plugins = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/dolphin-plugins-21.04.0.tar.xz"; - sha256 = "1ll8yhglncbzdmq6kpzavgd2q9llfbcqjyz8x97nlwibqszrbcwz"; - name = "dolphin-plugins-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/dolphin-plugins-21.08.1.tar.xz"; + sha256 = "0gnmr73ly0djngp3imdi4zm72icj3gilqcshb4ks3rq3lwk408rr"; + name = "dolphin-plugins-21.08.1.tar.xz"; }; }; dragon = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/dragon-21.04.0.tar.xz"; - sha256 = "00lnrskgvxclf75h89ycgafajkw1ddqg74lv38dv9yc21lh683k9"; - name = "dragon-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/dragon-21.08.1.tar.xz"; + sha256 = "050jrizyip362fanrbx3fwp4n69sr7d4y2w6n70aqv8hhi90xqjy"; + name = "dragon-21.08.1.tar.xz"; }; }; elisa = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/elisa-21.04.0.tar.xz"; - sha256 = "152i6748pkgnbpd192wd161w001l13gyinar1gphg46gb0z898sg"; - name = "elisa-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/elisa-21.08.1.tar.xz"; + sha256 = "12kr5aixw5gdmy2vj6id0wmznkwg6p1ysxcqayk8bwvv2qz2pygr"; + name = "elisa-21.08.1.tar.xz"; }; }; eventviews = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/eventviews-21.04.0.tar.xz"; - sha256 = "1zq97jfgl0k7k1nhv6zcnbicl1af86rz6hzski9hm387bh60rn5v"; - name = "eventviews-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/eventviews-21.08.1.tar.xz"; + sha256 = "04z5cb4vhxcwxp8dwv7w4400zmj090gr7dm4d4h4x39312d25rhh"; + name = "eventviews-21.08.1.tar.xz"; }; }; ffmpegthumbs = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ffmpegthumbs-21.04.0.tar.xz"; - sha256 = "06ycd5q5b4j6xxvrfvvpfdbmzrk8xysv7k8m64yypxnv9r7h1rsa"; - name = "ffmpegthumbs-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ffmpegthumbs-21.08.1.tar.xz"; + sha256 = "13v5y99fvj0p9f9hqafw652qzb7z267fjfsqykv7wb3pv274f11w"; + name = "ffmpegthumbs-21.08.1.tar.xz"; }; }; filelight = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/filelight-21.04.0.tar.xz"; - sha256 = "1bfpqc67mkqz1w7wwv3p28q0n55vc78l94nyg805zs9adk00886v"; - name = "filelight-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/filelight-21.08.1.tar.xz"; + sha256 = "0smvvh7g9p0vh4s3xd0pk6whszk8vmqv9ww1jp0y3dy6ai2cwixi"; + name = "filelight-21.08.1.tar.xz"; }; }; granatier = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/granatier-21.04.0.tar.xz"; - sha256 = "0qcnr7n2401ykgwbz4lcsgp19fkb90lfbblbmrnbcslfc5pz8jz8"; - name = "granatier-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/granatier-21.08.1.tar.xz"; + sha256 = "1n7bvkh118530hi0aka9wwz7kycljwawb5d0wxzjb74kqp5rp0lv"; + name = "granatier-21.08.1.tar.xz"; }; }; grantlee-editor = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/grantlee-editor-21.04.0.tar.xz"; - sha256 = "0rfcv63flw5izccqxz7mz43hvlim1cilnmrvk2vxc258vl1a226p"; - name = "grantlee-editor-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/grantlee-editor-21.08.1.tar.xz"; + sha256 = "1nfqylrnkvhjiygah527i9q16987n99ry69nwd1000xvf7r1k2yd"; + name = "grantlee-editor-21.08.1.tar.xz"; }; }; grantleetheme = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/grantleetheme-21.04.0.tar.xz"; - sha256 = "1jxdi7as6c81sy7zs59y6a0gmsjz6xwh6vbcr3r64wx62hj6vyls"; - name = "grantleetheme-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/grantleetheme-21.08.1.tar.xz"; + sha256 = "0zscb0wb85g1r0zcqb50ylg1r0640mjk985ifffnjzxlx4ayqglm"; + name = "grantleetheme-21.08.1.tar.xz"; }; }; gwenview = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/gwenview-21.04.0.tar.xz"; - sha256 = "06yyf7f49xbcfzbm10rr0xcmyxmlafh188wq8bjc8mp7p6fq7yd5"; - name = "gwenview-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/gwenview-21.08.1.tar.xz"; + sha256 = "187br8271z00v02vllpxqwk8x6y38gg43xixczd8x4j0p6rgv8a0"; + name = "gwenview-21.08.1.tar.xz"; }; }; incidenceeditor = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/incidenceeditor-21.04.0.tar.xz"; - sha256 = "1fch2d5jgh3raf2zqc4vapgwf3gkdfsd71djvd626q3dsbh82qxz"; - name = "incidenceeditor-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/incidenceeditor-21.08.1.tar.xz"; + sha256 = "1xyb106ck64qq4z083g0qx9n3rax5ma41jsfwl8am8w5q4szxw31"; + name = "incidenceeditor-21.08.1.tar.xz"; }; }; itinerary = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/itinerary-21.04.0.tar.xz"; - sha256 = "132y5v5qy89hfvp1j3x6rr6bg4wdzhd177isrs110w0aizdrbjcn"; - name = "itinerary-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/itinerary-21.08.1.tar.xz"; + sha256 = "018871y48yd2z2qsrnjhymb72nn4by2l8lrz38gcd9fq2dwlh5fs"; + name = "itinerary-21.08.1.tar.xz"; }; }; juk = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/juk-21.04.0.tar.xz"; - sha256 = "11plw0h56n4fmhi47rmjw8qdki3r5yf3v7zfc0svwkb12lrvcp6z"; - name = "juk-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/juk-21.08.1.tar.xz"; + sha256 = "0q2q31r72d28hhabrnwglhcz6h3ay70i4fg7gyn658njvx8gl26b"; + name = "juk-21.08.1.tar.xz"; }; }; k3b = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/k3b-21.04.0.tar.xz"; - sha256 = "1a6gm7bk486fr2haap6212vzx8hhrwkgjplyyq1nb27v61rpir2n"; - name = "k3b-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/k3b-21.08.1.tar.xz"; + sha256 = "1gs4api78ngyb03sgknhc1cil6rx7rd1y66674lmi3sssyhi6bkz"; + name = "k3b-21.08.1.tar.xz"; }; }; kaccounts-integration = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kaccounts-integration-21.04.0.tar.xz"; - sha256 = "1znfyslk4w45923xfxflipf0zwxf91k949carnbhzfiplab30gpy"; - name = "kaccounts-integration-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kaccounts-integration-21.08.1.tar.xz"; + sha256 = "1860njydckpdz34y7g94pa4xz0229j1szj8ihvql05kgysdm11qp"; + name = "kaccounts-integration-21.08.1.tar.xz"; }; }; kaccounts-providers = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kaccounts-providers-21.04.0.tar.xz"; - sha256 = "17rnqsagg60zd5nf7hag74kc9s7nj01ps3z411j8zwa1vlbqidg0"; - name = "kaccounts-providers-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kaccounts-providers-21.08.1.tar.xz"; + sha256 = "1w5k7y8xakp1lf4ca3wip7af3f9avd04i6zixv7kq9w3fh1mndp0"; + name = "kaccounts-providers-21.08.1.tar.xz"; }; }; kaddressbook = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kaddressbook-21.04.0.tar.xz"; - sha256 = "1p9lcs4jd8n52hd0mpckwiv23zivzflkih2lpdbqcw55s75g03bl"; - name = "kaddressbook-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kaddressbook-21.08.1.tar.xz"; + sha256 = "05lrxban904szlqhri71qqfykyygsxwgsx9w406s213vwkakirxb"; + name = "kaddressbook-21.08.1.tar.xz"; }; }; kajongg = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kajongg-21.04.0.tar.xz"; - sha256 = "11hxc0scc700zmw5736z3vcign09g5rgnfmg98z3j34bms7iff5n"; - name = "kajongg-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kajongg-21.08.1.tar.xz"; + sha256 = "1izm0n2nsvxh9zvws53q4hkpzjihjwwccspas7k10ryasgp4nwsb"; + name = "kajongg-21.08.1.tar.xz"; }; }; kalarm = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kalarm-21.04.0.tar.xz"; - sha256 = "1zcyc6nlsdh9ixl10n6xlnfj78z6j218a9aipj1vws0jx7zahl12"; - name = "kalarm-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kalarm-21.08.1.tar.xz"; + sha256 = "088461j6piwas0g4chpj579r3bhyncmyajsfh2hz4679ir5lf6yh"; + name = "kalarm-21.08.1.tar.xz"; }; }; kalarmcal = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kalarmcal-21.04.0.tar.xz"; - sha256 = "0cp5mian3zkyb51l6h2j7dkdhhmhk9vh33yvfa9x5q998sknr1m3"; - name = "kalarmcal-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kalarmcal-21.08.1.tar.xz"; + sha256 = "1s0yrh0y54rjp4d6y8vcixxrlsdra1xr8j3lxswl2h866p87v7fa"; + name = "kalarmcal-21.08.1.tar.xz"; }; }; kalgebra = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kalgebra-21.04.0.tar.xz"; - sha256 = "1w9vy3130kxw68fnpvzvq2k40dyain0ncsflf24fmn7dzjl4wpxn"; - name = "kalgebra-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kalgebra-21.08.1.tar.xz"; + sha256 = "0a8hmzdslr92v9a8pjf7rnmpf040l9cizzlx8xrxqk2bdb7qls5w"; + name = "kalgebra-21.08.1.tar.xz"; }; }; kalzium = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kalzium-21.04.0.tar.xz"; - sha256 = "0fnqj1xnlgkb5wfx7j2zzbypyyql44srd555bdb1w0q37w1zxxgm"; - name = "kalzium-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kalzium-21.08.1.tar.xz"; + sha256 = "0ijxyzryry1j9gfdmk56dlzyb4iz0v4vmjzjnqkv6sq2lm47lhyp"; + name = "kalzium-21.08.1.tar.xz"; }; }; kamera = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kamera-21.04.0.tar.xz"; - sha256 = "068ic1nf15x4h7h877q7by3hkd5dap9a2kdm7x2jwcqhwriiirw2"; - name = "kamera-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kamera-21.08.1.tar.xz"; + sha256 = "0cmppa8bc9iqbdk0pbnzrj1qqryqmrdgs7hliay3hsl7gjlz9zgy"; + name = "kamera-21.08.1.tar.xz"; }; }; kamoso = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kamoso-21.04.0.tar.xz"; - sha256 = "0npabci0x04g7v56x3pb5ps560d0xdshaznlci05bn3czxdas93h"; - name = "kamoso-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kamoso-21.08.1.tar.xz"; + sha256 = "15nqy97m913f0sdjs15bjivs7hvxghlhlw5579fsnfahg5iz5qp6"; + name = "kamoso-21.08.1.tar.xz"; }; }; kanagram = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kanagram-21.04.0.tar.xz"; - sha256 = "0ccnzrra54hqx7acsaiz8fk5gnax9y4j195hsbix7mghgb5ylz8r"; - name = "kanagram-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kanagram-21.08.1.tar.xz"; + sha256 = "1jqrmgyd2ijqb1sq17r7mijvcix6syys02kyasyilwgibbnlzjz1"; + name = "kanagram-21.08.1.tar.xz"; }; }; kapman = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kapman-21.04.0.tar.xz"; - sha256 = "1i7jr8xlh3v4wz9bbc335q79zx96nfp15hhqnhkgxsqc216zn8qm"; - name = "kapman-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kapman-21.08.1.tar.xz"; + sha256 = "072376xqm4a8fwvslf9grsklvzb50d9f098z4qba1lh3y3ivp7wm"; + name = "kapman-21.08.1.tar.xz"; }; }; kapptemplate = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kapptemplate-21.04.0.tar.xz"; - sha256 = "0l2y562s7rk99zr5vbp03gbv0fwbd211j4n51g3yry7vbk433aiw"; - name = "kapptemplate-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kapptemplate-21.08.1.tar.xz"; + sha256 = "1crll3dr299qpigh2w9psvpi0r4jmb8y0b0facfcfcs6j9ldfbw5"; + name = "kapptemplate-21.08.1.tar.xz"; }; }; kate = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kate-21.04.0.tar.xz"; - sha256 = "1m11fh5c527d6b8a5wmglj9z0d2caak5bqh1g7fql1ygw06wr01p"; - name = "kate-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kate-21.08.1.tar.xz"; + sha256 = "0k9kf8x5gbj5vbnr6lfhizi8122p76xixw480a3zsqi57i4bxk0z"; + name = "kate-21.08.1.tar.xz"; }; }; katomic = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/katomic-21.04.0.tar.xz"; - sha256 = "0hrlmzqnw03nv334q680zwk700c8pvnaw57gh1ixphzsbx871yrk"; - name = "katomic-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/katomic-21.08.1.tar.xz"; + sha256 = "1595swszpw2ia9dh5c6wgrz04qlcvw84l474imkms4gv1cz583pb"; + name = "katomic-21.08.1.tar.xz"; }; }; kbackup = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kbackup-21.04.0.tar.xz"; - sha256 = "1l3bk7dj2grbki41fhxawrwn4vpncf3m2b5bq5ivj4vj4jc6vlyz"; - name = "kbackup-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kbackup-21.08.1.tar.xz"; + sha256 = "04795m0r4icfpv6166ingb82mfai0g6q48f9qvcqn029z0f347ya"; + name = "kbackup-21.08.1.tar.xz"; }; }; kblackbox = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kblackbox-21.04.0.tar.xz"; - sha256 = "17ba03qmyaiqda064dhxl0kwvncll7fznjvnfvby9lgdpzfjj8j9"; - name = "kblackbox-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kblackbox-21.08.1.tar.xz"; + sha256 = "019nd86wmm1m8yz0lsayx37mqyzhx1pa5kbddajf5032dscncymd"; + name = "kblackbox-21.08.1.tar.xz"; }; }; kblocks = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kblocks-21.04.0.tar.xz"; - sha256 = "01i24fizs8d6yvyldln905vnww8ajy3aswn55xhxinjwhx9dcy7n"; - name = "kblocks-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kblocks-21.08.1.tar.xz"; + sha256 = "1grgkikl7zcs58y86kaw6slq7wvqa51g85kvwrysniv6l3yzhvxj"; + name = "kblocks-21.08.1.tar.xz"; }; }; kbounce = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kbounce-21.04.0.tar.xz"; - sha256 = "05wy4my4hil72cmj3p2hf9bshpknyps8xmp0mrbigyrzg505zjj2"; - name = "kbounce-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kbounce-21.08.1.tar.xz"; + sha256 = "18sd3yzz0mj9j666pnkm49ngfzh7aw125a5zyf1k947z6ayv5zix"; + name = "kbounce-21.08.1.tar.xz"; }; }; kbreakout = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kbreakout-21.04.0.tar.xz"; - sha256 = "0084id4wwk31m7wjkl5grcpbyqyzqx6cxixhdy48v7djdnn43jfj"; - name = "kbreakout-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kbreakout-21.08.1.tar.xz"; + sha256 = "0264w926ldfhdx22z1iqk41w5a9gnycff4vdjf0i6rzyws2qsb0g"; + name = "kbreakout-21.08.1.tar.xz"; }; }; kbruch = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kbruch-21.04.0.tar.xz"; - sha256 = "0qygd4zx039qckv4zzkgvz70wm8hg156bmb70g9g0nv5bzh4y02g"; - name = "kbruch-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kbruch-21.08.1.tar.xz"; + sha256 = "1rbkwzca3m93p3z294cwkiyycg0w87r6j37v0zyiq802pwkkpm34"; + name = "kbruch-21.08.1.tar.xz"; }; }; kcachegrind = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kcachegrind-21.04.0.tar.xz"; - sha256 = "1bdlzp35914nvbzcf4n6qrjmg7c0dc7c13kwq9gr5q6i4lvf275r"; - name = "kcachegrind-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kcachegrind-21.08.1.tar.xz"; + sha256 = "09zgilcya7asj2si747snli6h0s7wzgjzkns9f53rwvq06xbp2zv"; + name = "kcachegrind-21.08.1.tar.xz"; }; }; kcalc = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kcalc-21.04.0.tar.xz"; - sha256 = "0x0b19yaif6mjh20lbvl87phna781ya3l9hpwj2941vgvffwwpsh"; - name = "kcalc-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kcalc-21.08.1.tar.xz"; + sha256 = "0si3mp1xbk6gps5fhc9fv1vskx37pgwx72i2x1kcm7azif26nzsk"; + name = "kcalc-21.08.1.tar.xz"; }; }; kcalutils = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kcalutils-21.04.0.tar.xz"; - sha256 = "0kvl8ghwcamxayvwbsyjzib5b19v3k5hch17lj2pjsj20dgfl4qv"; - name = "kcalutils-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kcalutils-21.08.1.tar.xz"; + sha256 = "1xrggb8vv8lrjyhdb9yf2fzs36q766if78hlymgfndj1z37s0m6m"; + name = "kcalutils-21.08.1.tar.xz"; }; }; kcharselect = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kcharselect-21.04.0.tar.xz"; - sha256 = "1gp75qkwphgxpjkc1fwqkrbkkmc45l55ck8mqvbpz4aq8bscc0nx"; - name = "kcharselect-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kcharselect-21.08.1.tar.xz"; + sha256 = "0qbhmyczc13kmbls06732i91s8n6w396dfj1z50z28wrkyqls8zr"; + name = "kcharselect-21.08.1.tar.xz"; }; }; kcolorchooser = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kcolorchooser-21.04.0.tar.xz"; - sha256 = "0cgzclfmcn7l98ycm313sp8fhmx46fbn88l9cykywi27idymmb9v"; - name = "kcolorchooser-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kcolorchooser-21.08.1.tar.xz"; + sha256 = "13zdyksijxflvjb3zaszl6q7wzwz0pxsq8hyi5pb2gb7gryz65h7"; + name = "kcolorchooser-21.08.1.tar.xz"; }; }; kcron = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kcron-21.04.0.tar.xz"; - sha256 = "144y4cn8xpkmn1gsab8wpvhqrnfidcjrbp2cy9xhx18as5ckpjn3"; - name = "kcron-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kcron-21.08.1.tar.xz"; + sha256 = "0c9d3rlml2adk11bp541l1zpbgp3q6mfhb7bpq4alrwlrbd4fxan"; + name = "kcron-21.08.1.tar.xz"; }; }; - kdebugsettings = { - version = "21.04.0"; + kde-dev-scripts = { + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdebugsettings-21.04.0.tar.xz"; - sha256 = "1xpbw9v9ws9i7a6ag5f6z7d15svyyx34p5vibm4p4j70vd7q5rwk"; - name = "kdebugsettings-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kde-dev-scripts-21.08.1.tar.xz"; + sha256 = "1pv0qj7xpvxqgcrjbr9989cax0aan64cbipia4kmlg7kriz5wz6c"; + name = "kde-dev-scripts-21.08.1.tar.xz"; }; }; - kdeconnect-kde = { - version = "21.04.0"; + kde-dev-utils = { + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdeconnect-kde-21.04.0.tar.xz"; - sha256 = "1zbn2hi245934ljxgrzc3s2rpyapwrrkzx5vcjhnf8ri9v6sxhgp"; - name = "kdeconnect-kde-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kde-dev-utils-21.08.1.tar.xz"; + sha256 = "02ksa35xh8vw08pqik7q8v3wax1fcvx2inicm1b2z2c4gq5k766l"; + name = "kde-dev-utils-21.08.1.tar.xz"; }; }; - kde-dev-scripts = { - version = "21.04.0"; + kdebugsettings = { + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kde-dev-scripts-21.04.0.tar.xz"; - sha256 = "0plg145hp3bpxb2x3j8hja6fjn7yzmvx8j7zw123xnmqbzi25f6s"; - name = "kde-dev-scripts-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdebugsettings-21.08.1.tar.xz"; + sha256 = "1fmnmvyzlhczbsxdpnm3bi50pdh2659raizaqbal2yjxcp6rlb90"; + name = "kdebugsettings-21.08.1.tar.xz"; }; }; - kde-dev-utils = { - version = "21.04.0"; + kdeconnect-kde = { + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kde-dev-utils-21.04.0.tar.xz"; - sha256 = "1cgzkhpb81s1zbx4rsfprmjn3cwqykyaaymg4bm7nqwnq97bbmc5"; - name = "kde-dev-utils-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdeconnect-kde-21.08.1.tar.xz"; + sha256 = "01nwzsryxg7kkxb6g4h0lwn6g5zx4k64vizqk4gsvkif8d5zfc33"; + name = "kdeconnect-kde-21.08.1.tar.xz"; }; }; kdeedu-data = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdeedu-data-21.04.0.tar.xz"; - sha256 = "0s4x0n8skwn117iiffi8rp4l5ddizfdqlc9lm49ijlvzkvhz3g3p"; - name = "kdeedu-data-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdeedu-data-21.08.1.tar.xz"; + sha256 = "19hc9mykw8q0krcxmrjq4mhn5dljfrv9pzv38dm80w3yfflj8y65"; + name = "kdeedu-data-21.08.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdegraphics-mobipocket-21.04.0.tar.xz"; - sha256 = "00pxfffc2xb7mszzgq6b3kp1h3m870k81rqarsy2igxxpbr3dr2p"; - name = "kdegraphics-mobipocket-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdegraphics-mobipocket-21.08.1.tar.xz"; + sha256 = "06zpm5d58q10dalm2lm7v7lcjmainn3lmagra6a1f007yshm3i32"; + name = "kdegraphics-mobipocket-21.08.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdegraphics-thumbnailers-21.04.0.tar.xz"; - sha256 = "0yga4pa37zpgawq2hhc5w3scw40fwyp7901vbh6zspbdzya9lb50"; - name = "kdegraphics-thumbnailers-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdegraphics-thumbnailers-21.08.1.tar.xz"; + sha256 = "0hqdxsnv6xgvy2knnhq733hbfgzhr6f4fi63l80saysqvpjyrxly"; + name = "kdegraphics-thumbnailers-21.08.1.tar.xz"; }; }; kdenetwork-filesharing = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdenetwork-filesharing-21.04.0.tar.xz"; - sha256 = "07a9pflvjf7ffi9jqx43f43wykl7z92z3pr1ca9q36fxw7cdixad"; - name = "kdenetwork-filesharing-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdenetwork-filesharing-21.08.1.tar.xz"; + sha256 = "1q5wisy6gz94lbf3dnmxp3rq0c5b1laajph8lnlm9dhfxxmrkacf"; + name = "kdenetwork-filesharing-21.08.1.tar.xz"; }; }; kdenlive = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdenlive-21.04.0.tar.xz"; - sha256 = "1psb7mvffiqnv5n4b0wwa6s2ykcfkc4dxsvbxh2k67gmvq58zgmh"; - name = "kdenlive-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdenlive-21.08.1.tar.xz"; + sha256 = "0gjv1fm07f1qckpmlvia58myg9si9z46nwxiz1lcca5mx5k7rpcz"; + name = "kdenlive-21.08.1.tar.xz"; }; }; kdepim-addons = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdepim-addons-21.04.0.tar.xz"; - sha256 = "02xlp9xm15462y02wz05kn5vkg11lkiblz0cx43i8rcyiqnxbldz"; - name = "kdepim-addons-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdepim-addons-21.08.1.tar.xz"; + sha256 = "08vpjcqnjh99bbmwp3h64anp53zafifblqy2f7bqkvwifmlrqvz8"; + name = "kdepim-addons-21.08.1.tar.xz"; }; }; kdepim-runtime = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdepim-runtime-21.04.0.tar.xz"; - sha256 = "1m1fshyivm1mz4hj9qaq33wdjkqxpjjbr0rkscb2b56a6jg4glza"; - name = "kdepim-runtime-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdepim-runtime-21.08.1.tar.xz"; + sha256 = "0ai6v5sysh5pzwpvbhjzi1fvfp608abpndh9nhnm7b87hca73vm9"; + name = "kdepim-runtime-21.08.1.tar.xz"; }; }; kdesdk-kioslaves = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdesdk-kioslaves-21.04.0.tar.xz"; - sha256 = "068hqm1f2wllq3gcpmsib8cky6fhgpmqvmzvymcfc19ccyzwayhf"; - name = "kdesdk-kioslaves-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdesdk-kioslaves-21.08.1.tar.xz"; + sha256 = "0cz2cmcgksfkgl2nh0nnyz38q3rp1dfwhnajgcif5q0ka528v33w"; + name = "kdesdk-kioslaves-21.08.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdesdk-thumbnailers-21.04.0.tar.xz"; - sha256 = "0cj6xsazqv94l02bp1pr5kny5id0kr5kqv3xkwv4jvmq317vfi3i"; - name = "kdesdk-thumbnailers-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdesdk-thumbnailers-21.08.1.tar.xz"; + sha256 = "1cvh2p3vfzbqbr9cfa1bchgflmp9mi12qx1j6j1jdaqqwhz43kj6"; + name = "kdesdk-thumbnailers-21.08.1.tar.xz"; }; }; kdf = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdf-21.04.0.tar.xz"; - sha256 = "1vbc75z33gx8pvy0kbmrhcg209qxxnvw7ccw83wk9hhzqg7mj5gf"; - name = "kdf-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdf-21.08.1.tar.xz"; + sha256 = "1xmn7dhbnj9bhaw545ry0qwayxh3jhpgx9xa2fjcc0dhn8yx1spv"; + name = "kdf-21.08.1.tar.xz"; }; }; kdialog = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdialog-21.04.0.tar.xz"; - sha256 = "0damdppa2hm18nd99nzx23nac3k5ps0f5kc04cgfip4cr34rpg5s"; - name = "kdialog-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdialog-21.08.1.tar.xz"; + sha256 = "1mxmj5cm5h1dhqkblcqdc7ba9x04sqj6gp0b12gii7jsz3g0pa94"; + name = "kdialog-21.08.1.tar.xz"; }; }; kdiamond = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kdiamond-21.04.0.tar.xz"; - sha256 = "1lpwghy8v4242rm2vzm3wng43h5ys6r7spzlv53h329kpzd2259v"; - name = "kdiamond-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kdiamond-21.08.1.tar.xz"; + sha256 = "0l8z71k0a300yp03mkpabi3a9xydky6x19sk7xhq727canrb3nwz"; + name = "kdiamond-21.08.1.tar.xz"; }; }; keditbookmarks = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/keditbookmarks-21.04.0.tar.xz"; - sha256 = "1adk2g9hg7mls2vrrslmmy0nfvpgri9jlmii4pqfwl9kilcnk7lc"; - name = "keditbookmarks-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/keditbookmarks-21.08.1.tar.xz"; + sha256 = "0j9m5l3llb969ras4bvsswahqqpwrv1zscjpdscchk72vxi2ky4w"; + name = "keditbookmarks-21.08.1.tar.xz"; }; }; kfind = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kfind-21.04.0.tar.xz"; - sha256 = "1122h7jmsf49j7388py6pp72gfkqqzv971n7dkzpyqhfirqaigvj"; - name = "kfind-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kfind-21.08.1.tar.xz"; + sha256 = "0d3milbrznwls197a5bjrdwarpdly4pyask7j97ia7nx0z91k35f"; + name = "kfind-21.08.1.tar.xz"; }; }; kfloppy = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kfloppy-21.04.0.tar.xz"; - sha256 = "19maj0a469wnyindbrmqby8qikxcz38czagfygpq16y9bnkbvp3s"; - name = "kfloppy-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kfloppy-21.08.1.tar.xz"; + sha256 = "1nxkjaarvr7fq494hb4pk6nf9731f74zsxhfia3lzb2qf3rnxhvg"; + name = "kfloppy-21.08.1.tar.xz"; }; }; kfourinline = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kfourinline-21.04.0.tar.xz"; - sha256 = "0yna3lydp0gii1rasij5593gaf4w9pbv7y5l6hz5qddb5y6r82ds"; - name = "kfourinline-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kfourinline-21.08.1.tar.xz"; + sha256 = "0niwvc1fxvxk5xi90n753y7gjhljrnm3jjzxgjxs9ca5y1c7jcac"; + name = "kfourinline-21.08.1.tar.xz"; }; }; kgeography = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kgeography-21.04.0.tar.xz"; - sha256 = "1hcjp34jzz9qx8jp065gisnr9gn1v1ifnajfnaa3vc6sq1m1bvvi"; - name = "kgeography-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kgeography-21.08.1.tar.xz"; + sha256 = "0wqblfs4h8pr0c3m9qv5xpz1sq1zxxbbgv42d0m12fhlbmhx0l64"; + name = "kgeography-21.08.1.tar.xz"; }; }; kget = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kget-21.04.0.tar.xz"; - sha256 = "0lws94g3780kdnxw2wf8vl41fq8ffxwaafma3r7p15rs05cyl1rv"; - name = "kget-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kget-21.08.1.tar.xz"; + sha256 = "06lng1sr1l5a7qcbld7xn97vlaxnq4f98sai2llmjkyna3awzi6r"; + name = "kget-21.08.1.tar.xz"; }; }; kgoldrunner = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kgoldrunner-21.04.0.tar.xz"; - sha256 = "02gldv7l8igzzmmyrkyixgzncsh0ysmfhx0lfc27pdj0mvfpm3m2"; - name = "kgoldrunner-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kgoldrunner-21.08.1.tar.xz"; + sha256 = "1dggs4fbfqc7q97j8fpi2v6q52165yikaps15mracn319c8mbx85"; + name = "kgoldrunner-21.08.1.tar.xz"; }; }; kgpg = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kgpg-21.04.0.tar.xz"; - sha256 = "0a5xik5wb0b15p612lxzwqr5b58d4d7v3c7ghxmm8g27k36igqff"; - name = "kgpg-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kgpg-21.08.1.tar.xz"; + sha256 = "0q4k7ahh1qr4fnkw4na5kyp4kq922a45hjgz9qzh7whn6zqrhsxs"; + name = "kgpg-21.08.1.tar.xz"; }; }; khangman = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/khangman-21.04.0.tar.xz"; - sha256 = "0pkqhbvw375v3cwn7ilfn7x93nadnxl07swcj5dbxn84gs33aj7c"; - name = "khangman-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/khangman-21.08.1.tar.xz"; + sha256 = "1jv7vbk4za17l73b10xx1ckv56qhsvlf2irlys917bk39jhxmwpp"; + name = "khangman-21.08.1.tar.xz"; }; }; khelpcenter = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/khelpcenter-21.04.0.tar.xz"; - sha256 = "04fvipc3dzjl2fsgbla8w7kmv239ch86da8539gwg7l54bdmb5pv"; - name = "khelpcenter-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/khelpcenter-21.08.1.tar.xz"; + sha256 = "09ayg8kb4b4v30xjm8ca5csw1axipn1336mq2sfqra5qwkj8d93y"; + name = "khelpcenter-21.08.1.tar.xz"; }; }; kidentitymanagement = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kidentitymanagement-21.04.0.tar.xz"; - sha256 = "1y83k7lzyzc5r6f7pqkbzqm1xnjv0z11vg8yazqwmfcv1whbzxda"; - name = "kidentitymanagement-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kidentitymanagement-21.08.1.tar.xz"; + sha256 = "0xhkz33w0z9jlxlqb06w5fiyj1qz2mjssrbba2kdm55q67lj1b76"; + name = "kidentitymanagement-21.08.1.tar.xz"; }; }; kig = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kig-21.04.0.tar.xz"; - sha256 = "0d4p7py3lf05dsfy9x98aq6fwk6fsvf97jwxsdz4z3r49qvcp3hp"; - name = "kig-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kig-21.08.1.tar.xz"; + sha256 = "0gvp07mnkpfamdq78bv2r1m84l4xp23qh2i6iscdhjdh05dzyl6s"; + name = "kig-21.08.1.tar.xz"; }; }; kigo = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kigo-21.04.0.tar.xz"; - sha256 = "0ans0mj9ql6vdmnc130sw0wkkm8rc1bpiww36a76nw8n28cfcyzi"; - name = "kigo-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kigo-21.08.1.tar.xz"; + sha256 = "1y7fh9acng4a135bz7skg7hgmyisaxgwli4ddv7y5h3r1rlhfd47"; + name = "kigo-21.08.1.tar.xz"; }; }; killbots = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/killbots-21.04.0.tar.xz"; - sha256 = "1qf2lahvi5g9cgvbgp6sj9vw1g8fcvcwaxgaqnc5akl03p51gz2k"; - name = "killbots-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/killbots-21.08.1.tar.xz"; + sha256 = "02rh60ww43r3zqv3v7zs42j7nl8b5373mykbql80amxnbj5965mn"; + name = "killbots-21.08.1.tar.xz"; }; }; kimagemapeditor = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kimagemapeditor-21.04.0.tar.xz"; - sha256 = "1f3y10bk5541sgi2qfww56mfq245a9wg38vpw2c8ygf4lc5rh67s"; - name = "kimagemapeditor-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kimagemapeditor-21.08.1.tar.xz"; + sha256 = "1mrf0k923gwy4cfh7g5yv0nnm4kx0j0yk9sz051sbvvbm4hbxqjg"; + name = "kimagemapeditor-21.08.1.tar.xz"; }; }; kimap = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kimap-21.04.0.tar.xz"; - sha256 = "0fbcwsiz1q5s9d70zn7y183p477ykyjpw27i3k2mxb9ggk0h8bnx"; - name = "kimap-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kimap-21.08.1.tar.xz"; + sha256 = "19b8awcbrn61dwqli10v883i8s18sjz8w335c2sxlhzqgdijgxhl"; + name = "kimap-21.08.1.tar.xz"; }; }; kio-extras = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kio-extras-21.04.0.tar.xz"; - sha256 = "1p5kd5c4p5yc9fmppa6sivgv5kn1l9krzzw5h5y8xmi9g896yjjg"; - name = "kio-extras-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kio-extras-21.08.1.tar.xz"; + sha256 = "0wlgd0cc56gzicgi16nx4592i6f6594d1mvz7d0266xrwmm8n688"; + name = "kio-extras-21.08.1.tar.xz"; }; }; kio-gdrive = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kio-gdrive-21.04.0.tar.xz"; - sha256 = "0p1y30syzbj7lg8hpxb5r255ba0v93gc219r1v7gb1ja5p7pjvsh"; - name = "kio-gdrive-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kio-gdrive-21.08.1.tar.xz"; + sha256 = "1vqm8b819hg1yfjlz1x3yis9qkbclahp7l00cpqbxnra0ph9b1vw"; + name = "kio-gdrive-21.08.1.tar.xz"; }; }; kipi-plugins = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kipi-plugins-21.04.0.tar.xz"; - sha256 = "1x26yw1f47pylly2211kdld17m0p42a5miygwc7rnvasvh0dngwf"; - name = "kipi-plugins-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kipi-plugins-21.08.1.tar.xz"; + sha256 = "1w6sw3wn0nj15jv6qp0yg7psg1m87b3izgn303z74vzkhqw04pid"; + name = "kipi-plugins-21.08.1.tar.xz"; }; }; kirigami-gallery = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kirigami-gallery-21.04.0.tar.xz"; - sha256 = "04hq0hikx692glb83xs8fg97dv53ayzd8lp776zv4p3sd6dpaysf"; - name = "kirigami-gallery-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kirigami-gallery-21.08.1.tar.xz"; + sha256 = "0db1a5czq0xg0dhhmphds5vrz2lq771zwmps7gq6ahpfj01vyavd"; + name = "kirigami-gallery-21.08.1.tar.xz"; }; }; kiriki = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kiriki-21.04.0.tar.xz"; - sha256 = "0dlimwhw6ii9x4m7166hbl3n6zi5pcvbsg303jm8pjc2bj83izis"; - name = "kiriki-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kiriki-21.08.1.tar.xz"; + sha256 = "0x7iq3y2jc4wykgcyrgm8gmrkvlhs8gsxdl0495n1x1invsnmj00"; + name = "kiriki-21.08.1.tar.xz"; }; }; kiten = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kiten-21.04.0.tar.xz"; - sha256 = "0vvq75q7j4j2hzzwnsr5zafphqvhwggb0mbs6y1ccb6yfm5vy3a4"; - name = "kiten-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kiten-21.08.1.tar.xz"; + sha256 = "1skyfw5bshy6z8xvhs5q9f3c8nwqbm4mc74jcs6yhzc3i4mp82n3"; + name = "kiten-21.08.1.tar.xz"; }; }; kitinerary = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kitinerary-21.04.0.tar.xz"; - sha256 = "0sxzc2c0i1qjn5302a3cg7inx020r3n1pzjif6bhw4phynbzxliy"; - name = "kitinerary-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kitinerary-21.08.1.tar.xz"; + sha256 = "0r7mrcs7gh9ffscksvkh5v78dr2y1nh26p8r8ginafachg32p0mi"; + name = "kitinerary-21.08.1.tar.xz"; }; }; kjumpingcube = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kjumpingcube-21.04.0.tar.xz"; - sha256 = "12khypxl87725zs5ykwcp1ag27v5q89n9cvn879d6lp7qqs7mjx8"; - name = "kjumpingcube-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kjumpingcube-21.08.1.tar.xz"; + sha256 = "1kh3jqp3m96lal6salcrqhgzg1pbacx20xn41c1jy272ch57r2jj"; + name = "kjumpingcube-21.08.1.tar.xz"; }; }; kldap = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kldap-21.04.0.tar.xz"; - sha256 = "1mqqpzqpz0hlldb0nz3dnm33d1hwpxcwj9hdqik5bzbfnr7ww04g"; - name = "kldap-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kldap-21.08.1.tar.xz"; + sha256 = "1m92kd6mrz3dxap6rzw0r85wij030a60n10hkgkjkxb8npgvl14g"; + name = "kldap-21.08.1.tar.xz"; }; }; kleopatra = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kleopatra-21.04.0.tar.xz"; - sha256 = "0w58nsklvc63ps0m92knf0n2wkmksq432ckx1959klimgqacffy0"; - name = "kleopatra-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kleopatra-21.08.1.tar.xz"; + sha256 = "1j1jd8ivcw2r2nlzzhr24kxcvfp5q1206gpkchd5mvsl6q34fmzx"; + name = "kleopatra-21.08.1.tar.xz"; }; }; klettres = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/klettres-21.04.0.tar.xz"; - sha256 = "1kxyisvmpgf4m5qzi7w6lfmnnpp96f4v72pls5k68q01ygf7mlrg"; - name = "klettres-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/klettres-21.08.1.tar.xz"; + sha256 = "0scgccwsma1hc1zp52h4rqddwizsqzwsh6gql5lf4qxhr8ihgj4m"; + name = "klettres-21.08.1.tar.xz"; }; }; klickety = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/klickety-21.04.0.tar.xz"; - sha256 = "0jiaxfzvdbygmfd6d0bsakzsvzkjvlhhidjz1wmvxq0jla4qna6b"; - name = "klickety-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/klickety-21.08.1.tar.xz"; + sha256 = "0r8dr4blwv1l6b8585qw7q258qr9pgk97pmrfmpssb90yxni2c1c"; + name = "klickety-21.08.1.tar.xz"; }; }; klines = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/klines-21.04.0.tar.xz"; - sha256 = "1ay26by2hwn7b0i48xgsxdysqpwzkvsz6g974c93103f5ygn8wjl"; - name = "klines-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/klines-21.08.1.tar.xz"; + sha256 = "1iyk91spsnfrkbjyf6jng6rgximcav2zf2xqkq1q2vvyhwwpchn6"; + name = "klines-21.08.1.tar.xz"; }; }; kmag = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kmag-21.04.0.tar.xz"; - sha256 = "06yw7397v5wcdx4jxpyc2mxgbxr744wgnqm7w2xb4771izlwq3qy"; - name = "kmag-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kmag-21.08.1.tar.xz"; + sha256 = "1hdjcya1jv6adz0d9hp1sq7y8f6fvzpw30fchmjkdm9y2kf8il6c"; + name = "kmag-21.08.1.tar.xz"; }; }; kmahjongg = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kmahjongg-21.04.0.tar.xz"; - sha256 = "0w4fpnafn9vir8c6ha6kl1x8vbmvmjax0p1qzxa7596hf3lvcncq"; - name = "kmahjongg-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kmahjongg-21.08.1.tar.xz"; + sha256 = "1wrzyiv07cffn5xiachqa8k9spcsi3iwvdj6prgbgdndbffw2gim"; + name = "kmahjongg-21.08.1.tar.xz"; }; }; kmail = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kmail-21.04.0.tar.xz"; - sha256 = "11ghi1bqc8ldsb04z7fs5ba9b9fvsmcxxjp8j837iv0qz5rwh0fw"; - name = "kmail-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kmail-21.08.1.tar.xz"; + sha256 = "08q7c8l2nfrvw5xgc2dzcmidcpsjfya3jjnssziy3hpznmf8jpjr"; + name = "kmail-21.08.1.tar.xz"; }; }; kmail-account-wizard = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kmail-account-wizard-21.04.0.tar.xz"; - sha256 = "0jalwjk5jyih765i7cpa0qidw3di17cz1fygmzgdz1v6kasg3h0c"; - name = "kmail-account-wizard-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kmail-account-wizard-21.08.1.tar.xz"; + sha256 = "1xqm4737p5l5cwqlnn7xladz4yna7aghl84hlbvzrfcc72v5xkal"; + name = "kmail-account-wizard-21.08.1.tar.xz"; }; }; kmailtransport = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kmailtransport-21.04.0.tar.xz"; - sha256 = "1jgw93q8jpgkg8ms7pjral1wz1ycs12ikjnsw2fiybd67syd2dns"; - name = "kmailtransport-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kmailtransport-21.08.1.tar.xz"; + sha256 = "0zd03s4848n3g1w8fm0q3kq5sy91zhjw3hc2w6ncv6cgbb9s50dv"; + name = "kmailtransport-21.08.1.tar.xz"; }; }; kmbox = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kmbox-21.04.0.tar.xz"; - sha256 = "01p1ihr08dnmzsq22ipy06grnz59nxyc2vfqbh6hc949mhl3kwx4"; - name = "kmbox-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kmbox-21.08.1.tar.xz"; + sha256 = "027x76lrjssrhqpr651fyqqkdv6jmiad901cssv7w54r2dpzs6w3"; + name = "kmbox-21.08.1.tar.xz"; }; }; kmime = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kmime-21.04.0.tar.xz"; - sha256 = "096vbbr8qnwcws7c6llxwk0klbfrhh4k83384bkhw5m5xawnqaq4"; - name = "kmime-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kmime-21.08.1.tar.xz"; + sha256 = "0prsmiv0g6icclhv7mkha66pddmdqz2mi69njz0xwz6m3ax068jw"; + name = "kmime-21.08.1.tar.xz"; }; }; kmines = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kmines-21.04.0.tar.xz"; - sha256 = "08dynl219n0jd58i01ccmgphc03z2x143l0a8v11x0m5cfazvzpp"; - name = "kmines-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kmines-21.08.1.tar.xz"; + sha256 = "0nx07cghq20rja8rncrayx87v357s036whdfyzc6qkhdmlmkh6qj"; + name = "kmines-21.08.1.tar.xz"; }; }; kmix = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kmix-21.04.0.tar.xz"; - sha256 = "1s2cnbmpkchp1wc5217r17ramj7a8xrm4l9hb74lyw4fc78455z2"; - name = "kmix-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kmix-21.08.1.tar.xz"; + sha256 = "0jc0b1j32gg7az0z7m1cvfdjrwss4q91hm1cfhrk5fq12620vivf"; + name = "kmix-21.08.1.tar.xz"; }; }; kmousetool = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kmousetool-21.04.0.tar.xz"; - sha256 = "0iaqgflnyl62ynxcip8zbxm25hgr82yc9d3z5v36mv0q3lq4bi92"; - name = "kmousetool-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kmousetool-21.08.1.tar.xz"; + sha256 = "04a5zrxg48svrvdf8gf3qc7cj7cayzhw0q4l1v8nzs2ykc330xq1"; + name = "kmousetool-21.08.1.tar.xz"; }; }; kmouth = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kmouth-21.04.0.tar.xz"; - sha256 = "0sza7arw0nfga6g9fv7rbkgkxmn694awzhkjbklafdvcjyn3dw2v"; - name = "kmouth-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kmouth-21.08.1.tar.xz"; + sha256 = "1rmqppmjjcrc7xp63csdgp440f003nia6hcnixxlya8pwn90bpwr"; + name = "kmouth-21.08.1.tar.xz"; }; }; kmplot = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kmplot-21.04.0.tar.xz"; - sha256 = "1wpz5kb06ym920ghmrfb0jh6z4nadlb7d9z0l85vkm3y1rz0iisy"; - name = "kmplot-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kmplot-21.08.1.tar.xz"; + sha256 = "0mkcrdg0v98hdy5lgkyfv4x019w4sm7yiyfpryhx1wiqcpibxwl1"; + name = "kmplot-21.08.1.tar.xz"; }; }; knavalbattle = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/knavalbattle-21.04.0.tar.xz"; - sha256 = "0xn7mkmcr4p6c8kdcdxk7k9ifv12l0fflg2nkgmr1gbjxkpyy435"; - name = "knavalbattle-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/knavalbattle-21.08.1.tar.xz"; + sha256 = "1lvq223jspc5y0z6qaf648m85a58yp88b0jm8510p77ymxhyvgm7"; + name = "knavalbattle-21.08.1.tar.xz"; }; }; knetwalk = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/knetwalk-21.04.0.tar.xz"; - sha256 = "127s5fgjpcndgbg30wd9sv3jrskq7ib4rnrw5qdfsxv8c77kv74m"; - name = "knetwalk-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/knetwalk-21.08.1.tar.xz"; + sha256 = "1akv78yaym474b57d9qxqp3vivs405m1zm6x0plf2g1adp93myz2"; + name = "knetwalk-21.08.1.tar.xz"; }; }; knights = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/knights-21.04.0.tar.xz"; - sha256 = "09w3qqvp5k8z3bfwz6zlclagn11j1nar0bp2sgnjmi9cy2rs74n3"; - name = "knights-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/knights-21.08.1.tar.xz"; + sha256 = "1m00nryw69k4dyb0vvnjz3fwasf67ghkq78l7k8ck9vvzrihmwd1"; + name = "knights-21.08.1.tar.xz"; }; }; knotes = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/knotes-21.04.0.tar.xz"; - sha256 = "0zy10amznrkbj663h0b5a410ry65kh1sw2k9ra43zx45bpamh62q"; - name = "knotes-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/knotes-21.08.1.tar.xz"; + sha256 = "1av537f02zsz72mqkzlcrv977kf96nrdwsj4fx7kmdbhf5x9rvgv"; + name = "knotes-21.08.1.tar.xz"; }; }; kolf = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kolf-21.04.0.tar.xz"; - sha256 = "0220b4mbphb7c7p3szhi976dx8ln0f64ghika7b9x2cmdxcizfcq"; - name = "kolf-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kolf-21.08.1.tar.xz"; + sha256 = "15wk2c2pzpg39hv6s1b80mf5l7gkbxlprahjq6wh6f6a5hm3wkxb"; + name = "kolf-21.08.1.tar.xz"; }; }; kollision = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kollision-21.04.0.tar.xz"; - sha256 = "0cfn7l4ccl26rqm9i8rqp07yx6jc12xqhm16pgamrf8qv40vch9f"; - name = "kollision-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kollision-21.08.1.tar.xz"; + sha256 = "15ddxccj29094lxrihchc17x2a2xnjk790dqhfja9d235vkg3lpb"; + name = "kollision-21.08.1.tar.xz"; }; }; kolourpaint = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kolourpaint-21.04.0.tar.xz"; - sha256 = "0xp1kas6hk279aqm5g36qlsylpd43p9pv6vdk2dy4cilds4fc3vw"; - name = "kolourpaint-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kolourpaint-21.08.1.tar.xz"; + sha256 = "0vjssni7c8dx1617gsnkp8dip92agys8n1ydzdly6jpwhvlr382a"; + name = "kolourpaint-21.08.1.tar.xz"; }; }; kompare = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kompare-21.04.0.tar.xz"; - sha256 = "17p1i4gfgzbps60zq3svicp6yz6w33wvcp145lq1iqkj80pf5qyf"; - name = "kompare-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kompare-21.08.1.tar.xz"; + sha256 = "0sigh2c91ff7r6yclx18lcwqbwh4gbj55n5fjpd1fw9rb7xf9j3n"; + name = "kompare-21.08.1.tar.xz"; }; }; konqueror = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/konqueror-21.04.0.tar.xz"; - sha256 = "04mli5dv05v7fin58zrhm7jmddj8qa2qz7w3qdbjd3a4iz7y7z71"; - name = "konqueror-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/konqueror-21.08.1.tar.xz"; + sha256 = "155dc8nd3kgr25wpjisnp9z2jr1f31vcnm8ywa98p4i59kaaxh7h"; + name = "konqueror-21.08.1.tar.xz"; }; }; konquest = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/konquest-21.04.0.tar.xz"; - sha256 = "1ryh7d3ndvrw8vjaraxyzyw08sx9w4yny7hdj1ss7319y041a07s"; - name = "konquest-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/konquest-21.08.1.tar.xz"; + sha256 = "0i0pm5zq2ipm1ipsam19c771v16bxlhilidny336rzwfa1vik0zl"; + name = "konquest-21.08.1.tar.xz"; }; }; konsole = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/konsole-21.04.0.tar.xz"; - sha256 = "1dlr0w77sccibhp37xi49bi6g4679fymgziznqxjvhk5l141f2i6"; - name = "konsole-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/konsole-21.08.1.tar.xz"; + sha256 = "0v74yrblwakbmy0p4x5j9lhmqyavgsffahr51bh5r5qcgx0cafjv"; + name = "konsole-21.08.1.tar.xz"; }; }; kontact = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kontact-21.04.0.tar.xz"; - sha256 = "08d1837kkcqc8gp9hmd351yymjdl31vg6nk1vcrlb7xsndqcsb79"; - name = "kontact-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kontact-21.08.1.tar.xz"; + sha256 = "1aqyrkmc7hnzja1spm75ybrb9c3yg37rklcgdr7myyyhjxmvnrzg"; + name = "kontact-21.08.1.tar.xz"; }; }; kontactinterface = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kontactinterface-21.04.0.tar.xz"; - sha256 = "1h4v7jz4d5nl23fyjz946qszmidvdkayhsb1ffzk53bv8wpjh76m"; - name = "kontactinterface-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kontactinterface-21.08.1.tar.xz"; + sha256 = "1l251rw80c329sgrv25r8cn242v0kl7pvcfv9xkakql7dw707xs9"; + name = "kontactinterface-21.08.1.tar.xz"; }; }; kontrast = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kontrast-21.04.0.tar.xz"; - sha256 = "1bjkmhal9prizv1dlz8gdlki096a8d09bwksc0xxq3kml1r5gmfm"; - name = "kontrast-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kontrast-21.08.1.tar.xz"; + sha256 = "05nw7z05maxpcr37andv60fn9s8kprz474bkza980ah05xzvkkvb"; + name = "kontrast-21.08.1.tar.xz"; }; }; konversation = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/konversation-21.04.0.tar.xz"; - sha256 = "1fq4w0awg2xj6f7ivvpqrcch68ss01vnh0diwagryhrb0g0a37n7"; - name = "konversation-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/konversation-21.08.1.tar.xz"; + sha256 = "0v3nvyjc13jav8x9krg9sd9p533j7ndan0fqb5p0virwk1dznvfy"; + name = "konversation-21.08.1.tar.xz"; }; }; kopeninghours = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kopeninghours-21.04.0.tar.xz"; - sha256 = "11gkri2sk1dz4hndpid4c84pxkdzc1fdpzw8h2x0141njl62421c"; - name = "kopeninghours-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kopeninghours-21.08.1.tar.xz"; + sha256 = "09yskjfkr190vkp8xgj2hicfyg1mx9mqm7pgn4133qfn08xh52vd"; + name = "kopeninghours-21.08.1.tar.xz"; }; }; kopete = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kopete-21.04.0.tar.xz"; - sha256 = "14ypdl4xy4izg14nbdczif5i8q5kjly5gnyz032iy0cgnkarhi4q"; - name = "kopete-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kopete-21.08.1.tar.xz"; + sha256 = "131nic6w1bzc0l94b8jkzac2dckaz64y2fgplyiqjidicm0cyrd1"; + name = "kopete-21.08.1.tar.xz"; }; }; korganizer = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/korganizer-21.04.0.tar.xz"; - sha256 = "0znbwnzn35q4fdlj9n7hdqvq9rz3g8dyan9v1z9rh11cmdn4pc6h"; - name = "korganizer-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/korganizer-21.08.1.tar.xz"; + sha256 = "0x05i3c0nj46bnnd7msz1rpghbr2p6sywfsa15d6l1j72i2ay0vr"; + name = "korganizer-21.08.1.tar.xz"; }; }; kosmindoormap = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kosmindoormap-21.04.0.tar.xz"; - sha256 = "1c31f7b79xq9sxmfqxfs3082yrbqwkmw02brja8dg1h2avn0r3cy"; - name = "kosmindoormap-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kosmindoormap-21.08.1.tar.xz"; + sha256 = "1v31cik859b994xka37z0l86nd0crykbsnafyxpmqdzf942ixixb"; + name = "kosmindoormap-21.08.1.tar.xz"; }; }; kpat = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kpat-21.04.0.tar.xz"; - sha256 = "043apdv55kc8d2dih65vb4fkwmaqybz167z0g5nfrrg0ilnqhifn"; - name = "kpat-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kpat-21.08.1.tar.xz"; + sha256 = "1dxihma5mad2kbg7wzfbnaq3gmgwav70rqrj5fpji42pvlqx4vyn"; + name = "kpat-21.08.1.tar.xz"; }; }; kpimtextedit = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kpimtextedit-21.04.0.tar.xz"; - sha256 = "1acj6w164xg3v1svzlf4qa10kkzbhlnzrl4cp0brak81gal7bnrp"; - name = "kpimtextedit-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kpimtextedit-21.08.1.tar.xz"; + sha256 = "1zaavf0gpaibk22fz8ij0fqrlp18lj07hgdg6ynhdmhamw59sfr5"; + name = "kpimtextedit-21.08.1.tar.xz"; }; }; kpkpass = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kpkpass-21.04.0.tar.xz"; - sha256 = "0s1f9j3n3ki71kzi8zw95q4v8y3dcgi5cnpq5rk03qb69yqf45xi"; - name = "kpkpass-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kpkpass-21.08.1.tar.xz"; + sha256 = "0z8dk548awy37iq8zz41x2wm2i9bhpfa2g0ghlwvhj7sy97ap1vk"; + name = "kpkpass-21.08.1.tar.xz"; }; }; kpmcore = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kpmcore-21.04.0.tar.xz"; - sha256 = "0cb71d0w2jhbpm0da9rzn484930c022gxn2m4y9bgimaz0cgzcp7"; - name = "kpmcore-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kpmcore-21.08.1.tar.xz"; + sha256 = "1aw21x70kgm1dmhqr384k6rbsd1fx70zd94i0slq5zyf37zx6b9l"; + name = "kpmcore-21.08.1.tar.xz"; }; }; kpublictransport = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kpublictransport-21.04.0.tar.xz"; - sha256 = "18zmsq9585d8sx6qvcfw6wb183nzga9l0b6mm06cl89bwpr2bdbb"; - name = "kpublictransport-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kpublictransport-21.08.1.tar.xz"; + sha256 = "1dbbsdrzhqaiz6d4hlyy1f50m6hi0arafxrxr65gh9h4zs2ym4qs"; + name = "kpublictransport-21.08.1.tar.xz"; }; }; kqtquickcharts = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kqtquickcharts-21.04.0.tar.xz"; - sha256 = "09lw31sx93gw3s6hmwi0xaxyjnfx2nhij8iayam1sg644vx9a7ws"; - name = "kqtquickcharts-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kqtquickcharts-21.08.1.tar.xz"; + sha256 = "0ghmxzy3jqzy3zdpp5zhjv3mcq6micnnk1jhnlq03v4z981rrs6h"; + name = "kqtquickcharts-21.08.1.tar.xz"; }; }; krdc = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/krdc-21.04.0.tar.xz"; - sha256 = "08iqydss6lyc6823762fq1p5c1hs7hv2crwv609gw97cvxvc8ww1"; - name = "krdc-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/krdc-21.08.1.tar.xz"; + sha256 = "038m7wgpg33sqqqq7iy4rvficsi7x2012rimxb1gn2azg5kcwk6v"; + name = "krdc-21.08.1.tar.xz"; }; }; kreversi = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kreversi-21.04.0.tar.xz"; - sha256 = "02zk0bwjmhgpk7fbvzwxap0xda2vxfyfjy38zagm5wgpgd4acsj4"; - name = "kreversi-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kreversi-21.08.1.tar.xz"; + sha256 = "1gh7zhqzyh2m34v3gyb902c6cvw33rbib5g8p3dwsmm5v2bfgggj"; + name = "kreversi-21.08.1.tar.xz"; }; }; krfb = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/krfb-21.04.0.tar.xz"; - sha256 = "0vjf10fg8nqbc7dr19i1hlqpgi1z2bcm1zrpf2rs85fi4pxrw7lg"; - name = "krfb-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/krfb-21.08.1.tar.xz"; + sha256 = "0l28l9wmfxf6vihxr86pwxj027fkz0k0pwkif8had0s4swc9jfnx"; + name = "krfb-21.08.1.tar.xz"; }; }; kross-interpreters = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kross-interpreters-21.04.0.tar.xz"; - sha256 = "1203gmm6pcv37k2m3yah1qgazja8qxkn18dqxmnw7fj3903mqxjw"; - name = "kross-interpreters-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kross-interpreters-21.08.1.tar.xz"; + sha256 = "1fznrng6mz9s8ynzr48p05n6akkmzn3fifbgpxs98nhzlz2ay574"; + name = "kross-interpreters-21.08.1.tar.xz"; }; }; kruler = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kruler-21.04.0.tar.xz"; - sha256 = "0yrpkb755g2xy329336dl9yarl6dhcj5cwgv1sy75w1k3gibsz5y"; - name = "kruler-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kruler-21.08.1.tar.xz"; + sha256 = "0l78hk7zjwjxba094gjvajh32v4avdc80h5r0rv94k2r3gckfjv4"; + name = "kruler-21.08.1.tar.xz"; }; }; kshisen = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kshisen-21.04.0.tar.xz"; - sha256 = "087vynb6gr3l2291nvxcdk27ib10063fyhhxa7ibvfw68j612fri"; - name = "kshisen-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kshisen-21.08.1.tar.xz"; + sha256 = "107y828nkdzza5hi68pxxk5gp017dy2yxdmmhmg6ylppk5gfp6dp"; + name = "kshisen-21.08.1.tar.xz"; }; }; ksirk = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ksirk-21.04.0.tar.xz"; - sha256 = "1qrgkzgm7vnjz6mk7gqkxkx6i7p1dfnlw8fhxa6h1ihvgfmxr6kr"; - name = "ksirk-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ksirk-21.08.1.tar.xz"; + sha256 = "0l6bfpima9whgfdkbghhfh36p6kjs8j26gz5zc7r8fcswv66ya21"; + name = "ksirk-21.08.1.tar.xz"; }; }; ksmtp = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ksmtp-21.04.0.tar.xz"; - sha256 = "0mn4ciyg0c8rxbcc3d99slm03jbca7b6gaplh8zz54p2krf86my5"; - name = "ksmtp-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ksmtp-21.08.1.tar.xz"; + sha256 = "0pl167gjhpmdvhsjm6hcygxwjs8v1z4xfc7x0c69bac8rdrzrlb6"; + name = "ksmtp-21.08.1.tar.xz"; }; }; ksnakeduel = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ksnakeduel-21.04.0.tar.xz"; - sha256 = "1s3k4k2a27rfp300bgxm1qhsg0dnlz72ip3csdixkidwcig7v017"; - name = "ksnakeduel-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ksnakeduel-21.08.1.tar.xz"; + sha256 = "1jk4mdxg2b1aa1686rimhjqh91ijaf8n7fahvswwbl473zfjf748"; + name = "ksnakeduel-21.08.1.tar.xz"; }; }; kspaceduel = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kspaceduel-21.04.0.tar.xz"; - sha256 = "0acgmh4blmp2vmzqnxvphixbjmfv12al99hxwv1iavdfyl88yfqz"; - name = "kspaceduel-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kspaceduel-21.08.1.tar.xz"; + sha256 = "0q2mpidkhgjz3nm88j3m8wdb06y3m8ixr0540q0s9i9d997jdkch"; + name = "kspaceduel-21.08.1.tar.xz"; }; }; ksquares = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ksquares-21.04.0.tar.xz"; - sha256 = "1y23c86qz1qcmjzfsrj974c4ccai4rrp7ajmwxi7wgzgzwypflir"; - name = "ksquares-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ksquares-21.08.1.tar.xz"; + sha256 = "0z7h5vig5zablvdlv7lanmsjjbqq931pqjyynm75mygrrbavgcfq"; + name = "ksquares-21.08.1.tar.xz"; }; }; ksudoku = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ksudoku-21.04.0.tar.xz"; - sha256 = "0r6m6jpjpz759gq40bxh5n7lg89gn2kfmiik2i06d1slz9v54iv0"; - name = "ksudoku-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ksudoku-21.08.1.tar.xz"; + sha256 = "0aax14xwg42wr8g563nbpn7m55gs4k50kwk0zn79pf62i78g10lp"; + name = "ksudoku-21.08.1.tar.xz"; }; }; ksystemlog = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ksystemlog-21.04.0.tar.xz"; - sha256 = "06az8kfsp468hr3xzcfbra81xbfv12w2jzhd4n2cirsi6k8vhx14"; - name = "ksystemlog-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ksystemlog-21.08.1.tar.xz"; + sha256 = "1vv0wbb3npbq8r0mq8y5lc36qx1hxdjxygfcnw2h9hm4dwl8mc5v"; + name = "ksystemlog-21.08.1.tar.xz"; }; }; kteatime = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kteatime-21.04.0.tar.xz"; - sha256 = "1zk7gbdsxyw59lfr0r2nnxm08jjls0zcp7wqkm4sq2gyczs73vy5"; - name = "kteatime-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kteatime-21.08.1.tar.xz"; + sha256 = "0gjnvcvrnb3049ln64chnjgr7xm722ighjscxxhqz61i872dgb72"; + name = "kteatime-21.08.1.tar.xz"; }; }; ktimer = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktimer-21.04.0.tar.xz"; - sha256 = "0czwbd0id7a9w8wwpfsv2s06xc9my996bcdj0bn37091yik1wqzr"; - name = "ktimer-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktimer-21.08.1.tar.xz"; + sha256 = "1l79yrg6g78gf8av1h6yr4mxyd1n63g4r38qp4csvpnjpx7y8ijd"; + name = "ktimer-21.08.1.tar.xz"; }; }; ktnef = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktnef-21.04.0.tar.xz"; - sha256 = "0zs0bfb2g7rxcxc7ngjzszrcnj9qarpnig7b29xcrmnsxppa9z8y"; - name = "ktnef-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktnef-21.08.1.tar.xz"; + sha256 = "08wk4ssasqqixwnp59smv64c8m4jf89vpcwc3zvz4h92sfk0pk33"; + name = "ktnef-21.08.1.tar.xz"; }; }; ktorrent = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktorrent-21.04.0.tar.xz"; - sha256 = "0f28iyb2mrin2n5f6msxib9lh38qxid1sz5p5dq1g703gyqgr345"; - name = "ktorrent-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktorrent-21.08.1.tar.xz"; + sha256 = "1r7w43ns4zy94y82dbghrjgqv1sbdj01rni0iijirzjjikr5av9m"; + name = "ktorrent-21.08.1.tar.xz"; }; }; ktouch = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktouch-21.04.0.tar.xz"; - sha256 = "0f46dsjcgqqg1f24sl3za624h5kpynqdi480hnc0fc6yaf3nm2mm"; - name = "ktouch-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktouch-21.08.1.tar.xz"; + sha256 = "00pyrp00dqbanb2w0cxmxh8aahih714q85prjij6iy5sv0917zr7"; + name = "ktouch-21.08.1.tar.xz"; }; }; ktp-accounts-kcm = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktp-accounts-kcm-21.04.0.tar.xz"; - sha256 = "1vvnk9nfq4z3m73yr59y65v0nvqwn4xjx6lrm754dnqr6vldv01p"; - name = "ktp-accounts-kcm-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktp-accounts-kcm-21.08.1.tar.xz"; + sha256 = "0pn8g5w4p2synwfskw9m805nj2wk9g7yff423243qc3fxl572sv8"; + name = "ktp-accounts-kcm-21.08.1.tar.xz"; }; }; ktp-approver = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktp-approver-21.04.0.tar.xz"; - sha256 = "0j407a3bfmi4gn5v3gfazfidyp1kxn4vbs40xm5pkgxr4ykvzqj5"; - name = "ktp-approver-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktp-approver-21.08.1.tar.xz"; + sha256 = "1q2rsg9520ra7ap3ipvv0sdyc2mzbzap2ygzkwbm80fpspl6b973"; + name = "ktp-approver-21.08.1.tar.xz"; }; }; ktp-auth-handler = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktp-auth-handler-21.04.0.tar.xz"; - sha256 = "1lqjb3mawdvwrx7b2q2f3kr132shbgs9lvlzdn450pn9cn1c4z7i"; - name = "ktp-auth-handler-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktp-auth-handler-21.08.1.tar.xz"; + sha256 = "0yzh2sqsyic3d979mj3m8d9m42y37w3h2s7gsyifw08gf5sna48p"; + name = "ktp-auth-handler-21.08.1.tar.xz"; }; }; ktp-call-ui = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktp-call-ui-21.04.0.tar.xz"; - sha256 = "1f2rzm5jfw12b6v2yfzjs152sq2ak3k7zk3nwipyiy86n0f25yqp"; - name = "ktp-call-ui-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktp-call-ui-21.08.1.tar.xz"; + sha256 = "0m8x3mfhy5rnv9wp15zrl5fiwdkm66pc8szkncqnjxw2nv721s3m"; + name = "ktp-call-ui-21.08.1.tar.xz"; }; }; ktp-common-internals = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktp-common-internals-21.04.0.tar.xz"; - sha256 = "0j3fnvyln6w7m3z416blpvrk1bpcbd5403h6pyjyq3dsvswzd21x"; - name = "ktp-common-internals-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktp-common-internals-21.08.1.tar.xz"; + sha256 = "12jcfr3cvyhzn62jnlnfmp39wyxa06bih4qz8gxzv56nl434qzv0"; + name = "ktp-common-internals-21.08.1.tar.xz"; }; }; ktp-contact-list = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktp-contact-list-21.04.0.tar.xz"; - sha256 = "1bym3sf3szmgi3nbczlilcazkjd1jfy7v0p0c3844c33fid6ln4q"; - name = "ktp-contact-list-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktp-contact-list-21.08.1.tar.xz"; + sha256 = "1d4d0bvi9c813c3gyws3gc8zca1az2f3ych2r1cgpdhhbqjrf3wl"; + name = "ktp-contact-list-21.08.1.tar.xz"; }; }; ktp-contact-runner = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktp-contact-runner-21.04.0.tar.xz"; - sha256 = "1afcsc8bfvyqy9y32a73x01xar50g48q9jbvnsggmjb20qbgk6fz"; - name = "ktp-contact-runner-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktp-contact-runner-21.08.1.tar.xz"; + sha256 = "0l2qimrpfnpmhvspgv62y8a7hsbw4abz92n1xry040qmkfqzv2l7"; + name = "ktp-contact-runner-21.08.1.tar.xz"; }; }; ktp-desktop-applets = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktp-desktop-applets-21.04.0.tar.xz"; - sha256 = "1achgl8prdl33hw73nfjcm0djxzf9xy76n365kqzfz757fvy025w"; - name = "ktp-desktop-applets-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktp-desktop-applets-21.08.1.tar.xz"; + sha256 = "03si91agdjascs6ri0g5zrhicjzx24p6kh2ni1d96k5sc7alwxnl"; + name = "ktp-desktop-applets-21.08.1.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktp-filetransfer-handler-21.04.0.tar.xz"; - sha256 = "0mhvx3x4mf9b1mmn901995107ixz9qd80ydx468k30w13k8hwjpg"; - name = "ktp-filetransfer-handler-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktp-filetransfer-handler-21.08.1.tar.xz"; + sha256 = "08dklgklc31fvcdi3917lh77gr58y75f1di0xhjf6jq8vxplqjd8"; + name = "ktp-filetransfer-handler-21.08.1.tar.xz"; }; }; ktp-kded-module = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktp-kded-module-21.04.0.tar.xz"; - sha256 = "1d3rpbqks6x6bv12mzpd6g5x2h35hf4xfx871i23pq7p2n4nna8f"; - name = "ktp-kded-module-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktp-kded-module-21.08.1.tar.xz"; + sha256 = "1135hh82ivvbpks9k39baisrq053570yq2x851j4vb2qrxg000yg"; + name = "ktp-kded-module-21.08.1.tar.xz"; }; }; ktp-send-file = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktp-send-file-21.04.0.tar.xz"; - sha256 = "1lyshgan77cia7cnirjfyg0hw0wgazjw9z21ig0czs3hr6qqf277"; - name = "ktp-send-file-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktp-send-file-21.08.1.tar.xz"; + sha256 = "1fnn5m9spa0x8nw1rx94x85hy06qwkb1fl5l498rmhyzikhxmhqp"; + name = "ktp-send-file-21.08.1.tar.xz"; }; }; ktp-text-ui = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktp-text-ui-21.04.0.tar.xz"; - sha256 = "04k2m4f873hz783szmkgpc0y6mjpwld5z3xcbdqippfzcdn4hg0v"; - name = "ktp-text-ui-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktp-text-ui-21.08.1.tar.xz"; + sha256 = "0cfnf688jz5953x7jxjrdlfs96rxjcfzvasrc881y1aprav1dmjq"; + name = "ktp-text-ui-21.08.1.tar.xz"; }; }; ktuberling = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/ktuberling-21.04.0.tar.xz"; - sha256 = "14yg3pghm4l3qgpi1i5zicjyak62w2ci4b36914kn5b3yfxh132i"; - name = "ktuberling-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/ktuberling-21.08.1.tar.xz"; + sha256 = "1f3a74nfh4fhxibcfxgjdj6phy185iz6y9nfg3pag3jvqsn8nx49"; + name = "ktuberling-21.08.1.tar.xz"; }; }; kturtle = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kturtle-21.04.0.tar.xz"; - sha256 = "1l8drllf7a1d3zra23ysyli8jl6xgl3xciqfkhc1fxhdkncx24cd"; - name = "kturtle-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kturtle-21.08.1.tar.xz"; + sha256 = "15ng6k6xfaj37dvycm29pj2pk73yfr66pp0wgj719c0kq7c9avdp"; + name = "kturtle-21.08.1.tar.xz"; }; }; kubrick = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kubrick-21.04.0.tar.xz"; - sha256 = "0m8ps0yxqijshgx09cypzd3l1n0zlrqcrkjcd725zwxarpm0z0hk"; - name = "kubrick-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kubrick-21.08.1.tar.xz"; + sha256 = "03i0b24mmq3jqf7812a9sjr8lr82mq9mrq75z2a9h62jinvxvigj"; + name = "kubrick-21.08.1.tar.xz"; }; }; kwalletmanager = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kwalletmanager-21.04.0.tar.xz"; - sha256 = "1rh7xdwn0kdw8j936asxy8llar144144xgvp7sjlpi5y93ayf8vk"; - name = "kwalletmanager-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kwalletmanager-21.08.1.tar.xz"; + sha256 = "1a4aiajq04rlm566jwqwjq2b6sfamnabfrjfa80pld3qcmq0l1mz"; + name = "kwalletmanager-21.08.1.tar.xz"; }; }; kwave = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kwave-21.04.0.tar.xz"; - sha256 = "1wy6sxmf9pk2677xdsbpgy01p284rzqwiyzm1hr971xbra5h4k6i"; - name = "kwave-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kwave-21.08.1.tar.xz"; + sha256 = "1dl7kn67hp9y39xlnq989kg743295a23kbpjpvbjashgdqy3hqwl"; + name = "kwave-21.08.1.tar.xz"; }; }; kwordquiz = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/kwordquiz-21.04.0.tar.xz"; - sha256 = "0wnihn75yvhz2j310vr806vkbfywhr26wny07fpbzcishyjb89vi"; - name = "kwordquiz-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/kwordquiz-21.08.1.tar.xz"; + sha256 = "1mzdmgls07bb6k2x6qb1xzp04jpfifdrka2k6kzwy9bq071gs7q5"; + name = "kwordquiz-21.08.1.tar.xz"; }; }; libgravatar = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libgravatar-21.04.0.tar.xz"; - sha256 = "0li6p9df000bmkqgmwiix7ab4sah05r1n4gm109jjglh0a41bfvr"; - name = "libgravatar-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libgravatar-21.08.1.tar.xz"; + sha256 = "08xl8nb0bn6zf9sh7sn4v7aa86ffqb16hixci4ymixyxy5c4gwbv"; + name = "libgravatar-21.08.1.tar.xz"; }; }; libkcddb = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libkcddb-21.04.0.tar.xz"; - sha256 = "1fzbhn0rnlmxdglfb48f4f3ddagkgny2665mgv8gdbcq3vg62zwr"; - name = "libkcddb-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libkcddb-21.08.1.tar.xz"; + sha256 = "08841rssxcg9vi490qih8jxnalnbjd2wqsgcq22gkm1ahfj5dizq"; + name = "libkcddb-21.08.1.tar.xz"; }; }; libkcompactdisc = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libkcompactdisc-21.04.0.tar.xz"; - sha256 = "1skaic0vfspdkv0q574ia4jszq1a5smf4s9ls4flfk5qxmkv6862"; - name = "libkcompactdisc-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libkcompactdisc-21.08.1.tar.xz"; + sha256 = "1q838md6kqvjmc61sy943lqgv5isll2px1s0izyvvxkf747hcpin"; + name = "libkcompactdisc-21.08.1.tar.xz"; }; }; libkdcraw = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libkdcraw-21.04.0.tar.xz"; - sha256 = "1ir6m61yb8f0ic39jxxnzjd9jjkb0ksln3fkls5v0af6g546bgab"; - name = "libkdcraw-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libkdcraw-21.08.1.tar.xz"; + sha256 = "17ijpgljhrm851mdnd1znjpa7hidmv1d5d05q68r6lp1aclcgmwm"; + name = "libkdcraw-21.08.1.tar.xz"; }; }; libkdegames = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libkdegames-21.04.0.tar.xz"; - sha256 = "1q0m4kq32gsllxz8vx0qj9qii5y2lbd6wclwlykhayx1fcncwrj7"; - name = "libkdegames-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libkdegames-21.08.1.tar.xz"; + sha256 = "0vfx3ksy6z5h4hjx0dl3fr3phfz3q590h86ksbp5q20lyylmdpji"; + name = "libkdegames-21.08.1.tar.xz"; }; }; libkdepim = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libkdepim-21.04.0.tar.xz"; - sha256 = "1ai5l9qcjnpwndvv744sx85b0yyg4wz01r0v9b0b62zwx8i35clb"; - name = "libkdepim-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libkdepim-21.08.1.tar.xz"; + sha256 = "10zb97zf1jidh9q6dkn8cjs9f4gqz2xn6yqylsbq0bjlycv991fh"; + name = "libkdepim-21.08.1.tar.xz"; }; }; libkeduvocdocument = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libkeduvocdocument-21.04.0.tar.xz"; - sha256 = "0264i01w44fjdh14psmw8ynmb8vzkw94lqqff1ia8bw5n0ihr914"; - name = "libkeduvocdocument-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libkeduvocdocument-21.08.1.tar.xz"; + sha256 = "0wnyx7h284g6wssnfdfz4m0hcb0rc6fnlryav8vnjcyzz7p5ni6l"; + name = "libkeduvocdocument-21.08.1.tar.xz"; }; }; libkexiv2 = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libkexiv2-21.04.0.tar.xz"; - sha256 = "0grhibpq47yba9mjdhr1p0sbw62vxsrwfydi5ybpa8fjgvbbbprr"; - name = "libkexiv2-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libkexiv2-21.08.1.tar.xz"; + sha256 = "0wnpkzivb5f5z3d1dn5952cx07q8nw421xrs21r57cmbsss344xa"; + name = "libkexiv2-21.08.1.tar.xz"; }; }; libkgapi = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libkgapi-21.04.0.tar.xz"; - sha256 = "1x811g0mbgjz8spngdsqdxfhkyic9kqxkhx9nq592zihaqkl3ifz"; - name = "libkgapi-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libkgapi-21.08.1.tar.xz"; + sha256 = "14wzl40j5baw20628dqcpkg8vi6jsq5f9gw0sc1my8qhw91mj3vy"; + name = "libkgapi-21.08.1.tar.xz"; }; }; libkipi = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libkipi-21.04.0.tar.xz"; - sha256 = "0gk8bfhq1z9f82mnjm2xjabgxn0qjrabw53bb67lwvrrgaliliqb"; - name = "libkipi-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libkipi-21.08.1.tar.xz"; + sha256 = "13579gqxyj8dwmrmxylnw6mf56vr73vlbbv07rpi661kfrbjk2ms"; + name = "libkipi-21.08.1.tar.xz"; }; }; libkleo = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libkleo-21.04.0.tar.xz"; - sha256 = "073ghnw1s09fvai22ag37n20mmhkbl4gp4y58nbgw43gfy5gsv6z"; - name = "libkleo-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libkleo-21.08.1.tar.xz"; + sha256 = "1n1nacr1q0nw2jq8px6b3cmda6ff9mygggfrl3xh6qz042bg77xz"; + name = "libkleo-21.08.1.tar.xz"; }; }; libkmahjongg = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libkmahjongg-21.04.0.tar.xz"; - sha256 = "1n2jswdvpvc9jcqsvqf0nniaf893432v123my2q6msk2zvss6pcb"; - name = "libkmahjongg-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libkmahjongg-21.08.1.tar.xz"; + sha256 = "0ry6wz0i9dccjn5w2qy2nin0rhbg30vlbcr4zrlx8bxsw0la2k94"; + name = "libkmahjongg-21.08.1.tar.xz"; }; }; libkomparediff2 = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libkomparediff2-21.04.0.tar.xz"; - sha256 = "13kpaasyhrhhrgk8a5qg9qv65wdv6qvnz2gjbjv8qgp4k4jmwv7h"; - name = "libkomparediff2-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libkomparediff2-21.08.1.tar.xz"; + sha256 = "0n6xxam33k8j6c9wqdf0lhfpk6nyf9brhvdkivdamp0idhi3rcpx"; + name = "libkomparediff2-21.08.1.tar.xz"; }; }; libksane = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libksane-21.04.0.tar.xz"; - sha256 = "17a5i21h99qvv8sig7xh5n149ji8fqch5m0w6fqirrwf0iz66363"; - name = "libksane-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libksane-21.08.1.tar.xz"; + sha256 = "1x4wsdfczqnasr6ps8677m0ix1fqqd2316f6k2k3awn9qfgsqy3x"; + name = "libksane-21.08.1.tar.xz"; }; }; libksieve = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libksieve-21.04.0.tar.xz"; - sha256 = "04zyiqmkr78rnilv5zmmbr09k1nycgpc3qw3a9qy4xzh5amkl8wl"; - name = "libksieve-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libksieve-21.08.1.tar.xz"; + sha256 = "1569xcjz575f8007z91zs9xn5wjklzkiy6l0cl7yzpzn880wc03p"; + name = "libksieve-21.08.1.tar.xz"; }; }; libktorrent = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/libktorrent-21.04.0.tar.xz"; - sha256 = "0c8hbsk2vjkmdvnws4kaa9bylzyzmx12fxm354qm65n4j6pdd59v"; - name = "libktorrent-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/libktorrent-21.08.1.tar.xz"; + sha256 = "0y5881v0g49rr8dspzaq4l1c62rchgfq4mjx64sn0ng2jjpnhv1x"; + name = "libktorrent-21.08.1.tar.xz"; }; }; lokalize = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/lokalize-21.04.0.tar.xz"; - sha256 = "1wb95y89qi4z7hsldyq75w69rgdca3m0ji85khfvsb4h3cgilana"; - name = "lokalize-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/lokalize-21.08.1.tar.xz"; + sha256 = "0ih7a1rkwn9jpgk3qld8anavr0g4wlf8figwikhvbc2dw79lxs7k"; + name = "lokalize-21.08.1.tar.xz"; }; }; lskat = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/lskat-21.04.0.tar.xz"; - sha256 = "1acxbsldcjk3d84ip5z15y8x6nngj2vnb40s5p3mv47r6vgbh0qd"; - name = "lskat-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/lskat-21.08.1.tar.xz"; + sha256 = "1d89yqfsc703pnvxljcsn33wpsv64s4nr2wlmlbl609m9x8b9g9b"; + name = "lskat-21.08.1.tar.xz"; }; }; mailcommon = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/mailcommon-21.04.0.tar.xz"; - sha256 = "1ljchkfrnknlzgjrrpwszzyv8m066d29xwns1yp8smqzk723g0gx"; - name = "mailcommon-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/mailcommon-21.08.1.tar.xz"; + sha256 = "1r0qyqasah4z8vx836fhvv1f4zm20az9qrw8122l3a986lazh1zw"; + name = "mailcommon-21.08.1.tar.xz"; }; }; mailimporter = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/mailimporter-21.04.0.tar.xz"; - sha256 = "06zvaq3ccrgsd6idnd9m201924bnm72nvcg66v1salcdk93a8sv5"; - name = "mailimporter-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/mailimporter-21.08.1.tar.xz"; + sha256 = "05kiizbdnsl15ry2zb5sg94lcdwq9w4lnznd6zcq8n09s0zpz8nf"; + name = "mailimporter-21.08.1.tar.xz"; }; }; marble = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/marble-21.04.0.tar.xz"; - sha256 = "1c63x75fzhkqgvijd1pmpywq4dx7gkyw9x90aj54fzkgjzwzqzhq"; - name = "marble-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/marble-21.08.1.tar.xz"; + sha256 = "01hf3wwz9zflkpgx1pbkxbnl1vs2yyafrwmldnil66nkxsxx7izw"; + name = "marble-21.08.1.tar.xz"; }; }; markdownpart = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/markdownpart-21.04.0.tar.xz"; - sha256 = "0xgnj2g0hqwflw550fj6jzq36pc8j9vwb6p9cbvfljd8yv8va9kq"; - name = "markdownpart-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/markdownpart-21.08.1.tar.xz"; + sha256 = "0xgs2kxnbrn70mrzza2d4f7xpx9ks3dbl3yj1y1kds7bnidsf3f9"; + name = "markdownpart-21.08.1.tar.xz"; }; }; mbox-importer = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/mbox-importer-21.04.0.tar.xz"; - sha256 = "0rxrf1sxb5pzrkr8m2n1f3xgpwsihn6b6d5nilxmmsl5c60ya8j8"; - name = "mbox-importer-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/mbox-importer-21.08.1.tar.xz"; + sha256 = "06mgz10ma8r0vi7ln9zxz2kipdp9rd0zw0sgm69h43rq9zyjnjkk"; + name = "mbox-importer-21.08.1.tar.xz"; }; }; messagelib = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/messagelib-21.04.0.tar.xz"; - sha256 = "1qsvqrkh30vyfrsxkpriqkzizxg9mx6v2xx7j6gyhz7pmrskx8rg"; - name = "messagelib-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/messagelib-21.08.1.tar.xz"; + sha256 = "1r3lqacixy5vy36jgy6glz08gp8k4559h1bdqyh7svmmflhs927i"; + name = "messagelib-21.08.1.tar.xz"; }; }; minuet = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/minuet-21.04.0.tar.xz"; - sha256 = "0djqp807g47fy163bp0pkrhb7j37ijqdfyafz74871j2frrmnc97"; - name = "minuet-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/minuet-21.08.1.tar.xz"; + sha256 = "0law0ram3xdf5ayc7j8as1xwj83k37mf7w6qkkp3hy3kj2r2dahx"; + name = "minuet-21.08.1.tar.xz"; }; }; okular = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/okular-21.04.0.tar.xz"; - sha256 = "0l0vrglxy9331sqn3lx76hvbh7b0znsafl5ia61srk48kb0w9rqy"; - name = "okular-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/okular-21.08.1.tar.xz"; + sha256 = "1vk1mn40i80b5vkxq47i1qf2i734n5nfa1wgx3748jwc1fws631p"; + name = "okular-21.08.1.tar.xz"; }; }; palapeli = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/palapeli-21.04.0.tar.xz"; - sha256 = "0f7ylr46alafp2gz9sf7xgnjm9vgyx5r7nipbqjl4wi8w908rklw"; - name = "palapeli-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/palapeli-21.08.1.tar.xz"; + sha256 = "09mswv446s6vqlllhz727qpd7mdszdkgivfn9sazgmydmmmzrw53"; + name = "palapeli-21.08.1.tar.xz"; }; }; parley = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/parley-21.04.0.tar.xz"; - sha256 = "0a186zqpi815apf2grlj11xp64kw80i43779z99r665jpp6189z3"; - name = "parley-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/parley-21.08.1.tar.xz"; + sha256 = "02v9gfjdryf48m5iinsc9qg2qfmj1s96xga5b3ndd63g66b6gp9b"; + name = "parley-21.08.1.tar.xz"; }; }; partitionmanager = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/partitionmanager-21.04.0.tar.xz"; - sha256 = "02dgbqx1a6wahds04jcjdjh56pyrm47165hwv98ccarakrvn8yqm"; - name = "partitionmanager-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/partitionmanager-21.08.1.tar.xz"; + sha256 = "16vc0g08rs6dz87zv4b1ygs198c6mbjwcp2j4994z6cf16bxfgz8"; + name = "partitionmanager-21.08.1.tar.xz"; }; }; picmi = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/picmi-21.04.0.tar.xz"; - sha256 = "1pwswzc02blvf49v4i2grw9mlm9y1ydmms6mg50iyi6qrnzbv6r3"; - name = "picmi-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/picmi-21.08.1.tar.xz"; + sha256 = "1yshwfl8baw0cw8hnvzkb3y72r0bycyr19rwwns9sjc3fk9gnk6a"; + name = "picmi-21.08.1.tar.xz"; }; }; - pimcommon = { - version = "21.04.0"; + pim-data-exporter = { + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/pimcommon-21.04.0.tar.xz"; - sha256 = "0bprmk20pmngvxxxpygajnlr4yx9acrz7dw6bfnn6d8kig281qdn"; - name = "pimcommon-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/pim-data-exporter-21.08.1.tar.xz"; + sha256 = "1vx7h7900wq8icx7q4khkx9g5gm6j5c8dl38q08pwda4vl0pmxmd"; + name = "pim-data-exporter-21.08.1.tar.xz"; }; }; - pim-data-exporter = { - version = "21.04.0"; + pim-sieve-editor = { + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/pim-data-exporter-21.04.0.tar.xz"; - sha256 = "0rbkr1vgl14q4hi4byn20kfhkz3yzmrydhb3f1i2amp08ca4x71n"; - name = "pim-data-exporter-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/pim-sieve-editor-21.08.1.tar.xz"; + sha256 = "0ph62khl2k2gpfjf05p9sklihib0hbxgl3n1bv59l58awj9brs0r"; + name = "pim-sieve-editor-21.08.1.tar.xz"; }; }; - pim-sieve-editor = { - version = "21.04.0"; + pimcommon = { + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/pim-sieve-editor-21.04.0.tar.xz"; - sha256 = "1yxc4i0bsgrj9wsn44k7w3z1zkcm4y9qd8zd7shsqpca9lb9n13y"; - name = "pim-sieve-editor-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/pimcommon-21.08.1.tar.xz"; + sha256 = "1379lhvin2vkikd3fzanhwfjszb4cc9f3h9bxf3md3h4gx1i6hb6"; + name = "pimcommon-21.08.1.tar.xz"; }; }; poxml = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/poxml-21.04.0.tar.xz"; - sha256 = "0yhygizd0i6az1pd34lh4ij2x8867svbh2bic9lgcpmqbza9054g"; - name = "poxml-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/poxml-21.08.1.tar.xz"; + sha256 = "10wwrbmhwbjk71m4ya1shb7mviil33fciykrzyqvvdnvx668aawm"; + name = "poxml-21.08.1.tar.xz"; }; }; print-manager = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/print-manager-21.04.0.tar.xz"; - sha256 = "1k5pqh264jy698jdzsk7d6bhadnwvgx1g3rpji06pb0igr1zn820"; - name = "print-manager-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/print-manager-21.08.1.tar.xz"; + sha256 = "1hzykjnymr0knh67h6s5214bjp5lk1klm6znh8q2asf49c6x2zgw"; + name = "print-manager-21.08.1.tar.xz"; }; }; rocs = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/rocs-21.04.0.tar.xz"; - sha256 = "11yzgrmb15zv24pfr3096g9zgsvgdlw43vnbjgbr7s8xvnprlh5l"; - name = "rocs-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/rocs-21.08.1.tar.xz"; + sha256 = "1b527n0csk43sxafynqijiwf0bzj89viznpxnk2ayb9lik4q3djm"; + name = "rocs-21.08.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "21.04.0"; + version = "21.08.1"; + src = fetchurl { + url = "${mirror}/stable/release-service/21.08.1/src/signon-kwallet-extension-21.08.1.tar.xz"; + sha256 = "1x1q1vmqm9nq7sjhxc495x612jh39scxba0nbr8a4rval144268m"; + name = "signon-kwallet-extension-21.08.1.tar.xz"; + }; + }; + skanlite = { + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/signon-kwallet-extension-21.04.0.tar.xz"; - sha256 = "05jaa74j6rd89cj8szfgw5izjlkakbjmz7qiwlswyjd4lafjz65n"; - name = "signon-kwallet-extension-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/skanlite-21.08.1.tar.xz"; + sha256 = "17lnazx1h4lk78037gvzscnm3p2yl6dhc4970bdq982ahwp63gg8"; + name = "skanlite-21.08.1.tar.xz"; }; }; spectacle = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/spectacle-21.04.0.tar.xz"; - sha256 = "0cqf9p7mc5wyl5qy6866m7xhndwmgd3hmw7amkpzngmmz4h9i2p0"; - name = "spectacle-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/spectacle-21.08.1.tar.xz"; + sha256 = "0bs93gylw90wj3b9kw71xhqy60smggh38s5g4jcras1n6iqmb06x"; + name = "spectacle-21.08.1.tar.xz"; }; }; step = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/step-21.04.0.tar.xz"; - sha256 = "169ka33nkzrxdk874180v6yzmrngl98gzyql4p5ssmmdh0vrkg25"; - name = "step-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/step-21.08.1.tar.xz"; + sha256 = "0rg69j8r479vzyrajbdjgh5l2506w8f2dnlh1di545gzjk2ww448"; + name = "step-21.08.1.tar.xz"; }; }; svgpart = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/svgpart-21.04.0.tar.xz"; - sha256 = "0chfyxl94kp5pif6lzhlm7q8rg9l4lg74x4y04wslrfqcn1gghdj"; - name = "svgpart-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/svgpart-21.08.1.tar.xz"; + sha256 = "1silp6k0l9xb363h8whiv4dry6gf1mj4w53mksl1i2slhqn9q96v"; + name = "svgpart-21.08.1.tar.xz"; }; }; sweeper = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/sweeper-21.04.0.tar.xz"; - sha256 = "1iysxrfdp8bv0vgssv062yllsq4w3jf9vdi66jm9ka8i9w8wqpsv"; - name = "sweeper-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/sweeper-21.08.1.tar.xz"; + sha256 = "0p25bkczxmx93igicyiasvjd4v9rc3sg7gm7b9ddgzz8rrnr0d9p"; + name = "sweeper-21.08.1.tar.xz"; }; }; umbrello = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/umbrello-21.04.0.tar.xz"; - sha256 = "17xwsjc1ph2glscv41x4f5bagw1q5ackqpy1wcg8m9jrg9ipqpqx"; - name = "umbrello-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/umbrello-21.08.1.tar.xz"; + sha256 = "0x4f3hiydyprhzd56i8lijwfhzca041bmbbxp7x1dckv3shdangc"; + name = "umbrello-21.08.1.tar.xz"; }; }; yakuake = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/yakuake-21.04.0.tar.xz"; - sha256 = "1jkwcc4pdb06v4q7bnqppdkjf8n8qpfp9mk02l77brnxxf8i9r3b"; - name = "yakuake-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/yakuake-21.08.1.tar.xz"; + sha256 = "1x41jrkvlff8x5qcd12lcrv6zqzw7jqw02ikpmqv1v4gw7lz94w9"; + name = "yakuake-21.08.1.tar.xz"; }; }; zeroconf-ioslave = { - version = "21.04.0"; + version = "21.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/21.04.0/src/zeroconf-ioslave-21.04.0.tar.xz"; - sha256 = "03cmz3y8f48y26aybyygwssqicp0kz4ry9xm30rvvc5hiv0n6hj7"; - name = "zeroconf-ioslave-21.04.0.tar.xz"; + url = "${mirror}/stable/release-service/21.08.1/src/zeroconf-ioslave-21.08.1.tar.xz"; + sha256 = "113sp3lqzyxx7icww4sznc23kxarmxz0158kzl6nazxj4m6cnm4r"; + name = "zeroconf-ioslave-21.08.1.tar.xz"; }; }; } diff --git a/nixpkgs/pkgs/applications/misc/1password-gui/default.nix b/nixpkgs/pkgs/applications/misc/1password-gui/default.nix index 0803b495b2fa..486fb6b5f9ce 100644 --- a/nixpkgs/pkgs/applications/misc/1password-gui/default.nix +++ b/nixpkgs/pkgs/applications/misc/1password-gui/default.nix @@ -86,6 +86,9 @@ stdenv.mkDerivation rec { substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=/opt/1Password/${pname}' 'Exec=${pname}' + # Polkit file + install -Dm 0644 -t $out/share/polkit-1/actions com.1password.1Password.policy + # Icons cp -a resources/icons $out/share diff --git a/nixpkgs/pkgs/applications/misc/anytype/default.nix b/nixpkgs/pkgs/applications/misc/anytype/default.nix index 403973c46e7c..dcd0aa498c5b 100644 --- a/nixpkgs/pkgs/applications/misc/anytype/default.nix +++ b/nixpkgs/pkgs/applications/misc/anytype/default.nix @@ -2,13 +2,13 @@ let pname = "anytype"; - version = "0.18.68"; + version = "0.19.0"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://at9412003.fra1.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-VZYFMUgflc3LEk/nN7eoQbinGQS1AnPHmb8WgKzhGRM="; + sha256 = "sha256-sqCq9/QFygFcOUNCCBReD+eEk/8gvhMsuVD3g/ZPAFg="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in diff --git a/nixpkgs/pkgs/applications/misc/appeditor/default.nix b/nixpkgs/pkgs/applications/misc/appeditor/default.nix index a715681ae9f2..f8e709e423fd 100644 --- a/nixpkgs/pkgs/applications/misc/appeditor/default.nix +++ b/nixpkgs/pkgs/applications/misc/appeditor/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Edit the Pantheon desktop application menu"; homepage = "https://github.com/donadigo/appeditor"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3Plus; }; diff --git a/nixpkgs/pkgs/applications/misc/bleachbit/default.nix b/nixpkgs/pkgs/applications/misc/bleachbit/default.nix index 4b78cda35648..d40a57323a13 100644 --- a/nixpkgs/pkgs/applications/misc/bleachbit/default.nix +++ b/nixpkgs/pkgs/applications/misc/bleachbit/default.nix @@ -12,13 +12,13 @@ python3Packages.buildPythonApplication rec { pname = "bleachbit"; - version = "4.0.0"; + version = "4.4.0"; format = "other"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1dn3h6lr9ldbfpvgq9sdlk972sxhwalgj2f377qbqibm3yfxzpil"; + sha256 = "0kqqfzq6bh03n7kxb9vd483bqi1cklfvj35a7h4iqk96sq1xv8z6"; }; nativeBuildInputs = [ @@ -44,6 +44,7 @@ python3Packages.buildPythonApplication rec { postPatch = '' find -type f -exec sed -i -e 's@/usr/share@${placeholder "out"}/share@g' {} \; find -type f -exec sed -i -e 's@/usr/bin@${placeholder "out"}/bin@g' {} \; + find -type f -exec sed -i -e 's@${placeholder "out"}/bin/python3@${python3Packages.python}/bin/python3@' {} \; ''; dontBuild = true; @@ -52,7 +53,7 @@ python3Packages.buildPythonApplication rec { "prefix=${placeholder "out"}" ]; - # prevent double wrapping from wrapGApps and wrapPythonProgram + # Prevent double wrapping from wrapGApps and wrapPythonProgram dontWrapGApps = true; makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" @@ -65,6 +66,6 @@ python3Packages.buildPythonApplication rec { description = "A program to clean your computer"; longDescription = "BleachBit helps you easily clean your computer to free space and maintain privacy."; license = licenses.gpl3; - maintainers = with maintainers; [ leonardoce ]; + maintainers = with maintainers; [ leonardoce mbprtpmnr ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/blender/default.nix b/nixpkgs/pkgs/applications/misc/blender/default.nix index 59de68797830..3dfa6d9ab513 100644 --- a/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -143,6 +143,10 @@ stdenv.mkDerivation rec { --prefix PATH : $program_PATH \ --prefix PYTHONPATH : "$program_PYTHONPATH" \ --add-flags '--python-use-system-env' + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications/Blender.app + ln -s $out/Blender.app $out/Applications/Blender.app + ln -s $out/Blender.app/Contents/MacOS $out/bin ''; # Set RUNPATH so that libcuda and libnvrtc in /run/opengl-driver(-32)/lib can be diff --git a/nixpkgs/pkgs/applications/misc/bottles/default.nix b/nixpkgs/pkgs/applications/misc/bottles/default.nix index 21e63b8b29bb..52f4e8def20e 100644 --- a/nixpkgs/pkgs/applications/misc/bottles/default.nix +++ b/nixpkgs/pkgs/applications/misc/bottles/default.nix @@ -3,18 +3,18 @@ , desktop-file-utils, gsettings-desktop-schemas, libnotify, libhandy , python3Packages, gettext , appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3 -, steam-run-native +, steam-run, xdg-utils, pciutils, cabextract, wineWowPackages }: python3Packages.buildPythonApplication rec { pname = "bottles"; - version = "2021.7.14-treviso"; + version = "2021.7.28-treviso-2"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = pname; rev = version; - sha256 = "0xhfk1ll8vacgrr0kkhynq4bryjhfjs29j824bark5mj9b6lkbix"; + sha256 = "0kvwcajm9izvkwfg7ir7bks39bpc665idwa8mc8d536ajyjriysn"; }; postPatch = '' @@ -52,7 +52,14 @@ python3Packages.buildPythonApplication rec { dbus-python gst-python liblarch - ] ++ [ steam-run-native ]; + patool + ] ++ [ + steam-run + xdg-utils + pciutils + cabextract + wineWowPackages.minimal + ]; format = "other"; strictDeps = false; # broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943 @@ -62,8 +69,10 @@ python3Packages.buildPythonApplication rec { substituteInPlace build-aux/meson/postinstall.py \ --replace "'update-desktop-database'" "'${desktop-file-utils}/bin/update-desktop-database'" substituteInPlace src/runner.py \ - --replace " {runner}" " ${steam-run-native}/bin/steam-run {runner}" \ - --replace " {dxvk_setup}" " ${steam-run-native}/bin/steam-run {dxvk_setup}" + --replace " {runner}" " ${steam-run}/bin/steam-run {runner}" \ + --replace " {dxvk_setup}" " ${steam-run}/bin/steam-run {dxvk_setup}" + substituteInPlace src/runner_utilities.py \ + --replace " {runner}" " ${steam-run}/bin/steam-run {runner}" \ ''; preFixup = '' diff --git a/nixpkgs/pkgs/applications/misc/cherrytree/default.nix b/nixpkgs/pkgs/applications/misc/cherrytree/default.nix index 7458377d42de..d4fc82b91393 100644 --- a/nixpkgs/pkgs/applications/misc/cherrytree/default.nix +++ b/nixpkgs/pkgs/applications/misc/cherrytree/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "cherrytree"; - version = "0.99.40"; + version = "0.99.41"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - sha256 = "sha256-K1rf8/7kEpfLOPYJGh5U2eTnr5XCDhuc+seoUAKW7aE="; + sha256 = "sha256-Bhk5xpJiVDSTxP1wAFTL39MgAIOa6Is9NTF1WEh6S1A="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/cipher/default.nix b/nixpkgs/pkgs/applications/misc/cipher/default.nix index eab1185edd81..5675676d9519 100644 --- a/nixpkgs/pkgs/applications/misc/cipher/default.nix +++ b/nixpkgs/pkgs/applications/misc/cipher/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple application for encoding and decoding text, designed for elementary OS"; homepage = "https://github.com/arshubham/cipher"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3Plus; }; diff --git a/nixpkgs/pkgs/applications/misc/cloak/default.nix b/nixpkgs/pkgs/applications/misc/cloak/default.nix new file mode 100644 index 000000000000..cb33aa595a46 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/cloak/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "cloak"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "evansmurithi"; + repo = pname; + rev = "v${version}"; + sha256 = "139z2ga0q7a0vwfnn5hpzsz5yrrrr7rgyd32yvfj5sxiywkmczs7"; + }; + + cargoSha256 = "0af38wgwmsamnx63dwfm2nrkd8wmky3ai7zwy0knmifgkn4b7yyj"; + + meta = with lib; { + homepage = "https://github.com/evansmurithi/cloak"; + description = "Command-line OTP authenticator application"; + license = licenses.mit; + maintainers = with maintainers; [ mvs ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/cobalt/default.nix b/nixpkgs/pkgs/applications/misc/cobalt/default.nix index 6e13cc4728e8..9b263e6f0d47 100644 --- a/nixpkgs/pkgs/applications/misc/cobalt/default.nix +++ b/nixpkgs/pkgs/applications/misc/cobalt/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cobalt"; - version = "0.16.5"; + version = "0.17.4"; src = fetchFromGitHub { owner = "cobalt-org"; repo = "cobalt.rs"; rev = "v${version}"; - sha256 = "wSvjPifnA8oc0vVmHBMdsMKzX7Gg6TdbPzIXl/SHqn8="; + sha256 = "sha256-uZcs3VkmpasFwgB7m1spTHi2W86tJt2kWlRTXAotvvo="; }; - cargoSha256 = "27LcoGBI4elt80uQkTwvToOyEmd2+/3ma5Y32OFrJaw="; + cargoSha256 = "sha256-U2TVg2/SIOxaWs4EehTpcu47uDO/EA2dJK56k3I6F+0="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/nixpkgs/pkgs/applications/misc/cointop/default.nix b/nixpkgs/pkgs/applications/misc/cointop/default.nix index 4b2f45c47f4f..623c6ce4f1b5 100644 --- a/nixpkgs/pkgs/applications/misc/cointop/default.nix +++ b/nixpkgs/pkgs/applications/misc/cointop/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "cointop"; - version = "1.6.6"; + version = "1.6.8"; src = fetchFromGitHub { owner = "miguelmota"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cn2TtXIxBnEZyWAdtf9ING9I/53z6D8UPVxnFVSkGgo="; + sha256 = "sha256-uENfTj+pJjX4t+yrd7zrn3LHRbJJSZFCN1N6Ce47wcE="; }; goPackagePath = "github.com/miguelmota/cointop"; diff --git a/nixpkgs/pkgs/applications/misc/ericw-tools/default.nix b/nixpkgs/pkgs/applications/misc/ericw-tools/default.nix new file mode 100644 index 000000000000..dadd235319b3 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/ericw-tools/default.nix @@ -0,0 +1,48 @@ +{ lib, stdenv, fetchFromGitHub +, gtest, fmt +, cmake, ninja, installShellFiles +}: + +stdenv.mkDerivation rec { + pname = "ericw-tools"; + version = "0.18.1"; + + src = fetchFromGitHub { + owner = "ericwa"; + repo = "ericw-tools"; + rev = "v${version}"; + sha256 = "11sap7qv0rlhw8q25azvhgjcwiql3zam09q0gim3i04cg6fkh0vp"; + }; + postUnpack = '' + pushd source/3rdparty + ln -s ${fmt.src} fmt + ln -s ${gtest.src} googletest + popd + ''; + + nativeBuildInputs = [ cmake ninja installShellFiles ]; + + outputs = [ "out" "doc" "man" ]; + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + for TOOL in bspinfo bsputil light qbsp vis ; do + cp -a $TOOL/$TOOL $out/bin/ + done + + installManPage ../man/*.? + + mkdir -p $doc/share/doc/ericw-tools + cp -a ../README.md ../changelog.txt $doc/share/doc/ericw-tools/ + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://ericwa.github.io/ericw-tools/"; + description = "Map compile tools for Quake and Hexen 2"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ astro ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/formatter/default.nix b/nixpkgs/pkgs/applications/misc/formatter/default.nix index e8f329ecb0da..4532b766f47b 100644 --- a/nixpkgs/pkgs/applications/misc/formatter/default.nix +++ b/nixpkgs/pkgs/applications/misc/formatter/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple formatter designed for elementary OS"; homepage = "https://github.com/Djaler/Formatter"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.lgpl2Plus; }; diff --git a/nixpkgs/pkgs/applications/misc/gofu/default.nix b/nixpkgs/pkgs/applications/misc/gofu/default.nix index b951a3e48251..13cb7129a00b 100644 --- a/nixpkgs/pkgs/applications/misc/gofu/default.nix +++ b/nixpkgs/pkgs/applications/misc/gofu/default.nix @@ -15,6 +15,11 @@ buildGoModule rec { subPackages = [ "." ]; + postInstall = '' + ln -s $out/bin/gofu $out/bin/rtree + ln -s $out/bin/gofu $out/bin/prettyprompt + ''; + meta = with lib; { description = "Multibinary containing several utilities"; homepage = "https://github.com/majewsky/gofu"; diff --git a/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix b/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix index 00a3914e1735..137682c39774 100644 --- a/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix +++ b/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; homepage = "https://dfandrich.github.io/gpscorrelate/"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ sikmir ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/nixpkgs/pkgs/applications/misc/gpxsee/default.nix index 4dcad13a10cf..f008ea439ed6 100644 --- a/nixpkgs/pkgs/applications/misc/gpxsee/default.nix +++ b/nixpkgs/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "9.5"; + version = "9.6"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-KYw3RXdL/iiE2zFbrDzRWe8jdLYbF6gvOFAGyWgd3GM="; + sha256 = "sha256-Yj8lR8zgIV+gshea7rzLbMF84n1nyN3DytiIkr3B274="; }; patches = (substituteAll { diff --git a/nixpkgs/pkgs/applications/misc/grsync/default.nix b/nixpkgs/pkgs/applications/misc/grsync/default.nix index f4d1b0852591..c8068d682237 100644 --- a/nixpkgs/pkgs/applications/misc/grsync/default.nix +++ b/nixpkgs/pkgs/applications/misc/grsync/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, dee, gtk2, intltool, libdbusmenu-gtk2, libunity, pkg-config, rsync }: +{ lib, stdenv, fetchurl, dee, gtk3, intltool, libdbusmenu-gtk3, libunity, pkg-config, rsync }: stdenv.mkDerivation rec { - version = "1.2.8"; + version = "1.3.0"; pname = "grsync"; src = fetchurl { url = "mirror://sourceforge/grsync/grsync-${version}.tar.gz"; - sha256 = "1c86jch73cy7ig9k4shvcd3jnaxk7jppfcr8nmkz8gbylsn5zsll"; + sha256 = "sha256-t8fGpi4FMC2DF8OHQefXHvmrRjnuW/8mIqODsgQ6Nfw="; }; nativeBuildInputs = [ @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ dee - gtk2 - libdbusmenu-gtk2 + gtk3 + libdbusmenu-gtk3 libunity rsync ]; diff --git a/nixpkgs/pkgs/applications/misc/hugo/default.nix b/nixpkgs/pkgs/applications/misc/hugo/default.nix index 7b3f6122a62b..2153553c54a8 100644 --- a/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hugo"; - version = "0.88.0"; + version = "0.88.1"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6dJ8H9oJwIW7rY2NrYVKuWDjwrFc9C30Vb0i20+opM0="; + sha256 = "sha256-yuFFp/tgyziR4SXul2PlMhKmRl7C7OSrW8/kCCUpzI0="; }; vendorSha256 = "sha256-VX+oIz5wAyEQ4nky3kXmJZbMF0MvfAKdEAMLnS0hXc8="; diff --git a/nixpkgs/pkgs/applications/misc/index-fm/default.nix b/nixpkgs/pkgs/applications/misc/index-fm/default.nix index 149e571fea22..b4f6b0ca4bec 100644 --- a/nixpkgs/pkgs/applications/misc/index-fm/default.nix +++ b/nixpkgs/pkgs/applications/misc/index-fm/default.nix @@ -17,14 +17,14 @@ mkDerivation rec { pname = "index"; - version = "1.2.2"; + version = "2.0.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "maui"; repo = "index-fm"; rev = "v${version}"; - sha256 = "sha256-N9/Jt18QRqDMWtEfxWn22e5Ud3YMwJ9B7OQRwTvwX8g="; + sha256 = "sha256-aY8JBCIh6VyCDOGQIMWhO6asGMo6I6ZTgzpDnnDy9eo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix b/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix index 02e3596e05ee..4701fe0b54f3 100644 --- a/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix +++ b/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "2.3.5"; + version = "2.4.6"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "sha256-Qy/CpIEfAZ9735mwcNaJIw+qVmYXVwQ7gJuUj2lpQc4="; - x86_64-darwin = "sha256-7I+fhcFFW/WihuUkSE5Pc8RhKszSgByP58H3sKSJbrc="; + x86_64-linux = "sha256-BMpRWtfx5fXEJy3hp/+q86sd+Yd/QPJbSqi2nWE2dcQ="; + x86_64-darwin = "sha256-4UNKdoGtQSN5/m+xQZrY77ZE5A7jvpDOUCRvwrS5e6g="; }.${system} or throwSystem; }; diff --git a/nixpkgs/pkgs/applications/misc/joshuto/default.nix b/nixpkgs/pkgs/applications/misc/joshuto/default.nix index 89e5aea943a5..5497d37ef0e1 100644 --- a/nixpkgs/pkgs/applications/misc/joshuto/default.nix +++ b/nixpkgs/pkgs/applications/misc/joshuto/default.nix @@ -2,23 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "joshuto"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "kamiyaa"; repo = pname; rev = version; - sha256 = "08d6h7xwcgycw5bdzwwc6aaikcrw3yc7inkiydgml9q261kql7zl"; - # upstream includes an outdated Cargo.lock that stops cargo from compiling - postFetch = '' - mkdir -p $out - tar xf $downloadedFile --strip=1 -C $out - substituteInPlace $out/Cargo.lock \ - --replace 0.8.6 ${version} - ''; + sha256 = "sha256-+qKOvFoEF/gZL4ijL8lIRWE9ZWJM2eBlk29Lk46jAfQ="; }; - cargoSha256 = "1scrqm7fs8y7anfiigimj7y5rjxcc2qvrxiq8ai7k5cwfc4v1ghm"; + # upstream includes an outdated Cargo.lock that stops cargo from compiling + cargoPatches = [ ./fix-cargo-lock.patch ]; + + cargoSha256 = "sha256-JlekxU9pMkHNsIcH3+7b2I6MYUlxRqNX+0wwyVrQMAE="; buildInputs = lib.optional stdenv.isDarwin SystemConfiguration; diff --git a/nixpkgs/pkgs/applications/misc/joshuto/fix-cargo-lock.patch b/nixpkgs/pkgs/applications/misc/joshuto/fix-cargo-lock.patch new file mode 100644 index 000000000000..023c824add10 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/joshuto/fix-cargo-lock.patch @@ -0,0 +1,11 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -512,7 +512,7 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + + [[package]] + name = "joshuto" +-version = "0.9.0" ++version = "0.9.1" + dependencies = [ + "alphanumeric-sort", + "chrono", diff --git a/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix b/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix index 89d7c2df741a..0ce8d8c373db 100644 --- a/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "21.03"; + version = "21.09"; pname = "mediainfo-gui"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "07h2a1lbw5ak6c9bcn8qydchl0wpgk945rf9sfcqjyv05h5wll6y"; + sha256 = "0mqcqm8y2whnbdi2ry7jd755gfl5ccdqhwjh67hsyr7c0ajxk3vv"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/applications/misc/mediainfo/default.nix b/nixpkgs/pkgs/applications/misc/mediainfo/default.nix index 70f463c02364..146df27726bb 100644 --- a/nixpkgs/pkgs/applications/misc/mediainfo/default.nix +++ b/nixpkgs/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "21.03"; + version = "21.09"; pname = "mediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "07h2a1lbw5ak6c9bcn8qydchl0wpgk945rf9sfcqjyv05h5wll6y"; + sha256 = "0mqcqm8y2whnbdi2ry7jd755gfl5ccdqhwjh67hsyr7c0ajxk3vv"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/applications/misc/menumaker/default.nix b/nixpkgs/pkgs/applications/misc/menumaker/default.nix index 8d018a67d371..0fa9ad5e7f0a 100644 --- a/nixpkgs/pkgs/applications/misc/menumaker/default.nix +++ b/nixpkgs/pkgs/applications/misc/menumaker/default.nix @@ -1,12 +1,12 @@ -{ lib, fetchurl, python2Packages }: +{ lib, fetchurl, python3Packages }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "menumaker"; - version = "0.99.12"; + version = "0.99.13"; src = fetchurl { url = "mirror://sourceforge/menumaker/${pname}-${version}.tar.gz"; - sha256 = "034v5204bsgkzzk6zfa5ia63q95gln47f7hwf96yvad5hrhmd8z3"; + sha256 = "sha256-JBXs5hnt1snbnB1hi7q7HBI7rNp0OoalLeIM0uJCdkE="; }; format = "other"; diff --git a/nixpkgs/pkgs/applications/misc/mkgmap/default.nix b/nixpkgs/pkgs/applications/misc/mkgmap/default.nix index d6fa24c19baf..e6282d0acb6d 100644 --- a/nixpkgs/pkgs/applications/misc/mkgmap/default.nix +++ b/nixpkgs/pkgs/applications/misc/mkgmap/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4608"; + version = "4807"; src = fetchurl { url = "https://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz"; - sha256 = "uj/iZZHML4nqEKdFBQSDdegkalZFJdzEE4xQrOruEp0="; + sha256 = "3DEcXopoCIcBANYrGclZH6K0JLgeYADXtPjQtobyfps="; }; patches = [ diff --git a/nixpkgs/pkgs/applications/misc/mkgmap/splitter/default.nix b/nixpkgs/pkgs/applications/misc/mkgmap/splitter/default.nix index 9e034b58110d..1bd8b5899240 100644 --- a/nixpkgs/pkgs/applications/misc/mkgmap/splitter/default.nix +++ b/nixpkgs/pkgs/applications/misc/mkgmap/splitter/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "splitter"; - version = "598"; + version = "642"; src = fetchurl { url = "https://www.mkgmap.org.uk/download/splitter-r${version}-src.tar.gz"; - sha256 = "gpbJpDBXA9tmSmx9oKLa7xWtIOHBTYd1iPPgNTC2C2M="; + sha256 = "zMuMutkk0RsbEH+5undcMmZRCGYJ7LRvdK1pxAgQRYk="; }; patches = [ diff --git a/nixpkgs/pkgs/applications/misc/mnamer/default.nix b/nixpkgs/pkgs/applications/misc/mnamer/default.nix index dd634ae7f137..cad389bf0b9e 100644 --- a/nixpkgs/pkgs/applications/misc/mnamer/default.nix +++ b/nixpkgs/pkgs/applications/misc/mnamer/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "mnamer"; - version = "2.5.3"; + version = "2.5.4"; src = fetchFromGitHub { owner = "jkwill87"; repo = "mnamer"; rev = version; - sha256 = "1frrvfhp85fh82yw9yb6n61by8qp1v7f3c0f623njxk1afawhccd"; + sha256 = "sha256-fONQq/RboWHFuEFU7HP1ThUpSjOIlkg54c2WlMUKwuk="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/applications/misc/mob/default.nix b/nixpkgs/pkgs/applications/misc/mob/default.nix index 72aa41d03c26..e9e0559b0d08 100644 --- a/nixpkgs/pkgs/applications/misc/mob/default.nix +++ b/nixpkgs/pkgs/applications/misc/mob/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "mob"; - version = "1.10.0"; + version = "1.12.0"; goPackagePath = "github.com/remotemobprogramming/mob"; src = fetchFromGitHub { rev = "v${version}"; owner = "remotemobprogramming"; repo = pname; - sha256 = "sha256-O732PNmE+RDmETHAX/vlaSF4ZUShmO7P1B41kCw+/cQ="; + sha256 = "sha256-5hvuaKlaWrB8nEeHytnn4ywciLbOSoXdBdc3K/PqMG8="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/misc/moolticute/default.nix b/nixpkgs/pkgs/applications/misc/moolticute/default.nix index eabc93492378..653e8e9a1cc4 100644 --- a/nixpkgs/pkgs/applications/misc/moolticute/default.nix +++ b/nixpkgs/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "0.45.0"; + version = "0.52.0"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "sha256-azJ63NI0wzzv3acgoPaeF+lTM1WKpXg595FrK908k1U="; + sha256 = "sha256-6o0Tf6qBxCEOvfSuEP2Qz72T9Oexp95knRCtwImlpsA="; }; outputs = [ "out" "udev" ]; diff --git a/nixpkgs/pkgs/applications/misc/mop/default.nix b/nixpkgs/pkgs/applications/misc/mop/default.nix index 007965f868b1..f31b79c9ddf4 100644 --- a/nixpkgs/pkgs/applications/misc/mop/default.nix +++ b/nixpkgs/pkgs/applications/misc/mop/default.nix @@ -9,7 +9,7 @@ buildGoPackage rec { goDeps = ./deps.nix; preConfigure = '' - for i in $(find . -type f);do + for i in *.go **/*.go; do substituteInPlace $i --replace michaeldv/termbox-go nsf/termbox-go done substituteInPlace Makefile --replace mop/cmd mop/mop diff --git a/nixpkgs/pkgs/applications/misc/navi/default.nix b/nixpkgs/pkgs/applications/misc/navi/default.nix index 9b96fea718bf..04fe08e1f386 100644 --- a/nixpkgs/pkgs/applications/misc/navi/default.nix +++ b/nixpkgs/pkgs/applications/misc/navi/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "navi"; - version = "2.16.0"; + version = "2.17.0"; src = fetchFromGitHub { owner = "denisidoro"; repo = "navi"; rev = "v${version}"; - sha256 = "sha256-ngSZFYGE+Varul/qwavMO3xcMIp8w2WETWXc573wYhQ="; + sha256 = "sha256-WH8FfQ7cD4aFUi9iE0tR/B+5oWy8tMVmMLxusDwXF7w="; }; - cargoSha256 = "sha256-qtxFTk0iCxPa4Z7H9+QWSii+iYrLUV2LfiAEbePdhOQ="; + cargoSha256 = "sha256-TH9DNCoUVqH5g05Z4Vdv7F8CCLnaYezupI5FeJhYTaQ="; nativeBuildInputs = [ makeWrapper ]; @@ -23,6 +23,11 @@ rustPlatform.buildRustPackage rec { --prefix PATH : ${lib.makeBinPath [ fzf wget ]} ''; + checkFlags = [ + # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context + "--skip=test_parse_variable_line" + ]; + meta = with lib; { description = "An interactive cheatsheet tool for the command-line and application launchers"; homepage = "https://github.com/denisidoro/navi"; diff --git a/nixpkgs/pkgs/applications/misc/numberstation/default.nix b/nixpkgs/pkgs/applications/misc/numberstation/default.nix index c51306bb93fe..9809a2a62058 100644 --- a/nixpkgs/pkgs/applications/misc/numberstation/default.nix +++ b/nixpkgs/pkgs/applications/misc/numberstation/default.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { pname = "numberstation"; - version = "0.4.0"; + version = "0.5.0"; format = "other"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "~martijnbraam"; repo = "numberstation"; rev = version; - sha256 = "038yyffqknr274f7jh5z12y68pjxr37f8y2cn2pwhf605jmbmpwv"; + sha256 = "1hh66i0rfm85a97iajxlh965wk68hn0kkfgi9cljjkqf98xiy0bb"; }; postPatch = '' @@ -63,6 +63,6 @@ python3.pkgs.buildPythonApplication rec { description = "TOTP Authentication application for mobile"; homepage = "https://sr.ht/~martijnbraam/numberstation/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda tomfitzhenry ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix b/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix index efe4740d7737..b822a7ed117d 100644 --- a/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix +++ b/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "nwg-drawer"; - version = "0.1.7"; + version = "0.1.11"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WUYWS0pkYJwXadhlZDHIl9BuirLTu5TNITZ+cBMArVw="; + sha256 = "sha256-aUn9zvlNUuvm7Uo0wyzbkSLXfUDcKn1uxAu3pVwq0FA="; }; vendorSha256 = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk="; diff --git a/nixpkgs/pkgs/applications/misc/obinskit/default.nix b/nixpkgs/pkgs/applications/misc/obinskit/default.nix index 5e37e74902e4..c7725fbcb2fb 100644 --- a/nixpkgs/pkgs/applications/misc/obinskit/default.nix +++ b/nixpkgs/pkgs/applications/misc/obinskit/default.nix @@ -4,7 +4,7 @@ , libxkbcommon , systemd , xorg -, electron_3 +, electron_11 , makeWrapper , makeDesktopItem }: @@ -17,15 +17,15 @@ let genericName = "Obinskit keyboard configurator"; categories = "Utility"; }; - electron = electron_3; + electron = electron_11; in stdenv.mkDerivation rec { pname = "obinskit"; - version = "1.1.4"; + version = "1.1.8"; src = fetchurl { url = "http://releases.obins.net/occ/linux/tar/ObinsKit_${version}_x64.tar.gz"; - sha256 = "0q422rmfn4k4ww1qlgrwdmxz4l10dxkd6piynbcw5cr4i5icnh2l"; + sha256 = "MgasbgexOdscQrUte/6OzCSrc74RvaBq44oHplQA/Gc="; }; unpackPhase = "tar -xzf $src"; @@ -51,12 +51,12 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/opt/obinskit/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon (lib.getLib systemd) xorg.libXt ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon (lib.getLib systemd) xorg.libXt xorg.libXtst ]}" ''; meta = with lib; { description = "Graphical configurator for Anne Pro and Anne Pro II keyboards"; - homepage = "http://en.obins.net/obinskit/"; # https is broken + homepage = "https://www.hexcore.xyz/obinskit"; license = licenses.unfree; maintainers = with maintainers; [ shou ]; platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix b/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix index 616596ed9b18..bb727b2adbb5 100644 --- a/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix +++ b/nixpkgs/pkgs/applications/misc/octoprint/plugins.nix @@ -2,15 +2,17 @@ with pkgs; -self: super: let +self: super: +let buildPlugin = args: self.buildPythonPackage (args // { pname = "OctoPrintPlugin-${args.pname}"; inherit (args) version; - propagatedBuildInputs = (args.propagatedBuildInputs or []) ++ [ super.octoprint ]; + propagatedBuildInputs = (args.propagatedBuildInputs or [ ]) ++ [ super.octoprint ]; # none of the following have tests doCheck = false; }); -in { +in +{ inherit buildPlugin; m86motorsoff = buildPlugin rec { @@ -84,7 +86,7 @@ in { meta = with lib; { description = "Plugin to display the estimated print cost for the loaded model."; - homepage = "https://github.com/malnvenshorn/OctoPrint-CostEstimation"; + homepage = "https://github.com/OllisGit/OctoPrint-CostEstimation"; license = licenses.agpl3Only; maintainers = with maintainers; [ stunkymonkey ]; }; @@ -147,6 +149,25 @@ in { }; }; + ender3v2tempfix = buildPlugin rec { + pname = "OctoPrintPlugin-ender3v2tempfix"; + version = "unstable-2021-04-27"; + + src = fetchFromGitHub { + owner = "SimplyPrint"; + repo = "OctoPrint-Creality2xTemperatureReportingFix"; + rev = "2c4183b6a0242a24ebf646d7ac717cd7a2db2bcf"; + sha256 = "03bc2zbffw4ksk8if90kxhs3179nbhb4xikp4f0adm3lrnvxkd3s"; + }; + + meta = with lib; { + description = "Fixes the double temperature reporting from the Creality Ender-3 v2 printer"; + homepage = "https://github.com/SimplyPrint/OctoPrint-Creality2xTemperatureReportingFix"; + license = licenses.mit; + maintainers = with maintainers; [ illustris ]; + }; + }; + gcodeeditor = buildPlugin rec { pname = "GcodeEditor"; version = "0.2.12"; diff --git a/nixpkgs/pkgs/applications/misc/plank/default.nix b/nixpkgs/pkgs/applications/misc/plank/default.nix index 85e3bb48119c..1a8f0df5e41c 100644 --- a/nixpkgs/pkgs/applications/misc/plank/default.nix +++ b/nixpkgs/pkgs/applications/misc/plank/default.nix @@ -23,7 +23,6 @@ , libgee , wrapGAppsHook , autoreconfHook -, pantheon }: stdenv.mkDerivation rec { @@ -84,6 +83,6 @@ stdenv.mkDerivation rec { homepage = "https://launchpad.net/plank"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers; + maintainers = with maintainers; [ davidak ] ++ teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/applications/misc/plover/default.nix b/nixpkgs/pkgs/applications/misc/plover/default.nix index ac4811b30c41..68721c846f74 100644 --- a/nixpkgs/pkgs/applications/misc/plover/default.nix +++ b/nixpkgs/pkgs/applications/misc/plover/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, python27Packages, python36Packages, wmctrl, +{ lib, fetchurl, python27Packages, python3Packages, wmctrl, qtbase, mkDerivationWith }: { @@ -24,9 +24,9 @@ ]; }; - dev = with python36Packages; mkDerivationWith buildPythonPackage rec { + dev = with python3Packages; mkDerivationWith buildPythonPackage rec { pname = "plover"; - version = "4.0.0.dev8"; + version = "4.0.0.dev10"; meta = with lib; { description = "OpenSteno Plover stenography software"; @@ -36,7 +36,7 @@ src = fetchurl { url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz"; - sha256 = "1wxkmik1zyw5gqig5r0cas5v6f5408fbnximzw610rdisqy09rxp"; + sha256 = "sha256-Eun+ZgmOIjYw6FS/2OGoBvYh52U/Ue0+NtIqrvV2Tqc="; }; # I'm not sure why we don't find PyQt5 here but there's a similar diff --git a/nixpkgs/pkgs/applications/misc/portfolio-filemanager/default.nix b/nixpkgs/pkgs/applications/misc/portfolio-filemanager/default.nix index 6b4946976bf6..b7cd7c0e1170 100644 --- a/nixpkgs/pkgs/applications/misc/portfolio-filemanager/default.nix +++ b/nixpkgs/pkgs/applications/misc/portfolio-filemanager/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { pname = "portfolio"; - version = "0.9.10"; + version = "0.9.12"; format = "other"; @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { owner = "tchx84"; repo = "Portfolio"; rev = "v${version}"; - sha256 = "06hk0kx6h8w263qa71bik68rg4r8qs94b6s60pyhzicfc822k0j4"; + sha256 = "sha256-P+XQRIL2DepoOSVElxVxMihqxdxwLVnvXuraZN8L7z8="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/misc/privacyidea/default.nix b/nixpkgs/pkgs/applications/misc/privacyidea/default.nix index 217ea6f5e6cc..b8e4ebf841cd 100644 --- a/nixpkgs/pkgs/applications/misc/privacyidea/default.nix +++ b/nixpkgs/pkgs/applications/misc/privacyidea/default.nix @@ -14,7 +14,8 @@ let }); flask_migrate = super.flask_migrate.overridePythonAttrs (oldAttrs: rec { version = "2.7.0"; - src = oldAttrs.src.override { + src = python3.pkgs.fetchPypi { + pname = "Flask-Migrate"; inherit version; sha256 = "ae2f05671588762dd83a21d8b18c51fe355e86783e24594995ff8d7380dffe38"; }; diff --git a/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix index bc9b83178da0..479e497e3418 100644 --- a/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -1,23 +1,27 @@ { lib, fetchFromGitHub, makeDesktopItem, prusa-slicer }: let appname = "SuperSlicer"; - version = "2.3.56.8"; pname = "super-slicer"; description = "PrusaSlicer fork with more features and faster development cycle"; - override = super: { + + versions = { + stable = { version = "2.3.56.9"; sha256 = "sha256-vv01wGQkrasKKjpGSDeDqZbd1X5/iTfGXYN5Jwz+FKE="; }; + staging = { version = "2.3.57.0"; sha256 = "sha256-7o0AqgQcKYc6c+Hi3x5pC/pKJZPlEsYOYk9sC21+mvM="; }; + }; + + override = { version, sha256 }: super: { inherit version pname; src = fetchFromGitHub { owner = "supermerill"; repo = "SuperSlicer"; - sha256 = "sha256-em0OgrcPaV2VYM8DpvtVJjgdojStMF/ROUEtZ8iLZfo="; + inherit sha256; rev = version; fetchSubmodules = true; }; # We don't need PS overrides anymore, and gcode-viewer is embedded in the binary. postInstall = null; - dontStrip = true; separateDebugInfo = true; # See https://github.com/supermerill/SuperSlicer/issues/432 @@ -44,5 +48,10 @@ let maintainers = with maintainers; [ cab404 moredread ]; }; + passthru = allVersions; + }; -in prusa-slicer.overrideAttrs override + + allVersions = builtins.mapAttrs (_name: version: (prusa-slicer.overrideAttrs (override version))) versions; +in +allVersions.stable diff --git a/nixpkgs/pkgs/applications/misc/psi-notify/default.nix b/nixpkgs/pkgs/applications/misc/psi-notify/default.nix new file mode 100644 index 000000000000..5a4b6f385df2 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/psi-notify/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchFromGitHub, systemd, libnotify, pkg-config }: + +stdenv.mkDerivation rec { + pname = "psi-notify"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "cdown"; + repo = pname; + rev = version; + sha256 = "0hn37plim1smmlrjjmz8kybyms8pz3wxcgf8vmqjrsqi6bfcym7g"; + }; + + buildInputs = [ systemd libnotify ]; + nativeBuildInputs = [ pkg-config ]; + + installPhase = '' + runHook preInstall + + install -D psi-notify $out/bin/psi-notify + substituteInPlace psi-notify.service --replace psi-notify $out/bin/psi-notify + install -D psi-notify.service $out/share/systemd/user/psi-notify.service + + runHook postInstall + ''; + + meta = with lib; { + description = "Alert on system resource saturation"; + longDescription = '' + psi-notify can alert you when resources on your machine are becoming + oversaturated, and allow you to take action before your system slows to a + crawl. + ''; + license = licenses.mit; + homepage = "https://github.com/cdown/psi-notify"; + platforms = platforms.linux; + maintainers = with maintainers; [ eduarrrd ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/pueue/default.nix b/nixpkgs/pkgs/applications/misc/pueue/default.nix index 298307b58f91..ac79f5be8460 100644 --- a/nixpkgs/pkgs/applications/misc/pueue/default.nix +++ b/nixpkgs/pkgs/applications/misc/pueue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.12.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-umVIMboKG6cZ1JOcfhOEZTQwPLxC2LdlGUa4U6LXh/g="; + sha256 = "sha256-1iAXLs3O7EV7LfbXnajlDm75tQtanFInfNWZmnittlk="; }; - cargoSha256 = "sha256-nppwwO0dBXYG/ZJMNWGnl7J77GDI7+NV8QAmfcbpJD4="; + cargoSha256 = "sha256-x/qRNxZS++DBq5B9+/9eXN95QZN/FSLi+3XyJ06Y1hg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/misc/qcad/default.nix b/nixpkgs/pkgs/applications/misc/qcad/default.nix index 19e5d18fe93c..bddcfa497d91 100644 --- a/nixpkgs/pkgs/applications/misc/qcad/default.nix +++ b/nixpkgs/pkgs/applications/misc/qcad/default.nix @@ -17,13 +17,13 @@ mkDerivationWith stdenv.mkDerivation rec { pname = "qcad"; - version = "3.26.1.0"; + version = "3.26.4.7"; src = fetchFromGitHub { owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-OWAc7g8DiJR3z6dUF5D0Yo3wnRKd1Xe7D1eq15NRW5c="; + sha256 = "sha256-of0wsuHWM2mzGQmu9P4AHqXCHew45ywnnv/Al2o47ZM="; }; patches = [ diff --git a/nixpkgs/pkgs/applications/misc/qdirstat/default.nix b/nixpkgs/pkgs/applications/misc/qdirstat/default.nix index d5450f0e5c4e..60db29b83ba5 100644 --- a/nixpkgs/pkgs/applications/misc/qdirstat/default.nix +++ b/nixpkgs/pkgs/applications/misc/qdirstat/default.nix @@ -4,13 +4,13 @@ let pname = "qdirstat"; - version = "1.7.1"; + version = "1.8"; src = fetchFromGitHub { owner = "shundhammer"; repo = pname; rev = version; - sha256 = "sha256-i1xHMwSnBULJbOA/ykQK9WBd+6TBNBRI9hnU1FDGQlY="; + sha256 = "sha256-R/eUqv5AxO5TcLkqOvlAXEkjAzeKGihf8YIQIIevOR0="; }; in diff --git a/nixpkgs/pkgs/applications/misc/safeeyes/default.nix b/nixpkgs/pkgs/applications/misc/safeeyes/default.nix index 179ebd33d856..c188e5f78532 100644 --- a/nixpkgs/pkgs/applications/misc/safeeyes/default.nix +++ b/nixpkgs/pkgs/applications/misc/safeeyes/default.nix @@ -57,6 +57,9 @@ in buildPythonApplication rec { # safeeyes images --prefix XDG_DATA_DIRS : "$out/lib/${python.libPrefix}/site-packages/usr/share" ) + mkdir -p $out/share/applications + cp -r safeeyes/platform/icons $out/share/ + cp safeeyes/platform/safeeyes.desktop $out/share/applications/ ''; doCheck = false; # no tests diff --git a/nixpkgs/pkgs/applications/misc/seatd/default.nix b/nixpkgs/pkgs/applications/misc/seatd/default.nix index 98f278e0c3a7..0565c8add3b8 100644 --- a/nixpkgs/pkgs/applications/misc/seatd/default.nix +++ b/nixpkgs/pkgs/applications/misc/seatd/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "seatd"; - version = "0.5.0"; + version = "0.6.2"; src = fetchFromSourcehut { owner = "~kennylevinsen"; repo = "seatd"; rev = version; - sha256 = "sha256-JwlJLHkRgSRqfQEhXbzuFTmhxfbwKVdLICPbTDbC9M0="; + sha256 = "0c07i1nq0k60xmcsnr37ryqs7nzbg4qfq6fzbnzwbh1yhr8kypcm"; }; outputs = [ "bin" "out" "dev" "man" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ systemd ]; - mesonFlags = [ "-Dlogind=enabled" "-Dbuiltin=enabled" ]; + mesonFlags = [ "-Dlibseat-logind=systemd" "-Dlibseat-builtin=enabled" ]; meta = with lib; { description = "A universal seat management library"; diff --git a/nixpkgs/pkgs/applications/misc/sequeler/default.nix b/nixpkgs/pkgs/applications/misc/sequeler/default.nix index 5fd5176c95f8..123e01fe798a 100644 --- a/nixpkgs/pkgs/applications/misc/sequeler/default.nix +++ b/nixpkgs/pkgs/applications/misc/sequeler/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { ''; homepage = "https://github.com/Alecaddd/sequeler"; license = licenses.gpl3; - maintainers = [ maintainers.etu ] ++ pantheon.maintainers; + maintainers = with maintainers; [ etu ] ++ teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/misc/sidequest/default.nix b/nixpkgs/pkgs/applications/misc/sidequest/default.nix index c83cd7726591..a1be4a6b52eb 100644 --- a/nixpkgs/pkgs/applications/misc/sidequest/default.nix +++ b/nixpkgs/pkgs/applications/misc/sidequest/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }: let pname = "sidequest"; - version = "0.10.19"; + version = "0.10.24"; desktopItem = makeDesktopItem rec { name = "SideQuest"; @@ -16,7 +16,7 @@ src = fetchurl { url = "https://github.com/SideQuestVR/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz"; - sha256 = "14zqp12nigc4kv6hppyx2s59mmriimnzczay4xi3vh7zcw207px2"; + sha256 = "0bnd16f22sgy67z3d6rf4z20n56ljxczsql455p2j6kck5f75lh4"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/misc/skytemple/default.nix b/nixpkgs/pkgs/applications/misc/skytemple/default.nix index a242a520fc45..7e27acbeff70 100644 --- a/nixpkgs/pkgs/applications/misc/skytemple/default.nix +++ b/nixpkgs/pkgs/applications/misc/skytemple/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "skytemple"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "03qmjp257rk4p1zkz89cv26awdgngvakqyg6jc3g6xrhmsvr4r2p"; + sha256 = "13vvsp47frgq5c2wfllkg4lmsy5vxl53j5rw9c84d5xix5bisk1n"; }; buildInputs = [ @@ -41,6 +41,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/SkyTemple/skytemple"; description = "ROM hacking tool for Pokémon Mystery Dungeon Explorers of Sky"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ xfix ]; + maintainers = with maintainers; [ xfix marius851000 ]; }; } diff --git a/nixpkgs/pkgs/applications/misc/swappy/default.nix b/nixpkgs/pkgs/applications/misc/swappy/default.nix index 69d7836e7622..d83cf6c8484d 100644 --- a/nixpkgs/pkgs/applications/misc/swappy/default.nix +++ b/nixpkgs/pkgs/applications/misc/swappy/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "swappy"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "jtheoof"; repo = pname; rev = "v${version}"; - sha256 = "12z643c7vzffhjsxaz1lak99i4nwm688pha0hh4pg69jf5wz5xx3"; + sha256 = "sha256-sINX7pJ0msis7diGFTCgD4Mamd3yGGJew1uD8de4VOg="; }; nativeBuildInputs = [ glib meson ninja pkg-config scdoc wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix b/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix index a591a766e1e6..b360733d5058 100644 --- a/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.13.29"; + version = "0.13.33"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "sha256-56+/WQESbf31UkJU4xONLY2T+WQVM0bI/x1yLZr3elI="; + sha256 = "sha256-vKmVScXQLDjhNJEzlhqiyhRZjR26xjrT1LijxzZK8Cg="; }; # Because there's a test that requires terminal access doCheck = false; - cargoSha256 = "sha256-8am66wP2751AAMbWDBKZ89mAgr2poq3CU+aJF+I8/fs="; + cargoSha256 = "sha256-0E4nk8WLprumHKQjpdn+U36z7mdgFb7g/i7egLk4Jcs="; meta = with lib; { description = "A terminal user interface for taskwarrior "; diff --git a/nixpkgs/pkgs/applications/misc/ticker/default.nix b/nixpkgs/pkgs/applications/misc/ticker/default.nix index 4de28e6a861a..f268a9f4ecec 100644 --- a/nixpkgs/pkgs/applications/misc/ticker/default.nix +++ b/nixpkgs/pkgs/applications/misc/ticker/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ticker"; - version = "4.2.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-T9pApuzATohiOUmWa+GBlLrlTNgKNMwtW6fSPO/NS6Y="; + sha256 = "sha256-DdUXT8xrKd114U+CSwIgl7XczxQZGWVZA3tMU7461xY="; }; vendorSha256 = "sha256-vTB1RPg1LN44bkWrdGEXR6WRlM/Q2EITUO0yt5ar/zg="; diff --git a/nixpkgs/pkgs/applications/misc/trenchbroom/default.nix b/nixpkgs/pkgs/applications/misc/trenchbroom/default.nix new file mode 100644 index 000000000000..b6ff02116914 --- /dev/null +++ b/nixpkgs/pkgs/applications/misc/trenchbroom/default.nix @@ -0,0 +1,65 @@ +{ lib, stdenv, fetchFromGitHub +, cmake, ninja, git, pandoc +, libGL, libGLU, libXxf86vm, freeimage +, qtbase, wrapQtAppsHook +, copyDesktopItems, makeDesktopItem +}: + +stdenv.mkDerivation rec { + pname = "TrenchBroom"; + version = "2021.1"; + + src = fetchFromGitHub { + owner = "TrenchBroom"; + repo = "TrenchBroom"; + rev = "v${version}"; + sha256 = "06j68kp7g57hclyp8ilh2wd4vr5w8r718cicdp1cap48fcxlqfxv"; + fetchSubmodules = true; + }; + postPatch = '' + substituteInPlace common/src/Version.h.in \ + --subst-var-by APP_VERSION_YEAR ${lib.versions.major version} \ + --subst-var-by APP_VERSION_NUMBER ${lib.versions.minor version} \ + --subst-var-by GIT_DESCRIBE v${version} + ''; + + nativeBuildInputs = [ cmake git pandoc wrapQtAppsHook copyDesktopItems ]; + buildInputs = [ libGL libGLU libXxf86vm freeimage qtbase ]; + QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; + QT_QPA_PLATFORM = "offscreen"; + ninjaFlags = [ + "TrenchBroom" + ]; + preBuild = "export HOME=$(mktemp -d)"; + + postInstall = '' + pushd $out/share/TrenchBroom/icons + + for F in icon_*.png; do + SIZE=$(echo $F|sed -e s/icon_// -e s/.png//) + DIR=$out/share/icons/hicolor/$SIZE"x"$SIZE/apps + mkdir -p $DIR + ln -s ../../../../TrenchBroom/icons/$F $DIR/trenchbroom.png + done + + popd + ''; + + desktopItems = [ + (makeDesktopItem { + name = "TrenchBroom"; + desktopName = "TrenchBroom level editor"; + icon = "trenchbroom"; + comment = meta.description; + categories = "Development"; + exec = "trenchbroom"; + }) + ]; + + meta = with lib; { + homepage = "https://trenchbroom.github.io/"; + description = "Level editor for Quake-engine based games"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ astro ]; + }; +} diff --git a/nixpkgs/pkgs/applications/misc/tty-solitaire/default.nix b/nixpkgs/pkgs/applications/misc/tty-solitaire/default.nix index 9ea26b52bc34..708596d40747 100644 --- a/nixpkgs/pkgs/applications/misc/tty-solitaire/default.nix +++ b/nixpkgs/pkgs/applications/misc/tty-solitaire/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tty-solitaire"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "mpereira"; repo = pname; rev = "v${version}"; - sha256 = "0kix7wfy2bda8cw5kfm7bm5acd5fqmdl9g52ms9bza4kf2jnb754"; + sha256 = "sha256-zMLNWJieHxHALFQoSkdAxGbUBGuZnznLX86lI3P21F0="; }; buildInputs = [ ncurses ]; diff --git a/nixpkgs/pkgs/applications/misc/tut/default.nix b/nixpkgs/pkgs/applications/misc/tut/default.nix index f3e74fdbe942..8e84f56c841a 100644 --- a/nixpkgs/pkgs/applications/misc/tut/default.nix +++ b/nixpkgs/pkgs/applications/misc/tut/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tut"; - version = "0.0.27"; + version = "0.0.33"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "sha256-P5tIu6cmh37haWJodBGmzgE8f0QUTwIQes9AuiaVSxU="; + sha256 = "sha256-8aa3LYLHjodyYradF2NBuZReHTYBf9TvfVCoDs0gAUw="; }; - vendorSha256 = "1zmwfgl1mayqcqk93368l94d6yah1qb0x11vf9b2x7zbzxzfshg9"; + vendorSha256 = "sha256-DcMsxqUO9H1q5+njoOuxQ6l8ifSFuS1jdWSvY/5MDm8="; meta = with lib; { description = "A TUI for Mastodon with vim inspired keys"; diff --git a/nixpkgs/pkgs/applications/misc/ulauncher/default.nix b/nixpkgs/pkgs/applications/misc/ulauncher/default.nix index 0b7a766ba39d..d2df076dc23d 100644 --- a/nixpkgs/pkgs/applications/misc/ulauncher/default.nix +++ b/nixpkgs/pkgs/applications/misc/ulauncher/default.nix @@ -20,13 +20,13 @@ python3Packages.buildPythonApplication rec { pname = "ulauncher"; - version = "5.11.0"; + version = "5.12.1"; disabled = python3Packages.isPy27; src = fetchurl { url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; - sha256 = "sha256-xEM7sG0NRWouDu6NxNA94WTycykEhPI4ByjDk2yjHjo="; + sha256 = "sha256-Fd3IOCEeXGV8zGd/8SzrWRsSsZRVePnsDaX8WrBrCOQ="; }; nativeBuildInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/applications/misc/upwork/default.nix b/nixpkgs/pkgs/applications/misc/upwork/default.nix index e70b875e6f2c..3b159d4b7f5d 100644 --- a/nixpkgs/pkgs/applications/misc/upwork/default.nix +++ b/nixpkgs/pkgs/applications/misc/upwork/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "upwork"; - version = "5.6.7.13"; + version = "5.6.8.0"; src = fetchurl { - url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_7_13_9f0e0a44a59e4331/${pname}_${version}_amd64.deb"; - sha256 = "f1d3168cda47f77100192ee97aa629e2452fe62fb364dd59ad361adbc0d1da87"; + url = "https://upwork-usw2-desktopapp.upwork.com/binaries/v5_6_8_0_836f43f6f6be4149/${pname}_${version}_amd64.deb"; + sha256 = "b3a52f773d633837882dc107b206006325722ca5d5d5a1e8bdf5453f872e1b6f"; }; dontWrapGApps = true; diff --git a/nixpkgs/pkgs/applications/misc/variety/default.nix b/nixpkgs/pkgs/applications/misc/variety/default.nix index 9b40c4c44f1f..948719aae762 100644 --- a/nixpkgs/pkgs/applications/misc/variety/default.nix +++ b/nixpkgs/pkgs/applications/misc/variety/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, python37Packages +, python3Packages , fehSupport ? false, feh , imagemagickSupport ? true, imagemagick , intltool @@ -13,7 +13,7 @@ , makeWrapper }: -with python37Packages; +with python3Packages; buildPythonApplication rec { pname = "variety"; diff --git a/nixpkgs/pkgs/applications/misc/visidata/default.nix b/nixpkgs/pkgs/applications/misc/visidata/default.nix index 11216b1d8878..b56904e7fd6d 100644 --- a/nixpkgs/pkgs/applications/misc/visidata/default.nix +++ b/nixpkgs/pkgs/applications/misc/visidata/default.nix @@ -24,13 +24,13 @@ }: buildPythonApplication rec { pname = "visidata"; - version = "2.5"; + version = "2.6"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - sha256 = "1iijggdgj36v7d2zm45c00nrbzxaaah2azflpca0f6fjaaxh3lr2"; + sha256 = "sha256-fsk+Cn7CzrOAif5+LUMrs8llSnEfoSLAdg1qOFMJOh8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/wike/default.nix b/nixpkgs/pkgs/applications/misc/wike/default.nix index fac8ac2886d3..41722edc4c20 100644 --- a/nixpkgs/pkgs/applications/misc/wike/default.nix +++ b/nixpkgs/pkgs/applications/misc/wike/default.nix @@ -14,13 +14,13 @@ let ]); in stdenv.mkDerivation rec { pname = "wike"; - version = "1.5.6"; + version = "1.5.7"; src = fetchFromGitHub { owner = "hugolabe"; repo = "Wike"; rev = version; - sha256 = "1qnxzxqjj0sn522k15plskwa7nlhhbcipfc3w17fbq3k2zhpr1yy"; + sha256 = "sha256-SB+ApuSovqQCaZYPhH+duf+c07JDSSCRz8hTVhEa4gY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/misc/wtf/default.nix b/nixpkgs/pkgs/applications/misc/wtf/default.nix index 30ae2d9be0f6..ea7986595f49 100644 --- a/nixpkgs/pkgs/applications/misc/wtf/default.nix +++ b/nixpkgs/pkgs/applications/misc/wtf/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.38.0"; + version = "0.39.2"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZKv207pkjgXtCZ6kXGn94i8QtOBHpSkPKo1Sy2Nw9qQ="; + sha256 = "sha256-nP56HzjtIg9EIOBda9TQl8soUqlGfRmixidWrmQ7+vs="; }; - vendorSha256 = "sha256-E5sfT7uGnruVUfhhjkZM2mgauXzbmcLWS6s1J85nssE="; + vendorSha256 = "sha256-yD4BUauYvyGk/D0Gr5Z15xWPtI/ZR9xTbmeS6RAxw1o="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/misc/xcruiser/default.nix b/nixpkgs/pkgs/applications/misc/xcruiser/default.nix index 2e4771563a04..db7fe260b924 100644 --- a/nixpkgs/pkgs/applications/misc/xcruiser/default.nix +++ b/nixpkgs/pkgs/applications/misc/xcruiser/default.nix @@ -12,8 +12,10 @@ stdenv.mkDerivation { buildInputs = [ libXt libXaw libXpm libXext ]; makeFlags = [ - "BINDIR=$(out)/bin" - "XAPPLOADDIR=$(out)/etc/X11/app-defaults" + "BINDIR=${placeholder "out"}/bin" + "CONFDIR=${placeholder "out"}/etc/X11" + "LIBDIR=${placeholder "out"}/lib/X11" + "XAPPLOADDIR=${placeholder "out"}/etc/X11/app-defaults" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/misc/xmrig/default.nix b/nixpkgs/pkgs/applications/misc/xmrig/default.nix index affce3a71aaa..c0120e33992f 100644 --- a/nixpkgs/pkgs/applications/misc/xmrig/default.nix +++ b/nixpkgs/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.14.0"; + version = "6.14.1"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-h+Y7hXkenoLT83eG0w6YEfOuEocejXgvqRMq1DwWwT0="; + sha256 = "sha256-JJ20LKA4gnPXO6d2Cegr3I67k+ZZc69hdL1dTUIF5OM="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix b/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix index fa9f1644b50e..431aac070f24 100644 --- a/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix @@ -2,13 +2,13 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.14.1-mo2"; + version = "6.15.0-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-bfD/zxUo4ZDLRDpFbD/FCAvBISHvhRaYXwwiYFd10No="; + sha256 = "sha256-2JT315JbjiU8gAwROZL820MYC/v3MPtJVsN+vsf4KDQ="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix b/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix index 22ec54b67b5a..6d1105506f56 100644 --- a/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix +++ b/nixpkgs/pkgs/applications/misc/xmrig/proxy.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig-proxy"; - version = "6.14.0"; + version = "6.15.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "sha256-QCjXtn7O4jcPybzMsu2j7jQqWoGzeqjwessZC/dG86s="; + sha256 = "sha256-ZNyD0P1vuX/FBPW6tg4WRcNCJpz9/gY+Bhipqngv3jY="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/misc/xxkb/default.nix b/nixpkgs/pkgs/applications/misc/xxkb/default.nix index 7a0111785c14..b579579195f6 100644 --- a/nixpkgs/pkgs/applications/misc/xxkb/default.nix +++ b/nixpkgs/pkgs/applications/misc/xxkb/default.nix @@ -24,7 +24,9 @@ stdenv.mkDerivation rec { makeFlags = [ "BINDIR=${placeholder "out"}/bin" + "CONFDIR=${placeholder "out"}/etc/X11" "PIXMAPDIR=${placeholder "out"}/share/xxkb" + "LIBDIR=${placeholder "out"}/lib/X11" "XAPPLOADDIR=${placeholder "out"}/etc/X11/app-defaults" "MANDIR=${placeholder "man"}/share/man" ]; diff --git a/nixpkgs/pkgs/applications/misc/yambar/default.nix b/nixpkgs/pkgs/applications/misc/yambar/default.nix index db2f0579d1e8..96b44dc8961a 100644 --- a/nixpkgs/pkgs/applications/misc/yambar/default.nix +++ b/nixpkgs/pkgs/applications/misc/yambar/default.nix @@ -32,14 +32,14 @@ in stdenv.mkDerivation rec { pname = "yambar"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "yambar"; rev = version; - sha256 = "sha256-GPKR2BYl3ebxxXbVfH/oZLs7639EYwWU4ZsilJn0Ss8="; + sha256 = "sha256-NzJrlPOkzstMbw37yBTah/uFYezlPB/1hrxCiXduSmc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix b/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix index e894572dd78c..397c64141ac9 100644 --- a/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix +++ b/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix @@ -32,8 +32,7 @@ , openssl , pango , procps -, python37 -, python37Packages +, python3 , stdenv , systemd , xdg-utils @@ -101,8 +100,8 @@ stdenv.mkDerivation rec { dontBuild = true; buildInputs = [ - python37 - python37Packages.dbus-python + python3 + python3.pkgs.dbus-python ]; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/browsers/angelfish/default.nix b/nixpkgs/pkgs/applications/networking/browsers/angelfish/default.nix index 391993617da2..dedc51469670 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/angelfish/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/angelfish/default.nix @@ -20,17 +20,17 @@ mkDerivation rec { pname = "angelfish"; - version = "21.06"; + version = "21.08"; src = fetchurl { url = "mirror://kde/stable/plasma-mobile/${version}/angelfish-${version}.tar.xz"; - sha256 = "sha256-iHgmG/DeaUPnRXlVIU8P/oUcYINienYmR2zI9Q4Yd3s="; + sha256 = "1gzvlha159bw767mj8lisn89592j4j4dazzfws3v4anddjh60xnh"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "0zh0kli7kav18v9znq2f5jklhf3m1kyb41jzmivjx70g9xyfzlwk"; + sha256 = "1pbvw9hdzn3i97mahdy9y6jnjsmwmjs3lxfz7q6r9r10i8swbkak"; }; nativeBuildInputs = [ @@ -63,7 +63,7 @@ mkDerivation rec { meta = with lib; { description = "Web browser for Plasma Mobile"; - homepage = "https://apps.kde.org/en/mobile.angelfish"; + homepage = "https://invent.kde.org/plasma-mobile/angelfish"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix index 8b80f8f8a6ef..96729f1dcda6 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/browser.nix @@ -19,8 +19,7 @@ mkChromiumDerivation (base: rec { cp -v "$buildPath/"*.so "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" - ${lib.optionalString (!chromiumVersionAtLeast "94") ''cp -v "$buildPath/crashpad_handler" "$libExecPath/"''} - ${lib.optionalString (chromiumVersionAtLeast "94") ''cp -v "$buildPath/chrome_crashpad_handler" "$libExecPath/"''} + cp -v "$buildPath/chrome_crashpad_handler" "$libExecPath/" cp -v "$buildPath/chrome" "$libExecPath/$packageName" # Swiftshader diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index be3eff9bd955..4b7fbc38bbcc 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -85,17 +85,18 @@ let in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); # https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py - gnSystemLibraries = lib.optionals (!chromiumVersionAtLeast "93") [ - "ffmpeg" - "snappy" + gnSystemLibraries = lib.optionals (!chromiumVersionAtLeast "95") [ + "zlib" ] ++ [ + # TODO: + # "ffmpeg" + # "snappy" "flac" "libjpeg" "libpng" "libwebp" "libxslt" "opus" - "zlib" ]; opusWithCustomModes = libopus.override { @@ -159,21 +160,6 @@ let ./patches/no-build-timestamps.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: ./patches/widevine-79.patch - ] ++ lib.optionals (versionRange "91" "94") [ - # Fix the build by adding a missing dependency (s. https://crbug.com/1197837): - ./patches/fix-missing-atspi2-dependency.patch - # Required as dependency for the next patch: - (githubPatch { - # Reland "Reland "Linux sandbox syscall broker: use struct kernel_stat"" - commit = "4b438323d68840453b5ef826c3997568e2e0e8c7"; - sha256 = "1lf6yilx2ffd3r0840ilihp4px35w7jvr19ll56bncqmz4r5fd82"; - }) - # To fix the text rendering, see #131074: - (githubPatch { - # Linux sandbox: fix fstatat() crash - commit = "60d5e803ef2a4874d29799b638754152285e0ed9"; - sha256 = "0apmsqqlfxprmdmi3qzp3kr9jc52mcc4xzps206kwr8kzwv48b70"; - }) ]; postPatch = '' @@ -195,7 +181,7 @@ let substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" fi - chmod -x third_party/webgpu-cts/src/tools/deno + chmod -x third_party/webgpu-cts/src/tools/${lib.optionalString (chromiumVersionAtLeast "96") "run_"}deno # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ @@ -252,6 +238,7 @@ let # e.g. unsafe developer builds have developer-friendly features that may # weaken or disable security measures like sandboxing or ASLR): is_official_build = true; + disable_fieldtrial_testing_config = true; # Build Chromium using the system toolchain (for Linux distributions): custom_toolchain = "//build/toolchain/linux/unbundle:default"; host_toolchain = "//build/toolchain/linux/unbundle:default"; @@ -288,10 +275,6 @@ let enable_widevine = true; # Provides the enable-webrtc-pipewire-capturer flag to support Wayland screen capture: rtc_use_pipewire = true; - } // optionalAttrs (!chromiumVersionAtLeast "94") { - fieldtrial_testing_like_official_build = true; - } // optionalAttrs (chromiumVersionAtLeast "94") { - disable_fieldtrial_testing_config = true; } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix b/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix index 86ee33f3510f..c4521c89caa6 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,5 @@ { newScope, config, stdenv, fetchurl, makeWrapper -, llvmPackages_12, llvmPackages_13, ed, gnugrep, coreutils, xdg-utils +, llvmPackages_13, ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit , libva, pipewire, wayland , gcc, nspr, nss, runCommand @@ -19,7 +19,7 @@ }: let - llvmPackages = llvmPackages_12; + llvmPackages = llvmPackages_13; stdenv = llvmPackages.stdenv; upstream-info = (lib.importJSON ./upstream-info.json).${channel}; @@ -54,9 +54,6 @@ let inherit (upstream-info.deps.gn) url rev sha256; }; }); - } // lib.optionalAttrs (chromiumVersionAtLeast "93") rec { - llvmPackages = llvmPackages_13; - stdenv = llvmPackages.stdenv; }); browser = callPackage ./browser.nix { diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/fix-missing-atspi2-dependency.patch b/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/fix-missing-atspi2-dependency.patch deleted file mode 100644 index 9417b30159d7..000000000000 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/patches/fix-missing-atspi2-dependency.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 6c5b9197076f6f384112e6566039116c56600909 Mon Sep 17 00:00:00 2001 -From: Michael Weiss <dev.primeos@gmail.com> -Date: Sat, 10 Apr 2021 13:53:50 +0200 -Subject: [PATCH] Fix a missing atspi2 dependency - -See https://bugs.chromium.org/p/chromium/issues/detail?id=1197837 for -more details. ---- - content/public/browser/BUILD.gn | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn -index 7e7c436d90c7..20ef832f1d8c 100644 ---- a/content/public/browser/BUILD.gn -+++ b/content/public/browser/BUILD.gn -@@ -535,6 +535,7 @@ source_set("browser_sources") { - - if (use_atk) { - sources += [ "ax_inspect_factory_auralinux.cc" ] -+ configs += [ "//build/config/linux/atspi2" ] - } - - if (is_linux || is_chromeos) { --- -2.20.1 - diff --git a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json index a094e681e230..d7f29c4fefa2 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,26 +1,26 @@ { "stable": { - "version": "93.0.4577.63", - "sha256": "0ls8r77la6p7474j84wchvs4rvnxwfv7c8xvbxjm8h7jqak4zwza", - "sha256bin64": "1kv742arnv710mhakm2v59dwfypg7j01k7rd5if8h0s49yzdw3qc", + "version": "94.0.4606.61", + "sha256": "1gxrxmd2almwf067zycilyxkmc0d62h99ln8wp3n3i02bi9xnik4", + "sha256bin64": "116xrf8hcprbdpdx6a4xysac2phyvw88vs3n1bs24ly6pxydsasz", "deps": { "gn": { - "version": "2021-07-08", + "version": "2021-08-11", "url": "https://gn.googlesource.com/gn", - "rev": "24e2f7df92641de0351a96096fb2c490b2436bb8", - "sha256": "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl" + "rev": "69ec4fca1fa69ddadae13f9e6b7507efa0675263", + "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0" } }, "chromedriver": { - "version": "93.0.4577.15", - "sha256_linux": "11wcimkcgaiz740k9xibi5hq1kd4zgy1vk6bd6cp31wjw4y21x5f", - "sha256_darwin": "0cxf3cg5pg9rigq7wmbap6wvmgpdr6v44bndisyaqhlw7s2hhndn" + "version": "94.0.4606.41", + "sha256_linux": "06flgis4am4jmd9qz6yn1jfdr07w2n3mfrlicw6a9icg5ir64fdq", + "sha256_darwin": "1mc0hhksqm5ms4k4aji043xzxncbifjwz5fqzywy4ji64w5kqrca" } }, "beta": { - "version": "94.0.4606.41", - "sha256": "0kdi8rbly002abg9jwkmv6xmfcv7g0rm68lbdsnhr0biy7wvadij", - "sha256bin64": "0ayhppzwc4ia36hpakqg9rh3cggw33c7d2zkfaias3zm14k86ga2", + "version": "95.0.4638.17", + "sha256": "1v5r8m3wlwh6prcj7bd4zprsr4g43869lhxv43m207c5nlnqiriz", + "sha256bin64": "0h88gd8y4i2jmvhiwadbq6hzqygddym8jy1fhzp8qnwfhc30qm4m", "deps": { "gn": { "version": "2021-08-11", @@ -31,9 +31,9 @@ } }, "dev": { - "version": "95.0.4636.4", - "sha256": "1rhkmja9p2a8cxnjsrs0ipzajxwgp3c8q3903rp8ns1g579c4g3j", - "sha256bin64": "0l89iqi95fa10m3jdhbvfdjf4x88gscx6imkhy2x2ax669d19606", + "version": "96.0.4651.0", + "sha256": "0da1mhz3cy0k2igdh208i28k8fxca0yjfypvmj7624p7igrp4an6", + "sha256bin64": "1gslpdnpjp7w40lsl748rmbkbs31v22f2x45gahrijkvfrkgdqp9", "deps": { "gn": { "version": "2021-08-11", @@ -44,19 +44,19 @@ } }, "ungoogled-chromium": { - "version": "92.0.4515.159", - "sha256": "04gxgimg5ygzx6nvfws5y9dppdfjg1fhyl8zbykmksbh1myk6zfr", - "sha256bin64": "0lxnqsvqr1kw6swvkhhz475j0xvaa58ha8r1gq8zxmk48mp41985", + "version": "94.0.4606.54", + "sha256": "0p8kfnyhykbv1cylsx4hj2qdzqr2xdql9rhpva8bfla2w9hr8g83", + "sha256bin64": "0lq34l00zrr92g882xzqwq1lf2vf12x1mwidrr2qh6fz7v5418d3", "deps": { "gn": { - "version": "2021-05-07", + "version": "2021-08-11", "url": "https://gn.googlesource.com/gn", - "rev": "39a87c0b36310bdf06b692c098f199a0d97fc810", - "sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4" + "rev": "69ec4fca1fa69ddadae13f9e6b7507efa0675263", + "sha256": "031znmkbm504iim5jvg3gmazj4qnkfc7zg8aymjsij18fhf7piz0" }, "ungoogled-patches": { - "rev": "92.0.4515.159-1", - "sha256": "1mfkpkyj0sd2k07fzmxmqc24ywqqmcv3vpg1yhh96k676q0qkpd0" + "rev": "94.0.4606.54-1", + "sha256": "0phy87fiqdgikgl60yap7n1mvyvsidgznqp06j86287iihml3z2m" } } } diff --git a/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix b/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix index 64e261425755..1fea44e66279 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The always-incognito web browser"; homepage = "https://github.com/cassidyjames/ephemeral"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index d14d5b3215b9..5b7e6ad4233b 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,975 +1,985 @@ { - version = "90.0b6"; + version = "93.0b9"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ach/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ach/firefox-93.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "07c06ddfe0b2d3f4acc89a8bd5de963ae8fb90aedb7710272adbccac178af867"; + sha256 = "d0e5726093a17a6a399f3051812679311cb512e68bc840bf4f428ac3854c3796"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/af/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/af/firefox-93.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "b01b6f591d815e2dd3c0bb129952a4a5dbfc7f93d9eed2d61b8c387135768462"; + sha256 = "b511966a34c754e130644b04bd7af12d7171045ba711eaccc4f37d20c565a208"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/an/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/an/firefox-93.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "aebbf9e5edce5aa4a01b3dea5342d2335dadca261124f9557d727a2f03c5a123"; + sha256 = "c792bfaba7b3d180574a234d6b5f8130b4f5c86b7013ed389a61093b29b8163c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ar/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ar/firefox-93.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "842c29a5aa563d1f386ed74820ba2cce763e86f8d86a943295b959a51bd8bf27"; + sha256 = "ffe5349e09c6ac5a269b47b11b0a45d668046b1782c9952d344f47e7014edb5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ast/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ast/firefox-93.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "8fe01d2193b4d60ce2134ebc5848abf6621cc49bc76d08890ce7588ac2d81311"; + sha256 = "d0dc0d132efbc3801eb44507dfaee73f293fe322a2b33061e04a8258dd8a6d31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/az/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/az/firefox-93.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "e5a929e0eb95a09ec408aa831853b1a5859bb0b1f3b133677568f18bc7ba5a31"; + sha256 = "dbaa43c932c85a91f0c2febdfe79f7635be49e1ef044f4aa822934a5f6c4d001"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/be/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/be/firefox-93.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "32533dc55222e7e407b386f46d55ae78dc61581ec7653bbe9f8e9859b4d191ce"; + sha256 = "a7849eae891297d23559c0b9df2510207f4645b1084e9c38999dcc9d3477f844"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/bg/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/bg/firefox-93.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "2d561a690d625cfff4fe163dda26eac5424e89b74bd6385543238c9e85abf39b"; + sha256 = "f73997a3428ccfbbff1afae009bb6b468ea8abe64d5d628abef49a06c04103ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/bn/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/bn/firefox-93.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "3cec173b9c23137d935221d715bfeb87353bc87bd316a219c8063b5977422bc8"; + sha256 = "824032ba36651e7cc2e21bb8a0c5a0045d95f9e896dcb2a5f2708a33a9bca178"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/br/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/br/firefox-93.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "ab9bd15850209de8d7ad1ef33f50c132babc2c6e70b4ceddee84081f2707b6ab"; + sha256 = "67d55e943eb3c38ca05dc544a41d977b6e4c91c47ea4de22e51e706b9585140c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/bs/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/bs/firefox-93.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "9f9c87c0bf0a08c23dc30b29bcfb79634a52dccfa945a4593451f6230e373686"; + sha256 = "c834af150e15fe82d48b80a3d3ea272ef0aabbfb2481499787db5c7f12193c63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ca-valencia/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ca-valencia/firefox-93.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "21900bc7c61ebbf34f45da1b4740a722e00d6c0d27042a89e006fd99485e7b60"; + sha256 = "afc49c06a0eee92e8349723bde36c641b208d2b5e5edc258773e96d35eff6a47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ca/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ca/firefox-93.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6ccec2ac83ab36fb72a8db9293622d7b1c6fe55d1fb8ec6421a64e1210e7e0a1"; + sha256 = "33a30568d25de6388c61b08bb1f04afa92ff58e8359e21229d72b6b069a9e464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/cak/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/cak/firefox-93.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "7610d94fa66da37689abd3fa79e0703d77f68457c77287e5e61e66169baf7473"; + sha256 = "d862b1620a5221fbaccc638e91b4b5f5ecb8408763318551385d638c91a22e4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/cs/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/cs/firefox-93.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "6241b68e5618b474b86529222f5a646f426983eb9e39b2a4d7c3d261cd26f4e2"; + sha256 = "114a740beba1b3f934a05ceadbb54e3b663432ea5fd9d62fabc566cb00119e9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/cy/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/cy/firefox-93.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "b981946aec3128a3e7da3ca76f7815373dc8963ed01d495ee02941954ca42fca"; + sha256 = "ecfdebdd9b235d0eecfaaeb02897d01c429bbe8b16da7e7b6db3092bb0cf3221"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/da/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/da/firefox-93.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "c59f28aef1af64d1cf83e0e5e9ba4bd15be593da27e88e6ea7edaed80a3a64b5"; + sha256 = "6d7533de8a3b1898ca8129f78ab963bfc3579d80022085aa2ac1db4e1ad734b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/de/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/de/firefox-93.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "b9cd59a9b7ca024f6931d8e25962349346d8c279d3c7983f1a76681784c38efc"; + sha256 = "7b2214651e7326aa6966dc7ff16b4cc7a3c15a5011a00dba21df4ddb9fc206d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/dsb/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/dsb/firefox-93.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "e185f4b874beeacca38bfde59958eb277ce83fcf47eee4cc16065e350707e52d"; + sha256 = "ea4a0ed8e603e3271a271cf047aba1c7b7fa5f411c4c9e338d4729e84a049350"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/el/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/el/firefox-93.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "ed323fc4a677afa40b1073640dc3fe9e5f49906842684677694a1c85d042c988"; + sha256 = "7dabe495e8e3e601fda6bbdfcd17e36a600251bc3ad08879c2eac9003ed1ab9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/en-CA/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/en-CA/firefox-93.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "3c495c341ab226b13cca26fb4d1e79ba8a763c2944374f417b0d1d1e3afb6e64"; + sha256 = "231615a5aa24152383f993f1e5a592b1a22088b6bb90fcdd90b6e024e06c23f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/en-GB/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/en-GB/firefox-93.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "00d888cf643780473aa480c0a0ded49ad22b76ee0b902062cf014f140ddd2530"; + sha256 = "fbaa80f5f3aedcf1d7f56b54b6f2b477ef2fc28878fd00279753137f95319a51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/en-US/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/en-US/firefox-93.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "4421542a7a8d968b4e705852ca76ec4bed857c57df0d10afab17f27b701712e8"; + sha256 = "bd7272d70a62dd1927b2f79d3895d4f09028a77f33800fcbf0192386b6ec7ac7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/eo/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/eo/firefox-93.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "db89780192cd14f0fb43ac2974c7c8a72e1896ddcf2db7ff3f6eea9f2788051a"; + sha256 = "394ad6b0f718fc3bb6bc2114e5a019f6c96b3e7bbe308a98824f23bed35a0c5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/es-AR/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/es-AR/firefox-93.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "60cd22340342b689e12cabf13ae33a2af3a5ecc6dad5b5e15851fcec0405652b"; + sha256 = "36ff6fd2687f394f792d0920138b97175e2e88b8bd8e9f7d3c57372a81aa7ec2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/es-CL/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/es-CL/firefox-93.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "7524fa67ed3246fac49622fb360ddb9ca5b91cc0bdb7eb64d881bf9851dd9128"; + sha256 = "9436e754d9c5a79ac600c5172426bb27275b14ef28398207e49019a731d502ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/es-ES/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/es-ES/firefox-93.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "641c8f48694184ff77db1b7825317f623deae42acafccce35cf7b8b95d38d45e"; + sha256 = "e633c6ce44f330e0779a5c1ea0d24038915832337c374a41e1159f36d1457cd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/es-MX/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/es-MX/firefox-93.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "e0c808695678e844efe04926bab17168fef0a97f8b125e724c4ebc606a5fc513"; + sha256 = "af04af6a2a4d2698d8fb00890e51871f4fd179ee93c81ca151796cc32c46edbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/et/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/et/firefox-93.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "64fc3ac8c3614cb128f7174802dc101b5c36a92fee5cd6dbd826f505e85c149d"; + sha256 = "284d63fc7623f493bfd7b937c76303fdeb7de88f0545f28e9d9029497eec47b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/eu/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/eu/firefox-93.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "e7bb62c4f6d4a00b0837fb720c08923f057610267ef97b0090ae8767c26e6867"; + sha256 = "738c96dd120342e48c8aff7a38756e6cf4da9f5d83cdafb2e489960febfd1504"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/fa/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/fa/firefox-93.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "038a1f723017141ae12ec15a6fec3fc6a49cbdd6244d237c18cd36c70ea6e6d9"; + sha256 = "0da024e521465cdeec5eecbafea0a9319f83e263edb9541b45ff76f3477e33ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ff/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ff/firefox-93.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "e2c1d68ee029e3f1064277dc6c3844bdbbe3eb28b0492c1299ed6f8a9351ab56"; + sha256 = "26c68ebed471ef45d61d3464938039d5da7c3860b5c9ba976ad27edbc95305af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/fi/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/fi/firefox-93.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "c5e4dff35094ff645272bf402e4c56908b6df7b5c7d6b6925e86528d3ced89af"; + sha256 = "cc33430049420448835ae5f23bedce0648cdcf8769933bfcd20e714b68956fc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/fr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/fr/firefox-93.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "502f35f69f5f04477678f183e40f8958aa095724e65254cbbdaa9c72c1a40ed7"; + sha256 = "ba3fc410a6bc2876e437a34a75970571093602f011e0eaf61b206113816a0186"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/fy-NL/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/fy-NL/firefox-93.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "e353afc86a7b6c452870587b13fa093883e7680f2e44a14c94563d12d50de622"; + sha256 = "feb88e31052d2107f62d81950698f89f071136d136932a68fefa029e01eaf09f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ga-IE/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ga-IE/firefox-93.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "10cb0a4ee3c42035a06e509a74e632dc269c407efb8dbad40bc4dfc2b2d6b9d4"; + sha256 = "c6f56623965e7efe843350a4df004a5c08cfd73e3766278ff077d6d470e325be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/gd/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/gd/firefox-93.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "8cc1603bd589fb910df22b47a8d7e3611cff371deea4eb634127b68a523221df"; + sha256 = "07e4cc718d12ff33a23839e628a5202a8d0589064b32770cdc892066fb6acaea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/gl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/gl/firefox-93.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "b4867bf6406854f80dd402ab3f1ad1e20b7acae7e93587831913144e690cc84f"; + sha256 = "7ea901227a96a505c63a90a0897e2030215f93ed5bc24be8c7a1f8eec0e3eb17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/gn/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/gn/firefox-93.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "555a76d9915a471f134d8f3986e7afca341d201bcad73d90d5751d8ec86c17c3"; + sha256 = "7aaa7ec4520583755a042f15a03276d4f1610edbc9c76f20909888d123f06f4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/gu-IN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/gu-IN/firefox-93.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "c72f1b40d5a9fbe689b76b3a0010ee1838b8b7fd7126dccb2a7c8907a87db0a4"; + sha256 = "9a9071437e106857364fdd9c36650a7a1cad657ac745a394701defe0aed974a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/he/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/he/firefox-93.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "e63f1e83785b777dbf9c69982c314684937dc22456b19eb1e8e83c87af511938"; + sha256 = "380ce47961f8ea6756430f51ffc9506f25efaa7e9deb1643c8ade47ecbecf2ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/hi-IN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/hi-IN/firefox-93.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "41e02c58459a2b2e4dfee5ba4d8dce6fda51fd85ddcf7a4d18426d25b9049aa7"; + sha256 = "df0866c595d887d0bb9071af3686b7f0c95cbc528137bf1c10468956efa0d9f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/hr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/hr/firefox-93.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "5b4122ac4367a88de9d8551498633d396630ac4fbaa7012408382e8e7dbfd27f"; + sha256 = "01b83410c8e3aeecc058005083608d48ce49ef617c164a129b11fb0a9455a5eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/hsb/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/hsb/firefox-93.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "ec1d030b1980e747c415d6238cc5868c24ff6393cce6489f4775926e00fe55e6"; + sha256 = "c7d7f2f31dee9939bb8eda83783dfd164f8857a453dfd81dc497a157f4a83a8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/hu/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/hu/firefox-93.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "214f1dc79bd09d1f5e4dbba1311ebfbfd47ac4a418da2f6adb6c8c6285bfc4b4"; + sha256 = "64d89540a8eb8d07529ce858259a4d37f4e5bad17d32f40be0efbd3479d9ca8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/hy-AM/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/hy-AM/firefox-93.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "fddc2c4c13595e480696924cea10e5caeea81fb775d01a91e7b13a6701a1cd2a"; + sha256 = "1da16ec37e7efbf88d5b41aaeb2cb92020d84d12f6355b2a0ef0470ae91a29d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ia/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ia/firefox-93.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "39402ff53caddb69cb6248afbcc37814536fc0cd4767a2096923089168f48a46"; + sha256 = "2c2d36cb858615f55c8e7562eb86597c990fe703cf653946baff71d5b73ef618"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/id/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/id/firefox-93.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "d2143e50a0f6bb19ce038e5fcc83530bbd5c781bb104da3a29d870f00acd2001"; + sha256 = "0c64736719aded00ce140151bf2f36c54222390c5357835c00ca9b23522a52c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/is/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/is/firefox-93.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "e2b035ece9d2911d131fb40eee6bd8f9c40506cc812978bce0bcf317ea9c8ef1"; + sha256 = "564fc9da8d9e5518ceb27b5db96da0165b6e05eaaf348d106f26735c16a3ba5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/it/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/it/firefox-93.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "a2c3ddfeba658b8c58b77e6abd6aaf2c4141c73b0ee6363e391f08f5a94e8ec4"; + sha256 = "2a7590c5f5a3f033b268656e7672b3d2cb2c0a8588cf857d5351ff621e31672c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ja/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ja/firefox-93.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "ea7c40e0d00a1d8d72d7cd397bbe7533959e1e715a2a7df8a205ce6e98d26fca"; + sha256 = "547adad237c4e53ffdd18ae610631dba56ce80f198b8957fc670abfa21c5f2b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ka/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ka/firefox-93.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "24c62141ec5bddfc431690bd21428bbf8ad07d7fecc9acdc242565a2dfe5fe91"; + sha256 = "908af546da517476700b8004d62e2cb9511f3b18f7cb21cfed95db91938ac937"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/kab/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/kab/firefox-93.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "de40edc25528e7cff904d14feac97dd282067e27793a4d2a85311c260be4262c"; + sha256 = "42195e5dfb1183eb8c9664d60b868bbeb163aee2e487a54c1c7fbc6dc849ffde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/kk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/kk/firefox-93.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "a4daf7b8c77661f2dc211c6e4a4432de8c57e34be48556b707f167f7333f0a25"; + sha256 = "8a804224897cfbfacc6457b4d263f1530a85014c4d847fa261323947e891802f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/km/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/km/firefox-93.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "6d4a3eb396871b35e4d880c98e48dd5dfd92e66b09a80066c20543f95ab3cfbb"; + sha256 = "e97e0a5c5f60ffd59cb846f4adc9c0a3bd395921640954164c35b6740ea6ce6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/kn/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/kn/firefox-93.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "ff5e9d651cb9224dde03d207042c5ee4312359d9b111839269eaadff49d2efb5"; + sha256 = "752e095be2856836578bada2b4cf5a8eebb6aea2e1d585641dd90ed163681957"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ko/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ko/firefox-93.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "3433149001e07215dcce9f3b934edf5f188b8e88725a01372fb1e831f0dc00f7"; + sha256 = "26a310c92a9a1918a114c10e3d5ea5f8ff0e4c1c50d209835b8e434464df0440"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/lij/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/lij/firefox-93.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "79434cc64d0acbed593f3c859ef15623333239d2868d0b797e6e51252778466c"; + sha256 = "785eeee3bce686f95d84403a5dd3c19e155491c103fd7883ea9fad16555861d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/lt/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/lt/firefox-93.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "efb3302005785dc6fd7aa464c591978f11637e89aca3a6f41d4d855970fe68d9"; + sha256 = "0d8ce47835c0bce9dac357b6d6fe68ead731900b5ac27faa2ab6ba65edfc937f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/lv/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/lv/firefox-93.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "7940ac6685d94144e758f703511946aa422f7a9303f6e8461d29b65178068d3d"; + sha256 = "c797d782f17d3ba29f6e27ed487b36dd171a3e5400c3de8e51e467baf1e331af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/mk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/mk/firefox-93.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "adfc49b40832942760d996da4e659c672def298159de535b03daf5064ebbb049"; + sha256 = "cfd1b94eab0563ca999832c2f60e3ec63dfc085d9cf9edb01d39aaf953467962"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/mr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/mr/firefox-93.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "1212c04fb5b1a114b49562534e65c4983bfade7ae9290290e1b51f999476fdbe"; + sha256 = "5c55491069da30171a6c697e6abfb4a3e77551e66672bcf411a731fc340b713c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ms/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ms/firefox-93.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "4172e9dd98806535b22162c2a4b50b1912936ac6d94ee99fc2315fc8e93e7fba"; + sha256 = "68ce7a3b7f7b5e054119779f73e6fb41486490db6090a7b72c3571a259e54b01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/my/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/my/firefox-93.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "4c65a755594a5e03611c0add1b506760853efcfc057b9c04c0237968d972960e"; + sha256 = "abb13539f92f2ef3222d16642dcb287dba92803d5cc78ae1cf503488f01062ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/nb-NO/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/nb-NO/firefox-93.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "7b82b581badc7d5ddcc02e008bb1b968a1ddccd42e4acc3f75863114ef00459b"; + sha256 = "c0acf71a7d5c8881f55dc8b9434ffdd331907dc53370fb2932d8d6f5dcfb98c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ne-NP/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ne-NP/firefox-93.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "db25e60614b1f31049886d17b5d9f7aa45f51a1230e5829d513d449752d4cad4"; + sha256 = "66b8103a114689b24aa1f619d9175aa91fdfe9b7a85e0345dc4e390201a9d8c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/nl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/nl/firefox-93.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "d0208622ac503716edd14383f9b3391064b0e5167ebeb6e349819253ab12cadd"; + sha256 = "f9062dd30186390b0bbc131eac7f8d0023436a823400290e99dcae4ba30eb700"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/nn-NO/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/nn-NO/firefox-93.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "3e9eb15f215120151572feb8ae621cd9e07617962fd1797edbecd79f7176f950"; + sha256 = "3a3d429a5729c0eb59affdc1c1207ab3789313167619107724fd58e27a7f7e7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/oc/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/oc/firefox-93.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "db49b53e15f96dd4668e0224019f4413c3e41c5e696de137faa44ac547ad2560"; + sha256 = "06ad36d6271aa223fe72d97de0eca5f74d630c0d9be3638f5c12fc8b30abe3ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/pa-IN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/pa-IN/firefox-93.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "9b05c58c61c25b584dd32cd9973d42aed887b22e07feb8a64f20e8288a1ccbcf"; + sha256 = "c7e43cb3028f0b095497dd2e9eb83b562c6f31ce34c93f8dea045e23a7309619"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/pl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/pl/firefox-93.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "bdcd745a9270d9fa34b070cd260285381f41481a2735bcde9cb73ffd038c924c"; + sha256 = "f57b656b43d8aeb3084c9a457c44abcab598e3240506db7b5c413161929549ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/pt-BR/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/pt-BR/firefox-93.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "05ce159ae923326132d656b94b7ed78590109b14ce5436d65f262c00f7b70235"; + sha256 = "ff9b034781120ad951626684392b62e2b2e969d7593a8410024d6981a7e7be52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/pt-PT/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/pt-PT/firefox-93.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "1829442b517f425fa85feab5691ec63e2375473655d00a25618f21f4c3ff6797"; + sha256 = "a5a4a2dc7be12f53993f420b4daca288350dee15f5741a920e70c6315244fea4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/rm/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/rm/firefox-93.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "5ea7bfa88a46b4d3409ab953537fcc87a5a8a95dfc314a9f7b4b991886be10dd"; + sha256 = "d0921c67b4428cbb12cbf6abf5ffc3a8a8495139485e66459f7844df07da59bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ro/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ro/firefox-93.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "896c0a79ccebd764d4718342bd142d1cfdc172a666b2db2beafc3f1883b69edc"; + sha256 = "c9253ee6c0897eff1e7fdd2457bd34ab5848aacd42700cfb4b085413faf6f9c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ru/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ru/firefox-93.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "6c4f2da35945c331de90f292e35314ffd51c693f01ad69268062bbcad0e2a617"; + sha256 = "ed4e04002e4bc59521ee78f884f657ac5be69c53ed6cdf934fc68b645dbbbcfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/si/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/sco/firefox-93.0b9.tar.bz2"; + locale = "sco"; + arch = "linux-x86_64"; + sha256 = "80f71db11ab64c26f8fd6ba1725e37bfdbd1751914fc89daa1d381c11fd59e1e"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/si/firefox-93.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "095abb133991ec166dd0d6bc86de71f6367bd338a21480577f2fc2210f42d69f"; + sha256 = "bcd8249b4f6b0e7559fd78cf55b2f693a27d1be24760bb3b3a9d16658f2a93a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/sk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/sk/firefox-93.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "549d6fe7bb33d99a2e4a22438defeb5d5b090069f67d58063efdcc458edcaf9c"; + sha256 = "541a8f327edd16c5e169bbd4d04ae9e6676e0adfc8ad8824d6608a39a27f2174"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/sl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/sl/firefox-93.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "5c7138c3ccefcfea898c00e428fb166b0c8883ebaa4980eb9f75507acd15f01b"; + sha256 = "d860fb445e7295a054241473350304e0530be4a22f8f1c838a0ee8464ae7ebfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/son/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/son/firefox-93.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "a4cdf6b8a865b818301fa23a2ed3626f4e220b02cdc46475d1e39bc9e5245735"; + sha256 = "708e932ccd10487480f7d3fa165918aecd57e0486b408fc13bef27425bfe53e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/sq/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/sq/firefox-93.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "69d42b943be2a848b5a28aadf240540f9cb7e527ea312d83e1ac559a361ccfdc"; + sha256 = "9415edaffb318ecd800edb9ea68231d4b3f3c3ecf6927d30be6782748cc5d0be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/sr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/sr/firefox-93.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "8b14c6a508f0c5676de085050cac2732a6852047356d28d6257dcf80691df0b1"; + sha256 = "a78fb7f010d88c2c3b4da8e7dd7918b7b403b1eb2509ac2445a0455c4c420cb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/sv-SE/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/sv-SE/firefox-93.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "b145606546bac77e3e45b98a23bdeebd23b752b5a1045a72312e1cb6c6927fc9"; + sha256 = "3598d62e445fcd512638c6dcc976d02053c4c034ddd7852751291891dffb8a30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/szl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/szl/firefox-93.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "212ff7d8d8addec767ce38d81a4a92103d9ee905f01387df9975bbf557795a8d"; + sha256 = "4305e07b18641027c3f8d8ef7370f0f613a32b8945eae50f1bda6bf8b621e3c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ta/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ta/firefox-93.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "334684039f1350871356e58e0c467b2d93c6d56b00973601e24728a65ebf45fa"; + sha256 = "1deaf959c0bf15119cabe5b869d18a727b02ad581854b769f17a6fcc715e6ce2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/te/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/te/firefox-93.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "96a9a309a869fa11effce362fd6f781e9c0067639a49b372170e0bc85eb11706"; + sha256 = "ce6decf89059650d8da398bd1b26b15135b1e183dff69bfa56c723e2926d130a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/th/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/th/firefox-93.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "3bce10cbab2b6e913af910160c4935e814d2fe862428be78448b6c3b872df53f"; + sha256 = "174bd366c565283c912c567babd6e304f758ae7e379cd192343be527178c2284"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/tl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/tl/firefox-93.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "96879338880bc4c632d31d2b096966a957c85de649a047a9ecd5f8e0eaaa43e5"; + sha256 = "f02202793a78feed19ff8436a852cacee6c5cfba12e38c3bb2565436a040a156"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/tr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/tr/firefox-93.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "ab592b0b45491be0c573e604344a74291df2d7aa41604ae7961dd78e64987f49"; + sha256 = "83dddbf773f775366a709a7095847217b65426c1eec6ecf733be7e3a7db3fe30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/trs/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/trs/firefox-93.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "d75e1569466425349d64c57836517a20be7f6e036bfa837815f6e60c9b1f4f85"; + sha256 = "13b4b38c90bfd97065c1bec7d906fa03adf79906c6584165ebdd656c5be974bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/uk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/uk/firefox-93.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "5a35497e2e07cd5552f05a130c4ca161929e0643cf106e3bd6fd46fca71e2309"; + sha256 = "e7872bfa3c73bc9eb8ea69dc42f2ad386d5a8f947757eb6371e33fd3b2bb51c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/ur/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/ur/firefox-93.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "504a498350b1399662a68ef1b5371e3d5bd9313c844a9389e862ebc74b28f073"; + sha256 = "d6996fb216388aa54438ae2a4eb73e6ab3b8511e987ef3d650cc88a1ed7f7e6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/uz/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/uz/firefox-93.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "46c4b1f8403f0fb645878b5cf2867871bfd74382d33963ddc3240ebd0222971f"; + sha256 = "e163143913bd90e5390495238229db83a293ddb6ff65c36c353c063af595f4a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/vi/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/vi/firefox-93.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "909f7fbdd6d669f46bb3fdd7fdc929c4fccae59f3b6fcbce4fb6668e26661dc9"; + sha256 = "d16684e0ae4841bf682dbc3d3461128129f2715e180eef51038ac9566056e24a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/xh/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/xh/firefox-93.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "98114043b1b79dd9a151de04b2654fdc12885649e06a45c05818c1d66229a818"; + sha256 = "21102105b0ce8e77246a8e0f28c908a4f5b046ecc85a8413a932d93a93c095df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/zh-CN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/zh-CN/firefox-93.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "b2a0f7e1a18f77cbc33183a48a70f6459adde67329b7c2522d95622ac474f2f0"; + sha256 = "59e681831835b0b3c1a3da85e0e18ee070857079c8204aec9eb45e6a391d54e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-x86_64/zh-TW/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-x86_64/zh-TW/firefox-93.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "3999a0a4f297acfa0e5e8e464df86774676c07f7df9cdf3a9ade243b17d91424"; + sha256 = "89624b05a42c6a3c45f150ef24dcdbe51269b8d1cfd6bfa05ceaab954b77ec24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ach/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ach/firefox-93.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "1557576b37ef31b8ac98f2663afab1e589acc071a489c415594b2b7880ae15b6"; + sha256 = "bdf4f17f4a7dd56811ede354c389d598c01270f1007de9d19e513da7a39439be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/af/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/af/firefox-93.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "1ee162319eb90015d06165d4e6fb4ba6071cfddc54dbb17e3b84ee6c5f9bb72c"; + sha256 = "6f86397033fc2ad582b7d1b01e6e09c87f86f0a0dc1b857c72e40e04c4ec16ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/an/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/an/firefox-93.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "bb117ca51ff004a4320f58593f5aa45042e1ad9336989fee60810aa13b051ec7"; + sha256 = "3c70474ddc293f11818b323a827c73a076f76a3f512dc4e1ee9ffc68d516b579"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ar/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ar/firefox-93.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "d204482d09bb66f08562dc57a7151230d02994ed7515443c2a8ae1cdb35e1533"; + sha256 = "caef97a5d2aae3796a0370585bfbb3f5f1a96f83975971e024d0c76f7c8aa197"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ast/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ast/firefox-93.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "412812c1b9df963039f72652d24785f4401f414d4953c8a249c9bb8bb94e2f2a"; + sha256 = "326e9ae3193d093f72e9e58b8f991eb4128cff6597202dcf2c77ebffa070ed34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/az/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/az/firefox-93.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "3e2fe0a600137fdda9ed538dbc9292c8da03654d071c44651fae7a0917fd1428"; + sha256 = "8d4f54a224af9cb08e48e1281c72b4375916ef967698bc30d230e56fec10796f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/be/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/be/firefox-93.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "5d845562839f60c2c7b6b142411bb43764b67dbab604ea27852f2b61bf77bf22"; + sha256 = "be07f2011a2e5cfbbee5d4cdb0ed098aa17bb4c6b44896325fe451bceff5f887"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/bg/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/bg/firefox-93.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "642f79d32cb8ffa869527dc394b316a95caa3b3c30b1e61303d49ef4becc7ce1"; + sha256 = "c20b7a7b544397b8c6638042a6310646e4365bb51cc86bb2e65f3256d93f9b3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/bn/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/bn/firefox-93.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "aef7ab7858de026b357f9af8d00c32759031e77aef42d6ce9338cdffb1b120dc"; + sha256 = "0deca1edff9fe4826ee3abe61dfcf9c657a32c86ca8b926e298030db195e5c99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/br/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/br/firefox-93.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "856d428fc9cd62369b1b6834fbf577c94807ce4f958eb3c70accb45d4f86445e"; + sha256 = "59f358027d82b5d4a452d87cc3e7f6c752cf0bfb4e261af3a37d1de377ef966d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/bs/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/bs/firefox-93.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "8557c44af4b52dc6c72279b1b3b31a41c87c5cd9b1c23284e2e503362ba81ff7"; + sha256 = "c1eda916f44a8b25b3b0769a2da35663c57d112df83867f9c1e687be07b19560"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ca-valencia/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ca-valencia/firefox-93.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "0fc37342f7539431522dd60f1eb319ade594efa494810416843a58a1291fbe40"; + sha256 = "12ba89bd23f8c1fd20762af26172b2a5c8e23b28a228f211d863bae5d795b96d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ca/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ca/firefox-93.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "e5577a0cfec17c2dc83c46570a1351363ec7bffc3bbca59390d3866459bcd33c"; + sha256 = "23f8f0fc938caa8430fc26fec32c1b13b6a4220134ad20fbb79238a45f1ca71e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/cak/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/cak/firefox-93.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "e4ea2fa2c4d15152d21fa1843a5d14d76c12aaaa0ea8326c8db29f219f877f88"; + sha256 = "c432541d196e9aef73233ca32535d64b044d9119cdaa880e76116834b4e61dc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/cs/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/cs/firefox-93.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "43d9d42a10ad996f8a447f932068a0366557d542c1f2a3be626703b2f09735d0"; + sha256 = "c23d0e158f65c64f2a1010bbc886f801721104d4a5ffd8f5eec18608e7f3d949"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/cy/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/cy/firefox-93.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "0c79fc024f1714d4267d3483c33e5ef75a0415fc487b0689d600ac5a9a8b8c9b"; + sha256 = "9c8331496a92b0d79bbd1615661e0bc6ce74075b00d195f5ddd3060f42186026"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/da/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/da/firefox-93.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "df9e037da8af21c5a22c26f326389d8c171fdc3218e2df2b37795a2ea0af4987"; + sha256 = "885ee2d2a04aed0c76748a4959cd313a3f1a14a0eea6f6420ceae79fd2a6d15c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/de/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/de/firefox-93.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "1e85bb05709e2efdbb48d5b788a0210a5ed83b52c709be06d4cae6d7a94ea9a1"; + sha256 = "fa554536207916a67ea90cf405e2e2afd33f7fc84f062f3592751ec696b247c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/dsb/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/dsb/firefox-93.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "1074ee2af33d208875197e7f6434596b9d9bcbe6aa5ae911e11adb3606a8f06d"; + sha256 = "8576d990801c2ad851b793e745abc90d774289ae38ae75f97b4c62298f7a8277"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/el/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/el/firefox-93.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "c2378d2924f99e3c8600d6d23023cb524ada34884645917e1adfd810583fa1b4"; + sha256 = "92d905beb97cb1ff711ea6de17d6c0a68d387a502cc82736a99064e3d0ee7fce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/en-CA/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/en-CA/firefox-93.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "8f3f4c41c324d7b8b6e518f370899cef2aa58d311e2edea50be22991e0f0c865"; + sha256 = "6d11a75285e5e6387ce1da4b93d2e132a0025ec9c7009691f6ca32b94ff92938"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/en-GB/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/en-GB/firefox-93.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "a702f5cc3d5cc80b189ab4e50579a4a0dd5a3b969497c0f17f22296ccd6aaeac"; + sha256 = "640da3c339be2b78da31060dda3f21c9898b0652cb1a69131e6f573e6603c962"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/en-US/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/en-US/firefox-93.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "628dce1cf52e132019eb538d260c692e360d33ba18067c5696b665118f1756c1"; + sha256 = "55f16fe714887e043f3cb72feb286f6481f828f1f91c85f62a3d96278670c389"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/eo/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/eo/firefox-93.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "bea0b89ddeaf47d79d40ffd152c14846e7ece9d5cd62c3e11b3d8a47db26018e"; + sha256 = "29a004a7ecaef1ad46fba73c23f74d36d7c2e4757bc5649c1cb5a23f3fdccff0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/es-AR/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/es-AR/firefox-93.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "79703843c31b39f48198e7477c1047c246c2bbf6ae23736483a1a3c68a3acee2"; + sha256 = "e38224e8a952779c191a5ebab85c1069fab1c4ebd989d0647962dbc3cb9a0e39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/es-CL/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/es-CL/firefox-93.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "a1defb47b1e0deca525e474790fbb75ab48825b59a996f8e2af6d8bb3fd04da3"; + sha256 = "4348196295d9b224788d1d71486e8a68642a325017b14d219c06f642a70021df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/es-ES/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/es-ES/firefox-93.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "cc0b63ac061cc573a16ef419a856417242cb52f4f39525eaf4a03fe084659e87"; + sha256 = "4535f52c4e9ac754abc6e9f1093394b2b0610c8268612035fb644e06e7a4502f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/es-MX/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/es-MX/firefox-93.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "9f0ccc88d783b2b5dcefa19c0761517ec4aa29ebd45e09d36f3b52d4c0d4841e"; + sha256 = "c39f4bcf863f3e196f57bbbf5696f8db9de865fe9b64bcf5afe806579bcf7fec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/et/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/et/firefox-93.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "f08eb49146b4ff68ad82c92accf80956c9b5e203d384021475cbc51abd1be67e"; + sha256 = "165c2efb87a82c7b217be3184588eb9ee53635caccc6535ecadbe79d601a985b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/eu/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/eu/firefox-93.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "982cce3566baf096f37a3d9b4ab09324c0b0edd8bd1b31e711a269e2284fe5d2"; + sha256 = "e7084ade6270a90a744ec28f5c24e84e54042f0409816768fb2724b7323f541e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/fa/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/fa/firefox-93.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "8fcc7329ca0fd874e6b36d830bc6195d43387332b28bd2fdfbe09fad0a17c65f"; + sha256 = "92b83ff98c7e3e3e757c0b22438589dff0822c2b8340c7be968171cf58889c3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ff/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ff/firefox-93.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "efb096d2e43e54f9ed0e18ed898db646839287f55996c86610a463c1d6b92cd5"; + sha256 = "04a89dce83c600fc4af2bde6adc0e02dad151d3f8e22aad9f41088d1c266e272"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/fi/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/fi/firefox-93.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "8c3715c8063cbe7d7df698fa4e4380be1fd06d4e5c7976578f46fa3d40539417"; + sha256 = "9335d8a619fc9e387d71cf1051a8112735f74fc5ec1a082ba918d50ce318befc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/fr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/fr/firefox-93.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "57077171b350b88ccfaceb8c0eb3ad1990748d80b2f40dbc3d761c1d0a73d6eb"; + sha256 = "73f895669700a88e615d42dcc247bcad25d91081183a9c26ef2f85499aa54cda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/fy-NL/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/fy-NL/firefox-93.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "14f24328d0e33a18ce6e3d67fbc95cecc61554d07035884181806a25391ab6b6"; + sha256 = "694656f308e44a432e0bc618eebed744cbcd537170214385923683525f3c0f53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ga-IE/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ga-IE/firefox-93.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "27a8b7fdb93b98f36aee3a5442564421436df91f17a68d58961238108992542a"; + sha256 = "1f897211bbeeab3c8fccd5267761251d382977925dcf28123adbcbff7c63ed47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/gd/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/gd/firefox-93.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "2319b00f9b2bb0073045b08d170af666d217b2e4667611fbd8b9628c52680200"; + sha256 = "4e610963fe90250c9f906aa9f3902e788e33b51cae9cc622142b0ef14421eb41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/gl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/gl/firefox-93.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "65782353f01ad909dec1b473a6642b0a0e6733070df5c98f0a262b28aa536e36"; + sha256 = "988e1216882068a823ee4cb5c0e8d496472906cdc33087168d1a1f64d555953c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/gn/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/gn/firefox-93.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "e6cea933b4b1948f0eb84918df5b401968f6e449caae9a5a57ab765a8726eb89"; + sha256 = "b61b00d9ec818d5d8551dcd9759a25d250ac5a82c65ae209e0357dfd6c44950d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/gu-IN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/gu-IN/firefox-93.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "5702b1f19f7b99781447290abf32bbcf97c4ab889549ae5b9d73b20d49b0ecb6"; + sha256 = "7850917f25af596cf3fa38ce9390b75b6f26f662cd3db031b40017be5f2547b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/he/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/he/firefox-93.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "599e8f6d6972a7d9c33ebd92527eb30abe7ea5098c0dc0ad91171818d2ea1ca0"; + sha256 = "a8b992459399696ca9c30eab37488de89a45fe628a96159e6b74812d15ae05d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/hi-IN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/hi-IN/firefox-93.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "d8303c9148c008e556dbe754eba46f2c056a93167e90088ce06fb1bcf425c27e"; + sha256 = "250347865e62af7e78a7ad3ff80856d4420165c89576e28872b4a8fa09b6a074"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/hr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/hr/firefox-93.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "da8034b67d159a267b5a1e0d1d816c2030e52d1828fea29e46b8241486854e0f"; + sha256 = "ae830c670267f80982895bdc4787b9e56952e5d51daf7069a2570324b08fb758"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/hsb/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/hsb/firefox-93.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "7b7fa736a29a08108f6e3b5bb47aa768e3ee6c9dc58dae866dd70ab3ec6b04bb"; + sha256 = "eab6afa1409dd54eb476e6e66a8dbce5465cf58ed86f3c64019c141443c14200"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/hu/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/hu/firefox-93.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "7152458a1742f65ca69341d3762c0adec354acd7402c35213ac07ea2264107d8"; + sha256 = "dbc23804ef22b355b5bdd3901c831bdb7e81c660a7c7a0f1ec31f95dccf14814"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/hy-AM/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/hy-AM/firefox-93.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "362b5c4c2764f69c3cc175025cf3b0de054cc39e5a47bced76a67e8578d17a2a"; + sha256 = "d4394b8b398c84c6ee1ce5d46ded950a794af2932209957317823c98f3e0bcbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ia/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ia/firefox-93.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "a19ec522293833dbb48a20e0da510d67825f2dc7892c6c7c9e66d844f74a62f6"; + sha256 = "277c4fc2aa3473ef627f7df4ed14acd446adfb2d2d701c791d891eafbbb57fc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/id/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/id/firefox-93.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "cc0819e2c416b2473ef52eb1ee91dec88b38af97c420723562d90dab16f30952"; + sha256 = "e61b2a405a42adb4fc92e64265b0567e4b562de02d2c352ade5195d1dfa44638"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/is/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/is/firefox-93.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "f24905a22e4a664af3cfffc859ce6ec453a1b40309c2756b45a74b999e056769"; + sha256 = "03a55e33077ad11b8319ee655849279c15131e0686fea435896d9a35d5dbd703"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/it/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/it/firefox-93.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "e9813624c07dac6b9615f18baed1d24cbb1e34a2347e3d31034ba4718dba90b7"; + sha256 = "20faecbe37820be2935e6942a2e96865898f78da93ceef769f04c59e64739d8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ja/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ja/firefox-93.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "e8670c1edbff38ee9400bcfc9bc9893ff036af337fcfcceb8d8f76c854474b61"; + sha256 = "51ad50c6cdadf90d11056545bf308f121e78681b1d0a4ad649059fef081bc693"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ka/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ka/firefox-93.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "bb9243d36cf8c4e62258be1b692366243056d51164a183c7e10fcb3206e22902"; + sha256 = "bc1b0f3b95bd9d505a6776ccfe9ee194cbd96af337212ecaa7c6a45bff098750"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/kab/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/kab/firefox-93.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "7e57fa6e4da39014b4c7c53bf8b7e5b4f7868ba7e5c80726a3e03bf2d283baca"; + sha256 = "47105ccb2feb77ea05f2eacb771bf790b80f53bed3b5ddc622f738a20b4f2447"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/kk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/kk/firefox-93.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "acf4d5d11aa323659ef6c6ea0754104d642501cdc68e734d75bde77b662e207b"; + sha256 = "e6030b349dde6189fd2602c673830f1ef0b98afcb5918af55eaf1a4647ab6808"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/km/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/km/firefox-93.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "ab268fc166a3cf2b27df64472835d2ea487bf4860662db807a0700ac21ccfa0c"; + sha256 = "c1b2419acd6154fa05bfa94548835143c4d37738bc7f5e7087d121d0de8f83ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/kn/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/kn/firefox-93.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "478ea687157dc0922712a61652ad6884972551ed8ce4d01127a80c1efc106e32"; + sha256 = "25149dc40cc00cc2d7f1a52e85a7ba66ffcb2ef722afc699045f79bf66d79b06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ko/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ko/firefox-93.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "111876d47dd316c11e77439e076df41af384d3daed166f6f5d30b68bd0be4d52"; + sha256 = "e1a724ce75dda12054f9ac25b3a2895f491a1e24352c17e7e8ab4065fa4c91e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/lij/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/lij/firefox-93.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "0810c419383c606ff14d2bbac487368d2122599ee3a5684a288416069b52fac9"; + sha256 = "88505bdc9fc55503794a401d08e8f4a7cae47077a469819d0e085f8acdd7ac55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/lt/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/lt/firefox-93.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "79ab57756a0d232407752eecd621f13567e43592f84ce2995b13bf73513022b6"; + sha256 = "0bee40593c31e28c8e1ba84cee367fe1497abb4596fc8953c146a2465a118c7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/lv/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/lv/firefox-93.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "856608639af7990122fa2fce426ef126d35dbc3525fc7515b5f26c93203aadb8"; + sha256 = "cb7e1c15c830e2d79e31c761625d9e87dd2c1f3cc9d0e426eb85208bcbc31656"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/mk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/mk/firefox-93.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "ddd8dfa8a85754d96b83ef24ae5f0b3748b084cc1fbc87670dfe576d7c65c012"; + sha256 = "3a215b110a1b15453cf6acd5c18baa7400a821ba852cbbf010709fabae965eed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/mr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/mr/firefox-93.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "52f5327fe808e4273830ae5b71077d6419dff4c763c9e4fd9e64ac8c49b67f14"; + sha256 = "88c0ae127b8c03cbfe37bb14d7467e39f42905f82db521837eb023edeb1c1a15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ms/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ms/firefox-93.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "0242eedfe6b5259738175f83686db3bfdd6d42db66173f7632c6ad9b064cdd51"; + sha256 = "990efa377c86737edd76fa88d68b60d56869e31f3689edef94bd78572018db50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/my/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/my/firefox-93.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "706c6525e5f6859b5d19a5c49ad787577064b1c12ad5088cff3e923d4fb3304d"; + sha256 = "c9d46a5f6eb097dca199435ab66f0bf3a15c31273711b1958cb1b9dcaccf57e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/nb-NO/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/nb-NO/firefox-93.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "6a3aca1232dbf5a018be45fc5411ca82a45f4be7ecb91fc052a429b9716ec8d6"; + sha256 = "b133f54d14263dccc14cf7e4ccffa28c1b115ab4f2b45b62365dc37a5ff88d30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ne-NP/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ne-NP/firefox-93.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "ee10040074f9eb053a83308b104f84deabb2183bf7b1b9dbf349adfd3e25f523"; + sha256 = "dcdad00c5b7deb0897c4a6ad9679a74046372f710f34bf307f8e16fc0ce9b472"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/nl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/nl/firefox-93.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "3bbd3358f8a6d84ae3183f8f67941f3653d70595feb4d74f9c3d287caa698932"; + sha256 = "a10efbe195186f06e90601e21c50e7062c3b610deeb7f75761d8a1653c3345ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/nn-NO/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/nn-NO/firefox-93.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "61f21fef0fb76e40099f2264aae4969d1cd798f58dbf75db81c6366ddfe48335"; + sha256 = "35dbb3f4e2d4084413f3471f21dcf97a4c094063f54d1e232fa952cbea09518c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/oc/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/oc/firefox-93.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "0edac08c5d0f400df2f2c7d26c410b2eb3b2a467a167d17fd57b50352b9ff079"; + sha256 = "1e155efd7ff874cef65f6be0eddb4fa6ea2f161a82574de6c5d995243ac48a57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/pa-IN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/pa-IN/firefox-93.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "c036f77e862df5454e3be5f913448e1732585f19b3f4cd968824c139f82d8790"; + sha256 = "4c91d84911383326b3cdd3ff86be27903696b4c4b7060fea2fbac06778e604d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/pl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/pl/firefox-93.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "927a08479433999af0808538ea3df289d3595ff0c88dc311c71d061875ada19d"; + sha256 = "2aabe66a15ec18ffb1a2c28a984351447092de8257e260b4b63511d4a290cd56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/pt-BR/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/pt-BR/firefox-93.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "fd7ec7834104629773481d47cf3c36deb1147326661788403c5ad676e18dc1a5"; + sha256 = "a389ab0baef9576d549191e7928cdd07ac333cdb157a0dd8422a878811e0f092"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/pt-PT/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/pt-PT/firefox-93.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "b5125d265997ed75a68a9b9c8348efb1127da8c7e07233ee403bbc1c1c1d551a"; + sha256 = "b5d3ad3f589ff0831c438518dc4e5a8a5e8b0678aaa65ef1688207eb2e177d80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/rm/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/rm/firefox-93.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "9a77df59be3a58f7ba75951f38461ac366afeb22a936c01562a01d509792ecbb"; + sha256 = "406f3260b468b8f5adfdf86fe511ac534d62d3bf28f1be387150a92cc3e362d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ro/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ro/firefox-93.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "baf15728a07ba2ce73213edbc486cd060a95e9722867e129b4dcaa5b7dbdc20e"; + sha256 = "a8eae453a8e25e33dcbc2b4322167d9720b1e90728118d9d1ae249833248b7b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ru/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ru/firefox-93.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "201bfd1905918fde0134abff649e4153639d42beefca8e5cf695db13305c4869"; + sha256 = "c05e1c24e0cd94ba0df7608968b46a73227e7cf08de7b7b888c4f56682ae6cd8"; + } + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/sco/firefox-93.0b9.tar.bz2"; + locale = "sco"; + arch = "linux-i686"; + sha256 = "c1e3dd28aeb714102f105473c998b18c2715c6aa9fef8e96adf4ad79489154ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/si/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/si/firefox-93.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "9a8b35abf95cedd5bd8c777e45dc412df76c5ab135fdffce1136f4d5400c4b5f"; + sha256 = "520ba30da9407af4df173af1734ce5bd8f67de290133f71082bc69b51708c28c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/sk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/sk/firefox-93.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "371fc35135170674b3560a7472b479473c5f989d041c87cd030f8798861f1c2e"; + sha256 = "eab55c6d232f9c6eb9f6db8f8cb886cb560dffaa5b105c18a7808c6531f06c3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/sl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/sl/firefox-93.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "77df5a99a9577a3a07bb0f034a99f96afa85cb4b05200f56c41a3da2283a93f6"; + sha256 = "12dbc45778e917ab6b0d836a4ec0da059a7a2e5aa22580edee5aaef04447e5ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/son/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/son/firefox-93.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "5b72f4757d23c78e2f6ed33ba7afc99b09478d434b6d85b453f980d6a183fabb"; + sha256 = "64643222f7e0cb23259b75c7aa8dd4a61a87ecf21e46da62c1302cac22c6045c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/sq/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/sq/firefox-93.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "f44f53326face336bebe48657abec77444fbeaf90c82ea57a596465f0fa2e87f"; + sha256 = "ec7269e6e6a69abd48c093399aa40dd57795cffbec7dbb0138aca95b105ee362"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/sr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/sr/firefox-93.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "5a284e9d3afc91691a2f4cc9454f8f113a2385db8e93cf243717e18755a066ce"; + sha256 = "2561aba7e7a770129989fb780b74fdcd00ab39ea17fb3e27190c16c53c409447"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/sv-SE/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/sv-SE/firefox-93.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "b2abb070d7d89d0fff19b9ba293961d863547da558804c9ee853ba280cab5524"; + sha256 = "6e52362bb333ba3d5e20be7aaec57bc99cfe2edff32e7622863f8228eeeccc39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/szl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/szl/firefox-93.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "a6a8233e17ecdc236c6741286272fb79148d30b86876d348097f93733937bfcb"; + sha256 = "443b6bc4e2f163539e1ddc13420ecba7bde4de38cf9595b2d4916eb30b730c55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ta/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ta/firefox-93.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "723d94602a9914c1d572f85635ceb2622960b09bfdc99d4ae010efd1f65e4792"; + sha256 = "09a127420ae54b83c25dfc15f427b4df5f6e6b99eef396a8bda62df4a80907b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/te/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/te/firefox-93.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "78e0ed7271171c5eaed2831ed56afb98b525f8ae4cd9db78f6e5b2c6830b5c87"; + sha256 = "3ecad182f27b0f1128e899233768702eb8c697ccaf24928f60f0b3fd14f1774d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/th/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/th/firefox-93.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "4d06b6cf8b81e39875f6b749286cc52d89d8c172e8a8af54f920906326404346"; + sha256 = "15299b0799913da435abfb98c7a8d01f026658d59c1af3ab2d2fbf5ce3639a79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/tl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/tl/firefox-93.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "9880b5fb724522d823fdbad3aea4c9b1376e9d97543ad47071a7438aef164b1c"; + sha256 = "14c274e705a16afffc832e05fe0539035d20248571ce08c2869b2b37c8c549be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/tr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/tr/firefox-93.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "b198c6491a3618c0dc437cfef06c4564a8b70700b399013072201bbf003b2b37"; + sha256 = "dfaf43de7d1a227d72b732f8c424adfc1215d2a0c4201594b1c251aa337aa984"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/trs/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/trs/firefox-93.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "f35c3b4a04742ad4e500fd60a5d6f80147e19b60d6ba1464c7df62707a8dcc19"; + sha256 = "2831e14423d338a64d1db9de0baa2252b715ed24b356ae5d5062d2f801d4ea84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/uk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/uk/firefox-93.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "d3c2b7e536438e8d212c66463bb201475c1df143a040617aaeb08cc14e6962eb"; + sha256 = "76c69e012647c8053972a6b0c48df31a9ac74510ebf1ab58b704b1fe9197a128"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/ur/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/ur/firefox-93.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "c708a6886f3a22ec5ef66d9c3d26e051d153fea4ff01fceb65ac41cf090173e8"; + sha256 = "50c8c6858b1bf9994052e634f3d11c2849afcf9ff94757679d43ae5b1dd8bd48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/uz/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/uz/firefox-93.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "e26ab71962c17774721bc54bb612f963c61b3b5fb83f5c1473a84157c73c28bb"; + sha256 = "bb23e4d726b4f735593593e64b27bce89a3845ac4efdd6f91eb28b2c02ae33ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/vi/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/vi/firefox-93.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "fc8d824190bec7889618e14cc439f6b96e878acec171ef270e54980000cb60d5"; + sha256 = "be4fdfebf4f107be47a0d929786bb6388433e93ccaa0412fc1e4ce445423744a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/xh/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/xh/firefox-93.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "ef932683f2b7eb51b043ac7c2b9dc1ffef3e048f3a92a5abc65550743e95440b"; + sha256 = "846feea2feb0ab09ac6e30d3a5af3d97367fa1e83034b0ec142c002659cba58f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/zh-CN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/zh-CN/firefox-93.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "9e2695711d611ace940d8f6dcce037646bd96f0d0a533d551b73eb1adaa31b98"; + sha256 = "43df849aebf37e26fe7fb7458db07570df3b8af3a727517bd25cdd1550c1a477"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/90.0b6/linux-i686/zh-TW/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/93.0b9/linux-i686/zh-TW/firefox-93.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "dbb0f78780deef67bfed9c1a126ec296657f327ce3a72beabcea0bbb9a033be3"; + sha256 = "b17e9f960f3a90b64c6a8a9dbaa01b5921e62d24494806e00953ba24d42ac141"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix index 551453e9a2eb..54763b801817 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -28,7 +28,7 @@ , libXt , libcanberra , libnotify -, gnome +, adwaita-icon-theme , libGLU, libGL , nspr , nss @@ -137,7 +137,7 @@ stdenv.mkDerivation { inherit gtk3; - buildInputs = [ wrapGAppsHook gtk3 gnome.adwaita-icon-theme ]; + buildInputs = [ wrapGAppsHook gtk3 adwaita-icon-theme ]; # "strip" after "patchelf" may break binaries. # See: https://github.com/NixOS/patchelf/issues/10 diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 619b6186b49c..1972f8c2734c 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,975 +1,985 @@ { - version = "90.0b6"; + version = "93.0b9"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ach/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ach/firefox-93.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "20c33b145287c4477e6516837c7bd763f0895750e40400e82ddb6f196b072b23"; + sha256 = "b4e7438a7d4d5b4899fc752580909278ef92478069d4642c4e60aa413aa537f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/af/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/af/firefox-93.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "edebcfa2f2c8a7af69d8d98ec4890d6ce8404f93d8e21a7d643458d769056286"; + sha256 = "01ad52ec485881d0c621a95b7a5e6af22a72d704d487c88448ab86a62b4acb30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/an/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/an/firefox-93.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "59a8423486afdf3860bd03c5ed2df595c5706f2d048f14d27acf50bc659da119"; + sha256 = "f0dc29176b70234356bf145e65a77b1da218cb6f68914f90482278c456477bbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ar/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ar/firefox-93.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "0c2f57d48e42602109bc30574f12843c09f68f84e810e3f7860d3185999bf7cb"; + sha256 = "a58e28425055baa6d94aa337a637ba26da2a74fd6a7a5ee61ceb58c04c146545"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ast/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ast/firefox-93.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "d505465fa32dd6e0a324955ca950cbef5826f3136b5d2deff3e5a42b8063e69a"; + sha256 = "f921078583c19eaa9059e22928f91083d55f98e240cd821822f6bcb73b0ee10b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/az/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/az/firefox-93.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "fd87877ec1d0978b4f83451360d1eb4f2ff7c0e3fec9a9346b38f34545b89418"; + sha256 = "d13bb74cef565d2f13c3925ef358f64b791473d9f6cba2102d61bf91df9bc570"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/be/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/be/firefox-93.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "a193474f5b728559acbabbfb5d746930909db38e83c2607c38d48a8b62376bb9"; + sha256 = "49a01b14b3edcf28b2f17953d10cfb7dea75bb3e502aa1c268eba7357708c61f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/bg/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/bg/firefox-93.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "b0ed4a45bb9ec405b4795d2e73eccd56e89555eaa40c4c72c64c0b5d7731bad0"; + sha256 = "e80f298d74846850f66648141653db30214dfbe66c6dbb6f34c7189d11f1d687"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/bn/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/bn/firefox-93.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "1d7deb7f6bed82fe73e795677b4e60192dee7bc52e2a870c1ef53dc3a23e7390"; + sha256 = "50619c3343700135d25cee66e127f931f7d4c7b2a52007a1cc493ca3a882e38e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/br/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/br/firefox-93.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "379304d81c8ca21b41e63802394d30892572dc3a740d5fc701512ca482e2a649"; + sha256 = "382dbb9e1687534d1dabfd9388bfc3d532d36bedd314c33df25f14ae04e968f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/bs/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/bs/firefox-93.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "8b54063ef6a1c015f2fac84426b6309df89e013dc8e7deeb862ca6ef54512a7f"; + sha256 = "836551df658a7cfbd2374840226aa941ca2ceac0996d2ae98be43e62c5ed4d05"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ca-valencia/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ca-valencia/firefox-93.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "80ca50a92ff6a46d140609558265efb422759ce320f5e7480a270b16fcaf486d"; + sha256 = "54c4a599103789390d95742c20c873ed478963c3b55ec7188286156647ce5fc7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ca/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ca/firefox-93.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "00c027ca3c56aea456d0187a0a664d34d5ad704af5220d508e7dfe29ef66a4fa"; + sha256 = "884727b1ec14187d84031dece2e537adad1b3f5d6672e22d67e3b8f93076443b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/cak/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/cak/firefox-93.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "7126556936ac97989719922c4123f48508bf946ea51af05ce30182a8c5c798ca"; + sha256 = "9bc3c37ef3adb69176080c1c69ac541dfd95af9827d3a3e428515045a0227148"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/cs/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/cs/firefox-93.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "3f40d14e92fd79cf695b36c0c6357503bf08ffdf3e2105ea30b38919a0c40442"; + sha256 = "7efb185b5fe43570740585d770f5aed2de7e77f4bc1bc7614a69b97e6f9a37f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/cy/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/cy/firefox-93.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "be85ba66f9d92f27fadc5bef7220b794ad1425c09424ff7c1ffea905f1495222"; + sha256 = "cfac99243d6452aa2944c87a6cfd004a11c138cf70524ae6a2936790cafdc9aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/da/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/da/firefox-93.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "a69fb1355b2b0fb710954d2982750d9a11a80be924c4e8ca8664d97a77676f7f"; + sha256 = "3f399b0188aabd4c8e38ab8cf750f6a9660f1fb797407705e2474f53402eded7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/de/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/de/firefox-93.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "9142b0b44f4f375f2b426f3ed7af11646367b2a21db8cc3afb704d847552569b"; + sha256 = "03ae768d7dc3d9741b0c85357fcf9523571c3e53c8bb2c9efec9ed7caf1b63a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/dsb/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/dsb/firefox-93.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "42f04094c7d3eaeff3e8bebb073c140870a94e7de29f367950c47ea963fd8ee5"; + sha256 = "e2c6af4afc5cbd5b0007fb59e03bf9ca0d389df3ae24995a0d08b361ca529ef4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/el/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/el/firefox-93.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "17a234d289679e507f9bfe67d2b65d7a89dcb4b603e0b154b9faebb9044d320b"; + sha256 = "19f14830e19de72ec1933720f43a769e84a164dde8928d1f62d5fe051742159a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/en-CA/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/en-CA/firefox-93.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "5c5e9ef0526aaccf67f6f0bd1bbd5415c2086c0ea8c9d9e614cdd053c5e3e9c8"; + sha256 = "eb0ba67507f4c4c804dab1032a0656733b08ffc162c776291d0f716d5d0b5a6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/en-GB/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/en-GB/firefox-93.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "61a4dd2a80d54c79436c2f3f62c4b56bb2d6449c0475cd938a4bc5c3c91a41fd"; + sha256 = "1309163a30dfc89b687945665600ab1bd420bcbb3df310984f9219200f4241bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/en-US/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/en-US/firefox-93.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "0ab2b7121ff045df76e043e165cffd3a4cf33f4a5d76f80d880e4135b3ac8e87"; + sha256 = "066297d53c67a1be6dee4ddbad3dfab150f62c45bc24080f5790e922c11580a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/eo/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/eo/firefox-93.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "20282abb72dc7bbc2db8898d6c18b2d877a6905449a221d4044bb2984594782a"; + sha256 = "8c4f2e4b095f4c275815ee3cd98d2ebc7f0f3cc0013442996fcf911108c81688"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/es-AR/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/es-AR/firefox-93.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "3bfdb83b8ec6ea8c2e95e4a7e50348370617135057053e89ccf9e61ae26710bc"; + sha256 = "65e469a63917b09cca08b75c5448e967348b6a81dab302a41c9b339f20c31065"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/es-CL/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/es-CL/firefox-93.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "b78b75d2832c240c764409d0130f7f70081c66ddfc6a4a710acb329325df3f36"; + sha256 = "0bc194ad4e571d72d48c74f62c387c2d836d031a9904fc6cc79f8a591701d515"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/es-ES/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/es-ES/firefox-93.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "28821baefc20114bd7785c04ddcf4aec363151f0c1ebb850d364b337a5141fbd"; + sha256 = "12852d4120f7101a889f7ae4e1442f3a03bf0a10dee38aca5315121a3e57ffb9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/es-MX/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/es-MX/firefox-93.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "853620bc46a74bd425554e83a5866bc5bdec79e9f8129c83f0ba147c47ceec35"; + sha256 = "d7fb67fb1bc9c03759e7835c5ccaa740ba0ad625239d7ae8c125e10618c161d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/et/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/et/firefox-93.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "570cc2cf48702b16384029ee8831e3ba4db39a50b1b02576a0c82d51beb03779"; + sha256 = "51136e86f93f74c79ed3dc852ad16c94e5e4f44db12d395885f39f1c05b38f8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/eu/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/eu/firefox-93.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "44f3cb224da4c0df900737ca5d4d80ce41f404f1d3aa36f6f470d6eb13d7c9bb"; + sha256 = "1ce5e28ef66a523b5e82a5c83c90177149659253eb3035141f4fe91b5b32ebac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/fa/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/fa/firefox-93.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "24ac71b7d28b286fe026b1cea49777876eff5146bd47463071142524d4f18fb3"; + sha256 = "e2f8026270e6187a592c3b11a1a7a2182b5235616e3fe1b308580329ecc36d32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ff/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ff/firefox-93.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "1a795decfbef4c7689eeb931f07d8b036943856239ffdd550882267a14395dc0"; + sha256 = "81f01d94f933a94de8a0e48d3d30619e6d145e19ec3bc12bd58efb4c377bde48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/fi/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/fi/firefox-93.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "807a38d68d0a5010c6309e2e725d210e3254de5c5b7375fbd209b864053ad25b"; + sha256 = "34818f9a370f2f3c255dedb3dea41612988a2da1c57632b1b46b0b8fcc63b280"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/fr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/fr/firefox-93.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "6be1e617b3dcd59ec82607a8a1f8b5f145ca6c1cea7020ee678021ea5524d902"; + sha256 = "4f3bdc4c6c6000c008a891d0aec85915c8bbc089c963a771fbd058015ff76c58"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/fy-NL/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/fy-NL/firefox-93.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "48d4de4cc60ebc53acdcc4f8fea5b483b546f06527f24bf90340db141f1a043a"; + sha256 = "cc18317fd5101966f51a717e01a90e83c22a52d7056f7e396fa35ba4a63059af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ga-IE/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ga-IE/firefox-93.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "4924bab4100d18fa65b1309a091f0e6042f34aa342508923dd8c3ca559dc9628"; + sha256 = "6bc1f8875100ddead9ed8b2ea3dfc36d3b13267fc55a06a58d4cb709cb22d6b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/gd/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/gd/firefox-93.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "b2dcd37bc4c9ed6015321216040cbc27909061c668d8cc053f3385920ad9b18a"; + sha256 = "01937c8f7010ee8b5a573338e1aaeb17a2074738792416142fabcab587894c4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/gl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/gl/firefox-93.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "bb50a6514aeed37e4fd96295c0e97ef026bc6fca8c62b7ce6bfdbc227b69b0dd"; + sha256 = "b9daea490c1b6f4fb3e4043322e245a509564b64a237c10cb2cde519e4e81bf2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/gn/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/gn/firefox-93.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "a038dd8daa01675758acb4adf50cb93b204f3573ee204f97cf170a16f300906a"; + sha256 = "813383aa1a9fb4d7e1d9348a8c234341cabe6a536f857a7d0759cdc478afde9d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/gu-IN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/gu-IN/firefox-93.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "a2b385578b11bc12c3bd7230b3a22d03f08a260d26e8f287efb2756b0fd3f9e0"; + sha256 = "8f82730dfe1656c7d5bc83f6729b4d8f3ef60258f67019eb3f250596131f14f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/he/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/he/firefox-93.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "6025d34743157cc0869d12aa5921d9951cffa660244804b092ce0f79ebe9abae"; + sha256 = "c8ebfe59ae4e64a6ef0e186fcced173a16505dc69d367adab30aed82469f9476"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/hi-IN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/hi-IN/firefox-93.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "0c83746e1212350945277a65e0219e7bd871bf3bd01fd2e91194dd0e44e377c1"; + sha256 = "d03e1385f8ae37cc77a6f8d59145b5f0e79fe309e926ea30f17c01ed7c335cae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/hr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/hr/firefox-93.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "03675af908ee739dbe8f426fe7c4647f4b9073128544e990fd3e167020ba3a88"; + sha256 = "f79607136311cce69955220e63c5421818db8127f12dd8dcddb9db3e9fd3e9d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/hsb/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/hsb/firefox-93.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "9cf3dc5faebef0342f2b165189312fb1d76b5882b0767241a8240a440fc33bc8"; + sha256 = "85a924cee68507c1ca439c5b37b5054b01f3bad00109b19f75d668ab20c5ea7b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/hu/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/hu/firefox-93.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "b30deb7e51005523457e7f31428356178c1fd546440df2cb12f9420d89374c08"; + sha256 = "4f09afdc657283b6d983154fb20e036af10bde48d6bb34111a4f689cc0617422"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/hy-AM/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/hy-AM/firefox-93.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "b51db297071b1bcec3416e7904bc1340d1dcf3bc5fea5016e3311911782ae813"; + sha256 = "f7a3bc86f2cb510843959b6be1ba7ff6fd1403ded3472a8074a571d83257d13d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ia/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ia/firefox-93.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "1e946e4c6893583836874e9ed951969a605b5f8de222d152d79ca003904af86b"; + sha256 = "d4fc2c62fe8577ce06caa906f21741cc5a13fc5bfe722d54e3ab2068bca8e19d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/id/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/id/firefox-93.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "6fb1006d097e353401e032090f08bf1911247b4c3923d2490a7f46cae3f69376"; + sha256 = "7bd53608373e570ff4fad8564e60de11ccdf95d2b36ecbe01087a1e86decf724"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/is/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/is/firefox-93.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "a0de49c85a0726fd56038058acb6e1ab31e5100bbb759a6c5cc89191908fe402"; + sha256 = "50cceb8dd09d4b90e2bd88e7b7f9a3389e9181a40f9d98655aa969f4fd865a19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/it/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/it/firefox-93.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "386c1b25b9f78b91b0474e512091b6907a598555a8e146ed61226332e3c04e22"; + sha256 = "b2d72a1fa9e57b3e95e76dcce39e4b48330d51e463495d3cdfc8f5dad2ea4ebe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ja/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ja/firefox-93.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "185964b4ba62e93ce54004e28a8d6da65c9b5c657f191e4ef924528c92bf5fcb"; + sha256 = "f8daf66c5f57bcde2553e579824c8734cd82444443368bc192a1d305110bf9b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ka/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ka/firefox-93.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "ff14f1d6c4ee8438cc471c151fea840cc81336de06e244b6e2c8ca193d97e490"; + sha256 = "a0be598b8e2f0fc28c1ee8e1180d5fc4708fc272a9e5fd4114645649d95a15a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/kab/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/kab/firefox-93.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "36d9058cb4c0bd804f640665bfd05804a787ec59632010d682ea132f12660b18"; + sha256 = "0477f918ee53e1a11d4f37a12ced16d5054d2bc2d63c1f30a0b597f905934e48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/kk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/kk/firefox-93.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "da31f2928efa27843afe07872ecd9b6e286bac90a101c14e1dd1e806e3bdeb65"; + sha256 = "70c6f49e6ea628b6a52196c9593e83f47b26abfe74cd9df5ac78c7f1c76ba93c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/km/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/km/firefox-93.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "7a8a1aaf9d78f7b1373374e70017252004c3d49de9c0b97e705fc5df7790834d"; + sha256 = "1bdd53425ce34db23830ed5ea075b8867b076ff31565f52de58861614d987370"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/kn/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/kn/firefox-93.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "8641fa391ff8ac3cc25236ee6d19c043c39d651c674cca2badafee685b47eeef"; + sha256 = "da83476278e063e87351b20411f2278c71b31cd4da18add1aefa1e93afa4c675"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ko/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ko/firefox-93.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "7a676b767215a1d5d6537975fbe9e7e16156d21032901365c24b8b0dd1adb21f"; + sha256 = "e1651a1b982e3de1d0256b40605cbe648ae2854d206ab65c5a0b238737833800"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/lij/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/lij/firefox-93.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "3d5b3e6f04d7a617870a034a4c1b213246d48408eb4849cfaa8872f1aa8c8f13"; + sha256 = "74544673b4f1873d59ae86a5fc7435daba78c230e6cae037691b4dd78c231385"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/lt/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/lt/firefox-93.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "6534871a9a4414a59c3b885d7fa7d7637c9e1f220aa82afcb89e629795c61562"; + sha256 = "4ea7b516fc0be437944948d5eceb74aa80cf234182fbfd4d81a3c08c86f42d2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/lv/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/lv/firefox-93.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "c2b3cb52ea74f0d62b28e54f87662863b801d4f8fc357c088ecb690d042fe8f4"; + sha256 = "3aa2aefb7202c7cbdcc053a3a13c7fce7edf7872b5d82901be05a7bfed6790a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/mk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/mk/firefox-93.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "2a30d42025663aad7cf6f3039c0e4b8a1fe642dcf97b9d616e6a70c5f2ff0e82"; + sha256 = "8e91a31085519232ab0a23553f36291f7998fb5ae1c7cbb8b9d37b1ea0609537"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/mr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/mr/firefox-93.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "43f244482732b43c39f206fecbf1080c8a154e78707be98931549e0f6809b56f"; + sha256 = "59d3dc4141b0fd2bac81691ab72d4bab6d1e0265142e4584e9a87eef88d59b4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ms/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ms/firefox-93.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "46b3273f508889c48d611568f0e927eac7e612c2fdafb3546c47f080ee928db7"; + sha256 = "228e5d2419aaa55e5e98c355ae7dd81871f22661be041bc1a9397be5db2ecb5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/my/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/my/firefox-93.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "ea355f78f80ec11c44a5735838c5b48b6b915951872abfd8a935f8991010840c"; + sha256 = "e7b7a5c9788ce72b68fc0236fc7fc1fecc00f792e03b71e67359e9c93ff9f07f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/nb-NO/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/nb-NO/firefox-93.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "acda50b76ec558b2d941d77b4e523edc0fe4cce0f03e0201d881917a820dff9a"; + sha256 = "e71350bc79c186f1f64e28f3c13ffac3e9396674180ad3559b1ebc418078ec4c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ne-NP/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ne-NP/firefox-93.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "ac72053ee1992338bf192ec3a10ff975cc973e72c5468de68f8441bc815553b8"; + sha256 = "e90e6e6ab1a49bfb53e244bf58d21bb0e2c6fc17f2899cca4642097d2742adc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/nl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/nl/firefox-93.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "7f8c13888b7a24235c48f7c8c03ed66f7e3736247c936ddfcf88c8f3816c066c"; + sha256 = "f9d292f1c1238802a2c90fd5b5bcd77c6fc4d36e2848b81ca3d62c5128443ce6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/nn-NO/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/nn-NO/firefox-93.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "c0b50c45a6d198f60cd5703889771778bae6493e77e70d07518b6ae9ce9c4f4b"; + sha256 = "50e59a0ac8263b59d63a39e8acc93ddf88f4570755b859f75c29b0f8b5a08a80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/oc/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/oc/firefox-93.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "0b75c4725e1d9f271a5f34781b8479ff6d6a11ef827afca97d52c599fb389d08"; + sha256 = "0fb8406247ac22b55295b4d089aab6ceb4a8b334ea03268591f218ca2ae70930"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/pa-IN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/pa-IN/firefox-93.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "fd4e2d38c3dbbe0ef35799a89fb8cb50435e2a06ed49cec2a380144b3ccd0ec9"; + sha256 = "39caf8f8035591e5180e5336fe2bc92d7468e9c630177a4b6c20aec946f92164"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/pl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/pl/firefox-93.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "a329a085eaa20c41105b70b2efdfc31260c2e5f9afaae97416a8c3a77e82f822"; + sha256 = "0c9f88b6c78749d2306aa45edc29a68bcf52cddfe50fd5a61977f51373fb21a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/pt-BR/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/pt-BR/firefox-93.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "c418d18e275c4ce5641c8b0f7e30da75659137a4a5ef9dc43fbd2c206e1a1bdb"; + sha256 = "687d9fa875030327d376b58127776c10ca880982eb3bfdb3609cb643c80a76b0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/pt-PT/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/pt-PT/firefox-93.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "d5cbb5282477c716966c6b30ca9a8f21771638cfbf2e3fce69663ff7bc58c6b4"; + sha256 = "49b221a77cbb575a627b9cb2503544cec5a7fd2beeb35f51358ae59c7984a11d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/rm/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/rm/firefox-93.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "916934135d13a1b8c0a21543c3569f697358e8935cb9f6972c9e80f96fbb775c"; + sha256 = "07f1f9f1c4d81c0ecc11580032cc590007778322db260ea4088c8004095bb5df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ro/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ro/firefox-93.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "5571914386329eb2b0eddf3e4ddbf98eeebf1ae86172fac533d2397a48c8cb31"; + sha256 = "dd1ec66d82593f461f6277d8707761ae18903da16428cb37f079d83153278489"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ru/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ru/firefox-93.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "6b78d8ed2d8df5c00198ccf6fc3221b215623ab4a0b6c21030cde5413f1a1165"; + sha256 = "574f4afb6c4cc4f686c7e21570193708a2ba5f71f9462649e71f8db80c545847"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/si/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/sco/firefox-93.0b9.tar.bz2"; + locale = "sco"; + arch = "linux-x86_64"; + sha256 = "dcfe33f0f4ef517d71ccfc1bbd9c57f166c33f2c41e24e64c3699d576dea1581"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/si/firefox-93.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "ed31203623e85d3cd0ea23c54177542455af4013e2ed8ddf642056a99187f814"; + sha256 = "8a815a0f17a5d9065b40bba172897e7e258fa6462b6c139a8353dd548eb49279"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/sk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/sk/firefox-93.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "ef8f4020adae61fcd797ed23efc1bf54bd94609105a9bec4ac7f543fe876275b"; + sha256 = "162f1c3eca8245152d200fdf8a928a087d6d86e9493545c173b5aa9b44cbbed4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/sl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/sl/firefox-93.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "ca4a679042db1485d0ced1f81be3610493755ceb7a32887110f528029657b499"; + sha256 = "3879192bd83507236a1415007205ffbf20291d4739f2bf289d3f951c0889571a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/son/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/son/firefox-93.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "aeb7a5e4a15eb836455dacf964826a08905ac822390e2f67230eccd32942e136"; + sha256 = "5d0f0ed50682a74cf7bbdd1cd75050507aa9696c15aeb813de14975a49b16212"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/sq/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/sq/firefox-93.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "93109db6d38da24dd3999960c866754966945dceebdfee960125039e1939b5d9"; + sha256 = "87a273b3b0d232356364516bcbebe2e68689425e909a3f160ecb296b35954deb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/sr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/sr/firefox-93.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "cc1787dca9c673d6ee937d7e0a2801cb345a0b06db3f6e53581e1151716d4170"; + sha256 = "ea036fad2cafb67e0458f3a92b945e4436461e409ed4d89905b1e98fd52f38fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/sv-SE/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/sv-SE/firefox-93.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "281397c37d390635e44e1471b318ea9ba98f4b3b8d7670131c3262838ad26e4a"; + sha256 = "a44a9f6ed29ce861573e02bdaa4157a76a10aa1dc5f8cbde29571c1778637a53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/szl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/szl/firefox-93.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "5255724df1ec3d05f33de152885d180dab52796317ec6739838029f20195ce3b"; + sha256 = "3e7da2699de6cc01665632cef6d3de0f8c4abcda128993ce530a24a4a2f2237a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ta/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ta/firefox-93.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "d8c5ae00cc8175e5b6beba8b1c7102a8a1f81860d5945c4e73cd77df5b5f8368"; + sha256 = "000eed6800e7e7148dd283bd13e139ee9b02badfef751cfb76edcfffd13567e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/te/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/te/firefox-93.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "270e079ef9ce1c7977d8cdcfaed1f34552c3058dd6cdad22f17b53c31d6c1dc6"; + sha256 = "84f3da7dbdd3b82751b2a67f652eebbeddc47f94fd36ce2fced2b2031f0fb225"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/th/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/th/firefox-93.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "747acadb00c955621ec470870478a63a10c4131c244282bdde2a269a9569d6e6"; + sha256 = "25d87334811930044b8998940fb3bb6a3e4b54cbbbccec3c3456b1cf419600c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/tl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/tl/firefox-93.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "9cdc0ccc264d071ee7f9d7208cd1fddb6179e016ad759c4d5e4dbb00f6508360"; + sha256 = "0e2a7660604450ef5b23bfd6846036e20b7644b18396cc56950f14aea47529f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/tr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/tr/firefox-93.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "2e20a8e524e0b91832efa759627b0ddab02fac12d009e0b6bc81ba0833c94c2c"; + sha256 = "58efcd056d117d7b7e79054f472eeeac0b81b1362c0a1f663dbe83b2670a16fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/trs/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/trs/firefox-93.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "1f4654b6d9d9d33992662288c47e79f8fcfbdf76db5ba0519bfb0de997756afa"; + sha256 = "6cb54768b1932129fc19b5ffde3dbd255584be401d3928c0edea9b8bc34a1c0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/uk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/uk/firefox-93.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "e7048a1226c8af17dd95d162b0d88ed9cd8b0ddfb08bc03920ed04e3d2cd2d8b"; + sha256 = "0869ffbd421fcda84cd73ec7bb2887afcce92f9cc97c36e35604f48b750a1bda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/ur/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/ur/firefox-93.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "5ae8a63c2c3dc8168910c231dcf54aac745327b818d66254a3caada129a83fb0"; + sha256 = "1ed8047553e0888fba18c51cdc683c7a46ffb5b686f6586c33a14d1c7fe21b40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/uz/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/uz/firefox-93.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "3dc370ffe28c5ed91b8374c2f5ee41a0ae4bd094851a8dfb1d53b546595f558f"; + sha256 = "64602d30e1724206415a9fb42bb09efd2565812ba28e9e8c5d8ac9e9292da218"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/vi/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/vi/firefox-93.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "a6f39e25aae7ed5b7d7d1e4ec8c67c4bd5f5ab28178d8f1fbbb817713dbecc1a"; + sha256 = "7d27a349cb694bb1cacd504911c20e4ceb3f6dd88acdeb7ee763c510ec0dea1f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/xh/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/xh/firefox-93.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "10d3c4c3638f0715001b8eb0026a6ca18a5b92d09e8e1d80f6b40246a5c7cafd"; + sha256 = "f5d919ee5e150565ea7f62360f838eeeed6816511c4a76ee3a2502fe9134ca72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/zh-CN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/zh-CN/firefox-93.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "2142e803dd183e8f7fdf7949804e3cfef22dee2a0e665eeb60933368f54797c5"; + sha256 = "be32a85851306cd134fb142443c388ed063d5a919f27836c1f531c07f8fd7584"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-x86_64/zh-TW/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-x86_64/zh-TW/firefox-93.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "0617ccd22cc00872e5e5462636f150511ef5074052c8ad707bba98ae907f4ad7"; + sha256 = "b4dfa008a320bf25924718c14aa2a340e5a3eec4ab769f52f688c6e7b78e7e5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ach/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ach/firefox-93.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "eaa38a9976a7ac2e99030559ba27ff56cac4820ab5f9757f5c2cef76db8c4536"; + sha256 = "e9eb2a4532b6136b5889ec66d4b3ca4d19c99f99a66c96f119c2dfd41b4267cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/af/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/af/firefox-93.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "acc117bc014e08cfef0a26447097bb8df774d6246d569e6408021f0f8799af9d"; + sha256 = "927db81da2ebdfafe7e0ab53bbab88782167d4ee25f6a6651adfe5baf7373dee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/an/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/an/firefox-93.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "1bbab4c2b380edc694480e2f6427ddb539b5fe5fd2489f050998c920975725da"; + sha256 = "ca5309cf1e2b48e311d37c495f823c3b5f6c5fcbf9f50be0bc59b1230111e5ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ar/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ar/firefox-93.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "4d438bef41db963a282b53d13fc54db0d685014e03684fa19e25109f94d7f6bc"; + sha256 = "496bbfc40b050f2d2c49e8cbca690f50d7f1b88bab436bf56d82e92296b7897e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ast/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ast/firefox-93.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "ae0d76246adcf16e4e910a02c54c8227a1ebd930b24bfe32ee54e631310cc42e"; + sha256 = "b1fb5d0634f4f153f59b66603dc8ce55ba0575951db9f59b2ec841c274fff9d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/az/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/az/firefox-93.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "7b262f731afe0ab9a35e604099197e470416a79c80141c672886473cccfe9f49"; + sha256 = "f162ac2af6c4cd596b6d8733ef501555ea53b8dd115cc31e32df3955c2f21279"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/be/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/be/firefox-93.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "7a3596146cc81954dc55c4040d3926326d468e447dc8fdffaac7a3fabe423d0e"; + sha256 = "5a0732d66d76eebbfe4bdebc41884b44ac32259a008e47ac3559f1b52eacf5ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/bg/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/bg/firefox-93.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "8a1cd058dbd39c6c807a7819116f1af4b22ff936a71d67bc54047d72252721f7"; + sha256 = "275bd0bd8498313775939f9b8727c6ff4f4bfdb30e47938ad40ab2ed0f29c927"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/bn/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/bn/firefox-93.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "8e58b03730a2c32f0537537114ec662c7307d1f79c5f1aa3dbe60a8d95526194"; + sha256 = "48c71288deb68a813036f465e4658f4f64c0c7f97e8acef2f165acde6a940a5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/br/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/br/firefox-93.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "37bb7c1e9c015994ea23b6c069b227367c752a4a2cb968d983fe2b0fd0d35839"; + sha256 = "064a2aefbcd520efd8d9e53d897418542488684780e766cddc3969611d944351"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/bs/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/bs/firefox-93.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "fa97d80ac97b9d155c40ca0dcc21bc5d1255b3e6a54153402d965b35700d9f74"; + sha256 = "cd5d9d229c0f2be0a76dece98bf52bb7e74a8709ae1ab843e1e6815d067eaec6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ca-valencia/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ca-valencia/firefox-93.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "c9bc1be306267b7bb2282c8a543e6af66ccfaaa1f09769cd4c535d744a670b22"; + sha256 = "14818c3d576b0c5e860f9eb406d270d30f930153ee61d9858eaeaaa0987c0d65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ca/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ca/firefox-93.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "8f3d423ea28e80303709b9323576695a674ea20c675bd825ab5431606e284136"; + sha256 = "2adf82a136c78a7bda852e2c9f4918c5279e1c44a3a21b3b7ed828f57917afc6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/cak/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/cak/firefox-93.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "57d9509c186eee016cc22568d1f90942e689aeb918ed55aef19764b53da46087"; + sha256 = "fc05da877c0693d96619890abf19c1b68672ed6dfc49a5272b07195ea5d8ff43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/cs/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/cs/firefox-93.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "af43cab80b6f29346310171c32f8b8ea610f191ae48d6caf7db383826f23945c"; + sha256 = "d83868f0ee45fbdcd9bf12b97b4000dd9470c62dd8731baaf8a66b027ccae2e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/cy/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/cy/firefox-93.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "dc8e87e1e15cba292f3c5aadec017d8c0c6f2c5c5518f68b5267c7e707b27c4e"; + sha256 = "dcf063c758462ddb65b48e265047c18f9631a311c380e5660cc9f9a7c188a8e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/da/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/da/firefox-93.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "c30e8c35a2eb997c62530a330fc411bf9f87996a717ea3e12f0747784ce287d5"; + sha256 = "595160a704e76ab74fca0497c01e1085f44e8935415725e1c266eb72537e6b02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/de/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/de/firefox-93.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "ab884b36e16d5401b54c1e75d77d553c9add8bd26ee38e57f11f433a163bc567"; + sha256 = "ee8c11feeb6333ea81df1d5f5fc5d0c8a9cd87fb0401398b12e553d83d471fdf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/dsb/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/dsb/firefox-93.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "0eb8d2548e8b79211dba6fd477393430ba77c7bfb2fc519eeb5e1a3f484504fd"; + sha256 = "7f25250ebd2cc53d74b4fc8c217fc727149b622db386abd24f2d83e8561fabf1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/el/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/el/firefox-93.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "86522647d5107f3518002d8958af62272f0566e178b732a1243ff84da1b2579a"; + sha256 = "1fe1e5d977d4b0a4f6331efe1b8d53e56fa7c254b6e1985c5d03a7fd02c79808"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/en-CA/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/en-CA/firefox-93.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "e9b442a4aebca8f9740f657bd9c032661573890355efc2e418bc2a8ca66c07a4"; + sha256 = "6cf56b811a7e59f3c0db5c04f700a71a333cb8618a4b01b29ded81ff54451a06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/en-GB/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/en-GB/firefox-93.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "d0a850a7d9754bb71ff29985c4a129160ce3e99e30df1ef4e7c7a2e011b59771"; + sha256 = "40e7a0f214cef11ab5c16e9da62cc98f6dcb3287cefdc4ffaa34c99601eb624f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/en-US/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/en-US/firefox-93.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "4ba4529f6b391d946e876aa321648790b0ec7a92ea5530981dd2f726e04ce0b6"; + sha256 = "de10ad020df1bf779839acd6a2a0f409d6b35c6361f7a5f80f02b678004064e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/eo/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/eo/firefox-93.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "01e4bcc9d4d01ff5ffb67540cdb815710ab12d9bf621ab1febe8237236960680"; + sha256 = "7311cdfb11a7cf8a88b2424916d52423ce84703ab931e096c6d7bb72c148a65b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/es-AR/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/es-AR/firefox-93.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e3d38a32104b08219d06950d1f63726460ea631a7efe8f0eb594ff8aa4e398f4"; + sha256 = "3fd4508eb613f3001fe81bdb2845c0ef389e966b79ce12c8040901c579bd79c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/es-CL/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/es-CL/firefox-93.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "20df30c114c27f1242d14139e0a62efde00a6fca686adb54ea9f30ce30a22776"; + sha256 = "fe84e47151d82be0a9d74b377318925bd44ddd9be2e217778c041399e02b9e4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/es-ES/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/es-ES/firefox-93.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "441b5a41d4721cb6a3f99de3820611907e212415c4a398be9177693704d3cd80"; + sha256 = "4de9f1f42f27b2fb36daaa5ba7d212ba91fe3651ad0d326b3b8436b48decdc2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/es-MX/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/es-MX/firefox-93.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "b08fa76644afe19af1203fcf079e4908f1e441bf0db362cead45d13ad5f30a93"; + sha256 = "11b870635a925c571a762e1cbd1a8c53b3327e1031ddd8475591a72bafe01874"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/et/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/et/firefox-93.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "1754d25cf865a5d08c8a267abe0bce05c951644b58e0126f7085152538392028"; + sha256 = "1929a9f8a03fbf6ca8ab32a072e8c54855e1489c7f907d4edfdad8b07f8a91e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/eu/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/eu/firefox-93.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "33c3a95df0a369c5feae813bda7f0cc8bbc9b1c63aba5cf4193647f03d86623b"; + sha256 = "ec27021034521061ff5d53d403b082145f1bbd81494dd1dc8c8ea3b56643fa43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/fa/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/fa/firefox-93.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "ba977267c4ab955665fee6ebae8e5be2ac9a71118b118c2626942f4481e8b8f8"; + sha256 = "50c56acbc126c8c3e984316a00f94a4961ca8fa0eba8c5ec0f281f5fb11c6cd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ff/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ff/firefox-93.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "52b1cbeae32276158a6e649299229c008f797e05d16af756f8e11ab10b8e5a68"; + sha256 = "39571a5f07088064c9772f376ed30384f5bb2a02b25ade0b1cd7983786fbdffc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/fi/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/fi/firefox-93.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "45e3e210abb3d0e8647451a52c3ac8e17982d3774e557ffbde36383741b3ea88"; + sha256 = "9872be03a45fbf0cbbfe2da4caea27c34f75b515d8dc0e71e51de42b64cd0c20"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/fr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/fr/firefox-93.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "0d6b747bc77931771c9cf6ec23085bcc3def89d8586ebe310df6296a4690df74"; + sha256 = "9855d6a2344b8d49da4fbfba9918952b48fd5f227ab98dc65989f4ec31764dc5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/fy-NL/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/fy-NL/firefox-93.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "829019f441a1bdbabe67a367d755499c0fb2a79fe1e62c5fa319f7b786d8f096"; + sha256 = "d7f3daa5e12166b96112393d9c201ae1e7c3b4c52abd14a53caace37dc794dc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ga-IE/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ga-IE/firefox-93.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "2a04c91377b2870c986d434e24626e119a2420028549a51e0dfc0be140ebbd57"; + sha256 = "803ea16ab684720467ec0dd7b4d04bac066a9718423d0c66e6baa1dce1dd017c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/gd/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/gd/firefox-93.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "60ac0465a4cdae54b33035469d6897a5905678ebbe36b49a748fd87b0bf8e541"; + sha256 = "fc33b3978073687432daaf6321e9fdb33e24b3103623ccfe8fc0dd8d8f3e1530"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/gl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/gl/firefox-93.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "237a0ef1486b7864bb8cfbccd17d8ae95a1935664acda423a1c4ae543aa4401d"; + sha256 = "6b418d450059c4e7c7d443596d253a5446c1d8fdba62a2198435ed5bdb55800d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/gn/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/gn/firefox-93.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "137d3c301c5fb74d69481801eca7e7bd1cd01d10d0a87b68b177bc63382f8559"; + sha256 = "37dd582899cab6a195bd35ad98ac38b0d3db98096b90f192b5efdc3cc8f18000"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/gu-IN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/gu-IN/firefox-93.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "6d9e69ca5feb66721369a1c39e76ea3e0b4b4db855ca895137f55d61df129485"; + sha256 = "d45ef9352b50e78454e115ef69adba76adddf2429226ed54787b0844213a4f9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/he/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/he/firefox-93.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "fe88f902475e01b1fb5a26abaf40fef31910eb1c812bce208eb9f55024225e95"; + sha256 = "87a0c3278b25be8d39b2eec94d1e34075075db3abf87c87e1c28d726ce1f2a65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/hi-IN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/hi-IN/firefox-93.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "fce917ccb693ac825b387ea78f6a5e4de4816f8fe9d7fe5ad6c2b600a2a68cbc"; + sha256 = "43dd434b6fac377f9710995d4a5c5c74b095308a1d40a68a7367814b01f96b65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/hr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/hr/firefox-93.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "71872966d982032bbafea002c3e7e03162b972ee7f8eb8df00d26bd5d3e8c70e"; + sha256 = "7330335e186ed88837a4c955fec3a53aac36e78764aeb56de37561a67de0b63c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/hsb/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/hsb/firefox-93.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "ea8d862701f94cbca2e5f22090cc1434f6f51f8afec5ec929c84c714f11c42ee"; + sha256 = "73fcbc76759400d216c2d08fa54a61548b8f07c449792145446fa76d88485eb5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/hu/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/hu/firefox-93.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "9bd5842125a2432fc997a416987414323f729685b8b0780db1183a8415ad3a94"; + sha256 = "5bd7eea9ddc2c7a9a0aa41e68b2810a400c56f918d81fadf62c8e72d714c2c79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/hy-AM/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/hy-AM/firefox-93.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "d094a0d50acfa2d2e28cc6c4bda43c4e4fa999e80ef97bf4090fa19d672515a9"; + sha256 = "da2d3dab995c36a387993aa67655d18706c6c9d9b5e01e70ef23ac080d0ccc97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ia/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ia/firefox-93.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "077179806415be1461f4cf2dc5676c434b851fe99e62404cafa6736284cb432c"; + sha256 = "9572d0a6b82cd87bf022d29a247f9ac0e30255e784f3c82c7aede9bcfaad70f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/id/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/id/firefox-93.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "69e9dbb8621fb196d2a59f7f96c3f368abebc7b512ccc492ea45959f9ba75446"; + sha256 = "6d3b711cfbc9993d46510d021198a21d0ed3fdb00085f14eb05e508bf0cc1321"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/is/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/is/firefox-93.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "b5776defe739415915780672d31c35a277f885914ac56c09ac947e317f71ac5a"; + sha256 = "c7cb2639f7e17f41f0d96690f2ad3f82a212a5bcf5023cdebee6fc93aefc67a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/it/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/it/firefox-93.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "37b347a27bb14ee9a2c6c7f672cf971de1a7826cbeb0588a4847c32b79dc0496"; + sha256 = "8f9f401b3d07d3674fa4fc60b9cebaf81552248807cfefc88a31f16346f6bc90"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ja/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ja/firefox-93.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "979cb88f236160d3091f7cfcb80d317fba4fac6ab2ec26d78a2c92651e856f21"; + sha256 = "dd69192e7d5c8abdedd9a099558d1ed3670e3f2ffe0f549bd95d5d7684d2561b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ka/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ka/firefox-93.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "744cf7540dc3238442153b0edd50c687957f47531c0569ce32720e2e5160cbd7"; + sha256 = "83f2dd9e75e6260fa4bb4bf04d00616514194a00f370eabe0884bb22036530f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/kab/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/kab/firefox-93.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "66efbd08ad245c4629d05de0eec26f987d7d72d66ad097ab197bb31f29345284"; + sha256 = "f58da4330ff0307b17763aa45a52533aa7a4483c0afa66a7456ce61508168831"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/kk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/kk/firefox-93.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "9099027e11d674ce49a0945194d724010980deab08360b4bc0240d007c307fbc"; + sha256 = "72674bca530d0c95857fa014e1e0c7435fa1bde0c68638d47d41fc7d4decf836"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/km/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/km/firefox-93.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "a7e43012fcb7a6b58ad20069452d69cc9624236983872f733239c487e4737fda"; + sha256 = "e8aa8cdd71b7f8977d1242d472c45d4e500766c68ff28a77c852e75405d4b53d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/kn/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/kn/firefox-93.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "396bb2a4e2c5385b5f74018d3eccb3db2526fdaf277ca99e74934cb17c738cd2"; + sha256 = "621871771eabfeeb1d65def14ea3550bd8d28c7b08ce0a3311badfa8f2a5c2e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ko/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ko/firefox-93.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "7606eccf3e6ebe3190a1bfbb60bf88d991e0ff48453b9cc1c07a08ecf54e7932"; + sha256 = "0e3c16f9f0450da181f41eda8b55bb89794f35540a4cd206b7d9ad62f182eee5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/lij/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/lij/firefox-93.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "b5570a8a3ee4445da1b18ee3217976e02923819f4b3d05f58caba65586f91294"; + sha256 = "65c6ad7b2fcf59a0320ede05f7ecdd43fc09143446ac822a566a81ec8763b3ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/lt/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/lt/firefox-93.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "2e4b6a279d3db48dc8a498ee5d038c6304782083a699a89d958f81bfa87d8916"; + sha256 = "7a2b96ebdc2dfffb7bf331ec28eddfd04ac3b51dbb353208f50d1dcdc840280a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/lv/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/lv/firefox-93.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "031c1fa63780985b4576305b2979bb3c7265cfb175b67393c0f0bfc23177711e"; + sha256 = "a5293896e24d53645553af0b76f82dc0caad6a556fa749b2183ad6681b6950ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/mk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/mk/firefox-93.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "797af316793586db1ab0e0cc9fcf75c1fe70a9c89d78ffa43e6ca6b4fce99c44"; + sha256 = "18f078070bddb2f74b60f7d48b5ee60a520e822b5634515c8edba26886136cf0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/mr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/mr/firefox-93.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "5363901c98627006d490d20f89fbe9a050cc23a018651934b39e0a0b7dde0d5e"; + sha256 = "22d9f5a4eb0319e41cbd7e19421aad78168e5880bdc8557e5ca2d9e925715494"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ms/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ms/firefox-93.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "063ebaa12fa522c218990d01f5b312f019e223fee8efb57a10ff68197b8c529e"; + sha256 = "5c45c94fc63c39ab2168812a9b74de506cb2b9228241fe4c3573d33dca07c6f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/my/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/my/firefox-93.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "0eac26eb33852f0c0ea79869385010c623769933f5c8cd6c718ab9fde5eae61d"; + sha256 = "4b4859b782cea1810a8186dce1e792d53d63c8c4d262b38ea201e05d3e613267"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/nb-NO/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/nb-NO/firefox-93.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "15cad2c535889f2cc29021490d6bb28145e0f1df27676e3871d18d17b3db90bc"; + sha256 = "55c6bbd9624951d12249c391c21f2d0e267164bc465b79b27b7dbacc3e116542"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ne-NP/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ne-NP/firefox-93.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "640b3099d96af524455026de4059a23fe75a54b330a8b4fd0a9efe58e55cf950"; + sha256 = "cef068a354a629983b9cb4ba447fa6d5b14b9a56bf20bba7baa957bced248f41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/nl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/nl/firefox-93.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "f12f1d587701cc78884fa5ae3d9997aed69ab6b57438e89419bda3330e1787d7"; + sha256 = "ace8c4b715acea848034f45a9e30dcaf2c10085fe2d5bc819c011e1d3bccb4d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/nn-NO/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/nn-NO/firefox-93.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "7ac1de885da3fd400e03d91adad4eee78736d7776d1b3134b38ecb9bc4d4614c"; + sha256 = "55d95b6d644247239200004f56087bf0631f97a91a925ac271c658c35384037e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/oc/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/oc/firefox-93.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "bab17427dc0d1af03bf8a28a1ac9f505d71ff2d84a184fa6ac99454d6623a269"; + sha256 = "c3c043ad64908241feeea5f0c26231878bff46a9a26173a9ab1819dc1fca04ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/pa-IN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/pa-IN/firefox-93.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "47a04146475054fcb8d76880f06491e885e12862bd0444e6556ac1030ae8b2b9"; + sha256 = "d9c96deeede18320fc545cbe334cbcbd7ee7e1850de9b8303658dd34b7b83efc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/pl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/pl/firefox-93.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "5c4993bcc60f8d116ef36ea6b502078c34c274f91ee455497203714281f3be46"; + sha256 = "f8cb141e864d190352fecc706805f5018eacde93cb19e51320f5707493f0392b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/pt-BR/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/pt-BR/firefox-93.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "7b5e2f52aa1864a6c1c96387a8f5fe3e788b8472d4852226919db430168b151e"; + sha256 = "a3333a81c8bd6bd0592c909270143c50dffc09e13ed602ce61a61de979bd54e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/pt-PT/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/pt-PT/firefox-93.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "7717af1088d956ffaaf91f122e5929d3605b60938a40bfa829f791eb7833b620"; + sha256 = "683aa8963adafedf9bf843531829a783a5d51374bad88ca82d9661e6aba93848"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/rm/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/rm/firefox-93.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "eea1dd966c8f4264616b89183a732f7c551c30c999c7bc95e3a6952c6ed667c1"; + sha256 = "d79a780952024f89b00d3f72e2e048d6d84163e49c638a781a4ab8f6a6ead3d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ro/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ro/firefox-93.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "1f472eab1edacbd4f94e5120a32ecd51b4ec507108b516a244582e0a6f177669"; + sha256 = "8b6497370f76fc56fd9a9098a0c1a86a662b783143ab9dc018ebcb7a2bee0c05"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ru/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ru/firefox-93.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "0cc517ed918facc26e76159b744b28397536736db641a45ac5e11bef9cf9b3d9"; + sha256 = "32292a87d2ffc2be2e5026fc7ea7ae24174391d9419809f16521bcfcf68eed6e"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/sco/firefox-93.0b9.tar.bz2"; + locale = "sco"; + arch = "linux-i686"; + sha256 = "1c8dc3d68cf2d6670b6e262db5cf12f54b572130b4f3d125f8317cb83958c283"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/si/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/si/firefox-93.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "edb56422879227089c8093397464e24c641d7d76bfd71e2dd6fde7a8b7b2498e"; + sha256 = "d4051b591ff9124c3dee56cb28c267c04a353a875f28d48ba8edabf288079224"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/sk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/sk/firefox-93.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "ca64ed30ae3d073b51c3dc82c841eec88a7fa3913e82243dd8f67078f0ec59b0"; + sha256 = "406eb629f1c4b6b139079bffe021fdd07c2e0c5e8e548aefd542a8743b3cbfc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/sl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/sl/firefox-93.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "ce5c1df3db5e819f309a757e37c764f75dffc2cbf8737a8953349283f98855c2"; + sha256 = "0ca1a6894f9ca4cf129bb9d3d9105c063a2b07836142004354eac0d49a144376"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/son/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/son/firefox-93.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "d1f5604c5204be5c6c5e323b1ffabb411051de8c31c1568cebb6cecda0c1a371"; + sha256 = "50a9fddee248dbe7e3870616c18ec01215a371c63cce4eef456cc89a9a901a39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/sq/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/sq/firefox-93.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "805b77a1a561541e714c9ebaf23d0f5d50abb84766033e38056e0c528ac44d13"; + sha256 = "b1a19cceef256312a675b7c7749869031650c8d3894bfa13571da8e42ee7ae57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/sr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/sr/firefox-93.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "d9b5ca9b56132936391f0b56b3694dd741a6217f591acc7cecb73e947adac302"; + sha256 = "0996f5494ffc0f60d2b0edd52666989dc952705f56b04cdd5bb0e06a927bd4a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/sv-SE/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/sv-SE/firefox-93.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "3b5aa0a8d598135a2bee5b9b7db478a106473f7708e24c89f103c8d67e233dec"; + sha256 = "0cc38a93202358508c05a8c65b06a23f46f9fef4d1858ce9a0ab5b6f047007bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/szl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/szl/firefox-93.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "6da4aef36fb8cd014e827a89a9ec9092c9d2005f493b29180048fe70688e8513"; + sha256 = "ac7cb9a6eef936bddf9c43dad2bd4fd92ac773ddba2e182d771c35a7e9d56529"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ta/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ta/firefox-93.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "972706bfdf85c74f7615222fd3dc15315fe9b339f2cf03509ea40461ffa09dc9"; + sha256 = "549a7a0241e3333da7449638e52a9797a72dcc18b6a9066adaf25131d41cf187"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/te/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/te/firefox-93.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "5e92dbef162c8553868c321c604315af544fc5a157ad80bbb6cf0dfc1e049ed3"; + sha256 = "c56357ae1ec59fb32f38efb068107a22f0d854cf8486e5e259577752c262755f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/th/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/th/firefox-93.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "2530799eca2427f2294b9020dacdd1360f12c07973627a4f27a1fd09fcee02c3"; + sha256 = "a0653f59b22028f9aba8dd29b8993d650c361bbc19ebf8dbc5604a961e9d011c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/tl/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/tl/firefox-93.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "ab71a1db5a1a1a77e52819b48322186a7b2425ccea4528aa68c286f76733b0cd"; + sha256 = "ed207c9b471e8d34d9127c87621ba98faf83749f4157aba896ed30e22a5289b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/tr/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/tr/firefox-93.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "f4816b4dcc0263451bfe4953c80ca9b2c19dcc882cd01523dee0fa95f8196db7"; + sha256 = "4f43cf4f101c37b4ab50842b342063a43e95b855018b9cfcabb3b3297696b349"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/trs/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/trs/firefox-93.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "6dad8a06f75a64ea647b7eac9b211611048d46f6cb82c339eed09f26554e97e1"; + sha256 = "745802fdb974cde7565fc02f71046231bdc992edc17ae4567daf24f2dab27ba5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/uk/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/uk/firefox-93.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "ea5eb3e482eb51804a935266a91957c5969f0faacf7ea6fc3aaeb39e0b0d3dc4"; + sha256 = "4b85ea750a155f40356c2c7b8aa205ca3b269d0382bbd9200d0fad3141c4caa4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/ur/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/ur/firefox-93.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "3048627e8fa53fa379f5d1c3ec9ea70733aadee3a8a9ae35c75187f820024a1e"; + sha256 = "968d3a3920e8709f787a12c19c7106322af4aea48889b3a84827b00899fd8b64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/uz/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/uz/firefox-93.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "9cd8711b5a188e7c3fc954b65bd08b4ecb3b827816652ae859d5e6a57a15ae5f"; + sha256 = "cec4b1fd4a1460ae789ff99c4ee0923a337d5c48ce489dc44ea02291b96acafa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/vi/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/vi/firefox-93.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "89b09f5d295512e98fc374ee950a74aac041ecdde3bbad5cf42a07e5b3ae3ece"; + sha256 = "50cea0a2eb38ea294da4cb9298dde867e2fc1ee8d4e93f0c5c6efb8ba1aa1de7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/xh/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/xh/firefox-93.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "925c0f9832d235aca22b0b26aef59f750f09d1d3ea2a391aab4087a44f743072"; + sha256 = "913b091a7eaeb2905fa45b56db3125106e0161d944eef8a9f9aded4e8e3f00f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/zh-CN/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/zh-CN/firefox-93.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "3f8029b6f33a0954ea8d3029a5182b4b016356348d1a793f9f96261a5e7e6e99"; + sha256 = "33fcbece46f5fc08ae0b378b63378aa0b9933302c63ce11ec8e4f310e4f8e7e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/90.0b6/linux-i686/zh-TW/firefox-90.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/93.0b9/linux-i686/zh-TW/firefox-93.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "8d69eede16322268738bf8d4b75698a825391df1c06caa0ca2931555c832f124"; + sha256 = "cd88a9500b99db3849a1762a3981ecf1f0c2ceb919dbdd1844dbb9aaa7dd72c5"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index b93283c80eb7..eeca26fcaf93 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -9,7 +9,7 @@ , yasm, libGLU, libGL, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification , libvpx_1_8 -, icu69, libpng, jemalloc, glib, pciutils +, icu69, libpng, glib, pciutils , autoconf213, which, gnused, rustPackages, rustPackages_1_45 , rust-cbindgen, nodejs, nasm, fetchpatch , gnum4 @@ -27,6 +27,7 @@ , ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages , gssSupport ? true, libkrb5 , pipewireSupport ? waylandSupport && webrtcSupport, pipewire +, jemallocSupport ? true, jemalloc ## privacy-related options @@ -155,6 +156,23 @@ buildStdenv.mkDerivation ({ sha256 = "0qc62di5823r7ly2lxkclzj9rhg2z7ms81igz44nv0fzv3dszdab"; }) + # These fix Firefox on sway and other non-Gnome wayland WMs. They should be + # removed whenever the following two patches make it onto a release: + # 1. https://hg.mozilla.org/mozilla-central/rev/51c13987d1b8 + # 2. https://hg.mozilla.org/integration/autoland/rev/3b856ecc00e4 + # This will probably happen in the next point release, but let's be careful + # and double check whether it's working on sway on the next v bump. + ++ lib.optionals (lib.versionAtLeast version "92") [ + (fetchpatch { + url = "https://hg.mozilla.org/integration/autoland/raw-rev/3b856ecc00e4"; + sha256 = "sha256-d8IRJD6ELC3ZgEs1ES/gy2kTNu/ivoUkUNGMEUoq8r8="; + }) + (fetchpatch { + url = "https://hg.mozilla.org/mozilla-central/raw-rev/51c13987d1b8"; + sha256 = "sha256-C2jcoWLuxW0Ic+Mbh3UpEzxTKZInljqVdcuA9WjspoA="; + }) + ] + ++ patches; @@ -172,7 +190,7 @@ buildStdenv.mkDerivation ({ xorg.libXdamage xorg.libXext libevent libstartup_notification /* cairo */ - libpng jemalloc glib + libpng glib nasm icu69 libvpx_1_8 # >= 66 requires nasm for the AV1 lib dav1d # yasm can potentially be removed in future versions @@ -185,6 +203,7 @@ buildStdenv.mkDerivation ({ ++ lib.optional gssSupport libkrb5 ++ lib.optionals waylandSupport [ libxkbcommon libdrm ] ++ lib.optional pipewireSupport pipewire + ++ lib.optional jemallocSupport jemalloc ++ lib.optional (lib.versionAtLeast version "82") gnum4 ++ lib.optionals buildStdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos AVFoundation MediaToolbox CoreLocation @@ -292,7 +311,6 @@ buildStdenv.mkDerivation ({ "--disable-tests" "--disable-necko-wifi" # maybe we want to enable this at some point "--disable-updater" - "--enable-jemalloc" "--enable-default-toolkit=${default-toolkit}" "--with-libclang-path=${llvmPackages.libclang.lib}/lib" "--with-system-nspr" @@ -312,6 +330,7 @@ buildStdenv.mkDerivation ({ ++ flag alsaSupport "alsa" ++ flag pulseaudioSupport "pulseaudio" ++ flag ffmpegSupport "ffmpeg" + ++ flag jemallocSupport "jemalloc" ++ flag gssSupport "negotiateauth" ++ flag webrtcSupport "webrtc" ++ flag crashreporterSupport "crashreporter" diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index cf1a955c029d..774ac9770afe 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ rec { firefox = firefoxCommon rec { pname = "firefox"; - version = "92.0"; + version = "92.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "1a73cc275ea1790120845f579a7d21713ea78db0867ced767f393dfc25b132292dfbb673290fccdb9dcde86684e0300d56565841985fa3f0115376c91154ba8e"; + sha512 = "53361c231a4ac93a1808c9ccb29893d85b5e516fe939a770aac7f178abb4f43cbe3571097e5c5bf91b11fd95fc62b61f2aa215a45048357bfc9dad9eabdee9ef"; }; meta = { diff --git a/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix b/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix index 34cc5bb9160a..03bdb84f4384 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -6,7 +6,7 @@ , alsa-lib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups , dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core , libkrb5, libdrm, mesa -, libxkbcommon, wayland # ozone/wayland +, libxkbcommon, pipewire, wayland # ozone/wayland # Command line programs , coreutils @@ -67,7 +67,7 @@ let flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap at-spi2-atk at-spi2-core libkrb5 libdrm mesa coreutils - libxkbcommon wayland + libxkbcommon pipewire wayland ] ++ optional pulseSupport libpulseaudio ++ optional libvaSupport libva ++ optional vulkanSupport vulkan-loader diff --git a/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix b/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix index 9f3a27e22b5a..fe156347c93d 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.6.2"; + version = "1.6.5"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-YTWVBQt0X12UDFJv/rPBqlIBC4iXSvpdYi/HIl+BPxc="; + sha256 = "sha256-ZrpgSst17jjly6UnEWmlIBYjjW9nGFs7GTbVaKpZMrM="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix b/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix index 15da60ad3f82..5231b0a0f933 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchFromGitHub +, fetchzip , writeScript , alsa-lib , autoconf213 @@ -52,15 +52,12 @@ let in stdenv.mkDerivation rec { pname = "palemoon"; - version = "29.4.0.2"; - - src = fetchFromGitHub { - githubBase = "repo.palemoon.org"; - owner = "MoonchildProductions"; - repo = "Pale-Moon"; - rev = "${version}_Release"; - sha256 = "086f517xkk4smx57klyyvx4m3g6r5f1667w990zhpapbh997hfri"; - fetchSubmodules = true; + version = "29.4.1"; + + src = fetchzip { + url = "http://archive.palemoon.org/source/palemoon-${version}-source.tar.xz"; + stripRoot = false; + sha256 = "0kb9yn1q8rrmnlsyvxvv2gdgyyf12g6rxlyh82lmc0gysvd4qd2c"; }; passthru.updateScript = writeScript "update-${pname}" '' diff --git a/nixpkgs/pkgs/applications/networking/browsers/telescope/default.nix b/nixpkgs/pkgs/applications/networking/browsers/telescope/default.nix index 492709d88a50..dafcc0e63a88 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/telescope/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/telescope/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "telescope"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - sha256 = "0dd09r7b2gm9nv1q67yq4zk9f4v0fwqr5lw51crki9ii82gmj2h8"; + sha256 = "sha256-AdbFJfoicQUgJ9kesIWZ9ygttyjjDeC0UHRI98GwoZ8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index ac063cb1a644..c9f7e9cc6991 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -88,19 +88,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "10.5.5"; + version = "10.5.6"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "0847lib2z21fgb7x5szwvprc77fhdpmp4z5d6n1sk6d40dd34spn"; + sha256 = "1hxjixriah08c65nngjdp1blbji1vlnhqkphp8f96hy34hk4dpiw"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "0i26fb0r234nrwnvb2c9vk9yn869qghq0n4qlm1d7mr62dy6prxa"; + sha256 = "018kwwbbn02drvdj0bjkcyhsnbx97wnmd3lxkrx0kc9dw1s4r418"; }; }; in diff --git a/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix b/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix index f97e8d8250e7..781163050944 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix @@ -1,14 +1,14 @@ -{ mkYarnPackage, fetchFromGitHub, electron, makeWrapper, makeDesktopItem, lib }: +{ mkYarnPackage, fetchFromGitHub, electron, makeWrapper, makeDesktopItem, lib, p7zip }: mkYarnPackage rec { pname = "vieb"; - version = "5.3.0"; + version = "6.1.0"; src = fetchFromGitHub { owner = "Jelmerro"; repo = pname; rev = version; - sha256 = "sha256-NKWqSnUO8SScEodHYSptRHwVNOa5C4M61ac85d+wYK0="; + sha256 = "sha256-MJJeHnwfXouBygRT/wFWFMRHxQVf/3k2c7vp/tkD5co="; }; packageJSON = ./package.json; @@ -34,6 +34,11 @@ mkYarnPackage rec { }; postInstall = '' + unlink $out/libexec/vieb/deps/vieb/node_modules + ln -s $out/libexec/vieb/node_modules $out/libexec/vieb/deps/vieb/node_modules + + find $out/libexec/vieb/node_modules/7zip-bin -name 7za -exec ln -s -f ${p7zip}/bin/7za {} ';' + install -Dm0644 {${desktopItem},$out}/share/applications/vieb.desktop pushd $out/libexec/vieb/node_modules/vieb/app/img/icons diff --git a/nixpkgs/pkgs/applications/networking/cawbird/default.nix b/nixpkgs/pkgs/applications/networking/cawbird/default.nix index 517bd1e01cc5..08f554503748 100644 --- a/nixpkgs/pkgs/applications/networking/cawbird/default.nix +++ b/nixpkgs/pkgs/applications/networking/cawbird/default.nix @@ -23,14 +23,14 @@ }: stdenv.mkDerivation rec { - version = "1.4.1"; + version = "1.4.2"; pname = "cawbird"; src = fetchFromGitHub { owner = "IBBoard"; repo = "cawbird"; rev = "v${version}"; - sha256 = "0lmrgcj1ky1vhzynl36k6ba3ws089x4qdrnkjk3lbr334kicx9na"; + sha256 = "17575cp5qcgsqf37y3xqg3vr6l2j8bbbkmy2c1l185rxghfacida"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/nixpkgs/pkgs/applications/networking/cloudflared/default.nix index 5adb5bb65a8e..da7c5c815330 100644 --- a/nixpkgs/pkgs/applications/networking/cloudflared/default.nix +++ b/nixpkgs/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.8.7"; + version = "2021.9.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-Q8Xjo60lR1x7Y9/jcxXX32IxVVlHmkr4ekIwWTgdwps="; + sha256 = "sha256-VekJq7d80hD8AybkpLq4+9yeeBkeLATr2iG5OFU/TFs="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix index 4101ac9f3fd0..91ccf67f5579 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "argocd"; - version = "2.1.1"; - commit = "57abbf95ed160c88b2634ec4d37df9555cc74fb3"; + version = "2.1.2"; + commit = "7af9dfb3524c13e941ab604e36e49a617fe47d2e"; tag = "v${version}"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = tag; - sha256 = "0jh7kh4751kb7439vbbh5f03kcy56phdcvzypjw8n0w239n5xmmc"; + sha256 = "1pr48z1qhv7xxnllr00zz2v0ygxmq2hjdyk0j3zazflnqr2mc596"; }; - vendorSha256 = "sha256-KtLEN66Q5WpCi+COId+gPu2XHcs5/D04rYLHV6XohzQ="; + vendorSha256 = "sha256-N45yRlBGZ/c9ve2YPcWA26pylV8hzxjPh6evKtkgnoc="; nativeBuildInputs = [ packr makeWrapper installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix b/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix index 90105b1c4ebb..e03451f4f2fb 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "6.4.5"; + version = "6.4.7"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/1JRje7SNrIsb3V1tq5ZW5zsURaQUzM/Jp3TMR0MfKw="; + sha256 = "sha256-uLzYRfH2wJB/ucYtZGjKi0K5FaiP3CyA85gJ8Ji3WHE="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix b/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix index 9afc9f02c898..a33c261bf245 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,28 +1,29 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.17.0"; + version = "0.17.2"; + sha256 = "0kcdx4ldnshk4pqq37a7p08xr5cpsjrbrifk9fc3jbiw39m09mhf"; + manifestsSha256 = "1v6md4xh4sq1vmb5a8qvb66l101fq75lmv2s4j2z3walssb5mmgj"; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; - sha256 = "15ffb8damn935sfnqpshiyaazpldjcq411xrcfngpp7ncl9vbgwm"; + sha256 = manifestsSha256; stripRoot = false; }; in buildGoModule rec { - inherit version; - pname = "fluxcd"; + inherit version; src = fetchFromGitHub { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "1pw558d64c6ynqnnadhg8vbi4ql6f5y81l9hpxi0ki5myj2kx6an"; + inherit sha256; }; - vendorSha256 = "sha256-FUASe7EQ8YVv3R6fPPLtsvMibe00Ox596GoTyKt0S+E="; + vendorSha256 = "sha256-glifJ0V3RwS7E6EWZsCa88m0MK883RhPSXCsAmMggVs="; nativeBuildInputs = [ installShellFiles ]; @@ -50,6 +51,8 @@ buildGoModule rec { done ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Open and extensible continuous delivery solution for Kubernetes"; longDescription = '' diff --git a/nixpkgs/pkgs/applications/networking/cluster/fluxcd/update.sh b/nixpkgs/pkgs/applications/networking/cluster/fluxcd/update.sh new file mode 100755 index 000000000000..f463370e669a --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/fluxcd/update.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnugrep gnused jq + +set -eu -o pipefail + +cd $(dirname "${BASH_SOURCE[0]}") + +TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --silent https://api.github.com/repos/fluxcd/flux2/releases/latest | jq -r '.tag_name') + +VERSION=$(echo ${TAG} | sed 's/^v//') + +SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/archive/refs/tags/${TAG}.tar.gz) + +SPEC_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/releases/download/${TAG}/manifests.tar.gz) + +setKV () { + sed -i "s/$1 = \".*\"/$1 = \"$2\"/" ./default.nix +} + +setKV version ${VERSION} +setKV sha256 ${SHA256} +setKV manifestsSha256 ${SPEC_SHA256} +setKV vendorSha256 "" + +cd ../../../../../ +set +e +VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd 2>&1 | grep "got:" | cut -d':' -f2 | sed 's/ //g') +set -e + +cd - > /dev/null +setKV vendorSha256 ${VENDOR_SHA256} diff --git a/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix index 003c527a176f..fd6a314ecacc 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.24.0"; + version = "1.24.1"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "sha256-YjZ73Qc1lXosHopW+ZsrIyv16YupgB6ZpdcSGaZuafQ="; + sha256 = "sha256-lgcEkOu4iaLg+tP826Qpgmn0ogOpr62o1iWlv1yLbBQ="; }; - vendorSha256 = "sha256-OlM0HXFLTLYOZuVCud3k8K5X89zdZVlNkhXZzh0eKXc="; + vendorSha256 = "sha256-NQonBTHToGPo7QsChvuVM/jbV5FK71HMJfe5fe1gZYw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix b/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix index 8e9d2662ea68..425e7e2c2462 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm"; - version = "3.6.3"; - gitCommit = "ee407bdf364942bcb8e8c665f82e15aa28009b71"; + version = "3.7.0"; + gitCommit = "eeac83883cb4014fe60267ec6373570374ce770b"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-DfMI50eQsMHRX8S5rBzF3qlSfJizlYQyofA7HPkD4EQ="; + sha256 = "sha256-dV6Bx6XVzPqaRBeCzEFR473xnxjff4f24jd5vETVX78="; }; - vendorSha256 = "sha256-PTAyRG6PZK+vaiheUd3oiu4iBGlnFjoCrci0CYbXjBk="; + vendorSha256 = "sha256-Q/ycpLCIvf+PP+03ug3fKT+uIOdzDwP7709VfFVJglk="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix b/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix index 6d70b405e168..c9ce179e236e 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.140.0"; + version = "0.140.1"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-D9CyJE6/latz4541NfOtvKy+kui3CVmD483SkdEJzyU="; + sha256 = "sha256-QnGu/EGzgWva/EA6gKrDzWgjX6OrfZKzWIhRqKbexjU="; }; - vendorSha256 = "sha256-QYI5HxEUNrZKSjk0LlbhjvxXlWCbbLup51Ht3HJDNC8="; + vendorSha256 = "sha256-HKHMeDnIDmQ7AjuS2lYCMphTHGD1JgQuBYDJe2+PEk4="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix b/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix index 933f1bfe71b4..2ea7ea8d2455 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmsman"; - version = "3.7.2"; + version = "3.7.3"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-wzmn06nUycNaQ4tUEBd4q17M1CVC0+5X13rqF7zaHqU="; + sha256 = "sha256-7WN4YjhPbsFZfoFuZzsN85a+kdEVlEzQ9CfWh4nxxTs="; }; vendorSha256 = "sha256-XHgdVFGIzbPPYgv/T4TtvDDbKAe3niev4S5tu/nwSqg="; diff --git a/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix index e4ef8d1aa8d7..508ea403c5fa 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.11.0"; + version = "1.11.2"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-pQ8Xhhjpcp9RAUUqEDNWRf9JI7xkDVh2PG2KB0lmScs="; + sha256 = "sha256-4v/2lEq2BJX90P3UpSyDcHkxclMOTK9bmvyq0MyB7Pg="; }; - vendorSha256 = "sha256-PBMPTrTk5AzzELitSVQijHnx8YDCiZ7R+cpetUfe2KU="; + vendorSha256 = "sha256-TY7l5ttLKC3rqZ2kcy0l2gRXZg3vRrZBNzYsGerPe0k="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix index 59530f054571..d12042f40784 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "k0sctl"; - version = "0.9.0"; + version = "0.10.2"; src = fetchFromGitHub { owner = "k0sproject"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aW7x2XfeFU0z3lwPTsDHudHjdwTtfASgrbKGddVb6Rs="; + sha256 = "sha256-0vsOZbSQtoWvU81wnT7QWNhvIclwGAu441lTOuZnXho="; }; - vendorSha256 = "sha256-bsXXWyeZXZLV6igEvyvPpS92FruGiLDx/5CCTKPe0EU="; + vendorSha256 = "sha256-3OTkigryWsyCytyNMyumJJtc/BwtdryvDQRan2dzqfg="; meta = with lib; { description = "A bootstrapping and management tool for k0s clusters."; diff --git a/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix b/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix index 4b60ec6ea2dd..445483c1ecde 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix @@ -45,10 +45,16 @@ with lib; let k3sVersion = "1.21.4+k3s1"; # k3s git tag k3sCommit = "3e250fdbab72d88f7e6aae57446023a0567ffc97"; # k3s git commit at the above version + k3sRepoSha256 = "1w7drvk0bmlmqrxh1y6dxjy7dk6bdrl72pkd25lc1ir6wbzb05h9"; traefikChartVersion = "9.18.2"; # taken from ./scripts/download at TRAEFIK_VERSION + traefikChartSha256 = "sha256-9d7p0ngyMN27u4OPgz7yI14Zj9y36t9o/HMX5wyDpUI="; + k3sRootVersion = "0.9.1"; # taken from ./scripts/download at ROOT_VERSION + k3sRootSha256 = "sha256-qI84KYJKY/T6pqWZW9lOTq5NzZiu//v1zrMzUCiRTGQ="; + k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at VERSION_CNIPLUGINS + k3sCNISha256 = "sha256-uAy17eRRAXPCcnh481KxFMvFQecnnBs24jn5YnVNfY4="; baseMeta = { description = "A lightweight Kubernetes distribution"; @@ -61,7 +67,7 @@ let # bundled into the k3s binary traefikChart = fetchurl { url = "https://helm.traefik.io/traefik/traefik-${traefikChartVersion}.tgz"; - sha256 = "sha256-9d7p0ngyMN27u4OPgz7yI14Zj9y36t9o/HMX5wyDpUI="; + sha256 = traefikChartSha256; }; # so, k3s is a complicated thing to package # This derivation attempts to avoid including any random binaries from the @@ -75,7 +81,7 @@ let k3sRoot = fetchzip { # Note: marked as apache 2.0 license url = "https://github.com/k3s-io/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar"; - sha256 = "sha256-qI84KYJKY/T6pqWZW9lOTq5NzZiu//v1zrMzUCiRTGQ="; + sha256 = k3sRootSha256; stripRoot = false; }; k3sPlugins = buildGoPackage rec { @@ -89,7 +95,7 @@ let owner = "rancher"; repo = "plugins"; rev = "v${version}"; - sha256 = "sha256-uAy17eRRAXPCcnh481KxFMvFQecnnBs24jn5YnVNfY4="; + sha256 = k3sCNISha256; }; meta = baseMeta // { @@ -101,7 +107,7 @@ let k3sRepo = fetchgit { url = "https://github.com/k3s-io/k3s"; rev = "v${k3sVersion}"; - sha256 = "1w7drvk0bmlmqrxh1y6dxjy7dk6bdrl72pkd25lc1ir6wbzb05h9"; + sha256 = k3sRepoSha256; }; # Stage 1 of the k3s build: # Let's talk about how k3s is structured. @@ -280,5 +286,7 @@ stdenv.mkDerivation rec { $out/bin/k3s --version | grep v${k3sVersion} > /dev/null ''; + passthru.updateScript = ./update.sh; + meta = baseMeta; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/k3s/update.sh b/nixpkgs/pkgs/applications/networking/cluster/k3s/update.sh new file mode 100755 index 000000000000..db895af71c6a --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/cluster/k3s/update.sh @@ -0,0 +1,62 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnugrep gnused jq + +set -eu -o pipefail + +WORKDIR=$(mktemp -d) +trap "rm -rf ${WORKDIR}" EXIT + +cd $(dirname "${BASH_SOURCE[0]}") + +LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json +curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ + https://api.github.com/repos/k3s-io/k3s/releases/latest > ${LATEST_TAG_RAWFILE} + +LATEST_TAG_NAME=$(jq -r '.tag_name' ${LATEST_TAG_RAWFILE}) + +K3S_VERSION=$(echo ${LATEST_TAG_NAME} | sed 's/^v//') + +LATEST_TAG_TARBALL_URL=$(jq -r '.tarball_url' ${LATEST_TAG_RAWFILE}) + +K3S_COMMIT=$(curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ + https://api.github.com/repos/k3s-io/k3s/tags \ + | jq -r "map(select(.name == \"${LATEST_TAG_NAME}\")) | .[0] | .commit.sha") + +K3S_REPO_SHA256=$(nix-prefetch-url --quiet --unpack ${LATEST_TAG_TARBALL_URL}) + +FILE_SCRIPTS_DOWNLOAD=${WORKDIR}/scripts-download +curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/download > $FILE_SCRIPTS_DOWNLOAD + +FILE_SCRIPTS_VERSION=${WORKDIR}/scripts-version.sh +curl --silent https://raw.githubusercontent.com/k3s-io/k3s/${K3S_COMMIT}/scripts/version.sh > $FILE_SCRIPTS_VERSION + +TRAEFIK_CHART_VERSION=$(grep TRAEFIK_VERSION= $FILE_SCRIPTS_DOWNLOAD \ + | cut -d'=' -f2 | cut -d' ' -f1) +TRAEFIK_CHART_SHA256=$(nix-prefetch-url --quiet "https://helm.traefik.io/traefik/traefik-${TRAEFIK_CHART_VERSION}.tgz") + +K3S_ROOT_VERSION=$(grep ROOT_VERSION= $FILE_SCRIPTS_DOWNLOAD \ + | cut -d'=' -f2 | cut -d' ' -f1 | sed 's/^v//') +K3S_ROOT_SHA256=$(nix-prefetch-url --quiet --unpack \ + "https://github.com/k3s-io/k3s-root/releases/download/v${K3S_ROOT_VERSION}/k3s-root-amd64.tar") + +CNIPLUGINS_VERSION=$(grep VERSION_CNIPLUGINS= $FILE_SCRIPTS_VERSION \ + | cut -d'=' -f2 | cut -d' ' -f1 | sed -e 's/"//g' -e 's/^v//') +CNIPLUGINS_SHA256=$(nix-prefetch-url --quiet --unpack \ + "https://github.com/rancher/plugins/archive/refs/tags/v${CNIPLUGINS_VERSION}.tar.gz") + +setKV () { + sed -i "s/$1 = \".*\"/$1 = \"$2\"/" ./default.nix +} + +setKV k3sVersion ${K3S_VERSION} +setKV k3sCommit ${K3S_COMMIT} +setKV k3sRepoSha256 ${K3S_REPO_SHA256} + +setKV traefikChartVersion ${TRAEFIK_CHART_VERSION} +setKV traefikChartSha256 ${TRAEFIK_CHART_SHA256} + +setKV k3sRootVersion ${K3S_ROOT_VERSION} +setKV k3sRootSha256 ${K3S_ROOT_SHA256} + +setKV k3sCNIVersion ${CNIPLUGINS_VERSION} +setKV k3sCNISha256 ${CNIPLUGINS_SHA256} diff --git a/nixpkgs/pkgs/applications/networking/cluster/kube-score/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kube-score/default.nix index a466598f00df..707abd5e2bf4 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kube-score/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kube-score/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-score"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "zegl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O0RtlFkyo01kcxWSzrkhh7vvV76B7I5V19dSzaxvv4Y="; + sha256 = "sha256-FZbq7f8Urx3tlJOBPnPyp1enFsmtrxqNjR42CTNo6GI="; }; - vendorSha256 = "sha256-qFS+N0tOf3zxqs1tN6Z1EnR3qLR1FfZNfJ21NoRXek0="; + vendorSha256 = "sha256-8Rg57Uj/hdNqAj40MKZ/5PObRkdsInbsRT1ZkRqGTfo="; meta = with lib; { description = "Kubernetes object analysis with recommendations for improved reliability and security"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix index 926dc1dff542..655150580b58 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-E8oI0qBDS6CcA5ZDGs1YVt/BPEfUzCrt5aaqfHAXukI="; + sha256 = "sha256-7e1VQ9uXNj6Lmnl1IXHLcADSLuK7Jgiww8acxtD4xFM="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix index b570ebc09dcd..917059370ca6 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubeone"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - sha256 = "sha256-oInE8fwE+7a+F4NevKPuYQqCP9GkPhqayLu8HCmVbLs="; + sha256 = "sha256-B/ga5MpjXoLe5H/JosmrS/Wuj1elzQHPsnz/qOm7Hrg="; }; - vendorSha256 = "sha256-VvO5YnDofdEku9+RC6PPHWSZY8qZt9N3JNzlm5omNAc="; + vendorSha256 = "sha256-/rhV7JHuqejCTizcjKIkaJlbRcx7AfMcGqQYo6dlg48="; nativeBuildInputs = [ installShellFiles diff --git a/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix b/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix index 78ccc8cb83a1..13b15da38cde 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.22.1"; + version = "1.22.2"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-coiDKczX5kWw/5A9+p0atPbn2nR0wBBdfXKTw6FYywo="; + sha256 = "sha256-O+FY9wJ0fztO7i5qJfw+cfhfBgaMWKX7IBBXJV4uuCk="; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; @@ -60,6 +60,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall for p in $WHAT; do install -D _output/local/go/bin/''${p##*/} -t $out/bin done @@ -83,6 +84,7 @@ stdenv.mkDerivation rec { --bash <($out/bin/$tool completion bash) \ --zsh <($out/bin/$tool completion zsh) done + runHook postInstall ''; preFixup = '' diff --git a/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix b/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix index da77ffad3afc..6d5d5d1bd4a3 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix @@ -64,8 +64,8 @@ in }; edge = generic { channel = "edge"; - version = "21.8.2"; - sha256 = "sha256-jMYJ/mLWvuje4ZRuRbzMaqhz8kyn1bYGITJxkyw5Fyg="; - vendorSha256 = "sha256-18QB2GOxHfnP4GQaF0aohY5kEOg0xN/c+Sp33Ww/1uQ="; + version = "21.9.3"; + sha256 = "0swqx4myvr24visj39icg8g90kj325pvf22bq447rnm0whq3cnyz"; + vendorSha256 = "sha256-fMtAR66TwMNR/HCVQ9Jg3sJ0XBx2jUKDG7/ts0lEZM4="; }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix b/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix index 2db814c635f0..e49d0450d900 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix @@ -11,9 +11,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.22.0"; + version = "1.23.0"; - vendorSha256 = "sha256-zAXEwGJ3dnqN/+3k189zqppdiNHPyJ+mdZvDNEWQLsA="; + vendorSha256 = "sha256-KhUmyQn97rXX49EFqUrR7UEm0J5gIdogUJMVW1Wjrdw="; doCheck = false; @@ -21,7 +21,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-wL/HsdV6MZcsR3Y8pGZ5WYUMJ7j+VyJGpLeLIXm5MJM="; + sha256 = "sha256-Cf77qaAsavkSpSoBJz3kcPzL2SL7X9O9lCTYcm1tFFQ="; }; nativeBuildInputs = [ installShellFiles pkg-config which ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix b/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix index 344bf7c82dad..7ed122117e52 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-r9VJQUmwe4UGCLmzxG2t9XHQ7KUeJxmEuAwxssPArcM="; + sha256 = "sha256-QkUE4oImP0eg5tofGEUonKzffICG4b3SuPJz9S2ZNfE="; }; - vendorSha256 = "sha256-KnXxp/6L09a34cnv4h7vpPhNO6EGmeEC6c1ydyYXkxU="; + vendorSha256 = "sha256-mPOyF1S/g1FpUHHNc+cy0nxk6rK9txnZPYHOSvvfu70="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix b/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix index 6515885fd8e2..91f5cb82668e 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix @@ -17,6 +17,10 @@ let nixops = super.nixops.overridePythonAttrs ( old: { + postPatch = '' + substituteInPlace nixops/args.py --subst-var version + ''; + meta = old.meta // { homepage = https://github.com/NixOS/nixops; description = "NixOS cloud provisioning and deployment tool"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix b/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix index 62034a39bbc0..092a620b98f4 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/nomad/1.0.nix @@ -6,6 +6,6 @@ callPackage ./generic.nix { inherit buildGoPackage nvidia_x11 nvidiaGpuSupport; - version = "1.0.10"; - sha256 = "1yd4j35dmxzg9qapqyq3g3hnhxi5c4f57q43xbim8255bjyn94f0"; + version = "1.0.11"; + sha256 = "15h7w020p576zl91s5mr4npcmngrqqfj9xzlx6bk9i1cp6h4w0jy"; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/nomad/1.1.nix b/nixpkgs/pkgs/applications/networking/cluster/nomad/1.1.nix index 3d34331b57d1..6363852068e5 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/nomad/1.1.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/nomad/1.1.nix @@ -6,7 +6,7 @@ callPackage ./genericModule.nix { inherit buildGoModule nvidia_x11 nvidiaGpuSupport; - version = "1.1.4"; - sha256 = "182f3sxw751s8qg16vbssplhl92i9gshgzvflwwvnxraz2795y7l"; - vendorSha256 = "1nddknnsvb05sapbj1c52cv2fmibvdg48f88malxqblzw33wfziq"; + version = "1.1.5"; + sha256 = "03gxh12bd5mj1l4q3xilil806dsqaqmz93ff7ysf441frgkx3iy3"; + vendorSha256 = "0rfd22rf76mwj489zhswah4g3dhhz6davm336xgm9dbnyaz9d8r0"; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix b/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix index 9679f5bd2e03..4d3662ea8750 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "starboard-octant-plugin"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XHc/1rqTEVOjCm0kFniUmmjVeRsr9Npt0OpQ6Oy7Rxo="; + sha256 = "sha256-JTSZtIRVFdUjhQsp2EMukeoVIo6nNx4xofq+3iOZUIk="; }; - vendorSha256 = "sha256-EM0lPwwWJuLD+aqZWshz1ILaeEtUU4wJ0Puwv1Ikgf4="; + vendorSha256 = "sha256-1zrB+CobUBgdpBHRJPpfDYCD6oVWY4j4Met9EqNQQbE="; ldflags = [ "-s" "-w" diff --git a/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix b/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix index f5fb6ee234c5..a83bf805d876 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "qbec"; - version = "0.14.6"; + version = "0.14.8"; src = fetchFromGitHub { owner = "splunk"; repo = "qbec"; rev = "v${version}"; - sha256 = "sha256-zsabEYmbWW6lwqyqpPIgCmA4PE6F5Byb8KT/PlLSlvY="; + sha256 = "sha256-awuYmazBx7zv/WuDsePzdWNRcpAzLK7lf4L2W2Jbt3A="; }; vendorSha256 = "sha256-VOBRQJzATaY9DNRhZvYTRpoISikbzUAwS/1hUfce/44="; diff --git a/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix b/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix index 76230b8e1003..af194afafa9a 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/spark/default.nix @@ -1,56 +1,75 @@ -{ lib, stdenv, fetchzip, makeWrapper, jre, pythonPackages, coreutils, hadoop +{ lib, stdenv, fetchzip, makeWrapper, jdk8, python3Packages, extraPythonPackages ? [], coreutils, hadoop , RSupport? true, R }: with lib; -stdenv.mkDerivation rec { +let + spark = { pname, version, src }: + stdenv.mkDerivation rec { + inherit pname version src; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jdk8 python3Packages.python ] + ++ extraPythonPackages + ++ optional RSupport R; - pname = "spark"; - version = "2.4.4"; + untarDir = "${pname}-${version}"; + installPhase = '' + mkdir -p $out/{lib/${untarDir}/conf,bin,/share/java} + mv * $out/lib/${untarDir} - src = fetchzip { - url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz"; - sha256 = "1a9w5k0207fysgpxx6db3a00fs5hdc2ncx99x4ccy2s0v5ndc66g"; + cp $out/lib/${untarDir}/conf/log4j.properties{.template,} + + cat > $out/lib/${untarDir}/conf/spark-env.sh <<- EOF + export JAVA_HOME="${jdk8}" + export SPARK_HOME="$out/lib/${untarDir}" + export SPARK_DIST_CLASSPATH=$(${hadoop}/bin/hadoop classpath) + export PYSPARK_PYTHON="${python3Packages.python}/bin/${python3Packages.python.executable}" + export PYTHONPATH="\$PYTHONPATH:$PYTHONPATH" + ${optionalString RSupport '' + export SPARKR_R_SHELL="${R}/bin/R" + export PATH="\$PATH:${R}/bin"''} + EOF + + for n in $(find $out/lib/${untarDir}/bin -type f ! -name "*.*"); do + makeWrapper "$n" "$out/bin/$(basename $n)" + substituteInPlace "$n" --replace dirname ${coreutils.out}/bin/dirname + done + for n in $(find $out/lib/${untarDir}/sbin -type f); do + # Spark deprecated scripts with "slave" in the name. + # This line adds forward compatibility with the nixos spark module for + # older versions of spark that don't have the new "worker" scripts. + ln -s "$n" $(echo "$n" | sed -r 's/slave(s?).sh$/worker\1.sh/g') || true + done + ln -s $out/lib/${untarDir}/lib/spark-assembly-*.jar $out/share/java + ''; + + meta = { + description = "Apache Spark is a fast and general engine for large-scale data processing"; + homepage = "http://spark.apache.org"; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + maintainers = with maintainers; [ thoughtpolice offline kamilchm illustris ]; + repositories.git = "git://git.apache.org/spark.git"; + }; + }; +in { + spark3 = spark rec { + pname = "spark"; + version = "3.1.2"; + + src = fetchzip { + url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz"; + sha256 = "1bgh2y6jm7wqy6yc40rx68xkki31i3jiri2yixb1bm0i9pvsj9yf"; + }; }; + spark2 = spark rec { + pname = "spark"; + version = "2.4.8"; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre pythonPackages.python pythonPackages.numpy ] - ++ optional RSupport R; - - untarDir = "${pname}-${version}-bin-without-hadoop"; - installPhase = '' - mkdir -p $out/{lib/${untarDir}/conf,bin,/share/java} - mv * $out/lib/${untarDir} - - sed -e 's/INFO, console/WARN, console/' < \ - $out/lib/${untarDir}/conf/log4j.properties.template > \ - $out/lib/${untarDir}/conf/log4j.properties - - cat > $out/lib/${untarDir}/conf/spark-env.sh <<- EOF - export JAVA_HOME="${jre}" - export SPARK_HOME="$out/lib/${untarDir}" - export SPARK_DIST_CLASSPATH=$(${hadoop}/bin/hadoop classpath) - export PYSPARK_PYTHON="${pythonPackages.python}/bin/${pythonPackages.python.executable}" - export PYTHONPATH="\$PYTHONPATH:$PYTHONPATH" - ${optionalString RSupport - ''export SPARKR_R_SHELL="${R}/bin/R" - export PATH=$PATH:"${R}/bin/R"''} - EOF - - for n in $(find $out/lib/${untarDir}/bin -type f ! -name "*.*"); do - makeWrapper "$n" "$out/bin/$(basename $n)" - substituteInPlace "$n" --replace dirname ${coreutils.out}/bin/dirname - done - ln -s $out/lib/${untarDir}/lib/spark-assembly-*.jar $out/share/java - ''; - - meta = { - description = "Apache Spark is a fast and general engine for large-scale data processing"; - homepage = "http://spark.apache.org"; - license = lib.licenses.asl20; - platforms = lib.platforms.all; - maintainers = with maintainers; [ thoughtpolice offline kamilchm ]; - repositories.git = "git://git.apache.org/spark.git"; + src = fetchzip { + url = "mirror://apache/spark/${pname}-${version}/${pname}-${version}-bin-without-hadoop.tgz"; + sha256 = "1mkyq0gz9fiav25vr0dba5ivp0wh0mh7kswwnx8pvsmb6wbwyfxv"; + }; }; } diff --git a/nixpkgs/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/nixpkgs/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix index 15a3b0ac24c7..089f0b7bd974 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix @@ -1,17 +1,14 @@ { stdenv, lib, fetchurl, autoPatchelfHook, dpkg, awscli, unzip }: let - ver = "1.2.7.0"; - source = if stdenv.isDarwin then { - url = - "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/mac/sessionmanager-bundle.zip"; - sha256 = "sha256-HP+opNjS53zR9eUxpNUHGD9rZN1z7lDc6+nONR8fa/s="; - } else { - url = - "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_64bit/session-manager-plugin.deb"; - sha256 = "sha256-EZ9ncj1YYlod1RLfXOpZFijnKjLYWYVBb+C6yd42l34="; - }; - platformBuildInput = if stdenv.isDarwin then [ unzip ] else [ dpkg ]; - unpackCmd = if stdenv.isDarwin then "unzip $src" else "dpkg-deb -x $src ."; + ver = "1.2.54.0"; + source = + if stdenv.isDarwin then { + url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/mac/sessionmanager-bundle.zip"; + sha256 = "kgxoQrtu2tsV5t/3oA+Z2juY24hPOznPGjlQMsqOIZg="; + } else { + url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_64bit/session-manager-plugin.deb"; + sha256 = "uug1cT4yRxNQcf+zWz0mi72G4EGa3eZHVuG36INSqrM="; + }; archivePath = if stdenv.isDarwin then "sessionmanager-bundle" else "usr/local/sessionmanagerplugin"; in stdenv.mkDerivation rec { @@ -20,13 +17,19 @@ stdenv.mkDerivation rec { src = fetchurl source; - nativeBuildInputs = [ autoPatchelfHook ] ++ platformBuildInput; + nativeBuildInputs = [ autoPatchelfHook ] ++ (if stdenv.isDarwin then [ unzip ] else [ dpkg ]); buildInputs = [ awscli ]; - unpackPhase = unpackCmd; + unpackPhase = if stdenv.isDarwin then "unzip $src" else "dpkg-deb -x $src ."; + + installPhase = '' + runHook preInstall + + install -m755 -D ${archivePath}/bin/session-manager-plugin $out/bin/session-manager-plugin - installPhase = "install -m755 -D ${archivePath}/bin/session-manager-plugin $out/bin/session-manager-plugin"; + runHook postInstall + ''; meta = with lib; { homepage = diff --git a/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix b/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix index 066b70e8e254..6c22203eaaf1 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "starboard"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NV37K5JUfGPK8TwCi/4XY7MQUvp76vzdxsHUNPlYpYk="; + sha256 = "sha256-6QIQsxqTKERo5x2Knv4IBeNt5KjvfoW0ryFJLlALqrA="; }; - vendorSha256 = "sha256-4CmAf1s+tK7cKxwetgv0YewLLROsZ5g1Zd30FCep5k8="; + vendorSha256 = "sha256-r6wMSeW5Et6hYwoEKufmcOmucuHlYuBDOMuXXMT4W2Y="; # Don't build and check the integration tests excludedPackages = "itest"; diff --git a/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix b/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix index 74508a73227d..959c40637fbe 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix @@ -4,16 +4,16 @@ let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in buildGoModule rec { pname = "stern"; - version = "1.20.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "sha256-y8FkQBZHg4LYC8CmwQSg2oZjIrlY30tL/OkfnT+XsMM="; + sha256 = "sha256-JredVk2hjnhoaJ9bT7D5k35skBNjcEBLa6GgO8dB2+U="; }; - vendorSha256 = "sha256-217OKXT072hpq4a6JEev4rSR8uUoPdDbOR7KUkhpM9E="; + vendorSha256 = "sha256-ybsDB54kkbONi3b9URtNUusHIdUfzymOpYlNHJz4i2A="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix b/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix index 56642fb64d33..e1ea0a690c95 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tanka"; - version = "0.17.2"; + version = "0.17.3"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-a7utYYuCgFabKILUKnKF0fcrorlV1DYMOFMRkm5QMuU="; + sha256 = "sha256-Khu6ovtcXkqqt3W4OoJ09INgv80tw/6uDcJS+jt3y0Y="; }; vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw="; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index a5dcc900ff0d..5e2253aaa622 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -195,8 +195,8 @@ rec { }; terraform_1_0 = mkTerraform { - version = "1.0.6"; - sha256 = "1i1f2gmiv49ia6d4yi137s705vrxdc3rqxanjgwzysif11j6iwwc"; + version = "1.0.7"; + sha256 = "115gb4mqz7lzyb80psbfy10k4h09fbvb1l8iz7kg63ajx69fnasy"; vendorSha256 = "00cl42w1mzsi9qd09wydfvp5f2h7lxaay6s2dv0mf47k6h7prf42"; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; diff --git a/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index 214d3bfe3440..b238e5a4b71b 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.31.7"; + version = "0.32.2"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PCBKuTJ0IbYma584qIPrxGfwOIzHszWH+bW8iy0OUvo="; + sha256 = "sha256-1s6/Xn/NsClG7YvRyzpvzMy8HmDITNCQUJxHaA84470="; }; vendorSha256 = "sha256-y84EFmoJS4SeA5YFIVFU0iWa5NnjU5yvOj7OFE+jGN0="; diff --git a/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix b/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix index 5710d456cefb..eee449de53e3 100644 --- a/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix +++ b/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.22.4"; + version = "0.22.9"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bu8U3eJc10tnQhLLX0FwDrlTUVpjZBW7V4gbc/tBTBU="; + sha256 = "sha256-h19Cj4ztgypT/j1gB+PbvgDJ7jlJ3CYPEbK62tJeMss="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix b/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix index b313e0f87cb3..7fd2a9684ae7 100644 --- a/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/nixpkgs/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "3.9.2"; + version = "4.0.2"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "sha256-vWKPIm8iqgjeC7BEBzd5wyFRkLstmdqEtdsror+HUgU="; + sha256 = "sha256-Q2yVprIB8YeB8bCAau1H2m8QOidX1RrMIRET/fXyNi4="; }; buildInputs = [ qtwebengine qttools ]; diff --git a/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix b/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix index e70d6c187c2e..20623ac31827 100644 --- a/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix +++ b/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "zeek"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { url = "https://download.zeek.org/zeek-${version}.tar.gz"; - sha256 = "165kva8dgf152ahizqdk0g2y466ij2gyxja5fjxlkxcxr5p357pj"; + sha256 = "0wq3kjc3zc5ikzwix7k7gr92v75rg6283kx5fzvc3lcdkaczq2lc"; }; nativeBuildInputs = [ cmake flex bison file ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 075fd5b3a20a..99e3a90b60b6 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -2,12 +2,12 @@ mkDerivation rec { pname = "chatterino2"; - version = "2.3.0"; + version = "2.3.4"; src = fetchFromGitHub { owner = "Chatterino"; repo = pname; rev = "v${version}"; - sha256 = "0x12zcrbkxn2nn0hqkj1amrxv4q032id282cajzsx7by970r1shd"; + sha256 = "sha256-ZmUM56+YNH98J3XE/mWOOIfb0qBld2n4iuHpImbrU4o="; fetchSubmodules = true; }; nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/chatty/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/chatty/default.nix index 8266434eb086..fe7881de9959 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -10,11 +10,14 @@ , wrapGAppsHook , evolution-data-server , feedbackd +, glibmm +, gspell , gtk3 , json-glib , libgcrypt , libhandy , libphonenumber +, modemmanager , olm , pidgin , protobuf @@ -24,14 +27,14 @@ stdenv.mkDerivation rec { pname = "chatty"; - version = "0.3.4"; + version = "0.4.0"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = "chatty"; rev = "v${version}"; - sha256 = "0910f5bw75ph576gxbsd6ysdwnlk4ysdp0pml2i3mjqpcbkqfs3w"; + sha256 = "12k1a5xrwd6zk4x0m53hbzggk695z3bpbzy1wcikzy0jvch7h13d"; }; postPatch = '' @@ -51,11 +54,14 @@ stdenv.mkDerivation rec { buildInputs = [ evolution-data-server feedbackd + glibmm + gspell gtk3 json-glib libgcrypt libhandy libphonenumber + modemmanager olm pidgin protobuf diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index c4647b4cdfee..a359f0a4ac0f 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -20,13 +20,13 @@ let "${electron}/bin/electron"; in nodePackages.deltachat-desktop.override rec { pname = "deltachat-desktop"; - version = "1.21.0"; + version = "1.22.2"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - sha256 = "1fwnv77qa9p50js98byb26ms7mhv7rfwhfv21f282a74pbqsar45"; + sha256 = "0in6w2vl4ypgjb9gfhyh77vg05ni5p3z24lah7wvvhywcpv1jp2n"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json b/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json index a6355fde2b24..41bcdeca1864 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/package.json @@ -1,6 +1,6 @@ { "name": "deltachat-desktop", - "version": "1.21.0", + "version": "1.22.2", "dependencies": { "@blueprintjs/core": "^3.22.3", "@mapbox/geojson-extent": "^1.0.0", diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix index 7f0127c28fd8..d6d97b8e3447 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "dino"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; rev = "v${version}"; - sha256 = "11m38syqzb1z92wmdaf45gryl6gjxwbcnk32j4p984ipqj2vdzd8"; + sha256 = "sha256-uYP3D2uyvfRP91fq/1jKOaKgp/+How0SUwmxSrLLH4c="; }; nativeBuildInputs = [ @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Modern Jabber/XMPP Client using GTK/Vala"; homepage = "https://github.com/dino/dino"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ mic92 qyliss ]; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index 058e20da0ce5..b499f01d88fd 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,5 +1,4 @@ { branch ? "stable", pkgs }: -# Generated by ./update-discord.sh let inherit (pkgs) callPackage fetchurl; in { @@ -7,30 +6,30 @@ in { pname = "discord"; binaryName = "Discord"; desktopName = "Discord"; - version = "0.0.15"; + version = "0.0.16"; src = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "0pn2qczim79hqk2limgh88fsn93sa8wvana74mpdk5n6x5afkvdd"; + sha256 = "UTVKjs/i7C/m8141bXBsakQRFd/c//EmqqhKhkr1OOk="; }; }; ptb = callPackage ./base.nix rec { pname = "discord-ptb"; binaryName = "DiscordPTB"; desktopName = "Discord PTB"; - version = "0.0.25"; + version = "0.0.26"; src = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "082ygmsycicddpkv5s03vw3rjkrk4lgprq29z8b1hdjifvw93b21"; + sha256 = "1rlj76yhxjwwfmdln3azjr69hvfx1bjqdg9jhdn4fp6mlirkrcq4"; }; }; canary = callPackage ./base.nix rec { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.129"; + version = "0.0.131"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256:1x49vvd363w9xyrzjgmynj2b320hzpz388fh5vpp0q0qk8q3gwkk"; + sha256 = "087rzyivk0grhc73v7ldxxghks0n16ifrvpmk95vzaw99l9xv0v5"; }; }; }.${branch} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 5251b07d8d9f..65093878da2d 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.8.2", + "version": "1.8.5", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -54,7 +54,7 @@ "@types/minimist": "^1.2.1", "@typescript-eslint/eslint-plugin": "^4.17.0", "@typescript-eslint/parser": "^4.17.0", - "allchange": "^1.0.0", + "allchange": "^1.0.2", "asar": "^2.0.1", "chokidar": "^3.5.2", "electron": "^13.1.9", @@ -83,7 +83,7 @@ }, "build": { "appId": "im.riot.app", - "electronVersion": "13.1.9", + "electronVersion": "13.2.2", "files": [ "package.json", { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index 12ec78a6af1c..45f2a5638ed7 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -10,11 +10,11 @@ }; } { - name = "_actions_core___core_1.4.0.tgz"; + name = "_actions_core___core_1.5.0.tgz"; path = fetchurl { - name = "_actions_core___core_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/@actions/core/-/core-1.4.0.tgz"; - sha1 = "cf2e6ee317e314b03886adfeb20e448d50d6e524"; + name = "_actions_core___core_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/@actions/core/-/core-1.5.0.tgz"; + sha1 = "885b864700001a1b9a6fba247833a036e75ad9d3"; }; } { @@ -42,11 +42,11 @@ }; } { - name = "_babel_generator___generator_7.14.8.tgz"; + name = "_babel_generator___generator_7.15.0.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.14.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.8.tgz"; - sha1 = "bf86fd6af96cf3b74395a8ca409515f89423e070"; + name = "_babel_generator___generator_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.0.tgz"; + sha1 = "a7d0c172e0d814974bad5aa77ace543b97917f15"; }; } { @@ -82,11 +82,11 @@ }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.8.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.9.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz"; - sha1 = "32be33a756f29e278a0d644fa08a2c9e0f88a34c"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.9.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz"; + sha1 = "6654d171b2024f6d8ee151bf2509699919131d48"; }; } { @@ -98,19 +98,19 @@ }; } { - name = "_babel_parser___parser_7.14.8.tgz"; + name = "_babel_parser___parser_7.15.3.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.14.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.8.tgz"; - sha1 = "66fd41666b2d7b840bd5ace7f7416d5ac60208d4"; + name = "_babel_parser___parser_7.15.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.3.tgz"; + sha1 = "3416d9bea748052cfcb63dbcc27368105b1ed862"; }; } { - name = "_babel_runtime___runtime_7.14.8.tgz"; + name = "_babel_runtime___runtime_7.15.3.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.14.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.8.tgz"; - sha1 = "7119a56f421018852694290b9f9148097391b446"; + name = "_babel_runtime___runtime_7.15.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz"; + sha1 = "2e1c2880ca118e5b2f9988322bd8a7656a32502b"; }; } { @@ -122,19 +122,19 @@ }; } { - name = "_babel_traverse___traverse_7.14.8.tgz"; + name = "_babel_traverse___traverse_7.15.0.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.14.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.8.tgz"; - sha1 = "c0253f02677c5de1a8ff9df6b0aacbec7da1a8ce"; + name = "_babel_traverse___traverse_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz"; + sha1 = "4cca838fd1b2a03283c1f38e141f639d60b3fc98"; }; } { - name = "_babel_types___types_7.14.8.tgz"; + name = "_babel_types___types_7.15.0.tgz"; path = fetchurl { - name = "_babel_types___types_7.14.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.14.8.tgz"; - sha1 = "38109de8fcadc06415fbd9b74df0065d4d41c728"; + name = "_babel_types___types_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.15.0.tgz"; + sha1 = "61af11f2286c4e9c69ca8deb5f4375a73c72dcbd"; }; } { @@ -146,11 +146,11 @@ }; } { - name = "_electron_get___get_1.12.4.tgz"; + name = "_electron_get___get_1.13.0.tgz"; path = fetchurl { - name = "_electron_get___get_1.12.4.tgz"; - url = "https://registry.yarnpkg.com/@electron/get/-/get-1.12.4.tgz"; - sha1 = "a5971113fc1bf8fa12a8789dc20152a7359f06ab"; + name = "_electron_get___get_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/@electron/get/-/get-1.13.0.tgz"; + sha1 = "95c6bcaff4f9a505ea46792424f451efea89228c"; }; } { @@ -498,11 +498,11 @@ }; } { - name = "_npmcli_run_script___run_script_1.8.5.tgz"; + name = "_npmcli_run_script___run_script_1.8.6.tgz"; path = fetchurl { - name = "_npmcli_run_script___run_script_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.5.tgz"; - sha1 = "f250a0c5e1a08a792d775a315d0ff42fc3a51e1d"; + name = "_npmcli_run_script___run_script_1.8.6.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.6.tgz"; + sha1 = "18314802a6660b0d4baa4c3afe7f1ad39d8c28b7"; }; } { @@ -538,14 +538,6 @@ }; } { - name = "_octokit_openapi_types___openapi_types_9.3.0.tgz"; - path = fetchurl { - name = "_octokit_openapi_types___openapi_types_9.3.0.tgz"; - url = "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-9.3.0.tgz"; - sha1 = "160347858d727527901c6aae7f7d5c2414cc1f2e"; - }; - } - { name = "_octokit_openapi_types___openapi_types_9.7.0.tgz"; path = fetchurl { name = "_octokit_openapi_types___openapi_types_9.7.0.tgz"; @@ -562,14 +554,6 @@ }; } { - name = "_octokit_plugin_paginate_rest___plugin_paginate_rest_2.15.0.tgz"; - path = fetchurl { - name = "_octokit_plugin_paginate_rest___plugin_paginate_rest_2.15.0.tgz"; - url = "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.15.0.tgz"; - sha1 = "9c956c3710b2bd786eb3814eaf5a2b17392c150d"; - }; - } - { name = "_octokit_plugin_request_log___plugin_request_log_1.0.4.tgz"; path = fetchurl { name = "_octokit_plugin_request_log___plugin_request_log_1.0.4.tgz"; @@ -578,14 +562,6 @@ }; } { - name = "_octokit_plugin_rest_endpoint_methods___plugin_rest_endpoint_methods_5.6.0.tgz"; - path = fetchurl { - name = "_octokit_plugin_rest_endpoint_methods___plugin_rest_endpoint_methods_5.6.0.tgz"; - url = "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.6.0.tgz"; - sha1 = "c28833b88d0f07bf94093405d02d43d73c7de99b"; - }; - } - { name = "_octokit_plugin_rest_endpoint_methods___plugin_rest_endpoint_methods_5.8.0.tgz"; path = fetchurl { name = "_octokit_plugin_rest_endpoint_methods___plugin_rest_endpoint_methods_5.8.0.tgz"; @@ -602,27 +578,19 @@ }; } { - name = "_octokit_request___request_5.6.0.tgz"; - path = fetchurl { - name = "_octokit_request___request_5.6.0.tgz"; - url = "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.0.tgz"; - sha1 = "6084861b6e4fa21dc40c8e2a739ec5eff597e672"; - }; - } - { - name = "_octokit_rest___rest_18.8.0.tgz"; + name = "_octokit_request___request_5.6.1.tgz"; path = fetchurl { - name = "_octokit_rest___rest_18.8.0.tgz"; - url = "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.8.0.tgz"; - sha1 = "ba24f7ba554f015a7ae2b7cc2aecef5386ddfea5"; + name = "_octokit_request___request_5.6.1.tgz"; + url = "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.1.tgz"; + sha1 = "f97aff075c37ab1d427c49082fefeef0dba2d8ce"; }; } { - name = "_octokit_types___types_6.23.0.tgz"; + name = "_octokit_rest___rest_18.9.1.tgz"; path = fetchurl { - name = "_octokit_types___types_6.23.0.tgz"; - url = "https://registry.yarnpkg.com/@octokit/types/-/types-6.23.0.tgz"; - sha1 = "b39f242b20036e89fa8f34f7962b4e9b7ff8f65b"; + name = "_octokit_rest___rest_18.9.1.tgz"; + url = "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.9.1.tgz"; + sha1 = "db1d7ac1d7b10e908f7d4b78fe35a392554ccb26"; }; } { @@ -674,11 +642,11 @@ }; } { - name = "_types_debug___debug_4.1.6.tgz"; + name = "_types_debug___debug_4.1.7.tgz"; path = fetchurl { - name = "_types_debug___debug_4.1.6.tgz"; - url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.6.tgz"; - sha1 = "0b7018723084918a865eff99249c490505df2163"; + name = "_types_debug___debug_4.1.7.tgz"; + url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz"; + sha1 = "7cc0ea761509124709b8b2d1090d8f6c17aadb82"; }; } { @@ -698,11 +666,11 @@ }; } { - name = "_types_json_schema___json_schema_7.0.8.tgz"; + name = "_types_json_schema___json_schema_7.0.9.tgz"; path = fetchurl { - name = "_types_json_schema___json_schema_7.0.8.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.8.tgz"; - sha1 = "edf1bf1dbf4e04413ca8e5b17b3b7d7d54b59818"; + name = "_types_json_schema___json_schema_7.0.9.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz"; + sha1 = "97edc9037ea0c38585320b28964dde3b39e4660d"; }; } { @@ -722,19 +690,27 @@ }; } { - name = "_types_node___node_16.4.0.tgz"; + name = "_types_ms___ms_0.7.31.tgz"; + path = fetchurl { + name = "_types_ms___ms_0.7.31.tgz"; + url = "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz"; + sha1 = "31b7ca6407128a3d2bbc27fe2d21b345397f6197"; + }; + } + { + name = "_types_node___node_16.7.1.tgz"; path = fetchurl { - name = "_types_node___node_16.4.0.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.4.0.tgz"; - sha1 = "2c219eaa3b8d1e4d04f4dd6e40bc68c7467d5272"; + name = "_types_node___node_16.7.1.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.7.1.tgz"; + sha1 = "c6b9198178da504dfca1fd0be9b2e1002f1586f0"; }; } { - name = "_types_node___node_14.17.5.tgz"; + name = "_types_node___node_14.17.11.tgz"; path = fetchurl { - name = "_types_node___node_14.17.5.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.5.tgz"; - sha1 = "b59daf6a7ffa461b5648456ca59050ba8e40ed54"; + name = "_types_node___node_14.17.11.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.11.tgz"; + sha1 = "82d266d657aec5ff01ca59f2ffaff1bb43f7bf0f"; }; } { @@ -770,59 +746,59 @@ }; } { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.28.4.tgz"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.29.3.tgz"; path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.28.4.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.4.tgz"; - sha1 = "e73c8cabbf3f08dee0e1bda65ed4e622ae8f8921"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.29.3.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.3.tgz"; + sha1 = "95cb8029a8bd8bd9c7f4ab95074a7cb2115adefa"; }; } { - name = "_typescript_eslint_experimental_utils___experimental_utils_4.28.4.tgz"; + name = "_typescript_eslint_experimental_utils___experimental_utils_4.29.3.tgz"; path = fetchurl { - name = "_typescript_eslint_experimental_utils___experimental_utils_4.28.4.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.4.tgz"; - sha1 = "9c70c35ebed087a5c70fb0ecd90979547b7fec96"; + name = "_typescript_eslint_experimental_utils___experimental_utils_4.29.3.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.3.tgz"; + sha1 = "52e437a689ccdef73e83c5106b34240a706f15e1"; }; } { - name = "_typescript_eslint_parser___parser_4.28.4.tgz"; + name = "_typescript_eslint_parser___parser_4.29.3.tgz"; path = fetchurl { - name = "_typescript_eslint_parser___parser_4.28.4.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.4.tgz"; - sha1 = "bc462dc2779afeefdcf49082516afdc3e7b96fab"; + name = "_typescript_eslint_parser___parser_4.29.3.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.29.3.tgz"; + sha1 = "2ac25535f34c0e98f50c0e6b28c679c2357d45f2"; }; } { - name = "_typescript_eslint_scope_manager___scope_manager_4.28.4.tgz"; + name = "_typescript_eslint_scope_manager___scope_manager_4.29.3.tgz"; path = fetchurl { - name = "_typescript_eslint_scope_manager___scope_manager_4.28.4.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.4.tgz"; - sha1 = "bdbce9b6a644e34f767bd68bc17bb14353b9fe7f"; + name = "_typescript_eslint_scope_manager___scope_manager_4.29.3.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.3.tgz"; + sha1 = "497dec66f3a22e459f6e306cf14021e40ec86e19"; }; } { - name = "_typescript_eslint_types___types_4.28.4.tgz"; + name = "_typescript_eslint_types___types_4.29.3.tgz"; path = fetchurl { - name = "_typescript_eslint_types___types_4.28.4.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.4.tgz"; - sha1 = "41acbd79b5816b7c0dd7530a43d97d020d3aeb42"; + name = "_typescript_eslint_types___types_4.29.3.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.3.tgz"; + sha1 = "d7980c49aef643d0af8954c9f14f656b7fd16017"; }; } { - name = "_typescript_eslint_typescript_estree___typescript_estree_4.28.4.tgz"; + name = "_typescript_eslint_typescript_estree___typescript_estree_4.29.3.tgz"; path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_4.28.4.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.4.tgz"; - sha1 = "252e6863278dc0727244be9e371eb35241c46d00"; + name = "_typescript_eslint_typescript_estree___typescript_estree_4.29.3.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.3.tgz"; + sha1 = "1bafad610015c4ded35c85a70b6222faad598b40"; }; } { - name = "_typescript_eslint_visitor_keys___visitor_keys_4.28.4.tgz"; + name = "_typescript_eslint_visitor_keys___visitor_keys_4.29.3.tgz"; path = fetchurl { - name = "_typescript_eslint_visitor_keys___visitor_keys_4.28.4.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.4.tgz"; - sha1 = "92dacfefccd6751cbb0a964f06683bfd72d0c4d3"; + name = "_typescript_eslint_visitor_keys___visitor_keys_4.29.3.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.3.tgz"; + sha1 = "c691760a00bd86bf8320d2a90a93d86d322f1abf"; }; } { @@ -898,11 +874,11 @@ }; } { - name = "allchange___allchange_1.0.0.tgz"; + name = "allchange___allchange_1.0.2.tgz"; path = fetchurl { - name = "allchange___allchange_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/allchange/-/allchange-1.0.0.tgz"; - sha1 = "f5177b7d97f8e97a2d059a1524db9a72d94dc6d2"; + name = "allchange___allchange_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/allchange/-/allchange-1.0.2.tgz"; + sha1 = "86b9190e12b7ede4f230ae763cbd504c48fd907b"; }; } { @@ -1122,11 +1098,11 @@ }; } { - name = "async___async_3.2.0.tgz"; + name = "async___async_3.2.1.tgz"; path = fetchurl { - name = "async___async_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz"; - sha1 = "b3a2685c5ebb641d3de02d161002c60fc9f85720"; + name = "async___async_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-3.2.1.tgz"; + sha1 = "d3274ec66d107a47476a4c49136aacdb00665fc8"; }; } { @@ -1250,11 +1226,11 @@ }; } { - name = "boolean___boolean_3.1.2.tgz"; + name = "boolean___boolean_3.1.4.tgz"; path = fetchurl { - name = "boolean___boolean_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/boolean/-/boolean-3.1.2.tgz"; - sha1 = "e30f210a26b02458482a8cc353ab06f262a780c2"; + name = "boolean___boolean_3.1.4.tgz"; + url = "https://registry.yarnpkg.com/boolean/-/boolean-3.1.4.tgz"; + sha1 = "f51a2fb5838a99e06f9b6ec1edb674de67026435"; }; } { @@ -1306,11 +1282,11 @@ }; } { - name = "buffer_from___buffer_from_1.1.1.tgz"; + name = "buffer_from___buffer_from_1.1.2.tgz"; path = fetchurl { - name = "buffer_from___buffer_from_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; - sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; + name = "buffer_from___buffer_from_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz"; + sha1 = "2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"; }; } { @@ -1394,11 +1370,11 @@ }; } { - name = "chalk___chalk_4.1.1.tgz"; + name = "chalk___chalk_4.1.2.tgz"; path = fetchurl { - name = "chalk___chalk_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz"; - sha1 = "c80b3fab28bf6371e6863325eee67e618b77e6ad"; + name = "chalk___chalk_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz"; + sha1 = "aac4e2b7734a740867aeb16bf02aad556a1e7a01"; }; } { @@ -1634,11 +1610,11 @@ }; } { - name = "core_js___core_js_3.15.2.tgz"; + name = "core_js___core_js_3.16.3.tgz"; path = fetchurl { - name = "core_js___core_js_3.15.2.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz"; - sha1 = "740660d2ff55ef34ce664d7e2455119c5bdd3d61"; + name = "core_js___core_js_3.16.3.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.16.3.tgz"; + sha1 = "1f2d43c51a9ed014cc6c83440af14697ae4b75f2"; }; } { @@ -1970,11 +1946,11 @@ }; } { - name = "electron_notarize___electron_notarize_1.0.0.tgz"; + name = "electron_notarize___electron_notarize_1.1.0.tgz"; path = fetchurl { - name = "electron_notarize___electron_notarize_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.0.0.tgz"; - sha1 = "bc925b1ccc3f79e58e029e8c4706572b01a9fd8f"; + name = "electron_notarize___electron_notarize_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.1.0.tgz"; + sha1 = "00ed0182366b97f5593cb5ccdcf1120f1de37179"; }; } { @@ -2002,11 +1978,11 @@ }; } { - name = "electron___electron_13.1.9.tgz"; + name = "electron___electron_13.2.2.tgz"; path = fetchurl { - name = "electron___electron_13.1.9.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-13.1.9.tgz"; - sha1 = "668e2632b81e9fa21edfd32876282d3e2ff7fd76"; + name = "electron___electron_13.2.2.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-13.2.2.tgz"; + sha1 = "332d91891d0db4f9a1d22d4d0bc3b500e59dc051"; }; } { @@ -2298,11 +2274,11 @@ }; } { - name = "ext___ext_1.4.0.tgz"; + name = "ext___ext_1.5.0.tgz"; path = fetchurl { - name = "ext___ext_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz"; - sha1 = "89ae7a07158f79d35517882904324077e4379244"; + name = "ext___ext_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/ext/-/ext-1.5.0.tgz"; + sha1 = "e93b97ae0cb23f8370380f6107d2d2b7887687ad"; }; } { @@ -2370,11 +2346,11 @@ }; } { - name = "fastq___fastq_1.11.1.tgz"; + name = "fastq___fastq_1.12.0.tgz"; path = fetchurl { - name = "fastq___fastq_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/fastq/-/fastq-1.11.1.tgz"; - sha1 = "5d8175aae17db61947f8b162cfc7f63264d22807"; + name = "fastq___fastq_1.12.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.12.0.tgz"; + sha1 = "ed7b6ab5d62393fb2cc591c853652a5c318bf794"; }; } { @@ -2442,11 +2418,11 @@ }; } { - name = "flatted___flatted_3.2.1.tgz"; + name = "flatted___flatted_3.2.2.tgz"; path = fetchurl { - name = "flatted___flatted_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.1.tgz"; - sha1 = "bbef080d95fca6709362c73044a1634f7c6e7d05"; + name = "flatted___flatted_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz"; + sha1 = "64bfed5cb68fe3ca78b3eb214ad97b63bedce561"; }; } { @@ -2682,11 +2658,11 @@ }; } { - name = "graceful_fs___graceful_fs_4.2.6.tgz"; + name = "graceful_fs___graceful_fs_4.2.8.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.6.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz"; - sha1 = "ff040b2b0853b23c3d31027523706f1885d76bee"; + name = "graceful_fs___graceful_fs_4.2.8.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha1 = "e412b8d33f5e006593cbd3cee6df9f2cebbe802a"; }; } { @@ -3490,11 +3466,11 @@ }; } { - name = "make_fetch_happen___make_fetch_happen_9.0.4.tgz"; + name = "make_fetch_happen___make_fetch_happen_9.1.0.tgz"; path = fetchurl { - name = "make_fetch_happen___make_fetch_happen_9.0.4.tgz"; - url = "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.0.4.tgz"; - sha1 = "ceaa100e60e0ef9e8d1ede94614bb2ba83c8bb24"; + name = "make_fetch_happen___make_fetch_happen_9.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz"; + sha1 = "53085a09e7971433e6765f7971bf63f4e05cb968"; }; } { @@ -3538,19 +3514,19 @@ }; } { - name = "mime_db___mime_db_1.48.0.tgz"; + name = "mime_db___mime_db_1.49.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.48.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz"; - sha1 = "e35b31045dd7eada3aaad537ed88a33afbef2d1d"; + name = "mime_db___mime_db_1.49.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz"; + sha1 = "f3dfde60c99e9cf3bc9701d687778f537001cbed"; }; } { - name = "mime_types___mime_types_2.1.31.tgz"; + name = "mime_types___mime_types_2.1.32.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.31.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz"; - sha1 = "a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b"; + name = "mime_types___mime_types_2.1.32.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz"; + sha1 = "1d00e89e7de7fe02008db61001d9e02852670fd5"; }; } { @@ -3746,11 +3722,11 @@ }; } { - name = "needle___needle_2.8.0.tgz"; + name = "needle___needle_2.9.0.tgz"; path = fetchurl { - name = "needle___needle_2.8.0.tgz"; - url = "https://registry.yarnpkg.com/needle/-/needle-2.8.0.tgz"; - sha1 = "1c8ef9c1a2c29dcc1e83d73809d7bc681c80a048"; + name = "needle___needle_2.9.0.tgz"; + url = "https://registry.yarnpkg.com/needle/-/needle-2.9.0.tgz"; + sha1 = "c680e401f99b6c3d8d1f315756052edf3dc3bdff"; }; } { @@ -4106,11 +4082,11 @@ }; } { - name = "parse_headers___parse_headers_2.0.3.tgz"; + name = "parse_headers___parse_headers_2.0.4.tgz"; path = fetchurl { - name = "parse_headers___parse_headers_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.3.tgz"; - sha1 = "5e8e7512383d140ba02f0c7aa9f49b4399c92515"; + name = "parse_headers___parse_headers_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.4.tgz"; + sha1 = "9eaf2d02bed2d1eff494331ce3df36d7924760bf"; }; } { @@ -4202,11 +4178,11 @@ }; } { - name = "plist___plist_3.0.2.tgz"; + name = "plist___plist_3.0.3.tgz"; path = fetchurl { - name = "plist___plist_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/plist/-/plist-3.0.2.tgz"; - sha1 = "74bbf011124b90421c22d15779cee60060ba95bc"; + name = "plist___plist_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/plist/-/plist-3.0.3.tgz"; + sha1 = "007df34c7be0e2c3dcfcf460d623e6485457857d"; }; } { @@ -4370,11 +4346,11 @@ }; } { - name = "read_package_json_fast___read_package_json_fast_2.0.2.tgz"; + name = "read_package_json_fast___read_package_json_fast_2.0.3.tgz"; path = fetchurl { - name = "read_package_json_fast___read_package_json_fast_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.2.tgz"; - sha1 = "2dcb24d9e8dd50fb322042c8c35a954e6cc7ac9e"; + name = "read_package_json_fast___read_package_json_fast_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz"; + sha1 = "323ca529630da82cb34b36cc0b996693c98c2b83"; }; } { @@ -4410,11 +4386,11 @@ }; } { - name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz"; + name = "regenerator_runtime___regenerator_runtime_0.13.9.tgz"; path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"; - sha1 = "cac2dacc8a1ea675feaabaeb8ae833898ae46f55"; + name = "regenerator_runtime___regenerator_runtime_0.13.9.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; + sha1 = "8925742a98ffd90814988d7566ad30ca3b263b52"; }; } { @@ -4682,19 +4658,19 @@ }; } { - name = "smart_buffer___smart_buffer_4.1.0.tgz"; + name = "smart_buffer___smart_buffer_4.2.0.tgz"; path = fetchurl { - name = "smart_buffer___smart_buffer_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz"; - sha1 = "91605c25d91652f4661ea69ccf45f1b331ca21ba"; + name = "smart_buffer___smart_buffer_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz"; + sha1 = "6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"; }; } { - name = "socks_proxy_agent___socks_proxy_agent_5.0.1.tgz"; + name = "socks_proxy_agent___socks_proxy_agent_6.0.0.tgz"; path = fetchurl { - name = "socks_proxy_agent___socks_proxy_agent_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz"; - sha1 = "032fb583048a29ebffec2e6a73fca0761f48177e"; + name = "socks_proxy_agent___socks_proxy_agent_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.0.0.tgz"; + sha1 = "9f8749cdc05976505fa9f9a958b1818d0e60573b"; }; } { @@ -4906,19 +4882,19 @@ }; } { - name = "tar___tar_4.4.13.tgz"; + name = "tar___tar_4.4.19.tgz"; path = fetchurl { - name = "tar___tar_4.4.13.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz"; - sha1 = "43b364bc52888d555298637b10d60790254ab525"; + name = "tar___tar_4.4.19.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz"; + sha1 = "2e4d7263df26f2b914dee10c825ab132123742f3"; }; } { - name = "tar___tar_6.1.2.tgz"; + name = "tar___tar_6.1.10.tgz"; path = fetchurl { - name = "tar___tar_6.1.2.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-6.1.2.tgz"; - sha1 = "1f045a90a6eb23557a603595f41a16c57d47adc6"; + name = "tar___tar_6.1.10.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.1.10.tgz"; + sha1 = "8a320a74475fba54398fa136cd9883aa8ad11175"; }; } { @@ -5042,11 +5018,11 @@ }; } { - name = "tslib___tslib_2.3.0.tgz"; + name = "tslib___tslib_2.3.1.tgz"; path = fetchurl { - name = "tslib___tslib_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz"; - sha1 = "803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"; + name = "tslib___tslib_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz"; + sha1 = "e8a335add5ceae51aa261d32a490158ef042ef01"; }; } { @@ -5434,11 +5410,11 @@ }; } { - name = "xmldom___xmldom_0.5.0.tgz"; + name = "xmldom___xmldom_0.6.0.tgz"; path = fetchurl { - name = "xmldom___xmldom_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz"; - sha1 = "193cb96b84aa3486127ea6272c4596354cb4962e"; + name = "xmldom___xmldom_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz"; + sha1 = "43a96ecb8beece991cef382c08397d82d4d0c46f"; }; } { @@ -5490,11 +5466,11 @@ }; } { - name = "yargs___yargs_17.0.1.tgz"; + name = "yargs___yargs_17.1.1.tgz"; path = fetchurl { - name = "yargs___yargs_17.0.1.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-17.0.1.tgz"; - sha1 = "6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb"; + name = "yargs___yargs_17.1.1.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.1.1.tgz"; + sha1 = "c2a8091564bdb196f7c0a67c1d12e5b85b8067ba"; }; } { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 1cd7921cb9bd..27a5204e9e96 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -19,12 +19,12 @@ let executableName = "element-desktop"; - version = "1.8.2"; + version = "1.8.5"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-6DPMfx3LF45YWn2do02zDMLYZGBgBrOMJx3XBAO0ZyM="; + sha256 = "sha256-i9PWGEcf+EOn6j++GuYt6xmwYycmW5hE5xhpRMOFBGM="; }; electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; in diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix index fdea75c78af7..05c5e732ced5 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.8.2"; + version = "1.8.5"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "sha256-SgVxYPmdgFn6Nll1a6b1Sn2H5I0Vkjorn3gA9d5FamQ="; + sha256 = "sha256-E3H6iXBRi4mnhu0mu96ly9f8AYOiMFf9zTcpjDmfHy4="; }; installPhase = '' diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix index 1b6bcd6758f8..05ba66f93703 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -17,10 +17,10 @@ in mkFranzDerivation' rec { pname = "ferdi"; name = "Ferdi"; - version = "5.6.0"; + version = "5.6.2"; src = fetchurl { url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb"; - sha256 = "sha256-yaAYNQAvbtArw9qAtbTDD11a9nH2OQEPE8QLg1E79Yc="; + sha256 = "sha256-8rB7SnaIaeCXAaKELNO1CnxpV8TyeKRCVamwpATeia4="; }; extraBuildInputs = [ xorg.libxshmfence ]; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 0fea57ea9cc7..5f2a094ca36b 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -13,16 +13,16 @@ buildGoModule rec { pname = "gomuks"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "tulir"; repo = pname; rev = "v${version}"; - sha256 = "0g0aa6h6bm00mdgkb38wm66rcrhqfvs2xj9rl04bwprsa05q5lca"; + sha256 = "bTOfnEmJHTuniewH//SugNNDuKIFMQb1Safs0UVKH1c="; }; - vendorSha256 = "14ya5advpv4q5il235h5dxy8c2ap2yzrvqs0sjqgw0v1vm6vpwdx"; + vendorSha256 = "PuNROoxL7UmcuYDgfnsMUsGk9i1jnQyWtaUmT7vXdKE="; doCheck = false; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch b/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch index 0e0d4e28b0a1..dd89c92fd3d4 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/hardcoded_path.patch @@ -1,13 +1,15 @@ -diff --git a/lib/notification/notify_linux.go b/lib/notification/notify_linux.go -index f93a95f..da6a61d 100644 ---- a/lib/notification/notify_linux.go -+++ b/lib/notification/notify_linux.go -@@ -32,7 +32,7 @@ func Send(title, text string, critical, sound bool) error { - if critical { - soundName = "complete" - } -- exec.Command("paplay", "/usr/share/sounds/freedesktop/stereo/"+soundName+".oga").Run() -+ exec.Command("paplay", "@soundTheme@/share/sounds/freedesktop/stereo/"+soundName+".oga").Run() - } - return exec.Command("notify-send", args...).Run() - } +diff --git a/lib/notification/notify_xdg.go b/lib/notification/notify_xdg.go +index 7f102b8..996c15f 100644 +--- a/lib/notification/notify_xdg.go ++++ b/lib/notification/notify_xdg.go +@@ -26,8 +26,8 @@ import ( + var notifySendPath string + var audioCommand string + var tryAudioCommands = []string{"ogg123", "paplay"} +-var soundNormal = "/usr/share/sounds/freedesktop/stereo/message-new-instant.oga" +-var soundCritical = "/usr/share/sounds/freedesktop/stereo/complete.oga" ++var soundNormal = "@soundTheme@/share/sounds/freedesktop/stereo/message-new-instant.oga" ++var soundCritical = "@soundTheme@/share/sounds/freedesktop/stereo/complete.oga" + + func getSoundPath(env, defaultPath string) string { + if path, ok := os.LookupEnv(env); ok { diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix new file mode 100644 index 000000000000..c36159bfabd9 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop-appimage/default.nix @@ -0,0 +1,23 @@ +{ lib +, fetchurl +, appimageTools +}: + +let + version = "1.7.1"; +in +appimageTools.wrapType2 { + name = "session-desktop-appimage-${version}"; + src = fetchurl { + url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; + sha256 = "126dx37099pjaqgfv5gbmvn5iiwv2a8lvfbqy5i9h1w1gqnihwq6"; + }; + + meta = with lib; { + description = "Onion routing based messenger"; + homepage = "https://getsession.org/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ alexnortung ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 43985e773cb0..4c9a1b30e670 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.17.0"; # Please backport all updates to the stable channel. + version = "5.17.2"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1m3bkrshlipxlbf4xr7gpw3zn1k39cdysrqmw705hy2cwf7pw7yy"; + sha256 = "1fmn2i6k3zh3d37234yxbawzf85fa66xybcli7xffli39czxbcj3"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix index 61a859e331ec..f53f8d3fedac 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -44,14 +44,14 @@ let pname = "slack"; - x86_64-darwin-version = "4.18.0"; - x86_64-darwin-sha256 = "1qldmh0xdbl18gvxxsi2jvcq1ziwap3naxgax4gn36x5k25ipw5k"; + x86_64-darwin-version = "4.19.0"; + x86_64-darwin-sha256 = "0dj51lhxiba69as6x76ni8h20d36bcpf2xz3rxr1s8881mprpfsg"; - x86_64-linux-version = "4.18.0"; - x86_64-linux-sha256 = "1dhdmi2rvww8m6400c5dc0c6mrircvflgwcja2rr7ry0lv98n6kh"; + x86_64-linux-version = "4.19.2"; + x86_64-linux-sha256 = "02npmprwl1h7c2y03khvx8ifhk1gj1axbvlwigp2hkkjdw7y4b5a"; - aarch64-darwin-version = "4.18.0"; - aarch64-darwin-sha256 = "0qlfxskqq5gr45p1gfc2jcbr1abhc6di653jwjgh7yibim0hpjab"; + aarch64-darwin-version = "4.19.0"; + aarch64-darwin-sha256 = "1mvs1bdyyyrpqmrbqg4sxpy6ylgchwz39nr232s441iqdz45p87v"; version = { x86_64-darwin = x86_64-darwin-version; @@ -147,6 +147,8 @@ let dontPatchELF = true; installPhase = '' + runHook preInstall + # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here dpkg --fsys-tarfile $src | tar --extract rm -rf usr/share/lintian @@ -172,6 +174,8 @@ let substituteInPlace $out/share/applications/slack.desktop \ --replace /usr/bin/ $out/bin/ \ --replace /usr/share/ $out/share/ + + runHook postInstall ''; }; @@ -185,9 +189,11 @@ let sourceRoot = "Slack.app"; installPhase = '' + runHook preInstall mkdir -p $out/Applications/Slack.app cp -R . $out/Applications/Slack.app /usr/bin/defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -bool YES + runHook postInstall ''; }; in diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 048d40082daa..513f427ee13d 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -81,9 +81,9 @@ stdenv.mkDerivation rec { mv * $out/lib/teamspeak/ # Make a desktop item - mkdir -p $out/share/applications/ $out/share/icons/ + mkdir -p $out/share/applications/ $out/share/icons/hicolor/64x64/apps/ unzip ${pluginsdk} - cp pluginsdk/docs/client_html/images/logo.png $out/share/icons/teamspeak.png + cp pluginsdk/docs/client_html/images/logo.png $out/share/icons/hicolor/64x64/apps/teamspeak.png cp ${desktopItem}/share/applications/* $out/share/applications/ # Make a symlink to the binary from bin. diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 17c9f9114a1f..669e7de99fb8 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -45,6 +45,7 @@ , libsysprof-capture , libpsl , brotli +, microsoft_gsl }: # Main reference: @@ -59,7 +60,7 @@ let in mkDerivation rec { pname = "telegram-desktop"; - version = "3.0.1"; + version = "3.1.1"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -68,7 +69,7 @@ mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "196w82a92jahz7caqv2cyhhq53xm3figa7kiq59kid5wbqg33c9x"; + sha256 = "0h4g8lw9hf9pwmdljavflyn9g9jvjvany7y4vji0qcc1kd99vsnp"; }; postPatch = '' @@ -136,6 +137,7 @@ mkDerivation rec { libsysprof-capture libpsl brotli + microsoft_gsl ]; cmakeFlags = [ @@ -174,6 +176,6 @@ mkDerivation rec { platforms = platforms.linux; homepage = "https://desktop.telegram.org/"; changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}"; - maintainers = with maintainers; [ oxalica primeos ]; + maintainers = with maintainers; [ oxalica primeos vanilla ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index e553c95990e5..60baf734aa1a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2021-06-27"; + version = "unstable-2021-09-15"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "91d836dc84a16584c6ac52b36c04c0de504d9c34"; - sha256 = "1ir4svv5mijpzr0rmx65088iikck83vhcdqrpf9dnk6yp4j9v4v2"; + rev = "575fb17d2853c43329e45f6693370f5e41668055"; + sha256 = "17lhy5g4apdakspv75zm070k7003crf1i80m8wy8f631s86v30md"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix index fc6c78a4f673..3082748a3518 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "toxic"; - version = "0.10.1"; + version = "0.11.1"; src = fetchFromGitHub { owner = "Tox"; repo = "toxic"; rev = "v${version}"; - sha256 = "sha256-EElDi/VEYgYPpoDNatxcKQC1pnCU8kOcj0bAFojD9fU="; + sha256 = "sha256-5jLXXI+IMrYa7ZtdMjJrah1zB5TJ3GdHfvcMd1TYE4E="; }; makeFlags = [ "PREFIX=$(out)"]; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix index 0405dddf7cdc..4e61f39cac58 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix @@ -8,22 +8,24 @@ , libappindicator-gtk3 , gst_all_1 , pcre +, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "whatsapp-for-linux"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "eneshecan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dB+NsoUEYM3cT0cg5ZOkBGW7ozRGFWSsYQMja3CjaHM="; + sha256 = "sha256-dEJRufOqlY+DnJdUaG5WP9hR1qO7KxR6MjKWq1SJB8A="; }; nativeBuildInputs = [ cmake pkg-config + wrapGAppsHook ]; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 5395946125d0..03a34a69a72c 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -28,11 +28,11 @@ }: let - version = "5.7.31792.0820"; + version = "5.8.0.16"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.pkg.tar.xz"; - sha256 = "16p8wn67hb6p9rn684bbpwz8w5knyqw9rv2nnw6cwg949qjv43lm"; + sha256 = "1axnh81bf3ab5gzxxqm172wpqlpfbj9a2h3cry3kyxzmrihzbwdm"; }; }; diff --git a/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix b/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix index c9637fef4ca6..253143d00047 100644 --- a/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/tiny/default.nix @@ -26,6 +26,8 @@ rustPlatform.buildRustPackage rec { ./fix-Cargo.lock.patch ]; + cargoBuildFlags = lib.optionals stdenv.isLinux [ "--features=desktop-notifications" ]; + nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; buildInputs = lib.optionals stdenv.isLinux [ dbus openssl ] ++ lib.optional stdenv.isDarwin Foundation; diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix index 9d1ecbd3bced..976b03068ec4 100644 --- a/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix @@ -28,25 +28,16 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "3.2.1"; + version = "3.3"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "sha256-gtFskJoJLw7cqLao46LRUcZobOtzgwUOiKf7I4OiJAQ="; + sha256 = "sha256-GnSi7uMxiyWSQau75q07NlX1ikaBeWOdrzOf9f0jnBM="; }; - patches = [ - # weechat 3.2 fails to build on Darwin, but is fixed for the next release: - (fetchpatch { - url = "https://github.com/weechat/weechat/commit/0b7e4977bef763993e361c23db0f52117b799949.patch"; - sha256 = "eVdrhr4mrqv+OkqYOv1E7mUkmzd5NC3LmZhbXJnCpFg="; - excludes = [ "ChangeLog.adoc" ]; - }) - ]; - outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; cmakeFlags = with lib; [ diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix index 752577c39ba8..c426125cd227 100644 --- a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix @@ -3,6 +3,8 @@ { colorize_nicks = callPackage ./colorize_nicks { }; + edit = callPackage ./edit { }; + go = callPackage ./go { }; multiline = callPackage ./multiline { diff --git a/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/edit/default.nix b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/edit/default.nix new file mode 100644 index 000000000000..5f91417b76fa --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/edit/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub, weechat }: + +stdenv.mkDerivation rec { + pname = "edit-weechat"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "keith"; + repo = "edit-weechat"; + rev = version; + sha256 = "1s42r0l0xkhlp6rbc23cm4vlda91il6cg53w33hqfhd2wz91s66w"; + }; + + dontBuild = true; + + passthru.scripts = [ "edit.py" ]; + + installPhase = '' + runHook preInstall + install -D edit.py $out/share/edit.py + runHook postInstall + ''; + + meta = with lib; { + inherit (weechat.meta) platforms; + description = "This simple weechat plugin allows you to compose messages in your $EDITOR."; + license = licenses.mit; + maintainers = with maintainers; [ eraserhd ]; + }; +} diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 7792361145af..2a6b0892bfe8 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "evolution-ews"; - version = "3.40.3"; + version = "3.40.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "ZAIE5rpPOyZT3VSPYOR143bP8Na7Kv0NQRhQ+p2oxJY="; + sha256 = "0eAjb8gWhiyjqaOT5ur9gPoQv6W2u37u28qAJVMuUBU="; }; nativeBuildInputs = [ cmake gettext intltool pkg-config ]; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix b/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix index ec50e913176e..354ab024c6d0 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix @@ -15,15 +15,15 @@ rustPlatform.buildRustPackage rec { pname = "meli"; - version = "alpha-0.6.2"; + version = "alpha-0.7.1"; src = fetchgit { url = "https://git.meli.delivery/meli/meli.git"; rev = version; - sha256 = "0ycyksrrp4llwklzx3ipac8hmpfxa1pa7dqsm82wic0f6p5d1dp6"; + sha256 = "00iai2z5zydx9bw0ii0n6d7zwm5rrkj03b4ymic0ybwjahqzvyfq"; }; - cargoSha256 = "sha256:0lxwhb2c16w5z7rqzch0ij8n8hxb5xcin31w9i28mzv1xm7sg8ks"; + cargoSha256 = "1r54a51j91iv0ziasjygzw30vqqvqibcnwnkih5xv0ijbaly61n0"; cargoBuildFlags = lib.optional withNotmuch "--features=notmuch"; diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 3054775e2d7a..de453c4d19f3 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,655 +1,655 @@ { - version = "91.1.0"; + version = "91.1.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/af/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/af/thunderbird-91.1.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "6b355e9b1e5c467b51aecf697d776014f52a4b71c3b67afae34e64cb8af4155c"; + sha256 = "ba98ba0ac513e9f8ca047bd08b38e2391d5b67b4195c2c1ac7d90498e148ad6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ar/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ar/thunderbird-91.1.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "1fa1acd3b21db46e70ad0295ed95be4b3839b8029de09a42d11a8523df0e4573"; + sha256 = "3514eadb52d000429f16417d3af5ce648cfdeaa583bb3602623f40abfca72fec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ast/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ast/thunderbird-91.1.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "aa3c7ba15bd18ab420c028571fa472b25d4ffc11f5789e4330d49a787442a2f9"; + sha256 = "c630ab402c6f166181474b0e7299dc24ff0de5ce92fa0894adbc3dbaf8878f59"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/be/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/be/thunderbird-91.1.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "24a39668aaadec7a77bd75dbb9174d4865776d55c33d3b6a8fd63cb6589a176c"; + sha256 = "9f484652940fec35d9adad996e80092cedabc789952e083107b405992b1ecf9d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/bg/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/bg/thunderbird-91.1.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "aed38cd5384c6e7df097fca8b37e866e0e432ea37f636c2306d2c1534b1013a7"; + sha256 = "f784957e36cb9a92083c275eec887d3a6847439281e94346e5bf0e065ec23366"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/br/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/br/thunderbird-91.1.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "6e8558c74d7bd0fc827bae6fc948d20a8bf3a8cd1b60784bc9e45c101b781bf2"; + sha256 = "2817bf350195954464db3a936db3a3730c2d33dfea9333165e69418b627d575d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ca/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ca/thunderbird-91.1.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "35f23617e5a62dbb2732688add158818c9f33d1c38555c1035ebdf1511a58ba4"; + sha256 = "176b8f2463267ad2aed07ca6966609c600615763caba662ac68c45b5d36e367c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/cak/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/cak/thunderbird-91.1.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "6029b2ec2581997916575e73e88c01068f48a6b72e606882936be5ee4d6bb69a"; + sha256 = "7ff8fc736dd4232801d0e50b154747827cc818fe76782b219d683a8b2bba8969"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/cs/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/cs/thunderbird-91.1.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "6e7d2c6fdf864c7a9951f805a867c8d2b300d31f011e8e36e7f914c269ace27f"; + sha256 = "b6763048e3fab66a4f08fd8c868d7c9c51258c540801546546b7da3b2ea64693"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/cy/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/cy/thunderbird-91.1.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "7933796c5db473ca10f3633ca8f4d7d8fc6b8042e5fab2c18e45a0f1cfe542cd"; + sha256 = "810213d5f90387bd6f46436b1479b977248ec043235f2f97b7e8d0a3b296eaec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/da/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/da/thunderbird-91.1.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "fbce1763012fbb3395668cc88cd9562ca7cb19ecaa0f4eee81def9983106b97d"; + sha256 = "2c85f4ea05fb03aaf88f4cb028375a628061f2699adde13f78cf6e76b7564e7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/de/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/de/thunderbird-91.1.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "8e62c8f447cf509b31f4f54bd8537d8ff9e525ba065e225a1e1c0acdadff0d3e"; + sha256 = "9a05ca5400224fbf0923a331e1ba986d38038df24340c6aee695c24f96f75e0e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/dsb/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/dsb/thunderbird-91.1.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "4c3064d94f70ed5d80ee091127de862f700904c7ea267a9f225d3e770472d0cc"; + sha256 = "e06a84821ba0354e4d5efe0e080734e39f376ba3e1f1c385ab939fd4cb84301c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/el/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/el/thunderbird-91.1.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "5307684da1676cec690ecbd47159d99f8034f4f1dd7f2785bbd673b4bde88760"; + sha256 = "32a1de995a05495721a4c6a6a74ec27b68c03d7b2121ea7d6ce6d295ceb8d328"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/en-CA/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/en-CA/thunderbird-91.1.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "a411b006a7589c7798cf6e23d32c1096c8587904b8dec0c77c59a4864d94d077"; + sha256 = "95f2dd81dc1958f2acd8a801fe7a87dfa0a00c6b91b8bd669f8e3caf6d90aad2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/en-GB/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/en-GB/thunderbird-91.1.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "430b01b92d52940bfc37f5d6179da4cddf36884b3b26ece298a24b7743f72833"; + sha256 = "3177bce52669f44ae58ca447b54a86329cdb5b8006199e86fa66b5bfe96ac8a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/en-US/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/en-US/thunderbird-91.1.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "d19eb0214c17b9738124fd196cfc64e8c98df092d7777e59ebff2fd6304ccdad"; + sha256 = "c0331b86ef72bae3d769ca977b0c9adeb9a29145dab1eb0013f4d88fa9caeedc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/es-AR/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/es-AR/thunderbird-91.1.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "1614a42f7cff6e7c8d82cb7be3cbb13b056242206fb4e9b4765576d1a048c764"; + sha256 = "e2aee8223131a46bf99140ebdb56ab76ca03eb5eb66dfbee75f23520d95d1971"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/es-ES/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/es-ES/thunderbird-91.1.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "36fa6d30f6a743fba64cb3c7087143d9ba270b75b9c68e2bd9f305c0dba72a36"; + sha256 = "c8e189dc7a57d47c6dba9e4cda3068b327fa10cff3818e97a4942c71c1d0cc87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/et/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/et/thunderbird-91.1.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "c3ccde17967aca822bf70ad836c412315c4f8315126d000369344e19d3f5e4f5"; + sha256 = "76e094d63467fb36622b64361f86041f0e6361a4fb1f1702c8a0e88bc57cfc96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/eu/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/eu/thunderbird-91.1.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "799a10b1d0d59087dcbc36ea584e7b5bd0bf6e824b8b54fd4805693a86d8a5eb"; + sha256 = "8f09dc4bbbb76b660acf4664f4fb083a50de6523842171b4fe9558e7255c8bbf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/fi/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/fi/thunderbird-91.1.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "9d4ff3871c76453ee24ecca614c2b3ee74ccec34653758cb0d6814c6cb880cf2"; + sha256 = "d7dba3916342bfefe549ad21a70a438c8f2031fc5f0085fc4e236d0f8d07c948"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/fr/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/fr/thunderbird-91.1.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "8ecd58d5e078b3764805962a5b79c34cd967b671e83bf1d4eb986dbb6a0ce01f"; + sha256 = "4088b924197a6baf7ea3ee233d566b9799cbab955a135bc870eaf6e08ce70915"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/fy-NL/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/fy-NL/thunderbird-91.1.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "0f06c52b5acb30787df11994c816bacbb639d52f69490ce0d14f1dcea3393522"; + sha256 = "59cd7d50cdbb7867f746b137ec8f70407ae649b03e86a73a2be642eab9256be4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ga-IE/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ga-IE/thunderbird-91.1.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "ed49900c65dcc82db483f6ed25aa84d8df4ac2ef961857e2e04581a39fd2614c"; + sha256 = "10936f6c941d8c94eea200c1c3bb8919066714129eb3b34d67df87c9b93f331c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/gd/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/gd/thunderbird-91.1.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a5c60e5ec859ec7b3f3c5415e2aadbe0d934808c3ed2fd05832bdba9100f3906"; + sha256 = "4ee24daec40780a8148092c96140575e7e5d1169fd37ffc6d46879f76f976f80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/gl/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/gl/thunderbird-91.1.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "952b19e3c2b228102340803095c5c3854f1e726bf3bde05a5a5706cd536f6dfb"; + sha256 = "0126bc6b167b8bcb2135e02c289f26aed82e4ab8dc820fa9468ebb41fd05604d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/he/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/he/thunderbird-91.1.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "33121f9612d938b8f8dc040cfff99c6e76db956bf5cbd8823e8ec5488d6fb154"; + sha256 = "58ae78aee2da5f8a33edf8c87a743ea7f3da6702f25682869db9bbfcb53d4df5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/hr/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/hr/thunderbird-91.1.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "62060cc1b62831543bab9d8d6e63d8cc8ec755e51b463adf3823987828037196"; + sha256 = "c4543e54a9fa59906c64b8830e4ce6218279872e6beafeb67d13250159eca8f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/hsb/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/hsb/thunderbird-91.1.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "24f8af584f7f882a2a6e80ef704e58fdf1893c4690eaa9b9a6cc03fc786c6865"; + sha256 = "cded10c83585c5d6ebdae4a0740262f43203b7a9252144a6f97eb6b329cea95a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/hu/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/hu/thunderbird-91.1.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "33b17c2920312de96f9e7158b9659ab5afe8fdd09454b535b2b84f72e9797669"; + sha256 = "f6dcdab2dad04a9210f509a62da49ec5269bf5c9f40e74cf9d2f43edb0abd422"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/hy-AM/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/hy-AM/thunderbird-91.1.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "608cbb5ce32eef21489000f92857ac45e73adbf618f44e7fc36d8d323432504c"; + sha256 = "b3f8a1b6d4576dbf660bee6404b97babeb04bf0c1c6ff27aab25a073436f43a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/id/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/id/thunderbird-91.1.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "29e8a54b74a6ea8e8eed88b00c833bd6b6e90c9da62090a7162642627c04cd25"; + sha256 = "e1bfada3b7d33e01462cc303b22298850c5923f42e8ca656cdf5b2dc72c00745"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/is/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/is/thunderbird-91.1.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "5d8fc62ba40847027b9dc497294fd4a6a1ca34b1aadb934388d32942f0e47b47"; + sha256 = "602ee80721bfa921805c1fff2b0802d7845d7970645cbb839e5d0f6e25b5fe65"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/it/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/it/thunderbird-91.1.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "f5f0b1101e4ac664af9b4acf63d40d9cd1109653ce4f397a22f0d61f13576261"; + sha256 = "7e55d0b20027e23d3340a593beeebac0fead2dd0d048133b2e42dbb33288c4c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ja/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ja/thunderbird-91.1.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "7be97e12f05418cb82d86731130f0c2ebfc0c8aacc7f4120be2ec11d53b5980d"; + sha256 = "df67309b344f46f9ead5939a2f0f7bc34b90bf4cfa4cc28a662391146951c4a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ka/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ka/thunderbird-91.1.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "47438a6fa2bad17d57f90fb083f70ec023d65a9a344fd4ffa137cec9ceb1b29d"; + sha256 = "0992f5884dec1431a1c82e289195db7561a8089e7cd7d8fb940c0435e365b6f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/kab/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/kab/thunderbird-91.1.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "0037b1e8514c25fcbd05fb8dbb66880cbbf22d2bee443d14cca4acb3ef994982"; + sha256 = "37eb0b67bb564762f8c88fac75c9ef8a51ad4ca302e3bc5f4d99ff799a141309"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/kk/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/kk/thunderbird-91.1.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "749e22fb529f7d710a6a2ebeae9eb5019fad8cfda8f6678da9749bb2709fccd5"; + sha256 = "16fcf81dd18c51826d3a93e6393c820227322ad4cceaa668a22fcf79d9fe0773"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ko/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ko/thunderbird-91.1.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "d69205bc220de204535569d058230b9888d58cae8f8c44ff1fcec78a6443223a"; + sha256 = "4e6b0bb94ae1442b987b5e98ef287f6cdd354d13ecbb14dfc25b04ba17b3961d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/lt/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/lt/thunderbird-91.1.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "8d670513f40d04e73cab28bf2cbed5865c11c9ca22abd7b0c7f8e823e0d1553a"; + sha256 = "03364e6f6104f083bd38dbd65c1d451186757e07460840a1fc8ed8d71f00cc8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/lv/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/lv/thunderbird-91.1.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "1e8f6b5189b289b7538b4d49ab79e384f721c90279dbafb74fa797eed3144a00"; + sha256 = "4da6a4e457aadb58819c3b44432c5a5ff17f2be378fb461d859a92768e2c4b7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ms/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ms/thunderbird-91.1.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "6c29d08a31ddf074afe987864fd597822d70438b27b4f3ba09637235d387c4c6"; + sha256 = "8aae1245c40ba4b7682f5d26f3b90d9b5cfe53fbd00a755e699ddcea6ac5164f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/nb-NO/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/nb-NO/thunderbird-91.1.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "b0427494aa505bc4fb0dbd22881c480d9b3b0003a1768010ae277403964cc069"; + sha256 = "d279ee97817a87a87b8848f6cce8e1b0a9643095dbf46e3632df6242f9b05b23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/nl/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/nl/thunderbird-91.1.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "b690288643ecdda0f92c74ea1e27555dcbbfb5600e4b96c5f09fc6d438a07904"; + sha256 = "f1d58f439aa8276b5baa475e696a6eedb484059eef66ed8ab6ea27f66182d53a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/nn-NO/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/nn-NO/thunderbird-91.1.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "2d75277596380c477334f81ef75a20216502a767c307b50b29b1e9fb9c859c44"; + sha256 = "703745b4b07778058a8ed8d4072700033f268ea513abc9f4dc7d1cdcf07c9c2c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/pa-IN/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/pa-IN/thunderbird-91.1.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "1ab4a0c67f0ece7263b5aa67ff83e525b22aff82577ee80c422ebe8dc3df88e0"; + sha256 = "46d756ecb4d5e566dc4a72115874b32bce8eba5de141448d461d795b0c81e78c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/pl/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/pl/thunderbird-91.1.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "d4ef5d8678c8ef56bfc29362ef1745daef81ae7f8769eef6dcb38e9c2575f694"; + sha256 = "7384fd09796d727f82dd9f92b3faa67d53c415c01b44c885a998039eda703545"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/pt-BR/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/pt-BR/thunderbird-91.1.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "e29a8f74c456c3bb74e2c32aeb8b33b2e43a44f34ebdb965c62c26899c209b3e"; + sha256 = "dcd97601965c25f43fc10bf59c5ccd3d62439ad3f1ed724c379951d2b514df72"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/pt-PT/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/pt-PT/thunderbird-91.1.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "2e4af178f24ef709d770e53511da6c9445b4c68f8326a820839dccc1c7f5f018"; + sha256 = "225c2c87e5e18a987c1cad74622ace48bcda9dac7d420694f91c0c30757bfa23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/rm/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/rm/thunderbird-91.1.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "720067814b8b2ebcf4e4befffca4b64a2b3ede35a52cfbe155eacaaa55e3751f"; + sha256 = "07ca0312828ee92b9d04ca5e62f6f4f65260faba80da1da5365a2614edd43dae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ro/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ro/thunderbird-91.1.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "c1c86c6e702182eb058abda2e3aae249f2baa84b8c920216d82b02dd93336736"; + sha256 = "3cee1abefb6bcd9508a14e0b03e14f30b6aba95245ba79993d293fc92a3f7bb4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/ru/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/ru/thunderbird-91.1.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "79fa279c4b384c82952a8622c1fdbdd380f5c7c8519739daae923fe68a008168"; + sha256 = "e6491ab33fa05012206b22223f78e2f6f575f9e99d33159f0c853b538c3ab9ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/sk/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sk/thunderbird-91.1.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "dcc35cf4d23ad70e58378d9ce85d6cb627601ba1b6703bfa91b1350d7c9db460"; + sha256 = "b4cc3471da1cd3f1f9146bf5ba9d33f706df6d2988375a7f148223eba2cb88e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/sl/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sl/thunderbird-91.1.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "ffd4fd2047d6be06763c7e5d64936ed781ac55a6412236d3f4373e740f3effe2"; + sha256 = "a83b61af2283d3c694ede815faaa0abfb3e6b7a346d9d984dbf3e50856532473"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/sq/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sq/thunderbird-91.1.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "db989f096cfbb11451877f7a55b89ecc3d95f3920716f3c094272f7f606350f7"; + sha256 = "6562243bd3ca68b6b09c12745111c36a269e60593c5c458e04da12a9f1cfe7dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/sr/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sr/thunderbird-91.1.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "bc63020249bd66abcf17dd86daf72960c80fdfa334257031f88060d610b7b420"; + sha256 = "2b8dee91bfe25480f1a7b12b3825e2445b369d6125df9a13271ef6a6af015db8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/sv-SE/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/sv-SE/thunderbird-91.1.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "018f169ef69d4d43c860fa0b31102f87001035cdebbdaf9a296a5a9a42ffd351"; + sha256 = "113e0ebd096ef5ea225c76e930cbdc58f2b529b39fe799310098abefa4652ee1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/th/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/th/thunderbird-91.1.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "10a062c36ee778f9fb16cc90b27e51a00efc143008ea11c4e04a0261bcfd2001"; + sha256 = "71b62b60167d06a02fcc90017b33d65c757d18d05fbf689607631ff1783941ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/tr/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/tr/thunderbird-91.1.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "bbafbc16b0437fd507db0c72cdd0f13f40485329a1f6b238daf7f77c21290acb"; + sha256 = "ab7f254131c8fdcc040d06d29ffdb0da6d95b9970f7640851bbdad337af0bd0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/uk/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/uk/thunderbird-91.1.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "fb7488a541f284eda5862cf3f1f16e274fc3604d1ab3ec03c39c4779c9900c8d"; + sha256 = "6da1aa51763b3acb2015eb78b50d5d6cc080bd606e2afdcf181d84095b0cedc3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/uz/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/uz/thunderbird-91.1.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "c8238bb841b37e4f468c95e07c714caacb2c028969d10ed88027b89ebd12f11a"; + sha256 = "933513bdc1b1137dc627ec4895c3299d3633a105eadf2216b682fe36554c5f5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/vi/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/vi/thunderbird-91.1.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "34bb1df38a05b37a0e8f976bf45aa2b95295e54d3cea32a199ac1a3b623086c4"; + sha256 = "8f3eb2210a070983d87e6d5ec9908cabfdd012a4691443c39cbf2212d79e2394"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/zh-CN/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/zh-CN/thunderbird-91.1.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "e30dbf4980e33684f2011ce5fb938b1c78e106bf9f0386e720674e494e78b3a7"; + sha256 = "0faa621dba2d2725bcd6b2a337feac5ee2d6bf66900ce30e1e5abbcddc15ca45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-x86_64/zh-TW/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-x86_64/zh-TW/thunderbird-91.1.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "09e33501f8df2889820bea4ece53edd3a732b94cfad1a5006aca2f0930db80d4"; + sha256 = "e236b7d2b9187a0ac780d7e0821cf29138d5f03321248e4edab0d1f2a7267cc7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/af/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/af/thunderbird-91.1.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "def6badfd1fc47bcaf39eb729b32b7b18b60644d30ce1851e3c05a4e434aa55a"; + sha256 = "624e9894eba97eafff7241dd73c2edd685e0786ba3e12f525980012d7dbae0e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ar/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ar/thunderbird-91.1.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "53d0a95c544e619a25ac6cc7cc6679b1acee486e9c421a1daddbf8654b887afd"; + sha256 = "62f250a1925e8b3cf2c98fe877b7b5a6d559d3fafb1320312fc765630c23a71b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ast/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ast/thunderbird-91.1.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "887af3d430ae6a9f8ab8c4e8660ad3ee96b7bdd0a20b97382e2ee19c75881907"; + sha256 = "102b2e3d812eb4737f3d4ab63e2b696cb7cc2478ad438bed5c19299d65dc5ac6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/be/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/be/thunderbird-91.1.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "b1c98702341cb8250518226dc6ce1403ff6e8c4d693d6e2c71216b8448fa8685"; + sha256 = "ed15b0cc8c4d0dcc4071ccdc602fd796c5dc42a027f26595d1d8df2ab10267ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/bg/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/bg/thunderbird-91.1.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "77637e9d2e135116f2136ba04a48e787b1c44f137430255126f9d45ecb1fb56b"; + sha256 = "234f8ff03dbf19bd9100663ee517fa1630d0e7bd00953a056d5085021fa90324"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/br/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/br/thunderbird-91.1.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "f05f6536e425685296d257a7dabe838a9e09e3663d8315ac3f810a2f434e7087"; + sha256 = "34c578de385448cad19dc368a04d0285cfb1520c31477f6eacc10ffa2e81a02d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ca/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ca/thunderbird-91.1.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "0509d0cde2a0fe2d6ac8dc2d5b850ddff7815145673dd2ee5a121dea95253f2c"; + sha256 = "c3d3dfdeaa72254d02b12f72c83a95a2904a13f2e0c721d3baa5da0dd76bc2c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/cak/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/cak/thunderbird-91.1.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "9838e298051a41e26f07b4b3fe2b986f17dae2a28abe6d6f1117c6f0a07a3792"; + sha256 = "7cf60b8ecc692696081115f1df65f9976613ef34b57d412a6d3333a18400aa3c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/cs/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/cs/thunderbird-91.1.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "c480356bed2203f20c2e56b84a4f57782d8c439ee6f760a7bf71f6b635ff30fd"; + sha256 = "59f01da4722c4317f80a7174f85fff9ba60a8341d589ef2cc27c565a529af2f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/cy/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/cy/thunderbird-91.1.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "0b3787a4b535630cd18be5bd643f8a26bbe92b2a0d43a20638572bafd0ce7725"; + sha256 = "470e65ebf016cd8fdcba1ad405df36d556c6fa43c23856b88d6da3fc58f80d81"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/da/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/da/thunderbird-91.1.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "83be22576ad41fa1c8cad84c7f7236f810248ecdf5cb0d1605693fe0193b28d7"; + sha256 = "d1e95c7744d5058354e8626c361b7d529fefb2032cf380f8f129e84243221b9d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/de/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/de/thunderbird-91.1.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "3edc194f461c6785f71353917a7e8451b838066238ac178031f0584b0c44c23d"; + sha256 = "dbb632f5fe3a3ea2ffce78ef8984e78debf2b0d09ec42bfd1b642a7fd68dc93a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/dsb/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/dsb/thunderbird-91.1.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "4d11e2475112e28836d08e091a4a42a6bb6cffc2ef91a5daa909af0559c564cf"; + sha256 = "ab5d84870b77376fee50b082e14f2d5ce915f9041a63f09519ea5b8ab2c8c990"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/el/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/el/thunderbird-91.1.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "d4d1e9c7ab327bacfa0077cd1935660c7e49adba24be2be1af91ba5661872e65"; + sha256 = "a96a8d96484b441210b98e768462237ad2e4306bcb20412028613f480160fcd3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/en-CA/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/en-CA/thunderbird-91.1.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "4ea129ba96f00ad35e727af252d864b5b7b5d299cd4d75961c399a1b112638b2"; + sha256 = "f43fa2abb60bdeb571ec665d8f5779b049d3270f05e01e43795408e450240d85"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/en-GB/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/en-GB/thunderbird-91.1.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "a8fb21782b4556d9f050b471c6de8871cd156b83bf3453e3fb1d5845d8cadc7f"; + sha256 = "6c3c9f1c8f4e3f6cc6008cec83e5c234f797762ae05cdfe7dd7e95794f3fa007"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/en-US/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/en-US/thunderbird-91.1.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "46e6de8047c63b877ca7a34f2154851060833502d5bced598873d3f8d89cb099"; + sha256 = "a6c3f8b935f8c5e185e621aed1725b82db1007c977949fb9f786b86bf024dffb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/es-AR/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/es-AR/thunderbird-91.1.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "d24b1067cc6249b7d89fbcfedf18e390939c7aa3c1e009554ae4a3e980ce8605"; + sha256 = "e431f72359b602e4bb784626bda3f4526eda6ee5bddbe51d5c67fb62325da237"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/es-ES/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/es-ES/thunderbird-91.1.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "5ab7cbff3a0bb6684eeed6698826f7c417fef3a774a08995b087dbb069768e37"; + sha256 = "3f7ccfb4b86b11583289036792e78d080f558d8d58d1b11929664952076ed152"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/et/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/et/thunderbird-91.1.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "fd0a1e89d8c045e7858828c384ec9c1d805424b6d54cb46de7b45bec1266b89f"; + sha256 = "4d224ed49c4cc300e22add49b79931b753155f5052d7d0572a3b99833351feb3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/eu/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/eu/thunderbird-91.1.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "02ddc8a6dc782d7148dcd799b87d10fe9d6417199bf4c245bf1baccfa173d6c1"; + sha256 = "84ec201b40080de068c9a2d9ca4effb360102d34970964813f4335187fa0c472"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/fi/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/fi/thunderbird-91.1.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "ede8df4035b3fbeb7a2dcd49fbfcf56d9be4c152e57d7bcffcf66b35eb02e8ee"; + sha256 = "633a45dd1dd870dd0d486715328152ee092a5297f95f35ad4ac8c1a0fa59caba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/fr/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/fr/thunderbird-91.1.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "c343bc336f4c556af1ceaa597391608edcbc4f970f1fc6af6699853331d6b574"; + sha256 = "1a5e668cdfc500652d3429ecddd987993c60032de0dd570c14256642927910e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/fy-NL/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/fy-NL/thunderbird-91.1.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "2f2d2e7b47ea8b38379b883f4c3296110f82450d5dd5e64b76588b4bb8de6462"; + sha256 = "86d52dfe0a63c7f066f4d6b677d1b2d1025b60d7ca556f2cce074ac529d49948"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ga-IE/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ga-IE/thunderbird-91.1.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "3b60ca04b46298c5e560a9a85d01bdb1e2254b25b1592f78c616822f07454bc8"; + sha256 = "0a116945f0ce9f51feb9658756bbb706830709155d21f4d32be5bb9c2ba3924b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/gd/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/gd/thunderbird-91.1.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "bc07c4aaa55fb554fbf5a5ff5f7f03360ba048047e3e3365e28b995d40c60372"; + sha256 = "ddf29128560baf824d5ab984cc4c219318d62d1f6946c83f1e281bf59dfde046"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/gl/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/gl/thunderbird-91.1.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "b5ce738aeff507c8aa9dd3f7d0303d877188e0f51a99291ab8090b3af7e92a2c"; + sha256 = "28e291c985d8b618bb88a65995f0c523d18a231bd9e3020b743815754d2f761a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/he/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/he/thunderbird-91.1.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "3fe4505d46483e73e165185b449633169f8d3507c4c1a30d99e3442269907f79"; + sha256 = "daecfd126e4e7f7eed943c715b7e0e17fb1b17b55963211130a2326bdeaf2fa9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/hr/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/hr/thunderbird-91.1.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "87d7a3dce52e7fe0ea9d8fe610bd6683e14c0e65cfc6c4c25e5b258a468ff9ec"; + sha256 = "f685cf4629e13337795d25f7e75bf2f24abca87e35e41c62b0f48613a2e57365"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/hsb/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/hsb/thunderbird-91.1.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "4befc38910d18cc91b27ccbcd54a04cc87f709a7a5908f48c16b90fa5118b833"; + sha256 = "d9161bb816887e1fc2296dcd942f0fb4736f86bc8a8122f61caeffac75b0c19f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/hu/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/hu/thunderbird-91.1.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "9ae438b5b09d2390e3d934c85cad39d7a5dc733b1ad3add74c1700faff19bc6f"; + sha256 = "80e69465e6afd1b50a695b30fcfdc13ad2c051e75fcec666276935874e79d5fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/hy-AM/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/hy-AM/thunderbird-91.1.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "f0bf9acdc4f7b7b5b9e0d1a6005bb4919f10474a19aa9c54a4696ec3b6ec6853"; + sha256 = "a1aff21e7b07bcc20685d906d69d6b2515983263d90d2a2533e58d6c74046fbf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/id/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/id/thunderbird-91.1.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "3b266327a9681e5b2299b860f4ba6153c49d2417c3f506bb721dad4e6bebf21f"; + sha256 = "e911dd870b7a33d50278597a6cd1970c15578716f97a1ca90bac2813c4aabcb6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/is/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/is/thunderbird-91.1.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "63c5947e73d86ccda38e2f600b2bf17378e44c8ef0137fc8cf788d9fd04c90b8"; + sha256 = "ec91be584ef82def938d295925b1231f7ea50bf9e171d90ce74ae575970c5e5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/it/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/it/thunderbird-91.1.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "de701cb3aa59f540e7fe9cb364a34ad7b6072ef407530555e9bcde1799cf1afe"; + sha256 = "971d7ff2f20926b9148ac6386f2d5824a1443b3a4618e67cf4c30c14f126d711"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ja/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ja/thunderbird-91.1.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "16ddb5bf1cb3338a511b0e22f7b48e4dee43c364e0d8f1df5dca4354946c6d41"; + sha256 = "17526869e3234f885f2078c98a8442b2dd5a019a529d31e0bb6df5b6be24be8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ka/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ka/thunderbird-91.1.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "4fa177e0e9f4227bb389fb784a491730da682331161b6716caa64f9859756a96"; + sha256 = "945beaab6b2bac56b13f7329b98fe6bf621fa9f3c022b3568dfa43bdce6e422c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/kab/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/kab/thunderbird-91.1.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "79ece60db326d24b0672c518356c5af52f4bc32955d9e9df3d342d5179768f2c"; + sha256 = "39b6835112c58cba3b5e4b2f6964dbd9982c8146f0290aed9b13b10ae159bdd5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/kk/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/kk/thunderbird-91.1.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "cdd426bf11206588de80d4b8d68498748444e0536da9e6cc62f1b066faf195dd"; + sha256 = "a5c4fcd5d4e91c52814b2e8c6b0b239e0c430ea6169b351b33beb2b0736fa94b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ko/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ko/thunderbird-91.1.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "4b18853761c82122d814d95a57c161647f97de344e57f2600fa562332b56362e"; + sha256 = "97e5ae5cd2def5410de5b8a3194f77c53fc4ecb17572e9925a4bff56cb2ca73e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/lt/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/lt/thunderbird-91.1.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "dc44e61c6bbc3efe61310cf8541e33b04f2ad4a38a70826704706dba50622658"; + sha256 = "2fc8d9d3fe286efa337d98d033b43d9d0b1c7fec15e566ed6ae98272df6adbb3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/lv/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/lv/thunderbird-91.1.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "1ed31684fd7279c051c47a9d032c4c4e77e2ff396977dcd223a0608fc3ecc400"; + sha256 = "3a480801c29e7661b73a01d1d29455bbaa4f228a749da467400ebe0c973c5150"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ms/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ms/thunderbird-91.1.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "da27a3e094394650fb86ce53e737502628c12dd7a3c7d179367f7e5f4810bd13"; + sha256 = "143e04a636d4e3df7ebab4a26419f0df6131a911c7b158848a1a0f4a51b8c6f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/nb-NO/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/nb-NO/thunderbird-91.1.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "ac7acf9de057d8beded959c557ee1fb42513191c1580784cb710118ff9bbb919"; + sha256 = "4f3f731b0a9b2dd7496b9cf9e3df7c54924f821b8afd404848b8bee4c37db7c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/nl/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/nl/thunderbird-91.1.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "6311048f81b579cc49cac62b6b21c138d5d91c8ad3bebbf1c27c63cb1e60afc1"; + sha256 = "d6b758c9a5aff775088ebfe3c696d6275ecb2b2a4b7129ab3b79b23fe773e49a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/nn-NO/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/nn-NO/thunderbird-91.1.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "840c272897c1bd36e7e182acaf7eb1adda59c59c4b9809fbfe5fe71c14a67074"; + sha256 = "89bdee0a436d53cba1acddc9187b8bf7036d3f8b2d6f8a60a1f7d1e7aae4687a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/pa-IN/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/pa-IN/thunderbird-91.1.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "b56782bbd782840b9a1e4b9eb721539881443e7cf99f521078f86a220f425ad1"; + sha256 = "9def18033f40abd87764ee12a0c9a104df9ffbf5813b398251d86b26676aa57a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/pl/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/pl/thunderbird-91.1.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "e8883f496b67b9689e28d9313e038141876cd95e539b05fe020760f62057e934"; + sha256 = "e69e2f319a7691af209e517f7624a10e942c052fbff40cbe3e0cf057d5e8ce60"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/pt-BR/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/pt-BR/thunderbird-91.1.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "b5f24053b799799b161a572ad51b591c8145743c6d00ece95a7c9f57753fbb98"; + sha256 = "ce0a025976a058e01dcec3c7c22005cc8061dd118cbb5766e34e1fa2e2d24ee6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/pt-PT/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/pt-PT/thunderbird-91.1.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "83e4a41dab8ba18dd4bf14adcbc5cd27ea3fd9a3c5ad7d49c696eaa7159ec536"; + sha256 = "0e46088f48739f26d94f92aeef401f136006f0cfc67b9445573539f08e9175fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/rm/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/rm/thunderbird-91.1.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "079756fde88f2701a044b553b5c3076988951efed9029dc4e7a5b4e0e8ba4e93"; + sha256 = "7efd235fd88601a74d2e6a2d9e481fbb011e4a3695128997754d97917a94669d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ro/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ro/thunderbird-91.1.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "8c30ba26f8e8cd684bd72394164e4f9dc1ebc0d8186e78ab39a6ea8fa5119f66"; + sha256 = "9ada46d39f4eedb097b177d2c443dccc05af71a12f370b202aa0bf259c0cd7c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/ru/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/ru/thunderbird-91.1.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "718c94a9a7879dcde959665d1b78d8ac78e6e4ff1fa047178587b543cdcdc046"; + sha256 = "0e4d029183f9125a4d1efe81cba348155336a37267db346436698430808a3da6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/sk/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sk/thunderbird-91.1.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "46e0a7046c1b87ee70122a499778af86cc7d0af01995a081e8a6f1e9ff3bcbae"; + sha256 = "a4712e2e477bb96bcb69eb8ea96200f81b1eb829db3675844380f68b1d264915"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/sl/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sl/thunderbird-91.1.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "bb789aefaefa4c12276dd26e97684fd3ef2294b67ca6950f8acbf515377b0848"; + sha256 = "46f4f3dfe12614ceb8a249a4d38df2b40728082ce0448af03c2949f0d81d1969"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/sq/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sq/thunderbird-91.1.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "47a05b2db86bd268a44fe7a77a8960f11142ecdca16ffcee427603801add1c33"; + sha256 = "c5209bea51a081b6707ee79640ab663b3975af8c1bb26df05e480f5ad6dba723"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/sr/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sr/thunderbird-91.1.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "cf9789eb0f84697c66ed3ceccdbbe6a9e13fea2c27768e822f4e24a90950dfab"; + sha256 = "8cb6bb676a7143f10d5c666e41398b4045f32ca13bfd6a322d308f6b05dda441"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/sv-SE/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/sv-SE/thunderbird-91.1.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "bf3482ee0f9203acc262984ee886ab32da27f2a75c7681028bc0b3ab1f0a0c71"; + sha256 = "33736665f7c38a62ed65340acead5435599dcbb8c7892ce939664662168078cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/th/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/th/thunderbird-91.1.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "167a81fc42ef0bd51f149695c6acc36ab7df04c10ff727b119c295b7046481f9"; + sha256 = "0fd5af0ffc983f58c85756274d9d94f26a44c32aff3852b22ac0554375b8eac3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/tr/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/tr/thunderbird-91.1.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "f508d7a071fd6c641cbd70944b784e553ab7bd4ec8e084e0ece6746b7ad149ca"; + sha256 = "6f8318a023062b306a64cc615bbffb96d06b608c625a0134f28d60629f5986c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/uk/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/uk/thunderbird-91.1.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "2505fe82a01770c279a0c3c9a29d8eb02c3078ea3c6f3be956b531277a6125aa"; + sha256 = "fede0c129370c93df5cb9e9f5e9bef69c6ad6bb96db11bdb520c743183ea2b41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/uz/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/uz/thunderbird-91.1.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "25ffeef15ef2f0f9d939ce09edc9a5e8d58f23c94c0cfd4bf952e2ad5a373fd1"; + sha256 = "23db48eaf9101a4a838487ab4f31d7504036b0204a1624e0ac750bba6de24437"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/vi/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/vi/thunderbird-91.1.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "fab7cdf7def4e8f34d891275c914b42a75d174e5fe807642c6d47ad09622dd07"; + sha256 = "55ec78e15967365bc41fc2b1469af78cc9300a0365587ec72463e9e97958020b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/zh-CN/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/zh-CN/thunderbird-91.1.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "e113f02eba4e13ce2a17098576b87a2b64b969d97c11a4dd8bb561467bf26f3b"; + sha256 = "008216b04c79fb96686a747f9756caa2cc02aa052e7e682b0ba9bef0138d2ef6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.0/linux-i686/zh-TW/thunderbird-91.1.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.1.1/linux-i686/zh-TW/thunderbird-91.1.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "0a3733c11855cd48504e82c32172e7cedb1a57d402e8f1f4a6e8a305b9eda3ec"; + sha256 = "bb222c6f9c8e5ed7681fa920ff6bb6e9d1262e16efb994dd5976e575e4f54a7c"; } ]; } diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/D124361.diff b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/D124361.diff deleted file mode 100644 index 42dee06a26bf..000000000000 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/D124361.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/comm/mail/config/mozconfigs/common b/comm/mail/config/mozconfigs/common ---- a/comm/mail/config/mozconfigs/common -+++ b/comm/mail/config/mozconfigs/common -@@ -1,6 +1,3 @@ - ac_add_options --enable-application=comm/mail - --# Disable enforcing that add-ons are signed by the trusted root. --MOZ_REQUIRE_SIGNING= -- - . "$topsrcdir/build/mozconfig.common.override" -diff --git a/comm/mail/moz.configure b/comm/mail/moz.configure ---- a/comm/mail/moz.configure -+++ b/comm/mail/moz.configure -@@ -12,6 +12,7 @@ - imply_option("MOZ_CRASHREPORTER_URL", "https://crash-reports.thunderbird.net/") - - imply_option("--enable-default-browser-agent", False) -+imply_option("MOZ_REQUIRE_SIGNING", False) - - - @depends(target_is_windows, target_is_linux) - diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-90.patch b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-90.patch deleted file mode 100644 index c4e29f6355cf..000000000000 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig-90.patch +++ /dev/null @@ -1,13 +0,0 @@ -Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. ---- a/comm/mail/base/jar.mn -+++ b/comm/mail/base/jar.mn -@@ -119,9 +119,6 @@ messenger.jar: - % override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js - % override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml - --* content/messenger/buildconfig.html (content/buildconfig.html) --% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html -- - # L10n resources and overrides. - % override chrome://mozapps/locale/profile/profileDowngrade.dtd chrome://messenger/locale/profileDowngrade.dtd - % override chrome://global/locale/netError.dtd chrome://messenger/locale/netError.dtd diff --git a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 0be69104a5fe..1aca35d56b19 100644 --- a/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,21 +10,14 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.1.0"; + version = "91.1.1"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "c465ff25d67c5c28db53d3b1ccda10a743276e58c693406bf31bde0253f34123348180ae18765bd60b958c050e3a874dd69ac82d7612007a8c7a2e25939840ff"; + sha512 = "2da102f9ec42489fc785ccdabcc7fdbc826f2df5e8e76c65866a44a221e762f59647ea265fe4907c18f0d3f1e04199e809235b4587ea17bdc1155e829f57ff2f"; }; patches = [ - ./no-buildconfig-90.patch - - # There is a bug in Thunderbird 91 where add-ons are required - # to be signed when the build is run with default settings. - # https://bugzilla.mozilla.org/show_bug.cgi?id=1727113 - # https://phabricator.services.mozilla.com/D124361 - ./D124361.diff ]; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/networking/msmtp/default.nix b/nixpkgs/pkgs/applications/networking/msmtp/default.nix index d8f53f4b2566..299ba0765cde 100644 --- a/nixpkgs/pkgs/applications/networking/msmtp/default.nix +++ b/nixpkgs/pkgs/applications/networking/msmtp/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "msmtp"; - version = "1.8.15"; + version = "1.8.16"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-ImXcY56/Lt8waf/+CjvXZ0n4tY9AAdXN6uGYc5SQmc4="; + sha256 = "1n271yr83grpki9szdirnk6wb5rcc319f0gmfabyw3fzyf4msjy0"; }; patches = [ diff --git a/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix b/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix index 1781d37e6c9b..152cfb55e240 100644 --- a/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.3.3"; + version = "3.3.4"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-QE6F+L1uy2Tmsf/DI8eUF5Ck+oE8CXDTpZS3xg2tiSs="; + sha256 = "sha256-9RumsGpPHWa3EQXobBC3RcDUqwHCKiff+ngpTXKLyaE="; }; patches = [ diff --git a/nixpkgs/pkgs/applications/networking/nextdns/default.nix b/nixpkgs/pkgs/applications/networking/nextdns/default.nix index 4c0f9c1a0fb3..561a1c77b1ca 100644 --- a/nixpkgs/pkgs/applications/networking/nextdns/default.nix +++ b/nixpkgs/pkgs/applications/networking/nextdns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nextdns"; - version = "1.36.0"; + version = "1.37.2"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-aYWnopMRN0CDFpiWymhFT+f7vbKaP2HpjekVIr2rsME="; + sha256 = "sha256-R0n/wRCaQ8WvQer3bBLUmOdIojtfjXU0bs0pTn7L0lc="; }; vendorSha256 = "sha256-YZm+DUrH+1xdJrGjmlajbcsnqVODVbZKivVjmqZ2e48="; diff --git a/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix b/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix index 34ab19f6e27a..7c9a697243bd 100644 --- a/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix +++ b/nixpkgs/pkgs/applications/networking/owncloud-client/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "owncloud-client"; - version = "2.8.2.4246"; + version = "2.9.0.5150"; src = fetchurl { url = "https://download.owncloud.com/desktop/ownCloud/stable/${version}/source/ownCloud-${version}.tar.xz"; - sha256 = "0cc2e5154a1349bd21941ac3c32e8621778a9ff150730a19de2710e22d32fc43"; + sha256 = "0nf68x840p30yng4fh1nlyiqg40z0rkcv0lskpz8dd4pj1iw5jjs"; }; nativeBuildInputs = [ pkg-config cmake extra-cmake-modules ]; diff --git a/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix b/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix index fb1abae6bf3c..2ccf4ff4b860 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.15.0"; + version = "0.15.3"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "sha256-zKI9b7QIkKXrLMrkuPfnTI5OhNP8ovQZ13XLSljdmmc="; + sha256 = "sha256-1iZpqPQeB46qIgznejL08/gB4wmTV66McFSY/nOITsU="; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix b/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix index bd4fafed1119..38e1b7cfceb2 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -12,13 +12,13 @@ assert trackerSearch -> (python3 != null); with lib; mkDerivation rec { pname = "qbittorrent"; - version = "4.3.5"; + version = "4.3.8"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - sha256 = "1vdk42f8rxffyfydjk5cgzg5gl88ng2pynlyxw5ajh08wvkkjzgy"; + sha256 = "sha256-on5folzKuRoVlvDOpme+aWxUKUC5PnO+N3L51qwG2gY="; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/networking/ping/default.nix b/nixpkgs/pkgs/applications/networking/ping/default.nix index 40240565973d..82194e38eae7 100644 --- a/nixpkgs/pkgs/applications/networking/ping/default.nix +++ b/nixpkgs/pkgs/applications/networking/ping/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A helpful tool that lets you debug what part of your API is causing you issues"; homepage = "https://github.com/jeremyvaartjes/ping"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/nixpkgs/pkgs/applications/networking/qv2ray/default.nix b/nixpkgs/pkgs/applications/networking/qv2ray/default.nix index 7b97bd8543df..62327a8e9a89 100644 --- a/nixpkgs/pkgs/applications/networking/qv2ray/default.nix +++ b/nixpkgs/pkgs/applications/networking/qv2ray/default.nix @@ -1,10 +1,11 @@ { lib +, stdenv , mkDerivation , fetchFromGitHub , qmake , qttools , cmake -, clang +, clang_8 , grpc , protobuf , openssl @@ -13,20 +14,26 @@ , abseil-cpp , libGL , zlib +, curl }: mkDerivation rec { pname = "qv2ray"; - version = "2.6.3"; + version = "2.7.0"; src = fetchFromGitHub { owner = "Qv2ray"; repo = "Qv2ray"; rev = "v${version}"; - sha256 = "sha256-zf3IlpRbZGDZMEny0jp7S+kWtcE1Z10U9GzKC0W0mZI="; + sha256 = "sha256-afFTGX/zrnwq/p5p1kj+ANU4WeN7jNq3ieeW+c+GO5M="; fetchSubmodules = true; }; + patchPhase = lib.optionals stdenv.isDarwin '' + substituteInPlace cmake/platforms/macos.cmake \ + --replace \''${QV2RAY_QtX_DIR}/../../../bin/macdeployqt macdeployqt + ''; + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DQV2RAY_DISABLE_AUTO_UPDATE=on" @@ -50,10 +57,14 @@ mkDerivation rec { nativeBuildInputs = [ cmake - clang + + # The default clang_7 will result in reproducible ICE. + clang_8 + pkg-config qmake qttools + curl ]; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/networking/remote/aws-workspaces/default.nix b/nixpkgs/pkgs/applications/networking/remote/aws-workspaces/default.nix index 9efaa18e31f9..48b44656ff0a 100644 --- a/nixpkgs/pkgs/applications/networking/remote/aws-workspaces/default.nix +++ b/nixpkgs/pkgs/applications/networking/remote/aws-workspaces/default.nix @@ -5,15 +5,15 @@ stdenv.mkDerivation rec { pname = "aws-workspaces"; - version = "3.1.8.1198"; + version = "4.0.1.1302"; src = fetchurl { # ref https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/Packages urls = [ "https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/workspacesclient_${version}_amd64.deb" - "https://web.archive.org/web/20210626165043/https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/workspacesclient_${version}_amd64.deb" + "https://web.archive.org/web/20210921220718/https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/workspacesclient_${version}_amd64.deb" ]; - sha256 = "e784bc4401c2ffaf19f3cc42cb6c6f229c73adba36df49093a1d8cd30c86aaf0"; + sha256 = "208e67a544be5be7ff25218d68b4eb2ea9e65abfed444c99a0f7a6738d69ab9a"; }; nativeBuildInputs = [ @@ -45,14 +45,21 @@ stdenv.mkDerivation rec { ${dpkg}/bin/dpkg -x $src $out ''; + preFixup = '' + patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so $out/lib/libcoreclrtraceptprovider.so + ''; + installPhase = '' - mkdir -p $out/bin - mv $out/opt/workspacesclient/* $out/bin + mkdir -p $out/bin $out/lib + mv $out/opt/workspacesclient/* $out/lib + rm -rf $out/opt - wrapProgram $out/bin/workspacesclient \ + wrapProgram $out/lib/workspacesclient \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \ --set GDK_PIXBUF_MODULE_FILE "${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \ --set GIO_EXTRA_MODULES "${glib-networking.out}/lib/gio/modules" + + mv $out/lib/workspacesclient $out/bin ''; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/networking/sniffers/sngrep/default.nix b/nixpkgs/pkgs/applications/networking/sniffers/sngrep/default.nix index ac6e3bc3a018..3b5742ec2473 100644 --- a/nixpkgs/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/nixpkgs/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, autoconf, automake, fetchFromGitHub, libpcap, ncurses, openssl, pcre }: +{ lib +, stdenv +, autoconf +, automake +, fetchFromGitHub +, libpcap +, ncurses +, openssl +, pcre +}: stdenv.mkDerivation rec { pname = "sngrep"; @@ -11,12 +20,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-92wPRDFSoIOYFv3XKdsuYH8j3D8kXyg++q6VpIIMGDg="; }; - buildInputs = [ - libpcap ncurses pcre openssl ncurses + nativeBuildInputs = [ + autoconf + automake ]; - nativeBuildInputs = [ - autoconf automake + buildInputs = [ + libpcap + ncurses + ncurses + openssl + pcre ]; configureFlags = [ @@ -26,12 +40,14 @@ stdenv.mkDerivation rec { "--enable-eep" ]; - preConfigure = "./bootstrap.sh"; + preConfigure = '' + ./bootstrap.sh + ''; meta = with lib; { description = "A tool for displaying SIP calls message flows from terminal"; homepage = "https://github.com/irontec/sngrep"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ jorise ]; }; diff --git a/nixpkgs/pkgs/applications/networking/sniffers/whsniff/default.nix b/nixpkgs/pkgs/applications/networking/sniffers/whsniff/default.nix index 6674808e91ba..514336e7a6b9 100644 --- a/nixpkgs/pkgs/applications/networking/sniffers/whsniff/default.nix +++ b/nixpkgs/pkgs/applications/networking/sniffers/whsniff/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "Packet sniffer for 802.15.4 wireless networks"; maintainers = with maintainers; [ snicket2100 ]; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Only; }; } diff --git a/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix b/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix index 6e19fb60f8e5..90bd951468ca 100644 --- a/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix +++ b/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.56.0"; + version = "1.56.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "03fqwsbpwb8vmgxg6knkp8f4xlvgg88n2c7inwjg8x91c7c77i0b"; + sha256 = "sha256-2UIIJMa5Wlr4rvBRXvE9kwh798x8jVa63hVLZ51Ltp0="; }; - vendorSha256 = "1gryisn63f6ss889s162ncvlsaznwgvgxdwk2pn5c5zw8dkmjdmi"; + vendorSha256 = "sha256-sTZZZ0P8F1bsFZO3/vbj9itNN7PCBJ0Q0tq4YayOPr8="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/applications/networking/vnstat/default.nix b/nixpkgs/pkgs/applications/networking/vnstat/default.nix index f85f00bf0ae0..77812f88ad17 100644 --- a/nixpkgs/pkgs/applications/networking/vnstat/default.nix +++ b/nixpkgs/pkgs/applications/networking/vnstat/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "vnstat"; - version = "2.7"; + version = "2.8"; src = fetchFromGitHub { owner = "vergoh"; repo = pname; rev = "v${version}"; - sha256 = "105krrc7hl5mbj89i1k3w8yzqrg4f0q96lmyv4rc7fhhds5zam2h"; + sha256 = "sha256-r+dmsL3bPgCDdBje7uzg+ArhMkqj+R/hepNLMDqe350="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/office/agenda/default.nix b/nixpkgs/pkgs/applications/office/agenda/default.nix index 6654ed529fc3..c42052e5f7d4 100644 --- a/nixpkgs/pkgs/applications/office/agenda/default.nix +++ b/nixpkgs/pkgs/applications/office/agenda/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple, fast, no-nonsense to-do (task) list designed for elementary OS"; homepage = "https://github.com/dahenson/agenda"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/nixpkgs/pkgs/applications/office/elementary-planner/default.nix b/nixpkgs/pkgs/applications/office/elementary-planner/default.nix index 73888fbfe3d2..550316b82c55 100644 --- a/nixpkgs/pkgs/applications/office/elementary-planner/default.nix +++ b/nixpkgs/pkgs/applications/office/elementary-planner/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { description = "Task manager with Todoist support designed for GNU/Linux 🚀️"; homepage = "https://planner-todo.web.app"; license = licenses.gpl3; - maintainers = with maintainers; [ dtzWill ] ++ pantheon.maintainers; + maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/applications/office/khronos/default.nix b/nixpkgs/pkgs/applications/office/khronos/default.nix index d35f8eec2eb1..b3a38905531e 100644 --- a/nixpkgs/pkgs/applications/office/khronos/default.nix +++ b/nixpkgs/pkgs/applications/office/khronos/default.nix @@ -9,21 +9,22 @@ , pantheon , python3 , glib -, gtk3 +, gtk4 , json-glib +, libadwaita , libgee , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "khronos"; - version = "1.0.8"; + version = "3.5.9"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "0d5ma1d86lh2apagwrwk0d1v1cm3fifjivhf530nlznb67vi1x80"; + sha256 = "sha256-3FatmyANB/tNYSN2hu5IVkyCy0YrC3uA2d/3+5u48w8="; }; nativeBuildInputs = [ @@ -38,15 +39,16 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gtk3 + gtk4 json-glib + libadwaita libgee pantheon.granite ]; postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py + chmod +x build-aux/post_install.py + patchShebangs build-aux/post_install.py ''; passthru = { @@ -58,8 +60,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Track each task's time in a simple inobtrusive way"; homepage = "https://github.com/lainsce/khronos"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; - license = licenses.gpl3; + license = licenses.gpl3Plus; }; } diff --git a/nixpkgs/pkgs/applications/office/kitsas/default.nix b/nixpkgs/pkgs/applications/office/kitsas/default.nix index 0adfa748c018..e8d010aee22d 100644 --- a/nixpkgs/pkgs/applications/office/kitsas/default.nix +++ b/nixpkgs/pkgs/applications/office/kitsas/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "kitsas"; - version = "2.3"; + version = "3.0"; src = fetchFromGitHub { owner = "artoh"; repo = "kitupiikki"; rev = "v${version}"; - sha256 = "1qac6cxkb45rs5pschsf2rvpa789g27shmrwpshwahqzhw42xvgl"; + sha256 = "sha256-UH2bFJZd83APRjlv6JR+Uy+ng4DWnnLmavAgjgSOiRo="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/applications/office/paperless-ng/default.nix b/nixpkgs/pkgs/applications/office/paperless-ng/default.nix index e84b3c794433..64ef525cfc84 100644 --- a/nixpkgs/pkgs/applications/office/paperless-ng/default.nix +++ b/nixpkgs/pkgs/applications/office/paperless-ng/default.nix @@ -5,7 +5,6 @@ , ghostscript , imagemagick , jbig2enc -, ocrmypdf , optipng , pngquant , qpdf @@ -27,12 +26,20 @@ let # https://github.com/Koed00/django-q/issues/526 django-q = super.django-q.overridePythonAttrs (oldAttrs: rec { version = "1.3.4"; - src = super.fetchPypi { - inherit (oldAttrs) pname; + src = oldAttrs.src.override { inherit version; sha256 = "Uj1U3PG2YVLBtlj5FPAO07UYo0MqnezUiYc4yo274Q8="; }; }); + + # Incompatible with aioredis 2 + aioredis = super.aioredis.overridePythonAttrs (oldAttrs: rec { + version = "1.3.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0fi7jd5hlx8cnv1m97kv9hc4ih4l8v15wzkqwsp73is4n0qazy0m"; + }; + }); }; }; diff --git a/nixpkgs/pkgs/applications/office/qownnotes/default.nix b/nixpkgs/pkgs/applications/office/qownnotes/default.nix index c0d1c8a2a4e5..c843715fcd21 100644 --- a/nixpkgs/pkgs/applications/office/qownnotes/default.nix +++ b/nixpkgs/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "21.8.12"; + version = "21.9.2"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-<version>.tar.xz.sha256 - sha256 = "85fbfb6288411ed585de85dd2cfcf3b3308eb4634824b96c5842d091da4cd476"; + sha256 = "sha256-R+aXPnQ2Ns2D8PBTvaeh8ht3juZZhZJIb52A8CVRtFI="; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/nixpkgs/pkgs/applications/office/spice-up/default.nix b/nixpkgs/pkgs/applications/office/spice-up/default.nix index 28e35d08e917..b51eeb1ad954 100644 --- a/nixpkgs/pkgs/applications/office/spice-up/default.nix +++ b/nixpkgs/pkgs/applications/office/spice-up/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Create simple and beautiful presentations"; homepage = "https://github.com/Philip-Scott/Spice-up"; - maintainers = with maintainers; [ samdroid-apps xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ samdroid-apps xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; # The COPYING file has GPLv3; some files have GPLv2+ and some have GPLv3+ license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/applications/office/super-productivity/default.nix b/nixpkgs/pkgs/applications/office/super-productivity/default.nix index 7cb9a9b7e992..2b3ee7ddc23e 100644 --- a/nixpkgs/pkgs/applications/office/super-productivity/default.nix +++ b/nixpkgs/pkgs/applications/office/super-productivity/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { pname = "super-productivity"; - version = "7.2.1"; + version = "7.5.1"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "93eeb56fe923c48a9384cde0633e98a9d9dc5c0869fce63b9724ff74bb400049"; + sha256 = "sha256-ezJN/t0iNk0haMLPioEQSNXU4ugVeJe44GNVGd+cOF4="; name = "${pname}-${version}.AppImage"; }; diff --git a/nixpkgs/pkgs/applications/office/watson/default.nix b/nixpkgs/pkgs/applications/office/watson/default.nix index ff458cedba10..7584debc20f2 100644 --- a/nixpkgs/pkgs/applications/office/watson/default.nix +++ b/nixpkgs/pkgs/applications/office/watson/default.nix @@ -30,6 +30,7 @@ in with python.pkgs; buildPythonApplication rec { postInstall = '' installShellCompletion --bash --name watson watson.completion installShellCompletion --zsh --name _watson watson.zsh-completion + installShellCompletion --fish watson.fish ''; checkInputs = [ pytestCheckHook pytest-mock mock pytest-datafiles ]; diff --git a/nixpkgs/pkgs/applications/radio/kappanhang/default.nix b/nixpkgs/pkgs/applications/radio/kappanhang/default.nix new file mode 100644 index 000000000000..a236de8d9468 --- /dev/null +++ b/nixpkgs/pkgs/applications/radio/kappanhang/default.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub, pkg-config, pulseaudio }: + +buildGoModule rec { + pname = "kappanhang"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "nonoo"; + repo = pname; + rev = "v${version}"; + sha256 = "1ycy8avq5s7zspfi0d9klqcwwkpmcaz742cigd7pmcnbbhspcicp"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ pulseaudio ]; + + vendorSha256 = "1srjngcis42wfskwfqxxj101y9xyzrans1smy53bh1c9zm856xha"; + + meta = with lib; { + homepage = "https://github.com/nonoo/kappanhang"; + description = "Remote control for Icom radio transceivers"; + license = licenses.mit; + maintainers = with maintainers; [ mvs ]; + }; +} diff --git a/nixpkgs/pkgs/applications/radio/noaa-apt/default.nix b/nixpkgs/pkgs/applications/radio/noaa-apt/default.nix index 390bd128ef74..802e79fbd5e3 100644 --- a/nixpkgs/pkgs/applications/radio/noaa-apt/default.nix +++ b/nixpkgs/pkgs/applications/radio/noaa-apt/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "noaa-apt"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "martinber"; repo = "noaa-apt"; rev = "v${version}"; - sha256 = "0fmbg6lw7lmm402hzddpzgi7y9mc6kic14x8rif7fampk20mv3ms"; + sha256 = "sha256-A78O5HkD/LyfvjLJjf7PpJDuftkNbaxq7Zs5kNUaULk="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { pango ]; - cargoSha256 = "167q9w45lh05l27cdssg8sfz3qfskfaxayzjy6q1cj50jrn0gq13"; + cargoSha256 = "sha256-o39RvJkaJ8ZPOfLWDqykCLadwHhgBbmOWGQ4hZ6/6BI="; preBuild = '' # Used by macro pointing to resource location at compile time. diff --git a/nixpkgs/pkgs/applications/radio/tqsl/default.nix b/nixpkgs/pkgs/applications/radio/tqsl/default.nix index f0dd916a3354..fb55672c4576 100644 --- a/nixpkgs/pkgs/applications/radio/tqsl/default.nix +++ b/nixpkgs/pkgs/applications/radio/tqsl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tqsl"; - version = "2.5.1"; + version = "2.5.7"; src = fetchurl { url = "https://www.arrl.org/files/file/LoTW%20Instructions/${pname}-${version}.tar.gz"; - sha256 = "00v4n8pvi5qi2psjnrw611w5gg5bdlaxbsny535fsci3smyygpc0"; + sha256 = "sha256-0QlTUNwKeuuR+n8eT04kiywAsY3hrPGPYH1A84MmxIs="; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix b/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix index cf3ea143cedf..c7e76b6ad923 100644 --- a/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix +++ b/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kstars"; - version = "3.5.4"; + version = "3.5.5"; src = fetchurl { url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; - sha256 = "sha256-JCdSYcogvoUmu+vB/vye+6ZMIJqVoScAKreh89dxoDU="; + sha256 = "sha256-cD31YFBnKvEPyBQils6qJxNKagDoIi8/Znfxj/Gsa0M="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; @@ -33,11 +33,6 @@ mkDerivation rec { cfitsio indi-full xplanet libnova libraw gsl wcslib stellarsolver ]; - # See https://bugs.kde.org/show_bug.cgi?id=439541 - preConfigure = '' - rm po/de/docs/kstars/index.docbook - ''; - cmakeFlags = [ "-DINDI_PREFIX=${indi-full}" "-DXPLANET_PREFIX=${xplanet}" diff --git a/nixpkgs/pkgs/applications/science/biology/blast/default.nix b/nixpkgs/pkgs/applications/science/biology/blast/default.nix index 877b5b7d34c0..15e1b3eb9891 100644 --- a/nixpkgs/pkgs/applications/science/biology/blast/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/blast/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "blast"; - version = "2.11.0"; + version = "2.12.0"; src = fetchurl { url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-src.tar.gz"; - sha256 = "0m0r9vkw631ky1za1wilsfk9k9spwqh22nkrb9a57rbwmrc1i3nq"; + sha256 = "122bf45cyj3s3zv2lw1y1rhz7g22v0va560ai30xdjl8sk4wk8zx"; }; sourceRoot = "ncbi-blast-${version}+-src/c++"; diff --git a/nixpkgs/pkgs/applications/science/biology/bowtie/default.nix b/nixpkgs/pkgs/applications/science/biology/bowtie/default.nix index 0722ffe09fc9..81cdaecf2c1c 100644 --- a/nixpkgs/pkgs/applications/science/biology/bowtie/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/bowtie/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bowtie"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "BenLangmead"; repo = pname; rev = "v${version}"; - sha256 = "0da2kzyfsn6xv8mlqsv2vv7k8g0c9d2vgqzq8yqk888yljdzcrjp"; + sha256 = "sha256-mWItmrTMPst/NnzSpxxTHcBztDqHPCza9yOsZPwp7G4="; }; buildInputs = [ zlib ]; diff --git a/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix b/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix index 715f2ea313b4..b6cc5e406153 100644 --- a/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix @@ -1,23 +1,9 @@ -{lib, stdenv, fetchFromGitHub, nim, htslib, pcre}: +{lib, nimPackages, fetchFromGitHub, pcre}: -let - hts-nim = fetchFromGitHub { - owner = "brentp"; - repo = "hts-nim"; - rev = "v0.3.4"; - sha256 = "0670phk1bq3l9j2zaa8i5wcpc5dyfrc0l2a6c21g0l2mmdczffa7"; - }; - - docopt = fetchFromGitHub { - owner = "docopt"; - repo = "docopt.nim"; - rev = "v0.6.7"; - sha256 = "1ga7ckg21fzwwvh26jp2phn2h3pvkn8g8sm13dxif33rp471bv37"; - }; - -in stdenv.mkDerivation rec { +nimPackages.buildNimPackage rec { pname = "mosdepth"; version = "0.3.2"; + nimBinOnly = true; src = fetchFromGitHub { owner = "brentp"; @@ -26,15 +12,7 @@ in stdenv.mkDerivation rec { sha256 = "sha256-uui4yC7ok+pvbXVKfBVsAarH40fnH4fnP8P4uzOqztQ="; }; - nativeBuildInputs = [ nim ]; - buildInputs = [ htslib pcre ]; - - buildPhase = '' - HOME=$TMPDIR - nim -p:${hts-nim}/src -p:${docopt}/src c --nilseqs:on -d:release mosdepth.nim - ''; - - installPhase = "install -Dt $out/bin mosdepth"; + buildInputs = with nimPackages; [ docopt hts-nim pcre ]; meta = with lib; { description = "fast BAM/CRAM depth calculation for WGS, exome, or targeted sequencing"; diff --git a/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix b/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix index 345a38ae24a4..a5b226bd0a9f 100644 --- a/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.26.0"; + version = "2.26.2"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "sha256-sz/7MtcCJlUlrNy16W1YB/zXMhYeLLbQOIOdzNsGW7w="; + sha256 = "sha256-mfqxaZpzX9BIoFl1okN3TxzJnoepsoMR1KqHLQY5BHQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/science/biology/sambamba/default.nix b/nixpkgs/pkgs/applications/science/biology/sambamba/default.nix index abfac6ce083f..03ee40013c77 100644 --- a/nixpkgs/pkgs/applications/science/biology/sambamba/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/sambamba/default.nix @@ -2,21 +2,21 @@ stdenv.mkDerivation rec { pname = "sambamba"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "biod"; repo = "sambamba"; rev = "v${version}"; - sha256 = "sha256:0kx5a0fmvv9ldz2hnh7qavgf7711kqc73zxf51k4cca4hr58zxr9"; + sha256 = "0f4qngnys2zjb0ri54k6kxqnssg938mnnscs4z9713hjn41rk7yd"; fetchSubmodules = true; }; patches = [ - # Fixes hardcoded gcc, making clang build possible. + # make ldc 1.27.1 compatible (fetchpatch { - url = "https://github.com/biod/sambamba/commit/c50a1c91e1ba062635467f197139bf6784e9be15.patch"; - sha256 = "1y0vlybmb9wpg4z1nca7m96mk9hxmvd3yrg7w8rxscj45hcqvf8q"; + url = "https://github.com/biod/sambamba/pull/480/commits/b5c80feb62683d24ec0529f685a1d7a36962a1d4.patch"; + sha256 = "0yr9baxqbhyb4scwcwczk77z8gazhkl60jllhz9dnrb7p5qsvs7r"; }) ]; diff --git a/nixpkgs/pkgs/applications/science/biology/spades/default.nix b/nixpkgs/pkgs/applications/science/biology/spades/default.nix index e6f33d6cde90..b41d266dbab5 100644 --- a/nixpkgs/pkgs/applications/science/biology/spades/default.nix +++ b/nixpkgs/pkgs/applications/science/biology/spades/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "SPAdes"; - version = "3.15.2"; + version = "3.15.3"; src = fetchurl { url = "http://cab.spbu.ru/files/release${version}/${pname}-${version}.tar.gz"; - sha256 = "03cxz4m1n4rc81lqb4p1pz2ammms7f31wvi4daywfkc13aal6fz9"; + sha256 = "sha256-suWp/XplruWriGIi1q9Pe3vH91XaegOUFXH6vWueFJk="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix b/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix index 1927950c4fc4..732e97b9b095 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/octopus/default.nix @@ -1,6 +1,10 @@ { lib, stdenv, fetchFromGitLab, gfortran, perl, procps , libyaml, libxc, fftw, blas, lapack, gsl, netcdf, arpack, autoreconfHook , python3 +, enableFma ? stdenv.hostPlatform.fmaSupport +, enableFma4 ? stdenv.hostPlatform.fma4Support +, enableAvx ? stdenv.hostPlatform.avx2Support +, enableAvx512 ? stdenv.hostPlatform.avx512Support }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -35,14 +39,18 @@ stdenv.mkDerivation rec { (python3.withPackages (ps: [ ps.pyyaml ])) ]; - configureFlags = [ + configureFlags = with lib; [ "--with-yaml-prefix=${libyaml}" "--with-blas=-lblas" "--with-lapack=-llapack" "--with-fftw-prefix=${fftw.dev}" "--with-gsl-prefix=${gsl}" "--with-libxc-prefix=${libxc}" - ]; + "--enable-openmp" + ] ++ optional enableFma "--enable-fma3" + ++ optional enableFma4 "--enable-fma4" + ++ optional enableAvx "--enable-avx" + ++ optional enableAvx512 "--enable-avx512"; doCheck = false; checkTarget = "check-short"; diff --git a/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix b/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix index 8efe537dcacd..3cd991796989 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -27,9 +27,15 @@ in stdenv.mkDerivation { ./openblasPath.patch ]; - nativeBuildInputs = [ perl cmake texlive.combined.scheme-minimal makeWrapper ]; - buildInputs = [ + nativeBuildInputs = [ + perl gfortran + cmake + texlive.combined.scheme-minimal + makeWrapper + ]; + + buildInputs = [ openblas hdf5-cpp python diff --git a/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix index a348c51c2815..9933d0d8c727 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -1,5 +1,10 @@ -{ lib, stdenv, fetchurl -, gfortran, fftw, blas, lapack +{ lib +, stdenv +, fetchFromGitLab +, gfortran +, fftw +, blas +, lapack , useMpi ? false , mpi }: @@ -8,9 +13,11 @@ stdenv.mkDerivation rec { version = "6.6"; pname = "quantum-espresso"; - src = fetchurl { - url = "https://gitlab.com/QEF/q-e/-/archive/qe-${version}/q-e-qe-${version}.tar.gz"; - sha256 = "0b3718bwdqfyssyz25jknijar79qh5cf1bbizv9faliz135mcilj"; + src = fetchFromGitLab { + owner = "QEF"; + repo = "q-e"; + rev = "qe-${version}"; + sha256 = "1mkfmw0fq1dabplzdn6v1abhw0ds55gzlvbx3a9brv493whk21yp"; }; passthru = { @@ -21,21 +28,23 @@ stdenv.mkDerivation rec { patchShebangs configure ''; - buildInputs = [ fftw blas lapack gfortran ] + nativeBuildInputs = [ gfortran ]; + + buildInputs = [ fftw blas lapack ] ++ (lib.optionals useMpi [ mpi ]); -configureFlags = if useMpi then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${gfortran}/bin/gfortran" ]; + configureFlags = if useMpi then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${gfortran}/bin/gfortran" ]; makeFlags = [ "all" ]; meta = with lib; { description = "Electronic-structure calculations and materials modeling at the nanoscale"; longDescription = '' - Quantum ESPRESSO is an integrated suite of Open-Source computer codes for - electronic-structure calculations and materials modeling at the - nanoscale. It is based on density-functional theory, plane waves, and - pseudopotentials. - ''; + Quantum ESPRESSO is an integrated suite of Open-Source computer codes for + electronic-structure calculations and materials modeling at the + nanoscale. It is based on density-functional theory, plane waves, and + pseudopotentials. + ''; homepage = "https://www.quantum-espresso.org/"; license = licenses.gpl2; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/nixpkgs/pkgs/applications/science/chemistry/siesta/default.nix b/nixpkgs/pkgs/applications/science/chemistry/siesta/default.nix index 02ff4c1ca440..7b3a69ae775b 100644 --- a/nixpkgs/pkgs/applications/science/chemistry/siesta/default.nix +++ b/nixpkgs/pkgs/applications/science/chemistry/siesta/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation { inherit mpi; }; - buildInputs = [ blas lapack gfortran ] + nativeBuildInputs = [ gfortran ]; + + buildInputs = [ blas lapack ] ++ lib.optionals useMpi [ mpi scalapack ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/science/electronics/alliance/default.nix b/nixpkgs/pkgs/applications/science/electronics/alliance/default.nix index 081a4cab1df2..909a3ec767c6 100644 --- a/nixpkgs/pkgs/applications/science/electronics/alliance/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/alliance/default.nix @@ -1,52 +1,39 @@ -{ lib, stdenv, fetchurl -, xorgproto, motif, libX11, libXt, libXpm, bison -, flex, automake, autoconf, libtool, runtimeShell +{ lib, stdenv, fetchFromGitLab, xorgproto, motif, libX11, libXt, libXpm, bison +, flex, automake, autoconf, libtool }: stdenv.mkDerivation rec { pname = "alliance"; - version = "5.1.1"; - - src = fetchurl { - url = "http://www-asim.lip6.fr/pub/alliance/distribution/5.0/${pname}-${version}.tar.bz2"; - sha256 = "046c9qwl1vbww0ljm4xyxf5jpz9nq62b2q0wdz9xjimgh4c207w1"; + version = "unstable-2021-09-15"; + + src = fetchFromGitLab { + domain = "gitlab.lip6.fr"; + owner = "vlsi-eda"; + repo = "alliance"; + rev = "5e83c92d0307cce9d599f7099fb0023f81d26d65"; + sha256 = "Vd3MTT4eKn4FMt0/F4fQUPcWq25kH0FpeGxQUOetKPY="; }; + prePatch = "cd alliance/src"; nativeBuildInputs = [ libtool automake autoconf flex ]; buildInputs = [ xorgproto motif libX11 libXt libXpm bison ]; - sourceRoot = "alliance/src/"; + ALLIANCE_TOP = placeholder "out"; configureFlags = [ - "--prefix=$(out)" + "--prefix=${placeholder "out"}" "--enable-alc-shared" ]; - preConfigure = '' - mkdir -p $out/etc - - #texlive for docs seems extreme - mkdir -p $out/share/alliance - mv ./documentation $out/share/alliance + postPatch = '' + # texlive for docs seems extreme substituteInPlace autostuff \ - --replace "$newdirs documentation" "$newdirs" \ - --replace documentation Solaris + --replace "$newdirs documentation" "$newdirs" - substituteInPlace sea/src/DEF_grammar_lex.l \ - --replace "ifndef FLEX_BETA" "if (YY_FLEX_MAJOR_VERSION <= 2) && (YY_FLEX_MINOR_VERSION < 6)" - ./autostuff - ''; + substituteInPlace sea/src/DEF_grammar_lex.l --replace "ifndef FLEX_BETA" \ + "if (YY_FLEX_MAJOR_VERSION <= 2) && (YY_FLEX_MINOR_VERSION < 6)" - allianceInstaller = '' - #!${runtimeShell} - cp -v -r -n --no-preserve=mode $out/etc/* /etc/ > /etc/alliance-install.log - ''; - - allianceUnInstaller = '' - #!${runtimeShell} - awk '{print \$3}' /etc/alliance-install.log | xargs rm - awk '{print \$3}' /etc/alliance-install.log | xargs rmdir - rm /etc/alliance-install.log + ./autostuff ''; postInstall = '' @@ -55,20 +42,13 @@ stdenv.mkDerivation rec { cp -p distrib/*.desktop $out/share/applications/ mkdir -p $out/icons/hicolor/48x48/apps/ cp -p distrib/*.png $out/icons/hicolor/48x48/apps/ - - echo "${allianceInstaller}" > $out/bin/alliance-install - chmod +x $out/bin/alliance-install - - echo "${allianceUnInstaller}" > $out/bin/alliance-uninstall - chmod +x $out/bin/alliance-uninstall ''; meta = with lib; { - description = "Complete set of free CAD tools and portable libraries for VLSI design"; - homepage = "http://www-asim.lip6.fr/recherche/alliance/"; + description = "(deprecated) Complete set of free CAD tools and portable libraries for VLSI design"; + homepage = "http://coriolis.lip6.fr/"; license = with licenses; gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ l-as ]; platforms = with platforms; linux; - broken = true; }; } diff --git a/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix b/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix index c1ff99a2c3a3..eec7830b2a15 100644 --- a/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/nixpkgs/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "horizon-eda"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "horizon-eda"; repo = "horizon"; rev = "v${version}"; - sha256 = "sha256-FS24B/ySKeF8r7Tro+mf5P0ALtlPwwJCU3YdDNYLe6o="; + sha256 = "sha256-3JNkwKkr/fdz/2UFAHwhn03PHqX9YFOMf3Q7kkbTZYk="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/nixpkgs/pkgs/applications/science/logic/coq/default.nix index cd19b9a94424..e595bf47c67c 100644 --- a/nixpkgs/pkgs/applications/science/logic/coq/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/coq/default.nix @@ -9,7 +9,7 @@ , customOCamlPackages ? null , ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ncurses , buildIde ? true -, glib, gnome, wrapGAppsHook +, glib, gnome, wrapGAppsHook, makeDesktopItem, copyDesktopItems , csdp ? null , version, coq-version ? null, }@args: @@ -124,7 +124,9 @@ self = stdenv.mkDerivation { ''; }; - nativeBuildInputs = [ pkg-config ] ++ optional (!versionAtLeast "8.6") gnumake42; + nativeBuildInputs = [ pkg-config ] + ++ optional buildIde copyDesktopItems + ++ optional (!versionAtLeast "8.6") gnumake42; buildInputs = [ ncurses ] ++ ocamlBuildInputs ++ optionals buildIde (if versionAtLeast "8.10" @@ -166,12 +168,24 @@ self = stdenv.mkDerivation { createFindlibDestdir = true; + desktopItems = optional buildIde (makeDesktopItem { + name = "coqide"; + exec = "coqide"; + icon = "coq"; + desktopName = "CoqIDE"; + comment = "Graphical interface for the Coq proof assistant"; + categories = "Development;Science;Math;IDE;GTK"; + }); + postInstall = '' cp bin/votour $out/bin/ ln -s $out/lib/coq $OCAMLFIND_DESTDIR/coq + '' + optionalString buildIde '' + mkdir -p "$out/share/pixmaps" + ln -s "$out/share/coq/coq.png" "$out/share/pixmaps/" ''; - meta = with lib; { + meta = { description = "Coq proof assistant"; longDescription = '' Coq is a formal proof management system. It provides a formal language diff --git a/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix b/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix index fd22b7b1add8..2ef494cca266 100644 --- a/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix +++ b/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "opensmt"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "usi-verification-and-security"; repo = "opensmt"; rev = "v${version}"; - sha256 = "sha256-m8TpMBY1r0h8GJTHM4FLBuZtX+WK/Q7RTXUnNmUWV+o="; + sha256 = "sha256-StnEvkSSKDHGYXIQsDUu9T9Ztl+RtDTP47JvnRyH0bE="; }; nativeBuildInputs = [ cmake bison flex ]; diff --git a/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix b/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix index 47b826078f24..a7010966c26d 100644 --- a/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix @@ -8,6 +8,7 @@ # extra support , pythonSupport ? true, pythonPackages ? null , opencvSupport ? false, opencv ? null +, withSvmLight ? false }: assert pythonSupport -> pythonPackages != null; @@ -60,7 +61,7 @@ stdenv.mkDerivation rec { url = "https://github.com/awild82/shogun/commit/365ce4c4c700736d2eec8ba6c975327a5ac2cd9b.patch"; sha256 = "158hqv4xzw648pmjbwrhxjp7qcppqa7kvriif87gn3zdn711c49s"; }) - ]; + ] ++ lib.optional (!withSvmLight) ./svmlight-scrubber.patch; CCACHE_DISABLE="1"; CCACHE_DIR=".ccache"; @@ -86,12 +87,29 @@ stdenv.mkDerivation rec { (flag "CMAKE_VERBOSE_MAKEFILE:BOOL" doCheck) (flag "PythonModular" pythonSupport) (flag "OpenCV" opencvSupport) + (flag "USE_SVMLIGHT" withSvmLight) ]; + postPatch = '' + # Fix preprocessing SVMlight code + sed -i \ + -e 's@#ifdef SVMLIGHT@#ifdef USE_SVMLIGHT@' \ + -e '/^#ifdef USE_SVMLIGHT/,/^#endif/ s@#endif@#endif //USE_SVMLIGHT@' \ + src/shogun/kernel/string/CommUlongStringKernel.cpp + sed -i -e 's/#if USE_SVMLIGHT/#ifdef USE_SVMLIGHT/' src/interfaces/swig/Machine.i + sed -i -e 's@// USE_SVMLIGHT@//USE_SVMLIGHT@' src/interfaces/swig/Transfer.i + sed -i -e 's@/\* USE_SVMLIGHT \*/@//USE_SVMLIGHT@' src/interfaces/swig/Transfer_includes.i + '' + lib.optionalString (!withSvmLight) '' + # Run SVMlight scrubber + patchShebangs scripts/light-scrubber.sh + echo "removing SVMlight code" + ./scripts/light-scrubber.sh + ''; + meta = with lib; { description = "A toolbox which offers a wide range of efficient and unified machine learning methods"; homepage = "http://shogun-toolbox.org/"; - license = licenses.gpl3; + license = if withSvmLight then licenses.unfree else licenses.gpl3Plus; maintainers = with maintainers; [ edwtjo ]; }; } diff --git a/nixpkgs/pkgs/applications/science/machine-learning/shogun/svmlight-scrubber.patch b/nixpkgs/pkgs/applications/science/machine-learning/shogun/svmlight-scrubber.patch new file mode 100644 index 000000000000..2958e6ce5dae --- /dev/null +++ b/nixpkgs/pkgs/applications/science/machine-learning/shogun/svmlight-scrubber.patch @@ -0,0 +1,76 @@ +From: Sebastián Mancilla <smancill@smancill.dev> +Subject: Update SVMlight scrubber script + +This requires previously fixing a few wrong preprocessor directives that +are supposed to fence code using SVMlight. + +- The script was too eager and removing *.light files in SVMlight format + that are used by other tests. The code reading those files doesn't use + any SVMlight code so it should be fine to keep it and run the tests. + +- The Python test *domainadaptationsvm.py was not removed because of + wrong globbing. + +- Remove a couple of examples using SVMlight that were missed. + +- The script is actually modifying (and breaking) itself because the + grep for the USE_SVMLIGHT macro is too eager again and matches itself + (and the version stored in upstream's Debian package control tarball + is broken because of it). Just fix it by grepping for preprocessor + directives only. + +- No need to fix the Transfer_includes.i file in the script with a final + %} when its preprocessor directives have been fixed. + +- The Swig files were moved to a new directory at some point but the + script was not updated accordingly. +--- + scripts/light-scrubber.sh | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) + +diff a/scripts/light-scrubber.sh b/scripts/light-scrubber.sh +--- a/scripts/light-scrubber.sh ++++ b/scripts/light-scrubber.sh +@@ -26,14 +26,16 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu.org/licenses/>. + # +-rm -rf examples/*/*/{*light*,*_domainadaptationsvm_*} \ ++rm -rf examples/*/*/{*light*.*,*domainadaptationsvm*} \ + examples/undocumented/matlab_and_octave/tests/*light* \ ++ examples/undocumented/python/serialization_string_kernels.py \ ++ examples/undocumented/python/mkl_binclass.py \ + src/shogun/classifier/svm/SVMLight.* \ + src/shogun/classifier/svm/SVMLightOneClass.* \ + src/shogun/regression/svr/SVRLight.* \ + doc/md/LICENSE_SVMlight* + +-for _file in `grep -rl USE_SVMLIGHT .` ++grep -rl '^#ifdef USE_SVMLIGHT' . | while read -r _file + do + sed -i.orig -e \ + '/\#ifdef USE_SVMLIGHT/,/\#endif \/\/USE_SVMLIGHT/c \\' ${_file} && \ +@@ -41,7 +43,7 @@ do + rm -rf ${_file}.orig + done + +-for _file in `find . -depth -name 'CMakeLists.txt'` ++find . -depth -name 'CMakeLists.txt' | while read -r _file + do + sed -i.orig -e 's!.*_sv[mr]light_.*!!g' ${_file} && \ + touch -r ${_file}.orig ${_file} && \ +@@ -56,13 +58,7 @@ do + rm -rf ${_file}.orig + done + +-_file="src/interfaces/modular/Transfer_includes.i" && \ +-cp -a ${_file} ${_file}.orig && \ +-echo '%}' >> ${_file} && \ +-touch -r ${_file}.orig ${_file} && \ +-rm -rf ${_file}.orig +- +-_file="src/interfaces/modular/Machine.i" && \ ++_file="src/interfaces/swig/Machine.i" && \ + sed -i.orig -e '/.*CSVRLight.*/d' ${_file} && \ + touch -r ${_file}.orig ${_file} && \ + rm -rf ${_file}.orig diff --git a/nixpkgs/pkgs/applications/science/math/caffe/default.nix b/nixpkgs/pkgs/applications/science/math/caffe/default.nix index 08bf84be7c89..462a05d300ce 100644 --- a/nixpkgs/pkgs/applications/science/math/caffe/default.nix +++ b/nixpkgs/pkgs/applications/science/math/caffe/default.nix @@ -91,7 +91,11 @@ stdenv.mkDerivation rec { inherit (python.sourceVersion) major minor; # Should be changed in case of PyPy }); - postPatch = lib.optionalString (cudaSupport && lib.versionAtLeast cudatoolkit.version "9.0") '' + postPatch = '' + substituteInPlace src/caffe/util/io.cpp --replace \ + 'SetTotalBytesLimit(kProtoReadBytesLimit, 536870912)' \ + 'SetTotalBytesLimit(kProtoReadBytesLimit)' + '' + lib.optionalString (cudaSupport && lib.versionAtLeast cudatoolkit.version "9.0") '' # CUDA 9.0 doesn't support sm_20 sed -i 's,20 21(20) ,,' cmake/Cuda.cmake ''; diff --git a/nixpkgs/pkgs/applications/science/math/cntk/default.nix b/nixpkgs/pkgs/applications/science/math/cntk/default.nix index c007490c94d0..ba2225b903fa 100644 --- a/nixpkgs/pkgs/applications/science/math/cntk/default.nix +++ b/nixpkgs/pkgs/applications/science/math/cntk/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchgit, fetchFromGitHub, cmake +, fetchpatch , openblas, blas, lapack, opencv3, libzip, boost, protobuf, mpi , onebitSGDSupport ? false , cudaSupport ? false, addOpenGLRunpath, cudatoolkit, nvidia_x11 @@ -28,6 +29,26 @@ in stdenv.mkDerivation rec { sha256 = "18l9k7s966a26ywcf7flqyhm61788pcb9fj3wk61jrmgkhy2pcns"; }; + patches = [ + # Fix build with protobuf 3.18+ + # Remove with onnx submodule bump to 1.9+ + (fetchpatch { + url = "https://github.com/onnx/onnx/commit/d3bc82770474761571f950347560d62a35d519d7.patch"; + extraPrefix = "Source/CNTKv2LibraryDll/proto/onnx/onnx_repo/"; + stripLen = 1; + sha256 = "00raqj8wx30b06ky6cdp5vvc1mrzs7hglyi6h58hchw5lhrwkzxp"; + }) + ]; + + postPatch = '' + # Fix build with protobuf 3.18+ + substituteInPlace Source/CNTKv2LibraryDll/Serialization.cpp \ + --replace 'SetTotalBytesLimit(INT_MAX, INT_MAX)' \ + 'SetTotalBytesLimit(INT_MAX)' \ + --replace 'SetTotalBytesLimit(limit, limit)' \ + 'SetTotalBytesLimit(limit)' + ''; + nativeBuildInputs = [ cmake ] ++ lib.optional cudaSupport addOpenGLRunpath; # Force OpenMPI to use g++ in PATH. diff --git a/nixpkgs/pkgs/applications/science/math/jags/default.nix b/nixpkgs/pkgs/applications/science/math/jags/default.nix index 2e5986651342..5c0de33a71ae 100644 --- a/nixpkgs/pkgs/applications/science/math/jags/default.nix +++ b/nixpkgs/pkgs/applications/science/math/jags/default.nix @@ -6,7 +6,11 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz"; sha256 = "1z3icccg2ic56vmhyrpinlsvpq7kcaflk1731rgpvz9bk1bxvica"; }; - buildInputs = [gfortran blas lapack]; + + nativeBuildInputs = [ gfortran ]; + + buildInputs = [ blas lapack ]; + configureFlags = [ "--with-blas=-lblas" "--with-lapack=-llapack" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/applications/science/math/nasc/default.nix b/nixpkgs/pkgs/applications/science/math/nasc/default.nix index 431668f0c583..dffbdaa23aa8 100644 --- a/nixpkgs/pkgs/applications/science/math/nasc/default.nix +++ b/nixpkgs/pkgs/applications/science/math/nasc/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { the equations it’s used in. ''; homepage = "https://github.com/parnold-x/nasc"; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3Plus; }; diff --git a/nixpkgs/pkgs/applications/science/math/scilab/default.nix b/nixpkgs/pkgs/applications/science/math/scilab/default.nix index 95c6c23fb09a..4ce04340f3a1 100644 --- a/nixpkgs/pkgs/applications/science/math/scilab/default.nix +++ b/nixpkgs/pkgs/applications/science/math/scilab/default.nix @@ -19,11 +19,12 @@ stdenv.mkDerivation rec { sha256 = "1adk6jqlj7i3gjklvlf1j3il1nb22axnp4rvwl314an62siih0sc"; }; - buildInputs = [gfortran ncurses] - ++ lib.optionals withGtk [gtk2] - ++ lib.optionals withOCaml [ocaml] - ++ lib.optional withX xlibsWrapper - ; + nativeBuildInputs = [ gfortran ]; + + buildInputs = [ ncurses ] + ++ lib.optionals withGtk [ gtk2 ] + ++ lib.optionals withOCaml [ ocaml ] + ++ lib.optional withX xlibsWrapper; /* diff --git a/nixpkgs/pkgs/applications/science/misc/root/default.nix b/nixpkgs/pkgs/applications/science/misc/root/default.nix index 8aa9006d5232..4ac416908132 100644 --- a/nixpkgs/pkgs/applications/science/misc/root/default.nix +++ b/nixpkgs/pkgs/applications/science/misc/root/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , makeWrapper , cmake , git @@ -15,6 +16,7 @@ , libGLU , libGL , libxml2 +, llvm_9 , lz4 , xz , pcre @@ -29,6 +31,7 @@ , libjpeg , libtiff , libpng +, tbb , Cocoa , CoreSymbolication , OpenGL @@ -37,11 +40,11 @@ stdenv.mkDerivation rec { pname = "root"; - version = "6.24.02"; + version = "6.24.06"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "sha256-BQfhCV4nnMxyQPZR0llmAkMlF5+oWhJZtpS1ZyOtfBw="; + sha256 = "sha256-kH9p9LrKHk8w7rSXlZjKdZm2qoA8oEboDiW2u6oO9SI="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; @@ -53,6 +56,7 @@ stdenv.mkDerivation rec { zlib zstd libxml2 + llvm_9 lz4 xz gsl @@ -64,6 +68,7 @@ stdenv.mkDerivation rec { libpng nlohmann_json python.pkgs.numpy + tbb ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa CoreSymbolication OpenGL ] @@ -71,8 +76,23 @@ stdenv.mkDerivation rec { patches = [ ./sw_vers.patch + + # Fix builtin_llvm=OFF support + (fetchpatch { + url = "https://github.com/root-project/root/commit/0cddef5d3562a89fe254e0036bb7d5ca8a5d34d2.diff"; + excludes = [ "interpreter/cling/tools/plugins/clad/CMakeLists.txt" ]; + sha256 = "sha256-VxWUbxRHB3O6tERFQdbGI7ypDAZD3sjSi+PYfu1OAbM="; + }) ]; + # Fix build against vanilla LLVM 9 + postPatch = '' + sed \ + -e '/#include "llvm.*RTDyldObjectLinkingLayer.h"/i#define private protected' \ + -e '/#include "llvm.*RTDyldObjectLinkingLayer.h"/a#undef private' \ + -i interpreter/cling/lib/Interpreter/IncrementalJIT.h + ''; + preConfigure = '' rm -rf builtins/* substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \ @@ -99,6 +119,7 @@ stdenv.mkDerivation rec { "-DCMAKE_CXX_STANDARD=17" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-Dbuiltin_llvm=OFF" "-Dbuiltin_nlohmannjson=OFF" "-Dbuiltin_openui5=OFF" "-Dalien=OFF" @@ -112,7 +133,7 @@ stdenv.mkDerivation rec { "-Dfftw3=OFF" "-Dfitsio=OFF" "-Dfortran=OFF" - "-Dimt=OFF" + "-Dimt=ON" "-Dgfal=OFF" "-Dgviz=OFF" "-Dhdfs=OFF" diff --git a/nixpkgs/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix b/nixpkgs/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix index 16d858b00bed..cf4584979ba2 100644 --- a/nixpkgs/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix +++ b/nixpkgs/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix @@ -11,7 +11,9 @@ stdenv.mkDerivation { sha256 = "1r76zvln3bwycxlmqday0sqzv5j260y7mdh66as2aqny6jzd5ld7"; }; - buildInputs = [ mpi gfortran ]; + nativeBuildInputs = [ gfortran ]; + + buildInputs = [ mpi ]; configurePhase = '' cd source diff --git a/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix b/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix index 5033b28bd3b3..cd9b7430b99f 100644 --- a/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix +++ b/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ cmake pkg-config git ]; - buildInputs = [ gfortran mpi blas liblapack qt4 qwt6_qt4 ]; + nativeBuildInputs = [ cmake gfortran pkg-config git ]; + buildInputs = [ mpi blas liblapack qt4 qwt6_qt4 ]; preConfigure = '' patchShebangs ./ diff --git a/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix b/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix index eb718be12e4a..1c1bc22b0ffc 100644 --- a/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix +++ b/nixpkgs/pkgs/applications/science/physics/sherpa/default.nix @@ -13,7 +13,10 @@ stdenv.mkDerivation rec { sed -ie '/sys\/sysctl.h/d' ATOOLS/Org/Run_Parameter.C ''; - buildInputs = [ gfortran sqlite lhapdf rivet ]; + + nativeBuildInputs = [ gfortran ]; + + buildInputs = [ sqlite lhapdf rivet ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/science/physics/xfitter/default.nix b/nixpkgs/pkgs/applications/science/physics/xfitter/default.nix index 230f2f0e0efb..51d6c9d68fe4 100644 --- a/nixpkgs/pkgs/applications/science/physics/xfitter/default.nix +++ b/nixpkgs/pkgs/applications/science/physics/xfitter/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, apfel, apfelgrid, applgrid, blas, gfortran, lhapdf, lapack, libyaml, lynx , mela, root5, qcdnum, which, libtirpc +, memorymappingHook, memstreamHook }: stdenv.mkDerivation rec { @@ -36,9 +37,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran which ]; buildInputs = - [ apfel apfelgrid applgrid blas lhapdf lapack mela root5 qcdnum ] - # pdf2yaml requires fmemopen and open_memstream which are not readily available on Darwin - ++ lib.optional (!stdenv.isDarwin) libyaml + [ apfel apfelgrid applgrid blas lhapdf libyaml lapack mela root5 qcdnum ] + ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook memstreamHook ] ++ lib.optional (stdenv.hostPlatform.libc == "glibc") libtirpc ; propagatedBuildInputs = [ lynx ]; diff --git a/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix b/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix index 072207da0ce5..1d08043f5ff7 100644 --- a/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.41"; + version = "1.8.42"; src = fetchPypi { inherit pname version; - sha256 = "3dffb9b5b1e23c8dcb54bb8bdf1435337c01a4ab9faf34ffdfcb1dd26a4d8890"; + sha256 = "787f29f10d2cb7572206f874a255949d0da9a4e2ffd2bc28b94b78bb73cf05d8"; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 2759723841cc..76d2318cead4 100644 --- a/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -6,7 +6,7 @@ mkDerivation rec { pname = "qgroundcontrol"; - version = "4.1.3"; + version = "4.1.4"; qtInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -62,7 +62,7 @@ mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - sha256 = "0fbf564vzckvy1dc8f6yd8vpnzwzsgynva13bl2ks06768rrq9fb"; + sha256 = "0lhc36jpy7a5bnysqi574nk5izglj557mf8n9lcsgvzwxlkb2rbf"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/applications/search/recoll/default.nix b/nixpkgs/pkgs/applications/search/recoll/default.nix index a07340469fef..4c8a4b7850bd 100644 --- a/nixpkgs/pkgs/applications/search/recoll/default.nix +++ b/nixpkgs/pkgs/applications/search/recoll/default.nix @@ -35,11 +35,11 @@ mkDerivation rec { pname = "recoll"; - version = "1.28.6"; + version = "1.31.0"; src = fetchurl { url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-fSblLddWTJKRzw4VAQp+p3xPe5grB2xITgN6vKr0xLc="; + sha256 = "sha256-TtkfohzeT0HO6ywCMNxrODW1DnJg5KMFkx9AbDfQt+c="; }; configureFlags = [ "--enable-recollq" "--disable-webkit" ] diff --git a/nixpkgs/pkgs/applications/system/monitor/default.nix b/nixpkgs/pkgs/applications/system/monitor/default.nix index 588839b859da..afe18c399a3a 100644 --- a/nixpkgs/pkgs/applications/system/monitor/default.nix +++ b/nixpkgs/pkgs/applications/system/monitor/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "monitor"; - version = "0.8.1"; + version = "0.9.5"; src = fetchFromGitHub { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 = "111g2f3y5lmz91m755jz0x8yx5cx9ym484gch8wcv80dmr7ilb1y"; + sha256 = "sha256-eTsPn2Z1++KsZnnBnZ2s9fKK2HguPw+JqaRRkxQDiAk="; fetchSubmodules = true; }; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { section in the NixOS manual. ''; homepage = "https://github.com/stsdc/monitor"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/nixpkgs/pkgs/applications/system/pantheon-tweaks/default.nix b/nixpkgs/pkgs/applications/system/pantheon-tweaks/default.nix new file mode 100644 index 000000000000..5834e8d96308 --- /dev/null +++ b/nixpkgs/pkgs/applications/system/pantheon-tweaks/default.nix @@ -0,0 +1,68 @@ +{ lib +, stdenv +, fetchFromGitHub +, nix-update-script +, meson +, ninja +, pkg-config +, python3 +, vala +, gtk3 +, libgee +, pantheon +}: + +stdenv.mkDerivation rec { + pname = "pantheon-tweaks"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "pantheon-tweaks"; + repo = pname; + rev = version; + sha256 = "sha256-tAfDxX/RD7pO5PN/LaZ92Cj/iZtBI/EHb0+pORfYnPM="; + }; + + patches = [ + ./fix-paths.patch + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + python3 + vala + ]; + + buildInputs = [ + gtk3 + libgee + pantheon.granite + pantheon.switchboard + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + + meta = with lib; { + description = "Unofficial system settings panel for Pantheon"; + longDescription = '' + Unofficial system settings panel for Pantheon + that lets you easily and safely customise your desktop's appearance. + Use programs.pantheon-tweaks.enable to add this to your switchboard. + ''; + homepage = "https://github.com/pantheon-tweaks/pantheon-tweaks"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.pantheon.members; + }; +} diff --git a/nixpkgs/pkgs/applications/system/pantheon-tweaks/fix-paths.patch b/nixpkgs/pkgs/applications/system/pantheon-tweaks/fix-paths.patch new file mode 100644 index 000000000000..b2e0e0a7b4c8 --- /dev/null +++ b/nixpkgs/pkgs/applications/system/pantheon-tweaks/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/Settings/ThemeSettings.vala b/src/Settings/ThemeSettings.vala +index 589121b..8e9c81e 100644 +--- a/src/Settings/ThemeSettings.vala ++++ b/src/Settings/ThemeSettings.vala +@@ -29,7 +29,7 @@ public class PantheonTweaks.ThemeSettings { + var themes = new Gee.ArrayList<string> (); + + string[] dirs = { +- "/usr/share/" + path + "/", ++ "/run/current-system/sw/share/" + path + "/", + Environment.get_home_dir () + "/." + path + "/", + Environment.get_home_dir () + "/.local/share/" + path + "/"}; + diff --git a/nixpkgs/pkgs/applications/terminal-emulators/darktile/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/darktile/default.nix new file mode 100644 index 000000000000..f63232949501 --- /dev/null +++ b/nixpkgs/pkgs/applications/terminal-emulators/darktile/default.nix @@ -0,0 +1,68 @@ +{ stdenv +, buildGoModule +, fetchFromGitHub +, lib +, go +, pkg-config +, libX11 +, libXcursor +, libXrandr +, libXinerama +, libXi +, libXext +, libXxf86vm +, libGL +}: + +stdenv.mkDerivation rec { + pname = "darktile"; + version = "0.0.10"; + + src = fetchFromGitHub { + owner = "liamg"; + repo = "darktile"; + rev = "v${version}"; + sha256 = "0pdj4yv3qrq56gb67p85ara3g8qrzw5ha787bl2ls4vcx85q7303"; + }; + + nativeBuildInputs = [ go pkg-config ]; + + buildInputs = [ + libX11 + libXcursor + libXrandr + libXinerama + libXi + libXext + libXxf86vm + libGL + ]; + + postPatch = '' + substituteInPlace scripts/build.sh \ + --replace "bash" "sh" + ''; + + postConfigure = '' + export GOPATH=$TMP/go + ''; + + makeFlags = [ "HOME=$TMP" ]; + + installPhase = '' + runHook preInstall + + install -Dm755 darktile -t $out/bin + + runHook postInstall + ''; + + meta = with lib; { + description = "A GPU rendered terminal emulator designed for tiling window managers"; + homepage = "https://github.com/liamg/darktile"; + downloadPage = "https://github.com/liamg/darktile/releases"; + changelog = "https://github.com/liamg/darktile/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ flexagoon ]; + }; +} diff --git a/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix index 5aa14a042613..1d200824535d 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { pname = "hyper"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { url = "https://github.com/vercel/hyper/releases/download/v${version}/hyper_${version}_amd64.deb"; - sha256 = "1mixy9hlgdbbnwdgidady7q828dkf09lx1pacwxw386jj7kp4y5g"; + sha256 = "sha256-w+FISIeGf3K1dnykIEzU3KevyaFNl4X0beT6DdLW+zQ="; }; nativeBuildInputs = [ dpkg ]; diff --git a/nixpkgs/pkgs/applications/terminal-emulators/nimmm/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/nimmm/default.nix index bb09fa776b62..0e0d75ab8012 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/nimmm/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/nimmm/default.nix @@ -1,30 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, nim, termbox, pcre }: +{ lib, nimPackages, fetchFromGitHub, nim, termbox, pcre }: -let - noise = fetchFromGitHub { - owner = "jangko"; - repo = "nim-noise"; - rev = "v0.1.14"; - sha256 = "0wndiphznfyb1pac6zysi3bqljwlfwj6ziarcwnpf00sw2zni449"; - }; - - nimbox = fetchFromGitHub { - owner = "dom96"; - repo = "nimbox"; - rev = "6a56e76c01481176f16ae29b7d7c526bd83f229b"; - sha256 = "15x1sdfxa1xcqnr68705jfnlv83lm0xnp2z9iz3pgc4bz5vwn4x1"; - }; - - lscolors = fetchFromGitHub { - owner = "joachimschmidt557"; - repo = "nim-lscolors"; - rev = "v0.3.3"; - sha256 = "0526hqh46lcfsvymb67ldsc8xbfn24vicn3b8wrqnh6mag8wynf4"; - }; - -in stdenv.mkDerivation rec { +nimPackages.buildNimPackage rec { pname = "nimmm"; version = "0.2.0"; + nimBinOnly = true; src = fetchFromGitHub { owner = "joachimschmidt557"; @@ -33,17 +12,8 @@ in stdenv.mkDerivation rec { sha256 = "168n61avphbxsxfq8qzcnlqx6wgvz5yrjvs14g25cg3k46hj4xqg"; }; - nativeBuildInputs = [ nim ]; - buildInputs = [ termbox pcre ]; - - buildPhase = '' - export HOME=$TMPDIR; - nim -p:${noise} -p:${nimbox} -p:${lscolors}/src c -d:release src/nimmm.nim - ''; - - installPhase = '' - install -Dt $out/bin src/nimmm - ''; + buildInputs = [ termbox pcre ] + ++ (with nimPackages; [ noise nimbox lscolors ]); meta = with lib; { description = "Terminal file manager written in nim"; diff --git a/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix index 378fd7df01a6..4bb9386a112a 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "368"; + version = "369"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - sha256 = "L/UWmTC2tJ7wuvteEzHJTxqYwxBEK7p3mK3YIcdq5xI="; + sha256 = "ce1qSNBkiT0hSXQaACeBqXNJb9JNUtrdNk9jQ5p2TiY="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/bump2version/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/bump2version/default.nix index 47d31d6c18f6..ffb9455bd19f 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/bump2version/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/bump2version/default.nix @@ -1,22 +1,37 @@ -{ buildPythonApplication, fetchFromGitHub, isPy27, pytest, testfixtures, lib }: +{ lib +, buildPythonApplication +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, testfixtures +}: buildPythonApplication rec { pname = "bump2version"; - version = "1.0.0"; - disabled = isPy27; + version = "1.0.1"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "c4urself"; repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "10p7rg569rk3qvzs5kjj17894bqlsg3ihhbln6ciwwfhkfq1kpja"; + rev = "v${version}"; + sha256 = "sha256-j6HKi3jTwSgGBrA8PCJJNg+yQqRMo1aqaLgPGf4KAKU="; }; - checkInputs = [ pytest testfixtures ]; - # X's in pytest are git tests which won't run in sandbox - checkPhase = '' - pytest tests/ -k 'not usage_string_fork' - ''; + checkInputs = [ + pytestCheckHook + testfixtures + ]; + + disabledTests = [ + # X's in pytest are git tests which won't run in sandbox + "usage_string_fork" + "test_usage_string" + "test_defaults_in_usage_with_config" + ]; + + pythonImportsCheck = [ "bumpversion" ]; meta = with lib; { description = "Version-bump your software with a single command"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix index b0a5ca641a41..74e617021c92 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "0.2.6"; + version = "0.3.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - sha256 = "sha256-oQ23jvKR4HGIMnW56FVE0XlBpO4pnMBbRXVoc6OuiHo="; + sha256 = "sha256-d0qY0yGvFf1V8NhS9cHEawkTqMAN6roReAHJ6FT9qJ4="; }; - cargoSha256 = "sha256-49RHGOhTaYrg+JKYZMWcgSL7dxe6H50G6n9tJyGaLMQ="; + cargoSha256 = "sha256-UxV9trTm4vZ/boWB7Sl6Dbwhjk8jQnB0QT6bC+aCL+A="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index be6e96fc8ff5..91f6f2039838 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "git-interactive-rebase-tool"; @@ -11,7 +11,15 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-DYl/GUbeNtKmXoR3gq8mK8EfsZNVNlrdngAwfzG+epw="; }; - cargoSha256 = "sha256-1joMWPfn0s+pLsO6NHMT6AoXZ33R8MY2AWSrROY2mw8="; + cargoPatches = [ + # update git2 crate to fix a compile error + (fetchpatch { + url = "https://github.com/MitMaro/git-interactive-rebase-tool/commit/f4d3026f23118d29a263bbca6c83f963e76c34c4.patch"; + sha256 = "sha256-6ErPRcPbPRXbEslNiNInbbUhbOWb9ZRll7ZDRgTpWS4="; + }) + ]; + + cargoSha256 = "sha256-2aHW9JIiqkO0X0B0D44tSZ8QkmKH/QZoYvKNEQWldo4="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index d73ae5c960f4..fb5113dad089 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -1,29 +1,36 @@ -{ lib, buildPythonApplication, fetchPypi -, installShellFiles, pbr -, flake8, mock, pycodestyle, pylint, tox +{ lib +, buildPythonApplication +, fetchFromGitHub +, installShellFiles +, git +, stestr , nix-update-script -, testVersion, git-machete +, testVersion +, git-machete }: buildPythonApplication rec { pname = "git-machete"; version = "3.3.0"; - src = fetchPypi { - inherit pname version; - sha256 = "0mq6hmb3wvj0ash27h4zyl46l3fikpf0mv3ng330lcy6v7bhy5b8"; + src = fetchFromGitHub { + owner = "virtuslab"; + repo = pname; + rev = "v${version}"; + sha256 = "0sx45y1d1v6y66msjc1lw9jhjppgbxqj145kivmd7lr6ccw68kav"; }; - nativeBuildInputs = [ installShellFiles pbr ]; + nativeBuildInputs = [ installShellFiles ]; - # TODO: Add missing check inputs (2019-11-22): - # - stestr - doCheck = false; - checkInputs = [ flake8 mock pycodestyle pylint tox ]; + checkInputs = [ git stestr ]; + + postCheck = '' + stestr run + ''; postInstall = '' - installShellCompletion --bash --name git-machete completion/git-machete.completion.bash - installShellCompletion --zsh --name _git-machete completion/git-machete.completion.zsh + installShellCompletion --bash --name git-machete completion/git-machete.completion.bash + installShellCompletion --zsh --name _git-machete completion/git-machete.completion.zsh ''; passthru = { @@ -42,7 +49,6 @@ buildPythonApplication rec { homepage = "https://github.com/VirtusLab/git-machete"; description = "Git repository organizer and rebase/merge workflow automation tool"; license = licenses.mit; - platforms = platforms.all; - maintainers = [ maintainers.blitz ]; + maintainers = with maintainers; [ blitz ]; }; } diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix index 775c4dd09cde..9c9fa6032c6c 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -25,7 +25,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.32.0"; + version = "2.33.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "08rnm3ipjqdd2n31dw7mxl3iv9g4nxgc409krmz892a37kd43a38"; + sha256 = "0kqcs8nj5h7rh3q86pw5777awq7gn77lgxk88ynjl1rfz2snlg5z"; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; @@ -65,6 +65,9 @@ stdenv.mkDerivation { # Fix references to gettext introduced by ./git-sh-i18n.patch substituteInPlace git-sh-i18n.sh \ --subst-var-by gettext ${gettext} + + # ensure we are using the correct shell when executing the test scripts + patchShebangs t/*.sh ''; nativeBuildInputs = [ gettext perlPackages.perl makeWrapper ] @@ -297,6 +300,8 @@ stdenv.mkDerivation { disable_test t0001-init 'shared overrides system' disable_test t0001-init 'init honors global core.sharedRepository' disable_test t1301-shared-repo + # git-completion.bash: line 405: compgen: command not found: + disable_test t9902-completion 'option aliases are shown with GIT_COMPLETION_SHOW_ALL' # Our patched gettext never fallbacks disable_test t0201-gettext-fallbacks @@ -316,6 +321,7 @@ stdenv.mkDerivation { # Flaky tests: disable_test t5319-multi-pack-index + disable_test t6421-merge-partial-clone ${lib.optionalString (!perlSupport) '' # request-pull is a Bash script that invokes Perl, so it is not available diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch index 9603d8e27c5c..c78400847418 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch @@ -1,28 +1,31 @@ diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt -index 1afe9fc858..05dd7c3a90 100644 +index 3db4eab4ba..39bc0e77c9 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt -@@ -215,8 +215,7 @@ a password is obtained using 'git-credential'. - specify a full pathname of a sendmail-like program instead; - the program must support the `-i` option. Default value can - be specified by the `sendemail.smtpServer` configuration -- option; the built-in default is to search for `sendmail` in -- `/usr/sbin`, `/usr/lib` and $PATH if such program is -+ option; the built-in default is to search in $PATH if such program is - available, falling back to `localhost` otherwise. - - --smtp-server-port=<port>:: +@@ -220,9 +220,9 @@ a password is obtained using 'git-credential'. + --smtp-server=<host>:: + If set, specifies the outgoing SMTP server to use (e.g. + `smtp.example.com` or a raw IP address). If unspecified, and if +- `--sendmail-cmd` is also unspecified, the default is to search +- for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a +- program is available, falling back to `localhost` otherwise. ++ `--sendmail-cmd` is also unspecified, the default is to search for ++ `sendmail` in $PATH if such a program is available, falling back to ++ `localhost` otherwise. + + + For backward compatibility, this option can also specify a full pathname + of a sendmail-like program instead; the program must support the `-i` diff --git a/git-send-email.perl b/git-send-email.perl -index 8eb63b5a2f..74a61d8213 100755 +index e65d969d0b..508d49483d 100755 --- a/git-send-email.perl +++ b/git-send-email.perl -@@ -956,8 +956,7 @@ sub expand_one_alias { +@@ -1066,8 +1066,7 @@ sub expand_one_alias { } - if (!defined $smtp_server) { + if (!defined $sendmail_cmd && !defined $smtp_server) { - my @sendmail_paths = qw( /usr/sbin/sendmail /usr/lib/sendmail ); - push @sendmail_paths, map {"$_/sendmail"} split /:/, $ENV{PATH}; + my @sendmail_paths = map {"$_/sendmail"} split /:/, $ENV{PATH}; foreach (@sendmail_paths) { if (-x $_) { - $smtp_server = $_; + $sendmail_cmd = $_; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 5d1e50d12135..20219be776a5 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,22 +1,25 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip, pkg-config }: rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.17"; + version = "0.17.1"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UM1L95VKmUh2E56dlKo3TkNYRlib5Hg5VHGokBqTP+s="; + sha256 = "sha256-dRHlbxNV4nS50WbJP5lD1zB7NkZmv7nlPUm3RlQIBtc="; }; - cargoSha256 = "sha256-i/Z1pOrg7rKH5uDqkyh7V9jZRHXZ3Bhhw5UpzKWOjJ0="; + cargoSha256 = "sha256-9uRvxax0SrvRkD89mbZPxsfRItde11joA/ZgnXK9XBE="; - nativeBuildInputs = [ python3 perl ]; + nativeBuildInputs = [ python3 perl pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isLinux xclip ++ lib.optionals stdenv.isDarwin [ libiconv Security AppKit ]; + # Needed to get openssl-sys to use pkg-config. + OPENSSL_NO_VENDOR = 1; + meta = with lib; { description = "Blazing fast terminal-ui for git written in rust"; homepage = "https://github.com/extrawurst/gitui"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/glitter/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/glitter/default.nix new file mode 100644 index 000000000000..484491bcf788 --- /dev/null +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/glitter/default.nix @@ -0,0 +1,27 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "glitter"; + version = "1.4.4"; + + src = fetchFromGitHub { + owner = "milo123459"; + repo = pname; + rev = "v${version}"; + sha256 = "1hj1md4h4m1g7cx41sjihlr8xq0zhkikci4cp2gbldqcq5x8iws4"; + }; + + cargoSha256 = "sha256-2QgL8iH0FNlUR/863YML3PLad8lRkYjfSmbl49LTfWw="; + + # tests require it to be in a git repository + preCheck = '' + git init + ''; + + meta = with lib; { + description = "A git wrapper that allows you to compress multiple commands into one"; + homepage = "https://github.com/milo123459/glitter"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix index 8774e69e48c6..6d521151bd82 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/radicle-upstream/default.nix @@ -2,17 +2,17 @@ let pname = "radicle-upstream"; - version = "0.2.9"; + version = "0.2.10"; name = "${pname}-${version}"; srcs = { x86_64-linux = fetchurl { url = "https://releases.radicle.xyz/radicle-upstream-${version}.AppImage"; - sha256 = "sha256-chju3ZEFFLOzE9FakUK2izm/5ejELdL/iWMtM3bRpWY="; + sha256 = "sha256-iZC7FzYaQsCoAq/soi5g2oo/Xd2PtZgO/wR8zDgN4Fk="; }; x86_64-darwin = fetchurl { url = "https://releases.radicle.xyz/radicle-upstream-${version}.dmg"; - sha256 = "sha256-OOqe4diRcJWHHOa6jBpljPoA3FQOKlghMhKGQ242GnM="; + sha256 = "sha256-gc5OrNu7t0VJrjLQO7+7TWvEj7D51WmMJfL/KQDMgvA="; }; }; src = srcs.${stdenv.hostPlatform.system}; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix index 3129bd2e2083..d8420b1cb33c 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix @@ -8,13 +8,13 @@ let in crystal.buildCrystalPackage rec { pname = "thicket"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "taylorthurlow"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A89E0CbV7VFB7W4ycFcZloP0J/d42agEuD+hs9a6a6E="; + sha256 = "sha256-7X1RKj/FWgJdgA7P746hU0ndUM49fH79ZNRSkvNZYFg="; }; format = "shards"; diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/topgit/default.nix index cbb341ae3eb3..86e0d1b3c809 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/topgit/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/topgit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "topgit"; - version = "0.19.12"; + version = "0.19.13"; src = fetchFromGitHub { owner = "mackyle"; repo = "topgit"; rev = "${pname}-${version}"; - sha256 = "1wvf8hmwwl7a2fr17cfs3pbxjccdsjw9ngzivxlgja0gvfz4hjd5"; + sha256 = "sha256-K0X1DGc1LQsoteUhoHLxVJRrZaaPLKSSF61OKyGB5Qg="; }; makeFlags = [ "prefix=${placeholder "out"}" ]; diff --git a/nixpkgs/pkgs/applications/version-management/git-repo/default.nix b/nixpkgs/pkgs/applications/version-management/git-repo/default.nix index 0cf131508b4e..038df7772d8f 100644 --- a/nixpkgs/pkgs/applications/version-management/git-repo/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.16.7"; + version = "2.16.8"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-AJD+WV8JilclcMXc4RFv2xY9QZNUJtYX1dsb1q85qZ0="; + sha256 = "sha256-5EIuaGc93ll9YXLlleZ2HhT0maa+xtozk0LtneYYcDM="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/nixpkgs/pkgs/applications/version-management/gitea/default.nix index 4843e48b1f29..30ffc2b3295e 100644 --- a/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.15.2"; + version = "1.15.3"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-zvWJ1Q8nJw4hjPeBnuVprjn2NSlFwv4BwtHwgwHHvSI="; + sha256 = "sha256-r8FP9jEIChg4XDb0AF9riQBpNCVmffrVI0yzI83qwA0="; }; unpackPhase = '' diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/nixpkgs/pkgs/applications/version-management/gitlab/data.json index 7425af1f98a5..ff42c2d78ce0 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/data.json +++ b/nixpkgs/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "14.2.3", - "repo_hash": "06fr8srz5ii0h65b1h2zfm8kzqz9g8jy2aq4g5js6kmv44zjya1p", + "version": "14.2.4", + "repo_hash": "1bh95c7rrz9v2vn008lm4zqfm4n7my8r1b2665cippyi4bw0dfjr", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.2.3-ee", + "rev": "v14.2.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.2.3", + "GITALY_SERVER_VERSION": "14.2.4", "GITLAB_PAGES_VERSION": "1.42.0", "GITLAB_SHELL_VERSION": "13.19.1", - "GITLAB_WORKHORSE_VERSION": "14.2.3" + "GITLAB_WORKHORSE_VERSION": "14.2.4" } } diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index 07a9a297a034..815feb61e44c 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -20,7 +20,7 @@ let }; }; }; - version = "14.2.3"; + version = "14.2.4"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -32,7 +32,7 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-TSA5CoNaLeMu7O02rsaR/rNciLwzxSIUUQsCo40Z15c="; + sha256 = "sha256-jVYPJWFJN/KDEi8j+BOWTbH8xP0ZLPewhGsJfj5h/0w="; }; vendorSha256 = "sha256-WhkNK+V7yXK+le1u8StAKajZIBzVKqV/WIau27oZBXE="; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 0e81b89b3db8..d35c21169733 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.2.3"; + version = "14.2.4"; src = fetchFromGitLab { owner = data.owner; diff --git a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 3c5286b5edd3..ad2445ad750c 100644 --- a/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -1657,4 +1657,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.1) BUNDLED WITH - 2.2.20 + 2.2.24 diff --git a/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix b/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix index 1f798e33eb89..b4bc0db4bac4 100644 --- a/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix +++ b/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix @@ -1,22 +1,22 @@ { lib, stdenv, rustPlatform, cmake, fetchFromGitHub, pkg-config, openssl -, libiconv, Security }: +, libiconv, Security, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.7.0"; + version = "0.8.4"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - sha256 = "12f5qrrfjfqp1aph2nmfi9nyzs1ndvgrb3y53mrszm9kf7fa6pyg"; + sha256 = "WH8YiW1X7TkURjncm0OefxrZhnhGHaGLwxRNxe17g/0="; }; - cargoSha256 = "0gw19zdxbkgnj1kcyqn1naj1dnhsx10j860m0xgs5z7bbvfg82p6"; + cargoSha256 = "eTPJMYl9m81o4PJKfpDs61KmehSvKnY+bgybEodOhAM="; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = if stdenv.isDarwin - then [ libiconv Security ] + then [ libiconv Security SystemConfiguration] else [ openssl ]; # Needed to get openssl-sys to use pkg-config. diff --git a/nixpkgs/pkgs/applications/version-management/verco/default.nix b/nixpkgs/pkgs/applications/version-management/verco/default.nix index 13e6317491da..538544c5b224 100644 --- a/nixpkgs/pkgs/applications/version-management/verco/default.nix +++ b/nixpkgs/pkgs/applications/version-management/verco/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "verco"; - version = "6.4.0"; + version = "6.5.5"; src = fetchFromGitHub { owner = "vamolessa"; repo = pname; rev = "v${version}"; - sha256 = "09lkgqrv5wfpg7q5mqaiar93jp8gz8ys84hy7jhn1mvjml3zlbnx"; + sha256 = "sha256-n+GGiu/xGGGC6FQPoASok87bCG0MFVIf6l6nt1lvw8A="; }; - cargoSha256 = "04ddhhyad5cd3mg1yzx7mhr0g5mqfnmx9y0li82yx9wnv9br5qn6"; + cargoSha256 = "sha256-lNtR4N+bFFCr3Ct99DJCbtDeKxTzT7ZjvAWixbQm3jg="; meta = with lib; { description = "A simple Git/Mercurial/PlasticSCM tui client based on keyboard shortcuts"; diff --git a/nixpkgs/pkgs/applications/video/catt/default.nix b/nixpkgs/pkgs/applications/video/catt/default.nix index 4b285cfc0075..1f75997ce7bb 100644 --- a/nixpkgs/pkgs/applications/video/catt/default.nix +++ b/nixpkgs/pkgs/applications/video/catt/default.nix @@ -1,11 +1,48 @@ -{ lib, python3 }: +{ lib +, fetchFromGitHub +, python3 +}: -with python3.pkgs; +let + py = python3.override { + packageOverrides = self: super: { + # Upstream is pinning releases incl. dependencies of their dependencies + zeroconf = super.zeroconf.overridePythonAttrs (oldAttrs: rec { + version = "0.31.0"; + src = fetchFromGitHub { + owner = "jstasiak"; + repo = "python-zeroconf"; + rev = version; + sha256 = "158dqay74zvnz6kmpvip4ml0kw59nf2aaajwgaamx0zc8ci1p5pj"; + }; + }); + + click = super.click.overridePythonAttrs (oldAttrs: rec { + version = "7.1.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "06kbzd6sjfkqan3miwj9wqyddfxc2b6hi7p5s4dvqjb3gif2bdfj"; + }; + }); + + PyChromecast = super.PyChromecast.overridePythonAttrs (oldAttrs: rec { + version = "9.2.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "02ig2wf2yyrnnl88r2n13s1naskwsifwgx3syifmcxygflsmjd3d"; + }; + }); + }; + }; +in +with py.pkgs; buildPythonApplication rec { pname = "catt"; version = "0.12.2"; + disabled = python3.pythonOlder "3.4"; + src = fetchPypi { inherit pname version; sha256 = "sha256-BOETKTkcbLOu5SubiejswU7D47qWS13QZ7rU9x3jf5Y="; @@ -19,19 +56,12 @@ buildPythonApplication rec { youtube-dl ]; - # remove click when 0.12.3 is released - # upstream doesn't use zeroconf directly but pins it for pychromecast - postPatch = '' - substituteInPlace setup.py \ - --replace "zeroconf==0.31.0" "" \ - --replace "Click>=7.1.2,<8" "click" - ''; - doCheck = false; # attempts to access various URLs + pythonImportsCheck = [ "catt" ]; meta = with lib; { - description = "Cast All The Things allows you to send videos from many, many online sources to your Chromecast"; + description = "Tool to send media from online sources to Chromecast devices"; homepage = "https://github.com/skorokithakis/catt"; license = licenses.bsd2; maintainers = with maintainers; [ dtzWill ]; diff --git a/nixpkgs/pkgs/applications/video/clapper/default.nix b/nixpkgs/pkgs/applications/video/clapper/default.nix new file mode 100644 index 000000000000..96358383047a --- /dev/null +++ b/nixpkgs/pkgs/applications/video/clapper/default.nix @@ -0,0 +1,85 @@ +{ config +, lib +, stdenv +, fetchFromGitHub +, glib +, gobject-introspection +, python3 +, pkg-config +, ninja +, wayland +, wayland-protocols +, desktop-file-utils +, makeWrapper +, shared-mime-info +, wrapGAppsHook +, meson +, gjs +, gtk4 +, gst_all_1 +, libadwaita +}: + +stdenv.mkDerivation rec { + pname = "clapper"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "Rafostar"; + repo = pname; + rev = version; + sha256 = "1gf4z9lib5rxi1xilkxxyywakm9zlq5915w2wib09jyh0if82ahr"; + }; + + nativeBuildInputs = [ + desktop-file-utils # for update-desktop-database + glib + gobject-introspection + meson + ninja + makeWrapper + pkg-config + python3 + shared-mime-info # for update-mime-database + wrapGAppsHook # for gsettings + ]; + + buildInputs = [ + gjs + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + gtk4 + libadwaita + wayland + wayland-protocols + ]; + + postPatch = '' + patchShebangs build-aux/meson/postinstall.py + ''; + + mesonFlags = [ + # TODO: https://github.com/NixOS/nixpkgs/issues/36468 + "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" + ]; + + postInstall = '' + cp ${src}/data/icons/*.svg $out/share/icons/hicolor/scalable/apps/ + cp ${src}/data/icons/*.svg $out/share/icons/hicolor/symbolic/apps/ + ''; + + meta = with lib; { + description = "A GNOME media player built using GJS with GTK4 toolkit and powered by GStreamer with OpenGL rendering. "; + longDescription = '' + Clapper is a GNOME media player build using GJS with GTK4 toolkit. + The media player is using GStreamer as a media backend and renders everything via OpenGL. + ''; + homepage = "https://github.com/Rafostar/clapper"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ tomfitzhenry ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/applications/video/ffmpeg-normalize/default.nix b/nixpkgs/pkgs/applications/video/ffmpeg-normalize/default.nix index de0b088030f1..db1399ef6032 100644 --- a/nixpkgs/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/nixpkgs/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.22.1"; + version = "1.22.3"; src = fetchPypi { inherit pname version; - sha256 = "df826053212d540ab1bbe9819587fcbf36162f8c2535ae85b88b252e47d6d632"; + sha256 = "317a9636587182280debc85d483f6d21987ceb6cd96ab36a2399836780eca822"; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; diff --git a/nixpkgs/pkgs/applications/video/mplayer/default.nix b/nixpkgs/pkgs/applications/video/mplayer/default.nix index 1e439f57ef7b..644e35468fb5 100644 --- a/nixpkgs/pkgs/applications/video/mplayer/default.nix +++ b/nixpkgs/pkgs/applications/video/mplayer/default.nix @@ -223,11 +223,11 @@ stdenv.mkDerivation rec { fi ''; - meta = { + meta = with lib; { description = "A movie player that supports many video formats"; homepage = "http://mplayerhq.hu"; - license = "GPL"; - maintainers = [ lib.maintainers.eelco ]; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + license = licenses.gpl2Only; + maintainers = with maintainers; [ eelco ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/nixpkgs/pkgs/applications/video/openshot-qt/default.nix b/nixpkgs/pkgs/applications/video/openshot-qt/default.nix index 11f102085bc2..ac396f4be80a 100644 --- a/nixpkgs/pkgs/applications/video/openshot-qt/default.nix +++ b/nixpkgs/pkgs/applications/video/openshot-qt/default.nix @@ -5,13 +5,13 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pname = "openshot-qt"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; - sha256 = "0b11h335krvflpksdlhsrq3rqkb8asipnyaf62di2z32ci3irrpq"; + sha256 = "0pa8iwl217503bjlqg2zlrw5lxyq5hvxrf5apxrh3843hj1w1myv"; }; nativeBuildInputs = [ doxygen wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/video/pipe-viewer/default.nix b/nixpkgs/pkgs/applications/video/pipe-viewer/default.nix new file mode 100644 index 000000000000..1ef08870c86a --- /dev/null +++ b/nixpkgs/pkgs/applications/video/pipe-viewer/default.nix @@ -0,0 +1,86 @@ +{ lib +, fetchFromGitHub +, perl +, buildPerlModule +, makeWrapper +, wrapGAppsHook +, withGtk3 ? false +, ffmpeg +, gtk3 +, wget +, xdg-utils +, youtube-dl +, yt-dlp +, TestPod +, Gtk3 +}: +let + perlEnv = perl.withPackages (ps: with ps; [ + AnyURIEscape + DataDump + Encode + FilePath + GetoptLong + HTTPMessage + JSON + JSONXS + LWPProtocolHttps + LWPUserAgentCached + Memoize + PathTools + ScalarListUtils + TermReadLineGnu + TextParsewords + UnicodeLineBreak + ] ++ lib.optionals withGtk3 [ + FileShareDir + ]); +in +buildPerlModule rec { + pname = "pipe-viewer"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "trizen"; + repo = "pipe-viewer"; + rev = version; + hash = "sha256-kDlZ3Cl8zvN/naGExh2yVW5yHwc1O04x4s22lNkbCzU="; + }; + + nativeBuildInputs = [ makeWrapper ] + ++ lib.optionals withGtk3 [ wrapGAppsHook ]; + + buildInputs = [ perlEnv ] + # Can't be in perlEnv for wrapGAppsHook to work correctly + ++ lib.optional withGtk3 Gtk3; + + # Not supported by buildPerlModule + # and the Perl code fails anyway + # when Getopt::Long sets $gtk in Build.PL: + # Modification of a read-only value attempted at /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-perl5.34.0-Getopt-Long-2.52/lib/perl5/site_perl/5.34.0/Getopt/Long.pm line 585. + #buildFlags = lib.optional withGtk3 "--gtk3"; + postPatch = lib.optionalString withGtk3 '' + substituteInPlace Build.PL --replace 'my $gtk ' 'my $gtk = 1;#' + ''; + + checkInputs = [ + TestPod + ]; + + dontWrapGApps = true; + postFixup = '' + wrapProgram "$out/bin/pipe-viewer" \ + --prefix PATH : "${lib.makeBinPath [ ffmpeg wget youtube-dl yt-dlp ]}" + '' + lib.optionalString withGtk3 '' + wrapProgram "$out/bin/gtk-pipe-viewer" ''${gappsWrapperArgs[@]} \ + --prefix PATH : "${lib.makeBinPath [ ffmpeg wget xdg-utils youtube-dl yt-dlp ]}" + ''; + + meta = with lib; { + homepage = "https://github.com/trizen/pipe-viewer"; + description = "CLI+GUI YouTube Client"; + license = licenses.artistic2; + maintainers = with maintainers; [ julm ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/applications/video/pitivi/default.nix b/nixpkgs/pkgs/applications/video/pitivi/default.nix index b1be6035f9e8..f22dd77b332a 100644 --- a/nixpkgs/pkgs/applications/video/pitivi/default.nix +++ b/nixpkgs/pkgs/applications/video/pitivi/default.nix @@ -21,13 +21,13 @@ python3Packages.buildPythonApplication rec { pname = "pitivi"; - version = "2021.01"; + version = "2021.05"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/pitivi/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0krzsrv19v3mwhbsm72ica6m3p8ijy0lbd0c3s87yd7pmbwld2c1"; + sha256 = "z1aTxGxCqw2hSi5Zv89LyIBgS0HpzTqo0uvcYIJ7dcc="; }; patches = [ diff --git a/nixpkgs/pkgs/applications/video/smtube/default.nix b/nixpkgs/pkgs/applications/video/smtube/default.nix index 26b14ab739c6..10ba865eb343 100644 --- a/nixpkgs/pkgs/applications/video/smtube/default.nix +++ b/nixpkgs/pkgs/applications/video/smtube/default.nix @@ -1,12 +1,12 @@ { lib, mkDerivation, fetchurl, qmake, qtscript, qtwebkit }: mkDerivation rec { - version = "20.6.0"; + version = "21.7.0"; pname = "smtube"; src = fetchurl { url = "mirror://sourceforge/smtube/SMTube/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0hnza5gszwqnkc1py5g34hi4p976vpkc4h3ab0247ynqs83fpwc2"; + sha256 = "sha256-d+R3eM2BPdrsY7XX+6IWpz6cKIy/L2x0iLZH0mTgfcc="; }; makeFlags = [ diff --git a/nixpkgs/pkgs/applications/video/streamlink/default.nix b/nixpkgs/pkgs/applications/video/streamlink/default.nix index 8097c5dbe92a..4abc2b6546aa 100644 --- a/nixpkgs/pkgs/applications/video/streamlink/default.nix +++ b/nixpkgs/pkgs/applications/video/streamlink/default.nix @@ -1,48 +1,50 @@ { lib -, python3 -, fetchFromGitHub +, python3Packages , rtmpdump , ffmpeg +, fetchpatch }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "2.3.0"; + version = "2.4.0"; - src = fetchFromGitHub { - owner = "streamlink"; - repo = "streamlink"; - rev = version; - sha256 = "sha256-lsurDFvVHn1rxR3bgG7BY512ISavpja36/UaKXauf+g="; + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "e95588e222d1a7bd51e3171cd4bce84fd6f646418537aff37993d40f597810af"; }; - checkInputs = with python3.pkgs; [ + checkInputs = with python3Packages; [ pytestCheckHook mock requests-mock freezegun ]; - propagatedBuildInputs = (with python3.pkgs; [ + propagatedBuildInputs = (with python3Packages; [ pycryptodome requests iso-639 iso3166 websocket-client isodate + lxml ]) ++ [ rtmpdump ffmpeg ]; - # note that upstream currently uses requests 2.25.1 in Windows builds - postPatch = '' - substituteInPlace setup.py \ - --replace 'requests>=2.26.0,<3.0' 'requests>=2.25.1,<3.0' - ''; + patches = [ + # Patch failing tests to expect correct Accept-Encoding as generated by Requests + (fetchpatch { + url = "https://github.com/streamlink/streamlink/commit/ae747a113199c119bced4613d33edcc67a222bb9.patch"; + includes = [ "tests/test_stream_json.py" ]; + sha256 = "sha256-KEgyWdh5DNgNktmLSvKQowUQO9p9Q7zP4NbCQJPNgKw="; + }) + ]; meta = with lib; { - homepage = "https://github.com/streamlink/streamlink"; + homepage = "https://streamlink.github.io/"; description = "CLI for extracting streams from various websites to video player of your choosing"; longDescription = '' Streamlink is a CLI utility that pipes videos from online @@ -51,6 +53,7 @@ python3.pkgs.buildPythonApplication rec { Streamlink is a fork of the livestreamer project. ''; + changelog = "https://github.com/streamlink/streamlink/raw/${version}/CHANGELOG.md"; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ dezgeg zraexy DeeUnderscore ]; diff --git a/nixpkgs/pkgs/applications/virtualization/catatonit/default.nix b/nixpkgs/pkgs/applications/virtualization/catatonit/default.nix index c44db31f50cb..e311be68ab8c 100644 --- a/nixpkgs/pkgs/applications/virtualization/catatonit/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/catatonit/default.nix @@ -1,24 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, glibc, nixosTests }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, glibc, nixosTests }: stdenv.mkDerivation rec { pname = "catatonit"; - version = "0.1.5"; + version = "0.1.6"; src = fetchFromGitHub { owner = "openSUSE"; repo = pname; rev = "v${version}"; - sha256 = "ciJ1MI7jr5P2PgxIykQ+BiwNUO8lQHGt0+U8CNbc5bI="; + sha256 = "sha256-hokG6o7toZxU984EvIlne33Aa2EZVZ3qu1jTZMm5nt4="; }; - patches = [ - # Fix compilation with musl - (fetchpatch { - url = "https://github.com/openSUSE/catatonit/commit/75014b1c3099245b7d0f44f24d7f6dc4888a45fd.patch"; - sha256 = "sha256-9VMNUT1U90ocjvE7EXYfLxuodDwTXXHYg89qqa5Jq0g="; - }) - ]; - nativeBuildInputs = [ autoreconfHook ]; buildInputs = lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; diff --git a/nixpkgs/pkgs/applications/virtualization/conmon/default.nix b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix index b560b02d435c..fbbc59359db8 100644 --- a/nixpkgs/pkgs/applications/virtualization/conmon/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix @@ -4,23 +4,24 @@ , pkg-config , glib , glibc +, libseccomp , systemd , nixosTests }: stdenv.mkDerivation rec { pname = "conmon"; - version = "2.0.29"; + version = "2.0.30"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Idt+bN9Lf6GEjdGC/sM9Ln1ohXhUy78CrmJxSDA2Y0o="; + sha256 = "sha256-NZMuHhQyo+95QTJcR79cyZr86ytkbo4nmaqTF0Bdt+s="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib systemd ] + buildInputs = [ glib libseccomp systemd ] ++ lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; # manpage requires building the vendored go-md2man diff --git a/nixpkgs/pkgs/applications/virtualization/lima/default.nix b/nixpkgs/pkgs/applications/virtualization/lima/default.nix index adff564a3c9a..ba056920e849 100644 --- a/nixpkgs/pkgs/applications/virtualization/lima/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3Bc8F8L4ac0YoUp2zoQYPsj7hcXKf8SVkE7q6q0MNSs="; + sha256 = "sha256-u4XLWDJ35jEKKr98eEoUUsT3gawM/qNqXPXrhlQlugg="; }; - vendorSha256 = "sha256-vYeHv6sSiO6fY+oXR8bFFs/NAhivtnkc15pXEu+reZQ="; + vendorSha256 = "sha256-ivKudP0SlArfD+wXHmqNRmW8UGu0o2SJqURrjPhK2hs="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/nixpkgs/pkgs/applications/virtualization/qemu/default.nix index f3aecf300807..5bf5f169e47a 100644 --- a/nixpkgs/pkgs/applications/virtualization/qemu/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/qemu/default.nix @@ -50,12 +50,12 @@ stdenv.mkDerivation rec { sha256 = "1f9hz8rf12jm8baa7kda34yl4hyl0xh0c4ap03krfjx23i3img47"; }; - nativeBuildInputs = [ python python.pkgs.sphinx pkg-config flex bison meson ninja ] + nativeBuildInputs = [ makeWrapper python python.pkgs.sphinx pkg-config flex bison meson ninja ] ++ lib.optionals gtkSupport [ wrapGAppsHook ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; buildInputs = [ zlib glib perl pixman - vde2 texinfo makeWrapper lzo snappy + vde2 texinfo lzo snappy gnutls nettle curl ] ++ lib.optionals ncursesSupport [ ncurses ] diff --git a/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix b/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix index f54f9d84546b..0d6d707a60d5 100644 --- a/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix @@ -97,6 +97,8 @@ in stdenv.mkDerivation { # Temporary workaround for broken build # https://www.virtualbox.org/pipermail/vbox-dev/2021-July/015670.html ./fix-configure-pkgconfig-qt.patch + # https://github.com/NixOS/nixpkgs/issues/123851 + ./fix-audio-driver-loading.patch ]; postPatch = '' diff --git a/nixpkgs/pkgs/applications/virtualization/virtualbox/fix-audio-driver-loading.patch b/nixpkgs/pkgs/applications/virtualization/virtualbox/fix-audio-driver-loading.patch new file mode 100644 index 000000000000..552f867f1acc --- /dev/null +++ b/nixpkgs/pkgs/applications/virtualization/virtualbox/fix-audio-driver-loading.patch @@ -0,0 +1,26 @@ +diff --git a/src/VBox/Devices/Audio/DrvHostAudioAlsaStubs.cpp b/src/VBox/Devices/Audio/DrvHostAudioAlsaStubs.cpp +index cfcb0abbf..2ce564f6f 100644 +--- a/src/VBox/Devices/Audio/DrvHostAudioAlsaStubs.cpp ++++ b/src/VBox/Devices/Audio/DrvHostAudioAlsaStubs.cpp +@@ -258,7 +258,7 @@ static DECLCALLBACK(int32_t) drvHostAudioAlsaLibInitOnce(void *pvUser) + LogFlowFunc(("\n")); + + RTLDRMOD hMod = NIL_RTLDRMOD; +- int rc = RTLdrLoadSystemEx(VBOX_ALSA_LIB, RTLDRLOAD_FLAGS_NO_UNLOAD, &hMod); ++ int rc = RTLdrLoad(VBOX_ALSA_LIB, &hMod); + if (RT_SUCCESS(rc)) + { + for (uintptr_t i = 0; i < RT_ELEMENTS(SharedFuncs); i++) +diff --git a/src/VBox/Devices/Audio/DrvHostAudioPulseAudioStubs.cpp b/src/VBox/Devices/Audio/DrvHostAudioPulseAudioStubs.cpp +index a17fc93f9..148f5c39a 100644 +--- a/src/VBox/Devices/Audio/DrvHostAudioPulseAudioStubs.cpp ++++ b/src/VBox/Devices/Audio/DrvHostAudioPulseAudioStubs.cpp +@@ -332,7 +332,7 @@ static DECLCALLBACK(int32_t) drvHostAudioPulseLibInitOnce(void *pvUser) + LogFlowFunc(("\n")); + + RTLDRMOD hMod = NIL_RTLDRMOD; +- int rc = RTLdrLoadSystemEx(VBOX_PULSE_LIB, RTLDRLOAD_FLAGS_NO_UNLOAD, &hMod); ++ int rc = RTLdrLoad(VBOX_PULSE_LIB, &hMod); + if (RT_SUCCESS(rc)) + { + for (unsigned i = 0; i < RT_ELEMENTS(g_aImportedFunctions); i++) \ No newline at end of file diff --git a/nixpkgs/pkgs/applications/window-managers/icewm/default.nix b/nixpkgs/pkgs/applications/window-managers/icewm/default.nix index 1584b7fed019..e4efc13262d2 100644 --- a/nixpkgs/pkgs/applications/window-managers/icewm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/icewm/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , asciidoc , cmake , expat @@ -48,6 +49,15 @@ stdenv.mkDerivation rec { hash = "sha256-R06tiWS9z6K5Nbi+vvk7DyozpcFdrHleMeh7Iq/FfHQ="; }; + patches = [ + # https://github.com/ice-wm/icewm/pull/57 + # Fix trailing -I that leads to "to generate dependencies you must specify either '-M' or '-MM'" + (fetchpatch { + url = "https://github.com/ice-wm/icewm/pull/57/commits/ebd2c45341cc31755758a423392a0f78a64d2d37.patch"; + sha256 = "16m9znd3ijcfl7la3l27ac3clx8l9qng3fprkpxqcifd89ny1ml5"; + }) + ]; + nativeBuildInputs = [ asciidoc cmake diff --git a/nixpkgs/pkgs/applications/window-managers/mlvwm/default.nix b/nixpkgs/pkgs/applications/window-managers/mlvwm/default.nix index 14170be53ac6..49133ef5344f 100644 --- a/nixpkgs/pkgs/applications/window-managers/mlvwm/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/mlvwm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mlvwm"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "morgant"; repo = pname; rev = version; - sha256 = "sha256-Sps2+XyMTcNuhQTLrW/8vSZIcSzMejoi1m64SK129YI="; + sha256 = "sha256-ElKmi+ANuB3LPwZTMcr5HEMESjDwENbYnNIGdRP24d0="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/applications/window-managers/qtile/default.nix b/nixpkgs/pkgs/applications/window-managers/qtile/default.nix index ae62cdbbba14..786a47d49c34 100644 --- a/nixpkgs/pkgs/applications/window-managers/qtile/default.nix +++ b/nixpkgs/pkgs/applications/window-managers/qtile/default.nix @@ -11,13 +11,13 @@ let unwrapped = pythonPackages.buildPythonPackage rec { pname = "qtile"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; rev = "v${version}"; - sha256 = "sha256-S9G/EI18p9EAyWgI1ajDrLimeE+ETBC9feUDb/QthqI="; + sha256 = "0ln0fxarin9liy9n76zywmbr31xrjw8f7d3nr1mphci7wkc9bqmm"; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/window-managers/yabar/build.nix b/nixpkgs/pkgs/applications/window-managers/yabar/build.nix index f9b5d227b0e8..207e3a83ab2b 100644 --- a/nixpkgs/pkgs/applications/window-managers/yabar/build.nix +++ b/nixpkgs/pkgs/applications/window-managers/yabar/build.nix @@ -19,16 +19,33 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkg-config ]; + strictDeps = true; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ + pkg-config + asciidoc + docbook_xsl + libxslt + makeWrapper + libconfig + pango + ]; buildInputs = [ - cairo gdk-pixbuf libconfig pango xcbutilwm docbook_xsl - alsa-lib wirelesstools asciidoc libxslt makeWrapper + cairo + gdk-pixbuf + libconfig + pango + xcbutilwm + alsa-lib + wirelesstools ]; postPatch = '' substituteInPlace ./Makefile \ --replace "\$(shell git describe)" "${version}" \ - --replace "a2x" "${asciidoc}/bin/a2x --no-xmllint" + --replace "a2x" "a2x --no-xmllint" ''; makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" ]; diff --git a/nixpkgs/pkgs/build-support/alternatives/blas/default.nix b/nixpkgs/pkgs/build-support/alternatives/blas/default.nix index cf880677fddc..8917784bc6c3 100644 --- a/nixpkgs/pkgs/build-support/alternatives/blas/default.nix +++ b/nixpkgs/pkgs/build-support/alternatives/blas/default.nix @@ -31,7 +31,6 @@ let else stdenv.hostPlatform.extensions.sharedLibrary; - isILP64 = blasProvider.blas64 or false; blasImplementation = lib.getName blasProvider; in @@ -83,7 +82,7 @@ stdenv.mkDerivation { patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libblas${canonicalExtension}):${lib.getLib blasProvider}/lib" $out/lib/libblas${canonicalExtension} '' else if stdenv.hostPlatform.isDarwin then '' install_name_tool \ - -id libblas${canonicalExtension} \ + -id $out/lib/libblas${canonicalExtension} \ -add_rpath ${lib.getLib blasProvider}/lib \ $out/lib/libblas${canonicalExtension} '' else "") + '' @@ -115,7 +114,7 @@ EOF patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libcblas${canonicalExtension}):${lib.getLib blasProvider}/lib" $out/lib/libcblas${canonicalExtension} '' else if stdenv.hostPlatform.isDarwin then '' install_name_tool \ - -id libcblas${canonicalExtension} \ + -id $out/lib/libcblas${canonicalExtension} \ -add_rpath ${lib.getLib blasProvider}/lib \ $out/lib/libcblas${canonicalExtension} '' else "") + '' diff --git a/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix b/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix index 82d173697438..3d64639d33fa 100644 --- a/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix +++ b/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix @@ -327,7 +327,7 @@ stdenv.mkDerivation { ### ### Remove LC_UUID ### - + optionalString (stdenv.targetPlatform.isDarwin && !(stdenv.cc.bintools.bintools.isGNU or false)) '' + + optionalString (stdenv.targetPlatform.isDarwin && !(bintools.isGNU or false)) '' echo "-no_uuid" >> $out/nix-support/libc-ldflags-before '' diff --git a/nixpkgs/pkgs/build-support/buildenv/builder.pl b/nixpkgs/pkgs/build-support/buildenv/builder.pl index 411b147cc58e..ebd6026b2597 100755 --- a/nixpkgs/pkgs/build-support/buildenv/builder.pl +++ b/nixpkgs/pkgs/build-support/buildenv/builder.pl @@ -10,7 +10,11 @@ use JSON::PP; STDOUT->autoflush(1); +$SIG{__WARN__} = sub { warn "warning: ", @_ }; +$SIG{__DIE__} = sub { die "error: ", @_ }; + my $out = $ENV{"out"}; +my $extraPrefix = $ENV{"extraPrefix"}; my @pathsToLink = split ' ', $ENV{"pathsToLink"}; @@ -88,6 +92,10 @@ sub findFilesInDir { sub checkCollision { my ($path1, $path2) = @_; + if (! -e $path1 || ! -e $path2) { + return 0; + } + my $stat1 = (stat($path1))[2]; my $stat2 = (stat($path2))[2]; @@ -101,6 +109,11 @@ sub checkCollision { return compare($path1, $path2) == 0; } +sub prependDangling { + my $path = shift; + return (-l $path && ! -e $path ? "dangling symlink " : "") . "`$path'"; +} + sub findFiles { my ($relName, $target, $baseName, $ignoreCollisions, $checkCollisionContents, $priority) = @_; @@ -125,12 +138,21 @@ sub findFiles { # symlink to a file (not a directory) in a lower-priority package, # overwrite it. if (!defined $oldTarget || ($priority < $oldPriority && ($oldTarget ne "" && ! -d $oldTarget))) { + # If target is a dangling symlink, emit a warning. + if (-l $target && ! -e $target) { + my $link = readlink $target; + warn "creating dangling symlink `$out$extraPrefix/$relName' -> `$target' -> `$link'\n"; + } $symlinks{$relName} = [$target, $priority]; return; } # If target already exists and both targets resolves to the same path, skip - if (defined $oldTarget && $oldTarget ne "" && abs_path($target) eq abs_path($oldTarget)) { + if ( + defined $oldTarget && $oldTarget ne "" && + defined abs_path($target) && defined abs_path($oldTarget) && + abs_path($target) eq abs_path($oldTarget) + ) { # Prefer the target that is not a symlink, if any if (-l $oldTarget && ! -l $target) { $symlinks{$relName} = [$target, $priority]; @@ -144,14 +166,25 @@ sub findFiles { return; } + # If target is supposed to be a directory but it isn't, die with an error message + # instead of attempting to recurse into it, only to fail then. + # This happens e.g. when pathsToLink contains a non-directory path. + if ($oldTarget eq "" && ! -d $target) { + die "not a directory: `$target'\n"; + } + unless (-d $target && ($oldTarget eq "" || -d $oldTarget)) { + # Prepend "dangling symlink" to paths if applicable. + my $targetRef = prependDangling($target); + my $oldTargetRef = prependDangling($oldTarget); + if ($ignoreCollisions) { - warn "collision between `$target' and `$oldTarget'\n" if $ignoreCollisions == 1; + warn "collision between $targetRef and $oldTargetRef\n" if $ignoreCollisions == 1; return; } elsif ($checkCollisionContents && checkCollision($oldTarget, $target)) { return; } else { - die "collision between `$target' and `$oldTarget'\n"; + die "collision between $targetRef and $oldTargetRef\n"; } } @@ -224,7 +257,6 @@ while (scalar(keys %postponed) > 0) { # Create the symlinks. -my $extraPrefix = $ENV{"extraPrefix"}; my $nrLinks = 0; foreach my $relName (sort keys %symlinks) { my ($target, $priority) = @{$symlinks{$relName}}; diff --git a/nixpkgs/pkgs/build-support/cc-wrapper/default.nix b/nixpkgs/pkgs/build-support/cc-wrapper/default.nix index 804f59286c7a..3738f628b187 100644 --- a/nixpkgs/pkgs/build-support/cc-wrapper/default.nix +++ b/nixpkgs/pkgs/build-support/cc-wrapper/default.nix @@ -463,6 +463,9 @@ stdenv.mkDerivation { + optionalString (targetPlatform ? gcc.mode) '' echo "-mmode=${targetPlatform.gcc.mode}" >> $out/nix-support/cc-cflags-before '' + + optionalString (targetPlatform ? gcc.thumb) '' + echo "-m${if targetPlatform.gcc.thumb then "thumb" else "arm"}" >> $out/nix-support/cc-cflags-before + '' + optionalString (targetPlatform ? gcc.tune && isGccArchSupported targetPlatform.gcc.tune) '' echo "-mtune=${targetPlatform.gcc.tune}" >> $out/nix-support/cc-cflags-before diff --git a/nixpkgs/pkgs/build-support/coq/default.nix b/nixpkgs/pkgs/build-support/coq/default.nix index 05f6e7762a07..569b07cded63 100644 --- a/nixpkgs/pkgs/build-support/coq/default.nix +++ b/nixpkgs/pkgs/build-support/coq/default.nix @@ -16,7 +16,7 @@ in displayVersion ? {}, release ? {}, extraBuildInputs ? [], - namePrefix ? [], + namePrefix ? [ "coq" ], enableParallelBuilding ? true, extraInstallFlags ? [], setCOQBIN ? true, @@ -27,7 +27,7 @@ in dropDerivationAttrs ? [], useDune2ifVersion ? (x: false), useDune2 ? false, - opam-name ? "coq-${pname}", + opam-name ? (concatStringsSep "-" (namePrefix ++ [ pname ])), ... }@args: let @@ -44,7 +44,6 @@ let location = { inherit domain owner repo; }; } // optionalAttrs (args?fetcher) {inherit fetcher;}); fetched = fetch (if !isNull version then version else defaultVersion); - namePrefix = args.namePrefix or [ "coq" ]; display-pkg = n: sep: v: let d = displayVersion.${n} or (if sep == "" then ".." else true); in n + optionalString (v != "" && v != null) (switch d [ diff --git a/nixpkgs/pkgs/build-support/docker/default.nix b/nixpkgs/pkgs/build-support/docker/default.nix index 9e4709dd9bf8..4bda4d2a5c23 100644 --- a/nixpkgs/pkgs/build-support/docker/default.nix +++ b/nixpkgs/pkgs/build-support/docker/default.nix @@ -636,7 +636,7 @@ rec { <(sort -n layerFiles|uniq|grep -v ${layer}) -1 -3 > newFiles # Append the new files to the layer. tar -rpf temp/layer.tar --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" \ - --owner=0 --group=0 --no-recursion --files-from newFiles + --owner=0 --group=0 --no-recursion --verbatim-files-from --files-from newFiles echo "Adding meta..." diff --git a/nixpkgs/pkgs/build-support/fetchfirefoxaddon/tests.nix b/nixpkgs/pkgs/build-support/fetchfirefoxaddon/tests.nix new file mode 100644 index 000000000000..d125be196aff --- /dev/null +++ b/nixpkgs/pkgs/build-support/fetchfirefoxaddon/tests.nix @@ -0,0 +1,10 @@ +{ invalidateFetcherByDrvHash, fetchFirefoxAddon, ... }: + +{ + simple = invalidateFetcherByDrvHash fetchFirefoxAddon { + name = "image-search-options"; + # Chosen because its only 147KB + url = "https://addons.mozilla.org/firefox/downloads/file/3059971/image_search_options-3.0.12-fx.xpi"; + sha256 = "sha256-H73YWX/DKxvhEwKpWOo7orAQ7c/rQywpljeyxYxv0Gg="; + }; +} diff --git a/nixpkgs/pkgs/build-support/fetchgit/tests.nix b/nixpkgs/pkgs/build-support/fetchgit/tests.nix new file mode 100644 index 000000000000..6805473e2968 --- /dev/null +++ b/nixpkgs/pkgs/build-support/fetchgit/tests.nix @@ -0,0 +1,10 @@ +{ invalidateFetcherByDrvHash, fetchgit, ... }: + +{ + simple = invalidateFetcherByDrvHash fetchgit { + name = "nix-source"; + url = "https://github.com/NixOS/nix"; + rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; + sha256 = "sha256-7DszvbCNTjpzGRmpIVAWXk20P0/XTrWZ79KSOGLrUWY="; + }; +} diff --git a/nixpkgs/pkgs/build-support/fetchzip/default.nix b/nixpkgs/pkgs/build-support/fetchzip/default.nix index b174c252fc0e..af38537737eb 100644 --- a/nixpkgs/pkgs/build-support/fetchzip/default.nix +++ b/nixpkgs/pkgs/build-support/fetchzip/default.nix @@ -40,6 +40,7 @@ in { renamed="$TMPDIR/${tmpFilename}" mv "$downloadedFile" "$renamed" unpackFile "$renamed" + chmod -R +w "$unpackDir" '' + (if stripRoot then '' if [ $(ls "$unpackDir" | wc -l) != 1 ]; then diff --git a/nixpkgs/pkgs/build-support/ocaml/default.nix b/nixpkgs/pkgs/build-support/ocaml/default.nix index 88ed3dfc2c2f..cd17eb688c2e 100644 --- a/nixpkgs/pkgs/build-support/ocaml/default.nix +++ b/nixpkgs/pkgs/build-support/ocaml/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, writeText, ocaml, findlib, ocamlbuild, camlp4 }: -{ name, version, buildInputs ? [], +{ name, version, nativeBuildInputs ? [], createFindlibDestdir ? true, dontStrip ? true, minimumSupportedOcamlVersion ? null, @@ -19,7 +19,7 @@ in stdenv.mkDerivation (args // { name = "ocaml-${name}-${version}"; - buildInputs = [ ocaml findlib ocamlbuild camlp4 ] ++ buildInputs; + nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ] ++ nativeBuildInputs; setupHook = if setupHook == null && hasSharedObjects then writeText "setupHook.sh" '' diff --git a/nixpkgs/pkgs/build-support/ocaml/dune.nix b/nixpkgs/pkgs/build-support/ocaml/dune.nix index c049878d0131..6bdec501630e 100644 --- a/nixpkgs/pkgs/build-support/ocaml/dune.nix +++ b/nixpkgs/pkgs/build-support/ocaml/dune.nix @@ -1,6 +1,6 @@ { lib, stdenv, ocaml, findlib, dune_1, dune_2 }: -{ pname, version, buildInputs ? [], enableParallelBuilding ? true, ... }@args: +{ pname, version, nativeBuildInputs ? [], enableParallelBuilding ? true, ... }@args: let Dune = if args.useDune2 or false then dune_2 else dune_1; in @@ -12,6 +12,8 @@ else stdenv.mkDerivation ({ inherit enableParallelBuilding; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; buildPhase = '' runHook preBuild @@ -33,7 +35,7 @@ stdenv.mkDerivation ({ name = "ocaml${ocaml.version}-${pname}-${version}"; - buildInputs = [ ocaml Dune findlib ] ++ buildInputs; + nativeBuildInputs = [ ocaml Dune findlib ] ++ nativeBuildInputs; meta = (args.meta or {}) // { platforms = args.meta.platforms or ocaml.meta.platforms; }; diff --git a/nixpkgs/pkgs/build-support/rust/default-crate-overrides.nix b/nixpkgs/pkgs/build-support/rust/default-crate-overrides.nix index e14cbcc1183d..4050afe8dde1 100644 --- a/nixpkgs/pkgs/build-support/rust/default-crate-overrides.nix +++ b/nixpkgs/pkgs/build-support/rust/default-crate-overrides.nix @@ -22,6 +22,7 @@ , clang , llvmPackages , linux-pam +, rdkafka , ... }: @@ -135,6 +136,11 @@ in buildInputs = [ postgresql ]; }; + rdkafka-sys = attr: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ rdkafka ]; + }; + rink = attrs: { buildInputs = [ gmp ]; crateBin = [{ name = "rink"; path = "src/bin/rink.rs"; }]; diff --git a/nixpkgs/pkgs/build-support/rust/import-cargo-lock.nix b/nixpkgs/pkgs/build-support/rust/import-cargo-lock.nix index 3973aff398ab..fe070e9638d4 100644 --- a/nixpkgs/pkgs/build-support/rust/import-cargo-lock.nix +++ b/nixpkgs/pkgs/build-support/rust/import-cargo-lock.nix @@ -2,11 +2,16 @@ { # Cargo lock file - lockFile + lockFile ? null + + # Cargo lock file contents as string +, lockFileContents ? null # Hashes for git dependencies. , outputHashes ? {} -}: +} @ args: + +assert (lockFile == null) != (lockFileContents == null); let # Parse a git source into different components. @@ -22,7 +27,13 @@ let sha = builtins.elemAt parts 4; } // lib.optionalAttrs (type != null) { inherit type value; }; - packages = (builtins.fromTOML (builtins.readFile lockFile)).package; + # shadows args.lockFileContents + lockFileContents = + if lockFile != null + then builtins.readFile lockFile + else args.lockFileContents; + + packages = (builtins.fromTOML lockFileContents).package; # There is no source attribute for the source package itself. But # since we do not want to vendor the source package anyway, we can @@ -144,10 +155,17 @@ let '' else throw "Cannot handle crate source: ${pkg.source}"; - vendorDir = runCommand "cargo-vendor-dir" {} '' + vendorDir = runCommand "cargo-vendor-dir" (lib.optionalAttrs (lockFile == null) { + inherit lockFileContents; + passAsFile = [ "lockFileContents" ]; + }) '' mkdir -p $out/.cargo - ln -s ${lockFile} $out/Cargo.lock + ${ + if lockFile != null + then "ln -s ${lockFile} $out/Cargo.lock" + else "cp $lockFileContentsPath $out/Cargo.lock" + } cat > $out/.cargo/config <<EOF [source.crates-io] diff --git a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.lock b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.lock new file mode 100644 index 000000000000..522f9c260fa3 --- /dev/null +++ b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.lock @@ -0,0 +1,83 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "basic-dynamic" +version = "0.1.0" +dependencies = [ + "rand", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "getrandom" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "libc" +version = "0.2.102" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2a5ac8f984bfcf3a823267e5fde638acc3325f6496633a5da6bb6eb2171e103" + +[[package]] +name = "ppv-lite86" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" + +[[package]] +name = "rand" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", + "rand_hc", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" +dependencies = [ + "rand_core", +] + +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" diff --git a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.toml b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.toml new file mode 100644 index 000000000000..851024c82e94 --- /dev/null +++ b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "basic-dynamic" +version = "0.1.0" +authors = ["Daniël de Kok <me@danieldk.eu>"] +edition = "2018" + +[dependencies] +rand = "0.8" diff --git a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/default.nix b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/default.nix new file mode 100644 index 000000000000..eea2c3760599 --- /dev/null +++ b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/default.nix @@ -0,0 +1,16 @@ +{ rustPlatform }: + +rustPlatform.buildRustPackage { + pname = "basic-dynamic"; + version = "0.1.0"; + + src = ./.; + + cargoLock.lockFileContents = builtins.readFile ./Cargo.lock; + + doInstallCheck = true; + + installCheckPhase = '' + $out/bin/basic-dynamic + ''; +} diff --git a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/src/main.rs b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/src/main.rs new file mode 100644 index 000000000000..50b4ed799e43 --- /dev/null +++ b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/basic-dynamic/src/main.rs @@ -0,0 +1,9 @@ +use rand::Rng; + +fn main() { + let mut rng = rand::thread_rng(); + + // Always draw zero :). + let roll: u8 = rng.gen_range(0..1); + assert_eq!(roll, 0); +} diff --git a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/default.nix b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/default.nix index 95f1711d2da7..24e07099c058 100644 --- a/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/default.nix +++ b/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/default.nix @@ -4,6 +4,7 @@ # $ nix-build -A tests.importCargoLock { basic = callPackage ./basic { }; + basicDynamic = callPackage ./basic-dynamic { }; gitDependency = callPackage ./git-dependency { }; gitDependencyRev = callPackage ./git-dependency-rev { }; gitDependencyTag = callPackage ./git-dependency-tag { }; diff --git a/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh b/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh index 70b1fc802b56..d310f8255224 100644 --- a/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -38,7 +38,6 @@ isExecutable() { declare -Ag autoPatchelfCachedDepsAssoc declare -ag autoPatchelfCachedDeps - addToDepCache() { if [[ ${autoPatchelfCachedDepsAssoc[$1]+f} ]]; then return; fi @@ -54,25 +53,70 @@ declare -gi depCacheInitialised=0 declare -gi doneRecursiveSearch=0 declare -g foundDependency -getDepsFromSo() { - ldd "$1" 2> /dev/null | sed -n -e 's/[^=]*=> *\(.\+\) \+([^)]*)$/\1/p' +getDepsFromElfBinary() { + # NOTE: This does not use runPatchelf because it may encounter non-ELF + # files. Caller is expected to check the return code if needed. + patchelf --print-needed "$1" 2> /dev/null } -populateCacheWithRecursiveDeps() { - local so found foundso - for so in "${autoPatchelfCachedDeps[@]}"; do - for found in $(getDepsFromSo "$so"); do - local base="${found##*/}" - local soname="${base%.so*}" - for foundso in "${found%/*}/$soname".so*; do +getRpathFromElfBinary() { + # NOTE: This does not use runPatchelf because it may encounter non-ELF + # files. Caller is expected to check the return code if needed. + local rpath + rpath="$(patchelf --print-rpath "$1" 2> /dev/null)" || return $? + + local IFS=':' + printf "%s\n" $rpath +} + +populateCacheForDep() { + local so="$1" + local rpath found + rpath="$(getRpathFromElfBinary "$so")" || return 1 + + for found in $(getDepsFromElfBinary "$so"); do + local rpathElem + for rpathElem in $rpath; do + # Ignore empty element or $ORIGIN magic variable which should be + # deterministically resolved by adding this package's library + # files early anyway. + # + # shellcheck disable=SC2016 + # (Expressions don't expand in single quotes, use double quotes for + # that.) + if [[ -z "$rpathElem" || "$rpathElem" == *'$ORIGIN'* ]]; then + continue + fi + + local soname="${found%.so*}" + local foundso= + for foundso in "$rpathElem/$soname".so*; do addToDepCache "$foundso" done + + # Found in this element of the rpath, no need to check others. + if [ -n "$foundso" ]; then + break + fi done done + + # Not found in any rpath element. + return 1 +} + +populateCacheWithRecursiveDeps() { + # Dependencies may add more to the end of this array, so we use a counter + # with while instead of a regular for loop here. + local -i i=0 + while [ $i -lt ${#autoPatchelfCachedDeps[@]} ]; do + populateCacheForDep "${autoPatchelfCachedDeps[$i]}" + i=$i+1 + done } getSoArch() { - objdump -f "$1" | sed -ne 's/^architecture: *\([^,]\+\).*/\1/p' + $OBJDUMP -f "$1" | sed -ne 's/^architecture: *\([^,]\+\).*/\1/p' } # NOTE: If you want to use this function outside of the autoPatchelf function, @@ -130,25 +174,25 @@ autoPatchelfFile() { fi fi - echo "searching for dependencies of $toPatch" >&2 + local libcLib + libcLib="$(< "$NIX_CC/nix-support/orig-libc")/lib" - # We're going to find all dependencies based on ldd output, so we need to - # clear the RPATH first. - runPatchelf --remove-rpath "$toPatch" + echo "searching for dependencies of $toPatch" >&2 - # If the file is not a dynamic executable, ldd/sed will fail, - # in which case we return, since there is nothing left to do. local missing - missing="$( - ldd "$toPatch" 2> /dev/null | \ - sed -n -e 's/^[\t ]*\([^ ]\+\) => not found.*/\1/p' - )" || return 0 + missing="$(getDepsFromElfBinary "$toPatch")" || return 0 # This ensures that we get the output of all missing dependencies instead # of failing at the first one, because it's more useful when working on a # new package where you don't yet know its dependencies. for dep in $missing; do + # Check whether this library exists in libc. If so, we don't need to do + # any futher searching -- it will be resolved correctly by the linker. + if [ -f "$libcLib/$dep" ]; then + continue + fi + echo -n " $dep -> " >&2 if findDependency "$dep" "$(getSoArch "$toPatch")"; then rpath="$rpath${rpath:+:}${foundDependency%/*}" @@ -185,7 +229,7 @@ addAutoPatchelfSearchPath() { done while IFS= read -r -d '' file; do - addToDepCache "$file" + addToDepCache "$file" done < <(find "$@" "${findOpts[@]}" \! -type d \ \( -name '*.so' -o -name '*.so.*' \) -print0) } @@ -221,10 +265,10 @@ autoPatchelf() { segmentHeaders="$(LANG=C $READELF -l "$file")" # Skip if the ELF file doesn't have segment headers (eg. object files). # not using grep -q, because it can cause Broken pipe - [ -n "$(echo "$segmentHeaders" | grep '^Program Headers:')" ] || continue + grep -q '^Program Headers:' <<<"$segmentHeaders" || continue if isExecutable "$file"; then # Skip if the executable is statically linked. - [ -n "$(echo "$segmentHeaders" | grep "^ *INTERP\\>")" ] || continue + grep -q "^ *INTERP\\>" <<<"$segmentHeaders" || continue fi # Jump file if patchelf is unable to parse it # Some programs contain binary blobs for testing, @@ -256,6 +300,9 @@ autoPatchelf() { # So what we do here is basically run in postFixup and emulate the same # behaviour as fixupOutputHooks because the setup hook for patchelf is run in # fixupOutput and the postFixup hook runs later. +# +# shellcheck disable=SC2016 +# (Expressions don't expand in single quotes, use double quotes for that.) postFixupHooks+=(' if [ -z "${dontAutoPatchelf-}" ]; then autoPatchelf -- $(for output in $outputs; do diff --git a/nixpkgs/pkgs/build-support/setup-hooks/autoreconf.sh b/nixpkgs/pkgs/build-support/setup-hooks/autoreconf.sh index c08cab158688..6ce879ac092d 100644 --- a/nixpkgs/pkgs/build-support/setup-hooks/autoreconf.sh +++ b/nixpkgs/pkgs/build-support/setup-hooks/autoreconf.sh @@ -1,4 +1,4 @@ -preConfigurePhases+=" autoreconfPhase" +preConfigurePhases="${preConfigurePhases:-} autoreconfPhase" autoreconfPhase() { runHook preAutoreconf diff --git a/nixpkgs/pkgs/build-support/setup-hooks/compress-man-pages.sh b/nixpkgs/pkgs/build-support/setup-hooks/compress-man-pages.sh index f5af76e8168f..0d8a76558026 100644 --- a/nixpkgs/pkgs/build-support/setup-hooks/compress-man-pages.sh +++ b/nixpkgs/pkgs/build-support/setup-hooks/compress-man-pages.sh @@ -9,7 +9,7 @@ compressManPages() { echo "gzipping man pages under $dir/share/man/" # Compress all uncompressed manpages. Don't follow symlinks, etc. - find "$dir"/share/man/ -type f -a '!' -regex '.*\.\(bz2\|gz\)$' -print0 \ + find "$dir"/share/man/ -type f -a '!' -regex '.*\.\(bz2\|gz\|xz\)$' -print0 \ | while IFS= read -r -d $'\0' f do if gzip -c -n "$f" > "$f".gz; then @@ -20,7 +20,7 @@ compressManPages() { done # Point symlinks to compressed manpages. - find "$dir"/share/man/ -type l -a '!' -regex '.*\.\(bz2\|gz\)$' -print0 \ + find "$dir"/share/man/ -type l -a '!' -regex '.*\.\(bz2\|gz\|xz\)$' -print0 \ | sort -z \ | while IFS= read -r -d $'\0' f do diff --git a/nixpkgs/pkgs/build-support/setup-hooks/move-docs.sh b/nixpkgs/pkgs/build-support/setup-hooks/move-docs.sh index ef31dcdce274..e4460f98816d 100644 --- a/nixpkgs/pkgs/build-support/setup-hooks/move-docs.sh +++ b/nixpkgs/pkgs/build-support/setup-hooks/move-docs.sh @@ -6,7 +6,7 @@ preFixupHooks+=(_moveToShare) _moveToShare() { forceShare=${forceShare:=man doc info} - if [ -z "$forceShare" -o -z "$out" ]; then return; fi + if [[ -z "$out" ]]; then return; fi for d in $forceShare; do if [ -d "$out/$d" ]; then diff --git a/nixpkgs/pkgs/build-support/setup-hooks/reproducible-builds.sh b/nixpkgs/pkgs/build-support/setup-hooks/reproducible-builds.sh index 5b01c213fe4a..7b52f84df67b 100644 --- a/nixpkgs/pkgs/build-support/setup-hooks/reproducible-builds.sh +++ b/nixpkgs/pkgs/build-support/setup-hooks/reproducible-builds.sh @@ -2,8 +2,9 @@ # This should ensure that it is deterministic across rebuilds of the same # derivation and not easily collide with other builds. # We also truncate the hash so that it cannot cause reference cycles. -export NIX_CFLAGS_COMPILE+=" -frandom-seed=$( +NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE:-} -frandom-seed=$( outbase="${out##*/}" randomseed="${outbase:0:10}" echo $randomseed )" +export NIX_CFLAGS_COMPILE diff --git a/nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh b/nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh index 19dbb10d18e7..2481d8f50470 100644 --- a/nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -14,7 +14,7 @@ _separateDebugInfo() { dst="$dst/lib/debug/.build-id" # Find executables and dynamic libraries. - local i magic + local i while IFS= read -r -d $'\0' i; do if ! isELF "$i"; then continue; fi diff --git a/nixpkgs/pkgs/build-support/vm/default.nix b/nixpkgs/pkgs/build-support/vm/default.nix index 3a52d756571c..1a07e1c11591 100644 --- a/nixpkgs/pkgs/build-support/vm/default.nix +++ b/nixpkgs/pkgs/build-support/vm/default.nix @@ -13,7 +13,7 @@ with import ../../../nixos/lib/qemu-flags.nix { inherit pkgs; }; rec { - qemu = pkgs.qemu_kvm; + qemu = buildPackages.qemu_kvm; modulesClosure = makeModulesClosure { inherit kernel rootModules; @@ -24,7 +24,7 @@ rec { hd = "vda"; # either "sda" or "vda" initrdUtils = runCommand "initrd-utils" - { buildInputs = [ nukeReferences ]; + { nativeBuildInputs = [ buildPackages.nukeReferences ]; allowedReferences = [ "out" modulesClosure ]; # prevent accidents like glibc being included in the initrd } '' @@ -655,7 +655,10 @@ rec { rpmClosureGenerator = {name, packagesLists, urlPrefixes, packages, archs ? []}: assert (builtins.length packagesLists) == (builtins.length urlPrefixes); - runCommand "${name}.nix" {buildInputs = [perl perlPackages.XMLSimple]; inherit archs;} '' + runCommand "${name}.nix" { + nativeBuildInputs = [ buildPackages.perl buildPackages.perlPackages.XMLSimple ]; + inherit archs; + } '' ${lib.concatImapStrings (i: pl: '' gunzip < ${pl} > ./packages_${toString i}.xml '') packagesLists} @@ -694,7 +697,8 @@ rec { debClosureGenerator = {name, packagesLists, urlPrefix, packages}: - runCommand "${name}.nix" { buildInputs = [ perl dpkg ]; } '' + runCommand "${name}.nix" + { nativeBuildInputs = [ buildPackages.perl buildPackages.dpkg ]; } '' for i in ${toString packagesLists}; do echo "adding $i..." case $i in diff --git a/nixpkgs/pkgs/data/fonts/chonburi/default.nix b/nixpkgs/pkgs/data/fonts/chonburi/default.nix new file mode 100644 index 000000000000..4a14368f1f5f --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/chonburi/default.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "chonburi"; + version = "unstable-2021-09-15"; + + src = fetchFromGitHub { + owner = "cadsondemak"; + repo = pname; + rev = "daf26bf77d82fba50eaa3aa3fad905cb9f6b5e28"; + sha256 = "sha256-oC7ZCfNOyvGtqT9+Ap/CfCHzdWNzeCuac2dJ9fctgB8="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/doc/chonburi $out/share/fonts/{opentype,truetype} + + cp $src/OFL.txt $src/BRIEF.md $out/share/doc/chonburi + cp $src/fonts/*.otf $out/share/fonts/opentype + cp $src/fonts/*.ttf $out/share/fonts/truetype + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://cadsondemak.github.io/chonburi/"; + description = "A Didonic Thai and Latin display typeface"; + longDescription = '' + The objective of this project is to create a Thai and Latin Display + typeface. Chonburi is a display typeface with high contrast in a Didone + style. This single-weight typeface provides advance typographical support + with features such as discretionary ligature. This font can be extended + the family to other weights including both narrow and extended version. It + is also ready to be matched with other non-Latin script. + ''; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.toastal ]; + }; +} diff --git a/nixpkgs/pkgs/data/fonts/julia-mono/default.nix b/nixpkgs/pkgs/data/fonts/julia-mono/default.nix index 5e1cd786534d..a1f8f316773e 100644 --- a/nixpkgs/pkgs/data/fonts/julia-mono/default.nix +++ b/nixpkgs/pkgs/data/fonts/julia-mono/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "0.042"; + version = "0.043"; in fetchzip { name = "JuliaMono-ttf-${version}"; url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz"; - sha256 = "sha256-oXODkeLDT5GXO4+r1fGaRrRS/SSBhzro5XE0GOwl4mQ="; + sha256 = "sha256-oxQRrFhTf37OrJSbDlmzh/7xOuKrtxO7v2+j7QcsAmE="; postFetch = '' mkdir -p $out/share/fonts/truetype diff --git a/nixpkgs/pkgs/data/fonts/kanit/default.nix b/nixpkgs/pkgs/data/fonts/kanit/default.nix index 9b5be79061c1..8875704ba6b6 100644 --- a/nixpkgs/pkgs/data/fonts/kanit/default.nix +++ b/nixpkgs/pkgs/data/fonts/kanit/default.nix @@ -12,12 +12,16 @@ stdenv.mkDerivation rec { }; installPhase = '' - mkdir -p $out/share/doc/${pname}/css/ $out/share/fonts/{opentype,truetype} + runHook preInstall - cp $src/OFL.txt $src/documentation/{BRIEF.md,features.html} $out/share/doc/${pname} - cp $src/documentation/css/fonts.css $out/share/doc/${pname}/css + mkdir -p $out/share/doc/kanit/css/ $out/share/fonts/{opentype,truetype} + + cp $src/OFL.txt $src/documentation/{BRIEF.md,features.html} $out/share/doc/kanit + cp $src/documentation/css/fonts.css $out/share/doc/kanit/css cp $src/fonts/otf/*.otf $out/share/fonts/opentype cp $src/fonts/ttf/*.ttf $out/share/fonts/truetype + + runHook postInstall ''; meta = with lib; { diff --git a/nixpkgs/pkgs/data/fonts/openmoji/default.nix b/nixpkgs/pkgs/data/fonts/openmoji/default.nix new file mode 100644 index 000000000000..d511a78f7250 --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/openmoji/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, scfbuild +, nodejs +, nodePackages +, python3Packages +, variant ? "color" # "color" or "black" +}: + +let + filename = builtins.replaceStrings + [ "color" "black" ] + [ "OpenMoji-Color.ttf" "OpenMoji-Black.ttf" ] + variant; + +in stdenv.mkDerivation rec { + pname = "openmoji"; + version = "13.1.0"; + + src = fetchFromGitHub { + owner = "hfg-gmuend"; + repo = pname; + rev = version; + sha256 = "sha256-7G6a+LFq79njyPhnDhhSJ98Smw5fWlfcsFj6nWBPsSk="; + }; + + nativeBuildInputs = [ + scfbuild + nodejs + nodePackages.glob + nodePackages.lodash + ]; + + buildPhase = '' + runHook preBuild + + node helpers/generate-font-glyphs.js + + cd font + scfbuild -c scfbuild-${variant}.yml + + runHook postBuild + ''; + + installPhase = '' + install -Dm644 ${filename} $out/share/fonts/truetype/${filename} + ''; + + meta = with lib; { + license = licenses.cc-by-sa-40; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + homepage = "https://openmoji.org/"; + downloadPage = "https://github.com/hfg-gmuend/openmoji/releases"; + description = "Open-source emojis for designers, developers and everyone else"; + }; +} diff --git a/nixpkgs/pkgs/data/fonts/unifont/default.nix b/nixpkgs/pkgs/data/fonts/unifont/default.nix index f7cb84f285ac..44c3a2312461 100644 --- a/nixpkgs/pkgs/data/fonts/unifont/default.nix +++ b/nixpkgs/pkgs/data/fonts/unifont/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { pname = "unifont"; - version = "13.0.06"; + version = "14.0.01"; ttf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf"; - sha256 = "0hp72lcj8q8cw490lxl5y1ygw9mcicryjwqr1mmkdz8zh4jh8g6p"; + sha256 = "19algkm4nnixmzshc25rjgh8gfccqinallgi86wgvkcwcmn6ccn6"; }; pcf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; - sha256 = "0y030km1x8mai8zrk661dqsb0yq8rpx6akl7p2sw5ijkcdsfm85f"; + sha256 = "1aj29pswi6qwpvjwncv5w3ndwy2nzli0200i6dx6f80036z8nz9i"; }; nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; diff --git a/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix b/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix index 40799fafab79..902aba0caa24 100644 --- a/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix +++ b/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "13.0.06"; + version = "14.0.01"; in fetchzip rec { name = "unifont_upper-${version}"; @@ -9,7 +9,7 @@ in fetchzip rec { postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf"; - sha256 = "0bqw30h5b787dw8bn1dj8shz22mlxr1zmcfp68fpyll5vg02540n"; + sha256 = "0sb3m2qg0ri7zmxhjvrq8n0jmxxjx8rrx9rpibh5f5fbfkibq4gm"; meta = with lib; { description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane"; diff --git a/nixpkgs/pkgs/data/icons/luna-icons/default.nix b/nixpkgs/pkgs/data/icons/luna-icons/default.nix index 3b5bc262c033..efdea602c354 100644 --- a/nixpkgs/pkgs/data/icons/luna-icons/default.nix +++ b/nixpkgs/pkgs/data/icons/luna-icons/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0pww8882qvlnamxzvn7jxyi0h7lffrwld7qqs1q08h73xc3p18nv"; + sha256 = "sha256-qYFyZT1mLNHBRrX/NX2pmt9P5n8urEK/msQMctSckzE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/data/icons/whitesur-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/whitesur-icon-theme/default.nix index 95f41caca1aa..27695f3cbd15 100644 --- a/nixpkgs/pkgs/data/icons/whitesur-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/whitesur-icon-theme/default.nix @@ -1,30 +1,19 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, gtk3 -, gnome -, gnome-icon-theme -, hicolor-icon-theme -}: +{ lib, stdenvNoCC, fetchFromGitHub, gtk3, hicolor-icon-theme }: stdenvNoCC.mkDerivation rec { pname = "Whitesur-icon-theme"; - version = "2021-05-20"; + version = "2021-08-26"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "KboUYozTleOBKNun66g2oj7u/36hyQsPtRSk/x/LAWo="; + sha256 = "O7nb6X20HvnzldijP/fXqAs/2qE5JUg3DEMb84ZMQp4="; }; nativeBuildInputs = [ gtk3 ]; - buildInputs = [ - gnome-icon-theme - gnome.adwaita-icon-theme - hicolor-icon-theme - ]; + buildInputs = [ hicolor-icon-theme ]; dontDropIconThemeCache = true; diff --git a/nixpkgs/pkgs/data/misc/cacert/default.nix b/nixpkgs/pkgs/data/misc/cacert/default.nix index b4a8ebc4ef27..bd67e2a58f12 100644 --- a/nixpkgs/pkgs/data/misc/cacert/default.nix +++ b/nixpkgs/pkgs/data/misc/cacert/default.nix @@ -1,28 +1,17 @@ -{ lib, stdenv, fetchurl, nss, python3 -, blacklist ? [] - -# Used for tests only +{ lib +, stdenv +, fetchurl +, nss +, python3 +, blacklist ? [ ] + + # Used for tests only , runCommand , cacert , openssl }: -with lib; - let - version = "3.66"; - - underscoreVersion = builtins.replaceStrings ["."] ["_"] version; -in - -stdenv.mkDerivation { - name = "nss-cacert-${version}"; - - src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/nss-${version}.tar.gz"; - sha256 = "1jfdnh5l4k57r2vb07s06hqi7m2qzk0d9x25lsdsrw3cflx9x9w9"; - }; - certdata2pem = fetchurl { name = "certdata2pem.py"; urls = [ @@ -31,6 +20,16 @@ stdenv.mkDerivation { ]; sha256 = "1d4q27j1gss0186a5m8bs5dk786w07ccyq0qi6xmd2zr1a8q16wy"; }; +in + +stdenv.mkDerivation rec { + pname = "nss-cacert"; + version = "3.66"; + + src = fetchurl { + url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings ["."] ["_"] version}_RTM/src/nss-${version}.tar.gz"; + sha256 = "1jfdnh5l4k57r2vb07s06hqi7m2qzk0d9x25lsdsrw3cflx9x9w9"; + }; outputs = [ "out" "unbundled" ]; @@ -40,11 +39,11 @@ stdenv.mkDerivation { ln -s nss/lib/ckfw/builtins/certdata.txt cat << EOF > blacklist.txt - ${concatStringsSep "\n" (map (c: ''"${c}"'') blacklist)} + ${lib.concatStringsSep "\n" (map (c: ''"${c}"'') blacklist)} EOF # copy from the store, otherwise python will scan it for imports - cat "$certdata2pem" > certdata2pem.py + cat "${certdata2pem}" > certdata2pem.py ''; buildPhase = '' @@ -63,61 +62,66 @@ stdenv.mkDerivation { # install individual certs in unbundled output mkdir -pv $unbundled/etc/ssl/certs cp -v *.crt $unbundled/etc/ssl/certs - rm -f $unbundled/etc/ssl/certs/ca-bundle.crt # not wanted in unbundled + rm $unbundled/etc/ssl/certs/ca-bundle.crt # not wanted in unbundled ''; setupHook = ./setup-hook.sh; - passthru.updateScript = ./update.sh; - passthru.tests = { - # Test that building this derivation with a blacklist works, and that UTF-8 is supported. - blacklist-utf8 = let - blacklistCAToFingerprint = { - # "blacklist" uses the CA name from the NSS bundle, but we check for presence using the SHA256 fingerprint. - "CFCA EV ROOT" = "5C:C3:D7:8E:4E:1D:5E:45:54:7A:04:E6:87:3E:64:F9:0C:F9:53:6D:1C:CC:2E:F8:00:F3:55:C4:C5:FD:70:FD"; - "NetLock Arany (Class Gold) Főtanúsítvány" = "6C:61:DA:C3:A2:DE:F0:31:50:6B:E0:36:D2:A6:FE:40:19:94:FB:D1:3D:F9:C8:D4:66:59:92:74:C4:46:EC:98"; - }; - mapBlacklist = f: concatStringsSep "\n" (mapAttrsToList f blacklistCAToFingerprint); - in runCommand "verify-the-cacert-filter-output" { - cacert = cacert.unbundled; - cacertWithExcludes = (cacert.override { - blacklist = builtins.attrNames blacklistCAToFingerprint; - }).unbundled; - - nativeBuildInputs = [ openssl ]; - } '' - isPresent() { - # isPresent <unbundled-dir> <ca name> <ca sha256 fingerprint> - for f in $1/etc/ssl/certs/*.crt; do - fingerprint="$(openssl x509 -in "$f" -noout -fingerprint -sha256 | cut -f2 -d=)" - if [[ "x$fingerprint" == "x$3" ]]; then - return 0 - fi - done - return 1 - } - - # Ensure that each certificate is in the main "cacert". - ${mapBlacklist (caName: caFingerprint: '' - isPresent "$cacert" "${caName}" "${caFingerprint}" || ({ - echo "CA fingerprint ${caFingerprint} (${caName}) is missing from the CA bundle. Consider picking a different CA for the blacklist test." >&2 - exit 1 - }) - '')} - - # Ensure that each certificate is NOT in the "cacertWithExcludes". - ${mapBlacklist (caName: caFingerprint: '' - isPresent "$cacertWithExcludes" "${caName}" "${caFingerprint}" && ({ - echo "CA fingerprint ${caFingerprint} (${caName}) is present in the cacertWithExcludes bundle." >&2 - exit 1 - }) - '')} - - touch $out - ''; + passthru = { + updateScript = ./update.sh; + tests = { + # Test that building this derivation with a blacklist works, and that UTF-8 is supported. + blacklist-utf8 = + let + blacklistCAToFingerprint = { + # "blacklist" uses the CA name from the NSS bundle, but we check for presence using the SHA256 fingerprint. + "CFCA EV ROOT" = "5C:C3:D7:8E:4E:1D:5E:45:54:7A:04:E6:87:3E:64:F9:0C:F9:53:6D:1C:CC:2E:F8:00:F3:55:C4:C5:FD:70:FD"; + "NetLock Arany (Class Gold) Főtanúsítvány" = "6C:61:DA:C3:A2:DE:F0:31:50:6B:E0:36:D2:A6:FE:40:19:94:FB:D1:3D:F9:C8:D4:66:59:92:74:C4:46:EC:98"; + }; + mapBlacklist = f: lib.concatStringsSep "\n" (lib.mapAttrsToList f blacklistCAToFingerprint); + in + runCommand "verify-the-cacert-filter-output" + { + cacert = cacert.unbundled; + cacertWithExcludes = (cacert.override { + blacklist = builtins.attrNames blacklistCAToFingerprint; + }).unbundled; + + nativeBuildInputs = [ openssl ]; + } '' + isPresent() { + # isPresent <unbundled-dir> <ca name> <ca sha256 fingerprint> + for f in $1/etc/ssl/certs/*.crt; do + fingerprint="$(openssl x509 -in "$f" -noout -fingerprint -sha256 | cut -f2 -d=)" + if [[ "x$fingerprint" == "x$3" ]]; then + return 0 + fi + done + return 1 + } + + # Ensure that each certificate is in the main "cacert". + ${mapBlacklist (caName: caFingerprint: '' + isPresent "$cacert" "${caName}" "${caFingerprint}" || ({ + echo "CA fingerprint ${caFingerprint} (${caName}) is missing from the CA bundle. Consider picking a different CA for the blacklist test." >&2 + exit 1 + }) + '')} + + # Ensure that each certificate is NOT in the "cacertWithExcludes". + ${mapBlacklist (caName: caFingerprint: '' + isPresent "$cacertWithExcludes" "${caName}" "${caFingerprint}" && ({ + echo "CA fingerprint ${caFingerprint} (${caName}) is present in the cacertWithExcludes bundle." >&2 + exit 1 + }) + '')} + + touch $out + ''; + }; }; - meta = { + meta = with lib; { homepage = "https://curl.haxx.se/docs/caextract.html"; description = "A bundle of X.509 certificates of public Certificate Authorities (CA)"; platforms = platforms.all; diff --git a/nixpkgs/pkgs/data/misc/hackage/pin.json b/nixpkgs/pkgs/data/misc/hackage/pin.json index 2acb95488227..2a55794abfd7 100644 --- a/nixpkgs/pkgs/data/misc/hackage/pin.json +++ b/nixpkgs/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "332975af73ba6dc258ab7e103f00619e9bebeea2", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/332975af73ba6dc258ab7e103f00619e9bebeea2.tar.gz", - "sha256": "1fkc19vqylyjbhqa414mnz5ny235vp1f0wz70a2lbf5cwzg6185f", - "msg": "Update from Hackage at 2021-09-06T23:06:06Z" + "commit": "6b93e40198f31ac2a9d52e4f3ce90f22f1e9e6f9", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/6b93e40198f31ac2a9d52e4f3ce90f22f1e9e6f9.tar.gz", + "sha256": "1zs9d0h55q6lj3v0d0n19yxl58lhn07lmnw2j5k2y8zbx3pcqi8l", + "msg": "Update from Hackage at 2021-09-17T18:08:40Z" } diff --git a/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix index 49755dbd8ad6..51598a53d50a 100644 --- a/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mobile-broadband-provider-info"; - version = "20201225"; + version = "20210805"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "1g9x2i4xjm2sagaha07n9psacbylrwfrmfqkp17gjwhpyi6w0zqd"; + sha256 = "sha256-a/ihVY6lVBr7xve0QV50zJ9aqYKbE07Ks+8ch0ElaLw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix b/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix index 416bf0095188..4c60895897fe 100644 --- a/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix +++ b/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { pname = "shared-mime-info"; version = "2.1"; + outputs = [ "out" "dev" ]; + src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "xdg"; diff --git a/nixpkgs/pkgs/data/themes/flat-remix-gnome/default.nix b/nixpkgs/pkgs/data/themes/flat-remix-gnome/default.nix index 28bfb12f4c59..8e273afc7692 100644 --- a/nixpkgs/pkgs/data/themes/flat-remix-gnome/default.nix +++ b/nixpkgs/pkgs/data/themes/flat-remix-gnome/default.nix @@ -6,20 +6,20 @@ stdenv.mkDerivation rec { pname = "flat-remix-gnome"; - version = "20210716"; + version = "20210921"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - hash = "sha256-UAWi4MyqtuSzp5TEkVLYJF7+2tzH/aT60ObNOimCJ4o="; + hash = "sha256-HnbKqdDAre2jhZH1Osf3jigz/dQpx7k0fPsVaZz7xC8="; }; nativeBuildInputs = [ glib ]; makeFlags = [ "PREFIX=$(out)" ]; preInstall = '' # make install will back up this file, it will fail if the file doesn't exist. - # https://github.com/daniruiz/flat-remix-gnome/blob/20210716/Makefile#L53 + # https://github.com/daniruiz/flat-remix-gnome/blob/20210921/Makefile#L53 mkdir -p $out/share/gnome-shell/ touch $out/share/gnome-shell/gnome-shell-theme.gresource ''; diff --git a/nixpkgs/pkgs/data/themes/venta/default.nix b/nixpkgs/pkgs/data/themes/venta/default.nix index cd6791521609..83de638674e9 100644 --- a/nixpkgs/pkgs/data/themes/venta/default.nix +++ b/nixpkgs/pkgs/data/themes/venta/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , gdk-pixbuf , gtk-engine-murrine @@ -8,13 +9,13 @@ stdenv.mkDerivation rec { pname = "venta"; - version = "2020-08-20"; + version = "0.6"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; - rev = "f9b7ea560def5c9d25a14015d265ba559d3501ca"; - sha256 = "13rdavspz1q3zk2h04jpd77hxdcifg42kd71qq13ryg4b5yzqqgb"; + rev = version; + sha256 = "1fhiq1kji5qmwsh8335rzilvhs30g5jp126czf2rf532iba0ivd7"; }; buildInputs = [ @@ -33,7 +34,6 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/share/themes cp -a Venta* $out/share/themes - rm $out/share/themes/*/COPYING runHook postInstall ''; diff --git a/nixpkgs/pkgs/desktops/gnome/apps/file-roller/default.nix b/nixpkgs/pkgs/desktops/gnome/apps/file-roller/default.nix index 6af1994fb060..a26428652007 100644 --- a/nixpkgs/pkgs/desktops/gnome/apps/file-roller/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/apps/file-roller/default.nix @@ -25,10 +25,11 @@ stdenv.mkDerivation rec { patchShebangs data/set-mime-type-entry.py ''; - postFixup = '' + preFixup = '' # Workaround because of https://gitlab.gnome.org/GNOME/file-roller/issues/40 - wrapProgram "$out/bin/file-roller" \ + gappsWrapperArgs+=( --prefix PATH : ${lib.makeBinPath [ unzip ]} + ) ''; passthru = { diff --git a/nixpkgs/pkgs/desktops/gnome/core/epiphany/dark-style.patch b/nixpkgs/pkgs/desktops/gnome/core/epiphany/dark-style.patch new file mode 100644 index 000000000000..56ac5c1e5b2c --- /dev/null +++ b/nixpkgs/pkgs/desktops/gnome/core/epiphany/dark-style.patch @@ -0,0 +1,76 @@ +diff --git a/meson.build b/meson.build +index de9cbfa850..647f617605 100644 +--- a/meson.build ++++ b/meson.build +@@ -92,6 +92,7 @@ iso_codes_dep = dependency('iso-codes', version: '>= 0.35') + json_glib_dep = dependency('json-glib-1.0', version: '>= 1.6') + libarchive_dep = dependency('libarchive') + libdazzle_dep = dependency('libdazzle-1.0', version: '>= 3.37.1') ++libgranite_dep = dependency('granite', version: '>= 6.0.0') + libhandy_dep = dependency('libhandy-1', version: '>= 1.1.0') + libsecret_dep = dependency('libsecret-1', version: '>= 0.19.0') + libsoup_dep = dependency('libsoup-2.4', version: '>= 2.48.0') +diff --git a/src/ephy-shell.c b/src/ephy-shell.c +index 650531da86..b9d1355e86 100644 +--- a/src/ephy-shell.c ++++ b/src/ephy-shell.c +@@ -50,6 +50,7 @@ + + #include <glib/gi18n.h> + #include <gtk/gtk.h> ++#include <granite.h> + #include <handy.h> + + struct _EphyShell { +@@ -483,6 +484,20 @@ run_in_background_set_mapping (const GValue *value, + return g_variant_new_boolean (g_variant_get_boolean (var)); + } + ++static void ++ephy_shell_set_prefers_color_scheme (EphyShell *shell) ++{ ++ GtkSettings* gtk_settings = gtk_settings_get_default (); ++ GraniteSettings* granite_settings = granite_settings_get_default (); ++ ++ g_object_set ( ++ gtk_settings, ++ "gtk-application-prefer-dark-theme", ++ granite_settings_get_prefers_color_scheme (granite_settings) == GRANITE_SETTINGS_COLOR_SCHEME_DARK, ++ NULL ++ ); ++} ++ + static void + ephy_shell_startup (GApplication *application) + { +@@ -490,11 +505,18 @@ ephy_shell_startup (GApplication *application) + EphyShell *shell = EPHY_SHELL (application); + EphyEmbedShellMode mode; + GAction *action; ++ GraniteSettings* granite_settings = granite_settings_get_default (); + + G_APPLICATION_CLASS (ephy_shell_parent_class)->startup (application); + + hdy_init (); + ++ ephy_shell_set_prefers_color_scheme (shell); ++ ++ g_signal_connect (granite_settings, "notify::prefers-color-scheme", ++ G_CALLBACK (ephy_shell_set_prefers_color_scheme), shell ++ ); ++ + /* If we are under Pantheon set the icon-theme and cursor-theme accordingly. */ + if (is_desktop_pantheon ()) { + GtkSettings *settings = gtk_settings_get_default (); +diff --git a/src/meson.build b/src/meson.build +index 5bf3eb92ec..d17b1b6d93 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -74,6 +74,7 @@ libephymain_deps = [ + gdk_dep, + gvdb_dep, + libarchive_dep, ++ libgranite_dep, + libhandy_dep + ] + diff --git a/nixpkgs/pkgs/desktops/gnome/core/epiphany/default.nix b/nixpkgs/pkgs/desktops/gnome/core/epiphany/default.nix index 73c7a7aa1135..6f673d632267 100644 --- a/nixpkgs/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/core/epiphany/default.nix @@ -9,6 +9,7 @@ , icu , wrapGAppsHook , gnome +, pantheon , libportal , libxml2 , libxslt @@ -33,6 +34,7 @@ , libdazzle , libhandy , buildPackages +, withPantheon ? false }: stdenv.mkDerivation rec { @@ -44,6 +46,12 @@ stdenv.mkDerivation rec { sha256 = "2tE4ufLVXeJxEo/KOLYfU/2YDFh9KeG6a1CP/zsZ9WQ="; }; + patches = lib.optionals withPantheon [ + # https://github.com/elementary/browser + ./dark-style.patch + ./navigation-buttons.patch + ]; + nativeBuildInputs = [ desktop-file-utils gettext @@ -87,7 +95,7 @@ stdenv.mkDerivation rec { p11-kit sqlite webkitgtk - ]; + ] ++ lib.optional withPantheon pantheon.granite; # Tests need an X display mesonFlags = [ @@ -108,7 +116,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Epiphany"; description = "WebKit based web browser for GNOME"; - maintainers = teams.gnome.members; + maintainers = teams.gnome.members ++ teams.pantheon.members; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/desktops/gnome/core/epiphany/navigation-buttons.patch b/nixpkgs/pkgs/desktops/gnome/core/epiphany/navigation-buttons.patch new file mode 100644 index 000000000000..b7b3b620535f --- /dev/null +++ b/nixpkgs/pkgs/desktops/gnome/core/epiphany/navigation-buttons.patch @@ -0,0 +1,12 @@ +diff --git a/src/resources/gtk/action-bar-start.ui b/src/resources/gtk/action-bar-start.ui +index e604b9601f..2bfe244d53 100644 +--- a/src/resources/gtk/action-bar-start.ui ++++ b/src/resources/gtk/action-bar-start.ui +@@ -7,7 +7,6 @@ + <property name="visible">True</property> + <property name="orientation">horizontal</property> + <style> +- <class name="linked"/> + <class name="navigation-box"/> + </style> + <child> diff --git a/nixpkgs/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/nixpkgs/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index f507ef0e4bb6..b6aedeeb6464 100644 --- a/nixpkgs/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "40.3"; + version = "40.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "5QP9HUiFL112qr9iLR7ymWs4TYjaMf0WoQ1RPwmpDdc="; + sha256 = "QSplhO5upN+WN8QimT9Or4FYTSkZD16JOvmnhxy5Axs="; }; patches = [ diff --git a/nixpkgs/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix b/nixpkgs/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix new file mode 100644 index 000000000000..de48b72faca4 --- /dev/null +++ b/nixpkgs/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix @@ -0,0 +1,135 @@ +{ lib, stdenv +, fetchpatch +, substituteAll +, fetchurl +, meson +, ninja +, pkg-config +, gnome +, perl +, gettext +, gtk3 +, glib +, libnotify +, libgnomekbd +, lcms2 +, libpulseaudio +, alsa-lib +, libcanberra-gtk3 +, upower +, colord +, libgweather +, polkit +, gsettings-desktop-schemas +, geoclue2 +, systemd +, libgudev +, libwacom +, libxslt +, libxml2 +, modemmanager +, networkmanager +, gnome-desktop +, geocode-glib +, docbook_xsl +, wrapGAppsHook +, python3 +, tzdata +, nss +, gcr +, gnome-session-ctl +, pantheon +}: + +stdenv.mkDerivation rec { + pname = "gnome-settings-daemon"; + version = "3.38.2"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "136p3prdqvc0lvrcqs4h7crpnfqnimqklpzjivq5w4g1rhbdbhrj"; + }; + + patches = [ + # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/202 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/aae1e774dd9de22fe3520cf9eb2bfbf7216f5eb0.patch"; + sha256 = "O4m0rOW8Zrgu3Q0p0OA8b951VC0FjYbOUk9MLzB9icI="; + }) + + (substituteAll { + src = ./fix-paths.patch; + inherit tzdata; + }) + + # Adjust to libgweather changes. + # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/217 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/82d88014dfca2df7e081712870e1fb017c16b808.patch"; + sha256 = "H5k/v+M2bRaswt5nrDJFNn4gS4BdB0UfzdjUCT4yLKg="; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + perl + gettext + libxml2 + libxslt + docbook_xsl + wrapGAppsHook + python3 + ]; + + buildInputs = [ + gtk3 + glib + gsettings-desktop-schemas + modemmanager + networkmanager + libnotify + libgnomekbd # for org.gnome.libgnomekbd.keyboard schema + gnome-desktop + lcms2 + libpulseaudio + alsa-lib + libcanberra-gtk3 + upower + colord + libgweather + nss + polkit + geocode-glib + geoclue2 + systemd + libgudev + libwacom + gcr + ]; + + mesonFlags = [ + "-Dudev_dir=${placeholder "out"}/lib/udev" + "-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl" + ]; + + # Default for release buildtype but passed manually because + # we're using plain + NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; + + postPatch = '' + for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl meson_post_install.py; do + chmod +x $f + patchShebangs $f + done + ''; + + meta = with lib; { + description = "GNOME Settings Daemon"; + homepage = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/"; + license = licenses.gpl2Plus; + maintainers = teams.pantheon.members; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/fix-paths.patch index 2229302cab7c..2229302cab7c 100644 --- a/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch +++ b/nixpkgs/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/fix-paths.patch diff --git a/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch b/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch deleted file mode 100644 index 3691c034d1ee..000000000000 --- a/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d Mon Sep 17 00:00:00 2001 -Message-Id: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -From: WORLDofPEACE <worldofpeace@protonmail.ch> -Date: Sun, 20 Oct 2019 12:04:31 +0200 -Subject: [PATCH 1/7] EGL: Include EGL/eglmesaext.h - -From: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -The eglext.h shipped by libglvnd does not include the Mesa extensions, -unlike the header shipped in Mesa. - -Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876 - -(cherry picked from commit a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90) ---- - cogl/cogl/meson.build | 2 +- - src/backends/meta-egl-ext.h | 1 + - src/backends/meta-egl.c | 1 + - src/backends/meta-egl.h | 1 + - 4 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build -index 1057ef9..9a64294 100644 ---- a/cogl/cogl/meson.build -+++ b/cogl/cogl/meson.build -@@ -48,7 +48,7 @@ cogl_gl_header_h = configure_file( - built_headers += [cogl_gl_header_h] - - if have_egl -- cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>' -+ cogl_egl_includes_string = '#include <EGL/egl.h>\n#include <EGL/eglext.h>\n#include <EGL/eglmesaext.h>' - else - cogl_egl_includes_string = '' - endif -diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h -index 8705e7d..db0b74f 100644 ---- a/src/backends/meta-egl-ext.h -+++ b/src/backends/meta-egl-ext.h -@@ -29,6 +29,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - /* - * This is a little different to the tests shipped with EGL implementations, -diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c -index 6554be9..fdeff4f 100644 ---- a/src/backends/meta-egl.c -+++ b/src/backends/meta-egl.c -@@ -27,6 +27,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <gio/gio.h> - #include <glib.h> - #include <glib-object.h> -diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h -index f2a8164..4591e7d 100644 ---- a/src/backends/meta-egl.h -+++ b/src/backends/meta-egl.h -@@ -28,6 +28,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <glib-object.h> - - #define META_EGL_ERROR meta_egl_error_quark () - -base-commit: 48ffbb582404c1d52196eb6cc5f082c31ca4910c --- -git-series 0.9.1 diff --git a/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0002-drop-inheritable.patch b/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0002-drop-inheritable.patch deleted file mode 100644 index 28f89ac7c0c6..000000000000 --- a/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0002-drop-inheritable.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 14cee101882e65a57dcd66ea0f8399477b23ce7e Mon Sep 17 00:00:00 2001 -Message-Id: <14cee101882e65a57dcd66ea0f8399477b23ce7e.1601082838.git-series.worldofpeace@protonmail.ch> -In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -From: WORLDofPEACE <worldofpeace@protonmail.ch> -Date: Sat, 19 Oct 2019 13:26:05 +0200 -Subject: [PATCH 2/7] drop inheritable - -From: Tor Hedin Brønner <torhedinbronner@gmail.com> - -Adapted from https://gitlab.gnome.org/GNOME/mutter/commit/c53c47ae123b03cc66044d2b846342123ecb3a01 - -We only want to drop inheritable though, to prevent the ambient set leaking further than gnome-shell. ---- - config.h.meson | 3 +++ - meson.build | 5 +++++ - meson_options.txt | 6 ++++++ - src/core/main.c | 10 ++++++++++ - src/meson.build | 1 + - 5 files changed, 25 insertions(+) - -diff --git a/config.h.meson b/config.h.meson -index 0bab718..202fb7e 100644 ---- a/config.h.meson -+++ b/config.h.meson -@@ -58,6 +58,9 @@ - /* Xwayland applications allowed to issue keyboard grabs */ - #mesondefine XWAYLAND_GRAB_DEFAULT_ACCESS_RULES - -+/* Defined if libcap-ng is available */ -+#mesondefine HAVE_LIBCAPNG -+ - /* XKB base prefix */ - #mesondefine XKB_BASE - -diff --git a/meson.build b/meson.build -index 29d495b..86970df 100644 ---- a/meson.build -+++ b/meson.build -@@ -35,6 +35,7 @@ libstartup_notification_req = '>= 0.7' - libcanberra_req = '>= 0.26' - libwacom_req = '>= 0.13' - atk_req = '>= 2.5.3' -+libcapng_req = '>= 0.7.9' - - # optional version requirements - udev_req = '>= 228' -@@ -125,6 +126,7 @@ xau_dep = dependency('xau') - ice_dep = dependency('ice') - atk_dep = dependency('atk', version: atk_req) - libcanberra_dep = dependency('libcanberra', version: libcanberra_req) -+libcapng_dep = dependency('libcap-ng', required: get_option('libcapng')) - - # For now always require X11 support - have_x11 = true -@@ -256,6 +258,7 @@ have_core_tests = false - have_cogl_tests = false - have_clutter_tests = false - have_installed_tests = false -+have_libcapng = libcapng_dep.found() - - if have_tests - have_core_tests = get_option('core_tests') -@@ -361,6 +364,7 @@ cdata.set('HAVE_LIBWACOM', have_libwacom) - cdata.set('HAVE_SM', have_sm) - cdata.set('HAVE_STARTUP_NOTIFICATION', have_startup_notification) - cdata.set('HAVE_INTROSPECTION', have_introspection) -+cdata.set('HAVE_LIBCAPNG', have_libcapng) - cdata.set('HAVE_PROFILER', have_profiler) - - xkb_base = xkeyboard_config_dep.get_pkgconfig_variable('xkb_base') -@@ -443,6 +447,7 @@ output = [ - ' Startup notification..... ' + have_startup_notification.to_string(), - ' Introspection............ ' + have_introspection.to_string(), - ' Profiler................. ' + have_profiler.to_string(), -+ ' libcap-ng................ ' + have_libcapng.to_string(), - '', - ' Tests:', - '', -diff --git a/meson_options.txt b/meson_options.txt -index 73aa7ad..8bfaacd 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -152,3 +152,9 @@ option('xwayland_grab_default_access_rules', - value: 'gnome-boxes,remote-viewer,virt-viewer,virt-manager,vinagre,vncviewer,Xephyr', - description: 'Comma delimited list of applications ressources or class allowed to issue X11 grabs in Xwayland' - ) -+ -+option('libcapng', -+ type: 'feature', -+ value: 'auto', -+ description: 'Enable libcap-ng support' -+) -diff --git a/src/core/main.c b/src/core/main.c -index 3935f35..ecf3cb2 100644 ---- a/src/core/main.c -+++ b/src/core/main.c -@@ -66,6 +66,10 @@ - #include <girepository.h> - #endif - -+#ifdef HAVE_LIBCAPNG -+#include <cap-ng.h> -+#endif -+ - #if defined(HAVE_NATIVE_BACKEND) && defined(HAVE_WAYLAND) - #include <systemd/sd-login.h> - #endif /* HAVE_WAYLAND && HAVE_NATIVE_BACKEND */ -@@ -673,6 +677,12 @@ meta_run (void) - if (!meta_display_open ()) - meta_exit (META_EXIT_ERROR); - -+#ifdef HAVE_LIBCAPNG -+ capng_clear(CAPNG_SELECT_BOTH); -+ capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_NICE); -+ capng_apply(CAPNG_SELECT_BOTH); -+#endif -+ - g_main_loop_run (meta_main_loop); - - meta_finalize (); -diff --git a/src/meson.build b/src/meson.build -index 90d8073..a9fffa2 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -18,6 +18,7 @@ mutter_pkg_deps = [ - glib_dep, - gsettings_desktop_schemas_dep, - gtk3_dep, -+ libcapng_dep, - pango_dep, - ] - --- -git-series 0.9.1 diff --git a/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0003-Fix-glitches-in-gala.patch b/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0003-Fix-glitches-in-gala.patch deleted file mode 100644 index 9f78a324d9da..000000000000 --- a/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0003-Fix-glitches-in-gala.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5d2b9a03f24b4dbc423adff52b2eeb478c4b5913 Mon Sep 17 00:00:00 2001 -Message-Id: <5d2b9a03f24b4dbc423adff52b2eeb478c4b5913.1601082838.git-series.worldofpeace@protonmail.ch> -In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -From: WORLDofPEACE <worldofpeace@protonmail.ch> -Date: Sun, 5 Apr 2020 23:06:03 -0400 -Subject: [PATCH 3/7] Fix glitches in gala - -From: worldofpeace <worldofpeace@protonmail.ch> - -This fixes issues for users of mutter like in gala[0]. - -Upstream report: https://gitlab.gnome.org/GNOME/mutter/issues/536 -[0]: https://github.com/elementary/gala/issues/605 ---- - clutter/clutter/clutter-actor.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c -index ecf9a59..07b8b71 100644 ---- a/clutter/clutter/clutter-actor.c -+++ b/clutter/clutter/clutter-actor.c -@@ -17831,7 +17831,7 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self) - if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume)) - { - priv->paint_volume_valid = TRUE; -- priv->needs_paint_volume_update = FALSE; -+ //priv->needs_paint_volume_update = FALSE; - return &priv->paint_volume; - } - else --- -git-series 0.9.1 diff --git a/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch b/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch deleted file mode 100644 index cd98d3950415..000000000000 --- a/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 5a9f9fbaa1322b2ad0a52fcdd171d4f44d031918 Mon Sep 17 00:00:00 2001 -Message-Id: <5a9f9fbaa1322b2ad0a52fcdd171d4f44d031918.1601082838.git-series.worldofpeace@protonmail.ch> -In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -From: WORLDofPEACE <worldofpeace@protonmail.ch> -Date: Wed, 30 Oct 2019 15:23:24 -0700 -Subject: [PATCH 4/7] profiler: track changes in GLib and Sysprof - -From: Christian Hergert <chergert@redhat.com> - -This tracks the changes to gdbus-codegen in terms of how GUnixFDList is -done to use the UnixFD annotation. - -https://gitlab.gnome.org/GNOME/mutter/merge_requests/908 -(cherry picked from commit 605171291993460f31d470a8143d6438d0c6169c) ---- - src/backends/meta-profiler.c | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/src/backends/meta-profiler.c b/src/backends/meta-profiler.c -index 10d433a..0d62701 100644 ---- a/src/backends/meta-profiler.c -+++ b/src/backends/meta-profiler.c -@@ -51,13 +51,12 @@ G_DEFINE_TYPE_WITH_CODE (MetaProfiler, - static gboolean - handle_start (MetaDBusSysprof3Profiler *dbus_profiler, - GDBusMethodInvocation *invocation, -+ GUnixFDList *fd_list, - GVariant *options, - GVariant *fd_variant) - { - MetaProfiler *profiler = META_PROFILER (dbus_profiler); - GMainContext *main_context = g_main_context_default (); -- GDBusMessage *message; -- GUnixFDList *fd_list; - const char *group_name; - int position; - int fd = -1; -@@ -73,8 +72,6 @@ handle_start (MetaDBusSysprof3Profiler *dbus_profiler, - - g_variant_get (fd_variant, "h", &position); - -- message = g_dbus_method_invocation_get_message (invocation); -- fd_list = g_dbus_message_get_unix_fd_list (message); - if (fd_list) - fd = g_unix_fd_list_get (fd_list, position, NULL); - -@@ -98,7 +95,7 @@ handle_start (MetaDBusSysprof3Profiler *dbus_profiler, - - g_debug ("Profiler running"); - -- meta_dbus_sysprof3_profiler_complete_start (dbus_profiler, invocation); -+ meta_dbus_sysprof3_profiler_complete_start (dbus_profiler, invocation, NULL); - return TRUE; - } - --- -git-series 0.9.1 diff --git a/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch b/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch deleted file mode 100644 index 138970ddda0a..000000000000 --- a/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2caa072dd8e283a8e43febeab55fe8b76dda69b7 Mon Sep 17 00:00:00 2001 -Message-Id: <2caa072dd8e283a8e43febeab55fe8b76dda69b7.1601082838.git-series.worldofpeace@protonmail.ch> -In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -From: WORLDofPEACE <worldofpeace@protonmail.ch> -Date: Wed, 29 Jan 2020 11:02:33 +0100 -Subject: [PATCH 5/7] meta: Add missing display.h to meta-workspace-manager.h - -From: Corentin Noël <corentin@elementary.io> - -This is required because MetaDisplayCorner is only defined in display.h - -https://gitlab.gnome.org/GNOME/mutter/merge_requests/1025 -(cherry picked from commit 9d390ee49fb1f6300336e82ae94cc8061c6bae12) ---- - src/meta/meta-workspace-manager.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/meta/meta-workspace-manager.h b/src/meta/meta-workspace-manager.h -index 0390c44..92cd681 100644 ---- a/src/meta/meta-workspace-manager.h -+++ b/src/meta/meta-workspace-manager.h -@@ -26,6 +26,7 @@ - #include <glib-object.h> - - #include <meta/common.h> -+#include <meta/display.h> - #include <meta/prefs.h> - #include <meta/types.h> - --- -git-series 0.9.1 diff --git a/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch b/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch deleted file mode 100644 index 6d88f0f5e766..000000000000 --- a/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 0c95e5a5b31eab93f149b90982680f38e8977063 Mon Sep 17 00:00:00 2001 -Message-Id: <0c95e5a5b31eab93f149b90982680f38e8977063.1601082838.git-series.worldofpeace@protonmail.ch> -In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -From: WORLDofPEACE <worldofpeace@protonmail.ch> -Date: Sat, 4 Jul 2020 12:01:28 -0700 -Subject: [PATCH 6/7] build: bump ABI to sysprof-capture-4 - -From: Christian Hergert <chergert@redhat.com> - -GLib will now be linking against sysprof-capture-4.a. To support that, -sysprof had to remove the GLib dependency from sysprof-capture-4 which -had the side-effect of breaking ABi. - -This bumps the dependency and includes a fallback to compile just the -libsysprof-capture-4.a using a subproject wrap. - -https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1352 -(cherry picked from commit 2c08eb6d163b6758efec9eafe1d5c17fc1ab3692) ---- - meson.build | 20 ++++++++++++++++++-- - src/meson.build | 8 ++++++-- - subprojects/sysprof.wrap | 4 ++++ - 3 files changed, 28 insertions(+), 4 deletions(-) - create mode 100644 subprojects/sysprof.wrap - -diff --git a/meson.build b/meson.build -index 86970df..3dc0098 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,6 +1,6 @@ - project('mutter', 'c', - version: '3.34.6', -- meson_version: '>= 0.50.0', -+ meson_version: '>= 0.51.0', - license: 'GPLv2+' - ) - -@@ -52,6 +52,9 @@ gbm_req = '>= 10.3' - # screen cast version requirements - libpipewire_req = '>= 0.2.5' - -+# profiler requirements -+sysprof_req = '>= 3.37.2' -+ - gnome = import('gnome') - pkg = import('pkgconfig') - i18n = import('i18n') -@@ -275,7 +278,20 @@ endif - - have_profiler = get_option('profiler') - if have_profiler -- sysprof_dep = dependency('sysprof-capture-3') -+ # libsysprof-capture support -+ sysprof_dep = dependency('sysprof-capture-4', -+ required: true, -+ default_options: [ -+ 'enable_examples=false', -+ 'enable_gtk=false', -+ 'enable_tests=false', -+ 'enable_tools=false', -+ 'libsysprof=false', -+ 'with_sysprofd=none', -+ 'help=false', -+ ], -+ fallback: ['sysprof', 'libsysprof_capture_dep'], -+ ) - endif - - required_functions = [ -diff --git a/src/meson.build b/src/meson.build -index a9fffa2..a91baa1 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -711,9 +711,13 @@ if have_profiler - 'backends/meta-profiler.h', - ] - -- dbus_interfaces_dir = join_paths(datadir, 'dbus-1', 'interfaces') -- sysprof3_dbus_file = join_paths(dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml') -+ if sysprof_dep.type_name() == 'pkgconfig' -+ sysprof_dbus_interfaces_dir = join_paths(sysprof_dep.get_pkgconfig_variable('datadir'), 'dbus-1', 'interfaces') -+ else -+ sysprof_dbus_interfaces_dir = join_paths(meson.source_root(), 'subprojects', 'sysprof', 'src') -+ endif - -+ sysprof3_dbus_file = join_paths(sysprof_dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml') - dbus_sysprof3_profiler_built_sources = gnome.gdbus_codegen('meta-dbus-sysprof3-profiler', - sysprof3_dbus_file, - interface_prefix: 'org.gnome.', -diff --git a/subprojects/sysprof.wrap b/subprojects/sysprof.wrap -new file mode 100644 -index 0000000..c8f5883 ---- /dev/null -+++ b/subprojects/sysprof.wrap -@@ -0,0 +1,4 @@ -+[wrap-git] -+directory=sysprof -+url=https://gitlab.gnome.org/GNOME/sysprof.git -+revision=cae28263ff5dd4a510d82f3dc2e3a3b3d9b386fb --- -git-series 0.9.1 diff --git a/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0007-fix-paths.patch b/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0007-fix-paths.patch deleted file mode 100644 index 8376fc649b5f..000000000000 --- a/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/0007-fix-paths.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7bbbf082599ec786f64f2135c9acc0b4fe2ecbf4 Mon Sep 17 00:00:00 2001 -Message-Id: <7bbbf082599ec786f64f2135c9acc0b4fe2ecbf4.1601082838.git-series.worldofpeace@protonmail.ch> -In-Reply-To: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -References: <7b94f980f2a099dd4b19b60c357cfcf5ff7ada6d.1601082838.git-series.worldofpeace@protonmail.ch> -From: WORLDofPEACE <worldofpeace@protonmail.ch> -Date: Fri, 25 Sep 2020 20:48:33 -0400 -Subject: [PATCH 7/7] fix paths - ---- - src/core/util.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/util.c b/src/core/util.c -index 79bcfdc..87ce549 100644 ---- a/src/core/util.c -+++ b/src/core/util.c -@@ -623,7 +623,7 @@ meta_show_dialog (const char *type, - - args = g_ptr_array_new (); - -- append_argument (args, "zenity"); -+ append_argument (args, "@zenity@/bin/zenity"); - append_argument (args, type); - - if (display) --- -git-series 0.9.1 diff --git a/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/default.nix b/nixpkgs/pkgs/desktops/gnome/core/mutter/3.38/default.nix index 42f07d45e62f..3c2d30b813ba 100644 --- a/nixpkgs/pkgs/desktops/gnome/core/mutter/3.34/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/core/mutter/3.38/default.nix @@ -1,35 +1,35 @@ { fetchurl -, fetchpatch , substituteAll -, lib, stdenv +, runCommand +, lib +, stdenv , pkg-config , gnome -, pantheon , gettext , gobject-introspection -, upower , cairo , pango -, cogl , json-glib , libstartup_notification , zenity -, libcanberra-gtk3 +, libcanberra , ninja , xkeyboard_config , libxkbfile +, libXdamage , libxkbcommon , libXtst , libinput +, libdrm , gsettings-desktop-schemas , glib , gtk3 , gnome-desktop -, geocode-glib -, pipewire_0_2 +, pipewire , libgudev , libwacom , xwayland +, mesa , meson , gnome-settings-daemon , xorgserver @@ -39,23 +39,47 @@ , desktop-file-utils , libcap_ng , egl-wayland +, graphene +, wayland-protocols +, pantheon }: -stdenv.mkDerivation rec { +let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "3.34.6"; + version = "3.38.6"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-I73ofTO4mBNYgxzsiRW7X/Hq+cHedMkM0WYLG5WINSY="; + sha256 = "0mxln9azl4krmknq2vmhd15lgpa2q7gh7whiv14nsqbr9iaxmg2x"; }; + patches = [ + # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking + # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381 + ./drop-inheritable.patch + + # Fixes issues for users of mutter like in gala. + # https://github.com/elementary/gala/issues/605 + # https://gitlab.gnome.org/GNOME/mutter/issues/536 + ./fix-glitches-in-gala.patch + + (substituteAll { + src = ./fix-paths.patch; + inherit zenity; + }) + ]; + mesonFlags = [ "-Degl_device=true" "-Dinstalled_tests=false" # TODO: enable these "-Dwayland_eglstream=true" + "-Dprofiler=true" + "-Dxwayland_path=${xwayland}/bin/Xwayland" + # This should be auto detected, but it looks like it manages a false + # positive. + "-Dxwayland_initfd=disabled" ]; propagatedBuildInputs = [ @@ -63,11 +87,13 @@ stdenv.mkDerivation rec { json-glib libXtst libcap_ng + graphene ]; nativeBuildInputs = [ desktop-file-utils gettext + mesa # needed for gbm meson ninja pkg-config @@ -78,42 +104,28 @@ stdenv.mkDerivation rec { buildInputs = [ cairo - cogl egl-wayland - geocode-glib glib gnome-desktop gnome-settings-daemon gobject-introspection gsettings-desktop-schemas gtk3 - libcanberra-gtk3 + libcanberra + libdrm libgudev libinput libstartup_notification libwacom libxkbcommon libxkbfile + libXdamage pango - pipewire_0_2 # TODO: backport pipewire 0.3 support + pipewire sysprof - upower xkeyboard_config xwayland - zenity - ]; - - patches = [ - ./0001-EGL-Include-EGL-eglmesaext.h.patch - ./0002-drop-inheritable.patch - ./0003-Fix-glitches-in-gala.patch - ./0004-profiler-track-changes-in-GLib-and-Sysprof.patch - ./0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch - ./0006-build-bump-ABI-to-sysprof-capture-4.patch - (substituteAll { - src = ./0007-fix-paths.patch; - inherit zenity; - }) + wayland-protocols ]; postPatch = '' @@ -124,11 +136,29 @@ stdenv.mkDerivation rec { ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" ''; + # Install udev files into our own tree. + PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev"; + + passthru = { + libdir = "${self}/lib/mutter-7"; + + tests = { + libdirExists = runCommand "mutter-libdir-exists" {} '' + if [[ ! -d ${self.libdir} ]]; then + echo "passthru.libdir should contain a directory, “${self.libdir}” is not one." + exit 1 + fi + touch $out + ''; + }; + }; + meta = with lib; { description = "A window manager for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/mutter"; - license = licenses.gpl2; - maintainers = pantheon.maintainers; + license = licenses.gpl2Plus; + maintainers = teams.pantheon.members; platforms = platforms.linux; }; -} +}; +in self diff --git a/nixpkgs/pkgs/desktops/gnome/core/mutter/drop-inheritable.patch b/nixpkgs/pkgs/desktops/gnome/core/mutter/3.38/drop-inheritable.patch index 7374e1b86935..7374e1b86935 100644 --- a/nixpkgs/pkgs/desktops/gnome/core/mutter/drop-inheritable.patch +++ b/nixpkgs/pkgs/desktops/gnome/core/mutter/3.38/drop-inheritable.patch diff --git a/nixpkgs/pkgs/desktops/gnome/core/mutter/3.38/fix-glitches-in-gala.patch b/nixpkgs/pkgs/desktops/gnome/core/mutter/3.38/fix-glitches-in-gala.patch new file mode 100644 index 000000000000..973768239792 --- /dev/null +++ b/nixpkgs/pkgs/desktops/gnome/core/mutter/3.38/fix-glitches-in-gala.patch @@ -0,0 +1,27 @@ +From a58ace29db48f98ad59f4f309d49b458c68a6eec Mon Sep 17 00:00:00 2001 +From: Bobby Rong <rjl931189261@126.com> +Date: Wed, 28 Jul 2021 22:08:11 +0800 +Subject: [PATCH] Fix glitches in gala + +Co-Authored-By: WORLDofPEACE <worldofpeace@protonmail.ch> + +This fixes issues for users of mutter like in gala[0]. + +Upstream report: https://gitlab.gnome.org/GNOME/mutter/issues/536 +[0]: https://github.com/elementary/gala/issues/605 +--- + clutter/clutter/clutter-actor.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c +index febfb31918..71906000c0 100644 +--- a/clutter/clutter/clutter-actor.c ++++ b/clutter/clutter/clutter-actor.c +@@ -15926,7 +15926,6 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self) + if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume)) + { + priv->paint_volume_valid = TRUE; +- priv->needs_paint_volume_update = FALSE; + return &priv->paint_volume; + } + else diff --git a/nixpkgs/pkgs/desktops/gnome/core/mutter/3.38/fix-paths.patch b/nixpkgs/pkgs/desktops/gnome/core/mutter/3.38/fix-paths.patch new file mode 100644 index 000000000000..6ac0a431f61f --- /dev/null +++ b/nixpkgs/pkgs/desktops/gnome/core/mutter/3.38/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/core/util.c b/src/core/util.c +index 57b73747d..f424cc81c 100644 +--- a/src/core/util.c ++++ b/src/core/util.c +@@ -636,7 +636,7 @@ meta_show_dialog (const char *type, + + args = g_ptr_array_new (); + +- append_argument (args, "zenity"); ++ append_argument (args, "@zenity@/bin/zenity"); + append_argument (args, type); + + if (display) diff --git a/nixpkgs/pkgs/desktops/gnome/core/yelp-xsl/default.nix b/nixpkgs/pkgs/desktops/gnome/core/yelp-xsl/default.nix index 7c9b4eb839c0..32f3fbd61538 100644 --- a/nixpkgs/pkgs/desktops/gnome/core/yelp-xsl/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/core/yelp-xsl/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "yelp-xsl"; - version = "40.0"; + version = "40.2"; src = fetchurl { url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Nh7NTTP8zbO7CKaH9g5cPpCdLp47Ai2ETgSYINDPYrA="; + sha256 = "sha256-kZxVL4RqrsdB/lHVr0FrRpvNslx37/w7WhWktLf/gU4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/gnome/default.nix b/nixpkgs/pkgs/desktops/gnome/default.nix index 979ddafc10f0..a3f0107c288b 100644 --- a/nixpkgs/pkgs/desktops/gnome/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/default.nix @@ -88,6 +88,9 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { }; + # Using 3.38 to match Mutter used in Pantheon + gnome-settings-daemon338 = callPackage ./core/gnome-settings-daemon/3.38 { }; + gnome-software = callPackage ./core/gnome-software { }; gnome-system-monitor = callPackage ./core/gnome-system-monitor { }; @@ -106,9 +109,8 @@ lib.makeScope pkgs.newScope (self: with self; { mutter = callPackage ./core/mutter { }; - # Needed for elementary's gala and greeter until 3.36 support has more bugfixes - # https://github.com/elementary/gala/issues/763 - mutter334 = callPackage ./core/mutter/3.34 { }; + # Needed for elementary's gala and greeter until support for higher versions is provided + mutter338 = callPackage ./core/mutter/3.38 { }; nautilus = callPackage ./core/nautilus { }; @@ -355,7 +357,9 @@ lib.makeScope pkgs.newScope (self: with self; { maintainers = lib.teams.gnome.members; - mutter328 = throw "Removed as Pantheon is upgraded to mutter334."; + mutter328 = throw "Removed as Pantheon is upgraded to mutter338."; + + mutter334 = throw "Removed as Pantheon is upgraded to mutter338."; gnome-getting-started-docs = throw "Removed in favour of gnome-tour."; diff --git a/nixpkgs/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/nixpkgs/pkgs/desktops/gnome/extensions/arcmenu/default.nix index 2720026357d2..68898fa42b0e 100644 --- a/nixpkgs/pkgs/desktops/gnome/extensions/arcmenu/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/extensions/arcmenu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-arcmenu"; - version = "12"; + version = "14"; src = fetchFromGitLab { owner = "arcmenu"; repo = "ArcMenu"; rev = "v${version}"; - sha256 = "sha256-R1OUDf/YMyMlxwXM9rNsrasPumHEoYhJK0evnYGeIkA="; + sha256 = "sha256-Iobu5eNWSvAiTRe6wyx/0PgUtB9QIC9KdH0M1xhsM1I="; }; patches = [ diff --git a/nixpkgs/pkgs/desktops/gnome/games/tali/default.nix b/nixpkgs/pkgs/desktops/gnome/games/tali/default.nix index 9399561e6784..a818d8c115c3 100644 --- a/nixpkgs/pkgs/desktops/gnome/games/tali/default.nix +++ b/nixpkgs/pkgs/desktops/gnome/games/tali/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "tali"; - version = "40.2"; + version = "40.3"; src = fetchurl { url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "9SHsnW1SKA/Pfi1IerbVqIw54yx6n5XrqwKdUsAj4Cs="; + sha256 = "neLxCreZjHprLKYvs3nBgby8HtYqp6gkG8VVHVF4/iE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix b/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix index 5913ec7a0d03..60e6ca3d4e82 100644 --- a/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/nixpkgs/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -51,10 +51,6 @@ mkDerivation rec { xorg.xf86inputlibinput.dev ]; - postPatch = '' - sed -i "/\''${XORG_LIBINPUT_INCLUDE_DIRS}/a ${xorg.xf86inputlibinput.dev}/include/xorg" lxqt-config-input/CMakeLists.txt - ''; - passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; meta = with lib; { diff --git a/nixpkgs/pkgs/desktops/mate/atril/default.nix b/nixpkgs/pkgs/desktops/mate/atril/default.nix index 81c5bdcd78ec..c88e3a72ea45 100644 --- a/nixpkgs/pkgs/desktops/mate/atril/default.nix +++ b/nixpkgs/pkgs/desktops/mate/atril/default.nix @@ -75,6 +75,6 @@ stdenv.mkDerivation rec { homepage = "https://mate-desktop.org"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/caja-dropbox/default.nix b/nixpkgs/pkgs/desktops/mate/caja-dropbox/default.nix index 27bf56cf5160..0d347b39f108 100644 --- a/nixpkgs/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/nixpkgs/pkgs/desktops/mate/caja-dropbox/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mate-desktop/caja-dropbox"; license = with licenses; [ gpl3Plus cc-by-nd-30 ]; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix b/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix index 0b21f2721dba..4cec39774892 100644 --- a/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix +++ b/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://mate-desktop.org"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/caja/default.nix b/nixpkgs/pkgs/desktops/mate/caja/default.nix index 65d6e1a21ebc..ce9861f1762e 100644 --- a/nixpkgs/pkgs/desktops/mate/caja/default.nix +++ b/nixpkgs/pkgs/desktops/mate/caja/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { homepage = "https://mate-desktop.org"; license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/engrampa/default.nix b/nixpkgs/pkgs/desktops/mate/engrampa/default.nix index b9627dae02ca..7fde8fb1958d 100644 --- a/nixpkgs/pkgs/desktops/mate/engrampa/default.nix +++ b/nixpkgs/pkgs/desktops/mate/engrampa/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://mate-desktop.org"; license = with licenses; [ gpl2Plus lgpl2Plus fdl11Plus ]; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/eom/default.nix b/nixpkgs/pkgs/desktops/mate/eom/default.nix index 7947247bf1c6..9862c3059d21 100644 --- a/nixpkgs/pkgs/desktops/mate/eom/default.nix +++ b/nixpkgs/pkgs/desktops/mate/eom/default.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { passthru.updateScript = mateUpdateScript { inherit pname version; }; - meta = { + meta = with lib; { description = "An image viewing and cataloging program for the MATE desktop"; homepage = "https://mate-desktop.org"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.romildo ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix b/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix index 967e223f2b0e..d7969f55efce 100644 --- a/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix +++ b/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mate-desktop/libmatekbd"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix b/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix index 2824c958de2f..2ef34f2ea67d 100644 --- a/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix +++ b/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mate-desktop/libmatemixer"; license = licenses.lgpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix b/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix index b325de3b3c02..3d99b0ccd82e 100644 --- a/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix +++ b/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mate-desktop/libmateweather"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/marco/default.nix b/nixpkgs/pkgs/desktops/mate/marco/default.nix index e7e6547284db..597538a9f8a1 100644 --- a/nixpkgs/pkgs/desktops/mate/marco/default.nix +++ b/nixpkgs/pkgs/desktops/mate/marco/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mate-desktop/marco"; license = [ licenses.gpl2Plus ]; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix b/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix index f06db0adc1be..30b51e9ed5bd 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { homepage = "https://mate-desktop.org"; license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix b/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix index 3fa6f37b2a1f..9384d49e2a3d 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = "https://mate-desktop.org"; license = with licenses; [ gpl2Plus cc-by-sa-40 ]; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix b/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix index 4344e970758c..b26347f73397 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://mate-desktop.org"; license = [ licenses.gpl2Plus ]; platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-common/default.nix b/nixpkgs/pkgs/desktops/mate/mate-common/default.nix index 159fb75426ab..c3d2910e8696 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-common/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-common/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { passthru.updateScript = mateUpdateScript { inherit pname version; }; - meta = { + meta = with lib; { description = "Common files for development of MATE packages"; homepage = "https://mate-desktop.org"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.romildo ]; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix b/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix index 9c1186a692ea..e95f3696e288 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mate-desktop/mate-control-center"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix b/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix index 19ad26656f21..e4928ac748b5 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { homepage = "https://mate-desktop.org"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index 7dc4423fb6b2..69f780f6083f 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { homepage = "https://mate-desktop.org"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix b/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix index 0e4fc7f0c30d..001b6e418792 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { passthru.updateScript = mateUpdateScript { inherit pname version; }; - meta = { + meta = with lib; { description = "Icon themes from MATE"; homepage = "https://mate-desktop.org"; - license = lib.licenses.lgpl3Plus; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.romildo ]; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix b/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix index 3cf2ac9b4c34..08985608cd61 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { ''; license = with licenses; [ gpl3Plus lgpl2Plus ]; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-media/default.nix b/nixpkgs/pkgs/desktops/mate/mate-media/default.nix index c4e9a9d5b0c2..839e1dc20341 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-media/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-media/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://mate-desktop.org"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = [ maintainers.romildo maintainers.chpatrick ]; + maintainers = teams.mate.members ++ (with maintainers; [ chpatrick ]); }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix b/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix index 33f437446532..09c251f4083e 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mate-desktop/mate-menus"; license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix b/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix index f4908906ff95..f9c4737bab1c 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://mate-desktop.org"; license = with licenses; [ gpl3Only lgpl2Plus ]; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix b/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix index 8bc730032f6e..a66f8de43462 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mate-desktop/mate-notification-daemon"; license = with licenses; [ gpl2Plus gpl3Plus ]; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix b/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix index d0e54bab5850..8da5f8939231 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mate-desktop/mate-panel"; license = with licenses; [ gpl2Plus lgpl2Plus fdl11Plus ]; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix b/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix index 8ec813ce833d..9b1d77d78240 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://mate-desktop.org"; license = [ licenses.gpl2Plus ]; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix b/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix index c7b6690d2e3c..72f9ba93a437 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { homepage = "https://mate-desktop.org"; license = with licenses; [ gpl2Plus fdl11Plus ]; platforms = platforms.unix; - maintainers = with maintainers; [ romildo chpatrick ]; + maintainers = teams.mate.members ++ (with maintainers; [ chpatrick ]); }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix b/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix index b87ec4b68d08..f33c47cbf0a2 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { systemd mate.mate-desktop mate.mate-menus + mate.mate-panel ]; configureFlags = [ "--without-console-kit" ]; @@ -40,6 +41,6 @@ stdenv.mkDerivation rec { homepage = "https://mate-desktop.org"; license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix b/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix index 7e77f898051d..6faceee002e9 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { description = "MATE panel applet for hardware sensors"; license = with licenses; [ gpl2Plus ]; platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix b/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix index 152ecf572d78..1c51e2f6ae89 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mate-desktop/mate-session-manager"; license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix b/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix index 3ece77dc08c4..ff46b339b2fc 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mate-desktop/mate-settings-daemon"; license = with licenses; [ gpl2Plus gpl3Plus lgpl2Plus mit ]; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix b/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix index d94695ac80a4..9b4a510b7286 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { homepage = "https://mate-desktop.org"; license = [ licenses.gpl2Plus ]; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix b/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix index ed7ba49c18fe..19fa5697f969 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://mate-desktop.org"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-themes/default.nix b/nixpkgs/pkgs/desktops/mate/mate-themes/default.nix index 6a1be82c8a6d..21c7b23537ec 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-themes/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-themes/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://mate-desktop.org"; license = with licenses; [ lgpl21Plus lgpl3Only gpl3Plus ]; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix b/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix index 830cf092f80e..5aebd6aef43a 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-tweak/default.nix @@ -86,6 +86,6 @@ python3Packages.buildPythonApplication rec { changelog = "https://github.com/ubuntu-mate/mate-tweak/releases/tag/${version}"; license = [ licenses.gpl2Plus ]; platforms = platforms.linux; - maintainers = with maintainers; [ luc65r ]; + maintainers = teams.mate.members ++ (with maintainers; [ luc65r ]); }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix b/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix index 8a5aadb936db..ecbe2e667aad 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = "https://mate-desktop.org"; license = with licenses; [ gpl2Plus fdl12 ]; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix b/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix index 9907552f3c07..3e0062c7a793 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mate-desktop/mate-user-share"; license = with licenses; [ gpl2Plus ]; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix b/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix index 6801368dc43c..48e662f54f71 100644 --- a/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://mate-desktop.org"; license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/mozo/default.nix b/nixpkgs/pkgs/desktops/mate/mozo/default.nix index 037989083bc3..3a02b03ceb76 100644 --- a/nixpkgs/pkgs/desktops/mate/mozo/default.nix +++ b/nixpkgs/pkgs/desktops/mate/mozo/default.nix @@ -27,6 +27,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/mate-desktop/mozo"; license = with licenses; [ lgpl2Plus ]; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/pluma/default.nix b/nixpkgs/pkgs/desktops/mate/pluma/default.nix index 9eb0f9283be7..53b0251229ac 100644 --- a/nixpkgs/pkgs/desktops/mate/pluma/default.nix +++ b/nixpkgs/pkgs/desktops/mate/pluma/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = "https://mate-desktop.org"; license = with licenses; [ gpl2Plus lgpl2Plus fdl11Plus ]; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/mate/python-caja/default.nix b/nixpkgs/pkgs/desktops/mate/python-caja/default.nix index ccee7b046887..452a7943d664 100644 --- a/nixpkgs/pkgs/desktops/mate/python-caja/default.nix +++ b/nixpkgs/pkgs/desktops/mate/python-caja/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mate-desktop/python-caja"; license = [ licenses.gpl2Plus ]; platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; + maintainers = teams.mate.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix index 556b67aeafe8..86580bd4c30f 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -30,15 +30,24 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "3.6.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0kwqgilhyrj2nbvw5y34nzch5h9jnrg1a1n333qdsx4ax6yrxh4j"; + sha256 = "07lkdpnjj9pxbq8h794qjiidvnysvzx0132w98r1wg9k7ca170bj"; }; + patches = [ + # Try to remove other backends to make flatpak backend work. + # https://github.com/NixOS/nixpkgs/issues/70214 + ./flatpak-only.patch + # The homepage banner does not show up on first run, + # has issues with app icon and mouse scrolling. + ./drop-homepage-banner.patch + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -76,7 +85,6 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dhomepage=false" "-Dpayments=false" "-Dcurated=false" ]; @@ -91,6 +99,6 @@ stdenv.mkDerivation rec { description = "An open, pay-what-you-want app store for indie developers, designed for elementary OS"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/drop-homepage-banner.patch b/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/drop-homepage-banner.patch new file mode 100644 index 000000000000..3e7aa3efc126 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/drop-homepage-banner.patch @@ -0,0 +1,234 @@ +From b1e09653d755ca6ffd03a1e3e67750e6bcc2bc6f Mon Sep 17 00:00:00 2001 +From: Bobby Rong <rjl931189261@126.com> +Date: Wed, 22 Sep 2021 11:54:48 +0800 +Subject: [PATCH 2/2] Drop homepage banner + +--- + src/Views/Homepage.vala | 181 +--------------------------------------- + 1 file changed, 1 insertion(+), 180 deletions(-) + +diff --git a/src/Views/Homepage.vala b/src/Views/Homepage.vala +index 576fc02c..80a1d221 100644 +--- a/src/Views/Homepage.vala ++++ b/src/Views/Homepage.vala +@@ -31,67 +31,12 @@ public class AppCenter.Homepage : AbstractView { + public bool viewing_package { get; private set; default = false; } + + public AppStream.Category currently_viewed_category; +- private Hdy.Carousel banner_carousel; +- private Gtk.Revealer banner_revealer; +- private Gtk.FlowBox recently_updated_carousel; +- private Gtk.Revealer recently_updated_revealer; +- +- private uint banner_timeout_id; + + construct { +- banner_carousel = new Hdy.Carousel () { +- allow_long_swipes = true +- }; +- +- var banner_event_box = new Gtk.EventBox (); +- banner_event_box.events |= Gdk.EventMask.ENTER_NOTIFY_MASK; +- banner_event_box.events |= Gdk.EventMask.LEAVE_NOTIFY_MASK; +- banner_event_box.add (banner_carousel); +- +- var banner_dots = new Hdy.CarouselIndicatorDots () { +- carousel = banner_carousel +- }; +- +- var banner_grid = new Gtk.Grid () { +- orientation = Gtk.Orientation.VERTICAL +- }; +- banner_grid.add (banner_event_box); +- banner_grid.add (banner_dots); +- +- banner_revealer = new Gtk.Revealer (); +- banner_revealer.add (banner_grid); +- +- var recently_updated_label = new Granite.HeaderLabel (_("Recently Updated")) { +- margin_start = 12 +- }; +- +- recently_updated_carousel = new Gtk.FlowBox () { +- activate_on_single_click = true, +- column_spacing = 12, +- row_spacing = 12, +- homogeneous = true, +- max_children_per_line = 5, +- min_children_per_line = 3 +- }; +- +- var recently_updated_grid = new Gtk.Grid () { +- margin_end = 12, +- margin_start = 12 +- }; +- recently_updated_grid.attach (recently_updated_label, 0, 0); +- recently_updated_grid.attach (recently_updated_carousel, 0, 1); +- +- recently_updated_revealer = new Gtk.Revealer (); +- recently_updated_revealer.add (recently_updated_grid ); +- +- var categories_label = new Granite.HeaderLabel (_("Categories")) { +- margin_start = 24, +- margin_top = 24 +- }; +- + category_flow = new Widgets.CategoryFlowBox () { + margin_start = 12, + margin_end =12, ++ margin_top = 12, + valign = Gtk.Align.START + }; + +@@ -99,9 +44,6 @@ public class AppCenter.Homepage : AbstractView { + column_spacing = 24, + orientation = Gtk.Orientation.VERTICAL + }; +- grid.add (banner_revealer); +- grid.add (recently_updated_revealer); +- grid.add (categories_label); + grid.add (category_flow); + + scrolled_window = new Gtk.ScrolledWindow (null, null) { +@@ -111,19 +53,6 @@ public class AppCenter.Homepage : AbstractView { + + add (scrolled_window); + +- var local_package = App.local_package; +- if (local_package != null) { +- var banner = new Widgets.Banner (local_package); +- +- banner_carousel.prepend (banner); +- +- banner.clicked.connect (() => { +- show_package (local_package); +- }); +- } +- +- load_banners_and_carousels.begin (); +- + category_flow.child_activated.connect ((child) => { + var item = child as Widgets.CategoryItem; + if (item != null) { +@@ -159,94 +88,8 @@ public class AppCenter.Homepage : AbstractView { + } + } + } +- +- return GLib.Source.REMOVE; + }); + }); +- +- banner_event_box.enter_notify_event.connect (() => { +- banner_timeout_stop (); +- }); +- +- banner_event_box.leave_notify_event.connect (() => { +- banner_timeout_start (); +- }); +- +- recently_updated_carousel.child_activated.connect ((child) => { +- var package_row_grid = (AppCenter.Widgets.ListPackageRowGrid) child.get_child (); +- +- show_package (package_row_grid.package); +- }); +- } +- +- private async void load_banners_and_carousels () { +- unowned var fp_client = AppCenterCore.FlatpakBackend.get_default (); +- var packages_by_release_date = fp_client.get_featured_packages_by_release_date (); +- var packages_in_banner = new Gee.LinkedList<AppCenterCore.Package> (); +- +- int package_count = 0; +- foreach (var package in packages_by_release_date) { +- if (package_count >= MAX_PACKAGES_IN_BANNER) { +- break; +- } +- +- var installed = false; +- foreach (var origin_package in package.origin_packages) { +- try { +- if (yield origin_package.backend.is_package_installed (origin_package)) { +- installed = true; +- break; +- } +- } catch (Error e) { +- continue; +- } +- } +- +- if (!installed) { +- packages_in_banner.add (package); +- package_count++; +- } +- } +- +- foreach (var package in packages_in_banner) { +- var banner = new Widgets.Banner (package); +- banner.clicked.connect (() => { +- show_package (package); +- }); +- +- banner_carousel.add (banner); +- } +- +- banner_carousel.show_all (); +- banner_revealer.reveal_child = true; +- banner_timeout_start (); +- +- foreach (var package in packages_by_release_date) { +- if (recently_updated_carousel.get_children ().length () >= MAX_PACKAGES_IN_CAROUSEL) { +- break; +- } +- +- var installed = false; +- foreach (var origin_package in package.origin_packages) { +- try { +- if (yield origin_package.backend.is_package_installed (origin_package)) { +- installed = true; +- break; +- } +- } catch (Error e) { +- continue; +- } +- } +- +- if (!installed && !(package in packages_in_banner) && !package.is_explicit) { +- var package_row = new AppCenter.Widgets.ListPackageRowGrid (package); +- recently_updated_carousel.add (package_row); +- } +- } +- recently_updated_carousel.show_all (); +- recently_updated_revealer.reveal_child = recently_updated_carousel.get_children ().length () > 0; +- +- page_loaded (); + } + + public override void show_package ( +@@ -307,26 +150,4 @@ public class AppCenter.Homepage : AbstractView { + var apps = client.get_applications_for_category (category); + app_list_view.add_packages (apps); + } +- +- private void banner_timeout_start () { +- banner_timeout_id = Timeout.add (MILLISECONDS_BETWEEN_BANNER_ITEMS, () => { +- var new_index = (uint) banner_carousel.position + 1; +- var max_index = banner_carousel.n_pages - 1; // 0-based index +- +- if (banner_carousel.position >= max_index) { +- new_index = 0; +- } +- +- banner_carousel.switch_child (new_index, Granite.TRANSITION_DURATION_OPEN); +- +- return Source.CONTINUE; +- }); +- } +- +- private void banner_timeout_stop () { +- if (banner_timeout_id != 0) { +- Source.remove (banner_timeout_id); +- banner_timeout_id = 0; +- } +- } + } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/flatpak-only.patch b/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/flatpak-only.patch new file mode 100644 index 000000000000..aa8cde89616a --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/appcenter/flatpak-only.patch @@ -0,0 +1,162 @@ +From 5d3f20b49a89b55e39339a0f90ae7f846356b0e1 Mon Sep 17 00:00:00 2001 +From: Bobby Rong <rjl931189261@126.com> +Date: Wed, 22 Sep 2021 11:54:24 +0800 +Subject: [PATCH 1/2] Drop PackageKitBackend and UbuntuDriversBackend + +--- + src/Application.vala | 14 --------- + src/Core/BackendAggregator.vala | 2 -- + src/Core/UpdateManager.vala | 56 --------------------------------- + src/MainWindow.vala | 17 ---------- + 4 files changed, 89 deletions(-) + +diff --git a/src/Application.vala b/src/Application.vala +index 65fae5aa..9d42b14f 100644 +--- a/src/Application.vala ++++ b/src/Application.vala +@@ -167,10 +167,6 @@ public class AppCenter.App : Gtk.Application { + + var client = AppCenterCore.Client.get_default (); + +- if (fake_update_packages != null) { +- AppCenterCore.PackageKitBackend.get_default ().fake_packages = fake_update_packages; +- } +- + if (silent) { + NetworkMonitor.get_default ().network_changed.connect ((available) => { + schedule_cache_update (!available); +@@ -183,16 +179,6 @@ public class AppCenter.App : Gtk.Application { + return; + } + +- if (local_path != null) { +- var file = File.new_for_commandline_arg (local_path); +- +- try { +- local_package = AppCenterCore.PackageKitBackend.get_default ().add_local_component_file (file); +- } catch (Error e) { +- warning ("Failed to load local AppStream XML file: %s", e.message); +- } +- } +- + if (main_window == null) { + main_window = new MainWindow (this); + +diff --git a/src/Core/BackendAggregator.vala b/src/Core/BackendAggregator.vala +index 2f8bdedf..b705ca87 100644 +--- a/src/Core/BackendAggregator.vala ++++ b/src/Core/BackendAggregator.vala +@@ -26,8 +26,6 @@ public class AppCenterCore.BackendAggregator : Backend, Object { + + construct { + backends = new Gee.ArrayList<unowned Backend> (); +- backends.add (PackageKitBackend.get_default ()); +- backends.add (UbuntuDriversBackend.get_default ()); + backends.add (FlatpakBackend.get_default ()); + + unowned Gtk.Application app = (Gtk.Application) GLib.Application.get_default (); +diff --git a/src/Core/UpdateManager.vala b/src/Core/UpdateManager.vala +index 29fa397a..ce42dd57 100644 +--- a/src/Core/UpdateManager.vala ++++ b/src/Core/UpdateManager.vala +@@ -53,42 +53,9 @@ public class AppCenterCore.UpdateManager : Object { + installed_package.update_state (); + } + +- Pk.Results pk_updates; +- unowned PackageKitBackend client = PackageKitBackend.get_default (); +- try { +- pk_updates = yield client.get_updates (cancellable); +- } catch (Error e) { +- warning ("Unable to get updates from PackageKit backend: %s", e.message); +- return 0; +- } +- + uint os_count = 0; + string os_desc = ""; + +- var package_array = pk_updates.get_package_array (); +- debug ("PackageKit backend reports %d updates", package_array.length); +- +- package_array.foreach ((pk_package) => { +- var pkg_name = pk_package.get_name (); +- var appcenter_package = client.lookup_package_by_id (pkg_name); +- if (appcenter_package != null) { +- debug ("Added %s to app updates", pkg_name); +- apps_with_updates.add (appcenter_package); +- appcenter_package.latest_version = pk_package.get_version (); +- } else { +- debug ("Added %s to OS updates", pkg_name); +- os_count++; +- unowned string pkg_summary = pk_package.get_summary (); +- unowned string pkg_version = pk_package.get_version (); +- os_desc += Markup.printf_escaped ( +- "<li>%s\n\t%s\n\t%s</li>\n", +- pkg_name, +- pkg_summary, +- _("Version: %s").printf (pkg_version) +- ); +- } +- }); +- + os_updates.component.set_pkgnames ({}); + os_updates.change_information.clear_update_info (); + +@@ -160,29 +127,6 @@ public class AppCenterCore.UpdateManager : Object { + count += 1; + } + +- pk_updates.get_details_array ().foreach ((pk_detail) => { +- var pk_package = new Pk.Package (); +- try { +- pk_package.set_id (pk_detail.get_package_id ()); +- var pkg_name = pk_package.get_name (); +- var appcenter_package = client.lookup_package_by_id (pkg_name); +- if (appcenter_package != null) { +- appcenter_package.change_information.updatable_packages.@set (client, pk_package.get_id ()); +- appcenter_package.change_information.size += pk_detail.size; +- appcenter_package.update_state (); +- } else { +- var pkgnames = os_updates.component.pkgnames; +- pkgnames += pkg_name; +- os_updates.component.pkgnames = pkgnames; +- +- os_updates.change_information.updatable_packages.@set (client, pk_package.get_id ()); +- os_updates.change_information.size += pk_detail.size; +- } +- } catch (Error e) { +- critical (e.message); +- } +- }); +- + os_updates.update_state (); + return count; + } +diff --git a/src/MainWindow.vala b/src/MainWindow.vala +index a32ce47b..b9f8594a 100644 +--- a/src/MainWindow.vala ++++ b/src/MainWindow.vala +@@ -292,23 +292,6 @@ public class AppCenter.MainWindow : Hdy.ApplicationWindow { + } + + public override bool delete_event (Gdk.EventAny event) { +- unowned AppCenterCore.PackageKitBackend client = AppCenterCore.PackageKitBackend.get_default (); +- if (client.working) { +- if (task_finished_connection != 0U) { +- client.disconnect (task_finished_connection); +- } +- +- hide (); +- task_finished_connection = client.notify["working"].connect (() => { +- if (!visible && !client.working) { +- destroy (); +- } +- }); +- +- AppCenterCore.Client.get_default ().cancel_updates (false); //Timeouts keep running +- return true; +- } +- + return false; + } + diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 8b02af57d42d..7fbaa32dc39f 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , pkg-config @@ -12,6 +13,7 @@ , python3 , granite , libgee +, libhandy , elementary-icon-theme , appstream , wrapGAppsHook @@ -19,7 +21,7 @@ stdenv.mkDerivation rec { pname = "elementary-calculator"; - version = "1.6.2"; + version = "1.7.0"; repoName = "calculator"; @@ -27,7 +29,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-kOQr94PAfLPv4LjY2WDdTtlbf3/tYf+NUESZ94+L41M="; + sha256 = "1kl2iximcmbk8inklb2xav7dp08lp5pn9xxa59327zw13gdy8fkf"; }; passthru = { @@ -53,6 +55,7 @@ stdenv.mkDerivation rec { granite gtk3 libgee + libhandy ]; postPatch = '' @@ -65,6 +68,6 @@ stdenv.mkDerivation rec { description = "Calculator app designed for elementary OS"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index cf0d0d812fe1..549493966c13 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -10,6 +10,7 @@ , gtk3 , granite , libgee +, libhandy , geoclue2 , libchamplain , clutter @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { pname = "elementary-calendar"; - version = "5.1.1"; + version = "6.0.2"; repoName = "calendar"; @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "18npf4zzf2dywr1zkr6fqzcbb70297yvdp5wxw7zyam1xwa86v07"; + sha256 = "16xp8gfgpyz9xpjsxm6jlk4skkknj65g0q4x0qvw9sg9f1p6a514"; }; passthru = { @@ -66,6 +67,7 @@ stdenv.mkDerivation rec { gtk3 libchamplain libgee + libhandy libical libnotify libgdata # required by some dependency transitively @@ -81,6 +83,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/calendar"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 9a48d38ad8cb..432e5fdf00e7 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -13,6 +13,7 @@ , gtk3 , granite , libgee +, libhandy , gst_all_1 , libcanberra , clutter-gtk @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { pname = "elementary-camera"; - version = "1.0.6"; + version = "6.0.0"; repoName = "camera"; @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-asl5NdSuLItXebxvqGlSEjwWhdButmka12YQAYkQT44="; + sha256 = "1z5c6pkc7psglxwzby5idsdxvplpi28ckjxrwdngnr22knfdcgag"; }; passthru = { @@ -61,11 +62,12 @@ stdenv.mkDerivation rec { granite gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good + (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) gst_all_1.gstreamer gtk3 libcanberra libgee + libhandy ]; postPatch = '' @@ -76,8 +78,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Camera app designed for elementary OS"; homepage = "https://github.com/elementary/camera"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 50a32420de09..8516133b18d8 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , pkg-config @@ -41,6 +42,15 @@ stdenv.mkDerivation rec { sha256 = "1w1m52mq3zr9alkxk1c0s4ncscka1km5ppd0r6zm86qan9cjwq0f"; }; + patches = [ + # Upstream code not respecting our localedir + # https://github.com/elementary/code/pull/1090 + (fetchpatch { + url = "https://github.com/elementary/code/commit/88dc40d7bbcc2288ada6673eb8f4fab345d97882.patch"; + sha256 = "16y20bvslcm390irlib759703lvf7w6rz4xzaiazjj1r1njwinvv"; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -53,10 +63,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - - # polkit is needed for ITS rules - polkit - + polkit # needed for ITS rules python3 vala wrapGAppsHook @@ -100,6 +107,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/code"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-dock/default.nix index 797f62cf8e2f..4de65108c564 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-dock/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-dock/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , vala , atk , cairo @@ -24,11 +23,12 @@ , pantheon , meson , ninja +, granite }: stdenv.mkDerivation rec { pname = "elementary-dock"; - version = "unstable-2020-06-11"; + version = "unstable-2021-07-16"; outputs = [ "out" "dev" ]; @@ -37,18 +37,10 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "elementary"; repo = repoName; - rev = "0a389ee58939d8c91c340df4e5340fc4b23d0b80"; - sha256 = "01vinik73s0vmk56samgf49zr2bl4wjv44x15sz2cmh744llckja"; + rev = "05fd6fccdf1a769f6737a0d7e57e092825348660"; + sha256 = "0lqqq5cx0kk8y7qyjx7z2k3v1kw2xxzns968ianarcji19wzcns4"; }; - patches = [ - # Fix double includedir path in plank.pc - (fetchpatch { - url = "https://github.com/elementary/dock/commit/3bc368e2c4fafcd5b8baca2711c773b0e2441c7c.patch"; - sha256 = "0gg35phi1cg7ixljc388i0h70w323r1gqzjhanccnsbjpqsgvs3k"; - }) - ]; - nativeBuildInputs = [ gettext meson @@ -67,6 +59,7 @@ stdenv.mkDerivation rec { glib gnome-menus dconf + granite gtk3 libX11 libXfixes @@ -82,6 +75,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/dock"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers; + maintainers = with maintainers; [ davidak ] ++ teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index 2e20314d480a..e65e45809c45 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , pkg-config @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { pname = "elementary-feedback"; - version = "6.0.0"; + version = "6.1.0"; repoName = "feedback"; @@ -29,9 +30,18 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1fh9a0nfvbrxamki9avm9by760csj2nqy4ya7wzbnqbrrvjwd3fv"; + sha256 = "02wydbpa5qaa4xmmh4m7rbj4djbrn2i44zjakj5i6mzwjlj6sv5n"; }; + patches = [ + # Upstream code not respecting our localedir + # https://github.com/elementary/feedback/pull/48 + (fetchpatch { + url = "https://github.com/elementary/feedback/commit/080005153977a86d10099eff6a5b3e68f7b12847.patch"; + sha256 = "01710i90qsaqsrjs92ahwwj198bdrrif6mnw29l9har2rncfkfk2"; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -69,6 +79,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/feedback"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/0001-filechooser-module-hardcode-gsettings-for-nixos.patch b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/0001-filechooser-module-hardcode-gsettings-for-nixos.patch deleted file mode 100644 index 9bcedac3f035..000000000000 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/0001-filechooser-module-hardcode-gsettings-for-nixos.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f51974c9736c3e28755245d15729578214652343 Mon Sep 17 00:00:00 2001 -Message-Id: <f51974c9736c3e28755245d15729578214652343.1599178185.git-series.worldofpeace@protonmail.ch> -From: worldofpeace <worldofpeace@protonmail.ch> -Date: Thu, 3 Sep 2020 20:08:15 -0400 -Subject: [PATCH] filechooser-module: hardcode gsettings for nixos - ---- - filechooser-module/FileChooserDialog.vala | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/filechooser-module/FileChooserDialog.vala b/filechooser-module/FileChooserDialog.vala -index a70fe10..08fde2c 100644 ---- a/filechooser-module/FileChooserDialog.vala -+++ b/filechooser-module/FileChooserDialog.vala -@@ -60,10 +60,14 @@ public class CustomFileChooserDialog : Object { - /* If not local only during creation, strange bug occurs on fresh installs */ - chooser_dialog.local_only = true; - -- var files_preferences = new Settings ("io.elementary.files.preferences"); -+ SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@ELEMENTARY_FILES_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true); -+ SettingsSchema preferences_schema = sss.lookup ("io.elementary.files.preferences", false); -+ SettingsSchema chooser_schema = sss.lookup ("io.elementary.files.file-chooser", false); -+ -+ var files_preferences = new Settings.full (preferences_schema, null, null); - is_single_click = files_preferences.get_boolean ("single-click"); - -- var chooser_settings = new Settings ("io.elementary.files.file-chooser"); -+ var chooser_settings = new Settings.full (chooser_schema, null, null); - - assign_container_box (); - remove_gtk_widgets (); - -base-commit: 57cb89b64fd2d5c08f4aaf23e8c74bfaa5d0384f --- -git-series 0.9.1 diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 99fd2a6555f5..dcdd1bb9acec 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -13,9 +13,9 @@ , gtk3 , glib , libgee +, libhandy , granite , libnotify -, libunity , pango , elementary-dock , bamf @@ -27,11 +27,12 @@ , libcloudproviders , libgit2-glib , wrapGAppsHook +, systemd }: stdenv.mkDerivation rec { pname = "elementary-files"; - version = "4.5.0"; + version = "6.0.2"; repoName = "files"; @@ -41,7 +42,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-wtQW1poX791DAlSFdVV9psnCfBDeVXI2fDZ2GcvvNn8="; + sha256 = "1i514r3adypmcwinmv4c1kybims16xi4i3akx0yy04dib92hbk7c"; }; passthru = { @@ -73,30 +74,31 @@ stdenv.mkDerivation rec { libdbusmenu-gtk3 libgee libgit2-glib + libhandy libnotify - libunity pango sqlite + systemd zeitgeist ]; patches = [ - ./0001-filechooser-module-hardcode-gsettings-for-nixos.patch + ./filechooser-portal-hardcode-gsettings-for-nixos.patch ]; postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py - substituteInPlace filechooser-module/FileChooserDialog.vala \ + substituteInPlace filechooser-portal/LegacyFileChooserDialog.vala \ --subst-var-by ELEMENTARY_FILES_GSETTINGS_PATH ${glib.makeSchemaPath "$out" "${pname}-${version}"} ''; meta = with lib; { description = "File browser designed for elementary OS"; homepage = "https://github.com/elementary/files"; - license = licenses.lgpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/filechooser-portal-hardcode-gsettings-for-nixos.patch b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/filechooser-portal-hardcode-gsettings-for-nixos.patch new file mode 100644 index 000000000000..b04208cc8b86 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/filechooser-portal-hardcode-gsettings-for-nixos.patch @@ -0,0 +1,24 @@ +From 726ab4c0ab01273cb2197e4c151a5b69ff0954b6 Mon Sep 17 00:00:00 2001 +From: Bobby Rong <rjl931189261@126.com> +Date: Fri, 16 Jul 2021 18:24:58 +0800 +Subject: [PATCH] filechooser-portal: hardcode gsettings for nixos + +--- + filechooser-portal/LegacyFileChooserDialog.vala | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/filechooser-portal/LegacyFileChooserDialog.vala b/filechooser-portal/LegacyFileChooserDialog.vala +index 330718f..f383bb1 100644 +--- a/filechooser-portal/LegacyFileChooserDialog.vala ++++ b/filechooser-portal/LegacyFileChooserDialog.vala +@@ -60,7 +60,9 @@ public class Files.LegacyFileChooserDialog : Object { + /* If not local only during creation, strange bug occurs on fresh installs */ + chooser_dialog.local_only = true; + +- var chooser_settings = new Settings ("io.elementary.files.file-chooser"); ++ SettingsSchemaSource sss = new SettingsSchemaSource.from_directory ("@ELEMENTARY_FILES_GSETTINGS_PATH@", SettingsSchemaSource.get_default (), true); ++ SettingsSchema chooser_schema = sss.lookup ("io.elementary.files.file-chooser", false); ++ var chooser_settings = new Settings.full (chooser_schema, null, null); + + action_area = (Gtk.ButtonBox) chooser_dialog.get_action_area (); + diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index c990ecb24d6b..6d0b752c1d1d 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , pkg-config @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { pname = "elementary-mail"; - version = "6.0.0"; + version = "6.1.1"; repoName = "mail"; @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "07iiipl0nsp63g5bn1y2hg6bmgj6i9cxqcfpd7q3vmldnkijvaxs"; + sha256 = "15ai0x9236pjx76m0756nyc1by78v0lg1dgdiifk868krdvipzzx"; }; passthru = { @@ -42,6 +43,12 @@ stdenv.mkDerivation rec { }; }; + patches = [ + # The app stuck when loading gravatar, temporarily reverts part + # of https://github.com/elementary/mail/pull/600 to fix this + ./revert-fix-warning.patch + ]; + nativeBuildInputs = [ appstream desktop-file-utils @@ -77,6 +84,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/mail"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers ++ [ maintainers.ethancedwards8 ]; + maintainers = with maintainers; [ ethancedwards8 ] ++ teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/revert-fix-warning.patch b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/revert-fix-warning.patch new file mode 100644 index 000000000000..85534aaf4c60 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-mail/revert-fix-warning.patch @@ -0,0 +1,55 @@ +From 9e61e9493e78b83b9599886561ee596c096030ed Mon Sep 17 00:00:00 2001 +From: Bobby Rong <rjl931189261@126.com> +Date: Thu, 29 Jul 2021 13:57:21 +0800 +Subject: [PATCH] Partly revert "Fix Warnings in Vala Code (#600)" + +This partly reverts commit 9477c24201d3c9c3c7bcc650e0290daa0ee1ab21. +--- + src/MessageList/MessageListItem.vala | 27 ++++++++++++++++++++++++++- + 1 file changed, 26 insertions(+), 1 deletion(-) + +diff --git a/src/MessageList/MessageListItem.vala b/src/MessageList/MessageListItem.vala +index 96b61027..a7ef8f9e 100644 +--- a/src/MessageList/MessageListItem.vala ++++ b/src/MessageList/MessageListItem.vala +@@ -290,7 +290,7 @@ public class Mail.MessageListItem : Gtk.ListBoxRow { + expanded = false; + show_all (); + +- avatar.set_loadable_icon (new GravatarIcon (parsed_address, get_style_context ().get_scale ())); ++ download_gravatar.begin (parsed_address, avatar.size); + + /* Override default handler to stop event propagation. Otherwise clicking the menu will + expand or collapse the MessageListItem. */ +@@ -348,6 +348,31 @@ public class Mail.MessageListItem : Gtk.ListBoxRow { + }); + } + ++ private async void download_gravatar (string address, int size) { ++ if (avatars[address] == null) { ++ var uri = "https://secure.gravatar.com/avatar/%s?d=404&s=%d".printf ( ++ Checksum.compute_for_string (ChecksumType.MD5, address.strip ().down ()), ++ size * get_style_context ().get_scale () ++ ); ++ ++ var server_file = File.new_for_uri (uri); ++ var path = Path.build_filename (Environment.get_tmp_dir (), server_file.get_basename ()); ++ var local_file = File.new_for_path (path); ++ ++ try { ++ yield server_file.copy_async (local_file, FileCopyFlags.OVERWRITE, Priority.DEFAULT, null); ++ avatars[address] = new Gdk.Pixbuf.from_file_at_scale (path, size, size, true); ++ } catch (Error e) { ++ debug ("Unable to fetch gravatar: %s", e.message); ++ return; ++ } ++ } ++ ++ avatar.set_image_load_func (() => { ++ return avatars[address]; ++ }); ++ } ++ + private void add_inline_composer (ComposerWidget.Type composer_type) { + var message_list_box = (MessageListBox) get_parent (); + message_list_box.add_inline_composer.begin (composer_type, this); diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix index fe6c3f187fe3..300e7919dced 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , pkg-config @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { pname = "elementary-music"; - version = "5.1.0"; + version = "5.1.1"; repoName = "music"; @@ -39,9 +40,18 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "13v7rii9ardyd661s6d4hvvs4ig44v7s3qd1bx7imaigr72gg58b"; + sha256 = "1wqsn4ss9acg0scaqpg514ll2dj3bl71wly4mm79qkinhy30yv9n"; }; + patches = [ + # Upstream code not respecting our localedir + # https://github.com/elementary/music/pull/648 + (fetchpatch { + url = "https://github.com/elementary/music/commit/aea97103d59afd213467403a48788e476e47c4c3.patch"; + sha256 = "1ayj8l6lb19hhl9bhsdfbq7jgchfmpjx0qkljnld90czcksn95yx"; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -84,7 +94,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dplugins=lastfm,audioplayer,cdrom,ipod" + "-Dplugins=audioplayer,cdrom,ipod" ]; postPatch = '' @@ -95,8 +105,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Music player and library designed for elementary OS"; homepage = "https://github.com/elementary/music"; - license = licenses.lgpl2Plus; + license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index bced420dbc0a..61ec86dec44e 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -5,7 +5,7 @@ , meson , ninja , pkg-config -, vala +, vala_0_52 , desktop-file-utils , gtk3 , libaccounts-glib @@ -28,14 +28,13 @@ , webkitgtk , libwebp , appstream -, libunity , wrapGAppsHook , elementary-icon-theme }: stdenv.mkDerivation rec { pname = "elementary-photos"; - version = "2.7.1"; + version = "2.7.2"; repoName = "photos"; @@ -43,7 +42,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1dql14k43rv3in451amiwv4z71hz3ailx67hd8gw1ka3yw12128p"; + sha256 = "1zq9zfsc987vvrzadw9xqi3rlbi4jv2s82axkgy7ijm3ibi58ddc"; }; passthru = { @@ -59,7 +58,9 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - vala + # Does not build with vala 0.54 + # https://github.com/elementary/photos/issues/638 + vala_0_52 wrapGAppsHook ]; @@ -84,7 +85,6 @@ stdenv.mkDerivation rec { libraw librest libsoup - libunity libwebp scour sqlite @@ -105,6 +105,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/photos"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix index 048aa4ab129e..4eb574d69f26 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix @@ -11,14 +11,15 @@ , gtk3 , granite , libgee +, libhandy , libcanberra , elementary-icon-theme , wrapGAppsHook }: stdenv.mkDerivation rec { - pname = "elementary-screenshot-tool"; # This will be renamed to "screenshot" soon. See -> https://github.com/elementary/screenshot/pull/93 - version = "1.7.1"; + pname = "elementary-screenshot"; + version = "6.0.0"; repoName = "screenshot"; @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-qo55fzp0ieYF5I5uxnCQY066mege06InHL3B3ahYMZ0="; + sha256 = "1fvsl9zdkv7bgx3jpy7pr9lflm4ckr3swdby379mdxn2x6kxji0x"; }; passthru = { @@ -51,6 +52,7 @@ stdenv.mkDerivation rec { gtk3 libcanberra libgee + libhandy ]; postPatch = '' @@ -63,6 +65,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/screenshot"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix new file mode 100644 index 000000000000..bec0556a377d --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix @@ -0,0 +1,84 @@ +{ lib, stdenv +, fetchFromGitHub +, nix-update-script +, pantheon +, appstream +, desktop-file-utils +, meson +, ninja +, pkg-config +, python3 +, vala +, wrapGAppsHook +, clutter-gtk +, elementary-icon-theme +, evolution-data-server +, granite +, geoclue2 +, geocode-glib +, gtk3 +, libchamplain +, libgdata +, libgee +, libhandy +, libical +}: + +stdenv.mkDerivation rec { + pname = "elementary-tasks"; + version = "6.0.3"; + + repoName = "tasks"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = repoName; + rev = version; + sha256 = "0a6zgf7di4jyl764pn78wbanm0i5vrkk5ks3cfsvi3baprf3j9d5"; + }; + + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + + nativeBuildInputs = [ + appstream + desktop-file-utils + meson + ninja + pkg-config + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + clutter-gtk + elementary-icon-theme + evolution-data-server + granite + geoclue2 + geocode-glib + gtk3 + libchamplain + libgdata + libgee + libhandy + libical + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with lib; { + homepage = "https://github.com/elementary/tasks"; + description = "Synced tasks and reminders on elementary OS"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.pantheon.members; + }; +} diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 6e6beba50cec..cd0e39628023 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -35,6 +35,15 @@ stdenv.mkDerivation rec { sha256 = "08akr4sv4jy9kd4s26kib6j7i8hc3vs0sp71fifv7ww4mi9cm6jc"; }; + patches = [ + # Upstream code not respecting our localedir + # https://github.com/elementary/terminal/pull/611 + (fetchpatch { + url = "https://github.com/elementary/terminal/commit/4f6f2d9f58642ed904240c247cc0a0846baecb6b.patch"; + sha256 = "04pbd72migxw8i949v3bmw8kfi5nr02rjcwfrx3b6xkiic9825sv"; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -81,6 +90,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/terminal"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index 95df9a613a82..0c06e7b24439 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , pkg-config @@ -31,6 +32,15 @@ stdenv.mkDerivation rec { sha256 = "04nl9kn33dysvsg0n5qx1z8qgrifkgfwsm7gh1l308v3n8c69lh7"; }; + patches = [ + # Upstream code not respecting our localedir + # https://github.com/elementary/videos/pull/233 + (fetchpatch { + url = "https://github.com/elementary/videos/commit/19ba2a9148be09ea521d2e9ac29dede6b9c6fa07.patch"; + sha256 = "0ffp7ana98846xi7vxrzfg6dbs4yy28x2i4ky85mqs1gj6fjqin5"; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -72,6 +82,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/videos"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/sideload/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/sideload/default.nix index c3ba1717801d..df152afc1a0c 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/sideload/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/sideload/default.nix @@ -10,6 +10,7 @@ , granite , gtk3 , libgee +, libhandy , meson , ninja , pantheon @@ -22,13 +23,13 @@ stdenv.mkDerivation rec { pname = "sideload"; - version = "1.1.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-eI/j6+lok9axRHV5DCsFY1fDCV+X5zBR7X8rK6odjFY="; + sha256 = "0abpcawmmv5mgzk2i5n9rlairmjr2v9rg9b8c9g7xa085s496bi9"; }; passthru = { @@ -56,6 +57,7 @@ stdenv.mkDerivation rec { granite gtk3 libgee + libhandy libxml2 ]; @@ -69,6 +71,6 @@ stdenv.mkDerivation rec { description = "Flatpak installer, designed for elementary OS"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix index 06f097e81af5..949f1ecc3d0b 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , substituteAll , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , meson @@ -11,18 +12,19 @@ , granite , gtk3 , switchboard +, wingpanel-indicator-a11y , onboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-a11y"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-3PaOIadlEdYvfNZJaoAQVDKdSTfUdn+snCa8tHmDFD0="; + sha256 = "0dc5jv335j443rg08cb7p8wvmcg36wrf1vlcfg9r20cksdis9v4l"; }; patches = [ @@ -30,6 +32,12 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit onboard; }) + # Upstream code not respecting our localedir + # https://github.com/elementary/switchboard-plug-a11y/pull/79 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-a11y/commit/08db4b696128a6bf809da3403a818834fcd62b02.patch"; + sha256 = "1s13ak23bdxgcb74wdz3ql192bla5qhabdicqyjv1rp32plhkbg5"; + }) ]; passthru = { @@ -50,13 +58,14 @@ stdenv.mkDerivation rec { gtk3 libgee switchboard + wingpanel-indicator-a11y ]; meta = with lib; { description = "Switchboard Universal Access Plug"; homepage = "https://github.com/elementary/switchboard-plug-a11y"; - license = licenses.lgpl3Plus; + license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index adba2ec08017..c1144dd4ecd6 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , substituteAll @@ -9,22 +8,24 @@ , pkg-config , vala , libgee +, libgtop +, libhandy , granite , gtk3 , switchboard -, pciutils -, elementary-feedback +, fwupd +, appstream }: stdenv.mkDerivation rec { pname = "switchboard-plug-about"; - version = "2.6.3"; + version = "6.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-wis6wNEOOjPLUCT9vRRhMxbKHR2Y2nZArKogSF/FQv8="; + sha256 = "0c075ac7iqz4hqbp2ph0cwyhiq0jn6c1g1jjfhygjbssv3vvd268"; }; passthru = { @@ -41,32 +42,20 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + appstream + fwupd granite gtk3 libgee + libgtop + libhandy switchboard ]; patches = [ - # Get OS Info from GLib.Environment - # https://github.com/elementary/switchboard-plug-about/pull/128 - (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-about/commit/5ed29988e3a895b2df66e5529df0f12a94d5517c.patch"; - sha256 = "1ipDxnpDZjpSEzZdtOeNe5U+QOXiB5M+hC3yDAsl/rQ="; - }) - - # Use Pretty Name - # https://github.com/elementary/switchboard-plug-about/pull/134 - (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-about/commit/653d131dc8fac10ae7523f2bf6b179ffffa9c0fd.patch"; - sha256 = "AsM49Dc9/yn2tG6fqjfedeOlDXUu+iEoyNUmNYLH+zE="; - }) - - (substituteAll { - src = ./fix-paths.patch; - inherit pciutils; - elementary_feedback = elementary-feedback; - }) + # The NixOS logo is not centered in the circular background and path + # to the background is hardcoded, we will drop the background. + ./remove-logo-background.patch ]; meta = with lib; { @@ -74,7 +63,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-about"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/fix-paths.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/fix-paths.patch deleted file mode 100644 index d458689a3253..000000000000 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/fix-paths.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/Plug.vala b/src/Plug.vala -index c32efcbe..0cdaeaca 100644 ---- a/src/Plug.vala -+++ b/src/Plug.vala -@@ -178,7 +178,7 @@ public class About.Plug : Switchboard.Plug { - - var bug_button = new Gtk.Button.with_label (_("Report a Problem")); - bug_button.clicked.connect (() => { -- var appinfo = new GLib.DesktopAppInfo ("io.elementary.feedback.desktop"); -+ var appinfo = new GLib.DesktopAppInfo ("@elementary_feedback@/bin/io.elementary.feedback.desktop"); - if (appinfo != null) { - try { - appinfo.launch (null, null); -diff --git a/src/Views/HardwareView.vala b/src/Views/HardwareView.vala -index f8113634..3794bad8 100644 ---- a/src/Views/HardwareView.vala -+++ b/src/Views/HardwareView.vala -@@ -179,7 +179,7 @@ public class About.HardwareView : Gtk.Grid { - - // Graphics - try { -- Process.spawn_command_line_sync ("lspci", out graphics); -+ Process.spawn_command_line_sync ("@pciutils@/bin/lspci", out graphics); - - if ("VGA" in graphics) { //VGA-keyword indicates graphics-line - string[] lines = graphics.split("\n"); diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/remove-logo-background.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/remove-logo-background.patch new file mode 100644 index 000000000000..bc7805a22c47 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/about/remove-logo-background.patch @@ -0,0 +1,36 @@ +diff --git a/src/Views/OperatingSystemView.vala b/src/Views/OperatingSystemView.vala +index fdb92e7..87bb3a4 100644 +--- a/src/Views/OperatingSystemView.vala ++++ b/src/Views/OperatingSystemView.vala +@@ -39,21 +39,6 @@ public class About.OperatingSystemView : Gtk.Grid { + logo_icon_name = "distributor-logo"; + } + +- var logo = new Hdy.Avatar (128, "", false) { +- // In case the wallpaper can't be loaded, we don't want an icon or text +- icon_name = "invalid-icon-name", +- // We need this for the shadow to not get clipped by Gtk.Overlay +- margin = 6 +- }; +- logo.set_image_load_func ((size) => { +- try { +- return new Gdk.Pixbuf.from_file_at_scale ("/usr/share/backgrounds/elementaryos-default", -1, size, true); +- } catch (Error e) { +- critical (e.message); +- } +- }); +- logo.get_style_context ().add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); +- + var icon = new Gtk.Image () { + icon_name = logo_icon_name + "-symbolic", + // 128 minus 3px padding on each side +@@ -65,8 +50,7 @@ public class About.OperatingSystemView : Gtk.Grid { + icon_style_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); + + var logo_overlay = new Gtk.Overlay (); +- logo_overlay.add (logo); +- logo_overlay.add_overlay (icon); ++ logo_overlay.add (icon); + + // Intentionally not using GLib.OsInfoKey.PRETTY_NAME here because we + // want more granular control over text formatting diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index 66596fa2ff1b..3b3cbf64ef85 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , meson @@ -10,19 +11,29 @@ , granite , gtk3 , switchboard +, flatpak }: stdenv.mkDerivation rec { pname = "switchboard-plug-applications"; - version = "2.1.7"; + version = "6.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-uiu19XyogNR0LX/2IIZM6B1JKAfqDMOHniQ29EAa9XM="; + sha256 = "0hgvmrgg6g2sjb3sda7kzfcd3zgngd5w982drl6ll44k1mh16gsj"; }; + patches = [ + # Upstream code not respecting our localedir + # https://github.com/elementary/switchboard-plug-applications/pull/163 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-applications/commit/25db490654ab41694be7b7ba19218376f42fbb8d.patch"; + sha256 = "16y8zcwnnjsh72ifpyqcdb9f5ajdj0iy8kb5sj6v77c1cxdhrv29"; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -37,6 +48,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + flatpak granite gtk3 libgee @@ -46,8 +58,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Switchboard Applications Plug"; homepage = "https://github.com/elementary/switchboard-plug-applications"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index dea3c0306a32..2238125fe2f6 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , meson @@ -15,15 +16,24 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-bluetooth"; - version = "2.3.2"; + version = "2.3.6"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-avu9Hya3C9g8kGl3D9bLwuZBkNPdwyvLspuBWgvpXU8="; + sha256 = "0n9fhi9g0ww341bjk6lpc5ppnl7qj9b3d63j9a7iqnap57bgks9y"; }; + patches = [ + # Upstream code not respecting our localedir + # https://github.com/elementary/switchboard-plug-bluetooth/pull/182 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-bluetooth/commit/031dd5660b4bcb0bb4e82ebe6d8bcdaa1791c385.patch"; + sha256 = "1g01ad6md7pqp1fx00avbra8yfnr8ipg8y6zhfg35fgjakj4aags"; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -50,7 +60,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-bluetooth"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index 2337ef241198..b4518ea1e440 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , meson @@ -17,13 +18,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-datetime"; - version = "2.1.9"; + version = "2.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-qgsU3NXqH7ryUah7rEnUrsbecV4AsOo4QfgTcWc5bc4="; + sha256 = "10rqhxsqbl1xnz5n84d7m39c3vb71k153989xvyc55djia1wjx96"; }; passthru = { @@ -32,6 +33,19 @@ stdenv.mkDerivation rec { }; }; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + tzdata = tzdata; + }) + # Upstream code not respecting our localedir + # https://github.com/elementary/switchboard-plug-datetime/pull/100 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-datetime/commit/a90639ed4f185f50d4ae448cd9503203dc24b3f4.patch"; + sha256 = "0dz0s02ccnds62dqil44k652pc5icka2rfhcx0a5bj1wi5sifnp7"; + }) + ]; + nativeBuildInputs = [ libxml2 meson @@ -52,6 +66,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-datetime"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/fix-paths.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/fix-paths.patch new file mode 100644 index 000000000000..784ea9daa0b7 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/fix-paths.patch @@ -0,0 +1,15 @@ +diff --git a/src/Parser.vala b/src/Parser.vala +index 7c7b82d..2c3a061 100644 +--- a/src/Parser.vala ++++ b/src/Parser.vala +@@ -28,9 +28,9 @@ public class DateTime.Parser : GLib.Object { + return parser; + } + private Parser () { +- var file = File.new_for_path ("/usr/share/zoneinfo/zone.tab"); ++ var file = File.new_for_path ("@tzdata@/share/zoneinfo/zone.tab"); + if (!file.query_exists ()) { +- critical ("/usr/share/zoneinfo/zone.tab doesn't exist !"); ++ critical ("@tzdata@/share/zoneinfo/zone.tab doesn't exist !"); + return; + } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index 055a40989631..0fbb1eb81e7c 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-display"; - version = "2.2.2"; + version = "2.3.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-mjmvuSipCRGg/HSa1n1eLyVU1gERNT2ciqgz/0KqX0Y="; + sha256 = "1dqd34v124y71nnk0l617a53x652m0sb7b58465imr6ppyhx4vsv"; }; passthru = { @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Switchboard Displays Plug"; homepage = "https://github.com/elementary/switchboard-plug-display"; - license = licenses.lgpl2Plus; + license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch index 42900c380627..550aefbb1f10 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/0001-Remove-Install-Unlisted-Engines-function.patch @@ -1,19 +1,21 @@ -From 4fd6da39ab33a6eef46ee2c64eb4f5595c7fe633 Mon Sep 17 00:00:00 2001 -Message-Id: <4fd6da39ab33a6eef46ee2c64eb4f5595c7fe633.1599180249.git-series.worldofpeace@protonmail.ch> -From: worldofpeace <worldofpeace@protonmail.ch> -Date: Thu, 3 Sep 2020 20:43:25 -0400 +From f23363ad2fa402d59b41ffe2c13a46462c6d2194 Mon Sep 17 00:00:00 2001 +From: Bobby Rong <rjl931189261@126.com> +Date: Fri, 16 Jul 2021 23:28:56 +0800 Subject: [PATCH] Remove Install Unlisted Engines function https://github.com/elementary/switchboard-plug-keyboard/issues/324 + +Co-Authored-By: WORLDofPEACE <worldofpeace@protonmail.ch> + --- - src/Dialogs/InstallEngineDialog.vala | 140 +------------------ - src/Dialogs/ProgressDialog.vala | 82 +---------- - src/InputMethod/Installer/InstallList.vala | 73 +--------- - src/InputMethod/Installer/UbuntuInstaller.vala | 142 +------------------ - src/InputMethod/Installer/aptd-client.vala | 93 +------------ - src/Widgets/InputMethod/AddEnginesPopover.vala | 12 +-- - src/Widgets/InputMethod/LanguagesRow.vala | 43 +----- - src/meson.build | 6 +- + src/Dialogs/InstallEngineDialog.vala | 140 ----------------- + src/Dialogs/ProgressDialog.vala | 82 ---------- + src/InputMethod/Installer/InstallList.vala | 73 --------- + .../Installer/UbuntuInstaller.vala | 142 ------------------ + src/InputMethod/Installer/aptd-client.vala | 93 ------------ + .../InputMethod/AddEnginesPopover.vala | 12 -- + src/Widgets/InputMethod/LanguagesRow.vala | 43 ------ + src/meson.build | 6 - 8 files changed, 591 deletions(-) delete mode 100644 src/Dialogs/InstallEngineDialog.vala delete mode 100644 src/Dialogs/ProgressDialog.vala @@ -170,7 +172,7 @@ index ffba3a8..0000000 -} diff --git a/src/Dialogs/ProgressDialog.vala b/src/Dialogs/ProgressDialog.vala deleted file mode 100644 -index f110aca..0000000 +index 868f167..0000000 --- a/src/Dialogs/ProgressDialog.vala +++ /dev/null @@ -1,82 +0,0 @@ @@ -191,7 +193,7 @@ index f110aca..0000000 -* with this program. If not, see http://www.gnu.org/licenses/. -*/ - --public class Pantheon.Keyboard.InputMethodPage.ProgressDialog : Gtk.Dialog { +-public class Pantheon.Keyboard.InputMethodPage.ProgressDialog : Granite.Dialog { - public int progress { - set { - if (value >= 100) { @@ -583,10 +585,10 @@ index ee5c3f5..0000000 - } -} diff --git a/src/Widgets/InputMethod/AddEnginesPopover.vala b/src/Widgets/InputMethod/AddEnginesPopover.vala -index 46e005d..6b56c6b 100644 +index 110bc1d..8a03ca8 100644 --- a/src/Widgets/InputMethod/AddEnginesPopover.vala +++ b/src/Widgets/InputMethod/AddEnginesPopover.vala -@@ -49,8 +49,6 @@ public class Pantheon.Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover { +@@ -43,8 +43,6 @@ public class Pantheon.Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover { }; scrolled.add (listbox); @@ -595,7 +597,7 @@ index 46e005d..6b56c6b 100644 var cancel_button = new Gtk.Button.with_label (_("Cancel")); var add_button = new Gtk.Button.with_label (_("Add Engine")); -@@ -61,10 +59,8 @@ public class Pantheon.Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover { +@@ -55,10 +53,8 @@ public class Pantheon.Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover { margin = 12, spacing = 6 }; @@ -606,7 +608,7 @@ index 46e005d..6b56c6b 100644 var grid = new Gtk.Grid (); grid.attach (search_entry, 0, 0); -@@ -92,14 +88,6 @@ public class Pantheon.Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover { +@@ -88,14 +84,6 @@ public class Pantheon.Keyboard.InputMethodPage.AddEnginesPopover : Gtk.Popover { listbox.invalidate_filter (); }); @@ -671,20 +673,20 @@ index dc064ae..0000000 - } -} diff --git a/src/meson.build b/src/meson.build -index 28f07c1..a515419 100644 +index 77a51d0..26711c5 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -16,7 +16,6 @@ plug_files = files( - 'Widgets/Shortcuts/CustomTree.vala', +@@ -17,7 +17,6 @@ plug_files = files( 'Widgets/Layout/Display.vala', - 'Widgets/Layout/AddLayoutPopover.vala', + 'Widgets/Layout/AdvancedSettingsPanel.vala', + 'Widgets/Layout/AdvancedSettingsGrid.vala', - 'Widgets/InputMethod/LanguagesRow.vala', 'Widgets/InputMethod/EnginesRow.vala', 'Widgets/InputMethod/AddEnginesPopover.vala', 'Views/Shortcuts.vala', -@@ -36,11 +35,6 @@ plug_files = files( - 'Layout/AdvancedSettingsGrid.vala', - 'InputMethod/Utils.vala', +@@ -33,11 +32,6 @@ plug_files = files( + 'InputSources/SourceSettings.vala', + 'InputSources/InputSource.vala', 'InputMethod/AddEnginesList.vala', - 'InputMethod/Installer/UbuntuInstaller.vala', - 'InputMethod/Installer/InstallList.vala', @@ -692,9 +694,5 @@ index 28f07c1..a515419 100644 - 'Dialogs/ProgressDialog.vala', - 'Dialogs/InstallEngineDialog.vala', 'Dialogs/ConflictDialog.vala', + 'Dialogs/AddLayoutDialog.vala' ) - - -base-commit: 9d9eddeb7da8450a309496c25066f4f78a9d4070 --- -git-series 0.9.1 diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 06bdce19f45c..c3860ba22789 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , nix-update-script , pantheon -, fetchpatch , substituteAll , meson , ninja @@ -11,27 +10,31 @@ , libgee , granite , gtk3 +, libhandy , libxml2 , libgnomekbd , libxklavier -, xorg , ibus , switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-keyboard"; - version = "2.4.1"; + version = "2.5.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-iuv5NZ7v+rXyFsKB/PvGa/7hm9MIV8E6JnTzEGROlhM="; + sha256 = "1p1l7dx5v1zzz89hhhkm6n3ls7ig4cf2prh1099f1c054qiy9b0y"; }; patches = [ ./0001-Remove-Install-Unlisted-Engines-function.patch + (substituteAll { + src = ./fix-paths.patch; + ibus = ibus; + }) ]; passthru = { @@ -54,6 +57,7 @@ stdenv.mkDerivation rec { ibus libgee libgnomekbd + libhandy libxklavier switchboard ]; @@ -63,6 +67,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-keyboard"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch new file mode 100644 index 000000000000..bb21712a5bc4 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/Views/InputMethod.vala b/src/Views/InputMethod.vala +index 6d79fdc..de4276e 100644 +--- a/src/Views/InputMethod.vala ++++ b/src/Views/InputMethod.vala +@@ -325,7 +325,7 @@ public class Pantheon.Keyboard.InputMethodPage.Page : Gtk.Grid { + private void spawn_ibus_daemon () { + bool is_spawn_succeeded = false; + try { +- is_spawn_succeeded = Process.spawn_sync ("/", { "ibus-daemon", "-drx" }, Environ.get (), SpawnFlags.SEARCH_PATH, null); ++ is_spawn_succeeded = Process.spawn_sync ("/", { "@ibus@/bin/ibus-daemon", "-drx" }, Environ.get (), SpawnFlags.SEARCH_PATH, null); + } catch (GLib.SpawnError e) { + warning (e.message); + set_visible_view (e.message); diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index 67eeee584a69..0368314e7b4f 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -1,28 +1,32 @@ { lib, stdenv , fetchFromGitHub , nix-update-script +, substituteAll , pantheon , meson , ninja , pkg-config , vala , libgee +, libxml2 , granite , gtk3 , switchboard -, elementary-settings-daemon +, gnome-settings-daemon , glib +, gala # needed for gestures support +, touchegg }: stdenv.mkDerivation rec { pname = "switchboard-plug-mouse-touchpad"; - version = "2.4.2"; + version = "6.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-WJ/GRhZsSwC31HEIjHHWBy9/Skqbwor0tNVTedue3kk="; + sha256 = "0nqgbpk1knvbj5xa078i0ka6lzqmaaa873gwj3mhjr5q2gzkw7y5"; }; passthru = { @@ -39,19 +43,29 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gala glib granite gtk3 libgee - elementary-settings-daemon + libxml2 + gnome-settings-daemon switchboard + touchegg + ]; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + touchegg = touchegg; + }) ]; meta = with lib; { description = "Switchboard Mouse & Touchpad Plug"; homepage = "https://github.com/elementary/switchboard-plug-mouse-touchpad"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/fix-paths.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/fix-paths.patch new file mode 100644 index 000000000000..e0c63bac8322 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/Utils/ToucheggSettings.vala b/src/Utils/ToucheggSettings.vala +index 1d621b9c..73c89714 100644 +--- a/src/Utils/ToucheggSettings.vala ++++ b/src/Utils/ToucheggSettings.vala +@@ -36,7 +36,7 @@ public class MouseTouchpad.ToucheggSettings : GLib.Object { + private const string MAXIMIZE_4_XPATH = "//application[@name=\"All\"]/gesture[@fingers=\"4\"]/action[@type=\"MAXIMIZE_RESTORE_WINDOW\"]/.."; + + public ToucheggSettings () { +- system_config_path = Path.build_filename (GLib.Path.DIR_SEPARATOR_S, "usr", "share", "touchegg", "touchegg.conf"); ++ system_config_path = Path.build_filename ("@touchegg@", "share", "touchegg", "touchegg.conf"); + user_config_dir_path = Path.build_filename (GLib.Environment.get_home_dir (), ".config", "touchegg"); + user_config_path = Path.build_filename (GLib.Environment.get_home_dir (), ".config", "touchegg", "touchegg.conf"); + } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index fce9402e131f..7ccfb265e9e9 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-network"; - version = "2.3.2"; + version = "2.4.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-PYgewxBblhOfOJQSeRaq8xD7qZ3083EvgUjpi92FqyI="; + sha256 = "0nqihsbrpjw4nx1c50g854bqybniw38adi78vzg8nyl6ikj2r0z4"; }; passthru = { @@ -60,8 +60,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Switchboard Networking Plug"; homepage = "https://github.com/elementary/switchboard-plug-network"; - license = licenses.lgpl21Plus; + license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index 8c750710aed9..42cddfd2d67f 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -16,15 +16,24 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-notifications"; - version = "2.1.7"; + version = "2.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-MBCSQ+4l0mpS2OTDRJ7+91qo0SWm5nJNYO7SZaSoVQk="; + sha256 = "0zzhgs8m1y7ab31hbn7v8g8k7rx51gqajl243zmysn86lfqk8iay"; }; + patches = [ + # Upstream code not respecting our localedir + # https://github.com/elementary/switchboard-plug-notifications/pull/83 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-notifications/commit/2e0320aab62b6932e8ef5f941d02e244de381957.patch"; + sha256 = "0rcamasq837grck0i2yx6psggzrhv7p7m3mra5l0k9zsjxgar92v"; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -51,6 +60,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-notifications"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index ef12cb38e1b9..9aa9d7e6780a 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -1,33 +1,36 @@ { lib, stdenv , fetchFromGitHub , nix-update-script -, fetchpatch , pantheon , meson , ninja , pkg-config -, vala_0_46 +, vala , libgee , granite , gtk3 , libaccounts-glib +, libgdata +, libhandy , libsignon-glib , json-glib , librest , webkitgtk , libsoup +, sqlite , switchboard +, evolution-data-server }: stdenv.mkDerivation rec { pname = "switchboard-plug-onlineaccounts"; - version = "2.0.1"; + version = "6.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-CVYKcRty5bBEMNyoY51JAJQy6uh+U+7IvS6V/1GMCA4="; + sha256 = "1lp3i31jzp21n43d1mh4d4i8zgim3q3j4inw4hmyimyql2s83cc3"; }; passthru = { @@ -40,47 +43,35 @@ stdenv.mkDerivation rec { meson ninja pkg-config - vala_0_46 + vala ]; buildInputs = [ + evolution-data-server granite gtk3 json-glib libaccounts-glib + libgdata libgee + libhandy libsignon-glib libsoup librest + sqlite # needed for camel-1.2 switchboard webkitgtk ]; - patches = [ - # Fix build with latest vala - (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/5fa2882f765076d20c6ef4886198a34a05159f8a.patch"; - sha256 = "1szryyy7shdmbvx9yhpi0bhzaayg7hl6pq2c456j1qf9kfv0m4hf"; - }) - - # fix build with vala 0.48.9 - (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-onlineaccounts/commit/b1853b7427102b8dd94774e1e2cc455f50902263.patch"; - sha256 = "J3C71GyEHEZWSghGXlwXPHFJRhrvx6i0yvi8NIDb4WE="; - }) - ]; - PKG_CONFIG_LIBACCOUNTS_GLIB_PROVIDERFILESDIR = "${placeholder "out"}/share/accounts/providers"; PKG_CONFIG_LIBACCOUNTS_GLIB_SERVICEFILESDIR = "${placeholder "out"}/share/accounts/services"; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; - meta = with lib; { description = "Switchboard Online Accounts Plug"; homepage = "https://github.com/elementary/switchboard-plug-onlineaccounts"; - license = licenses.lgpl2Plus; + license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index 97668d35471a..69242e8132f1 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -1,18 +1,48 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, pantheon, meson, ninja, pkg-config, vala, glib -, libgee, granite, gexiv2, elementary-settings-daemon, gtk3, gnome-desktop -, gala, wingpanel, elementary-dock, switchboard, gettext, bamf, fetchpatch }: +{ lib, stdenv +, fetchFromGitHub +, fetchpatch +, nix-update-script +, pantheon +, meson +, ninja +, pkg-config +, vala +, glib +, libgee +, granite +, gexiv2 +, gnome-settings-daemon +, elementary-settings-daemon +, gtk3 +, gnome-desktop +, gala +, wingpanel +, elementary-dock +, switchboard +, gettext +, bamf +}: stdenv.mkDerivation rec { pname = "switchboard-plug-pantheon-shell"; - version = "2.8.4"; + version = "6.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-CHl+4mVjrDg2gusrWOCfI++DZMWKLdvHxG3ZWMjZ2to="; + sha256 = "0349150kxdv14ald79pzn7lasiqipyc37fgchygbc8hsy62d9a32"; }; + patches = [ + # Upstream code not respecting our localedir + # https://github.com/elementary/switchboard-plug-pantheon-shell/pull/286 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-pantheon-shell/commit/0c3207ffaeaa82ca3c743bc9ec772185fbd7e8cf.patch"; + sha256 = "11ymzqx6has4zf8y0xy7pfhymcl128hzzjcgp46inshjf99v5kiv"; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -31,6 +61,7 @@ stdenv.mkDerivation rec { bamf elementary-dock elementary-settings-daemon + gnome-settings-daemon gala gexiv2 glib @@ -47,6 +78,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-pantheon-shell"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index f0cf47cfdfea..a9c60600f045 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -2,14 +2,13 @@ , fetchFromGitHub , nix-update-script , pantheon -, substituteAll , meson , ninja , pkg-config , vala , libgee -, elementary-dpms-helper , elementary-settings-daemon +, gnome-settings-daemon , granite , gtk3 , glib @@ -20,13 +19,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-power"; - version = "2.4.2"; + version = "2.6.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-swcbkaHHe9BZxMWvjdRutvYfXXrSCUJWuld1btfYeH0="; + sha256 = "006h8mrhmdrbd83vhdyahgrfk9wh6j9kjincpp7dz7sl8fsyhmcr"; }; passthru = { @@ -44,8 +43,8 @@ stdenv.mkDerivation rec { buildInputs = [ dbus - elementary-dpms-helper elementary-settings-daemon + gnome-settings-daemon glib granite gtk3 @@ -54,18 +53,11 @@ stdenv.mkDerivation rec { switchboard ]; - patches = [ - (substituteAll { - src = ./dpms-helper-exec.patch; - elementary_dpms_helper = elementary-dpms-helper; - }) - ]; - meta = with lib; { description = "Switchboard Power Plug"; homepage = "https://github.com/elementary/switchboard-plug-power"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/dpms-helper-exec.patch b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/dpms-helper-exec.patch deleted file mode 100644 index 335d3f296262..000000000000 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/power/dpms-helper-exec.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/MainView.vala b/src/MainView.vala -index 1654e68..175f220 100644 ---- a/src/MainView.vala -+++ b/src/MainView.vala -@@ -317,7 +317,7 @@ public class Power.MainView : Gtk.Grid { - - private static void run_dpms_helper () { - try { -- string[] argv = { "io.elementary.dpms-helper" }; -+ string[] argv = { "@elementary_dpms_helper@/bin/io.elementary.dpms-helper" }; - Process.spawn_async (null, argv, Environ.get (), - SpawnFlags.SEARCH_PATH | SpawnFlags.STDERR_TO_DEV_NULL | SpawnFlags.STDOUT_TO_DEV_NULL, - null, null); diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index 7387ea34e4de..cae5b570547f 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -16,20 +16,21 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-printers"; - version = "2.1.9"; + version = "2.1.10"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-tnAJyyPN/Xy1pmlgBpgO2Eb5CeHrRltjQTHmuTPBt8s="; + sha256 = "0frvybbx7mcs87kww0if4zn0c6c2gb400cpiqrl8b0294py58xpb"; }; patches = [ - # Fix build with latest Vala. + # Upstream code not respecting our localedir + # https://github.com/elementary/switchboard-plug-printers/pull/153 (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-printers/commit/5eced5ddda6f229d7265ea0a713f6c1cd181a526.patch"; - sha256 = "lPTNqka6jjvv1JnAqVzVIQBIdDXlCOQ5ASvgZNuEUC8="; + url = "https://github.com/elementary/switchboard-plug-printers/commit/3e2b01378cbb8e666d23daeef7f40fcaa90daa45.patch"; + sha256 = "0b8pq525xnir06pn65rcz68bcp5xdxl0gpbj7p5x1hs23p5dp04n"; }) ]; @@ -57,9 +58,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Switchboard Printers Plug"; homepage = "https://github.com/elementary/switchboard-plug-printers"; - license = licenses.lgpl3Plus; + license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index 26e26de33b12..986aa171e920 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -10,30 +10,31 @@ , vala , libgee , granite +, gala , gtk3 , glib , polkit , zeitgeist , switchboard -, lightlocker }: stdenv.mkDerivation rec { pname = "switchboard-plug-security-privacy"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-Sws6FqUL7QAROInDrcqYAp6j1TCC4aGV0/hi5Kmm5wQ="; + sha256 = "1ydr1xpbyxjcnd36c9j7a64srbz6gpbshwhcqj6591kmiqhmvknk"; }; patches = [ - # Fix build with latest Vala. + # Upstream code not respecting our localedir + # https://github.com/elementary/switchboard-plug-security-privacy/pull/130 (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-security-privacy/commit/c8e422e630bbee0badcf4df26364c9e83e06bad0.patch"; - sha256 = "5Gm+muZiCraJC5JaGVVo0HDJ7KxjOpclHRW1RKsk3bc="; + url = "https://github.com/elementary/switchboard-plug-security-privacy/commit/18fe438baba651670d7f0534856c3b2433e3d75d.patch"; + sha256 = "19qwm725k6h41kgg4a98i4rxx45s4bb1wxx0fzkh75gz9syfi58w"; }) ]; @@ -52,13 +53,13 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gala glib granite gtk3 libgee polkit switchboard - lightlocker zeitgeist ]; @@ -70,9 +71,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Switchboard Security & Privacy Plug"; homepage = "https://github.com/elementary/switchboard-plug-security-privacy"; - license = licenses.lgpl3Plus; + license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix index 6baaed293c9f..2eacf5585109 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -15,15 +15,24 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-sharing"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-/M60w14zfAUXspabvTUWlOPRrHvKtCYUio82b034k6s="; + sha256 = "00lqrxq1wz3y2s9jiz8rh9d571va2vza2gdwj6c86z3q4c4hmn17"; }; + patches = [ + # Upstream code not respecting our localedir + # https://github.com/elementary/switchboard-plug-sharing/pull/55 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-sharing/commit/5219839738b79e3c5f039a811d96a40eb2644eab.patch"; + sha256 = "020w746q7gzmic0pdnbxs792sx15wlsqaf2x770r5xwbyfmqr7bs"; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -47,8 +56,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Switchboard Sharing Plug"; homepage = "https://github.com/elementary/switchboard-plug-sharing"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index 10117dd8f957..7719477ce702 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , meson @@ -10,22 +11,30 @@ , granite , gtk3 , pulseaudio -, libcanberra , libcanberra-gtk3 , switchboard }: stdenv.mkDerivation rec { pname = "switchboard-plug-sound"; - version = "2.2.5"; + version = "2.2.7"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-ITgxLZSB4zhSaFKX7Vbf89DGI8ibIcGEQTtLjcGN2tA="; + sha256 = "0yjqws7ryfid9lcafgzzbfnjjwccsankscwdwqfw486qid85whzc"; }; + patches = [ + # Upstream code not respecting our localedir + # https://github.com/elementary/switchboard-plug-sound/pull/203 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-sound/commit/1f3b9f001ace4c457ab194158dff04ba5e25d278.patch"; + sha256 = "1lmf2bbif2wkfv500nxbqxp8jdmnjg8yk8xhx3g2g55d15rc5hk4"; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -42,7 +51,6 @@ stdenv.mkDerivation rec { buildInputs = [ granite gtk3 - libcanberra libcanberra-gtk3 libgee pulseaudio @@ -52,8 +60,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Switchboard Sound Plug"; homepage = "https://github.com/elementary/switchboard-plug-sound"; - license = licenses.lgpl2Plus; + license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix new file mode 100644 index 000000000000..9268fa76aefc --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix @@ -0,0 +1,72 @@ +{ lib, stdenv +, fetchFromGitHub +, fetchpatch +, nix-update-script +, pantheon +, meson +, ninja +, pkg-config +, vala +, glib +, granite +, gtk3 +, libgee +, libgudev +, libwacom +, switchboard +, xorg +}: + +stdenv.mkDerivation rec { + pname = "switchboard-plug-wacom"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "1n2yfq4s9xpnfqjikchjp4z2nk8cmfz4g0p18cplzh5w1lvz17lm"; + }; + + patches = [ + # Upstream code not respecting our localedir + # https://github.com/elementary/switchboard-plug-wacom/pull/29 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-wacom/commit/2a7dee180d73ffb3521d806efb7028f5a71cb511.patch"; + sha256 = "06ra5c0f14brmj2mmsqscpc4d1114i4qazgnsazzh2hrp04ilnva"; + }) + ]; + + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + ]; + + buildInputs = [ + glib + granite + gtk3 + libgee + libgudev + libwacom + switchboard + xorg.libX11 + xorg.libXi + ]; + + meta = with lib; { + description = "Switchboard Wacom Plug"; + homepage = "https://github.com/elementary/switchboard-plug-wacom"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.pantheon.members; + }; +} diff --git a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix index d0b56d7456af..bdab9b0d7662 100644 --- a/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , pkg-config @@ -9,6 +10,7 @@ , vala , gtk3 , libgee +, libhandy , granite , gettext , clutter-gtk @@ -18,13 +20,13 @@ stdenv.mkDerivation rec { pname = "switchboard"; - version = "2.4.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-N3WZysLIah40kcyIyhryZpm2FxCmlvp0EB1krZ/IsYs="; + sha256 = "02dfsrfmr297cxpyd5m3746ihcgjyfnb3d42ng9m4ljdvh0dxgim"; }; passthru = { @@ -49,10 +51,17 @@ stdenv.mkDerivation rec { granite gtk3 libgee + libhandy ]; patches = [ ./plugs-path-env.patch + # Upstream code not respecting our localedir + # https://github.com/elementary/switchboard/pull/214 + (fetchpatch { + url = "https://github.com/elementary/switchboard/commit/8d6b5f4cbbaf134880252afbf1e25d70033e6402.patch"; + sha256 = "0gwq3wwj45jrnlhsmxfclbjw6xjr8kf6pp3a84vbnrazw76lg5nc"; + }) ]; postPatch = '' @@ -65,6 +74,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index 437f37941220..e0299767ef3f 100644 --- a/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -5,11 +5,12 @@ , meson , ninja , gettext +, sassc }: stdenv.mkDerivation rec { pname = "elementary-gtk-theme"; - version = "5.4.2"; + version = "6.0.0"; repoName = "stylesheet"; @@ -17,7 +18,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-eE0/LLdnpxOpBvdpioGKV/DOQ5lIuQt9dPnhGkQDGCs="; + sha256 = "08iga854s6w77xr5rhvr74pgn2lc884aigc7gkn0xjlwysd195fr"; }; passthru = { @@ -30,6 +31,7 @@ stdenv.mkDerivation rec { gettext meson ninja + sassc ]; meta = with lib; { @@ -37,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/stylesheet"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index bd4845172c52..abaf8d6c31c5 100644 --- a/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -65,6 +65,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/icons"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix b/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix index 6a9d1b0aca36..b9c51f5688c2 100644 --- a/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { description = "Font for concealing text"; homepage = "https://github.com/png2378/redacted-elementary"; license = licenses.ofl; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix index d273f03f4bda..6fe18119b458 100644 --- a/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/sound-theme"; license = licenses.unlicense; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix index 3e4e64d73012..9fd0a4d1a4e8 100644 --- a/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "elementary-wallpapers"; - version = "5.5.0"; + version = "6.0.0"; repoName = "wallpapers"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-Q5sYDXqFhiTu8nABmyND3L8bIXd1BJ3GZQ9TL3SzwzA="; + sha256 = "1qpf8w7x9sp3sd4zpsrlj5ywpwqkq4ywbagm4sf25cwwn82dl59b"; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wallpapers"; license = licenses.publicDomain; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/default.nix b/nixpkgs/pkgs/desktops/pantheon/default.nix index dc1245e1b156..b3b5409f6a01 100644 --- a/nixpkgs/pkgs/desktops/pantheon/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/default.nix @@ -12,25 +12,31 @@ lib.makeScope pkgs.newScope (self: with self; { switchboard-plug-onlineaccounts switchboard-plug-pantheon-shell switchboard-plug-power switchboard-plug-printers switchboard-plug-security-privacy switchboard-plug-sharing - switchboard-plug-sound + switchboard-plug-sound switchboard-plug-wacom ]; wingpanelIndicators = [ - wingpanel-applications-menu wingpanel-indicator-bluetooth - wingpanel-indicator-datetime wingpanel-indicator-keyboard - wingpanel-indicator-network wingpanel-indicator-nightlight - wingpanel-indicator-notifications wingpanel-indicator-power - wingpanel-indicator-session wingpanel-indicator-sound + wingpanel-applications-menu wingpanel-indicator-a11y + wingpanel-indicator-bluetooth wingpanel-indicator-datetime + wingpanel-indicator-keyboard wingpanel-indicator-network + wingpanel-indicator-nightlight wingpanel-indicator-notifications + wingpanel-indicator-power wingpanel-indicator-session + wingpanel-indicator-sound ]; maintainers = lib.teams.pantheon.members; - mutter = pkgs.gnome.mutter334; + mutter = pkgs.gnome.mutter338; + + # Using 3.38 to match Mutter used in Pantheon + gnome-settings-daemon = pkgs.gnome.gnome-settings-daemon338; elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; notes-up = pkgs.notes-up.override { withPantheon = true; }; + touchegg = pkgs.touchegg.override { withPantheon = true; }; + #### APPS appcenter = callPackage ./apps/appcenter { }; @@ -55,12 +61,16 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-photos = callPackage ./apps/elementary-photos { }; - elementary-screenshot-tool = callPackage ./apps/elementary-screenshot-tool { }; + elementary-screenshot = callPackage ./apps/elementary-screenshot { }; + + elementary-tasks = callPackage ./apps/elementary-tasks { }; elementary-terminal = callPackage ./apps/elementary-terminal { }; elementary-videos = callPackage ./apps/elementary-videos { }; + epiphany = pkgs.epiphany.override { withPantheon = true; }; + sideload = callPackage ./apps/sideload { }; #### DESKTOP @@ -103,16 +113,9 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-capnet-assist = callPackage ./services/elementary-capnet-assist { }; - elementary-dpms-helper = callPackage ./services/elementary-dpms-helper { }; - elementary-notifications = callPackage ./services/elementary-notifications { }; - # We're using ubuntu and elementary's patchset due to reasons - # explained here -> https://github.com/elementary/greeter/issues/92#issuecomment-376215614 - # Take note of "I am holding off on "fixing" this bug for as long as possible." - elementary-settings-daemon = callPackage ./services/elementary-settings-daemon { - inherit (gnome) gnome-desktop; - }; + elementary-settings-daemon = callPackage ./services/elementary-settings-daemon { }; pantheon-agent-geoclue2 = callPackage ./services/pantheon-agent-geoclue2 { }; @@ -122,6 +125,8 @@ lib.makeScope pkgs.newScope (self: with self; { wingpanel-applications-menu = callPackage ./desktop/wingpanel-indicators/applications-menu { }; + wingpanel-indicator-a11y = callPackage ./desktop/wingpanel-indicators/a11y { }; + wingpanel-indicator-bluetooth = callPackage ./desktop/wingpanel-indicators/bluetooth { }; wingpanel-indicator-datetime = callPackage ./desktop/wingpanel-indicators/datetime { }; @@ -184,6 +189,8 @@ lib.makeScope pkgs.newScope (self: with self; { switchboard-plug-sound = callPackage ./apps/switchboard-plugs/sound { }; + switchboard-plug-wacom = callPackage ./apps/switchboard-plugs/wacom { }; + ### ARTWORK elementary-gtk-theme = callPackage ./artwork/elementary-gtk-theme { }; @@ -204,4 +211,6 @@ lib.makeScope pkgs.newScope (self: with self; { cerbere = throw "Cerbere is now obsolete https://github.com/elementary/cerbere/releases/tag/2.5.1."; + elementary-screenshot-tool = elementary-screenshot; # added 2021-07-21 + }) diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/0001-Build-with-Meson.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/0001-Build-with-Meson.patch deleted file mode 100644 index 3a0b3812450c..000000000000 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/0001-Build-with-Meson.patch +++ /dev/null @@ -1,309 +0,0 @@ -From f728ac670d8f6bb7600a007d92034b711471fab6 Mon Sep 17 00:00:00 2001 -From: worldofpeace <worldofpeace@protonmail.ch> -Date: Sat, 13 Jul 2019 19:06:20 -0400 -Subject: [PATCH 1/2] Build with Meson - -Has the following meson build options: -* default-wallpaper -* plank-dockitems -* default-gsettings-overrides - -All default to true. - -We also split the default-settings gsettings override into another that -only sets plank's default dockitems. This is installed when plank-dockitems -is true. We need to have this because those settings are dependent on -those dockitems actually being installed and we have it optional. ---- - accountsservice/create-symlink.py | 24 ++++++ - accountsservice/meson.build | 25 ++++++ - .../appcenter.blacklist | 0 - .../default-testpage.pdf | Bin - settings.ini => gtk/settings.ini | 0 - .inputrc => inputrc/.inputrc | 0 - meson.build | 79 ++++++++++++++++++ - meson/post_install.py | 12 +++ - meson_options.txt | 14 ++++ - ...e => default-settings.gschema.override.in} | 3 +- - overrides/meson.build | 21 +++++ - overrides/plank-dockitems.gschema.override | 2 + - .../sessioninstaller.desktop | 0 - 13 files changed, 178 insertions(+), 2 deletions(-) - create mode 100644 accountsservice/create-symlink.py - create mode 100644 accountsservice/meson.build - rename appcenter.blacklist => appcenter/appcenter.blacklist (100%) - rename default-testpage.pdf => cups/default-testpage.pdf (100%) - rename settings.ini => gtk/settings.ini (100%) - rename .inputrc => inputrc/.inputrc (100%) - create mode 100644 meson.build - create mode 100755 meson/post_install.py - create mode 100644 meson_options.txt - rename overrides/{default-settings.gschema.override => default-settings.gschema.override.in} (92%) - create mode 100644 overrides/meson.build - create mode 100644 overrides/plank-dockitems.gschema.override - rename sessioninstaller.desktop => sessioninstaller/sessioninstaller.desktop (100%) - -diff --git a/accountsservice/create-symlink.py b/accountsservice/create-symlink.py -new file mode 100644 -index 0000000..e502134 ---- /dev/null -+++ b/accountsservice/create-symlink.py -@@ -0,0 +1,24 @@ -+#!/usr/bin/env python3 -+ -+import os -+import sys -+ -+if len(sys.argv) < 3: -+ print('Usage: create-symlink.py SOURCE DESTINATION') -+ sys.exit(1) -+ -+src = sys.argv[1] -+dest = sys.argv[2] -+ -+if 'MESON_INSTALL_DESTDIR_PREFIX' in os.environ: -+ src = os.path.join(os.environ['MESON_INSTALL_DESTDIR_PREFIX'], src) -+ dest = os.path.join(os.environ['MESON_INSTALL_DESTDIR_PREFIX'], dest) -+ -+if os.path.isabs(src): -+ src = os.path.relpath(src, os.path.dirname(os.path.realpath(dest))) -+ -+if not os.path.exists(dest): -+ print('Creating symbolic link: ' + dest + ' -> ' + src) -+ if not os.path.exists(os.path.dirname(dest)): -+ os.makedirs(os.path.dirname(dest)) -+ os.symlink(src, dest) -diff --git a/accountsservice/meson.build b/accountsservice/meson.build -new file mode 100644 -index 0000000..6d18459 ---- /dev/null -+++ b/accountsservice/meson.build -@@ -0,0 +1,25 @@ -+dbus_dep = dependency('dbus-1') -+dbus_interfaces_dir = dbus_dep.get_pkgconfig_variable('interfaces_dir', define_variable: ['datadir', datadir]) -+ -+install_data( -+ 'io.elementary.pantheon.AccountsService.xml', -+ install_dir: dbus_interfaces_dir -+) -+ -+ -+polkit_dep = dependency('polkit-gobject-1') -+polkit_actiondir = polkit_dep.get_pkgconfig_variable('actiondir', define_variable: ['prefix', prefix]) -+ -+install_data( -+ 'io.elementary.pantheon.AccountsService.policy', -+ install_dir: polkit_actiondir -+) -+ -+act_dep = dependency('accountsservice') -+act_interfacesdir = act_dep.get_pkgconfig_variable('interfacesdir', define_variable: ['datadir', datadir]) -+ -+meson.add_install_script( -+ 'create-symlink.py', -+ join_paths(dbus_interfaces_dir, 'io.elementary.pantheon.AccountsService.xml'), -+ join_paths(act_interfacesdir, 'io.elementary.pantheon.AccountsService.xml'), -+) -diff --git a/appcenter.blacklist b/appcenter/appcenter.blacklist -similarity index 100% -rename from appcenter.blacklist -rename to appcenter/appcenter.blacklist -diff --git a/default-testpage.pdf b/cups/default-testpage.pdf -similarity index 100% -rename from default-testpage.pdf -rename to cups/default-testpage.pdf -diff --git a/settings.ini b/gtk/settings.ini -similarity index 100% -rename from settings.ini -rename to gtk/settings.ini -diff --git a/.inputrc b/inputrc/.inputrc -similarity index 100% -rename from .inputrc -rename to inputrc/.inputrc -diff --git a/meson.build b/meson.build -new file mode 100644 -index 0000000..7740a34 ---- /dev/null -+++ b/meson.build -@@ -0,0 +1,79 @@ -+project( -+ 'elementary-default-settings', -+ version: '5.1.0', -+ default_options: 'sysconfdir=/etc', -+) -+ -+prefix = get_option('prefix') -+datadir = join_paths(prefix, get_option('datadir')) -+sysconfdir = get_option('sysconfdir') -+ -+meson.add_install_script('meson/post_install.py', datadir) -+ -+# Planks Default DockItems -+if get_option('plank-dockitems') -+ install_subdir( -+ 'plank', -+ install_dir: join_paths(sysconfdir, 'skel', '.config') -+ ) -+endif -+ -+# Setup system wide global environment for applications -+install_subdir( -+ 'profile.d', -+ install_dir: join_paths(sysconfdir, 'profile.d'), -+ strip_directory : true -+) -+ -+# elementary Plymouth Theme -+install_subdir( -+ 'plymouth/elementary', -+ install_dir: join_paths(datadir, 'plymouth', 'themes') -+) -+ -+install_data( -+ 'plymouth/ubuntu-text.plymouth', -+ install_dir: join_paths(datadir, 'plymouth', 'themes') -+) -+ -+# Sudo password feedback in terminals -+install_data( -+ 'sudoers.d/pwfeedback', -+ install_dir: join_paths(sysconfdir, 'sudoers.d') -+) -+ -+# CUPS Printing testpage -+install_data( -+ 'cups/default-testpage.pdf', -+ install_dir: join_paths(datadir, 'cups', 'data') -+) -+ -+# GTK3 Settings -+install_data( -+ 'gtk/settings.ini', -+ install_dir: join_paths(sysconfdir, 'gtk-3.0') -+) -+ -+# So SessionInstaller can have an Icon -+install_data( -+ 'sessioninstaller/sessioninstaller.desktop', -+ install_dir: join_paths(datadir, 'applications') -+) -+ -+# Default Appcenter Blacklist -+install_data( -+ 'appcenter/appcenter.blacklist', -+ install_dir: join_paths(sysconfdir, 'appcenter') -+) -+ -+# Configuration file of GNU readline -+install_data( -+ 'inputrc/.inputrc', -+ install_dir: join_paths(sysconfdir, 'skel') -+) -+ -+# Default gsettings overrides -+subdir('overrides') -+ -+# AccountsService extension for Greeter. -+subdir('accountsservice') -diff --git a/meson/post_install.py b/meson/post_install.py -new file mode 100755 -index 0000000..c6b5617 ---- /dev/null -+++ b/meson/post_install.py -@@ -0,0 +1,12 @@ -+#!/usr/bin/env python3 -+ -+import os -+import sys -+import subprocess -+ -+if 'DESTDIR' not in os.environ: -+ default_settings_datadir = sys.argv[1] -+ -+ print('Compiling GSettings schemas...') -+ subprocess.call(['glib-compile-schemas', -+ os.path.join(default_settings_datadir, 'glib-2.0', 'schemas')]) -diff --git a/meson_options.txt b/meson_options.txt -new file mode 100644 -index 0000000..8fd19ba ---- /dev/null -+++ b/meson_options.txt -@@ -0,0 +1,14 @@ -+option('default-wallpaper', -+ type: 'string', -+ value: '/usr/share/backgrounds/elementaryos-default', -+ description: 'Path to default wallpaper to use in Pantheon.') -+ -+option('plank-dockitems', -+ type: 'boolean', -+ value: true, -+ description: 'Install default Pantheon Plank dockitems') -+ -+option('default-gsettings-overrides', -+ type: 'boolean', -+ value: true, -+ description: 'Install default Pantheon GSettings Overrides') -diff --git a/overrides/default-settings.gschema.override b/overrides/default-settings.gschema.override.in -similarity index 92% -rename from overrides/default-settings.gschema.override -rename to overrides/default-settings.gschema.override.in -index 1aef29c..69d272b 100644 ---- a/overrides/default-settings.gschema.override -+++ b/overrides/default-settings.gschema.override.in -@@ -1,5 +1,4 @@ - [net.launchpad.plank.dock.settings] --dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','org.pantheon.mail.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem','io.elementary.appcenter.dockitem'] - hide-delay=250 - hide-mode='window-dodge' - show-dock-item=false -@@ -11,7 +10,7 @@ triggers=['<Control>space'] - [org.gnome.desktop.background] - draw-background=true - picture-options='zoom' --picture-uri='file:///usr/share/backgrounds/elementaryos-default' -+picture-uri='file://@DEFAULT_WALLPAPER@' - primary-color='#000000' - show-desktop-icons=false - -diff --git a/overrides/meson.build b/overrides/meson.build -new file mode 100644 -index 0000000..ad80644 ---- /dev/null -+++ b/overrides/meson.build -@@ -0,0 +1,21 @@ -+if get_option('default-gsettings-overrides') -+ default_wallpaper = get_option('default-wallpaper') -+ -+ wallpaper_configuration = configuration_data() -+ wallpaper_configuration.set('DEFAULT_WALLPAPER', default_wallpaper) -+ -+ settings_override = configure_file( -+ input: 'default-settings.gschema.override.in', -+ output: '@BASENAME@', -+ configuration: wallpaper_configuration, -+ install_dir: join_paths(datadir, 'glib-2.0', 'schemas') -+ ) -+endif -+ -+# Install conditionally because it's dependent on our dockitems being installed -+if get_option('plank-dockitems') -+ install_data( -+ 'plank-dockitems.gschema.override', -+ install_dir: join_paths(datadir, 'glib-2.0', 'schemas') -+ ) -+endif -diff --git a/overrides/plank-dockitems.gschema.override b/overrides/plank-dockitems.gschema.override -new file mode 100644 -index 0000000..72b38d4 ---- /dev/null -+++ b/overrides/plank-dockitems.gschema.override -@@ -0,0 +1,2 @@ -+[net.launchpad.plank.dock.settings] -+dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','org.pantheon.mail.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem','io.elementary.appcenter.dockitem'] -diff --git a/sessioninstaller.desktop b/sessioninstaller/sessioninstaller.desktop -similarity index 100% -rename from sessioninstaller.desktop -rename to sessioninstaller/sessioninstaller.desktop --- -2.23.0 - diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 982502f51612..1751636da008 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -11,12 +11,11 @@ , polkit , accountsservice , python3 -, fetchpatch }: stdenv.mkDerivation rec { pname = "elementary-default-settings"; - version = "5.1.2"; + version = "6.0.1"; repoName = "default-settings"; @@ -24,7 +23,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-HKrDs2frEWVPpwyGNP+NikrjyplSXJj1hFMLy6kK4wM="; + sha256 = "0gqnrm968j4v699yhhiyw5fqjy4zbvvrjci2v1jrlycn09c2yrwf"; }; passthru = { @@ -33,23 +32,6 @@ stdenv.mkDerivation rec { }; }; - patches = [ - # Use new notifications - (fetchpatch { - url = "https://github.com/elementary/default-settings/commit/0658bb75b9f49f58b35746d05fb6c4b811f125e9.patch"; - sha256 = "0wa7iq0vfp2av5v23w94a5844ddj4g48d4wk3yrp745dyrimg739"; - }) - - # Fix media key syntax - (fetchpatch { - url = "https://github.com/elementary/default-settings/commit/332aefe1883be5dfe90920e165c39e331a53b2ea.patch"; - sha256 = "0ypcaga55pw58l30srq3ga1mhz2w6hkwanv41jjr6g3ia9jvq69n"; - }) - - # https://github.com/elementary/default-settings/pull/119 - ./0001-Build-with-Meson.patch - ]; - nativeBuildInputs = [ accountsservice dbus @@ -73,9 +55,9 @@ stdenv.mkDerivation rec { ''; preInstall = '' - # Install our override for plank dockitems. - # This is because we don't have Pantheon's mail or Appcenter. - # See: https://github.com/NixOS/nixpkgs/issues/58161 + # Install our override for plank dockitems as Appcenter and Tasks is not ready to be preinstalled. + # For Appcenter, see: https://github.com/NixOS/nixpkgs/issues/70214. + # For Tasks, see: https://github.com/elementary/tasks/issues/243#issuecomment-846259496 schema_dir=$out/share/glib-2.0/schemas install -D ${./overrides/plank-dockitems.gschema.override} $schema_dir/plank-dockitems.gschema.override @@ -84,7 +66,7 @@ stdenv.mkDerivation rec { cp -avr ${./launchers} $out/etc/skel/.config/plank/dock1/launchers # Whitelist wingpanel indicators to be used in the greeter - # hhttps://github.com/elementary/greeter/blob/fc19752f147c62767cd2097c0c0c0fcce41e5873/debian/io.elementary.greeter.whitelist + # https://github.com/elementary/greeter/blob/fc19752f147c62767cd2097c0c0c0fcce41e5873/debian/io.elementary.greeter.whitelist # wingpanel 2.3.2 renamed this to .allowed to .forbidden # https://github.com/elementary/wingpanel/pull/326 install -D ${./io.elementary.greeter.allowed} $out/etc/wingpanel.d/io.elementary.greeter.allowed @@ -103,6 +85,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/default-settings"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.mail.dockitem b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.mail.dockitem new file mode 100644 index 000000000000..e07328c59473 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/io.elementary.mail.dockitem @@ -0,0 +1,2 @@ +[PlankDockItemPreferences] +Launcher=file:///run/current-system/sw/share/applications/io.elementary.mail.desktop diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/org.gnome.Geary.dockitem b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/org.gnome.Geary.dockitem deleted file mode 100644 index 8b04efe417ea..000000000000 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/launchers/org.gnome.Geary.dockitem +++ /dev/null @@ -1,2 +0,0 @@ -[PlankDockItemPreferences] -Launcher=file:///run/current-system/sw/share/applications/org.gnome.Geary.desktop diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override index 671448745c50..b3ca51853b79 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-default-settings/overrides/plank-dockitems.gschema.override @@ -1,2 +1,2 @@ [net.launchpad.plank.dock.settings] -dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','org.gnome.Geary.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem'] +dock-items=['gala-multitaskingview.dockitem','org.gnome.Epiphany.dockitem','io.elementary.mail.dockitem','io.elementary.calendar.dockitem','io.elementary.music.dockitem','io.elementary.videos.dockitem','io.elementary.photos.dockitem','io.elementary.switchboard.dockitem'] diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index e80e7d951cd4..e85acf39e722 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -13,11 +13,13 @@ , gtk3 , granite , libgee -, elementary-settings-daemon +, libhandy +, gnome-settings-daemon , mutter , elementary-icon-theme , wingpanel-with-indicators , elementary-gtk-theme +, elementary-settings-daemon , nixos-artwork , lightdm , gdk-pixbuf @@ -29,7 +31,7 @@ stdenv.mkDerivation rec { pname = "elementary-greeter"; - version = "5.0.4"; + version = "6.0.1"; repoName = "greeter"; @@ -37,7 +39,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-Enn+ekALWbk7FVJJuea/rNiwEZDIyb3kyMcZNNraOv8="; + sha256 = "1f606ds56sp1c58q8dblfpaq9pwwkqw9i4gkwksw45m2xkwlbflq"; }; passthru = { @@ -66,10 +68,12 @@ stdenv.mkDerivation rec { elementary-gtk-theme elementary-icon-theme elementary-settings-daemon + gnome-settings-daemon gdk-pixbuf granite gtk3 libgee + libhandy lightdm mutter wingpanel-with-indicators @@ -80,9 +84,7 @@ stdenv.mkDerivation rec { "--sbindir=${placeholder "out"}/bin" # baked into the program for discovery of the greeter configuration "--sysconfdir=/etc" - # We use the patched gnome-settings-daemon - "-Dubuntu-patched-gsd=true" - "-Dgsd-dir=${elementary-settings-daemon}/libexec/" # trailing slash is needed + "-Dgsd-dir=${gnome-settings-daemon}/libexec/" # trailing slash is needed ]; patches = [ @@ -125,6 +127,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/greeter"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix index bfe95e0be46d..1f8c811d9d10 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -6,7 +6,7 @@ , glib , gala , epiphany -, elementary-settings-daemon +, gnome-settings-daemon , gtk3 , elementary-dock , gsettings-desktop-schemas @@ -18,7 +18,7 @@ let gsettingsOverridePackages = [ elementary-dock - elementary-settings-daemon + gnome-settings-daemon epiphany gala gsettings-desktop-schemas diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index 70da883392a8..e7b0248ad425 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -1,8 +1,8 @@ { lib, stdenv , fetchFromGitHub , nix-update-script +, substituteAll , pantheon -, fetchpatch , pkg-config , meson , ninja @@ -17,11 +17,12 @@ , gettext , libhandy , wrapGAppsHook +, appcenter }: stdenv.mkDerivation rec { pname = "elementary-onboarding"; - version = "1.2.1"; + version = "6.0.0"; repoName = "onboarding"; @@ -29,20 +30,9 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-tLTwXA2miHqYqCUbIiBjb2nQB+uN/WzuE4F9m3fVCbM="; + sha256 = "1mpw0j8ymb41py9v9qlk4nwy1lnwj7k388c7gqdv34ynck0ymfi4"; }; - patches = [ - # Port to Libhandy-1 - (fetchpatch { - url = "https://github.com/elementary/onboarding/commit/8af6b7d9216f8cbf725f708b36ef4d4f6c400c78.patch"; - sha256 = "cnSCSSFEQlNd9Ncw5VCJ32stZ8D4vhl3f+derAk/Cas="; - excludes = [ - ".github/workflows/main.yml" - ]; - }) - ]; - passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -69,6 +59,13 @@ stdenv.mkDerivation rec { libhandy ]; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + appcenter = appcenter; + }) + ]; + postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py @@ -79,6 +76,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/onboarding"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/fix-paths.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/fix-paths.patch new file mode 100644 index 000000000000..c98d898bb488 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-onboarding/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/Views/AppCenterView.vala b/src/Views/AppCenterView.vala +index 16cd18b..5895897 100644 +--- a/src/Views/AppCenterView.vala ++++ b/src/Views/AppCenterView.vala +@@ -55,7 +55,7 @@ public class Onboarding.AppCenterView : AbstractOnboardingView { + appcenter_button.clicked.connect (() => { + try { + var appcenter = AppInfo.create_from_commandline ( +- "io.elementary.appcenter", ++ "@appcenter@/bin/io.elementary.appcenter", + "AppCenter", + AppInfoCreateFlags.SUPPORTS_STARTUP_NOTIFICATION + ); diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix index 7b821f883ce9..c64cfced0c55 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/print"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index 38fcb8d40b41..e3d0cb8c7282 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -11,7 +11,7 @@ , orca , onboard , elementary-default-settings -, elementary-settings-daemon +, gnome-settings-daemon , runtimeShell , writeText , meson @@ -89,16 +89,16 @@ let in stdenv.mkDerivation rec { - pname = "elementary-session-settings-unstable"; - version = "2020-07-06"; + pname = "elementary-session-settings"; + version = "6.0.0"; repoName = "session-settings"; src = fetchFromGitHub { owner = "elementary"; repo = repoName; - rev = "fa15cbd83fba0ba30e9a302db880350bff5ace52"; - hash = "sha256-26H791c7OAjFYtjVChIatICSocMt0uTej1TKBOvw+6w="; + rev = version; + sha256 = "1faglpa7q3a4335gnd074a3lnsdspyjdnskgy4bfnf6xmwjx7kjx"; }; nativeBuildInputs = [ @@ -109,8 +109,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - pantheon.elementary-settings-daemon gnome-keyring + gnome-settings-daemon onboard orca ]; @@ -124,7 +124,6 @@ stdenv.mkDerivation rec { postInstall = '' # our mimeapps patched from upstream to exclude: - # * pantheon-mail -> geary # * evince.desktop -> org.gnome.Evince.desktop mkdir -p $out/share/applications cp -av ${./pantheon-mimeapps.list} $out/share/applications/pantheon-mimeapps.list @@ -154,8 +153,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Session settings for elementary"; homepage = "https://github.com/elementary/session-settings"; - license = licenses.lgpl3; + license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list index 3b5e3b0e77a5..8deb6ae8c1c5 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-session-settings/pantheon-mimeapps.list @@ -163,6 +163,6 @@ x-content/video-svcd=io.elementary.videos.desktop x-content/video-vcd=io.elementary.videos.desktop x-scheme-handler/http=org.gnome.Epiphany.desktop x-scheme-handler/https=org.gnome.Epiphany.desktop -x-scheme-handler/mailto=org.gnome.Evolution.desktop +x-scheme-handler/mailto=io.elementary.mail.desktop x-scheme-handler/trash=io.elementary.files.desktop diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index 314267d86122..3a6fbc194772 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , pkg-config @@ -12,13 +13,14 @@ , glib , granite , libgee +, libhandy , elementary-icon-theme , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "elementary-shortcut-overlay"; - version = "1.1.2"; + version = "1.2.0"; repoName = "shortcut-overlay"; @@ -26,9 +28,18 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-TFS29vwDkTtoFcIVAbKskyLemqW9fxE7fQkM61DpDm0="; + sha256 = "1zs2fpx4agr00rsfmpi00nhiw92mlypzm4p9x3g851p24m62fn79"; }; + patches = [ + # Upstream code not respecting our localedir + # https://github.com/elementary/shortcut-overlay/pull/100 + (fetchpatch { + url = "https://github.com/elementary/shortcut-overlay/commit/f26e3684568e30cb6e151438e2d86c4d392626bf.patch"; + sha256 = "0zxyqpk9xbxdm8lmgdwbb4yzzwbjlhypsca3xs34a2pl0b9pcdwd"; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -51,6 +62,7 @@ stdenv.mkDerivation rec { granite gtk3 libgee + libhandy ]; meta = with lib; { @@ -58,6 +70,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/shortcut-overlay"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix index c4467c53a2bf..665007fcd634 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , fetchFromGitHub , nix-update-script -, fetchpatch , pantheon , pkg-config , meson @@ -23,18 +22,20 @@ , elementary-dock , elementary-icon-theme , elementary-settings-daemon +, gnome-settings-daemon , wrapGAppsHook +, gexiv2 }: stdenv.mkDerivation rec { pname = "gala"; - version = "3.3.2"; + version = "6.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-BOarHUEgWqQM6jmVMauJi0JnsM+jE45MnPNnAqz1qOE="; + sha256 = "1yxsfshahaxiqs5waj4v96rhjhdgyd1za4pwlg3vqq51p75k2b1g"; }; passthru = { @@ -61,6 +62,8 @@ stdenv.mkDerivation rec { elementary-dock elementary-icon-theme elementary-settings-daemon + gnome-settings-daemon + gexiv2 gnome-desktop granite gtk3 @@ -71,15 +74,12 @@ stdenv.mkDerivation rec { ]; patches = [ - # https://github.com/elementary/gala/pull/869 - # build failure in vala 0.48.7 - # https://github.com/elementary/gala/pull/869#issuecomment-657147695 - (fetchpatch { - url = "https://github.com/elementary/gala/commit/85d290c75eaa147b704ad34e6c67498071707ee8.patch"; - sha256 = "19jkvmxidf453qfrxkvi35igxzfz2cm8srwkabvyn9wyd1yhiw0l"; - }) ./plugins-dir.patch - ./use-new-notifications-default.patch + # https://github.com/elementary/gala/pull/1259 + # https://github.com/NixOS/nixpkgs/issues/139404 + # Remove this patch when it is included in a new release + # of gala OR when we no longer use mutter 3.38 for pantheon + ./fix-session-crash-when-taking-screenshots.patch ]; postPatch = '' @@ -92,6 +92,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/gala"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/gala/fix-session-crash-when-taking-screenshots.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/gala/fix-session-crash-when-taking-screenshots.patch new file mode 100644 index 000000000000..f2393a804bcf --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/gala/fix-session-crash-when-taking-screenshots.patch @@ -0,0 +1,50 @@ +From fa3c39331d4ef56a13019f45d811bde1fc755c21 Mon Sep 17 00:00:00 2001 +From: Bobby Rong <rjl931189261@126.com> +Date: Sat, 25 Sep 2021 23:21:01 +0800 +Subject: [PATCH] Fix session crash when taking screenshots with mutter 3.38 + +--- + src/ScreenshotManager.vala | 5 ++--- + vapi/mutter-clutter.vapi | 2 +- + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/src/ScreenshotManager.vala b/src/ScreenshotManager.vala +index 3ffb0123..388fee1a 100644 +--- a/src/ScreenshotManager.vala ++++ b/src/ScreenshotManager.vala +@@ -354,12 +354,11 @@ namespace Gala { + paint_flags |= Clutter.PaintFlag.FORCE_CURSORS; + } + +- unowned var data = image.get_data (); + if (GLib.ByteOrder.HOST == GLib.ByteOrder.LITTLE_ENDIAN) { + wm.stage.paint_to_buffer ( + {x, y, width, height}, + scale, +- ref data, ++ image.get_data (), + image.get_stride (), + Cogl.PixelFormat.BGRA_8888_PRE, + paint_flags +@@ -368,7 +367,7 @@ namespace Gala { + wm.stage.paint_to_buffer ( + {x, y, width, height}, + scale, +- ref data, ++ image.get_data (), + image.get_stride (), + Cogl.PixelFormat.ARGB_8888_PRE, + paint_flags +diff --git a/vapi/mutter-clutter.vapi b/vapi/mutter-clutter.vapi +index 5b778cb2..95de24be 100644 +--- a/vapi/mutter-clutter.vapi ++++ b/vapi/mutter-clutter.vapi +@@ -7336,7 +7336,7 @@ namespace Clutter { + [Version (since = "1.2")] + public bool get_use_alpha (); + #if HAS_MUTTER338 +- public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, [CCode (array_length = false)] ref unowned uint8[] data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error; ++ public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, [CCode (array_length = false, type = "uint8_t*")] uint8[] data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error; + public void paint_to_framebuffer (Cogl.Framebuffer framebuffer, Cairo.RectangleInt rect, float scale, Clutter.PaintFlag paint_flags); + #else + [Version (since = "0.4")] diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch index f08652e9f630..b0e72bbe1ab7 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch @@ -1,16 +1,17 @@ diff --git a/meson.build b/meson.build -index 78113d6..926596c 100644 +index d0f00e5..977d2e2 100644 --- a/meson.build +++ b/meson.build -@@ -24,13 +24,14 @@ vapi_dir = meson.current_source_dir() / 'vapi' - +@@ -25,6 +25,7 @@ vapi_dir = meson.current_source_dir() / 'vapi' + locale_dir = join_paths(get_option('prefix'), get_option('localedir')) data_dir = join_paths(get_option('prefix'), get_option('datadir')) plugins_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'plugins') +plugins_dir_for_build = join_paths('/run/current-system/sw/lib/', meson.project_name(), 'plugins') pkgdata_dir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name()) pkglib_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name()) - - conf = configuration_data() + +@@ -33,7 +34,7 @@ conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) + conf.set_quoted('LOCALEDIR', locale_dir) conf.set_quoted('DATADIR', data_dir) conf.set_quoted('PKGDATADIR', pkgdata_dir) -conf.set_quoted('PLUGINDIR', plugins_dir) diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/gala/use-new-notifications-default.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/gala/use-new-notifications-default.patch deleted file mode 100644 index dc256bcff3aa..000000000000 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/gala/use-new-notifications-default.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/data/gala.gschema.xml b/data/gala.gschema.xml -index 8032583..7f4f03c 100644 ---- a/data/gala.gschema.xml -+++ b/data/gala.gschema.xml -@@ -58,7 +58,7 @@ - <description>If enabled, dropping windows on vertical screen edges maximizes them vertically and resizes them horizontally to cover half of the available area. Dropping windows on the top screen edge maximizes them completely.</description> - </key> - <key type="b" name="use-new-notifications"> -- <default>false</default> -+ <default>true</default> - <summary>If new notifications should be used</summary> - <description>If new notifications UI should be used, requires io.elemenetary.notifications to be present and running</description> - </key> diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix new file mode 100644 index 000000000000..7e185ece23ac --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix @@ -0,0 +1,70 @@ +{ lib, stdenv +, fetchFromGitHub +, fetchpatch +, nix-update-script +, pantheon +, meson +, ninja +, pkg-config +, python3 +, vala +, granite +, gtk3 +, libgee +, wingpanel +}: + +stdenv.mkDerivation rec { + pname = "wingpanel-indicator-a11y"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = pname; + rev = version; + sha256 = "1adx1sx9qh02hjgv5h0gwyn116shjl3paxmyaiv4cgh6vq3ndp3c"; + }; + + patches = [ + # Upstream code not respecting our localedir + # https://github.com/elementary/wingpanel-indicator-a11y/pull/48 + (fetchpatch { + url = "https://github.com/elementary/wingpanel-indicator-a11y/commit/fb8412d56bc1c42b70e8ee41b837e8024e1297f7.patch"; + sha256 = "0619npdw9wvaz1zk2lzikczyjdqba8v8c9ry9zizvvl4j1i1ad7k"; + }) + ]; + + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + python3 + vala + ]; + + buildInputs = [ + granite + gtk3 + libgee + wingpanel + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with lib; { + description = "Universal Access Indicator for Wingpanel"; + homepage = "https://github.com/elementary/wingpanel-indicator-a11y"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = teams.pantheon.members; + }; +} diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 230ae29ffa05..29432bf19656 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pantheon , substituteAll @@ -19,7 +18,6 @@ , elementary-dock , bamf , switchboard-with-plugs -, libunity , libsoup , wingpanel , zeitgeist @@ -29,7 +27,7 @@ stdenv.mkDerivation rec { pname = "wingpanel-applications-menu"; - version = "2.7.1"; + version = "2.8.2"; repoName = "applications-menu"; @@ -37,7 +35,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-NeazBzkbdQTC6OzPxxyED4OstMkNkUGtCIaZD67fTnM="; + sha256 = "1pm3dnq35vbvyxqapmfy4frfwhc1l2zh634annlmbjiyfp5mzk0q"; }; passthru = { @@ -59,14 +57,12 @@ stdenv.mkDerivation rec { buildInputs = [ bamf elementary-dock - gnome-menus granite gtk3 json-glib libgee libhandy libsoup - libunity switchboard-with-plugs wingpanel zeitgeist @@ -83,12 +79,6 @@ stdenv.mkDerivation rec { ]; patches = [ - # Port to Libhandy-1 - (fetchpatch { - url = "https://github.com/elementary/applications-menu/commit/8eb2430e8513e9d37f875c5c9b8b15a968c27127.patch"; - sha256 = "8Uw9mUw7U5nrAwUDGVpAwoRqb9ah503wQCr9kPbBJIo="; - }) - (substituteAll { src = ./fix-paths.patch; bc = "${bc}/bin/bc"; @@ -105,6 +95,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/applications-menu"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patch index 25e3891a205a..aea828b36336 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patch +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/fix-paths.patch @@ -1,8 +1,8 @@ diff --git a/src/synapse-plugins/calculator-plugin.vala b/src/synapse-plugins/calculator-plugin.vala -index 18ca3af..f5d1076 100644 +index 886a44cd..a4601da6 100644 --- a/src/synapse-plugins/calculator-plugin.vala +++ b/src/synapse-plugins/calculator-plugin.vala -@@ -44,9 +44,7 @@ namespace Synapse { +@@ -50,9 +50,7 @@ namespace Synapse { _("Calculator"), _("Calculate basic expressions."), "accessories-calculator", @@ -13,10 +13,10 @@ index 18ca3af..f5d1076 100644 ); } -@@ -87,7 +85,7 @@ namespace Synapse { - if (matched) { +@@ -94,7 +92,7 @@ namespace Synapse { Pid pid; int read_fd, write_fd; + /* Must include math library to get non-integer results and to access standard math functions */ - string[] argv = {"bc", "-l"}; + string[] argv = {"@bc@", "-l"}; string? solution = null; diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 03500abd6237..a9b13650ddba 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-bluetooth"; - version = "unstable-2020-10-01"; + version = "2.1.8"; src = fetchFromGitHub { owner = "elementary"; repo = pname; - rev = "2b59d646ea0d66ae45dafc851374f24dcd98c064"; - sha256 = "sha256-selp70P+7RhbdHF6iiNmcNbMf/c+B9zZ6nlxwRSZGn4="; + rev = version; + sha256 = "12rasf8wy3cqnfjlm9s2qnx4drzx0w0yviagkng3kspdzm3vzsqy"; }; passthru = { @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel-indicator-bluetooth"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 03954fac6448..ad030277463c 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -1,6 +1,8 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script +, substituteAll , pantheon , pkg-config , meson @@ -13,6 +15,7 @@ , evolution-data-server , libical , libgee +, libhandy , libxml2 , libsoup , libgdata @@ -21,13 +24,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-datetime"; - version = "2.2.5"; + version = "2.3.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-rZzZIh4bwZfwQFDbfPDKQtfLMJQ2IdykH1yiV6ckqnw="; + sha256 = "1mdm0fsnmmyw8c0ik2jmfri3kas9zkz1hskzf8wvbd51vnazfpgw"; }; passthru = { @@ -50,12 +53,26 @@ stdenv.mkDerivation rec { granite gtk3 libgee + libhandy libical libsoup wingpanel libgdata # required by some dependency transitively ]; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + elementary_calendar = elementary-calendar; + }) + # Upstream code not respecting our localedir + # https://github.com/elementary/wingpanel-indicator-datetime/pull/269 + (fetchpatch { + url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/f7befa68a9fd6215297c334a366919d3431cae65.patch"; + sha256 = "0l997b1pnpjscs886xy28as5yykxamxacvxdv8466zin7zynarfs"; + }) + ]; + postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py @@ -64,8 +81,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Date & Time Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-datetime"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-paths.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-paths.patch new file mode 100644 index 000000000000..bec5f43e0d78 --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/Widgets/calendar/CalendarView.vala b/src/Widgets/calendar/CalendarView.vala +index 6e0d530a..2f90f96c 100644 +--- a/src/Widgets/calendar/CalendarView.vala ++++ b/src/Widgets/calendar/CalendarView.vala +@@ -222,7 +222,7 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid { + + // TODO: As far as maya supports it use the Dbus Activation feature to run the calendar-app. + public void show_date_in_maya (GLib.DateTime date) { +- var command = "io.elementary.calendar --show-day %s".printf (date.format ("%F")); ++ var command = "@elementary_calendar@/bin/io.elementary.calendar --show-day %s".printf (date.format ("%F")); + + try { + var appinfo = AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE); diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index 4e2f9455073c..6d5227b7139f 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , pkg-config @@ -14,17 +15,18 @@ , libgee , xorg , libgnomekbd +, ibus }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-keyboard"; - version = "2.2.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-/sTx0qT7gNj1waQg9OKqHY6MtL+p0NljiIAXKA3DYmA="; + sha256 = "10zzsil5l6snz47nx887r22sl2n0j6bg4dhxmgk3j3xp3jhgmrgl"; }; passthru = { @@ -44,6 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ granite gtk3 + ibus libgee wingpanel xorg.xkeyboardconfig @@ -54,13 +57,19 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; gkbd_keyboard_display = "${libgnomekbd}/bin/gkbd-keyboard-display"; }) + # Upstream code not respecting our localedir + # https://github.com/elementary/wingpanel-indicator-keyboard/pull/110 + (fetchpatch { + url = "https://github.com/elementary/wingpanel-indicator-keyboard/commit/ea5df2f62a99a216ee5ed137268e710490a852a4.patch"; + sha256 = "0fmdz10xgzsryj0f0dnpjrh9yygjkb91a7pxg0rwddxbprhnr7j0"; + }) ]; meta = with lib; { description = "Keyboard Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-keyboard"; - license = licenses.lgpl21Plus; + license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index ab898084c087..92738df7b355 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -1,6 +1,8 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script +, substituteAll , pantheon , pkg-config , meson @@ -12,17 +14,18 @@ , libnma , wingpanel , libgee +, elementary-capnet-assist }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-network"; - version = "2.2.4"; + version = "2.3.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-wVHvHduUT55rIWRfRWg3Z3jL3FdzUJfiqFONRmpCR8k="; + sha256 = "0q5ad2sj0nmigrh1rykb2kvik3hzibzyafdvkkmjd6y92145lwl1"; }; passthru = { @@ -47,11 +50,24 @@ stdenv.mkDerivation rec { wingpanel ]; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + elementary_capnet_assist = elementary-capnet-assist; + }) + # Upstream code not respecting our localedir + # https://github.com/elementary/wingpanel-indicator-network/pull/228 + (fetchpatch { + url = "https://github.com/elementary/wingpanel-indicator-network/commit/eacc7d46a94a980005e87e38e6c943143a09692a.patch"; + sha256 = "1svg07fqmplchp1ass0h8qkr3g24pkw8dcsnd54ddmvnjzwrzz0a"; + }) + ]; + meta = with lib; { description = "Network Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-network"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/fix-paths.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/fix-paths.patch new file mode 100644 index 000000000000..b98c50b3e49a --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/Indicator.vala b/src/Indicator.vala +index 83ce932a..f95ed142 100644 +--- a/src/Indicator.vala ++++ b/src/Indicator.vala +@@ -67,7 +67,7 @@ public class Network.Indicator : Wingpanel.Indicator { + + if (network_monitor.get_connectivity () == NetworkConnectivity.FULL || network_monitor.get_connectivity () == NetworkConnectivity.PORTAL) { + try { +- var appinfo = AppInfo.create_from_commandline ("io.elementary.capnet-assist", null, AppInfoCreateFlags.NONE); ++ var appinfo = AppInfo.create_from_commandline ("@elementary_capnet_assist@/bin/io.elementary.capnet-assist", null, AppInfoCreateFlags.NONE); + appinfo.launch (null, null); + } catch (Error e) { + warning ("%s\n", e.message); diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index 4481c181f53d..23f9e400c01b 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , pkg-config @@ -15,15 +16,24 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-nightlight"; - version = "2.0.4"; + version = "2.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-0f03XO74ezzS/Uy0mXT4raoazETL/SOVh58sAo9bEIA="; + sha256 = "1zxjw68byg4sjn8lzsidzmy4ipwxgnv8rm529a7wzlpgj2xq3x4j"; }; + patches = [ + # Upstream code not respecting our localedir + # https://github.com/elementary/wingpanel-indicator-nightlight/pull/91 + (fetchpatch { + url = "https://github.com/elementary/wingpanel-indicator-nightlight/commit/4e15f71ed958df3569b2f1e224b9fb18613281f1.patch"; + sha256 = "07awmswyy0988pm6ggyz22mllja675cbdzrjdqc1xd4knwcgy77v"; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -45,13 +55,11 @@ stdenv.mkDerivation rec { wingpanel ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel"; - meta = with lib; { description = "Night Light Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-nightlight"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index 97ab0cb80ed3..1a101a8a886d 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -11,26 +11,27 @@ , granite , wingpanel , libgee +, libhandy , elementary-notifications }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-notifications"; - version = "2.1.4"; + version = "6.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-tVPSJO/9IXlibLkb6Cv+8azdvuXbcNOI1qYk4VQc4WI="; + sha256 = "1pvcpk1d2zh9pvw0clv3bhf2plcww6nbxs6j7xjbvnaqs7d6i1k2"; }; patches = [ - # Fix do not disturb on NixOS - # https://github.com/elementary/wingpanel-indicator-notifications/pull/110 + # Upstream code not respecting our localedir + # https://github.com/elementary/wingpanel-indicator-notifications/pull/218 (fetchpatch { - url = "https://github.com/elementary/wingpanel-indicator-notifications/commit/02b1e226c0262c1535fdf2b4f1daba6be9084f67.patch"; - sha256 = "1a5phygygndr28yx8yp0lyk0wxypc5656dpidw1z8x1yd6xysqhy"; + url = "https://github.com/elementary/wingpanel-indicator-notifications/commit/c7e73f0683561345935a959dafa2083b7e22fe99.patch"; + sha256 = "10xiyq42bqfmih1jgqpq64nha3n0y7ra3j7j0q27rn5hhhgbyjs7"; }) ]; @@ -52,6 +53,7 @@ stdenv.mkDerivation rec { granite gtk3 libgee + libhandy wingpanel ]; @@ -60,6 +62,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel-indicator-notifications"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 69a17b9dd30a..f3d3ac0e46d5 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -1,7 +1,9 @@ { lib, stdenv , fetchFromGitHub +, substituteAll , nix-update-script , pantheon +, gnome , pkg-config , meson , python3 @@ -11,6 +13,7 @@ , granite , bamf , libgtop +, libnotify , udev , wingpanel , libgee @@ -18,13 +21,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-power"; - version = "2.2.0"; + version = "6.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-wjYZXFnzvPSukzh1BNvyaFxKpYm+kNNFm5AsthLXGVE="; + sha256 = "1zlpnl7983jkpy2nik08ih8lwrqvm456h993ixa6armzlazdvnjk"; }; passthru = { @@ -47,10 +50,18 @@ stdenv.mkDerivation rec { gtk3 libgee libgtop + libnotify udev wingpanel ]; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + gnome_power_manager = gnome.gnome-power-manager; + }) + ]; + postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py @@ -59,8 +70,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Power Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-power"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/fix-paths.patch b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/fix-paths.patch new file mode 100644 index 000000000000..532001eb663b --- /dev/null +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/Widgets/DeviceList.vala b/src/Widgets/DeviceList.vala +index 0c56f46..33d97b3 100644 +--- a/src/Widgets/DeviceList.vala ++++ b/src/Widgets/DeviceList.vala +@@ -39,7 +39,7 @@ public class Power.Widgets.DeviceList : Gtk.ListBox { + string device_path = path_entries.@get (value); + try { + AppInfo statistics_app = AppInfo.create_from_commandline ( +- "gnome-power-statistics --device " + device_path, ++ "@gnome_power_manager@/bin/gnome-power-statistics --device " + device_path, + "", + AppInfoCreateFlags.NONE + ); diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index a6c08b613bbd..eaccad35aa0b 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -12,19 +12,29 @@ , wingpanel , accountsservice , libgee +, libhandy }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-session"; - version = "unstable-2020-09-13"; + version = "2.3.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; - rev = "e65c95f46adbfd598ad61933394d7bc3c5998278"; - sha256 = "sha256-QKOfgAc6pDQYpETrFunZB6+rF1P8XIf0pjft/t9aWW0="; + rev = version; + sha256 = "0hww856qjl4kjmmksd5gp8bc5vj4fhs2s9fmbnpbf88lg5ds0wv0"; }; + patches = [ + # Upstream code not respecting our localedir + # https://github.com/elementary/wingpanel-indicator-session/pull/162 + (fetchpatch { + url = "https://github.com/elementary/wingpanel-indicator-session/commit/e85032da8e923df4589dc75ccded10026b6c1cd7.patch"; + sha256 = "139b2zbc6qjaw41nwfjkqv4npahkzryv4p5m6v10273clv6l72ng"; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -43,6 +53,7 @@ stdenv.mkDerivation rec { granite gtk3 libgee + libhandy wingpanel ]; @@ -51,6 +62,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel-indicator-session"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index 25707f39e46b..55f27d606467 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -1,12 +1,13 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pantheon , pkg-config , meson , python3 , ninja -, vala +, vala_0_52 , gtk3 , granite , wingpanel @@ -19,15 +20,24 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-sound"; - version = "2.1.6"; + version = "6.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-WGkxLsbdJ7Z7kolymYpggsVy4cN4CicNKdfCbunklSI="; + sha256 = "0cv97c0qrhqisyghy9a9qr4ffcx3g4bkswxm6rn4r2wfg4gvljri"; }; + patches = [ + # Upstream code not respecting our localedir + # https://github.com/elementary/wingpanel-indicator-sound/pull/216 + (fetchpatch { + url = "https://github.com/elementary/wingpanel-indicator-sound/commit/df816104c15e4322c1077313b1f43114cdaf710e.patch"; + sha256 = "029z7l467jz1ymxwrzrf874062r6xmskl7mldpq39jh110fijy5l"; + }) + ]; + passthru = { updateScript = nix-update-script { attrPath = "pantheon.${pname}"; @@ -40,7 +50,9 @@ stdenv.mkDerivation rec { ninja pkg-config python3 - vala + # Does not build with vala 0.54 + # https://github.com/elementary/wingpanel-indicator-sound/issues/219 + vala_0_52 ]; buildInputs = [ @@ -61,8 +73,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Sound Indicator for Wingpanel"; homepage = "https://github.com/elementary/wingpanel-indicator-sound"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 97c2d0c8845a..1ae9f9f4aaa5 100644 --- a/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "wingpanel"; - version = "2.3.2"; + version = "3.0.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-mXi600gufUK81Uks9p4+al0tCI7H9KpizZGyoomp42s="; + sha256 = "0ycys24y1rrz0ydpvs4mc89p4k986q1ziwbvziinxr1wsli9v1dj"; }; passthru = { @@ -82,8 +82,8 @@ stdenv.mkDerivation rec { including the applications menu. ''; homepage = "https://github.com/elementary/wingpanel"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/granite/default.nix b/nixpkgs/pkgs/desktops/pantheon/granite/default.nix index 7f3a6dc0983e..0e6d14d2425a 100644 --- a/nixpkgs/pkgs/desktops/pantheon/granite/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/granite/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "granite"; - version = "6.1.0"; + version = "6.1.1"; outputs = [ "out" "dev" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "02hn4abnsn6fm2m33pjmlnkj8dljsm292z62vn8ccvy7l8f9my6l"; + sha256 = "13c6xk014psvmll9qybdqviskllw4g150m2k4ikjbv59g0rfp7xq"; }; passthru = { @@ -67,6 +67,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/granite"; license = licenses.lgpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/services/contractor/default.nix b/nixpkgs/pkgs/desktops/pantheon/services/contractor/default.nix index e15480c8cc88..666e17362ac2 100644 --- a/nixpkgs/pkgs/desktops/pantheon/services/contractor/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/services/contractor/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "contractor"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-FHLecRxTE8v3M7cV6rkQKNhPhKFhuhvkzB5C+u7Z+Ms="; + sha256 = "1sqww7zlzl086pjww3d21ah1g78lfrc9aagrqhmsnnbji9gwb8ab"; }; passthru = { @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/contractor"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/nixpkgs/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index d9f224ce45d8..0b904a112177 100644 --- a/nixpkgs/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -11,6 +11,7 @@ , gtk3 , granite , libgee +, libhandy , gcr , webkitgtk , wrapGAppsHook @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { pname = "elementary-capnet-assist"; - version = "2.2.5"; + version = "2.3.0"; repoName = "capnet-assist"; @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "sha256-o6J3vNWvV0zRde8VWWfpb56PQhSck2sJQVLimq0P9CY="; + sha256 = "1gma8a04ndivx1fd3ha9f45r642qq2li80wrd6dsrp4v3vqix9bn"; }; passthru = { @@ -50,6 +51,7 @@ stdenv.mkDerivation rec { granite gtk3 libgee + libhandy webkitgtk ]; @@ -66,8 +68,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A small WebKit app that assists a user with login when a captive portal is detected"; homepage = "https://github.com/elementary/capnet-assist"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix b/nixpkgs/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix deleted file mode 100644 index 65995c456599..000000000000 --- a/nixpkgs/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, nix-update-script -, pantheon -, meson -, ninja -, desktop-file-utils -, glib -, coreutils -, elementary-settings-daemon -, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - pname = "elementary-dpms-helper"; - version = "1.0"; - - repoName = "dpms-helper"; - - src = fetchFromGitHub { - owner = "elementary"; - repo = repoName; - rev = version; - sha256 = "sha256-0KbfAxvZ+aFjq+XEK4uoRHSyKlaky0FlJd2a5TG4bms="; - }; - - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; - - nativeBuildInputs = [ - desktop-file-utils - meson - ninja - wrapGAppsHook - ]; - - buildInputs = [ - elementary-settings-daemon - glib - ]; - - preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ glib.dev coreutils ]}") - ''; - - postFixup = '' - substituteInPlace $out/etc/xdg/autostart/io.elementary.dpms-helper.desktop \ - --replace "Exec=io.elementary.dpms-helper" "Exec=$out/bin/io.elementary.dpms-helper" - ''; - - # See: https://github.com/elementary/dpms-helper/pull/10 - postInstall = '' - ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas - ''; - - meta = with lib; { - description = "Sets DPMS settings found in org.pantheon.dpms"; - homepage = "https://github.com/elementary/dpms-helper"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = pantheon.maintainers; - }; -} diff --git a/nixpkgs/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/nixpkgs/pkgs/desktops/pantheon/services/elementary-notifications/default.nix index 73cace23cca9..15ae6840e454 100644 --- a/nixpkgs/pkgs/desktops/pantheon/services/elementary-notifications/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/services/elementary-notifications/default.nix @@ -8,6 +8,7 @@ , glib , granite , libgee +, libhandy , libcanberra-gtk3 , pantheon , python3 @@ -16,15 +17,15 @@ stdenv.mkDerivation rec { pname = "elementary-notifications"; - version = "unstable-2020-03-31"; + version = "6.0.0"; repoName = "notifications"; src = fetchFromGitHub { owner = "elementary"; repo = repoName; - rev = "db552b0c3466ba1099c7737c353b7225ab1896cc"; - sha256 = "1fhf4zx73qka935x5afv6zqsm2l37d1mjbhrbzzzz44dqwa2vp16"; + rev = version; + sha256 = "0jfppafbc8jwhhnillylicz4zfds789d8b31ifsx0qijlxa7kji9"; }; nativeBuildInputs = [ @@ -43,6 +44,7 @@ stdenv.mkDerivation rec { gtk3 libcanberra-gtk3 libgee + libhandy ]; postPatch = '' @@ -54,7 +56,7 @@ stdenv.mkDerivation rec { description = "GTK notification server for Pantheon"; homepage = "https://github.com/elementary/notifications"; license = licenses.gpl3Plus; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 568414aab35c..d1aaad42e2f3 100644 --- a/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -1,166 +1,67 @@ { lib, stdenv -, substituteAll -, fetchurl -, fetchgit -, fetchpatch +, fetchFromGitHub , meson , ninja +, pantheon , pkg-config -, gnome -, perl -, gettext -, gtk3 -, glib -, libnotify -, libgnomekbd -, lcms2 -, libpulseaudio -, alsa-lib -, libcanberra-gtk3 -, upower -, colord -, libgweather -, polkit -, gsettings-desktop-schemas -, geoclue2 -, systemd -, libgudev -, libwacom -, libxslt -, libxml2 -, modemmanager -, networkmanager -, gnome-desktop -, geocode-glib -, docbook_xsl +, python3 +, vala , accountsservice +, dbus +, desktop-file-utils +, geoclue2 +, glib +, gobject-introspection +, gtk3 +, granite +, libgee , wrapGAppsHook -, python3 -, tzdata -, nss -, gcr -, pantheon }: stdenv.mkDerivation rec { pname = "elementary-settings-daemon"; - version = "3.34.1"; + version = "1.0.0"; - repoName = "gnome-settings-daemon"; + repoName = "settings-daemon"; - src = fetchgit { - url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/${repoName}"; - rev = "refs/tags/ubuntu/${version}-1ubuntu2"; - sha256 = "0w0dsbzif7v0gk61rs9g20ldlimbdwb5yvlfdc568yyx5z643jbv"; + src = fetchFromGitHub { + owner = "elementary"; + repo = repoName; + rev = version; + sha256 = "1masvy1f9z2cp8w5ajnhy4k9bzvzgfziqlm59bf146pdd2567hiw"; }; - # We've omitted the 53_sync_input_sources_to_accountsservice patch because it breaks the build. - # See: https://gist.github.com/worldofpeace/2f152a20b7c47895bb93239fce1c9f52 - # - # Also omit ubuntu_calculator_snap.patch as that's obviously not useful here. - patches = let patchPath = "${src}/debian/patches"; in [ - (substituteAll { - src = ./fix-paths.patch; - inherit tzdata; - }) - ./global-backlight-helper.patch - "${patchPath}/45_suppress-printer-may-not-be-connected-notification.patch" - #"${patchPath}/53_sync_input_sources_to_accountsservice.patch" - "${patchPath}/64_restore_terminal_keyboard_shortcut_schema.patch" - "${patchPath}/correct_logout_action.patch" - "${patchPath}/ubuntu-lid-close-suspend.patch" - "${patchPath}/revert-gsettings-removals.patch" - "${patchPath}/revert-mediakeys-dbus-interface-drop.patch" - #"${patchPath}/ubuntu_ibus_configs.patch" - # https://github.com/elementary/os-patches/blob/6975d1c254cb6ab913b8e2396877203aea8eaa65/debian/patches/elementary-dpms.patch - ./elementary-dpms.patch - - # Query GWeather DB on the fly instead of caching. - # Needed for the next patch to apply. - # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/merge_requests/175 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/df6c69f028d27b53ac86829e11df103b25ed5a74.patch"; - sha256 = "bKZkPzN64DXMgitjn0vUzUvKl7ldhN/mNVtPKVmHd0Q="; - }) - # Adjust to libgweather changes. - # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/217 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/82d88014dfca2df7e081712870e1fb017c16b808.patch"; - sha256 = "H5k/v+M2bRaswt5nrDJFNn4gS4BdB0UfzdjUCT4yLKg="; - }) - ]; - nativeBuildInputs = [ + desktop-file-utils + gobject-introspection meson ninja pkg-config - perl - gettext - libxml2 - libxslt - docbook_xsl - wrapGAppsHook python3 + vala + wrapGAppsHook ]; buildInputs = [ accountsservice - alsa-lib - colord - gcr + dbus geoclue2 - geocode-glib glib - gnome-desktop - gsettings-desktop-schemas gtk3 - lcms2 - libcanberra-gtk3 - libgnomekbd # for org.gnome.libgnomekbd.keyboard schema - libgudev - libgweather - libnotify - libpulseaudio - libwacom - modemmanager - networkmanager - nss - polkit - systemd - upower - ]; - - mesonFlags = [ - "-Dudev_dir=${placeholder "out"}/lib/udev" + granite + libgee ]; - # Default for release buildtype but passed manually because - # we're using plain - NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; - postPatch = '' - for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl meson_post_install.py; do - chmod +x $f - patchShebangs $f - done - ''; - - postFixup = '' - # So the polkit policy can reference /run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper - mkdir -p $out/bin/elementary-settings-daemon - ln -s $out/libexec/gsd-backlight-helper $out/bin/elementary-settings-daemon/gsd-backlight-helper + chmod +x meson/post_install.py + patchShebangs meson/post_install.py ''; - passthru = { - updateScript = gnome.updateScript { - packageName = repoName; - attrPath = "pantheon.${pname}"; - }; - }; - meta = with lib; { - license = licenses.gpl2Plus; - maintainers = pantheon.maintainers; + description = "Settings daemon for Pantheon"; + homepage = "https://github.com/elementary/settings-daemon"; + license = licenses.gpl3Plus; + maintainers = teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/elementary-dpms.patch b/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/elementary-dpms.patch deleted file mode 100644 index 14d056ceca27..000000000000 --- a/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/elementary-dpms.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff --git a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in -index ec805d8a..cf0d6793 100644 ---- a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in -+++ b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in -@@ -11,6 +11,11 @@ - <summary>Activation of this plugin</summary> - <description>Whether this plugin would be activated by unity-settings-daemon or not</description> - </key> -+ <key name="manage-dpms-defaults" type="b"> -+ <default>false</default> -+ <summary>Reset X DPMS values</summary> -+ <description>Whether DPMS values will be adjusted by gnome-settings-daemon</description> -+ </key> - <key name="idle-brightness" type="i"> - <default>30</default> - <summary>The brightness of the screen when idle</summary> -diff --git a/plugins/power/gpm-common.c b/plugins/power/gpm-common.c -index a7ca87fb..a56a7cdc 100644 ---- a/plugins/power/gpm-common.c -+++ b/plugins/power/gpm-common.c -@@ -280,6 +280,18 @@ disable_builtin_screensaver (gpointer unused) - return TRUE; - } - -+gboolean -+manage_dpms (void) -+{ -+ GSettings *settings; -+ gboolean manage_dpms_defaults; -+ -+ settings = g_settings_new ("org.gnome.settings-daemon.plugins.power"); -+ manage_dpms_defaults = g_settings_get_boolean (settings, "manage-dpms-defaults"); -+ g_object_unref (settings); -+ return manage_dpms_defaults; -+} -+ - guint - gsd_power_enable_screensaver_watchdog (void) - { -@@ -290,7 +302,7 @@ gsd_power_enable_screensaver_watchdog (void) - * way. The defaults are now applied in Fedora 20 from - * being "0" by default to being "600" by default */ - gdk_x11_display_error_trap_push (gdk_display_get_default ()); -- if (DPMSQueryExtension(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &dummy, &dummy)) -+ if (manage_dpms () && DPMSQueryExtension(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &dummy, &dummy)) - DPMSSetTimeouts (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), 0, 0, 0); - gdk_x11_display_error_trap_pop_ignored (gdk_display_get_default ()); - id = g_timeout_add_seconds (XSCREENSAVER_WATCHDOG_TIMEOUT, -diff --git a/plugins/power/gpm-common.h b/plugins/power/gpm-common.h -index 88a8e00e..af106479 100644 ---- a/plugins/power/gpm-common.h -+++ b/plugins/power/gpm-common.h -@@ -34,6 +34,7 @@ gchar *gpm_get_timestring (guint time); - gboolean gsd_power_is_hardware_a_vm (void); - guint gsd_power_enable_screensaver_watchdog (void); - void reset_idletime (void); -+gboolean manage_dpms (void); - - /* Backlight helpers */ - -diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c -index c500fa38..445496ee 100644 ---- a/plugins/power/gsd-power-manager.c -+++ b/plugins/power/gsd-power-manager.c -@@ -1033,6 +1033,9 @@ backlight_enable (GsdPowerManager *manager) - gboolean ret; - GError *error = NULL; - -+ if (!(manage_dpms ())) -+ return; -+ - iio_proxy_claim_light (manager, TRUE); - ret = gnome_rr_screen_set_dpms_mode (manager->rr_screen, - GNOME_RR_DPMS_ON, -@@ -1052,6 +1055,9 @@ backlight_disable (GsdPowerManager *manager) - gboolean ret; - GError *error = NULL; - -+ if (!(manage_dpms ())) -+ return; -+ - iio_proxy_claim_light (manager, FALSE); - ret = gnome_rr_screen_set_dpms_mode (manager->rr_screen, - GNOME_RR_DPMS_OFF, diff --git a/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch b/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch deleted file mode 100644 index dcdc83934ba6..000000000000 --- a/nixpkgs/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c -index d7d10fd2..5619d6ad 100644 ---- a/plugins/power/gsd-backlight.c -+++ b/plugins/power/gsd-backlight.c -@@ -358,7 +358,7 @@ gsd_backlight_run_set_helper (GsdBacklight *backlight, GTask *task) - proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE, - &error, - "pkexec", -- LIBEXECDIR "/gsd-backlight-helper", -+ "/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper", - g_udev_device_get_sysfs_path (backlight->udev_device), - data->value_str, NULL); - } else { -diff --git a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in -index f16300f8..79d6bd17 100644 ---- a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in -+++ b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in -@@ -25,7 +25,7 @@ - <allow_inactive>no</allow_inactive> - <allow_active>yes</allow_active> - </defaults> -- <annotate key="org.freedesktop.policykit.exec.path">@libexecdir@/gsd-backlight-helper</annotate> -+ <annotate key="org.freedesktop.policykit.exec.path">/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper</annotate> - </action> - - </policyconfig> diff --git a/nixpkgs/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/nixpkgs/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix index 70b62e2b9a07..e2053ebf6a31 100644 --- a/nixpkgs/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "pantheon-agent-geoclue2"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-LrDu9NczSKN9YLo922MqYbcHG1QAwzXUb7W0Q/g9ftI="; + sha256 = "0hx3sky0vd2vshkscy3w5x3s18gd45cfqh510xhbmvc0sa32q9gd"; }; passthru = { @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/pantheon-agent-geoclue2"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/nixpkgs/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix index 61bbb6ef9a4b..4bef7fd5e08e 100644 --- a/nixpkgs/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix +++ b/nixpkgs/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "pantheon-agent-polkit"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-YL1LHnPH7pP0EW9IkjdSEX+VuaAF9uNyFbl47vjVps0="; + sha256 = "1acqjjarl225yk0f68wkldsamcrzrj0ibpcxma04wq9w7jlmz60c"; }; passthru = { @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/pantheon-agent-polkit"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/desktops/plasma-5/fetch.sh b/nixpkgs/pkgs/desktops/plasma-5/fetch.sh index db200b4cd1ea..5e9e799e2e7e 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/fetch.sh +++ b/nixpkgs/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.22.4/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.22.5/ -A '*.tar.xz' ) diff --git a/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix b/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix index e6e49a591810..c650f4ef83df 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix @@ -40,6 +40,18 @@ mkDerivation { ./0002-xwayland.patch ./0003-plugins-qpa-allow-using-nixos-wrapper.patch ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch + # Fix build against libglvnd 1.3.4+ + # Remove with release 5.22.90 + (fetchpatch { + url = "https://invent.kde.org/plasma/kwin/-/commit/839710201c389b7f4ed248cb3818e755a37ce977.patch"; + sha256 = "09rldhy0sbmqdfpyjzwm20cwnmrmj0w2751vyi5xlr414g0rzyc1"; + }) + # Fixup previous patch for i686 + # Remove with release 5.22.90 + (fetchpatch { + url = "https://invent.kde.org/plasma/kwin/-/commit/38e24ecd6416a975db0989c21b70d6a4cc242f35.patch"; + sha256 = "0zsjmzswcnvfd2jm1c8i9aijpbap1141mjv6y4j282bplyqlp966"; + }) ]; CXXFLAGS = [ ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' diff --git a/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix index d8ca0ddfdec3..1dc3d99b5e4c 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchpatch, extra-cmake-modules, kdoctools, boost, fontconfig, ibus, libXcursor, libXft, libcanberra_kde, libpulseaudio, @@ -21,7 +21,8 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft xorgserver - libxkbfile phonon xf86inputevdev xf86inputsynaptics xinput xkeyboard_config + libxkbfile phonon xf86inputlibinput xf86inputevdev xf86inputsynaptics xinput + xkeyboard_config accounts-qt qtdeclarative qtquickcontrols qtquickcontrols2 qtsvg qtx11extras @@ -35,19 +36,15 @@ mkDerivation { patches = [ ./hwclock-path.patch ./tzdir.patch + # https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/563 + (fetchpatch { + url = "https://invent.kde.org/plasma/plasma-desktop/-/commit/8d9bf2032b8a2e5de75edf5713c42866f5b80649.patch"; + sha256 = "sha256-2jqqFjBljbhf7I+fTsIvuFs3Ic662KTKRnbcSm5Jing="; + }) ]; - postPatch = '' - sed '1i#include <cmath>' -i kcms/touchpad/backends/x11/synapticstouchpad.cpp - ''; CXXFLAGS = [ - "-I${lib.getDev xorgserver}/include/xorg" - "-I${lib.getDev xf86inputsynaptics}/include/xorg" ''-DNIXPKGS_HWCLOCK=\"${lib.getBin util-linux}/sbin/hwclock\"'' ]; - cmakeFlags = [ - "-DEvdev_INCLUDE_DIRS=${lib.getDev xf86inputevdev}/include/xorg" - "-DXORGLIBINPUT_INCLUDE_DIRS=${lib.getDev xf86inputlibinput}/include/xorg" - ]; postInstall = '' # Display ~/Desktop contents on the desktop by default. sed -i "''${!outputBin}/share/plasma/shells/org.kde.plasma.desktop/contents/defaults" \ diff --git a/nixpkgs/pkgs/desktops/plasma-5/srcs.nix b/nixpkgs/pkgs/desktops/plasma-5/srcs.nix index 0cd26b6a6cf3..c90bc704237d 100644 --- a/nixpkgs/pkgs/desktops/plasma-5/srcs.nix +++ b/nixpkgs/pkgs/desktops/plasma-5/srcs.nix @@ -4,427 +4,427 @@ { bluedevil = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/bluedevil-5.22.4.tar.xz"; - sha256 = "10bqk46ygnf72aqxxaxlx4khv1gwj46la1czsjmlszvkcqxrpwa0"; - name = "bluedevil-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/bluedevil-5.22.5.tar.xz"; + sha256 = "01fc5zk3qh3kx8z3dpikaaidi6vg21s75kmpd9w65rj5akg98452"; + name = "bluedevil-5.22.5.tar.xz"; }; }; breeze = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/breeze-5.22.4.tar.xz"; - sha256 = "1b4zrwpaayd6mlwsnwg416ryba32zpg8w2dlh56qbmg6jxzjnybx"; - name = "breeze-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/breeze-5.22.5.tar.xz"; + sha256 = "09ll0bddsbbhz7ihqcn0wbd2llbjrblgk90gp556kpy09jh4rz73"; + name = "breeze-5.22.5.tar.xz"; }; }; breeze-grub = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/breeze-grub-5.22.4.tar.xz"; - sha256 = "19zlhq3k80id676sxlf8nhk0a11rkrwmbd256aggdwhz1fivxc1c"; - name = "breeze-grub-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/breeze-grub-5.22.5.tar.xz"; + sha256 = "1p08pmhkac3s5pccryy5s33594kr0v8z6j1hg94l419nzaqqya1v"; + name = "breeze-grub-5.22.5.tar.xz"; }; }; breeze-gtk = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/breeze-gtk-5.22.4.tar.xz"; - sha256 = "1p47vsr2xj00p1r2jhyns2wzchjlhymzzyv2xqy9xd4l8pkv8scb"; - name = "breeze-gtk-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/breeze-gtk-5.22.5.tar.xz"; + sha256 = "0lifs97wad9cg5hp1vdd5ag9fkcbqj3h2bkg6x5jd4f41j0x2fy2"; + name = "breeze-gtk-5.22.5.tar.xz"; }; }; breeze-plymouth = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/breeze-plymouth-5.22.4.tar.xz"; - sha256 = "0b9sjn8lfhgyc2sz1r9rnknkas79526qmwi5j3wbxb0va2rcap9z"; - name = "breeze-plymouth-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/breeze-plymouth-5.22.5.tar.xz"; + sha256 = "1735ii7is873yz6rhcsrj81crvmdxj4a368k22rkj8nm374s44g1"; + name = "breeze-plymouth-5.22.5.tar.xz"; }; }; discover = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/discover-5.22.4.tar.xz"; - sha256 = "0ij7b1fyv9rgiw6ywgxzj35c9bd3937w3njzqmkzi2l9zlnrzwvg"; - name = "discover-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/discover-5.22.5.tar.xz"; + sha256 = "1c22910ainm4819xzkri8j2x8lng0g6zgmh1k770jsgjyg49x069"; + name = "discover-5.22.5.tar.xz"; }; }; drkonqi = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/drkonqi-5.22.4.tar.xz"; - sha256 = "1dy5v50icnlwa4pl5z30q5abv2sbznlrpgiy28hh1mf64hx6hl3w"; - name = "drkonqi-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/drkonqi-5.22.5.tar.xz"; + sha256 = "1f23p35wzsk0wx2kz0r7x616in6kizzdvl9j37v2a94hh8z3f7my"; + name = "drkonqi-5.22.5.tar.xz"; }; }; kactivitymanagerd = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kactivitymanagerd-5.22.4.tar.xz"; - sha256 = "1km0mlqyrvflq45gwffrbwvkrqirb44qn1rp37iif4d82pmx11yv"; - name = "kactivitymanagerd-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kactivitymanagerd-5.22.5.tar.xz"; + sha256 = "069a862myj9b0303qc6j8iv3mdja8qhzx5ax52206pjrglvn9ar2"; + name = "kactivitymanagerd-5.22.5.tar.xz"; }; }; kde-cli-tools = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kde-cli-tools-5.22.4.tar.xz"; - sha256 = "1kh8pba9q61qjjpc945nvx42mm63vrj5bny4iv60jgcfxxwy7qj4"; - name = "kde-cli-tools-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kde-cli-tools-5.22.5.tar.xz"; + sha256 = "1jj5vywai9di05wzr81dzvrcsb5h6l300llw3ma49f0jl4z3gjwh"; + name = "kde-cli-tools-5.22.5.tar.xz"; }; }; - kdecoration = { - version = "5.22.4"; + kde-gtk-config = { + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kdecoration-5.22.4.tar.xz"; - sha256 = "0cc0lskm359lbg93bxny84cf1qnk0h53f64bxy3dvbyn5gmvzsch"; - name = "kdecoration-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kde-gtk-config-5.22.5.tar.xz"; + sha256 = "0v0yjy6diwby3y71kkipx8h0wxfc49nwr2r3g2j8cf9ybqnwmy6s"; + name = "kde-gtk-config-5.22.5.tar.xz"; }; }; - kde-gtk-config = { - version = "5.22.4"; + kdecoration = { + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kde-gtk-config-5.22.4.tar.xz"; - sha256 = "0d56brzpk5yi7cdyvpqg3jlk5n3l2dvk98npw34fd4i3gw357px8"; - name = "kde-gtk-config-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kdecoration-5.22.5.tar.xz"; + sha256 = "1vqv44ls79x2d71ldkkkzpk4mzpv110y270wf1gbkmxaxwp20xxm"; + name = "kdecoration-5.22.5.tar.xz"; }; }; kdeplasma-addons = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kdeplasma-addons-5.22.4.tar.xz"; - sha256 = "1flf4mq0zcjh7fnv155hklliidfvflh20d1s84rj8q2ka7phcwk0"; - name = "kdeplasma-addons-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kdeplasma-addons-5.22.5.tar.xz"; + sha256 = "00ricjqxcafhji8b33zqynrlh56z3nr516v5jghp8cz2wclvnh32"; + name = "kdeplasma-addons-5.22.5.tar.xz"; }; }; kgamma5 = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kgamma5-5.22.4.tar.xz"; - sha256 = "0fgx9i031iqrp7w7v7px1vha079cjcdv9w5ah4k1m53g8abriddl"; - name = "kgamma5-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kgamma5-5.22.5.tar.xz"; + sha256 = "0m2h4wwkg3dnkvq31z8mvn4q1r7hwi1q2d7csy350ycrv9x7f402"; + name = "kgamma5-5.22.5.tar.xz"; }; }; khotkeys = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/khotkeys-5.22.4.tar.xz"; - sha256 = "1lm1xrbrpym7nhvnzljdgr5nsas8z3i0hgda53j5k6svzk5r3qg8"; - name = "khotkeys-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/khotkeys-5.22.5.tar.xz"; + sha256 = "1l0p9q7bmljism188mzssryyd31b1x0alivnpsk0jhhjr9hwbqb4"; + name = "khotkeys-5.22.5.tar.xz"; }; }; kinfocenter = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kinfocenter-5.22.4.tar.xz"; - sha256 = "14vfz5j3fxhfb1fip00fgg9k6dc9ffjf0ss8ij1cx7bga14nmzvw"; - name = "kinfocenter-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kinfocenter-5.22.5.tar.xz"; + sha256 = "1pxr4pihy6asflpij5r4payxnbagzkli3qm5zh4zgap4bhq447lm"; + name = "kinfocenter-5.22.5.tar.xz"; }; }; kmenuedit = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kmenuedit-5.22.4.tar.xz"; - sha256 = "186j8ky5z3l0mmxx327xzahhsyf7wlds1rsmzzmlxficpg43n90b"; - name = "kmenuedit-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kmenuedit-5.22.5.tar.xz"; + sha256 = "1in8q0hd8wgcnwmx0cpv2w5l2w75xhv5j38mc5py322h9gkg1mqs"; + name = "kmenuedit-5.22.5.tar.xz"; }; }; kscreen = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kscreen-5.22.4.tar.xz"; - sha256 = "0hkn7ap55x4rzm6x3qdinjar9qhnb742zgzmvswy1kn3a8mxby17"; - name = "kscreen-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kscreen-5.22.5.tar.xz"; + sha256 = "0q0ykp10nwfzzxjrcra11k4b81di4r37jbhis4b9wn9j0pqv3ykb"; + name = "kscreen-5.22.5.tar.xz"; }; }; kscreenlocker = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kscreenlocker-5.22.4.tar.xz"; - sha256 = "0i7c6a378h7366h7nl5051mwrx7cadzfaryfnhpskhlgy3l7119j"; - name = "kscreenlocker-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kscreenlocker-5.22.5.tar.xz"; + sha256 = "107icbr0cdcpbzi5npgx3fw2m2wp1z91k1iw26n595dp3n2czv98"; + name = "kscreenlocker-5.22.5.tar.xz"; }; }; ksshaskpass = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/ksshaskpass-5.22.4.tar.xz"; - sha256 = "01f2rz1xqb1jy83427f7rmsb3a7ivkgf2qmm04kwjv29zplg796f"; - name = "ksshaskpass-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/ksshaskpass-5.22.5.tar.xz"; + sha256 = "0ig2cx80ba57k9mq7bcnmriymjln7kvr81mgm5rsdi4asal2zpgp"; + name = "ksshaskpass-5.22.5.tar.xz"; }; }; ksystemstats = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/ksystemstats-5.22.4.tar.xz"; - sha256 = "1daz3890v7qbkcsb9m535mfnijdq3rbasxwqs0ixhn2m400yivvg"; - name = "ksystemstats-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/ksystemstats-5.22.5.tar.xz"; + sha256 = "1cb5hbwnj6j9ziin6bflcz9b8jyvjqbqqhqbzvgs8dyji2xz0gb8"; + name = "ksystemstats-5.22.5.tar.xz"; }; }; kwallet-pam = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kwallet-pam-5.22.4.tar.xz"; - sha256 = "1ljrrgjvkvs3fsiijgaxj82hzp1fhsiy39r4amwp21v411c80jwq"; - name = "kwallet-pam-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kwallet-pam-5.22.5.tar.xz"; + sha256 = "03rj2kgda1as547jjvvigkb4pblh1w9jv8hsrjrs5vwfir0ag8nq"; + name = "kwallet-pam-5.22.5.tar.xz"; }; }; kwayland-integration = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kwayland-integration-5.22.4.tar.xz"; - sha256 = "17nl033vl8i9a92bjbgwwwrkf03lg4726lwdbj3y8xajdp8ql1nb"; - name = "kwayland-integration-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kwayland-integration-5.22.5.tar.xz"; + sha256 = "0kgv6klb32y7ckflsi5xbs8ajn7zg461621fqhmgn1x54w931g2c"; + name = "kwayland-integration-5.22.5.tar.xz"; }; }; kwayland-server = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kwayland-server-5.22.4.tar.xz"; - sha256 = "0z3ni5ar2bwpc75ssb3qmkbff85a489sxr7vzqhxa40n48bp85ns"; - name = "kwayland-server-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kwayland-server-5.22.5.tar.xz"; + sha256 = "17gkbcam9dpqbw618rvb5ia8inp0yvpyr3bxd0fn4fdj57bbsr6x"; + name = "kwayland-server-5.22.5.tar.xz"; }; }; kwin = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kwin-5.22.4.tar.xz"; - sha256 = "1x5338aib7kn1lgpb06b8s06bfj2ybfgyr6k0q91zlc53x61qamh"; - name = "kwin-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kwin-5.22.5.tar.xz"; + sha256 = "18zmzhmjr6q5vsfd7lr0ym5ga7l2x8xcxqizmpfnb7hv3kaax38j"; + name = "kwin-5.22.5.tar.xz"; }; }; kwrited = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/kwrited-5.22.4.tar.xz"; - sha256 = "1rbkbqf5v8wqd2aldpg396ki8a9fsw82jmzmdhsirq33r5yznn4i"; - name = "kwrited-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/kwrited-5.22.5.tar.xz"; + sha256 = "02cffj88hqs5rfvrkkmk9z23qsdnqhavm98hksx1v5ajjh4rbgb3"; + name = "kwrited-5.22.5.tar.xz"; }; }; layer-shell-qt = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/layer-shell-qt-5.22.4.tar.xz"; - sha256 = "11iqk4bla0y0w2frmvzxi4a3jxj3cj2m8y473z3nfb0z8i5yca0m"; - name = "layer-shell-qt-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/layer-shell-qt-5.22.5.tar.xz"; + sha256 = "0i9gsckqk9608drxvym6ghcwxqilcf6ilcxq48sbrnpswid71k7z"; + name = "layer-shell-qt-5.22.5.tar.xz"; }; }; libkscreen = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/libkscreen-5.22.4.tar.xz"; - sha256 = "0z2mzha22f2yl7l0ijy4pqpab6n1ivib3grnd583znff02wvj4d2"; - name = "libkscreen-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/libkscreen-5.22.5.tar.xz"; + sha256 = "1qqnra28r698kbps6ywk22ncac4sm3f9d9wrwmicp963mkmwlksv"; + name = "libkscreen-5.22.5.tar.xz"; }; }; libksysguard = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/libksysguard-5.22.4.tar.xz"; - sha256 = "14h66gs7z6gf7wrpdhpd1461431q2plv7kvfsh02fj52l1dzpcc0"; - name = "libksysguard-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/libksysguard-5.22.5.tar.xz"; + sha256 = "1hkjsjfl4hsxbk998hpq4f38rahqfx6nmznbh0dqrymadfbsn8m5"; + name = "libksysguard-5.22.5.tar.xz"; }; }; milou = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/milou-5.22.4.tar.xz"; - sha256 = "11fa9bj3yzriaydfk8q9kc626yv0s0sal5ws13pcd6ksbhslz83s"; - name = "milou-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/milou-5.22.5.tar.xz"; + sha256 = "1d1zg1fbhl6cbxfhgrp9njvpcn052psn96cfyw314255v532phpp"; + name = "milou-5.22.5.tar.xz"; }; }; oxygen = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/oxygen-5.22.4.tar.xz"; - sha256 = "1p5hklryi02xw0byy5zcaxx5zw81vd6vq3s1h8dyhj07vspimpzw"; - name = "oxygen-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/oxygen-5.22.5.tar.xz"; + sha256 = "0fy4dr8kjyh96w482qbf47vkbnb2qqwwp8d0jlf0xc20w6fb4fqc"; + name = "oxygen-5.22.5.tar.xz"; }; }; plasma-browser-integration = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-browser-integration-5.22.4.tar.xz"; - sha256 = "023qbp77ga0jblhhx3437v9jjxx5va7q58abmnpv2nls1xwyq8hb"; - name = "plasma-browser-integration-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-browser-integration-5.22.5.tar.xz"; + sha256 = "1zkz4qd9nk2kw8zx0mj0p5q4yclmfgz5ihfmgqb2iw4j0d2ckw8f"; + name = "plasma-browser-integration-5.22.5.tar.xz"; }; }; plasma-desktop = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-desktop-5.22.4.tar.xz"; - sha256 = "0c225lckhsmhig7xsnv5yfajys3w67g6xj4w1hvz1x3hqs79z3kj"; - name = "plasma-desktop-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-desktop-5.22.5.tar.xz"; + sha256 = "1kmcmpfjgmiazalczjchyrvgy365s1gqdnyv3xav4g4irb62llxl"; + name = "plasma-desktop-5.22.5.tar.xz"; }; }; plasma-disks = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-disks-5.22.4.tar.xz"; - sha256 = "02brm36akqfhjz9fzyzfinjnb954glrrlwpyhiq1sx073v2ibyap"; - name = "plasma-disks-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-disks-5.22.5.tar.xz"; + sha256 = "14ml1vxdp6brms8yqg5x96bad2r9n81cki91fsq6qk0aq098dqbh"; + name = "plasma-disks-5.22.5.tar.xz"; }; }; plasma-firewall = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-firewall-5.22.4.tar.xz"; - sha256 = "1c1mzpd45hd4sb6qsylqgq2x4fay1nskkgmcc1vswmnapcm9gp91"; - name = "plasma-firewall-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-firewall-5.22.5.tar.xz"; + sha256 = "19ii5ha3m9jmfrdg59z9nfx8frmp4f2gc3a7c0krsnajhyrm0npg"; + name = "plasma-firewall-5.22.5.tar.xz"; }; }; plasma-integration = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-integration-5.22.4.tar.xz"; - sha256 = "0rslli0jsyyhm6prac3xgilwf58gjxqhsijgvr25sipg6200r2z0"; - name = "plasma-integration-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-integration-5.22.5.tar.xz"; + sha256 = "0w7jnsyz876k6kzppd6lx0i58ywbfhaycsnq3nn2s10im7ql7ir8"; + name = "plasma-integration-5.22.5.tar.xz"; }; }; plasma-nano = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-nano-5.22.4.tar.xz"; - sha256 = "1ag57nphgkj3f17s42d81npk0z2n27623szbiz1hpgp7f6994l90"; - name = "plasma-nano-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-nano-5.22.5.tar.xz"; + sha256 = "0i8r8mxf00c0rfnybxy2nzl2hn2r7vqfzwlbmkykd6b1z333xfjh"; + name = "plasma-nano-5.22.5.tar.xz"; }; }; plasma-nm = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-nm-5.22.4.tar.xz"; - sha256 = "1cvfawsqzk3yzjwnz6gc6l7p3pz9brbh0n6km23i1bis08rks168"; - name = "plasma-nm-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-nm-5.22.5.tar.xz"; + sha256 = "0jgwp41l4h16qyif2bwnsdfd190ykpddv7gi3zrcmc57fnhrzavz"; + name = "plasma-nm-5.22.5.tar.xz"; }; }; plasma-pa = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-pa-5.22.4.tar.xz"; - sha256 = "1p000y08p89wvv73glv9ic0gdbdhc9fpzvphx72y420g5hhmnnwa"; - name = "plasma-pa-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-pa-5.22.5.tar.xz"; + sha256 = "1axm564si8g9j9f9ndvq39x7s6awiwiiyqnvs1wf76miyyjfdba0"; + name = "plasma-pa-5.22.5.tar.xz"; }; }; plasma-phone-components = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-phone-components-5.22.4.tar.xz"; - sha256 = "0mkr7amxvr325y7f98y1368iv4gs6j2x6bkpi20rp8c2vifkvg5b"; - name = "plasma-phone-components-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-phone-components-5.22.5.tar.xz"; + sha256 = "1m2swgkydjrpxsnj87fs8zkyavba6zrfrzvimbhxf15c3199yrj0"; + name = "plasma-phone-components-5.22.5.tar.xz"; }; }; plasma-sdk = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-sdk-5.22.4.tar.xz"; - sha256 = "0nrh3zbff25wr59hbsvrygjix56as8rd95smr5075qwdyamcqnhf"; - name = "plasma-sdk-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-sdk-5.22.5.tar.xz"; + sha256 = "0gvmvdlqjm2kvkb7bw3bhryql4d9mp0max89l9y25kzqadd6byad"; + name = "plasma-sdk-5.22.5.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-systemmonitor-5.22.4.tar.xz"; - sha256 = "1gl6kjk6b8xwcfrk6xf41jf1lh3zxr5b6qvdv7z6i8wb3pll63cb"; - name = "plasma-systemmonitor-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-systemmonitor-5.22.5.tar.xz"; + sha256 = "18s72vdcx4jrjs1hfr7mq8zjng2pmba2x23k11jdk8hxl7msm7nx"; + name = "plasma-systemmonitor-5.22.5.tar.xz"; }; }; plasma-tests = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-tests-5.22.4.tar.xz"; - sha256 = "1wf33c0izm9yyjcysiimcpiwmsa64b4ypklga2rbg7kkk7q0nq82"; - name = "plasma-tests-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-tests-5.22.5.tar.xz"; + sha256 = "1wmwm9mmdy98qrmr0r8h99j0cpmib2vyv66jk99wf43bwddy2hxi"; + name = "plasma-tests-5.22.5.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-thunderbolt-5.22.4.tar.xz"; - sha256 = "1c5ihvam5hfk7xiy3m707jjhpv2rxgl7d2f6m0d764zynm6zax79"; - name = "plasma-thunderbolt-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-thunderbolt-5.22.5.tar.xz"; + sha256 = "13rjn21sdga5yx9983zx26jdb260lg5815ilfjnkdfp7g6ckjlmc"; + name = "plasma-thunderbolt-5.22.5.tar.xz"; }; }; plasma-vault = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-vault-5.22.4.tar.xz"; - sha256 = "1p6bl8as8rx36nzwx2rymqmx4rg7dg0bfrxr0flx9jqp1adclf39"; - name = "plasma-vault-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-vault-5.22.5.tar.xz"; + sha256 = "1ap9kp9agnqljlszzkd14sivpfz9ihjlhq67lhg2sg570s8ng4a0"; + name = "plasma-vault-5.22.5.tar.xz"; }; }; plasma-workspace = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-workspace-5.22.4.tar.xz"; - sha256 = "1fi0c66f2cgqcbshbaxzch75r28l5w4l3flggccil5c73lavf5mg"; - name = "plasma-workspace-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-workspace-5.22.5.tar.xz"; + sha256 = "01inn7jawqn5brcmbglqs3szfzkq637qzf39kya8siq3lgg14bpj"; + name = "plasma-workspace-5.22.5.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plasma-workspace-wallpapers-5.22.4.tar.xz"; - sha256 = "0abz3qic8m7dcbd0m1ci8qspfds3fdsqhgv8m6ks2jkcm7z4vnnr"; - name = "plasma-workspace-wallpapers-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plasma-workspace-wallpapers-5.22.5.tar.xz"; + sha256 = "1h582vqw14zyngfyjppg6lgs17d1nmc7gcr8kw1zzbc0ynbl68dy"; + name = "plasma-workspace-wallpapers-5.22.5.tar.xz"; }; }; plymouth-kcm = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/plymouth-kcm-5.22.4.tar.xz"; - sha256 = "0vh39lidm0dqah14y7nkzqpanlkxpmylf7wc40giavady3d2i1y1"; - name = "plymouth-kcm-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/plymouth-kcm-5.22.5.tar.xz"; + sha256 = "1rn8c0z6ycagmxm72gs9cm6pwv1fy8zg5881brglpxy8x63prb9g"; + name = "plymouth-kcm-5.22.5.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.22.4"; + version = "1-5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/polkit-kde-agent-1-5.22.4.tar.xz"; - sha256 = "0pxrrn4qs96a5p9cp890vdq2g79ah72p655643ciqdb14936p0z2"; - name = "polkit-kde-agent-1-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/polkit-kde-agent-1-5.22.5.tar.xz"; + sha256 = "1a1b4baszlx01x4n66wikgw8z7wwnycz5rqzjr8r6q1b9dafmqv0"; + name = "polkit-kde-agent-1-5.22.5.tar.xz"; }; }; powerdevil = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/powerdevil-5.22.4.tar.xz"; - sha256 = "17427sv6yh16hmgl94lyb4d7gds0r4hvx8vbbqhzysih2x81xl6m"; - name = "powerdevil-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/powerdevil-5.22.5.tar.xz"; + sha256 = "17qw7w9h60illpzd1zlymdipx0mpwfhn12d9k0f165qcabk02wsr"; + name = "powerdevil-5.22.5.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/qqc2-breeze-style-5.22.4.tar.xz"; - sha256 = "15h9rjc4ry3kw18aw18r8y8av4cn2wckab8gyyi7zx7s54n6zpvc"; - name = "qqc2-breeze-style-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/qqc2-breeze-style-5.22.5.tar.xz"; + sha256 = "0qi8b11f45lnyy09w3b65h0s7qj7d40b7ppwy8mapr92m0zqrkpf"; + name = "qqc2-breeze-style-5.22.5.tar.xz"; }; }; sddm-kcm = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/sddm-kcm-5.22.4.tar.xz"; - sha256 = "08j0qd288a5msagpyaqwrw0w6wymxsgqq3rlk8kv3n6qvrsm7174"; - name = "sddm-kcm-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/sddm-kcm-5.22.5.tar.xz"; + sha256 = "163p426bd9zfval5zz2hmq3na0px3pz016shzzgna3rqwh7s8sa6"; + name = "sddm-kcm-5.22.5.tar.xz"; }; }; systemsettings = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/systemsettings-5.22.4.tar.xz"; - sha256 = "1ap2h1sa6hdakhf6lzy4bhaq5pxc8g7p32iz04894hd7dbb2iv8h"; - name = "systemsettings-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/systemsettings-5.22.5.tar.xz"; + sha256 = "1fvmp6nhmn71hxrf0nfg9m8ifp36kvk5k550hiazgz63l7x7hyfc"; + name = "systemsettings-5.22.5.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.22.4"; + version = "5.22.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.22.4/xdg-desktop-portal-kde-5.22.4.tar.xz"; - sha256 = "1xmlw66bw60cl530hjjab8g4krv6di4wpimjaz0a9mv3dnq9xz7m"; - name = "xdg-desktop-portal-kde-5.22.4.tar.xz"; + url = "${mirror}/stable/plasma/5.22.5/xdg-desktop-portal-kde-5.22.5.tar.xz"; + sha256 = "00d6dh9jh15y0ndcrm86wzhmpv81s9pm0x0pbiywdia606yp27c6"; + name = "xdg-desktop-portal-kde-5.22.5.tar.xz"; }; }; } diff --git a/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix b/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix index 7efc64e942de..42c0f1ef674c 100644 --- a/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix +++ b/nixpkgs/pkgs/desktops/xfce/core/thunar/default.nix @@ -21,9 +21,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "4.16.8"; + version = "4.16.9"; - sha256 = "sha256-KFx01vbVeGR+0U3DkUVRhO7pTv3R2h7qSe5VQE2b+OQ="; + sha256 = "sha256-TpazNC4TwNhcEGQ4AQICxbmfZ1i4RE9vXkM9Zln80vE="; nativeBuildInputs = [ docbook_xsl diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix b/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix index c8a1964814e5..585277064ab1 100644 --- a/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/common.nix @@ -193,11 +193,11 @@ stdenv.mkDerivation rec { --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i fi if [[ $i =~ libcudart ]]; then - rpath2= + patchelf --remove-rpath $i else rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64 + patchelf --set-rpath "$rpath2" --force-rpath $i fi - patchelf --set-rpath "$rpath2" --force-rpath $i done < <(find $out $lib $doc -type f -print0) ''; diff --git a/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix b/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix index da6857f6ab92..1747f16f12d1 100644 --- a/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix +++ b/nixpkgs/pkgs/development/compilers/cudatoolkit/default.nix @@ -1,13 +1,15 @@ -{ lib -, callPackage +{ callPackage , fetchurl , gcc7 , gcc9 +, gcc10 +, lib }: let common = callPackage ./common.nix; -in rec { +in +rec { cudatoolkit_10_0 = common { version = "10.0.130"; url = "https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux"; @@ -56,5 +58,19 @@ in rec { gcc = gcc9; }; + cudatoolkit_11_3 = common { + version = "11.3.1"; + url = "https://developer.download.nvidia.com/compute/cuda/11.3.1/local_installers/cuda_11.3.1_465.19.01_linux.run"; + sha256 = "0d19pwcqin76scbw1s5kgj8n0z1p4v1hyfldqmamilyfxycfm4xd"; + gcc = gcc9; + }; + + cudatoolkit_11_4 = common { + version = "11.4.1"; + url = "https://developer.download.nvidia.com/compute/cuda/11.4.1/local_installers/cuda_11.4.1_470.57.02_linux.run"; + sha256 = "0180pb1zfajb9l6blr467xkx01yp3snfwm2xix8x52crf6d36v6x"; + gcc = gcc10; # can bump to 11 along with stdenv.cc + }; + cudatoolkit_11 = cudatoolkit_11_2; } diff --git a/nixpkgs/pkgs/development/compilers/dmd/default.nix b/nixpkgs/pkgs/development/compilers/dmd/default.nix index 3ae72e5862f7..04dbfc0faa9e 100644 --- a/nixpkgs/pkgs/development/compilers/dmd/default.nix +++ b/nixpkgs/pkgs/development/compilers/dmd/default.nix @@ -1,26 +1,25 @@ { stdenv, lib, fetchFromGitHub , makeWrapper, unzip, which, writeTextFile -, curl, tzdata, gdb, darwin, git, callPackage +, curl, tzdata, gdb, Foundation, git, callPackage , targetPackages, fetchpatch, bash -, dmdBootstrap ? callPackage ./bootstrap.nix { } -, HOST_DMD ? "${dmdBootstrap}/bin/dmd" -, version ? "2.095.1" -, dmdSha256 ? "sha256:0faca1y42a1h16aml4lb7z118mh9k9fjx3xlw3ki5f1h3ln91xhk" -, druntimeSha256 ? "sha256:0ad4pa5llr9m9wqbvfv4yrcra4zz9qxlh5kx43mrv48f9bcxm2ha" -, phobosSha256 ? "sha256:04w6jw4izix2vbw62j13wvz6q3pi7vivxnmxqj0g8904j5g0cxjl" +, HOST_DMD? "${callPackage ./bootstrap.nix { }}/bin/dmd" +, version? "2.097.2" +, dmdSha256? "16ldkk32y7ln82n7g2ym5d1xf3vly3i31hf8600cpvimf6yhr6kb" +, druntimeSha256? "1sayg6ia85jln8g28vb4m124c27lgbkd6xzg9gblss8ardb8dsp1" +, phobosSha256? "0czg13h65b6qwhk9ibya21z3iv3fpk3rsjr3zbcrpc2spqjknfw5" }: let - dmdConfFile = writeTextFile { - name = "dmd.conf"; - text = (lib.generators.toINI {} { - Environment = { - DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}''; - }; - }); + name = "dmd.conf"; + text = (lib.generators.toINI {} { + Environment = { + DFLAGS = ''-I@out@/include/dmd -L-L@out@/lib -fPIC ${lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"}''; + }; + }); }; + bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; in stdenv.mkDerivation rec { @@ -30,27 +29,27 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; srcs = [ - (fetchFromGitHub { - owner = "dlang"; - repo = "dmd"; - rev = "v${version}"; - sha256 = dmdSha256; - name = "dmd"; - }) - (fetchFromGitHub { - owner = "dlang"; - repo = "druntime"; - rev = "v${version}"; - sha256 = druntimeSha256; - name = "druntime"; - }) - (fetchFromGitHub { - owner = "dlang"; - repo = "phobos"; - rev = "v${version}"; - sha256 = phobosSha256; - name = "phobos"; - }) + (fetchFromGitHub { + owner = "dlang"; + repo = "dmd"; + rev = "v${version}"; + sha256 = dmdSha256; + name = "dmd"; + }) + (fetchFromGitHub { + owner = "dlang"; + repo = "druntime"; + rev = "v${version}"; + sha256 = druntimeSha256; + name = "druntime"; + }) + (fetchFromGitHub { + owner = "dlang"; + repo = "phobos"; + rev = "v${version}"; + sha256 = phobosSha256; + name = "phobos"; + }) ]; sourceRoot = "."; @@ -58,61 +57,73 @@ stdenv.mkDerivation rec { # https://issues.dlang.org/show_bug.cgi?id=19553 hardeningDisable = [ "fortify" ]; - postUnpack = '' - patchShebangs . - ''; + # Not using patches option to make it easy to patch, for example, dmd and + # Phobos at same time if that's required + patchPhase = + lib.optionalString (builtins.compareVersions version "2.092.1" <= 0) '' + patch -p1 -F3 --directory=druntime -i ${(fetchpatch { + url = "https://github.com/dlang/druntime/commit/438990def7e377ca1f87b6d28246673bb38022ab.patch"; + sha256 = "0nxzkrd1rzj44l83j7jj90yz2cv01na8vn9d116ijnm85jl007b4"; + })} - postPatch = '' - substituteInPlace dmd/test/dshell/test6952.d --replace "/usr/bin/env bash" "${bash}/bin/bash" - - rm dmd/test/runnable/gdb1.d - rm dmd/test/runnable/gdb10311.d - rm dmd/test/runnable/gdb14225.d - rm dmd/test/runnable/gdb14276.d - rm dmd/test/runnable/gdb14313.d - rm dmd/test/runnable/gdb14330.d - rm dmd/test/runnable/gdb15729.sh - rm dmd/test/runnable/gdb4149.d - rm dmd/test/runnable/gdb4181.d - '' - + lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" + '' + postPatch; + + postPatch = '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" + patchShebangs . + + '' + lib.optionalString (version == "2.092.1") '' + rm dmd/test/dshell/test6952.d + '' + lib.optionalString (builtins.compareVersions "2.092.1" version < 0) '' + substituteInPlace dmd/test/dshell/test6952.d --replace "/usr/bin/env bash" "${bash}/bin/bash" + + '' + '' + rm dmd/test/runnable/gdb1.d + rm dmd/test/runnable/gdb10311.d + rm dmd/test/runnable/gdb14225.d + rm dmd/test/runnable/gdb14276.d + rm dmd/test/runnable/gdb14313.d + rm dmd/test/runnable/gdb14330.d + rm dmd/test/runnable/gdb15729.sh + rm dmd/test/runnable/gdb4149.d + rm dmd/test/runnable/gdb4181.d + + '' + lib.optionalString stdenv.isLinux '' + substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" ''; - nativeBuildInputs = [ makeWrapper unzip which gdb git ] + nativeBuildInputs = [ makeWrapper unzip which git ]; - ++ lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - Foundation - ]); + buildInputs = [ gdb curl tzdata ] + ++ lib.optional stdenv.isDarwin [ Foundation gdb ]; - buildInputs = [ curl tzdata ]; - bits = builtins.toString stdenv.hostPlatform.parsed.cpu.bits; - osname = if stdenv.hostPlatform.isDarwin then + osname = if stdenv.isDarwin then "osx" else stdenv.hostPlatform.parsed.kernel.name; - top = "$(echo $NIX_BUILD_TOP)"; + top = "$NIX_BUILD_TOP"; pathToDmd = "${top}/dmd/generated/${osname}/release/${bits}/dmd"; - # Buid and install are based on http://wiki.dlang.org/Building_DMD + # Build and install are based on http://wiki.dlang.org/Building_DMD buildPhase = '' - cd dmd - make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out BUILD=release ENABLE_RELEASE=1 PIC=1 HOST_DMD=${HOST_DMD} - cd ../druntime - make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} - cd ../phobos - echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile - echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > LibcurlPathFile - make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)" - cd .. + cd dmd + make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out BUILD=release ENABLE_RELEASE=1 PIC=1 HOST_DMD=${HOST_DMD} + cd ../druntime + make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} + cd ../phobos + echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile + echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > LibcurlPathFile + make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -version=LibcurlPath -J$(pwd)" + cd .. ''; doCheck = true; + # many tests are disbled because they are failing + # NOTE: Purity check is disabled for checkPhase because it doesn't fare well # with the DMD linker. See https://github.com/NixOS/nixpkgs/issues/97420 checkPhase = '' @@ -132,43 +143,42 @@ stdenv.mkDerivation rec { ''; installPhase = '' - cd dmd - mkdir $out - mkdir $out/bin - cp ${pathToDmd} $out/bin + cd dmd + mkdir $out + mkdir $out/bin + cp ${pathToDmd} $out/bin - mkdir -p $out/share/man/man1 - mkdir -p $out/share/man/man5 - cp -r docs/man/man1/* $out/share/man/man1/ - cp -r docs/man/man5/* $out/share/man/man5/ + mkdir -p $out/share/man/man1 + mkdir -p $out/share/man/man5 + cp -r docs/man/man1/* $out/share/man/man1/ + cp -r docs/man/man5/* $out/share/man/man5/ - cd ../druntime - mkdir $out/include - mkdir $out/include/dmd - cp -r import/* $out/include/dmd + cd ../druntime + mkdir $out/include + mkdir $out/include/dmd + cp -r import/* $out/include/dmd - cd ../phobos - mkdir $out/lib - cp generated/${osname}/release/${bits}/libphobos2.* $out/lib + cd ../phobos + mkdir $out/lib + cp generated/${osname}/release/${bits}/libphobos2.* $out/lib - cp -r std $out/include/dmd - cp -r etc $out/include/dmd + cp -r std $out/include/dmd + cp -r etc $out/include/dmd - wrapProgram $out/bin/dmd \ - --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ - --set-default CC "${targetPackages.stdenv.cc}/bin/cc" + wrapProgram $out/bin/dmd \ + --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ + --set-default CC "${targetPackages.stdenv.cc}/bin/cc" - substitute ${dmdConfFile} "$out/bin/dmd.conf" --subst-var out + substitute ${dmdConfFile} "$out/bin/dmd.conf" --subst-var out ''; meta = with lib; { description = "Official reference compiler for the D language"; - homepage = "http://dlang.org/"; + homepage = "https://dlang.org/"; # Everything is now Boost licensed, even the backend. # https://github.com/dlang/dmd/pull/6680 license = licenses.boost; maintainers = with maintainers; [ ThomasMader lionello ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - # many tests are failing }; } diff --git a/nixpkgs/pkgs/development/compilers/dotnet/default.nix b/nixpkgs/pkgs/development/compilers/dotnet/default.nix index f78c546542a2..89d7f4c7d922 100644 --- a/nixpkgs/pkgs/development/compilers/dotnet/default.nix +++ b/nixpkgs/pkgs/development/compilers/dotnet/default.nix @@ -80,58 +80,58 @@ rec { # v3.1.1 (LTS) aspnetcore_3_1 = buildAspNetCore { - version = "3.1.8"; + version = "3.1.19"; sha512 = { - x86_64-linux = "0i3dqsmh5x2aaagw30zvr0ydmzms5j6xvmwq0yx79r1hncw0zg8w1zq7cxvaddszl13d24wxb8vm4varkiv3fy8z3n2ndmhlqa2qcyw"; - aarch64-linux = "3f3xky7jqpqwnsg730ka1576ppsspi25xlqsrqmwlbanad0r89lidfppr34nsys9gb5f1vx1zkv73dn4jhl6yawnas9j9f8nhi5mq40"; - x86_64-darwin = "1gbiizljh80m9sqv4ynvch7si55if43f4ccfd9ynakwm777fddbg8py338l7irnxc5rid3xzw7c0yj5p8f22n38krlxkvr1zcwij68b"; + x86_64-linux = "c9234b5dba62c88b5f7e869c7dc7fc94d9cd7b300b0ed2461132c32762c0d3d1f23a1ee0432264704fefeb35f77ca7d1dd41910daee84df9aa325559a43cfc71"; + aarch64-linux = "4cba9b43a9beb977bb50c290c0e7cbbf42664538609079dd1bc0e925a0cc4a1f76748492d4d0d402610ae910e878449bab5d797a9f12e63399585b11f9bfbee9"; + x86_64-darwin = "a30959156c818d8d93df398742a70a050decfddbd777ddd6adb4d3c1aa5ed129545eab8f0aa3f12be991611dbc3582336ed747f3075906a2a29a1cd30ef3ad90"; }; }; netcore_3_1 = buildNetCore { - version = "3.1.8"; + version = "3.1.19"; sha512 = { - x86_64-linux = "19gbb92lkfwmx4ic27v5g4cs8qzxiq8cv7sw9pxa8kibgr7lgifvg8dh3pd0i30a78yg5lc3fsdy0jal5i2k049nak72rfhxhrk5yxc"; - aarch64-linux = "0h0zfj82wafk6brmh35ah1qfxgxs4nm3wc47i14vhvkg78rz25w46rnah88zf9gkllnbhfxkw1ivcl4mm6l4ri9hv9367rr627hybvf"; - x86_64-darwin = "0zcp77lh6rvj1vlnjnnd9gqrwazn9v572l0x6r7b9pkjjq7fdh5cnjcc1cvkv9rb00mssd9jjv7yjdpv4i8i9hwby85g9bn500qx42c"; + x86_64-linux = "2cf268cc13bb4739203a18a9160aac58f2088e8ec275b1f7ef2fe2b74bc16edfdfbeb886a74fc9421edbf2899fa9e3ee7ea2734a83b1800b4a9848fb7e10bbbe"; + aarch64-linux = "c6a97bc6e2f2644d57d3fa5a512274b7129956371b07e0f39f734875b15bc0c178a9b068e2fa3e06e8a3a6696163ad1856f5d87a689612211ee02e589138110e"; + x86_64-darwin = "41ae9bc0212247c4721f41be384dae620971360c09fa31430f062c2ab851f10506ef620bf63ee414819b5dd20ddae8a1ce581bbe0d699378b244375e0822bd34"; }; }; sdk_3_1 = buildNetCoreSdk { - version = "3.1.402"; + version = "3.1.413"; sha512 = { - x86_64-linux = "2zdb5cl4swg7kvnla6kgnnwg3kkb3rj2ccizg43fw89h8nacr1klz3zdl5km9l553lvm364dy8xsdwm79bw1ch0qgff6snnbbxlw5a2"; - aarch64-linux = "1aq8fhsn15362x99dfp72m67zbswrg30xscy1n983mmq76qn5ha6sy8pyj84l7qcs0n1b7akb77qyi3d2ns8bd2wl6s1dacl24gn10p"; - x86_64-darwin = "1gk6sgd9gdc6nr64mdfj6lhzdi6ixi5c1r0i1b7bhkg2xycx5cnbgjycrpqh17h6wbp68dz4mkg5hf1y3527hdwypa9k0sqdg3yrdb8"; + x86_64-linux = "2a0824f11aba0b79d3f9a36af0395649bc9b4137e61b240a48dccb671df0a5b8c2086054f8e495430b7ed6c344bb3f27ac3dfda5967d863718a6dadeca951a83"; + aarch64-linux = "39f198f07577faf81f09ca621fb749d5aac38fc05e7e6bd6226009679abc7d001454068430ddb34b320901955f42de3951e2707e01bce825b5216df2bc0c8eca"; + x86_64-darwin = "2c8e5b7e578aa36d40946d0deea93dff72a68ebb5504b1593d86d63022be8b65b284cf2adad711a926b7170fc865ac4cb38531a4f2ef087e07147e67300e86b8"; }; }; # v5.0.0 aspnetcore_5_0 = buildAspNetCore { - version = "5.0.0"; + version = "5.0.10"; sha512 = { - x86_64-linux = "402046ee144915ef7d75a788cf19552eea56cf897681721b74bfc403fd366f71eb7e56f6b83ea299b6b812c6b87378c15e7bfe249415427dcd147dfeacd084d0"; - aarch64-linux = "13e174de1cf10135531468c2a76852de2c37253f4d8b487ff25d249c2d7a1c590475545ca246515338baff2950422ec6c5ffe2180e8327f25cb5f9fede696ccc"; - x86_64-darwin = "b47a9958f5412b22edb2cb47702ad442c389901ede3ca2a7f75d901f8ed608494431849f498c2191327065ff1db52a1658b1a8c0feb53aaec4c814fb0baf6818"; + x86_64-linux = "60fd41e42e07a96416baf2dd7ea8112a7c7d510bc6f4656274981777d2cf5e824cd519924cdf06215338d74e78cdc7801e1b24c39b3d67cd2d1b3c6fee6474a9"; + aarch64-linux = "e86dd5b26e5add2f35c3a029c78e3c447755a319c105d371da297f66db5eff260f3f55ccf23e508e9a33536876708ac2e358dc62a4a28518f88df3a9131adb01"; + x86_64-darwin = "124abacba27e26249d265d51fd7abc7ab0bed9859ce3a6a8e4f193031bff3f28dd81af639542b0cc043a3957e2a90a2f5b41c6ec6b4a50a4cb8fce12bc8654f9"; }; }; net_5_0 = buildNetCore { - version = "5.0.0"; + version = "5.0.10"; sha512 = { - x86_64-linux = "d4d67df5ff5f6dde0d865a6e87559955bd57429df396cf7d05fe77f09e6220c67dc5e66439b1801ca4d301a62f81f666122bf4b623b31a46b861677dcafc62a4"; - aarch64-linux = "c7a5ae2bd4e0edbd3b681c2997ebf1633bfa1cd30a4333cb63fc9945b4e7c9278282516fb5bc22c710ce6fb59dc2e28230c07b0e99826165fa148406ab8afb0f"; - x86_64-darwin = "eba97211e158a0c1c15b03a79b42027319d83456dc377a2513c32defb560cd43fcfa1e84154a43243b77ca6b454c4dbc32be4153f0ba9c954c7b1e69ab5d7c53"; + x86_64-linux = "421b00d5751381e6bf829dcba8fa0d781f0efd065be492739d60a4bef2b7b362dbec77fa3289e2ee45cab40616f95318fc214699ffe2f33aa15e77c2d163841c"; + aarch64-linux = "30861f2bd41fcd7c1d657be1eafa09f22886af0c3e09d1854c626b675a469347ce9fb79b2ea92b5ed4e2fd3d3457766ac03fc5393a690099e1d2b9b15f3334b9"; + x86_64-darwin = "2839f4fafa1f85a90b43a74a4898cbba915324f7363f1716e58cb9163d1415fa4d360703e27d0cadfe8495a370ccddbcfcc514076a880d6343a0bff76bb5ac2a"; }; }; sdk_5_0 = buildNetCoreSdk { - version = "5.0.202"; + version = "5.0.401"; sha512 = { - x86_64-linux = "Ae1Z8jYYSYdAVnPSSUDVXOKdgw59u8GVVv3AOJMDnmBGcS3m+QHcmREEeg3uT9FTGbfpT4ox32uYH6Nb2T2YOA=="; - aarch64-linux = "JuwSWgY35xrK0gOGR034mhAemulIkhtd4M00P0vA6EtOeyMY4Vl4cj6zudMh6Jt5DD8EJKQ8KbABX8byuePp2Q=="; - x86_64-darwin = "jxnfTbQUb0dJ2/NX2pu8Pi/F/e4EaDm2Ta5U+6sSYj/s6nNp6NHxtEn7BzhQ9/EVLszl/oXi3lL0d/BPbzldEA=="; + x86_64-linux = "a444d44007709ceb68d8f72dec0531e17f85f800efc0007ace4fa66ba27f095066930e6c6defcd2f85cdedea2fec25e163f5da461c1c2b8563e5cd7cb47091e0"; + aarch64-linux = "770dcf18c08cd285934af61bedc06ffcc16a74115d15376f72376cdfbb4ab9cc9f53537ca1fe5d906b4b3c30b960ffe1404d6f7e01254091b4b9d288e9e972fa"; + x86_64-darwin = "eca773f407314123fd5b2017f68520c0647651f53e546583c4145b596c230c42898b3e56355cd5ace76b793df4aca3cd7ff9142718c86eedeabbabb70b393d0e"; }; }; } diff --git a/nixpkgs/pkgs/development/compilers/ecl/default.nix b/nixpkgs/pkgs/development/compilers/ecl/default.nix index 44f7eab62ee5..5896e9488268 100644 --- a/nixpkgs/pkgs/development/compilers/ecl/default.nix +++ b/nixpkgs/pkgs/development/compilers/ecl/default.nix @@ -16,7 +16,7 @@ let url="https://common-lisp.net/project/ecl/static/files/release/${name}.tgz"; sha256="000906nnq25177bgsfndiw3iqqgrjc9spk10hzk653sbz3f7anmi"; }; - buildInputs = [ + nativeBuildInputs = [ libtool autoconf automake texinfo makeWrapper ]; propagatedBuildInputs = [ @@ -29,7 +29,7 @@ let in stdenv.mkDerivation { inherit (s) name version; - inherit buildInputs propagatedBuildInputs; + inherit nativeBuildInputs propagatedBuildInputs; src = fetchurl { inherit (s) url sha256; diff --git a/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix b/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix index 3453d8d54bf1..68b4c97604b5 100644 --- a/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/nixpkgs/pkgs/development/compilers/elm/packages/node-packages.nix @@ -22,22 +22,22 @@ let sha512 = "OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA=="; }; }; - "@babel/code-frame-7.12.13" = { + "@babel/code-frame-7.14.5" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz"; - sha512 = "HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz"; + sha512 = "9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw=="; }; }; - "@babel/compat-data-7.13.8" = { + "@babel/compat-data-7.15.0" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.13.8"; + version = "7.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.8.tgz"; - sha512 = "EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz"; + sha512 = "0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA=="; }; }; "@babel/core-7.12.10" = { @@ -49,355 +49,355 @@ let sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w=="; }; }; - "@babel/generator-7.13.9" = { + "@babel/generator-7.15.4" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.13.9"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz"; - sha512 = "mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.15.4.tgz"; + sha512 = "d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw=="; }; }; - "@babel/helper-annotate-as-pure-7.12.13" = { + "@babel/helper-annotate-as-pure-7.15.4" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.12.13"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz"; - sha512 = "7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz"; + sha512 = "QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.12.13"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz"; - sha512 = "CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz"; + sha512 = "P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q=="; }; }; - "@babel/helper-compilation-targets-7.13.10" = { + "@babel/helper-compilation-targets-7.15.4" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.13.10"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.10.tgz"; - sha512 = "/Xju7Qg1GQO4mHZ/Kcs6Au7gfafgZnwm+a7sy/ow/tV1sHeraRUHbjdat8/UvDor4Tez+siGKDk6zIKtCPKVJA=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz"; + sha512 = "rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.13.10" = { + "@babel/helper-create-class-features-plugin-7.15.4" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.13.10"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.10.tgz"; - sha512 = "YV7r2YxdTUaw84EwNkyrRke/TJHR/UXGiyvACRqvdVJ2/syV2rQuJNnaRLSuYiop8cMRXOgseTGoJCWX0q2fFg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz"; + sha512 = "7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.12.17" = { + "@babel/helper-create-regexp-features-plugin-7.14.5" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.12.17"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz"; - sha512 = "p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz"; + sha512 = "TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A=="; }; }; - "@babel/helper-explode-assignable-expression-7.13.0" = { + "@babel/helper-explode-assignable-expression-7.15.4" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.13.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz"; - sha512 = "qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz"; + sha512 = "J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g=="; }; }; - "@babel/helper-function-name-7.12.13" = { + "@babel/helper-function-name-7.15.4" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.12.13"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz"; - sha512 = "TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz"; + sha512 = "Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw=="; }; }; - "@babel/helper-get-function-arity-7.12.13" = { + "@babel/helper-get-function-arity-7.15.4" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; - version = "7.12.13"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; - sha512 = "DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg=="; + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz"; + sha512 = "1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA=="; }; }; - "@babel/helper-hoist-variables-7.13.0" = { + "@babel/helper-hoist-variables-7.15.4" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.13.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz"; - sha512 = "0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz"; + sha512 = "VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA=="; }; }; - "@babel/helper-member-expression-to-functions-7.13.0" = { + "@babel/helper-member-expression-to-functions-7.15.4" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.13.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz"; - sha512 = "yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz"; + sha512 = "cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA=="; }; }; - "@babel/helper-module-imports-7.12.13" = { + "@babel/helper-module-imports-7.15.4" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.12.13"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz"; - sha512 = "NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz"; + sha512 = "jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA=="; }; }; - "@babel/helper-module-transforms-7.13.0" = { + "@babel/helper-module-transforms-7.15.7" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.13.0"; + version = "7.15.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz"; - sha512 = "Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.7.tgz"; + sha512 = "ZNqjjQG/AuFfekFTY+7nY4RgBSklgTu970c7Rj3m/JOhIu5KPBUuTA9AY6zaKcUvk4g6EbDXdBnhi35FAssdSw=="; }; }; - "@babel/helper-optimise-call-expression-7.12.13" = { + "@babel/helper-optimise-call-expression-7.15.4" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.12.13"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz"; - sha512 = "BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz"; + sha512 = "E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw=="; }; }; - "@babel/helper-plugin-utils-7.13.0" = { + "@babel/helper-plugin-utils-7.14.5" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz"; - sha512 = "ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz"; + sha512 = "/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ=="; }; }; - "@babel/helper-remap-async-to-generator-7.13.0" = { + "@babel/helper-remap-async-to-generator-7.15.4" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.13.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz"; - sha512 = "pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz"; + sha512 = "v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ=="; }; }; - "@babel/helper-replace-supers-7.13.0" = { + "@babel/helper-replace-supers-7.15.4" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.13.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz"; - sha512 = "Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz"; + sha512 = "/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw=="; }; }; - "@babel/helper-simple-access-7.12.13" = { + "@babel/helper-simple-access-7.15.4" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.12.13"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz"; - sha512 = "0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz"; + sha512 = "UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg=="; }; }; - "@babel/helper-skip-transparent-expression-wrappers-7.12.1" = { + "@babel/helper-skip-transparent-expression-wrappers-7.15.4" = { name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.12.1"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz"; - sha512 = "Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA=="; + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz"; + sha512 = "BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A=="; }; }; - "@babel/helper-split-export-declaration-7.12.13" = { + "@babel/helper-split-export-declaration-7.15.4" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.12.13"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; - sha512 = "tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz"; + sha512 = "HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw=="; }; }; - "@babel/helper-validator-identifier-7.12.11" = { + "@babel/helper-validator-identifier-7.15.7" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.12.11"; + version = "7.15.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz"; - sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz"; + sha512 = "K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w=="; }; }; - "@babel/helper-validator-option-7.12.17" = { + "@babel/helper-validator-option-7.14.5" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.12.17"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz"; - sha512 = "TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz"; + sha512 = "OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="; }; }; - "@babel/helper-wrap-function-7.13.0" = { + "@babel/helper-wrap-function-7.15.4" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.13.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz"; - sha512 = "1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz"; + sha512 = "Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw=="; }; }; - "@babel/helpers-7.13.10" = { + "@babel/helpers-7.15.4" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.13.10"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.10.tgz"; - sha512 = "4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz"; + sha512 = "V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ=="; }; }; - "@babel/highlight-7.13.10" = { + "@babel/highlight-7.14.5" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.13.10"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz"; - sha512 = "5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz"; + sha512 = "qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg=="; }; }; - "@babel/parser-7.13.10" = { + "@babel/parser-7.15.7" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.13.10"; + version = "7.15.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.13.10.tgz"; - sha512 = "0s7Mlrw9uTWkYua7xWr99Wpk2bnGa0ANleKfksYAES8LpWH4gW1OUr42vqKNf0us5UQNfru2wPqMqRITzq/SIQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.15.7.tgz"; + sha512 = "rycZXvQ+xS9QyIcJ9HXeDWf1uxqlbVFAUq0Rq0dbc50Zb/+wUe/ehyfzGfm9KZZF0kBejYgxltBXocP+gKdL2g=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.13.8" = { + "@babel/plugin-proposal-async-generator-functions-7.15.4" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.13.8"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz"; - sha512 = "rPBnhj+WgoSmgq+4gQUtXx/vOcU+UYtjy1AA/aeD61Hwj410fwYyqfUcRP3lR8ucgliVJL/G7sXcNUecC75IXA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.4.tgz"; + sha512 = "2zt2g5vTXpMC3OmK6uyjvdXptbhBXfA77XGrd3gh93zwG8lZYBLOBImiGBEG0RANu3JqKEACCz5CGk73OJROBw=="; }; }; - "@babel/plugin-proposal-class-properties-7.13.0" = { + "@babel/plugin-proposal-class-properties-7.14.5" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz"; - sha512 = "KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz"; + sha512 = "q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.13.8" = { + "@babel/plugin-proposal-dynamic-import-7.14.5" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.13.8"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz"; - sha512 = "ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz"; + sha512 = "ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.12.13" = { + "@babel/plugin-proposal-export-namespace-from-7.14.5" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz"; - sha512 = "INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz"; + sha512 = "g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA=="; }; }; - "@babel/plugin-proposal-json-strings-7.13.8" = { + "@babel/plugin-proposal-json-strings-7.14.5" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.13.8"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz"; - sha512 = "w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz"; + sha512 = "NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.13.8" = { + "@babel/plugin-proposal-logical-assignment-operators-7.14.5" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.13.8"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz"; - sha512 = "aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz"; + sha512 = "YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.13.8" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.13.8"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz"; - sha512 = "iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz"; + sha512 = "gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.12.13" = { + "@babel/plugin-proposal-numeric-separator-7.14.5" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz"; - sha512 = "O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz"; + sha512 = "yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.13.8" = { + "@babel/plugin-proposal-object-rest-spread-7.15.6" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.13.8"; + version = "7.15.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz"; - sha512 = "DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz"; + sha512 = "qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.13.8" = { + "@babel/plugin-proposal-optional-catch-binding-7.14.5" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.13.8"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz"; - sha512 = "0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz"; + sha512 = "3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.13.8" = { + "@babel/plugin-proposal-optional-chaining-7.14.5" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.13.8"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.8.tgz"; - sha512 = "hpbBwbTgd7Cz1QryvwJZRo1U0k1q8uyBmeXOSQUjdg/A2TASkhR/rz7AyqZ/kS8kbpsNA80rOYbxySBJAqmhhQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz"; + sha512 = "ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ=="; }; }; - "@babel/plugin-proposal-private-methods-7.13.0" = { + "@babel/plugin-proposal-private-methods-7.14.5" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz"; - sha512 = "MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz"; + sha512 = "838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.12.13" = { + "@babel/plugin-proposal-unicode-property-regex-7.14.5" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz"; - sha512 = "XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz"; + sha512 = "6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -499,238 +499,238 @@ let sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; }; }; - "@babel/plugin-syntax-top-level-await-7.12.13" = { + "@babel/plugin-syntax-top-level-await-7.14.5" = { name = "_at_babel_slash_plugin-syntax-top-level-await"; packageName = "@babel/plugin-syntax-top-level-await"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz"; - sha512 = "A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"; + sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-transform-arrow-functions-7.13.0" = { + "@babel/plugin-transform-arrow-functions-7.14.5" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz"; - sha512 = "96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz"; + sha512 = "KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A=="; }; }; - "@babel/plugin-transform-async-to-generator-7.13.0" = { + "@babel/plugin-transform-async-to-generator-7.14.5" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz"; - sha512 = "3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz"; + sha512 = "szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.12.13" = { + "@babel/plugin-transform-block-scoped-functions-7.14.5" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz"; - sha512 = "zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz"; + sha512 = "dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.12.13" = { + "@babel/plugin-transform-block-scoping-7.15.3" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.12.13"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz"; - sha512 = "Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz"; + sha512 = "nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q=="; }; }; - "@babel/plugin-transform-classes-7.13.0" = { + "@babel/plugin-transform-classes-7.15.4" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.13.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz"; - sha512 = "9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz"; + sha512 = "Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg=="; }; }; - "@babel/plugin-transform-computed-properties-7.13.0" = { + "@babel/plugin-transform-computed-properties-7.14.5" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz"; - sha512 = "RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz"; + sha512 = "pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg=="; }; }; - "@babel/plugin-transform-destructuring-7.13.0" = { + "@babel/plugin-transform-destructuring-7.14.7" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.13.0"; + version = "7.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz"; - sha512 = "zym5em7tePoNT9s964c0/KU3JPPnuq7VhIxPRefJ4/s82cD+q1mgKfuGRDMCPL0HTyKz4dISuQlCusfgCJ86HA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz"; + sha512 = "0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw=="; }; }; - "@babel/plugin-transform-dotall-regex-7.12.13" = { + "@babel/plugin-transform-dotall-regex-7.14.5" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz"; - sha512 = "foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz"; + sha512 = "loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.12.13" = { + "@babel/plugin-transform-duplicate-keys-7.14.5" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz"; - sha512 = "NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz"; + sha512 = "iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.12.13" = { + "@babel/plugin-transform-exponentiation-operator-7.14.5" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz"; - sha512 = "fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz"; + sha512 = "jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA=="; }; }; - "@babel/plugin-transform-for-of-7.13.0" = { + "@babel/plugin-transform-for-of-7.15.4" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.13.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz"; - sha512 = "IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz"; + sha512 = "DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA=="; }; }; - "@babel/plugin-transform-function-name-7.12.13" = { + "@babel/plugin-transform-function-name-7.14.5" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz"; - sha512 = "6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz"; + sha512 = "vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ=="; }; }; - "@babel/plugin-transform-literals-7.12.13" = { + "@babel/plugin-transform-literals-7.14.5" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz"; - sha512 = "FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz"; + sha512 = "ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.12.13" = { + "@babel/plugin-transform-member-expression-literals-7.14.5" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz"; - sha512 = "kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz"; + sha512 = "WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q=="; }; }; - "@babel/plugin-transform-modules-amd-7.13.0" = { + "@babel/plugin-transform-modules-amd-7.14.5" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz"; - sha512 = "EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz"; + sha512 = "3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.13.8" = { + "@babel/plugin-transform-modules-commonjs-7.15.4" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.13.8"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz"; - sha512 = "9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz"; + sha512 = "qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.13.8" = { + "@babel/plugin-transform-modules-systemjs-7.15.4" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.13.8"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz"; - sha512 = "hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz"; + sha512 = "fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw=="; }; }; - "@babel/plugin-transform-modules-umd-7.13.0" = { + "@babel/plugin-transform-modules-umd-7.14.5" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz"; - sha512 = "D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz"; + sha512 = "RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.12.13" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.14.9" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.12.13"; + version = "7.14.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz"; - sha512 = "Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz"; + sha512 = "l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA=="; }; }; - "@babel/plugin-transform-new-target-7.12.13" = { + "@babel/plugin-transform-new-target-7.14.5" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz"; - sha512 = "/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz"; + sha512 = "Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ=="; }; }; - "@babel/plugin-transform-object-super-7.12.13" = { + "@babel/plugin-transform-object-super-7.14.5" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz"; - sha512 = "JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz"; + sha512 = "MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg=="; }; }; - "@babel/plugin-transform-parameters-7.13.0" = { + "@babel/plugin-transform-parameters-7.15.4" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.13.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz"; - sha512 = "Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz"; + sha512 = "9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ=="; }; }; - "@babel/plugin-transform-property-literals-7.12.13" = { + "@babel/plugin-transform-property-literals-7.14.5" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz"; - sha512 = "nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz"; + sha512 = "r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw=="; }; }; - "@babel/plugin-transform-regenerator-7.12.13" = { + "@babel/plugin-transform-regenerator-7.14.5" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz"; - sha512 = "lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz"; + sha512 = "NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg=="; }; }; - "@babel/plugin-transform-reserved-words-7.12.13" = { + "@babel/plugin-transform-reserved-words-7.14.5" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz"; - sha512 = "xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz"; + sha512 = "cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg=="; }; }; "@babel/plugin-transform-runtime-7.12.10" = { @@ -742,67 +742,67 @@ let sha512 = "xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.12.13" = { + "@babel/plugin-transform-shorthand-properties-7.14.5" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz"; - sha512 = "xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz"; + sha512 = "xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g=="; }; }; - "@babel/plugin-transform-spread-7.13.0" = { + "@babel/plugin-transform-spread-7.14.6" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.13.0"; + version = "7.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz"; - sha512 = "V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz"; + sha512 = "Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag=="; }; }; - "@babel/plugin-transform-sticky-regex-7.12.13" = { + "@babel/plugin-transform-sticky-regex-7.14.5" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz"; - sha512 = "Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz"; + sha512 = "Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A=="; }; }; - "@babel/plugin-transform-template-literals-7.13.0" = { + "@babel/plugin-transform-template-literals-7.14.5" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.13.0"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz"; - sha512 = "d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz"; + sha512 = "22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.12.13" = { + "@babel/plugin-transform-typeof-symbol-7.14.5" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz"; - sha512 = "eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz"; + sha512 = "lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.12.13" = { + "@babel/plugin-transform-unicode-escapes-7.14.5" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz"; - sha512 = "0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz"; + sha512 = "crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA=="; }; }; - "@babel/plugin-transform-unicode-regex-7.12.13" = { + "@babel/plugin-transform-unicode-regex-7.14.5" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.12.13"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz"; - sha512 = "mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz"; + sha512 = "UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw=="; }; }; "@babel/preset-env-7.12.10" = { @@ -832,31 +832,31 @@ let sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg=="; }; }; - "@babel/template-7.12.13" = { + "@babel/template-7.15.4" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.12.13"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz"; - sha512 = "/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz"; + sha512 = "UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg=="; }; }; - "@babel/traverse-7.13.0" = { + "@babel/traverse-7.15.4" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.13.0"; + version = "7.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.0.tgz"; - sha512 = "xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz"; + sha512 = "W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA=="; }; }; - "@babel/types-7.13.0" = { + "@babel/types-7.15.6" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.13.0"; + version = "7.15.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.13.0.tgz"; - sha512 = "hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz"; + sha512 = "BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig=="; }; }; "@hapi/address-2.1.4" = { @@ -913,13 +913,13 @@ let sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g=="; }; }; - "@nodelib/fs.scandir-2.1.4" = { + "@nodelib/fs.scandir-2.1.5" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; - sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA=="; + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; + sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; }; }; "@nodelib/fs.stat-1.1.3" = { @@ -931,22 +931,22 @@ let sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="; }; }; - "@nodelib/fs.stat-2.0.4" = { + "@nodelib/fs.stat-2.0.5" = { name = "_at_nodelib_slash_fs.stat"; packageName = "@nodelib/fs.stat"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; - sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q=="; + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; + sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; }; }; - "@nodelib/fs.walk-1.2.6" = { + "@nodelib/fs.walk-1.2.8" = { name = "_at_nodelib_slash_fs.walk"; packageName = "@nodelib/fs.walk"; - version = "1.2.6"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; - sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow=="; + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; + sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -976,103 +976,94 @@ let sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA=="; }; }; - "@szmarczak/http-timer-4.0.5" = { + "@szmarczak/http-timer-4.0.6" = { name = "_at_szmarczak_slash_http-timer"; packageName = "@szmarczak/http-timer"; - version = "4.0.5"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz"; - sha512 = "PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ=="; + url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz"; + sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w=="; }; }; - "@types/anymatch-1.3.1" = { - name = "_at_types_slash_anymatch"; - packageName = "@types/anymatch"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz"; - sha512 = "/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA=="; - }; - }; - "@types/cacheable-request-6.0.1" = { + "@types/cacheable-request-6.0.2" = { name = "_at_types_slash_cacheable-request"; packageName = "@types/cacheable-request"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.1.tgz"; - sha512 = "ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ=="; + url = "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz"; + sha512 = "B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA=="; }; }; - "@types/glob-7.1.3" = { + "@types/glob-7.1.4" = { name = "_at_types_slash_glob"; packageName = "@types/glob"; - version = "7.1.3"; + version = "7.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.3.tgz"; - sha512 = "SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w=="; + url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.4.tgz"; + sha512 = "w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA=="; }; }; - "@types/html-minifier-terser-5.1.1" = { + "@types/html-minifier-terser-5.1.2" = { name = "_at_types_slash_html-minifier-terser"; packageName = "@types/html-minifier-terser"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"; - sha512 = "giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA=="; + url = "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz"; + sha512 = "h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w=="; }; }; - "@types/http-cache-semantics-4.0.0" = { + "@types/http-cache-semantics-4.0.1" = { name = "_at_types_slash_http-cache-semantics"; packageName = "@types/http-cache-semantics"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz"; - sha512 = "c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A=="; + url = "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz"; + sha512 = "SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="; }; }; - "@types/http-proxy-1.17.5" = { + "@types/http-proxy-1.17.7" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.5"; + version = "1.17.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.5.tgz"; - sha512 = "GNkDE7bTv6Sf8JbV2GksknKOsk7OznNYHSdrtvPJXO0qJ9odZig6IZKUi5RFGi6d1bf6dgIAe4uXi3DBc7069Q=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.7.tgz"; + sha512 = "9hdj6iXH64tHSLTY+Vt2eYOGzSogC+JQ2H7bdPWkuh7KXP5qLllWx++t+K9Wk556c3dkDdPws/SpMRi0sdCT1w=="; }; }; - "@types/json-schema-7.0.7" = { + "@types/json-schema-7.0.9" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.7"; + version = "7.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz"; - sha512 = "cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz"; + sha512 = "qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="; }; }; - "@types/keyv-3.1.1" = { + "@types/keyv-3.1.3" = { name = "_at_types_slash_keyv"; packageName = "@types/keyv"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz"; - sha512 = "MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw=="; + url = "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.3.tgz"; + sha512 = "FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg=="; }; }; - "@types/minimatch-3.0.3" = { + "@types/minimatch-3.0.5" = { name = "_at_types_slash_minimatch"; packageName = "@types/minimatch"; - version = "3.0.3"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz"; - sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; + url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz"; + sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; }; }; - "@types/node-14.14.34" = { + "@types/node-16.9.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.34"; + version = "16.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.34.tgz"; - sha512 = "dBPaxocOK6UVyvhbnpFIj2W+S+1cBTkHQbFQfeeJhoKFbzYcVUGHvddeWPSucKATb3F0+pgDq0i6ghEaZjsugA=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.9.3.tgz"; + sha512 = "5UmMznRvrwKqisJ458JbNoq3AyXHxlAKMkGtNe143W1SkZ1BVgvCHYBzn7wD66J+smE+BolqA1mes5BeXlWY6w=="; }; }; "@types/parse-json-4.0.0" = { @@ -1084,13 +1075,13 @@ let sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; }; }; - "@types/q-1.5.4" = { + "@types/q-1.5.5" = { name = "_at_types_slash_q"; packageName = "@types/q"; - version = "1.5.4"; + version = "1.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz"; - sha512 = "1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="; + url = "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz"; + sha512 = "L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="; }; }; "@types/responselike-1.0.0" = { @@ -1111,40 +1102,40 @@ let sha512 = "K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA=="; }; }; - "@types/tapable-1.0.6" = { + "@types/tapable-1.0.8" = { name = "_at_types_slash_tapable"; packageName = "@types/tapable"; - version = "1.0.6"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.6.tgz"; - sha512 = "W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA=="; + url = "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.8.tgz"; + sha512 = "ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ=="; }; }; - "@types/uglify-js-3.13.0" = { + "@types/uglify-js-3.13.1" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.13.0"; + version = "3.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.0.tgz"; - sha512 = "EGkrJD5Uy+Pg0NUR8uA4bJ5WMfljyad0G+784vLCNUkD+QwOJXUbBYExXfVGf7YtyzdQp3L/XMYcliB987kL5Q=="; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.1.tgz"; + sha512 = "O3MmRAk6ZuAKa9CHgg0Pr0+lUOqoMLpc9AS4R8ano2auvsg7IE8syF3Xh/NPr26TWklxYcqoEEFdzLLs1fV9PQ=="; }; }; - "@types/webpack-4.41.26" = { + "@types/webpack-4.41.31" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; - version = "4.41.26"; + version = "4.41.31"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.26.tgz"; - sha512 = "7ZyTfxjCRwexh+EJFwRUM+CDB2XvgHl4vfuqf1ZKrgGvcS5BrNvPQqJh3tsZ0P6h6Aa1qClVHaJZszLPzpqHeA=="; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.31.tgz"; + sha512 = "/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ=="; }; }; - "@types/webpack-sources-2.1.0" = { + "@types/webpack-sources-3.2.0" = { name = "_at_types_slash_webpack-sources"; packageName = "@types/webpack-sources"; - version = "2.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-2.1.0.tgz"; - sha512 = "LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg=="; + url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-3.2.0.tgz"; + sha512 = "Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg=="; }; }; "@webassemblyjs/ast-1.9.0" = { @@ -1417,13 +1408,13 @@ let sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; }; }; - "ansi-escapes-4.3.1" = { + "ansi-escapes-4.3.2" = { name = "ansi-escapes"; packageName = "ansi-escapes"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; - sha512 = "JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA=="; + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz"; + sha512 = "gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="; }; }; "ansi-html-0.0.7" = { @@ -1462,13 +1453,13 @@ let sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; }; }; - "ansi-regex-5.0.0" = { + "ansi-regex-5.0.1" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz"; - sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"; + sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; }; "ansi-styles-2.2.1" = { @@ -1507,13 +1498,13 @@ let sha512 = "5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="; }; }; - "anymatch-3.1.1" = { + "anymatch-3.1.2" = { name = "anymatch"; packageName = "anymatch"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz"; - sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg=="; + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz"; + sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="; }; }; "aproba-1.2.0" = { @@ -1885,13 +1876,13 @@ let sha512 = "q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="; }; }; - "balanced-match-1.0.0" = { + "balanced-match-1.0.2" = { name = "balanced-match"; packageName = "balanced-match"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; }; }; "base-0.11.2" = { @@ -2002,6 +1993,15 @@ let sha512 = "N4Pm7iyDEv0BrAMs+dny8WQa+e0nNTdzn2ODkf/MM6XBtKSCxCSUA1ZOQGoc1n7mUqdgOS5pwjsW91rmXVxy2Q=="; }; }; + "bl-4.1.0" = { + name = "bl"; + packageName = "bl"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"; + sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; + }; + }; "bluebird-3.7.2" = { name = "bluebird"; packageName = "bluebird"; @@ -2164,13 +2164,13 @@ let sha512 = "VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q=="; }; }; - "browserslist-4.16.3" = { + "browserslist-4.17.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.16.3"; + version = "4.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz"; - sha512 = "vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.17.0.tgz"; + sha512 = "g2BJ2a0nEYvEFQC208q8mVAhfNwpZ5Mu8BwgtCdZKO3qx98HChmeg448fPdUzld8aFmfLgVh7yymqV+q1lJZ5g=="; }; }; "buffer-4.9.2" = { @@ -2182,13 +2182,22 @@ let sha512 = "xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg=="; }; }; - "buffer-from-1.1.1" = { + "buffer-5.7.1" = { + name = "buffer"; + packageName = "buffer"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"; + sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; + }; + }; + "buffer-from-1.1.2" = { name = "buffer-from"; packageName = "buffer-from"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; - sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; + url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"; + sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; }; }; "buffer-indexof-1.1.1" = { @@ -2290,13 +2299,13 @@ let sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; }; }; - "cacheable-request-7.0.1" = { + "cacheable-request-7.0.2" = { name = "cacheable-request"; packageName = "cacheable-request"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.1.tgz"; - sha512 = "lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw=="; + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz"; + sha512 = "pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew=="; }; }; "call-bind-1.0.2" = { @@ -2398,13 +2407,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001199" = { + "caniuse-lite-1.0.30001258" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001199"; + version = "1.0.30001258"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001199.tgz"; - sha512 = "ifbK2eChUCFUwGhlEzIoVwzFt1+iriSjyKKFYNfv6hN34483wyWpLLavYQXhnR036LhkdUYaSDpHg1El++VgHQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001258.tgz"; + sha512 = "RBByOG6xWXUp0CR2/WU2amXz3stjKpSl5J1xU49F1n2OxD//uBZO4wCKUiG+QMGf7CHGfDDcqoKriomoGVxTeA=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -2479,13 +2488,13 @@ let sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; }; }; - "chalk-4.1.0" = { + "chalk-4.1.2" = { name = "chalk"; packageName = "chalk"; - version = "4.1.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz"; - sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="; + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"; + sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; }; "chardet-0.7.0" = { @@ -2533,13 +2542,13 @@ let sha512 = "/j5PPkb5Feyps9e+jo07jUZGvkB5Aj953NrI4s8xSVScrAo/RHeILrtdb4uzR7N6aaFFxxJ+gt8mA8HfNpw76w=="; }; }; - "chokidar-3.5.1" = { + "chokidar-3.5.2" = { name = "chokidar"; packageName = "chokidar"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz"; - sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz"; + sha512 = "ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ=="; }; }; "chownr-1.1.4" = { @@ -2560,13 +2569,13 @@ let sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; }; }; - "chrome-trace-event-1.0.2" = { + "chrome-trace-event-1.0.3" = { name = "chrome-trace-event"; packageName = "chrome-trace-event"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz"; - sha512 = "9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ=="; + url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"; + sha512 = "p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg=="; }; }; "cipher-base-1.0.4" = { @@ -2614,13 +2623,13 @@ let sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; }; }; - "cli-spinners-2.5.0" = { + "cli-spinners-2.6.0" = { name = "cli-spinners"; packageName = "cli-spinners"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.5.0.tgz"; - sha512 = "PC+AmIuK04E6aeSs/pUccSujsTzBhu4HzC2dL+CfJB/Jcc2qTRbEwZQDfIUpt2Xl8BodYBEq8w4fc0kU2I9DjQ=="; + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz"; + sha512 = "t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q=="; }; }; "cli-table-0.3.4" = { @@ -2713,13 +2722,13 @@ let sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; }; }; - "color-3.1.3" = { + "color-3.2.1" = { name = "color"; packageName = "color"; - version = "3.1.3"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-3.1.3.tgz"; - sha512 = "xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ=="; + url = "https://registry.npmjs.org/color/-/color-3.2.1.tgz"; + sha512 = "aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA=="; }; }; "color-convert-1.9.3" = { @@ -2758,22 +2767,22 @@ let sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; - "color-string-1.5.5" = { + "color-string-1.6.0" = { name = "color-string"; packageName = "color-string"; - version = "1.5.5"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-1.5.5.tgz"; - sha512 = "jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg=="; + url = "https://registry.npmjs.org/color-string/-/color-string-1.6.0.tgz"; + sha512 = "c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA=="; }; }; - "colorette-1.2.2" = { + "colorette-1.4.0" = { name = "colorette"; packageName = "colorette"; - version = "1.2.2"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz"; - sha512 = "MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="; + url = "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz"; + sha512 = "Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g=="; }; }; "colors-1.0.3" = { @@ -2857,13 +2866,13 @@ let sha512 = "U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA=="; }; }; - "commander-7.1.0" = { + "commander-7.2.0" = { name = "commander"; packageName = "commander"; - version = "7.1.0"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-7.1.0.tgz"; - sha512 = "pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg=="; + url = "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"; + sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; }; }; "common-tags-1.8.0" = { @@ -2947,13 +2956,13 @@ let sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; }; }; - "config-chain-1.1.12" = { + "config-chain-1.1.13" = { name = "config-chain"; packageName = "config-chain"; - version = "1.1.12"; + version = "1.1.13"; src = fetchurl { - url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.12.tgz"; - sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA=="; + url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz"; + sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; }; }; "connect-history-api-fallback-1.6.0" = { @@ -3010,13 +3019,13 @@ let sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; - "convert-source-map-1.7.0" = { + "convert-source-map-1.8.0" = { name = "convert-source-map"; packageName = "convert-source-map"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz"; - sha512 = "4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA=="; + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz"; + sha512 = "+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA=="; }; }; "cookie-0.3.1" = { @@ -3082,13 +3091,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-compat-3.9.1" = { + "core-js-compat-3.17.3" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.9.1"; + version = "3.17.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.9.1.tgz"; - sha512 = "jXAirMQxrkbiiLsCx9bQPJFA6llDadKMpYrBJQJ3/c4/vsPP/fAf29h24tviRlvwUL6AmY5CHLu2GvjuYviQqA=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.17.3.tgz"; + sha512 = "+in61CKYs4hQERiADCJsdgewpdl/X0GhEX77pjKgbeibXviIt2oxEjTc8O2fqHX8mDdBrDvX8MYD/RYsBv4OiA=="; }; }; "core-util-is-1.0.2" = { @@ -3100,6 +3109,15 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; + "core-util-is-1.0.3" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"; + sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; + }; + }; "cosmiconfig-5.2.1" = { name = "cosmiconfig"; packageName = "cosmiconfig"; @@ -3109,13 +3127,13 @@ let sha512 = "H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA=="; }; }; - "cosmiconfig-7.0.0" = { + "cosmiconfig-7.0.1" = { name = "cosmiconfig"; packageName = "cosmiconfig"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz"; - sha512 = "pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA=="; + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz"; + sha512 = "a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ=="; }; }; "create-ecdh-4.0.4" = { @@ -3253,6 +3271,15 @@ let sha512 = "Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ=="; }; }; + "css-select-4.1.3" = { + name = "css-select"; + packageName = "css-select"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz"; + sha512 = "gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA=="; + }; + }; "css-select-base-adapter-0.1.1" = { name = "css-select-base-adapter"; packageName = "css-select-base-adapter"; @@ -3271,13 +3298,13 @@ let sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg=="; }; }; - "css-tree-1.1.2" = { + "css-tree-1.1.3" = { name = "css-tree"; packageName = "css-tree"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/css-tree/-/css-tree-1.1.2.tgz"; - sha512 = "wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ=="; + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz"; + sha512 = "tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q=="; }; }; "css-what-3.4.2" = { @@ -3289,6 +3316,15 @@ let sha512 = "ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ=="; }; }; + "css-what-5.0.1" = { + name = "css-what"; + packageName = "css-what"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz"; + sha512 = "FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg=="; + }; + }; "cssesc-3.0.0" = { name = "cssesc"; packageName = "cssesc"; @@ -3298,22 +3334,22 @@ let sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="; }; }; - "cssnano-4.1.10" = { + "cssnano-4.1.11" = { name = "cssnano"; packageName = "cssnano"; - version = "4.1.10"; + version = "4.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz"; - sha512 = "5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ=="; + url = "https://registry.npmjs.org/cssnano/-/cssnano-4.1.11.tgz"; + sha512 = "6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g=="; }; }; - "cssnano-preset-default-4.0.7" = { + "cssnano-preset-default-4.0.8" = { name = "cssnano-preset-default"; packageName = "cssnano-preset-default"; - version = "4.0.7"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz"; - sha512 = "x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA=="; + url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz"; + sha512 = "LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ=="; }; }; "cssnano-util-get-arguments-4.0.0" = { @@ -3604,13 +3640,13 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "detect-node-2.0.4" = { + "detect-node-2.1.0" = { name = "detect-node"; packageName = "detect-node"; - version = "2.0.4"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz"; - sha512 = "ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw=="; + url = "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz"; + sha512 = "T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="; }; }; "detect-port-alt-1.1.6" = { @@ -3658,13 +3694,13 @@ let sha1 = "b39e7f1da6eb0a75ba9c17324b34753c47e0654d"; }; }; - "dns-packet-1.3.1" = { + "dns-packet-1.3.4" = { name = "dns-packet"; packageName = "dns-packet"; - version = "1.3.1"; + version = "1.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz"; - sha512 = "0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg=="; + url = "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz"; + sha512 = "BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA=="; }; }; "dns-txt-2.0.2" = { @@ -3694,6 +3730,15 @@ let sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; }; }; + "dom-serializer-1.3.2" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz"; + sha512 = "5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig=="; + }; + }; "domain-browser-1.2.0" = { name = "domain-browser"; packageName = "domain-browser"; @@ -3712,22 +3757,22 @@ let sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; }; }; - "domelementtype-2.1.0" = { + "domelementtype-2.2.0" = { name = "domelementtype"; packageName = "domelementtype"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz"; - sha512 = "LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w=="; + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz"; + sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="; }; }; - "domhandler-2.4.2" = { + "domhandler-4.2.2" = { name = "domhandler"; packageName = "domhandler"; - version = "2.4.2"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz"; - sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA=="; + url = "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz"; + sha512 = "PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w=="; }; }; "domutils-1.7.0" = { @@ -3739,6 +3784,15 @@ let sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; }; }; + "domutils-2.8.0" = { + name = "domutils"; + packageName = "domutils"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz"; + sha512 = "w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="; + }; + }; "dot-case-3.0.4" = { name = "dot-case"; packageName = "dot-case"; @@ -3811,13 +3865,13 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "electron-to-chromium-1.3.687" = { + "electron-to-chromium-1.3.843" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.687"; + version = "1.3.843"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.687.tgz"; - sha512 = "IpzksdQNl3wdgkzf7dnA7/v10w0Utf1dF2L+B4+gKrloBrxCut+au+kky3PYvle3RMdSxZP+UiCZtLbcYRxSNQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.843.tgz"; + sha512 = "OWEwAbzaVd1Lk9MohVw8LxMXFlnYd9oYTYxfX8KS++kLLjDfbovLOcEEXwRhG612dqGQ6+44SZvim0GXuBRiKg=="; }; }; "elliptic-6.5.4" = { @@ -3892,22 +3946,22 @@ let sha512 = "SyZgZ/hxq62budS3k0M1Qj1E8fIRvldSxFSm4XfzE6qRRuHAT2a82fxprZRZl1yG2GwnImGmhuKH5hSyjPpzjA=="; }; }; - "elm-test-0.19.1-revision6" = { + "elm-test-0.19.1-revision7" = { name = "elm-test"; packageName = "elm-test"; - version = "0.19.1-revision6"; + version = "0.19.1-revision7"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision6.tgz"; - sha512 = "4VbIyCRlCUm/py0E0AjMT3/mwd6DR4Y5Z5gEox6z5JII6ZdKIJmcQzjgWRI5qo5ERJiw9M/Nxhk7SGXFUbZsxQ=="; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision7.tgz"; + sha512 = "sd3nCQMeYMaY84Sz41bVJ30ZvQN1/4ZcD8uYMOuUbM39FDh58NY9/AcImVJ7Z+gjCFdcSU6VscZzhUoPW8jp6Q=="; }; }; - "elm-tooling-1.3.0" = { + "elm-tooling-1.6.0" = { name = "elm-tooling"; packageName = "elm-tooling"; - version = "1.3.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.3.0.tgz"; - sha512 = "OLRg8D7QCbzMmi8QTaebIIsH2qaIj4NiltuJ8vZj4JFHOIVa3utyD5tlfySBGZNfDG7+vZ2K8iDk82TalFaAbw=="; + url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.6.0.tgz"; + sha512 = "quliLTmqEcqqFZEcJKnYcZ9BrL1K2sYvtryQl6BfaMD6HaI8oRaZYDPY/Ihdo7X7t7mY5TbSlrcxv6coJgWwtA=="; }; }; "elm-webpack-loader-6.0.1" = { @@ -3991,15 +4045,6 @@ let sha512 = "Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg=="; }; }; - "entities-1.1.2" = { - name = "entities"; - packageName = "entities"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz"; - sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="; - }; - }; "entities-2.2.0" = { name = "entities"; packageName = "entities"; @@ -4027,13 +4072,13 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; - "es-abstract-1.18.0" = { + "es-abstract-1.18.6" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.18.0"; + version = "1.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz"; - sha512 = "LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.6.tgz"; + sha512 = "kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ=="; }; }; "es-to-primitive-1.2.1" = { @@ -4198,13 +4243,13 @@ let sha1 = "0acede849ed7dd1ccc32c811bb11b944d4f29232"; }; }; - "eventsource-1.0.7" = { + "eventsource-1.1.0" = { name = "eventsource"; packageName = "eventsource"; - version = "1.0.7"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz"; - sha512 = "4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ=="; + url = "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz"; + sha512 = "VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg=="; }; }; "evp_bytestokey-1.0.3" = { @@ -4225,13 +4270,13 @@ let sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; }; }; - "execa-5.0.0" = { + "execa-5.1.1" = { name = "execa"; packageName = "execa"; - version = "5.0.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-5.0.0.tgz"; - sha512 = "ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ=="; + url = "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz"; + sha512 = "8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="; }; }; "expand-brackets-2.1.4" = { @@ -4378,13 +4423,13 @@ let sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw=="; }; }; - "fast-glob-3.2.5" = { + "fast-glob-3.2.7" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.5"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz"; - sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz"; + sha512 = "rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q=="; }; }; "fast-json-stable-stringify-2.1.0" = { @@ -4414,13 +4459,13 @@ let sha512 = "On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="; }; }; - "fastq-1.11.0" = { + "fastq-1.13.0" = { name = "fastq"; packageName = "fastq"; - version = "1.11.0"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz"; - sha512 = "7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz"; + sha512 = "YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw=="; }; }; "faye-websocket-0.10.0" = { @@ -4432,13 +4477,13 @@ let sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; }; }; - "faye-websocket-0.11.3" = { + "faye-websocket-0.11.4" = { name = "faye-websocket"; packageName = "faye-websocket"; - version = "0.11.3"; + version = "0.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz"; - sha512 = "D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA=="; + url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz"; + sha512 = "CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g=="; }; }; "figgy-pudding-3.5.2" = { @@ -4558,13 +4603,13 @@ let sha512 = "Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ=="; }; }; - "find-cache-dir-3.3.1" = { + "find-cache-dir-3.3.2" = { name = "find-cache-dir"; packageName = "find-cache-dir"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz"; - sha512 = "t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ=="; + url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz"; + sha512 = "wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig=="; }; }; "find-elm-dependencies-2.0.2" = { @@ -4585,13 +4630,13 @@ let sha512 = "x/4w4fVmlD2X4PD9oQ+yh9EyaQef6OtEULdMGBTuWx0Nkppvo2Z/bAiQioW2n+GdRYKypME2b9OmYTw5tw5qDg=="; }; }; - "find-parent-dir-0.3.0" = { + "find-parent-dir-0.3.1" = { name = "find-parent-dir"; packageName = "find-parent-dir"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.0.tgz"; - sha1 = "33c44b429ab2b2f0646299c5f9f718f376ff8d54"; + url = "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.1.tgz"; + sha512 = "o4UcykWV/XN9wm+jMEtWLPlV8RXCZnMhQI6F6OdHeSez7iiJWePw8ijOlskJZMsaQoGR/b7dH6lO02HhaTN7+A=="; }; }; "find-up-1.1.2" = { @@ -4675,13 +4720,13 @@ let sha512 = "SDgHBgV+RCjrYs8aUwCb9rTgbTVuSdzvFmLaChsLre1yf+D64khCW++VYciaByZ8Rm0uKF8R/XEpXuTRSGUM1A=="; }; }; - "follow-redirects-1.13.3" = { + "follow-redirects-1.14.4" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.13.3"; + version = "1.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz"; - sha512 = "DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz"; + sha512 = "zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g=="; }; }; "for-in-1.0.2" = { @@ -4711,22 +4756,22 @@ let sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; - "forwarded-0.1.2" = { + "forwarded-0.2.0" = { name = "forwarded"; packageName = "forwarded"; - version = "0.1.2"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz"; - sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"; + sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; }; }; - "fraction.js-4.0.13" = { + "fraction.js-4.1.1" = { name = "fraction.js"; packageName = "fraction.js"; - version = "4.0.13"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.13.tgz"; - sha512 = "E1fz2Xs9ltlUp+qbiyx9wmt2n9dRzPsS11Jtdb8D2o+cC7wr9xkkKsVKJuBX0ST+LVS+LhLO+SbLJNtfWcJvXA=="; + url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.1.tgz"; + sha512 = "MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg=="; }; }; "fragment-cache-0.2.1" = { @@ -4756,15 +4801,6 @@ let sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; }; }; - "fromentries-1.3.2" = { - name = "fromentries"; - packageName = "fromentries"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz"; - sha512 = "cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg=="; - }; - }; "fs-extra-2.0.0" = { name = "fs-extra"; packageName = "fs-extra"; @@ -4981,13 +5017,22 @@ let sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; }; }; - "get-stream-6.0.0" = { + "get-stream-6.0.1" = { name = "get-stream"; packageName = "get-stream"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-6.0.0.tgz"; - sha512 = "A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg=="; + url = "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz"; + sha512 = "ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="; + }; + }; + "get-symbol-description-1.0.0" = { + name = "get-symbol-description"; + packageName = "get-symbol-description"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz"; + sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; }; }; "get-value-2.0.6" = { @@ -5017,13 +5062,13 @@ let sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A=="; }; }; - "glob-7.1.6" = { + "glob-7.1.7" = { name = "glob"; packageName = "glob"; - version = "7.1.6"; + version = "7.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; - sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + url = "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz"; + sha512 = "OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ=="; }; }; "glob-parent-3.1.0" = { @@ -5080,13 +5125,13 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globby-11.0.2" = { + "globby-11.0.4" = { name = "globby"; packageName = "globby"; - version = "11.0.2"; + version = "11.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz"; - sha512 = "2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og=="; + url = "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz"; + sha512 = "9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg=="; }; }; "globby-6.1.0" = { @@ -5134,13 +5179,13 @@ let sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; }; }; - "graceful-fs-4.2.6" = { + "graceful-fs-4.2.8" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.6"; + version = "4.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz"; - sha512 = "nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; }; }; "gzip-size-5.0.0" = { @@ -5251,6 +5296,15 @@ let sha512 = "vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw=="; }; }; + "has-tostringtag-1.0.0" = { + name = "has-tostringtag"; + packageName = "has-tostringtag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; + sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; + }; + }; "has-value-0.3.1" = { name = "has-value"; packageName = "has-value"; @@ -5341,13 +5395,13 @@ let sha512 = "eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA=="; }; }; - "hosted-git-info-2.8.8" = { + "hosted-git-info-2.8.9" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.8.8"; + version = "2.8.9"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; - sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; + sha512 = "mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="; }; }; "hpack.js-2.1.6" = { @@ -5377,15 +5431,6 @@ let sha1 = "c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"; }; }; - "html-comment-regex-1.1.2" = { - name = "html-comment-regex"; - packageName = "html-comment-regex"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz"; - sha512 = "P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ=="; - }; - }; "html-entities-1.4.0" = { name = "html-entities"; packageName = "html-entities"; @@ -5413,13 +5458,13 @@ let sha512 = "MouoXEYSjTzCrjIxWwg8gxL5fE2X2WZJLmBYXlaJhQUH5K/b5OrqmV7T4dB7iu0xkmJ6JlUuV6fFVtnqbPopZw=="; }; }; - "htmlparser2-3.10.1" = { + "htmlparser2-6.1.0" = { name = "htmlparser2"; packageName = "htmlparser2"; - version = "3.10.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz"; - sha512 = "IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ=="; + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz"; + sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A=="; }; }; "http-cache-semantics-4.1.0" = { @@ -5746,6 +5791,15 @@ let sha512 = "S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg=="; }; }; + "internal-slot-1.0.3" = { + name = "internal-slot"; + packageName = "internal-slot"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"; + sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; + }; + }; "invert-kv-1.0.0" = { name = "invert-kv"; packageName = "invert-kv"; @@ -5818,13 +5872,13 @@ let sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; }; }; - "is-arguments-1.1.0" = { + "is-arguments-1.1.1" = { name = "is-arguments"; packageName = "is-arguments"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz"; - sha512 = "1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg=="; + url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz"; + sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="; }; }; "is-arrayish-0.2.1" = { @@ -5845,13 +5899,13 @@ let sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; }; }; - "is-bigint-1.0.1" = { + "is-bigint-1.0.4" = { name = "is-bigint"; packageName = "is-bigint"; - version = "1.0.1"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz"; - sha512 = "J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg=="; + url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz"; + sha512 = "zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg=="; }; }; "is-binary-path-1.0.1" = { @@ -5872,13 +5926,13 @@ let sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; - "is-boolean-object-1.1.0" = { + "is-boolean-object-1.1.2" = { name = "is-boolean-object"; packageName = "is-boolean-object"; - version = "1.1.0"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz"; - sha512 = "a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA=="; + url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz"; + sha512 = "gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA=="; }; }; "is-buffer-1.1.6" = { @@ -5890,13 +5944,13 @@ let sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; - "is-callable-1.2.3" = { + "is-callable-1.2.4" = { name = "is-callable"; packageName = "is-callable"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz"; - sha512 = "J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ=="; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz"; + sha512 = "nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="; }; }; "is-color-stop-1.1.0" = { @@ -5908,13 +5962,13 @@ let sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; }; }; - "is-core-module-2.2.0" = { + "is-core-module-2.6.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.2.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz"; - sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz"; + sha512 = "wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ=="; }; }; "is-data-descriptor-0.1.4" = { @@ -5935,13 +5989,13 @@ let sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; }; }; - "is-date-object-1.0.2" = { + "is-date-object-1.0.5" = { name = "is-date-object"; packageName = "is-date-object"; - version = "1.0.2"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz"; - sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz"; + sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; }; }; "is-descriptor-0.1.6" = { @@ -5971,13 +6025,13 @@ let sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; }; }; - "is-docker-2.1.1" = { + "is-docker-2.2.1" = { name = "is-docker"; packageName = "is-docker"; - version = "2.1.1"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz"; - sha512 = "ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw=="; + url = "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz"; + sha512 = "F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="; }; }; "is-extendable-0.1.1" = { @@ -6088,13 +6142,13 @@ let sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; - "is-number-object-1.0.4" = { + "is-number-object-1.0.6" = { name = "is-number-object"; packageName = "is-number-object"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz"; - sha512 = "zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw=="; + url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz"; + sha512 = "bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g=="; }; }; "is-obj-1.0.1" = { @@ -6169,13 +6223,13 @@ let sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; }; }; - "is-regex-1.1.2" = { + "is-regex-1.1.4" = { name = "is-regex"; packageName = "is-regex"; - version = "1.1.2"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz"; - sha512 = "axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg=="; + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"; + sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; }; }; "is-regexp-1.0.0" = { @@ -6214,40 +6268,31 @@ let sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; }; - "is-stream-2.0.0" = { + "is-stream-2.0.1" = { name = "is-stream"; packageName = "is-stream"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; - sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; + url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"; + sha512 = "hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="; }; }; - "is-string-1.0.5" = { + "is-string-1.0.7" = { name = "is-string"; packageName = "is-string"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz"; - sha512 = "buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ=="; - }; - }; - "is-svg-3.0.0" = { - name = "is-svg"; - packageName = "is-svg"; - version = "3.0.0"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz"; - sha512 = "gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ=="; + url = "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz"; + sha512 = "tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg=="; }; }; - "is-symbol-1.0.3" = { + "is-symbol-1.0.4" = { name = "is-symbol"; packageName = "is-symbol"; - version = "1.0.3"; + version = "1.0.4"; 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-symbol/-/is-symbol-1.0.4.tgz"; + sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; }; }; "is-typedarray-1.0.0" = { @@ -6259,6 +6304,15 @@ let sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; }; + "is-unicode-supported-0.1.0" = { + name = "is-unicode-supported"; + packageName = "is-unicode-supported"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"; + sha512 = "knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="; + }; + }; "is-utf8-0.2.1" = { name = "is-utf8"; packageName = "is-utf8"; @@ -6808,13 +6862,13 @@ let sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; }; }; - "log-symbols-3.0.0" = { + "log-symbols-4.1.0" = { name = "log-symbols"; packageName = "log-symbols"; - version = "3.0.0"; + version = "4.1.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.1.0.tgz"; + sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; }; }; "loglevel-1.7.1" = { @@ -7033,13 +7087,13 @@ let sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; }; - "micromatch-4.0.2" = { + "micromatch-4.0.4" = { name = "micromatch"; packageName = "micromatch"; - version = "4.0.2"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz"; - sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="; + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz"; + sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; }; }; "miller-rabin-4.0.1" = { @@ -7087,22 +7141,22 @@ let sha512 = "tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg=="; }; }; - "mime-db-1.46.0" = { + "mime-db-1.49.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.46.0"; + version = "1.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz"; - sha512 = "svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz"; + sha512 = "CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA=="; }; }; - "mime-types-2.1.29" = { + "mime-types-2.1.32" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.29"; + version = "2.1.32"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz"; - sha512 = "Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz"; + sha512 = "hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A=="; }; }; "mimic-fn-1.2.0" = { @@ -7204,13 +7258,13 @@ let sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg=="; }; }; - "minipass-3.1.3" = { + "minipass-3.1.5" = { name = "minipass"; packageName = "minipass"; - version = "3.1.3"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz"; - sha512 = "Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg=="; + url = "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz"; + sha512 = "+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw=="; }; }; "minizlib-1.3.3" = { @@ -7384,22 +7438,22 @@ let sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; }; }; - "nan-2.14.2" = { + "nan-2.15.0" = { name = "nan"; packageName = "nan"; - version = "2.14.2"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz"; - sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="; + url = "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz"; + sha512 = "8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="; }; }; - "nanoid-3.1.21" = { + "nanoid-3.1.25" = { name = "nanoid"; packageName = "nanoid"; - version = "3.1.21"; + version = "3.1.25"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.21.tgz"; - sha512 = "A6oZraK4DJkAOICstsGH98dvycPr/4GGDH7ZWKmMdd3vGcOurZ6JmWFUt0DA5bzrrn2FrUjmv6mFNWvv8jpppA=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz"; + sha512 = "rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q=="; }; }; "nanomatch-1.2.13" = { @@ -7465,13 +7519,13 @@ let sha512 = "VQsT8QSierYGkHzRed+b4MnccQVF1+qPHunE8jBoU7jD6YpuRqCDPzEoC2zfyEJS80qVnlMZrqobLnyjzX9lJg=="; }; }; - "node-elm-compiler-5.0.5" = { + "node-elm-compiler-5.0.6" = { name = "node-elm-compiler"; packageName = "node-elm-compiler"; - version = "5.0.5"; + version = "5.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-elm-compiler/-/node-elm-compiler-5.0.5.tgz"; - sha512 = "vapB+VkmKMY1NRy7jjpGjzwWbKmtiRfzbgVoV/eROz5Kx30QvY0Nd5Ua7iST+9utrn1aG8cVToXC6UWdEO5BKQ=="; + url = "https://registry.npmjs.org/node-elm-compiler/-/node-elm-compiler-5.0.6.tgz"; + sha512 = "DWTRQR8b54rvschcZRREdsz7K84lnS8A6YJu8du3QLQ8f204SJbyTaA6NzYYbfUG97OTRKRv/0KZl82cTfpLhA=="; }; }; "node-forge-0.10.0" = { @@ -7492,13 +7546,13 @@ let sha512 = "h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q=="; }; }; - "node-releases-1.1.71" = { + "node-releases-1.1.75" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.71"; + version = "1.1.75"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz"; - sha512 = "zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz"; + sha512 = "Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw=="; }; }; "node-watch-0.5.5" = { @@ -7573,13 +7627,22 @@ let sha512 = "U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="; }; }; - "normalize-url-4.5.0" = { + "normalize-url-4.5.1" = { name = "normalize-url"; packageName = "normalize-url"; - version = "4.5.0"; + version = "4.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz"; - sha512 = "2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ=="; + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz"; + sha512 = "9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA=="; + }; + }; + "normalize-url-6.1.0" = { + name = "normalize-url"; + packageName = "normalize-url"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz"; + sha512 = "DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="; }; }; "npm-conf-1.1.3" = { @@ -7618,6 +7681,15 @@ let sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="; }; }; + "nth-check-2.0.1" = { + name = "nth-check"; + packageName = "nth-check"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz"; + sha512 = "it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w=="; + }; + }; "number-is-nan-1.0.1" = { name = "number-is-nan"; packageName = "number-is-nan"; @@ -7654,13 +7726,13 @@ let sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; }; }; - "object-inspect-1.9.0" = { + "object-inspect-1.11.0" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.9.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz"; - sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz"; + sha512 = "jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="; }; }; "object-is-1.1.5" = { @@ -7699,13 +7771,13 @@ let sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; }; }; - "object.entries-1.1.3" = { + "object.entries-1.1.4" = { name = "object.entries"; packageName = "object.entries"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.3.tgz"; - sha512 = "ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg=="; + url = "https://registry.npmjs.org/object.entries/-/object.entries-1.1.4.tgz"; + sha512 = "h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA=="; }; }; "object.getownpropertydescriptors-2.1.2" = { @@ -7726,13 +7798,13 @@ let sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; }; }; - "object.values-1.1.3" = { + "object.values-1.1.4" = { name = "object.values"; packageName = "object.values"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.1.3.tgz"; - sha512 = "nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw=="; + url = "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz"; + sha512 = "TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg=="; }; }; "obuf-1.1.2" = { @@ -7843,13 +7915,13 @@ let sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; }; }; - "ora-4.1.1" = { + "ora-5.4.1" = { name = "ora"; packageName = "ora"; - version = "4.1.1"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-4.1.1.tgz"; - sha512 = "sjYP8QyVWBpBZWD6Vr1M/KwknSw6kJOz41tvGMlwWeClHBtYKTbHMki1PsLZnxKpXMPbTKv9b3pjQu3REib96A=="; + url = "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz"; + sha512 = "5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ=="; }; }; "original-1.0.2" = { @@ -7906,13 +7978,13 @@ let sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; }; }; - "p-cancelable-2.1.0" = { + "p-cancelable-2.1.1" = { name = "p-cancelable"; packageName = "p-cancelable"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.0.tgz"; - sha512 = "HAZyB3ZodPo+BDpb4/Iu7Jv4P6cSazBz9ZM0ChhEXp70scx834aWCEjQRwgt41UzzejUAPdbqqONfRWTPYrPAQ=="; + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz"; + sha512 = "BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="; }; }; "p-event-4.2.0" = { @@ -8221,13 +8293,13 @@ let sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; }; - "path-parse-1.0.6" = { + "path-parse-1.0.7" = { name = "path-parse"; packageName = "path-parse"; - version = "1.0.6"; + version = "1.0.7"; 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-parse/-/path-parse-1.0.7.tgz"; + sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; }; }; "path-to-regexp-0.1.7" = { @@ -8266,13 +8338,13 @@ let sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; }; - "pbkdf2-3.1.1" = { + "pbkdf2-3.1.2" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz"; - sha512 = "4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg=="; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz"; + sha512 = "iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA=="; }; }; "pem-1.14.2" = { @@ -8293,13 +8365,13 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "picomatch-2.2.2" = { + "picomatch-2.3.0" = { name = "picomatch"; packageName = "picomatch"; - version = "2.2.2"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; - sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz"; + sha512 = "lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="; }; }; "pify-2.3.0" = { @@ -8428,22 +8500,22 @@ let sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; }; }; - "postcss-7.0.35" = { + "postcss-7.0.36" = { name = "postcss"; packageName = "postcss"; - version = "7.0.35"; + version = "7.0.36"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz"; - sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz"; + sha512 = "BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw=="; }; }; - "postcss-8.2.8" = { + "postcss-8.3.6" = { name = "postcss"; packageName = "postcss"; - version = "8.2.8"; + version = "8.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.2.8.tgz"; - sha512 = "1F0Xb2T21xET7oQV9eKuctbM9S7BC0fetoHCc4H13z0PT6haiRLP4T0ZY4XWh7iLP0usgqykT6p9B2RtOf4FPw=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz"; + sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A=="; }; }; "postcss-calc-7.0.5" = { @@ -8743,22 +8815,22 @@ let sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA=="; }; }; - "postcss-selector-parser-6.0.4" = { + "postcss-selector-parser-6.0.6" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; - version = "6.0.4"; + version = "6.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz"; - sha512 = "gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw=="; + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz"; + sha512 = "9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg=="; }; }; - "postcss-svgo-4.0.2" = { + "postcss-svgo-4.0.3" = { name = "postcss-svgo"; packageName = "postcss-svgo"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz"; - sha512 = "C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw=="; + url = "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.3.tgz"; + sha512 = "NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw=="; }; }; "postcss-unique-selectors-4.0.1" = { @@ -8878,13 +8950,13 @@ let sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe"; }; }; - "prompts-2.4.0" = { + "prompts-2.4.1" = { name = "prompts"; packageName = "prompts"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz"; - sha512 = "awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ=="; + url = "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz"; + sha512 = "EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ=="; }; }; "proto-list-1.2.4" = { @@ -8896,13 +8968,13 @@ let sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; }; }; - "proxy-addr-2.0.6" = { + "proxy-addr-2.0.7" = { name = "proxy-addr"; packageName = "proxy-addr"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz"; - sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"; + sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; }; }; "prr-1.0.1" = { @@ -9067,13 +9139,13 @@ let sha512 = "FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="; }; }; - "queue-microtask-1.2.2" = { + "queue-microtask-1.2.3" = { name = "queue-microtask"; packageName = "queue-microtask"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.2.tgz"; - sha512 = "dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg=="; + url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"; + sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; }; }; "randombytes-2.1.0" = { @@ -9229,13 +9301,13 @@ let sha512 = "ZOsfTGkjO2kqeR5Mzr5RYDbTGYneSkdNKX2fOX2P5jF7vMrd/GNnIAUtDldeHHumHUCQ3V05YfWUdxMPAsRu9Q=="; }; }; - "readdirp-3.5.0" = { + "readdirp-3.6.0" = { name = "readdirp"; packageName = "readdirp"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz"; - sha512 = "cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ=="; + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"; + sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; }; }; "recursive-readdir-2.2.2" = { @@ -9265,13 +9337,13 @@ let sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; }; }; - "regenerate-unicode-properties-8.2.0" = { + "regenerate-unicode-properties-9.0.0" = { name = "regenerate-unicode-properties"; packageName = "regenerate-unicode-properties"; - version = "8.2.0"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"; - sha512 = "F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA=="; + url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz"; + sha512 = "3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA=="; }; }; "regenerator-runtime-0.11.1" = { @@ -9283,13 +9355,13 @@ let sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; }; }; - "regenerator-runtime-0.13.7" = { + "regenerator-runtime-0.13.9" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; - version = "0.13.7"; + version = "0.13.9"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"; - sha512 = "a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; + sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; }; }; "regenerator-runtime-0.9.6" = { @@ -9328,13 +9400,13 @@ let sha512 = "JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA=="; }; }; - "regexpu-core-4.7.1" = { + "regexpu-core-4.8.0" = { name = "regexpu-core"; packageName = "regexpu-core"; - version = "4.7.1"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz"; - sha512 = "ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ=="; + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.8.0.tgz"; + sha512 = "1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg=="; }; }; "registry-auth-token-4.2.1" = { @@ -9364,13 +9436,13 @@ let sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="; }; }; - "regjsparser-0.6.7" = { + "regjsparser-0.7.0" = { name = "regjsparser"; packageName = "regjsparser"; - version = "0.6.7"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.7.tgz"; - sha512 = "ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ=="; + url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.7.0.tgz"; + sha512 = "A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ=="; }; }; "relateurl-0.2.7" = { @@ -9391,22 +9463,22 @@ let sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; }; }; - "renderkid-2.0.5" = { + "renderkid-2.0.7" = { name = "renderkid"; packageName = "renderkid"; - version = "2.0.5"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.5.tgz"; - sha512 = "ccqoLg+HLOHq1vdfYNm4TBeaCDIi1FLt3wGojTDSvdewUv65oTmI3cnT2E4hRjl1gzKZIPK+KZrXzlUYKnR+vQ=="; + url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.7.tgz"; + sha512 = "oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ=="; }; }; - "repeat-element-1.1.3" = { + "repeat-element-1.1.4" = { name = "repeat-element"; packageName = "repeat-element"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz"; - sha512 = "ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="; + url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz"; + sha512 = "LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ=="; }; }; "repeat-string-1.6.1" = { @@ -9697,13 +9769,13 @@ let sha1 = "e848396f057d223f24386924618e25694161ec47"; }; }; - "rxjs-6.6.6" = { + "rxjs-6.6.7" = { name = "rxjs"; packageName = "rxjs"; - version = "6.6.6"; + version = "6.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.6.tgz"; - sha512 = "/oTwee4N4iWzAMAL9xdGKjkEHmIwupR3oXbQjCKywF1BeFohswF3vZdogbmEF6pZkOsXTzWkrZszrWpQTByYVg=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz"; + sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; "safe-buffer-5.1.1" = { @@ -9796,13 +9868,13 @@ let sha512 = "SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg=="; }; }; - "schema-utils-3.0.0" = { + "schema-utils-3.1.1" = { name = "schema-utils"; packageName = "schema-utils"; - version = "3.0.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.0.0.tgz"; - sha512 = "6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA=="; + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz"; + sha512 = "Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw=="; }; }; "select-hose-2.0.0" = { @@ -9814,13 +9886,13 @@ let sha1 = "625d8658f865af43ec962bfc376a37359a4994ca"; }; }; - "selfsigned-1.10.8" = { + "selfsigned-1.10.11" = { name = "selfsigned"; packageName = "selfsigned"; - version = "1.10.8"; + version = "1.10.11"; src = fetchurl { - url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz"; - sha512 = "2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w=="; + url = "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.11.tgz"; + sha512 = "aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA=="; }; }; "semver-5.7.1" = { @@ -9850,13 +9922,13 @@ let sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; }; }; - "semver-7.3.4" = { + "semver-7.3.5" = { name = "semver"; packageName = "semver"; - version = "7.3.4"; + version = "7.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz"; - sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"; + sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; }; }; "semver-regex-1.0.0" = { @@ -10048,13 +10120,22 @@ let sha1 = "f4781949cce402697127430ea3b3c5476f481767"; }; }; - "signal-exit-3.0.3" = { + "side-channel-1.0.4" = { + name = "side-channel"; + packageName = "side-channel"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"; + sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; + }; + }; + "signal-exit-3.0.4" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"; - sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.4.tgz"; + sha512 = "rqYhcAnZ6d/vTPGghdrw7iumdcbXpsk1b8IG/rz+VWV51DM0p7XCtMoJ3qhPLIbp3tvyt3pKRbaaEMZYpHto8Q=="; }; }; "simple-swizzle-0.2.2" = { @@ -10210,6 +10291,15 @@ let sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; }; }; + "source-map-js-0.6.2" = { + name = "source-map-js"; + packageName = "source-map-js"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz"; + sha512 = "/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug=="; + }; + }; "source-map-resolve-0.5.3" = { name = "source-map-resolve"; packageName = "source-map-resolve"; @@ -10219,13 +10309,13 @@ let sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; }; }; - "source-map-support-0.5.19" = { + "source-map-support-0.5.20" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.5.19"; + version = "0.5.20"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz"; - sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz"; + sha512 = "n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw=="; }; }; "source-map-url-0.4.1" = { @@ -10264,13 +10354,13 @@ let sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.7" = { + "spdx-license-ids-3.0.10" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.7"; + version = "3.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz"; - sha512 = "U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz"; + sha512 = "oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA=="; }; }; "spdy-4.0.2" = { @@ -10336,13 +10426,13 @@ let sha512 = "XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ=="; }; }; - "ssri-6.0.1" = { + "ssri-6.0.2" = { name = "ssri"; packageName = "ssri"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz"; - sha512 = "3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA=="; + url = "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz"; + sha512 = "cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q=="; }; }; "stable-0.1.8" = { @@ -10525,6 +10615,15 @@ let 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=="; + }; + }; "stringify-object-3.3.0" = { name = "stringify-object"; packageName = "stringify-object"; @@ -10687,13 +10786,13 @@ let sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; }; - "supports-hyperlinks-2.1.0" = { + "supports-hyperlinks-2.2.0" = { name = "supports-hyperlinks"; packageName = "supports-hyperlinks"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz"; - sha512 = "zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA=="; + url = "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz"; + sha512 = "6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ=="; }; }; "svgo-1.3.2" = { @@ -10723,22 +10822,22 @@ let sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="; }; }; - "tar-4.4.13" = { + "tar-4.4.19" = { name = "tar"; packageName = "tar"; - version = "4.4.13"; + version = "4.4.19"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz"; - sha512 = "w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA=="; + url = "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz"; + sha512 = "a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA=="; }; }; - "tar-6.1.0" = { + "tar-6.1.11" = { name = "tar"; packageName = "tar"; - version = "6.1.0"; + version = "6.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz"; - sha512 = "DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA=="; + url = "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz"; + sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; }; }; "temp-0.9.0" = { @@ -11002,13 +11101,13 @@ let sha1 = "61dbc2d53b69ff6091a12a168fd7d433107e40f1"; }; }; - "ts-debounce-2.3.0" = { + "ts-debounce-3.0.0" = { name = "ts-debounce"; packageName = "ts-debounce"; - version = "2.3.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ts-debounce/-/ts-debounce-2.3.0.tgz"; - sha512 = "j63IP7/unAzovrhVHE7U+fNkvDKwIaLH11dCO9TcRbYOZw1chPL054poqq3ZloyRJ5KwJMeB8csN/vGPPpQJjw=="; + url = "https://registry.npmjs.org/ts-debounce/-/ts-debounce-3.0.0.tgz"; + sha512 = "7jiRWgN4/8IdvCxbIwnwg2W0bbYFBH6BxFqBjMKk442t7+liF2Z1H6AUCcl8e/pD93GjPru+axeiJwFmRww1WQ=="; }; }; "ts-union-2.3.0" = { @@ -11029,22 +11128,22 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tslib-2.1.0" = { + "tslib-2.3.1" = { name = "tslib"; packageName = "tslib"; - version = "2.1.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz"; - sha512 = "hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz"; + sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="; }; }; - "tsyringe-4.4.0" = { + "tsyringe-4.6.0" = { name = "tsyringe"; packageName = "tsyringe"; - version = "4.4.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/tsyringe/-/tsyringe-4.4.0.tgz"; - sha512 = "SlMApe1lhIq546CDp7bF+IdF4RB6d+9C5T7B0AS0P/Bm+Qpizj/gEmZzvw9J/KlXPEt4qHTbi1TRvX3rCPSdTg=="; + url = "https://registry.npmjs.org/tsyringe/-/tsyringe-4.6.0.tgz"; + sha512 = "BMQAZamSfEmIQzH8WJeRu1yZGQbPSDuI9g+yEiKZFIcO46GPZuMOC2d0b52cVBdw1d++06JnDSIIZvEnogMdAw=="; }; }; "tty-browserify-0.0.0" = { @@ -11083,13 +11182,13 @@ let sha512 = "EUV9jo4sffrwlg8s0zDhP0T2WD3pru5Xi0+HTE3zTUmBaZNhfkite9PdSJwdXLwPVW0jnAHT56pZHIOYckPEiw=="; }; }; - "type-fest-0.11.0" = { + "type-fest-0.21.3" = { name = "type-fest"; packageName = "type-fest"; - version = "0.11.0"; + version = "0.21.3"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz"; - sha512 = "OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz"; + sha512 = "t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="; }; }; "type-is-1.6.18" = { @@ -11110,13 +11209,13 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "typescript-3.9.9" = { + "typescript-3.9.10" = { name = "typescript"; packageName = "typescript"; - version = "3.9.9"; + version = "3.9.10"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.9.9.tgz"; - sha512 = "kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz"; + sha512 = "w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q=="; }; }; "uglify-es-3.3.10" = { @@ -11155,49 +11254,49 @@ let sha512 = "UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="; }; }; - "unbox-primitive-1.0.0" = { + "unbox-primitive-1.0.1" = { name = "unbox-primitive"; packageName = "unbox-primitive"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.0.tgz"; - sha512 = "P/51NX+JXyxK/aigg1/ZgyccdAxm5K1+n8+tvqSntjOivPt19gvm1VC49RWYetsiub8WViUchdxl/KWHHB0kzA=="; + url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz"; + sha512 = "tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw=="; }; }; - "unicode-canonical-property-names-ecmascript-1.0.4" = { + "unicode-canonical-property-names-ecmascript-2.0.0" = { name = "unicode-canonical-property-names-ecmascript"; packageName = "unicode-canonical-property-names-ecmascript"; - version = "1.0.4"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"; - sha512 = "jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ=="; + url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"; + sha512 = "yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="; }; }; - "unicode-match-property-ecmascript-1.0.4" = { + "unicode-match-property-ecmascript-2.0.0" = { name = "unicode-match-property-ecmascript"; packageName = "unicode-match-property-ecmascript"; - version = "1.0.4"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"; - sha512 = "L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg=="; + url = "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz"; + sha512 = "5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q=="; }; }; - "unicode-match-property-value-ecmascript-1.2.0" = { + "unicode-match-property-value-ecmascript-2.0.0" = { name = "unicode-match-property-value-ecmascript"; packageName = "unicode-match-property-value-ecmascript"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"; - sha512 = "wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ=="; + url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz"; + sha512 = "7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="; }; }; - "unicode-property-aliases-ecmascript-1.1.0" = { + "unicode-property-aliases-ecmascript-2.0.0" = { name = "unicode-property-aliases-ecmascript"; packageName = "unicode-property-aliases-ecmascript"; - version = "1.1.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"; - sha512 = "PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg=="; + url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz"; + sha512 = "5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ=="; }; }; "union-value-1.0.1" = { @@ -11353,13 +11452,13 @@ let sha512 = "3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA=="; }; }; - "url-parse-1.5.1" = { + "url-parse-1.5.3" = { name = "url-parse"; packageName = "url-parse"; - version = "1.5.1"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz"; - sha512 = "HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q=="; + url = "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz"; + sha512 = "IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ=="; }; }; "url-parse-lax-3.0.0" = { @@ -11596,13 +11695,13 @@ let sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; }; }; - "web-tree-sitter-0.17.1" = { + "web-tree-sitter-0.19.4" = { name = "web-tree-sitter"; packageName = "web-tree-sitter"; - version = "0.17.1"; + version = "0.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.17.1.tgz"; - sha512 = "QgaeV+wmlB1Qaw9rS5a0ZDBt8GRcKkF+hGNSVxQ/HLm1lPCow3BKOhoILaXkYm7YozCcL7TjppRADBwFJugbuA=="; + url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.19.4.tgz"; + sha512 = "8G0xBj05hqZybCqBtW7RPZ/hWEtP3DiLTauQzGJZuZYfVRgw7qj7iaZ+8djNqJ4VPrdOO+pS2dR1JsTbsLxdYg=="; }; }; "webpack-4.44.2" = { @@ -11965,22 +12064,22 @@ let sha512 = "8A/uRMnQy8KCQsmep1m7Bk+z/+LIkeF7w+TDMLtX1iZm5Hq9HsUDmgFGaW1ACW5Cj0b2Qo7wCvRhYN2ErUVp/A=="; }; }; - "ws-5.2.2" = { + "ws-5.2.3" = { name = "ws"; packageName = "ws"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz"; - sha512 = "jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA=="; + url = "https://registry.npmjs.org/ws/-/ws-5.2.3.tgz"; + sha512 = "jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA=="; }; }; - "ws-6.2.1" = { + "ws-6.2.2" = { name = "ws"; packageName = "ws"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz"; - sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; + url = "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz"; + sha512 = "zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw=="; }; }; "ws-7.1.1" = { @@ -11992,13 +12091,13 @@ let sha512 = "o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A=="; }; }; - "ws-7.4.4" = { + "ws-7.5.5" = { name = "ws"; packageName = "ws"; - version = "7.4.4"; + version = "7.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz"; - sha512 = "Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw=="; + url = "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz"; + sha512 = "BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w=="; }; }; "xmlbuilder-13.0.2" = { @@ -12037,13 +12136,13 @@ let sha512 = "uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ=="; }; }; - "y18n-4.0.1" = { + "y18n-4.0.3" = { name = "y18n"; packageName = "y18n"; - version = "4.0.1"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz"; - sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ=="; + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz"; + sha512 = "JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="; }; }; "yallist-2.1.2" = { @@ -12073,13 +12172,13 @@ let sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; }; }; - "yaml-1.10.1" = { + "yaml-1.10.2" = { name = "yaml"; packageName = "yaml"; - version = "1.10.1"; + version = "1.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/yaml/-/yaml-1.10.1.tgz"; - sha512 = "z/asvd+V08l1ywhaemZVirCwjdzLo6O1/0j2JbYCsGjiezupNQqjs5IIPyNtctbHjPEckqzVGd4jvpU5Lr25vQ=="; + url = "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"; + sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; }; }; "yargs-13.3.2" = { @@ -12224,11 +12323,11 @@ in sources."find-0.2.7" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs-extra-2.0.0" sources."getpass-0.1.7" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."http-errors-1.7.2" @@ -12252,8 +12351,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.4.1" - sources."mime-db-1.46.0" - sources."mime-types-2.1.29" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimist-1.2.0" sources."ms-2.0.0" sources."negotiator-0.6.2" @@ -12268,7 +12367,7 @@ in sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" sources."process-nextick-args-1.0.7" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.7.0" @@ -12347,14 +12446,14 @@ in sources."ajv-6.12.6" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" - sources."anymatch-3.1.1" + sources."anymatch-3.1.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."astral-regex-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."balanced-match-1.0.0" + sources."balanced-match-1.0.2" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" sources."binary-extensions-2.2.0" @@ -12375,7 +12474,7 @@ in sources."chownr-2.0.0" (sources."cliui-6.0.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.2" @@ -12413,7 +12512,7 @@ in sources."minipass-2.9.0" sources."minizlib-1.3.3" sources."mkdirp-0.5.5" - sources."tar-4.4.13" + sources."tar-4.4.19" sources."yallist-3.1.1" ]; }) @@ -12431,7 +12530,7 @@ in sources."lodash-4.17.15" ]; }) - sources."find-parent-dir-0.3.0" + sources."find-parent-dir-0.3.1" sources."find-up-4.1.0" sources."firstline-2.0.2" sources."forever-agent-0.6.1" @@ -12444,7 +12543,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.4" sources."glob-parent-5.1.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -12473,11 +12572,11 @@ in sources."yallist-2.1.2" ]; }) - sources."mime-db-1.46.0" - sources."mime-types-2.1.29" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."minipass-3.1.3" + sources."minipass-3.1.5" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."moment-2.29.1" @@ -12504,7 +12603,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."performance-now-2.1.0" - sources."picomatch-2.2.2" + sources."picomatch-2.3.0" sources."pseudomap-1.0.2" sources."psl-1.8.0" sources."punycode-2.1.1" @@ -12534,7 +12633,7 @@ in ]; }) sources."table-5.4.6" - sources."tar-6.1.0" + sources."tar-6.1.11" sources."temp-0.9.0" sources."through-2.3.8" sources."tmp-0.0.33" @@ -12559,7 +12658,7 @@ in sources."which-module-2.0.0" (sources."wrap-ansi-6.2.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -12571,11 +12670,11 @@ in }) sources."wrappy-1.0.2" sources."xmlbuilder-13.0.2" - sources."y18n-4.0.1" + sources."y18n-4.0.3" sources."yallist-4.0.0" (sources."yargs-15.4.1" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.2" @@ -12607,10 +12706,10 @@ in sources."@szmarczak/http-timer-1.1.2" sources."accepts-1.3.7" sources."ansi-styles-4.3.0" - sources."anymatch-3.1.1" + sources."anymatch-3.1.2" sources."array-flatten-1.1.1" sources."async-limiter-1.0.1" - sources."balanced-match-1.0.0" + sources."balanced-match-1.0.2" sources."batch-0.6.1" sources."binary-extensions-2.2.0" sources."body-parser-1.19.0" @@ -12624,7 +12723,7 @@ in ]; }) sources."chalk-3.0.0" - sources."chokidar-3.5.1" + sources."chokidar-3.5.2" sources."clone-response-1.0.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -12650,17 +12749,17 @@ in sources."express-4.17.1" (sources."express-ws-4.0.0" // { dependencies = [ - sources."ws-5.2.2" + sources."ws-5.2.3" ]; }) sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."forwarded-0.1.2" + sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."get-stream-4.1.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."got-9.6.0" sources."has-flag-4.0.0" @@ -12672,7 +12771,7 @@ in sources."ini-1.3.8" sources."ipaddr.js-1.9.1" sources."is-binary-path-2.1.0" - sources."is-docker-2.1.1" + sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" @@ -12686,15 +12785,15 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.46.0" - sources."mime-types-2.1.29" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."ms-2.0.0" sources."negotiator-0.6.2" sources."normalize-path-3.0.0" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."on-finished-2.3.0" sources."once-1.4.0" sources."open-7.4.2" @@ -12704,15 +12803,15 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."path-to-regexp-0.1.7" - sources."picomatch-2.2.2" + sources."picomatch-2.3.0" sources."prepend-http-2.0.0" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."pump-3.0.0" sources."qs-6.7.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" - sources."readdirp-3.5.0" + sources."readdirp-3.6.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."responselike-1.0.2" @@ -12749,7 +12848,7 @@ in sources."vary-1.1.2" sources."which-2.0.2" sources."wrappy-1.0.2" - sources."ws-7.4.4" + sources."ws-7.5.5" ]; buildInputs = globalBuildInputs; meta = { @@ -12764,73 +12863,72 @@ in "@elm-tooling/elm-language-server" = nodeEnv.buildNodePackage { name = "_at_elm-tooling_slash_elm-language-server"; packageName = "@elm-tooling/elm-language-server"; - version = "2.0.3"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-2.0.3.tgz"; - sha512 = "pOcQNSFEoxsvXQlsRap2ahloqscf5jGYQ8ZqtM4TjdwvavSmObDejTyM5lNO81pFyrEUavTG6Q7G68HyP8TxBA=="; + url = "https://registry.npmjs.org/@elm-tooling/elm-language-server/-/elm-language-server-2.2.1.tgz"; + sha512 = "cihWZw073jnxhFoF3TvaajlXQXDvjx4sYYHnDL4GNKYaTntkNmS3w/C65KMgF0b64lOQl0mABc1fikJf52Cs/g=="; }; dependencies = [ - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" - sources."anymatch-3.1.1" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + sources."anymatch-3.1.2" sources."array-union-2.1.0" sources."binary-extensions-2.2.0" sources."braces-3.0.2" - sources."chokidar-3.5.1" + sources."chokidar-3.5.2" sources."cross-spawn-7.0.3" sources."dir-glob-3.0.1" sources."escape-string-regexp-4.0.0" - sources."execa-5.0.0" + sources."execa-5.1.1" sources."fast-diff-1.2.0" - sources."fast-glob-3.2.5" - sources."fastq-1.11.0" + sources."fast-glob-3.2.7" + sources."fastq-1.13.0" sources."fill-range-7.0.1" - sources."fromentries-1.3.2" sources."fsevents-2.3.2" - sources."get-stream-6.0.0" + sources."get-stream-6.0.1" sources."glob-parent-5.1.2" - sources."globby-11.0.2" + sources."globby-11.0.4" sources."human-signals-2.1.0" sources."ignore-5.1.8" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" - sources."is-stream-2.0.0" + sources."is-stream-2.0.1" sources."isexe-2.0.0" sources."merge-stream-2.0.0" sources."merge2-1.4.1" - sources."micromatch-4.0.2" + sources."micromatch-4.0.4" sources."mimic-fn-2.1.0" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."onetime-5.1.2" sources."path-key-3.1.1" sources."path-type-4.0.0" - sources."picomatch-2.2.2" + sources."picomatch-2.3.0" sources."pjson-1.0.9" - sources."queue-microtask-1.2.2" - sources."readdirp-3.5.0" + sources."queue-microtask-1.2.3" + sources."readdirp-3.6.0" sources."reflect-metadata-0.1.13" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."slash-3.0.0" sources."strip-final-newline-2.0.0" sources."to-regex-range-5.0.1" - sources."ts-debounce-2.3.0" + sources."ts-debounce-3.0.0" sources."tslib-1.14.1" - sources."tsyringe-4.4.0" + sources."tsyringe-4.6.0" sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-3.0.2" - sources."web-tree-sitter-0.17.1" + sources."web-tree-sitter-0.19.4" sources."which-2.0.2" ]; buildInputs = globalBuildInputs; @@ -12854,7 +12952,7 @@ in dependencies = [ sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" - sources."anymatch-3.1.1" + sources."anymatch-3.1.2" sources."async-limiter-1.0.1" sources."binary-extensions-2.2.0" sources."braces-3.0.2" @@ -12885,7 +12983,7 @@ in }) sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."follow-redirects-1.13.3" + sources."follow-redirects-1.14.4" sources."fresh-0.5.2" sources."fsevents-2.3.2" sources."get-stream-4.1.0" @@ -12920,11 +13018,11 @@ in sources."parseurl-1.3.3" sources."path-key-2.0.1" sources."pem-1.14.2" - sources."picomatch-2.2.2" + sources."picomatch-2.3.0" sources."pseudomap-1.0.2" sources."pump-3.0.0" sources."range-parser-1.2.1" - sources."readdirp-3.5.0" + sources."readdirp-3.6.0" sources."requires-port-1.0.0" sources."semver-5.7.1" (sources."send-0.17.1" // { @@ -12937,7 +13035,7 @@ in sources."setprototypeof-1.1.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."statuses-1.5.0" sources."strip-ansi-3.0.1" sources."strip-eof-1.0.0" @@ -12963,32 +13061,32 @@ in elm-test = nodeEnv.buildNodePackage { name = "elm-test"; packageName = "elm-test"; - version = "0.19.1-revision6"; + version = "0.19.1-revision7"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision6.tgz"; - sha512 = "4VbIyCRlCUm/py0E0AjMT3/mwd6DR4Y5Z5gEox6z5JII6ZdKIJmcQzjgWRI5qo5ERJiw9M/Nxhk7SGXFUbZsxQ=="; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision7.tgz"; + sha512 = "sd3nCQMeYMaY84Sz41bVJ30ZvQN1/4ZcD8uYMOuUbM39FDh58NY9/AcImVJ7Z+gjCFdcSU6VscZzhUoPW8jp6Q=="; }; dependencies = [ sources."ansi-styles-4.3.0" - sources."anymatch-3.1.1" - sources."balanced-match-1.0.0" + sources."anymatch-3.1.2" + sources."balanced-match-1.0.2" sources."binary-extensions-2.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."chalk-4.1.0" - sources."chokidar-3.5.1" + sources."chalk-4.1.2" + sources."chokidar-3.5.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-7.1.0" + sources."commander-7.2.0" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."elm-tooling-1.3.0" + sources."elm-tooling-1.6.0" sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -13002,8 +13100,8 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."picomatch-2.2.2" - sources."readdirp-3.5.0" + sources."picomatch-2.3.0" + sources."readdirp-3.6.0" sources."rimraf-3.0.2" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -13035,21 +13133,21 @@ in }; dependencies = [ sources."@sindresorhus/is-2.1.1" - sources."@szmarczak/http-timer-4.0.5" - sources."@types/cacheable-request-6.0.1" - sources."@types/http-cache-semantics-4.0.0" - sources."@types/keyv-3.1.1" - sources."@types/node-14.14.34" + sources."@szmarczak/http-timer-4.0.6" + sources."@types/cacheable-request-6.0.2" + sources."@types/http-cache-semantics-4.0.1" + sources."@types/keyv-3.1.3" + sources."@types/node-16.9.3" sources."@types/responselike-1.0.0" sources."cacheable-lookup-2.0.1" - sources."cacheable-request-7.0.1" + sources."cacheable-request-7.0.2" sources."caw-2.0.1" (sources."clone-response-1.0.2" // { dependencies = [ sources."mimic-response-1.0.1" ]; }) - sources."config-chain-1.1.12" + sources."config-chain-1.1.13" sources."decompress-response-5.0.0" sources."defer-to-connect-2.0.1" sources."duplexer3-0.1.4" @@ -13058,7 +13156,7 @@ in sources."get-proxy-2.1.0" sources."get-stream-5.2.0" sources."got-10.7.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."http-cache-semantics-4.1.0" @@ -13072,10 +13170,10 @@ in sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" sources."mimic-response-2.1.0" - sources."normalize-url-4.5.0" + sources."normalize-url-6.1.0" sources."npm-conf-1.1.3" sources."once-1.4.0" - sources."p-cancelable-2.1.0" + sources."p-cancelable-2.1.1" sources."p-event-4.2.0" sources."p-finally-1.0.0" sources."p-timeout-3.2.0" @@ -13085,7 +13183,7 @@ in sources."responselike-2.0.0" sources."safe-buffer-5.2.1" sources."safename-1.0.2" - sources."semver-7.3.4" + sources."semver-7.3.5" sources."to-readable-stream-2.1.0" sources."tunnel-agent-0.6.0" sources."type-fest-0.10.0" @@ -13118,13 +13216,13 @@ in sources."ajv-6.12.6" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" - sources."anymatch-3.1.1" + sources."anymatch-3.1.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."balanced-match-1.0.0" + sources."balanced-match-1.0.2" sources."bcrypt-pbkdf-1.0.2" sources."binary-0.3.0" sources."binary-extensions-2.2.0" @@ -13174,7 +13272,7 @@ in sources."firstline-1.2.0" ]; }) - sources."find-parent-dir-0.3.0" + sources."find-parent-dir-0.3.1" sources."find-up-3.0.0" sources."firstline-2.0.2" sources."forever-agent-0.6.1" @@ -13187,7 +13285,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.4" sources."glob-parent-5.1.2" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -13210,8 +13308,8 @@ in sources."jsprim-1.4.1" sources."locate-path-3.0.0" sources."lodash-4.17.15" - sources."mime-db-1.46.0" - sources."mime-types-2.1.29" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-2.9.0" @@ -13237,7 +13335,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."performance-now-2.1.0" - sources."picomatch-2.2.2" + sources."picomatch-2.3.0" sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" @@ -13264,7 +13362,7 @@ in sources."string-width-3.1.0" sources."strip-ansi-5.2.0" sources."supports-color-5.5.0" - sources."tar-4.4.13" + sources."tar-4.4.19" (sources."temp-0.9.0" // { dependencies = [ sources."rimraf-2.6.3" @@ -13286,7 +13384,7 @@ in sources."wrap-ansi-5.1.0" sources."wrappy-1.0.2" sources."xmlbuilder-13.0.2" - sources."y18n-4.0.1" + sources."y18n-4.0.3" sources."yallist-3.1.1" sources."yargs-13.3.2" sources."yargs-parser-13.1.2" @@ -13311,9 +13409,9 @@ in dependencies = [ sources."bluebird-3.7.2" sources."compare-versions-3.6.0" - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."fs-extra-6.0.1" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."inherits-2.0.4" sources."isarray-1.0.0" sources."jsonfile-4.0.0" @@ -13355,52 +13453,52 @@ in }; dependencies = [ sources."@babel/cli-7.12.10" - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.13.8" + sources."@babel/code-frame-7.14.5" + sources."@babel/compat-data-7.15.0" sources."@babel/core-7.12.10" - sources."@babel/generator-7.13.9" - sources."@babel/helper-annotate-as-pure-7.12.13" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - (sources."@babel/helper-compilation-targets-7.13.10" // { + sources."@babel/generator-7.15.4" + sources."@babel/helper-annotate-as-pure-7.15.4" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" + (sources."@babel/helper-compilation-targets-7.15.4" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.13.10" - sources."@babel/helper-create-regexp-features-plugin-7.12.17" - sources."@babel/helper-explode-assignable-expression-7.13.0" - sources."@babel/helper-function-name-7.12.13" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.13.0" - sources."@babel/helper-member-expression-to-functions-7.13.0" - sources."@babel/helper-module-imports-7.12.13" - sources."@babel/helper-module-transforms-7.13.0" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-plugin-utils-7.13.0" - sources."@babel/helper-remap-async-to-generator-7.13.0" - sources."@babel/helper-replace-supers-7.13.0" - sources."@babel/helper-simple-access-7.12.13" - sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.13.10" - sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.10" - sources."@babel/plugin-proposal-async-generator-functions-7.13.8" - sources."@babel/plugin-proposal-class-properties-7.13.0" - sources."@babel/plugin-proposal-dynamic-import-7.13.8" - sources."@babel/plugin-proposal-export-namespace-from-7.12.13" - sources."@babel/plugin-proposal-json-strings-7.13.8" - sources."@babel/plugin-proposal-logical-assignment-operators-7.13.8" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.13.8" - sources."@babel/plugin-proposal-numeric-separator-7.12.13" - sources."@babel/plugin-proposal-object-rest-spread-7.13.8" - sources."@babel/plugin-proposal-optional-catch-binding-7.13.8" - sources."@babel/plugin-proposal-optional-chaining-7.13.8" - sources."@babel/plugin-proposal-private-methods-7.13.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" + sources."@babel/helper-create-class-features-plugin-7.15.4" + sources."@babel/helper-create-regexp-features-plugin-7.14.5" + sources."@babel/helper-explode-assignable-expression-7.15.4" + sources."@babel/helper-function-name-7.15.4" + sources."@babel/helper-get-function-arity-7.15.4" + sources."@babel/helper-hoist-variables-7.15.4" + sources."@babel/helper-member-expression-to-functions-7.15.4" + sources."@babel/helper-module-imports-7.15.4" + sources."@babel/helper-module-transforms-7.15.7" + sources."@babel/helper-optimise-call-expression-7.15.4" + sources."@babel/helper-plugin-utils-7.14.5" + sources."@babel/helper-remap-async-to-generator-7.15.4" + sources."@babel/helper-replace-supers-7.15.4" + sources."@babel/helper-simple-access-7.15.4" + sources."@babel/helper-skip-transparent-expression-wrappers-7.15.4" + sources."@babel/helper-split-export-declaration-7.15.4" + sources."@babel/helper-validator-identifier-7.15.7" + sources."@babel/helper-validator-option-7.14.5" + sources."@babel/helper-wrap-function-7.15.4" + sources."@babel/helpers-7.15.4" + sources."@babel/highlight-7.14.5" + sources."@babel/parser-7.15.7" + sources."@babel/plugin-proposal-async-generator-functions-7.15.4" + sources."@babel/plugin-proposal-class-properties-7.14.5" + sources."@babel/plugin-proposal-dynamic-import-7.14.5" + sources."@babel/plugin-proposal-export-namespace-from-7.14.5" + sources."@babel/plugin-proposal-json-strings-7.14.5" + sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" + sources."@babel/plugin-proposal-numeric-separator-7.14.5" + sources."@babel/plugin-proposal-object-rest-spread-7.15.6" + sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" + sources."@babel/plugin-proposal-optional-chaining-7.14.5" + sources."@babel/plugin-proposal-private-methods-7.14.5" + sources."@babel/plugin-proposal-unicode-property-regex-7.14.5" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" @@ -13412,46 +13510,46 @@ in sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.12.13" - sources."@babel/plugin-transform-arrow-functions-7.13.0" - sources."@babel/plugin-transform-async-to-generator-7.13.0" - sources."@babel/plugin-transform-block-scoped-functions-7.12.13" - sources."@babel/plugin-transform-block-scoping-7.12.13" - sources."@babel/plugin-transform-classes-7.13.0" - sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.13.0" - sources."@babel/plugin-transform-dotall-regex-7.12.13" - sources."@babel/plugin-transform-duplicate-keys-7.12.13" - sources."@babel/plugin-transform-exponentiation-operator-7.12.13" - sources."@babel/plugin-transform-for-of-7.13.0" - sources."@babel/plugin-transform-function-name-7.12.13" - sources."@babel/plugin-transform-literals-7.12.13" - sources."@babel/plugin-transform-member-expression-literals-7.12.13" - sources."@babel/plugin-transform-modules-amd-7.13.0" - sources."@babel/plugin-transform-modules-commonjs-7.13.8" - sources."@babel/plugin-transform-modules-systemjs-7.13.8" - sources."@babel/plugin-transform-modules-umd-7.13.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" - sources."@babel/plugin-transform-new-target-7.12.13" - sources."@babel/plugin-transform-object-super-7.12.13" - sources."@babel/plugin-transform-parameters-7.13.0" - sources."@babel/plugin-transform-property-literals-7.12.13" - sources."@babel/plugin-transform-regenerator-7.12.13" - sources."@babel/plugin-transform-reserved-words-7.12.13" + sources."@babel/plugin-syntax-top-level-await-7.14.5" + sources."@babel/plugin-transform-arrow-functions-7.14.5" + sources."@babel/plugin-transform-async-to-generator-7.14.5" + sources."@babel/plugin-transform-block-scoped-functions-7.14.5" + sources."@babel/plugin-transform-block-scoping-7.15.3" + sources."@babel/plugin-transform-classes-7.15.4" + sources."@babel/plugin-transform-computed-properties-7.14.5" + sources."@babel/plugin-transform-destructuring-7.14.7" + sources."@babel/plugin-transform-dotall-regex-7.14.5" + sources."@babel/plugin-transform-duplicate-keys-7.14.5" + sources."@babel/plugin-transform-exponentiation-operator-7.14.5" + sources."@babel/plugin-transform-for-of-7.15.4" + sources."@babel/plugin-transform-function-name-7.14.5" + sources."@babel/plugin-transform-literals-7.14.5" + sources."@babel/plugin-transform-member-expression-literals-7.14.5" + sources."@babel/plugin-transform-modules-amd-7.14.5" + sources."@babel/plugin-transform-modules-commonjs-7.15.4" + sources."@babel/plugin-transform-modules-systemjs-7.15.4" + sources."@babel/plugin-transform-modules-umd-7.14.5" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.14.9" + sources."@babel/plugin-transform-new-target-7.14.5" + sources."@babel/plugin-transform-object-super-7.14.5" + sources."@babel/plugin-transform-parameters-7.15.4" + sources."@babel/plugin-transform-property-literals-7.14.5" + sources."@babel/plugin-transform-regenerator-7.14.5" + sources."@babel/plugin-transform-reserved-words-7.14.5" sources."@babel/plugin-transform-runtime-7.12.10" - sources."@babel/plugin-transform-shorthand-properties-7.12.13" - sources."@babel/plugin-transform-spread-7.13.0" - sources."@babel/plugin-transform-sticky-regex-7.12.13" - sources."@babel/plugin-transform-template-literals-7.13.0" - sources."@babel/plugin-transform-typeof-symbol-7.12.13" - sources."@babel/plugin-transform-unicode-escapes-7.12.13" - sources."@babel/plugin-transform-unicode-regex-7.12.13" + sources."@babel/plugin-transform-shorthand-properties-7.14.5" + sources."@babel/plugin-transform-spread-7.14.6" + sources."@babel/plugin-transform-sticky-regex-7.14.5" + sources."@babel/plugin-transform-template-literals-7.14.5" + sources."@babel/plugin-transform-typeof-symbol-7.14.5" + sources."@babel/plugin-transform-unicode-escapes-7.14.5" + sources."@babel/plugin-transform-unicode-regex-7.14.5" sources."@babel/preset-env-7.12.10" sources."@babel/preset-modules-0.1.4" sources."@babel/runtime-7.12.5" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.0" - sources."@babel/types-7.13.0" + sources."@babel/template-7.15.4" + sources."@babel/traverse-7.15.4" + sources."@babel/types-7.15.6" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -13459,28 +13557,27 @@ in sources."@hapi/topo-3.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" - sources."@types/anymatch-1.3.1" - sources."@types/glob-7.1.3" - sources."@types/html-minifier-terser-5.1.1" - sources."@types/http-proxy-1.17.5" - sources."@types/json-schema-7.0.7" - sources."@types/minimatch-3.0.3" - sources."@types/node-14.14.34" + sources."@types/glob-7.1.4" + sources."@types/html-minifier-terser-5.1.2" + sources."@types/http-proxy-1.17.7" + sources."@types/json-schema-7.0.9" + sources."@types/minimatch-3.0.5" + sources."@types/node-16.9.3" sources."@types/parse-json-4.0.0" - sources."@types/q-1.5.4" + sources."@types/q-1.5.5" sources."@types/source-list-map-0.1.2" - sources."@types/tapable-1.0.6" - (sources."@types/uglify-js-3.13.0" // { + sources."@types/tapable-1.0.8" + (sources."@types/uglify-js-3.13.1" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.26" // { + (sources."@types/webpack-4.41.31" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-sources-2.1.0" // { + (sources."@types/webpack-sources-3.2.0" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -13517,7 +13614,7 @@ in sources."ansi-html-0.0.7" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" - sources."anymatch-3.1.1" + sources."anymatch-3.1.2" sources."aproba-1.2.0" sources."argparse-1.0.10" sources."arr-diff-4.0.0" @@ -13574,7 +13671,7 @@ in ]; }) sources."babylon-6.18.0" - sources."balanced-match-1.0.0" + sources."balanced-match-1.0.2" (sources."base-0.11.2" // { dependencies = [ sources."define-property-1.0.0" @@ -13616,9 +13713,9 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.16.3" + sources."browserslist-4.17.0" sources."buffer-4.9.2" - sources."buffer-from-1.1.1" + sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" @@ -13633,7 +13730,7 @@ in sources."camel-case-4.1.2" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001199" + sources."caniuse-lite-1.0.30001258" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" (sources."chalk-2.4.2" // { @@ -13642,17 +13739,13 @@ in ]; }) sources."chardet-0.7.0" - (sources."chokidar-3.5.1" // { + (sources."chokidar-3.5.2" // { dependencies = [ sources."glob-parent-5.1.2" ]; }) sources."chownr-1.1.4" - (sources."chrome-trace-event-1.0.2" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) + sources."chrome-trace-event-1.0.3" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ @@ -13689,11 +13782,11 @@ in sources."coa-2.0.2" sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" - sources."color-3.1.3" + sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.5.5" - sources."colorette-1.2.2" + sources."color-string-1.6.0" + sources."colorette-1.4.0" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."commander-4.1.1" @@ -13714,7 +13807,7 @@ in sources."constants-browserify-1.0.0" sources."content-disposition-0.5.3" sources."content-type-1.0.4" - sources."convert-source-map-1.7.0" + sources."convert-source-map-1.8.0" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-concurrently-1.0.5" @@ -13731,12 +13824,12 @@ in ]; }) sources."core-js-2.6.12" - (sources."core-js-compat-3.9.1" // { + (sources."core-js-compat-3.17.3" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-util-is-1.0.2" + sources."core-util-is-1.0.3" sources."cosmiconfig-5.2.1" (sources."create-ecdh-4.0.4" // { dependencies = [ @@ -13754,28 +13847,28 @@ in sources."camelcase-6.2.0" sources."loader-utils-2.0.0" sources."lru-cache-6.0.0" - sources."semver-7.3.4" + sources."semver-7.3.5" sources."yallist-4.0.0" ]; }) - sources."css-select-2.1.0" + sources."css-select-4.1.3" sources."css-select-base-adapter-0.1.1" (sources."css-tree-1.0.0-alpha.37" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."css-what-3.4.2" + sources."css-what-5.0.1" sources."cssesc-3.0.0" - sources."cssnano-4.1.10" - sources."cssnano-preset-default-4.0.7" + sources."cssnano-4.1.11" + sources."cssnano-preset-default-4.0.8" sources."cssnano-util-get-arguments-4.0.0" sources."cssnano-util-get-match-4.0.0" sources."cssnano-util-raw-cache-4.0.1" sources."cssnano-util-same-parent-4.0.1" (sources."csso-4.2.0" // { dependencies = [ - sources."css-tree-1.1.2" + sources."css-tree-1.1.3" sources."mdn-data-2.0.14" sources."source-map-0.6.1" ]; @@ -13803,7 +13896,7 @@ in sources."depd-1.1.2" sources."des.js-1.0.1" sources."destroy-1.0.4" - sources."detect-node-2.0.4" + sources."detect-node-2.1.0" (sources."detect-port-alt-1.1.6" // { dependencies = [ sources."debug-2.6.9" @@ -13817,18 +13910,14 @@ in }) sources."dir-glob-2.2.2" sources."dns-equal-1.0.0" - sources."dns-packet-1.3.1" + sources."dns-packet-1.3.4" sources."dns-txt-2.0.2" sources."dom-converter-0.2.0" - (sources."dom-serializer-0.2.2" // { - dependencies = [ - sources."domelementtype-2.1.0" - ]; - }) + sources."dom-serializer-1.3.2" sources."domain-browser-1.2.0" - sources."domelementtype-1.3.1" - sources."domhandler-2.4.2" - sources."domutils-1.7.0" + sources."domelementtype-2.2.0" + sources."domhandler-4.2.2" + sources."domutils-2.8.0" sources."dot-case-3.0.4" sources."dot-prop-5.3.0" sources."dotenv-8.2.0" @@ -13836,7 +13925,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.687" + sources."electron-to-chromium-1.3.843" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -13846,19 +13935,19 @@ in sources."elm-asset-webpack-loader-1.1.2" sources."elm-hot-1.1.6" sources."elm-hot-webpack-loader-1.1.7" - (sources."elm-test-0.19.1-revision6" // { + (sources."elm-test-0.19.1-revision7" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-7.1.0" + sources."commander-7.2.0" sources."has-flag-4.0.0" sources."rimraf-3.0.2" sources."supports-color-7.2.0" ]; }) - sources."elm-tooling-1.3.0" + sources."elm-tooling-1.6.0" sources."elm-webpack-loader-6.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -13872,7 +13961,7 @@ in sources."entities-2.2.0" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.18.0" + sources."es-abstract-1.18.6" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -13967,7 +14056,7 @@ in ]; }) sources."fast-json-stable-stringify-2.1.0" - sources."faye-websocket-0.11.3" + sources."faye-websocket-0.11.4" sources."figgy-pudding-3.5.2" (sources."figures-2.0.0" // { dependencies = [ @@ -13977,7 +14066,7 @@ in (sources."file-loader-6.2.0" // { dependencies = [ sources."loader-utils-2.0.0" - sources."schema-utils-3.0.0" + sources."schema-utils-3.1.1" ]; }) sources."file-uri-to-path-1.0.0" @@ -13989,7 +14078,7 @@ in sources."ms-2.0.0" ]; }) - (sources."find-cache-dir-3.3.1" // { + (sources."find-cache-dir-3.3.2" // { dependencies = [ sources."make-dir-3.1.0" sources."semver-6.3.0" @@ -13999,12 +14088,12 @@ in sources."find-up-4.1.0" sources."firstline-1.3.1" sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.13.3" + sources."follow-redirects-1.14.4" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."forwarded-0.1.2" - sources."fraction.js-4.0.13" + sources."forwarded-0.2.0" + sources."fraction.js-4.1.1" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" sources."from2-2.3.0" @@ -14019,9 +14108,10 @@ in sources."get-intrinsic-1.1.1" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-stream-4.1.0" + sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -14041,7 +14131,7 @@ in sources."slash-1.0.0" ]; }) - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" (sources."gzip-size-5.0.0" // { dependencies = [ sources."pify-3.0.0" @@ -14054,6 +14144,7 @@ in sources."has-bigints-1.0.1" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -14076,20 +14167,14 @@ in sources."hex-color-regex-1.1.0" sources."hmac-drbg-1.0.1" sources."homedir-polyfill-1.0.3" - sources."hosted-git-info-2.8.8" + sources."hosted-git-info-2.8.9" sources."hpack.js-2.1.6" sources."hsl-regex-1.0.0" sources."hsla-regex-1.0.0" - sources."html-comment-regex-1.1.2" sources."html-entities-1.4.0" sources."html-minifier-terser-5.1.1" sources."html-webpack-plugin-4.5.0" - (sources."htmlparser2-3.10.1" // { - dependencies = [ - sources."entities-1.1.2" - sources."readable-stream-3.6.0" - ]; - }) + sources."htmlparser2-6.1.0" sources."http-deceiver-1.2.7" (sources."http-errors-1.7.2" // { dependencies = [ @@ -14134,23 +14219,24 @@ in ]; }) sources."internal-ip-4.3.0" + sources."internal-slot-1.0.3" sources."invert-kv-1.0.0" sources."ip-1.1.5" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-absolute-url-2.1.0" sources."is-accessor-descriptor-1.0.0" - sources."is-arguments-1.1.0" + sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.1" + sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" - sources."is-boolean-object-1.1.0" + sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" - sources."is-callable-1.2.3" + sources."is-callable-1.2.4" sources."is-color-stop-1.1.0" - sources."is-core-module-2.2.0" + sources."is-core-module-2.6.0" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.2" + sources."is-date-object-1.0.5" sources."is-descriptor-1.0.2" sources."is-directory-0.3.1" sources."is-extendable-0.1.1" @@ -14159,21 +14245,20 @@ in sources."is-glob-4.0.1" sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" - sources."is-number-object-1.0.4" + sources."is-number-object-1.0.6" sources."is-obj-2.0.0" sources."is-path-cwd-2.2.0" sources."is-path-in-cwd-2.1.0" sources."is-path-inside-2.1.0" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" - sources."is-regex-1.1.2" + sources."is-regex-1.1.4" sources."is-regexp-1.0.0" sources."is-resolvable-1.1.0" sources."is-root-2.0.0" sources."is-stream-1.1.0" - sources."is-string-1.0.5" - sources."is-svg-3.0.0" - sources."is-symbol-1.0.3" + sources."is-string-1.0.7" + sources."is-symbol-1.0.4" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" @@ -14235,15 +14320,15 @@ in sources."merge-descriptors-1.0.1" sources."merge2-1.4.1" sources."methods-1.1.2" - sources."micromatch-4.0.2" + sources."micromatch-4.0.4" (sources."miller-rabin-4.0.1" // { dependencies = [ sources."bn.js-4.12.0" ]; }) sources."mime-1.6.0" - sources."mime-db-1.46.0" - sources."mime-types-2.1.29" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" sources."mimic-fn-1.2.0" (sources."mini-css-extract-plugin-0.12.0" // { dependencies = [ @@ -14266,15 +14351,15 @@ in sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" sources."mute-stream-0.0.8" - sources."nan-2.14.2" - sources."nanoid-3.1.21" + sources."nan-2.15.0" + sources."nanoid-3.1.25" sources."nanomatch-1.2.13" sources."ncp-1.0.1" sources."negotiator-0.6.2" sources."neo-async-2.6.2" sources."nice-try-1.0.5" sources."no-case-3.0.4" - (sources."node-elm-compiler-5.0.5" // { + (sources."node-elm-compiler-5.0.6" // { dependencies = [ sources."cross-spawn-6.0.5" sources."path-key-2.0.1" @@ -14289,7 +14374,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.71" + sources."node-releases-1.1.75" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" @@ -14299,7 +14384,7 @@ in sources."path-key-2.0.1" ]; }) - sources."nth-check-1.0.2" + sources."nth-check-2.0.1" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" @@ -14316,15 +14401,15 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.9.0" + sources."object-inspect-1.11.0" sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.2" - sources."object.entries-1.1.3" + sources."object.entries-1.1.4" sources."object.getownpropertydescriptors-2.1.2" sources."object.pick-1.3.0" - sources."object.values-1.1.3" + sources."object.values-1.1.4" sources."obuf-1.1.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" @@ -14362,16 +14447,16 @@ in sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-3.1.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" (sources."path-type-3.0.0" // { dependencies = [ sources."pify-3.0.0" ]; }) - sources."pbkdf2-3.1.1" + sources."pbkdf2-3.1.2" sources."performance-now-2.1.0" - sources."picomatch-2.2.2" + sources."picomatch-2.3.0" sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" @@ -14395,7 +14480,7 @@ in ]; }) sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.35" // { + (sources."postcss-7.0.36" // { dependencies = [ sources."source-map-0.6.1" sources."supports-color-6.1.0" @@ -14419,15 +14504,15 @@ in sources."postcss-flexbugs-fixes-4.2.1" (sources."postcss-loader-4.1.0" // { dependencies = [ - sources."cosmiconfig-7.0.0" + sources."cosmiconfig-7.0.1" sources."import-fresh-3.3.0" sources."loader-utils-2.0.0" sources."lru-cache-6.0.0" sources."parse-json-5.2.0" sources."path-type-4.0.0" sources."resolve-from-4.0.0" - sources."schema-utils-3.0.0" - sources."semver-7.3.4" + sources."schema-utils-3.1.1" + sources."semver-7.3.5" sources."yallist-4.0.0" ]; }) @@ -14520,12 +14605,11 @@ in }) (sources."postcss-safe-parser-5.0.2" // { dependencies = [ - sources."postcss-8.2.8" - sources."source-map-0.6.1" + sources."postcss-8.3.6" ]; }) - sources."postcss-selector-parser-6.0.4" - (sources."postcss-svgo-4.0.2" // { + sources."postcss-selector-parser-6.0.6" + (sources."postcss-svgo-4.0.3" // { dependencies = [ sources."postcss-value-parser-3.3.1" ]; @@ -14540,7 +14624,7 @@ in sources."promise-8.1.0" sources."promise-inflight-1.0.1" sources."prompt-1.0.0" - sources."proxy-addr-2.0.6" + sources."proxy-addr-2.0.7" sources."prr-1.0.1" sources."pseudomap-1.0.2" sources."psl-1.8.0" @@ -14615,29 +14699,29 @@ in ]; }) sources."readable-stream-2.3.7" - sources."readdirp-3.5.0" + sources."readdirp-3.6.0" sources."recursive-readdir-2.2.2" sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.7" + sources."regenerate-unicode-properties-9.0.0" + sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.3.1" - sources."regexpu-core-4.7.1" + sources."regexpu-core-4.8.0" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.7" // { + (sources."regjsparser-0.7.0" // { dependencies = [ sources."jsesc-0.5.0" ]; }) sources."relateurl-0.2.7" sources."remove-trailing-separator-1.1.0" - (sources."renderkid-2.0.5" // { + (sources."renderkid-2.0.7" // { dependencies = [ sources."strip-ansi-3.0.1" ]; }) - sources."repeat-element-1.1.3" + sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" sources."request-2.88.2" sources."require-directory-2.1.1" @@ -14658,7 +14742,7 @@ in sources."ripemd160-2.0.2" sources."run-async-2.4.1" sources."run-queue-1.0.3" - (sources."rxjs-6.6.6" // { + (sources."rxjs-6.6.7" // { dependencies = [ sources."tslib-1.14.1" ]; @@ -14669,7 +14753,7 @@ in sources."sax-1.2.4" sources."schema-utils-2.7.1" sources."select-hose-2.0.0" - sources."selfsigned-1.10.8" + sources."selfsigned-1.10.11" sources."semver-5.7.1" (sources."send-0.17.1" // { dependencies = [ @@ -14704,7 +14788,8 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shell-quote-1.6.1" - sources."signal-exit-3.0.3" + sources."side-channel-1.0.4" + sources."signal-exit-3.0.4" (sources."simple-swizzle-0.2.2" // { dependencies = [ sources."is-arrayish-0.3.2" @@ -14750,14 +14835,15 @@ in (sources."sockjs-client-1.4.0" // { dependencies = [ sources."debug-3.2.7" - sources."eventsource-1.0.7" + sources."eventsource-1.1.0" ]; }) sources."sort-keys-1.1.2" sources."source-list-map-2.0.1" sources."source-map-0.5.7" + sources."source-map-js-0.6.2" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.19" // { + (sources."source-map-support-0.5.20" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -14766,7 +14852,7 @@ in 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."spdx-license-ids-3.0.10" sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ @@ -14777,7 +14863,7 @@ in sources."split-string-3.1.0" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" - sources."ssri-6.0.1" + sources."ssri-6.0.2" sources."stable-0.1.8" sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { @@ -14815,7 +14901,7 @@ in }) (sources."strip-ansi-6.0.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" ]; }) sources."strip-bom-2.0.0" @@ -14832,7 +14918,20 @@ in ]; }) sources."supports-color-5.5.0" - sources."svgo-1.3.2" + (sources."svgo-1.3.2" // { + dependencies = [ + sources."css-select-2.1.0" + sources."css-what-3.4.2" + (sources."dom-serializer-0.2.2" // { + dependencies = [ + sources."domelementtype-2.2.0" + ]; + }) + sources."domelementtype-1.3.1" + sources."domutils-1.7.0" + sources."nth-check-1.0.2" + ]; + }) sources."tapable-1.1.3" (sources."temp-0.9.4" // { dependencies = [ @@ -14875,7 +14974,7 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" - sources."tslib-2.1.0" + sources."tslib-2.3.1" sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -14910,11 +15009,11 @@ in sources."yallist-2.1.2" ]; }) - sources."unbox-primitive-1.0.0" - sources."unicode-canonical-property-names-ecmascript-1.0.4" - sources."unicode-match-property-ecmascript-1.0.4" - sources."unicode-match-property-value-ecmascript-1.2.0" - sources."unicode-property-aliases-ecmascript-1.1.0" + sources."unbox-primitive-1.0.1" + sources."unicode-canonical-property-names-ecmascript-2.0.0" + sources."unicode-match-property-ecmascript-2.0.0" + sources."unicode-match-property-value-ecmascript-2.0.0" + sources."unicode-property-aliases-ecmascript-2.0.0" sources."union-value-1.0.1" sources."uniq-1.0.1" sources."uniqs-2.0.0" @@ -14944,10 +15043,10 @@ in (sources."url-loader-4.1.1" // { dependencies = [ sources."loader-utils-2.0.0" - sources."schema-utils-3.0.0" + sources."schema-utils-3.1.1" ]; }) - sources."url-parse-1.5.1" + sources."url-parse-1.5.3" sources."use-3.1.1" (sources."util-0.11.1" // { dependencies = [ @@ -14963,7 +15062,11 @@ in sources."validate-npm-package-license-3.0.4" sources."vary-1.1.2" sources."vendors-1.0.4" - sources."verror-1.10.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) sources."vm-browserify-1.1.2" sources."watchpack-1.7.5" (sources."watchpack-chokidar2-2.0.1" // { @@ -15107,12 +15210,12 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-6.2.1" + sources."ws-6.2.2" sources."xmlbuilder-15.1.1" sources."xtend-4.0.2" - sources."y18n-4.0.1" + sources."y18n-4.0.3" sources."yallist-3.1.1" - sources."yaml-1.10.1" + sources."yaml-1.10.2" (sources."yargs-6.6.0" // { dependencies = [ sources."camelcase-3.0.0" @@ -15148,9 +15251,9 @@ in }; dependencies = [ sources."ansi-styles-4.3.0" - sources."balanced-match-1.0.0" + sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."chalk-4.1.0" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."commander-6.2.1" @@ -15159,7 +15262,7 @@ in sources."find-elm-dependencies-2.0.4" sources."firstline-1.3.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."has-flag-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -15169,7 +15272,7 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."nice-try-1.0.5" - sources."node-elm-compiler-5.0.5" + sources."node-elm-compiler-5.0.6" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" @@ -15180,7 +15283,7 @@ in sources."supports-color-7.2.0" sources."temp-0.9.4" sources."ts-union-2.3.0" - sources."typescript-3.9.9" + sources."typescript-3.9.10" sources."which-1.3.1" sources."wrappy-1.0.2" ]; @@ -15197,38 +15300,41 @@ in elm-review = nodeEnv.buildNodePackage { name = "elm-review"; packageName = "elm-review"; - version = "2.4.6"; + version = "2.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/elm-review/-/elm-review-2.4.6.tgz"; - sha512 = "O94tBcesK/JytSGrLXh/NEU9jTQ2jGWpDrN6y/vgGu/gmL/i2Z6tdYw1+Jw0DKzigH3I3JtpoQAp2K/Y27y8Gw=="; + url = "https://registry.npmjs.org/elm-review/-/elm-review-2.5.5.tgz"; + sha512 = "VOPeOgeE16RjLich8Gt1qJlXyASG2qS5Or4Q3vO1OlAYLPxEAlzUlEiloa7RFtm6dnEYk38axnpx8WexKy7VjA=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" - sources."@szmarczak/http-timer-4.0.5" - sources."@types/cacheable-request-6.0.1" - sources."@types/http-cache-semantics-4.0.0" - sources."@types/keyv-3.1.1" - sources."@types/node-14.14.34" + sources."@szmarczak/http-timer-4.0.6" + sources."@types/cacheable-request-6.0.2" + sources."@types/http-cache-semantics-4.0.1" + sources."@types/keyv-3.1.3" + sources."@types/node-16.9.3" sources."@types/responselike-1.0.0" - (sources."ansi-escapes-4.3.1" // { + (sources."ansi-escapes-4.3.2" // { dependencies = [ - sources."type-fest-0.11.0" + sources."type-fest-0.21.3" ]; }) - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."anymatch-3.1.1" + sources."anymatch-3.1.2" sources."at-least-node-1.0.0" - sources."balanced-match-1.0.0" + sources."balanced-match-1.0.2" + sources."base64-js-1.5.1" sources."binary-extensions-2.2.0" + sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" + sources."buffer-5.7.1" sources."cacheable-lookup-2.0.1" - sources."cacheable-request-7.0.1" - sources."chalk-4.1.0" - sources."chokidar-3.5.1" + sources."cacheable-request-7.0.2" + sources."chalk-4.1.2" + sources."chokidar-3.5.2" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.5.0" + sources."cli-spinners-2.6.0" sources."clone-1.0.4" (sources."clone-response-1.0.2" // { dependencies = [ @@ -15244,10 +15350,9 @@ in sources."defaults-1.0.3" sources."defer-to-connect-2.0.1" sources."duplexer3-0.1.4" - sources."elm-tooling-1.3.0" + sources."elm-tooling-1.6.0" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."escape-string-regexp-1.0.5" sources."fast-levenshtein-3.0.0" sources."fastest-levenshtein-1.0.12" sources."fill-range-7.0.1" @@ -15257,12 +15362,13 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."get-stream-5.2.0" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-parent-5.1.2" sources."got-10.7.0" - sources."graceful-fs-4.2.6" + sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."http-cache-semantics-4.1.0" + sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" @@ -15271,22 +15377,14 @@ in sources."is-glob-4.0.1" sources."is-interactive-1.0.0" sources."is-number-7.0.0" + sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" sources."json-buffer-3.0.1" sources."jsonfile-6.1.0" sources."keyv-4.0.3" sources."kleur-3.0.3" sources."locate-path-5.0.0" - (sources."log-symbols-3.0.0" // { - 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."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) + sources."log-symbols-4.1.0" sources."lowercase-keys-2.0.0" sources."mimic-fn-2.1.0" sources."mimic-response-2.1.0" @@ -15294,17 +15392,12 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.1.2" - sources."mute-stream-0.0.8" sources."normalize-path-3.0.0" - sources."normalize-url-4.5.0" + sources."normalize-url-6.1.0" sources."once-1.4.0" sources."onetime-5.1.2" - (sources."ora-4.1.1" // { - dependencies = [ - sources."chalk-3.0.0" - ]; - }) - sources."p-cancelable-2.1.0" + sources."ora-5.4.1" + sources."p-cancelable-2.1.1" sources."p-event-4.2.0" sources."p-finally-1.0.0" sources."p-limit-2.3.0" @@ -15314,27 +15407,31 @@ in sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" - sources."picomatch-2.2.2" - sources."prompts-2.4.0" + sources."picomatch-2.3.0" + sources."prompts-2.4.1" sources."pump-3.0.0" - sources."readdirp-3.5.0" + sources."readable-stream-3.6.0" + sources."readdirp-3.6.0" sources."responselike-2.0.0" sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" + sources."safe-buffer-5.2.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."sisteransi-1.0.5" sources."string-width-4.2.2" + sources."string_decoder-1.3.0" sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" - sources."supports-hyperlinks-2.1.0" + sources."supports-hyperlinks-2.2.0" sources."temp-0.9.4" sources."terminal-link-2.1.1" sources."to-readable-stream-2.1.0" sources."to-regex-range-5.0.1" sources."type-fest-0.10.0" sources."universalify-2.0.0" + sources."util-deprecate-1.0.2" sources."wcwidth-1.0.1" sources."which-2.0.2" sources."wrap-ansi-6.2.0" diff --git a/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix b/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix index 6744ad8b0bfe..bebf91114d70 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -93,6 +93,7 @@ let # libsanitizer requires netrom/netrom.h which is not # available in uclibc. "--disable-libsanitizer" + ] ++ lib.optionals (targetPlatform.libc == "uclibc") [ # In uclibc cases, libgomp needs an additional '-ldl' # and as I don't know how to pass it, I disable libgomp. "--disable-libgomp" diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix b/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix index c0f791389c83..411146569ab0 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix @@ -129,7 +129,8 @@ let # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. - useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl && !targetPlatform.isWindows); + useLdGold = targetPlatform.linker == "gold" || + (targetPlatform.linker == "bfd" && (targetPackages.stdenv.cc.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); runtimeDeps = [ targetPackages.stdenv.cc.bintools @@ -169,6 +170,15 @@ stdenv.mkDerivation (rec { url = "https://raw.githubusercontent.com/input-output-hk/haskell.nix/122bd81150386867da07fdc9ad5096db6719545a/overlays/patches/ghc/cabal-host.patch"; sha256 = "sha256:0yd0sajgi24sc1w5m55lkg2lp6kfkgpp3lgija2c8y3cmkwfpdc1"; }) + + # In order to build ghcjs packages, the Cabal of the ghc used for the ghcjs + # needs to be patched. Ref https://github.com/haskell/cabal/pull/7575 + (fetchpatch { + url = "https://github.com/haskell/cabal/commit/369c4a0a54ad08a9e6b0d3bd303fedd7b5e5a336.patch"; + sha256 = "120f11hwyaqa0pq9g5l1300crqij49jg0rh83hnp9sa49zfdwx1n"; + stripLen = 3; + extraPrefix = "libraries/Cabal/Cabal/"; + }) ] ++ lib.optionals stdenv.isDarwin [ # Make Block.h compile with c++ compilers. Remove with the next release (fetchpatch { diff --git a/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix b/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix index 1f207059756b..e2a65a19791b 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix @@ -137,7 +137,8 @@ let # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. - useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl && !targetPlatform.isWindows); + useLdGold = targetPlatform.linker == "gold" || + (targetPlatform.linker == "bfd" && (targetPackages.stdenv.cc.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); runtimeDeps = [ targetPackages.stdenv.cc.bintools diff --git a/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix b/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix index d1b64e2ae5f5..af740c01f5bf 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix @@ -123,7 +123,8 @@ let # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. - useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl); + useLdGold = targetPlatform.linker == "gold" || + (targetPlatform.linker == "bfd" && (targetPackages.stdenv.cc.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); runtimeDeps = [ targetPackages.stdenv.cc.bintools diff --git a/nixpkgs/pkgs/development/compilers/ghc/head.nix b/nixpkgs/pkgs/development/compilers/ghc/head.nix index a7f7c9db4814..cb2cd79a482c 100644 --- a/nixpkgs/pkgs/development/compilers/ghc/head.nix +++ b/nixpkgs/pkgs/development/compilers/ghc/head.nix @@ -40,7 +40,7 @@ , # Whether to build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows -, version ? "9.3.20210806" +, version ? "9.3.20210913" , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) @@ -133,7 +133,8 @@ let # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 # see #84670 and #49071 for more background. - useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl); + useLdGold = targetPlatform.linker == "gold" || + (targetPlatform.linker == "bfd" && (targetPackages.stdenv.cc.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); runtimeDeps = [ targetPackages.stdenv.cc.bintools @@ -152,8 +153,8 @@ stdenv.mkDerivation (rec { src = fetchgit { url = "https://gitlab.haskell.org/ghc/ghc.git/"; - rev = "5d651c78fed7e55b3b3cd21a04499d1a2f75204d"; - sha256 = "1z9xg8jsqr9id985wxfhkjyb3kpyrmr7vjdqzfv42cpxynd483r8"; + rev = "64923cf295ea914db458547432237a5ed1eff571"; + sha256 = "1s9sm4gf4r71lk0s7h9v217rxfwjf435q1jji90hlxz23wvmhr6d"; }; enableParallelBuilding = true; @@ -193,6 +194,9 @@ stdenv.mkDerivation (rec { export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" '' + lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" + + # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 + export XATTR=${lib.getBin xattr}/bin/xattr '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets '' + lib.optionalString targetPlatform.isMusl '' @@ -255,10 +259,6 @@ stdenv.mkDerivation (rec { ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour ] ++ lib.optionals enableDocs [ sphinx - ] ++ lib.optionals stdenv.isDarwin [ - # TODO(@sternenseemann): use XATTR env var once we have - # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6447 - xattr ]; # For building runtime libs diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix deleted file mode 100644 index bbf8a579919f..000000000000 --- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ haskellLib }: - -let inherit (haskellLib) doJailbreak dontHaddock dontCheck; -in self: super: { - ghcjs = super.ghcjs.override { - shelly = super.shelly_1_8_1; - }; - ghc-api-ghcjs = super.ghc-api-ghcjs.override - { - happy = self.happy_1_19_5; - }; - haddock-library-ghcjs = doJailbreak (dontCheck super.haddock-library-ghcjs); - haddock-api-ghcjs = doJailbreak (dontHaddock super.haddock-api-ghcjs); -} diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/git.json b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/git.json deleted file mode 100644 index 1114e1a12905..000000000000 --- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/git.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "url": "https://github.com/ghcjs/ghcjs", - "rev": "e87195eaa2bc7e320e18cf10386802bc90b7c874", - "sha256": "02mwkf7aagxqi142gcmq048244apslrr72p568akcab9s0fn2gvy", - "fetchSubmodules": true -} diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix deleted file mode 100644 index d6a050915145..000000000000 --- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix +++ /dev/null @@ -1,177 +0,0 @@ -{ callPackage, configuredSrc }: - -{ - - ghcjs = callPackage - ({ mkDerivation, aeson, array, attoparsec, base, base16-bytestring - , base64-bytestring, binary, bytestring, Cabal, containers - , cryptohash, data-default, deepseq, directory, executable-path - , filepath, ghc-api-ghcjs, ghc-boot, ghc-paths, ghci-ghcjs - , ghcjs-th, haddock-api-ghcjs, hashable, haskell-src-exts - , haskell-src-meta, http-types, HUnit, lens, lifted-base, mtl - , network, optparse-applicative, parallel, parsec, process, random - , regex-posix, safe, shelly, split, lib, stringsearch, syb - , system-fileio, system-filepath, tar, template-haskell - , template-haskell-ghcjs, terminfo, test-framework - , test-framework-hunit, text, time, transformers - , transformers-compat, unix, unix-compat, unordered-containers - , vector, wai, wai-app-static, wai-extra, wai-websockets, warp - , webdriver, websockets, wl-pprint-text, yaml - }: - mkDerivation { - pname = "ghcjs"; - version = "8.6.0.1"; - src = configuredSrc + /.; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ - base Cabal containers directory filepath process template-haskell - transformers - ]; - libraryHaskellDepends = [ - aeson array attoparsec base base16-bytestring base64-bytestring - binary bytestring Cabal containers cryptohash data-default deepseq - directory filepath ghc-api-ghcjs ghc-boot ghc-paths ghci-ghcjs - ghcjs-th hashable haskell-src-exts haskell-src-meta lens mtl - optparse-applicative parallel parsec process regex-posix safe split - stringsearch syb template-haskell template-haskell-ghcjs text time - transformers unordered-containers vector wl-pprint-text yaml - ]; - executableHaskellDepends = [ - aeson base binary bytestring Cabal containers directory - executable-path filepath ghc-api-ghcjs ghc-boot haddock-api-ghcjs - lens mtl optparse-applicative process shelly system-fileio - system-filepath tar terminfo text time transformers - transformers-compat unix unix-compat unordered-containers vector - yaml - ]; - testHaskellDepends = [ - aeson base bytestring data-default deepseq directory http-types - HUnit lens lifted-base network optparse-applicative process random - shelly system-fileio system-filepath test-framework - test-framework-hunit text time transformers unordered-containers - wai wai-app-static wai-extra wai-websockets warp webdriver - websockets yaml - ]; - description = "Haskell to JavaScript compiler"; - license = lib.licenses.mit; - }) {}; - - ghc-api-ghcjs = callPackage - ({ mkDerivation, alex, array, base, binary, bytestring, containers - , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghc-heap - , ghci-ghcjs, happy, hpc, process, lib, template-haskell-ghcjs - , terminfo, time, transformers, unix - }: - mkDerivation { - pname = "ghc-api-ghcjs"; - version = "8.6.5"; - src = configuredSrc + /lib/ghc-api-ghcjs; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq directory filepath - ghc-boot ghc-boot-th ghc-heap ghci-ghcjs hpc process - template-haskell-ghcjs terminfo time transformers unix - ]; - libraryToolDepends = [ alex happy ]; - homepage = "http://www.haskell.org/ghc/"; - description = "The GHC API (customized for GHCJS)"; - license = lib.licenses.bsd3; - }) {}; - - ghci-ghcjs = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , deepseq, filepath, ghc-boot, ghc-boot-th, ghc-heap, lib - , template-haskell-ghcjs, transformers, unix - }: - mkDerivation { - pname = "ghci-ghcjs"; - version = "8.6.1"; - src = configuredSrc + /lib/ghci-ghcjs; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq filepath ghc-boot - ghc-boot-th ghc-heap template-haskell-ghcjs transformers unix - ]; - description = "The library supporting GHC's interactive interpreter (customized for GHCJS)"; - license = lib.licenses.bsd3; - }) {}; - - ghcjs-th = callPackage - ({ mkDerivation, base, binary, bytestring, containers, ghc-prim - , ghci-ghcjs, lib, template-haskell-ghcjs - }: - mkDerivation { - pname = "ghcjs-th"; - version = "0.1.0.0"; - src = configuredSrc + /lib/ghcjs-th; - libraryHaskellDepends = [ - base binary bytestring containers ghc-prim ghci-ghcjs - template-haskell-ghcjs - ]; - homepage = "https://github.com/ghcjs"; - license = lib.licenses.mit; - }) {}; - - haddock-api-ghcjs = callPackage - ({ mkDerivation, array, base, bytestring, Cabal, containers, deepseq - , directory, filepath, ghc-api-ghcjs, ghc-boot, ghc-paths - , haddock-library-ghcjs, hspec, hspec-discover, QuickCheck, lib - , transformers, xhtml - }: - mkDerivation { - pname = "haddock-api-ghcjs"; - version = "2.20.0"; - src = configuredSrc + /lib/haddock-api-ghcjs; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base bytestring Cabal containers deepseq directory filepath - ghc-api-ghcjs ghc-boot ghc-paths haddock-library-ghcjs transformers - xhtml - ]; - testHaskellDepends = [ - array base bytestring Cabal containers deepseq directory filepath - ghc-api-ghcjs ghc-boot ghc-paths haddock-library-ghcjs hspec - QuickCheck transformers xhtml - ]; - testToolDepends = [ hspec-discover ]; - homepage = "http://www.haskell.org/haddock/"; - description = "A documentation-generation tool for Haskell libraries"; - license = lib.licenses.bsd3; - }) {}; - - haddock-library-ghcjs = callPackage - ({ mkDerivation, base, base-compat, bytestring, containers, deepseq - , directory, filepath, haddock-library, hspec, hspec-discover - , optparse-applicative, parsec, QuickCheck, lib, text - , transformers, tree-diff - }: - mkDerivation { - pname = "haddock-library-ghcjs"; - version = "1.6.0"; - src = configuredSrc + /lib/haddock-library-ghcjs; - libraryHaskellDepends = [ - base bytestring containers parsec text transformers - ]; - testHaskellDepends = [ - base base-compat bytestring containers deepseq directory filepath - haddock-library hspec optparse-applicative parsec QuickCheck text - transformers tree-diff - ]; - testToolDepends = [ hspec-discover ]; - homepage = "http://www.haskell.org/haddock/"; - description = "Library exposing some functionality of Haddock"; - license = lib.licenses.bsd3; - }) {}; - - template-haskell-ghcjs = callPackage - ({ mkDerivation, base, ghc-boot-th, pretty, lib }: - mkDerivation { - pname = "template-haskell-ghcjs"; - version = "2.14.0.0"; - src = configuredSrc + /lib/template-haskell-ghcjs; - libraryHaskellDepends = [ base ghc-boot-th pretty ]; - description = "Support library for Template Haskell (customized for GHCJS)"; - license = lib.licenses.bsd3; - }) {}; - -} diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/README.md b/nixpkgs/pkgs/development/compilers/ghcjs-ng/README.md deleted file mode 100644 index 99ad980c965e..000000000000 --- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/README.md +++ /dev/null @@ -1,21 +0,0 @@ -New build system for GHCJS 8.2 ---- - -`ghcjs-8.2` reworked the build system, and now comes with its own -small package set of dependencies. This involves autogenerating -several sources and cabal files, based on a GHC -checkout. `callCabal2nix` is off limits, since we don't like "import -from derivation" in nixpkgs. So there is a derivation that builds the -nix expression that should be checked in whenever GHCJS is updated. - -Updating ---- - -``` -$ nix-prefetch-git https://github.com/ghcjs/ghcjs --rev refs/heads/ghc-8.4 \ - | jq '{ url, rev, fetchSubmodules, sha256 }' \ - > 8.4/git.json -$ cat $(nix-build ../../../.. -A haskell.compiler.ghcjs82.genStage0 --no-out-link) > 8.4/stage0.nix -$ cabal2nix --compiler ghcjs git://github.com/ghcjs/ghcjs-base > ghcjs-base.nix -``` - diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/common-overrides.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/common-overrides.nix deleted file mode 100644 index 00a071651eda..000000000000 --- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/common-overrides.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ haskellLib }: - -let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak; -in self: super: { - ghcjs = dontHaddock (appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install"); - haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs; - system-fileio = doJailbreak super.system-fileio; -} diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix deleted file mode 100644 index 943866d5f24e..000000000000 --- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ perl -, autoconf -, automake -, python3 -, gcc -, cabal-install -, runCommand -, lib -, stdenv - -, ghc -, happy -, alex - -, ghcjsSrc -}: - -runCommand "configured-ghcjs-src" { - nativeBuildInputs = [ - perl - autoconf - automake - python3 - ghc - happy - alex - cabal-install - ] ++ lib.optionals stdenv.isDarwin [ - gcc # https://github.com/ghcjs/ghcjs/issues/663 - ]; - inherit ghcjsSrc; -} '' - export HOME=$(pwd) - mkdir $HOME/.cabal - touch $HOME/.cabal/config - cp -r "$ghcjsSrc" "$out" - chmod -R +w "$out" - cd "$out" - - # TODO: Find a better way to avoid impure version numbers - sed -i 's/RELEASE=NO/RELEASE=YES/' ghc/configure.ac - - # TODO: How to actually fix this? - # Seems to work fine and produce the right files. - touch ghc/includes/ghcautoconf.h - mkdir -p ghc/compiler/vectorise - mkdir -p ghc/utils/haddock/haddock-library/vendor - - patchShebangs . - ./utils/makePackages.sh copy -'' diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/mk-stage0.nix b/nixpkgs/pkgs/development/compilers/ghcjs-ng/mk-stage0.nix deleted file mode 100644 index f45ebb4511d6..000000000000 --- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/mk-stage0.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ configuredSrc -, runCommand -, cabal2nix -, yq -}: - -runCommand "stage0.nix" { - buildInputs = [cabal2nix yq]; -} '' - ( - printf '{ callPackage, configuredSrc }:\n\n{\n\n' - yq '.packages | .[]' ${configuredSrc}/stack.yaml -r | sed 's|^\.$|./.|' | sed 's|^\.||' | while read f; do - printf ' %s = callPackage\n' \ - "$(find ${configuredSrc}/$f -name "*.cabal" -maxdepth 1 \ - | xargs basename \ - | sed 's/.cabal$//')" - printf '(%s) {};' \ - "$(cabal2nix ${configuredSrc}/$f \ - | sed 's|${configuredSrc}/|configuredSrc + |g')" \ - | sed 's/^/ /' - printf '\n\n' - done - printf '}\n' - ) > $out -'' diff --git a/nixpkgs/pkgs/development/compilers/ghcjs/8.10/common-overrides.nix b/nixpkgs/pkgs/development/compilers/ghcjs/8.10/common-overrides.nix new file mode 100644 index 000000000000..a83795635b90 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/ghcjs/8.10/common-overrides.nix @@ -0,0 +1,8 @@ +{ haskellLib }: + +let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak; +in self: super: { + ghcjs = doJailbreak (super.ghcjs.overrideScope (self: super: { + optparse-applicative = self.optparse-applicative_0_15_1_0; + })); +} diff --git a/nixpkgs/pkgs/development/compilers/ghcjs/8.10/configured-ghcjs-src.nix b/nixpkgs/pkgs/development/compilers/ghcjs/8.10/configured-ghcjs-src.nix new file mode 100644 index 000000000000..9fa6fae1a593 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/ghcjs/8.10/configured-ghcjs-src.nix @@ -0,0 +1,60 @@ +{ perl +, autoconf +, automake +, python3 +, gcc +, cabal-install +, runCommand +, lib +, stdenv + +, ghc +, happy +, alex + +, ghcjsSrc +, version +}: + +runCommand "configured-ghcjs-src" { + nativeBuildInputs = [ + perl + autoconf + automake + python3 + ghc + happy + alex + cabal-install + ] ++ lib.optionals stdenv.isDarwin [ + gcc # https://github.com/ghcjs/ghcjs/issues/663 + ]; + inherit ghcjsSrc; +} '' + export HOME=$(pwd) + mkdir $HOME/.cabal + touch $HOME/.cabal/config + cp -r "$ghcjsSrc" "$out" + chmod -R +w "$out" + cd "$out" + + # TODO: Find a better way to avoid impure version numbers + sed -i 's/RELEASE=NO/RELEASE=YES/' ghc/configure.ac + + # These files are needed by ghc-boot package, and these are generated by the + # make/hadrian build system when compiling ghc. Since we dont have access to + # the generated code of the ghc while it got built, here is a little hack to + # generate these again. + runhaskell ${./generate_host_version.hs} + mkdir -p utils/pkg-cache/ghc/libraries/ghc-boot/dist-install/build/GHC/Platform + mv Host.hs utils/pkg-cache/ghc/libraries/ghc-boot/dist-install/build/GHC/Platform/Host.hs + mv Version.hs utils/pkg-cache/ghc/libraries/ghc-boot/dist-install/build/GHC/Version.hs + + # The ghcjs has the following hardcoded paths of lib dir in its code. Patching + # these to match the path expected by the nixpkgs's generic-builder, etc. + sed -i 's/libSubDir = "lib"/libSubDir = "lib\/ghcjs-${version}"/' src-bin/Boot.hs + sed -i 's@let libDir = takeDirectory haddockPath </> ".." </> "lib"@let libDir = takeDirectory haddockPath </> ".." </> "lib/ghcjs-${version}"@' src-bin/HaddockDriver.hs + + patchShebangs . + ./utils/makePackages.sh copy +'' diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix b/nixpkgs/pkgs/development/compilers/ghcjs/8.10/default.nix index 8a04bc0c079c..f8e7c31353f7 100644 --- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/nixpkgs/pkgs/development/compilers/ghcjs/8.10/default.nix @@ -17,15 +17,18 @@ , lib , ghcjsDepOverrides ? (_:_:{}) , haskell +, linkFarm +, buildPackages }: let passthru = { configuredSrc = callPackage ./configured-ghcjs-src.nix { inherit ghcjsSrc; - inherit (bootPkgs) ghc alex happy; + inherit (bootPkgs) ghc alex; + inherit (bootGhcjs) version; + happy = bootPkgs.happy_1_19_12; }; - genStage0 = callPackage ./mk-stage0.nix { inherit (passthru) configuredSrc; }; bootPkgs = bootPkgs.extend (lib.foldr lib.composeExtensions (_:_:{}) [ (self: _: import stage0 { inherit (passthru) configuredSrc; @@ -41,26 +44,22 @@ let targetPrefix = ""; inherit bootGhcjs; inherit (bootGhcjs) version; - ghcVersion = bootPkgs.ghc.version; isGhcjs = true; enableShared = true; socket-io = pkgsHostHost.nodePackages."socket.io"; - # Relics of the old GHCJS build system - stage1Packages = []; - mkStage2 = { callPackage }: { - # https://github.com/ghcjs/ghcjs-base/issues/110 - # https://github.com/ghcjs/ghcjs-base/pull/111 - ghcjs-base = haskell.lib.dontCheck (haskell.lib.doJailbreak (callPackage ./ghcjs-base.nix {})); - }; - haskellCompilerName = "ghcjs-${bootGhcjs.version}"; }; bootGhcjs = haskellLib.justStaticExecutables passthru.bootPkgs.ghcjs; - libexec = "${bootGhcjs}/libexec/${builtins.replaceStrings ["darwin" "i686"] ["osx" "i386"] stdenv.buildPlatform.system}-${passthru.bootPkgs.ghc.name}/${bootGhcjs.name}"; + + # This provides the stuff we need from the emsdk + emsdk = linkFarm "emsdk" [ + { name = "upstream/bin"; path = buildPackages.clang + "/bin";} + { name = "upstream/emscripten"; path = buildPackages.emscripten + "/bin"; } + ]; in stdenv.mkDerivation { name = bootGhcjs.name; @@ -87,23 +86,36 @@ in stdenv.mkDerivation { mkdir -p $out/bin mkdir -p $out/lib/${bootGhcjs.name} - lndir ${libexec} $out/bin + lndir ${bootGhcjs}/bin $out/bin + chmod -R +w $out/bin + rm $out/bin/ghcjs-boot + cp ${bootGhcjs}/bin/ghcjs-boot $out/bin + rm $out/bin/haddock + cp ${bootGhcjs}/bin/haddock $out/bin + cp ${bootGhcjs}/bin/private-ghcjs-hsc2hs $out/bin/ghcjs-hsc2hs + + wrapProgram $out/bin/ghcjs-boot --set ghcjs_libexecdir $out/bin wrapProgram $out/bin/ghcjs --add-flags "-B$out/lib/${bootGhcjs.name}" - wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/lib/${bootGhcjs.name}" + wrapProgram $out/bin/haddock --add-flags "-B$out/lib/${bootGhcjs.name}" wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/lib/${bootGhcjs.name}/package.conf.d" + wrapProgram $out/bin/ghcjs-hsc2hs --add-flags "-I$out/lib/${bootGhcjs.name}/include --template=$out/lib/${bootGhcjs.name}/include/template-hsc.h" - env PATH=$out/bin:$PATH $out/bin/ghcjs-boot -j1 --with-ghcjs-bin $out/bin + env PATH=$out/bin:$PATH $out/bin/ghcjs-boot --with-emsdk=${emsdk} --no-haddock ''; - # We hard code -j1 as a temporary workaround for - # https://github.com/ghcjs/ghcjs/issues/654 - # enableParallelBuilding = true; + enableParallelBuilding = true; inherit passthru; - meta.platforms = passthru.bootPkgs.ghc.meta.platforms; - meta.maintainers = [lib.maintainers.elvishjerricco]; - meta.hydraPlatforms = []; - meta.broken = true; # https://hydra.nixos.org/build/129701778 + meta = { + platforms = with lib.platforms; linux ++ darwin; + + # Hydra limits jobs to only outputting 1 gigabyte worth of files. + # GHCJS outputs over 3 gigabytes. + # https://github.com/NixOS/nixpkgs/pull/137066#issuecomment-922335563 + hydraPlatforms = lib.platforms.none; + + maintainers = with lib.maintainers; [ obsidian-systems-maintenance ]; + }; } diff --git a/nixpkgs/pkgs/development/compilers/ghcjs/8.10/generate_host_version.hs b/nixpkgs/pkgs/development/compilers/ghcjs/8.10/generate_host_version.hs new file mode 100644 index 000000000000..8bf2583d238c --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/ghcjs/8.10/generate_host_version.hs @@ -0,0 +1,54 @@ +-- Generate the Host.hs and Version.hs as done by hadrian/src/Rules/Generate.hs + +import GHC.Platform.Host +import GHC.Version + +main = do + writeFile "Version.hs" versionHs + writeFile "Host.hs" platformHostHs + +-- | Generate @Version.hs@ files. +versionHs :: String +versionHs = unlines + [ "module GHC.Version where" + , "" + , "import Prelude -- See Note [Why do we import Prelude here?]" + , "" + , "cProjectGitCommitId :: String" + , "cProjectGitCommitId = " ++ show cProjectGitCommitId + , "" + , "cProjectVersion :: String" + , "cProjectVersion = " ++ show cProjectVersion + , "" + , "cProjectVersionInt :: String" + , "cProjectVersionInt = " ++ show cProjectVersionInt + , "" + , "cProjectPatchLevel :: String" + , "cProjectPatchLevel = " ++ show cProjectPatchLevel + , "" + , "cProjectPatchLevel1 :: String" + , "cProjectPatchLevel1 = " ++ show cProjectPatchLevel1 + , "" + , "cProjectPatchLevel2 :: String" + , "cProjectPatchLevel2 = " ++ show cProjectPatchLevel2 + ] + +-- | Generate @Platform/Host.hs@ files. +platformHostHs :: String +platformHostHs = unlines + [ "module GHC.Platform.Host where" + , "" + , "import GHC.Platform" + , "" + , "cHostPlatformArch :: Arch" + , "cHostPlatformArch = " ++ show cHostPlatformArch + , "" + , "cHostPlatformOS :: OS" + , "cHostPlatformOS = " ++ show cHostPlatformOS + , "" + , "cHostPlatformMini :: PlatformMini" + , "cHostPlatformMini = PlatformMini" + , " { platformMini_arch = cHostPlatformArch" + , " , platformMini_os = cHostPlatformOS" + , " }" + ] diff --git a/nixpkgs/pkgs/development/compilers/ghcjs/8.10/git.json b/nixpkgs/pkgs/development/compilers/ghcjs/8.10/git.json new file mode 100644 index 000000000000..18804d84acb1 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/ghcjs/8.10/git.json @@ -0,0 +1,6 @@ +{ + "url": "https://github.com/obsidiansystems/ghcjs", + "rev": "9fc935f2c3ba6c33ec62eb83afc9f52a893eb68c", + "sha256": "sha256:063dmir39c4i1z8ypnmq86g1x2vhqndmdpzc4hyzsy5jjqcbx6i3", + "fetchSubmodules": true +} diff --git a/nixpkgs/pkgs/development/compilers/ghcjs/8.10/stage0.nix b/nixpkgs/pkgs/development/compilers/ghcjs/8.10/stage0.nix new file mode 100644 index 000000000000..1cb476ab0cb6 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/ghcjs/8.10/stage0.nix @@ -0,0 +1,77 @@ +{ callPackage, configuredSrc }: + +{ + + ghcjs = callPackage + ({ mkDerivation, aeson, alex, array, attoparsec, base, base16-bytestring + , base64-bytestring, binary, bytestring, Cabal, containers + , cryptohash, data-default, deepseq, directory, executable-path + , filepath, ghc-boot, ghc-boot-th, ghc-compact, ghc-heap, ghc-paths + , ghci, happy, hashable, hpc, http-types, HUnit, lens, lib + , lifted-base, mtl, network, optparse-applicative, parallel, parsec + , process, random, safe, shelly, split, stringsearch, syb, tar + , template-haskell, terminfo, test-framework, test-framework-hunit + , text, time, transformers, unix, unix-compat, unordered-containers + , vector, wai, wai-app-static, wai-extra, wai-websockets, warp + , webdriver, websockets, wl-pprint-text, xhtml, yaml + }: + mkDerivation { + pname = "ghcjs"; + version = "8.10.7"; + src = configuredSrc + /.; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson array attoparsec base base16-bytestring base64-bytestring + binary bytestring Cabal containers cryptohash data-default deepseq + directory filepath ghc-boot ghc-boot-th ghc-compact ghc-heap + ghc-paths ghci hashable hpc lens mtl optparse-applicative parallel + parsec process safe split stringsearch syb template-haskell + terminfo text time transformers unix unordered-containers vector + wl-pprint-text yaml + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ + aeson array base binary bytestring Cabal containers deepseq + directory executable-path filepath ghc-boot lens mtl + optparse-applicative parsec process tar terminfo text time + transformers unix unix-compat unordered-containers vector xhtml + yaml + ]; + testHaskellDepends = [ + aeson base bytestring data-default deepseq directory filepath + http-types HUnit lens lifted-base network optparse-applicative + process random shelly test-framework test-framework-hunit text time + transformers unordered-containers wai wai-app-static wai-extra + wai-websockets warp webdriver websockets yaml + ]; + description = "Haskell to JavaScript compiler"; + license = lib.licenses.mit; + }) {}; + + ghcjs-th = callPackage + ({ mkDerivation, base, binary, bytestring, containers, ghc-prim + , ghci, lib, template-haskell + }: + mkDerivation { + pname = "ghcjs-th"; + version = "0.1.0.0"; + src = configuredSrc + /lib/ghcjs-th; + libraryHaskellDepends = [ + base binary bytestring containers ghc-prim ghci template-haskell + ]; + homepage = "http://github.com/ghcjs"; + license = lib.licenses.mit; + }) {}; + + ghcjs-prim = callPackage + ({ mkDerivation, base, ghc-prim, lib }: + mkDerivation { + pname = "ghcjs-prim"; + version = "0.1.1.0"; + src = ./.; + libraryHaskellDepends = [ base ghc-prim ]; + homepage = "http://github.com/ghcjs"; + license = lib.licenses.mit; + }) {}; +} diff --git a/nixpkgs/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix b/nixpkgs/pkgs/development/compilers/ghcjs/ghcjs-base.nix index 4fff32759d38..ca0086a918ab 100644 --- a/nixpkgs/pkgs/development/compilers/ghcjs-ng/ghcjs-base.nix +++ b/nixpkgs/pkgs/development/compilers/ghcjs/ghcjs-base.nix @@ -8,11 +8,11 @@ }: mkDerivation { pname = "ghcjs-base"; - version = "0.2.0.0"; + version = "0.2.0.3"; src = fetchgit { url = "git://github.com/ghcjs/ghcjs-base"; - sha256 = "0qr05m0djll3x38dhl85pl798arsndmwfhil8yklhb70lxrbvfrs"; - rev = "01014ade3f8f5ae677df192d7c2a208bd795b96c"; + sha256 = "15fdkjv0l7hpbbsn5238xxgzfdg61g666nzbv2sgxkwryn5rycv0"; + rev = "85e31beab9beffc3ea91b954b61a5d04e708b8f2"; }; libraryHaskellDepends = [ aeson attoparsec base binary bytestring containers deepseq dlist diff --git a/nixpkgs/pkgs/development/compilers/ghcjs/patches/vector-ghcjs-storable-set.patch b/nixpkgs/pkgs/development/compilers/ghcjs/patches/vector-ghcjs-storable-set.patch new file mode 100644 index 000000000000..20e19d8bf863 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/ghcjs/patches/vector-ghcjs-storable-set.patch @@ -0,0 +1,14 @@ +diff --git a/Data/Vector/Storable/Mutable.hs b/Data/Vector/Storable/Mutable.hs +index 8b538bc..2b74fce 100644 +--- a/Data/Vector/Storable/Mutable.hs ++++ b/Data/Vector/Storable/Mutable.hs +@@ -197,7 +197,9 @@ storableSet (MVector n fp) x + 1 -> storableSetAsPrim n fp x (undefined :: Word8) + 2 -> storableSetAsPrim n fp x (undefined :: Word16) + 4 -> storableSetAsPrim n fp x (undefined :: Word32) ++#if !defined(ghcjs_HOST_OS) + 8 -> storableSetAsPrim n fp x (undefined :: Word64) ++#endif + _ -> unsafeWithForeignPtr fp $ \p -> do + poke p x + diff --git a/nixpkgs/pkgs/development/compilers/gleam/default.nix b/nixpkgs/pkgs/development/compilers/gleam/default.nix index af8758997ea3..d97ab82b3945 100644 --- a/nixpkgs/pkgs/development/compilers/gleam/default.nix +++ b/nixpkgs/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.16.1"; + version = "0.17.0"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JivBYBhXTti285pO4HNhalj0WeR/Hly3IjxpA+qauWY="; + sha256 = "sha256-HFcJUOfWMgMm+Sc3nAXW6FwXkiY34826QxMZ8rWPmnk="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoSha256 = "sha256-SemHpvZ0lMqyMcgHPnmqI4C1krAJMM0hKCNNVMrulfI="; + cargoSha256 = "sha256-zjb+ERikMwC+ulfx6EW+FXLweZACwKNw4HEIc9dH3+4="; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/nixpkgs/pkgs/development/compilers/graalvm/default.nix b/nixpkgs/pkgs/development/compilers/graalvm/default.nix index ccfb4a18a12a..069c4655ea46 100644 --- a/nixpkgs/pkgs/development/compilers/graalvm/default.nix +++ b/nixpkgs/pkgs/development/compilers/graalvm/default.nix @@ -370,9 +370,11 @@ in rec { ./009_remove_signedness_verifier.patch ./010_mx_substratevm.py ]; + nativeBuildInputs = [ gfortran ]; + buildInputs = [ mx zlib.dev mercurial jvmci8 git llvm clang python27withPackages icu ruby bzip2 which - readline bzip2 xz pcre curl ed gfortran + readline bzip2 xz pcre curl ed ] ++ lib.optional stdenv.isDarwin [ CoreFoundation gcc.cc.lib libiconv perl openssl ]; diff --git a/nixpkgs/pkgs/development/compilers/idris2/default.nix b/nixpkgs/pkgs/development/compilers/idris2/default.nix index c399772a9f32..a8ac6431a4d3 100644 --- a/nixpkgs/pkgs/development/compilers/idris2/default.nix +++ b/nixpkgs/pkgs/development/compilers/idris2/default.nix @@ -13,13 +13,13 @@ # Uses scheme to bootstrap the build of idris2 stdenv.mkDerivation rec { pname = "idris2"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "idris-lang"; repo = "Idris2"; rev = "v${version}"; - sha256 = "105jybjf5s0k6003qzfxchzsfcpsxip180bh3mdmi74d464d0h8g"; + sha256 = "sha256-6CTn8o5geWSesXO7vTrrV/2EOQ3f+nPQ2M5cem13ZSY="; }; # We do not add any propagatedNativeBuildInputs because we do not want the diff --git a/nixpkgs/pkgs/development/compilers/kotlin/default.nix b/nixpkgs/pkgs/development/compilers/kotlin/default.nix index a1de91f2d396..9f2efdb409b9 100644 --- a/nixpkgs/pkgs/development/compilers/kotlin/default.nix +++ b/nixpkgs/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.5.30"; + version = "1.5.31"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "sha256-Je69ubsuFl5LqO+/j/lDxF1Pw52//CwcqgWejdgTZ18="; + sha256 = "sha256-ZhERKG8+WsBqrzqUA9hp2alqF2tisUGBS+YmpHJJ/p4="; }; propagatedBuildInputs = [ jre ] ; diff --git a/nixpkgs/pkgs/development/compilers/ldc/default.nix b/nixpkgs/pkgs/development/compilers/ldc/default.nix index a199747546ab..317fbdba8bb3 100644 --- a/nixpkgs/pkgs/development/compilers/ldc/default.nix +++ b/nixpkgs/pkgs/development/compilers/ldc/default.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "1.25.1"; - ldcSha256 = "sha256-DjcW/pknvpEmTR/eXEEHECb2xEJic16evaU4CJthLUA="; + version = "1.27.1"; + ldcSha256 = "1775001ba6n8w46ln530kb5r66vs935ingnppgddq8wqnc0gbj4k"; } diff --git a/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/darwin-targetconditionals.patch b/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/darwin-targetconditionals.patch deleted file mode 100644 index 425dc2af01e7..000000000000 --- a/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/darwin-targetconditionals.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp ---- a/lib/sanitizer_common/sanitizer_mac.cpp -+++ b/lib/sanitizer_common/sanitizer_mac.cpp -@@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) { - // Offset example: - // XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4 - constexpr u16 GetOSMajorKernelOffset() { -- if (TARGET_OS_OSX) return 4; -- if (TARGET_OS_IOS || TARGET_OS_TV) return 6; -- if (TARGET_OS_WATCH) return 13; -+#if TARGET_OS_OSX -+ return 4; -+#endif -+#if TARGET_OS_IOS || TARGET_OS_TV -+ return 6; -+#endif -+#if TARGET_OS_WATCH -+ return 13; -+#endif - } - - using VersStr = char[64]; -@@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) { - u16 os_major = kernel_major - offset; - - const char *format = "%d.0"; -- if (TARGET_OS_OSX) { -- if (os_major >= 16) { // macOS 11+ -- os_major -= 5; -- } else { // macOS 10.15 and below -- format = "10.%d"; -- } -+#if TARGET_OS_OSX -+ if (os_major >= 16) { // macOS 11+ -+ os_major -= 5; -+ } else { // macOS 10.15 and below -+ format = "10.%d"; - } -+#endif - return internal_snprintf(vers, sizeof(VersStr), format, os_major); - } - -@@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) { - // Aligned versions example: - // macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6 - static void MapToMacos(u16 *major, u16 *minor) { -- if (TARGET_OS_OSX) -- return; -- -- if (TARGET_OS_IOS || TARGET_OS_TV) -+#if !TARGET_OS_OSX -+#if TARGET_OS_IOS || TARGET_OS_TV - *major += 2; -- else if (TARGET_OS_WATCH) -+#elif TARGET_OS_WATCH - *major += 9; -- else -+#else - UNREACHABLE("unsupported platform"); -+#endif - - if (*major >= 16) { // macOS 11+ - *major -= 5; -@@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) { - *minor = *major; - *major = 10; - } -+#endif - } - - static MacosVersion GetMacosAlignedVersionInternal() { diff --git a/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/default.nix b/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/default.nix index 16f58616aab7..5f2cf9fd3fbd 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/default.nix @@ -59,8 +59,6 @@ stdenv.mkDerivation { # extra `/`. ./normalize-var.patch ]# ++ lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch - # Prevent a compilation error on darwin - ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin-targetconditionals.patch ++ lib.optional stdenv.hostPlatform.isAarch32 ./armv7l.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks diff --git a/nixpkgs/pkgs/development/compilers/llvm/13/default.nix b/nixpkgs/pkgs/development/compilers/llvm/13/default.nix index 76a46492cf74..4605b87846fd 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/13/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/13/default.nix @@ -19,7 +19,7 @@ let release_version = "13.0.0"; - candidate = "rc2"; # empty or "rcN" + candidate = "rc4"; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; rev = ""; # When using a Git commit rev-version = ""; # When using a Git commit @@ -30,7 +30,7 @@ let owner = "llvm"; repo = "llvm-project"; rev = if rev != "" then rev else "llvmorg-${version}"; - sha256 = "06cy6v231w067g310bwpk6a654j6q9rcxa0y0wz5sc5rrh61zjrn"; + sha256 = "0cjl0vssi4y2g4nfr710fb6cdhxmn5r0vis15sf088zsc5zydfhw"; }; llvm_meta = { diff --git a/nixpkgs/pkgs/development/compilers/llvm/13/lld/default.nix b/nixpkgs/pkgs/development/compilers/llvm/13/lld/default.nix index 34ac265f4bfd..2b5e9e965d07 100644 --- a/nixpkgs/pkgs/development/compilers/llvm/13/lld/default.nix +++ b/nixpkgs/pkgs/development/compilers/llvm/13/lld/default.nix @@ -18,6 +18,14 @@ stdenv.mkDerivation rec { ./gnu-install-dirs.patch ]; + # On Darwin the llvm-config is perhaps not working fine as the + # LLVM_MAIN_SRC_DIR is not getting set correctly, and the build fails as the + # include path is not correct. + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace MachO/CMakeLists.txt --replace \ + '(''${LLVM_MAIN_SRC_DIR}/' '(../' + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ libllvm libxml2 ]; diff --git a/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix b/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix index e7098abb60af..c67f8d2f72ff 100644 --- a/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix +++ b/nixpkgs/pkgs/development/compilers/mit-scheme/default.nix @@ -62,10 +62,10 @@ stdenv.mkDerivation { runHook postInstall ''; - postFixup = - '' wrapProgram $out/bin/mit-scheme${arch} --set MITSCHEME_LIBRARY_PATH \ - $out/lib/mit-scheme${arch} - ''; + postFixup = '' + wrapProgram $out/bin/mit-scheme${arch}-${version} --set MITSCHEME_LIBRARY_PATH \ + $out/lib/mit-scheme${arch}-${version} + ''; nativeBuildInputs = [ makeWrapper gnum4 texinfo texLive automake ghostscript autoconf libtool ]; diff --git a/nixpkgs/pkgs/development/compilers/mlkit/default.nix b/nixpkgs/pkgs/development/compilers/mlkit/default.nix index 77d2fe6cac9d..04e9e8a1630e 100644 --- a/nixpkgs/pkgs/development/compilers/mlkit/default.nix +++ b/nixpkgs/pkgs/development/compilers/mlkit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mlkit"; - version = "4.5.7"; + version = "4.5.9"; src = fetchFromGitHub { owner = "melsman"; repo = "mlkit"; rev = "v${version}"; - sha256 = "sha256-Wq+Os7nzRA5Pxz6Ba7DudcDQs3KA0eYVLy1nO/A16EE="; + sha256 = "sha256-b+iPuGB82a0r0zl49+RbalxR6OpFNXOxZgubzKE+2M4="; }; nativeBuildInputs = [ autoreconfHook mlton ]; diff --git a/nixpkgs/pkgs/development/compilers/nim/default.nix b/nixpkgs/pkgs/development/compilers/nim/default.nix index 25b1c4873572..7434347f2a28 100644 --- a/nixpkgs/pkgs/development/compilers/nim/default.nix +++ b/nixpkgs/pkgs/development/compilers/nim/default.nix @@ -1,8 +1,9 @@ # https://nim-lang.github.io/Nim/packaging.html # https://nim-lang.org/docs/nimc.html -{ lib, buildPackages, stdenv, fetchurl, fetchgit, fetchFromGitHub, makeWrapper -, openssl, pcre, readline, boehmgc, sqlite, nim-unwrapped }: +{ lib, callPackage, buildPackages, stdenv, fetchurl, fetchgit, fetchFromGitHub +, makeWrapper, openssl, pcre, readline, boehmgc, sqlite, nim-unwrapped +, nimble-unwrapped }: let parseCpu = platform: @@ -22,9 +23,9 @@ let "mips64" else if isMsp430 then "msp430" - else if isPowerPC && is32bit then + else if isPower && is32bit then "powerpc" - else if isPowerPC && is64bit then + else if isPower && is64bit then "powerpc64" else if isRiscV && is64bit then "riscv64" @@ -186,138 +187,141 @@ in { nim' = buildPackages.nim-unwrapped; nimble' = buildPackages.nimble-unwrapped; inherit (stdenv) targetPlatform; - in stdenv.mkDerivation { - name = "${targetPlatform.config}-nim-wrapper-${nim'.version}"; - inherit (nim') version; - preferLocalBuild = true; - strictDeps = true; - - nativeBuildInputs = [ makeWrapper ]; - - patches = [ - ./nim.cfg.patch - # Remove configurations that clash with ours - ]; - - unpackPhase = '' - runHook preUnpack - tar xf ${nim'.src} nim-$version/config - cd nim-$version - runHook postUnpack - ''; - - dontConfigure = true; - - buildPhase = - # Configure the Nim compiler to use $CC and $CXX as backends - # The compiler is configured by two configuration files, each with - # a different DSL. The order of evaluation matters and that order - # is not documented, so duplicate the configuration across both files. - '' - runHook preBuild - cat >> config/config.nims << WTF - - switch("os", "${nimTarget.os}") - switch("cpu", "${nimTarget.cpu}") - switch("define", "nixbuild") - - # Configure the compiler using the $CC set by Nix at build time - import strutils - let cc = getEnv"CC" - if cc.contains("gcc"): - switch("cc", "gcc") - elif cc.contains("clang"): - switch("cc", "clang") - WTF - - mv config/nim.cfg config/nim.cfg.old - cat > config/nim.cfg << WTF - os = "${nimTarget.os}" - cpu = "${nimTarget.cpu}" - define:"nixbuild" - WTF - - cat >> config/nim.cfg < config/nim.cfg.old - rm config/nim.cfg.old - - cat >> config/nim.cfg << WTF - - clang.cpp.exe %= "\$CXX" - clang.cpp.linkerexe %= "\$CXX" - clang.exe %= "\$CC" - clang.linkerexe %= "\$CC" - gcc.cpp.exe %= "\$CXX" - gcc.cpp.linkerexe %= "\$CXX" - gcc.exe %= "\$CC" - gcc.linkerexe %= "\$CC" - WTF - - runHook postBuild + self = stdenv.mkDerivation { + name = "${targetPlatform.config}-nim-wrapper-${nim'.version}"; + inherit (nim') version; + preferLocalBuild = true; + strictDeps = true; + + nativeBuildInputs = [ makeWrapper ]; + + patches = [ + ./nim.cfg.patch + # Remove configurations that clash with ours + ]; + + unpackPhase = '' + runHook preUnpack + tar xf ${nim'.src} nim-$version/config + cd nim-$version + runHook postUnpack ''; - wrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ buildPackages.gdb ]}:${ - placeholder "out" - }/bin" - # Used by nim-gdb - - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl pcre ]}" - # These libraries may be referred to by the standard library. - # This is broken for cross-compilation because the package - # set will be shifted back by nativeBuildInputs. - - "--set NIM_CONFIG_PATH ${placeholder "out"}/etc/nim" - # Use the custom configuration - - ''--set NIX_HARDENING_ENABLE "''${NIX_HARDENING_ENABLE/fortify}"'' - # Fortify hardening appends -O2 to gcc flags which is unwanted for unoptimized nim builds. - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/etc + dontConfigure = true; + + buildPhase = + # Configure the Nim compiler to use $CC and $CXX as backends + # The compiler is configured by two configuration files, each with + # a different DSL. The order of evaluation matters and that order + # is not documented, so duplicate the configuration across both files. + '' + runHook preBuild + cat >> config/config.nims << WTF + + switch("os", "${nimTarget.os}") + switch("cpu", "${nimTarget.cpu}") + switch("define", "nixbuild") + + # Configure the compiler using the $CC set by Nix at build time + import strutils + let cc = getEnv"CC" + if cc.contains("gcc"): + switch("cc", "gcc") + elif cc.contains("clang"): + switch("cc", "clang") + WTF + + mv config/nim.cfg config/nim.cfg.old + cat > config/nim.cfg << WTF + os = "${nimTarget.os}" + cpu = "${nimTarget.cpu}" + define:"nixbuild" + WTF + + cat >> config/nim.cfg < config/nim.cfg.old + rm config/nim.cfg.old + + cat >> config/nim.cfg << WTF + + clang.cpp.exe %= "\$CXX" + clang.cpp.linkerexe %= "\$CXX" + clang.exe %= "\$CC" + clang.linkerexe %= "\$CC" + gcc.cpp.exe %= "\$CXX" + gcc.cpp.linkerexe %= "\$CXX" + gcc.exe %= "\$CC" + gcc.linkerexe %= "\$CC" + WTF + + runHook postBuild + ''; + + wrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ buildPackages.gdb ]}:${ + placeholder "out" + }/bin" + # Used by nim-gdb + + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl pcre ]}" + # These libraries may be referred to by the standard library. + # This is broken for cross-compilation because the package + # set will be shifted back by nativeBuildInputs. + + "--set NIM_CONFIG_PATH ${placeholder "out"}/etc/nim" + # Use the custom configuration + + ''--set NIX_HARDENING_ENABLE "''${NIX_HARDENING_ENABLE/fortify}"'' + # Fortify hardening appends -O2 to gcc flags which is unwanted for unoptimized nim builds. + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/etc + + cp -r config $out/etc/nim + + for binpath in ${nim'}/bin/nim?*; do + local binname=`basename $binpath` + makeWrapper \ + $binpath $out/bin/${targetPlatform.config}-$binname \ + $wrapperArgs + ln -s $out/bin/${targetPlatform.config}-$binname $out/bin/$binname + done - cp -r config $out/etc/nim + makeWrapper \ + ${nim'}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \ + --set-default CC $(command -v $CC) \ + --set-default CXX $(command -v $CXX) \ + $wrapperArgs + ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim - for binpath in ${nim'}/bin/nim?*; do - local binname=`basename $binpath` makeWrapper \ - $binpath $out/bin/${targetPlatform.config}-$binname \ + ${nim'}/bin/testament $out/bin/${targetPlatform.config}-testament \ $wrapperArgs - ln -s $out/bin/${targetPlatform.config}-$binname $out/bin/$binname - done - - makeWrapper \ - ${nim'}/nim/bin/nim $out/bin/${targetPlatform.config}-nim \ - --set-default CC $(command -v $CC) \ - --set-default CXX $(command -v $CXX) \ - $wrapperArgs - ln -s $out/bin/${targetPlatform.config}-nim $out/bin/nim - - makeWrapper \ - ${nim'}/bin/testament $out/bin/${targetPlatform.config}-testament \ - $wrapperArgs - ln -s $out/bin/${targetPlatform.config}-testament $out/bin/testament - - makeWrapper \ - ${nimble'}/bin/nimble $out/bin/${targetPlatform.config}-nimble \ - --suffix PATH : $out/bin - ln -s $out/bin/${targetPlatform.config}-nimble $out/bin/nimble + ln -s $out/bin/${targetPlatform.config}-testament $out/bin/testament - runHook postInstall - ''; + makeWrapper \ + ${nimble'}/bin/nimble $out/bin/${targetPlatform.config}-nimble \ + --suffix PATH : $out/bin + ln -s $out/bin/${targetPlatform.config}-nimble $out/bin/nimble - passthru = { - nim = nim'; - nimble = nimble'; - }; + runHook postInstall + ''; + + passthru = { + nim = nim'; + nimble = nimble'; + }; - meta = nim'.meta // { - description = nim'.meta.description - + " (${targetPlatform.config} wrapper)"; - platforms = with lib.platforms; unix ++ genode; + meta = nim'.meta // { + description = nim'.meta.description + + " (${targetPlatform.config} wrapper)"; + platforms = with lib.platforms; unix ++ genode; + }; }; + in self // { + pkgs = callPackage ../../../top-level/nim-packages.nix { nim = self; }; }; } diff --git a/nixpkgs/pkgs/development/compilers/ocaml/4.13.nix b/nixpkgs/pkgs/development/compilers/ocaml/4.13.nix index 723b597b88dc..256242e9cbb5 100644 --- a/nixpkgs/pkgs/development/compilers/ocaml/4.13.nix +++ b/nixpkgs/pkgs/development/compilers/ocaml/4.13.nix @@ -1,9 +1,6 @@ import ./generic.nix { major_version = "4"; minor_version = "13"; - patch_version = "0-beta1"; - src = fetchTarball { - url = "https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.0~beta1.tar.xz"; - sha256 = "0dbz69p1kqabjvzaasy2malfdfn4b93s504x2xs0dl5l3fa3p6c3"; - }; + patch_version = "0"; + sha256 = "sha256:1f7gnndzs6qcyy2gnzalnhm808pifxhvxg2qp5dnsziz6li7x303"; } diff --git a/nixpkgs/pkgs/development/compilers/ocaml/generic.nix b/nixpkgs/pkgs/development/compilers/ocaml/generic.nix index 2dd959600eac..e4cec4cf52ed 100644 --- a/nixpkgs/pkgs/development/compilers/ocaml/generic.nix +++ b/nixpkgs/pkgs/development/compilers/ocaml/generic.nix @@ -3,7 +3,7 @@ let versionNoPatch = "${toString major_version}.${toString minor_version}"; version = "${versionNoPatch}.${toString patch_version}"; - safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips); + safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips || stdenv.hostPlatform.isStatic); in { lib, stdenv, fetchurl, ncurses, buildEnv, libunwind @@ -13,7 +13,7 @@ in , spaceTimeSupport ? false }: -assert useX11 -> !stdenv.isAarch32 && !stdenv.isMips; +assert useX11 -> safeX11 stdenv; assert aflSupport -> lib.versionAtLeast version "4.05"; assert flambdaSupport -> lib.versionAtLeast version "4.03"; assert spaceTimeSupport -> lib.versionAtLeast version "4.04"; @@ -44,6 +44,8 @@ stdenv.mkDerivation (args // { inherit src; + strictDeps = true; + prefixKey = "-prefix "; configureFlags = let flags = new: old: @@ -56,7 +58,15 @@ stdenv.mkDerivation (args // { ++ optional aflSupport (flags "--with-afl" "-afl-instrument") ++ optional flambdaSupport (flags "--enable-flambda" "-flambda") ++ optional spaceTimeSupport (flags "--enable-spacetime" "-spacetime") - ; + ++ optional (stdenv.hostPlatform.isStatic && (lib.versionOlder version "4.08")) "-no-shared-libs" + ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && lib.versionOlder version "4.08") [ + "-host ${stdenv.hostPlatform.config}" + "-target ${stdenv.targetPlatform.config}" + ]; + dontAddStaticConfigureFlags = lib.versionOlder version "4.08"; + configurePlatforms = lib.optionals (lib.versionAtLeast version "4.08") [ "host" "target" ]; + # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together + hardeningDisable = lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie"; buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ]; buildInputs = optional (!lib.versionAtLeast version "4.07") ncurses @@ -70,6 +80,8 @@ stdenv.mkDerivation (args // { # Do what upstream does by default now: https://github.com/ocaml/ocaml/pull/10176 # This is required for aarch64-darwin, everything else works as is. AS="${stdenv.cc}/bin/cc -c" ASPP="${stdenv.cc}/bin/cc -c" + '' + optionalString (lib.versionOlder version "4.08" && stdenv.hostPlatform.isStatic) '' + configureFlagsArray+=("-cc" "$CC" "-as" "$AS" "-partialld" "$LD -r") ''; postBuild = '' mkdir -p $out/include diff --git a/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix index 1d741fd8be2d..223a1921ef9d 100644 --- a/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/nixpkgs/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -24,6 +24,11 @@ let dontUseCmakeConfigure = true; + postPatch = '' + substituteInPlace buildSrc/linux.gradle \ + --replace ', "-Werror=implicit-function-declaration"' "" + ''; + config = writeText "gradle.properties" ('' CONF = Release JDK_HOME = ${openjdk11-bootstrap.home} diff --git a/nixpkgs/pkgs/development/compilers/orc/default.nix b/nixpkgs/pkgs/development/compilers/orc/default.nix index 40c89d0cc59b..2d56d461627a 100644 --- a/nixpkgs/pkgs/development/compilers/orc/default.nix +++ b/nixpkgs/pkgs/development/compilers/orc/default.nix @@ -12,6 +12,11 @@ in stdenv.mkDerivation rec { sha256 = "1w0qmyj3v9sb2g7ff39pp38b9850y9hyy0bag26ifrby5f7ksvm6"; }; + postPatch = lib.optionalString stdenv.isAarch32 '' + # https://gitlab.freedesktop.org/gstreamer/orc/-/issues/20 + sed -i '/exec_opcodes_sys/d' testsuite/meson.build + ''; + outputs = [ "out" "dev" ] ++ optional buildDevDoc "devdoc" ; diff --git a/nixpkgs/pkgs/development/compilers/osl/default.nix b/nixpkgs/pkgs/development/compilers/osl/default.nix index eeaba75c0de4..736a9d3c34c6 100644 --- a/nixpkgs/pkgs/development/compilers/osl/default.nix +++ b/nixpkgs/pkgs/development/compilers/osl/default.nix @@ -17,7 +17,15 @@ in clangStdenv.mkDerivation rec { sha256 = "1dwf10f2fpxc55pymwkapql20nc462mq61hv21c527994c2qp1ll"; }; - cmakeFlags = [ "-DUSE_BOOST_WAVE=ON" "-DENABLERTTI=ON" ]; + cmakeFlags = [ + "-DUSE_BOOST_WAVE=ON" + "-DENABLERTTI=ON" + + # Build system implies llvm-config and llvm-as are in the same directory. + # Override defaults. + "-DLLVM_DIRECTORY=${llvm}" + "-DLLVM_CONFIG=${llvm.dev}/bin/llvm-config" + ]; preConfigure = "patchShebangs src/liboslexec/serialize-bc.bash "; diff --git a/nixpkgs/pkgs/development/compilers/roslyn/deps.nix b/nixpkgs/pkgs/development/compilers/roslyn/deps.nix index deb72e522cdc..0ddd7e7cbac4 100644 --- a/nixpkgs/pkgs/development/compilers/roslyn/deps.nix +++ b/nixpkgs/pkgs/development/compilers/roslyn/deps.nix @@ -137,10 +137,10 @@ } { name = "microsoft.netcore.app.host.linux-x64"; - version = "3.1.14"; + version = "3.1.19"; src = fetchurl { - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/3.1.14/microsoft.netcore.app.host.linux-x64.3.1.14.nupkg"; - sha256 = "11rqnascx9asfyxgxzwgxgr9gxxndm552k4dn4p1s57ciz7vkg9h"; + url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-x64/3.1.19/microsoft.netcore.app.host.linux-x64.3.1.19.nupkg"; + sha256 = "10fs93kg8vhhm1l05815m8yqz796i6gk824pk1bps239mshmkybr"; }; } { diff --git a/nixpkgs/pkgs/development/compilers/rust/1_53.nix b/nixpkgs/pkgs/development/compilers/rust/1_55.nix index dda6d3931903..715a82de5adf 100644 --- a/nixpkgs/pkgs/development/compilers/rust/1_53.nix +++ b/nixpkgs/pkgs/development/compilers/rust/1_55.nix @@ -20,8 +20,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.53.0"; - rustcSha256 = "1f95p259dfp5ca118bg107rj3rqwlswy65dxn3hg8sqgl4wwmxsw"; + rustcVersion = "1.55.0"; + rustcSha256 = "07l28f7grdmi65naq71pbmvdd61hwcpi40ry7kp7dy7m233rldxj"; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_12.libllvm.override { enableSharedLibraries = true; }; @@ -34,24 +34,24 @@ import ./default.nix { # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.52.1"; + bootstrapVersion = "1.54.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "c91f0431c8137a4e98e097ab47b49846820531aafb6e9c249b71b770771832e9"; - x86_64-unknown-linux-gnu = "617ae06e212cb65bc4abbf52b158b0328b9f1a6c2f822c27c95b274d6fbc0627"; - x86_64-unknown-linux-musl = "c3eae6e78ee29e03416897f89b54448b2a03d063f07a78cde41757ad2e02c2f0"; - arm-unknown-linux-gnueabihf = "ef412d923a0c5a9fa54422f40cde62f2e85a62339057cb8b986a545b108d3347"; - armv7-unknown-linux-gnueabihf = "ec47b3f5c801f8a4df7180e088dcc1817ee160df34ef64ddac4fa50f714f119f"; - aarch64-unknown-linux-gnu = "17d9aa7bb73b819ef70d81013498727b7218533ee6cf3bd802c4eac29137fbcb"; - aarch64-unknown-linux-musl = "f2bae2b32f05a90eec041352d9329deb3e907f5560b9fda525788df3b8008b6b"; - x86_64-apple-darwin = "cfa73228ea54e2c94f75d1b142ea41444c463f4ee8562a3eca1b11b2fe8af95a"; - aarch64-apple-darwin = "217e9723f828c5359467d69b363a342d702bdcbbcc4107be907e6bc4531f4912"; - powerpc64le-unknown-linux-gnu = "f258c5d7d6d9022108672b7383412d930a5f59d7644d148e413c3ab0ae45604f"; - riscv64gc-unknown-linux-gnu = "c1c98ccc8bb4147a819411a10162c8f8ce1aaa5c65cf2c74802dce4dacd6e64b"; + i686-unknown-linux-gnu = "1cd06090463711d50d98374ef52c1a84b9f4e3e35febaaef4890fb10536ceb3a"; + x86_64-unknown-linux-gnu = "350354495b1d4b6dd2ec7cf96aa9bc61d031951cf667a31e8cf401dc508639e6"; + x86_64-unknown-linux-musl = "3571db0018fcd32f3b579a32b2301826dbd1cce44b373aed8e8a31c2a6f52fe8"; + arm-unknown-linux-gnueabihf = "77f4e4c2195f75466c6de0b1d8fd7fb8cef3d12666e3aae777dcfd0d71d080ca"; + armv7-unknown-linux-gnueabihf = "dd01ccb6a53d5e895a6755a78c213ae601a347366688941d5c543b5af5835d6d"; + aarch64-unknown-linux-gnu = "33a50c5366a57aaab43c1c19e4a49ab7d8ffcd99a72925c315fb1f9389139e6f"; + aarch64-unknown-linux-musl = "49d94116a357ea13f5a3231de2472f59210028c3cf81f158b8a367c3155ac544"; + x86_64-apple-darwin = "5eb27a4f5f7a4699bc70cf1848e340ddd74e151488bfcb26853fd584958e3d33"; + aarch64-apple-darwin = "801b3b15b992b0321261de8b8ea2728e9a74822c6cb99bf978b34e217c7825ba"; + powerpc64le-unknown-linux-gnu = "67cadf7ac5bd2e3d5fb4baede69846059f17c4e099f771329b266d08b875ed71"; + riscv64gc-unknown-linux-gnu = "6113a6cce3500033d0dc0d170b54c5f22562ef3025fd58d804c822a2499c74d7"; }; - selectRustPackage = pkgs: pkgs.rust_1_53; + selectRustPackage = pkgs: pkgs.rust_1_55; rustcPatches = [ ]; diff --git a/nixpkgs/pkgs/development/compilers/rust/cargo.nix b/nixpkgs/pkgs/development/compilers/rust/cargo.nix index 3ada23e74882..ee909e973a35 100644 --- a/nixpkgs/pkgs/development/compilers/rust/cargo.nix +++ b/nixpkgs/pkgs/development/compilers/rust/cargo.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, file, curl, pkg-config, python3, openssl, cmake, zlib +{ lib, stdenv, pkgsHostHost +, file, curl, pkg-config, python3, openssl, cmake, zlib , installShellFiles, makeWrapper, cacert, rustPlatform, rustc , CoreFoundation, Security }: @@ -16,7 +17,10 @@ rustPlatform.buildRustPackage { # changes hash of vendor directory otherwise dontUpdateAutotoolsGnuConfigScripts = true; - nativeBuildInputs = [ pkg-config cmake installShellFiles makeWrapper ]; + nativeBuildInputs = [ + pkg-config cmake installShellFiles makeWrapper + (lib.getDev pkgsHostHost.curl) + ]; buildInputs = [ cacert file curl python3 openssl zlib ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; @@ -54,6 +58,14 @@ rustPlatform.buildRustPackage { # Disable check phase as there are failures (4 tests fail) doCheck = false; + doInstallCheck = !stdenv.hostPlatform.isStatic && + stdenv.hostPlatform.parsed.kernel.execFormat == lib.systems.parse.execFormats.elf; + installCheckPhase = '' + runHook preInstallCheck + readelf -a $out/bin/.cargo-wrapped | grep -F 'Shared library: [libcurl.so' + runHook postInstallCheck + ''; + meta = with lib; { homepage = "https://crates.io"; description = "Downloads your Rust project's dependencies and builds your project"; diff --git a/nixpkgs/pkgs/development/compilers/scala/2.x.nix b/nixpkgs/pkgs/development/compilers/scala/2.x.nix index 1ffdc5ec0263..571aeb0cc39f 100644 --- a/nixpkgs/pkgs/development/compilers/scala/2.x.nix +++ b/nixpkgs/pkgs/development/compilers/scala/2.x.nix @@ -20,8 +20,8 @@ let }; "2.12" = { - version = "2.12.14"; - sha256 = "/X4+QDIogBOinAoUR8WX+vew5Jl2LA2YHbIQmel4BCY="; + version = "2.12.15"; + sha256 = "F5RePKlHjQaoQ2BWqsa5r99g3q/cPjgsbAi2A5IberY="; pname = "scala_2_12"; }; diff --git a/nixpkgs/pkgs/development/compilers/sjasmplus/default.nix b/nixpkgs/pkgs/development/compilers/sjasmplus/default.nix index 422181679846..6ef3d11c712f 100644 --- a/nixpkgs/pkgs/development/compilers/sjasmplus/default.nix +++ b/nixpkgs/pkgs/development/compilers/sjasmplus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sjasmplus"; - version = "1.18.2"; + version = "1.18.3"; src = fetchFromGitHub { owner = "z00m128"; repo = "sjasmplus"; rev = "v${version}"; - sha256 = "04348zcmc0b3crzwhvj1shx6f1n3x05vs8d5qdm7qhgdfki8r74v"; + sha256 = "sha256-+FvNYfJ5I91RfuJTiOPhj5KW8HoOq8OgnnpFEgefSGc="; }; buildFlags = [ diff --git a/nixpkgs/pkgs/development/compilers/vala/default.nix b/nixpkgs/pkgs/development/compilers/vala/default.nix index 8f93a6746ea2..809e81ae548b 100644 --- a/nixpkgs/pkgs/development/compilers/vala/default.nix +++ b/nixpkgs/pkgs/development/compilers/vala/default.nix @@ -116,18 +116,18 @@ in rec { }; vala_0_48 = generic { - version = "0.48.18"; - sha256 = "1pbz4nyrrf9wp8rp953sczx545s4g0h5mars9ynkn788dzs2h3wy"; + version = "0.48.19"; + sha256 = "sha256-gLdlijfZhE/NG0Mdr8WATeYWpYGW5PHxGeWyrraLSgE="; }; vala_0_50 = generic { - version = "0.50.9"; - sha256 = "0w5ngs90rq7vy21nqfq8drqyb33kxm17j161qvakwpsbjsidv1mn"; + version = "0.50.10"; + sha256 = "sha256-vnIf8/AYHqttM+zKzygfZvMI+qHl5VTwj99nFZpFlRU="; }; vala_0_52 = generic { - version = "0.52.4"; - sha256 = "0cfz3xshc9azxx4fn25x9gadnph6jvf1r2wzd7p5krk0a4755ppc"; + version = "0.52.5"; + sha256 = "sha256-hKG7MSs+Xcrkt7JcRVmNN14stpIzzvtZoV0jUMdr3ZE="; }; vala = vala_0_52; diff --git a/nixpkgs/pkgs/development/compilers/yasm/default.nix b/nixpkgs/pkgs/development/compilers/yasm/default.nix index 48c251d828a2..b770f3b7dfdb 100644 --- a/nixpkgs/pkgs/development/compilers/yasm/default.nix +++ b/nixpkgs/pkgs/development/compilers/yasm/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "yasm-1.3.0"; + pname = "yasm"; + version = "1.3.0"; src = fetchurl { - url = "https://www.tortall.net/projects/yasm/releases/${name}.tar.gz"; + url = "https://www.tortall.net/projects/yasm/releases/yasm-${version}.tar.gz"; sha256 = "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix"; }; diff --git a/nixpkgs/pkgs/development/coq-modules/ceres/default.nix b/nixpkgs/pkgs/development/coq-modules/ceres/default.nix new file mode 100644 index 000000000000..1813cd700c70 --- /dev/null +++ b/nixpkgs/pkgs/development/coq-modules/ceres/default.nix @@ -0,0 +1,19 @@ +{ lib, mkCoqDerivation, coq, version ? null }: + +with lib; +mkCoqDerivation { + + pname = "ceres"; + repo = "coq-ceres"; + owner = "Lysxia"; + + inherit version; + defaultVersion = if versions.isGe "8.8" coq.version then "0.4.0" else null; + release."0.4.0".sha256 = "sha256:0zwp3pn6fdj0qdig734zdczrls886al06mxqhhabms0jvvqijmbi"; + + meta = { + description = "Library for serialization to S-expressions"; + license = licenses.mit; + maintainers = with maintainers; [ Zimmi48 ]; + }; +} diff --git a/nixpkgs/pkgs/development/coq-modules/flocq/default.nix b/nixpkgs/pkgs/development/coq-modules/flocq/default.nix index 2598d4e233eb..1ac76b38c72c 100644 --- a/nixpkgs/pkgs/development/coq-modules/flocq/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/flocq/default.nix @@ -7,9 +7,10 @@ with lib; mkCoqDerivation { domain = "gitlab.inria.fr"; inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.7"; out = "3.3.1"; } + { case = range "8.7" "8.14"; out = "3.4.2"; } { case = range "8.5" "8.8"; out = "2.6.1"; } ] null; + release."3.4.2".sha256 = "1s37hvxyffx8ccc8mg5aba7ivfc39p216iibvd7f2cb9lniqk1pw"; release."3.3.1".sha256 = "1mk8adhi5hrllsr0hamzk91vf2405sjr4lh5brg9201mcw11abkz"; release."2.6.1".sha256 = "0q5a038ww5dn72yvwn5298d3ridkcngb1dik8hdyr3xh7gr5qibj"; releaseRev = v: "flocq-${v}"; diff --git a/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix b/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix index acbb602a54ef..f806d764755d 100644 --- a/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix +++ b/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix @@ -4,7 +4,6 @@ with lib; mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "multinomials"; - opam-name = "coq-mathcomp-multinomials"; owner = "math-comp"; diff --git a/nixpkgs/pkgs/development/coq-modules/parsec/default.nix b/nixpkgs/pkgs/development/coq-modules/parsec/default.nix new file mode 100644 index 000000000000..ad48809a9fed --- /dev/null +++ b/nixpkgs/pkgs/development/coq-modules/parsec/default.nix @@ -0,0 +1,22 @@ +{ lib, mkCoqDerivation, coq, ceres, coq-ext-lib, version ? null }: + +with lib; +mkCoqDerivation { + + pname = "parsec"; + repo = "coq-parsec"; + owner = "liyishuai"; + + propagatedBuildInputs = [ ceres coq-ext-lib ]; + releaseRev = (v: "v${v}"); + + inherit version; + defaultVersion = if versions.isGe "8.12" coq.version then "0.1.0" else null; + release."0.1.0".sha256 = "sha256:01avfcqirz2b9wjzi9iywbhz9szybpnnj3672dgkfsimyg9jgnsr"; + + meta = { + description = "Library for serialization to S-expressions"; + license = licenses.mit; + maintainers = with maintainers; [ Zimmi48 ]; + }; +} diff --git a/nixpkgs/pkgs/development/dhall-modules/dhall-packages.nix b/nixpkgs/pkgs/development/dhall-modules/dhall-packages.nix deleted file mode 100644 index 989531db8da6..000000000000 --- a/nixpkgs/pkgs/development/dhall-modules/dhall-packages.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ buildDhallGitHubPackage, dhall-kubernetes, Prelude }: - -let - Prelude_12_0_0 = Prelude.overridePackage { - name = "Prelude-12.0.0"; - rev = "9f248138f69ee5e22192dc3d0417d5c77b189e04"; - sha256 = "1gbr0376sfamp0ibhcbxz4vaxr6ipv42y42p5wyksfhz3ls9x5ph"; - }; - - kubernetes = { - "6a47bd" = dhall-kubernetes.overridePackage { - name = "dhall-kubernetes-6a47bd"; - rev = "6a47bd50c4d3984a13570ea62382a3ad4a9919a4"; - sha256 = "1azqs0x2kia3xw93rfk2mdi8izd7gy9aq6qzbip32gin7dncmfhh"; - }; - - "4ad581" = dhall-kubernetes.overridePackage { - name = "dhall-kubernetes-4ad581"; - rev = "4ad58156b7fdbbb6da0543d8b314df899feca077"; - sha256 = "12fm70qbhcainxia388svsay2cfg9iksc6mss0nvhgxhpypgp8r0"; - }; - - "fee24c" = dhall-kubernetes.overridePackage { - name = "dhall-kubernetes-fee24c"; - rev = "fee24c0993ba0b20190e2fdb94e386b7fb67252d"; - sha256 = "11d93z8y0jzrb8dl43gqha9z96nxxqkl7cbxpz8hw8ky9x6ggayk"; - }; - }; - -in - buildDhallGitHubPackage { - name = "dhall-packages-0.11.1"; - owner = "EarnestResearch"; - repo = "dhall-packages"; - file = "package.dhall"; - rev = "8d228f578fbc7bb16c04a7c9ac8c6c7d2e13d1f7"; - sha256 = "1v4y1x13lxy6cxf8xqc6sb0mc4mrd4frkxih95v9q2wxw4vkw2h7"; - - dependencies = [ - (kubernetes."6a47bd".overridePackage { file = "1.14/package.dhall"; }) - (kubernetes."6a47bd".overridePackage { file = "1.15/package.dhall"; }) - (kubernetes."6a47bd".overridePackage { file = "1.16/package.dhall"; }) - (kubernetes."4ad581".overridePackage { file = "types.dhall"; }) - (kubernetes."fee24c".overridePackage { file = "types/io.k8s.api.core.v1.ServiceSpec.dhall"; }) - (kubernetes."fee24c".overridePackage { file = "types/io.k8s.api.core.v1.PodTemplateSpec.dhall"; }) - Prelude_12_0_0 - (Prelude_12_0_0.overridePackage { file = "JSON/package.dhall"; }) - (Prelude_12_0_0.overridePackage { file = "JSON/Type"; }) - (Prelude_12_0_0.overridePackage { file = "Map/Type"; }) - ]; - } diff --git a/nixpkgs/pkgs/development/dotnet-modules/python-language-server/deps.nix b/nixpkgs/pkgs/development/dotnet-modules/python-language-server/deps.nix index 899f38d256dd..9ebbaceae502 100644 --- a/nixpkgs/pkgs/development/dotnet-modules/python-language-server/deps.nix +++ b/nixpkgs/pkgs/development/dotnet-modules/python-language-server/deps.nix @@ -48,8 +48,8 @@ in [ (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.1.8"; - sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135"; + version = "3.1.19"; + sha256 = "19z4zrchaxcz0a33c33n1qd11z9khj4323nfzsbzah0xxkkj8ka8"; }) (fetchNuGet { @@ -78,8 +78,8 @@ in [ (fetchNuGet { name = "Microsoft.NetCore.App.Runtime.linux-x64"; - version = "3.1.8"; - sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa"; + version = "3.1.19"; + sha256 = "10c9bq1z8j173n9jzamgplbxq101yscwdhksshn1ybisn7cr5g0h"; }) (fetchNuGet { diff --git a/nixpkgs/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt b/nixpkgs/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt index ec49eee7e9cf..541bedcbe566 100644 --- a/nixpkgs/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt +++ b/nixpkgs/pkgs/development/dotnet-modules/python-language-server/manual_deps.txt @@ -1,2 +1,2 @@ -Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.8 -Microsoft.NetCore.App.Runtime.linux-x64 3.1.8 +Microsoft.AspNetCore.App.Runtime.linux-x64 3.1.19 +Microsoft.NetCore.App.Runtime.linux-x64 3.1.19 diff --git a/nixpkgs/pkgs/development/embedded/platformio/chrootenv.nix b/nixpkgs/pkgs/development/embedded/platformio/chrootenv.nix index 72384c0994a2..138e7186624a 100644 --- a/nixpkgs/pkgs/development/embedded/platformio/chrootenv.nix +++ b/nixpkgs/pkgs/development/embedded/platformio/chrootenv.nix @@ -23,7 +23,8 @@ in buildFHSUserEnv { name = "platformio"; targetPkgs = pio-pkgs; - multiPkgs = pio-pkgs; + # disabled temporarily because fastdiff no longer support 32bit + # multiPkgs = pio-pkgs; meta = with lib; { description = "An open source ecosystem for IoT development"; diff --git a/nixpkgs/pkgs/development/embedded/platformio/core.nix b/nixpkgs/pkgs/development/embedded/platformio/core.nix index a3dcbdd35fdf..169ff4cd5a86 100644 --- a/nixpkgs/pkgs/development/embedded/platformio/core.nix +++ b/nixpkgs/pkgs/development/embedded/platformio/core.nix @@ -1,5 +1,6 @@ { stdenv, lib, python3 , fetchFromGitHub +, fetchPypi , git , spdx-license-list-data , version, src @@ -20,6 +21,15 @@ let doCheck = false; }); + ajsonrpc = super.ajsonrpc.overridePythonAttrs (oldAttrs: rec { + pname = "ajsonrpc"; + version = "1.1.0"; + src = fetchPypi { + inherit pname version; + sha256 = "sha256-CgHCtW0gxZho7ZavvEaODNc+KbFW4sAsHtM2Xk5Cuaw="; + }; + }); + click = super.click.overridePythonAttrs (oldAttrs: rec { version = "7.1.2"; src = oldAttrs.src.override { @@ -28,6 +38,18 @@ let }; }); + starlette = super.starlette.overridePythonAttrs (oldAttrs: rec { + pname = "starlette"; + version = "0.14.2"; + src = fetchFromGitHub { + owner = "encode"; + repo = pname; + rev = version; + sha256 = "sha256-Ki5jTEr5w6CrGK6F60E9uvdUlGx8pxdHMpxHvj9D4js="; + }; + doCheck = false; + }); + uvicorn = super.uvicorn.overridePythonAttrs (oldAttrs: rec { version = "0.13.2"; src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/development/embedded/tytools/default.nix b/nixpkgs/pkgs/development/embedded/tytools/default.nix new file mode 100644 index 000000000000..027cfde2669a --- /dev/null +++ b/nixpkgs/pkgs/development/embedded/tytools/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook , qtbase}: + +stdenv.mkDerivation rec { + pname = "tytools"; + version = "0.9.3"; + + src = fetchFromGitHub { + owner = "Koromix"; + repo = pname; + rev = "v${version}"; + sha256 = "0ax6j17f5nm0q4sp8sg1412hd48qp7whdy7dd699kwjcm763bl5j"; + }; + + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + buildInputs = [ + qtbase + ]; + + meta = with lib; { + description = "Collection of tools to manage Teensy boards"; + homepage = "https://koromix.dev/tytools"; + license = licenses.unlicense; + platforms = platforms.unix; + maintainers = with maintainers; [ ahuzik ]; + }; +} diff --git a/nixpkgs/pkgs/development/haskell-modules/HACKING.md b/nixpkgs/pkgs/development/haskell-modules/HACKING.md index b53fa3d73e06..5e996548e495 100644 --- a/nixpkgs/pkgs/development/haskell-modules/HACKING.md +++ b/nixpkgs/pkgs/development/haskell-modules/HACKING.md @@ -20,6 +20,10 @@ The workflow generally proceeds in three main steps: Each of these steps is described in a separate section. +There is a script that automates the workflow for merging the currently open +`haskell-updates` PR into `master` and opening the next PR. It is described +at the end of this document. + ## Initial `haskell-updates` PR In this section we create the PR for merging `haskell-updates` into `master`. @@ -46,39 +50,8 @@ In this section we create the PR for merging `haskell-updates` into `master`. 1. Push these commits to the `haskell-updates` branch of the NixOS/nixpkgs repository. -1. Open a PR on Nixpkgs merging `haskell-updates` into `master`. - - - -Use the title `haskellPackages: update stackage and hackage` and the following message body: - -```markdown -### This Merge - -This PR is the regular merge of the `haskell-updates` branch into `master`. - -This branch is being continually built and tested by hydra at https://hydra.nixos.org/jobset/nixpkgs/haskell-updates. - -I will aim to merge this PR **by 2021-TODO-TODO**. If I can merge it earlier, there might be successor PRs in that time window. As part of our rotation @TODO will continue these merges from 2021-TODO-TODO to 2021-TODO-TODO. - -### haskellPackages Workflow Summary - -Our workflow is currently described in -[`pkgs/development/haskell-modules/HACKING.md`](https://github.com/NixOS/nixpkgs/blob/haskell-updates/pkgs/development/haskell-modules/HACKING.md). - -The short version is this: -* We regularly update the Stackage and Hackage pins on `haskell-updates` (normally at the beginning of a merge window). -* The community fixes builds of Haskell packages on that branch. -* We aim at at least one merge of `haskell-updates` into `master` every two weeks. -* We only do the merge if the [`mergeable`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/mergeable) job is succeeding on hydra. -* If a [`maintained`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/maintained) package is still broken at the time of merge, we will only merge if the maintainer has been pinged 7 days in advance. (If you care about a Haskell package, become a maintainer!) - ---- - -This is the follow-up to #TODO. Come to [#haskell:nixos.org](https://matrix.to/#/#haskell:nixos.org) if you have any questions. -``` - -Make sure to replace all TODO with the actual values. +1. Open a PR on Nixpkgs for merging `haskell-updates` into `master`. The recommended + PR title and body text are described in the `merge-and-open-pr.sh` section. ## Notify Maintainers and Fix Broken Packages @@ -111,7 +84,7 @@ It may help contributors to try to keep the GitHub comment updated with the most recent build report. Maintainers should be given at least 7 days to fix up their packages when they -break. If maintainers don't fix up their packages with 7 days, then they +break. If maintainers don't fix up their packages within 7 days, then they may be marked broken before merging `haskell-updates` into `master`. ### Fix Broken Packages @@ -180,24 +153,6 @@ following will happen: - All updated files will be committed. -### Merge `master` into `haskell-updates` - -You should occasionally merge the `master` branch into the `haskell-updates` -branch. - -In an ideal world, when we merge `haskell-updates` into `master`, it would -cause few Hydra rebuilds on `master`. Ideally, the `nixos-unstable` channel -would never be prevented from progressing because of needing to wait for -rebuilding Haskell packages. - -In order to make sure that there are a minimal number of rebuilds after merging -`haskell-updates` into `master`, `master` should occasionally be merged into -the `haskell-updates` branch. - -This is especially important after `staging-next` is merged into `master`, -since there is a high chance that this will cause all the Haskell packages to -rebuild. - ## Merge `haskell-updates` into `master` Now it is time to merge the `haskell-updates` PR you opened above. @@ -241,12 +196,60 @@ When you've double-checked these points, go ahead and merge the `haskell-updates After merging, **make sure not to delete the `haskell-updates` branch**, since it causes all currently open Haskell-related pull-requests to be automatically closed on GitHub. +## Script for Merging `haskell-updates` and Opening a New PR + +There is a script that automates merging the current `haskell-updates` PR and +opening the next one. When you want to merge the currently open +`haskell-updates` PR, you can run the script with the following steps: + +1. Make sure you have previously authenticated with the `gh` command. The + script uses the `gh` command to merge the current PR and open a new one. + You should only need to do this once. + + ```console + $ gh auth login + ``` + +1. Make sure you have correctly marked packages broken. One of the previous + sections explains how to do this. + +1. Merge `master` into `haskell-updates` and make sure to push to the + `haskell-updates` branch. (This can be skipped if `master` has recently + been merged into `haskell-updates`.) + +1. Go to https://hydra.nixos.org/jobset/nixpkgs/haskell-updates and force an + evaluation of the `haskell-updates` jobset. See one of the following + sections for how to do this. Make sure there are no evaluation errors. If + there are remaining evaluation errors, fix them before continuing with this + merge. + +1. Run the script to merge `haskell-updates`: + + ```console + $ ./maintainers/scripts/haskell/merge-and-open-pr.sh PR_NUM_OF_CURRENT_HASKELL_UPDATES_PR + ``` + + This does the following things: + + 1. Fetches `origin`, makes sure you currently have the `haskell-updates` + branch checked out, and makes sure your currently checked-out + `haskell-updates` branch is on the same commit as + `origin/haskell-updates`. + + 1. Merges the currently open `haskell-updates` PR. + + 1. Updates Stackage and Hackage snapshots. Regenerates the Haskell package set. + + 1. Pushes the commits updating Stackage and Hackage and opens a new + `haskell-updates` PR on Nixpkgs. If you'd like to do this by hand, + look in the script for the recommended PR title and body text. + ## Update Hackage Version Information -After merging into `master` you can update what hackage displays as the current -version in NixOS for every individual package. -To do this you run `maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh`. -See the script for how to provide credentials. Once you have configured that +After merging into `master` you can update what Hackage displays as the current +version in NixOS for every individual package. To do this you run +`maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh`. See the +script for how to provide credentials. Once you have configured credentials, running this takes only a few seconds. ## Additional Info diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-arm.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-arm.nix index 1013975ac66f..9fc87c06a7dd 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-arm.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-arm.nix @@ -91,6 +91,9 @@ self: super: { xml-html-qq = dontCheck super.xml-html-qq; yaml-combinators = dontCheck super.yaml-combinators; yesod-paginator = dontCheck super.yesod-paginator; + hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin; + hls-call-hierarchy-plugin = dontCheck super.hls-call-hierarchy-plugin; + hls-module-name-plugin = dontCheck super.hls-module-name-plugin; # https://github.com/ekmett/half/issues/35 half = dontCheck super.half; diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index 44a958295a13..053752edd6fa 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -212,6 +212,7 @@ self: super: { command-qq = dontCheck super.command-qq; # http://hydra.cryp.to/build/499042/log/raw conduit-connection = dontCheck super.conduit-connection; craftwerk = dontCheck super.craftwerk; + crc = dontCheck super.crc; # https://github.com/MichaelXavier/crc/issues/2 css-text = dontCheck super.css-text; damnpacket = dontCheck super.damnpacket; # http://hydra.cryp.to/build/496923/log data-hash = dontCheck super.data-hash; @@ -1354,19 +1355,12 @@ self: super: { # 2021-06-20: Tests fail: https://github.com/haskell/haskell-language-server/issues/1949 hls-refine-imports-plugin = dontCheck super.hls-refine-imports-plugin; - # 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.override { refinery = self.refinery_0_3_0_0; }); + # 2021-09-14: Tests are broken because of undeterministic variable names + hls-tactics-plugin = dontCheck super.hls-tactics-plugin; # 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 - ghcide = doJailbreak (dontCheck super.ghcide); - - # 2020-03-09: Tests broken in hackage release - # fixed on upstream, but not released in hiedb 0.3.0.1 - # https://github.com/wz1000/HieDb/issues/30 - hiedb = dontCheck super.hiedb; + ghcide = dontCheck super.ghcide; data-tree-print = doJailbreak super.data-tree-print; @@ -1443,10 +1437,10 @@ self: super: { # compatible with Cabal 3. No upstream repository found so far readline = appendPatch super.readline ./patches/readline-fix-for-cabal-3.patch; - # 2020-12-05: http-client is fixed on too old version - essence-of-live-coding-warp = doJailbreak (super.essence-of-live-coding-warp.override { - http-client = self.http-client_0_7_8; - }); + # 2020-12-05: this package requires a newer version of http-client, + # but it still compiles with older version: + # https://github.com/turion/essence-of-live-coding/pull/86 + essence-of-live-coding-warp = doJailbreak super.essence-of-live-coding-warp; # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27) pandoc-include-code = doJailbreak super.pandoc-include-code; @@ -1842,9 +1836,6 @@ EOT testFlags = [ "--pattern" "!/[NOCI]/" ]; }; - # Tests require to run a binary which isn't built - lsp-test = dontCheck super.lsp-test; - # 2021-05-22: Tests fail sometimes (even consistently on hydra) # when running a fs-related test with >= 12 jobs. To work around # this, run tests with only a single job. @@ -1923,7 +1914,7 @@ EOT # Needs Cabal >= 3.4 chs-cabal = super.chs-cabal.override { - Cabal = self.Cabal_3_6_0_0; + Cabal = self.Cabal_3_6_1_0; }; # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too. @@ -1931,7 +1922,21 @@ EOT # 2021-09-06: hadolint depends on language-docker >= 10.1 hadolint = super.hadolint.override { - language-docker = self.language-docker_10_1_1; + language-docker = self.language-docker_10_1_2; }; + # 2021-09-13: hls 1.3 needs a newer lsp than stackage-lts. (lsp >= 1.2.0.1) + # (hls is nearly the only consumer, but consists of 18 packages, so we bump lsp globally.) + lsp = doDistribute self.lsp_1_2_0_1; + lsp-types = doDistribute self.lsp-types_1_3_0_1; + # Not running the "example" test because it requires a binary from lsps test + # suite which is not part of the output of lsp. + lsp-test = doDistribute (overrideCabal self.lsp-test_0_14_0_1 (old: { testTarget = "tests func-test"; })); + + # 2021-09-14: Tests are flaky. + hls-splice-plugin = dontCheck super.hls-splice-plugin; + + # 2021-09-18: https://github.com/haskell/haskell-language-server/issues/2205 + hls-stylish-haskell-plugin = doJailbreak super.hls-stylish-haskell-plugin; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 6a7ad8a0492a..714b889f2c05 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -44,12 +44,11 @@ self: super: { # cabal-install needs more recent versions of Cabal and base16-bytestring. cabal-install = super.cabal-install.overrideScope (self: super: { - Cabal = self.Cabal_3_4_0_0; - base16-bytestring = self.base16-bytestring_0_1_1_7; + Cabal = self.Cabal_3_6_1_0; }); # cabal-install-parsers is written for Cabal 3.6 - cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_0_0; }; + cabal-install-parsers = super.cabal-install-parsers.override { Cabal = super.Cabal_3_6_1_0; }; # older version of cabal-install-parsers for reverse dependencies that use Cabal 3.4 cabal-install-parsers_0_4_2 = super.cabal-install-parsers_0_4_2.override { diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index bb8a1ce29711..0d1efbf71198 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -51,8 +51,7 @@ self: super: { # cabal-install needs more recent versions of Cabal and random, but an older # version of base16-bytestring. cabal-install = super.cabal-install.overrideScope (self: super: { - Cabal = self.Cabal_3_4_0_0; - base16-bytestring = self.base16-bytestring_0_1_1_7; + Cabal = self.Cabal_3_6_1_0; }); # Ignore overly restrictive upper version bounds. @@ -99,7 +98,7 @@ self: super: { darcs = dontDistribute super.darcs; # The package needs the latest Cabal version. - cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_6_0_0; }); + cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_6_1_0; }); # cabal-fmt requires Cabal3 cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_1_0; }; diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 38926d352874..cd2d86421f34 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -45,8 +45,7 @@ self: super: { # cabal-install needs more recent versions of Cabal and base16-bytestring. cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { - Cabal = null; - base16-bytestring = self.base16-bytestring_0_1_1_7; + Cabal = self.Cabal_3_6_1_0; }); # Jailbreaks & Version Updates @@ -105,14 +104,80 @@ self: super: { # https://github.com/Soostone/retry/issues/71 retry = dontCheck super.retry; - # hlint 3.3 needs a ghc-lib-parser newer than the one from stackage - hlint = super.hlint_3_3_4.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; - }); + # Hlint needs >= 3.3.4 for ghc 9 support. + hlint = super.hlint_3_3_4; - # pick right version for compiler + # 2021-09-18: ghc-api-compat and ghc-lib-* need >= 9.0.x versions for hls and hlint ghc-api-compat = doDistribute super.ghc-api-compat_9_0_1; + ghc-lib-parser = self.ghc-lib-parser_9_0_1_20210324; + ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_0_0_4; + ghc-lib = self.ghc-lib_9_0_1_20210324; + + # 2021-09-18: Need semialign >= 1.2 for correct bounds + semialign = super.semialign_1_2; + + # Will probably be needed for brittany support + # https://github.com/lspitzner/czipwith/pull/2 + #czipwith = appendPatch super.czipwith + # (pkgs.fetchpatch { + # url = "https://github.com/lspitzner/czipwith/commit/b6245884ae83e00dd2b5261762549b37390179f8.patch"; + # sha256 = "08rpppdldsdwzb09fmn0j55l23pwyls2dyzziw3yjc1cm0j5vic5"; + # }); + + # 2021-09-18: https://github.com/mokus0/th-extras/pull/8 + # Release is missing, but asked for in the above PR. + th-extras = overrideCabal super.th-extras (old: { + version = assert old.version == "0.0.0.4"; "unstable-2021-09-18"; + src = pkgs.fetchFromGitHub { + owner = "mokus0"; + repo = "th-extras"; + rev = "0d050b24ec5ef37c825b6f28ebd46787191e2a2d"; + sha256 = "045f36yagrigrggvyb96zqmw8y42qjsllhhx2h20q25sk5h44xsd"; + }; + libraryHaskellDepends = old.libraryHaskellDepends ++ [self.th-abstraction]; + }); + + # 2021-09-18: GHC 9 compat release is missing + # Issue: https://github.com/obsidiansystems/dependent-sum/issues/65 + dependent-sum-template = dontCheck (appendPatch super.dependent-sum-template + (pkgs.fetchpatch { + url = "https://github.com/obsidiansystems/dependent-sum/commit/8cf4c7fbc3bfa2be475a17bb7c94a1e1e9a830b5.patch"; + sha256 = "02wyy0ciicq2x8lw4xxz3x5i4a550mxfidhm2ihh60ni6am498ff"; + stripLen = 2; + extraPrefix = ""; + })); + + # 2021-09-18: cabal2nix does not detect the need for ghc-api-compat. + hiedb = overrideCabal super.hiedb (old: { + libraryHaskellDepends = old.libraryHaskellDepends ++ [self.ghc-api-compat]; + }); + + # 2021-09-18: Need path >= 0.9.0 for ghc 9 compat + path = self.path_0_9_0; + # 2021-09-18: Need ormolu >= 0.3.0.0 for ghc 9 compat + ormolu = self.ormolu_0_3_0_0; + # 2021-09-18: https://github.com/haskell/haskell-language-server/issues/2206 + # Restrictive upper bound on ormolu + hls-ormolu-plugin = doJailbreak super.hls-ormolu-plugin; + + # 2021-09-18: The following plugins don‘t work yet on ghc9. + haskell-language-server = appendConfigureFlags (super.haskell-language-server.override { + hls-tactics-plugin = null; # No upstream support, generic-lens-core fail + hls-splice-plugin = null; # No upstream support in hls 1.4.0, should be fixed in 1.5 + hls-refine-imports-plugin = null; # same issue es splice-plugin + hls-class-plugin = null; # No upstream support + + hls-fourmolu-plugin = null; # No upstream support, needs new fourmolu release + hls-stylish-haskell-plugin = null; # No upstream support + hls-brittany-plugin = null; # No upstream support, needs new brittany release + }) [ + "-f-tactic" + "-f-splice" + "-f-refineimports" + "-f-class" + + "-f-fourmolu" + "-f-brittany" + "-f-stylishhaskell" + ]; } diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 4ae21181e8ca..eac85d6b7a9e 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -49,7 +49,6 @@ self: super: { # cabal-install needs more recent versions of Cabal and base16-bytestring. cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { Cabal = null; - base16-bytestring = self.base16-bytestring_0_1_1_7; }); # Jailbreaks & Version Updates diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-ghcjs.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-ghcjs.nix new file mode 100644 index 000000000000..d4e443d6beaf --- /dev/null +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -0,0 +1,109 @@ +# GHCJS package fixes +# +# Please insert new packages *alphabetically* +# in the OTHER PACKAGES section. +{ pkgs, haskellLib }: + +let + removeLibraryHaskellDepends = pnames: depends: + builtins.filter (e: !(builtins.elem (e.pname or "") pnames)) depends; +in + +with haskellLib; + +self: super: + +## GENERAL SETUP BASE PACKAGES +{ + inherit (self.ghc.bootPkgs) + jailbreak-cabal alex happy gtk2hs-buildtools rehoo hoogle; + + ghcjs-base = dontCheck (self.callPackage ../compilers/ghcjs/ghcjs-base.nix { + fetchgit = pkgs.buildPackages.fetchgit; + }); + + # GHCJS does not ship with the same core packages as GHC. + # https://github.com/ghcjs/ghcjs/issues/676 + stm = doJailbreak self.stm_2_5_0_1; + exceptions = dontCheck self.exceptions_0_10_4; + +## OTHER PACKAGES + + # Runtime exception in tests, missing C API h$realloc + base-compat-batteries = dontCheck super.base-compat-batteries; + + # nodejs crashes during test + ChasingBottoms = dontCheck super.ChasingBottoms; + + # doctest doesn't work on ghcjs, but sometimes dontCheck doesn't seem to get rid of the dependency + doctest = pkgs.lib.warn "ignoring dependency on doctest" null; + + ghcjs-dom = overrideCabal super.ghcjs-dom (drv: { + libraryHaskellDepends = with self; [ + ghcjs-base ghcjs-dom-jsffi text transformers + ]; + configureFlags = [ "-fjsffi" "-f-webkit" ]; + }); + + ghcjs-dom-jsffi = overrideCabal super.ghcjs-dom-jsffi (drv: { + libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ [ self.ghcjs-base self.text ]; + broken = false; + }); + + # https://github.com/Deewiant/glob/issues/39 + Glob = dontCheck super.Glob; + + # Test fails to compile during the hsc2hs stage + hashable = dontCheck super.hashable; + + # uses doctest + http-types = dontCheck super.http-types; + + jsaddle = overrideCabal super.jsaddle (drv: { + libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ [ self.ghcjs-base ]; + }); + + # Tests hang, possibly some issue with tasty and race(async) usage in the nonTerminating tests + logict = dontCheck super.logict; + + patch = dontCheck super.patch; + + # TODO: tests hang + pcre-light = dontCheck super.pcre-light; + + # Terminal test not supported on ghcjs + QuickCheck = dontCheck super.QuickCheck; + + reflex = overrideCabal super.reflex (drv: { + libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ [ self.ghcjs-base ]; + }); + + reflex-dom = overrideCabal super.reflex-dom (drv: { + libraryHaskellDepends = removeLibraryHaskellDepends ["jsaddle-webkit2gtk"] (drv.libraryHaskellDepends or []); + }); + + # https://github.com/dreixel/syb/issues/21 + syb = dontCheck super.syb; + + # nodejs crashes during test + scientific = dontCheck super.scientific; + + # Tests use TH which gives error + tasty-quickcheck = dontCheck super.tasty-quickcheck; + + temporary = dontCheck super.temporary; + + # 2 tests fail, related to time precision + time-compat = dontCheck super.time-compat; + + # TODO: The tests have a TH error, which has been fixed in ghc + # https://gitlab.haskell.org/ghc/ghc/-/issues/15481 but somehow the issue is + # still present here https://github.com/glguy/th-abstraction/issues/53 + th-abstraction = dontCheck super.th-abstraction; + + # https://github.com/haskell/vector/issues/410 + vector = appendPatch super.vector (../compilers/ghcjs/patches/vector-ghcjs-storable-set.patch) ; + + # Need hedgehog for tests, which fails to compile due to dep on concurrent-output + zenc = dontCheck super.zenc; +} diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 12832210fa81..6a7605d20cfd 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -288,6 +288,7 @@ broken-packages: - barrie - barrier - barrier-monad + - base62 - base64-conduit - base-compat-migrate - base-encoding @@ -556,6 +557,7 @@ broken-packages: - capri - caramia - carbonara + - cardano-coin-selection - carettah - CarneadesDSL - carte @@ -843,7 +845,6 @@ broken-packages: - Craft3e - craftwerk - crawlchain - - crc - crc16 - crdt-event-fold - creatur @@ -1103,6 +1104,7 @@ broken-packages: - doctest-prop - docusign-example - docvim + - doi - dominion - domplate - dormouse-uri @@ -5228,6 +5230,7 @@ broken-packages: - why3 - WikimediaParser - windns + - windowslive - winerror - Wired - wires diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 022e8f74f233..2b4ffb3c4eea 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -96,6 +96,8 @@ default-package-overrides: - reflex-dom-pandoc < 1.0.0.0 # 2021-09-07: pin to our current GHC version - ghc-api-compat == 8.10.7 + # 2021-09-14: Pin hiedb to version needed by ghcide + - hiedb == 0.4.0.* extra-packages: - base16-bytestring < 1 # required for cabal-install etc. @@ -113,12 +115,12 @@ extra-packages: - haddock-api == 2.23.* # required on GHC < 8.10.x - haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0 - happy == 1.19.9 # for purescript + - happy == 1.19.12 # for ghcjs - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20 - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - optparse-applicative < 0.16 # needed for niv-0.2.19 - - refinery == 0.3.* # required by hls-tactics-plugin-1.0.0.0 - resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x - sbv == 7.13 # required for pkgs.petrinizer - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index a39665e2d6a0..d7f850773b42 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 18.9 +# Stackage LTS 18.10 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -159,7 +159,7 @@ default-package-overrides: - approximate-equality ==1.1.0.2 - app-settings ==0.2.0.12 - arbor-lru-cache ==0.1.1.1 - - arithmoi ==0.12.0.0 + - arithmoi ==0.12.0.1 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - arrows ==0.4.4.2 @@ -573,7 +573,7 @@ default-package-overrides: - dbus ==1.2.17 - dbus-hslogger ==0.1.0.1 - debian ==4.0.2 - - debian-build ==0.10.2.0 + - debian-build ==0.10.2.1 - debug-trace-var ==0.2.0 - dec ==0.0.4 - Decimal ==0.5.2 @@ -587,7 +587,7 @@ default-package-overrides: - dependent-sum ==0.7.1.0 - dependent-sum-template ==0.1.0.3 - depq ==0.4.2 - - deque ==0.4.3 + - deque ==0.4.4 - deriveJsonNoPrefix ==0.1.0.1 - derive-topdown ==0.0.2.2 - deriving-aeson ==0.2.7 @@ -777,7 +777,7 @@ default-package-overrides: - fixed-length ==0.2.3 - fixed-vector ==1.2.0.0 - fixed-vector-hetero ==0.6.1.0 - - fix-whitespace ==0.0.6 + - fix-whitespace ==0.0.7 - flac ==0.2.0 - flac-picture ==0.1.2 - flags-applicative ==0.1.0.3 @@ -789,7 +789,7 @@ default-package-overrides: - flow ==1.0.22 - flush-queue ==1.0.0 - fmlist ==0.9.4 - - fmt ==0.6.2.0 + - fmt ==0.6.3.0 - fn ==0.3.0.2 - focus ==1.0.2 - focuslist ==0.1.0.2 @@ -1003,6 +1003,7 @@ default-package-overrides: - haskell-src-exts-util ==0.2.5 - haskell-src-meta ==0.8.7 - haskey-btree ==0.3.0.1 + - hasktags ==0.72.0 - hasql ==1.4.5.1 - hasql-notifications ==0.2.0.0 - hasql-optparse-applicative ==0.3.0.6 @@ -1135,7 +1136,7 @@ default-package-overrides: - hspec-wai-json ==0.11.0 - hs-php-session ==0.0.9.3 - hsshellscript ==3.5.0 - - hs-tags ==0.1.5.1 + - hs-tags ==0.1.5.2 - HStringTemplate ==0.8.8 - HSvm ==0.1.1.3.22 - HsYAML ==0.2.1.0 @@ -1239,7 +1240,7 @@ default-package-overrides: - indexed-traversable-instances ==0.1 - infer-license ==0.2.0 - inflections ==0.4.0.6 - - influxdb ==1.9.1.2 + - influxdb ==1.9.2 - ini ==0.4.1 - inj ==1.0 - inline-c ==0.9.1.5 @@ -1304,11 +1305,12 @@ default-package-overrides: - js-dgtable ==0.5.2 - js-flot ==0.8.3 - js-jquery ==3.3.1 + - json ==0.10 - json-feed ==1.0.13 - jsonifier ==0.1.1 - jsonpath ==0.2.0.0 - json-rpc ==1.0.3 - - json-rpc-generic ==0.2.1.5 + - json-rpc-generic ==0.2.1.6 - JuicyPixels ==3.3.5 - JuicyPixels-blurhash ==0.1.0.3 - JuicyPixels-extra ==0.5.2 @@ -1766,7 +1768,7 @@ default-package-overrides: - persistent-mtl ==0.2.2.0 - persistent-mysql ==2.13.0.2 - persistent-pagination ==0.1.1.2 - - persistent-postgresql ==2.13.0.3 + - persistent-postgresql ==2.13.1.0 - persistent-qq ==2.12.0.1 - persistent-sqlite ==2.13.0.3 - persistent-template ==2.12.0.0 @@ -2005,7 +2007,7 @@ default-package-overrides: - rev-state ==0.1.2 - rfc1751 ==0.1.3 - rfc5051 ==0.2 - - rhbzquery ==0.4.3 + - rhbzquery ==0.4.4 - rhine ==0.7.0 - rhine-gloss ==0.7.0 - rigel-viz ==0.2.0.0 @@ -2043,9 +2045,9 @@ default-package-overrides: - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - sampling ==0.3.5 - - sandwich ==0.1.0.8 - - sandwich-quickcheck ==0.1.0.5 - - sandwich-slack ==0.1.0.4 + - sandwich ==0.1.0.9 + - sandwich-quickcheck ==0.1.0.6 + - sandwich-slack ==0.1.0.6 - sandwich-webdriver ==0.1.0.6 - say ==0.1.0.1 - sbp ==2.6.3 @@ -2127,7 +2129,7 @@ default-package-overrides: - setlocale ==1.0.0.10 - sexp-grammar ==2.3.1 - SHA ==1.6.4.4 - - shake ==0.19.5 + - shake ==0.19.6 - shake-language-c ==0.12.0 - shake-plus ==0.3.4.0 - shake-plus-extended ==0.4.1.0 @@ -2259,7 +2261,7 @@ default-package-overrides: - streamt ==0.5.0.0 - strict ==0.4.0.1 - strict-concurrency ==0.2.4.3 - - strict-list ==0.1.5 + - strict-list ==0.1.6 - strict-tuple ==0.1.4 - strict-tuple-lens ==0.1.0.1 - stringbuilder ==0.5.1 @@ -2370,7 +2372,7 @@ default-package-overrides: - text-format ==0.3.2 - text-icu ==0.7.1.0 - text-latin1 ==0.3.1 - - text-ldap ==0.1.1.13 + - text-ldap ==0.1.1.14 - textlocal ==0.1.0.5 - text-manipulate ==0.3.0.0 - text-metrics ==0.3.1 @@ -2408,7 +2410,7 @@ default-package-overrides: - thread-supervisor ==0.2.0.0 - threepenny-gui ==0.9.1.0 - th-reify-compat ==0.0.1.5 - - th-reify-many ==0.1.9 + - th-reify-many ==0.1.10 - throttle-io-stream ==0.2.0.1 - through-text ==0.1.0.0 - throwable-exceptions ==0.1.0.9 @@ -2575,7 +2577,7 @@ default-package-overrides: - vector-circular ==0.1.3 - vector-instances ==3.4 - vector-mmap ==0.0.3 - - vector-rotcev ==0.1.0.0 + - vector-rotcev ==0.1.0.1 - vector-sized ==1.4.4 - vector-space ==0.16 - vector-split ==1.0.0.2 @@ -2608,7 +2610,7 @@ default-package-overrides: - wai-rate-limit-redis ==0.1.0.0 - wai-saml2 ==0.2.1.2 - wai-session ==0.3.3 - - wai-session-redis ==0.1.0.2 + - wai-session-redis ==0.1.0.3 - wai-slack-middleware ==0.2.0 - wai-websockets ==3.0.1.2 - wakame ==0.1.0.0 @@ -2630,6 +2632,7 @@ default-package-overrides: - wikicfp-scraper ==0.1.0.12 - wild-bind ==0.1.2.7 - wild-bind-x11 ==0.2.0.13 + - Win32 ==2.6.2.1 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - witch ==0.3.4.0 @@ -2689,7 +2692,7 @@ default-package-overrides: - yaml ==0.11.5.0 - yamlparse-applicative ==0.2.0.0 - yesod ==1.6.1.2 - - yesod-auth ==1.6.10.3 + - yesod-auth ==1.6.10.4 - yesod-auth-hashdb ==1.7.1.7 - yesod-auth-oauth2 ==0.6.3.4 - yesod-bin ==1.6.1 diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index fe7d2b7663d6..ead6c306edba 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -602,9 +602,6 @@ dont-distribute-packages: - boots-web - borel - bowntz - - box - - box-csv - - box-socket - breakout - bricks - bricks-internal-test @@ -650,7 +647,6 @@ dont-distribute-packages: - call - camfort - campfire - - candid - canteven-http - cao - cap @@ -700,6 +696,7 @@ dont-distribute-packages: - chr-core - chr-lang - chromatin + - chronos_1_1_3 - chu2 - chunks - ciphersaber2 @@ -3181,7 +3178,6 @@ dont-distribute-packages: - wavy - web-mongrel2 - web-page - - web-rep - web-routes-regular - web-routing - web3 diff --git a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 1f15b4cdda7c..f87aee89d453 100644 --- a/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -699,7 +699,7 @@ self: super: builtins.intersectAttrs super { testTarget = "unit-tests"; }; - haskell-language-server = enableCabalFlag (enableCabalFlag (overrideCabal super.haskell-language-server (drv: { + haskell-language-server = overrideCabal super.haskell-language-server (drv: { postInstall = let inherit (pkgs.lib) concatStringsSep take splitString; ghc_version = self.ghc.version; @@ -714,7 +714,7 @@ self: super: builtins.intersectAttrs super { export PATH=$PATH:$PWD/dist/build/haskell-language-server:$PWD/dist/build/haskell-language-server-wrapper export HOME=$TMPDIR ''; - })) "all-plugins") "all-formatters"; + }); # tests depend on a specific version of solc hevm = dontCheck (doJailbreak super.hevm); @@ -842,6 +842,16 @@ self: super: builtins.intersectAttrs super { export HOME=$TMPDIR/home ''; }); + hiedb = overrideCabal super.hiedb (drv: { + preCheck = '' + export PATH=$PWD/dist/build/hiedb:$PATH + ''; + }); + hls-call-hierarchy-plugin = overrideCabal super.hls-call-hierarchy-plugin (drv: { + preCheck = '' + export HOME=$TMPDIR/home + ''; + }); # Tests have file permissions expections that don‘t work with the nix store. hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin; hls-haddock-comments-plugin = overrideCabal super.hls-haddock-comments-plugin (drv: { diff --git a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index ca8c0c141687..f2747b6a5402 100644 --- a/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -4,6 +4,22 @@ self: { + "2captcha" = callPackage + ({ mkDerivation, aeson, base, bytestring, clock, exceptions + , http-client, lens, lens-aeson, parsec, text, wreq + }: + mkDerivation { + pname = "2captcha"; + version = "0.1.0.0"; + sha256 = "1876bdriagjfp4dyhhkpjrwa8kycvwa0zrdihw5q7dj5msmnxsrc"; + libraryHaskellDepends = [ + aeson base bytestring clock exceptions http-client lens lens-aeson + parsec text wreq + ]; + description = "Haskell package for easy integration with the 2captcha API"; + license = lib.licenses.mit; + }) {}; + "3d-graphics-examples" = callPackage ({ mkDerivation, base, GLUT, OpenGL, random }: mkDerivation { @@ -2761,15 +2777,15 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "Cabal_3_6_0_0" = callPackage + "Cabal_3_6_1_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , deepseq, directory, filepath, mtl, parsec, pretty, process, text , time, transformers, unix }: mkDerivation { pname = "Cabal"; - version = "3.6.0.0"; - sha256 = "0xkyip9fm1k4cwjifqsh12xwi7za5lcbszqkl11gjyx6nxddzdhv"; + version = "3.6.1.0"; + sha256 = "0yjdp78775752k10q4j5dbvqj37xaa2b3anmfld53mgr17k182a7"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -3455,8 +3471,8 @@ self: { }: mkDerivation { pname = "ConClusion"; - version = "0.0.2"; - sha256 = "1n2wyvcyh950v67z4szvnr19vdh0fg2zvhxqyfqblpb1njayy92l"; + version = "0.1.0"; + sha256 = "1zi113zyf6fp133fplc3263683asxf0j038xsy51simwzw4rmxjc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -17820,8 +17836,8 @@ self: { pname = "SVGFonts"; version = "1.7.0.1"; sha256 = "06vnpkkr19s9b1wjp7l2w29vr7fsghcrffd2knlxvdhjacrfpc9h"; - revision = "1"; - editedCabalFile = "110zlafis1rivba3za7in92fq6a7738hh57w5gkivi50d7pfbw24"; + revision = "2"; + editedCabalFile = "0q731cyrqq1csbid9nxh2bj6rf8yss017lz9j9zk22bw3bymzb0s"; enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base blaze-markup blaze-svg bytestring cereal @@ -21165,8 +21181,19 @@ self: { ({ mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.12.0.1"; - sha256 = "1nivdwjp9x9i64xg8gf3xj8khm9dfq6n5m8kvvlhz7i7ypl4mv72"; + version = "2.6.2.1"; + sha256 = "03lwm777sqv24hwyjjail8lk95jgaw7mns1g1hx2qhk29593432q"; + description = "A binding to Windows Win32 API"; + license = lib.licenses.bsd3; + platforms = lib.platforms.none; + }) {}; + + "Win32_2_13_0_0" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "Win32"; + version = "2.13.0.0"; + sha256 = "0i4ws3d7s94vv6gh3cjj9nr0l88rwx7bwjk9jk0grzvw734dd9a2"; description = "A binding to Windows Win32 API"; license = lib.licenses.bsd3; platforms = lib.platforms.none; @@ -21838,8 +21865,8 @@ self: { ({ mkDerivation, base, deepseq, random, simple-affine-space }: mkDerivation { pname = "Yampa"; - version = "0.13.1"; - sha256 = "0wx47awmijdrw4alcwd4icfip8702h3riq0nhs8sjfjqsihdz4fb"; + version = "0.13.2"; + sha256 = "0y0jmk9cbcnhwdrjcacx5j8gb64aj61a04nxizwbds0zvibcdzgb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32604,8 +32631,8 @@ self: { }: mkDerivation { pname = "arduino-copilot"; - version = "1.5.4"; - sha256 = "15z3ndcg1ycnfzvqbbfalx1gfa61pyi5n2fy1dj8qm0gqkhz23lh"; + version = "1.5.5"; + sha256 = "0g2zw7xngaz5xhp4zrnhrkscnyck0474mngvp2j14p87sc7qn20w"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language directory filepath mtl optparse-applicative temporary @@ -32940,39 +32967,6 @@ self: { , deepseq, exact-pi, integer-gmp, integer-logarithms, integer-roots , mod, QuickCheck, quickcheck-classes, random, semirings , smallcheck, tasty, tasty-bench, tasty-hunit, tasty-quickcheck - , tasty-rerun, tasty-smallcheck, transformers, vector, vector-sized - }: - mkDerivation { - pname = "arithmoi"; - version = "0.12.0.0"; - sha256 = "1lghgr4z2vhafj8d8971pdghih6r5qq5xlc0b87jmazyhzz95w3f"; - revision = "1"; - editedCabalFile = "1b08p18k41sm298rn1z5ljs1l6s74nddm4fpdgix3npl8wsmmxgq"; - configureFlags = [ "-f-llvm" ]; - libraryHaskellDepends = [ - array base chimera constraints containers deepseq exact-pi - integer-gmp integer-logarithms integer-roots mod random semirings - transformers vector - ]; - testHaskellDepends = [ - base containers exact-pi integer-gmp integer-roots mod QuickCheck - quickcheck-classes random semirings smallcheck tasty tasty-hunit - tasty-quickcheck tasty-rerun tasty-smallcheck transformers vector - vector-sized - ]; - benchmarkHaskellDepends = [ - array base constraints containers deepseq integer-logarithms mod - random semirings tasty-bench vector - ]; - description = "Efficient basic number-theoretic functions"; - license = lib.licenses.mit; - }) {}; - - "arithmoi_0_12_0_1" = callPackage - ({ mkDerivation, array, base, chimera, constraints, containers - , deepseq, exact-pi, integer-gmp, integer-logarithms, integer-roots - , mod, QuickCheck, quickcheck-classes, random, semirings - , smallcheck, tasty, tasty-bench, tasty-hunit, tasty-quickcheck , tasty-rerun, tasty-smallcheck, transformers, vector }: mkDerivation { @@ -32996,7 +32990,6 @@ self: { ]; description = "Efficient basic number-theoretic functions"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "arity-generic-liftA" = callPackage @@ -38633,6 +38626,8 @@ self: { ]; description = "Base62 encoding and decoding"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "base64" = callPackage @@ -39067,6 +39062,23 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "batching" = callPackage + ({ mkDerivation, base, primitive, QuickCheck, short-vec, sint + , test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "batching"; + version = "0.1.0.0"; + sha256 = "1mks6w3zfvkdgi9didf94jp1hac9ps4pli75vn79p9hxjwc2fm27"; + libraryHaskellDepends = [ base primitive short-vec sint ]; + testHaskellDepends = [ + base primitive QuickCheck short-vec sint test-framework + test-framework-quickcheck2 + ]; + description = "An Applicative Functor deferring actions to run in a batch later"; + license = lib.licenses.asl20; + }) {}; + "battlenet" = callPackage ({ mkDerivation, aeson, base, containers, http-conduit, text }: mkDerivation { @@ -40021,8 +40033,8 @@ self: { }: mkDerivation { pname = "bencoding"; - version = "0.4.5.3"; - sha256 = "0sj69g4a68bv43vgmqdgp2nzi30gzp4lgz78hg1rdhind8lxrvp9"; + version = "0.4.5.4"; + sha256 = "01ncsvlay03h4cnj19mvrwbhmx0mksrvyq96qq8r5f7i8l0l9z8r"; libraryHaskellDepends = [ attoparsec base bytestring deepseq ghc-prim integer-gmp mtl pretty text @@ -42551,23 +42563,23 @@ self: { "bisc" = callPackage ({ mkDerivation, base, bytestring, configurator, data-default - , directory, exceptions, filepath, leveldb-haskell, mtl, selda - , selda-sqlite, snappy, text + , directory, exceptions, filepath, leveldb-haskell, mtl + , optparse-applicative, selda, selda-sqlite, text }: mkDerivation { pname = "bisc"; - version = "0.3.1.0"; - sha256 = "0d0n3dmdfh4dxnxa8pdvdh4fhlhpdal4fixbjk2ignmf6ghm54qk"; + version = "0.4.0.0"; + sha256 = "1x0i3yjgfnhw5nsx2fr150anf199z29g630xv58315xz6a526js0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring configurator data-default directory exceptions - filepath leveldb-haskell mtl selda selda-sqlite text + filepath leveldb-haskell mtl optparse-applicative selda + selda-sqlite text ]; - executableSystemDepends = [ snappy ]; description = "A small tool that clears cookies (and more)"; license = lib.licenses.gpl3Only; - }) {inherit (pkgs) snappy;}; + }) {}; "biscuit-haskell" = callPackage ({ mkDerivation, async, attoparsec, base, base16-bytestring, base64 @@ -44325,6 +44337,94 @@ self: { broken = true; }) {}; + "blockfrost-api" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default + , data-default-class, deriving-aeson, hspec, lens, QuickCheck + , quickcheck-instances, raw-strings-qq, safe-money, servant + , servant-docs, servant-multipart-api, tasty, tasty-discover + , tasty-hspec, tasty-hunit, template-haskell, text, time, vector + }: + mkDerivation { + pname = "blockfrost-api"; + version = "0.1.0.0"; + sha256 = "0fc1s4ajx2l5s3csqz7q7r6kr985607cj3a2x2ypwv1q6x1f2amz"; + libraryHaskellDepends = [ + aeson base bytestring data-default-class deriving-aeson lens + QuickCheck quickcheck-instances safe-money servant servant-docs + servant-multipart-api template-haskell text time + ]; + testHaskellDepends = [ + aeson base bytestring data-default hspec raw-strings-qq safe-money + tasty tasty-hspec tasty-hunit text vector + ]; + testToolDepends = [ tasty-discover ]; + description = "API definitions for blockfrost.io"; + license = lib.licenses.asl20; + }) {}; + + "blockfrost-client" = callPackage + ({ mkDerivation, base, blockfrost-api, blockfrost-client-core + , bytestring, data-default, directory, filepath, hspec, mtl + , servant, servant-client, servant-client-core, tasty + , tasty-discover, tasty-hspec, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "blockfrost-client"; + version = "0.1.0.0"; + sha256 = "0n21zbmspjix1jnwym7xijaciyii85phb07ndr5dih12i9vsncp6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blockfrost-api blockfrost-client-core bytestring data-default + directory filepath mtl servant servant-client servant-client-core + text + ]; + testHaskellDepends = [ + base hspec tasty tasty-hspec tasty-hunit tasty-quickcheck + ]; + testToolDepends = [ tasty-discover ]; + description = "blockfrost.io basic client"; + license = lib.licenses.asl20; + }) {}; + + "blockfrost-client-core" = callPackage + ({ mkDerivation, aeson, base, blockfrost-api, bytestring + , case-insensitive, containers, data-default, http-client + , http-client-tls, http-types, servant, servant-client + , servant-client-core, servant-multipart-api + , servant-multipart-client, text + }: + mkDerivation { + pname = "blockfrost-client-core"; + version = "0.1.0.0"; + sha256 = "0khybzvsy61zl4z02ccvh51gl4xj2cbi20i27xl4wxrhw6iqzc0i"; + libraryHaskellDepends = [ + aeson base blockfrost-api bytestring case-insensitive containers + data-default http-client http-client-tls http-types servant + servant-client servant-client-core servant-multipart-api + servant-multipart-client text + ]; + description = "blockfrost.io common client definitions / instances"; + license = lib.licenses.asl20; + }) {}; + + "blockfrost-pretty" = callPackage + ({ mkDerivation, base, blockfrost-api, data-default, lens + , prettyprinter, prettyprinter-ansi-terminal, safe-money, text + , time + }: + mkDerivation { + pname = "blockfrost-pretty"; + version = "0.1.0.0"; + sha256 = "1i25jcq45jf9x8idi9ipwfikq2pcnzpia8flcdgn8c9s6ap5bb1h"; + libraryHaskellDepends = [ + base blockfrost-api data-default lens prettyprinter + prettyprinter-ansi-terminal safe-money text time + ]; + description = "blockfrost.io pretty-printing utilities"; + license = lib.licenses.asl20; + }) {}; + "blockhash" = callPackage ({ mkDerivation, base, bytestring, JuicyPixels , optparse-applicative, primitive, vector, vector-algorithms @@ -45706,72 +45806,57 @@ self: { }) {}; "box" = callPackage - ({ mkDerivation, attoparsec, base, comonad, concurrency, containers - , contravariant, dejafu, doctest, exceptions, generic-lens, lens - , mmorph, mtl, numhask, numhask-space, optparse-generic - , profunctors, random, text, time, transformers, transformers-base - , websockets + ({ mkDerivation, attoparsec, base, concurrency, containers + , contravariant, exceptions, lens, mmorph, mtl, profunctors, text + , time, transformers }: mkDerivation { pname = "box"; - version = "0.6.3"; - sha256 = "1qdl8n9icp8v8hpk4jd3gsg8wrr469q4y6h6p1h6n6f899rwpv5c"; - isLibrary = true; - isExecutable = true; + version = "0.7.0"; + sha256 = "0fxrhfzf4xsfma2x355ij3ky1h83wq3khd08vkix1lnmw9vnvk37"; libraryHaskellDepends = [ - attoparsec base comonad concurrency containers contravariant - exceptions lens mmorph numhask numhask-space profunctors text time - transformers transformers-base + attoparsec base concurrency containers contravariant exceptions + lens mmorph mtl profunctors text time transformers ]; - executableHaskellDepends = [ - base concurrency containers dejafu exceptions generic-lens lens mtl - numhask optparse-generic random text transformers websockets - ]; - testHaskellDepends = [ base doctest numhask ]; description = "boxes"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "box-csv" = callPackage - ({ mkDerivation, attoparsec, base, box, doctest, generic-lens, lens - , numhask, scientific, text, time + ({ mkDerivation, attoparsec, base, box, generic-lens, lens + , scientific, text, time }: mkDerivation { pname = "box-csv"; - version = "0.0.3"; - sha256 = "16kg45hma04r6slw2fic5jbamkcbv6mgqybw081w76hckcg72522"; + version = "0.1.0"; + sha256 = "0h62za6qirm003bwrsjb9pj4d9gnrypvqchzhnv3nj37niscmddy"; libraryHaskellDepends = [ - attoparsec base box generic-lens lens numhask scientific text time + attoparsec base box generic-lens lens scientific text time ]; - testHaskellDepends = [ base doctest numhask ]; - description = "See readme.md"; + description = "CSV parsing in a box"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "box-socket" = callPackage - ({ mkDerivation, base, box, bytestring, concurrency, doctest - , exceptions, generic-lens, lens, network, network-simple, numhask - , optparse-generic, websockets + ({ mkDerivation, async, base, box, bytestring, concurrency + , exceptions, generic-lens, lens, network, network-simple + , optparse-generic, text, websockets }: mkDerivation { pname = "box-socket"; - version = "0.1.2"; - sha256 = "0ybv8amph38s2yz8qpwjrn7428d09ikl7d5ljqkbivydripg6ybc"; + version = "0.2.0"; + sha256 = "198llmb67g348apjrhp180x2ykjlp2mnbhvkw90yh5nm7pnd0j3c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base box bytestring concurrency exceptions generic-lens lens - network network-simple numhask websockets + async base box bytestring concurrency exceptions generic-lens lens + network network-simple text websockets ]; executableHaskellDepends = [ - base box concurrency generic-lens lens numhask optparse-generic + base box concurrency generic-lens lens optparse-generic text ]; - testHaskellDepends = [ base doctest numhask ]; description = "Box websockets"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "box-tuples" = callPackage @@ -46012,7 +46097,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "brick_0_64" = callPackage + "brick_0_64_1" = callPackage ({ mkDerivation, base, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, dlist, exceptions , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm @@ -46021,8 +46106,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.64"; - sha256 = "06l6vqxl2hd788pf465h7d4xicnd8zj6h1n73dg7s3mnhx177n2n"; + version = "0.64.1"; + sha256 = "13n4m4qfxbh8grqmp3ycl99xf8hszk9539qy73bzz785axgvhhbj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47647,6 +47732,22 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "byte-count-reader_0_10_1_6" = callPackage + ({ mkDerivation, base, extra, hspec, parsec, parsec-numbers, text + }: + mkDerivation { + pname = "byte-count-reader"; + version = "0.10.1.6"; + sha256 = "182pc1fx74zfcrvp1g3ghqw3rhc9pcjkxy92n66pg0zm8yk8xqly"; + libraryHaskellDepends = [ base extra parsec parsec-numbers text ]; + testHaskellDepends = [ + base extra hspec parsec parsec-numbers text + ]; + description = "Read strings describing a number of bytes like 2Kb and 0.5 MiB"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "byte-order" = callPackage ({ mkDerivation, base, primitive, primitive-unaligned }: mkDerivation { @@ -47820,8 +47921,8 @@ self: { }: mkDerivation { pname = "byteslice"; - version = "0.2.5.2"; - sha256 = "0nva9w086g6d7g6bjwk4ad14jz8z17m0m9fvzfxv90cx6wkmvph3"; + version = "0.2.6.0"; + sha256 = "0kgrqf5v0crr44xm46fppkbqw5r738qspwyjdk9g4wavsm1bk20b"; libraryHaskellDepends = [ base bytestring primitive primitive-addr primitive-unlifted run-st tuples vector @@ -49278,8 +49379,8 @@ self: { }: mkDerivation { pname = "cabal-install"; - version = "3.4.0.0"; - sha256 = "15rylx5pa03jdiwcg1x7zvs6aq3g6phwmi1hz26cl080nczyz00r"; + version = "3.6.0.0"; + sha256 = "0ishq4n1jn0kll8257akrzm95lg9ryhyp9pzypcikgvqhl0sz741"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -50763,20 +50864,20 @@ self: { "call-alloy" = callPackage ({ mkDerivation, base, bytestring, containers, directory - , file-embed, filepath, hashable, hspec, lens, mtl, process, split + , file-embed, filepath, hashable, hspec, mtl, process, split , trifecta, unix }: mkDerivation { pname = "call-alloy"; - version = "0.2.1.1"; - sha256 = "0vgn4rrpnhmjcn7wh01nr4q0mlmr4ja2dd1b9vysxfrmslfxnxda"; + version = "0.2.2.0"; + sha256 = "09xy823lxmp4siqxbv8f6v192a9bs0vmq36293cbiv7g7w65bnvi"; libraryHaskellDepends = [ base bytestring containers directory file-embed filepath hashable - lens mtl process split trifecta unix + mtl process split trifecta unix ]; testHaskellDepends = [ base bytestring containers directory file-embed filepath hashable - hspec lens mtl process split trifecta unix + hspec mtl process split trifecta unix ]; description = "A simple library to call Alloy given a specification"; license = lib.licenses.mit; @@ -50944,7 +51045,6 @@ self: { ]; description = "Candid integration"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "canon" = callPackage @@ -51260,6 +51360,8 @@ self: { pname = "capnp"; version = "0.14.0.0"; sha256 = "15v0s597wq0ipvikd727fzcqg5r6685lvr8y1x93q5mdl975gi8m"; + revision = "1"; + editedCabalFile = "1s57x426qkn54g8zj8rbn77qg849mx5ps1zwjj6gwfjifddgd5g5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51440,6 +51542,8 @@ self: { ]; description = "Algorithms for coin selection and fee balancing"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cardano-transactions" = callPackage @@ -53834,30 +53938,26 @@ self: { }) {}; "chart-svg" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, Color, concurrency - , containers, cubicbezier, doctest, foldl, generic-lens - , JuicyPixels, lens, linear, lucid, numhask, numhask-space - , reanimate, reanimate-svg, scientific, tagsoup, text, time - , transformers, unordered-containers, vector + ({ mkDerivation, attoparsec, base, Color, containers, cubicbezier + , foldl, generic-lens, JuicyPixels, lens, linear, lucid, mtl + , numhask, numhask-space, reanimate, reanimate-svg, scientific + , tagsoup, text, time, transformers, unordered-containers }: mkDerivation { pname = "chart-svg"; - version = "0.2.2"; - sha256 = "184hpqkc9fvn64bg550clwxvjg2ii8igcl7nq3895pgi0cxxr0p1"; + version = "0.2.3"; + sha256 = "1j96l71gi2nrvwrwsvww9x7whvv3vmnc0ywgiy6ak1yh71hmivm1"; + revision = "1"; + editedCabalFile = "1zanv288hlir51yv4zqkcf2b4wxqivwd5y6f1s1n9zdn9k6b7c64"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base Color containers cubicbezier foldl generic-lens - JuicyPixels lens linear lucid numhask numhask-space reanimate + JuicyPixels lens linear lucid mtl numhask numhask-space reanimate reanimate-svg scientific tagsoup text time transformers unordered-containers ]; - executableHaskellDepends = [ - attoparsec base bytestring concurrency foldl JuicyPixels lens - linear lucid numhask numhask-space reanimate reanimate-svg text - time transformers unordered-containers vector - ]; - testHaskellDepends = [ base doctest numhask ]; + executableHaskellDepends = [ base lens reanimate ]; description = "Charting library targetting SVGs"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -54851,19 +54951,22 @@ self: { license = lib.licenses.bsd3; }) {}; - "chronos_1_1_2" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion - , deepseq, doctest, hashable, HUnit, old-locale, primitive - , QuickCheck, semigroups, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, thyme, time, torsor, vector + "chronos_1_1_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytebuild, byteslice + , bytesmith, bytestring, criterion, deepseq, doctest, hashable + , HUnit, natural-arithmetic, old-locale, primitive, QuickCheck + , semigroups, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, text-short, thyme, time, torsor + , vector }: mkDerivation { pname = "chronos"; - version = "1.1.2"; - sha256 = "0izzg5cnnw53m3pfxglpj96i88h1qx75w04n6a67855xly4dfyxa"; + version = "1.1.3"; + sha256 = "1c5jzws6szqf9izifavapzvvib0b83rlyf5wcjfrshfipwfqrg26"; libraryHaskellDepends = [ - aeson attoparsec base bytestring deepseq hashable primitive - semigroups text torsor vector + aeson attoparsec base bytebuild byteslice bytesmith bytestring + deepseq hashable natural-arithmetic primitive semigroups text + text-short torsor vector ]; testHaskellDepends = [ aeson attoparsec base bytestring deepseq doctest HUnit QuickCheck @@ -54872,7 +54975,7 @@ self: { ]; benchmarkHaskellDepends = [ attoparsec base bytestring criterion deepseq old-locale QuickCheck - text thyme time vector + text text-short thyme time vector ]; description = "A high-performance time library"; license = lib.licenses.bsd3; @@ -55426,6 +55529,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "circular_0_4_0_1" = callPackage + ({ mkDerivation, aeson, base, criterion, hspec, primitive + , QuickCheck, quickcheck-instances, vector + }: + mkDerivation { + pname = "circular"; + version = "0.4.0.1"; + sha256 = "03j06zf2fshcf59df088i47s4nx89arggv9h96izbpi0rz4m0fmk"; + libraryHaskellDepends = [ aeson base primitive vector ]; + testHaskellDepends = [ + aeson base hspec primitive QuickCheck quickcheck-instances vector + ]; + benchmarkHaskellDepends = [ base criterion vector ]; + description = "Circular fixed-sized mutable vectors"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "circus" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, mtl, syb , text @@ -57211,6 +57332,17 @@ self: { license = lib.licenses.mit; }) {}; + "closed-classes" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "closed-classes"; + version = "0.1"; + sha256 = "1l62g1akdxwfxjy80hbfw7bmscbrxr8xqq6gdx7d2z8np7vvjr3k"; + libraryHaskellDepends = [ base template-haskell ]; + description = "Closed type class declarations"; + license = lib.licenses.bsd3; + }) {}; + "closed-intervals" = callPackage ({ mkDerivation, base, containers, doctest-exitcode-stdio , doctest-lib, filtrable, QuickCheck, time, utility-ht @@ -58585,8 +58717,8 @@ self: { ({ mkDerivation, base, profunctors }: mkDerivation { pname = "coercible-subtypes"; - version = "0.1.1.0"; - sha256 = "1q6a38y49a31vl19i5c5kym36fjxspxj6vfi0b35j4gb9b7r642r"; + version = "0.2.0.0"; + sha256 = "0n8g69l3iwcy588yj29b7qsac8n8cl44ibb62a36x9n2jpgz5xif"; libraryHaskellDepends = [ base profunctors ]; description = "Coercible but only in one direction"; license = lib.licenses.bsd3; @@ -58972,6 +59104,25 @@ self: { broken = true; }) {}; + "collate" = callPackage + ({ mkDerivation, base, containers, lens, primitive, QuickCheck + , test-framework, test-framework-quickcheck2, transformers, vector + }: + mkDerivation { + pname = "collate"; + version = "0.1.0.0"; + sha256 = "1fh335mwk51gyhyxilv83z66ilz5ws3ni8cbr4qmpfpgf9m1jp5s"; + libraryHaskellDepends = [ + base containers lens primitive transformers vector + ]; + testHaskellDepends = [ + base containers lens primitive QuickCheck test-framework + test-framework-quickcheck2 transformers vector + ]; + description = "An Applicative Functor for extracting parts of a stream of values"; + license = lib.licenses.asl20; + }) {}; + "collect-errors" = callPackage ({ mkDerivation, base, containers, deepseq, QuickCheck }: mkDerivation { @@ -60697,15 +60848,15 @@ self: { "composite-dhall" = callPackage ({ mkDerivation, base, composite-base, dhall, tasty, tasty-hunit - , text + , text, vinyl }: mkDerivation { pname = "composite-dhall"; - version = "0.0.4.1"; - sha256 = "19lhw02my7dv6gx2zlvmsbc2w4g09j1yxpwg6s203bd5n4dp5v9v"; - libraryHaskellDepends = [ base composite-base dhall text ]; + version = "0.1.0.0"; + sha256 = "05izp2zg6y4av8cc7lvvsy7ngk6aajqcm9x29faq36288dq1iim7"; + libraryHaskellDepends = [ base composite-base dhall text vinyl ]; testHaskellDepends = [ - base composite-base dhall tasty tasty-hunit text + base composite-base dhall tasty tasty-hunit text vinyl ]; description = "Dhall instances for composite records"; license = lib.licenses.mit; @@ -62871,6 +63022,21 @@ self: { broken = true; }) {}; + "conic-graphs" = callPackage + ({ mkDerivation, base, fcf-graphs, fcf-vinyl, first-class-families + , vinyl + }: + mkDerivation { + pname = "conic-graphs"; + version = "0.0.1.0"; + sha256 = "19fjgji22ikgr3c80cjr6bpj3cx28vsix8vwqmhmnmff9daw63z4"; + libraryHaskellDepends = [ + base fcf-graphs fcf-vinyl first-class-families vinyl + ]; + description = "Vinyl-style extensible graphs"; + license = lib.licenses.bsd3; + }) {}; + "conjugateGradient" = callPackage ({ mkDerivation, base, containers, random }: mkDerivation { @@ -62999,8 +63165,8 @@ self: { }: mkDerivation { pname = "connections"; - version = "0.3.1"; - sha256 = "0candwv3sv6qk76a4dn3m64957462da1pyvixl8jazf0gvq1pp23"; + version = "0.3.2"; + sha256 = "1j5vwg9ch37wkfa7sdyy97d6xlz4y70pfpcxp963cia9l28qpima"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers extended-reals time ]; @@ -63776,8 +63942,8 @@ self: { }: mkDerivation { pname = "contiguous"; - version = "0.6.0"; - sha256 = "0wlm8y732v0l7my67vlm0r7dpmp0ah8b4zqnjhksmabmrb7vfbak"; + version = "0.6.1"; + sha256 = "1cgmz0adrv1kv1z21cfs4s4lmzbyp4acq5v2ly96bckp8a35cbix"; libraryHaskellDepends = [ base deepseq primitive primitive-unlifted run-st ]; @@ -64471,8 +64637,8 @@ self: { }: mkDerivation { pname = "copilot"; - version = "3.4"; - sha256 = "1cl7w9z08rnzsig09q65i6j4644zj469isd1mjjiwp23yiqs5gfh"; + version = "3.5"; + sha256 = "1cia936fm14bzkd8qh8g8zri2lfx7n0jfbjqiqwpwhpgmxvfhznj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64491,8 +64657,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.4"; - sha256 = "14ajk29p4da777r9klfqhcyi5qkrz16qn5f6h22kgw1vqj9vm4ja"; + version = "3.5"; + sha256 = "1svcshxqrqp9m7pj7k77vfxzmzkanj0zyjq4ry985zzhcqgzcank"; libraryHaskellDepends = [ base containers copilot-core directory filepath language-c99 language-c99-simple language-c99-util mtl pretty @@ -64522,8 +64688,8 @@ self: { ({ mkDerivation, base, dlist, mtl, pretty }: mkDerivation { pname = "copilot-core"; - version = "3.4"; - sha256 = "01bxajyxd9na6msjnh6klnhc71xryc7nxz96pylyqn39978by7p0"; + version = "3.5"; + sha256 = "0i5jj4hzk0gqsjx24xswjna9cdwxbyv5hln5jsmhdhgw05c4z5g4"; libraryHaskellDepends = [ base dlist mtl pretty ]; description = "An intermediate representation for Copilot"; license = lib.licenses.bsd3; @@ -64531,15 +64697,14 @@ self: { "copilot-language" = callPackage ({ mkDerivation, array, base, containers, copilot-core - , copilot-theorem, data-reify, ghc-prim, mtl + , copilot-theorem, data-reify, mtl }: mkDerivation { pname = "copilot-language"; - version = "3.4"; - sha256 = "0i3ha9mpjizqalhnv2vvcgzs75r3ld7c4qhaknip3jw1d0j76fx6"; + version = "3.5"; + sha256 = "0s1yn4la8pbdwlcfrlx79031anagp235dbapm3c715mv67dgcs2b"; libraryHaskellDepends = [ - array base containers copilot-core copilot-theorem data-reify - ghc-prim mtl + array base containers copilot-core copilot-theorem data-reify mtl ]; description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems"; license = lib.licenses.bsd3; @@ -64552,8 +64717,8 @@ self: { }: mkDerivation { pname = "copilot-libraries"; - version = "3.4"; - sha256 = "13ypvpqr0g3xrvdria35c83yxpk3727wm6n8jdsihq7ilkhl00mf"; + version = "3.5"; + sha256 = "1glz1x00abyavyca7kz19ji7jipl5fjxwqi47mql4b3wr9ksc0y4"; libraryHaskellDepends = [ array base containers copilot-language data-reify mtl parsec ]; @@ -64587,8 +64752,8 @@ self: { }: mkDerivation { pname = "copilot-theorem"; - version = "3.4"; - sha256 = "1mrw6i4dwg8cx56821vcy0bnzyhxcch0k9byrkazg3jgplvalfbr"; + version = "3.5"; + sha256 = "0cb22695jp502iilyjkfhr8lzl97rdrpjvs9fbknrr0zbwn1m7p9"; libraryHaskellDepends = [ ansi-terminal base bimap bv-sized containers copilot-core data-default directory filepath libBF mtl panic parameterized-utils @@ -65120,6 +65285,20 @@ self: { broken = true; }) {}; + "covariance" = callPackage + ({ mkDerivation, base, glasso, hmatrix, statistics, tasty + , tasty-hunit, vector + }: + mkDerivation { + pname = "covariance"; + version = "0.1.0.5"; + sha256 = "0ahbr930imp1qf67zdalk67zykp1q6dm141wcrb6pkv6ldjavv2p"; + libraryHaskellDepends = [ base glasso hmatrix statistics vector ]; + testHaskellDepends = [ base hmatrix tasty tasty-hunit ]; + description = "Well-conditioned estimation of large-dimensional covariance matrices"; + license = lib.licenses.gpl3Plus; + }) {}; + "coverage" = callPackage ({ mkDerivation, base, hspec, HUnit, QuickCheck }: mkDerivation { @@ -65881,8 +66060,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Implements various Cyclic Redundancy Checks (CRC)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "crc16" = callPackage @@ -66449,6 +66626,20 @@ self: { broken = true; }) {}; + "cropty" = callPackage + ({ mkDerivation, base, binary, bytestring, cryptonite, hedgehog + , unliftio + }: + mkDerivation { + pname = "cropty"; + version = "0.2.0.0"; + sha256 = "1skw80716qwsmdg1m55bl556xc8mmailzhz7m8psgaf2ggiys3jc"; + libraryHaskellDepends = [ base binary bytestring cryptonite ]; + testHaskellDepends = [ base hedgehog unliftio ]; + description = "Encryption and decryption"; + license = lib.licenses.mit; + }) {}; + "cruncher-types" = callPackage ({ mkDerivation, aeson, base, containers, hlint, lens, text }: mkDerivation { @@ -72366,8 +72557,8 @@ self: { }: mkDerivation { pname = "dear-imgui"; - version = "1.1.0"; - sha256 = "0vi9aqlp6pm1qmnihmx426fla3ffvnc2nc1s2i41180wfa6karbf"; + version = "1.2.0"; + sha256 = "0cnfm4wq8mfmqa4n5rvgl4y52850qgkk8kph6qihb5270xmxh8pi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72431,24 +72622,6 @@ self: { }: mkDerivation { pname = "debian-build"; - version = "0.10.2.0"; - sha256 = "1yqswr5cvv2yzl15nylvnf2x7cshz482fgfi1nnm22vq71zszn2x"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base directory filepath process split transformers - ]; - executableHaskellDepends = [ base filepath transformers ]; - description = "Debian package build sequence tools"; - license = lib.licenses.bsd3; - }) {}; - - "debian-build_0_10_2_1" = callPackage - ({ mkDerivation, base, directory, filepath, process, split - , transformers - }: - mkDerivation { - pname = "debian-build"; version = "0.10.2.1"; sha256 = "1114xaqmhx74w0zqdksj6c1ggmfglcshhsxrw89gai5kzy47zp9d"; isLibrary = true; @@ -72459,7 +72632,6 @@ self: { executableHaskellDepends = [ base filepath transformers ]; description = "Debian package build sequence tools"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "debug" = callPackage @@ -73483,6 +73655,38 @@ self: { broken = true; }) {}; + "dependent-literals" = callPackage + ({ mkDerivation, base, fin-int, numeric-kinds, sint, snumber + , tagged, wrapped + }: + mkDerivation { + pname = "dependent-literals"; + version = "0.1.1.0"; + sha256 = "0dw2xc5l8cmhsmr2akyyhyfj8m3qx02pz81fn52ii9mkhzs6rcjb"; + libraryHaskellDepends = [ + base fin-int numeric-kinds sint snumber tagged wrapped + ]; + description = "Provides library support for pseudo-dependently-typed int literals"; + license = lib.licenses.asl20; + }) {}; + + "dependent-literals-plugin" = callPackage + ({ mkDerivation, base, dependent-literals, fin-int, ghc + , numeric-kinds, short-vec, sint, snumber, syb, wrapped + }: + mkDerivation { + pname = "dependent-literals-plugin"; + version = "0.1.0.1"; + sha256 = "1rpjlcv3g150rcmxidn48n25xxv2ghdz4x9jnap1swkz0fb10i3a"; + libraryHaskellDepends = [ base ghc syb ]; + testHaskellDepends = [ + base dependent-literals fin-int numeric-kinds short-vec sint + snumber wrapped + ]; + description = "Rewrites integer literals to a pseudo-dependently-typed form"; + license = lib.licenses.asl20; + }) {}; + "dependent-map_0_2_4_0" = callPackage ({ mkDerivation, base, containers, dependent-sum }: mkDerivation { @@ -73704,15 +73908,15 @@ self: { }) {}; "deque" = callPackage - ({ mkDerivation, base, hashable, mtl, QuickCheck + ({ mkDerivation, base, deepseq, hashable, mtl, QuickCheck , quickcheck-instances, rerebase, strict-list, tasty, tasty-hunit , tasty-quickcheck }: mkDerivation { pname = "deque"; - version = "0.4.3"; - sha256 = "19apwmcykprz3a91wszmc1w3qcz4x3rq79gmik514fszi9yhwsmp"; - libraryHaskellDepends = [ base hashable mtl strict-list ]; + version = "0.4.4"; + sha256 = "1x0rjdqgf4kwgpyisx618waz6r9gki3ivav9m4biysyc04hdhinn"; + libraryHaskellDepends = [ base deepseq hashable mtl strict-list ]; testHaskellDepends = [ QuickCheck quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck @@ -77242,6 +77446,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "dirichlet_0_1_0_5" = callPackage + ({ mkDerivation, base, hspec, log-domain, math-functions + , mwc-random, primitive, vector + }: + mkDerivation { + pname = "dirichlet"; + version = "0.1.0.5"; + sha256 = "1ibp7cvbi86m2m0kb1pzxmnb68awhbkayms7gffx3nqli6yb1fi9"; + libraryHaskellDepends = [ + base log-domain math-functions mwc-random primitive vector + ]; + testHaskellDepends = [ base hspec log-domain mwc-random vector ]; + description = "Multivariate Dirichlet distribution"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "dirstream" = callPackage ({ mkDerivation, base, directory, pipes, pipes-safe, system-fileio , system-filepath, unix @@ -79277,8 +79498,8 @@ self: { }: mkDerivation { pname = "docopt"; - version = "0.7.0.5"; - sha256 = "1vh5kn13z0c6k2ir6nyr453flyn0cfmz7h61903vysw9lh40hy8m"; + version = "0.7.0.6"; + sha256 = "0gkj3bh74kbwk62zdr18lbd1544yi22w067xl8w35y8bdflkq7in"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers parsec template-haskell th-lift @@ -79686,6 +79907,8 @@ self: { ]; description = "Automatic Bibtex and fulltext of scientific articles"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "doldol" = callPackage @@ -84428,14 +84651,14 @@ self: { license = lib.licenses.gpl3Plus; }) {}; - "elynx_0_6_0_0" = callPackage + "elynx_0_6_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, elynx-tools , optparse-applicative, slynx, tlynx }: mkDerivation { pname = "elynx"; - version = "0.6.0.0"; - sha256 = "0ni33i5l82pyhsm2y2r5gpn736mnnd56086ma51s880lbr4qcizf"; + version = "0.6.1.0"; + sha256 = "0y6l3vcjjrsr3klzzcbckil36v12fyhy195fd43h8zabmlkrg897"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -84467,15 +84690,15 @@ self: { license = lib.licenses.gpl3Plus; }) {}; - "elynx-markov_0_6_0_0" = callPackage + "elynx-markov_0_6_1_0" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, containers , elynx-seq, elynx-tools, hmatrix, hspec, integration , math-functions, mwc-random, primitive, statistics, vector }: mkDerivation { pname = "elynx-markov"; - version = "0.6.0.0"; - sha256 = "12vbb7lrf7qw581pn0y5dpx1gkny74vib9f6sykg650izias8pl1"; + version = "0.6.1.0"; + sha256 = "1bk0hxwym1kgq97xdyzf4925y53gsb5figl5gamarwh6f3rxl6sw"; libraryHaskellDepends = [ async attoparsec base bytestring containers elynx-seq hmatrix integration math-functions mwc-random primitive statistics vector @@ -84501,12 +84724,12 @@ self: { license = lib.licenses.gpl3Plus; }) {}; - "elynx-nexus_0_6_0_0" = callPackage + "elynx-nexus_0_6_1_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { pname = "elynx-nexus"; - version = "0.6.0.0"; - sha256 = "0yhyacb04d9080rh030f082r64z72ma5g3sgpxy3vihp139gar34"; + version = "0.6.1.0"; + sha256 = "1dj8mn3ky0xzr94iar6bc82vsia3znq2fbr8ly0mlwph45x25czz"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ base hspec ]; description = "Import and export Nexus files"; @@ -84534,15 +84757,15 @@ self: { license = lib.licenses.gpl3Plus; }) {}; - "elynx-seq_0_6_0_0" = callPackage + "elynx-seq_0_6_1_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , elynx-tools, hspec, matrices, mwc-random, parallel, primitive , vector, vector-th-unbox, word8 }: mkDerivation { pname = "elynx-seq"; - version = "0.6.0.0"; - sha256 = "1jyb8m400qcw7bkm1mdxqny59vk6bhfgp2fwsa1a9vxi1cdswk3l"; + version = "0.6.1.0"; + sha256 = "1bzcp6s1pxxwwg44yj0v1rh0k4saf52nr5m7mh6fpybcm3kpkww0"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers matrices mwc-random parallel primitive vector vector-th-unbox word8 @@ -84577,20 +84800,20 @@ self: { license = lib.licenses.gpl3Plus; }) {}; - "elynx-tools_0_6_0_0" = callPackage + "elynx-tools_0_6_1_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, cryptohash-sha256, directory, hmatrix, mwc-random - , optparse-applicative, primitive, template-haskell, text, time - , transformers, vector, zlib + , optparse-applicative, template-haskell, text, time, transformers + , vector, zlib }: mkDerivation { pname = "elynx-tools"; - version = "0.6.0.0"; - sha256 = "1jfxyf2f8wf1kzzg3wpw8fixzl6icx1729mpw98hp5wacvp1d4mk"; + version = "0.6.1.0"; + sha256 = "17vw9b9158mfna83xqkj8hnl02m8ngn2k22wsh2kvnhgiw9qc38m"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring cryptohash-sha256 directory hmatrix mwc-random optparse-applicative - primitive template-haskell text time transformers vector zlib + template-haskell text time transformers vector zlib ]; description = "Tools for ELynx"; license = lib.licenses.gpl3Plus; @@ -84622,7 +84845,7 @@ self: { license = lib.licenses.gpl3Plus; }) {}; - "elynx-tree_0_6_0_0" = callPackage + "elynx-tree_0_6_1_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad , containers, criterion, data-default, data-default-class, deepseq , double-conversion, elynx-nexus, elynx-tools, hspec @@ -84631,8 +84854,8 @@ self: { }: mkDerivation { pname = "elynx-tree"; - version = "0.6.0.0"; - sha256 = "1cywd10rky712yijpvq6cfrphmgks760y52gsdlfxwcn6jgych0r"; + version = "0.6.1.0"; + sha256 = "186f8qyp0k8jjc01wvpwlpxfkmr7043yyxajmh700jlxbz4p8j7i"; libraryHaskellDepends = [ aeson attoparsec base bytestring comonad containers data-default-class deepseq double-conversion elynx-nexus @@ -87956,15 +88179,36 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "evm-opcodes" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, data-dword + , hedgehog, hspec, tasty, tasty-discover, tasty-hedgehog + , tasty-hspec, text + }: + mkDerivation { + pname = "evm-opcodes"; + version = "0.1.0"; + sha256 = "1bjn8i6d6vccms4xzs877cpmd75v0kgd349a024gig3rfsxqadn5"; + libraryHaskellDepends = [ + base bytestring cereal containers data-dword text + ]; + testHaskellDepends = [ + base bytestring cereal containers data-dword hedgehog hspec tasty + tasty-discover tasty-hedgehog tasty-hspec text + ]; + testToolDepends = [ tasty-discover ]; + description = "Opcode types for Ethereum Virtual Machine (EVM)"; + license = lib.licenses.mit; + }) {}; + "evoke" = callPackage ({ mkDerivation, aeson, base, ghc, HUnit, insert-ordered-containers - , lens, QuickCheck, random, swagger2, text + , lens, QuickCheck, swagger2, text }: mkDerivation { pname = "evoke"; - version = "0.2021.8.25"; - sha256 = "14yq5izrlzyqwm3cf9lc26dgxix3yyfiafp5i4p9s6j4d1dspm1i"; - libraryHaskellDepends = [ base ghc random ]; + version = "0.2021.9.14"; + sha256 = "1r31f54s37rqdka8szmiavgjr0nhnsbbzmsdakwv675s29cclh8f"; + libraryHaskellDepends = [ base ghc ]; testHaskellDepends = [ aeson base HUnit insert-ordered-containers lens QuickCheck swagger2 text @@ -91029,6 +91273,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "fcf-graphs" = callPackage + ({ mkDerivation, base, doctest, fcf-containers + , first-class-families, Glob + }: + mkDerivation { + pname = "fcf-graphs"; + version = "0.0.1.0"; + sha256 = "15yzkgn5vj7yd14h0y7l2nwcip9ys3wx09wx6mm8ryx3f98iym69"; + libraryHaskellDepends = [ + base fcf-containers first-class-families + ]; + testHaskellDepends = [ + base doctest fcf-containers first-class-families Glob + ]; + description = "Type-level version of algebraic-graphs"; + license = lib.licenses.mit; + }) {}; + + "fcf-vinyl" = callPackage + ({ mkDerivation, base, first-class-families, vinyl }: + mkDerivation { + pname = "fcf-vinyl"; + version = "0.0.1.0"; + sha256 = "0svdmd4lj1dwn7ipzx7vzd9bw6v2fvm2w70kziqvmnjxrvnnbxwv"; + revision = "1"; + editedCabalFile = "19xfj49aw1vrdzrkbsy7aj9jq5l8ss3l41sznrg3ljxpvh3b3i4l"; + libraryHaskellDepends = [ base first-class-families vinyl ]; + description = "Vinyl compatibility with first-class-families"; + license = lib.licenses.bsd3; + }) {}; + "fcg" = callPackage ({ mkDerivation }: mkDerivation { @@ -92741,6 +93016,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "fin-int" = callPackage + ({ mkDerivation, attenuation, base, data-default-class, deepseq + , portray, portray-diff, QuickCheck, sint + }: + mkDerivation { + pname = "fin-int"; + version = "0.1.0.0"; + sha256 = "0ksjc8jz3l5jh6xd7aam424vpcq1ah7dcq2r5vmh4c7hcd48fakv"; + revision = "1"; + editedCabalFile = "0fq6cliihr0dhks62nim33f0sxqs2rwn4yd7gdd67h07acimcrzf"; + libraryHaskellDepends = [ + attenuation base data-default-class deepseq portray portray-diff + QuickCheck sint + ]; + description = "The type of finite sets with elements identified by the ordinals"; + license = lib.licenses.asl20; + }) {}; + "final" = callPackage ({ mkDerivation, base, stm, transformers }: mkDerivation { @@ -93029,6 +93322,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "finite-table" = callPackage + ({ mkDerivation, adjunctions, base, cereal, data-default-class + , deepseq, distributive, fin-int, indexed-traversable, lens + , portray, portray-diff, QuickCheck, short-vec, short-vec-lens + , sint, test-framework, test-framework-quickcheck2, wrapped + }: + mkDerivation { + pname = "finite-table"; + version = "0.1.0.1"; + sha256 = "17bn5wmv5sz89yh3lh39i1armi168wxxnz6l9smcfmw334lidlv6"; + libraryHaskellDepends = [ + adjunctions base cereal data-default-class deepseq distributive + fin-int indexed-traversable lens portray portray-diff short-vec + short-vec-lens sint wrapped + ]; + testHaskellDepends = [ + adjunctions base cereal data-default-class deepseq distributive + fin-int indexed-traversable lens portray portray-diff QuickCheck + short-vec short-vec-lens sint test-framework + test-framework-quickcheck2 wrapped + ]; + description = "Types isomorphic to Fin, and Tables indexed by them"; + license = lib.licenses.asl20; + }) {}; + "finite-typelits" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { @@ -93351,8 +93669,8 @@ self: { }: mkDerivation { pname = "fix-whitespace"; - version = "0.0.6"; - sha256 = "087sp7bf7k4h9clmhqdzk8j1y12rc6lhd22p2w6kp7w1ppgg06aw"; + version = "0.0.7"; + sha256 = "1nx56dfgg0i75f007y0r5w0955y3x78drjkvdx278llalyfpc5bg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -94976,33 +95294,6 @@ self: { }: mkDerivation { pname = "fmt"; - version = "0.6.2.0"; - sha256 = "14h5f7nz9czfg1ar0ga9vry4ck2xf7h6rxiyk276w871yra01l9g"; - libraryHaskellDepends = [ - base base64-bytestring bytestring call-stack containers formatting - microlens text time time-locale-compat - ]; - testHaskellDepends = [ - base bytestring call-stack containers doctest hspec - neat-interpolation QuickCheck text vector - ]; - testToolDepends = [ doctest-discover ]; - benchmarkHaskellDepends = [ - base bytestring containers criterion deepseq formatting interpolate - text vector - ]; - description = "A new formatting library"; - license = lib.licenses.bsd3; - }) {}; - - "fmt_0_6_3_0" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, call-stack - , containers, criterion, deepseq, doctest, doctest-discover - , formatting, hspec, interpolate, microlens, neat-interpolation - , QuickCheck, text, time, time-locale-compat, vector - }: - mkDerivation { - pname = "fmt"; version = "0.6.3.0"; sha256 = "01mh0k69dv5x30hlmxi36dp1ylk0a6affr4jb3pvy8vjm4ypzvml"; libraryHaskellDepends = [ @@ -95020,7 +95311,6 @@ self: { ]; description = "A new formatting library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fmt-for-rio" = callPackage @@ -96030,8 +96320,8 @@ self: { }: mkDerivation { pname = "fortran-src"; - version = "0.6.0"; - sha256 = "0g0wpcr9ddad59x58gknrw2y7w3h88i7s9br9qk423k48gq8qsla"; + version = "0.6.1"; + sha256 = "1d07ih8bcij71x4b5nwd4fk12cmmigpzcf98fixgayrkcvmnckzg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98896,8 +99186,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.20.1"; - sha256 = "0ay1ly65sv57p6hymnb902xz5jmvjzl0zfshffrl73v8mgqbgnlv"; + version = "0.20.2"; + sha256 = "0nn0ndnzabkgcpdwhim51ji6mm95ky48f8vybch4dvvwsm3ld10b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102724,6 +103014,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ghc-definitions-th" = callPackage + ({ mkDerivation, base, constraints, ghc, template-haskell }: + mkDerivation { + pname = "ghc-definitions-th"; + version = "0.1"; + sha256 = "13c9m1rlgayqncqs8cn7mc0r72p2gb7657gpq3gi7r707mj52fj3"; + libraryHaskellDepends = [ base constraints ghc template-haskell ]; + description = "Automatically generate GHC API counterparts to Haskell declarations"; + license = lib.licenses.bsd3; + }) {}; + "ghc-dump-core" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, ghc , serialise, text @@ -104120,32 +104421,30 @@ self: { }: mkDerivation { pname = "ghcide"; - version = "1.4.0.3"; - sha256 = "1znf54l3g44cskx5blfaibf1frgyhy5z7906rdvyzb0dqfmkbzpw"; - revision = "1"; - editedCabalFile = "1qm3zj7c8qkc0ncm9bl57zj5nj7jm8c4lg2wzjrgmz3vvfmsd11c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array async base base16-bytestring binary bytestring - bytestring-encoding case-insensitive containers cryptohash-sha1 - data-default deepseq dependent-map dependent-sum Diff directory - dlist extra filepath fingertree fuzzy ghc ghc-api-compat ghc-boot - ghc-boot-th ghc-check ghc-exactprint ghc-paths ghc-trace-events - Glob haddock-library hashable heapsize hie-bios hie-compat hiedb - hls-graph hls-plugin-api hslogger implicit-hie-cradle lens lsp - lsp-types mtl network-uri opentelemetry optparse-applicative - parallel prettyprinter prettyprinter-ansi-terminal regex-tdfa - retrie rope-utf16-splay safe safe-exceptions sorted-list - sqlite-simple stm syb text time transformers unix unliftio - unliftio-core unordered-containers utf8-string vector + version = "1.4.2.0"; + sha256 = "1hkh6j95rmsk2g9m2x7qr4w9ckhr7w1rg6di6h5dwqi9pryfbfny"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty array async base base16-bytestring binary + bytestring bytestring-encoding case-insensitive containers + cryptohash-sha1 data-default deepseq dependent-map dependent-sum + Diff directory dlist extra filepath fingertree fuzzy ghc + ghc-api-compat ghc-boot ghc-boot-th ghc-check ghc-exactprint + ghc-paths ghc-trace-events Glob haddock-library hashable heapsize + hie-bios hie-compat hiedb hls-graph hls-plugin-api hslogger + implicit-hie-cradle lens lsp lsp-types mtl network-uri + opentelemetry optparse-applicative parallel prettyprinter + prettyprinter-ansi-terminal regex-tdfa retrie rope-utf16-splay safe + safe-exceptions sorted-list sqlite-simple stm syb text time + transformers unix unliftio unliftio-core unordered-containers + utf8-string vector ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring containers data-default - directory extra filepath ghc gitrev hashable heapsize hie-bios - hiedb hls-graph hls-plugin-api lens lsp lsp-test lsp-types - optparse-applicative process safe-exceptions shake text - unordered-containers + aeson base bytestring containers data-default directory extra + filepath ghc gitrev hashable heapsize hie-bios hiedb hls-graph + hls-plugin-api lens lsp lsp-test lsp-types optparse-applicative + process safe-exceptions shake text unordered-containers ]; testHaskellDepends = [ aeson async base binary bytestring containers data-default @@ -105178,8 +105477,8 @@ self: { }: mkDerivation { pname = "gi-gtk-declarative"; - version = "0.7.0"; - sha256 = "0j6yk2qr88yrxs8vdwcqv6jzisjl0x1j932ssim8ay98z4r6y8gg"; + version = "0.7.1"; + sha256 = "0fc3y6p7adnwpz5zwv9sh0wy88nx1i3n7m8qx4awha9id59s0y1y"; libraryHaskellDepends = [ base containers data-default-class gi-glib gi-gobject gi-gtk haskell-gi haskell-gi-base haskell-gi-overloading mtl text @@ -105201,8 +105500,8 @@ self: { }: mkDerivation { pname = "gi-gtk-declarative-app-simple"; - version = "0.7.0"; - sha256 = "0ygp70yfj530czfw6an3yp9y883q4lwky45rxdslyf1ifk8dn6rf"; + version = "0.7.1"; + sha256 = "0q5crb3jl8mlr474srqya3yqi90vklnldlb2qs167h60shzvf353"; libraryHaskellDepends = [ async base gi-gdk gi-glib gi-gobject gi-gtk gi-gtk-declarative haskell-gi haskell-gi-base haskell-gi-overloading pipes @@ -118718,6 +119017,22 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "happy_1_19_12" = callPackage + ({ mkDerivation, array, base, containers, mtl, process }: + mkDerivation { + pname = "happy"; + version = "1.19.12"; + sha256 = "03xlmq6qmdx4zvzw8bp33kd9g7yvcq5cz4wg50xilw812kj276pv"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ array base containers mtl ]; + testHaskellDepends = [ base process ]; + description = "Happy is a parser generator for Haskell"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "happy" = callPackage ({ mkDerivation, array, base, containers, mtl, process }: mkDerivation { @@ -119155,8 +119470,8 @@ self: { }: mkDerivation { pname = "hasbolt-extras"; - version = "0.0.1.7"; - sha256 = "1dnia4da5g9c8ckiap4wsacv6lccr69ai24i3n6mywdykhy159f1"; + version = "0.0.1.8"; + sha256 = "1qmj8dikn47qi47ic1zb7ahcsnmaamkrpbvica17fgyxcdbiilfl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120733,21 +121048,22 @@ self: { , cryptohash-sha1, data-default, deepseq, directory, extra , filepath, ghc, ghc-api-compat, ghc-boot-th, ghc-paths, ghcide , gitrev, hashable, hie-bios, hiedb, hls-brittany-plugin - , hls-class-plugin, hls-eval-plugin, hls-explicit-imports-plugin - , hls-floskell-plugin, hls-fourmolu-plugin, hls-graph - , hls-haddock-comments-plugin, hls-hlint-plugin - , hls-module-name-plugin, hls-ormolu-plugin, hls-plugin-api - , hls-pragmas-plugin, hls-refine-imports-plugin, hls-retrie-plugin - , hls-splice-plugin, hls-stylish-haskell-plugin, hls-tactics-plugin - , hls-test-utils, hslogger, hspec-expectations, lens, lsp, lsp-test - , lsp-types, mtl, optparse-applicative, optparse-simple, process - , regex-tdfa, safe-exceptions, sqlite-simple, temporary, text - , transformers, unordered-containers + , hls-call-hierarchy-plugin, hls-class-plugin, hls-eval-plugin + , hls-explicit-imports-plugin, hls-floskell-plugin + , hls-fourmolu-plugin, hls-graph, hls-haddock-comments-plugin + , hls-hlint-plugin, hls-module-name-plugin, hls-ormolu-plugin + , hls-plugin-api, hls-pragmas-plugin, hls-refine-imports-plugin + , hls-retrie-plugin, hls-splice-plugin, hls-stylish-haskell-plugin + , hls-tactics-plugin, hls-test-utils, hslogger, hspec-expectations + , lens, lsp, lsp-test, lsp-types, mtl, optparse-applicative + , optparse-simple, process, regex-tdfa, safe-exceptions + , sqlite-simple, temporary, text, transformers + , unordered-containers }: mkDerivation { pname = "haskell-language-server"; - version = "1.2.0.0"; - sha256 = "131l21r9ahnw54x5453j7pw728z6vp3gc2zmj6wrwzz51b9v64q8"; + version = "1.4.0.0"; + sha256 = "1zyvfh9lmr97i221kqkjilq1di3l5h2qk2d46rcl3gyfrdpc2cil"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120761,15 +121077,16 @@ self: { aeson async base base16-bytestring binary bytestring containers cryptohash-sha1 data-default deepseq directory extra filepath ghc ghc-api-compat ghc-boot-th ghc-paths ghcide gitrev hashable - hie-bios hiedb hls-brittany-plugin hls-class-plugin hls-eval-plugin - hls-explicit-imports-plugin hls-floskell-plugin hls-fourmolu-plugin - hls-graph hls-haddock-comments-plugin hls-hlint-plugin - hls-module-name-plugin hls-ormolu-plugin hls-plugin-api - hls-pragmas-plugin hls-refine-imports-plugin hls-retrie-plugin - hls-splice-plugin hls-stylish-haskell-plugin hls-tactics-plugin - hslogger lens lsp mtl optparse-applicative optparse-simple process - regex-tdfa safe-exceptions sqlite-simple temporary text - transformers unordered-containers + hie-bios hiedb hls-brittany-plugin hls-call-hierarchy-plugin + hls-class-plugin hls-eval-plugin hls-explicit-imports-plugin + hls-floskell-plugin hls-fourmolu-plugin hls-graph + hls-haddock-comments-plugin hls-hlint-plugin hls-module-name-plugin + hls-ormolu-plugin hls-plugin-api hls-pragmas-plugin + hls-refine-imports-plugin hls-retrie-plugin hls-splice-plugin + hls-stylish-haskell-plugin hls-tactics-plugin hslogger lens lsp mtl + optparse-applicative optparse-simple process regex-tdfa + safe-exceptions sqlite-simple temporary text transformers + unordered-containers ]; testHaskellDepends = [ aeson base bytestring containers data-default directory extra @@ -122737,28 +123054,33 @@ self: { }) {}; "hasklepias" = callPackage - ({ mkDerivation, aeson, base, bytestring, cmdargs, co-log - , containers, contravariant, flow, ghc-prim, hspec - , interval-algebra, lens, lens-aeson, mtl, nonempty-containers + ({ mkDerivation, aeson, amazonka, amazonka-s3, base, bytestring + , cmdargs, co-log, conduit, conduit-extra, containers + , contravariant, flow, ghc-prim, hspec, interval-algebra, lens + , lens-aeson, mtl, nonempty-containers, optparse-applicative , QuickCheck, safe, semiring-simple, tasty, tasty-hspec - , tasty-hunit, text, time, tuple, unordered-containers, vector - , witherable + , tasty-hunit, tasty-silver, text, time, tuple + , unordered-containers, vector, witherable }: mkDerivation { pname = "hasklepias"; - version = "0.18.0"; - sha256 = "1kfsiw32bqf8xl801bk21jzhx5ma7skfi9pnp3vsz3n6n856yva9"; + version = "0.20.0"; + sha256 = "1fp7pd96mf91cf906lb1xd92ncm6fjpw4657fa47xba8yxcyy1gw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring cmdargs co-log containers contravariant flow - ghc-prim interval-algebra lens lens-aeson mtl nonempty-containers - QuickCheck safe semiring-simple tasty tasty-hunit text time tuple + aeson amazonka amazonka-s3 base bytestring cmdargs co-log conduit + conduit-extra containers contravariant flow ghc-prim + interval-algebra lens lens-aeson mtl nonempty-containers QuickCheck + safe semiring-simple tasty tasty-hunit text time tuple unordered-containers vector witherable ]; + executableHaskellDepends = [ + base bytestring optparse-applicative + ]; testHaskellDepends = [ aeson base bytestring containers flow hspec interval-algebra lens - QuickCheck tasty tasty-hspec tasty-hunit text time + QuickCheck tasty tasty-hspec tasty-hunit tasty-silver text time unordered-containers vector ]; description = "embedded DSL for defining epidemiologic cohorts"; @@ -122840,8 +123162,8 @@ self: { }: mkDerivation { pname = "haskoin-core"; - version = "0.20.4"; - sha256 = "0mbq4ixnnjln0qjippmv57qz5p4qx3s0fyr2xj43q5gmis89m4cg"; + version = "0.20.5"; + sha256 = "1nx0m51nxm6m2nq6cdcsd8xiap7x6rr2z5ckbzga33fh73ivmkmp"; libraryHaskellDepends = [ aeson array base base16 binary bytes bytestring cereal conduit containers cryptonite deepseq entropy hashable hspec memory mtl @@ -122978,8 +123300,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.53.10"; - sha256 = "0a20808l907wvgcdvbv7jvkpphpfj64x9cm7a07hpldsi2r3c26p"; + version = "0.53.11"; + sha256 = "0b6q74zk58chz1b9pv6rm1ipx2ss08ks4qwlyhzqgwfy5npn1x6p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123024,8 +123346,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.53.10"; - sha256 = "0rnqa294j909s06nadg58vdblfvswb6si04m6gyf4k3ihmd1nj39"; + version = "0.53.11"; + sha256 = "0x75vm28j8gpwan2kdy3di14myhk6gfk8wa70iys8cj43c7ds83l"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -123887,6 +124209,33 @@ self: { license = lib.licenses.mit; }) {}; + "hasql_1_4_5_2" = 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.2"; + sha256 = "0kliby1gigmy1z856wnnlrn70hacqj2350yypdxkm7sfh717n4rj"; + 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 @@ -126470,6 +126819,8 @@ self: { pname = "hedgehog"; version = "1.0.5"; sha256 = "1qsqs8lmxa3wmw228cwi98vvvh9hqbc9d43i1sy2c9igw9xlhfi6"; + revision = "1"; + editedCabalFile = "0vqjjjvnbb601f6lwm90x80wb6rxhnvi4p8g04g15bfs3kxqw44z"; libraryHaskellDepends = [ ansi-terminal async base bytestring concurrent-output containers deepseq directory erf exceptions lifted-async mmorph monad-control @@ -128647,8 +128998,8 @@ self: { }: mkDerivation { pname = "hfmt"; - version = "0.2.3.1"; - sha256 = "178nr4k4jgl3xxlvds7cqg18qfmsak1zhwlkks6syviypbg5wb07"; + version = "0.3.0.0"; + sha256 = "0cda45hj3y21ji8xq0mnf727narbgjgcy3wck9aiy5qnjxa1vfl3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128657,11 +129008,16 @@ self: { path-io pretty stylish-haskell text transformers yaml ]; executableHaskellDepends = [ - ansi-wl-pprint base conduit conduit-combinators directory - optparse-applicative + ansi-wl-pprint base bytestring Cabal conduit conduit-combinators + Diff directory exceptions filepath haskell-src-exts hindent hlint + HUnit optparse-applicative path path-io pretty stylish-haskell text + transformers yaml ]; testHaskellDepends = [ - base HUnit test-framework test-framework-hunit + base bytestring Cabal conduit conduit-combinators Diff directory + exceptions filepath haskell-src-exts hindent hlint HUnit path + path-io pretty stylish-haskell test-framework test-framework-hunit + text transformers yaml ]; description = "Haskell source code formatter"; license = lib.licenses.mit; @@ -129513,8 +129869,8 @@ self: { }: mkDerivation { pname = "hie-compat"; - version = "0.2.0.0"; - sha256 = "029h465wfknjdjk4yqq10b9krya9qplh8zzvmnwp9hf5rlr9awc3"; + version = "0.2.1.0"; + sha256 = "0dl48y5ijr73dc1lrarvfz6bivxg42ll4y339saw1y5xmgw1c5w7"; libraryHaskellDepends = [ array base bytestring containers directory filepath ghc ghc-boot transformers @@ -129569,6 +129925,31 @@ self: { }: mkDerivation { pname = "hiedb"; + version = "0.4.0.0"; + sha256 = "1frcl9mxmn97qc97l3kw21ksapyndn6jq7yfxxrr0fvzn7jji7wv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + algebraic-graphs ansi-terminal array base bytestring containers + directory extra filepath ghc hie-compat lucid mtl + optparse-applicative sqlite-simple terminal-size text + ]; + executableHaskellDepends = [ base ghc-paths ]; + testHaskellDepends = [ + base directory filepath ghc ghc-paths hspec process temporary + ]; + description = "Generates a references DB from .hie files"; + license = lib.licenses.bsd3; + }) {}; + + "hiedb_0_4_1_0" = callPackage + ({ mkDerivation, algebraic-graphs, ansi-terminal, array, base + , bytestring, containers, directory, extra, filepath, ghc + , ghc-paths, hie-compat, hspec, lucid, mtl, optparse-applicative + , process, sqlite-simple, temporary, terminal-size, text + }: + mkDerivation { + pname = "hiedb"; version = "0.4.1.0"; sha256 = "1389qmlga5rq8has02rn35pzag5wnfpx3w77r60mzl3b4pkpzi7i"; isLibrary = true; @@ -129584,6 +129965,7 @@ self: { ]; description = "Generates a references DB from .hie files"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hieraclus" = callPackage @@ -132196,22 +132578,44 @@ self: { }) {}; "hls-brittany-plugin" = callPackage - ({ mkDerivation, base, brittany, bytestring, filepath, ghc - , ghc-boot-th, ghcide, hls-plugin-api, hls-test-utils, lens - , lsp-types, text, transformers + ({ mkDerivation, base, brittany, czipwith, extra, filepath, ghc + , ghc-boot-th, ghc-exactprint, ghcide, hls-plugin-api + , hls-test-utils, lens, lsp-types, text, transformers }: mkDerivation { pname = "hls-brittany-plugin"; - version = "1.0.0.1"; - sha256 = "1lfhgvxs0bvs67raxalvj8pr4qln1yvi7i7wlp33gpk2x89bwaqy"; - revision = "3"; - editedCabalFile = "0d7pn634gpksl49hp3bfds52zhc80943bb2l5cvlbaf3phlsfskc"; + version = "1.0.1.0"; + sha256 = "0wkarbbq3nq923d169k8g6z8svnqp8ghikh2q7nbrdg8anhrbgqz"; libraryHaskellDepends = [ - base brittany filepath ghc ghc-boot-th ghcide hls-plugin-api lens - lsp-types text transformers + base brittany czipwith extra filepath ghc ghc-boot-th + ghc-exactprint ghcide hls-plugin-api lens lsp-types text + transformers ]; - testHaskellDepends = [ base bytestring hls-test-utils text ]; + testHaskellDepends = [ base filepath hls-test-utils ]; description = "Integration with the Brittany code formatter"; + license = lib.licenses.agpl3Only; + }) {}; + + "hls-call-hierarchy-plugin" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, extra + , filepath, ghc, ghc-api-compat, ghcide, hiedb, hls-plugin-api + , hls-test-utils, lens, lsp, lsp-test, sqlite-simple, text + , unordered-containers + }: + mkDerivation { + pname = "hls-call-hierarchy-plugin"; + version = "1.0.1.0"; + sha256 = "1vzxiwxj14kmabcggp9dnq8jw9kcqknlg4xyv9cp69djz5ssrnzr"; + libraryHaskellDepends = [ + aeson base bytestring containers extra ghc ghc-api-compat ghcide + hiedb hls-plugin-api lens lsp sqlite-simple text + unordered-containers + ]; + testHaskellDepends = [ + aeson base containers extra filepath hls-test-utils lens lsp + lsp-test text + ]; + description = "Call hierarchy plugin for Haskell Language Server"; license = lib.licenses.asl20; }) {}; @@ -132222,8 +132626,8 @@ self: { }: mkDerivation { pname = "hls-class-plugin"; - version = "1.0.0.2"; - sha256 = "0z6774vmfafgr3z5h98ls5sssax15psa2dq5sf8bcqm29y3g3zvi"; + version = "1.0.1.0"; + sha256 = "0m1yifv7pfb4gll0zajdzxy0v0a7kwivfvbamvh9g3lf7iiy0vd0"; libraryHaskellDepends = [ aeson base containers ghc ghc-api-compat ghc-exactprint ghcide hls-plugin-api lens lsp text transformers @@ -132245,8 +132649,8 @@ self: { }: mkDerivation { pname = "hls-eval-plugin"; - version = "1.1.1.0"; - sha256 = "167vmz7jl09lkayjf6g0inn2q5i1h3gs5vl6xpdg4cbvd8srdvbs"; + version = "1.1.2.0"; + sha256 = "11h017jy9g21ziiql61hr0q9g3wfvckyf1nfkg8vf9wnrmlzjqid"; libraryHaskellDepends = [ aeson base containers deepseq Diff directory dlist extra filepath ghc ghc-api-compat ghc-boot-th ghc-paths ghcide hashable @@ -132256,6 +132660,7 @@ self: { ]; testHaskellDepends = [ aeson base directory extra filepath hls-test-utils lens lsp-types + text ]; description = "Eval plugin for Haskell Language Server"; license = lib.licenses.asl20; @@ -132287,8 +132692,8 @@ self: { }: mkDerivation { pname = "hls-explicit-imports-plugin"; - version = "1.0.0.3"; - sha256 = "0sh4mimx76n6nzlz0nxa1z5q9ga8g268lkncqz4p0nbc54y070hh"; + version = "1.0.1.0"; + sha256 = "0frk2id6k3r58799qvppryapayvkim969xhh89i8ak5vs4a8ygpy"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghc-api-compat ghcide hls-graph hls-plugin-api lsp text unordered-containers @@ -132298,19 +132703,17 @@ self: { }) {}; "hls-floskell-plugin" = callPackage - ({ mkDerivation, base, floskell, ghcide, hls-plugin-api + ({ mkDerivation, base, filepath, floskell, ghcide, hls-plugin-api , hls-test-utils, lsp-types, text, transformers }: mkDerivation { pname = "hls-floskell-plugin"; - version = "1.0.0.0"; - sha256 = "0wf4483a4xhvynqqgj6gf1qg5nv9rv4gv9rm2hwsbjq123bs0wy8"; - revision = "1"; - editedCabalFile = "120ai8hswj310sv098j1b8dzpkzmjyphyxqnc1gszqds3qx588fj"; + version = "1.0.0.1"; + sha256 = "0d68fa83f5r1mn0pgsi6ff3q75z83gdivmfj0pkzp1m4acy2nx7z"; libraryHaskellDepends = [ base floskell ghcide hls-plugin-api lsp-types text transformers ]; - testHaskellDepends = [ base hls-test-utils text ]; + testHaskellDepends = [ base filepath hls-test-utils ]; description = "Integration with the Floskell code formatter"; license = lib.licenses.asl20; }) {}; @@ -132321,8 +132724,8 @@ self: { }: mkDerivation { pname = "hls-fourmolu-plugin"; - version = "1.0.0.1"; - sha256 = "039vvbzj583kxf04d9wjam6x7pjs7hv13ysa1rapsj5san0r73y7"; + version = "1.0.0.2"; + sha256 = "1m56xpzf5dqmwl2jryh1lv6pghngkzr7lsda1gf0j4ydajkm5app"; libraryHaskellDepends = [ base filepath fourmolu ghc ghc-boot-th ghcide hls-plugin-api lens lsp text @@ -132352,8 +132755,8 @@ self: { }: mkDerivation { pname = "hls-haddock-comments-plugin"; - version = "1.0.0.2"; - sha256 = "09gfvzz56vz0qzn1md2p0i6rdzf7v9nwm78lcw66asblq485jac6"; + version = "1.0.0.3"; + sha256 = "1gvzzm1m6n69126z3b7mb57n0hmnj5zmn1agj927zvjvs7m1hgpx"; libraryHaskellDepends = [ base containers ghc ghc-exactprint ghcide hls-plugin-api lsp-types text unordered-containers @@ -132372,8 +132775,8 @@ self: { }: mkDerivation { pname = "hls-hlint-plugin"; - version = "1.0.1.0"; - sha256 = "0wy6mw3i5mssjg9bf0gn5411yvqzlxd63s0amrg0yci6nx78nb8p"; + version = "1.0.1.1"; + sha256 = "0yvl7lxb5cw71nl8pzrplhws8k8khjjqxivyzs50f9yn6msr0w3z"; libraryHaskellDepends = [ aeson apply-refact base binary bytestring containers data-default deepseq Diff directory extra filepath ghc ghc-exactprint ghc-lib @@ -132392,8 +132795,8 @@ self: { }: mkDerivation { pname = "hls-module-name-plugin"; - version = "1.0.0.0"; - sha256 = "1a41zn1k4xga9v8xqly2jbi2i11zy05cgs60b7j9fasmm991vkxb"; + version = "1.0.0.1"; + sha256 = "06lf7wsci6yfmlm8slv8bwmkac9086pc7lxm38ivwffrsz3ninxx"; libraryHaskellDepends = [ aeson base directory filepath ghcide hls-plugin-api lsp text transformers unordered-containers @@ -132404,17 +132807,17 @@ self: { }) {}; "hls-ormolu-plugin" = callPackage - ({ mkDerivation, base, filepath, ghc, ghc-boot-th, ghcide - , hls-plugin-api, hls-test-utils, lens, lsp, lsp-types, ormolu - , text + ({ mkDerivation, base, filepath, ghc, ghc-api-compat, ghc-boot-th + , ghcide, hls-plugin-api, hls-test-utils, lens, lsp, lsp-types + , ormolu, text }: mkDerivation { pname = "hls-ormolu-plugin"; - version = "1.0.0.0"; - sha256 = "1iiq1m69jqrv28nzcrp9j70qvi21gsl9v9kjx0nkcdlbqzybfrfr"; + version = "1.0.1.0"; + sha256 = "0s7hynj50vldxgzii4gb0mml9gyizy3vaan1scpmhrj7kh44w746"; libraryHaskellDepends = [ - base filepath ghc ghc-boot-th ghcide hls-plugin-api lens lsp ormolu - text + base filepath ghc ghc-api-compat ghc-boot-th ghcide hls-plugin-api + lens lsp ormolu text ]; testHaskellDepends = [ base filepath hls-test-utils lsp-types ]; description = "Integration with the Ormolu code formatter"; @@ -132424,19 +132827,19 @@ self: { "hls-plugin-api" = callPackage ({ mkDerivation, aeson, base, containers, data-default , dependent-map, dependent-sum, Diff, dlist, ghc, ghc-api-compat - , hashable, hls-graph, hslogger, lens, lsp, opentelemetry, process - , regex-tdfa, text, unix, unordered-containers + , hashable, hls-graph, hslogger, lens, lsp, opentelemetry + , optparse-applicative, process, regex-tdfa, text, unix + , unordered-containers }: mkDerivation { pname = "hls-plugin-api"; - version = "1.1.0.2"; - sha256 = "1x49h8087x3fynagm4na72lyqyy58bb33kcrzkfcpbr3lsb8k455"; - revision = "1"; - editedCabalFile = "0pgicyph7zz2c7pbcair4wp4x5vvkmigbxxzrsxsgmvavki8r904"; + version = "1.2.0.1"; + sha256 = "0hixalca3lznzgcdzk7aix0nkhdlwds83kvz7bxjgvfs3ml7gw01"; libraryHaskellDepends = [ aeson base containers data-default dependent-map dependent-sum Diff dlist ghc ghc-api-compat hashable hls-graph hslogger lens lsp - opentelemetry process regex-tdfa text unix unordered-containers + opentelemetry optparse-applicative process regex-tdfa text unix + unordered-containers ]; description = "Haskell Language Server API for plugin communication"; license = lib.licenses.asl20; @@ -132444,21 +132847,19 @@ self: { "hls-pragmas-plugin" = callPackage ({ mkDerivation, base, extra, filepath, fuzzy, ghcide - , hls-plugin-api, hls-test-utils, lens, lsp, lsp-test, lsp-types - , text, transformers, unordered-containers + , hls-plugin-api, hls-test-utils, lens, lsp, lsp-types, text + , transformers, unordered-containers }: mkDerivation { pname = "hls-pragmas-plugin"; - version = "1.0.0.0"; - sha256 = "1zkq95dklc6sdhczgr6l2hdkkrbrjy3zwp0qfz3qvf55gpxspzzs"; - revision = "1"; - editedCabalFile = "0xkq857i68s58101x8dc8ynvnkhjp2f8lfddg2cjkycbwhfj42cc"; + version = "1.0.1.0"; + sha256 = "0w4q1mkpqbl27wqa06l7709y1qfdlfvavfcqvyjs1vwqf1c4q5ag"; libraryHaskellDepends = [ base extra fuzzy ghcide hls-plugin-api lens lsp text transformers unordered-containers ]; testHaskellDepends = [ - base filepath hls-test-utils lens lsp-test lsp-types text + base filepath hls-test-utils lens lsp-types text ]; description = "Pragmas plugin for Haskell Language Server"; license = lib.licenses.asl20; @@ -132471,8 +132872,8 @@ self: { }: mkDerivation { pname = "hls-refine-imports-plugin"; - version = "1.0.0.0"; - sha256 = "16dn7lnsam10rvazkslrw81qahn2i2yghdbi9pdjdzd3l3nrcyl9"; + version = "1.0.0.1"; + sha256 = "1gc899yiqic4sbv9q70xasv96s1l7ypgxjrafqlbvw6gyyn4sarj"; libraryHaskellDepends = [ aeson base containers deepseq ghc ghcide hls-explicit-imports-plugin hls-graph hls-plugin-api lsp text @@ -132491,8 +132892,8 @@ self: { }: mkDerivation { pname = "hls-retrie-plugin"; - version = "1.0.1.0"; - sha256 = "0kfip2fqjbr9qxg749ikdj42zgnchwjrp5ch84xr5z8k7hmlnw4z"; + version = "1.0.1.2"; + sha256 = "0pvz8vgzpaljlpfpwzhsfj5yyd3m5hvhy8b17q87ripbffpb58dr"; libraryHaskellDepends = [ aeson base containers deepseq directory extra ghc ghc-api-compat ghcide hashable hls-plugin-api lsp lsp-types retrie safe-exceptions @@ -132510,8 +132911,8 @@ self: { }: mkDerivation { pname = "hls-splice-plugin"; - version = "1.0.0.3"; - sha256 = "0v5m6h4pb2piihjyldy0nm6zl8iaw34gp6yqicbqkryinz0mb4pg"; + version = "1.0.0.4"; + sha256 = "0l929w9f6ay4ih1yi70lhn60zy79wq2mhmmhfyv0944x44dxjk8n"; libraryHaskellDepends = [ aeson base containers dlist extra foldl ghc ghc-exactprint ghcide hls-plugin-api lens lsp retrie syb text transformers unliftio-core @@ -132529,8 +132930,8 @@ self: { }: mkDerivation { pname = "hls-stylish-haskell-plugin"; - version = "1.0.0.1"; - sha256 = "1dkgvh169mf0s0vnyfgb965k393hm622cd2ssl6clgbaq2q20qlf"; + version = "1.0.0.2"; + sha256 = "0i8kjxqwg8mkk2imbc36ic2n59c09zc79g12c64vrjb7pgxpxrid"; libraryHaskellDepends = [ base directory filepath ghc ghc-boot-th ghcide hls-plugin-api lsp-types stylish-haskell text @@ -132547,21 +132948,19 @@ self: { , hls-test-utils, hspec, hspec-discover, hspec-expectations , hyphenation, lens, lsp, lsp-types, megaparsec, mtl , parser-combinators, prettyprinter, QuickCheck, refinery, retrie - , syb, tasty-hspec, tasty-hunit, text, transformers + , syb, tasty-hspec, tasty-hunit, text, transformers, unagi-chan , unordered-containers }: mkDerivation { pname = "hls-tactics-plugin"; - version = "1.2.0.0"; - sha256 = "0djyskzsv1hz92p6x62nf78j1f0x9nl55fl5mzc29lncqib8g8ak"; - revision = "2"; - editedCabalFile = "0ywqrd6wxbmblmf7m58cj5yarcl4869fdzrlnm0gia6qc1qa0y8j"; + version = "1.4.0.0"; + sha256 = "189d43vpf3sky9qh5mswmr4i0qxmjaayg20x21swaf7sglgw6lw8"; libraryHaskellDepends = [ aeson base containers deepseq directory extra filepath fingertree generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide hls-graph hls-plugin-api hyphenation lens lsp megaparsec mtl parser-combinators prettyprinter refinery retrie syb text - transformers unordered-containers + transformers unagi-chan unordered-containers ]; testHaskellDepends = [ aeson base containers deepseq directory filepath ghc ghcide @@ -132582,8 +132981,8 @@ self: { }: mkDerivation { pname = "hls-test-utils"; - version = "1.0.1.0"; - sha256 = "0pqypxqwh8dm4xl7bpfqdvzaxw98v7bwbzkssgx5zgczhzs2y8mi"; + version = "1.1.0.0"; + sha256 = "10sjizl6bxmcf90ksrgzvxmrka41g3pa2ciwcxfpkzgx3wnf1855"; libraryHaskellDepends = [ aeson async base blaze-markup bytestring containers data-default directory extra filepath ghcide hls-graph hls-plugin-api hspec @@ -137232,8 +137631,8 @@ self: { }: mkDerivation { pname = "hs-tags"; - version = "0.1.5.1"; - sha256 = "1yk1x24qar19hx47yjlr4f1qz3ld45hzpc74yxak73rsz08c08dx"; + version = "0.1.5.2"; + sha256 = "0xvrar39682z4jiggf260ypxhzk2z180zlh3i3rw19cbq1xdw5hw"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -142256,7 +142655,7 @@ self: { license = lib.licenses.mit; }) {}; - "http-client_0_7_8" = callPackage + "http-client_0_7_9" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , deepseq, directory, exceptions, filepath, ghc-prim, hspec @@ -142266,8 +142665,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.7.8"; - sha256 = "043ydfakl02cghmphzz9hj08hrfszqw96vjrb4cal7c7801szz0q"; + version = "0.7.9"; + sha256 = "1yg8sx50bs2q1si2f2783w1iy3235h8mxzif2g498ixpx6syzrmy"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -144479,8 +144878,8 @@ self: { pname = "hw-dsv"; version = "0.4.1.0"; sha256 = "1wv0yg662c3bq4kpgfqfjks59v17i5h3v3mils1qpxn4c57jr3s8"; - revision = "5"; - editedCabalFile = "0dzysj8fzyfg4ggda5ramq1zad8jb810rg2nncnzv95xmnlwakgl"; + revision = "6"; + editedCabalFile = "0w0w2ir8z1v4zpjxx36slkqcpvgl1s9520cnnbqg9i0fnvydb50v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -148895,8 +149294,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "include-env"; - version = "0.1.3.0"; - sha256 = "0yj7gbsxdjihf243c0xym5yxdkyr1s8qs8dvxhf7xf5pw77y03qg"; + version = "0.3.0.0"; + sha256 = "00wgyka74w6i4w2k673cahp2nmsvhgdfdc3dp5nqb1hgks51n5lc"; libraryHaskellDepends = [ base template-haskell ]; description = "Include the value of an environment variable at compile time"; license = lib.licenses.bsd3; @@ -149576,8 +149975,8 @@ self: { }: mkDerivation { pname = "influxdb"; - version = "1.9.1.2"; - sha256 = "0adrfaimjfrhfx2542wynjpd810yqxnjr3q4hhw8gz75v70f44nn"; + version = "1.9.2"; + sha256 = "1dmj2gg47wav9qk22a9p4pclxmxnw3czyfj19nbb09911vq1ng5n"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -150919,8 +151318,8 @@ self: { }: mkDerivation { pname = "interval-algebra"; - version = "0.10.2"; - sha256 = "13rglhfcjlwsvch4qcrsjfgcxv4rsxx63zhw3fjzvb5hrj7qvgb1"; + version = "1.0.0"; + sha256 = "1wd2z7ngw53krg3y5klrhlndm9dilmqpvmlipjda168gqisxsscp"; libraryHaskellDepends = [ base containers foldl QuickCheck safe time witherable ]; @@ -155263,17 +155662,18 @@ self: { "json-query" = callPackage ({ mkDerivation, array-chunks, base, bytebuild, byteslice - , bytestring, json-syntax, neat-interpolation, primitive - , scientific-notation, tasty, tasty-hunit, text, text-short - , transformers + , bytestring, contiguous, json-syntax, neat-interpolation + , primitive, primitive-unlifted, profunctors, scientific-notation + , tasty, tasty-hunit, text, text-short, transformers }: mkDerivation { pname = "json-query"; - version = "0.1.0.0"; - sha256 = "0i1lw40j6qdfcj44mzp5g99plqwdwbh4ab3rfvv24v2c2fq20kqm"; + version = "0.2.0.0"; + sha256 = "1wlf8vl890lpvffl5f5aj8g6zdyzf5vq1fpcsl5cfrllws8jprln"; libraryHaskellDepends = [ - array-chunks base bytebuild bytestring json-syntax primitive - scientific-notation text-short transformers + array-chunks base bytebuild bytestring contiguous json-syntax + primitive primitive-unlifted profunctors scientific-notation + text-short transformers ]; testHaskellDepends = [ array-chunks base bytebuild byteslice bytestring json-syntax @@ -155346,15 +155746,15 @@ self: { "json-rpc-generic" = callPackage ({ mkDerivation, aeson, aeson-generic-compat, base, containers - , dlist, QuickCheck, quickcheck-simple, scientific, text - , transformers, unordered-containers, vector + , QuickCheck, quickcheck-simple, scientific, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "json-rpc-generic"; - version = "0.2.1.5"; - sha256 = "1h1spyiq5xix3rbjdk37a28l6l46zygvxafdhaa466hyn2j7p4cz"; + version = "0.2.1.6"; + sha256 = "0qzqf4vnlpkj1gl48kds4lxmb0glf4k33bv6dq0hdyrv62aw52m4"; libraryHaskellDepends = [ - aeson aeson-generic-compat base containers dlist scientific text + aeson aeson-generic-compat base containers scientific text transformers unordered-containers vector ]; testHaskellDepends = [ @@ -158785,8 +159185,8 @@ self: { ({ mkDerivation, base, HUnit }: mkDerivation { pname = "kparams"; - version = "0.1.0.0"; - sha256 = "0q1ma3qm2anpr6w4xa78wh97b7pzy85ggjiiwbd0gb7b0vwbglx0"; + version = "0.1.0.1"; + sha256 = "1zb0xww3rgqcd7famh7cwf4igva60a8q8mv78a6mkdfffjg16q8s"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -160474,8 +160874,8 @@ self: { ({ mkDerivation, base, pretty }: mkDerivation { pname = "language-c99"; - version = "0.1.2"; - sha256 = "0k4a1chca328sa3w7aghhi446kqfrbp6h5jaj2rddd8f8qjz5pag"; + version = "0.1.3"; + sha256 = "159cy0vrnzs8kdraclia3i693kkik33dnhx5279d7l685jf3a8fz"; libraryHaskellDepends = [ base pretty ]; description = "An implementation of the C99 AST that strictly follows the standard"; license = lib.licenses.mit; @@ -160643,15 +161043,15 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "language-docker_10_1_1" = callPackage + "language-docker_10_1_2" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , hspec, hspec-megaparsec, HUnit, megaparsec, prettyprinter , QuickCheck, split, text, time }: mkDerivation { pname = "language-docker"; - version = "10.1.1"; - sha256 = "0qk6riw3xf57p4jizw15bd45in924vmjkrycaw0dvwkizb74a53b"; + version = "10.1.2"; + sha256 = "07h2qarbscgppn9drpl72pi2w9arigqpczrxb51q9m6xhfdx12n1"; libraryHaskellDepends = [ base bytestring containers data-default-class megaparsec prettyprinter split text time @@ -164632,17 +165032,29 @@ self: { }) {}; "libmdbx" = callPackage - ({ mkDerivation, base, bytestring, c2hs, mtl, store, text }: + ({ mkDerivation, base, binary, bytestring, c2hs, data-default + , directory, hspec, HUnit, mtl, store, store-core, text + , transformers + }: mkDerivation { pname = "libmdbx"; - version = "0.1.0.4"; - sha256 = "0gkpj2chxmq9kb6mg9r78x4w4lspr2sq3462xy1m9y2frcbbkf8p"; + version = "0.2.1.0"; + sha256 = "1v5gjp1hr4c1r5nbf4r2j3pd2kxl36b9xpphmmxqin7jfmpj5fjj"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base mtl text ]; + libraryHaskellDepends = [ + base binary bytestring data-default mtl store store-core text + transformers + ]; libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ base bytestring mtl store text ]; - testHaskellDepends = [ base mtl text ]; + executableHaskellDepends = [ + base binary bytestring data-default mtl store store-core text + transformers + ]; + testHaskellDepends = [ + base binary bytestring data-default directory hspec HUnit mtl store + store-core text transformers + ]; description = "Bindings for libmdbx, an embedded key/value store"; license = lib.licenses.bsd3; }) {}; @@ -165396,6 +165808,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "lift-generics_0_2_1" = callPackage + ({ mkDerivation, base, base-compat, containers, generic-deriving + , ghc-prim, hspec, hspec-discover, mtl, template-haskell, th-compat + , th-lift-instances + }: + mkDerivation { + pname = "lift-generics"; + version = "0.2.1"; + sha256 = "1qkzq8hcb6j15cslv577bmhjcxmljzsrryysdgd7r99kr3q445b4"; + libraryHaskellDepends = [ + base generic-deriving ghc-prim template-haskell th-compat + ]; + testHaskellDepends = [ + base base-compat containers generic-deriving hspec mtl + template-haskell th-compat th-lift-instances + ]; + testToolDepends = [ hspec-discover ]; + description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lift-read-show" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -167316,6 +167750,25 @@ self: { license = lib.licenses.mit; }) {}; + "list-t_1_0_5" = callPackage + ({ mkDerivation, base, base-prelude, foldl, HTF, logict, mmorph + , monad-control, mtl, mtl-prelude, semigroups, transformers + , transformers-base + }: + mkDerivation { + pname = "list-t"; + version = "1.0.5"; + sha256 = "1gyn25ra5y8bv1hxlsjg6l1dmzp6wj9g81v1nxz1p545cbl3g9my"; + libraryHaskellDepends = [ + base foldl logict mmorph monad-control mtl semigroups transformers + transformers-base + ]; + testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; + description = "ListT done right"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "list-t-attoparsec" = callPackage ({ mkDerivation, attoparsec, base-prelude, either, hspec, list-t , list-t-text, text, transformers @@ -170272,6 +170725,8 @@ self: { pname = "lsp"; version = "1.2.0.1"; sha256 = "1bdgbxakdyhkrddj58f0al2wrx1mckp6hia7hk2wqjix20my8v49"; + revision = "1"; + editedCabalFile = "193y4b3l6agm83ng2c0ngvd0j9a71q237g9i5v57p502lhzfaag2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174818,22 +175273,23 @@ self: { license = lib.licenses.gpl3Plus; }) {}; - "mcmc_0_6_0_0" = callPackage + "mcmc_0_6_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, circular, containers - , criterion, data-default, deepseq, directory, dirichlet - , double-conversion, hspec, log-domain, math-functions, matrices - , microlens, monad-parallel, mwc-random, pretty-show, primitive - , statistics, time, transformers, vector, zlib + , covariance, criterion, data-default, deepseq, directory + , dirichlet, double-conversion, hmatrix, hspec, log-domain + , math-functions, microlens, monad-parallel, mwc-random + , pretty-show, primitive, statistics, time, transformers, vector + , zlib }: mkDerivation { pname = "mcmc"; - version = "0.6.0.0"; - sha256 = "13m4rdgfwvwhw7nznxlq6af2w56pizgypxxyn8g2agzn2vl6nzfl"; + version = "0.6.1.0"; + sha256 = "0wln2fin522mg8ql4ypyxhm93rgq985bcqq61gsvzqrkwrp7n33a"; libraryHaskellDepends = [ - aeson base bytestring circular containers data-default deepseq - directory dirichlet double-conversion log-domain math-functions - matrices microlens monad-parallel mwc-random pretty-show primitive - statistics time transformers vector zlib + aeson base bytestring circular containers covariance data-default + deepseq directory dirichlet double-conversion hmatrix log-domain + math-functions microlens monad-parallel mwc-random pretty-show + primitive statistics time transformers vector zlib ]; testHaskellDepends = [ base hspec log-domain mwc-random statistics @@ -174999,22 +175455,20 @@ self: { }) {}; "mealy" = callPackage - ({ mkDerivation, adjunctions, base, containers, doctest, folds - , generic-lens, lens, matrix, mwc-probability, numhask - , numhask-array, primitive, profunctors, tdigest, text, vector - , vector-algorithms + ({ mkDerivation, adjunctions, base, containers, folds, generic-lens + , lens, matrix, mwc-probability, numhask, numhask-array, primitive + , profunctors, tdigest, text, vector, vector-algorithms }: mkDerivation { pname = "mealy"; - version = "0.0.3"; - sha256 = "0gv4vi8ppbrhi8j2xwhnw96sybs2ci2ja6s37ggv4g0lxbxin17m"; + version = "0.1.0"; + sha256 = "14xdhb39aa548sswbkasx546pzpgyl9msabi2w5gd7qwvlhxsmg3"; libraryHaskellDepends = [ adjunctions base containers folds generic-lens lens matrix mwc-probability numhask numhask-array primitive profunctors tdigest text vector vector-algorithms ]; - testHaskellDepends = [ base doctest numhask ]; - description = "See readme.md"; + description = "Mealy machines for processing time-series and ordered data"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -175988,6 +176442,18 @@ self: { license = lib.licenses.mit; }) {}; + "merge" = callPackage + ({ mkDerivation, base, profunctors }: + mkDerivation { + pname = "merge"; + version = "0.2.0.0"; + sha256 = "193xvnm5ahms8pg8g8jscrcfp29mwni9rssy5hci11z3b126s6wv"; + libraryHaskellDepends = [ base profunctors ]; + testHaskellDepends = [ base ]; + description = "A functor for consistent merging of information"; + license = lib.licenses.mit; + }) {}; + "merge-bash-history" = callPackage ({ mkDerivation, attoparsec, base, data-ordlist, errors , optparse-applicative, text @@ -178263,19 +178729,20 @@ self: { }) {}; "miso" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, http-api-data - , http-types, lucid, network-uri, servant, servant-lucid, text - , transformers, vector + ({ mkDerivation, aeson, base, bytestring, containers, file-embed + , http-api-data, http-types, jsaddle, lucid, network-uri, servant + , servant-lucid, tagsoup, text, transformers, vector }: mkDerivation { pname = "miso"; - version = "1.7.1.0"; - sha256 = "1hkfcinwymrff8mmvywhnlzbj5804hwkk4rhzxzhzsycdf4v7a41"; + version = "1.8.0.0"; + sha256 = "02j6z7l8016cccm9i699b0ggp3l6hxhk0j7m8kiw5d7ik4wciphv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers http-api-data http-types lucid - network-uri servant servant-lucid text transformers vector + aeson base bytestring containers file-embed http-api-data + http-types jsaddle lucid network-uri servant servant-lucid tagsoup + text transformers vector ]; description = "A tasty Haskell front-end framework"; license = lib.licenses.bsd3; @@ -178298,8 +178765,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "miso-examples"; - version = "1.7.1.0"; - sha256 = "1z6zcydai6k9hj1phws1axdcbvdplhxv833is7pzfv8sq9mfyfsc"; + version = "1.8.0.0"; + sha256 = "1dr967y1ffp1lw6jiclrgqvfvfi68d88l5qbsyl8bidfzvm7sbk1"; isLibrary = false; isExecutable = true; description = "A tasty Haskell front-end framework"; @@ -181360,6 +181827,29 @@ self: { license = lib.licenses.mit; }) {}; + "mono-traversable_1_0_15_2" = callPackage + ({ mkDerivation, base, bytestring, containers, foldl, gauge + , hashable, hspec, HUnit, mwc-random, QuickCheck, split, text + , transformers, unordered-containers, vector, vector-algorithms + }: + mkDerivation { + pname = "mono-traversable"; + version = "1.0.15.2"; + sha256 = "1drh7nxfzlfmjr11hk2ijjsf3zsim18blaghhxmx6nxgy8i95876"; + libraryHaskellDepends = [ + base bytestring containers hashable split text transformers + unordered-containers vector vector-algorithms + ]; + testHaskellDepends = [ + base bytestring containers foldl hspec HUnit QuickCheck text + transformers unordered-containers vector + ]; + benchmarkHaskellDepends = [ base gauge mwc-random vector ]; + description = "Type classes for mapping, folding, and traversing monomorphic containers"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "mono-traversable-instances" = callPackage ({ mkDerivation, base, comonad, containers, dlist, dlist-instances , mono-traversable, semigroupoids, semigroups, transformers @@ -191996,6 +192486,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "numeric-kinds" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "numeric-kinds"; + version = "0.1.0.0"; + sha256 = "0rdx39wa7kklx9a7i5rdwf541fxpz9v3n32rvy2fa6i7n4hr64s4"; + libraryHaskellDepends = [ base ]; + description = "Type-level numeric types, classes, and instances"; + license = lib.licenses.asl20; + }) {}; + "numeric-limits" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -196541,21 +197042,21 @@ self: { license = lib.licenses.bsd3; }) {}; - "ormolu_0_2_0_0" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, containers, Diff - , dlist, exceptions, filepath, ghc-lib-parser, gitrev, hspec - , hspec-discover, mtl, optparse-applicative, path, path-io, syb - , text + "ormolu_0_3_0_0" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, Cabal, containers + , Diff, directory, dlist, exceptions, filepath, ghc-lib-parser + , gitrev, hspec, hspec-discover, mtl, optparse-applicative, path + , path-io, syb, text }: mkDerivation { pname = "ormolu"; - version = "0.2.0.0"; - sha256 = "0zivz7vcl4m1rjay5md6cdqac9cnfwz9c844l20byiz5h49bwfhb"; + version = "0.3.0.0"; + sha256 = "073d8wkpciqadcv1vnim00c13n30ybqdraaxgyr96dcqvq71zvjv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal base bytestring containers Diff dlist exceptions - ghc-lib-parser mtl syb text + ansi-terminal base bytestring Cabal containers Diff directory dlist + exceptions filepath ghc-lib-parser mtl syb text ]; executableHaskellDepends = [ base filepath ghc-lib-parser gitrev optparse-applicative text @@ -201019,6 +201520,20 @@ self: { license = lib.licenses.gpl3Plus; }) {}; + "pava_0_1_1_2" = callPackage + ({ mkDerivation, base, criterion, hspec, mwc-random, vector }: + mkDerivation { + pname = "pava"; + version = "0.1.1.2"; + sha256 = "0qvyia9iy8f9s16v2khgzm74z9r7mks98xz1g1qhrdkw950mjlga"; + 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 { @@ -202226,15 +202741,15 @@ self: { }) {}; "perf" = callPackage - ({ mkDerivation, base, containers, deepseq, foldl, mtl, rdtsc, text - , time, transformers + ({ mkDerivation, base, containers, foldl, mtl, rdtsc, text, time + , transformers }: mkDerivation { pname = "perf"; - version = "0.8.0"; - sha256 = "1wgl5nwvip2mxicskqqj6c0c53rp1x4ls31j5i5njd324kvxp8ql"; + version = "0.9.0"; + sha256 = "116j1dygya9226q52vw6l6w64raldjpz7z22kmcm38v36i696lik"; libraryHaskellDepends = [ - base containers deepseq foldl mtl rdtsc text time transformers + base containers foldl mtl rdtsc text time transformers ]; description = "Low-level run time measurement"; license = lib.licenses.bsd3; @@ -203137,39 +203652,6 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.13.0.3"; - sha256 = "06f5yyv8bj3m4zpjwr1k66hkmh1gfy624rnq2g12sjrpz8nrax6j"; - 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 hspec-expectations-lifted http-api-data HUnit - monad-logger path-pieces 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; - }) {}; - - "persistent-postgresql_2_13_1_0" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring - , conduit, containers, fast-logger, hspec, hspec-expectations - , hspec-expectations-lifted, http-api-data, HUnit, monad-logger - , mtl, path-pieces, 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.13.1.0"; sha256 = "05bj3b7kdwaba3szrrsmafxr6vcnvdhq20jk5xx348jnf2flkw0i"; isLibrary = true; @@ -203189,7 +203671,6 @@ self: { ]; description = "Backend for the persistent library using postgresql"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "persistent-protobuf" = callPackage @@ -204211,8 +204692,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-plus"; - version = "0.4.0.0"; - sha256 = "01c0yfgg78za60izyak3qcxwf39xydyw405grflwxxkcl4bq5ax7"; + version = "0.4.1.0"; + sha256 = "08qshrwh19wvav0j5h05x49m8i7j1p4lgzwpv86n5y34gx0bbfg2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -204302,8 +204783,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.11.0.1"; - sha256 = "0mr1pckay3i72yh1b1dbbm68cbf4jx2vw1w0h86ykvamc1vjy7lp"; + version = "0.12.1.0"; + sha256 = "1scjdf6k36vqd4cdnsqwwhbb97dsicarrc320w4ybikr1rk42phd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -204340,8 +204821,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-examples-common"; - version = "0.1.3.0"; - sha256 = "09jl0zjpny5xh7f9igglfdl36lazrrr131khi625ay48283g2wpc"; + version = "0.1.4.0"; + sha256 = "1dsfnjjri15mhm31ny82j26djbsw6lgvvqpq9k7fzgj0inb5slns"; libraryHaskellDepends = [ base heaps mmsyn2-array phonetic-languages-constraints-array phonetic-languages-ukrainian-array @@ -204364,8 +204845,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-array"; - version = "0.11.0.0"; - sha256 = "0qxvfn4ii0v722r11hgcwb68d19ji1xchdkgr5n4dsbdkzqlvjrf"; + version = "0.12.1.0"; + sha256 = "0wp5gpshmq5kr39glvfmc0b5jg8p1i146svjxh6flgkfn7yyr6rf"; libraryHaskellDepends = [ base heaps mmsyn2-array mmsyn3 parallel phonetic-languages-constraints-array @@ -204520,8 +205001,8 @@ self: { ({ mkDerivation, base, mmsyn2-array, mmsyn5 }: mkDerivation { pname = "phonetic-languages-ukrainian-array"; - version = "0.6.0.0"; - sha256 = "01wsdcnl9vidwbmxv1jlvchad477l5kdkz6jnfm6rnfkyrfwrcrn"; + version = "0.6.1.0"; + sha256 = "1ggwhfgfk1vrl5dw1yzd2xnmnk9r33fnfcydm6zskxairbgx7zkr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mmsyn2-array mmsyn5 ]; @@ -208401,8 +208882,8 @@ self: { }: mkDerivation { pname = "polysemy-conc"; - version = "0.2.0.0"; - sha256 = "16ywldx4p76s64qfwlm7swdzz8kcvzzrflz7cprlq2pc1fc6bf7x"; + version = "0.3.0.0"; + sha256 = "0lg68nwasak6yvzy1wgjlydmvbj5cwyadmgi14vw4df6wnh17wwq"; libraryHaskellDepends = [ async base containers polysemy polysemy-time relude stm stm-chans string-interpolate template-haskell text time unagi-chan unix @@ -208555,8 +209036,8 @@ self: { }: mkDerivation { pname = "polysemy-log"; - version = "0.2.2.3"; - sha256 = "1a2l9zspg0ajbgq0vqbxz399fcbr53sydhk71j8ii8y79pm1b3z4"; + version = "0.2.2.4"; + sha256 = "17jzmiqqwq44zvg1m6w0m3ishkwfcz66gagijwkqbrk1rcn3bmc0"; libraryHaskellDepends = [ ansi-terminal base polysemy polysemy-conc polysemy-time relude string-interpolate template-haskell text time @@ -208578,8 +209059,8 @@ self: { }: mkDerivation { pname = "polysemy-log-co"; - version = "0.2.2.3"; - sha256 = "04gx2irrj59rs0jm0mrc3mka3xk46qx9z5mwad4akh0kmpsl09rz"; + version = "0.2.2.4"; + sha256 = "0ph24p6b7m4icq65kc6ws8ih9p1arpq9zx3abwzsq2f4dcgmibhx"; libraryHaskellDepends = [ base co-log co-log-core co-log-polysemy polysemy polysemy-conc polysemy-log polysemy-time relude text time @@ -208601,8 +209082,8 @@ self: { }: mkDerivation { pname = "polysemy-log-di"; - version = "0.2.2.3"; - sha256 = "050y12sgd4j3487q01bczsjsn1dask507gpz1i8fgl958vr0ywwj"; + version = "0.2.2.4"; + sha256 = "1m2zssg54lx0drc8vw0jjhdl74pks6752am8467xv3qawndm71kg"; libraryHaskellDepends = [ base di-polysemy polysemy polysemy-conc polysemy-log polysemy-time relude text time @@ -209640,8 +210121,8 @@ self: { }: mkDerivation { pname = "portray"; - version = "0.1.0.0"; - sha256 = "06czmcf00rdhj7f5xyrllkjmbqsvgv7j9bxvr0jn4cipvnd8lq7c"; + version = "0.2.0"; + sha256 = "1kzzvwqphlg1dmd486ijkv6vsqmxnp8h05mwc8590yjxdln5vzdw"; libraryHaskellDepends = [ base containers text wrapped ]; testHaskellDepends = [ base containers HUnit test-framework test-framework-hunit text @@ -209655,8 +210136,8 @@ self: { ({ mkDerivation, base, containers, dlist, portray, text, wrapped }: mkDerivation { pname = "portray-diff"; - version = "0.1.0.0"; - sha256 = "16lb8gcvdqbnjz72znjcm5c8zrydnjwwmqr9hm4bq3vay4f2dapm"; + version = "0.1.0.1"; + sha256 = "1da884cj865q6g1bd1fhcazyl1nzxb0pk2nvhcpp4iqkjvhyd8hw"; libraryHaskellDepends = [ base containers dlist portray text wrapped ]; @@ -209697,14 +210178,36 @@ self: { }: mkDerivation { pname = "portray-pretty"; - version = "0.1.0.0"; - sha256 = "1pz42y8b0psks8p9yd18ns0149q9m41ym4ah28zcg1arl36b3bf4"; + version = "0.1.0.2"; + sha256 = "1gh50r77yz1l8qkhdz96bds2l0d5zi75fkir27x3si406h7sdic9"; libraryHaskellDepends = [ base portray portray-diff pretty text ]; testHaskellDepends = [ base HUnit portray portray-diff pretty test-framework test-framework-hunit text ]; - description = "\"pretty\" integration for \"portray\""; + description = "A portray backend using the pretty package"; + license = lib.licenses.asl20; + }) {}; + + "portray-prettyprinter" = callPackage + ({ mkDerivation, base, HUnit, portray, portray-diff, prettyprinter + , prettyprinter-ansi-terminal, QuickCheck, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "portray-prettyprinter"; + version = "0.2.0"; + sha256 = "16g55vjcfawx1jxmgy3zgl6bqv67h831z00912fbfh878s1s24ic"; + libraryHaskellDepends = [ + base portray portray-diff prettyprinter prettyprinter-ansi-terminal + text + ]; + testHaskellDepends = [ + base HUnit portray portray-diff prettyprinter + prettyprinter-ansi-terminal QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 text + ]; + description = "A portray backend using the prettyprinter package"; license = lib.licenses.asl20; }) {}; @@ -210416,8 +210919,8 @@ self: { }: mkDerivation { pname = "postgresql-query"; - version = "3.8.2"; - sha256 = "1vcfs5yg9ab0axdm661kjpsfxii7h3s8rrq38kgc68vhr280m110"; + version = "3.9.0"; + sha256 = "1520crprhdnan7w5qm9h42r6cxz4v6zffwwfvybzwpczj2g3laa6"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder bytestring containers data-default exceptions file-embed haskell-src-meta hreader hset @@ -212472,6 +212975,32 @@ self: { license = lib.licenses.bsd2; }) {}; + "prettyprinter_1_7_1" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, base-compat, bytestring + , containers, deepseq, doctest, gauge, mtl, pgp-wordlist + , QuickCheck, quickcheck-instances, random, tasty, tasty-hunit + , tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "prettyprinter"; + version = "1.7.1"; + sha256 = "0i8b3wjjpdvp5b857j065jwyrpgcnzgk75imrj7i3yhl668acvjy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ + base bytestring doctest pgp-wordlist QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + ansi-wl-pprint base base-compat containers deepseq gauge mtl + QuickCheck random text transformers + ]; + description = "A modern, easy to use, well-documented, extensible pretty-printer"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "prettyprinter-ansi-terminal" = callPackage ({ mkDerivation, ansi-terminal, base, base-compat, containers , deepseq, doctest, gauge, prettyprinter, QuickCheck, text @@ -212490,6 +213019,25 @@ self: { license = lib.licenses.bsd2; }) {}; + "prettyprinter-ansi-terminal_1_1_3" = callPackage + ({ mkDerivation, ansi-terminal, base, base-compat, containers + , deepseq, doctest, gauge, prettyprinter, QuickCheck, text + }: + mkDerivation { + pname = "prettyprinter-ansi-terminal"; + version = "1.1.3"; + sha256 = "1cqxbcmy9ykk4pssq5hp6h51g2h547zfz549awh0c1fni8q3jdw1"; + libraryHaskellDepends = [ ansi-terminal base prettyprinter text ]; + testHaskellDepends = [ base doctest ]; + benchmarkHaskellDepends = [ + base base-compat containers deepseq gauge prettyprinter QuickCheck + text + ]; + description = "ANSI terminal backend for the »prettyprinter« package"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "prettyprinter-compat-annotated-wl-pprint" = callPackage ({ mkDerivation, base, prettyprinter, text }: mkDerivation { @@ -212518,6 +213066,22 @@ self: { license = lib.licenses.bsd2; }) {}; + "prettyprinter-compat-ansi-wl-pprint_1_0_2" = callPackage + ({ mkDerivation, base, prettyprinter, prettyprinter-ansi-terminal + , text + }: + mkDerivation { + pname = "prettyprinter-compat-ansi-wl-pprint"; + version = "1.0.2"; + sha256 = "0mcy0621lx0zmc2csdq348r21f932f2w51y62jzyz4cby58p5ch5"; + libraryHaskellDepends = [ + base prettyprinter prettyprinter-ansi-terminal text + ]; + description = "Drop-in compatibility package to migrate from »ansi-wl-pprint« to »prettyprinter«"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "prettyprinter-compat-wl-pprint" = callPackage ({ mkDerivation, base, prettyprinter, text }: mkDerivation { @@ -212531,6 +213095,18 @@ self: { license = lib.licenses.bsd2; }) {}; + "prettyprinter-compat-wl-pprint_1_0_1" = callPackage + ({ mkDerivation, base, prettyprinter, text }: + mkDerivation { + pname = "prettyprinter-compat-wl-pprint"; + version = "1.0.1"; + sha256 = "0ffrbh79da9ihn3lbk9vq9329sdhddf6ccnag1k148z3ividxc63"; + libraryHaskellDepends = [ base prettyprinter text ]; + description = "Drop-in compatibility package to migrate from »wl-pprint« to »prettyprinter«"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "prettyprinter-convert-ansi-wl-pprint" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, doctest , prettyprinter, prettyprinter-ansi-terminal, text @@ -212548,6 +213124,24 @@ self: { license = lib.licenses.bsd2; }) {}; + "prettyprinter-convert-ansi-wl-pprint_1_1_2" = callPackage + ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, doctest + , prettyprinter, prettyprinter-ansi-terminal, text + }: + mkDerivation { + pname = "prettyprinter-convert-ansi-wl-pprint"; + version = "1.1.2"; + sha256 = "0kfrwnaldx0cyr3mwx3ys14bl58nfjpxkzrfi6152gvfh8ly44c6"; + libraryHaskellDepends = [ + ansi-terminal ansi-wl-pprint base prettyprinter + prettyprinter-ansi-terminal text + ]; + testHaskellDepends = [ base doctest ]; + description = "Converter from »ansi-wl-pprint« documents to »prettyprinter«-based ones"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "prettyprinter-graphviz" = callPackage ({ mkDerivation, base, graphviz, prettyprinter, text }: mkDerivation { @@ -220066,6 +220660,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "rank2classes_1_4_3" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, distributive, doctest + , markdown-unlit, tasty, tasty-hunit, template-haskell + , transformers + }: + mkDerivation { + pname = "rank2classes"; + version = "1.4.3"; + sha256 = "03sla9gsg23ma8xxm3mndc9wrh715lsgksxc34rxkmjbp9vxlccj"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base distributive template-haskell transformers + ]; + testHaskellDepends = [ + base distributive doctest tasty tasty-hunit + ]; + testToolDepends = [ markdown-unlit ]; + description = "standard type constructor class hierarchy, only with methods of rank 2 types"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "rapid" = callPackage ({ mkDerivation, async, base, containers, foreign-store, stm }: mkDerivation { @@ -221089,20 +221705,20 @@ self: { "reactive-banana" = callPackage ({ mkDerivation, base, containers, hashable, HUnit, pqueue - , psqueues, semigroups, test-framework, test-framework-hunit + , psqueues, semigroups, test-framework, test-framework-hunit, these , transformers, unordered-containers, vault }: mkDerivation { pname = "reactive-banana"; - version = "1.2.1.0"; - sha256 = "18vm9zxr59s8n5bmqx3pg8jbaay6vlz1icnf9p1vnq8bvsb6svyc"; + version = "1.2.2.0"; + sha256 = "0zqvswqgisfj1hvwp9r53b91h4062d2afrw4ybcdr7d047ba9icp"; libraryHaskellDepends = [ - base containers hashable pqueue semigroups transformers + base containers hashable pqueue semigroups these transformers unordered-containers vault ]; testHaskellDepends = [ base containers hashable HUnit pqueue psqueues semigroups - test-framework test-framework-hunit transformers + test-framework test-framework-hunit these transformers unordered-containers vault ]; description = "Library for functional reactive programming (FRP)"; @@ -222046,8 +222662,8 @@ self: { ({ mkDerivation, base, composition-prelude }: mkDerivation { pname = "recursion"; - version = "2.2.4.4"; - sha256 = "09zssx2yqz22hm678ik5zz2zkanzfazcyfqmwlxc9mk6gxxdy6ia"; + version = "2.2.5.0"; + sha256 = "08b72mbg187v27i5pq89zgn63ldnh47nq0hyg2xyh6j58d9f7g4v"; libraryHaskellDepends = [ base composition-prelude ]; description = "A recursion schemes library for Haskell"; license = lib.licenses.bsd3; @@ -222645,23 +223261,6 @@ self: { broken = true; }) {}; - "refinery_0_3_0_0" = callPackage - ({ mkDerivation, base, checkers, exceptions, hspec, logict, mmorph - , mtl, QuickCheck - }: - mkDerivation { - pname = "refinery"; - version = "0.3.0.0"; - sha256 = "1bsbnxf75prw153c3k02jk84h3sravdi1c1sl75c7sx4xq81qhlp"; - libraryHaskellDepends = [ base exceptions logict mmorph mtl ]; - testHaskellDepends = [ - base checkers exceptions hspec logict mmorph mtl QuickCheck - ]; - description = "Toolkit for building proof automation systems"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "refinery" = callPackage ({ mkDerivation, base, checkers, exceptions, hspec, mmorph, mtl , QuickCheck @@ -222734,10 +223333,8 @@ self: { }: mkDerivation { pname = "reflex"; - version = "0.8.1.0"; - sha256 = "0p27dj7fckkvw9li69whcfrv1cd59kkp6qbvfmndzx8fbh44ggbp"; - revision = "1"; - editedCabalFile = "07bvrcfbnz1pv15cmk4f780aiw72gbhsji20kqyk8kk7d2jwpcab"; + version = "0.8.1.1"; + sha256 = "0fxvlvh6k2h7p76nhjbjl6jqs4iqixq5p93fywn6jj37g00lxnhy"; libraryHaskellDepends = [ base bifunctors comonad constraints-extras containers data-default dependent-map dependent-sum exception-transformers haskell-src-exts @@ -222937,8 +223534,8 @@ self: { }: mkDerivation { pname = "reflex-dom-core"; - version = "0.6.2.0"; - sha256 = "067m8ifgkknafy0nxzmns89dqjzpsc983pm3gaq7dg618jp1dzy4"; + version = "0.6.2.1"; + sha256 = "1xqb0m1p2x8s2x98j9nlq707p92gdjby9k925l13bly3rh1kk4y4"; libraryHaskellDepends = [ aeson base bifunctors bimap blaze-builder bytestring case-insensitive constraints containers contravariant data-default @@ -223443,24 +224040,25 @@ self: { "reflex-vty" = callPackage ({ mkDerivation, base, bimap, containers, data-default - , dependent-map, dependent-sum, exception-transformers, mtl - , primitive, ref-tf, reflex, stm, text, text-icu, time - , transformers, vty + , dependent-map, dependent-sum, exception-transformers, extra + , hspec, mmorph, mtl, ordered-containers, primitive, ref-tf, reflex + , stm, text, time, transformers, vty }: mkDerivation { pname = "reflex-vty"; - version = "0.1.4.2"; - sha256 = "07fjw95w8ahllbs1zp215apck01abcrv4sshid8z6972g7n7392r"; + version = "0.2.0.0"; + sha256 = "1l7ksf11352llcy6fzap3hsq9vgv99gs948ha5i1vvz9bjvn2qwg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bimap containers data-default dependent-map dependent-sum - exception-transformers mtl primitive ref-tf reflex stm text - text-icu time transformers vty + exception-transformers mmorph mtl ordered-containers primitive + ref-tf reflex stm text time transformers vty ]; executableHaskellDepends = [ base containers reflex text time transformers vty ]; + testHaskellDepends = [ base containers extra hspec reflex text ]; description = "Reflex FRP host and widgets for VTY applications"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -223973,6 +224571,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "regex-pcre-builtin_0_95_2_3_8_44" = callPackage + ({ mkDerivation, array, base, bytestring, containers, regex-base + , text + }: + mkDerivation { + pname = "regex-pcre-builtin"; + version = "0.95.2.3.8.44"; + sha256 = "0pn55ssrwr05c9sa9jvp0knvzjksz04wn3pmzf5dz4xgbyjadkna"; + libraryHaskellDepends = [ + array base bytestring containers regex-base text + ]; + description = "PCRE Backend for \"Text.Regex\" (regex-base)"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "regex-pcre-text" = callPackage ({ mkDerivation, array, base, bytestring, regex-base , regex-pcre-builtin, regex-tdfa-text, text @@ -227479,28 +228093,6 @@ self: { }: mkDerivation { pname = "rhbzquery"; - version = "0.4.3"; - sha256 = "13brargymd1c9b0csaprj85qdqg98bzj3z2smbb0v66myj48v6fp"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring config-ini directory email-validate extra filepath - http-types optparse-applicative simple-cmd simple-cmd-args text - ]; - testHaskellDepends = [ base simple-cmd ]; - description = "Bugzilla query tool"; - license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "rhbzquery_0_4_4" = callPackage - ({ mkDerivation, base, bytestring, config-ini, directory - , email-validate, extra, filepath, http-types, optparse-applicative - , simple-cmd, simple-cmd-args, text - }: - mkDerivation { - pname = "rhbzquery"; version = "0.4.4"; sha256 = "00175smanmcr6k8b83kj7mif47jggxn0pvy64yjc4ikpbw822c2q"; isLibrary = false; @@ -228337,6 +228929,25 @@ self: { broken = true; }) {}; + "rle" = callPackage + ({ mkDerivation, base, cereal, deepseq, portray, portray-diff + , QuickCheck, test-framework, test-framework-quickcheck2, wrapped + }: + mkDerivation { + pname = "rle"; + version = "0.1.0.1"; + sha256 = "05rbhm0lxrq7vdbq9s0q21m0f0hlzmknljmampcmdjnwbl4nvf3d"; + libraryHaskellDepends = [ + base cereal deepseq portray portray-diff wrapped + ]; + testHaskellDepends = [ + base cereal deepseq portray portray-diff QuickCheck test-framework + test-framework-quickcheck2 wrapped + ]; + description = "A data type of run-length-encoded lists"; + license = lib.licenses.asl20; + }) {}; + "rlglue" = callPackage ({ mkDerivation, base, binary, bytestring, data-binary-ieee754 , exceptions, network, network-simple, parsec, random, transformers @@ -229557,8 +230168,8 @@ self: { }: mkDerivation { pname = "row-types"; - version = "1.0.1.0"; - sha256 = "0msk1s6mnhclj9v2x2nnvbw3d4lbxhx2ks2hxaa726l3psakbs22"; + version = "1.0.1.2"; + sha256 = "05vfnhcfi7wsidxiknl8a28xvlid2q095qhah08r7mj9zq38da8f"; libraryHaskellDepends = [ base constraints deepseq generic-lens hashable profunctors text unordered-containers @@ -231178,8 +231789,8 @@ self: { }: mkDerivation { pname = "sajson"; - version = "0.1.0.0"; - sha256 = "0979skxh82s0q56smp8vlg0cj1k7qj1y37ivksl3spw9dspbpcs1"; + version = "0.2.0.0"; + sha256 = "0shqik98wnyfxb6qmqbbm6ap3108kbm3f4zrswg2nc6kkxc1dwkm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -231681,8 +232292,8 @@ self: { }: mkDerivation { pname = "sandwich"; - version = "0.1.0.8"; - sha256 = "0b0k01r85wiaxn264ax3xva8a2gy7vv9qnig2fxyr42zdkm289jy"; + version = "0.1.0.9"; + sha256 = "07knl1kpbg85df08q07byjid26bkgk514pngkf58h9wy4y5l5il7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -231714,20 +232325,20 @@ self: { }) {}; "sandwich-quickcheck" = callPackage - ({ mkDerivation, base, brick, free, monad-control, QuickCheck - , safe-exceptions, sandwich, string-interpolate, text, time + ({ mkDerivation, base, free, monad-control, mtl, QuickCheck + , safe-exceptions, sandwich, text, time }: mkDerivation { pname = "sandwich-quickcheck"; - version = "0.1.0.5"; - sha256 = "03z8g5q3yxfpazbwi56ji9554z3l2ac776mzz06xsb7cha3kf7lw"; + version = "0.1.0.6"; + sha256 = "1vlp15hcmrxrqwzqgk7ykpg3pvr0wd2cz6pib61yrxmp7334cf4y"; libraryHaskellDepends = [ - base brick free monad-control QuickCheck safe-exceptions sandwich - string-interpolate text time + base free monad-control mtl QuickCheck safe-exceptions sandwich + text time ]; testHaskellDepends = [ - base brick free monad-control QuickCheck safe-exceptions sandwich - string-interpolate text time + base free monad-control mtl QuickCheck safe-exceptions sandwich + text time ]; description = "Sandwich integration with QuickCheck"; license = lib.licenses.bsd3; @@ -231740,8 +232351,8 @@ self: { }: mkDerivation { pname = "sandwich-slack"; - version = "0.1.0.4"; - sha256 = "1l296q3lxafj3gd7pr6n6qrvcb4zdkncsj2z6ra6q0qfw465jaqk"; + version = "0.1.0.6"; + sha256 = "1ck4amyxcf2qpgx3qpbg2f137bi6px83k72bspi2kfn0nnx8gja9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -234007,6 +234618,29 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_gfx;}; + "sdl2-gfx_0_3_0_0" = callPackage + ({ mkDerivation, base, lifted-base, monad-control, SDL2, sdl2 + , SDL2_gfx, template-haskell, vector + }: + mkDerivation { + pname = "sdl2-gfx"; + version = "0.3.0.0"; + sha256 = "0r9m54ffkp1dv2ffz9i9318qhvpinc76iih7vg1dwq3siwgpxaxw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base lifted-base monad-control sdl2 template-haskell vector + ]; + librarySystemDepends = [ SDL2_gfx ]; + libraryPkgconfigDepends = [ SDL2 SDL2_gfx ]; + executableHaskellDepends = [ base sdl2 vector ]; + executableSystemDepends = [ SDL2_gfx ]; + executablePkgconfigDepends = [ SDL2 SDL2_gfx ]; + description = "Haskell bindings to SDL2_gfx"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_gfx;}; + "sdl2-image" = callPackage ({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_image , template-haskell, text, transformers @@ -234028,6 +234662,29 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_image;}; + "sdl2-image_2_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_image + , template-haskell, text + }: + mkDerivation { + pname = "sdl2-image"; + version = "2.1.0.0"; + sha256 = "03cjlmj844gmfxqn9mp8333hpsg227kaipgs6g68xwg0cvch696j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring sdl2 template-haskell text + ]; + librarySystemDepends = [ SDL2_image ]; + libraryPkgconfigDepends = [ SDL2 SDL2_image ]; + executableHaskellDepends = [ base sdl2 text ]; + executableSystemDepends = [ SDL2_image ]; + executablePkgconfigDepends = [ SDL2 SDL2_image ]; + description = "Haskell bindings to SDL2_image"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_image;}; + "sdl2-mixer" = callPackage ({ mkDerivation, base, bytestring, data-default-class, lifted-base , monad-control, sdl2, SDL2_mixer, template-haskell, vector @@ -234053,6 +234710,33 @@ self: { ]; }) {inherit (pkgs) SDL2_mixer;}; + "sdl2-mixer_1_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, lifted-base + , monad-control, sdl2, SDL2_mixer, template-haskell, vector + }: + mkDerivation { + pname = "sdl2-mixer"; + version = "1.2.0.0"; + sha256 = "16fgnxq2nmifbz3lrr7dn1qj57l5f2kzv124lya1fjaxmwk1h52q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring data-default-class lifted-base monad-control sdl2 + template-haskell vector + ]; + librarySystemDepends = [ SDL2_mixer ]; + libraryPkgconfigDepends = [ SDL2_mixer ]; + executableHaskellDepends = [ base data-default-class sdl2 vector ]; + executableSystemDepends = [ SDL2_mixer ]; + executablePkgconfigDepends = [ SDL2_mixer ]; + description = "Haskell bindings to SDL2_mixer"; + license = lib.licenses.bsd3; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) SDL2_mixer;}; + "sdl2-sprite" = callPackage ({ mkDerivation, base, optparse-simple, sdl2, sdl2-image, split , text @@ -236485,8 +237169,8 @@ self: { pname = "servant-benchmark"; version = "0.1.2.0"; sha256 = "0lqqk410nx48g895pfxkbbk85b1ijs4bfl9zr2li2p7wwwc4gyi9"; - revision = "1"; - editedCabalFile = "1zzprj7pw7fzyscg4n9g023c47bb6fywq5b11krazz3vyynh53cc"; + revision = "2"; + editedCabalFile = "1xg1w1cy44a06sb1x2j5crid9splfgay8cj20bpjdnv5sj510gd2"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive http-media http-types QuickCheck servant text yaml @@ -239897,8 +240581,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.19.5"; - sha256 = "105agfvn75czyq3jbmppybv776njlsqc7k4m1xnx0n78qjmcnpb9"; + version = "0.19.6"; + sha256 = "0hnm3h1ni4jq73a7b7yxhbg9wm8mrjda5kmkpnmclynnpwvvi7bx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -239941,16 +240625,17 @@ self: { }) {}; "shake-bench" = callPackage - ({ mkDerivation, aeson, base, Chart, Chart-diagrams, diagrams - , diagrams-svg, directory, extra, filepath, shake, text + ({ mkDerivation, aeson, base, Chart, Chart-diagrams + , diagrams-contrib, diagrams-core, diagrams-lib, diagrams-svg + , directory, extra, filepath, shake, text }: mkDerivation { pname = "shake-bench"; - version = "0.1.0.0"; - sha256 = "09lgmiw77nr3xycxksvzmcw1c2j66h51d5vxpm0lngv1dnsrad64"; + version = "0.1.0.2"; + sha256 = "14p9887qa2i34pbwfg2v2zzvdsbcpzf1d0mr0y2rzjy703356xsm"; libraryHaskellDepends = [ - aeson base Chart Chart-diagrams diagrams diagrams-svg directory - extra filepath shake text + aeson base Chart Chart-diagrams diagrams-contrib diagrams-core + diagrams-lib diagrams-svg directory extra filepath shake text ]; description = "Build rules for historical benchmarking"; license = lib.licenses.asl20; @@ -241152,6 +241837,54 @@ self: { broken = true; }) {}; + "short-vec" = callPackage + ({ mkDerivation, adjunctions, base, data-default-class, deepseq + , distributive, fin-int, gauge, HUnit, indexed-traversable + , integer-gmp, portray, portray-diff, QuickCheck, semigroupoids + , sint, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "short-vec"; + version = "0.1.0.0"; + sha256 = "0w651jipwxh7k4ng5rvq507br4347hzy8x8c47c1g7haryj80gzq"; + revision = "2"; + editedCabalFile = "1w56zmw085509grvk5ddlrv12pqpzfpmdprjd44lv4sgzv09bzfk"; + libraryHaskellDepends = [ + adjunctions base data-default-class deepseq distributive fin-int + indexed-traversable integer-gmp portray portray-diff QuickCheck + semigroupoids sint + ]; + testHaskellDepends = [ + adjunctions base data-default-class deepseq distributive fin-int + HUnit indexed-traversable integer-gmp portray portray-diff + QuickCheck semigroupoids sint test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + adjunctions base data-default-class deepseq distributive fin-int + gauge indexed-traversable integer-gmp portray portray-diff + QuickCheck semigroupoids sint + ]; + description = "A length-indexed vector type build on 'SmallArray#'"; + license = lib.licenses.asl20; + }) {}; + + "short-vec-lens" = callPackage + ({ mkDerivation, base, fin-int, indexed-traversable, lens + , short-vec, sint + }: + mkDerivation { + pname = "short-vec-lens"; + version = "0.1.0.0"; + sha256 = "1afz1izz19xrjy0cdhmpy7b667waa5v8jh1ps3jpjfpgbmysjz3g"; + libraryHaskellDepends = [ + base fin-int indexed-traversable lens short-vec sint + ]; + description = "Lenses and related functionality for the `short-vec` package"; + license = lib.licenses.asl20; + }) {}; + "shortbytestring" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim , primitive, random, tasty, tasty-bench, tasty-quickcheck @@ -242955,40 +243688,43 @@ self: { "simplexmq" = callPackage ({ mkDerivation, ansi-terminal, asn1-encoding, asn1-types, async - , attoparsec, base, base64-bytestring, bytestring, containers - , cryptonite, cryptostore, directory, filepath, generic-random - , hspec, hspec-core, HUnit, ini, iso8601-time, memory, mtl, network + , attoparsec, base, base64-bytestring, bytestring, composition + , constraints, containers, cryptonite, cryptostore, direct-sqlite + , directory, file-embed, filepath, generic-random, hspec + , hspec-core, HUnit, ini, iso8601-time, memory, mtl, network , network-transport, optparse-applicative, QuickCheck, random , simple-logger, sqlite-simple, stm, template-haskell, text, time , timeit, transformers, unliftio, unliftio-core, websockets, x509 }: mkDerivation { pname = "simplexmq"; - version = "0.3.2"; - sha256 = "1bxg91ycmpa8762v5vdviqvyzkfap4iv9plnr7gcibf8vsd39qxl"; + version = "0.4.1"; + sha256 = "0bqpjvcxk8fij0bvdp8abpaca17hwkjrya5fhiwzjsrs48c5w0by"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal asn1-encoding asn1-types async attoparsec base - base64-bytestring bytestring containers cryptonite directory - filepath generic-random iso8601-time memory mtl network - network-transport QuickCheck random simple-logger sqlite-simple stm - template-haskell text time transformers unliftio unliftio-core - websockets x509 + base64-bytestring bytestring composition constraints containers + cryptonite direct-sqlite directory file-embed filepath + generic-random iso8601-time memory mtl network network-transport + QuickCheck random simple-logger sqlite-simple stm template-haskell + text time transformers unliftio unliftio-core websockets x509 ]; executableHaskellDepends = [ ansi-terminal asn1-encoding asn1-types async attoparsec base - base64-bytestring bytestring containers cryptonite cryptostore - directory filepath generic-random ini iso8601-time memory mtl - network network-transport optparse-applicative QuickCheck random + base64-bytestring bytestring composition constraints containers + cryptonite cryptostore direct-sqlite directory file-embed filepath + generic-random ini iso8601-time memory mtl network + network-transport optparse-applicative QuickCheck random simple-logger sqlite-simple stm template-haskell text time transformers unliftio unliftio-core websockets x509 ]; testHaskellDepends = [ ansi-terminal asn1-encoding asn1-types async attoparsec base - base64-bytestring bytestring containers cryptonite directory - filepath generic-random hspec hspec-core HUnit iso8601-time memory - mtl network network-transport QuickCheck random simple-logger + base64-bytestring bytestring composition constraints containers + cryptonite direct-sqlite directory file-embed filepath + generic-random hspec hspec-core HUnit iso8601-time memory mtl + network network-transport QuickCheck random simple-logger sqlite-simple stm template-haskell text time timeit transformers unliftio unliftio-core websockets x509 ]; @@ -243322,6 +244058,25 @@ self: { broken = true; }) {}; + "sint" = callPackage + ({ mkDerivation, base, portray, portray-diff, QuickCheck + , test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "sint"; + version = "0.1.0.0"; + sha256 = "1gqd5m5r3i9qvszzb1ljjip5c7bnsp5nblmghg4lhbpfrs7r87gf"; + revision = "1"; + editedCabalFile = "0z0bm4hj5w0xpasvdlczabd6my5ms1xfzyg1yg9fwc5llbi2z34p"; + libraryHaskellDepends = [ base portray portray-diff ]; + testHaskellDepends = [ + base portray portray-diff QuickCheck test-framework + test-framework-quickcheck2 + ]; + description = "A singleton type for `Nat` represented as `Int`"; + license = lib.licenses.asl20; + }) {}; + "siphash" = callPackage ({ mkDerivation, base, bytestring, cpu, QuickCheck, test-framework , test-framework-quickcheck2 @@ -244297,6 +245052,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "slick_1_1_2_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, extra + , mustache, pandoc, shake, text, unordered-containers + }: + mkDerivation { + pname = "slick"; + version = "1.1.2.2"; + sha256 = "0q6q496cvrsc4gnksihib0dr80cjg0n9vy69h2ani2ax0g75fzqd"; + libraryHaskellDepends = [ + aeson base bytestring directory extra mustache pandoc shake text + unordered-containers + ]; + description = "A quick & easy static site builder built with shake and pandoc"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "slidemews" = callPackage ({ mkDerivation, aeson, base, bytestring, MonadCatchIO-transformers , mtl, pandoc, snap-core, snap-server, utf8-string @@ -244531,20 +245303,20 @@ self: { license = lib.licenses.gpl3Plus; }) {}; - "slynx_0_6_0_0" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers + "slynx_0_6_1_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , elynx-markov, elynx-seq, elynx-tools, elynx-tree, hmatrix , mwc-random, optparse-applicative, statistics, text, transformers , vector }: mkDerivation { pname = "slynx"; - version = "0.6.0.0"; - sha256 = "0jk3l7nlz0s57x952qcn1yj6fdfds01flcz6xiykpjwbyjm0fq81"; + version = "0.6.1.0"; + sha256 = "15wjlxmhwrk3fj6hzmc9rpgc7qnkld028z79h9a5k6vs90hgcwlx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base bytestring containers elynx-markov elynx-seq + aeson attoparsec base bytestring containers elynx-markov elynx-seq elynx-tools elynx-tree hmatrix mwc-random optparse-applicative statistics text transformers vector ]; @@ -245974,8 +246746,8 @@ self: { }: mkDerivation { pname = "snaplet-customauth"; - version = "0.2"; - sha256 = "10brxk6fpblbc58wjfhp3frx6r4d13iqz704v804r2hhsj35rkfz"; + version = "0.2.1"; + sha256 = "04bnkw268klv06w0hbgdcxmdcyyg7bjxfhqfx7ymbl41a887h2zb"; libraryHaskellDepends = [ aeson base base64-bytestring binary binary-instances bytestring bytestring-show configurator containers errors heist hoauth2 @@ -247001,6 +247773,17 @@ self: { broken = true; }) {}; + "snumber" = callPackage + ({ mkDerivation, base, numeric-kinds }: + mkDerivation { + pname = "snumber"; + version = "0.1.0.0"; + sha256 = "0f340hzhhmiy342c5250m61f3gkcnfymjbd2a13alzdh7pmhb2mg"; + libraryHaskellDepends = [ base numeric-kinds ]; + description = "Indexed numeric types linking type-level and value-level numbers"; + license = lib.licenses.asl20; + }) {}; + "soap" = callPackage ({ mkDerivation, base, bytestring, conduit, configurator , data-default, exceptions, hspec, http-client, http-types, HUnit @@ -253508,8 +254291,8 @@ self: { ({ mkDerivation, base, hspec, streaming }: mkDerivation { pname = "streaming-nonempty"; - version = "0.1.0.0"; - sha256 = "0ykw92p2v8v0dlq68733wyh211dh7cd8s3iirnkbnabm0vyc20y6"; + version = "0.1.0.1"; + sha256 = "1d0r4isxl9g5q2fcqz17iyxmzxg4hnj9xw95sxqz3mfw9l02lc85"; libraryHaskellDepends = [ base streaming ]; testHaskellDepends = [ base hspec streaming ]; description = "Add support for non empty streams to Streaming lib"; @@ -254287,14 +255070,15 @@ self: { }) {}; "strict-list" = callPackage - ({ mkDerivation, base, hashable, QuickCheck, quickcheck-instances - , rerebase, semigroupoids, tasty, tasty-hunit, tasty-quickcheck + ({ mkDerivation, base, deepseq, hashable, QuickCheck + , quickcheck-instances, rerebase, semigroupoids, tasty, tasty-hunit + , tasty-quickcheck }: mkDerivation { pname = "strict-list"; - version = "0.1.5"; - sha256 = "06mv208bspfl2mh1razi6af3fri8w7f5p3klkc3b9yx5ddv3hwxs"; - libraryHaskellDepends = [ base hashable semigroupoids ]; + version = "0.1.6"; + sha256 = "0cbf3my7fghifplk7l2m77cc0x7xkh1pyv5k36h7dl6m2ddhmdc1"; + libraryHaskellDepends = [ base deepseq hashable semigroupoids ]; testHaskellDepends = [ QuickCheck quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck @@ -255410,8 +256194,8 @@ self: { }: mkDerivation { pname = "stylish-haskell"; - version = "0.12.2.0"; - sha256 = "074nr4yg3yqjshnwxxrbs0shsjphbrmacz92ysyw8gnppq1z538c"; + version = "0.13.0.0"; + sha256 = "0x9w3zh1lzp6l5xj3mynnlr0fzb5mbv0wwpfxp8fr6bk0jcrzjwf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -255858,6 +256642,8 @@ self: { pname = "suitable"; version = "0.1.1"; sha256 = "1pvw7zgvfr0z2gjy224gd92ayh20j3v97rdlqmq6k6g4yabdpgci"; + revision = "1"; + editedCabalFile = "10yinlpa6q6jvpsnazpbgqnpg0d8va7lkfqafpym9gsgcn9f6xf4"; libraryHaskellDepends = [ base containers ]; description = "Abstract over the constraints on the parameters to type constructors"; license = lib.licenses.bsd3; @@ -255878,12 +256664,12 @@ self: { }) {}; "summer" = callPackage - ({ mkDerivation, base, generics-sop, vector }: + ({ mkDerivation, base, generics-sop, profunctors, vector }: mkDerivation { pname = "summer"; - version = "0.3.2.0"; - sha256 = "1gs9w6a5wh14f4c868b85acz92wn0s75cv8hadiws0546g4amb9v"; - libraryHaskellDepends = [ base generics-sop vector ]; + version = "0.3.7.1"; + sha256 = "0g745i3ms1i6qz428aln33hczvgn1zg79xd0n94h696x397d7zs5"; + libraryHaskellDepends = [ base generics-sop profunctors vector ]; testHaskellDepends = [ base ]; description = "An implementation of extensible products and sums"; license = lib.licenses.mit; @@ -261071,6 +261857,30 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-silver_3_2_3" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring, containers + , deepseq, directory, filepath, mtl, optparse-applicative, process + , process-extras, regex-tdfa, silently, stm, tagged, tasty + , tasty-hunit, temporary, text, transformers + }: + mkDerivation { + pname = "tasty-silver"; + version = "3.2.3"; + sha256 = "0nvh2k8iqqkanmp7lpwd3asimyarzisly8wavbdahcxryn0j4xb7"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring containers deepseq directory + filepath mtl optparse-applicative process process-extras regex-tdfa + stm tagged tasty temporary text + ]; + testHaskellDepends = [ + base directory filepath process silently tasty tasty-hunit + temporary transformers + ]; + description = "A fancy test runner, including support for golden tests"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-smallcheck" = callPackage ({ mkDerivation, base, optparse-applicative, smallcheck, tagged , tasty @@ -262408,10 +263218,8 @@ self: { }: mkDerivation { pname = "ten"; - version = "0.1.0.0"; - sha256 = "0rgcwwc3rq1bk3dc1plqyhc8mzk429ghswl6ry4zs2n8ds57gnwj"; - revision = "1"; - editedCabalFile = "0dslnfn52q87sb2d9di80nirwmfk3bkhc2wbp2wh209k0b5va63w"; + version = "0.1.0.2"; + sha256 = "0djvcb2l9dnnjbhivchi6yyaj5i96jmy7yhr9x3paiz1l54brrqx"; libraryHaskellDepends = [ adjunctions base data-default-class deepseq distributive hashable portray portray-diff some text transformers wrapped @@ -262429,10 +263237,10 @@ self: { ({ mkDerivation, base, lens, profunctors, some, ten }: mkDerivation { pname = "ten-lens"; - version = "0.1.0.0"; - sha256 = "1b27ds47395jnzqvhsp68807ffa6lmln37vzqkyp1l4r3bk2s7wb"; + version = "0.1.0.1"; + sha256 = "0qckywzj1c1k8la2ya1vpgrpl9fnqhggx6m6ad0rgrhyal48522c"; libraryHaskellDepends = [ base lens profunctors some ten ]; - description = "Lenses for the types in the \"ten\" package"; + description = "Lenses for the types in the ten package"; license = lib.licenses.asl20; }) {}; @@ -262444,8 +263252,8 @@ self: { }: mkDerivation { pname = "ten-unordered-containers"; - version = "0.1.0.0"; - sha256 = "1p399g5m3sbd5f11wksiz49hjd4jrs000jypav82dqw9qr2ys0xl"; + version = "0.1.0.2"; + sha256 = "0y4aw77ix2ay43l8n17322hbmm1npcdr1bl7kdza377jd1ci20px"; libraryHaskellDepends = [ base hashable portray portray-diff some ten unordered-containers wrapped @@ -262910,14 +263718,12 @@ self: { broken = true; }) {}; - "terminfo_0_4_1_4" = callPackage + "terminfo_0_4_1_5" = callPackage ({ mkDerivation, base, ncurses }: mkDerivation { pname = "terminfo"; - version = "0.4.1.4"; - sha256 = "170pnql6ycpk6gwy9v28mppm0w2n89l0n6fhnzph2za9kwrs9fqh"; - revision = "1"; - editedCabalFile = "0f82h8mj3swx7c2cxls76nzqx0qnibvsncmvqcbc7v5db4mkfmm1"; + version = "0.4.1.5"; + sha256 = "0s0x5knl4hsmzlklabcd7c0m468gisg5cnf842wi1vfg8q922q5i"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ ncurses ]; description = "Haskell bindings to the terminfo library"; @@ -264012,6 +264818,28 @@ self: { license = lib.licenses.mit; }) {}; + "text-builder_0_6_6_3" = 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.3"; + sha256 = "0j2f9zbkk2lbvfb0f3c1i6376zbrr4p782ivbhgi8nv65rsp2ijy"; + 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 @@ -264240,27 +265068,6 @@ self: { }) {}; "text-ldap" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, dlist - , memory, QuickCheck, quickcheck-simple, random, transformers - }: - mkDerivation { - pname = "text-ldap"; - version = "0.1.1.13"; - sha256 = "0d1a7932999yx98hjvnrap1lpm9jcfg34m2m0hdy4j1m6cq4q5zc"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base bytestring containers dlist memory transformers - ]; - executableHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ - base bytestring QuickCheck quickcheck-simple random - ]; - description = "Parser and Printer for LDAP text data stream"; - license = lib.licenses.bsd3; - }) {}; - - "text-ldap_0_1_1_14" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, memory , QuickCheck, quickcheck-simple, random, transformers }: @@ -264279,7 +265086,6 @@ self: { ]; description = "Parser and Printer for LDAP text data stream"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "text-lens" = callPackage @@ -265515,24 +266321,6 @@ self: { }: mkDerivation { pname = "th-reify-many"; - version = "0.1.9"; - sha256 = "0hxf56filzqnyrc8q7766vai80y6cgrrbrczx6n93caskl1dv2gq"; - revision = "1"; - editedCabalFile = "0y0gyh866i40a71732mbkzb1clxh4cq26kma4xnrq86kdd7s2rr8"; - libraryHaskellDepends = [ - base containers mtl safe template-haskell th-expand-syns - ]; - testHaskellDepends = [ base template-haskell ]; - description = "Recurseively reify template haskell datatype info"; - license = lib.licenses.bsd3; - }) {}; - - "th-reify-many_0_1_10" = callPackage - ({ mkDerivation, base, containers, mtl, safe, template-haskell - , th-expand-syns - }: - mkDerivation { - pname = "th-reify-many"; version = "0.1.10"; sha256 = "19g4gc1q3zxbylmvrgk3dqjzychq2k02i7fwvs3vhbrg4ihhw9cx"; libraryHaskellDepends = [ @@ -265541,7 +266329,6 @@ self: { testHaskellDepends = [ base template-haskell ]; description = "Recurseively reify template haskell datatype info"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "th-sccs" = callPackage @@ -268337,22 +269124,23 @@ self: { license = lib.licenses.gpl3Plus; }) {}; - "tlynx_0_6_0_0" = callPackage + "tlynx_0_6_1_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , comonad, containers, data-default-class, elynx-tools, elynx-tree - , gnuplot, mwc-random, optparse-applicative, parallel, statistics - , text, transformers, vector + , gnuplot, mwc-random, optparse-applicative, parallel, primitive + , statistics, text, transformers, vector }: mkDerivation { pname = "tlynx"; - version = "0.6.0.0"; - sha256 = "1iz555rfq4wi5yc5bqfgkgwzmlxcksxmbpcfdwmcarcijazm9mpi"; + version = "0.6.1.0"; + sha256 = "0dwwpq0jj89g68scxrqy4zr6r3f93w8024icbblwx4ygv51xkxai"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async attoparsec base bytestring comonad containers data-default-class elynx-tools elynx-tree gnuplot mwc-random - optparse-applicative parallel statistics text transformers vector + optparse-applicative parallel primitive statistics text + transformers vector ]; executableHaskellDepends = [ base ]; description = "Handle phylogenetic trees"; @@ -280417,6 +281205,28 @@ self: { broken = true; }) {}; + "vector-hashtables" = callPackage + ({ mkDerivation, base, containers, criterion, hashable, hashtables + , hspec, hspec-discover, primitive, QuickCheck + , quickcheck-instances, unordered-containers, vector + }: + mkDerivation { + pname = "vector-hashtables"; + version = "0.1.1.1"; + sha256 = "02kixbi9v4rcj46fvvba5aq6vn6f5yncnvc71f4y7h1wq5b452jj"; + libraryHaskellDepends = [ base hashable primitive vector ]; + testHaskellDepends = [ + base containers hashable hspec primitive QuickCheck + quickcheck-instances vector + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + base criterion hashtables primitive unordered-containers vector + ]; + description = "Efficient vector-based mutable hashtables implementation"; + license = lib.licenses.bsd3; + }) {}; + "vector-heterogenous" = callPackage ({ mkDerivation, base, vector }: mkDerivation { @@ -280505,27 +281315,12 @@ self: { ({ mkDerivation, base, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "vector-rotcev"; - version = "0.1.0.0"; - sha256 = "1sl5jwmpmzzvknalgqrbpy3yhqclgqxf75wnpb24rn416kdscy6j"; - revision = "1"; - editedCabalFile = "1hn2g8wykmisaacw4w8iffcd8qn3dnkl9lkj3j9n0324xm1b3sp0"; - libraryHaskellDepends = [ base vector ]; - testHaskellDepends = [ base tasty tasty-quickcheck vector ]; - description = "Vectors with O(1) reverse"; - license = lib.licenses.bsd3; - }) {}; - - "vector-rotcev_0_1_0_1" = callPackage - ({ mkDerivation, base, tasty, tasty-quickcheck, vector }: - mkDerivation { - pname = "vector-rotcev"; version = "0.1.0.1"; sha256 = "1zrw1r6xspjncavd307xbbnjdmmhjq9w3dbvm0khnkxjgh47is8v"; libraryHaskellDepends = [ base vector ]; testHaskellDepends = [ base tasty tasty-quickcheck vector ]; description = "Vectors with O(1) reverse"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "vector-shuffling" = callPackage @@ -284025,33 +284820,6 @@ self: { }: mkDerivation { pname = "wai-session-redis"; - version = "0.1.0.2"; - sha256 = "15l0sq5y9lalprn3k7fcw37fnmzphhd00qkpwna3wxpr0vrlihzs"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring cereal data-default hedis vault wai wai-session - ]; - executableHaskellDepends = [ - base bytestring cereal data-default hedis http-types vault wai - wai-session warp - ]; - testHaskellDepends = [ - base bytestring cereal data-default hedis hspec vault wai - wai-session - ]; - description = "Simple Redis backed wai-session backend"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "wai-session-redis_0_1_0_3" = callPackage - ({ mkDerivation, base, bytestring, cereal, data-default, hedis - , hspec, http-types, vault, wai, wai-session, warp - }: - mkDerivation { - pname = "wai-session-redis"; version = "0.1.0.3"; sha256 = "1ikm5i4cvx2wzlq5ij7aqk9c37jpnw9c0dl0xdw3c4hqsnjnb5yj"; isLibrary = true; @@ -284990,33 +285758,27 @@ self: { }) {}; "web-rep" = callPackage - ({ mkDerivation, attoparsec, base, box, box-socket, clay - , concurrency, doctest, generic-lens, interpolatedstring-perl6 - , language-javascript, lens, lucid, mtl, network-simple, numhask - , optparse-generic, scotty, tasty, tasty-hspec, text, transformers - , unordered-containers, wai-middleware-static, wai-websockets - , websockets + ({ mkDerivation, attoparsec, base, bifunctors, box, box-socket + , clay, concurrency, generic-lens, interpolatedstring-perl6 + , language-javascript, lens, lucid, mtl, optparse-generic, scotty + , text, transformers, unordered-containers, wai-middleware-static + , wai-websockets, websockets }: mkDerivation { pname = "web-rep"; - version = "0.7.2"; - sha256 = "1h6krrm412b9374778jg33gdmk6ig0sp06yk68h5prjdgy6shmww"; + version = "0.8.0"; + sha256 = "1ri1sczacxy351jsdaiz7iwsl8b19a1jvzppyxf56grm6zr94dmg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base box box-socket clay concurrency generic-lens - interpolatedstring-perl6 language-javascript lens lucid mtl - network-simple numhask scotty text transformers - unordered-containers wai-middleware-static wai-websockets - websockets - ]; - executableHaskellDepends = [ base numhask optparse-generic ]; - testHaskellDepends = [ - base doctest lens lucid numhask tasty tasty-hspec text + attoparsec base bifunctors box box-socket clay concurrency + generic-lens interpolatedstring-perl6 language-javascript lens + lucid mtl scotty text transformers unordered-containers + wai-middleware-static wai-websockets websockets ]; + executableHaskellDepends = [ base optparse-generic ]; description = "representations of a web page"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "web-routes" = callPackage @@ -286253,13 +287015,14 @@ self: { "wgpu-hs" = callPackage ({ mkDerivation, base, bytestring, containers, data-default - , data-has, GLFW-b, lens, mtl, resourcet, safe-exceptions, sdl2 - , string-qq, text, transformers, vector, wgpu-raw-hs + , data-has, derive-storable, GLFW-b, JuicyPixels, lens, linear, mtl + , resourcet, safe-exceptions, sdl2, string-qq, text, transformers + , vector, wgpu-raw-hs }: mkDerivation { pname = "wgpu-hs"; - version = "0.3.0.0"; - sha256 = "1m5rglmj20544x36i64iyiz8zb73pci8aqf483wrpfswrvf2k6xg"; + version = "0.4.0.0"; + sha256 = "10bbjkfv1w8wwiq4kq2r1y8l8l6dyi5d7x5r70w7vk9p624bs8a3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -286267,8 +287030,9 @@ self: { resourcet safe-exceptions sdl2 text vector wgpu-raw-hs ]; executableHaskellDepends = [ - base data-default data-has GLFW-b lens mtl resourcet - safe-exceptions sdl2 string-qq text transformers vector + base data-default data-has derive-storable GLFW-b JuicyPixels lens + linear mtl resourcet safe-exceptions sdl2 string-qq text + transformers vector ]; doHaddock = false; description = "WGPU"; @@ -286281,8 +287045,8 @@ self: { ({ mkDerivation, base, GLFW-b, SDL2, sdl2, unix }: mkDerivation { pname = "wgpu-raw-hs"; - version = "0.3.0.0"; - sha256 = "0p7j8v0wxjv22b1zmdx0d433rdl91h7p5bcbvm9g30dg8y0fip0x"; + version = "0.4.0.0"; + sha256 = "1j3bajywdg73c5xq8j8f1dw0bcvr5g3di9rwabzm47xnyjd6jcdh"; libraryHaskellDepends = [ base GLFW-b sdl2 unix ]; libraryPkgconfigDepends = [ SDL2 ]; description = "WGPU Raw"; @@ -286740,6 +287504,8 @@ self: { ]; description = "Implements Windows Live Web Authentication and Delegated Authentication"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "winerror" = callPackage @@ -287856,13 +288622,19 @@ self: { }) {}; "worldturtle" = callPackage - ({ mkDerivation, base, containers, gloss, lens, matrix, mtl }: + ({ mkDerivation, base, containers, gloss, lens, matrix + , transformers + }: mkDerivation { pname = "worldturtle"; - version = "0.2.0.0"; - sha256 = "0h5r74ba0wjhyp8yl3clxgq5yfdr51fdkfn2xz4ahizxycyrx14f"; - libraryHaskellDepends = [ base containers gloss lens matrix mtl ]; - description = "Turtle graphics"; + version = "0.2.2.0"; + sha256 = "0h7zhgpddhmsxmz1x7hmz785r4mx7i37ad16621wmnc1w84zcfaq"; + revision = "1"; + editedCabalFile = "1m8mivb0xsbbyrbc27r9kdkkfyd5wnasppjx8ywpsl2xknmxx918"; + libraryHaskellDepends = [ + base containers gloss lens matrix transformers + ]; + description = "LOGO-like Turtle graphics with a monadic interface"; license = lib.licenses.bsd3; }) {}; @@ -287922,6 +288694,8 @@ self: { pname = "wrapped-generic-default"; version = "0.1.0.0"; sha256 = "0h1aay81l8b2nih08pli30ly0vcwvi8n2kdxck60ww2qb2b7wzzc"; + revision = "1"; + editedCabalFile = "03wvdf76ddn4xsyc94ya3hycl7isi18lbbn0lsigicas7nhbc2sl"; libraryHaskellDepends = [ base data-default-class wrapped ]; description = "Provides an orphan instance Default (Wrapped Generic a)"; license = lib.licenses.asl20; @@ -292030,8 +292804,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.2"; - sha256 = "030dakxny9nh0spq04vbxs961y12i2xbr9g9g3q7lk78mhshwv5v"; + version = "0.13.2"; + sha256 = "004qly1sags94p7ks1j93xziixbpi3wsblbh2d2ws78gyywqdj9f"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -292384,8 +293158,8 @@ self: { }: mkDerivation { pname = "yeamer"; - version = "0.1.1.0"; - sha256 = "0i3ka3c4ci70kgrbmc7ynk587a4sihpqhyv6bjc1n9gwjbm9abxi"; + version = "0.1.2.0"; + sha256 = "07xl891fdy9cilzpfpirzqmz7f6jw2m151bdk8p16633fkhsmvc3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -292661,8 +293435,8 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.6.10.3"; - sha256 = "00a7gbp2czg6ixxx62k2nmrj5g1la6cjh697y8vg9xhxq7vpyshg"; + version = "1.6.10.4"; + sha256 = "01s5svba45g0d12cz8kc8lvdw18jfhjxr7yk69cf5157qg0f2czv"; libraryHaskellDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup bytestring conduit @@ -296869,14 +297643,14 @@ self: { }) {}; "zoovisitor" = callPackage - ({ mkDerivation, base, hspec, Z-Data, Z-IO, zookeeper_mt }: + ({ mkDerivation, base, hspec, uuid, Z-Data, Z-IO, zookeeper_mt }: mkDerivation { pname = "zoovisitor"; - version = "0.1.3.1"; - sha256 = "0mfarqcm2h9chbn7kybw58gd6l2wpjkhpg1vgip92djwmvkilarl"; + version = "0.1.4.0"; + sha256 = "163aixwxjnrbd9gzh73mys2zkbni3sjxmjyg7z374fa1k08rrxya"; libraryHaskellDepends = [ base Z-Data Z-IO ]; librarySystemDepends = [ zookeeper_mt ]; - testHaskellDepends = [ base hspec ]; + testHaskellDepends = [ base hspec uuid Z-Data ]; description = "A haskell binding to Apache Zookeeper C library(mt) using Haskell Z project"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; diff --git a/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix b/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix index e8a1bfeb1909..b167a4e9b12f 100644 --- a/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix +++ b/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "babashka"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-W7zcTs0nTw1ed04ev7WKAMyBd/2n4Mezo5kh0sHFyyc="; + sha256 = "sha256-s0fZzx/sEAUwXY2cx2ODDhwIrJb5LykFgHBcscsZQO0="; }; dontUnpack = true; @@ -21,8 +21,10 @@ stdenv.mkDerivation rec { buildPhase = '' runHook preBuild - # https://github.com/babashka/babashka/blob/v0.6.0/script/compile#L41-L52 + # https://github.com/babashka/babashka/blob/v0.6.1/script/compile#L41-L52 args=("-jar" "$BABASHKA_JAR" + # Required to build babashka on darwin. Do not remove. + "${lib.optionalString stdenv.isDarwin "-H:-CheckToolchain"}" "-H:Name=$BABASHKA_BINARY" "-H:+ReportExceptionStackTraces" # "-H:+PrintAnalysisCallTree" diff --git a/nixpkgs/pkgs/development/interpreters/lunatic/default.nix b/nixpkgs/pkgs/development/interpreters/lunatic/default.nix new file mode 100644 index 000000000000..39e8323e194c --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/lunatic/default.nix @@ -0,0 +1,24 @@ +{ cmake, fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "lunatic"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "lunatic-solutions"; + repo = pname; + rev = "v${version}"; + sha256 = "1dz8v19jw9v55p3mz4932v6z24ihp6wk238n4d4lx9xj91mf3g6r"; + }; + + cargoSha256 = "1rkxl27l6ydmcq3flc6qbnd7zmpkfmyc86b8q4pi7dwhqnd5g70g"; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "An Erlang inspired runtime for WebAssembly"; + homepage = "https://lunatic.solutions"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/development/interpreters/npiet/default.nix b/nixpkgs/pkgs/development/interpreters/npiet/default.nix new file mode 100644 index 000000000000..c0e2c3ade292 --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/npiet/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchurl +, gd +, giflib +, groff +, libpng +, tk +}: + +stdenv.mkDerivation rec { + pname = "npiet"; + version = "1.3f"; + + src = fetchurl { + url = "https://www.bertnase.de/npiet/npiet-${version}.tar.gz"; + sha256 = "sha256-Le2FYGKr1zWZ6F4edozmvGC6LbItx9aptidj3KBLhVo="; + }; + + buildInputs = [ gd giflib libpng ]; + + nativeBuildInputs = [ groff ]; + + postPatch = '' + # malloc.h is not needed because stdlib.h is already included. + # On macOS, malloc.h does not even exist, resulting in an error. + substituteInPlace npiet-foogol.c \ + --replace '#include <malloc.h>' "" + + substituteInPlace npietedit \ + --replace 'exec wish' 'exec ${tk}/bin/wish' + ''; + + meta = with lib; { + description = "An interpreter for piet programs. Also includes npietedit and npiet-foogol"; + longDescription = '' + npiet is an interpreter for the piet programming language. + Instead of text, piet programs are pictures. Commands are determined based on changes in color. + ''; + homepage = "https://www.bertnase.de/npiet/"; + license = licenses.gpl2Only; + platforms = platforms.unix; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/nixpkgs/pkgs/development/interpreters/perl/default.nix b/nixpkgs/pkgs/development/interpreters/perl/default.nix index 54b7e9afefd4..98de7c71abca 100644 --- a/nixpkgs/pkgs/development/interpreters/perl/default.nix +++ b/nixpkgs/pkgs/development/interpreters/perl/default.nix @@ -86,6 +86,8 @@ let configureScript = optionalString (!crossCompiling) "${stdenv.shell} ./Configure"; + dontAddStaticConfigureFlags = true; + dontAddPrefix = !crossCompiling; enableParallelBuilding = !crossCompiling; diff --git a/nixpkgs/pkgs/development/interpreters/php/7.4.nix b/nixpkgs/pkgs/development/interpreters/php/7.4.nix index 1e72f7b48b4a..d098aeb57e1b 100644 --- a/nixpkgs/pkgs/development/interpreters/php/7.4.nix +++ b/nixpkgs/pkgs/development/interpreters/php/7.4.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "7.4.21"; - sha256 = "0al2697d5hwq0f39rgncl1pwfxzzpc0afmr0fjvw5qjpww163v1n"; + version = "7.4.23"; + sha256 = "d1e094fe6e4f832e0a64be9c69464ba5d593fb216f914efa8bbb084e0a7a5727"; }); in diff --git a/nixpkgs/pkgs/development/interpreters/php/8.0.nix b/nixpkgs/pkgs/development/interpreters/php/8.0.nix index 82d78d95314e..624fe1c338e7 100644 --- a/nixpkgs/pkgs/development/interpreters/php/8.0.nix +++ b/nixpkgs/pkgs/development/interpreters/php/8.0.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.0.8"; - sha256 = "0vyi9hhy7yl4l589dniwb3gq29sp3giq7ni4nca3x54q3bbpgg8l"; + version = "8.0.10"; + sha256 = "sha256-yUVHJxQQkAhFsITsK8s0Zq82PuypLLJL1hHcvcJvFYc="; }); in diff --git a/nixpkgs/pkgs/development/interpreters/pixie/dust.nix b/nixpkgs/pkgs/development/interpreters/pixie/dust.nix index bbe9ae3dcc4b..9c39b5c5ce63 100644 --- a/nixpkgs/pkgs/development/interpreters/pixie/dust.nix +++ b/nixpkgs/pkgs/development/interpreters/pixie/dust.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, pixie, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub +, pixie, rlwrap +}: stdenv.mkDerivation rec { pname = "dust"; @@ -16,8 +18,9 @@ stdenv.mkDerivation rec { patches = [ ./make-paths-configurable.patch ]; configurePhase = '' - pixiePath="${pixie}/bin/pixie-vm" \ + pixiePath="${pixie}/bin/pixie" \ basePath="$out/share/dust" \ + rlwrapPath="${rlwrap}/bin/rlwrap" \ substituteAll dust.in dust chmod +x dust ''; diff --git a/nixpkgs/pkgs/development/interpreters/pixie/make-paths-configurable.patch b/nixpkgs/pkgs/development/interpreters/pixie/make-paths-configurable.patch index 122ab6e2c07b..e22e83d2ee74 100644 --- a/nixpkgs/pkgs/development/interpreters/pixie/make-paths-configurable.patch +++ b/nixpkgs/pkgs/development/interpreters/pixie/make-paths-configurable.patch @@ -73,11 +73,12 @@ new file mode 100755 index 0000000..44a7fbd --- /dev/null +++ b/dust.in -@@ -0,0 +1,43 @@ +@@ -0,0 +1,40 @@ +#!/usr/bin/env bash + +base_path=@basePath@ +pixie_path=@pixiePath@ ++rlwrap_cmd=@rlwrapPath@ + +function set_load_path() { + load_path="" @@ -98,11 +99,7 @@ index 0000000..44a7fbd + +case $1 in + ""|"repl") -+ rlwrap_cmd="" -+ if [ -n "`which rlwrap`" ]; then -+ rlwrap_cmd="rlwrap -aignored -n" -+ fi -+ $rlwrap_cmd $pixie_path $load_path ++ $rlwrap_cmd -aignored -n $pixie_path $load_path + ;; + "run") + shift diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix index 5ee88ebb8810..fd7e684113e7 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -26,10 +26,10 @@ , sourceVersion , sha256 , passthruFun -, static ? false +, static ? stdenv.hostPlatform.isStatic , stripBytecode ? reproducibleBuild , rebuildBytecode ? true -, reproducibleBuild ? true +, reproducibleBuild ? false , enableOptimizations ? false , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}" }: @@ -48,6 +48,8 @@ assert lib.assertMsg (reproducibleBuild -> stripBytecode) assert lib.assertMsg (reproducibleBuild -> (!enableOptimizations)) "Deterministic builds are not achieved when optimizations are enabled."; +assert lib.assertMsg (reproducibleBuild -> (!rebuildBytecode)) + "Deterministic builds are not achieved when (default unoptimized) bytecode is created."; with lib; @@ -185,8 +187,9 @@ let configureFlags = optionals enableOptimizations [ "--enable-optimizations" - ] ++ [ + ] ++ optionals (!static) [ "--enable-shared" + ] ++ [ "--with-threads" "--enable-unicode=ucs${toString ucsEncoding}" ] ++ optionals (stdenv.hostPlatform.isCygwin || stdenv.hostPlatform.isAarch64) [ @@ -224,6 +227,7 @@ let ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no" ++ optional static "LDFLAGS=-static"; + strictDeps = true; buildInputs = optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ [ bzip2 openssl zlib ] @@ -296,8 +300,10 @@ in with passthru; stdenv.mkDerivation ({ # 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. + # We build 3 levels of optimized bytecode. Note the default level, without optimizations, + # is not reproducible yet. https://bugs.python.org/issue29708 + # Not creating bytecode will result in a large performance loss however, so we do build it. + find $out -name "*.py" | ${pythonForBuildInterpreter} -m compileall -q -f -x "lib2to3" -i - 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 '' diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/3.9/darwin-tcl-tk.patch b/nixpkgs/pkgs/development/interpreters/python/cpython/3.9/darwin-tcl-tk.patch new file mode 100644 index 000000000000..a9b0c0677c5e --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/3.9/darwin-tcl-tk.patch @@ -0,0 +1,15 @@ +diff --git a/setup.py b/setup.py +index 04eb6b2..2e1160d 100644 +--- a/setup.py ++++ b/setup.py +@@ -1981,8 +1981,8 @@ class PyBuildExt(build_ext): + # Rather than complicate the code below, detecting and building + # AquaTk is a separate method. Only one Tkinter will be built on + # Darwin - either AquaTk, if it is found, or X11 based Tk. +- if (MACOS and self.detect_tkinter_darwin()): +- return True ++ # if (MACOS and self.detect_tkinter_darwin()): ++ # return True + + # Assume we haven't found any of the libraries or include files + # The versions with dots are used on Unix, and the versions without diff --git a/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix b/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix index 5b5060b58842..353535ed6823 100644 --- a/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix +++ b/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix @@ -35,7 +35,7 @@ , stripTests ? false , stripTkinter ? false , rebuildBytecode ? true -, stripBytecode ? reproducibleBuild +, stripBytecode ? true , includeSiteCustomize ? true , static ? stdenv.hostPlatform.isStatic , enableOptimizations ? false @@ -48,7 +48,7 @@ # enabling LTO with musl and dynamic linking fails with a linker error although it should # be possible as alpine is doing it: https://github.com/alpinelinux/aports/blob/a8ccb04668c7729e0f0db6c6ff5f25d7519e779b/main/python3/APKBUILD#L82 , enableLTO ? stdenv.is64bit && stdenv.isLinux && !(stdenv.hostPlatform.isMusl && !stdenv.hostPlatform.isStatic) -, reproducibleBuild ? true +, reproducibleBuild ? false , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}" }: @@ -75,6 +75,9 @@ assert lib.assertMsg (reproducibleBuild -> stripBytecode) assert lib.assertMsg (reproducibleBuild -> (!enableOptimizations)) "Deterministic builds are not achieved when optimizations are enabled."; +assert lib.assertMsg (reproducibleBuild -> (!rebuildBytecode)) + "Deterministic builds are not achieved when (default unoptimized) bytecode is created."; + with lib; let @@ -100,6 +103,8 @@ let version = with sourceVersion; "${major}.${minor}.${patch}${suffix}"; + strictDeps = true; + nativeBuildInputs = optionals (!stdenv.isDarwin) [ autoreconfHook ] ++ optionals (!stdenv.isDarwin && passthru.pythonAtLeast "3.10") [ @@ -234,6 +239,9 @@ in with passthru; stdenv.mkDerivation { else ./3.5/profile-task.patch ) + ] ++ optionals (pythonAtLeast "3.9" && stdenv.isDarwin) [ + # Stop checking for TCL/TK in global macOS locations + ./3.9/darwin-tcl-tk.patch ] ++ optionals (isPy3k && hasDistutilsCxxPatch) [ # Fix for http://bugs.python.org/issue1222585 # Upstream distutils is calling C compiler to compile C++ code, which @@ -283,10 +291,11 @@ in with passthru; stdenv.mkDerivation { PYTHONHASHSEED=0; configureFlags = [ - "--enable-shared" "--without-ensurepip" "--with-system-expat" "--with-system-ffi" + ] ++ optionals (!static) [ + "--enable-shared" ] ++ optionals enableOptimizations [ "--enable-optimizations" ] ++ optionals enableLTO [ @@ -334,6 +343,8 @@ in with passthru; stdenv.mkDerivation { '' + optionalString stdenv.isDarwin '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2" export MACOSX_DEPLOYMENT_TARGET=10.6 + # Override the auto-detection in setup.py, which assumes a universal build + export PYTHON_DECIMAL_WITH_MACHINE=${if stdenv.isAarch64 then "uint128" else "x64"} '' + optionalString (isPy3k && pythonOlder "3.7") '' # Determinism: The interpreter is patched to write null timestamps when compiling Python files # so Python doesn't try to update the bytecode when seeing frozen timestamps in Nix's store. @@ -405,6 +416,11 @@ in with passthru; stdenv.mkDerivation { # This allows build Python to import host Python's sysconfigdata mkdir -p "$out/${sitePackages}" ln -s "$out/lib/${libPrefix}/"_sysconfigdata*.py "$out/${sitePackages}/" + + # debug info can't be separated from a static library and would otherwise be + # left in place by a separateDebugInfo build. force its removal here to save + # space in output. + $STRIP -S $out/lib/${libPrefix}/config-*/libpython*.a || true '' + optionalString stripConfig '' rm -R $out/bin/python*-config $out/lib/python*/config-* '' + optionalString stripIdlelib '' @@ -424,13 +440,23 @@ in with passthru; stdenv.mkDerivation { # 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. - # compileall uses this checked-hash method by default when `SOURCE_DATE_EPOCH` is set. + # compileall uses the therein introduced checked-hash method by default when + # `SOURCE_DATE_EPOCH` is set. # We exclude lib2to3 because that's Python 2 code which fails + # We build 3 levels of optimized bytecode. Note the default level, without optimizations, + # is not reproducible yet. https://bugs.python.org/issue29708 + # Not creating bytecode will result in a large performance loss however, so we do build it. + find $out -name "*.py" | ${pythonForBuildInterpreter} -m compileall -q -f -x "lib2to3" -i - 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 - + '' + '' + # *strip* shebang from libpython gdb script - it should be dual-syntax and + # interpretable by whatever python the gdb in question is using, which may + # not even match the major version of this python. doing this after the + # bytecode compilations for the same reason - we don't want bytecode generated. + mkdir -p $out/share/gdb + sed '/^#!/d' Tools/gdb/libpython.py > $out/share/gdb/libpython.py ''; preFixup = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' @@ -456,6 +482,8 @@ in with passthru; stdenv.mkDerivation { pythonForBuild buildPackages.bash ]; + separateDebugInfo = true; + inherit passthru; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/interpreters/python/tests.nix b/nixpkgs/pkgs/development/interpreters/python/tests.nix index 872123338f8c..764ab29e919b 100644 --- a/nixpkgs/pkgs/development/interpreters/python/tests.nix +++ b/nixpkgs/pkgs/development/interpreters/python/tests.nix @@ -94,12 +94,18 @@ let # Integration tests involving the package set. # All PyPy package builds are broken at the moment - integrationTests = lib.optionalAttrs (python.pythonAtLeast "3.7" && (!python.isPyPy)) rec { - # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages - nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix { - interpreter = python; - }; - }; + integrationTests = lib.optionalAttrs (!python.isPyPy) ( + lib.optionalAttrs (python.isPy3k && !stdenv.isDarwin) { # darwin has no split-debug + cpython-gdb = callPackage ./tests/test_cpython_gdb { + interpreter = python; + }; + } // lib.optionalAttrs (python.pythonAtLeast "3.7") rec { + # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages + nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix { + interpreter = python; + }; + } + ); # Tests to ensure overriding works as expected. overrideTests = let diff --git a/nixpkgs/pkgs/development/interpreters/python/tests/test_cpython_gdb/default.nix b/nixpkgs/pkgs/development/interpreters/python/tests/test_cpython_gdb/default.nix new file mode 100644 index 000000000000..0254d843a4cf --- /dev/null +++ b/nixpkgs/pkgs/development/interpreters/python/tests/test_cpython_gdb/default.nix @@ -0,0 +1,22 @@ +{ interpreter, lib, gdb, writeText, runCommand }: + +let + crashme-py = writeText "crashme.py" '' + import ctypes + + def sentinel_foo_bar(): + ctypes.memset(0, 1, 1) + + sentinel_foo_bar() + ''; +in runCommand "python-gdb" {} '' + # test that gdb is able to recover the python stack frame of this segfault + ${gdb}/bin/gdb -batch -ex 'set debug-file-directory ${interpreter.debug}/lib/debug' \ + -ex 'source ${interpreter}/share/gdb/libpython.py' \ + -ex r \ + -ex py-bt \ + --args ${interpreter}/bin/python ${crashme-py} | grep 'in sentinel_foo_bar' > /dev/null + + # success. + touch $out +'' diff --git a/nixpkgs/pkgs/development/interpreters/racket/default.nix b/nixpkgs/pkgs/development/interpreters/racket/default.nix index 5737241bb7e5..c49c6b5b7c70 100644 --- a/nixpkgs/pkgs/development/interpreters/racket/default.nix +++ b/nixpkgs/pkgs/development/interpreters/racket/default.nix @@ -8,6 +8,7 @@ , libGL , libGLU , libjpeg +, xorg , ncurses , libpng, libtool, mpfr, openssl, pango, poppler , readline, sqlite @@ -96,6 +97,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; + postFixup = lib.optionalString stdenv.isDarwin '' + wrapProgram $out/bin/drracket --prefix DYLD_LIBRARY_PATH : ${xorg.libX11}/lib + ''; meta = with lib; { description = "A programmable programming language"; @@ -112,6 +116,5 @@ stdenv.mkDerivation rec { license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ kkallio henrytill vrthra ]; platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" ]; - broken = stdenv.isDarwin; # No support yet for setting FFI lookup path }; } diff --git a/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix b/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix index c5b622d2761f..acc42c9d2d3c 100644 --- a/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix +++ b/nixpkgs/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.11.10"; + version = "0.11.11"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-snnvREM2RLssmE55Ea0Imcw12pmyD6+/11ZXmmUY36U="; + sha256 = "sha256-IOConYPH+t84INXaHw8OVp0mLNucSDS2RT2AlZOUoEs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/interpreters/tcl/8.5.nix b/nixpkgs/pkgs/development/interpreters/tcl/8.5.nix index 193ff4f93769..9daf67fe2bd0 100644 --- a/nixpkgs/pkgs/development/interpreters/tcl/8.5.nix +++ b/nixpkgs/pkgs/development/interpreters/tcl/8.5.nix @@ -4,6 +4,8 @@ callPackage ./generic.nix (args // rec { release = "8.5"; version = "${release}.18"; + # Note: when updating, the hash in pkgs/development/libraries/tk/8.5.nix must also be updated! + src = fetchurl { url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz"; sha256 = "1jfkqp2fr0xh6xvaqx134hkfa5kh7agaqbxm6lhjbpvvc1xfaaq3"; diff --git a/nixpkgs/pkgs/development/interpreters/tcl/8.6.nix b/nixpkgs/pkgs/development/interpreters/tcl/8.6.nix index 37a7fee8a859..03fcb8317792 100644 --- a/nixpkgs/pkgs/development/interpreters/tcl/8.6.nix +++ b/nixpkgs/pkgs/development/interpreters/tcl/8.6.nix @@ -4,6 +4,8 @@ callPackage ./generic.nix (args // rec { release = "8.6"; version = "${release}.11"; + # Note: when updating, the hash in pkgs/development/libraries/tk/8.6.nix must also be updated! + src = fetchurl { url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz"; sha256 = "0n4211j80mxr6ql0xx52rig8r885rcbminfpjdb2qrw6hmk8c14c"; diff --git a/nixpkgs/pkgs/development/interpreters/tcl/generic.nix b/nixpkgs/pkgs/development/interpreters/tcl/generic.nix index beb95d51d2c1..6351a08c1c07 100644 --- a/nixpkgs/pkgs/development/interpreters/tcl/generic.nix +++ b/nixpkgs/pkgs/development/interpreters/tcl/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, callPackage, makeSetupHook, makeWrapper +{ lib, stdenv, callPackage, makeSetupHook # Version specific stuff , release, version, src @@ -51,9 +51,9 @@ let inherit release version; libPrefix = "tcl${release}"; libdir = "lib/${libPrefix}"; - tclPackageHook = callPackage ({}: makeSetupHook { + tclPackageHook = callPackage ({ buildPackages }: makeSetupHook { name = "tcl-package-hook"; - deps = [ makeWrapper ]; + deps = [ buildPackages.makeWrapper ]; } ./tcl-package-hook.sh) {}; }; }; diff --git a/nixpkgs/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix b/nixpkgs/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix index 4f3ffe6f995f..f3d34f13c688 100644 --- a/nixpkgs/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix +++ b/nixpkgs/pkgs/development/interpreters/tcl/mk-tcl-derivation.nix @@ -39,8 +39,8 @@ let "addTclConfigureFlags" "checkPhase" "checkInputs" "doCheck" ]) // { - buildInputs = buildInputs ++ [ makeWrapper tcl.tclPackageHook ]; - nativeBuildInputs = nativeBuildInputs ++ [ tcl ]; + buildInputs = buildInputs ++ [ tcl.tclPackageHook ]; + nativeBuildInputs = nativeBuildInputs ++ [ makeWrapper tcl ]; propagatedBuildInputs = propagatedBuildInputs ++ [ tcl ]; TCLSH = "${getBin tcl}/bin/tclsh"; diff --git a/nixpkgs/pkgs/development/interpreters/trealla/default.nix b/nixpkgs/pkgs/development/interpreters/trealla/default.nix index f72c8b69eb1b..6c6268011a73 100644 --- a/nixpkgs/pkgs/development/interpreters/trealla/default.nix +++ b/nixpkgs/pkgs/development/interpreters/trealla/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trealla"; - version = "1.9.37"; + version = "1.12.0"; src = fetchFromGitHub { owner = "infradig"; repo = "trealla"; rev = "v${version}"; - sha256 = "sha256-0cj4FGaYKIKCgWwRyLUw1DcvNnioQPOtqZhSvWSaojU="; + sha256 = "sha256-5gMf62WSGf46Bg8CaI9weSMRjrdGiuxtaDV9FrS2xO8="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/alembic/default.nix b/nixpkgs/pkgs/development/libraries/alembic/default.nix index 0ed9aa204706..667d334c9026 100644 --- a/nixpkgs/pkgs/development/libraries/alembic/default.nix +++ b/nixpkgs/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "alembic"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = version; - sha256 = "sha256-e87pnWIV8fbjEQa5iXRPXA9MkJN9NwY9PW/QI+cVSKo="; + sha256 = "sha256-QnqUD8KmMDmEZ1REoKN70SwVICOdyGPZsB/lU9nojj4="; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/nixpkgs/pkgs/development/libraries/apr/default.nix b/nixpkgs/pkgs/development/libraries/apr/default.nix index dd88cf7b1d49..19adfb08cfa0 100644 --- a/nixpkgs/pkgs/development/libraries/apr/default.nix +++ b/nixpkgs/pkgs/development/libraries/apr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook }: +{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "apr"; @@ -9,7 +9,15 @@ stdenv.mkDerivation rec { sha256 = "1spp6r2a3xcl5yajm9safhzyilsdzgagc2dadif8x6z9nbq4iqg2"; }; - patches = lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ]; + patches = [ + (fetchpatch { + name = "CVE-2021-35940.patch"; + url = "https://dist.apache.org/repos/dist/release/apr/patches/apr-1.7.0-CVE-2021-35940.patch"; + sha256 = "1qd511dyqa1b7bj89iihrlbaavbzl6yyblqginghmcnhw8adymbs"; + # convince fetchpatch to restore missing `a/`, `b/` to paths + extraPrefix = ""; + }) + ] ++ lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ]; # This test needs the net postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/audio/libbs2b/default.nix b/nixpkgs/pkgs/development/libraries/audio/libbs2b/default.nix index 11135b14fd48..720823852b02 100644 --- a/nixpkgs/pkgs/development/libraries/audio/libbs2b/default.nix +++ b/nixpkgs/pkgs/development/libraries/audio/libbs2b/default.nix @@ -12,6 +12,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsndfile ]; + configureFlags = [ + # Required for cross-compilation. + # Prevents linking error with 'undefined reference to rpl_malloc'. + # I think it's safe to assume that most libcs will properly handle + # realloc(NULL, size) and treat it like malloc(size). + "ac_cv_func_malloc_0_nonnull=yes" + ]; hardeningDisable = [ "format" ]; meta = { diff --git a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix index fa081ab3f24f..69cb1cc22ae9 100644 --- a/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -64,10 +64,10 @@ stdenv.mkDerivation rec { # fix build with gcc9, can be removed after bumping to current version NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; - preConfigure = - '' - rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp - ''; + # aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp + # aws-cpp-sdk-core-tests/aws/client/AWSClientTest.cpp + # seem to have a datarace + enableParallelChecking = false; postFixupHooks = [ # This bodge is necessary so that the file that the generated -config.cmake file diff --git a/nixpkgs/pkgs/development/libraries/bamf/default.nix b/nixpkgs/pkgs/development/libraries/bamf/default.nix index f53ea0d705cc..406ff81fe8ee 100644 --- a/nixpkgs/pkgs/development/libraries/bamf/default.nix +++ b/nixpkgs/pkgs/development/libraries/bamf/default.nix @@ -94,6 +94,6 @@ stdenv.mkDerivation rec { homepage = "https://launchpad.net/bamf"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers; + maintainers = with maintainers; [ davidak ] ++ teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/development/libraries/bash/bash-preexec/default.nix b/nixpkgs/pkgs/development/libraries/bash/bash-preexec/default.nix new file mode 100644 index 000000000000..db928729bd9a --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/bash/bash-preexec/default.nix @@ -0,0 +1,41 @@ +{ stdenvNoCC, lib, fetchFromGitHub, bats }: + +let version = "0.4.1"; +in stdenvNoCC.mkDerivation { + pname = "bash-preexec"; + inherit version; + + src = fetchFromGitHub { + owner = "rcaloras"; + repo = "bash-preexec"; + rev = version; + sha256 = "062iigps285628p710i7vh7kmgra5gahq9qiwj7rxir167lg0ggw"; + }; + + checkInputs = [ bats ]; + + dontConfigure = true; + doCheck = true; + dontBuild = true; + + patchPhase = '' + # Needed since the tests expect that HISTCONTROL is set. + sed -i '/setup()/a HISTCONTROL=""' test/bash-preexec.bats + ''; + + checkPhase = '' + bats test + ''; + + installPhase = '' + install -Dm755 $src/bash-preexec.sh $out/share/bash/bash-preexec.sh + ''; + + meta = with lib; { + description = "preexec and precmd functions for Bash just like Zsh"; + license = licenses.mit; + homepage = "https://github.com/rcaloras/bash-preexec"; + maintainers = [ maintainers.hawkw maintainers.rycee ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/boost/default.nix b/nixpkgs/pkgs/development/libraries/boost/default.nix new file mode 100644 index 000000000000..3b79378605f2 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/boost/default.nix @@ -0,0 +1,47 @@ +{ lib +, callPackage +, boost-build +, fetchurl +}: + +let + # for boost 1.55 we need to use 1.56's b2 + # since 1.55's build system is not working + # with our derivation + useBoost156 = rec { + version = "1.56.0"; + src = fetchurl { + url = "mirror://sourceforge/boost/boost_${lib.replaceStrings ["."] ["_"] version}.tar.bz2"; + sha256 = "07gz62nj767qzwqm3xjh11znpyph8gcii0cqhnx7wvismyn34iqk"; + }; + }; + + makeBoost = file: + lib.fix (self: + callPackage file { + boost-build = boost-build.override { + # useBoost allows us passing in src and version from + # the derivation we are building to get a matching b2 version. + useBoost = + if lib.versionAtLeast self.version "1.56" + then self + else useBoost156; # see above + }; + } + ); +in { + boost155 = makeBoost ./1.55.nix; + boost159 = makeBoost ./1.59.nix; + boost160 = makeBoost ./1.60.nix; + boost165 = makeBoost ./1.65.nix; + boost166 = makeBoost ./1.66.nix; + boost167 = makeBoost ./1.67.nix; + boost168 = makeBoost ./1.68.nix; + boost169 = makeBoost ./1.69.nix; + boost170 = makeBoost ./1.70.nix; + boost171 = makeBoost ./1.71.nix; + boost172 = makeBoost ./1.72.nix; + boost173 = makeBoost ./1.73.nix; + boost174 = makeBoost ./1.74.nix; + boost175 = makeBoost ./1.75.nix; +} diff --git a/nixpkgs/pkgs/development/libraries/boost/generic.nix b/nixpkgs/pkgs/development/libraries/boost/generic.nix index 1f9bbe5ffcad..2d8d13482eac 100644 --- a/nixpkgs/pkgs/development/libraries/boost/generic.nix +++ b/nixpkgs/pkgs/development/libraries/boost/generic.nix @@ -1,8 +1,9 @@ { lib, stdenv, icu, expat, zlib, bzip2, python ? null, fixDarwinDylibNames, libiconv +, boost-build , fetchpatch , which -, buildPackages , toolset ? /**/ if stdenv.cc.isClang then "clang" + else if stdenv.cc.isGNU then "gcc" else null , enableRelease ? true , enableDebug ? false @@ -67,6 +68,8 @@ let else "$NIX_BUILD_CORES"; + needUserConfig = stdenv.hostPlatform != stdenv.buildPlatform || useMpi || stdenv.isDarwin; + b2Args = concatStringsSep " " ([ "--includedir=$dev/include" "--libdir=$out/lib" @@ -95,7 +98,7 @@ let ++ optional (variant == "release") "debug-symbols=off" ++ optional (toolset != null) "toolset=${toolset}" ++ optional (!enablePython) "--without-python" - ++ optional (useMpi || stdenv.hostPlatform != stdenv.buildPlatform) "--user-config=user-config.jam" + ++ optional needUserConfig "--user-config=user-config.jam" ++ optionals (stdenv.hostPlatform.libc == "msvcrt") [ "threadapi=win32" ] ++ extraB2Args @@ -137,22 +140,39 @@ stdenv.mkDerivation { maintainers = with maintainers; [ peti ]; }; - preConfigure = '' - if test -f tools/build/src/tools/clang-darwin.jam ; then - substituteInPlace tools/build/src/tools/clang-darwin.jam \ - --replace '@rpath/$(<[1]:D=)' "$out/lib/\$(<[1]:D=)"; - fi; - '' + optionalString useMpi '' + preConfigure = optionalString useMpi '' cat << EOF >> user-config.jam using mpi : ${mpi}/bin/mpiCC ; EOF - '' + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + '' + # On darwin we need to add the `$out/lib` to the libraries' rpath explicitly, + # otherwise the dynamic linker is unable to resolve the reference to @rpath + # when the boost libraries want to load each other at runtime. + + optionalString (stdenv.isDarwin && enableShared) '' + cat << EOF >> user-config.jam + using clang-darwin : : ${stdenv.cc.targetPrefix}c++ + : <linkflags>"-rpath $out/lib/" + ; + EOF + '' + # b2 has trouble finding the correct compiler and tools for cross compilation + # since it apparently ignores $CC, $AR etc. Thus we need to set everything + # in user-config.jam. To keep things simple we just set everything in an + # uniform way for clang and gcc (which works thanks to our cc-wrapper). + # We pass toolset later which will make b2 invoke everything in the right + # way -- the other toolset in user-config.jam will be ignored. + + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' cat << EOF >> user-config.jam - using gcc : cross : ${stdenv.cc.targetPrefix}c++ ; + using gcc : cross : ${stdenv.cc.targetPrefix}c++ + : <archiver>$AR + <ranlib>$RANLIB + ; + + using clang : cross : ${stdenv.cc.targetPrefix}c++ + : <archiver>$AR + <ranlib>$RANLIB + ; EOF - # Build b2 with buildPlatform CC/CXX. - sed '2i export CC=$CC_FOR_BUILD; export CXX=$CXX_FOR_BUILD' \ - -i ./tools/build/src/engine/build.sh ''; NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin @@ -160,9 +180,8 @@ stdenv.mkDerivation { enableParallelBuilding = true; - nativeBuildInputs = [ which ] + nativeBuildInputs = [ which boost-build ] ++ optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ expat zlib bzip2 libiconv ] ++ optional (stdenv.hostPlatform == stdenv.buildPlatform) icu ++ optional enablePython python @@ -170,16 +189,19 @@ stdenv.mkDerivation { configureScript = "./bootstrap.sh"; configurePlatforms = []; + dontDisableStatic = true; + dontAddStaticConfigureFlags = true; configureFlags = [ "--includedir=$(dev)/include" "--libdir=$(out)/lib" + "--with-bjam=b2" # prevent bootstrapping b2 in configurePhase ] ++ optional enablePython "--with-python=${python.interpreter}" - ++ [ (if stdenv.hostPlatform == stdenv.buildPlatform then "--with-icu=${icu.dev}" else "--without-icu") ] - ++ optional (toolset != null) "--with-toolset=${toolset}"; + ++ optional (toolset != null) "--with-toolset=${toolset}" + ++ [ (if stdenv.hostPlatform == stdenv.buildPlatform then "--with-icu=${icu.dev}" else "--without-icu") ]; buildPhase = '' runHook preBuild - ./b2 ${b2Args} + b2 ${b2Args} runHook postBuild ''; @@ -191,7 +213,7 @@ stdenv.mkDerivation { cp -a tools/boostbook/{xsl,dtd} $dev/share/boostbook/ # Let boost install everything else - ./b2 ${b2Args} install + b2 ${b2Args} install runHook postInstall ''; diff --git a/nixpkgs/pkgs/development/libraries/boxfort/default.nix b/nixpkgs/pkgs/development/libraries/boxfort/default.nix index 740e43216984..93176fb230f1 100644 --- a/nixpkgs/pkgs/development/libraries/boxfort/default.nix +++ b/nixpkgs/pkgs/development/libraries/boxfort/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, python37Packages }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, python3Packages }: stdenv.mkDerivation rec { version = "unstable-2019-10-09"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patchShebangs ci/isdir.py ''; - checkInputs = with python37Packages; [ cram ]; + checkInputs = with python3Packages; [ cram ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/c-ares/default.nix b/nixpkgs/pkgs/development/libraries/c-ares/default.nix index 20bcf80d9e59..4f571b7f1dd9 100644 --- a/nixpkgs/pkgs/development/libraries/c-ares/default.nix +++ b/nixpkgs/pkgs/development/libraries/c-ares/default.nix @@ -8,13 +8,15 @@ let self = stdenv.mkDerivation rec { pname = "c-ares"; - version = "1.17.1"; + version = "1.17.2"; src = fetchurl { url = "https://c-ares.haxx.se/download/${pname}-${version}.tar.gz"; - sha256 = "0h7wjfnk2092glqcp9mqaax7xx0s13m501z1gi0gsjl2vvvd0gfp"; + sha256 = "sha256-SAPIRM4gzlEO8OuD+OpB+iTsqunSgMRoxYLSuyWzkT0="; }; + enableParallelBuilding = true; + meta = with lib; { description = "A C library for asynchronous DNS requests"; homepage = "https://c-ares.haxx.se"; diff --git a/nixpkgs/pkgs/development/libraries/c-blosc/default.nix b/nixpkgs/pkgs/development/libraries/c-blosc/default.nix index a7420e300ed4..6f59c96d2bc6 100644 --- a/nixpkgs/pkgs/development/libraries/c-blosc/default.nix +++ b/nixpkgs/pkgs/development/libraries/c-blosc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "c-blosc"; - version = "1.20.1"; + version = "1.21.0"; src = fetchFromGitHub { owner = "Blosc"; repo = "c-blosc"; rev = "v${version}"; - sha256 = "0a3yrig78plzjbazfqcfrzqhnw17xd0dcayvp4z4kp415kgs2a3s"; + sha256 = "sha256-B8SFOc1oGgU5AGAbkqe5oz045H08TnymNAbzz2oOKoo="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/cairo/default.nix b/nixpkgs/pkgs/development/libraries/cairo/default.nix index 905098faead9..8c7f1bcfaa09 100644 --- a/nixpkgs/pkgs/development/libraries/cairo/default.nix +++ b/nixpkgs/pkgs/development/libraries/cairo/default.nix @@ -70,6 +70,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; # very small + separateDebugInfo = true; nativeBuildInputs = [ autoreconfHook diff --git a/nixpkgs/pkgs/development/libraries/capnproto/default.nix b/nixpkgs/pkgs/development/libraries/capnproto/default.nix index a27a54b1eacb..3e5a22bf4c86 100644 --- a/nixpkgs/pkgs/development/libraries/capnproto/default.nix +++ b/nixpkgs/pkgs/development/libraries/capnproto/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://kentonv.github.io/capnproto"; + homepage = "https://capnproto.org/"; description = "Cap'n Proto cerealization protocol"; longDescription = '' Cap’n Proto is an insanely fast data interchange format and capability-based RPC system. Think JSON, except binary. Or think Protocol Buffers, except faster. ''; - license = licenses.bsd2; + license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ cstrahan ]; }; diff --git a/nixpkgs/pkgs/development/libraries/cdo/default.nix b/nixpkgs/pkgs/development/libraries/cdo/default.nix index a038b5885c2b..d13305d10b9e 100644 --- a/nixpkgs/pkgs/development/libraries/cdo/default.nix +++ b/nixpkgs/pkgs/development/libraries/cdo/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "cdo"; - version = "1.9.7.1"; + version = "1.9.10"; # Dependencies buildInputs = [ curl netcdf hdf5 ]; src = fetchurl { - url = "https://code.mpimet.mpg.de/attachments/download/20124/${pname}-${version}.tar.gz"; - sha256 = "0b4n8dwxfsdbz4jflsx0b75hwapdf1rp14p48dfr7ksv0qp9aw9p"; + url = "https://code.mpimet.mpg.de/attachments/download/24638/${pname}-${version}.tar.gz"; + sha256 = "sha256-zDnIm7tIHXs5RaBsVqhJIEcjX0asNjxPDZgPzN3mZ34="; }; # Configure phase diff --git a/nixpkgs/pkgs/development/libraries/ceres-solver/default.nix b/nixpkgs/pkgs/development/libraries/ceres-solver/default.nix index 14d0e38f3d9f..794a09749c55 100644 --- a/nixpkgs/pkgs/development/libraries/ceres-solver/default.nix +++ b/nixpkgs/pkgs/development/libraries/ceres-solver/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen glog ] - ++ lib.optional runTests gflags; + buildInputs = lib.optional runTests gflags; + propagatedBuildInputs = [ eigen glog ]; # The Basel BUILD file conflicts with the cmake build directory on # case-insensitive filesystems, eg. darwin. diff --git a/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix b/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix index 8a9534365f4e..b25688acfa15 100644 --- a/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix +++ b/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "cmark-gfm"; - version = "0.29.0.gfm.0"; + version = "0.29.0.gfm.2"; src = fetchFromGitHub { owner = "github"; repo = "cmark-gfm"; rev = version; - sha256 = "0wfr3xwl4wria8vld71flv6vpsdj9aj81yqvj0azidyb8p229a1l"; + sha256 = "sha256-8PjG87hR66ozKx+PSuKi0vHIoKICHSLdl2cKUYf+5m8="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix b/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix index 9dcfb79f3e3b..c33779ba5b9d 100644 --- a/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix +++ b/nixpkgs/pkgs/development/libraries/coordgenlibs/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "coordgenlibs"; - version = "2.0.3"; + version = "3.0.0"; src = fetchFromGitHub { owner = "schrodinger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uperQnJ1Q+s15pAlg/f4XR5VJI484ygZ0F6pMvcVDv8="; + sha256 = "sha256-iy5VFp+50ldyoGJtPI1w3VfndIAGwBb1Xh6Qp18q/wU="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix b/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix index 769f573f7afd..dcce68b927cf 100644 --- a/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix +++ b/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.11.0"; + version = "5.11.1"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ibZ/cj+pDLxUugz5jTc3FcVlytwS+R1RTtISbXe1mq4="; + sha256 = "sha256-H8BDuoSF5XkWgahGj7LCSsdXBbgcSjPLTmgUgamCij8="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/criterion/default.nix b/nixpkgs/pkgs/development/libraries/criterion/default.nix index ba436fec0a26..a1e7137d92ab 100644 --- a/nixpkgs/pkgs/development/libraries/criterion/default.nix +++ b/nixpkgs/pkgs/development/libraries/criterion/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, boxfort, cmake, libcsptr, pkg-config, gettext -, dyncall , nanomsg, python37Packages }: +, dyncall , nanomsg, python3Packages }: stdenv.mkDerivation rec { version = "2.3.3"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nanomsg ]; - checkInputs = with python37Packages; [ cram ]; + checkInputs = with python3Packages; [ cram ]; cmakeFlags = [ "-DCTESTS=ON" ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/dav1d/default.nix b/nixpkgs/pkgs/development/libraries/dav1d/default.nix index fe6926fe809a..b39e09236096 100644 --- a/nixpkgs/pkgs/development/libraries/dav1d/default.nix +++ b/nixpkgs/pkgs/development/libraries/dav1d/default.nix @@ -10,14 +10,14 @@ assert useVulkan -> withExamples; stdenv.mkDerivation rec { pname = "dav1d"; - version = "0.9.0"; + version = "0.9.2"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = version; - sha256 = "0ki3wlyaqr80gl1srbbd18dd5bs1sl9icxym8ar62abpvgzxl5yk"; + sha256 = "0bkps488h9s15ylvkm4fmfywgrpbw570glawpnv6khpq9n223dzl"; }; nativeBuildInputs = [ meson ninja nasm pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/duckdb/default.nix b/nixpkgs/pkgs/development/libraries/duckdb/default.nix index 92f6accd4262..71a466067ad6 100644 --- a/nixpkgs/pkgs/development/libraries/duckdb/default.nix +++ b/nixpkgs/pkgs/development/libraries/duckdb/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.2.8"; + version = "0.2.9"; src = fetchFromGitHub { owner = "cwida"; repo = "duckdb"; rev = "v${version}"; - sha256 = "sha256-X8zk9D7BQQ6iHdfvpaTZ8wS779wt3nRthH7OG4p9bTg="; + sha256 = "sha256-ID65xpNSDyi19OcOs9Gdf5xpK++UVWclp8pVggIWQNU="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/eccodes/default.nix b/nixpkgs/pkgs/development/libraries/eccodes/default.nix index 1050490a220b..a528656fe464 100644 --- a/nixpkgs/pkgs/development/libraries/eccodes/default.nix +++ b/nixpkgs/pkgs/development/libraries/eccodes/default.nix @@ -1,39 +1,50 @@ -{ fetchurl, lib, stdenv -, cmake, netcdf, openjpeg, libpng, gfortran -, enablePython ? false, pythonPackages +{ fetchurl +, lib +, stdenv +, cmake +, netcdf +, openjpeg +, libpng +, gfortran +, perl +, enablePython ? false +, pythonPackages , enablePosixThreads ? false -, enableOpenMPThreads ? false}: -with lib; +, enableOpenMPThreads ? false +}: + stdenv.mkDerivation rec { pname = "eccodes"; - version = "2.12.5"; + version = "2.23.0"; src = fetchurl { url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "0576fccng4nvmq5gma1nb1v00if5cwl81w4nv5zkb80q5wicn50c"; + sha256 = "sha256-y9yFMlN+loLxqT3bA0QEFrZpBqTMJd7Dy9c5QNGUvww="; }; postPatch = '' substituteInPlace cmake/FindOpenJPEG.cmake --replace openjpeg-2.1 ${openjpeg.incDir} ''; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake gfortran perl ]; + + buildInputs = [ + netcdf + openjpeg + libpng + ]; - buildInputs = [ netcdf - openjpeg - libpng - gfortran - ]; - propagatedBuildInputs = optionals enablePython [ - pythonPackages.python - pythonPackages.numpy - ]; + propagatedBuildInputs = lib.optionals enablePython [ + pythonPackages.python + pythonPackages.numpy + ]; - cmakeFlags = [ "-DENABLE_PYTHON=${if enablePython then "ON" else "OFF"}" - "-DENABLE_PNG=ON" - "-DENABLE_ECCODES_THREADS=${if enablePosixThreads then "ON" else "OFF"}" - "-DENABLE_ECCODES_OMP_THREADS=${if enableOpenMPThreads then "ON" else "OFF"}" - ]; + cmakeFlags = [ + "-DENABLE_PYTHON=${if enablePython then "ON" else "OFF"}" + "-DENABLE_PNG=ON" + "-DENABLE_ECCODES_THREADS=${if enablePosixThreads then "ON" else "OFF"}" + "-DENABLE_ECCODES_OMP_THREADS=${if enableOpenMPThreads then "ON" else "OFF"}" + ]; doCheck = true; @@ -44,7 +55,7 @@ stdenv.mkDerivation rec { ctest -R "eccodes_t_(definitions|calendar|unit_tests|md5|uerra|grib_2nd_order_numValues|julian)" -VV ''; - meta = { + meta = with lib; { homepage = "https://confluence.ecmwf.int/display/ECC/"; license = licenses.asl20; maintainers = with maintainers; [ knedlsepp ]; diff --git a/nixpkgs/pkgs/development/libraries/enchant/2.x.nix b/nixpkgs/pkgs/development/libraries/enchant/2.x.nix index 237ecf148cb8..0d1374018b6c 100644 --- a/nixpkgs/pkgs/development/libraries/enchant/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/enchant/2.x.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "enchant"; - version = "2.3.0"; + version = "2.3.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-32gGO2wTskX6ckaw4JigPnT3qRxtiUe8XE9CzlXi5B0="; + sha256 = "sha256-e0sa/PLNi/ppHe6mGIQE0zfyMXS7w5ucKt0r80Bzbpw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/ethash/default.nix b/nixpkgs/pkgs/development/libraries/ethash/default.nix index c1ef9cee9906..1283ec8cfab0 100644 --- a/nixpkgs/pkgs/development/libraries/ethash/default.nix +++ b/nixpkgs/pkgs/development/libraries/ethash/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ethash"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "chfast"; repo = "ethash"; rev = "v${version}"; - sha256 = "sha256-QQoWOJGwL03zbBfrFNXz0Ff9Agc2dMBW9nW3jdOwEE8="; + sha256 = "sha256-ba8SBtJd0ERunO9KpJZkutkO6ZnZOEGzWn2IjO1Uu28="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/fcl/default.nix b/nixpkgs/pkgs/development/libraries/fcl/default.nix index 33a600805846..4e13a3f7113f 100644 --- a/nixpkgs/pkgs/development/libraries/fcl/default.nix +++ b/nixpkgs/pkgs/development/libraries/fcl/default.nix @@ -2,30 +2,15 @@ stdenv.mkDerivation rec { pname = "fcl"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "flexible-collision-library"; repo = pname; rev = version; - sha256 = "1i1sd0fsvk5d529aw8aw29bsmymqgcmj3ci35sz58nzp2wjn0l5d"; + sha256 = "0f5lhg6f9np7w16s6wz4mb349bycil1irk8z8ylfjwllxi4n6x7a"; }; - patches = [ - # Disable SSE on Emscripten (required for the next patch to apply cleanly) - # https://github.com/flexible-collision-library/fcl/pull/470 - (fetchpatch { - url = "https://github.com/flexible-collision-library/fcl/commit/83a1af61ba4efa81ec0b552b3121100044a8cf46.patch"; - sha256 = "0bbkv4xpkl3c0i8qdlkghj6qkybrrd491c8rd2cqnxfgspcd40p0"; - }) - # Detect SSE support to fix building on ARM - # https://github.com/flexible-collision-library/fcl/pull/506 - (fetchpatch { - url = "https://github.com/flexible-collision-library/fcl/commit/cbfe1e9405aa68138ed1a8f33736429b85500dea.patch"; - sha256 = "18qip8gwhm3fvbz1cvzf625rh5msq8m4669ld1m60fv6z50clr9h"; - }) - ]; - nativeBuildInputs = [ cmake ]; propagatedBuildInputs = [ eigen libccd octomap ]; diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix b/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix index 3dca11008f72..77bd473485b0 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix @@ -244,7 +244,7 @@ assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; stdenv.mkDerivation rec { pname = "ffmpeg-full"; - inherit (ffmpeg) src version; + inherit (ffmpeg) src version patches; prePatch = '' patchShebangs . @@ -447,6 +447,14 @@ stdenv.mkDerivation rec { buildFlags = [ "all" ] ++ optional qtFaststartProgram "tools/qt-faststart"; # Build qt-faststart executable + doCheck = true; + checkPhase = let + ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + in '' + ${ldLibraryPathEnv}="libavcodec:libavdevice:libavfilter:libavformat:libavresample:libavutil:libpostproc:libswresample:libswscale:''${${ldLibraryPathEnv}}" \ + make check -j$NIX_BUILD_CORES + ''; + # Hacky framework patching technique borrowed from the phantomjs2 package postInstall = optionalString qtFaststartProgram '' cp -a tools/qt-faststart $out/bin/ diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/2.8.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/2.8.nix index 6d94c2e9974b..0df810ff10b0 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/2.8.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/2.8.nix @@ -7,4 +7,5 @@ callPackage ./generic.nix (rec { knownVulnerabilities = [ "CVE-2021-30123" ]; + doCheck = false; } // args) diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix index d557c87ebdf6..14405f40f67d 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix @@ -13,6 +13,26 @@ callPackage ./generic.nix (rec { darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; patches = [ + (fetchpatch { + name = "CVE-2021-33815.patch"; + url = "https://github.com/FFmpeg/FFmpeg/commit/26d3c81bc5ef2f8c3f09d45eaeacfb4b1139a777.patch"; + sha256 = "0l8dqga5845f7d3wdbvd05i23saldq4pm2cyfdgszbr0c18sxagf"; + }) + (fetchpatch { + name = "CVE-2021-38114.patch"; + url = "https://github.com/FFmpeg/FFmpeg/commit/7150f9575671f898382c370acae35f9087a30ba1.patch"; + sha256 = "0gwkc7v1wsh4j0am2nnskhsca1b5aqzhcfd41sd9mh2swsdyf27i"; + }) + (fetchpatch { + name = "CVE-2021-38171.patch"; + url = "https://github.com/FFmpeg/FFmpeg/commit/9ffa49496d1aae4cbbb387aac28a9e061a6ab0a6.patch"; + sha256 = "0b8hsb45izw7w1vb2b94k9f6kvn2shxrap5ip1krdxg6hs7an0x8"; + }) + (fetchpatch { + name = "CVE-2021-38291.patch"; + url = "https://github.com/FFmpeg/FFmpeg/commit/e01d306c647b5827102260b885faa223b646d2d1.patch"; + sha256 = "0p2p8gcnb5j469xa3czfssm09w3jk08kz8rnl8wi2l9aj9l08my9"; + }) # Fix incorrect segment length in HLS child playlist with fmp4 segment format # FIXME remove in version 4.5 # https://trac.ffmpeg.org/ticket/9193 diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix index d52abd4ab09f..876910da6d25 100644 --- a/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix +++ b/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix @@ -2,6 +2,7 @@ , alsa-lib, bzip2, fontconfig, freetype, gnutls, libiconv, lame, libass, libogg , libssh, libtheora, libva, libdrm, libvorbis, libvpx, xz, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d +, srt ? null , openglSupport ? false, libGLU ? null, libGL ? null , libmfxSupport ? false, intel-media-sdk ? null , libaomSupport ? false, libaom ? null @@ -17,7 +18,8 @@ # Darwin frameworks , Cocoa, darwinFrameworks ? [ Cocoa ] # Inherit generics -, branch, sha256, version, patches ? [], knownVulnerabilities ? [], ... +, branch, sha256, version, patches ? [], knownVulnerabilities ? [] +, doCheck ? true, ... }: /* Maintainer notes: @@ -94,6 +96,7 @@ stdenv.mkDerivation rec { # Build flags "--enable-shared" (ifMinVer "0.6" "--enable-pic") + (ifMinVer "4.0" (enableFeature (srt != null) "libsrt")) (enableFeature runtimeCpuDetectBuild "runtime-cpudetect") "--enable-hardcoded-tables" ] ++ @@ -171,7 +174,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora - libvorbis xz soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers + libvorbis xz soxr x264 x265 xvidcore zlib libopus speex srt nv-codec-headers ] ++ optionals openglSupport [ libGL libGLU ] ++ optional libmfxSupport intel-media-sdk ++ optional libaomSupport libaom @@ -187,7 +190,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = false; # fails + inherit doCheck; + checkPhase = let + ldLibraryPathEnv = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + in '' + ${ldLibraryPathEnv}="libavcodec:libavdevice:libavfilter:libavformat:libavresample:libavutil:libpostproc:libswresample:libswscale:''${${ldLibraryPathEnv}}" \ + make check -j$NIX_BUILD_CORES + ''; # ffmpeg 3+ generates pkg-config (.pc) files that don't have the # form automatically handled by the multiple-outputs hooks. diff --git a/nixpkgs/pkgs/development/libraries/folly/default.nix b/nixpkgs/pkgs/development/libraries/folly/default.nix index b2774e41ce46..dcb0fc070475 100644 --- a/nixpkgs/pkgs/development/libraries/folly/default.nix +++ b/nixpkgs/pkgs/development/libraries/folly/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (rec { pname = "folly"; - version = "2021.08.30.00"; + version = "2021.09.20.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-LS1FD5NMLkv7dr4j1b75aEdTDJdbjrXymF7eDFPGRDI="; + sha256 = "sha256-aFTFUtRQOGCDR3pbpw1ViuMFm02GSq04u9GgE9pq33A="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix b/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix index 70bd37e40d39..0bb9e58fe355 100644 --- a/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix +++ b/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gbenchmark"; - version = "1.5.6"; + version = "1.6.0"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; rev = "v${version}"; - sha256 = "sha256-DFm5cQh1b2BX6qCDaQZ1/XBNDeIYXKWbIETYu1EjDww="; + sha256 = "sha256-EAJk3JhLdkuGKRMtspTLejck8doWPd7Z0Lv/Mvf3KFY="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/gdal/default.nix b/nixpkgs/pkgs/development/libraries/gdal/default.nix index ca5eabd65302..d00b184cae43 100644 --- a/nixpkgs/pkgs/development/libraries/gdal/default.nix +++ b/nixpkgs/pkgs/development/libraries/gdal/default.nix @@ -7,13 +7,13 @@ with lib; stdenv.mkDerivation rec { pname = "gdal"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; rev = "v${version}"; - sha256 = "0832w40a92cl8ydkv0pk7nl1ivhfhbhqbhmpqmdjpi0126jlm2y0"; + sha256 = "sha256-fla3EMDmuW0+vmmU0sgtLsGfO7dDApLQ2EoKJeR/1IM="; }; sourceRoot = "source/gdal"; diff --git a/nixpkgs/pkgs/development/libraries/glew/default.nix b/nixpkgs/pkgs/development/libraries/glew/default.nix index 53c9b5a30dc9..ae32bbe95223 100644 --- a/nixpkgs/pkgs/development/libraries/glew/default.nix +++ b/nixpkgs/pkgs/development/libraries/glew/default.nix @@ -43,6 +43,9 @@ stdenv.mkDerivation rec { makeFlags = [ "SYSTEM=${if stdenv.hostPlatform.isMinGW then "mingw" else stdenv.hostPlatform.parsed.kernel.name}" + "CC=${stdenv.cc.targetPrefix}cc" + "LD=${stdenv.cc.targetPrefix}cc" + "AR=${stdenv.cc.targetPrefix}ar" ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/glib-networking/default.nix b/nixpkgs/pkgs/development/libraries/glib-networking/default.nix index 690279fcf213..6842470be4c0 100644 --- a/nixpkgs/pkgs/development/libraries/glib-networking/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.68.1"; + version = "2.68.2"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0c1vylxly8k7g454g02spi44ybjidlwg461vp713zxd94k8qnpfh"; + sha256 = "U168BU72l9tWpP/+2RvA4RyO4cmstIqtKMjh1cPVmU8="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix index 3c8fe4d569fa..edb37d2ddd32 100644 --- a/nixpkgs/pkgs/development/libraries/glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/glib/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.68.3"; + version = "2.68.4"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0f1iprj7v0b5wn9njj39dkl25g6filfs7i4ybk20jq821k1a7qg7"; + sha256 = "sha256-Yv0GHQinVJJhfmJac+LAXiWfgxrLuOH4ucgfI/eZOjs="; }; patches = optionals stdenv.isDarwin [ diff --git a/nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz b/nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz index 59230761cd43..4a287d5c9ca1 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz +++ b/nixpkgs/pkgs/development/libraries/glibc/2.33-master.patch.gz Binary files differdiff --git a/nixpkgs/pkgs/development/libraries/glibc/common.nix b/nixpkgs/pkgs/development/libraries/glibc/common.nix index e651a8effac9..fe8fd6d80c6d 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/common.nix +++ b/nixpkgs/pkgs/development/libraries/glibc/common.nix @@ -42,7 +42,7 @@ let version = "2.33"; - patchSuffix = "-47"; + patchSuffix = "-50"; sha256 = "sha256-LiVWAA4QXb1X8Layoy/yzxc73k8Nhd/8z9i35RoGd/8="; in @@ -61,7 +61,7 @@ stdenv.mkDerivation ({ [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. $ git fetch --all -p && git checkout origin/release/2.33/master && git describe - glibc-2.33-47-gb5711025bc + glibc-2.33-50-gc6cadbf83a $ git show --minimal --reverse glibc-2.33.. | gzip -9n --rsyncable - > 2.33-master.patch.gz To compare the archive contents zdiff can be used. diff --git a/nixpkgs/pkgs/development/libraries/glibc/locales.nix b/nixpkgs/pkgs/development/libraries/glibc/locales.nix index 325e0d09936b..208eedd71934 100644 --- a/nixpkgs/pkgs/development/libraries/glibc/locales.nix +++ b/nixpkgs/pkgs/development/libraries/glibc/locales.nix @@ -34,9 +34,9 @@ callPackage ./common.nix { inherit stdenv; } { + lib.optionalString (!allLocales) '' # Check that all locales to be built are supported echo -n '${lib.concatMapStrings (s: s + " \\\n") locales}' \ - | sort > locales-to-build.txt + | sort -u > locales-to-build.txt cat ../glibc-2*/localedata/SUPPORTED | grep ' \\' \ - | sort > locales-supported.txt + | sort -u > locales-supported.txt comm -13 locales-supported.txt locales-to-build.txt \ > locales-unsupported.txt if [[ $(wc -c locales-unsupported.txt) != "0 locales-unsupported.txt" ]]; then diff --git a/nixpkgs/pkgs/development/libraries/glm/default.nix b/nixpkgs/pkgs/development/libraries/glm/default.nix index f5652a61c1de..ef8cd49ba297 100644 --- a/nixpkgs/pkgs/development/libraries/glm/default.nix +++ b/nixpkgs/pkgs/development/libraries/glm/default.nix @@ -1,37 +1,53 @@ -{ lib, stdenv, fetchurl, fetchzip, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - version = "0.9.8.5"; + version = "0.9.9.8"; pname = "glm"; - src = fetchzip { - url = "https://github.com/g-truc/glm/releases/download/${version}/${pname}-${version}.zip"; - sha256 = "0dkfj4hin3am9fxgcvwr5gj0h9y52x7wa03lfwb3q0bvaj1rsly2"; + src = fetchFromGitHub { + owner = "g-truc"; + repo = pname; + rev = version; + sha256 = "sha256-F//+3L5Ozrw6s7t4LrcUmO7sN30ZSESdrPAYX57zgr8="; }; + outputs = [ "out" "doc" ]; + nativeBuildInputs = [ cmake ]; - outputs = [ "out" "doc" ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=OFF" + "-DBUILD_STATIC_LIBS=OFF" + "-DGLM_TEST_ENABLE=${if doCheck then "ON" else "OFF"}" + ]; - cmakeConfigureFlags = [ "-DGLM_INSTALL_ENABLE=off" ]; + doCheck = true; - # fetch newer version of platform.h which correctly supports gcc 7.3 - gcc7PlatformPatch = fetchurl { - url = "https://raw.githubusercontent.com/g-truc/glm/384dab02e45a8ad3c1a3fa0906e0d5682c5b27b9/glm/simd/platform.h"; - sha256 = "0ym0sgwznxhfyi014xs55x3ql7r65fjs34sqb5jiaffkdhkqgzia"; - }; + installPhase = '' + runHook preInstall - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace '"''${CMAKE_CURRENT_BINARY_DIR}/''${GLM_INSTALL_CONFIGDIR}' '"''${GLM_INSTALL_CONFIGDIR}' - cp ${gcc7PlatformPatch} glm/simd/platform.h - ''; + # Install header-only library + mkdir -p $out/include + cp -rv ../glm $out/include + rm $out/include/glm/CMakeLists.txt + rm $out/include/glm/detail/*.cpp + + # Install CMake files + mkdir -p $out/lib + cp -rv ../cmake $out/lib + substituteInPlace $out/lib/cmake/glm/glmConfig.cmake \ + --replace 'GLM_INCLUDE_DIRS ''${_IMPORT_PREFIX}' "GLM_INCLUDE_DIRS $out/include" - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DGLM_COMPILER=0"; + # Install pkg-config file + mkdir -p $out/lib/pkgconfig + substituteAll ${./glm.pc.in} $out/lib/pkgconfig/glm.pc - postInstall = '' + # Install docs mkdir -p $doc/share/doc/glm - cp -rv $NIX_BUILD_TOP/$sourceRoot/doc/* $doc/share/doc/glm + cp -rv ../doc/api $doc/share/doc/glm/html + cp -v ../doc/manual.pdf $doc/share/doc/glm + + runHook postInstall ''; meta = with lib; { @@ -41,10 +57,10 @@ stdenv.mkDerivation rec { graphics software based on the OpenGL Shading Language (GLSL) specification and released under the MIT license. ''; - homepage = "http://glm.g-truc.net/"; + homepage = "https://github.com/g-truc/glm"; license = licenses.mit; platforms = platforms.unix; - maintainers = with lib.maintainers; [ ]; + maintainers = with maintainers; [ smancill ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/glm/glm.pc.in b/nixpkgs/pkgs/development/libraries/glm/glm.pc.in new file mode 100644 index 000000000000..e196c793d1d5 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/glm/glm.pc.in @@ -0,0 +1,7 @@ +prefix=@out@ +includedir=@out@/include + +Name: GLM +Description: OpenGL Mathematics +Version: @version@ +Cflags: -I${includedir} diff --git a/nixpkgs/pkgs/development/libraries/globalarrays/default.nix b/nixpkgs/pkgs/development/libraries/globalarrays/default.nix index 8b01f9f68146..a2e983ece83d 100644 --- a/nixpkgs/pkgs/development/libraries/globalarrays/default.nix +++ b/nixpkgs/pkgs/development/libraries/globalarrays/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { sha256 = "0bky91ncz6vy0011ps9prsnq9f4a5s5xwr23kkmi39xzg0417mnd"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ mpi blas gfortran openssh ]; + nativeBuildInputs = [ autoreconfHook gfortran ]; + buildInputs = [ mpi blas openssh ]; preConfigure = '' configureFlagsArray+=( "--enable-i8" \ diff --git a/nixpkgs/pkgs/development/libraries/gpgme/default.nix b/nixpkgs/pkgs/development/libraries/gpgme/default.nix index 9cbf5c39a7e7..c1c9460fad69 100644 --- a/nixpkgs/pkgs/development/libraries/gpgme/default.nix +++ b/nixpkgs/pkgs/development/libraries/gpgme/default.nix @@ -21,22 +21,10 @@ stdenv.mkDerivation rec { }; patches = [ - (fetchpatch { # probably included in > 1.16.0 - name = "test_t-edit-sign.diff"; # we experienced segmentation fault in this test - urls = [ - "https://files.gnupg.net/file/data/w43xz2zf73pnyqk5mm5l/PHID-FILE-hm2x5mjntsdyxrxve5tb/file" - "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=81a33ea5e1b86d586b956e893a5b25c4cd41c969" - ]; - sha256 = "1xxvv0kc9wdj5hzpddzs3cn8dhmm2cb29224a7h9vairraq5272h"; - }) - (fetchpatch { # gpg: Send --with-keygrip when listing keys - name = "c4cf527ea227edb468a84bf9b8ce996807bd6992.patch"; - urls = [ - "https://files.gnupg.net/file/data/2ufcg7ny5jdnv7hmewb4/PHID-FILE-7iwvryn2btti6txr3bsz/file" - "http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=c4cf527ea227edb468a84bf9b8ce996807bd6992" - ]; - sha256 = "0y0b0lb2nq5p9kx13b59b2jaz157mvflliw1qdvg1v1hynvgb8m4"; - }) + # probably included in > 1.16.0 + ./test_t-edit-sign.diff + # https://dev.gnupg.org/rMc4cf527ea227edb468a84bf9b8ce996807bd6992 + ./fix_gpg_list_keys.diff # https://lists.gnupg.org/pipermail/gnupg-devel/2020-April/034591.html (fetchpatch { name = "0001-Fix-python-tests-on-non-Linux.patch"; diff --git a/nixpkgs/pkgs/development/libraries/gpgme/fix_gpg_list_keys.diff b/nixpkgs/pkgs/development/libraries/gpgme/fix_gpg_list_keys.diff new file mode 100644 index 000000000000..bd8da4edd6e0 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gpgme/fix_gpg_list_keys.diff @@ -0,0 +1,12 @@ +diff --git a/src/engine-gpg.c b/src/engine-gpg.c +index b51ea173..4e74665e 100644 +--- a/src/engine-gpg.c ++++ b/src/engine-gpg.c +@@ -3005,6 +3005,7 @@ gpg_keylist_build_options (engine_gpg_t gpg, int secret_only, + gpg_error_t err; + + err = add_arg (gpg, "--with-colons"); ++ err = add_arg (gpg, "--with-keygrip"); + + /* Since gpg 2.1.15 fingerprints are always printed, thus there is + * no more need to explicitly request them. */ \ No newline at end of file diff --git a/nixpkgs/pkgs/development/libraries/gpgme/test_t-edit-sign.diff b/nixpkgs/pkgs/development/libraries/gpgme/test_t-edit-sign.diff new file mode 100644 index 000000000000..55075b9eb126 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gpgme/test_t-edit-sign.diff @@ -0,0 +1,125 @@ +From 81a33ea5e1b86d586b956e893a5b25c4cd41c969 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de> +Date: Sat, 26 Jun 2021 18:02:47 +0200 +Subject: [PATCH] core: Fix use-after-free issue in test + +* tests/gpg/t-edit-sign.c (sign_key, verify_key_signature): New. +(main): Factored out signing and verifying the result. +-- + +Factoring the two steps of the test into different functions fixes the +use-after-free issue that was caused by accidentaly using a variable +of the first step in the second step. + +GnuPG-bug-id: 5509 +--- + tests/gpg/t-edit-sign.c | 54 ++++++++++++++++++++++++++++------------- + 1 file changed, 37 insertions(+), 17 deletions(-) + +diff --git a/tests/gpg/t-edit-sign.c b/tests/gpg/t-edit-sign.c +index 2f983622..e0494c54 100644 +--- a/tests/gpg/t-edit-sign.c ++++ b/tests/gpg/t-edit-sign.c +@@ -107,31 +107,19 @@ interact_fnc (void *opaque, const char *status, const char *args, int fd) + } + + +-int +-main (int argc, char **argv) ++void ++sign_key (const char *key_fpr, const char *signer_fpr) + { + gpgme_ctx_t ctx; + gpgme_error_t err; + gpgme_data_t out = NULL; +- const char *signer_fpr = "A0FF4590BB6122EDEF6E3C542D727CC768697734"; /* Alpha Test */ + gpgme_key_t signing_key = NULL; +- const char *key_fpr = "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2"; /* Bravo Test */ + gpgme_key_t key = NULL; +- gpgme_key_t signed_key = NULL; +- gpgme_user_id_t signed_uid = NULL; +- gpgme_key_sig_t key_sig = NULL; + char *agent_info; +- int mode; +- +- (void)argc; +- (void)argv; +- +- init_gpgme (GPGME_PROTOCOL_OpenPGP); + + err = gpgme_new (&ctx); + fail_if_err (err); + +- /* Sign the key */ + agent_info = getenv("GPG_AGENT_INFO"); + if (!(agent_info && strchr (agent_info, ':'))) + gpgme_set_passphrase_cb (ctx, passphrase_cb, 0); +@@ -159,8 +147,23 @@ main (int argc, char **argv) + gpgme_data_release (out); + gpgme_key_unref (key); + gpgme_key_unref (signing_key); ++ gpgme_release (ctx); ++} ++ ++ ++void ++verify_key_signature (const char *key_fpr, const char *signer_keyid) ++{ ++ gpgme_ctx_t ctx; ++ gpgme_error_t err; ++ gpgme_key_t signed_key = NULL; ++ gpgme_user_id_t signed_uid = NULL; ++ gpgme_key_sig_t key_sig = NULL; ++ int mode; ++ ++ err = gpgme_new (&ctx); ++ fail_if_err (err); + +- /* Verify the key signature */ + mode = gpgme_get_keylist_mode (ctx); + mode |= GPGME_KEYLIST_MODE_SIGS; + err = gpgme_set_keylist_mode (ctx, mode); +@@ -168,7 +171,7 @@ main (int argc, char **argv) + err = gpgme_get_key (ctx, key_fpr, &signed_key, 0); + fail_if_err (err); + +- signed_uid = key->uids; ++ signed_uid = signed_key->uids; + if (!signed_uid) + { + fprintf (stderr, "Signed key has no user IDs\n"); +@@ -180,7 +183,7 @@ main (int argc, char **argv) + exit (1); + } + key_sig = signed_uid->signatures->next; +- if (strcmp ("2D727CC768697734", key_sig->keyid)) ++ if (strcmp (signer_keyid, key_sig->keyid)) + { + fprintf (stderr, "Unexpected key ID in second user ID sig: %s\n", + key_sig->keyid); +@@ -196,6 +199,23 @@ main (int argc, char **argv) + + gpgme_key_unref (signed_key); + gpgme_release (ctx); ++} ++ ++ ++int ++main (int argc, char **argv) ++{ ++ const char *signer_fpr = "A0FF4590BB6122EDEF6E3C542D727CC768697734"; /* Alpha Test */ ++ const char *signer_keyid = signer_fpr + strlen(signer_fpr) - 16; ++ const char *key_fpr = "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2"; /* Bravo Test */ ++ ++ (void)argc; ++ (void)argv; ++ ++ init_gpgme (GPGME_PROTOCOL_OpenPGP); ++ ++ sign_key (key_fpr, signer_fpr); ++ verify_key_signature (key_fpr, signer_keyid); + + return 0; + } +-- +2.32.0 diff --git a/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix b/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix index 3e00050ada2f..1edadf0a51bc 100644 --- a/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix +++ b/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix @@ -107,6 +107,7 @@ stdenv.mkDerivation rec { "-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "-Dintrospection=disabled" + "-Dtests=disabled" ] ++ lib.optional (!enableX11) "-Dx11=disabled" # TODO How to disable Wayland? diff --git a/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/nixpkgs/pkgs/development/libraries/gtk/3.x.nix index 01b98d06bf30..7999d62b9112 100644 --- a/nixpkgs/pkgs/development/libraries/gtk/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/gtk/3.x.nix @@ -76,12 +76,7 @@ stdenv.mkDerivation rec { patches = [ ./patches/3.0-immodules.cache.patch - - (fetchpatch { - name = "Xft-setting-fallback-compute-DPI-properly.patch"; - url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; - sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; - }) + ./patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch ] ++ lib.optionals stdenv.isDarwin [ # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it diff --git a/nixpkgs/pkgs/development/libraries/gtk/patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch b/nixpkgs/pkgs/development/libraries/gtk/patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch new file mode 100644 index 000000000000..247dd3ea8456 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/gtk/patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch @@ -0,0 +1,34 @@ +From 269f2d80ea41cde17612600841fbdc32e99010f5 Mon Sep 17 00:00:00 2001 +From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> +Date: Tue, 24 Jan 2017 12:30:08 +0100 +Subject: [PATCH] Xft setting fallback: compute DPI properly + +This is a partial revert of bdf0820c501437a2150d8ff0d5340246e713f73f. If +the Xft DPI settings are not explicitly set, use the values provided by +the X server rather than hard-coding the fallback value of 96. + +While an auto-configured Xorg already reports 96, this value can be +overriden by the user, and we should respect the user choice in this +case. There is no need to require them to set the same value in +different places (the Xorg DPI settings and Xft.dpi). +--- + gdk/x11/gdkxftdefaults.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/gdk/x11/gdkxftdefaults.c b/gdk/x11/gdkxftdefaults.c +index fa1cfde2ec..c462b78c4b 100644 +--- a/gdk/x11/gdkxftdefaults.c ++++ b/gdk/x11/gdkxftdefaults.c +@@ -174,7 +174,8 @@ init_xft_settings (GdkScreen *screen) + x11_screen->xft_rgba = FC_RGBA_UNKNOWN; + + if (!get_double_default (xdisplay, "dpi", &dpi_double)) +- dpi_double = 96.0; ++ dpi_double = (DisplayHeight(xdisplay, x11_screen->screen_num)*25.4)/ ++ DisplayHeightMM(xdisplay, x11_screen->screen_num); + + x11_screen->xft_dpi = (int)(0.5 + PANGO_SCALE * dpi_double); + } +-- +2.11.0.616.gd72966cf44.dirty + diff --git a/nixpkgs/pkgs/development/libraries/gtkd/default.nix b/nixpkgs/pkgs/development/libraries/gtkd/default.nix index eaf8a94d137e..ed4326527005 100644 --- a/nixpkgs/pkgs/development/libraries/gtkd/default.nix +++ b/nixpkgs/pkgs/development/libraries/gtkd/default.nix @@ -27,6 +27,11 @@ in stdenv.mkDerivation rec { url = "https://github.com/gtkd-developers/GtkD/commit/a9db09117ab27127ca4c3b8d2f308fae483a9199.patch"; sha256 = "0ngyqifw1kandc1vk01kms3z65pcisfd75q7z09rml96glhfzjd6"; }) + # Fix breakage with dmd ldc 1.26 and newer + (fetchpatch { + url = "https://github.com/gtkd-developers/GtkD/commit/323ff96c648882eaca2faee170bd9e90c6e1e9c3.patch"; + sha256 = "1rhyi0isl6fl5i6fgsinvgq6v72xq7c6sajrxcsnmrzpvw91il3d"; + }) ]; prePatch = '' diff --git a/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix b/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix index 4a12c5bcc225..e94fcc5ece9d 100644 --- a/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix +++ b/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix @@ -32,7 +32,8 @@ let in stdenv.mkDerivation { - name = "harfbuzz${optionalString withIcu "-icu"}-${version}"; + pname = "harfbuzz${optionalString withIcu "-icu"}"; + inherit version; src = fetchFromGitHub { owner = "harfbuzz"; @@ -42,8 +43,7 @@ stdenv.mkDerivation { }; postPatch = '' - patchShebangs src/*.py - patchShebangs test + patchShebangs src/*.py test '' + lib.optionalString stdenv.isDarwin '' # ApplicationServices.framework headers have cast-align warnings. substituteInPlace src/hb.hh \ diff --git a/nixpkgs/pkgs/development/libraries/imlib2/default.nix b/nixpkgs/pkgs/development/libraries/imlib2/default.nix index 6be73c8da4b3..b61f4e442bf2 100644 --- a/nixpkgs/pkgs/development/libraries/imlib2/default.nix +++ b/nixpkgs/pkgs/development/libraries/imlib2/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "imlib2"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Ul1OMYknRxveRSB4bcJVC1mriFM4SNstdcYPW05YIaE="; + sha256 = "sha256-FY0LjCC8ESIa+ed6ZKEW/KcFGwPN6ixPMdMfRpOC+Zc="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix index 71c1efe3f914..5d7e04e75966 100644 --- a/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "21.2.2"; + version = "21.3.1"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "${pname}-${version}"; - sha256 = "134l0d74ai4mqlp244nvkvg3mgzbzy20mjd274yay8g8hvb1g90v"; + sha256 = "0dzqfgbd0fxl8rxgf5nmj1jd4izzaqfb0s53l96qwz1j57q5ybj5"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh b/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh index 93d7cbef74c3..05c89d25ce62 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.84/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.85/ -A '*.tar.xz' ) diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix index 47b958ea0b32..84957c183ff5 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -1,6 +1,6 @@ { mkDerivation, fetchpatch, - extra-cmake-modules, kdoctools, qttools, + util-linux, extra-cmake-modules, kdoctools, qttools, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, @@ -11,7 +11,7 @@ mkDerivation { name = "kio"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications + util-linux karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications ktextwidgets kwallet kwidgetsaddons kwindowsystem qtscript qtx11extras kcrash ]; diff --git a/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix b/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix index 34792d254e72..73d4ce478c61 100644 --- a/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/nixpkgs/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/attica-5.84.0.tar.xz"; - sha256 = "1q5imda1p26rw3lzz7p6wlg63d2kjl6yx93pxryy129xwyxszf5d"; - name = "attica-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/attica-5.85.0.tar.xz"; + sha256 = "1rwb2jz2chvxa7hdxn5ms1f93ykpk26kmnngwcixqr7gwlcv8prl"; + name = "attica-5.85.0.tar.xz"; }; }; baloo = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/baloo-5.84.0.tar.xz"; - sha256 = "15ldfq9qryw2xna6kr316fqldrfd2r09qj9ig8i2x391x18dzhg4"; - name = "baloo-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/baloo-5.85.0.tar.xz"; + sha256 = "0kcilv41assarhp54i99scpg08m11fjznw4d1lx5rdy7fyd4bd41"; + name = "baloo-5.85.0.tar.xz"; }; }; bluez-qt = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/bluez-qt-5.84.0.tar.xz"; - sha256 = "0pg6zj0b7j9v339g1q5a9dm1l0a7n1c388n26x6k2s1q785vk6lh"; - name = "bluez-qt-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/bluez-qt-5.85.0.tar.xz"; + sha256 = "18h0swvmimfxr9ygg0fs9gg0bm4a016n55hkvqx6n3y505b2lnx8"; + name = "bluez-qt-5.85.0.tar.xz"; }; }; breeze-icons = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/breeze-icons-5.84.0.tar.xz"; - sha256 = "1320c84pr39541lb4zk33brxx593dbvvnij5x8as4rp99mcjd6h4"; - name = "breeze-icons-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/breeze-icons-5.85.0.tar.xz"; + sha256 = "0g97md30f76x38skqf7xpxxrcpydx4z5adrknq0bcnpqg3baw1s4"; + name = "breeze-icons-5.85.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/extra-cmake-modules-5.84.0.tar.xz"; - sha256 = "0h8w5ahjpbb524qgabzbgd4x2j8qnfv1d1cq8vzq5hbpw7r5w25v"; - name = "extra-cmake-modules-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/extra-cmake-modules-5.85.0.tar.xz"; + sha256 = "0d36dg727d0ilq0ag4mv3vhp065p60nnl61014jm1p0kn71hjhks"; + name = "extra-cmake-modules-5.85.0.tar.xz"; }; }; frameworkintegration = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/frameworkintegration-5.84.0.tar.xz"; - sha256 = "0jzrsw5fkbgk8xpdjfjprqm1vpa61x32zikyj370shcg3qsaiyir"; - name = "frameworkintegration-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/frameworkintegration-5.85.0.tar.xz"; + sha256 = "1j3p1hy5fhy1b83mcy2n25a8rzwv8n79c2jwfxhyd2hw1yvrkmzr"; + name = "frameworkintegration-5.85.0.tar.xz"; }; }; kactivities = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kactivities-5.84.0.tar.xz"; - sha256 = "0lihxr9jvmg2h7k36djdfvsz5slxzzgxpxmv9745ynvc92fr1c46"; - name = "kactivities-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kactivities-5.85.0.tar.xz"; + sha256 = "0c40ripx3k8rccaj699ill4kmdnh1vl9gsxvzvff0y312ya1v2gm"; + name = "kactivities-5.85.0.tar.xz"; }; }; kactivities-stats = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kactivities-stats-5.84.0.tar.xz"; - sha256 = "1mb80jzccvha6rnd9q0xych1k4p0nfdyh7s9ryafv9fqqhzr5fh4"; - name = "kactivities-stats-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kactivities-stats-5.85.0.tar.xz"; + sha256 = "08y5wqalsd3xwczb87n2n5l0rky8lydhyb66xvh2dzl5fmw7k5z1"; + name = "kactivities-stats-5.85.0.tar.xz"; }; }; kapidox = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kapidox-5.84.0.tar.xz"; - sha256 = "0h8isigbgc02df3kb875p7yzy04i41lss2r5awlh5b1np89l5g51"; - name = "kapidox-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kapidox-5.85.0.tar.xz"; + sha256 = "1cmx16gy2s6j2vvs0nn62vczjf6pc8s7dvdz47lrnpmc7p8yzddm"; + name = "kapidox-5.85.0.tar.xz"; }; }; karchive = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/karchive-5.84.0.tar.xz"; - sha256 = "1xjykx94xn0p1926my4f82dn9bsv2b2mv1l4pjpzzfwyn26df34s"; - name = "karchive-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/karchive-5.85.0.tar.xz"; + sha256 = "0bvbmd3phjyk11ylggmzl0kihmg7w623alplwp3j4mj8jn8nw6cc"; + name = "karchive-5.85.0.tar.xz"; }; }; kauth = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kauth-5.84.0.tar.xz"; - sha256 = "1jwynarchwbgdnfzpp3r8ggr8mz2gwgwiv9j2kxmh0m607sqzj04"; - name = "kauth-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kauth-5.85.0.tar.xz"; + sha256 = "1ib1i4mpxdkddn0kd6prx0j8vc55ai6nlx71lakr2cdafp296fhs"; + name = "kauth-5.85.0.tar.xz"; }; }; kbookmarks = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kbookmarks-5.84.0.tar.xz"; - sha256 = "1k3mamhd55j3hvkw7h0gfizy5hg37d57h26xz9hbxrw1lb1p9gyc"; - name = "kbookmarks-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kbookmarks-5.85.0.tar.xz"; + sha256 = "0jraagmjch0pda15k9ywpidl474x4wq60zzffi2n3vmy8y9hs4rn"; + name = "kbookmarks-5.85.0.tar.xz"; }; }; kcalendarcore = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kcalendarcore-5.84.0.tar.xz"; - sha256 = "06asygdsk4bnn29cc8khpzy68fiyrqwajl55fixmja7kvzsnq4cb"; - name = "kcalendarcore-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kcalendarcore-5.85.0.tar.xz"; + sha256 = "04nrfwd4g5v4lnmlcq0rdmx8xfn9wbzp92izsy7zwwxcmpwivysq"; + name = "kcalendarcore-5.85.0.tar.xz"; }; }; kcmutils = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kcmutils-5.84.0.tar.xz"; - sha256 = "1ackicsg2xnjl8gid9v4a72vvqhn7536s0w1g50hss142hp0b9zf"; - name = "kcmutils-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kcmutils-5.85.0.tar.xz"; + sha256 = "14yfkrqv77r6hm390ib8g7gcjcw3dlnlqs9bd3y0mg123wps7s10"; + name = "kcmutils-5.85.0.tar.xz"; }; }; kcodecs = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kcodecs-5.84.0.tar.xz"; - sha256 = "0fjjz40kchw38p74zvgrcfsgclg54w6b8bl6ly72qmj5n0ip2gr3"; - name = "kcodecs-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kcodecs-5.85.0.tar.xz"; + sha256 = "1zgpi177j0j3jzi3n0kjyddy0d7b9vp7kxv6c2jsqx9ppps0l1k5"; + name = "kcodecs-5.85.0.tar.xz"; }; }; kcompletion = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kcompletion-5.84.0.tar.xz"; - sha256 = "1kbj1f3c3qpfxn4jyldhzlmgxfxn0af5rbs0irzwd9wqgk9i94vs"; - name = "kcompletion-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kcompletion-5.85.0.tar.xz"; + sha256 = "1vy41mavbm8avr9jfspys4mpzc4i5rkg5gpl9hcbjrkldb9ymfj1"; + name = "kcompletion-5.85.0.tar.xz"; }; }; kconfig = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kconfig-5.84.0.tar.xz"; - sha256 = "0wshg4hx4d6m1r17mc7l9ivhx6mw0h1qx8fd46hmydmbjp030jma"; - name = "kconfig-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kconfig-5.85.0.tar.xz"; + sha256 = "0qmrv8ixlg7qrb7fyyvk7a0a7avvpflc05rj46zzip6kjhl4imds"; + name = "kconfig-5.85.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kconfigwidgets-5.84.0.tar.xz"; - sha256 = "17hyf495wlm5jqc0qxxymy1kcjybbihg8093kf59hvvpcci5xsin"; - name = "kconfigwidgets-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kconfigwidgets-5.85.0.tar.xz"; + sha256 = "0hx8f1dcd38wsrifh4j3a5m05xahdqrhsysasbdwxhr5s29d7vvr"; + name = "kconfigwidgets-5.85.0.tar.xz"; }; }; kcontacts = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kcontacts-5.84.0.tar.xz"; - sha256 = "0gvskvfwfmrs884fkfl0gvmnic4hhymffs7jhq6yaixbsjl2mznl"; - name = "kcontacts-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kcontacts-5.85.0.tar.xz"; + sha256 = "07j2h8fd62j7jbcm5fyv27vy120687k1cmp2rw06sf3xl480nk8k"; + name = "kcontacts-5.85.0.tar.xz"; }; }; kcoreaddons = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kcoreaddons-5.84.0.tar.xz"; - sha256 = "1c0z2cn02jqanisq5rr6iry1hx9p5ffm59353mknyyg5xyk3qkbm"; - name = "kcoreaddons-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kcoreaddons-5.85.0.tar.xz"; + sha256 = "052l8kvv7k3m43r6arckg4fls0y913gklc8jx09y56g1m51mgbwh"; + name = "kcoreaddons-5.85.0.tar.xz"; }; }; kcrash = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kcrash-5.84.0.tar.xz"; - sha256 = "0asr7llkdbr6wzq31vnmga7haxddz1b6xqp3smw7hvgzs0f8vrv5"; - name = "kcrash-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kcrash-5.85.0.tar.xz"; + sha256 = "14hknkl4md0qzh44f1zqraljzvlbwzc95mci713a9mhk9rb0957f"; + name = "kcrash-5.85.0.tar.xz"; }; }; kdav = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kdav-5.84.0.tar.xz"; - sha256 = "09wly717cp86b3gahj79nfplx71f78zyb5mhpw9xm0dkdf1qf56q"; - name = "kdav-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kdav-5.85.0.tar.xz"; + sha256 = "11wwdv19d0fy7b1bzgqaciv4hg99a8pi6g2ymjn3g0l3ps05a0sl"; + name = "kdav-5.85.0.tar.xz"; }; }; kdbusaddons = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kdbusaddons-5.84.0.tar.xz"; - sha256 = "0a4v2g86lss1wq359mssg142dp1qccn17yrdhbgy55qi6id6pvl5"; - name = "kdbusaddons-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kdbusaddons-5.85.0.tar.xz"; + sha256 = "0f8k2kynbspi86gcvpzn209m1bm6vc65flqlnh8prbkd3gg283d6"; + name = "kdbusaddons-5.85.0.tar.xz"; }; }; kdeclarative = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kdeclarative-5.84.0.tar.xz"; - sha256 = "0ygp3jwz0fjixiq7bkjchsxzvg6fn50qw7si9nil5hkkg6lwxir6"; - name = "kdeclarative-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kdeclarative-5.85.0.tar.xz"; + sha256 = "1qdbvfx0i09hn9236hnb73fzym529wjsgqmfwzhh5a6dnqdh1rjd"; + name = "kdeclarative-5.85.0.tar.xz"; }; }; kded = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kded-5.84.0.tar.xz"; - sha256 = "0c6klrchbxy57f7hjvsk640bg6s8gp1ilrzvzg7f8m825yg1b5jc"; - name = "kded-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kded-5.85.0.tar.xz"; + sha256 = "1yar9zcrrs0c0hakg8sfisnp32284ljj1axhgmx8hkwfj591jdiw"; + name = "kded-5.85.0.tar.xz"; }; }; kdelibs4support = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/portingAids/kdelibs4support-5.84.0.tar.xz"; - sha256 = "1qkiqv0fq8q6i18mi7gm58qhnqra8xkslzjprap6zjq49g9lcgrp"; - name = "kdelibs4support-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/portingAids/kdelibs4support-5.85.0.tar.xz"; + sha256 = "1c4zd60s7l1qv719nl28j7gh3lpr1cwqq5vcibb9a6di04k27mm0"; + name = "kdelibs4support-5.85.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/portingAids/kdesignerplugin-5.84.0.tar.xz"; - sha256 = "0k51pjkh4dfc8bkw0pbsa260fifvcm0wrbpckvd1xd32b0r1n2ax"; - name = "kdesignerplugin-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/portingAids/kdesignerplugin-5.85.0.tar.xz"; + sha256 = "0pchfvmy7r2mkd412nbzk2pkji2dx5lispwcnk759ffm4wlnxncf"; + name = "kdesignerplugin-5.85.0.tar.xz"; }; }; kdesu = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kdesu-5.84.0.tar.xz"; - sha256 = "0b3ljqj86crccyqzlqg0fkjryi654pi5q84c11zywmws72bjjx9d"; - name = "kdesu-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kdesu-5.85.0.tar.xz"; + sha256 = "1xqzkyd9flglr3aqabkh54yl7a5a429d24mpqphakc3djmdv5d08"; + name = "kdesu-5.85.0.tar.xz"; }; }; kdewebkit = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/portingAids/kdewebkit-5.84.0.tar.xz"; - sha256 = "0rhjdqr5g4gphszz70nhvv9wgr0g048pnc36w4w2jpzyy75nwjq2"; - name = "kdewebkit-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/portingAids/kdewebkit-5.85.0.tar.xz"; + sha256 = "14w254wfp35sldadff1y62yl6f1kshlfk4vlhlan626vyidypc43"; + name = "kdewebkit-5.85.0.tar.xz"; }; }; kdnssd = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kdnssd-5.84.0.tar.xz"; - sha256 = "1ayscd05m20i4nldidxdx83xsa66ybsyrf3f8sm3h99hgwb1yxm9"; - name = "kdnssd-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kdnssd-5.85.0.tar.xz"; + sha256 = "0i1qv6qjsdlb08mwiqs3s6v2hwfr77i65hgc0qj9pbhzvm5v6x8m"; + name = "kdnssd-5.85.0.tar.xz"; }; }; kdoctools = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kdoctools-5.84.0.tar.xz"; - sha256 = "1x0dimayl1pj6r4cjwsvzvyc5j79308bcdi27bn0lq1769wm7rlp"; - name = "kdoctools-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kdoctools-5.85.0.tar.xz"; + sha256 = "01bxzp65ffwr14yrrbw8p15lkwhisv15drwkgcwg48f289f51if1"; + name = "kdoctools-5.85.0.tar.xz"; }; }; kemoticons = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kemoticons-5.84.0.tar.xz"; - sha256 = "0h8ilgwd5y8mbmvr89qkq81km216gs2lx7ln4rijamv2380gwcq7"; - name = "kemoticons-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kemoticons-5.85.0.tar.xz"; + sha256 = "0zihi00fql8q4jp08n71agmjrpr5177yw24w0vf0lmjhgmxwkrsw"; + name = "kemoticons-5.85.0.tar.xz"; }; }; kfilemetadata = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kfilemetadata-5.84.0.tar.xz"; - sha256 = "19a6lsnh7vxjgvy780bgispgxycj2838gyak6ivd9lxzn6d9jw6i"; - name = "kfilemetadata-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kfilemetadata-5.85.0.tar.xz"; + sha256 = "07i52zi4jmqhm2sazw2jx7g7s3mp8c7kr32z3ikifsc5wfzy8kix"; + name = "kfilemetadata-5.85.0.tar.xz"; }; }; kglobalaccel = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kglobalaccel-5.84.0.tar.xz"; - sha256 = "0v3j4zx6p45lwd7jpbc9y43l5fh247dm6g21w5r56cq6asapx3k5"; - name = "kglobalaccel-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kglobalaccel-5.85.0.tar.xz"; + sha256 = "0f5ly344a06aaj3rcsa45xzg9xx0s2qsgk5r0h2kphkj8n2gpp70"; + name = "kglobalaccel-5.85.0.tar.xz"; }; }; kguiaddons = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kguiaddons-5.84.0.tar.xz"; - sha256 = "0p98xzml58fv2cv8x382bmcrbk39q89mrxy52hkqy759g4ffj919"; - name = "kguiaddons-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kguiaddons-5.85.0.tar.xz"; + sha256 = "1d1724k67chiv4sxbaifnwzwcss3kry3ms9frpxifi2nsn0x9nhc"; + name = "kguiaddons-5.85.0.tar.xz"; }; }; kholidays = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kholidays-5.84.0.tar.xz"; - sha256 = "0fzcdlvai0p3l58wbs8ia7vmd9ll2akzzab12ask8kkaz7iwaqqs"; - name = "kholidays-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kholidays-5.85.0.tar.xz"; + sha256 = "0nrxn8sjzp1lg3va7703d5hxmda33d0f91rgq2s99mxi77a82yi2"; + name = "kholidays-5.85.0.tar.xz"; }; }; khtml = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/portingAids/khtml-5.84.0.tar.xz"; - sha256 = "13j2plfgx4zx99i3s70424v8b7qj2xf6gndp7hhmdka0vjhm5bv9"; - name = "khtml-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/portingAids/khtml-5.85.0.tar.xz"; + sha256 = "0ma9sk51pszxqmvzlrfdsnh2f8fm09wd0kaywsrkvbh2q2f6kg8g"; + name = "khtml-5.85.0.tar.xz"; }; }; ki18n = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/ki18n-5.84.0.tar.xz"; - sha256 = "1530jxpbfky3mhr1dv3pr7lrvi96q4ai8fn85h5gnjp7s7h1wgv0"; - name = "ki18n-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/ki18n-5.85.0.tar.xz"; + sha256 = "1h1jcdyc3cphkn56qfn5j6jbbb6wp5z0vp8kxzm1wd023sj83dqn"; + name = "ki18n-5.85.0.tar.xz"; }; }; kiconthemes = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kiconthemes-5.84.0.tar.xz"; - sha256 = "0r90cdxs6x9bnqb6qb7p2szavqw2lfk9khhxhzgp2z9121smxpgn"; - name = "kiconthemes-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kiconthemes-5.85.0.tar.xz"; + sha256 = "0k6ni351b051k8rfncpddf5zplqmg71wf9a5h8k6ix787h1r5dcp"; + name = "kiconthemes-5.85.0.tar.xz"; }; }; kidletime = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kidletime-5.84.0.tar.xz"; - sha256 = "0akkzj05399f72klr8qf5q0w9v8x1jw2961m3h4hcg1zfsmb6pv4"; - name = "kidletime-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kidletime-5.85.0.tar.xz"; + sha256 = "1nclrxipjzasqi8g84lvpsr5rwfs9xfqgj377wfphm4qbml09x2z"; + name = "kidletime-5.85.0.tar.xz"; }; }; kimageformats = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kimageformats-5.84.0.tar.xz"; - sha256 = "1xzddqc6wj188dhwcw1haa2a28r2d8c4aqhmgymwdwhs7k4ibpds"; - name = "kimageformats-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kimageformats-5.85.0.tar.xz"; + sha256 = "1687sh19ph1v1bg4xrdrf0gs2nna0ds8gcqc8x7ydgdc2301m9jh"; + name = "kimageformats-5.85.0.tar.xz"; }; }; kinit = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kinit-5.84.0.tar.xz"; - sha256 = "0a5i2rvamw95y9bqscdg6fk1fjsib7rcis9fbk504qk4n7jdp9gw"; - name = "kinit-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kinit-5.85.0.tar.xz"; + sha256 = "03m6ik7l54q1w615111rqs0m7az7snh6x418s90xnzm81g0dzpwj"; + name = "kinit-5.85.0.tar.xz"; }; }; kio = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kio-5.84.0.tar.xz"; - sha256 = "1lz07745w3549n7lc174p4rz5w12mm4q08y5xn2a95xg5xrjpgln"; - name = "kio-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kio-5.85.0.tar.xz"; + sha256 = "1xhrmpz9xbwipxqvj7l6d1n471isb3jggrvgcx5hqlz659yqmmg4"; + name = "kio-5.85.0.tar.xz"; }; }; kirigami2 = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kirigami2-5.84.0.tar.xz"; - sha256 = "05hpw2ba7g5kzg6z0slngrfz45kih8w1zmahbjhss9i7blj9x32r"; - name = "kirigami2-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kirigami2-5.85.0.tar.xz"; + sha256 = "0axdsxzmr735ci19srmgkgpm4x7h23vk37hhakfc6n30ry0j7lik"; + name = "kirigami2-5.85.0.tar.xz"; }; }; kitemmodels = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kitemmodels-5.84.0.tar.xz"; - sha256 = "1v19vc155jh421z8djhrigc83ajz9qvb6qz9cpscdzrcimhaarns"; - name = "kitemmodels-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kitemmodels-5.85.0.tar.xz"; + sha256 = "0c55lw6r78x41v6fgycr68inviaxlxa6bj8zm8fdia631mhx273s"; + name = "kitemmodels-5.85.0.tar.xz"; }; }; kitemviews = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kitemviews-5.84.0.tar.xz"; - sha256 = "14rammhm5zp8h37a794z3pmgkpnb606izqy1zlk8lwvnw6aj0kwb"; - name = "kitemviews-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kitemviews-5.85.0.tar.xz"; + sha256 = "1fr8ivpvpaxykrgnjjsf8nhnhs60i4xhlkanvhrkkgjabxk0sbl0"; + name = "kitemviews-5.85.0.tar.xz"; }; }; kjobwidgets = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kjobwidgets-5.84.0.tar.xz"; - sha256 = "0gcdd07ma7wg6rqygfhmq2nc3cq78zcxbd7mx0fgirdns5fbp8p5"; - name = "kjobwidgets-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kjobwidgets-5.85.0.tar.xz"; + sha256 = "05gpp2bvirbxs5yk0ysi5gh72axwv253yc2sqmzdsjylq4fjy8rl"; + name = "kjobwidgets-5.85.0.tar.xz"; }; }; kjs = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/portingAids/kjs-5.84.0.tar.xz"; - sha256 = "0qi1xk6pq7nyzkh6jlp4l1v1b5gq9hryq2a81hgfl7q9xgrx00qy"; - name = "kjs-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/portingAids/kjs-5.85.0.tar.xz"; + sha256 = "0inliv97x63174n3mn5jqyy8d440863g3m5pn69cq1i2mr5zyswb"; + name = "kjs-5.85.0.tar.xz"; }; }; kjsembed = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/portingAids/kjsembed-5.84.0.tar.xz"; - sha256 = "1av326byza162ds5vn54nmpd9ndr7yb0cpl8hxmwzfbym1favhvb"; - name = "kjsembed-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/portingAids/kjsembed-5.85.0.tar.xz"; + sha256 = "1j8prfg7hpk0g7manilds27ivrcgxr3hidjzy0yzn13ckvv3ccj1"; + name = "kjsembed-5.85.0.tar.xz"; }; }; kmediaplayer = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/portingAids/kmediaplayer-5.84.0.tar.xz"; - sha256 = "1zzx7d9wcc1qh9zg83c2ihid0c2f5p23gpc475ql056ny71fdvv3"; - name = "kmediaplayer-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/portingAids/kmediaplayer-5.85.0.tar.xz"; + sha256 = "1bmj24d3si937svh8zdi7xs0y4j1ibyj8z8q1y4k2vp8fa9fack6"; + name = "kmediaplayer-5.85.0.tar.xz"; }; }; knewstuff = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/knewstuff-5.84.0.tar.xz"; - sha256 = "1y1b7704xlf7kmw7c41b3ngsmi5304mvdgphcqsinav6bq48ka5f"; - name = "knewstuff-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/knewstuff-5.85.0.tar.xz"; + sha256 = "1j90ysfw1qygaiigizbjik1k7zkl6wkin0r7r9q8r3dibvbqziph"; + name = "knewstuff-5.85.0.tar.xz"; }; }; knotifications = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/knotifications-5.84.0.tar.xz"; - sha256 = "02az98aqk8alq1cqrxym5idnlzvl6i4jvgnv34q6g4x7j5h4v75h"; - name = "knotifications-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/knotifications-5.85.0.tar.xz"; + sha256 = "0qr695sn2di24cal0x6yj4x1a8qk6jny68r4d4xdcy5i1i4yyni5"; + name = "knotifications-5.85.0.tar.xz"; }; }; knotifyconfig = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/knotifyconfig-5.84.0.tar.xz"; - sha256 = "1x7jp2c2a1bawl3nl46zfnp8d5al1z19za58g76wn40jy9ksnpy2"; - name = "knotifyconfig-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/knotifyconfig-5.85.0.tar.xz"; + sha256 = "1aphmi7r4zmzrfk8635a66dnkd6zg2i17nrm0hfqhqhcfn217mfv"; + name = "knotifyconfig-5.85.0.tar.xz"; }; }; kpackage = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kpackage-5.84.0.tar.xz"; - sha256 = "166cc85y49xqk4r8k6003rlwphxxx2rmik24d7yhmq8p1qig4qb7"; - name = "kpackage-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kpackage-5.85.0.tar.xz"; + sha256 = "14rwq5ckns06h0n8h4q2r7ilfr1myxcan1md1zz4cg4vb87ckimj"; + name = "kpackage-5.85.0.tar.xz"; }; }; kparts = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kparts-5.84.0.tar.xz"; - sha256 = "1fbmywx1fvv9hnznpiy8cp27dfn2ysskymyppqi1hsw01gqs7vfy"; - name = "kparts-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kparts-5.85.0.tar.xz"; + sha256 = "07px14xdh7p2kb9kvsma16xifsc65mhpm6xmnz15i5pdmrz1wxc1"; + name = "kparts-5.85.0.tar.xz"; }; }; kpeople = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kpeople-5.84.0.tar.xz"; - sha256 = "0llggx56xb3y10j0avm4vdmjfl4pwqbvpb5w7kk1gb43nxpz7h3p"; - name = "kpeople-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kpeople-5.85.0.tar.xz"; + sha256 = "03ynnbjj939b3cmczlz9piilkgh45fbyal71pab0qfpxr66m9fk5"; + name = "kpeople-5.85.0.tar.xz"; }; }; kplotting = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kplotting-5.84.0.tar.xz"; - sha256 = "007cvy57ck2frnr5dvs80k3n7lv1q2xw1zadmw13wwdqqsl0kzag"; - name = "kplotting-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kplotting-5.85.0.tar.xz"; + sha256 = "0jhkc12fiz50iavz9msj6w29lhqrm6chl1521sx55km9cb3wmzda"; + name = "kplotting-5.85.0.tar.xz"; }; }; kpty = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kpty-5.84.0.tar.xz"; - sha256 = "04q6qz62vwywzaxxmsq0g28k036ljrcyvn5hywdns58zi5d7nab2"; - name = "kpty-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kpty-5.85.0.tar.xz"; + sha256 = "1zmzzlzv1pnx0d7w6v8yiccw1q2g94pfjzh4sm2k1fickgrfrir8"; + name = "kpty-5.85.0.tar.xz"; }; }; kquickcharts = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kquickcharts-5.84.0.tar.xz"; - sha256 = "01q1ncvk8dc9jkm9x6q7wkcnj1z1377824gj7m83pzgy3g51vcdg"; - name = "kquickcharts-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kquickcharts-5.85.0.tar.xz"; + sha256 = "1hnbr3qkjy48pq8hkvl7lcfd8cywkkr77n8qf296rjmrv23jw4xf"; + name = "kquickcharts-5.85.0.tar.xz"; }; }; kross = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/portingAids/kross-5.84.0.tar.xz"; - sha256 = "0fz4q2m16f4zy6pajcrmhm5a9fjrfjfqyns1lm6aimdsrvkwpc93"; - name = "kross-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/portingAids/kross-5.85.0.tar.xz"; + sha256 = "07gnh98avv5zzybh4262jqkjy8kg0cplryv356kvsbarl4ksy4kr"; + name = "kross-5.85.0.tar.xz"; }; }; krunner = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/krunner-5.84.0.tar.xz"; - sha256 = "15ai1x9v5hm5vj7qhh7c4ajiiaf56h3yy3qnb4kamkv146g09a1p"; - name = "krunner-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/krunner-5.85.0.tar.xz"; + sha256 = "1pz466pjrqd3dj2wdqsqxcpmim0ig8i7gvnw96mxlh262cv15h4d"; + name = "krunner-5.85.0.tar.xz"; }; }; kservice = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kservice-5.84.0.tar.xz"; - sha256 = "1lbx51wpsc7qdp480yl08wsp6lb1lww5ix5hpxxmv0x7galcgsf2"; - name = "kservice-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kservice-5.85.0.tar.xz"; + sha256 = "008b56jibgvpg6qqh7wqbg39fyca62w6nj7c9qxsgj1bd91vglg2"; + name = "kservice-5.85.0.tar.xz"; }; }; ktexteditor = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/ktexteditor-5.84.0.tar.xz"; - sha256 = "0znpls5ap33yjcjw1ayl6zja8qnqx5glk2bvig5aajriqbpw8irk"; - name = "ktexteditor-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/ktexteditor-5.85.0.tar.xz"; + sha256 = "1j6xkz8w7mb47ypgcf00m7hl1ayli8r5a3l4fk5xzsz1k0g72l6m"; + name = "ktexteditor-5.85.0.tar.xz"; }; }; ktextwidgets = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/ktextwidgets-5.84.0.tar.xz"; - sha256 = "069qk1frsfa9iqgchpvkq4sgh973fc2fy1hjymc2zv3mahz23qfl"; - name = "ktextwidgets-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/ktextwidgets-5.85.0.tar.xz"; + sha256 = "128jjcay0s2qi0zs32zxwlmh2xq4kzasc0zhy3l9gfv898yaq6zy"; + name = "ktextwidgets-5.85.0.tar.xz"; }; }; kunitconversion = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kunitconversion-5.84.0.tar.xz"; - sha256 = "0a8jc3vw4ydsfff1qis9323vcd7nhigwyjxqa57qzvswrk7wmlxf"; - name = "kunitconversion-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kunitconversion-5.85.0.tar.xz"; + sha256 = "0rcnmdqnm7h8ffxacza2v7y7zicly0yvz07g4857jxpk7h4z62hy"; + name = "kunitconversion-5.85.0.tar.xz"; }; }; kwallet = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kwallet-5.84.0.tar.xz"; - sha256 = "1m08q820zl9wrc04i0inb7n0r35p0lzcv3hiwvzxmgdcm9zm2n3c"; - name = "kwallet-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kwallet-5.85.0.tar.xz"; + sha256 = "053ddi83a5d1i61r8y6jimd5pafmilja25w5pl09g3fqkp3id677"; + name = "kwallet-5.85.0.tar.xz"; }; }; kwayland = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kwayland-5.84.0.tar.xz"; - sha256 = "1lpmbqkfbjq3445lj42zqc90wk437kzyjlpzji0wh4p9nqa4a27s"; - name = "kwayland-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kwayland-5.85.0.tar.xz"; + sha256 = "0sfzpqb3v79jrhc49f4v3akc9wrv1976nb7xs9nd6ips237v86v2"; + name = "kwayland-5.85.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kwidgetsaddons-5.84.0.tar.xz"; - sha256 = "1xffbmi3a3qp781aay964b30l9y170imxaa05r3xpj77saq673kp"; - name = "kwidgetsaddons-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kwidgetsaddons-5.85.0.tar.xz"; + sha256 = "14042vc9jl48fclsfmsincwqj2s6mfm3lbq4yg5vlj931kznyr31"; + name = "kwidgetsaddons-5.85.0.tar.xz"; }; }; kwindowsystem = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kwindowsystem-5.84.0.tar.xz"; - sha256 = "19fa8j4paq245rwvnmnz2mnwgh8y6c26wbw25v8kgd7a33ryg0fg"; - name = "kwindowsystem-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kwindowsystem-5.85.0.tar.xz"; + sha256 = "07k6d6sgxlfwkjg0r9lgvlkd7j53b986qfv283c313ahy5c3gd3d"; + name = "kwindowsystem-5.85.0.tar.xz"; }; }; kxmlgui = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/kxmlgui-5.84.0.tar.xz"; - sha256 = "1ddfvjwww2270zx4f86w0xmd45pyir95llhc4x2ixicx94jvsg1c"; - name = "kxmlgui-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/kxmlgui-5.85.0.tar.xz"; + sha256 = "1ciwrm16a5cgmkkm8cv72cyr45q418gsrxc3qrjq3iic9ycf6fi5"; + name = "kxmlgui-5.85.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/portingAids/kxmlrpcclient-5.84.0.tar.xz"; - sha256 = "10jddyak99wd4x3vm9d6xzh45pl1lhhfw9isrdkgzcixip2s4p6i"; - name = "kxmlrpcclient-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/portingAids/kxmlrpcclient-5.85.0.tar.xz"; + sha256 = "117cvdf7iy1139sx0vk906whmkm3ffw0wivqdjdcfwxsdxi6s6d1"; + name = "kxmlrpcclient-5.85.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/modemmanager-qt-5.84.0.tar.xz"; - sha256 = "1k0dbgq3zbg1rhy775vbxwqssbdin4wm7rw4fkcdra4z9hf39xin"; - name = "modemmanager-qt-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/modemmanager-qt-5.85.0.tar.xz"; + sha256 = "1jb27266dc6ry2y3w9bf1sf20xxw2rkb6ac8z9p46r0myhj2zn2j"; + name = "modemmanager-qt-5.85.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/networkmanager-qt-5.84.0.tar.xz"; - sha256 = "1qd58p2hj1rnzjvd6sskmry7gq7gp9fvp115ihc8dkaq8xvwah77"; - name = "networkmanager-qt-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/networkmanager-qt-5.85.0.tar.xz"; + sha256 = "1lg17ibk9mn4jsxh6dl0yzyhy26xifymvrf5saggl28vkkhvnh6r"; + name = "networkmanager-qt-5.85.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/oxygen-icons5-5.84.0.tar.xz"; - sha256 = "06h1c2lvvs41lcibgv5iz31g7j1x7fdyi7lnh21hkgd7747vk42l"; - name = "oxygen-icons5-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/oxygen-icons5-5.85.0.tar.xz"; + sha256 = "0if136n5mkvxhiyvlmwmj3q9y1g1gr9qz4qqdcsn6wy9jippq46g"; + name = "oxygen-icons5-5.85.0.tar.xz"; }; }; plasma-framework = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/plasma-framework-5.84.0.tar.xz"; - sha256 = "0chmmb04m1bq4d1w67bw3ppc2iycw7wzsdpams6c4y9f59iwrd8r"; - name = "plasma-framework-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/plasma-framework-5.85.0.tar.xz"; + sha256 = "1zzqmm7s39bcay3b4f6qzhd5pw3q6p9fas94i88afhqsxjbkm6w7"; + name = "plasma-framework-5.85.0.tar.xz"; }; }; prison = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/prison-5.84.0.tar.xz"; - sha256 = "17bd40fqp88j5dwxixrhf1d4xwri574l4593rdhzg8qgi9jm2ypj"; - name = "prison-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/prison-5.85.0.tar.xz"; + sha256 = "1c6dq4ql3n6s9xwvs6ix8n3fsv96aqdvd0qwc1n4sap9xlg3752n"; + name = "prison-5.85.0.tar.xz"; }; }; purpose = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/purpose-5.84.0.tar.xz"; - sha256 = "01rh85fc4c4gl0lxw2rbcrh001akggnz7aahkc2spsgd64m7vfv7"; - name = "purpose-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/purpose-5.85.0.tar.xz"; + sha256 = "13r47g81qfqdvd0s70r9dwlcdg8c6m5xrnpvypjs6cd51907m0f5"; + name = "purpose-5.85.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/qqc2-desktop-style-5.84.0.tar.xz"; - sha256 = "0vz68nh6iy92whjlkgf1jmmlhr5261rgsy1r7k3bfd91a41qh2qw"; - name = "qqc2-desktop-style-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/qqc2-desktop-style-5.85.0.tar.xz"; + sha256 = "1hkcy3dzaqfkxnmj9k278q0dijiwhjmzw98xxj9fh8mjygwkj1dp"; + name = "qqc2-desktop-style-5.85.0.tar.xz"; }; }; solid = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/solid-5.84.0.tar.xz"; - sha256 = "0lrims7zfr5xr5y25v63d08m6cm27z6mxbdg9j06xsrqf93vyz4s"; - name = "solid-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/solid-5.85.0.tar.xz"; + sha256 = "0gcddgrz07j9dgf4fg9hc810zr8f3az9b0qvxax9ys9x5kg1dr57"; + name = "solid-5.85.0.tar.xz"; }; }; sonnet = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/sonnet-5.84.0.tar.xz"; - sha256 = "0xnbi1rbb2awl5bvyjxjvzq5a8n9xpmiqvlzcgprmqgmsygzlnnq"; - name = "sonnet-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/sonnet-5.85.0.tar.xz"; + sha256 = "1cg2f09c0blk7ymlq7j3a1bci78kv1n0xq3ys4kxgf53khwhdqpw"; + name = "sonnet-5.85.0.tar.xz"; }; }; syndication = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/syndication-5.84.0.tar.xz"; - sha256 = "0m245vp5dkw88rz9kgym4ka729p688wspm8mv6zzsfffggvfkwrc"; - name = "syndication-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/syndication-5.85.0.tar.xz"; + sha256 = "05hvzxzlvdzc2sxapjvqhdycdvn6bnq0hs45c88pb13ncxxljdxh"; + name = "syndication-5.85.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/syntax-highlighting-5.84.0.tar.xz"; - sha256 = "1mb4di9k2rxf6f7n53z94q5awmwzfd516kv757ifd323w9xkmyxa"; - name = "syntax-highlighting-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/syntax-highlighting-5.85.0.tar.xz"; + sha256 = "1qn9n2sv9n22j7bhq4n93i985v244kkg0vi5c33s9zppb4xgd34a"; + name = "syntax-highlighting-5.85.0.tar.xz"; }; }; threadweaver = { - version = "5.84.0"; + version = "5.85.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.84/threadweaver-5.84.0.tar.xz"; - sha256 = "0hmxkqwxjvk6m3h3l12bw01xgwqxzja5cismqrwcc3yxf8fyd572"; - name = "threadweaver-5.84.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.85/threadweaver-5.85.0.tar.xz"; + sha256 = "0md5bnkn5bh2jqzj7m444bmn5c7davyhwlffi0pg22r01m44l6s3"; + name = "threadweaver-5.85.0.tar.xz"; }; }; } diff --git a/nixpkgs/pkgs/development/libraries/kimageannotator/default.nix b/nixpkgs/pkgs/development/libraries/kimageannotator/default.nix index 3188415ea045..b43883b645d8 100644 --- a/nixpkgs/pkgs/development/libraries/kimageannotator/default.nix +++ b/nixpkgs/pkgs/development/libraries/kimageannotator/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "kimageannotator"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "ksnip"; repo = "kImageAnnotator"; rev = "v${version}"; - sha256 = "0hfvrd78lgwd7bccz0fx2pr7g0v3s401y5plra63rxwk55ffkxf8"; + sha256 = "07m3il928gwzzab349grpaksqqv4n7r6mn317sx2jly0x0bpv0rh"; }; nativeBuildInputs = [ cmake qttools ]; diff --git a/nixpkgs/pkgs/development/libraries/libadwaita/default.nix b/nixpkgs/pkgs/development/libraries/libadwaita/default.nix index d6cffcab7fed..405598c69640 100644 --- a/nixpkgs/pkgs/development/libraries/libadwaita/default.nix +++ b/nixpkgs/pkgs/development/libraries/libadwaita/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.0.0-alpha.1"; + version = "1.0.0-alpha.2"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - sha256 = "1v52md62kaqykv8b6kxxbxwnbdzlda4ir7n5wh2iizadcailyw7p"; + sha256 = "1yvjdzs5ipmr4gi0l4k6dkqhl9b090kpjc3ll8bv1a6i7yfaf53s"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libaom/default.nix b/nixpkgs/pkgs/development/libraries/libaom/default.nix index 3ee5f3749165..9a8ac1be95fe 100644 --- a/nixpkgs/pkgs/development/libraries/libaom/default.nix +++ b/nixpkgs/pkgs/development/libraries/libaom/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # CPU detection isn't supported on Darwin and breaks the aarch64-darwin build: "-DCONFIG_RUNTIME_CPU_DETECT=0" + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-DAS_EXECUTABLE=${stdenv.cc.targetPrefix}as" ] ++ lib.optionals stdenv.isAarch32 [ # armv7l-hf-multiplatform does not support NEON # see lib/systems/platform.nix diff --git a/nixpkgs/pkgs/development/libraries/libarchive/default.nix b/nixpkgs/pkgs/development/libraries/libarchive/default.nix index f53d1b1a12f7..2a1d53e6ee01 100644 --- a/nixpkgs/pkgs/development/libraries/libarchive/default.nix +++ b/nixpkgs/pkgs/development/libraries/libarchive/default.nix @@ -12,13 +12,13 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { pname = "libarchive"; - version = "3.5.1"; + version = "3.5.2"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${version}"; - sha256 = "sha256-RFPhe4PCq8OLwa6c7ir+5u9jBsUxS5M/fcZYAG9W6R0="; + sha256 = "sha256-H00UJ+ON1kBc19BgWBBKmO8f23oAg2mk7o9hhDhn50Q="; }; outputs = [ "out" "lib" "dev" ]; diff --git a/nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix b/nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix index f9e850f91ffa..9b91dac8f638 100644 --- a/nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix +++ b/nixpkgs/pkgs/development/libraries/libatomic_ops/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "libatomic_ops"; - version = "7.6.10"; + version = "7.6.12"; src = fetchurl { urls = [ "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz" "https://github.com/ivmai/libatomic_ops/releases/download/v${version}/libatomic_ops-${version}.tar.gz" ]; - sha256 = "1bwry043f62pc4mgdd37zx3fif19qyrs8f5bw7qxlmkzh5hdyzjq"; + sha256 = "sha256-8KtWbiX84ItWDh/qtqPbAdtKOOW8aHgEM07zkgxUnz4="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libbfd/default.nix b/nixpkgs/pkgs/development/libraries/libbfd/default.nix index 499f04349b5d..45fe337d8588 100644 --- a/nixpkgs/pkgs/development/libraries/libbfd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libbfd/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchpatch, gnu-config, autoreconfHook, bison, binutils-unwrapped -, libiberty, zlib +, libiberty, libintl, zlib }: stdenv.mkDerivation { @@ -30,16 +30,16 @@ stdenv.mkDerivation { # We update these ourselves dontUpdateAutotoolsGnuConfigScripts = true; + strictDeps = true; nativeBuildInputs = [ autoreconfHook bison ]; - buildInputs = [ libiberty zlib.dev ]; + buildInputs = [ libiberty zlib ] ++ lib.optionals stdenv.isDarwin [ libintl ]; configurePlatforms = [ "build" "host" ]; configureFlags = [ "--enable-targets=all" "--enable-64-bit-bfd" "--enable-install-libbfd" - "--enable-shared" "--with-system-zlib" - ]; + ] ++ lib.optional (!stdenv.hostPlatform.isStatic) "--enable-shared"; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix b/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix index c7a7673dc1b3..4f80709652db 100644 --- a/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix @@ -1,26 +1,26 @@ -{ lib, stdenv, fetchurl, cmake, libdigidoc, minizip, pcsclite, opensc, openssl +{ lib, stdenv, fetchurl, cmake, minizip, pcsclite, opensc, openssl , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - version = "3.14.6"; + version = "3.14.7"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - sha256 = "sha256-zDMxJyL/T3cXrqgMT15yZlCozgyOt5nNreottuuiGHk="; + sha256 = "sha256-QdctW2+T8kPNUJv30pXZ/qfnw1Uhq6gScSjUI+bZMfY="; }; nativeBuildInputs = [ cmake pkg-config xxd ]; buildInputs = [ - libdigidoc minizip pcsclite opensc openssl xercesc + minizip pcsclite opensc openssl xercesc xml-security-c xsd zlib xalanc ]; meta = with lib; { description = "Library for creating DigiDoc signature files"; homepage = "http://www.id.ee/"; - license = licenses.lgpl2; + license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = [ maintainers.jagajaga ]; }; diff --git a/nixpkgs/pkgs/development/libraries/libebml/default.nix b/nixpkgs/pkgs/development/libraries/libebml/default.nix index 6a042012132e..84025e24f659 100644 --- a/nixpkgs/pkgs/development/libraries/libebml/default.nix +++ b/nixpkgs/pkgs/development/libraries/libebml/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "libebml"; @@ -11,6 +11,15 @@ stdenv.mkDerivation rec { sha256 = "1hiilnabar826lfxsaflqjhgsdli6hzzhjv8q2nmw36fvvlyks25"; }; + patches = [ + # Upstream fix for gcc-11 + (fetchpatch { + url = "https://github.com/Matroska-Org/libebml/commit/f0bfd53647961e799a43d918c46cf3b6bff89806.patch"; + sha256 = "1yd6rsds03kwx5jki4hihd2bpfh26g5l1pi82qzaqzarixdxwzvl"; + excludes = [ "ChangeLog" ]; + }) + ]; + nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [ diff --git a/nixpkgs/pkgs/development/libraries/libexif/default.nix b/nixpkgs/pkgs/development/libraries/libexif/default.nix index 20e69c4ad664..1c650ad60de0 100644 --- a/nixpkgs/pkgs/development/libraries/libexif/default.nix +++ b/nixpkgs/pkgs/development/libraries/libexif/default.nix @@ -1,30 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gettext }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gettext }: stdenv.mkDerivation rec { pname = "libexif"; - version = "0.6.22"; + version = "0.6.23"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "${pname}-${builtins.replaceStrings ["."] ["_"] version}-release"; - sha256 = "0mzndakdi816zcs13z7yzp7hj031p2dcyfq2p391r63d9z21jmy1"; + sha256 = "sha256-Os0yI/IPoe9MuhXgNdDaIg6uohclA2bjeu9t3tbUoNA="; }; - patches = [ - (fetchpatch { - name = "CVE-2020-0198.patch"; - url = "https://github.com/libexif/libexif/commit/ce03ad7ef4e8aeefce79192bf5b6f69fae396f0c.patch"; - sha256 = "1040278g5dbq3vvlyk8cmzb7flpi9bfsp99268hw69i6ilwbdf2k"; - }) - (fetchpatch { - name = "CVE-2020-0452.patch"; - url = "https://github.com/libexif/libexif/commit/9266d14b5ca4e29b970fa03272318e5f99386e06.patch"; - excludes = [ "NEWS" ]; - sha256 = "0k4z1gbbkli6wwyy9qm2qvn0h00qda6wqym61nmmbys7yc2zryj6"; - }) - ]; - nativeBuildInputs = [ autoreconfHook gettext ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libfabric/default.nix b/nixpkgs/pkgs/development/libraries/libfabric/default.nix new file mode 100644 index 000000000000..4142c3763b52 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libfabric/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, libpsm2 +, enablePsm2 ? (stdenv.isx86_64 && stdenv.isLinux) }: + +stdenv.mkDerivation rec { + pname = "libfabric"; + version = "1.13.1"; + + enableParallelBuilding = true; + + src = fetchFromGitHub { + owner = "ofiwg"; + repo = pname; + rev = "v${version}"; + sha256 = "0USQMBXZrbz4GtXLNsSti9ohUOqqo0OCtVz+0Uk9ndI="; + }; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + + buildInputs = lib.optional enablePsm2 libpsm2; + + configureFlags = [ (if enablePsm2 then "--enable-psm2=${libpsm2}" else "--disable-psm2") ]; + + meta = with lib; { + homepage = "https://ofiwg.github.io/libfabric/"; + description = "Open Fabric Interfaces"; + license = with licenses; [ gpl2 bsd2 ]; + platforms = platforms.all; + maintainers = [ maintainers.bzizou ]; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix b/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix index 506b1a5b25fb..6b0f4aad4449 100644 --- a/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix @@ -4,11 +4,11 @@ assert enableCapabilities -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; - version = "1.9.3"; + version = "1.9.4"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; - sha256 = "sha256-l+vk+U4vfjW3UhlM4VoPPGYyTg/2ryZlm7+1/y7DKP0="; + sha256 = "1xxabjv45zlxyryiwhmbfblsx41kl267wsb78bny6m14ly1rr17a"; }; outputs = [ "out" "dev" "info" ]; diff --git a/nixpkgs/pkgs/development/libraries/libglvnd/default.nix b/nixpkgs/pkgs/development/libraries/libglvnd/default.nix index 65d0651ed415..b4d8657359f1 100644 --- a/nixpkgs/pkgs/development/libraries/libglvnd/default.nix +++ b/nixpkgs/pkgs/development/libraries/libglvnd/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "libglvnd"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "glvnd"; repo = "libglvnd"; rev = "v${version}"; - sha256 = "0gjk6m3gkdm12bmih2jflp0v5s1ibkixk7mrzrk0cj884m3hy1z6"; + sha256 = "0phvgg2h3pcz3x39gaymwb37bnw1s26clq9wsj0zx398zmp3dwpk"; }; nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ]; diff --git a/nixpkgs/pkgs/development/libraries/libhandy/default.nix b/nixpkgs/pkgs/development/libraries/libhandy/default.nix index 98aba664c02a..bb4b03515eda 100644 --- a/nixpkgs/pkgs/development/libraries/libhandy/default.nix +++ b/nixpkgs/pkgs/development/libraries/libhandy/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "libhandy"; - version = "1.2.3"; + version = "1.4.0"; outputs = [ "out" @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-kuxKWB7BtB3Qek6PqvXVKuN8q7fh+n+UTWyvvllrbWE="; + sha256 = "sha256-JnbVH6H6QP3udJfT52P++hiwM4v/zS7jLn9+YzyIVEY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/libinput/default.nix b/nixpkgs/pkgs/development/libraries/libinput/default.nix index 8f1511de3304..375154ea46ad 100644 --- a/nixpkgs/pkgs/development/libraries/libinput/default.nix +++ b/nixpkgs/pkgs/development/libraries/libinput/default.nix @@ -1,14 +1,10 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja +{ lib, stdenv, fetchurl, pkg-config, meson, ninja , libevdev, mtdev, udev, libwacom -, documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation -, eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support -, testsSupport ? false, check ? null, valgrind ? null, python3 ? null +, documentationSupport ? false, doxygen, graphviz # Documentation +, eventGUISupport ? false, cairo, glib, gtk3 # GUI event viewer support +, testsSupport ? false, check, valgrind, python3 }: -assert documentationSupport -> doxygen != null && graphviz != null && python3 != null; -assert eventGUISupport -> cairo != null && glib != null && gtk3 != null; -assert testsSupport -> check != null && valgrind != null && python3 != null; - let mkFlag = optSet: flag: "-D${flag}=${lib.boolToString optSet}"; @@ -24,17 +20,13 @@ let else null; in -with lib; stdenv.mkDerivation rec { pname = "libinput"; - version = "1.16.4"; - - src = fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = pname; - repo = pname; - rev = version; - sha256 = "1c81429kh9av9fanxmnjw5rvsjbzcyi7d0dx0gkyq5yysmpmrppi"; + version = "1.18.1"; + + src = fetchurl { + url = "https://www.freedesktop.org/software/libinput/libinput-${version}.tar.xz"; + sha256 = "1jx7y48ym89grjz67jmn80h5j8c36qgwb0h5c703nln2zchl18cw"; }; outputs = [ "bin" "out" "dev" ]; @@ -48,7 +40,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config meson ninja ] - ++ optionals documentationSupport [ doxygen graphviz sphinx-build ]; + ++ lib.optionals documentationSupport [ doxygen graphviz sphinx-build ]; buildInputs = [ libevdev @@ -60,8 +52,7 @@ stdenv.mkDerivation rec { pyyaml setuptools ])) - ] - ++ optionals eventGUISupport [ cairo glib gtk3 ]; + ] ++ lib.optionals eventGUISupport [ cairo glib gtk3 ]; checkInputs = [ check @@ -73,15 +64,19 @@ stdenv.mkDerivation rec { patches = [ ./udev-absolute-path.patch ]; postPatch = '' - patchShebangs tools/helper-copy-and-exec-from-tmp.sh - patchShebangs test/symbols-leak-test - patchShebangs test/check-leftover-udev-rules.sh - patchShebangs test/helper-copy-and-exec-from-tmp.sh + patchShebangs \ + tools/helper-copy-and-exec-from-tmp.sh \ + test/symbols-leak-test \ + test/check-leftover-udev-rules.sh \ + test/helper-copy-and-exec-from-tmp.sh + + # Don't create an empty /etc directory. + sed -i "/install_subdir('libinput', install_dir : dir_etc)/d" meson.build ''; doCheck = testsSupport && stdenv.hostPlatform == stdenv.buildPlatform; - meta = { + meta = with lib; { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; homepage = "https://www.freedesktop.org/wiki/Software/libinput/"; license = licenses.mit; diff --git a/nixpkgs/pkgs/development/libraries/liblqr-1/default.nix b/nixpkgs/pkgs/development/libraries/liblqr-1/default.nix index aa6cd0fd57d8..914cc0c2ab69 100644 --- a/nixpkgs/pkgs/development/libraries/liblqr-1/default.nix +++ b/nixpkgs/pkgs/development/libraries/liblqr-1/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, glib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, Carbon }: stdenv.mkDerivation rec { pname = "liblqr-1"; @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; + buildInputs = lib.optionals stdenv.isDarwin [ Carbon ]; propagatedBuildInputs = [ glib ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libmbim/default.nix b/nixpkgs/pkgs/development/libraries/libmbim/default.nix index 43a88f9dd5fb..83950e982583 100644 --- a/nixpkgs/pkgs/development/libraries/libmbim/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmbim/default.nix @@ -1,21 +1,21 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , pkg-config , glib , python3 , systemd -, libgudev , withIntrospection ? stdenv.hostPlatform == stdenv.buildPlatform , gobject-introspection }: stdenv.mkDerivation rec { pname = "libmbim"; - version = "1.24.8"; + version = "1.26.0"; src = fetchurl { url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz"; - sha256 = "sha256-AlkHNhY//xDlcyGR/MwbmSCWlhbdxZYToAMFKhFqPCU="; + sha256 = "1kqkx139z62w391bz6lwmcjg7v12jxlcm7hj88222xrcn8k0j7qy"; }; outputs = [ "out" "dev" "man" ]; @@ -33,7 +33,6 @@ stdenv.mkDerivation rec { buildInputs = [ glib - libgudev systemd ]; @@ -43,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://www.freedesktop.org/wiki/Software/libmbim/"; description = "Library for talking to WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol"; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Plus; }; } diff --git a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix index 3541d3d466f7..7fa7ce9482a7 100644 --- a/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix +++ b/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }: stdenv.mkDerivation rec { - version = "21.03"; + version = "21.09"; pname = "libmediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "1jm4mk539wf3crgpcddgwdixshwdzm37mkb5441lifhcz2mykdsn"; + sha256 = "09pinxqw3z3hxrafn67clw1cb1z9aqfy6gkiavginfm0yr299gk9"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix b/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix index 11b8d66b4a8f..36c1c0dc098c 100644 --- a/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix +++ b/nixpkgs/pkgs/development/libraries/libnatpmp/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLPREFIX=$(out)" ]; + postFixup = '' + chmod +x $out/lib/* + ''; + meta = with lib; { homepage = "http://miniupnp.free.fr/libnatpmp.html"; description = "NAT-PMP client"; diff --git a/nixpkgs/pkgs/development/libraries/libogg/default.nix b/nixpkgs/pkgs/development/libraries/libogg/default.nix index 83555ccab8ce..ba0338ffd934 100644 --- a/nixpkgs/pkgs/development/libraries/libogg/default.nix +++ b/nixpkgs/pkgs/development/libraries/libogg/default.nix @@ -1,23 +1,16 @@ -{ lib, stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libogg-1.3.4"; + pname = "libogg"; + version = "1.3.5"; src = fetchurl { - url = "http://downloads.xiph.org/releases/ogg/${name}.tar.xz"; - sha256 = "1zlk33vxvxr0l9lhkbhkdwvylw96d2n0fnd3d8dl031hph9bqqy1"; + url = "http://downloads.xiph.org/releases/ogg/${pname}-${version}.tar.xz"; + sha256 = "01b7050bghdvbxvw0gzv588fn4a27zh42ljpwzm4vrf8dziipnf4"; }; outputs = [ "out" "dev" "doc" ]; - patches = lib.optionals stdenv.isDarwin [ - # Fix unsigned typedefs on darwin. Remove with the next release https://github.com/xiph/ogg/pull/64 - (fetchpatch { - url = "https://github.com/xiph/ogg/commit/c8fca6b4a02d695b1ceea39b330d4406001c03ed.patch"; - sha256 = "1s72g37y87x0a74zjji9vx2hyk86kr4f2l3m4y2fipvlf9348b3f"; - }) - ]; - meta = with lib; { description = "Media container library to manipulate Ogg files"; longDescription = '' diff --git a/nixpkgs/pkgs/development/libraries/libopenaptx/default.nix b/nixpkgs/pkgs/development/libraries/libopenaptx/default.nix index 9cc57d1a465a..33a5cadb71dd 100644 --- a/nixpkgs/pkgs/development/libraries/libopenaptx/default.nix +++ b/nixpkgs/pkgs/development/libraries/libopenaptx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libopenaptx"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "pali"; repo = "libopenaptx"; rev = version; - sha256 = "nTpw4vWgJ765FM6Es3SzaaaZr0YDydXglb0RWLbiigI="; + sha256 = "sha256-4FYKxw1U+efCfzKOPSDJH8a/dG0KV+anJDgxjqzD80k="; }; makeFlags = [ @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Audio Processing Technology codec (aptX)"; - license = licenses.lgpl21Plus; + license = licenses.gpl3Plus; homepage = "https://github.com/pali/libopenaptx"; platforms = platforms.linux; maintainers = with maintainers; [ orivej ]; diff --git a/nixpkgs/pkgs/development/libraries/libplctag/default.nix b/nixpkgs/pkgs/development/libraries/libplctag/default.nix index 6ca637a5b515..f16e6eba0d9a 100644 --- a/nixpkgs/pkgs/development/libraries/libplctag/default.nix +++ b/nixpkgs/pkgs/development/libraries/libplctag/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libplctag"; - version = "2.3.7"; + version = "2.4.0"; src = fetchFromGitHub { owner = "libplctag"; repo = "libplctag"; rev = "v${version}"; - sha256 = "sha256-AGU1/56OO96njWLSS91HBSe2tFXBwKzJMSh2/m6Fv0E="; + sha256 = "sha256-ClNLU1BPNemUOu+nMHujFYQSE+wnYuUPhHytjD8snb4="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/libqmi/default.nix b/nixpkgs/pkgs/development/libraries/libqmi/default.nix index 157445cfee82..196b9d3ad521 100644 --- a/nixpkgs/pkgs/development/libraries/libqmi/default.nix +++ b/nixpkgs/pkgs/development/libraries/libqmi/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.28.6"; + version = "1.28.8"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "1zg5k8f6l87iy9hmzwckdx532s845z9c5npblmpf1pp17n4r1f6b"; + sha256 = "sha256-bju70gC8G2SyP2JU/vkhLyaZ7HfPsyB10rpQecc6n3g="; }; nativeBuildInputs = [ @@ -64,5 +64,6 @@ stdenv.mkDerivation rec { # Tools gpl2Plus ]; + changelog = "https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/blob/${version}/NEWS"; }; } diff --git a/nixpkgs/pkgs/development/libraries/libquotient/default.nix b/nixpkgs/pkgs/development/libraries/libquotient/default.nix index 6264a9de3691..b64e9de9ceed 100644 --- a/nixpkgs/pkgs/development/libraries/libquotient/default.nix +++ b/nixpkgs/pkgs/development/libraries/libquotient/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "libquotient"; - version = "0.6.8"; + version = "0.6.9"; src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; rev = version; - sha256 = "sha256-CrAK0yq1upB1+C2z6mqKkSArCmzI+TDEEHTIBWB29Go="; + sha256 = "sha256-1YiS2b4lYknNSB+8LKB/s6AcF0yQVsakrkp6/Sjkczo="; }; buildInputs = [ qtbase qtmultimedia ]; diff --git a/nixpkgs/pkgs/development/libraries/libsixel/default.nix b/nixpkgs/pkgs/development/libraries/libsixel/default.nix index 0d5a54f9693e..549f4385fa56 100644 --- a/nixpkgs/pkgs/development/libraries/libsixel/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsixel/default.nix @@ -1,30 +1,56 @@ -{lib, stdenv, fetchFromGitHub}: +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, libbsd +, gdk-pixbuf +, gd +, libjpeg +, pkg-config +, fetchpatch +}: stdenv.mkDerivation rec { - version = "1.8.6"; pname = "libsixel"; + version = "1.10.1"; src = fetchFromGitHub { + owner = "libsixel"; repo = "libsixel"; rev = "v${version}"; - owner = "saitoha"; - sha256 = "1saxdj6sldv01g6w6yk8vr7px4bl31xca3a82j6v1j3fw5rbfphy"; + sha256 = "sha256-ACypJTFjXSzBjo4hQzUiJOqnaRaZnYX+/NublN9sbBo="; }; - configureFlags = [ - "--enable-tests" + patches = [ + (fetchpatch { + url = "https://github.com/libsixel/libsixel/commit/4d3e53ee007f3b71f638875f9fabbba658b2ca8a.patch"; + sha256 = "sha256-iDfsTyUczjtzV3pt1ZErbhVO2rMm2ZYKWSBl+ru+5HA="; + }) + ]; + + buildInputs = [ + libbsd gdk-pixbuf gd + ]; + + nativeBuildInputs = [ + meson ninja pkg-config ]; doCheck = true; + mesonFlags = [ + "-Dtests=enabled" + # build system seems to be broken here, it still seems to handle jpeg + # through some other ways. + "-Djpeg=disabled" + "-Dpng=disabled" + ]; + meta = with lib; { description = "The SIXEL library for console graphics, and converter programs"; - homepage = "http://saitoha.github.com/libsixel"; + homepage = "https://github.com/libsixel/libsixel"; maintainers = with maintainers; [ vrthra ]; license = licenses.mit; - platforms = with platforms; unix; - knownVulnerabilities = [ - "CVE-2020-11721" # https://github.com/saitoha/libsixel/issues/134 - "CVE-2020-19668" # https://github.com/saitoha/libsixel/issues/136 - ]; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/libraries/libsndfile/default.nix b/nixpkgs/pkgs/development/libraries/libsndfile/default.nix index 61e6d9cd7652..dbe108f586f4 100644 --- a/nixpkgs/pkgs/development/libraries/libsndfile/default.nix +++ b/nixpkgs/pkgs/development/libraries/libsndfile/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libsndfile"; - version = "1.0.30"; + version = "1.0.31"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "1rh79y4s4m2wcm2kahmzs2kijpdpayif2gyca6m71f3k7jbhgcwa"; + rev = version; + sha256 = "1alba3iv8i7i2jb5fd6q5s7j9bcj48sf28nfjd3qigz2n2is5jl2"; }; nativeBuildInputs = [ autoreconfHook autogen pkg-config python3 ]; diff --git a/nixpkgs/pkgs/development/libraries/libssh/default.nix b/nixpkgs/pkgs/development/libraries/libssh/default.nix index c613cfab777b..c5cd5c353960 100644 --- a/nixpkgs/pkgs/development/libraries/libssh/default.nix +++ b/nixpkgs/pkgs/development/libraries/libssh/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libssh"; - version = "0.8.9"; + version = "0.9.6"; src = fetchurl { - url = "https://www.libssh.org/files/0.8/${pname}-${version}.tar.xz"; - sha256 = "09b8w9m5qiap8wbvz4613nglsynpk8hn0q9b929ny2y4l2fy2nc5"; + url = "https://www.libssh.org/files/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-hrz4hb2bgEZv4OBUU8WLh332GvqLqUeljDVtfw+rgps="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/libraries/libssh2/1_10.nix b/nixpkgs/pkgs/development/libraries/libssh2/1_10.nix new file mode 100644 index 000000000000..edba7a84ef2b --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/libssh2/1_10.nix @@ -0,0 +1,10 @@ +{ libssh2, fetchurl }: + +libssh2.overrideAttrs (attrs: rec { + version = "1.10.0"; + src = fetchurl { + url = with attrs; "${meta.homepage}/download/${pname}-${version}.tar.gz"; + sha256 = "sha256-LWTpDz3tOUuR06LndMogOkF59prr7gMAPlpvpiHkHVE="; + }; + patches = []; +}) diff --git a/nixpkgs/pkgs/development/libraries/libssh2/CVE-2019-17498.patch b/nixpkgs/pkgs/development/libraries/libssh2/CVE-2019-17498.patch deleted file mode 100644 index 8681c3ef6091..000000000000 --- a/nixpkgs/pkgs/development/libraries/libssh2/CVE-2019-17498.patch +++ /dev/null @@ -1,210 +0,0 @@ -From b9aa7c2495694d0527e4e7fd560a3f0f18556c72 Mon Sep 17 00:00:00 2001 -From: Will Cosgrove <will@panic.com> -Date: Thu, 29 Aug 2019 15:14:19 -0700 -Subject: [PATCH 1/5] packet.c: improve parsing of packets - -file: packet.c - -notes: -Use _libssh2_get_string API in SSH_MSG_DEBUG, additional uint32 bounds check in SSH_MSG_GLOBAL_REQUEST ---- - src/packet.c | 30 +++++++++++++++--------------- - 1 file changed, 15 insertions(+), 15 deletions(-) - -diff --git a/src/packet.c b/src/packet.c -index 38ab62944..ac69768cd 100644 ---- a/src/packet.c -+++ b/src/packet.c -@@ -537,26 +537,26 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - case SSH_MSG_DEBUG: - if(datalen >= 2) { - int always_display = data[1]; -- -+ - if(datalen >= 6) { -- message_len = _libssh2_ntohu32(data + 2); -- -- if(message_len <= (datalen - 10)) { -- /* 6 = packet_type(1) + display(1) + message_len(4) */ -- message = (char *) data + 6; -- language_len = _libssh2_ntohu32(data + 6 + -- message_len); -- -- if(language_len <= (datalen - 10 - message_len)) -- language = (char *) data + 10 + message_len; -- } -+ struct string_buf buf; -+ buf.data = (unsigned char *)data; -+ buf.dataptr = buf.data; -+ buf.len = datalen; -+ buf.dataptr += 2; /* advance past type & always display */ -+ -+ _libssh2_get_string(&buf, &message, &message_len); -+ _libssh2_get_string(&buf, &language, &language_len); - } - - if(session->ssh_msg_debug) { -- LIBSSH2_DEBUG(session, always_display, message, -- message_len, language, language_len); -+ LIBSSH2_DEBUG(session, always_display, -+ (const char *)message, -+ message_len, (const char *)language, -+ language_len); - } - } -+ - /* - * _libssh2_debug will actually truncate this for us so - * that it's not an inordinate about of data -@@ -579,7 +579,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - uint32_t len = 0; - unsigned char want_reply = 0; - len = _libssh2_ntohu32(data + 1); -- if(datalen >= (6 + len)) { -+ if((len <= (UINT_MAX - 6) && (datalen >= (6 + len))) { - want_reply = data[5 + len]; - _libssh2_debug(session, - LIBSSH2_TRACE_CONN, - -From 8b3cf0b17c1b84a138bed9423a9e0743452b4de9 Mon Sep 17 00:00:00 2001 -From: Will Cosgrove <will@panic.com> -Date: Thu, 29 Aug 2019 15:15:33 -0700 -Subject: [PATCH 2/5] stray whitespace - ---- - src/packet.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/packet.c b/src/packet.c -index ac69768cd..8908b2c5a 100644 ---- a/src/packet.c -+++ b/src/packet.c -@@ -537,7 +537,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - case SSH_MSG_DEBUG: - if(datalen >= 2) { - int always_display = data[1]; -- -+ - if(datalen >= 6) { - struct string_buf buf; - buf.data = (unsigned char *)data; - -From 1c6fa92b77e34d089493fe6d3e2c6c8775858b94 Mon Sep 17 00:00:00 2001 -From: Will Cosgrove <will@panic.com> -Date: Thu, 29 Aug 2019 15:24:22 -0700 -Subject: [PATCH 3/5] fixed type issue, updated SSH_MSG_DISCONNECT - -SSH_MSG_DISCONNECT now also uses _libssh2_get API. ---- - src/packet.c | 40 +++++++++++++++------------------------- - 1 file changed, 15 insertions(+), 25 deletions(-) - -diff --git a/src/packet.c b/src/packet.c -index 8908b2c5a..97f0cdd4b 100644 ---- a/src/packet.c -+++ b/src/packet.c -@@ -419,8 +419,8 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - size_t datalen, int macstate) - { - int rc = 0; -- char *message = NULL; -- char *language = NULL; -+ unsigned char *message = NULL; -+ unsigned char *language = NULL; - size_t message_len = 0; - size_t language_len = 0; - LIBSSH2_CHANNEL *channelp = NULL; -@@ -472,33 +472,23 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - - case SSH_MSG_DISCONNECT: - if(datalen >= 5) { -- size_t reason = _libssh2_ntohu32(data + 1); -+ uint32_t reason = 0; -+ struct string_buf buf; -+ buf.data = (unsigned char *)data; -+ buf.dataptr = buf.data; -+ buf.len = datalen; -+ buf.dataptr++; /* advance past type */ - -- if(datalen >= 9) { -- message_len = _libssh2_ntohu32(data + 5); -+ _libssh2_get_u32(&buf, &reason); -+ _libssh2_get_string(&buf, &message, &message_len); -+ _libssh2_get_string(&buf, &language, &language_len); - -- if(message_len < datalen-13) { -- /* 9 = packet_type(1) + reason(4) + message_len(4) */ -- message = (char *) data + 9; -- -- language_len = -- _libssh2_ntohu32(data + 9 + message_len); -- language = (char *) data + 9 + message_len + 4; -- -- if(language_len > (datalen-13-message_len)) { -- /* bad input, clear info */ -- language = message = NULL; -- language_len = message_len = 0; -- } -- } -- else -- /* bad size, clear it */ -- message_len = 0; -- } - if(session->ssh_msg_disconnect) { -- LIBSSH2_DISCONNECT(session, reason, message, -- message_len, language, language_len); -+ LIBSSH2_DISCONNECT(session, reason, (const char *)message, -+ message_len, (const char *)language, -+ language_len); - } -+ - _libssh2_debug(session, LIBSSH2_TRACE_TRANS, - "Disconnect(%d): %s(%s)", reason, - message, language); - -From 77616117cc9dbbdd0fe1157098435bff73a83a0f Mon Sep 17 00:00:00 2001 -From: Will Cosgrove <will@panic.com> -Date: Thu, 29 Aug 2019 15:26:32 -0700 -Subject: [PATCH 4/5] fixed stray ( - -bad paste ---- - src/packet.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/packet.c b/src/packet.c -index 97f0cdd4b..bd4c39e46 100644 ---- a/src/packet.c -+++ b/src/packet.c -@@ -569,7 +569,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - uint32_t len = 0; - unsigned char want_reply = 0; - len = _libssh2_ntohu32(data + 1); -- if((len <= (UINT_MAX - 6) && (datalen >= (6 + len))) { -+ if(len <= (UINT_MAX - 6) && datalen >= (6 + len)) { - want_reply = data[5 + len]; - _libssh2_debug(session, - LIBSSH2_TRACE_CONN, - -From 436c45dc143cadc8c59afac6c4255be332856581 Mon Sep 17 00:00:00 2001 -From: Will Cosgrove <will@panic.com> -Date: Thu, 29 Aug 2019 15:29:00 -0700 -Subject: [PATCH 5/5] added additional parentheses for clarity - ---- - src/packet.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/packet.c b/src/packet.c -index bd4c39e46..2e01bfc5d 100644 ---- a/src/packet.c -+++ b/src/packet.c -@@ -569,7 +569,7 @@ _libssh2_packet_add(LIBSSH2_SESSION * session, unsigned char *data, - uint32_t len = 0; - unsigned char want_reply = 0; - len = _libssh2_ntohu32(data + 1); -- if(len <= (UINT_MAX - 6) && datalen >= (6 + len)) { -+ if((len <= (UINT_MAX - 6)) && (datalen >= (6 + len))) { - want_reply = data[5 + len]; - _libssh2_debug(session, - LIBSSH2_TRACE_CONN, diff --git a/nixpkgs/pkgs/development/libraries/libssh2/default.nix b/nixpkgs/pkgs/development/libraries/libssh2/default.nix index ed09e8ba5624..d6817550fe7b 100644 --- a/nixpkgs/pkgs/development/libraries/libssh2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libssh2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libssh2"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { - url = "${meta.homepage}/download/${pname}-${version}.tar.gz"; - sha256 = "1zfsz9nldakfz61d2j70pk29zlmj7w2vv46s9l3x2prhcgaqpyym"; + url = "https://www.libssh2.org/download/libssh2-${version}.tar.gz"; + sha256 = "sha256-LWTpDz3tOUuR06LndMogOkF59prr7gMAPlpvpiHkHVE="; }; outputs = [ "out" "dev" "devdoc" ]; @@ -14,16 +14,11 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib ] ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64; - patches = [ - # Not able to use fetchpatch here: infinite recursion - ./CVE-2019-17498.patch - ]; - meta = with lib; { description = "A client-side C library implementing the SSH2 protocol"; homepage = "https://www.libssh2.org"; platforms = platforms.all; license = licenses.bsd3; - maintainers = [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/libva/default.nix b/nixpkgs/pkgs/development/libraries/libva/default.nix index 1eee4b3870bc..2d4186385193 100644 --- a/nixpkgs/pkgs/development/libraries/libva/default.nix +++ b/nixpkgs/pkgs/development/libraries/libva/default.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - name = "libva-${lib.optionalString minimal "minimal-"}${version}"; + pname = "libva" + lib.optionalString minimal "minimal"; version = "2.12.0"; src = fetchFromGitHub { @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { # TODO: share libs between minimal and !minimal - perhaps just symlink them mesonFlags = [ - # Add FHS paths for non-NixOS applications: - "-Ddriverdir=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" + # Add FHS and Debian paths for non-NixOS applications + "-Ddriverdir=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/i386-linux-gnu/dri" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/nixpkgs/pkgs/development/libraries/libvirt/default.nix index 2d13b993fd28..dca856dbb571 100644 --- a/nixpkgs/pkgs/development/libraries/libvirt/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvirt/default.nix @@ -183,6 +183,10 @@ stdenv.mkDerivation rec { # do not use "''${qemu_kvm}/bin/qemu-kvm" to avoid bound VMs to particular qemu derivations substituteInPlace src/lxc/lxc_conf.c \ --replace 'lxc_path,' '"/run/libvirt/nix-emulators/libvirt_lxc",' + substituteInPlace build-aux/meson.build \ + --replace "gsed" "sed" \ + --replace "gmake" "make" \ + --replace "ggrep" "grep" patchShebangs . '' + (lib.concatStringsSep "\n" (lib.mapAttrsToList patchBuilder overrides)); diff --git a/nixpkgs/pkgs/development/libraries/libvmaf/default.nix b/nixpkgs/pkgs/development/libraries/libvmaf/default.nix index 1410822a1ca4..57a9095dc56e 100644 --- a/nixpkgs/pkgs/development/libraries/libvmaf/default.nix +++ b/nixpkgs/pkgs/development/libraries/libvmaf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libvmaf"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "netflix"; repo = "vmaf"; rev = "v${version}"; - sha256 = "1jlmivmdzlhizljbmsvqqxnhjfyjh8zxyf5xv6j040vbfj4mf14f"; + sha256 = "sha256-t1dK4UnperX9YtvmTwIo/03Dxq/Pl+K6kZIL0uX1OcE="; }; sourceRoot = "source/libvmaf"; diff --git a/nixpkgs/pkgs/development/libraries/libwacom/default.nix b/nixpkgs/pkgs/development/libraries/libwacom/default.nix index 5bb6445ac38f..9ebb2c855cba 100644 --- a/nixpkgs/pkgs/development/libraries/libwacom/default.nix +++ b/nixpkgs/pkgs/development/libraries/libwacom/default.nix @@ -1,8 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, glib, pkg-config, udev, libgudev, doxygen, python3 }: +{ stdenv +, lib +, fetchFromGitHub +, meson +, ninja +, glib +, pkg-config +, udev +, libgudev +, python3 +}: stdenv.mkDerivation rec { pname = "libwacom"; - version = "1.10"; + version = "1.12"; outputs = [ "out" "dev" ]; @@ -10,14 +20,25 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "sha256-Q7b54AMAxdIzN7TUuhIdlrXaVtj2szV4n3y9bAE0LsU="; + sha256 = "sha256-pCO0lB0liveIEZIxY3IJcqlmWy4rYhSBtRPssfzHEow="; }; - nativeBuildInputs = [ pkg-config meson ninja doxygen python3 ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + python3 + ]; - mesonFlags = [ "-Dtests=disabled" ]; + buildInputs = [ + glib + udev + libgudev + ]; - buildInputs = [ glib udev libgudev ]; + mesonFlags = [ + "-Dtests=disabled" + ]; meta = with lib; { platforms = platforms.linux; diff --git a/nixpkgs/pkgs/development/libraries/libxc/default.nix b/nixpkgs/pkgs/development/libraries/libxc/default.nix index b46bc9626302..3f16f3cc3e2a 100644 --- a/nixpkgs/pkgs/development/libraries/libxc/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxc/default.nix @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { sha256 = "07iljmv737kx24kd33x9ndf5l854mwslg9x2psqm12k07jmq9wjw"; }; - buildInputs = [ gfortran ]; - nativeBuildInputs = [ perl cmake ]; + nativeBuildInputs = [ perl cmake gfortran ]; preConfigure = '' patchShebangs ./ diff --git a/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix b/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix index 8bec962c0aea..25d2d89add01 100644 --- a/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxkbcommon/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "libxkbcommon"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; - sha256 = "0ysynzzgzd9jdrh1321r4bgw8wd5zljrlyn5y1a31g39xacf02bv"; + sha256 = "0d4jzq0zv1xmng0z0q5lb4rz03ikgxdwi68k3r70ac16gb911ixk"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/nixpkgs/pkgs/development/libraries/libxml2/default.nix b/nixpkgs/pkgs/development/libraries/libxml2/default.nix index 1b58b4539e46..c98a1cbce0e9 100644 --- a/nixpkgs/pkgs/development/libraries/libxml2/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxml2/default.nix @@ -2,7 +2,7 @@ , zlib, xz, libintl, python, gettext, ncurses, findXMLCatalogs , pythonSupport ? enableShared && stdenv.buildPlatform == stdenv.hostPlatform , icuSupport ? false, icu ? null -, enableShared ? stdenv.hostPlatform.libc != "msvcrt" +, enableShared ? stdenv.hostPlatform.libc != "msvcrt" && !stdenv.hostPlatform.isStatic , enableStatic ? !enableShared }: @@ -40,6 +40,8 @@ stdenv.mkDerivation rec { ++ lib.optional pythonSupport "py" ++ lib.optional (enableStatic && enableShared) "static"; + strictDeps = true; + buildInputs = lib.optional pythonSupport python ++ lib.optional (pythonSupport && python?isPy2 && python.isPy2) gettext ++ lib.optional (pythonSupport && python?isPy3 && python.isPy3) ncurses diff --git a/nixpkgs/pkgs/development/libraries/libxsmm/default.nix b/nixpkgs/pkgs/development/libraries/libxsmm/default.nix index 21052df86307..b016a5e8751c 100644 --- a/nixpkgs/pkgs/development/libraries/libxsmm/default.nix +++ b/nixpkgs/pkgs/development/libraries/libxsmm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libxsmm"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "hfp"; repo = "libxsmm"; rev = version; - sha256 = "1c1qj6hcdfx11bvilnly92vgk1niisd2bjw1s8vfyi2f7ws1wnp0"; + sha256 = "sha256-gmv5XHBRztcF7+ZKskQMloytJ53k0eJg0HJmUhndq70="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/lzo/default.nix b/nixpkgs/pkgs/development/libraries/lzo/default.nix index f5b0111a1a78..480e2bb909cd 100644 --- a/nixpkgs/pkgs/development/libraries/lzo/default.nix +++ b/nixpkgs/pkgs/development/libraries/lzo/default.nix @@ -9,12 +9,14 @@ stdenv.mkDerivation rec { sha256 = "0wm04519pd3g8hqpjqhfr72q8qmbiwqaxcs3cndny9h86aa95y60"; }; - configureFlags = [ "--enable-shared" ]; + configureFlags = lib.optional (!stdenv.hostPlatform.isStatic) "--enable-shared" ; enableParallelBuilding = true; doCheck = true; # not cross; + strictDeps = true; + meta = with lib; { description = "Real-time data (de)compression library"; longDescription = '' diff --git a/nixpkgs/pkgs/development/libraries/mauikit-filebrowsing/default.nix b/nixpkgs/pkgs/development/libraries/mauikit-filebrowsing/default.nix index 5cce0382c8f0..1591988e0c0c 100644 --- a/nixpkgs/pkgs/development/libraries/mauikit-filebrowsing/default.nix +++ b/nixpkgs/pkgs/development/libraries/mauikit-filebrowsing/default.nix @@ -10,14 +10,14 @@ mkDerivation rec { pname = "mauikit-filebrowsing"; - version = "1.2.2"; + version = "2.0.1"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "maui"; repo = "mauikit-filebrowsing"; rev = "v${version}"; - sha256 = "1m56lil7w884wn8qycl7y55abvw2vanfy8c4g786200p6acsh3kl"; + sha256 = "sha256-hiR0RbZTduH0noyzpewsNJAtSdCtiSmTP8SLMBgK3uA="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/mauikit/default.nix b/nixpkgs/pkgs/development/libraries/mauikit/default.nix index 3991ee5551f0..2575e2566a29 100644 --- a/nixpkgs/pkgs/development/libraries/mauikit/default.nix +++ b/nixpkgs/pkgs/development/libraries/mauikit/default.nix @@ -6,20 +6,21 @@ , kconfig , kcoreaddons , ki18n +, knotifications , qtbase , qtquickcontrols2 }: mkDerivation rec { pname = "mauikit"; - version = "1.2.2"; + version = "2.0.1"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "maui"; repo = "mauikit"; rev = "v${version}"; - sha256 = "1jz0a65bbznjg7aaq19rdyp956wn6xc1x4xigfkhj6mwsvnb49av"; + sha256 = "sha256-qz/MePMvyGR8lzR2xB2f9QENx04UHu0Xef7v0xcKovo="; }; nativeBuildInputs = [ @@ -31,6 +32,7 @@ mkDerivation rec { kconfig kcoreaddons ki18n + knotifications qtquickcontrols2 ]; diff --git a/nixpkgs/pkgs/development/libraries/md4c/default.nix b/nixpkgs/pkgs/development/libraries/md4c/default.nix index a29b521a2de5..2ad77b2d2fd8 100644 --- a/nixpkgs/pkgs/development/libraries/md4c/default.nix +++ b/nixpkgs/pkgs/development/libraries/md4c/default.nix @@ -16,6 +16,13 @@ stdenv.mkDerivation rec { hash = "sha256-+LObAD5JB8Vb4Rt4hTo1Z4ispxzfFkkXA2sw6TKB7Yo="; }; + patches = [ + # We set CMAKE_INSTALL_LIBDIR to the absolute path in $out, so + # prefix and exec_prefix cannot be $out, too + # Use CMake's _FULL_ variables instead of `prefix` concatenation. + ./fix-pkgconfig.patch + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/nixpkgs/pkgs/development/libraries/md4c/fix-pkgconfig.patch b/nixpkgs/pkgs/development/libraries/md4c/fix-pkgconfig.patch new file mode 100644 index 000000000000..e0e9f3d96b2b --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/md4c/fix-pkgconfig.patch @@ -0,0 +1,44 @@ +From 0ab8f5a6ee305cf4edcebfdc7b9eb5f98302de75 Mon Sep 17 00:00:00 2001 +From: Leif Middelschulte <Leif.Middelschulte@klsmartin.com> +Date: Fri, 17 Sep 2021 16:16:17 +0200 +Subject: [PATCH] pc.in: use _FULL_ variable variants + +Nix' cmake packaging handler replaces the CMAKE_INSTALL_INCLUDEDIR +with the absolute path. Which break package +portability (i.e. `prefix`-usage). +--- + src/md4c-html.pc.in | 6 ++---- + src/md4c.pc.in | 6 ++---- + 2 files changed, 4 insertions(+), 8 deletions(-) + +diff --git a/src/md4c-html.pc.in b/src/md4c-html.pc.in +index 504bb52..fec7df4 100644 +--- a/src/md4c-html.pc.in ++++ b/src/md4c-html.pc.in +@@ -1,7 +1,5 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: @PROJECT_NAME@ HTML renderer + Description: Markdown to HTML converter library. +diff --git a/src/md4c.pc.in b/src/md4c.pc.in +index cd8842d..b5d81f8 100644 +--- a/src/md4c.pc.in ++++ b/src/md4c.pc.in +@@ -1,7 +1,5 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: @PROJECT_NAME@ + Description: Markdown parser library with a SAX-like callback-based interface. +-- +2.31.0 + diff --git a/nixpkgs/pkgs/development/libraries/memorymapping/default.nix b/nixpkgs/pkgs/development/libraries/memorymapping/default.nix new file mode 100644 index 000000000000..91af205f0320 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/memorymapping/default.nix @@ -0,0 +1,45 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + pname = "memorymapping"; + version = "unstable-2014-02-20"; + + src = fetchFromGitHub { + owner = "NimbusKit"; + repo = "memorymapping"; + rev = "fc285afe13cb9d56a40c647b8ed6d6bd40636af7"; + sha256 = "sha256-9u/QvK9TDsKxcubINH2OAbx5fXXkKF0+YT7LoLDaF0M="; + }; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + $CC -c src/fmemopen.c + $AR rcs libmemorymapping.a fmemopen.o + sed -e '1i#include <stdio.h>' -i src/fmemopen.h + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -D libmemorymapping.a "$out"/lib/libmemorymapping.a + install -D src/fmemopen.h "$out"/include/fmemopen.h + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://nimbuskit.github.io/memorymapping/"; + description = "fmemopen for Mac OS and iOS"; + license = licenses.asl20; + maintainers = with maintainers; [ veprbl ]; + # Uses BSD-style funopen() to implement glibc-style fmemopen(). + # Add more BSDs if you need to. + platforms = platforms.darwin; + broken = stdenv.isAarch64; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/memorymapping/setup-hook.sh b/nixpkgs/pkgs/development/libraries/memorymapping/setup-hook.sh new file mode 100644 index 000000000000..5ee3470fe370 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/memorymapping/setup-hook.sh @@ -0,0 +1,6 @@ +useMemorymapping () { + export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE-}${NIX_CFLAGS_COMPILE:+ }-include fmemopen.h"; + export NIX_LDFLAGS="${NIX_LDFLAGS-}${NIX_LDFLAGS:+ }-lmemorymapping"; +} + +postHooks+=(useMemorymapping) diff --git a/nixpkgs/pkgs/development/libraries/memstream/default.nix b/nixpkgs/pkgs/development/libraries/memstream/default.nix new file mode 100644 index 000000000000..90505a56a931 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/memstream/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "memstream"; + version = "0.1"; + + src = fetchurl { + url = "https://piumarta.com/software/memstream/memstream-${version}.tar.gz"; + sha256 = "0kvdb897g7nyviaz72arbqijk2g2wa61cmi3l5yh48rzr49r3a3a"; + }; + + dontConfigure = true; + + postBuild = '' + $AR rcs libmemstream.a memstream.o + ''; + + doCheck = true; + checkPhase = '' + runHook preCheck + + ./test | grep "This is a test of memstream" + + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + + install -D libmemstream.a "$out"/lib/libmemstream.a + install -D memstream.h "$out"/include/memstream.h + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://www.piumarta.com/software/memstream/"; + description = "memstream.c is an implementation of the POSIX function open_memstream() for BSD and BSD-like operating systems"; + license = licenses.mit; + maintainers = with maintainers; [ veprbl ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/development/libraries/memstream/setup-hook.sh b/nixpkgs/pkgs/development/libraries/memstream/setup-hook.sh new file mode 100644 index 000000000000..09aabe748841 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/memstream/setup-hook.sh @@ -0,0 +1,6 @@ +useMemstream () { + export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE-}${NIX_CFLAGS_COMPILE:+ }-include memstream.h"; + export NIX_LDFLAGS="${NIX_LDFLAGS-}${NIX_LDFLAGS:+ }-lmemstream"; +} + +postHooks+=(useMemstream) diff --git a/nixpkgs/pkgs/development/libraries/mesa/default.nix b/nixpkgs/pkgs/development/libraries/mesa/default.nix index 876a3c015a0d..81d553547c3f 100644 --- a/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -31,7 +31,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.1.7"; + version = "21.2.2"; branch = versions.major version; self = stdenv.mkDerivation { @@ -45,11 +45,9 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "1fx7nfvh1drfa6vv34j7ma944qbs014b0jwlbgqlnbjgcl87rrp9"; + sha256 = "1i75k6gh76f49vy6kksbsikf593jmgk6slqwbs1fs5s2jyzz3an4"; }; - prePatch = "patchShebangs ."; - # TODO: # revive ./dricore-gallium.patch when it gets ported (from Ubuntu), as it saved # ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog @@ -64,12 +62,6 @@ self = stdenv.mkDerivation { url = "https://gitlab.freedesktop.org/mesa/mesa/commit/aebbf819df6d1e.patch"; sha256 = "17248hyzg43d73c86p077m4lv1pkncaycr3l27hwv9k4ija9zl8q"; }) - # For RISC-V support: - (fetchpatch { - name = "add-riscv-default-selections.patch"; - url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/9908da1b7a5eaf0156d458e0e24b694c070ba345.patch"; - sha256 = "036gv95m5gzzs6qpgkydf5fwgdlm7kpbdfalg8vmayghd260rw1w"; - }) ] ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ # Fix aarch64-darwin build, remove when upstreaam supports it out of the box. # See: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1020 @@ -77,6 +69,8 @@ self = stdenv.mkDerivation { ]; postPatch = '' + patchShebangs . + substituteInPlace meson.build --replace \ "find_program('pkg-config')" \ "find_program('${buildPackages.pkg-config.targetPrefix}pkg-config')" diff --git a/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix index f8724703f049..948de303cefa 100644 --- a/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix +++ b/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, cmake , SDL , ffmpeg , frei0r @@ -26,13 +27,13 @@ mkDerivation rec { pname = "mlt"; - version = "6.24.0"; + version = "7.0.1"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "1my43ica2qax2622307dv4gn3w8hkchy643i9pq8r9yh2hd4pvs9"; + sha256 = "13c5miph9jjbz69dhy0zvbkk5zbb05dr3vraaci0d5fdbrlhyscf"; }; buildInputs = [ @@ -56,42 +57,15 @@ mkDerivation rec { ladspaPlugins ]; - nativeBuildInputs = [ which ]; + nativeBuildInputs = [ cmake which ]; outputs = [ "out" "dev" ]; - # Mostly taken from: - # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine - configureFlags = [ - "--avformat-swscale" - "--enable-gpl" - "--enable-gpl3" - "--enable-opengl" - ]; - - # mlt is unable to cope with our multi-prefix Qt build - # because it does not use CMake or qmake. - NIX_CFLAGS_COMPILE = "-I${lib.getDev qtsvg}/include/QtSvg"; - - CXXFLAGS = "-std=c++11"; - qtWrapperArgs = [ "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa" ]; - postInstall = '' - # Remove an unnecessary reference to movit.dev. - s=${movit.dev}/include - t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done) - sed -i $out/lib/mlt/libmltopengl.so -e "s|$s|$t|g" - - # Remove an unnecessary reference to movit.dev. - s=${qtbase.dev}/include - t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done) - sed -i $out/lib/mlt/libmltqt.so -e "s|$s|$t|g" - ''; - passthru = { inherit ffmpeg; }; diff --git a/nixpkgs/pkgs/development/libraries/mpich/default.nix b/nixpkgs/pkgs/development/libraries/mpich/default.nix index 9227cd705430..3aed0d288527 100644 --- a/nixpkgs/pkgs/development/libraries/mpich/default.nix +++ b/nixpkgs/pkgs/development/libraries/mpich/default.nix @@ -26,7 +26,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ perl gfortran openssh hwloc ] + nativeBuildInputs = [ gfortran ]; + buildInputs = [ perl openssh hwloc ] ++ lib.optional (!stdenv.isDarwin) ch4backend; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/mvapich/default.nix b/nixpkgs/pkgs/development/libraries/mvapich/default.nix index 704a28dbb8cd..c496927ebca5 100644 --- a/nixpkgs/pkgs/development/libraries/mvapich/default.nix +++ b/nixpkgs/pkgs/development/libraries/mvapich/default.nix @@ -21,13 +21,12 @@ stdenv.mkDerivation rec { sha256 = "0jd28vy9ivl3rcpkxmhw73b6krzm0pd9jps8asw92wa00lm2z9mk"; }; - nativeBuildInputs = [ pkg-config bison makeWrapper ]; + nativeBuildInputs = [ pkg-config bison makeWrapper gfortran ]; propagatedBuildInputs = [ numactl rdma-core zlib opensm ]; buildInputs = with lib; [ numactl libxml2 perl - gfortran openssh hwloc ] ++ optionals (network == "infiniband") [ rdma-core opensm ] diff --git a/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix b/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix index 0cdeda238792..503226ddcbb3 100644 --- a/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/nixpkgs/pkgs/development/libraries/netcdf-fortran/default.nix @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "00qwg4v250yg8kxp68srrnvfbfim241fnlm071p9ila2mihk8r01"; }; - buildInputs = [ netcdf hdf5 curl gfortran ]; + nativeBuildInputs = [ gfortran ]; + buildInputs = [ netcdf hdf5 curl ]; doCheck = true; meta = with lib; { diff --git a/nixpkgs/pkgs/development/libraries/newt/default.nix b/nixpkgs/pkgs/development/libraries/newt/default.nix index dc6b604bd8e2..7b5316b144a2 100644 --- a/nixpkgs/pkgs/development/libraries/newt/default.nix +++ b/nixpkgs/pkgs/development/libraries/newt/default.nix @@ -12,16 +12,21 @@ stdenv.mkDerivation rec { sha256 = "0cdvbancr7y4nrj8257y5n45hmhizr8isynagy4fpsnpammv8pi6"; }; - patchPhase = '' + postPatch = '' sed -i -e s,/usr/bin/install,install, -e s,-I/usr/include/slang,, Makefile.in po/Makefile substituteInPlace configure \ --replace "/usr/include/python" "${pythonIncludePath}" substituteInPlace configure.ac \ --replace "/usr/include/python" "${pythonIncludePath}" + + substituteInPlace Makefile.in \ + --replace "ar rv" "${stdenv.cc.targetPrefix}ar rv" ''; - buildInputs = [ slang popt python ]; + strictDeps = true; + nativeBuildInputs = [ python ]; + buildInputs = [ slang popt ]; NIX_LDFLAGS = "-lncurses"; diff --git a/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix b/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix index 41a967a5b709..d8ae8fcaa4ae 100644 --- a/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix +++ b/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix @@ -1,41 +1,46 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake +{ stdenv +, lib +, fetchFromGitHub +, cmake }: - -stdenv.mkDerivation rec { +let + testData = fetchFromGitHub { + owner = "nlohmann"; + repo = "json_test_data"; + rev = "v3.0.0"; + sha256 = "O6p2PFB7c2KE9VqWvmTaFywbW1hSzAP5V42EuemX+ls="; + }; +in stdenv.mkDerivation rec { pname = "nlohmann_json"; - version = "3.9.1"; + version = "3.10.2"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${version}"; - sha256 = "sha256-THordDPdH2qwk6lFTgeFmkl7iDuA/7YH71PTUe6vJCs="; + sha256 = "/OFNfukrIyfJmD0ko174aud9T6ZOesHANJjyfk4q/Vs="; }; - patches = [ - # https://github.com/nlohmann/json/pull/2690 - (fetchpatch { - url = "https://github.com/nlohmann/json/commit/53a9850eebb88c6ff95f6042d08d5c0cc9d18097.patch"; - sha256 = "k+Og00nXNg5IsFQY5fWD3xVQQXUFFTie44UXole0S1M="; - }) - ]; - nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DBuildTests=${if doCheck then "ON" else "OFF"}" "-DJSON_MultipleHeaders=ON" - ]; + ] ++ lib.optional doCheck "-DJSON_TestDataDirectory=${testData}"; + + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; - # A test cause the build to timeout https://github.com/nlohmann/json/issues/1816 - #doCheck = stdenv.hostPlatform == stdenv.buildPlatform; - doCheck = false; + # skip tests that require git or modify “installed files” + preCheck = '' + checkFlagsArray+=("ARGS=-LE 'not_reproducible|git_required'") + ''; postInstall = "rm -rf $out/lib64"; meta = with lib; { - description = "Header only C++ library for the JSON file format"; - homepage = "https://github.com/nlohmann/json"; + description = "JSON for Modern C++"; + homepage = "https://json.nlohmann.me"; + changelog = "https://github.com/nlohmann/json/blob/develop/ChangeLog.md"; license = licenses.mit; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/development/libraries/notcurses/default.nix b/nixpkgs/pkgs/development/libraries/notcurses/default.nix index a99a09a0fe69..6d12ed6ef1bd 100644 --- a/nixpkgs/pkgs/development/libraries/notcurses/default.nix +++ b/nixpkgs/pkgs/development/libraries/notcurses/default.nix @@ -4,6 +4,7 @@ , pandoc , libunistring , ncurses +, zlib , ffmpeg , readline , fetchFromGitHub @@ -13,20 +14,20 @@ stdenv.mkDerivation rec { pname = "notcurses"; - version = "2.3.8"; + version = "2.4.1"; src = fetchFromGitHub { owner = "dankamongmen"; repo = "notcurses"; rev = "v${version}"; - sha256 = "sha256-CTMFXTmOnBUCm0KdVNBoDT08arr01XTHdELFiTayk3E="; + sha256 = "sha256-Oyjdmmb+rqPgkwVJw3y4NKGPABmCZFyGFBzBJn6IEHk="; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake pkg-config pandoc ]; - buildInputs = [ libunistring ncurses readline ] + buildInputs = [ libunistring ncurses readline zlib ] ++ lib.optional multimediaSupport ffmpeg; cmakeFlags = [ "-DUSE_QRCODEGEN=OFF" ] diff --git a/nixpkgs/pkgs/development/libraries/nss/default.nix b/nixpkgs/pkgs/development/libraries/nss/default.nix index fc17bb8e8c55..f8bd34a164de 100644 --- a/nixpkgs/pkgs/development/libraries/nss/default.nix +++ b/nixpkgs/pkgs/development/libraries/nss/default.nix @@ -187,6 +187,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = with lib; { homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"; description = "A set of libraries for development of security-enabled client and server applications"; diff --git a/nixpkgs/pkgs/development/libraries/nss/update.sh b/nixpkgs/pkgs/development/libraries/nss/update.sh new file mode 100755 index 000000000000..600dbdff004c --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/nss/update.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnugrep gnused coreutils common-updater-scripts + +set -x + +base_url="https://ftp.mozilla.org/pub/security/nss/releases/" + +version="$(curl -sSL ${base_url} | grep 'RTM' | grep -v WITH_CKBI | sed 's|.*>\(NSS_[0-9]*_[0-9]*_*[0-9]*_*[0-9]*_RTM\)/.*|\1|g' | sed 's|NSS_||g' | sed 's|_RTM||g' | sed 's|_|.|g' | sort -V | tail -1)" +hash="$(nix-hash --type sha256 --base32 ${base_url}/NSS_${version/\./_}_RTM/src/nss-${version}.tar.gz)" +update-source-version nss "${version}" "${hash}" diff --git a/nixpkgs/pkgs/development/libraries/openal-soft/default.nix b/nixpkgs/pkgs/development/libraries/openal-soft/default.nix index 2d469a406dec..d28f7b25792e 100644 --- a/nixpkgs/pkgs/development/libraries/openal-soft/default.nix +++ b/nixpkgs/pkgs/development/libraries/openal-soft/default.nix @@ -1,45 +1,39 @@ { lib, stdenv, fetchFromGitHub, cmake -, alsaSupport ? !stdenv.isDarwin, alsa-lib ? null -, pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null +, alsaSupport ? !stdenv.isDarwin, alsa-lib +, pulseSupport ? !stdenv.isDarwin, libpulseaudio , CoreServices, AudioUnit, AudioToolbox }: -with lib; - -assert alsaSupport -> alsa-lib != null; -assert pulseSupport -> libpulseaudio != null; - stdenv.mkDerivation rec { - version = "1.19.1"; pname = "openal-soft"; + version = "1.21.1"; src = fetchFromGitHub { owner = "kcat"; repo = "openal-soft"; - rev = "${pname}-${version}"; - sha256 = "0b0g0q1c36nfb289xcaaj3cmyfpiswvvgky3qyalsf9n4dj7vnzi"; + rev = version; + sha256 = "sha256-rgc6kjXaZb6sCR+e9Gu7BEEHIiCHMygpLIeSqgWkuAg="; }; # this will make it find its own data files (e.g. HRTF profiles) # without any other configuration patches = [ ./search-out.patch ]; postPatch = '' - substituteInPlace Alc/helpers.c \ + substituteInPlace alc/helpers.cpp \ --replace "@OUT@" $out ''; nativeBuildInputs = [ cmake ]; - buildInputs = [] - ++ optional alsaSupport alsa-lib - ++ optional pulseSupport libpulseaudio - ++ optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; + buildInputs = lib.optional alsaSupport alsa-lib + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; - NIX_LDFLAGS = toString ([] - ++ optional alsaSupport "-lasound" - ++ optional pulseSupport "-lpulse"); + NIX_LDFLAGS = toString ( + lib.optional alsaSupport "-lasound" + ++ lib.optional pulseSupport "-lpulse"); - meta = { + meta = with lib; { description = "OpenAL alternative"; homepage = "https://kcat.strangesoft.net/openal.html"; license = licenses.lgpl2; diff --git a/nixpkgs/pkgs/development/libraries/openal-soft/search-out.patch b/nixpkgs/pkgs/development/libraries/openal-soft/search-out.patch index 0f9c2abad3c3..796642aa3c89 100644 --- a/nixpkgs/pkgs/development/libraries/openal-soft/search-out.patch +++ b/nixpkgs/pkgs/development/libraries/openal-soft/search-out.patch @@ -1,12 +1,12 @@ -diff -Nuar a/Alc/helpers.c b/Alc/helpers.c ---- a/Alc/helpers.c 1970-01-01 00:00:01.000000000 +0000 -+++ b/Alc/helpers.c 1970-01-01 00:00:02.000000000 +0000 -@@ -951,6 +951,8 @@ - } - } +diff --git a/alc/helpers.cpp b/alc/helpers.cpp +index 8c1c856..19bbc0f 100644 +--- a/alc/helpers.cpp ++++ b/alc/helpers.cpp +@@ -402,6 +402,7 @@ al::vector<std::string> SearchDataFiles(const char *ext, const char *subdir) -+ DirectorySearch("@OUT@/share", ext, &results); -+ - alstr_reset(&path); + DirectorySearch(path.c_str(), ext, &results); } ++ DirectorySearch("@OUT@/share/", ext, &results); + return results; + } diff --git a/nixpkgs/pkgs/development/libraries/opencolorio/default.nix b/nixpkgs/pkgs/development/libraries/opencolorio/default.nix index 522c8cfa4a13..a660008841a3 100644 --- a/nixpkgs/pkgs/development/libraries/opencolorio/default.nix +++ b/nixpkgs/pkgs/development/libraries/opencolorio/default.nix @@ -16,13 +16,13 @@ with lib; stdenv.mkDerivation rec { pname = "opencolorio"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenColorIO"; rev = "v${version}"; - sha256 = "194j9jp5c8ws0fryiz936wyinphnpzwpqnzvw9ryx6rbiwrba487"; + sha256 = "sha256-Yr7yypXxf3ZvQVsDxVuKTN/DGPaLkIWli26RRoEDMdA="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/opencv/3.x.nix b/nixpkgs/pkgs/development/libraries/opencv/3.x.nix index 33b1cd187571..dfb67b6a12a7 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/3.x.nix +++ b/nixpkgs/pkgs/development/libraries/opencv/3.x.nix @@ -1,5 +1,6 @@ { lib, stdenv -, fetchFromGitHub, fetchpatch +, fetchFromGitHub +, fetchpatch , cmake, pkg-config, unzip, zlib, pcre, hdf5 , glog, boost, gflags, protobuf , config @@ -39,20 +40,20 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; assert enablePython -> pythonPackages != null; let - version = "3.4.8"; + version = "3.4.15"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "1dnz3gfj70lm1gbrk8pz28apinlqi2x6nvd6xcy5hs08505nqnjp"; + hash = "sha256-dLwQM2VhVlBV4xazS2rItTscKYeeNlNT0G8G1A1mOmc="; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "0psaa1yx36n34l09zd1y8jxgf8q4jzxd3vn06fqmzwzy85hcqn8i"; + hash = "sha256-FJDRMmSOT5jA+n2Ke0gEH7n5rgGvB1UzYpYZ1vmucjg="; }; # Contrib must be built in order to enable Tesseract support: @@ -151,6 +152,16 @@ stdenv.mkDerivation { cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib" ''; + # Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV. + patches = [ + ./cmake-don-t-use-OpenCVFindOpenEXR.patch + # Fix usage of deprecated version of protobuf' SetTotalBytesLimit. Remove with the next release. + (fetchpatch { + url = "https://github.com/opencv/opencv/commit/384875f4fcf1782b10699a379aa245a03cb27a04.patch"; + sha256 = "1agwd0pm07m2dy8a62vmfl4n73dsmsdll2a73q6kara9wm3jlp41"; + }) + ]; + # This prevents cmake from using libraries in impure paths (which # causes build failure on non NixOS) # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with diff --git a/nixpkgs/pkgs/development/libraries/opencv/4.x.nix b/nixpkgs/pkgs/development/libraries/opencv/4.x.nix index a33eff4faa53..c3f46d8e31ef 100644 --- a/nixpkgs/pkgs/development/libraries/opencv/4.x.nix +++ b/nixpkgs/pkgs/development/libraries/opencv/4.x.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , fetchFromGitHub , cmake , pkg-config @@ -214,11 +215,18 @@ stdenv.mkDerivation { cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib" ''; - # This prevents cmake from using libraries in impure paths (which - # causes build failure on non NixOS) + # Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV. patches = [ ./cmake-don-t-use-OpenCVFindOpenEXR.patch + # Fix usage of deprecated version of protobuf' SetTotalBytesLimit. Remove with the next release. + (fetchpatch { + url = "https://github.com/opencv/opencv/commit/384875f4fcf1782b10699a379aa245a03cb27a04.patch"; + sha256 = "1agwd0pm07m2dy8a62vmfl4n73dsmsdll2a73q6kara9wm3jlp41"; + }) ] ++ lib.optional enableCuda ./cuda_opt_flow.patch; + + # This prevents cmake from using libraries in impure paths (which + # causes build failure on non NixOS) postPatch = '' sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt ''; diff --git a/nixpkgs/pkgs/development/libraries/opendht/default.nix b/nixpkgs/pkgs/development/libraries/opendht/default.nix index 3cf29b7351e9..2de005d885a1 100644 --- a/nixpkgs/pkgs/development/libraries/opendht/default.nix +++ b/nixpkgs/pkgs/development/libraries/opendht/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.2.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = version; - sha256 = "sha256-u4MWMUbnq2q4FH0TMpbrbhS5erAfT4/3HYGLXaLTz+I="; + sha256 = "sha256-Os5PRYTZMVekQrbwNODWsHANTx6RSC5vzGJ5JoYtvtE="; }; nativeBuildInputs = diff --git a/nixpkgs/pkgs/development/libraries/openmpi/default.nix b/nixpkgs/pkgs/development/libraries/openmpi/default.nix index 35708c0ac016..d3323b1fa9e0 100644 --- a/nixpkgs/pkgs/development/libraries/openmpi/default.nix +++ b/nixpkgs/pkgs/development/libraries/openmpi/default.nix @@ -46,14 +46,14 @@ in stdenv.mkDerivation rec { ''; buildInputs = [ zlib ] - ++ lib.optionals fortranSupport [ gfortran ] ++ lib.optionals stdenv.isLinux [ libnl numactl pmix ucx ] ++ lib.optionals cudaSupport [ cudatoolkit ] ++ [ libevent hwloc ] ++ lib.optional (stdenv.isLinux || stdenv.isFreeBSD) rdma-core ++ lib.optional fabricSupport [ libpsm2 libfabric ]; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl ] + ++ lib.optionals fortranSupport [ gfortran ]; configureFlags = lib.optional (!cudaSupport) "--disable-mca-dso" ++ lib.optional (!fortranSupport) "--disable-mpi-fortran" diff --git a/nixpkgs/pkgs/development/libraries/openvino/default.nix b/nixpkgs/pkgs/development/libraries/openvino/default.nix index b4e487887999..86bc3b0d009c 100644 --- a/nixpkgs/pkgs/development/libraries/openvino/default.nix +++ b/nixpkgs/pkgs/development/libraries/openvino/default.nix @@ -3,6 +3,7 @@ , autoPatchelfHook , stdenv , fetchFromGitHub +, fetchpatch , cmake , git , protobuf @@ -10,17 +11,29 @@ , opencv , unzip , shellcheck +, srcOnly , python , enablePython ? false }: let - onnx_src = fetchFromGitHub { - owner = "onnx"; - repo = "onnx"; - rev = "v1.8.1"; - sha256 = "+1zNnZ4lAyVYRptfk0PV7koIX9FqcfD1Ah33qj/G2rA="; + onnx_src = srcOnly { + name = "onnx-patched"; + src = fetchFromGitHub { + owner = "onnx"; + repo = "onnx"; + rev = "v1.8.1"; + sha256 = "+1zNnZ4lAyVYRptfk0PV7koIX9FqcfD1Ah33qj/G2rA="; + }; + patches = [ + # Fix build with protobuf 3.18+ + # Remove with onnx 1.9 release + (fetchpatch { + url = "https://github.com/onnx/onnx/commit/d3bc82770474761571f950347560d62a35d519d7.patch"; + sha256 = "0vdsrklkzhdjaj8wdsl4icn93q3961g8dx35zvff0nhpr08wjb7y"; + }) + ]; }; in diff --git a/nixpkgs/pkgs/development/libraries/orocos-kdl/default.nix b/nixpkgs/pkgs/development/libraries/orocos-kdl/default.nix index 4eb18c347c09..c60d79fd492f 100644 --- a/nixpkgs/pkgs/development/libraries/orocos-kdl/default.nix +++ b/nixpkgs/pkgs/development/libraries/orocos-kdl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "orocos-kdl"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "orocos"; repo = "orocos_kinematics_dynamics"; rev = "v${version}"; - sha256 = "181w2q6lsrfcvrgqwi6m0xrydjlblj1b654apf2d7zjc7qqgd6ca"; + sha256 = "15ky7vw461005axx96d0f4zxdnb9dxl3h082igyd68sbdb8r1419"; # Needed to build Python bindings fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/libraries/pangomm/2.48.nix b/nixpkgs/pkgs/development/libraries/pangomm/2.48.nix index 3c25d113d727..c2ab99395453 100644 --- a/nixpkgs/pkgs/development/libraries/pangomm/2.48.nix +++ b/nixpkgs/pkgs/development/libraries/pangomm/2.48.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "pangomm"; - version= "2.48.0"; + version= "2.48.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ng7UdMM/jCACyp4rYcoNHz2OQJ4J6Z9NjBnur8z1W3g="; + sha256 = "sha256-d2rVPnkeQxBrf0D/CDS+5uTrHGrXy20hVUb3o98O3E0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix b/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix index 65aa7b8b4703..3ed2f24f45f9 100644 --- a/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/applgrid/default.nix @@ -9,8 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1yw9wrk3vjv84kd3j4s1scfhinirknwk6xq0hvj7x2srx3h93q9p"; }; + nativeBuildInputs = [ gfortran ]; + # For some reason zlib was only needed after bump to gfortran8 - buildInputs = [ gfortran hoppet lhapdf root5 zlib ]; + buildInputs = [ hoppet lhapdf root5 zlib ]; patches = [ ./bad_code.patch diff --git a/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix b/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix index 35ce8dedca74..65fb04b707ab 100644 --- a/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/fastjet/default.nix @@ -1,20 +1,24 @@ -{ lib, stdenv, fetchurl, python2 }: +{ lib +, stdenv +, fetchurl +, python +, withPython ? false +}: stdenv.mkDerivation rec { pname = "fastjet"; - version = "3.3.4"; + version = "3.4.0"; src = fetchurl { url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz"; - sha256 = "00zwvmnp2j79z95n9lgnq67q02bqfgirqla8j9y6jd8k3r052as3"; + hash = "sha256-7gfIdHyOrYbYjeSp5OjR6efXYUlz9WMbqCl/egJHi5E="; }; - buildInputs = [ python2 ]; + buildInputs = lib.optional withPython python; configureFlags = [ "--enable-allcxxplugins" - "--enable-pyext" - ]; + ] ++ lib.optional withPython "--enable-pyext"; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix b/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix index 0a7e9b4d948e..1c3bfaa2064e 100644 --- a/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix @@ -9,9 +9,9 @@ stdenv.mkDerivation rec { sha256 = "10y3fb33zsinr0z3hzap9rsbcqhy1yjqnv4b4vz21g7mdlw6pq2k"; }; - nativeBuildInputs = [ autoconf automake libtool ]; + nativeBuildInputs = [ autoconf automake libtool gfortran ]; - buildInputs = [ boost fastjet gfortran gsl thepeg zlib ] + buildInputs = [ boost fastjet gsl thepeg zlib ] # There is a bug that requires for default PDF's to be present during the build ++ (with lhapdf.pdf_sets; [ CT14lo CT14nlo ]); diff --git a/nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix b/nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix index 7ad5b9861a1d..af90192878d7 100644 --- a/nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/hoppet/default.nix @@ -9,8 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0j7437rh4xxbfzmkjr22ry34xm266gijzj6mvrq193fcsfzipzdz"; }; - buildInputs = [ gfortran ]; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl gfortran ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/physics/mela/default.nix b/nixpkgs/pkgs/development/libraries/physics/mela/default.nix index 90cf5ac8b2d1..e48a2f4638bc 100644 --- a/nixpkgs/pkgs/development/libraries/physics/mela/default.nix +++ b/nixpkgs/pkgs/development/libraries/physics/mela/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "01sgd4mwx4n58x95brphp4dskqkkx8434bvsr38r5drg9na5nc9y"; }; - buildInputs = [ gfortran ]; + nativeBuildInputs = [ gfortran ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch b/nixpkgs/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch index 1f1a98780e9c..d3851604a131 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch +++ b/nixpkgs/pkgs/development/libraries/pipewire/0090-pipewire-config-template-paths.patch @@ -1,8 +1,8 @@ diff --git a/src/daemon/pipewire.conf.in b/src/daemon/pipewire.conf.in -index bbafa134..227d3e06 100644 +index 95632c250..a88aac6e2 100644 --- a/src/daemon/pipewire.conf.in +++ b/src/daemon/pipewire.conf.in -@@ -116,7 +116,7 @@ context.modules = [ +@@ -131,7 +131,7 @@ context.modules = [ # access.allowed to list an array of paths of allowed # apps. #access.allowed = [ @@ -11,18 +11,18 @@ index bbafa134..227d3e06 100644 #] # An array of rejected paths. -@@ -220,12 +220,12 @@ context.exec = [ +@@ -235,12 +235,12 @@ context.exec = [ # but it is better to start it as a systemd service. # Run the session manager with -h for options. # -- @comment@{ path = "@session_manager_path@" args = "@session_manager_args@" } -+ @comment@{ path = "<session_manager_path>" args = "@session_manager_args@" } +- @sm_comment@{ path = "@session_manager_path@" args = "@session_manager_args@" } ++ @sm_comment@{ path = "<session_manager_path>" args = "@session_manager_args@" } # # You can optionally start the pulseaudio-server here as well # but it is better to start it as a systemd service. # It can be interesting to start another daemon here that listens # on another address with the -a option (eg. -a tcp:4713). # -- @comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } -+ @comment@{ path = "<pipewire_path>" args = "-c pipewire-pulse.conf" } +- @pulse_comment@{ path = "@pipewire_path@" args = "-c pipewire-pulse.conf" } ++ @pulse_comment@{ path = "<pipewire_path>" args = "-c pipewire-pulse.conf" } ] diff --git a/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/nixpkgs/pkgs/development/libraries/pipewire/default.nix index ed22eb6c6838..0ada18539984 100644 --- a/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -7,6 +7,7 @@ , ninja , systemd , pkg-config +, docutils , doxygen , graphviz , valgrind @@ -57,7 +58,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.34"; + version = "0.3.36"; outputs = [ "out" @@ -66,6 +67,7 @@ let "jack" "dev" "doc" + "man" "mediaSession" "installedTests" ]; @@ -75,7 +77,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-ZFARA7YuDnpObGLWbgy1Rk+wzmAxHEMuHQkb6tWD0s0="; + sha256 = "sha256-kwoffB0Hi84T4Q0NaxLxsCyPV4R0LayX9kHmXU/vRPA="; }; patches = [ @@ -94,6 +96,7 @@ let ]; nativeBuildInputs = [ + docutils doxygen graphviz meson @@ -125,7 +128,6 @@ let mesonFlags = [ "-Ddocs=enabled" - "-Dman=disabled" # we don't have xmltoman "-Dexamples=${mesonEnable withMediaSession}" # only needed for `pipewire-media-session` "-Dudevrulesdir=lib/udev/rules.d" "-Dinstalled_tests=enabled" diff --git a/nixpkgs/pkgs/development/libraries/pixman/default.nix b/nixpkgs/pkgs/development/libraries/pixman/default.nix index a8cea4638069..d8f2e3bd5599 100644 --- a/nixpkgs/pkgs/development/libraries/pixman/default.nix +++ b/nixpkgs/pkgs/development/libraries/pixman/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0l0m48lnmdlmnaxn2021qi5cj366d9fzfjxkqgcj9bs14pxbgaw4"; }; + separateDebugInfo = true; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng ]; diff --git a/nixpkgs/pkgs/development/libraries/poco/default.nix b/nixpkgs/pkgs/development/libraries/poco/default.nix index 8f963bb366a9..57e8fb1a5a75 100644 --- a/nixpkgs/pkgs/development/libraries/poco/default.nix +++ b/nixpkgs/pkgs/development/libraries/poco/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, pkg-config, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }: +{ lib, stdenv, fetchurl, fetchpatch, cmake, pkg-config, zlib, pcre, expat, sqlite, openssl, unixODBC, libmysqlclient }: stdenv.mkDerivation rec { pname = "poco"; @@ -10,9 +10,31 @@ stdenv.mkDerivation rec { sha256 = "1jilzh0h6ik5lr167nax7q6nrpzxl99p11pkl202ig06pgh32nbz"; }; + patches = [ + # Use GNUInstallDirs (https://github.com/pocoproject/poco/pull/3105) + (fetchpatch { + name = "use-gnuinstalldirs.patch"; + url = "https://github.com/pocoproject/poco/commit/9e8f84dff4575f01be02e0b07364efd1561ce66c.patch"; + sha256 = "1bj4i93gxr7pwx33bfyhg20ad4ak1rbxkrlpsgzk7rm6mh0mld26"; + # Files not included in release tarball + excludes = [ + "Encodings/Compiler/CMakeLists.txt" + "PocoDoc/CMakeLists.txt" + "NetSSL_Win/CMakeLists.txt" + "PDF/CMakeLists.txt" + "SevenZip/CMakeLists.txt" + "ApacheConnector/CMakeLists.txt" + "CppParser/CMakeLists.txt" + ]; + }) + ]; + nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ zlib pcre expat sqlite openssl unixODBC libmysqlclient ]; + buildInputs = [ openssl unixODBC libmysqlclient ]; + propagatedBuildInputs = [ zlib pcre expat sqlite ]; + + outputs = [ "out" "dev" ]; MYSQL_DIR = libmysqlclient; MYSQL_INCLUDE_DIR = "${MYSQL_DIR}/include/mysql"; diff --git a/nixpkgs/pkgs/development/libraries/protobuf/3.18.nix b/nixpkgs/pkgs/development/libraries/protobuf/3.18.nix new file mode 100644 index 000000000000..c670b56c7c5a --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/protobuf/3.18.nix @@ -0,0 +1,6 @@ +{ callPackage, ... }: + +callPackage ./generic-v3.nix { + version = "3.18.0"; + sha256 = "0nhjw4m4dm6wqwwsi0b18js5wbh3ibrpsq195g6mk9cx54fx097f"; +} diff --git a/nixpkgs/pkgs/development/libraries/qrupdate/default.nix b/nixpkgs/pkgs/development/libraries/qrupdate/default.nix index ad7e88d4647e..2f119311c1f2 100644 --- a/nixpkgs/pkgs/development/libraries/qrupdate/default.nix +++ b/nixpkgs/pkgs/development/libraries/qrupdate/default.nix @@ -42,9 +42,7 @@ stdenv.mkDerivation rec { installTargets = lib.optionals stdenv.isDarwin [ "install-staticlib" "install-shlib" ]; - buildInputs = [ gfortran ]; - - nativeBuildInputs = [ which ]; + nativeBuildInputs = [ which gfortran ]; meta = with lib; { description = "Library for fast updating of qr and cholesky decompositions"; diff --git a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix index 04a89558c3d0..3cb8a3e801cc 100644 --- a/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -177,6 +177,7 @@ stdenv.mkDerivation { ''-D${if compareVersion "5.11.0" >= 0 then "LIBRESOLV_SO" else "NIXPKGS_LIBRESOLV"}="${stdenv.cc.libc.out}/lib/libresolv"'' ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' ] ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"'' + ++ lib.optional stdenv.isLinux "-DUSE_X11" ++ lib.optionals withGtk3 [ ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"'' ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"'' diff --git a/nixpkgs/pkgs/development/libraries/qtutilities/default.nix b/nixpkgs/pkgs/development/libraries/qtutilities/default.nix index 99cf50a7ba04..7871c1fd9a8d 100644 --- a/nixpkgs/pkgs/development/libraries/qtutilities/default.nix +++ b/nixpkgs/pkgs/development/libraries/qtutilities/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "qtutilities"; - version = "6.3.3"; + version = "6.5.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RoI1huVei4SmAUhuYruzgod0/qIlnrZSHEMceQc2jzc="; + sha256 = "sha256-+W5EdnB0QbI22iDWRyj+ntp/l/Kc6VHca2LwmHA7pgA="; }; buildInputs = [ qtbase cpp-utilities ]; diff --git a/nixpkgs/pkgs/development/libraries/rdkafka/default.nix b/nixpkgs/pkgs/development/libraries/rdkafka/default.nix index 41a5526fc5e2..78ffab44edd9 100644 --- a/nixpkgs/pkgs/development/libraries/rdkafka/default.nix +++ b/nixpkgs/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "sha256-NLlg9S3bn5rAFyRa1ETeQGhFJYb/1y2ZiDylOy7xNbY="; + sha256 = "sha256-LTO27UQqGHOEOXaw2Aln1i37ZaXIAKK8r7P2WAx8nIQ="; }; nativeBuildInputs = [ pkg-config python3 ]; diff --git a/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix index be4b9710533b..2ad169f2a3f6 100644 --- a/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix +++ b/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "s2n-tls"; - version = "1.0.16"; + version = "1.0.17"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gF4VhNEq/gpxXqOKvBtWZ5iZ3Jf98vSuSZYUu8r1jKA="; + sha256 = "sha256-6XqBpNURU8fzGkTt4jsijgMiOkzMebmLmPAq8yQsTg4="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix index eb0f34db26f5..0ab4c8cd6ca6 100644 --- a/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "indilib"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${version}"; - sha256 = "sha256-qXGTHyXhJrApexQL31fba0ZvnHEyTsY3Tb7aB4GpGn4="; + sha256 = "sha256-5MaN1aNyHpZzKwQPUpp9NYRh7i+lx1N70+J1gczdtAE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index 5909a06cfb59..c4faadd2a5eb 100644 --- a/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -40,7 +40,8 @@ stdenv.mkDerivation rec { postPatch = '' for f in indi-qsi/CMakeLists.txt \ indi-dsi/CMakeLists.txt \ - indi-armadillo-platypus/CMakeLists.txt + indi-armadillo-platypus/CMakeLists.txt \ + indi-orion-ssg3/CMakeLists.txt do substituteInPlace $f \ --replace "/lib/udev/rules.d" "lib/udev/rules.d" \ diff --git a/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix index 4ac9a122fd2f..5cdd4c4b2b26 100644 --- a/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix +++ b/nixpkgs/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix @@ -1,12 +1,12 @@ { stdenv, lib, callPackage, fetchFromGitHub, indilib }: let - indi-version = "1.9.1"; + indi-version = "1.9.2"; indi-3rdparty-src = fetchFromGitHub { owner = "indilib"; repo = "indi-3rdparty"; rev = "v${indi-version}"; - sha256 = "sha256-F0O4WUYdUL6IjJyON/XJp78v4n5rj0unm1xTzEsEH0k="; + sha256 = "sha256-dpuJ/J5gc+kAklbvMjsWic9jusXWB4gUcT8E/1eSLXQ="; }; indi-firmware = callPackage ./indi-firmware.nix { version = indi-version; diff --git a/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix index a26a3bb6d8d9..88336f21ed27 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix @@ -22,9 +22,8 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake gfortran ]; buildInputs = assert (blas.isILP64 == lapack.isILP64); [ - gfortran blas lapack eigen diff --git a/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix index 85a73ccd5697..cfdc102e0447 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/blas/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-LjYNmcm9yEB6YYiMQKqFP7QhlCDruCZNtIbLiGBGirM="; }; - buildInputs = [ gfortran ]; + nativeBuildInputs = [ gfortran ]; configurePhase = '' echo >make.inc "SHELL = ${stdenv.shell}" diff --git a/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix b/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix index fe9a8b671459..202903b9aa18 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/caffe2/default.nix @@ -139,5 +139,9 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ yuriaisaka ]; + # fails to compile with + # error: invalid conversion from 'const char*' to 'char*' + # TODO: Remove usage of python2, protobuf overwrite + broken = true; }; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/nixpkgs/pkgs/development/libraries/science/math/cholmod-extra/default.nix index 38d1b126ea4e..311ffefcfaad 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/cholmod-extra/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/cholmod-extra/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0hz1lfp0zaarvl0dv0zgp337hyd8np41kmdpz5rr3fc6yzw7vmkg"; }; - buildInputs = [ suitesparse gfortran blas lapack ]; + nativeBuildInputs = [ gfortran ]; + buildInputs = [ suitesparse blas lapack ]; makeFlags = [ "BLAS=-lcblas" diff --git a/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix index fcb49d70a3b1..a87d107b3a17 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix @@ -35,9 +35,8 @@ stdenv.mkDerivation rec { "-DBUILD_TEST=OFF" ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake gfortran ]; buildInputs = [ - gfortran blas python3 boost diff --git a/nixpkgs/pkgs/development/libraries/science/math/cutensor/default.nix b/nixpkgs/pkgs/development/libraries/science/math/cutensor/default.nix index 1b5895b02bb3..b8f4475ce122 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/cutensor/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/cutensor/default.nix @@ -1,6 +1,6 @@ { callPackage , cudatoolkit_10_1, cudatoolkit_10_2 -, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 +, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2, cudatoolkit_11_3, cudatoolkit_11_4 }: rec { @@ -33,5 +33,13 @@ rec { cudatoolkit = cudatoolkit_11_2; }; + cutensor_cudatoolkit_11_3 = cutensor_cudatoolkit_11_0.override { + cudatoolkit = cudatoolkit_11_3; + }; + + cutensor_cudatoolkit_11_4 = cutensor_cudatoolkit_11_0.override { + cudatoolkit = cudatoolkit_11_4; + }; + cutensor_cudatoolkit_11 = cutensor_cudatoolkit_11_2; } diff --git a/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix b/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix index d1d7a9b9f342..e0dfef0b7eec 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/ipopt/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { "--with-lapack-lib=-llapack" ]; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ unzip gfortran ]; - buildInputs = [ gfortran blas lapack ]; + buildInputs = [ blas lapack ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix b/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix index 5d3c3f40f1d4..bf7eb3d0d38c 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, perl, which +{ lib, stdenv, fetchFromGitHub, perl, which # Most packages depending on openblas expect integer width to match # pointer width, but some expect to use 32-bit integers always # (for compatibility with reference BLAS). @@ -129,7 +129,7 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.15"; + version = "0.3.17"; outputs = [ "out" "dev" ]; @@ -137,23 +137,9 @@ stdenv.mkDerivation rec { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "1qjr02cqncv20abdp1yzr55n7smhx6h9chqvb0xbp18byynvj87w"; + sha256 = "11j103s851mml6kns781kha0asxjz6b6s1vbv80aq3b6g7p05pms"; }; - # remove both patches when updating to 0.3.16 - patches = [ - (fetchpatch { - name = "riscv64-imin-fix-wrong-comparison.patch"; - url = "https://github.com/xianyi/OpenBLAS/commit/1e0192a5ccac28fc0c749f49d36ec7eda9757428.patch"; - sha256 = "0kjkmrj8023vcjxhgin5dqs5w3gf93hzhwdhg0vsjhdra2ghkwzj"; - }) - (fetchpatch { - name = "riscv64-generic-use-generic-kernel-for-dsdot.patch"; - url = "https://github.com/xianyi/OpenBLAS/commit/3521cd48cbfb3d50f6ae9a10377382d37075c696.patch"; - sha256 = "0ljwbldff4db377s8rzmqxrszilqdivy656yqvfq46x5338v3gi0"; - }) - ]; - inherit blas64; # Some hardening features are disabled due to sporadic failures in diff --git a/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix b/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix index 34ebc36ebb92..0252b7baa162 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/openlibm/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "openlibm"; - version = "0.7.5"; + version = "0.8.0"; src = fetchurl { url = "https://github.com/JuliaLang/openlibm/archive/v${version}.tar.gz"; - sha256 = "sha256-vpg7nh5A5pbou7frj2N208oK5nWubYKTZUA4Ww7uwVs="; + sha256 = "sha256-A2IHaN9MpSamPdZ1xt6VpcnRZ/9ZVVzlemHGv0nkAO4="; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix b/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix index 3b84a9d99cbe..3b1fb98a42ea 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { sha256 = "1c10d18gj3kvpmyv5q246x35hjxaqn4ygy1cygaydhyxnm4klzdj"; }; - nativeBuildInputs = [ cmake openssh ]; - buildInputs = [ mpi gfortran blas lapack ]; + nativeBuildInputs = [ cmake openssh gfortran ]; + buildInputs = [ mpi blas lapack ]; doCheck = true; diff --git a/nixpkgs/pkgs/development/libraries/science/math/spooles/default.nix b/nixpkgs/pkgs/development/libraries/science/math/spooles/default.nix index 6f4ddb3f787e..6e94d093a2cb 100644 --- a/nixpkgs/pkgs/development/libraries/science/math/spooles/default.nix +++ b/nixpkgs/pkgs/development/libraries/science/math/spooles/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gfortran, perl }: +{ lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { pname = "spooles"; diff --git a/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix b/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix index b047d6870746..ea1bb4936834 100644 --- a/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix @@ -5,6 +5,7 @@ , freetype , cmake , static ? stdenv.hostPlatform.isStatic +, libgcc }: stdenv.mkDerivation rec { @@ -18,7 +19,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = [ freetype ]; + buildInputs = [ freetype ] + # On aarch64-darwin libgcc won't even build currently, and it doesn't seem needed. + ++ lib.optionals (with stdenv; !cc.isGNU && !(isDarwin && isAarch64)) [ libgcc ]; patches = lib.optionals stdenv.isDarwin [ ./macosx.patch ]; diff --git a/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/nixpkgs/pkgs/development/libraries/simdjson/default.nix index 3ee1a1d0689e..18ba50cb96f1 100644 --- a/nixpkgs/pkgs/development/libraries/simdjson/default.nix +++ b/nixpkgs/pkgs/development/libraries/simdjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "0.9.7"; + version = "1.0.0"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-3ZLEp2RQhQ7QsRGLimWlZQM8PMTv07NlFoe64ES2+Ug="; + sha256 = "sha256-4I3w3sZRBdHVpUP0O7H7LGUM5uInyrSeHTe5ov5Qcyc="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix b/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix index e1ba9dbc1e61..1f68f044cda5 100644 --- a/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix +++ b/nixpkgs/pkgs/development/libraries/socket_wrapper/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, cmake, pkg-config }: stdenv.mkDerivation rec { - name = "socket_wrapper-1.2.5"; + pname = "socket_wrapper"; + version = "1.3.3"; src = fetchurl { - url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "1wb3gq0rj5h92mhq6f1hb2qy4ypkxvn8y87ag88c7gc71nkpa1fx"; + url = "mirror://samba/cwrap/socket_wrapper-${version}.tar.gz"; + sha256 = "sha256-G42i+w7n3JkPvOc039I+frzDnq1GGGyQqUkMFdoebhM="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/development/libraries/spandsp/default.nix b/nixpkgs/pkgs/development/libraries/spandsp/default.nix index 240c86534335..406603e66225 100644 --- a/nixpkgs/pkgs/development/libraries/spandsp/default.nix +++ b/nixpkgs/pkgs/development/libraries/spandsp/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, audiofile, libtiff}: +{ lib, stdenv, fetchurl, audiofile, libtiff, buildPackages }: stdenv.mkDerivation rec { version = "0.0.6"; pname = "spandsp"; @@ -8,7 +8,19 @@ stdenv.mkDerivation rec { }; outputs = [ "out" "dev" ]; + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + configureFlags = [ + # This flag is required to prevent linking error in the cross-compilation case. + # I think it's fair to assume that realloc(NULL, size) will return a valid memory + # block for most libc implementation, so let's just assume that and hope for the best. + "ac_cv_func_malloc_0_nonnull=yes" + ]; + + strictDeps = true; + depsBuildBuild = [ buildPackages.stdenv.cc ]; propagatedBuildInputs = [audiofile libtiff]; meta = { description = "A portable and modular SIP User-Agent with audio and video support"; diff --git a/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/nixpkgs/pkgs/development/libraries/sqlite/default.nix index 7e53222d0a33..96028009e2cb 100644 --- a/nixpkgs/pkgs/development/libraries/sqlite/default.nix +++ b/nixpkgs/pkgs/development/libraries/sqlite/default.nix @@ -13,12 +13,12 @@ in stdenv.mkDerivation rec { pname = "sqlite"; - version = "3.35.5"; + version = "3.36.0"; # 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 = "9StypcMZw+UW7XqS4SMTmm6Hrwii3EPXdXck9hMubbA="; + sha256 = "sha256-vZDD65a+6ZYga4O+cGXJzhmu84w/T7Uwc62g0LabvOM="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/nixpkgs/pkgs/development/libraries/srtp/default.nix b/nixpkgs/pkgs/development/libraries/srtp/default.nix index 0dbfef2c6394..b0ab391a89f0 100644 --- a/nixpkgs/pkgs/development/libraries/srtp/default.nix +++ b/nixpkgs/pkgs/development/libraries/srtp/default.nix @@ -1,40 +1,57 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config -, openssl ? null, libpcap ? null +{ lib +, stdenv +, fetchFromGitHub +, libpcap +, meson +, ninja +, openssl +, pkg-config }: -with lib; stdenv.mkDerivation rec { pname = "libsrtp"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "cisco"; repo = "libsrtp"; rev = "v${version}"; - sha256 = "1f7i3jdh1wzdv7zjlz7gs3xw5jqig9zw8z9awsqqcp54f94xdpvd"; + sha256 = "0syl2ywddgqz29h43d6rc7waf3hp2yc14yhnrvdsja2bg8wrv6sb"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkg-config ]; - - # libsrtp.pc references -lcrypto -lpcap without -L - propagatedBuildInputs = [ openssl libpcap ]; - - configureFlags = [ - "--disable-debug" - ] ++ optional (openssl != null) "--enable-openssl"; + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + libpcap + openssl + ]; + + # rtpw tests hang + preConfigure = '' + rm test/rtpw_test.sh \ + test/rtpw_test_gcm.sh + ''; - buildFlags = [ "shared_library" ]; + mesonFlags = [ + "-Dcrypto-library=openssl" + "-Dcrypto-library-kdf=disabled" + "-Ddoc=disabled" + "-Dtests=${if doCheck then "enabled" else "disabled"}" + ]; - postInstall = '' - rm -rf $out/bin - ''; + doCheck = true; - meta = { + meta = with lib; { homepage = "https://github.com/cisco/libsrtp"; description = "Secure RTP (SRTP) Reference Implementation"; license = licenses.bsd3; platforms = platforms.all; + maintainers = with maintainers; [ r-burns ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/sundials/default.nix b/nixpkgs/pkgs/development/libraries/sundials/default.nix index f04b22abe8c6..75c238a430c4 100644 --- a/nixpkgs/pkgs/development/libraries/sundials/default.nix +++ b/nixpkgs/pkgs/development/libraries/sundials/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { hash = "sha256-SNp7qoFS3bIq7RsC2C0du0+/6iKs9nY0ARqgMDoQCkM="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake gfortran ]; buildInputs = [ python @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { ++ lib.optionals (lapackSupport) # Check that the same index size is used for both libraries (assert (blas.isILP64 == lapack.isILP64); [ - gfortran blas lapack ]) diff --git a/nixpkgs/pkgs/development/libraries/symengine/default.nix b/nixpkgs/pkgs/development/libraries/symengine/default.nix index 01ec3a4fba29..92ecf3e494e1 100644 --- a/nixpkgs/pkgs/development/libraries/symengine/default.nix +++ b/nixpkgs/pkgs/development/libraries/symengine/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "symengine"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine"; rev = "v${version}"; - sha256 = "sha256-aoitTT9fwTIs3ovfqQjKGgrU+kT5mj+vDHt5lg49JHU="; + sha256 = "sha256-HTDOSgdWo9MWmKeXOkOHAJjgvihUAkSXoYTeMz9XXLI="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/tcltls/default.nix b/nixpkgs/pkgs/development/libraries/tcltls/default.nix index 8883ad5dd440..a0a1c0ae53cc 100644 --- a/nixpkgs/pkgs/development/libraries/tcltls/default.nix +++ b/nixpkgs/pkgs/development/libraries/tcltls/default.nix @@ -2,11 +2,11 @@ tcl.mkTclDerivation rec { pname = "tcltls"; - version = "1.7.21"; + version = "1.7.22"; src = fetchurl { url = "https://core.tcl-lang.org/tcltls/uv/tcltls-${version}.tar.gz"; - sha256 = "0xf1rfsnn4k9j1bd2a1p8ir0xr4a3phgr9lcgbazh4084l2y8sl0"; + sha256 = "sha256-6E4reideyCxKqp0bH5eG2+Q1jIFekXU5/+f2Z/9Lw7Q="; }; buildInputs = [ openssl ]; diff --git a/nixpkgs/pkgs/development/libraries/tinycbor/default.nix b/nixpkgs/pkgs/development/libraries/tinycbor/default.nix index d03e20cb7e21..0890ab60c2b1 100644 --- a/nixpkgs/pkgs/development/libraries/tinycbor/default.nix +++ b/nixpkgs/pkgs/development/libraries/tinycbor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tinycbor"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "intel"; repo = "tinycbor"; rev = "v${version}"; - sha256 = "11y6liyd3fvc28d3dinii16sxgwgg2p29p41snc4h82dvvx5bb2b"; + sha256 = "sha256-H0NTUaSOGMtbM1+EQVOsYoPP+A1FGvUM7XrbPxArR88="; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/nixpkgs/pkgs/development/libraries/tix/default.nix b/nixpkgs/pkgs/development/libraries/tix/default.nix index c42847ef5335..b017b3eb6618 100644 --- a/nixpkgs/pkgs/development/libraries/tix/default.nix +++ b/nixpkgs/pkgs/development/libraries/tix/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchurl, tcl, tk, fetchpatch } : +{ lib +, stdenv +, fetchurl +, fetchpatch +, tcl +, tk +}: tcl.mkTclDerivation { version = "8.4.3"; @@ -13,6 +19,8 @@ tcl.mkTclDerivation { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-tcltk/tix/files/tix-8.4.3-tcl8.5.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d"; sha256 = "0wzqmcxxq0rqpnjgxz10spw92yhfygnlwv0h8pcx2ycnqiljz6vj"; }) + # Remove duplicated definition of XLowerWindow + ./duplicated-xlowerwindow.patch ] ++ lib.optional (tcl.release == "8.6") (fetchpatch { name = "tix-8.4.3-tcl8.6.patch"; diff --git a/nixpkgs/pkgs/development/libraries/tix/duplicated-xlowerwindow.patch b/nixpkgs/pkgs/development/libraries/tix/duplicated-xlowerwindow.patch new file mode 100644 index 000000000000..0ea888749a2f --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/tix/duplicated-xlowerwindow.patch @@ -0,0 +1,49 @@ +This is duplicated code from Tk. +It causes errors during build since XLowerWindow is not only a function but also "defined" in tkIntXlibDecls.h. + +See +https://github.com/tcltk/tk/blob/71dcaddc69769cbd3e2c4b5edb5810f974579527/generic/tkIntXlibDecls.h#L396 +and +https://github.com/tcltk/tk/blob/71dcaddc69769cbd3e2c4b5edb5810f974579527/generic/tkIntXlibDecls.h#L1487 + +--- a/unix/tixUnixWm.c 2005-03-25 13:15:53.000000000 -0700 ++++ b/unix/tixUnixWm.c 2021-03-20 07:31:52.000000000 -0700 +@@ -24,38 +24,3 @@ + { + return TCL_OK; + } +- +-#ifdef MAC_OSX_TK +-#include "tkInt.h" +-/* +- *---------------------------------------------------------------------- +- * +- * XLowerWindow -- +- * +- * Change the stacking order of a window. +- * +- * Results: +- * None. +- * +- * Side effects: +- * Changes the stacking order of the specified window. +- * +- *---------------------------------------------------------------------- +- */ +- +-int +-XLowerWindow( +- Display* display, /* Display. */ +- Window window) /* Window. */ +-{ +- TkWindow *winPtr = *((TkWindow **) window); +- +- display->request++; +- if (Tk_IsTopLevel(winPtr) && !Tk_IsEmbedded(winPtr)) { +- TkWmRestackToplevel(winPtr, Below, NULL); +- } else { +- /* TODO: this should generate damage */ +- } +- return 0; +-} +-#endif diff --git a/nixpkgs/pkgs/development/libraries/tk/8.5.nix b/nixpkgs/pkgs/development/libraries/tk/8.5.nix index 3058af46ab57..c5d5c478c670 100644 --- a/nixpkgs/pkgs/development/libraries/tk/8.5.nix +++ b/nixpkgs/pkgs/development/libraries/tk/8.5.nix @@ -1,4 +1,11 @@ -{ callPackage, fetchurl, tcl, ... } @ args: +{ lib +, stdenv +, callPackage +, fetchurl +, fetchpatch +, tcl +, ... +} @ args: callPackage ./generic.nix (args // { @@ -7,4 +14,15 @@ callPackage ./generic.nix (args // { sha256 = "0an3wqkjzlyyq6l9l3nawz76axsrsppbyylx0zk9lkv7llrala03"; }; + patches = lib.optionals stdenv.isDarwin [ + # Define MODULE_SCOPE before including tkPort.h + # https://core.tcl-lang.org/tk/info/dba9f5ce3b + (fetchpatch { + name = "module_scope.patch"; + url = "https://core.tcl-lang.org/tk/vpatch?from=ef6c6960c53ea30c&to=9b8aa74eebed509a"; + extraPrefix = ""; + sha256 = "0crhf4zrzdpc1jdgyv6l6mxqgmny12r3i39y1i0j8q3pbqkd04bv"; + }) + ]; + }) diff --git a/nixpkgs/pkgs/development/libraries/tk/8.6.nix b/nixpkgs/pkgs/development/libraries/tk/8.6.nix index fdffbeba2c93..c4825d2ccf9d 100644 --- a/nixpkgs/pkgs/development/libraries/tk/8.6.nix +++ b/nixpkgs/pkgs/development/libraries/tk/8.6.nix @@ -1,12 +1,29 @@ -{ callPackage, fetchurl, tcl, lib, stdenv, ... } @ args: +{ lib +, stdenv +, callPackage +, fetchurl +, fetchpatch +, tcl +, ... +} @ args: callPackage ./generic.nix (args // { src = fetchurl { url = "mirror://sourceforge/tcl/tk${tcl.version}.1-src.tar.gz"; # TODO: remove '.1' for v8.6.10 or v8.7.x - sha256 = "1d7bfkxpacy33w5nahf73lkwxqpff44w1jplg7i2gmwgiaawvjwg"; + sha256 = "1gh9k7l76qg9l0sb78ijw9xz4xl1af47aqbdifb6mjpf3cbsnv00"; }; - patches = [ ./different-prefix-with-tcl.patch ] ++ lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ]; + patches = [ ./different-prefix-with-tcl.patch ] ++ lib.optionals stdenv.isDarwin [ + ./Fix-bad-install_name-for-libtk8.6.dylib.patch + # Define MODULE_SCOPE before including tkPort.h + # https://core.tcl-lang.org/tk/info/dba9f5ce3b + (fetchpatch { + name = "module_scope.patch"; + url = "https://core.tcl-lang.org/tk/vpatch?from=ef6c6960c53ea30c&to=9b8aa74eebed509a"; + extraPrefix = ""; + sha256 = "0crhf4zrzdpc1jdgyv6l6mxqgmny12r3i39y1i0j8q3pbqkd04bv"; + }) + ]; }) diff --git a/nixpkgs/pkgs/development/libraries/tk/generic.nix b/nixpkgs/pkgs/development/libraries/tk/generic.nix index b829d846be56..6aa67bf274de 100644 --- a/nixpkgs/pkgs/development/libraries/tk/generic.nix +++ b/nixpkgs/pkgs/development/libraries/tk/generic.nix @@ -41,6 +41,8 @@ tcl.mkTclDerivation { propagatedBuildInputs = [ libXft ]; + enableParallelBuilding = true; + doCheck = false; # fails. can't find itself inherit tcl; diff --git a/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix b/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix index d367a56010ba..06e1ac9409a1 100644 --- a/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix +++ b/nixpkgs/pkgs/development/libraries/tpm2-tss/default.nix @@ -3,6 +3,14 @@ , openssl, json_c, curl, libgcrypt , cmocka, uthash, ibm-sw-tpm2, iproute2, procps, which }: +let + # Avoid a circular dependency on Linux systems (systemd depends on tpm2-tss, + # tpm2-tss tests depend on procps, procps depends on systemd by default). This + # needs to be conditional based on isLinux because procps for other systems + # might not support the withSystemd option. + procpsWithoutSystemd = procps.override { withSystemd = false; }; + procps_pkg = if stdenv.isLinux then procpsWithoutSystemd else procps; +in stdenv.mkDerivation rec { pname = "tpm2-tss"; @@ -20,7 +28,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ openssl json_c curl libgcrypt ]; checkInputs = [ - cmocka uthash ibm-sw-tpm2 iproute2 procps which + cmocka uthash ibm-sw-tpm2 iproute2 procps_pkg which ]; preAutoreconf = "./bootstrap"; diff --git a/nixpkgs/pkgs/development/libraries/ucx/default.nix b/nixpkgs/pkgs/development/libraries/ucx/default.nix index 7e1f36f0f96e..22d2b314b2a9 100644 --- a/nixpkgs/pkgs/development/libraries/ucx/default.nix +++ b/nixpkgs/pkgs/development/libraries/ucx/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ucx"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "openucx"; repo = "ucx"; rev = "v${version}"; - sha256 = "1ww5a9m1jbjjhsjlvjvlcvcv0sv388irfx8xdh0pd9w03xv754d0"; + sha256 = "07yyvb87i2f4w9rlvkracwzm133phwjw4zv9rs7xw6ql4pkrhrr3"; }; nativeBuildInputs = [ autoreconfHook doxygen ]; diff --git a/nixpkgs/pkgs/development/libraries/udunits/default.nix b/nixpkgs/pkgs/development/libraries/udunits/default.nix index b8ea203ef176..17efccce82a9 100644 --- a/nixpkgs/pkgs/development/libraries/udunits/default.nix +++ b/nixpkgs/pkgs/development/libraries/udunits/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { ''; license = licenses.asl20; maintainers = with maintainers; [ AndersonTorres pSub ]; - platforms = platforms.linux; + platforms = platforms.all; + mainProgram = "udunits2"; }; } diff --git a/nixpkgs/pkgs/development/libraries/valhalla/default.nix b/nixpkgs/pkgs/development/libraries/valhalla/default.nix index 6eac19bcb2cd..b3d61e6efd72 100644 --- a/nixpkgs/pkgs/development/libraries/valhalla/default.nix +++ b/nixpkgs/pkgs/development/libraries/valhalla/default.nix @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + # https://github.com/valhalla/valhalla/issues/2119 + postPatch = '' + for f in valhalla/mjolnir/transitpbf.h \ + src/mjolnir/valhalla_query_transit.cc; do + substituteInPlace $f --replace 'SetTotalBytesLimit(limit, limit)' \ + 'SetTotalBytesLimit(limit)' + done + ''; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib curl protobuf prime-server boost sqlite libspatialite diff --git a/nixpkgs/pkgs/development/libraries/vapoursynth/0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch b/nixpkgs/pkgs/development/libraries/vapoursynth/0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch index 0937ac6e3084..72ec48f020b2 100644 --- a/nixpkgs/pkgs/development/libraries/vapoursynth/0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch +++ b/nixpkgs/pkgs/development/libraries/vapoursynth/0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch @@ -1,4 +1,4 @@ -From 9b05a6f331506afa5aca8865677af83403d2a32d Mon Sep 17 00:00:00 2001 +From 439e2effe1cc372925daf6d5c28569663ffb93ed Mon Sep 17 00:00:00 2001 From: Tadeo Kondrak <me@tadeo.ca> Date: Mon, 25 Jan 2021 11:17:44 -0700 Subject: [PATCH] Call weak function to allow adding preloaded plugins after @@ -10,10 +10,10 @@ Subject: [PATCH] Call weak function to allow adding preloaded plugins after 2 files changed, 24 insertions(+) diff --git a/src/core/vscore.cpp b/src/core/vscore.cpp -index 2d29844d..35c509ed 100644 +index f8e69062..4ce4c623 100644 --- a/src/core/vscore.cpp +++ b/src/core/vscore.cpp -@@ -1229,6 +1229,20 @@ void VSCore::destroyFilterInstance(VSNode *node) { +@@ -1791,6 +1791,20 @@ void VSCore::destroyFilterInstance(VSNode *node) { freeDepth--; } @@ -31,10 +31,10 @@ index 2d29844d..35c509ed 100644 +} +} + - VSCore::VSCore(int threads) : - coreFreed(false), + VSCore::VSCore(int flags) : numFilterInstances(1), -@@ -1351,6 +1365,11 @@ VSCore::VSCore(int threads) : + numFunctionInstances(0), +@@ -1918,6 +1932,11 @@ VSCore::VSCore(int flags) : } // If neither exists, an empty string will do. #endif @@ -44,14 +44,14 @@ index 2d29844d..35c509ed 100644 + } + VSMap *settings = readSettings(configFile); - const char *error = vs_internal_vsapi.getError(settings); + const char *error = vs_internal_vsapi.mapGetError(settings); if (error) { diff --git a/src/core/vscore.h b/src/core/vscore.h -index 74df8a84..3efac811 100644 +index 2ce0f56b..2982b133 100644 --- a/src/core/vscore.h +++ b/src/core/vscore.h -@@ -582,6 +582,9 @@ public: - VSFunction() : functionData(nullptr), func(nullptr) {} +@@ -985,6 +985,9 @@ public: + std::string getV3ArgString() const; }; +extern "C" { @@ -59,10 +59,10 @@ index 74df8a84..3efac811 100644 +} struct VSPlugin { - private: -@@ -683,6 +686,8 @@ public: + friend struct VSPluginFunction; +@@ -1140,6 +1143,8 @@ public: - explicit VSCore(int threads); + explicit VSCore(int flags); void freeCore(); + + friend void VSLoadPluginsNixCallback(void *data, const char *path); @@ -70,5 +70,5 @@ index 74df8a84..3efac811 100644 #endif // VSCORE_H -- -2.30.0 +2.32.0 diff --git a/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix b/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix index 37d82b0b4bd9..3eaeeccc4544 100644 --- a/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix +++ b/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix @@ -10,13 +10,13 @@ with lib; stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "R54"; + version = "R55"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "01jym2rq28j0g792yagk9dvm411gwmk6qgj9rgrg7ckpxmw27w2s"; + sha256 = "sha256-91lPknNX3NM3NraIcPAR478paPoYvgjgCOIcdgaR5nE="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/vc/default.nix b/nixpkgs/pkgs/development/libraries/vc/default.nix index 40347940ff04..090b445a3a5c 100644 --- a/nixpkgs/pkgs/development/libraries/vc/default.nix +++ b/nixpkgs/pkgs/development/libraries/vc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "Vc"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "VcDevel"; repo = "Vc"; rev = version; - sha256 = "09nf6j1hyq2yv0c1cmnv4ff5243ylsajy1xj3dz8c2qqcm14y6cm"; + sha256 = "sha256-rh2vcn58xDsbxxABrxneCq6TKIyT51KxGB7sOtHpvYE="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/libraries/wayland/protocols.nix b/nixpkgs/pkgs/development/libraries/wayland/protocols.nix index 7f3ec5f3d597..71131516f942 100644 --- a/nixpkgs/pkgs/development/libraries/wayland/protocols.nix +++ b/nixpkgs/pkgs/development/libraries/wayland/protocols.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wayland-protocols"; - version = "1.21"; + version = "1.23"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1rfdlkzz67qsb955zqb8jbw3m22pl6ppvrvfq8bqiqcb5n24b6dr"; + sha256 = "0xizccackgwszjhlq7jjiv2z2gwppljx0w32ga91bxlnby8z22kc"; }; postPatch = lib.optionalString doCheck '' diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 90ad985cfb81..9165bb4be6f0 100644 --- a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -63,7 +63,7 @@ assert enableGeoLocation -> geoclue2 != null; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.32.3"; + version = "2.32.4"; outputs = [ "out" "dev" ]; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-wfSW9axlTv5M72L71PL77u8mWgfF50GeXSkAv+6lLLw="; + sha256 = "1zfkfyhm4i7901pp32wcwcfxax69qgq5k44x0glwaywdg4zjvkh0"; }; patches = lib.optionals stdenv.isLinux [ diff --git a/nixpkgs/pkgs/development/libraries/x264/default.nix b/nixpkgs/pkgs/development/libraries/x264/default.nix index 5b82c594b086..57d0c0a4d632 100644 --- a/nixpkgs/pkgs/development/libraries/x264/default.nix +++ b/nixpkgs/pkgs/development/libraries/x264/default.nix @@ -1,14 +1,17 @@ -{ stdenv, lib, fetchurl, nasm +{ stdenv, lib, fetchFromGitLab, nasm , enableShared ? !stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { pname = "x264"; - version = "20191217-2245"; - - src = fetchurl { - url = "https://download.videolan.org/x264/snapshots/x264-snapshot-${version}-stable.tar.bz2"; - sha256 = "0q214q4rhbhigyx3dfhp6d5v5gzln01cxccl153ps5ih567mqjdj"; + version = "unstable-2021-06-13"; + + src = fetchFromGitLab { + domain = "code.videolan.org"; + owner = "videolan"; + repo = pname; + rev = "5db6aa6cab1b146e07b60cc1736a01f21da01154"; + sha256 = "0swyrkz6nvajivxvrr08py0jrfcsjvpxw78xm1k5gd9xbdrxvknh"; }; # Upstream ./configure greps for (-mcpu|-march|-mfpu) in CFLAGS, which in nix diff --git a/nixpkgs/pkgs/development/libraries/zlib/default.nix b/nixpkgs/pkgs/development/libraries/zlib/default.nix index a9fadf46c4b2..8d7cb3a48c88 100644 --- a/nixpkgs/pkgs/development/libraries/zlib/default.nix +++ b/nixpkgs/pkgs/development/libraries/zlib/default.nix @@ -57,11 +57,13 @@ stdenv.mkDerivation (rec { # and giving nothing builds both. # So we have 3 possible ways to build both: # `--static --shared`, `--shared` and giving nothing. - # Of these, we choose `--shared`, only because that's - # what we did in the past and we can avoid mass rebuilds this way. - # As a result, we pass `--static` only when we want just static. - configureFlags = lib.optional (static && !shared) "--static" + # Of these, we choose `--static --shared`, for clarity and simpler + # conditions. + configureFlags = lib.optional static "--static" ++ lib.optional shared "--shared"; + # We do the right thing manually, above, so don't need these. + dontDisableStatic = true; + dontAddStaticConfigureFlags = true; # Note we don't need to set `dontDisableStatic`, because static-disabling # works by grepping for `enable-static` in the `./configure` script diff --git a/nixpkgs/pkgs/development/misc/resholve/README.md b/nixpkgs/pkgs/development/misc/resholve/README.md index 6b99aebb5979..024465f306cd 100644 --- a/nixpkgs/pkgs/development/misc/resholve/README.md +++ b/nixpkgs/pkgs/development/misc/resholve/README.md @@ -84,6 +84,9 @@ that the `resholve` CLI expects. Here's an overview: | fake | attrset | [directives](#controlling-resolution-with-directives) | | fix | attrset | [directives](#controlling-resolution-with-directives) | | keep | attrset | [directives](#controlling-resolution-with-directives) | +| lore | string | [lore directory](#controlling-nested-resolution-with-lore) | +| execers | list | [execer lore directive](#controlling-nested-resolution-with-lore) | +| wrappers | list | [wrapper lore directive](#controlling-nested-resolution-with-lore) | ## Controlling resolution with directives @@ -156,3 +159,52 @@ keep = { "~/.bashrc" = true; }; ``` + +## Controlling nested resolution with lore + +Initially, resolution of commands in the arguments to command-executing +commands was limited to one level for a hard-coded list of builtins and +external commands. resholve can now resolve these recursively. + +This feature combines information (_lore_) that the resholve Nix API +obtains via binlore ([nixpkgs](../../tools/analysis/binlore), [repo](https://github.com/abathur/resholve)), +with some rules (internal to resholve) for locating sub-executions in +some of the more common commands. + +- "execer" lore identifies whether an executable can, cannot, + or might execute its arguments. Every "can" or "might" verdict requires + either built-in rules for finding the executable, or human triage. +- "wrapper" lore maps shell exec wrappers to the programs they exec so + that resholve can substitute an executable's verdict for its wrapper's. + +There will be more mechanisms for controlling this process in the future +(and your reports/experiences will play a role in shaping them...) For now, +the main lever is the ability to substitute your own lore. This is how you'd +do it piecemeal: + +``` +# --execer 'cannot:${openssl.bin}/bin/openssl can:${openssl.bin}/bin/c_rehash' +execer = [ + /* + This is the same verdict binlore will + come up with. It's a no-op just to demo + how to fiddle lore via the Nix API. + */ + "cannot:${openssl.bin}/bin/openssl" + # different verdict, but not used + "can:${openssl.bin}/bin/c_rehash" +]; + +# --wrapper '${gnugrep}/bin/egrep:${gnugrep}/bin/grep' +execer = [ + /* + This is the same verdict binlore will + come up with. It's a no-op just to demo + how to fiddle lore via the Nix API. + */ + "${gnugrep}/bin/egrep:${gnugrep}/bin/grep" +]; +``` + +The format is fairly simple to generate--you can script your own generator if +you need to modify the lore. diff --git a/nixpkgs/pkgs/development/misc/resholve/default.nix b/nixpkgs/pkgs/development/misc/resholve/default.nix index 7b5a79dd221a..dae7fdc384c1 100644 --- a/nixpkgs/pkgs/development/misc/resholve/default.nix +++ b/nixpkgs/pkgs/development/misc/resholve/default.nix @@ -1,9 +1,18 @@ { callPackage -, doCheck ? true +, ... }: +let + source = callPackage ./source.nix { }; + deps = callPackage ./deps.nix { }; +in rec { - resholve = callPackage ./resholve.nix { inherit doCheck; }; - resholvePackage = - callPackage ./resholve-package.nix { inherit resholve; }; + resholve = callPackage ./resholve.nix { + inherit (source) rSrc; + inherit (source) version; + inherit (deps.oil) oildev; + }; + resholvePackage = callPackage ./resholve-package.nix { + inherit resholve; + }; } diff --git a/nixpkgs/pkgs/development/misc/resholve/deps.nix b/nixpkgs/pkgs/development/misc/resholve/deps.nix index 6a1d9c77b5a0..604bfa872c25 100644 --- a/nixpkgs/pkgs/development/misc/resholve/deps.nix +++ b/nixpkgs/pkgs/development/misc/resholve/deps.nix @@ -1,120 +1,18 @@ -{ lib, stdenv -, python27Packages -, fetchFromGitHub -, makeWrapper -, # re2c deps - autoreconfHook -, # py-yajl deps - git -, # oil deps - readline -, cmark -, file -, glibcLocales -, oilPatches ? [ ] +{ callPackage +, ... }: /* -Notes on specific dependencies: -- if/when python2.7 is removed from nixpkgs, this may need to figure + Notes on specific dependencies: + - if/when python2.7 is removed from nixpkgs, this may need to figure out how to build oil's vendored python2 -- I'm not sure if glibcLocales is worth the addition here. It's to fix + - I'm not sure if glibcLocales is worth the addition here. It's to fix a libc test oil runs. My oil fork just disabled the libc tests, but I haven't quite decided if that's the right long-term call, so I didn't add a patch for it here yet. */ rec { - # had to add this as well; 1.3 causes a break here; sticking - # to oil's official 1.0.3 dep for now. - re2c = stdenv.mkDerivation rec { - pname = "re2c"; - version = "1.0.3"; - sourceRoot = "${src.name}/re2c"; - src = fetchFromGitHub { - owner = "skvadrik"; - repo = "re2c"; - rev = version; - sha256 = "0grx7nl9fwcn880v5ssjljhcb9c5p2a6xpwil7zxpmv0rwnr3yqi"; - }; - nativeBuildInputs = [ autoreconfHook ]; - preCheck = '' - patchShebangs run_tests.sh - ''; - }; - - py-yajl = python27Packages.buildPythonPackage rec { - pname = "oil-pyyajl-unstable"; - version = "2019-12-05"; - src = fetchFromGitHub { - owner = "oilshell"; - repo = "py-yajl"; - rev = "eb561e9aea6e88095d66abcc3990f2ee1f5339df"; - sha256 = "17hcgb7r7cy8r1pwbdh8di0nvykdswlqj73c85k6z8m0filj3hbh"; - fetchSubmodules = true; - }; - # just for submodule IIRC - nativeBuildInputs = [ git ]; - }; - - # resholve's primary dependency is this developer build of the oil shell. - oildev = python27Packages.buildPythonPackage rec { - pname = "oildev-unstable"; - version = "2021-02-26"; - - src = fetchFromGitHub { - owner = "oilshell"; - repo = "oil"; - rev = "11c6bd3ca0e126862c7a1f938c8510779837affa"; - hash = "sha256-UTQywtx+Dn1/qx5uocqgGn7oFYW4R5DbuiRNF8t/BzY="; - - /* - It's not critical to drop most of these; the primary target is - the vendored fork of Python-2.7.13, which is ~ 55M and over 3200 - files, dozens of which get interpreter script patches in fixup. - */ - extraPostFetch = '' - rm -rf Python-2.7.13 benchmarks metrics py-yajl rfc gold web testdata services demo devtools cpp - ''; - }; - - # TODO: not sure why I'm having to set this for nix-build... - # can anyone tell if I'm doing something wrong? - SOURCE_DATE_EPOCH = 315532800; - - # These aren't, strictly speaking, nix/nixpkgs specific, but I've - # had hell upstreaming them. Pulling from resholve source and - # passing in from resholve.nix - patches = oilPatches; - - buildInputs = [ readline cmark py-yajl ]; - - nativeBuildInputs = [ re2c file makeWrapper ]; - - propagatedBuildInputs = with python27Packages; [ six typing ]; - - doCheck = true; - - preBuild = '' - build/dev.sh all - ''; - - postPatch = '' - patchShebangs asdl build core doctools frontend native oil_lang - ''; - - _NIX_SHELL_LIBCMARK = "${cmark}/lib/libcmark${stdenv.hostPlatform.extensions.sharedLibrary}"; - - # See earlier note on glibcLocales - LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive"; - - meta = { - description = "A new unix shell"; - homepage = "https://www.oilshell.org/"; - license = with lib.licenses; [ - psfl # Includes a portion of the python interpreter and standard library - asl20 # Licence for Oil itself - ]; - }; - }; + # binlore = callPackage ./binlore.nix { }; + oil = callPackage ./oildev.nix { }; } diff --git a/nixpkgs/pkgs/development/misc/resholve/oildev.nix b/nixpkgs/pkgs/development/misc/resholve/oildev.nix new file mode 100644 index 000000000000..b15047b53ff9 --- /dev/null +++ b/nixpkgs/pkgs/development/misc/resholve/oildev.nix @@ -0,0 +1,121 @@ +{ lib +, stdenv +, python27Packages +, callPackage +, fetchFromGitHub +, makeWrapper +, # re2c deps + autoreconfHook +, # py-yajl deps + git +, # oil deps + readline +, cmark +, file +, glibcLocales +}: + +rec { + re2c = stdenv.mkDerivation rec { + pname = "re2c"; + version = "1.0.3"; + sourceRoot = "${src.name}/re2c"; + src = fetchFromGitHub { + owner = "skvadrik"; + repo = "re2c"; + rev = version; + sha256 = "0grx7nl9fwcn880v5ssjljhcb9c5p2a6xpwil7zxpmv0rwnr3yqi"; + }; + nativeBuildInputs = [ autoreconfHook ]; + preCheck = '' + patchShebangs run_tests.sh + ''; + }; + + py-yajl = python27Packages.buildPythonPackage rec { + pname = "oil-pyyajl-unstable"; + version = "2019-12-05"; + src = fetchFromGitHub { + owner = "oilshell"; + repo = "py-yajl"; + rev = "eb561e9aea6e88095d66abcc3990f2ee1f5339df"; + sha256 = "17hcgb7r7cy8r1pwbdh8di0nvykdswlqj73c85k6z8m0filj3hbh"; + fetchSubmodules = true; + }; + # just for submodule IIRC + nativeBuildInputs = [ git ]; + }; + + oildev = python27Packages.buildPythonPackage rec { + pname = "oildev-unstable"; + version = "2021-07-14"; + + src = fetchFromGitHub { + owner = "oilshell"; + repo = "oil"; + # rev == present HEAD of release/0.8.12 + rev = "799c0703d1da86cb80d1f5b163edf9369ad77cf1"; + hash = "sha256-QNSISr719ycZ1Z0quxHWzCb3IvHGj9TpogaYz20hDM4="; + + /* + It's not critical to drop most of these; the primary target is + the vendored fork of Python-2.7.13, which is ~ 55M and over 3200 + files, dozens of which get interpreter script patches in fixup. + */ + extraPostFetch = '' + rm -rf Python-2.7.13 benchmarks metrics py-yajl rfc gold web testdata services demo devtools cpp + ''; + }; + + # TODO: not sure why I'm having to set this for nix-build... + # can anyone tell if I'm doing something wrong? + SOURCE_DATE_EPOCH = 315532800; + + # patch to support a python package, pass tests on macOS, etc. + patchSrc = fetchFromGitHub { + owner = "abathur"; + repo = "nix-py-dev-oil"; + rev = "v0.8.12"; + hash = "sha256-/EvwxL201lGsioL0lIhzM8VTghe6FuVbc3PBJgY8c8E="; + }; + patches = [ + "${patchSrc}/0001-add_setup_py.patch" + "${patchSrc}/0002-add_MANIFEST_in.patch" + "${patchSrc}/0004-disable-internal-py-yajl-for-nix-built.patch" + "${patchSrc}/0006-disable_failing_libc_tests.patch" + "${patchSrc}/0007-namespace_via_init.patch" + ]; + + buildInputs = [ readline cmark py-yajl ]; + + nativeBuildInputs = [ re2c file makeWrapper ]; + + propagatedBuildInputs = with python27Packages; [ six typing ]; + + doCheck = true; + + preBuild = '' + build/dev.sh all + ''; + + postPatch = '' + patchShebangs asdl build core doctools frontend native oil_lang + ''; + + # TODO: this may be obsolete? + _NIX_SHELL_LIBCMARK = "${cmark}/lib/libcmark${stdenv.hostPlatform.extensions.sharedLibrary}"; + + # See earlier note on glibcLocales TODO: verify needed? + LOCALE_ARCHIVE = lib.optionalString (stdenv.buildPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive"; + + # not exhaustive; just a spot-check for now + pythonImportsCheck = [ "oil" "oil._devbuild" ]; + + meta = { + license = with lib.licenses; [ + psfl # Includes a portion of the python interpreter and standard library + asl20 # Licence for Oil itself + ]; + }; + }; +} diff --git a/nixpkgs/pkgs/development/misc/resholve/resholve-package.nix b/nixpkgs/pkgs/development/misc/resholve/resholve-package.nix index cc971196a4f8..78ee6603b9d4 100644 --- a/nixpkgs/pkgs/development/misc/resholve/resholve-package.nix +++ b/nixpkgs/pkgs/development/misc/resholve/resholve-package.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, resholve }: +{ stdenv, lib, resholve, binlore }: { pname , src @@ -10,11 +10,11 @@ let inherit stdenv; /* These functions break up the work of partially validating the - * 'solutions' attrset and massaging it into env/cli args. - * - * Note: some of the left-most args do not *have* to be passed as - * deep as they are, but I've done so to provide more error context - */ + 'solutions' attrset and massaging it into env/cli args. + + Note: some of the left-most args do not *have* to be passed as + deep as they are, but I've done so to provide more error context + */ # for brevity / line length spaces = l: builtins.concatStringsSep " " l; @@ -72,7 +72,8 @@ let /* Build a single resholve invocation */ makeInvocation = solution: value: if validateSolution value then - "${makeEnvs solution value} resholve --overwrite ${makeArgs value}" + # we pass resholve a directory + "RESHOLVE_LORE=${binlore.collect { drvs = value.inputs; } } ${makeEnvs solution value} resholve --overwrite ${makeArgs value}" else throw "invalid solution"; # shouldn't trigger for now /* Build resholve invocation for each solution. */ @@ -87,10 +88,19 @@ let # enable below for verbose debug info if needed # supports default python.logging levels # LOGLEVEL="INFO"; + /* + subshell/PS4/set -x and : command to output resholve envs + and invocation. Extra context makes it clearer what the + Nix API is doing, makes nix-shell debugging easier, etc. + */ preFixup = '' - pushd "$out" - ${builtins.concatStringsSep "\n" (makeCommands solutions)} - popd + ( + cd "$out" + PS4=$'\x1f'"\033[33m[resholve context]\033[0m " + set -x + : changing directory to $PWD + ${builtins.concatStringsSep "\n" (makeCommands solutions)} + ) ''; })); in diff --git a/nixpkgs/pkgs/development/misc/resholve/resholve.nix b/nixpkgs/pkgs/development/misc/resholve/resholve.nix index d3603266bea9..fbddc4d72dd2 100644 --- a/nixpkgs/pkgs/development/misc/resholve/resholve.nix +++ b/nixpkgs/pkgs/development/misc/resholve/resholve.nix @@ -2,48 +2,22 @@ , callPackage , python27Packages , installShellFiles -, fetchFromGitHub -, file -, findutils -, gettext -, bats -, bash -, doCheck ? true +, rSrc +, version +, oildev +, binlore }: -let - version = "0.5.1"; - rSrc = fetchFromGitHub { - owner = "abathur"; - repo = "resholve"; - rev = "v${version}"; - hash = "sha256-+9MjvO1H+A3Ol2to5tWqdpNR7osQsYcbkX9avAqyrKw="; - }; - deps = callPackage ./deps.nix { - /* - resholve needs to patch Oil, but trying to avoid adding - them all *to* nixpkgs, since they aren't specific to - nix/nixpkgs. - */ - oilPatches = [ - "${rSrc}/0001-add_setup_py.patch" - "${rSrc}/0002-add_MANIFEST_in.patch" - "${rSrc}/0003-fix_codegen_shebang.patch" - "${rSrc}/0004-disable-internal-py-yajl-for-nix-built.patch" - "${rSrc}/0005_revert_libc_locale.patch" - "${rSrc}/0006_disable_failing_libc_tests.patch" - "${rSrc}/0007_restore_root_init_py.patch" - ]; - }; -in + python27Packages.buildPythonApplication { pname = "resholve"; inherit version; src = rSrc; format = "other"; + dontBuild = true; nativeBuildInputs = [ installShellFiles ]; - propagatedBuildInputs = [ deps.oildev python27Packages.configargparse ]; + propagatedBuildInputs = [ oildev python27Packages.configargparse ]; patchPhase = '' for file in resholve; do @@ -56,23 +30,14 @@ python27Packages.buildPythonApplication { installManPage resholve.1 ''; - inherit doCheck; - checkInputs = [ bats ]; - RESHOLVE_PATH = "${lib.makeBinPath [ file findutils gettext ]}"; - - checkPhase = '' - # explicit interpreter for test suite - export INTERP="${bash}/bin/bash" PATH="$out/bin:$PATH" - patchShebangs . - ./test.sh - ''; - # Do not propagate Python; may be obsoleted by nixos/nixpkgs#102613 # for context on why, see abathur/resholve#20 postFixup = '' rm $out/nix-support/propagated-build-inputs ''; + passthru.tests = callPackage ./test.nix { inherit rSrc; inherit binlore; }; + meta = with lib; { description = "Resolve external shell-script dependencies"; homepage = "https://github.com/abathur/resholve"; diff --git a/nixpkgs/pkgs/development/misc/resholve/source.nix b/nixpkgs/pkgs/development/misc/resholve/source.nix new file mode 100644 index 000000000000..32ffeb98fd7e --- /dev/null +++ b/nixpkgs/pkgs/development/misc/resholve/source.nix @@ -0,0 +1,19 @@ +{ fetchFromGitHub +, ... +}: + +rec { + version = "0.6.0"; + rSrc = + # local build -> `make ci`; `make clean` to restore + # return to remote source + # if builtins.pathExists ./.local + # then ./. + # else + fetchFromGitHub { + owner = "abathur"; + repo = "resholve"; + rev = "v${version}"; + hash = "sha256-GfhhU9f5kiYcuYTPKWXCIkAGsz7GhAUGjAmIZ8Ww5X4="; + }; +} diff --git a/nixpkgs/pkgs/development/misc/resholve/test.nix b/nixpkgs/pkgs/development/misc/resholve/test.nix new file mode 100644 index 000000000000..f263c019d813 --- /dev/null +++ b/nixpkgs/pkgs/development/misc/resholve/test.nix @@ -0,0 +1,227 @@ +{ lib +, stdenv +, callPackage +, resholve +, resholvePackage +, shunit2 +, coreutils +, gnused +, gnugrep +, findutils +, jq +, bash +, bats +, libressl +, openssl +, python27 +, file +, gettext +, rSrc +, runDemo ? false +, binlore +}: + +let + inherit (callPackage ./default.nix { }) + resholve resholvePackage; + + # ourCoreutils = coreutils.override { singleBinary = false; }; + + /* + TODO: wrapped copy of find so that we can eventually test + our ability to see through wrappers. Unused for now. + Note: grep can serve the negative case; grep doesn't match, and + egrep is a shell wrapper for grep. + */ + # wrapfind = runCommand "wrapped-find" { } '' + # source ${makeWrapper}/nix-support/setup-hook + # makeWrapper ${findutils}/bin/find $out/bin/wrapped-find + # ''; + /* TODO: + unrelated, but is there already a function (or would + there be demand for one?) along the lines of: + wrap = { drv, executable(s?), args ? { } }: that: + - generates a sane output name + - sources makewrapper + - retargets real executable if already wrapped + - wraps the executable + + I wonder because my first thought here was overrideAttrs, + but I realized rebuilding just for a custom wrapper is an + ongoing waste of time. If it is a common pattern in the + wild, it would be a nice QoL improvement. + */ + +in +rec { + re_shunit2 = with shunit2; + resholvePackage { + inherit pname src version installPhase; + solutions = { + shunit = { + interpreter = "none"; + scripts = [ "bin/shunit2" ]; + inputs = [ coreutils gnused gnugrep findutils ]; + # resholve's Nix API is analogous to the CLI flags + # documented in 'man resholve' + fake = { + # "missing" functions shunit2 expects the user to declare + function = [ + "oneTimeSetUp" + "oneTimeTearDown" + "setUp" + "tearDown" + "suite" + "noexec" + ]; + # shunit2 is both bash and zsh compatible, and in + # some zsh-specific code it uses this non-bash builtin + builtin = [ "setopt" ]; + }; + fix = { + # stray absolute path; make it resolve from coreutils + "/usr/bin/od" = true; + }; + keep = { + # dynamically defined in shunit2:_shunit_mktempFunc + eval = [ "shunit_condition_" "_shunit_test_" "_shunit_prepForSourcing" ]; + + # variables invoked as commands; long-term goal is to + # resolve the *variable*, but that is complexish, so + # this is where we are... + "$__SHUNIT_CMD_ECHO_ESC" = true; + "$_SHUNIT_LINENO_" = true; + "$SHUNIT_CMD_TPUT" = true; + }; + }; + }; + }; + module1 = resholvePackage { + pname = "testmod1"; + version = "unreleased"; + + src = rSrc; + setSourceRoot = "sourceRoot=$(echo */tests/nix/libressl)"; + + installPhase = '' + mkdir -p $out/{bin,submodule} + install libressl.sh $out/bin/libressl.sh + install submodule/helper.sh $out/submodule/helper.sh + ''; + + solutions = { + libressl = { + # submodule to demonstrate + scripts = [ "bin/libressl.sh" "submodule/helper.sh" ]; + interpreter = "none"; + inputs = [ jq module2 libressl.bin ]; + }; + }; + + is_it_okay_with_arbitrary_envs = "shonuff"; + }; + module2 = resholvePackage { + pname = "testmod2"; + version = "unreleased"; + + src = rSrc; + setSourceRoot = "sourceRoot=$(echo */tests/nix/openssl)"; + + installPhase = '' + mkdir -p $out/bin + install openssl.sh $out/bin/openssl.sh + install profile $out/profile + ''; + + solutions = { + openssl = { + fix = { + aliases = true; + }; + scripts = [ "bin/openssl.sh" ]; + interpreter = "none"; + inputs = [ re_shunit2 openssl.bin ]; + execer = [ + /* + This is the same verdict binlore will + come up with. It's a no-op just to demo + how to fiddle lore via the Nix API. + */ + "cannot:${openssl.bin}/bin/openssl" + # different verdict, but not used + "can:${openssl.bin}/bin/c_rehash" + ]; + }; + profile = { + scripts = [ "profile" ]; + interpreter = "none"; + inputs = [ ]; + }; + }; + }; + module3 = resholvePackage { + pname = "testmod3"; + version = "unreleased"; + + src = rSrc; + setSourceRoot = "sourceRoot=$(echo */tests/nix/future_perfect_tense)"; + + installPhase = '' + mkdir -p $out/bin + install conjure.sh $out/bin/conjure.sh + ''; + + solutions = { + conjure = { + scripts = [ "bin/conjure.sh" ]; + interpreter = "${bash}/bin/bash"; + inputs = [ module1 ]; + }; + }; + }; + + cli = stdenv.mkDerivation { + name = "resholve-test"; + src = rSrc; + installPhase = '' + mkdir $out + cp *.ansi $out/ + ''; + doCheck = true; + buildInputs = [ resholve ]; + checkInputs = [ coreutils bats python27 ]; + # LOGLEVEL="DEBUG"; + + # default path + RESHOLVE_PATH = "${lib.makeBinPath [ bash file findutils gettext ]}"; + # but separate packages for combining as needed + PKG_FILE = "${lib.makeBinPath [ file ]}"; + PKG_FINDUTILS = "${lib.makeBinPath [ findutils ]}"; + PKG_GETTEXT = "${lib.makeBinPath [ gettext ]}"; + PKG_COREUTILS = "${lib.makeBinPath [ coreutils ]}"; + RESHOLVE_LORE = "${binlore.collect { drvs = [ bash file findutils gettext coreutils ]; } }"; + + # explicit interpreter for demo suite; maybe some better way... + INTERP = "${bash}/bin/bash"; + + checkPhase = '' + patchShebangs . + mkdir empty_lore + touch empty_lore/{execers,wrappers} + export EMPTY_LORE=$PWD/empty_lore + printf "\033[33m============================= resholve test suite ===================================\033[0m\n" > test.ansi + if ./test.sh &>> test.ansi; then + cat test.ansi + else + cat test.ansi && exit 1 + fi + '' + lib.optionalString runDemo '' + printf "\033[33m============================= resholve demo ===================================\033[0m\n" > demo.ansi + if ./demo &>> demo.ansi; then + cat demo.ansi + else + cat demo.ansi && exit 1 + fi + ''; + }; +} diff --git a/nixpkgs/pkgs/development/nim-packages/astpatternmatching/default.nix b/nixpkgs/pkgs/development/nim-packages/astpatternmatching/default.nix new file mode 100644 index 000000000000..6f1137ac7045 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/astpatternmatching/default.nix @@ -0,0 +1,8 @@ +{ fetchFromGitHub }: + +fetchFromGitHub { + owner = "krux02"; + repo = "ast-pattern-matching"; + rev = "87f7d163421af5a4f5e5cb6da7b93278e6897e96"; + sha256 = "19mb5bb6riia8380p5dpc3q0vwgrj958dd6p7vw8vkvwiqrzg6zq"; +} diff --git a/nixpkgs/pkgs/development/nim-packages/build-nim-package/default.nix b/nixpkgs/pkgs/development/nim-packages/build-nim-package/default.nix new file mode 100644 index 000000000000..6c7aafd22c81 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/build-nim-package/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, nim, nim_builder }: + +{ strictDeps ? true, nativeBuildInputs ? [ ], configurePhase ? null +, buildPhase ? null, checkPhase ? null, installPhase ? null, meta ? { }, ... +}@attrs: + +stdenv.mkDerivation (attrs // { + inherit strictDeps; + nativeBuildInputs = [ nim nim_builder ] ++ nativeBuildInputs; + + configurePhase = if isNull configurePhase then '' + runHook preConfigure + find $NIX_BUILD_TOP -name .attrs.json + nim_builder --phase:configure + runHook postConfigure + '' else + buildPhase; + + buildPhase = if isNull buildPhase then '' + runHook preBuild + nim_builder --phase:build + runHook postBuild + '' else + buildPhase; + + checkPhase = if isNull checkPhase then '' + runHook preCheck + nim_builder --phase:check + runHook postCheck + '' else + checkPhase; + + installPhase = if isNull installPhase then '' + runHook preInstall + nim_builder --phase:install + runHook postInstall + '' else + installPhase; + + meta = meta // { + maintainers = (meta.maintainers or [ ]) ++ [ lib.maintainers.ehmry ]; + }; +}) diff --git a/nixpkgs/pkgs/development/nim-packages/bumpy/default.nix b/nixpkgs/pkgs/development/nim-packages/bumpy/default.nix new file mode 100644 index 000000000000..9579d87d9d5d --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/bumpy/default.nix @@ -0,0 +1,7 @@ +{ fetchNimble }: + +fetchNimble { + pname = "bumpy"; + version = "1.0.3"; + hash = "sha256-mDmDlhOGoYYjKgF5j808oT2NqRlfcOdLSDE3WtdJFQ0="; +} diff --git a/nixpkgs/pkgs/development/nim-packages/c2nim/default.nix b/nixpkgs/pkgs/development/nim-packages/c2nim/default.nix new file mode 100644 index 000000000000..408e4fbee96e --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/c2nim/default.nix @@ -0,0 +1,19 @@ +{ lib, buildNimPackage, fetchFromGitHub, SDL2 }: + +buildNimPackage rec { + pname = "c2nim"; + version = "0.9.18"; + nimBinOnly = true; + src = fetchFromGitHub { + owner = "nim-lang"; + repo = pname; + rev = version; + hash = "sha256-127ux36mfC+PnS2HIQffw+z0TSvzdQXnKRxqYV3XahU="; + }; + meta = with lib; + src.meta // { + description = "Tool to translate Ansi C code to Nim"; + license = licenses.mit; + maintainers = [ maintainers.ehmry ]; + }; +} diff --git a/nixpkgs/pkgs/development/nim-packages/chroma/default.nix b/nixpkgs/pkgs/development/nim-packages/chroma/default.nix new file mode 100644 index 000000000000..266cd0645f36 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/chroma/default.nix @@ -0,0 +1,7 @@ +{ fetchNimble }: + +fetchNimble { + pname = "chroma"; + version = "0.2.5"; + hash = "sha256-6lNHpO2aMorgkaPfo6kRcOs9r5R6T/kislVmkeoulw8="; +} diff --git a/nixpkgs/pkgs/development/nim-packages/docopt/default.nix b/nixpkgs/pkgs/development/nim-packages/docopt/default.nix new file mode 100644 index 000000000000..38465384fbde --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/docopt/default.nix @@ -0,0 +1,8 @@ +{ fetchFromGitHub }: + +fetchFromGitHub { + owner = "docopt"; + repo = "docopt.nim"; + rev = "v0.6.7"; + sha256 = "1ga7ckg21fzwwvh26jp2phn2h3pvkn8g8sm13dxif33rp471bv37"; +} diff --git a/nixpkgs/pkgs/development/nim-packages/fetch-nimble/builder.sh b/nixpkgs/pkgs/development/nim-packages/fetch-nimble/builder.sh new file mode 100644 index 000000000000..693ab339408e --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/fetch-nimble/builder.sh @@ -0,0 +1,12 @@ +source $stdenv/setup +export HOME=$NIX_BUILD_TOP + +nimble --accept --noSSLCheck develop "${pkgname}@${version}" +# TODO: bring in the certificates for Nimble to verify the fetch of +# the package list. + +pkgdir=${NIX_BUILD_TOP}/${pkgname} + +find "$pkgdir" -name .git -print0 | xargs -0 rm -rf + +cp -a "$pkgdir" "$out" diff --git a/nixpkgs/pkgs/development/nim-packages/fetch-nimble/default.nix b/nixpkgs/pkgs/development/nim-packages/fetch-nimble/default.nix new file mode 100644 index 000000000000..ccdacc8e27b9 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/fetch-nimble/default.nix @@ -0,0 +1,20 @@ +{ lib, makeOverridable, stdenv, gitMinimal, nim, cacert }: + +makeOverridable ( + + { pname, version, hash ? lib.fakeHash, + + meta ? { }, passthru ? { }, preferLocalBuild ? true }: + stdenv.mkDerivation { + inherit version meta passthru preferLocalBuild; + pname = pname + "-src"; + pkgname = pname; + builder = ./builder.sh; + nativeBuildInputs = [ gitMinimal nim ]; + outputHash = hash; + outputHashAlgo = null; + outputHashMode = "recursive"; + impureEnvVars = lib.fetchers.proxyImpureEnvVars + ++ [ "GIT_PROXY_COMMAND" "SOCKS_SERVER" ]; + GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + }) diff --git a/nixpkgs/pkgs/development/nim-packages/flatty/default.nix b/nixpkgs/pkgs/development/nim-packages/flatty/default.nix new file mode 100644 index 000000000000..241b59f8230f --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/flatty/default.nix @@ -0,0 +1,7 @@ +{ fetchNimble }: + +fetchNimble { + pname = "flatty"; + version = "0.2.1"; + hash = "sha256-TqNnRh2+i6n98ktLRVQxt9CVw17FGLNYq29rJoMus/0="; +} diff --git a/nixpkgs/pkgs/development/nim-packages/frosty/default.nix b/nixpkgs/pkgs/development/nim-packages/frosty/default.nix new file mode 100644 index 000000000000..6394c455d07f --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/frosty/default.nix @@ -0,0 +1,8 @@ +{ fetchFromGitHub }: + +fetchFromGitHub { + owner = "disruptek"; + repo = "frosty"; + rev = "0.3.1"; + sha256 = "0hd6484ihjgl57gmqyp5xfq5prycb49k0313fqky600mhz71nmyz"; +} diff --git a/nixpkgs/pkgs/development/nim-packages/hts-nim/default.nix b/nixpkgs/pkgs/development/nim-packages/hts-nim/default.nix new file mode 100644 index 000000000000..960a9e63d215 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/hts-nim/default.nix @@ -0,0 +1,13 @@ +{ buildNimPackage, fetchFromGitHub, htslib }: + +buildNimPackage rec { + pname = "hts-nim"; + version = "0.3.4"; + src = fetchFromGitHub { + owner = "brentp"; + repo = pname; + rev = "v${version}"; + sha256 = "0670phk1bq3l9j2zaa8i5wcpc5dyfrc0l2a6c21g0l2mmdczffa7"; + }; + propagatedBuildInputs = [ htslib ]; +} diff --git a/nixpkgs/pkgs/development/nim-packages/jester/default.nix b/nixpkgs/pkgs/development/nim-packages/jester/default.nix new file mode 100644 index 000000000000..21646f3667f0 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/jester/default.nix @@ -0,0 +1,8 @@ +{ fetchFromGitHub }: + +fetchFromGitHub { + owner = "dom96"; + repo = "jester"; + rev = "v0.5.0"; + sha256 = "0m8a4ss4460jd2lcbqcbdd68jhcy35xg7qdyr95mh8rflwvmcvhk"; +} diff --git a/nixpkgs/pkgs/development/nim-packages/jsonschema/default.nix b/nixpkgs/pkgs/development/nim-packages/jsonschema/default.nix new file mode 100644 index 000000000000..8dc195b8b822 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/jsonschema/default.nix @@ -0,0 +1,8 @@ +{ fetchFromGitHub }: + +fetchFromGitHub { + owner = "PMunch"; + repo = "jsonschema"; + rev = "7b41c03e3e1a487d5a8f6b940ca8e764dc2cbabf"; + sha256 = "1js64jqd854yjladxvnylij4rsz7212k31ks541pqrdzm6hpblbz"; +} diff --git a/nixpkgs/pkgs/development/nim-packages/karax/default.nix b/nixpkgs/pkgs/development/nim-packages/karax/default.nix new file mode 100644 index 000000000000..35a5c78ee56a --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/karax/default.nix @@ -0,0 +1,8 @@ +{ fetchFromGitHub }: + +fetchFromGitHub { + owner = "karaxnim"; + repo = "karax"; + rev = "1.1.2"; + sha256 = "07ykrd21hd76vlmkqpvv5xvaxw6aaq87bky47p2420ni85a6d94j"; +} diff --git a/nixpkgs/pkgs/development/nim-packages/lscolors/default.nix b/nixpkgs/pkgs/development/nim-packages/lscolors/default.nix new file mode 100644 index 000000000000..5a72c46e4c50 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/lscolors/default.nix @@ -0,0 +1,8 @@ +{ fetchFromGitHub }: + +fetchFromGitHub { + owner = "joachimschmidt557"; + repo = "nim-lscolors"; + rev = "v0.3.3"; + sha256 = "0526hqh46lcfsvymb67ldsc8xbfn24vicn3b8wrqnh6mag8wynf4"; +} diff --git a/nixpkgs/pkgs/development/nim-packages/markdown/default.nix b/nixpkgs/pkgs/development/nim-packages/markdown/default.nix new file mode 100644 index 000000000000..c893ff0e4148 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/markdown/default.nix @@ -0,0 +1,8 @@ +{ fetchFromGitHub }: + +fetchFromGitHub { + owner = "soasme"; + repo = "nim-markdown"; + rev = "abdbe5e"; + sha256 = "0f3c1sxvhbbds43c9l8cz69pfpf984msj1lv4pb7bzpxb5zil2wy"; +} diff --git a/nixpkgs/pkgs/development/nim-packages/nim_builder/default.nix b/nixpkgs/pkgs/development/nim-packages/nim_builder/default.nix new file mode 100644 index 000000000000..34da4dfa61a0 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/nim_builder/default.nix @@ -0,0 +1,19 @@ +{ lib, stdenv, nim }: + +stdenv.mkDerivation { + pname = "nim_builder"; + inherit (nim) version; + dontUnpack = true; + nativeBuildInputs = [ nim ]; + buildPhase = '' + cp ${./nim_builder.nim} nim_builder.nim + nim c --nimcache:$TMPDIR nim_builder + ''; + installPhase = '' + install -Dt $out/bin nim_builder + ''; + meta = { + description = "Internal Nixpkgs utility for buildNimPackage."; + maintainers = [ lib.maintainers.ehmry ]; + }; +} diff --git a/nixpkgs/pkgs/development/nim-packages/nim_builder/nim_builder.nim b/nixpkgs/pkgs/development/nim-packages/nim_builder/nim_builder.nim new file mode 100644 index 000000000000..b8881b700047 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/nim_builder/nim_builder.nim @@ -0,0 +1,166 @@ +# SPDX-FileCopyrightText: 2021 Nixpkgs/NixOS contributors +## Custom Nim builder for Nixpkgs. + +import std/[os, osproc, parseutils, sequtils, streams, strutils] + +proc findNimbleFile(): string = + ## Copied from Nimble. + ## Copyright (c) 2015, Dominik Picheta + ## BSD3 + let dir = getCurrentDir() + result = "" + var hits = 0 + for kind, path in walkDir(dir): + if kind in {pcFile, pcLinkToFile}: + let ext = path.splitFile.ext + if ext == ".nimble": + result = path + inc hits + if hits >= 2: + quit("Only one .nimble file should be present in " & dir) + elif hits == 0: + quit("Could not find a file with a .nimble extension in " & dir) + +proc getEnvBool(key: string; default = false): bool = + ## Parse a boolean environmental variable. + let val = getEnv(key) + if val == "": default + else: parseBool(val) + +proc getNimbleFilePath(): string = + ## Get the Nimble file for the current package. + if existsEnv"nimbleFile": + getEnv"nimbleFile" + else: + findNimbleFile() + +proc getNimbleValue(filePath, key: string; default = ""): string = + ## Extract a string value from the Nimble file at ``filePath``. + var + fs = newFileStream(filePath, fmRead) + line: string + if fs.isNil: + quit("could not open " & filePath) + while fs.readline(line): + if line.startsWith(key): + var i = key.len + i.inc skipWhile(line, Whitespace, i) + if line[i] == '=': + inc i + i.inc skipWhile(line, Whitespace, i) + discard parseUntil(line, result, Newlines, i) + if result.len > 0 and result[0] == '"': + result = result.unescape + return + default + +proc getNimbleValues(filePath, key: string): seq[string] = + ## Extract a string sequence from the Nimble file at ``filePath``. + var gunk = getNimbleValue(filePath, key) + result = gunk.strip(chars = {'@', '[', ']'}).split(',') + if result == @[""]: reset result + apply(result) do (s: var string): + s = s.strip() + if s.len > 0 and s[0] == '"': + s = s.unescape() + +proc configurePhase*() = + ## Generate "config.nims" which will be read by the Nim + ## compiler during later phases. + const configFilePath = "config.nims" + echo "generating ", configFilePath + let + nf = getNimbleFilePath() + mode = + if fileExists configFilePath: fmAppend + else: fmWrite + var cfg = newFileStream(configFilePath, mode) + proc switch(key, val: string) = + cfg.writeLine("switch(", key.escape, ",", val.escape, ")") + switch("backend", nf.getNimbleValue("backend", "c")) + switch("nimcache", getEnv("NIX_BUILD_TOP", ".") / "nimcache") + if getEnvBool("nimRelease", true): + switch("define", "release") + for def in getEnv("nimDefines").split: + if def != "": + switch("define", def) + for input in getEnv("buildInputs").split: + if input != "": + for nimbleFile in walkFiles(input / "*.nimble"): + let inputSrc = normalizedPath( + input / nimbleFile.getNimbleValue("srcDir", ".")) + echo "found nimble input ", inputSrc + switch("path", inputSrc) + close(cfg) + +proc buildPhase*() = + ## Build the programs listed in the Nimble file and + ## optionally some documentation. + var cmds: seq[string] + proc before(idx: int) = + echo "build job ", idx, ": ", cmds[idx] + let + nf = getNimbleFilePath() + bins = nf.getNimbleValues("bin") + srcDir = nf.getNimbleValue("srcDir", ".") + binDir = getenv("outputBin", getenv("out", "/dev/null")) / "bin" + if bins != @[]: + for bin in bins: + cmds.add("nim compile $# --outdir:$# $#" % + [getenv"nimFlags", binDir, normalizedPath(srcDir / bin)]) + if getEnvBool"nimDoc": + echo "generating documentation" + let docDir = getenv("outputDoc", (getenv("out", "/dev/null") / "doc")) + for path in walkFiles(srcDir / "*.nim"): + cmds.add("nim doc --outdir:$# $#" % [docDir, path]) + if cmds.len > 0: + let err = execProcesses( + cmds, n = 1, + beforeRunEvent = before) + if err != 0: quit("build phase failed", err) + +proc installPhase*() = + ## Install the Nim sources if ``nimBinOnly`` is not + ## set in the environment. + if not getEnvBool"nimBinOnly": + let + nf = getNimbleFilePath() + srcDir = nf.getNimbleValue("srcDir", ".") + devDir = getenv("outputDev", getenv("out", "/dev/null")) + echo "Install ", srcDir, " to ", devDir + copyDir(normalizedPath(srcDir), normalizedPath(devDir / srcDir)) + copyFile(nf, devDir / nf.extractFilename) + +proc checkPhase*() = + ## Build and run the tests in ``tests``. + var cmds: seq[string] + proc before(idx: int) = + echo "check job ", idx, ": ", cmds[idx] + for path in walkPattern("tests/t*.nim"): + cmds.add("nim r $#" % [path]) + let err = execProcesses( + cmds, n = 1, + beforeRunEvent = before) + if err != 0: quit("check phase failed", err) + +when isMainModule: + import std/parseopt + var phase: string + + for kind, key, val in getopt(): + case kind + of cmdLongOption: + case key.toLowerAscii + of "phase": + if phase != "": quit("only a single phase may be specified") + phase = val + else: quit("unhandled argument " & key) + of cmdEnd: discard + else: quit("unhandled argument " & key) + + case phase + of "configure": configurePhase() + of "build": buildPhase() + of "install": installPhase() + of "check": checkPhase() + else: quit("unhandled phase " & phase) diff --git a/nixpkgs/pkgs/development/nim-packages/nimbox/default.nix b/nixpkgs/pkgs/development/nim-packages/nimbox/default.nix new file mode 100644 index 000000000000..53663c642810 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/nimbox/default.nix @@ -0,0 +1,8 @@ +{ fetchFromGitHub }: + +fetchFromGitHub { + owner = "dom96"; + repo = "nimbox"; + rev = "6a56e76c01481176f16ae29b7d7c526bd83f229b"; + sha256 = "15x1sdfxa1xcqnr68705jfnlv83lm0xnp2z9iz3pgc4bz5vwn4x1"; +} diff --git a/nixpkgs/pkgs/development/nim-packages/nimcrypto/default.nix b/nixpkgs/pkgs/development/nim-packages/nimcrypto/default.nix new file mode 100644 index 000000000000..6c212ef45f1a --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/nimcrypto/default.nix @@ -0,0 +1,8 @@ +{ fetchFromGitHub }: + +fetchFromGitHub { + owner = "cheatfate"; + repo = "nimcrypto"; + rev = "a5742a9a214ac33f91615f3862c7b099aec43b00"; + sha256 = "0al0jsaicm8vyr63n909dq1glhvpra1n9sllmj0r7lsjsdb59wsz"; +} diff --git a/nixpkgs/pkgs/development/nim-packages/nimsimd/default.nix b/nixpkgs/pkgs/development/nim-packages/nimsimd/default.nix new file mode 100644 index 000000000000..9ccd96453572 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/nimsimd/default.nix @@ -0,0 +1,7 @@ +{ fetchNimble }: + +fetchNimble { + pname = "nimsimd"; + version = "1.0.0"; + hash = "sha256-kp61fylAJ6MSN9hLYLi7CU2lxVR/lbrNCvZTe0LJLGo="; +} diff --git a/nixpkgs/pkgs/development/nim-packages/noise/default.nix b/nixpkgs/pkgs/development/nim-packages/noise/default.nix new file mode 100644 index 000000000000..7931467dbbd5 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/noise/default.nix @@ -0,0 +1,8 @@ +{ fetchFromGitHub }: + +fetchFromGitHub { + owner = "jangko"; + repo = "nim-noise"; + rev = "v0.1.14"; + sha256 = "0wndiphznfyb1pac6zysi3bqljwlfwj6ziarcwnpf00sw2zni449"; +} diff --git a/nixpkgs/pkgs/development/nim-packages/packedjson/default.nix b/nixpkgs/pkgs/development/nim-packages/packedjson/default.nix new file mode 100644 index 000000000000..9edad962d589 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/packedjson/default.nix @@ -0,0 +1,8 @@ +{ fetchFromGitHub }: + +fetchFromGitHub { + owner = "Araq"; + repo = "packedjson"; + rev = "7198cc8"; + sha256 = "1ay2zd88q8hvpvigsg8h0y5vc65hk3lk0d48fy9hwg4lcng19mp1"; +} diff --git a/nixpkgs/pkgs/development/nim-packages/pixie/default.nix b/nixpkgs/pkgs/development/nim-packages/pixie/default.nix new file mode 100644 index 000000000000..2262ccf23721 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/pixie/default.nix @@ -0,0 +1,7 @@ +{ fetchNimble }: + +fetchNimble { + pname = "pixie"; + version = "1.1.3"; + hash = "sha256-xKIejVxOd19mblL1ZwpJH91dgKQS5g8U08EL8lGGelA="; +} diff --git a/nixpkgs/pkgs/development/nim-packages/redis/default.nix b/nixpkgs/pkgs/development/nim-packages/redis/default.nix new file mode 100644 index 000000000000..1768bf1976f5 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/redis/default.nix @@ -0,0 +1,8 @@ +{ fetchFromGitHub }: + +fetchFromGitHub { + owner = "zedeus"; + repo = "redis"; + rev = "94bcbf1"; + sha256 = "1p9zv4f4lqrjqa8fk98cb89b9fzlf866jc584ll9sws14904i80j"; +} diff --git a/nixpkgs/pkgs/development/nim-packages/redpool/default.nix b/nixpkgs/pkgs/development/nim-packages/redpool/default.nix new file mode 100644 index 000000000000..ef14854b32dc --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/redpool/default.nix @@ -0,0 +1,8 @@ +{ fetchFromGitHub }: + +fetchFromGitHub { + owner = "zedeus"; + repo = "redpool"; + rev = "57aeb25"; + sha256 = "0fph7qlia6fvya1zqzbgvww2hk5pd0vq1wlf9ij9jyn655mg0w3q"; +} diff --git a/nixpkgs/pkgs/development/nim-packages/regex/default.nix b/nixpkgs/pkgs/development/nim-packages/regex/default.nix new file mode 100644 index 000000000000..d89fbdd60538 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/regex/default.nix @@ -0,0 +1,8 @@ +{ fetchFromGitHub }: + +fetchFromGitHub { + owner = "nitely"; + repo = "nim-regex"; + rev = "2e32fdc"; + sha256 = "1hrl40mwql7nh4wc7sdhmk8bj5728b93v5a93j49v660l0rn4qx8"; +} diff --git a/nixpkgs/pkgs/development/nim-packages/sass/default.nix b/nixpkgs/pkgs/development/nim-packages/sass/default.nix new file mode 100644 index 000000000000..79885ed9ec5a --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/sass/default.nix @@ -0,0 +1,13 @@ +{ buildNimPackage, fetchFromGitHub, libsass }: + +buildNimPackage rec { + pname = "sass"; + version = "e683aa1"; + src = fetchFromGitHub { + owner = "dom96"; + repo = pname; + rev = version; + sha256 = "0qvly5rilsqqsyvr67pqhglm55ndc4nd6v90jwswbnigxiqf79lc"; + }; + propagatedBuildInputs = [ libsass ]; +} diff --git a/nixpkgs/pkgs/development/nim-packages/sdl2/default.nix b/nixpkgs/pkgs/development/nim-packages/sdl2/default.nix new file mode 100644 index 000000000000..ddcdf072c6b4 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/sdl2/default.nix @@ -0,0 +1,17 @@ +{ lib, buildNimPackage, fetchNimble, SDL2 }: + +buildNimPackage rec { + pname = "sdl2"; + version = "2.0.4"; + src = fetchNimble { + inherit pname version; + hash = "sha256-Vtcj8goI4zZPQs2TbFoBFlcR5UqDtOldaXSH/+/xULk="; + }; + propagatedBuildInputs = [ SDL2 ]; + doCheck = true; + meta = { + description = "Nim wrapper for SDL 2.x"; + platforms = lib.platforms.linux; # Problems with Darwin. + license = [ lib.licenses.mit ]; + }; +} diff --git a/nixpkgs/pkgs/development/nim-packages/segmentation/default.nix b/nixpkgs/pkgs/development/nim-packages/segmentation/default.nix new file mode 100644 index 000000000000..c695cd00ca92 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/segmentation/default.nix @@ -0,0 +1,8 @@ +{ fetchFromGitHub }: + +fetchFromGitHub { + owner = "nitely"; + repo = "nim-segmentation"; + rev = "v0.1.0"; + sha256 = "007bkx8dwy8n340zbp6wyqfsq9bh6q5ykav1ywdlwykyp1n909bh"; +} diff --git a/nixpkgs/pkgs/development/nim-packages/supersnappy/default.nix b/nixpkgs/pkgs/development/nim-packages/supersnappy/default.nix new file mode 100644 index 000000000000..471543eca411 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/supersnappy/default.nix @@ -0,0 +1,8 @@ +{ fetchFromGitHub }: + +fetchFromGitHub { + owner = "guzba"; + repo = "supersnappy"; + rev = "1.1.5"; + sha256 = "1y26sgnszvdf5sn7j0jx2dpd4i03mvbk9i9ni9kbyrs798bjwi6z"; +} diff --git a/nixpkgs/pkgs/development/nim-packages/typography/default.nix b/nixpkgs/pkgs/development/nim-packages/typography/default.nix new file mode 100644 index 000000000000..59037cbd9dd3 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/typography/default.nix @@ -0,0 +1,7 @@ +{ fetchNimble }: + +fetchNimble { + pname = "typography"; + version = "0.7.9"; + hash = "sha256-IYjw3PCp5XzVed2fGGCt9Hb60cxFeF0BUZ7L5PedTLU="; +} diff --git a/nixpkgs/pkgs/development/nim-packages/unicodedb/default.nix b/nixpkgs/pkgs/development/nim-packages/unicodedb/default.nix new file mode 100644 index 000000000000..8b60710e8210 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/unicodedb/default.nix @@ -0,0 +1,8 @@ +{ fetchFromGitHub }: + +fetchFromGitHub { + owner = "nitely"; + repo = "nim-unicodedb"; + rev = "v0.9.0"; + sha256 = "06j8d0bjbpv1iibqlmrac4qb61ggv17hvh6nv4pbccqk1rlpxhsq"; +} diff --git a/nixpkgs/pkgs/development/nim-packages/unicodeplus/default.nix b/nixpkgs/pkgs/development/nim-packages/unicodeplus/default.nix new file mode 100644 index 000000000000..772524eaf94b --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/unicodeplus/default.nix @@ -0,0 +1,8 @@ +{ fetchFromGitHub }: + +fetchFromGitHub { + owner = "nitely"; + repo = "nim-unicodeplus"; + rev = "v0.8.0"; + sha256 = "181wzwivfgplkqn5r4crhnaqgsza7x6fi23i86djb2dxvm7v6qxk"; +} diff --git a/nixpkgs/pkgs/development/nim-packages/vmath/default.nix b/nixpkgs/pkgs/development/nim-packages/vmath/default.nix new file mode 100644 index 000000000000..9ca48c43d7f4 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/vmath/default.nix @@ -0,0 +1,7 @@ +{ fetchNimble }: + +fetchNimble { + pname = "vmath"; + version = "1.0.3"; + hash = "sha256-zzSKXjuTZ46HTFUs0N47mxEKTKIdS3dwr+60sQYSdn0="; +} diff --git a/nixpkgs/pkgs/development/nim-packages/zippy/default.nix b/nixpkgs/pkgs/development/nim-packages/zippy/default.nix new file mode 100644 index 000000000000..230892b68899 --- /dev/null +++ b/nixpkgs/pkgs/development/nim-packages/zippy/default.nix @@ -0,0 +1,7 @@ +{ fetchNimble }: + +fetchNimble { + pname = "zippy"; + version = "0.5.6"; + hash = "sha256-axp4t9+8TFSpvnATlRKZyuOGLA0e/XKfvrVSwreXpC4="; +} diff --git a/nixpkgs/pkgs/development/node-packages/default.nix b/nixpkgs/pkgs/development/node-packages/default.nix index 2ecda487920f..0c952e71f551 100644 --- a/nixpkgs/pkgs/development/node-packages/default.nix +++ b/nixpkgs/pkgs/development/node-packages/default.nix @@ -1,4 +1,4 @@ -{ pkgs, nodejs, stdenv, applyPatches, fetchFromGitHub, fetchpatch }: +{ pkgs, nodejs, stdenv, applyPatches, fetchFromGitHub, fetchpatch, fetchurl }: let since = (version: pkgs.lib.versionAtLeast nodejs.version version); @@ -46,6 +46,17 @@ let ''; }; + carbon-now-cli = super.carbon-now-cli.override ({ + nativeBuildInputs = [ pkgs.makeWrapper ]; + prePatch = '' + export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 + ''; + postInstall = '' + wrapProgram $out/bin/carbon-now \ + --set PUPPETEER_EXECUTABLE_PATH ${pkgs.chromium.outPath}/bin/chromium + ''; + }); + castnow = super.castnow.override { nativeBuildInputs = [ pkgs.makeWrapper ]; @@ -278,13 +289,29 @@ let prisma = super.prisma.override { nativeBuildInputs = [ pkgs.makeWrapper ]; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prisma/-/prisma-3.1.1.tgz"; + sha512 = "sha512-+eZtWIL6hnOKUOvqq9WLBzSw2d/EbTmOx1Td1LI8/0XE40ctXMLG2N1p6NK5/+yivGaoNJ9PDpPsPL9lO4nJrQ=="; + }; + dependencies = [ + { + name = "_at_prisma_slash_engines"; + packageName = "@prisma/engines"; + version = "3.1.0-24.c22652b7e418506fab23052d569b85d3aec4883f"; + src = fetchurl { + url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.1.0-24.c22652b7e418506fab23052d569b85d3aec4883f.tgz"; + sha512 = "sha512-6NEp0VlLho3hVtIvj2P4h0e19AYqQSXtFGts8gSIXDnV+l5pRFZaDMfGo2RiLMR0Kfrs8c3ZYxYX0sWmVL0tWw=="; + }; + } + ]; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ - --prefix PRISMA_MIGRATION_ENGINE_BINARY : "${prisma-engines}/bin/migration-engine" \ - --prefix PRISMA_QUERY_ENGINE_BINARY : "${prisma-engines}/bin/query-engine" \ - --prefix PRISMA_QUERY_ENGINE_LIBRARY : "${lib.getLib prisma-engines}/libquery_engine.so.node" - --prefix PRISMA_INTROSPECTION_ENGINE_BINARY : "${prisma-engines}/bin/introspection-engine" \ - --prefix PRISMA_FMT_BINARY : "${prisma-engines}/bin/prisma-fmt" + --set PRISMA_MIGRATION_ENGINE_BINARY ${prisma-engines}/bin/migration-engine \ + --set PRISMA_QUERY_ENGINE_BINARY ${prisma-engines}/bin/query-engine \ + --set PRISMA_QUERY_ENGINE_LIBRARY ${lib.getLib prisma-engines}/lib/libquery_engine.node \ + --set PRISMA_INTROSPECTION_ENGINE_BINARY ${prisma-engines}/bin/introspection-engine \ + --set PRISMA_FMT_BINARY ${prisma-engines}/bin/prisma-fmt ''; }; diff --git a/nixpkgs/pkgs/development/node-packages/node-packages.json b/nixpkgs/pkgs/development/node-packages/node-packages.json index dcab9c832e64..ebfe703123a0 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -25,8 +25,10 @@ , "bower" , "bower2nix" , "browserify" +, "browser-sync" , "btc-rpc-explorer" , "castnow" +, "carbon-now-cli" , "cdk8s-cli" , "cdktf-cli" , "clean-css-cli" @@ -117,6 +119,7 @@ , "git-ssb" , "git-standup" , "gitmoji-cli" +, "glob" , "graphql-cli" , "grunt-cli" , "makam" @@ -166,6 +169,7 @@ , "less-plugin-clean-css" , "live-server" , "livedown" +, "lodash" , {"lumo-build-deps": "../interpreters/clojurescript/lumo" } , "madoko" , "markdownlint-cli" diff --git a/nixpkgs/pkgs/development/node-packages/node-packages.nix b/nixpkgs/pkgs/development/node-packages/node-packages.nix index f6529ab7f5be..cbbaf7b0db8c 100644 --- a/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -31,6 +31,15 @@ let sha512 = "CXMFAyovJHtLzKlraBpGlM/8TX9bvVz081IDZkQF3IMGHePgHCAs1vQdnKM38VMGekywNCbo7kt3fHooSMgA2w=="; }; }; + "@alexbosworth/node-fetch-2.6.2" = { + name = "_at_alexbosworth_slash_node-fetch"; + packageName = "@alexbosworth/node-fetch"; + version = "2.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@alexbosworth/node-fetch/-/node-fetch-2.6.2.tgz"; + sha512 = "9ls0Zn0qXTmUdt1p9LA1P9Kor9wF1pXtfUTjipCpoYYQ4fEUsuCgQbiymk4oJccpsZ9dAG3vZ1Zt51WabjJTUw=="; + }; + }; "@alexbosworth/saxophone-0.6.2" = { name = "_at_alexbosworth_slash_saxophone"; packageName = "@alexbosworth/saxophone"; @@ -40,13 +49,13 @@ let sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww=="; }; }; - "@angular-devkit/architect-0.1202.5" = { + "@angular-devkit/architect-0.1202.7" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1202.5"; + version = "0.1202.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.5.tgz"; - sha512 = "HiF8RceDrvP7m8Qm53KWVpekESX0UIK4/tOg9mgFMcS/2utRnPzuu4WbfrcY9DRrsoMWLXQs6j/UVXqf8PzXJw=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.7.tgz"; + sha512 = "zqqw3h8jMDYsRrXUNY1J8xtUl6wmBO++yTka+CoEIFetNdLdoWmb5VpaA81i0aSBhXBgnBUUFvqZGdiI7BbV8A=="; }; }; "@angular-devkit/core-12.0.5" = { @@ -67,13 +76,13 @@ let sha512 = "KOzGD8JbP/7EeUwPiU5x+fo3ZEQ5R4IVW5WoH92PaO3mdpqXC7UL2MWLct8PUe9il9nqJMvrBMldSSvP9PCT2w=="; }; }; - "@angular-devkit/core-12.2.5" = { + "@angular-devkit/core-12.2.7" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "12.2.5"; + version = "12.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.5.tgz"; - sha512 = "UBo0Q9nVGPxC+C1PONSzaczPLv5++5Q7PC2orZepDbWmY0jUDwe9VVJrmp8EhLZbzVKFpyCIs1ZE8h0s0LP1zA=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.7.tgz"; + sha512 = "WeLlDZaudpx10OGDPfVcWu/CaEWiWzAaLTUQz0Ww/yM+01FxR/P8yeH1sYAV1MS6d6KHvXGw7Lpf8PV7IA/zHA=="; }; }; "@angular-devkit/schematics-12.0.5" = { @@ -94,13 +103,13 @@ let sha512 = "yD3y3pK/K5piOgvALFoCCiPp4H8emNa3yZL+vlpEpewVLpF1MM55LeTxc0PI5s0uqtOGVnvcbA5wYgMm3YsUEA=="; }; }; - "@angular-devkit/schematics-12.2.5" = { + "@angular-devkit/schematics-12.2.7" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "12.2.5"; + version = "12.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.2.5.tgz"; - sha512 = "8WAdZ39FZqbU1/ZQQrK+7PeRuj6QUGlxFUgoVXk5nzRbpZo/OSaKhPoC7sC1A0EU+7udLp5vT7R12sDz7Mr9vQ=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.2.7.tgz"; + sha512 = "E0hCFyyfbixjerf0Okt4ynC6F1dsT2Wl7MwAePe+wzPTHCnKIRTa2PQTxJzdWeTlSkQMkSK6ft2iyWOD/FODng=="; }; }; "@angular-devkit/schematics-cli-12.1.4" = { @@ -229,13 +238,13 @@ let sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w=="; }; }; - "@apollo/client-3.4.10" = { + "@apollo/client-3.4.13" = { name = "_at_apollo_slash_client"; packageName = "@apollo/client"; - version = "3.4.10"; + version = "3.4.13"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/client/-/client-3.4.10.tgz"; - sha512 = "b+8TT3jBM2BtEJi+V2FuLpvoYDZCY3baNYrgAgEyw4fjnuBCSRPY7qVjqriZAwMaGiTLtyVifGhmdeICQs4Eow=="; + url = "https://registry.npmjs.org/@apollo/client/-/client-3.4.13.tgz"; + sha512 = "/nH8z/0X6WJ+wtUREHTlKQGX4lo6u3XkF1hy+k4eCxLZzT5+VRw1rm92iIkj1H85vep/eE/KV3DdRq1x3t9NnQ=="; }; }; "@apollo/protobufjs-1.2.2" = { @@ -310,13 +319,13 @@ let sha1 = "e70187f8a862e191b1bce6c0268f13acd3a56b20"; }; }; - "@babel/cli-7.15.4" = { + "@babel/cli-7.15.7" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.15.4"; + version = "7.15.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.15.4.tgz"; - sha512 = "9RhhQ7tgKRcSO/jI3rNLxalLSk30cHqeM8bb+nGOJTyYBDpkoXw/A9QHZ2SYjlslAt4tr90pZQGIEobwWHSIDw=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.15.7.tgz"; + sha512 = "YW5wOprO2LzMjoWZ5ZG6jfbY9JnkDxuHDwvnrThnuYtByorova/I0HNXJedrUfwuXFQfYOjcqDA4PU3qlZGZjg=="; }; }; "@babel/code-frame-7.10.4" = { @@ -499,13 +508,13 @@ let sha512 = "jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA=="; }; }; - "@babel/helper-module-transforms-7.15.4" = { + "@babel/helper-module-transforms-7.15.7" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.15.4"; + version = "7.15.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.4.tgz"; - sha512 = "9fHHSGE9zTC++KuXLZcB5FKgvlV83Ox+NLUmQTawovwlJ85+QMhk1CnVk406CQVj97LaWod6KVjl2Sfgw9Aktw=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.7.tgz"; + sha512 = "ZNqjjQG/AuFfekFTY+7nY4RgBSklgTu970c7Rj3m/JOhIu5KPBUuTA9AY6zaKcUvk4g6EbDXdBnhi35FAssdSw=="; }; }; "@babel/helper-optimise-call-expression-7.15.4" = { @@ -580,13 +589,13 @@ let sha512 = "HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw=="; }; }; - "@babel/helper-validator-identifier-7.14.9" = { + "@babel/helper-validator-identifier-7.15.7" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.14.9"; + version = "7.15.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz"; - sha512 = "pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz"; + sha512 = "K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w=="; }; }; "@babel/helper-validator-option-7.14.5" = { @@ -643,13 +652,13 @@ let sha512 = "OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw=="; }; }; - "@babel/parser-7.15.5" = { + "@babel/parser-7.15.7" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.15.5"; + version = "7.15.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.15.5.tgz"; - sha512 = "2hQstc6I7T6tQsWzlboMh3SgMRPaS4H6H7cPQsJkdzTzEGqQrpLDsE2BGASU5sBPoEQyHzeqU6C8uKbFeEk6sg=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.15.7.tgz"; + sha512 = "rycZXvQ+xS9QyIcJ9HXeDWf1uxqlbVFAUq0Rq0dbc50Zb/+wUe/ehyfzGfm9KZZF0kBejYgxltBXocP+gKdL2g=="; }; }; "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" = { @@ -769,13 +778,13 @@ let sha512 = "6vh4SqRuLLarjgeOf4EaROJAHjvu9Gl+/346PbDH9yWbJyfnJ/ah3jmYKYtswEyCoWZiidvVHjHshd4WgjB9BA=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.14.7" = { + "@babel/plugin-proposal-object-rest-spread-7.15.6" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.14.7"; + version = "7.15.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz"; - sha512 = "082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz"; + sha512 = "qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.14.5" = { @@ -1390,13 +1399,13 @@ let sha512 = "UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw=="; }; }; - "@babel/preset-env-7.15.4" = { + "@babel/preset-env-7.15.6" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.15.4"; + version = "7.15.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.4.tgz"; - sha512 = "4f2nLw+q6ht8gl3sHCmNhmA5W6b1ItLzbH3UrKuJxACHr2eCpk96jwjrAfCAaXaaVwTQGnyUYHY2EWXJGt7TUQ=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.6.tgz"; + sha512 = "L+6jcGn7EWu7zqaO2uoTDjjMBW+88FXzV8KvrBl2z6MtRNxlsmUNRlZPaNNPUTgqhyC5DHNFk/2Jmra+ublZWw=="; }; }; "@babel/preset-flow-7.14.5" = { @@ -1489,22 +1498,13 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/runtime-corejs3-7.15.4" = { - name = "_at_babel_slash_runtime-corejs3"; - packageName = "@babel/runtime-corejs3"; - version = "7.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.4.tgz"; - sha512 = "lWcAqKeB624/twtTc3w6w/2o9RqJPaNBhPGK6DKLSiwuVWC7WFkypWyNg+CpZoyJH0jVzv1uMtXZ/5/lQOLtCg=="; - }; - }; - "@babel/standalone-7.15.5" = { + "@babel/standalone-7.15.7" = { name = "_at_babel_slash_standalone"; packageName = "@babel/standalone"; - version = "7.15.5"; + version = "7.15.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.15.5.tgz"; - sha512 = "rho2fzDGLrdYVbl0S71I8z6AREWnVvADzv7Gb4TLKhqpE6cJAvno0ALMuF253+wqhN8futx4ELWQpBYMxi4jmA=="; + url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.15.7.tgz"; + sha512 = "1dPLi+eQEJE0g1GnUM0Ik2GcS5SMXivoxt6meQxQxGWEd/DCdSBRJClUVlQ25Vbqe49g1HG5Ej0ULhmsqtSMmg=="; }; }; "@babel/template-7.15.4" = { @@ -1534,40 +1534,40 @@ let sha512 = "K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA=="; }; }; - "@babel/types-7.15.4" = { + "@babel/types-7.15.6" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.15.4"; + version = "7.15.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.15.4.tgz"; - sha512 = "0f1HJFuGmmbrKTCZtbm3cU+b/AqdEYk5toj5iQur58xkVMlS0JWaKxTBSmCXd47uiN7vbcozAupm6Mvs80GNhw=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz"; + sha512 = "BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig=="; }; }; - "@blueprintjs/colors-3.0.0" = { + "@blueprintjs/colors-5.0.0-alpha.0" = { name = "_at_blueprintjs_slash_colors"; packageName = "@blueprintjs/colors"; - version = "3.0.0"; + version = "5.0.0-alpha.0"; src = fetchurl { - url = "https://registry.npmjs.org/@blueprintjs/colors/-/colors-3.0.0.tgz"; - sha512 = "8rRkIcnnOwMEMAGDciKFdVQ3dZXvCkSGcgEzVR2ijopCvLZrrHf+ySzn8v7Y2d60A2Q2A3Of8NDrYbV32sBssg=="; + url = "https://registry.npmjs.org/@blueprintjs/colors/-/colors-5.0.0-alpha.0.tgz"; + sha512 = "TsYKtsT7K+ok14GYWheBfkQxqMRGd6M3cnJ1Ge/nitNzIzmYiydKhOb7KBV0xnRNHlDKGuXSEdnsylAlRgSoIQ=="; }; }; - "@blueprintjs/core-3.49.1" = { + "@blueprintjs/core-3.50.2" = { name = "_at_blueprintjs_slash_core"; packageName = "@blueprintjs/core"; - version = "3.49.1"; + version = "3.50.2"; src = fetchurl { - url = "https://registry.npmjs.org/@blueprintjs/core/-/core-3.49.1.tgz"; - sha512 = "H6UAYZeBZcGDQb24vEkFps0eKlkyKvy/B/OJ2elZjHC1B1Regv7TwIDjju9wgzZvzKCcCVZzUg9OqtH43V+1yA=="; + url = "https://registry.npmjs.org/@blueprintjs/core/-/core-3.50.2.tgz"; + sha512 = "y+J5yh34MoCFPgr7TlfRAY8xyFvZadoGbqhoMWdUWP+Nfhb6+Zu5wIchpC+2Z2Kw+eHH3W1ld39GYiPHOVnNWw=="; }; }; - "@blueprintjs/icons-3.29.0" = { + "@blueprintjs/icons-3.30.1" = { name = "_at_blueprintjs_slash_icons"; packageName = "@blueprintjs/icons"; - version = "3.29.0"; + version = "3.30.1"; src = fetchurl { - url = "https://registry.npmjs.org/@blueprintjs/icons/-/icons-3.29.0.tgz"; - sha512 = "FDpPsEBwzsFBsxDXNsea+u+bU+iFWcVTbKH05+jtGEpvDEOrpOsOwUYvkBvVaReR0DORREVye2/NL0/uvLCRrg=="; + url = "https://registry.npmjs.org/@blueprintjs/icons/-/icons-3.30.1.tgz"; + sha512 = "Y15u+B/+N51oLwOkZg5uQ5tkGCMLXfMhf2iRBIr6t3OBkCGoc9C61a7VeII5EDC8fjKlh9MewVbLuFIIEbUP8g=="; }; }; "@braintree/sanitize-url-3.1.0" = { @@ -1633,22 +1633,22 @@ let sha512 = "htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA=="; }; }; - "@cdktf/hcl2cdk-0.5.0" = { + "@cdktf/hcl2cdk-0.6.3" = { name = "_at_cdktf_slash_hcl2cdk"; packageName = "@cdktf/hcl2cdk"; - version = "0.5.0"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.5.0.tgz"; - sha512 = "E9/uA3JxXPPVKkiTX6DhUZHkAH5ZFWrNewhJB/woOejTkn7P4saOGxXYgrxiu6MCz2lgN8iE4YNGSTKPcxq8sA=="; + url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.6.3.tgz"; + sha512 = "HlftsTONtdqtn3y/vjGWAPoyZGKSAkz7NAE+xo4ukdbH7HRYCmb5nrh5t40bIKiWtXe4kdYGxRWsNC0VHCOt5A=="; }; }; - "@cdktf/hcl2json-0.5.0" = { + "@cdktf/hcl2json-0.6.3" = { name = "_at_cdktf_slash_hcl2json"; packageName = "@cdktf/hcl2json"; - version = "0.5.0"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.5.0.tgz"; - sha512 = "3E4/6sCLEcoPUk6FJHOpLGqBNSE2AHrIrErXKRFU3je/MZotxvWrfrZY3IsENJgjJ69Zv0dxMxTZo/l+BVNa3w=="; + url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.6.3.tgz"; + sha512 = "DVHTsD13IoNPFDFMXg8PzCI9qUp8hKHvhmysDECbTIMqQ5CzkdM3u9CMojTdco5HEbdmymFkaVX07xn+9ITKQA=="; }; }; "@chemzqm/neovim-5.4.0" = { @@ -1921,175 +1921,175 @@ let sha512 = "HilPrVrCosYWqSyjfpDtaaN1kJwdlBpS+IAflP3z+e7nsEgk3JGJf1Vg0NgHJooTf5HDfXSyZqMVg+5jvXCK0g=="; }; }; - "@discoveryjs/json-ext-0.5.3" = { + "@discoveryjs/json-ext-0.5.5" = { name = "_at_discoveryjs_slash_json-ext"; packageName = "@discoveryjs/json-ext"; - version = "0.5.3"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz"; - sha512 = "Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g=="; + url = "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz"; + sha512 = "6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA=="; }; }; - "@electron-forge/async-ora-6.0.0-beta.60" = { + "@electron-forge/async-ora-6.0.0-beta.61" = { name = "_at_electron-forge_slash_async-ora"; packageName = "@electron-forge/async-ora"; - version = "6.0.0-beta.60"; + version = "6.0.0-beta.61"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.60.tgz"; - sha512 = "MGRAfcxHkBVstgoZl/vk35IufNCu+xEYyZwaBk94w7NicIcW69z2VnP/W/v35sP3ekhqjpDCc0QGSQP5S1Zmuw=="; + url = "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.61.tgz"; + sha512 = "K+9fwnLbcV7TmgDxZO0PMdh1Cs1dWPFmVRfLRPBTS1NFsbiJqVwMVNZiL7fXV8ruWQDi7VXC8I42poLIVhcg0A=="; }; }; - "@electron-forge/core-6.0.0-beta.60" = { + "@electron-forge/core-6.0.0-beta.61" = { name = "_at_electron-forge_slash_core"; packageName = "@electron-forge/core"; - version = "6.0.0-beta.60"; + version = "6.0.0-beta.61"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.60.tgz"; - sha512 = "JOUcO+PNdSeA623Y38zBJYvGnR6eIGNs+GA15ba9X/BKwX4zNjXDubc2tct+tiMNudTdSIAA/dwlzCJw9hTF9g=="; + url = "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.61.tgz"; + sha512 = "MdthpIbTmjbzq7DdYDKWSyT+bApmP4uvIEdC9b8FafInxZWvBGWupod3OuoZs49uZE8w9dpYwDc1g4B3jDcAHw=="; }; }; - "@electron-forge/installer-base-6.0.0-beta.60" = { + "@electron-forge/installer-base-6.0.0-beta.61" = { name = "_at_electron-forge_slash_installer-base"; packageName = "@electron-forge/installer-base"; - version = "6.0.0-beta.60"; + version = "6.0.0-beta.61"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.60.tgz"; - sha512 = "WnU7LEw98Lew1/5Kv/DzvqW19BNPPXxPTtTfpHnhOybm5g9uJ2sEjol4We5bgK0UFbCCORmwgbZYZsMCN/mx4A=="; + url = "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.61.tgz"; + sha512 = "8Mx/c3xtJm4uWv6y8SBd0SW0NodWFr1SHGJXURY8TmLQKvy+9YCDXhJlIF5etUHXgWeZeAidY3Ly/EksJrmm4g=="; }; }; - "@electron-forge/installer-darwin-6.0.0-beta.60" = { + "@electron-forge/installer-darwin-6.0.0-beta.61" = { name = "_at_electron-forge_slash_installer-darwin"; packageName = "@electron-forge/installer-darwin"; - version = "6.0.0-beta.60"; + version = "6.0.0-beta.61"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.60.tgz"; - sha512 = "qAbPhr5Dt+aALmwC47cjNKR70hj+spNKRkMYSJMxD6tpbG4JDS+UQaHeuQAWY50XGgBWdialN6Hvr+y+d+QgGg=="; + url = "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.61.tgz"; + sha512 = "96BO9FwhB1LUrHQVEtl+Lz7Fs6tJYW/lUlYYfXzMhCD2xmYOaZ91uDdbqSRdZ1F9iOYAb5xVSV6RuHvf3F84GQ=="; }; }; - "@electron-forge/installer-deb-6.0.0-beta.60" = { + "@electron-forge/installer-deb-6.0.0-beta.61" = { name = "_at_electron-forge_slash_installer-deb"; packageName = "@electron-forge/installer-deb"; - version = "6.0.0-beta.60"; + version = "6.0.0-beta.61"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.60.tgz"; - sha512 = "Wma/FqochMopLeQTxW2/3uRt69JkkL7xq91P5PDJzIgEXEjlU0SyR8LKvNC8VMPQ7/cBDHowpI79cMBVjif25g=="; + url = "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.61.tgz"; + sha512 = "jA8H9RiIK9whif5pq3phzIncW6+FLOcPoipi75oh+LOp6Dvw39jWnfqH6mwleBH2SUhPmUy/XeFhre4LBissBQ=="; }; }; - "@electron-forge/installer-dmg-6.0.0-beta.60" = { + "@electron-forge/installer-dmg-6.0.0-beta.61" = { name = "_at_electron-forge_slash_installer-dmg"; packageName = "@electron-forge/installer-dmg"; - version = "6.0.0-beta.60"; + version = "6.0.0-beta.61"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.60.tgz"; - sha512 = "N0rXYeMA4qcsDH9WadJU4RT/HmveO8ggNw3zDVmuvvV1y0nt1OGU3kHaJuslDYAUY6DNpwdHoz6wd7XLsBzDrw=="; + url = "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.61.tgz"; + sha512 = "G6C96vaaRqZLG6JLkzcFd31OBSnOX80alIh5jmOpK3jZYMSWpvhDknhYmJfGktdGhH4MGBfhEcADdMnC8aDthw=="; }; }; - "@electron-forge/installer-exe-6.0.0-beta.60" = { + "@electron-forge/installer-exe-6.0.0-beta.61" = { name = "_at_electron-forge_slash_installer-exe"; packageName = "@electron-forge/installer-exe"; - version = "6.0.0-beta.60"; + version = "6.0.0-beta.61"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.60.tgz"; - sha512 = "YZ8V5DGTRgKB1+97t9wOtJh1T7yo7ea9CWK899yodGxYmFh1Xtc4hwfszOhnnXCoy5LyQhjvnrHWA3lRffOInA=="; + url = "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.61.tgz"; + sha512 = "feq/RCjEbQ6I0Xi06plMCbQ0lOhCP/G+La5RIkfyrzYUFMrSTA4tMbBirwI7w9Akxojdqfdfo8gldAIvvVMsjg=="; }; }; - "@electron-forge/installer-linux-6.0.0-beta.60" = { + "@electron-forge/installer-linux-6.0.0-beta.61" = { name = "_at_electron-forge_slash_installer-linux"; packageName = "@electron-forge/installer-linux"; - version = "6.0.0-beta.60"; + version = "6.0.0-beta.61"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.60.tgz"; - sha512 = "yi78aQvFtpyOe0WynsuJOOIXh2BSwrHPoufVgQpqicyAF8Ql/cteL5bZAbP7YNapWRBC/dI7XjxhUl5MbbEGTg=="; + url = "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.61.tgz"; + sha512 = "5nVQINdd+h6JWNQCLYe7Sh/15gD08lO2frOcjuWuG/w7/GhvkNot7eo9ff6vceKtIOi+OgJMgJIm2XnOF92u/w=="; }; }; - "@electron-forge/installer-rpm-6.0.0-beta.60" = { + "@electron-forge/installer-rpm-6.0.0-beta.61" = { name = "_at_electron-forge_slash_installer-rpm"; packageName = "@electron-forge/installer-rpm"; - version = "6.0.0-beta.60"; + version = "6.0.0-beta.61"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.60.tgz"; - sha512 = "JKP2ZefoC4mi3nCFXt6Md82QdEFn0A2WEW5q5R1xTOLbYm0SuYYX34S0Mo+6EZgBQYqot2ExA/l6C0beq1+GRQ=="; + url = "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.61.tgz"; + sha512 = "VARwf5fi8n4Y/UC51Vr2yM85FwDt/6Ynx4Xf80n3i0liIrdXuYgiuoaQ2ukrQ0osMpXZku0pKOvIo/McSI33TA=="; }; }; - "@electron-forge/installer-zip-6.0.0-beta.60" = { + "@electron-forge/installer-zip-6.0.0-beta.61" = { name = "_at_electron-forge_slash_installer-zip"; packageName = "@electron-forge/installer-zip"; - version = "6.0.0-beta.60"; + version = "6.0.0-beta.61"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.60.tgz"; - sha512 = "MMnCESVjn1nCVBGHHd1fD+4pBEgKj/aKCwAxYP9VmZdR/EcxpcFo+yjYEHtf39gFXHAKtVtJTO/FF7m7peUz+g=="; + url = "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.61.tgz"; + sha512 = "T4YNzbPsmlHKiLpy+P5sEtrKd6bYbOdCEjXAZllNKsmU8jMjL3b3Z4rvpxWoyE4o2EMCZkf1rteFe0JEqkMzeQ=="; }; }; - "@electron-forge/maker-base-6.0.0-beta.60" = { + "@electron-forge/maker-base-6.0.0-beta.61" = { name = "_at_electron-forge_slash_maker-base"; packageName = "@electron-forge/maker-base"; - version = "6.0.0-beta.60"; + version = "6.0.0-beta.61"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.60.tgz"; - sha512 = "z31j1tWMQunHpy9tCvbwEIFaF8/3ip13NAerTOSdABj1ngH1Wj+wdGm05iIeRQVcCrGSn/IIj/u7RGZ5CIRE6g=="; + url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.61.tgz"; + sha512 = "Q4FC11hNr/556lVNAT9TPY6whjSXCQqJb6IS0hNCdvlIX13mrb755fhsOSIdao9DKS2huYDZBN7ZkwcOcziJHQ=="; }; }; - "@electron-forge/plugin-base-6.0.0-beta.60" = { + "@electron-forge/plugin-base-6.0.0-beta.61" = { name = "_at_electron-forge_slash_plugin-base"; packageName = "@electron-forge/plugin-base"; - version = "6.0.0-beta.60"; + version = "6.0.0-beta.61"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.60.tgz"; - sha512 = "tNRGBmh/kFr/S/EXLvuyIRZYeu8axwt4IhJem/26rSe7byJ4ynjDYvhWBhT4S+//3w/fMmuJJX47cPKPfHxjgg=="; + url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.61.tgz"; + sha512 = "XVnV4teAx3e08Fg0bdPWUbGZTYQBOtXiD8i80NaKfo+tk3EkxEAVxYdQfHPZ0QV+0nZ1S/RZi/Lf6nKCnIbAGg=="; }; }; - "@electron-forge/publisher-base-6.0.0-beta.60" = { + "@electron-forge/publisher-base-6.0.0-beta.61" = { name = "_at_electron-forge_slash_publisher-base"; packageName = "@electron-forge/publisher-base"; - version = "6.0.0-beta.60"; + version = "6.0.0-beta.61"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.60.tgz"; - sha512 = "x7Zm/mukxPnvrJzP8mvhT1hohaIrAnGrDx4AKR8P2wxvz/lejU4VOJ6uRo+7w3OIi07IYJIrG52qhSyipEspqQ=="; + url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.61.tgz"; + sha512 = "qgZeWYKPfwLZEAa2KIE/PFTllxu9xWHigxyauy5RriM6wr1Df6FB7Zreq78j3aQOpi+mPZNx7+SUPPyImWMaqQ=="; }; }; - "@electron-forge/shared-types-6.0.0-beta.60" = { + "@electron-forge/shared-types-6.0.0-beta.61" = { name = "_at_electron-forge_slash_shared-types"; packageName = "@electron-forge/shared-types"; - version = "6.0.0-beta.60"; + version = "6.0.0-beta.61"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.60.tgz"; - sha512 = "ZAD7Aj+FpdKSrVvxnY54G8GsZKQYIbFtYmVljOgwV9hRaSt70uCMME60yBv6gbKeX+FYk0UopiU5Txrna2EeKA=="; + url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.61.tgz"; + sha512 = "VsFGVY5hXqEmhb36fg1CK57bPnYDZ/kYB9iZBNoXJVOHua9lW6HJaTXKXEsFfmCJi5U9hHLhfPtcIlNHPbG3/A=="; }; }; - "@electron-forge/template-base-6.0.0-beta.60" = { + "@electron-forge/template-base-6.0.0-beta.61" = { name = "_at_electron-forge_slash_template-base"; packageName = "@electron-forge/template-base"; - version = "6.0.0-beta.60"; + version = "6.0.0-beta.61"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.60.tgz"; - sha512 = "+/BM7QMljccaBFVq5wGUuf6vi1/UJt9gJq32TRlc4srZGjKarwmr393agedXYUkej85ns2dXK3mexF2ehIh4qQ=="; + url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.61.tgz"; + sha512 = "tt5tDD3Hb1oO2JJVMCn6pEWzVgFDq/Gok0Vjfk7v40l7dq6QUmDN1jAlxqXucPWlxkLC7U7oxiz+cNZRGbzqfQ=="; }; }; - "@electron-forge/template-typescript-6.0.0-beta.60" = { + "@electron-forge/template-typescript-6.0.0-beta.61" = { name = "_at_electron-forge_slash_template-typescript"; packageName = "@electron-forge/template-typescript"; - version = "6.0.0-beta.60"; + version = "6.0.0-beta.61"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.60.tgz"; - sha512 = "FN0mbNg4jyRSbrr1+hpx7JV6wyWwclDjB6X9vItrTc9IXz+xCWWrvTDvEfziwm5GMqNZ7u7/yWyJZnehre2k6A=="; + url = "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.61.tgz"; + sha512 = "oV+8TSHSjIGU7laO/6YSVGkod/zzxHjS3GFc3NqJ10K6417uQ2Xcxrs4rDJvKtQfuJ58n3tql0o5Rg5Hp7BYnA=="; }; }; - "@electron-forge/template-typescript-webpack-6.0.0-beta.60" = { + "@electron-forge/template-typescript-webpack-6.0.0-beta.61" = { name = "_at_electron-forge_slash_template-typescript-webpack"; packageName = "@electron-forge/template-typescript-webpack"; - version = "6.0.0-beta.60"; + version = "6.0.0-beta.61"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.60.tgz"; - sha512 = "UKGeLuq9Ds9/DBsu3c/99q8/6aBpFNENPjZI6kZ5CWq1wXXg+6QZaZLD+D6JAEYs3QJgAVT2bYMyvjysLglNoQ=="; + url = "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.61.tgz"; + sha512 = "HWsVSfrJbkUx4tqOYu7iygDCaioLMtDezlxDGPsX78Gdm2Npk1BqaZHpAZDQrUqM9qqfi4YMxkV+md7eVfFYhQ=="; }; }; - "@electron-forge/template-webpack-6.0.0-beta.60" = { + "@electron-forge/template-webpack-6.0.0-beta.61" = { name = "_at_electron-forge_slash_template-webpack"; packageName = "@electron-forge/template-webpack"; - version = "6.0.0-beta.60"; + version = "6.0.0-beta.61"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.60.tgz"; - sha512 = "RyYLOzuQXKQ2mFV2d2DiUObWVe99rHXZ+d+PmOcysJWnNHjuEuLc8OOQQskRjFBy1pUkVCuv530Q1d1ufwY8lg=="; + url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.61.tgz"; + sha512 = "epOCIlbDb2oklpTrVEBWVfZETfJkkCwAtvO8JI2v/DXdGG4K+b1118ZhRKzg4tArTuyD7EqO2oRkUny37tRdqQ=="; }; }; "@electron/get-1.13.0" = { @@ -2182,13 +2182,13 @@ let sha512 = "J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="; }; }; - "@exodus/schemasafe-1.0.0-rc.4" = { + "@exodus/schemasafe-1.0.0-rc.6" = { name = "_at_exodus_slash_schemasafe"; packageName = "@exodus/schemasafe"; - version = "1.0.0-rc.4"; + version = "1.0.0-rc.6"; src = fetchurl { - url = "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.0.0-rc.4.tgz"; - sha512 = "zHISeJ5jcHSo3i2bI5RHb0XEJ1JGxQ/QQzU2FLPcJxohNohJV8jHCM1FSrOUxTspyDRSSULg3iKQa1FJ4EsSiQ=="; + url = "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.0.0-rc.6.tgz"; + sha512 = "dDnQizD94EdBwEj/fh3zPRa/HWCS9O5au2PuHhZBbuM3xWHxuaKzPBOEWze7Nn0xW68MIpZ7Xdyn1CoCpjKCuQ=="; }; }; "@expo/apple-utils-0.0.0-alpha.25" = { @@ -2209,22 +2209,22 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-5.0.9" = { + "@expo/config-6.0.0" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "5.0.9"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-5.0.9.tgz"; - sha512 = "eZj+cf03wkQQdHSpYvrmiqAsn2dJV10uhHIwXyeFBaFvhds0NgThOldJZfOppQ4QUaGobB/vaJ7UqUa3B0PCMw=="; + url = "https://registry.npmjs.org/@expo/config/-/config-6.0.0.tgz"; + sha512 = "pL4ZZbue6oU4Prcxew96Vpg2OApD5IE8Otk+eIKZKo0aS5BGnWEic/GszXLOAhPgGiHyP/jmylQ+GPNztz1TUA=="; }; }; - "@expo/config-plugins-3.1.0" = { + "@expo/config-plugins-4.0.0" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "3.1.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-3.1.0.tgz"; - sha512 = "V5qxaxCAExBM0TXmbU1QKiZcAGP3ecu7KXede8vByT15cro5PkcWu2sSdJCYbHQ/gw6Vf/i8sr8gKlN8V8TSLg=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-4.0.0.tgz"; + sha512 = "6pNLI8L8oV4MfyM/w2DDx9zvzO258Jl2QfDdHI+T1QAAShupqzXdqjkRMj6+6n3CrUaeqUadSMnjqSTUF9XZlQ=="; }; }; "@expo/config-types-42.0.0" = { @@ -2236,22 +2236,22 @@ let sha512 = "Rj02OMZke2MrGa/1Y/EScmR7VuWbDEHPJyvfFyyLbadUt+Yv6isCdeFzDt71I7gJlPR9T4fzixeYLrtXXOTq0w=="; }; }; - "@expo/dev-server-0.1.84" = { + "@expo/dev-server-0.1.85" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.84"; + version = "0.1.85"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.84.tgz"; - sha512 = "6N5Vw8PZgnXvjdXm0Lo7v68nIeoPtIV8+G2YGtImaIw4SRshLaTidKefkJNH+JmvXMyEwqLG02xFAQa/I2v3jA=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.85.tgz"; + sha512 = "Jz8kqbpdBBx01Pu00eXy/ZfEz7hTeaQRwRsyQndVdDIUYddb0R/NI/m1aCk+JdnIZv1Et5krgw/ADdDUwWz6kQ=="; }; }; - "@expo/dev-tools-0.13.115" = { + "@expo/dev-tools-0.13.116" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.115"; + version = "0.13.116"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.115.tgz"; - sha512 = "wxA7SuWXEHrQDn/9Z8E3JnLicUSZvdSMtq++5KAFIKndOlTZ6KC9oGwlsgXzBPktQUHUMglaRxgSmx5fOKPJGQ=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.116.tgz"; + sha512 = "n+H/2JgFmYxPxiJJcpzKJDziJJ3omj0rROJAVrfMaZSHvrL6qf/nFDXm4UDaFQvw+oHSkrz9vJaSIKVYm6Gwow=="; }; }; "@expo/devcert-1.0.0" = { @@ -2281,13 +2281,13 @@ let sha512 = "CDnhjdirUs6OdN5hOSTJ2y3i9EiJMk7Z5iDljC5xyCHCrUex7oyI8vbRsZEojAahxZccgL/PrO+CjakiFFWurg=="; }; }; - "@expo/metro-config-0.1.84" = { + "@expo/metro-config-0.2.0" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.84"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.84.tgz"; - sha512 = "xWSfM0+AxcKw0H8mc1RuKs4Yy4JT4SJfn4yDnGLAlKkHlEC+D2seZvb/Tdd173e/LANmcarNd+OcDYu03AmVWA=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.2.0.tgz"; + sha512 = "p2N8V/zByM1e7YmBSWQ7eUAs6ALYFMjSa2ebMwJUr2i63b1p9A7aInGOP3rCgEiroRcwdyTIq/tUQC4rlsNRWw=="; }; }; "@expo/osascript-2.0.30" = { @@ -2308,22 +2308,22 @@ let sha512 = "guFnGAiNLW/JsienEq3NkZk5khTP+RdT/czk/teJUiYLkBy0hLmMTJsNXurGgFwI33+ScEbDvFmN5IOEBGpUDQ=="; }; }; - "@expo/plist-0.0.14" = { + "@expo/plist-0.0.15" = { name = "_at_expo_slash_plist"; packageName = "@expo/plist"; - version = "0.0.14"; + version = "0.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/plist/-/plist-0.0.14.tgz"; - sha512 = "bb4Ua1M/OdNgS8KiGdSDUjZ/bbPfv3xdPY/lz8Ctp/adlj/QgB8xA7tVPeqSSfJPZqFRwU0qLCnRhpUOnP51VQ=="; + url = "https://registry.npmjs.org/@expo/plist/-/plist-0.0.15.tgz"; + sha512 = "LDxiS0KNZAGJu4fIJhbEKczmb+zeftl1NU0LE0tj0mozoMI5HSKdMUchgvnBm35bwBl8ekKkAfJJ0ONxljWQjQ=="; }; }; - "@expo/prebuild-config-2.1.0" = { + "@expo/prebuild-config-3.0.0" = { name = "_at_expo_slash_prebuild-config"; packageName = "@expo/prebuild-config"; - version = "2.1.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-2.1.0.tgz"; - sha512 = "obpbnV0+Otv7Dbx8kkbSd62xL9HYZRDPdmdcVWuML7lv7Zo4r+OyS6vYpUmln9htp0gtjuc6+X9FiC74bbGkVA=="; + url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-3.0.0.tgz"; + sha512 = "/6Un2nN9oiL2IVGDin00wwJfEGZbG4IRe/ycBeZbCIA5xux+ovVaiuGNJklTvlUVRxSboG5mXWt+drfa0GUwtw=="; }; }; "@expo/results-1.0.0" = { @@ -2371,13 +2371,13 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; - "@expo/webpack-config-0.15.0" = { + "@expo/webpack-config-0.16.0" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.15.0"; + version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.15.0.tgz"; - sha512 = "AcZiRs+7RwHM05uR4qdTGAU6kpQRPZ3U0yedtVe391i4NRM80sBe+sIc7LuhFN9aZL89+ZjqN3fDoA0ZNIgIfQ=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.16.0.tgz"; + sha512 = "IwzXvzvjd5+Zc10+3K6fvjY3d5ECEH81fukka0qRyIHgCtxivl2tBlJftAQB3tfN3L32xeNTbj6iKXtAolCDvQ=="; }; }; "@expo/xcpretty-3.1.4" = { @@ -2434,13 +2434,13 @@ let sha512 = "iT1bU56rKrKEOfODoW6fScY11qj3iaYrZ+z11T6fo5+TDm84UGkkXjLXJTE57ZJzg0/gbccHQWYv+chY7bJN8Q=="; }; }; - "@fluentui/react-7.175.2" = { + "@fluentui/react-7.176.1" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.175.2"; + version = "7.176.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.175.2.tgz"; - sha512 = "jikYyizEWUEkXISiYKA5/bmV0Am1480rmct2nTMQZgWxnZGh00NG8jTPpr+rQKRENTyBvvpE8wZVp4/f5XKzAg=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.176.1.tgz"; + sha512 = "lYiJLLYXOpURpTUnyH/hXK4/KVJCV5l37mD50v7C0yKucrT48FtTfkhNXPpo365wR/avXltTP80q2Cdysm7fHQ=="; }; }; "@fluentui/react-focus-7.18.0" = { @@ -2515,13 +2515,13 @@ let sha512 = "j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA=="; }; }; - "@google-cloud/pubsub-2.17.0" = { + "@google-cloud/pubsub-2.18.0" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "2.17.0"; + version = "2.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.17.0.tgz"; - sha512 = "9Xya69A5VAYVEGf651jy071RuBIjv+jpyozSc3j8V21LIiKRr9x+KyplHcLTYWdj+uXbP9cry8Ck8JEFc7GiqQ=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-2.18.0.tgz"; + sha512 = "pekDgDMhREHD7Mxo6aGcGRAq52c8Lv2bICQHYwHn9ET9EY9QMShLJXEhVTTCP7FrczfCJJcnAi6BYlZ6Fc/pWA=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -2569,13 +2569,13 @@ let sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ=="; }; }; - "@graphql-tools/import-6.4.0" = { + "@graphql-tools/import-6.4.1" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.4.0"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.4.0.tgz"; - sha512 = "jfE01oPcmc4vzAcYLs6xT7XC4jJWrM1HNtIwc7HyyHTxrC3nf36XrF3txEZ2l20GT53+OWnMgYx1HhauLGdJmA=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.4.1.tgz"; + sha512 = "nFWo2dI9XXs0hsBscHnTSJNfgFq2gA1bw0qbCXyQga1PJclZViO8SxcHqCf2JmShRpTFsyzsDjKA8xGKDDs8PQ=="; }; }; "@graphql-tools/json-file-loader-6.2.6" = { @@ -2623,13 +2623,13 @@ let sha512 = "kFLd4kKNJXYXnKIhM8q9zgGAtbLmsy3WmGdDxYq3YHBJUogucAxnivQYyRIseUq37KGmSAIWu3pBQ23TKGsGOw=="; }; }; - "@graphql-tools/mock-8.3.1" = { + "@graphql-tools/mock-8.4.0" = { name = "_at_graphql-tools_slash_mock"; packageName = "@graphql-tools/mock"; - version = "8.3.1"; + version = "8.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.3.1.tgz"; - sha512 = "iJ3GeQ10Vqa0Tg4QJHiulxUUI4r84RAvltM3Sc+XPj07QlrLzMHOHO/goO7FC4TN2/HVncj7pWHwrmLPT9du/Q=="; + url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.4.0.tgz"; + sha512 = "RKcqmw7P5pC2ULh2/kg/erxxsd7lEV/wnI5jNgahkCw8wiSC8OI3SwNMwjfrlpYogs7eEhiXi7Ix6abCiFUURw=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -2686,13 +2686,13 @@ let sha512 = "gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ=="; }; }; - "@graphql-tools/utils-8.2.2" = { + "@graphql-tools/utils-8.2.3" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "8.2.2"; + version = "8.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.2.2.tgz"; - sha512 = "29FFY5U4lpXuBiW9dRvuWnBVwGhWbGLa2leZcAMU/Pz47Cr/QLZGVgpLBV9rt+Gbs7wyIJM7t7EuksPs0RDm3g=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.2.3.tgz"; + sha512 = "RR+aiusf2gIfnPmrDIH1uA45QuPiHB54RD+BmWyMcl88tWAjeJtqZeWPqUTq/1EXrNeocJAJQqogHV4Fbbzx3A=="; }; }; "@graphql-tools/wrap-7.0.8" = { @@ -2722,24 +2722,6 @@ let sha512 = "UXepkOKCATJrhHGsxt+CGfpZy9zUn1q9mop5kfcXq1fBkTePxVNPOdnISlCbJFlCtld+pSLGyZCzr9/zVprFKA=="; }; }; - "@grpc/grpc-js-1.3.4" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.4.tgz"; - sha512 = "AxtZcm0mArQhY9z8T3TynCYVEaSKxNCa9mVhVwBCUnsuUEe8Zn94bPYYKVQSLt+hJJ1y0ukr3mUvtWfcATL/IQ=="; - }; - }; - "@grpc/grpc-js-1.3.6" = { - name = "_at_grpc_slash_grpc-js"; - packageName = "@grpc/grpc-js"; - version = "1.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.3.6.tgz"; - sha512 = "v7+LQFbqZKmd/Tvf5/j1Xlbq6jXL/4d+gUtm2TNX4QiEC3ELWADmGr2dGlUyLl6aKTuYfsN72vAsO5zmavYkEg=="; - }; - }; "@grpc/grpc-js-1.3.7" = { name = "_at_grpc_slash_grpc-js"; packageName = "@grpc/grpc-js"; @@ -2758,22 +2740,22 @@ let sha512 = "q2Qle60Ht2OQBCp9S5hv1JbI4uBBq6/mqSevFNK3ZEgRDBCAkWqZPUhD/K9gXOHrHKluliHiVq2L9sw1mVyAIg=="; }; }; - "@grpc/proto-loader-0.6.3" = { + "@grpc/proto-loader-0.6.4" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; - version = "0.6.3"; + version = "0.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.3.tgz"; - sha512 = "AtMWwb7kY8DdtwIQh2hC4YFM1MzZ22lMA+gjbnCYDgICt14vX2tCa59bDrEjFyOI4LvORjpvT/UhHUdKvsX8og=="; + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.4.tgz"; + sha512 = "7xvDvW/vJEcmLUltCUGOgWRPM8Oofv0eCFSVMuKqaqWJaXSzmB+m9hiyqe34QofAl4WAzIKUZZlinIF9FOHyTQ=="; }; }; - "@grpc/proto-loader-0.6.4" = { + "@grpc/proto-loader-0.6.5" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; - version = "0.6.4"; + version = "0.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.4.tgz"; - sha512 = "7xvDvW/vJEcmLUltCUGOgWRPM8Oofv0eCFSVMuKqaqWJaXSzmB+m9hiyqe34QofAl4WAzIKUZZlinIF9FOHyTQ=="; + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.5.tgz"; + sha512 = "GZdzyVQI1Bln/kCzIYgTKu+rQJ5dno0gVrfmLe4jqQu7T2e7svSwJzpCBqVU5hhBSJP3peuPjOMWsj5GR61YmQ=="; }; }; "@gulp-sourcemaps/identity-map-1.0.2" = { @@ -3838,22 +3820,22 @@ let sha1 = "3e591f32e1f0c3981c864239f7b0ac06e610f8a9"; }; }; - "@mapbox/geojson-coords-0.0.1" = { + "@mapbox/geojson-coords-0.0.2" = { name = "_at_mapbox_slash_geojson-coords"; packageName = "@mapbox/geojson-coords"; - version = "0.0.1"; + version = "0.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mapbox/geojson-coords/-/geojson-coords-0.0.1.tgz"; - sha512 = "cdMlqmDl1vzAl2E0XC2zIuqM74vdet0Dq2el49haJEVbGpC8se40j5UcsnBK/gsvZzrume30fon1u/aSYMXG4Q=="; + url = "https://registry.npmjs.org/@mapbox/geojson-coords/-/geojson-coords-0.0.2.tgz"; + sha512 = "YuVzpseee/P1T5BWyeVVPppyfmuXYHFwZHmybkqaMfu4BWlOf2cmMGKj2Rr92MwfSTOCSUA0PAsVGRG8akY0rg=="; }; }; - "@mapbox/geojson-extent-1.0.0" = { + "@mapbox/geojson-extent-1.0.1" = { name = "_at_mapbox_slash_geojson-extent"; packageName = "@mapbox/geojson-extent"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@mapbox/geojson-extent/-/geojson-extent-1.0.0.tgz"; - sha512 = "OWW/Tw7OkKHoogXjQJNILjLd2d4JZzO/elc5Qr08VNwFSIPpSnJgyaEGO2xRPqNuWDLr4RocuqmC0FcQWPgeOA=="; + url = "https://registry.npmjs.org/@mapbox/geojson-extent/-/geojson-extent-1.0.1.tgz"; + sha512 = "hh8LEO3djT4fqfr8sSC6wKt+p0TMiu+KOLMBUiFOyj+zGq7+IXwQGl0ppCVDkyzCewyd9LoGe9zAvDxXrLfhLw=="; }; }; "@mapbox/geojson-normalize-0.0.1" = { @@ -3973,13 +3955,13 @@ let sha512 = "7AQsO0hMmpqDledV7AhBuSYqYPFsKP9PaltMecX9nlnsyFxqtsqUg9/pvB2L/jxvskrDrNkdKYz2KTbQznCtng=="; }; }; - "@mdn/browser-compat-data-3.3.14" = { + "@mdn/browser-compat-data-4.0.2" = { name = "_at_mdn_slash_browser-compat-data"; packageName = "@mdn/browser-compat-data"; - version = "3.3.14"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-3.3.14.tgz"; - sha512 = "n2RC9d6XatVbWFdHLimzzUJxJ1KY8LdjqrW6YvGPiRmsHkhOUx74/Ct10x5Yo7bC/Jvqx7cDEW8IMPv/+vwEzA=="; + url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-4.0.2.tgz"; + sha512 = "XGLqWi1uOil0L4TJs9KOTMRl9FdEtRQLvBDaB7++AFnFf9G0QYihiUNRJ4eXZa53KI9VORsEi3Fj8p3N+m/Gdw=="; }; }; "@mdx-js/util-2.0.0-next.8" = { @@ -4009,13 +3991,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.208" = { + "@microsoft/load-themed-styles-1.10.216" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.208"; + version = "1.10.216"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.208.tgz"; - sha512 = "lOJQ/FOFiZJ+LIOUnVKu2StmB3DKIg50XTlm6DwBXpgUowAFhJ188mck8j4POpZtzQf/DfmOlQLqPEZXzM/6/A=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.216.tgz"; + sha512 = "JHJwWWY3J1vKDMRREIm2U8JB5sgpGPqlF6Kf7Sjl2I8f0AeLFt43+fdPDm77sNyt5sVB1yp9hiV45i5K4s6Yag=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -4090,13 +4072,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-18.8.0" = { + "@netlify/build-18.13.1" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "18.8.0"; + version = "18.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-18.8.0.tgz"; - sha512 = "6xU3mGfkSPJlhK5r0y9fMgBRmQFzs6UxPB4MLQ6hmufL/Tj4vFx56hCXX5+fADpThe0uMw+ubNbMr0L44b5gzQ=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-18.13.1.tgz"; + sha512 = "E5tmUV+fvC5mdQUiJjQpMrWgoHkvfqKFhmbnox43yJ2bU98xL2mq/tLLQqKV9STzMa8/amSBb+CLSJ9iB0THvA=="; }; }; "@netlify/cache-utils-2.0.3" = { @@ -4108,13 +4090,13 @@ let sha512 = "820dYhacTHXKxpYm81VlmCJ48ySGj+6GZi1oPLevdTSkMXGM1BphBKUjM/r9+GUE1ocGOh8Vdt3PsDp8f7gS4w=="; }; }; - "@netlify/config-15.6.2" = { + "@netlify/config-15.6.3" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "15.6.2"; + version = "15.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-15.6.2.tgz"; - sha512 = "wFZ2sLg/NaU0kQC8EnxdMUrr3rMWC8CQnBedQsxRW2dmQKQgW4tsCqUVy2U++iu2FTZkh8CwYo8W0qCPoel4lA=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-15.6.3.tgz"; + sha512 = "VYJSJgWAh1VwjCOhMt8h3lEb6ZzfHa6qAzA5TyEtfqFV3chBrIso9qx7JkVapAFlFnEiIb1BFX1n81xkmx/8oA=="; }; }; "@netlify/esbuild-0.13.6" = { @@ -4126,13 +4108,13 @@ let sha512 = "tiKmDcHM2riSVN79c0mJY/67EBDafXQAMitHuLiCDAMdtz3kfv+NqdVG5krgf5lWR8Uf8AeZrUW5Q9RP25REvw=="; }; }; - "@netlify/framework-info-5.9.1" = { + "@netlify/framework-info-5.9.2" = { name = "_at_netlify_slash_framework-info"; packageName = "@netlify/framework-info"; - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.9.1.tgz"; - sha512 = "EBbR4grr0innWmKk43q5iLokcuJ1bZn/56KBz8WyKsarCvLkt6SqHaxXJp3Uab1D6Fhn0BTQBhIttb3KdyPGdQ=="; + url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.9.2.tgz"; + sha512 = "2mzH9iOc57rUx698oIjOvw5wLRJJBHTgNBqLU6ZhUSn14Nj02jej5F2POeH4Zwi48u45YpTnJ0nnSIUjNExNWg=="; }; }; "@netlify/functions-utils-2.0.2" = { @@ -4144,13 +4126,13 @@ let sha512 = "mQI0NX0QPNVcYb2TQF5cpxO350BR9309r7vSOSvfn0DHkPWUea1kl3iiLXi1mm/dUC6pd3p5ctc0UboW0u+iVQ=="; }; }; - "@netlify/git-utils-2.0.1" = { + "@netlify/git-utils-2.0.2" = { name = "_at_netlify_slash_git-utils"; packageName = "@netlify/git-utils"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-2.0.1.tgz"; - sha512 = "a9GKmoOJuVTQ4+0x+4utS9XOySIGX5KBhMUgPKXGAZAFNeDXGkJj+ITrzyHcyJ4P8d8WPfQEXIusIqAqlfp+DA=="; + url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-2.0.2.tgz"; + sha512 = "gk1ak1AAktsjHQDY1Sg0qp8H+3dcmdB7jEmr0MD8V7X4u/CByPx8fBC0ZpksZ+HhkAdw/thRL4Qir+zhh4QtWA=="; }; }; "@netlify/local-functions-proxy-1.1.1" = { @@ -4297,13 +4279,13 @@ let sha512 = "yRgsmBw8Wzk6/I/afcerhC+3XtVxXUF0xrSMOYgxV0bmaKJmB/0StJG4FY9TOAmb/IzCp82mR/63ZpzwIvpVzw=="; }; }; - "@netlify/routing-local-proxy-0.31.0" = { + "@netlify/routing-local-proxy-0.33.2" = { name = "_at_netlify_slash_routing-local-proxy"; packageName = "@netlify/routing-local-proxy"; - version = "0.31.0"; + version = "0.33.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/routing-local-proxy/-/routing-local-proxy-0.31.0.tgz"; - sha512 = "SSlWic9za/0QtfCP7GllJcOV98BWlx2goOF9bLLhmsHGiPfrhlhZfemqdMtKM4BIs+G70wzUqaIYeyjtxVh37A=="; + url = "https://registry.npmjs.org/@netlify/routing-local-proxy/-/routing-local-proxy-0.33.2.tgz"; + sha512 = "0y8PMy5f73PSttizvmxGk1MbrdZL6qKRZr9jH2Rk+OB29EhNlcsdJT56DHSjnIUxRAmeZVY0JnXDhHNI2cDapQ=="; }; }; "@netlify/run-utils-2.0.1" = { @@ -4315,13 +4297,13 @@ let sha512 = "F1YcF2kje0Ttj+t5Cn5d6ojGQcKj4i/GMWgQuoZGVjQ31ToNcDXIbBm5SBKIkMMpNejtR1wF+1a0Q+aBPWiZVQ=="; }; }; - "@netlify/zip-it-and-ship-it-4.20.0" = { + "@netlify/zip-it-and-ship-it-4.23.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "4.20.0"; + version = "4.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.20.0.tgz"; - sha512 = "+wo8rupUJbrfw/lEBPccVP+GhFEJEbzx7M67eSEWxqwQkUKtZIHbBc6Ile+iVXqFnLyM2ryfxLTcSIm1pc797g=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.23.0.tgz"; + sha512 = "hefNXuzWnQqEClsgQMOAubkScTiIf+r+AmsrEShNkUUrg9pUoQpNVpbIpQUiP9VEIvnrCwAtPmSOaus0ijTOXQ=="; }; }; "@node-red/editor-api-2.0.6" = { @@ -4558,13 +4540,13 @@ let sha512 = "Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA=="; }; }; - "@oclif/core-0.5.35" = { + "@oclif/core-0.5.39" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; - version = "0.5.35"; + version = "0.5.39"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/core/-/core-0.5.35.tgz"; - sha512 = "5nTd+lOcDh1QPa9mM74qFChmApp5oHnP3EqYGYwqhfA3ad4qIfyYEn8pKxf0MlrYoPA8j2PrmceuRZThstKssA=="; + url = "https://registry.npmjs.org/@oclif/core/-/core-0.5.39.tgz"; + sha512 = "4XusxLX8PnHDQxtRP25PImlkIj1Mlx6wt0NWb1FxQGvTJOAgXGJZl3YB02ZeXZLYbeKA2A3AqqxFTTKbADnZng=="; }; }; "@oclif/errors-1.3.5" = { @@ -4648,13 +4630,13 @@ let sha512 = "60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw=="; }; }; - "@octokit/auth-token-2.4.5" = { + "@octokit/auth-token-2.5.0" = { name = "_at_octokit_slash_auth-token"; packageName = "@octokit/auth-token"; - version = "2.4.5"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.5.tgz"; - sha512 = "BpGYsPgJt05M7/L/5FoE1PiAbdxXFZkX/3kDYcsvd1v6UhlnE5e96dTDr0ezX/EFwciQxf3cNV0loipsURU+WA=="; + url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz"; + sha512 = "r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g=="; }; }; "@octokit/core-3.5.1" = { @@ -4684,13 +4666,13 @@ let sha512 = "0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg=="; }; }; - "@octokit/openapi-types-10.1.1" = { + "@octokit/openapi-types-10.5.0" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "10.1.1"; + version = "10.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-10.1.1.tgz"; - sha512 = "ygp/6r25Ezb1CJuVMnFfOsScEtPF0zosdTJDZ7mZ+I8IULl7DP1BS5ZvPRwglcarGPXOvS5sHdR0bjnVDDfQdQ=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-10.5.0.tgz"; + sha512 = "yt8GpYL0s1bLZR7602l0Im5zfmB3UdHYCfcrv3ZGRX95BjX66UQeH4asXjXo8xBit9HneCctVhTMN0On/duukQ=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4702,13 +4684,13 @@ let sha512 = "93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw=="; }; }; - "@octokit/plugin-paginate-rest-2.16.0" = { + "@octokit/plugin-paginate-rest-2.16.4" = { name = "_at_octokit_slash_plugin-paginate-rest"; packageName = "@octokit/plugin-paginate-rest"; - version = "2.16.0"; + version = "2.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.16.0.tgz"; - sha512 = "8YYzALPMvEZ35kgy5pdYvQ22Roz+BIuEaedO575GwE2vb/ACDqQn0xQrTJR4tnZCJn7pi8+AWPVjrFDaERIyXQ=="; + url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.16.4.tgz"; + sha512 = "33UFvlgJP1zQVcbkeMQhzUeEXMOOr1U/3i8GDJqzw9MMRy90P/J+PXfgQvhE0N/rfX01DnY2IQMb2Q/L01EL0A=="; }; }; "@octokit/plugin-request-log-1.0.4" = { @@ -4720,13 +4702,22 @@ let sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="; }; }; - "@octokit/plugin-rest-endpoint-methods-5.10.1" = { + "@octokit/plugin-rest-endpoint-methods-5.11.1" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "5.10.1"; + version = "5.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.11.1.tgz"; + sha512 = "EE69SuO08wtnIy9q/HftGDr7/Im1txzDfeYr+I4T/JkMSNEiedUUE5RuCWkEQAwwbeEU4kVTwSEQZb9Af77/PA=="; + }; + }; + "@octokit/plugin-retry-3.0.9" = { + name = "_at_octokit_slash_plugin-retry"; + packageName = "@octokit/plugin-retry"; + version = "3.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.10.1.tgz"; - sha512 = "Rf1iMl40I0dIxjh1g32qZ6Ym/uT8QWZMm2vYGG5Vi8SX1MwZvbuxEGXYgmzTUWSD3PYWSLilE2+4L8kmdLGTMg=="; + url = "https://registry.npmjs.org/@octokit/plugin-retry/-/plugin-retry-3.0.9.tgz"; + sha512 = "r+fArdP5+TG6l1Rv/C9hVoty6tldw6cE2pRHNGmFPdyfrc696R6JjrQ3d7HdVqGwuzfyrcaLAKD7K8TX8aehUQ=="; }; }; "@octokit/request-5.6.1" = { @@ -4747,22 +4738,22 @@ let sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; - "@octokit/rest-18.10.0" = { + "@octokit/rest-18.11.0" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "18.10.0"; + version = "18.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.10.0.tgz"; - sha512 = "esHR5OKy38bccL/sajHqZudZCvmv4yjovMJzyXlphaUo7xykmtOdILGJ3aAm0mFHmMLmPFmDMJXf39cAjNJsrw=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.11.0.tgz"; + sha512 = "e30+ERbA4nXkzkaCDgfxS9H1A43Z1GvV5nqLfkxS81rYKbFE6+sEsrXsTRzV1aWLsRIQ+B75Vgnyzjw/ioTyVA=="; }; }; - "@octokit/types-6.27.0" = { + "@octokit/types-6.31.0" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.27.0"; + version = "6.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.27.0.tgz"; - sha512 = "ha27f8DToxXBPEJdzHCCuqpw7AgKfjhWGdNf3yIlBAhAsaexBXTfWw36zNSsncALXGvJq4EjLy1p3Wz45Aqb4A=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.31.0.tgz"; + sha512 = "xobpvYmMYoFSxZB6jL1TPTMMZkxZIBlY145ZKibBJDKCczP1FrLLougtuVOZywGVZdcYs8oq2Bxb3aMjqIFeiw=="; }; }; "@opencensus/core-0.0.8" = { @@ -4810,310 +4801,310 @@ let sha512 = "a/szuMQV0Quy0/M7kKdglcbRSoorleyyOwbTNNJ32O+RBN766wbQlMTvdimImTmwYWGr+NJOni1EcC242WlRcA=="; }; }; - "@ot-builder/bin-composite-types-1.1.0" = { + "@ot-builder/bin-composite-types-1.1.1" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.1.0.tgz"; - sha512 = "/JaR3T99LHJWzOp08qLE9yTpe+v9DlgyE/ZwSyueG/fbzfCquHve9qgOaIP/yEiVNhQdMEBMsJdpQyicL6db3w=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.1.1.tgz"; + sha512 = "a0TkE2hUZkQcFbiaXIYBhziCF/x23ZgBz+uEfzp+hIszWneay2r9eCJIfSJMtW82xn3g7QOz9FyXgpmtCimcBA=="; }; }; - "@ot-builder/bin-util-1.1.0" = { + "@ot-builder/bin-util-1.1.1" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.1.0.tgz"; - sha512 = "Cwk6FsYU9aJmmbFcrE1DI3t+FzdyTb6IotsCY1YAxnS4nEkj70bNRfDbxu4rzpPqBgndIjAz1FSXtlSayW0LMw=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.1.1.tgz"; + sha512 = "QQo2wkYahVeDdsPY0dIZ7AAIRwnSIq0v+vFgJhZeFe55DS/0HSe0Lc3nlKjwFMqh8jWbeczltWrKUHqNpiNCNg=="; }; }; - "@ot-builder/cli-help-shower-1.1.0" = { + "@ot-builder/cli-help-shower-1.1.1" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.1.0.tgz"; - sha512 = "0KaiPVXkjyuBhHZK5/1fxGX7Ch0/YAmc/+Os3QSwH8xgN2O682TZhW+TaKJzGLe6wuTomQ0H3YzO5Z4PfIyx3g=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.1.1.tgz"; + sha512 = "kUfEQQP/80DubcUjMKEOjLkS4XvIFKkgvgOhWtBiIFyqx3gK99I+j5UyxzxPjV6c22m9RN/wCPy3fWShtjnupw=="; }; }; - "@ot-builder/cli-proc-1.1.0" = { + "@ot-builder/cli-proc-1.1.1" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.1.0.tgz"; - sha512 = "NiFyLMF6YCSum5gvqTWYZai2by0ULkOAX41bRdyoq9i+bq2vLQAisCdo3jZ6rjAWHO+zo4YTvcTyj2ukfABycw=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.1.1.tgz"; + sha512 = "4LzX3/+t7qLhmJLLphY5omCIIvhNK/QRSpvGk2tWD/fZxJbek/tKXtU03jdHzSdcO/U0trIo3DenKztwLlf/fw=="; }; }; - "@ot-builder/cli-shared-1.1.0" = { + "@ot-builder/cli-shared-1.1.1" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.1.0.tgz"; - sha512 = "rMsvIZHPc6RPSX1V2XJWM0fO/stSLctRMQZPnoPWQFcChS8Xvjf7iCBD8NA7V07LUI/8hYrcb4DMzp6aoJ4/pg=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.1.1.tgz"; + sha512 = "I9ycAD61HRoWAHo2UJBh4ywskjTae8qCMUy42Ld3SLGXgBSp5xaUmlc5645qRH3tMppCqFekmKXY0QVQWL/u4w=="; }; }; - "@ot-builder/common-impl-1.1.0" = { + "@ot-builder/common-impl-1.1.1" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.1.0.tgz"; - sha512 = "Gnm1eCD2UMSXJhqoqK4vEGGIqVHKch+UF6VBO6uezT7vzdHfTW/IltIaB5ukbT4wumQfRMuZs9Eb6cabNae+hg=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.1.1.tgz"; + sha512 = "2yeCB16S77sjgwz7G4Svrjc1m40Iot6XQGoua3kRq/CErf6Cvu4OQ9QlH1W14qW9nZ3yWfHfrJ6kg8YSgJGoQw=="; }; }; - "@ot-builder/errors-1.1.0" = { + "@ot-builder/errors-1.1.1" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.1.0.tgz"; - sha512 = "88O6kaLJSWv+n1rboJ/lFEWEs3gRlABlLbqEgUX/tXqVs3cineH7ZZlBDpoNvVYnYV53KzReh8P0P4MIQklejQ=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.1.1.tgz"; + sha512 = "mCm6yHnYVI0Uz0vk3FJES089KKTKR7zoXGFFFy5sUMB3vcHm7XeIT2aOog9b+eemQBrS/WkvQN6s6E6PZY8fRA=="; }; }; - "@ot-builder/io-bin-cff-1.1.0" = { + "@ot-builder/io-bin-cff-1.1.1" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.1.0.tgz"; - sha512 = "bLVT7VnEViiKjL2emb1GbWwybBN0qkfqWgZgkdZJEU930nlnY//FsQhKrpZDW6A9vce7GiwuZaxeSETexF0/ug=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.1.1.tgz"; + sha512 = "dRs9stSE5UHdalErQIeVn7l4ggVoGSWWitcb2Hy5Jds1RKmD+/ZX6G+qPO5Q3CnMbDMRLHjS6RtCJzoJi9jBQw=="; }; }; - "@ot-builder/io-bin-encoding-1.1.0" = { + "@ot-builder/io-bin-encoding-1.1.1" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.1.0.tgz"; - sha512 = "77cYkXoJxfrDfjXkVIGuCHy/E+ff+t5E2zABHIFLoNmpXJvJdjYPupM/roMKkHqWjhnIP6caEwdCuxt3e8UNHA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.1.1.tgz"; + sha512 = "MyxdWkEj5yd+miWZzLfc0ZUm3iF9lgZ8UL91qXH6IbXB9OzLtCu75meQspRcPWdGe8ta+YejNU2aQ65WBoNDwQ=="; }; }; - "@ot-builder/io-bin-ext-private-1.1.0" = { + "@ot-builder/io-bin-ext-private-1.1.1" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.1.0.tgz"; - sha512 = "EwaHkGdP53bEXm7drrwrD6u63kSHw0A4NX+5xzhsIqDV24LShsZ9t34O2Pby9pN9jCJJFIWN3ryXEq3sHny4cA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.1.1.tgz"; + sha512 = "BjyCWoF0RWg/mnCQfnJHxdiNpYHEr24gZ8yl1KpRqdwHkGQDNxIGg8hzm5lIFb/gBKTl0MRJYrmkT4dYdI1UtQ=="; }; }; - "@ot-builder/io-bin-font-1.1.0" = { + "@ot-builder/io-bin-font-1.1.1" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.1.0.tgz"; - sha512 = "PslL6SFENEGtQ6zOXMewl69cOibOLLzrr8CS2Pe78zNcxJ4BWsP6dwZNeu8gVqWKLsUQJQIWbwaPiP/RDhQKUQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.1.1.tgz"; + sha512 = "yqLqyYCA0l272Bf/AkziCofRLnzmLaNGned5Ibi2LvklpzCmpR+Tszm8M/moBTSWhFhs82ga7ujLRqjIzDJwnA=="; }; }; - "@ot-builder/io-bin-glyph-store-1.1.0" = { + "@ot-builder/io-bin-glyph-store-1.1.1" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.1.0.tgz"; - sha512 = "ontsdJHI6dY1N0HKzdwLIb0o9G5Q+S1ETADuShP/nQD0lV3cxxj1KS/PnFE/LSoyY0AKrs630kLV1lrMS3R4rg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.1.1.tgz"; + sha512 = "VmOZaACjzSvE3AaTxJeqpyg4q35jt0AFXOlIXG3lzzGyvUf6nFIZexvDPAWBJtkHyN5jcJ9QWGmqulGY4Son1g=="; }; }; - "@ot-builder/io-bin-layout-1.1.0" = { + "@ot-builder/io-bin-layout-1.1.1" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.1.0.tgz"; - sha512 = "QEW3kR/Tu1Qtp3f6zrmQKGGeRD6daTpuBwjS4AnR47WhGHLZ9IJxVsNMHJeyYwnjXAWg6Tht5HjHGnI9dKnSDA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.1.1.tgz"; + sha512 = "O/W1AV/ewUvLwh4Pmi5AkysVmyaczfq10Z49ku05oAa3gGDxQFEyX5e/3l7zD2rSLx/FN4zUb/t5obCJoHV2VQ=="; }; }; - "@ot-builder/io-bin-metadata-1.1.0" = { + "@ot-builder/io-bin-metadata-1.1.1" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.1.0.tgz"; - sha512 = "PjeEoquOsI2mwg3MZL4VDRlzmWVA5LBeYKAY3LH140WOPYFlPN27YfWGVUO/swc98Z+5xgDZau3emj3ElSRvrw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.1.1.tgz"; + sha512 = "xGoUWEYBPQEpwhvTqjCK2IdhXWgNyIux3MKM7lf6mqkZJBLUTNu/9GnqAmBflRVZqnNo/kMVVRp3Z3EHTVc2qw=="; }; }; - "@ot-builder/io-bin-metric-1.1.0" = { + "@ot-builder/io-bin-metric-1.1.1" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.1.0.tgz"; - sha512 = "mVjDTkxn6ARu7UUMi7rQCNC+fYK7IgSuO2bmYdzuozP7EmEWI5VQq3rhhMHDlvTodEuNARKJxr/tmzcB5Tx7PQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.1.1.tgz"; + sha512 = "ivQQ15TGPNSmULEn4prvaptyFLu8ZGg7Odt/Hd48yGRnpHiFsfJDmowJ1EJda7XqCgSAjJaXcsGj2rrtm1+quw=="; }; }; - "@ot-builder/io-bin-name-1.1.0" = { + "@ot-builder/io-bin-name-1.1.1" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.1.0.tgz"; - sha512 = "EBQLOP5LFdU18crQuNRQ4lWBzLv3Dw2R8vTvlyUY8nX8OfVUE2KhBreyTjMYTZATfNA2Ey1ZzJPhbT5LpwHg8Q=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.1.1.tgz"; + sha512 = "clLE/osaX2w7Pb08y5g19rJ0VMyGYBQYFhRF+dx1QK0MXfEaFBzA6QydIt9T03aZowrJu8Chf9Vu0XLdvXuudA=="; }; }; - "@ot-builder/io-bin-sfnt-1.1.0" = { + "@ot-builder/io-bin-sfnt-1.1.1" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.1.0.tgz"; - sha512 = "SO0kgwif/7idUMT/Oo8J2N1iwIY98FKtl3yKSFYegiGrMqmL4qYGq26NxCt1NgpQyyZrMQV3D5eC81EpmvEy/Q=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.1.1.tgz"; + sha512 = "QzDy42PpGMMEIur2r8cAuN2+q2lgfYYTjYoDknMSVXJSjR+ZBFyQvPOL0qPjL5++7P14z32TxB11//01VQwv7Q=="; }; }; - "@ot-builder/io-bin-ttf-1.1.0" = { + "@ot-builder/io-bin-ttf-1.1.1" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.1.0.tgz"; - sha512 = "jlyLDuCocNq43uX2wGLspoJ/t901ywgO5OTIfx/x8hg4ka6TKlC13bi0bSvaiVNB6HpDO62GJ69gufRaSCEzvQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.1.1.tgz"; + sha512 = "uQtaQ2mMg+cYmDJkYQRQDVlgb/ylWJQnC5rwNV1s9tun1/ol3KM6Ym3zKQPtXUYJF7mK2DBePd3HjiusU2Ioag=="; }; }; - "@ot-builder/ot-1.1.0" = { + "@ot-builder/ot-1.1.1" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.1.0.tgz"; - sha512 = "9ikUYwiE5ur7l89Ki7uDscMYWm1bxvuRzeWJoMr7thxibtnlMl6rVW5H6NspjEbOZmxgAf3YmiL3oPCq/jiewA=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.1.1.tgz"; + sha512 = "uzpHTo12lWCNQgkiLYTV6edIDbs4dEHJ85A0FdAOieJhzalN5DVdzNPVmyEo6e7+qDf4Z5wwNQy/knw0Moz47Q=="; }; }; - "@ot-builder/ot-encoding-1.1.0" = { + "@ot-builder/ot-encoding-1.1.1" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.1.0.tgz"; - sha512 = "2x/lVIxC42XJdNB9BhvKq3P/bO1yomTwkLVcBS9R92x6/V1t4KOVCYHOtNL79lCGfZkdCWxHxtHhChF55BetsQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.1.1.tgz"; + sha512 = "XLGIHrYkLf1yq6fC9lDonWW5nA1z6t0+JFs01biQ40SholcfTOrlpCNbh7646UHTlOQX93CuzyFFSA/ONwOs2Q=="; }; }; - "@ot-builder/ot-ext-private-1.1.0" = { + "@ot-builder/ot-ext-private-1.1.1" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.1.0.tgz"; - sha512 = "MBMiz8RC8crmx7PB89G75y2nIue6+QkIiXGsx402ozlLQVgJe9YznV7dzUHlpLrPGFsbMYPRfZVTV4Ro+YAK0A=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.1.1.tgz"; + sha512 = "SKHLh13DSvSsWuAd9xsHOei8FjVyYAE0fTzbN/22mWFnrFMryuWVz1GE8n6KpxLa2EYjW1zQ9njuq1JnzjCCaw=="; }; }; - "@ot-builder/ot-glyphs-1.1.0" = { + "@ot-builder/ot-glyphs-1.1.1" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.1.0.tgz"; - sha512 = "EURkR2aUUR4Zlhdx+SdvEAkA7Vx+2mRorozb4gySs5PNqbKq43uzgXIgz1Djq6wasN00KcJGlOjogIv1zKFBwg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.1.1.tgz"; + sha512 = "+1eUQ42XXE0X3bTJlXK7hPFxXT46Ad4rSd7v/nsIJoLCggngDZmlMP2xSfualh/x6VV66sgys49NWY9ZF/KLXg=="; }; }; - "@ot-builder/ot-layout-1.1.0" = { + "@ot-builder/ot-layout-1.1.1" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.1.0.tgz"; - sha512 = "x07BUvdLmcU2w8V8JxiMzv1dI5ybkuDrvpVDuwSAL/eBsuDYf7/3i+ewvHv1WlqG9nQ0v2RJK48CicrCGhlpQw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.1.1.tgz"; + sha512 = "m3AgW5UT322g6fjUs9oRj/khjpCkAAC429PEckA1faRq2BJtCGOV5XE+S05TcjodiWNBMc11TVyREAqsSUEK/Q=="; }; }; - "@ot-builder/ot-metadata-1.1.0" = { + "@ot-builder/ot-metadata-1.1.1" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.1.0.tgz"; - sha512 = "zgUlAqDj8eCuizVbMN4CVA76m+PAUdl91tUO1JTAn5qt0Lo8kfnOWaFc/aU+Q8HD3RXENRpAjA3N3kBm05UNiQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.1.1.tgz"; + sha512 = "1IXH0alOpT9DA7efJnPjm6G25vRQB88T+dPFBUlxunRJCfWryUU4pKIHRDUTq4pshDRC2tGSU2z9o6a/UcRrMw=="; }; }; - "@ot-builder/ot-name-1.1.0" = { + "@ot-builder/ot-name-1.1.1" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.1.0.tgz"; - sha512 = "mudNPddCD/UD+v1fuFdPv3CzHjVS9Jt4GJhQ7or5HsG3/dIQ9N8jfqtBXtSK5ePEgoUsfhPWN5do/cwd//GQQQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.1.1.tgz"; + sha512 = "dtryvcD1/j8e0eaL1ZHm6Svrl3qesDtiWb6lpq0BFbGk5dP1hRICNX+McgOSssOQf2ry6O5yjzrhsPygClkg+A=="; }; }; - "@ot-builder/ot-sfnt-1.1.0" = { + "@ot-builder/ot-sfnt-1.1.1" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.1.0.tgz"; - sha512 = "iyz7npSWu5z9mgSnEjFkBFoOA4mKYIfbG27SGUWWWx0HWHI9cRoE+FHIcQOCJH0PmATvNCXMVfiCSPHesb57GA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.1.1.tgz"; + sha512 = "U4WKdofSLDZNQsIf882b6snNA1tm7ooDl7o7p1cl5IcCycj/pbeqCpMwXd4mfcuzP8oAynuWvKOR2CgUjYoxEQ=="; }; }; - "@ot-builder/ot-standard-glyph-namer-1.1.0" = { + "@ot-builder/ot-standard-glyph-namer-1.1.1" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.1.0.tgz"; - sha512 = "2jyZCBOWmkKyLfU/EOS2AZjJ0Y0toqZqOb2vrIhQRUkli9cb1RyALxkOnP60IfGsD2SNa9yxZcEbS9RlRK8rvw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.1.1.tgz"; + sha512 = "hEHm3Al0tZV48eVuupGsFmxuOPih60on3aQlhYp4zqdxSqPEmiDycdsJ7isjqi405MnYfKY+HKDihGXisWXhHQ=="; }; }; - "@ot-builder/prelude-1.1.0" = { + "@ot-builder/prelude-1.1.1" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.1.0.tgz"; - sha512 = "ghZ04jh2z8WD4UdHJVXKTyjzAo7zUD4lyilrO17fKT3WqD/LW/2vKC7inwepELwVC03uT8xaVhnflF1rYGMzKg=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.1.1.tgz"; + sha512 = "/o7oAgrKzcCwqJCgagucGZE+J2+RSCNTOo5b5OBhSYeHZkHuqkWHa/0osn93e6Pmx/2UPe14vdIAnmO3mtLR1g=="; }; }; - "@ot-builder/primitive-1.1.0" = { + "@ot-builder/primitive-1.1.1" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.1.0.tgz"; - sha512 = "ob7od9Lr3nlGSM6v4xoM8krXuO2W0bOFfpog4Trsg6BArRz8zFfdFVjsZ8umxAhJX2z0Jroiq1nM8okdkw0TDQ=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.1.1.tgz"; + sha512 = "Cnz9jKC+PLmpkBtcZCjUkb4+nxvaRaltVTWVPcPyhyKJRGcVJ71bYp/akV/+z6O6EO2vhleJdoayHr9GuLxYwQ=="; }; }; - "@ot-builder/rectify-1.1.0" = { + "@ot-builder/rectify-1.1.1" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.1.0.tgz"; - sha512 = "nT6VP78JwQtLcyn+DEVp5Xv5bAi+6z9Y8QaaLYWCtv5AnY4aNN7VKwiK4v9Kag77BYDqYT7PI4et2tR5Pf4jSA=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.1.1.tgz"; + sha512 = "vTEqcITcKTaZiyhdk1MWL0sKj8L/oKARNeSusJs3kMxzxtTZQVnG4sdbE8BvKy686DHtwggNyROncp1FPY0EEw=="; }; }; - "@ot-builder/stat-glyphs-1.1.0" = { + "@ot-builder/stat-glyphs-1.1.1" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.1.0.tgz"; - sha512 = "FquKCcC2/Z/cCV16vi+8DHoQzMdwaYSgvA8Hv4Djx3aYLyAmYe14ODfZF63RcW5uh7pZsG1c6u82bf1trwZr9g=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.1.1.tgz"; + sha512 = "vBukU1iyR9o+cDEpJd/X+EH8ySCgIM+g4VujiDk0EIaXD0fUuN/9IIbYnOIl6QmFaPLFTngR9d/Kmtm6QtHrUQ=="; }; }; - "@ot-builder/trace-1.1.0" = { + "@ot-builder/trace-1.1.1" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.1.0.tgz"; - sha512 = "1C2vziYWUYe2YzPEPfNIdqjXtVjl5we69EjX5q4ZZPbCFFoeWGRR54Zxgyp8V5GAvKz0Pn94nXGaFlfEdwk3jQ=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.1.1.tgz"; + sha512 = "Js9UH5YF2/7/rfNQbYbW/Lw/g3Nz4gjOr7BFJIgvBYw4Bu4EKg0Ic30OVfxdxJ7l1YwwtTDxnlCvPyjhoY5F9A=="; }; }; - "@ot-builder/var-store-1.1.0" = { + "@ot-builder/var-store-1.1.1" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.1.0.tgz"; - sha512 = "Q60yNeIDJiqlHIPDkqJJXZWN5zodkKQQv/5PpLIocKMdHrQVqltrTQ5QL+V42Nup1+BiGt1zmR+sO+uUa3A/Iw=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.1.1.tgz"; + sha512 = "8MZo9pfCFCfNb42eGnZMHuqIYi5GFDOxXGC7gkiKVkPd7RtDe2v5ZLMDEHgQwHACArUn16/U+cSexNbXg8y+Yw=="; }; }; - "@ot-builder/variance-1.1.0" = { + "@ot-builder/variance-1.1.1" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.1.0.tgz"; - sha512 = "azUnRrvj2LKkPTYWuiEFStbUEQWbaiI6F63SZOL8yIOEr5Jya/iZ33HeeGltx/jbCrLdboad5pBechG/QD44+w=="; + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.1.1.tgz"; + sha512 = "zCL24UlrRJ7Eojq5PgbbAjPo05NDiYhyZ+wTwbgNpiJ4Pcd64SfgXwwWcrq261v7d2W/u0TkV77xGJYnHG+vKg=="; }; }; "@parcel/fs-1.11.0" = { @@ -5161,13 +5152,13 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; - "@pm2/agent-2.0.0" = { + "@pm2/agent-2.0.1" = { name = "_at_pm2_slash_agent"; packageName = "@pm2/agent"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@pm2/agent/-/agent-2.0.0.tgz"; - sha512 = "W1LvdyF1tGaVU5f/hV8DjpI5joI7MEgXiQMLZnTwZlFwDVP00O9s86571Q8xSiweTcFZFyye0F4wORN/PjSgGA=="; + url = "https://registry.npmjs.org/@pm2/agent/-/agent-2.0.1.tgz"; + sha512 = "QKHMm6yexcvdDfcNE7PL9D6uEjoQPGRi+8dh+rc4Hwtbpsbh5IAvZbz3BVGjcd4HaX6pt2xGpOohG7/Y2L4QLw=="; }; }; "@pm2/io-5.0.0" = { @@ -5206,13 +5197,13 @@ let sha512 = "I/gRlM2meKPKXFN/1fxLoigPXvAUsivxRCih7vgeO7o4qrNNsl6Ah85l3UBbFi0t7ttjMde2+bS1A32a1Hu0BA=="; }; }; - "@prisma/engines-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db" = { + "@prisma/engines-3.1.0-24.c22652b7e418506fab23052d569b85d3aec4883f" = { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; - version = "2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db"; + version = "3.1.0-24.c22652b7e418506fab23052d569b85d3aec4883f"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/engines/-/engines-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db.tgz"; - sha512 = "Q9CwN6e5E5Abso7J3A1fHbcF4NXGRINyMnf7WQ07fXaebxTTARY5BNUzy2Mo5uH82eRVO5v7ImNuR044KTjLJg=="; + url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.1.0-24.c22652b7e418506fab23052d569b85d3aec4883f.tgz"; + sha512 = "sha512-6NEp0VlLho3hVtIvj2P4h0e19AYqQSXtFGts8gSIXDnV+l5pRFZaDMfGo2RiLMR0Kfrs8c3ZYxYX0sWmVL0tWw=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -5305,13 +5296,13 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; - "@putdotio/api-client-8.17.0" = { + "@putdotio/api-client-8.18.0" = { name = "_at_putdotio_slash_api-client"; packageName = "@putdotio/api-client"; - version = "8.17.0"; + version = "8.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.17.0.tgz"; - sha512 = "iLLe3tgQd9W8ZMbfaMXIzoWj/wc5xg5cwys5WEV39RDRL5x7uP6YvELJ0QDNxQTX9S+bT6SzwJiBEmX8DADPHA=="; + url = "https://registry.npmjs.org/@putdotio/api-client/-/api-client-8.18.0.tgz"; + sha512 = "EpIGWaGI6t3uy3hP1XUUURCZ5ma+9fiknqFu1IL7wemJoBLz0wVpAmZxv+sKo32RtI+qfQwrA3ZKoCNFPaEGXA=="; }; }; "@reach/router-1.3.4" = { @@ -5350,6 +5341,15 @@ let sha512 = "XOX5w98oSE8+KnkMZZPMRT7I5TaP8fLbDl0tCu40S7Epz+Zz924n80fmdu6nUDIfPT1nV6yH1hmHmWAWTDOR+Q=="; }; }; + "@react-native/normalize-color-2.0.0" = { + name = "_at_react-native_slash_normalize-color"; + packageName = "@react-native/normalize-color"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@react-native/normalize-color/-/normalize-color-2.0.0.tgz"; + sha512 = "Wip/xsc5lw8vsBlmY2MO/gFLp3MvuZ2baBZjDeTjjndMgM0h5sxz7AZR62RDPGgstp8Np7JzjvVqVT7tpFZqsw=="; + }; + }; "@redocly/ajv-8.6.2" = { name = "_at_redocly_slash_ajv"; packageName = "@redocly/ajv"; @@ -5359,13 +5359,13 @@ let sha512 = "tU8fQs0D76ZKhJ2cWtnfQthWqiZgGBx0gH0+5D8JvaBEBaqA8foPPBt3Nonwr3ygyv5xrw2IzKWgIY86BlGs+w=="; }; }; - "@redocly/openapi-core-1.0.0-beta.58" = { + "@redocly/openapi-core-1.0.0-beta.61" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.58"; + version = "1.0.0-beta.61"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.58.tgz"; - sha512 = "aHohzi5PCBJd47cXXLD1sigVWEs4Xs9E5MOMq2RZ3FNmufiRxY+u1b4oPYGfcr4n3mBnG2qH1mFiTue6Levq7w=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.61.tgz"; + sha512 = "/OgtozUxy7SvHVBZ3Iygu6brDTOFTOlkzpDQyykpa0lK2cPBeYjkJP5foBlHKeHl+TvxfPuzh1CSGSShSc+IBg=="; }; }; "@redocly/react-dropdown-aria-2.0.12" = { @@ -5458,13 +5458,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-12.2.5" = { + "@schematics/angular-12.2.7" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "12.2.5"; + version = "12.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.5.tgz"; - sha512 = "Ln2GyO7Y00PrQKjqCONCDb4dwGzGboH3zIJvicWzFO+ZgkNLr/dsitGKm8b8OfR/UEiBcnK72xwPj9FWfXA4EQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.7.tgz"; + sha512 = "wGqp0jC545Fwf0ydBkeoJHx9snFW+uqn40WwVqs/27Nh4AEHB5uzwzLY7Ykae95Zn802a61KPqSNWpez2fWWGA=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -5494,13 +5494,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.17.0" = { + "@serverless/components-3.17.1" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.17.0"; + version = "3.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.17.0.tgz"; - sha512 = "F0ReVFmwnbSDyH9PaifjrxvR0HvnKS37VyoEOCagj/31vGrksyrvuwI8BxC0YwPReRDb4n99+CtGkDsdGb9AQg=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.17.1.tgz"; + sha512 = "Ra0VVpivEWB816ZAca4UCNzOxQqxveEp4h+RzUX5vaAsZrxpotPUFZi96w9yZGQk3OTxxscRqrsBLxGDtOu8SA=="; }; }; "@serverless/core-1.1.2" = { @@ -5539,13 +5539,13 @@ let sha512 = "q2CMqCkKeBaKA/UwfJAZLkdUsbghSbiYPvAX4rl9rsR5APm4KWtjKQP9CTOtVO5JRMWYoysK6jF0d5VJOABRzQ=="; }; }; - "@serverless/platform-client-china-2.2.6" = { + "@serverless/platform-client-china-2.2.7" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "2.2.6"; + version = "2.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.2.6.tgz"; - sha512 = "CRQi3vi1iqWF8qeMNjU5lq+V7ztdVY3pUf6qNhCwcxM1TAOFncM3lsbIc4yf9gsKkOThHDmltf686u/KqDGgJg=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.2.7.tgz"; + sha512 = "6wkOQamu7jPNq4bI/TbMrk69BrIMm/nzRwKQbq84fNmdxC+u1sxLkWuAafGYOQePbA7lq/oLEsVO3fWAA83jCA=="; }; }; "@serverless/template-1.1.4" = { @@ -5575,13 +5575,13 @@ let sha512 = "cl5uPaGg72z0sCUpF0zsOhwYYUV72Gxc1FwFfxltO8hSvMeFDvwD7JrNE4kHcIcKRjwPGbSH0fdVPUpErZ8Mog=="; }; }; - "@serverless/utils-5.10.0" = { + "@serverless/utils-5.16.0" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "5.10.0"; + version = "5.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.10.0.tgz"; - sha512 = "bRv5o+uR2/o6PCvRI+9mAe6quhqAyJIybI3RH/UXiRzP3qNtbt9RnZDhAe2wjNidf+8iA5UYeLRt2MG3Mb9X3w=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.16.0.tgz"; + sha512 = "oxxfpJ7BowcJZ9cQxf02bPbCViEaU78iT6fN15/6DGD1KAm+b6h0o/962DNg5g1+QSVLsM1iP2upypf5iTjEzA=="; }; }; "@serverless/utils-china-1.1.4" = { @@ -5674,13 +5674,22 @@ let sha512 = "JiX9vxoKMmu8Y3Zr2RVathBL1Cdu4Nt4MuNWemt1Nc06A0RAin9c5FArkhGsyMBWfCu4zj+9b+GxtjAnE4qqLQ=="; }; }; - "@sindresorhus/is-4.0.1" = { + "@sindresorhus/is-4.2.0" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; - version = "4.0.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz"; - sha512 = "Qm9hBEBu18wt1PO2flE7LPb30BHMQt1eQgbV76YntdNk73XZGpn3izvGTYxbGgzXKgbCjiia0uxTd3aTNQrY/g=="; + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-4.2.0.tgz"; + sha512 = "VkE3KLBmJwcCaVARtQpfuKcKv8gcBmUubrfHGF84dXuuW6jgsRYxPtzcIhPyK9WAPpRt2/xY6zkD9MnRaJzSyw=="; + }; + }; + "@sindresorhus/jimp-0.3.0" = { + name = "_at_sindresorhus_slash_jimp"; + packageName = "@sindresorhus/jimp"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/jimp/-/jimp-0.3.0.tgz"; + sha512 = "ikwHOfJF0umx1eV/JpQDMsFxODvCSdD9zdIQVDEjcTNpfofz7+PZrjfKUFkG3iQ9mSUG3BwODv0XOEvTRNdovw=="; }; }; "@sindresorhus/slugify-1.1.2" = { @@ -6088,13 +6097,13 @@ let sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; }; }; - "@trysound/sax-0.1.1" = { + "@trysound/sax-0.2.0" = { name = "_at_trysound_slash_sax"; packageName = "@trysound/sax"; - version = "0.1.1"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@trysound/sax/-/sax-0.1.1.tgz"; - sha512 = "Z6DoceYb/1xSg5+e+ZlPZ9v0N16ZvZ+wYMraFue4HYrE4ttONKtsvruIRf6t9TBR0YvSOfi1hUU0fJfBLCDYow=="; + url = "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz"; + sha512 = "L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="; }; }; "@turist/fetch-7.1.7" = { @@ -6340,13 +6349,13 @@ let sha512 = "vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="; }; }; - "@types/debounce-1.2.0" = { + "@types/debounce-1.2.1" = { name = "_at_types_slash_debounce"; packageName = "@types/debounce"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/debounce/-/debounce-1.2.0.tgz"; - sha512 = "bWG5wapaWgbss9E238T0R6bfo5Fh3OkeoSt245CM7JJwVwpw6MEBCbIxLq5z8KzsE3uJhzcIuQkyiZmzV3M/Dw=="; + url = "https://registry.npmjs.org/@types/debounce/-/debounce-1.2.1.tgz"; + sha512 = "epMsEE85fi4lfmJUH/89/iV/LI+F5CvNIvmgs5g5jYFPfhO2S/ae8WSsLOKWdwtoaZw9Q2IhJ4tQ5tFCcS/4HA=="; }; }; "@types/decompress-4.2.4" = { @@ -6394,13 +6403,13 @@ let sha512 = "kM2g9Fdk/du24fKuuQhA/LBleFR4Z4JP2MVKpLxQQSzofF1uJ06D+c05zfLDAkkDO55aEeNwJih0gHrE/Ci20A=="; }; }; - "@types/emoji-mart-3.0.5" = { + "@types/emoji-mart-3.0.6" = { name = "_at_types_slash_emoji-mart"; packageName = "@types/emoji-mart"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/emoji-mart/-/emoji-mart-3.0.5.tgz"; - sha512 = "bsMEXVPrasIJ03u61msIKMMiL7Hh6dGQ3Gcz3CjytTxTQKQRdf/g0owWTSSL5mvKNgu9UfgornrF6qqClPk1Jw=="; + url = "https://registry.npmjs.org/@types/emoji-mart/-/emoji-mart-3.0.6.tgz"; + sha512 = "TbFLFkWvhZUeYkII94fB8bplhtRTUxekBjZehcKu7leq9gvg8IG7F9NBh0YJdH3XRiu+uk0Drviy+GzfcMkMCw=="; }; }; "@types/engine.io-3.1.7" = { @@ -6520,13 +6529,13 @@ let sha512 = "FKVPOCFbhCvZxpVAMhdBdTfVfXUpsh15wFHgqOKxh9N9vzWZVuWCSijZ5T4U34XYNnuj2oduh6xcs1i+LPI+BQ=="; }; }; - "@types/fs-extra-9.0.12" = { + "@types/fs-extra-9.0.13" = { name = "_at_types_slash_fs-extra"; packageName = "@types/fs-extra"; - version = "9.0.12"; + version = "9.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.12.tgz"; - sha512 = "I+bsBr67CurCGnSenZZ7v94gd3tc3+Aj2taxMT4yu4ABLuOgOjeFxX3dokG24ztSRg5tnT00sL8BszO7gSMoIw=="; + url = "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz"; + sha512 = "nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA=="; }; }; "@types/geojson-7946.0.8" = { @@ -6772,13 +6781,13 @@ let sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA=="; }; }; - "@types/lodash-4.14.172" = { + "@types/lodash-4.14.173" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.172"; + version = "4.14.173"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.172.tgz"; - sha512 = "/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.173.tgz"; + sha512 = "vv0CAYoaEjCw/mLy96GBTnRoZrSxkGE0BKzKimdR8P3OzrNYNvBgtW7p055A+E8C31vXNUhWKoFCbhq7gbyhFg=="; }; }; "@types/long-4.0.1" = { @@ -6934,13 +6943,13 @@ let sha512 = "F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw=="; }; }; - "@types/node-12.20.24" = { + "@types/node-12.20.26" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.20.24"; + version = "12.20.26"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.20.24.tgz"; - sha512 = "yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.20.26.tgz"; + sha512 = "gIt+h4u2uTho2bsH1K250fUv5fHU71ET1yWT7bM4523zV/XrFb9jlWBOV4DO8FpscY+Sz/WEr1EEjIP2H4yumQ=="; }; }; "@types/node-14.11.1" = { @@ -6952,22 +6961,13 @@ let sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; }; }; - "@types/node-14.17.15" = { + "@types/node-14.17.18" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.17.15"; + version = "14.17.18"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.17.15.tgz"; - sha512 = "D1sdW0EcSCmNdLKBGMYb38YsHUS6JcM7yQ6sLQ9KuZ35ck7LYCKE7kYFHOO59ayFOY3zobWVZxf4KXhYHcHYFA=="; - }; - }; - "@types/node-15.12.5" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "15.12.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-15.12.5.tgz"; - sha512 = "se3yX7UHv5Bscf8f1ERKvQOD6sTyycH3hdaoozvaLxgUiY5lIGEeH37AD0G0Qi9kPqihPn0HOfd2yaIEN9VwEg=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.17.18.tgz"; + sha512 = "haYyibw4pbteEhkSg0xdDLAI3679L75EJ799ymVrPxOA922bPx3ML59SoDsQ//rHlvqpu+e36kcbR3XRQtFblA=="; }; }; "@types/node-15.14.9" = { @@ -6988,15 +6988,6 @@ let sha512 = "7EIraBEyRHEe7CH+Fm1XvgqU6uwZN8Q7jppJGcqjROMT29qhAuuOxYB1uEY5UMYQKEmA5D+5tBnhdaPXSsLONA=="; }; }; - "@types/node-16.3.3" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "16.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.3.3.tgz"; - sha512 = "8h7k1YgQKxKXWckzFCMfsIwn0Y61UK6tlD6y2lOb3hTOIMlK3t9/QwHOhc81TwU+RMf0As5fj7NPjroERCnejQ=="; - }; - }; "@types/node-16.6.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -7015,22 +7006,22 @@ let sha512 = "S6gm2sm9xIRWTxD7Ttj8N1ZrYfqdqZEU38Nwnrhd6krk7zf8vdgMgzz8hpAX9CfmXaJfP+Vqy2EhJpVavNEocg=="; }; }; - "@types/node-16.7.6" = { + "@types/node-16.9.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.7.6"; + version = "16.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.7.6.tgz"; - sha512 = "VESVNFoa/ahYA62xnLBjo5ur6gPsgEE5cNRy8SrdnkZ2nwJSW0kJ4ufbFr2zuU9ALtHM8juY53VcRoTA7htXSg=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.9.1.tgz"; + sha512 = "QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g=="; }; }; - "@types/node-16.9.0" = { + "@types/node-16.9.6" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.9.0"; + version = "16.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.9.0.tgz"; - sha512 = "nmP+VR4oT0pJUPFbKE4SXj3Yb4Q/kz3M9dSAO1GGMebRKWHQxLfDNmU/yh3xxCJha3N60nQ/JwXWwOE/ZSEVag=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.9.6.tgz"; + sha512 = "YHUZhBOMTM3mjFkXVcK+WwAcYmyhe1wL4lfqNtzI0b3qAy7yuSetnM7QJazgE5PFmgVTNGiLOgRFfJMqW7XpSQ=="; }; }; "@types/node-6.14.13" = { @@ -7222,15 +7213,6 @@ let sha512 = "/LO7xRVnL3DxJ1WkPGDQrp4VTV1reX9RkC85mJ+Qzykj2Bdw+mG15aAfDahc76HtknjzE16SX/Yddn6MxVbmGQ=="; }; }; - "@types/request-2.48.6" = { - name = "_at_types_slash_request"; - packageName = "@types/request"; - version = "2.48.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/request/-/request-2.48.6.tgz"; - sha512 = "vrZaV3Ij7j/l/3hz6OttZFtpRCu7zlq7XgkYHJP6FwVEAZkGQ095WqyJV08/GlW9eyXKVcp/xmtruHm8eHpw1g=="; - }; - }; "@types/request-2.48.7" = { name = "_at_types_slash_request"; packageName = "@types/request"; @@ -7483,13 +7465,13 @@ let sha512 = "wZt3VTmzYrgZ0l/3QmEbCq4KAJ71K3/hmMQ/nfpv84oH8e81KKwPEoQ5v8dNCxfHFVJ1JabHKmCvqdYOoVm1Ow=="; }; }; - "@types/webpack-4.41.30" = { + "@types/webpack-4.41.31" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; - version = "4.41.30"; + version = "4.41.31"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.30.tgz"; - sha512 = "GUHyY+pfuQ6haAfzu4S14F+R5iGRwN6b2FRNJY7U0NilmFAqbsOfK6j1HwuLBAqwRIT+pVdNDJGJ6e8rpp0KHA=="; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.31.tgz"; + sha512 = "/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ=="; }; }; "@types/webpack-sources-3.2.0" = { @@ -7519,15 +7501,6 @@ let sha512 = "d/7W23JAXPodQNbOZNXvl2K+bqAQrCMwlh/nuQsPSQk6Fq0opHoPrUw43aHsvSbIiQPr8Of2hkFbnz1XBFVyZQ=="; }; }; - "@types/ws-7.4.5" = { - name = "_at_types_slash_ws"; - packageName = "@types/ws"; - version = "7.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-7.4.5.tgz"; - sha512 = "8mbDgtc8xpxDDem5Gwj76stBDJX35KQ3YBoayxlqUQcL5BZUthiqP/VQ4PQnLHqM4PmlbyO74t98eJpURO+gPA=="; - }; - }; "@types/ws-7.4.7" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; @@ -7555,15 +7528,6 @@ let sha512 = "7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="; }; }; - "@types/yauzl-2.9.1" = { - name = "_at_types_slash_yauzl"; - packageName = "@types/yauzl"; - version = "2.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz"; - sha512 = "A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA=="; - }; - }; "@types/yauzl-2.9.2" = { name = "_at_types_slash_yauzl"; packageName = "@types/yauzl"; @@ -7582,13 +7546,22 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; - "@typescript-eslint/eslint-plugin-4.31.0" = { + "@types/zen-observable-0.8.3" = { + name = "_at_types_slash_zen-observable"; + packageName = "@types/zen-observable"; + version = "0.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/zen-observable/-/zen-observable-0.8.3.tgz"; + sha512 = "fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw=="; + }; + }; + "@typescript-eslint/eslint-plugin-4.31.2" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.31.0"; + version = "4.31.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.0.tgz"; - sha512 = "iPKZTZNavAlOhfF4gymiSuUkgLne/nh5Oz2/mdiUmuZVD42m9PapnCnzjxuDsnpnbH3wT5s2D8bw6S39TC6GNw=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.2.tgz"; + sha512 = "w63SCQ4bIwWN/+3FxzpnWrDjQRXVEGiTt9tJTRptRXeFvdZc/wLiz3FQUwNQ2CVoRGI6KUWMNUj/pk63noUfcA=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -7600,13 +7573,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.31.0" = { + "@typescript-eslint/experimental-utils-4.31.2" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.31.0"; + version = "4.31.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.0.tgz"; - sha512 = "Hld+EQiKLMppgKKkdUsLeVIeEOrwKc2G983NmznY/r5/ZtZCDvIOXnXtwqJIgYz/ymsy7n7RGvMyrzf1WaSQrw=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.2.tgz"; + sha512 = "3tm2T4nyA970yQ6R3JZV9l0yilE2FedYg8dcXrTar34zC9r6JB7WyBQbpIVongKPlhEMjhQ01qkwrzWy38Bk1Q=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -7618,22 +7591,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.31.0" = { + "@typescript-eslint/parser-4.31.2" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.31.0"; + version = "4.31.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.31.0.tgz"; - sha512 = "oWbzvPh5amMuTmKaf1wp0ySxPt2ZXHnFQBN2Szu1O//7LmOvgaKTCIDNLK2NvzpmVd5A2M/1j/rujBqO37hj3w=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.31.2.tgz"; + sha512 = "EcdO0E7M/sv23S/rLvenHkb58l3XhuSZzKf6DBvLgHqOYdL6YFMYVtreGFWirxaU2mS1GYDby3Lyxco7X5+Vjw=="; }; }; - "@typescript-eslint/scope-manager-4.31.0" = { + "@typescript-eslint/scope-manager-4.31.2" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.31.0"; + version = "4.31.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.31.0.tgz"; - sha512 = "LJ+xtl34W76JMRLjbaQorhR0hfRAlp3Lscdiz9NeI/8i+q0hdBZ7BsiYieLoYWqy+AnRigaD3hUwPFugSzdocg=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.31.2.tgz"; + sha512 = "2JGwudpFoR/3Czq6mPpE8zBPYdHWFGL6lUNIGolbKQeSNv4EAiHaR5GVDQaLA0FwgcdcMtRk+SBJbFGL7+La5w=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -7645,13 +7618,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.31.0" = { + "@typescript-eslint/types-4.31.2" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.31.0"; + version = "4.31.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.31.0.tgz"; - sha512 = "9XR5q9mk7DCXgXLS7REIVs+BaAswfdHhx91XqlJklmqWpTALGjygWVIb/UnLh4NWhfwhR5wNe1yTyCInxVhLqQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.31.2.tgz"; + sha512 = "kWiTTBCTKEdBGrZKwFvOlGNcAsKGJSBc8xLvSjSppFO88AqGxGNYtF36EuEYG6XZ9vT0xX8RNiHbQUKglbSi1w=="; }; }; "@typescript-eslint/typescript-estree-3.10.1" = { @@ -7663,13 +7636,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.31.0" = { + "@typescript-eslint/typescript-estree-4.31.2" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.31.0"; + version = "4.31.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.0.tgz"; - sha512 = "QHl2014t3ptg+xpmOSSPn5hm4mY8D4s97ftzyk9BZ8RxYQ3j73XcwuijnJ9cMa6DO4aLXeo8XS3z1omT9LA/Eg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.2.tgz"; + sha512 = "ieBq8U9at6PvaC7/Z6oe8D3czeW5d//Fo1xkF/s9394VR0bg/UaMYPdARiWyKX+lLEjY3w/FNZJxitMsiWv+wA=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -7681,13 +7654,13 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.31.0" = { + "@typescript-eslint/visitor-keys-4.31.2" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.31.0"; + version = "4.31.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.0.tgz"; - sha512 = "HUcRp2a9I+P21+O21yu3ezv3GEPGjyGiXoEUQwZXjR8UxRApGeLyWH4ZIIUSalE28aG4YsV6GjtaAVB3QKOu0w=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.2.tgz"; + sha512 = "PrBId7EQq2Nibns7dd/ch6S6/M4/iwLM9McbgeEbCXfxdwRUNxJ4UNreJ6Gh3fI2GNKNrWnQxKL7oCPmngKBug=="; }; }; "@uifabric/foundation-7.10.0" = { @@ -7771,13 +7744,13 @@ let sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="; }; }; - "@unicode/unicode-13.0.0-1.2.0" = { + "@unicode/unicode-13.0.0-1.2.1" = { name = "_at_unicode_slash_unicode-13.0.0"; packageName = "@unicode/unicode-13.0.0"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@unicode/unicode-13.0.0/-/unicode-13.0.0-1.2.0.tgz"; - sha512 = "ocuWbduBe3lNt/651RUs3eVbWLCQ7S40nxCCuErm0ynDZsraAzT9TGMea2qx9mUR59/un4a+SQSTHs1vB9QfPQ=="; + url = "https://registry.npmjs.org/@unicode/unicode-13.0.0/-/unicode-13.0.0-1.2.1.tgz"; + sha512 = "8NDE4zZASktxJe+hV13K795wefyx+wRhu3Wl7TJ8fzsKx95CHsgTFmYRTscqna90zpUz6YBjGyqXHBI2ubiMaw=="; }; }; "@uphold/request-logger-2.0.0" = { @@ -7870,31 +7843,31 @@ let sha512 = "B6PedV/H2kcGEAgnqncwjHe3E8fqUNXCLv1BsrNwkHHWQJXkDN7dFeuEB4oaucBOVbjhH7KGLJ6JAiXPE3S7xA=="; }; }; - "@vue/compiler-core-3.2.11" = { + "@vue/compiler-core-3.2.16" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.2.11"; + version = "3.2.16"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.11.tgz"; - sha512 = "bcbsLx5XyQg8WDDEGwmpX0BfEfv82wIs9fWFelpyVhNRGMaABvUTalYINyfhVT+jOqNaD4JBhJiVKd/8TmsHWg=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.16.tgz"; + sha512 = "60LD3f1GpMtoCPWKP7HacFxv97/EUY8m4WNqfFYmfaILVGO0icojdOCYOfgGFiYC+kgk1MOVdiI4vrWci0CnhQ=="; }; }; - "@vue/compiler-dom-3.2.11" = { + "@vue/compiler-dom-3.2.16" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.2.11"; + version = "3.2.16"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.11.tgz"; - sha512 = "DNvhUHI/1Hn0/+ZYDYGAuDGasUm+XHKC3FE4GqkNCTO/fcLaJMRg/7eT1m1lkc7jPffUwwfh1rZru5mwzOjrNw=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.16.tgz"; + sha512 = "K7lYfwvsp5OLb0+/rKI9XT2RJy2RB7TyJBjvlfCDAF0KOJGqWAx++DLJPm+F3D29Mhxgt6ozSKP+rC3dSabvYA=="; }; }; - "@vue/shared-3.2.11" = { + "@vue/shared-3.2.16" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.2.11"; + version = "3.2.16"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.11.tgz"; - sha512 = "ovfXAsSsCvV9JVceWjkqC/7OF5HbgLOtCWjCIosmPGG8lxbPuavhIxRH1dTx4Dg9xLgRTNLvI3pVxG4ItQZekg=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.16.tgz"; + sha512 = "zpv8lxuatl3ruCJCsGzrO/F4+IlLug4jbu3vaIi/wJVZKQgnsW1R/xSRJMQS6K57cl4fT/2zkrYsWh1/6H7Esw=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -8455,13 +8428,13 @@ let sha512 = "WwB53ikYudh9pIorgxrkHKrQZcCqNM/Q/bDzZBffEaGUKGuHrRb3zZUT9Sh2qw9yogC7SsdRmQ1ER0pqvd3bfw=="; }; }; - "@xmldom/xmldom-0.7.4" = { + "@xmldom/xmldom-0.7.5" = { name = "_at_xmldom_slash_xmldom"; packageName = "@xmldom/xmldom"; - version = "0.7.4"; + version = "0.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.4.tgz"; - sha512 = "wdxC79cvO7PjSM34jATd/RYZuYWQ8y/R7MidZl1NYYlbpFn1+spfjkiR3ZsJfcaTs2IyslBN7VwBBJwrYKM+zw=="; + url = "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz"; + sha512 = "V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A=="; }; }; "@xmpp/base64-0.12.1" = { @@ -9157,22 +9130,22 @@ let sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa"; }; }; - "addons-linter-3.12.0" = { + "addons-linter-3.14.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "3.12.0"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-3.12.0.tgz"; - sha512 = "GAvHjjqxVn8cQYBD6xshneACdaY2KjakWIyUhXrVbx3g8TZSF78ISucKZ1+XtKZLDvEr1LIJjeeYlR49LNH3CQ=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-3.14.0.tgz"; + sha512 = "vtumbG5Ma50K3JkQerx7Q03CfIYy4qZLl4jgwx42tdU8rSFy0vOWqr3t6pOnWD94r1dHAxcDoVglz2YcUrhBuQ=="; }; }; - "addons-scanner-utils-4.9.0" = { + "addons-scanner-utils-4.10.0" = { name = "addons-scanner-utils"; packageName = "addons-scanner-utils"; - version = "4.9.0"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-4.9.0.tgz"; - sha512 = "RF+pVMSj3CcWV6NH4pBboCZnpzfr48ZmJCBXt/LZbU59PNepZDFxax9tl2MXzX01AXNwKUGa321pPyc5h4zV5A=="; + url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-4.10.0.tgz"; + sha512 = "QVpmVvcKuHHNEqz2aUKKqb5hA65xFSUP2aitkR8OSD2Fh1DGIBrVvjXP41nef3f2hLDJ+2oWrEK7toEK1wk2dQ=="; }; }; "addr-to-ip-port-1.5.4" = { @@ -9193,13 +9166,13 @@ let sha512 = "aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA=="; }; }; - "adm-zip-0.5.5" = { + "adm-zip-0.5.6" = { name = "adm-zip"; packageName = "adm-zip"; - version = "0.5.5"; + version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.5.tgz"; - sha512 = "IWwXKnCbirdbyXSfUDvCCrmYrOHANRZcc8NcRrvTlIApdl7PwE9oGcsYvNeJPAVY1M+70b4PxXGKIf8AEuiQ6w=="; + url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.6.tgz"; + sha512 = "nUeYhBHLG08VFOkVwai0pLXge6NNlahH+ccwxXodvl+SLa5l9mXHjg40jRVzofRPz29goiTGze7vIKmCltKtSA=="; }; }; "adverb-where-0.2.5" = { @@ -9382,6 +9355,15 @@ let sha512 = "9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w=="; }; }; + "ajv-8.6.3" = { + name = "ajv"; + packageName = "ajv"; + version = "8.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz"; + sha512 = "SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw=="; + }; + }; "ajv-errors-1.0.1" = { name = "ajv-errors"; packageName = "ajv-errors"; @@ -9526,15 +9508,6 @@ let sha1 = "a78f1c98995087ad36192a41298e4db49e3dfc45"; }; }; - "analytics-node-3.5.0" = { - name = "analytics-node"; - packageName = "analytics-node"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/analytics-node/-/analytics-node-3.5.0.tgz"; - sha512 = "XgQq6ejZHCehUSnZS4V7QJPLIP7S9OAWwQDYl4WTLtsRvc5fCxIwzK/yihzmIW51v9PnyBmrl9dMcqvwfOE8WA=="; - }; - }; "anchor-markdown-header-0.5.7" = { name = "anchor-markdown-header"; packageName = "anchor-markdown-header"; @@ -9769,22 +9742,22 @@ let sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; }; }; - "ansi-regex-5.0.0" = { + "ansi-regex-5.0.1" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz"; - sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"; + sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; }; - "ansi-regex-6.0.0" = { + "ansi-regex-6.0.1" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.0.tgz"; - sha512 = "tAaOSrWCHF+1Ear1Z4wnJCXA9GGox4K6Ic85a5qalES2aeEwQGr7UC93mwef49536PkCYjzkp0zIxfFvexJ6zQ=="; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz"; + sha512 = "n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="; }; }; "ansi-split-1.0.1" = { @@ -10192,6 +10165,15 @@ let sha512 = "pk2hiWrCXMAy2fRPwEyhvka+mqwzeP60Jr1tRYi5xru+3ko94HI9o6lK0CT33/w4RDlxWchmdhDCrvdr+pHCig=="; }; }; + "app-path-2.2.0" = { + name = "app-path"; + packageName = "app-path"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/app-path/-/app-path-2.2.0.tgz"; + sha1 = "2af5c2b544a40e15fc1ac55548314397460845d0"; + }; + }; "appdata-path-1.0.0" = { name = "appdata-path"; packageName = "appdata-path"; @@ -10903,13 +10885,13 @@ let sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; }; }; - "asar-3.0.3" = { + "asar-3.1.0" = { name = "asar"; packageName = "asar"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/asar/-/asar-3.0.3.tgz"; - sha512 = "k7zd+KoR+n8pl71PvgElcoKHrVNiSXtw7odKbyNpmgKe7EGRF9Pnu3uLOukD37EvavKwVFxOUpqXTIZC5B5Pmw=="; + url = "https://registry.npmjs.org/asar/-/asar-3.1.0.tgz"; + sha512 = "vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ=="; }; }; "ascii-table-0.0.9" = { @@ -11227,13 +11209,13 @@ let sha512 = "XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg=="; }; }; - "async-append-only-log-3.0.9" = { + "async-append-only-log-3.1.0" = { name = "async-append-only-log"; packageName = "async-append-only-log"; - version = "3.0.9"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/async-append-only-log/-/async-append-only-log-3.0.9.tgz"; - sha512 = "PIAz4ujkfeDkCjWawS14HIJksu52QTp8i8fSdCdzg/neNldROEjCtfcZ4+DpU4o6U7aSYNNpdN5stwDwhSZQfA=="; + url = "https://registry.npmjs.org/async-append-only-log/-/async-append-only-log-3.1.0.tgz"; + sha512 = "vEnzpbpfnMvWK7xweZ4mX+Y4H6eYMtEvVLctsLleXjN3lWewCcGxPxSAscBq05MxH3Veh7q9JHnOfuOIoeJYVw=="; }; }; "async-done-1.3.2" = { @@ -11254,6 +11236,15 @@ let sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="; }; }; + "async-each-series-0.1.1" = { + name = "async-each-series"; + packageName = "async-each-series"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/async-each-series/-/async-each-series-0.1.1.tgz"; + sha1 = "7617c1917401fd8ca4a28aadce3dbae98afeb432"; + }; + }; "async-exit-hook-2.0.1" = { name = "async-exit-hook"; packageName = "async-exit-hook"; @@ -11560,13 +11551,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.985.0" = { + "aws-sdk-2.994.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.985.0"; + version = "2.994.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.985.0.tgz"; - sha512 = "Al1oFENrrDeKRpxlklk5sONqzCgEkrhaJ1vtIfpLYYqhNlAY+ku/z1hG1+qSlvgmljGyn7T6/zAb2EcbbAFZLQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.994.0.tgz"; + sha512 = "NBGY9IgE3EsIkIhylR6pwVx9ETrVZ6fCzd7/Ptzjx7Ccw4L2sMhl4EiBAW2sp5M7PZz5DnEQHdAQstqmdxggaQ=="; }; }; "aws-sign2-0.6.0" = { @@ -11632,15 +11623,6 @@ let sha512 = "NFCoNIHq8lYkJa6ku4m+V1837TP6lCa7n79Iuf8/AqATAHYB0ISaAS1eyIenDOfHOLtym34W65Sjke2xjg2fsA=="; }; }; - "azure-devops-node-api-10.2.2" = { - name = "azure-devops-node-api"; - packageName = "azure-devops-node-api"; - version = "10.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-10.2.2.tgz"; - sha512 = "4TVv2X7oNStT0vLaEfExmy3J4/CzfuXolEcQl/BRUmvGySqKStTG2O55/hUQ0kM7UJlZBLgniM0SBq4d/WkKow=="; - }; - }; "azure-devops-node-api-11.0.1" = { name = "azure-devops-node-api"; packageName = "azure-devops-node-api"; @@ -11929,13 +11911,13 @@ let sha512 = "kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ=="; }; }; - "babel-plugin-polyfill-corejs3-0.2.4" = { + "babel-plugin-polyfill-corejs3-0.2.5" = { name = "babel-plugin-polyfill-corejs3"; packageName = "babel-plugin-polyfill-corejs3"; - version = "0.2.4"; + version = "0.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz"; - sha512 = "z3HnJE5TY/j4EFEa/qpQMSbcUJZ5JQi+3UFjXzn6pQCmIKc5Ug5j98SuYyH+m4xQnvKlMDIW4plLfgyVnd0IcQ=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.5.tgz"; + sha512 = "ninF5MQNwAX9Z7c9ED+H2pGt1mXdP4TqzlHKyPIYmJIYz0N+++uwdM7RnJukklhzJ54Q84vA4ZJkgs7lu5vqcw=="; }; }; "babel-plugin-polyfill-regenerator-0.2.2" = { @@ -12757,6 +12739,15 @@ let sha512 = "j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w=="; }; }; + "big-integer-1.6.49" = { + name = "big-integer"; + packageName = "big-integer"; + version = "1.6.49"; + src = fetchurl { + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.49.tgz"; + sha512 = "KJ7VhqH+f/BOt9a3yMwJNmcZjG53ijWMTjSAGMveQWyLwqIiwkjNP5PFgDob3Snnx86SjDj6I89fIbv0dkQeNw=="; + }; + }; "big.js-3.2.0" = { name = "big.js"; packageName = "big.js"; @@ -12775,6 +12766,15 @@ let sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; }; }; + "bignumber.js-2.4.0" = { + name = "bignumber.js"; + packageName = "bignumber.js"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-2.4.0.tgz"; + sha1 = "838a992da9f9d737e0f4b2db0be62bb09dd0c5e8"; + }; + }; "bignumber.js-9.0.0" = { name = "bignumber.js"; packageName = "bignumber.js"; @@ -13342,6 +13342,15 @@ let sha512 = "vE52okJvzsVWhcgUHOv+69OG3Mdg151xyn41aVQN/5W5S+S43qZhxECtYLAEHMSFWX6Mv5IZrzj3T5+JqXfj5Q=="; }; }; + "bmp-js-0.0.3" = { + name = "bmp-js"; + packageName = "bmp-js"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bmp-js/-/bmp-js-0.0.3.tgz"; + sha1 = "64113e9c7cf1202b376ed607bf30626ebe57b18a"; + }; + }; "bmutex-0.1.6" = { name = "bmutex"; packageName = "bmutex"; @@ -13558,6 +13567,15 @@ let sha1 = "b4a0a5a839a406454af0fe05a8b91a7a766a54e2"; }; }; + "bottleneck-2.19.5" = { + name = "bottleneck"; + packageName = "bottleneck"; + version = "2.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bottleneck/-/bottleneck-2.19.5.tgz"; + sha512 = "VHiNCbI1lKdl44tGrhNfU3lup0Tj/ZBMJB5/2ZbNXRCPuRCO7ed2mgcK4r17y+KB2EfuYuRaVlwNbAeaWGSpbw=="; + }; + }; "boundary-1.0.1" = { name = "boundary"; packageName = "boundary"; @@ -13639,13 +13657,13 @@ let sha512 = "eB4uT9RGzg2odpER62bBwSLvUeGC+WbRjjyyFhGsKnc8wp/m0+hQsMUvUe3H2V0D5vw0nBdO1hCJoZo5mKeuIQ=="; }; }; - "boxen-5.0.1" = { + "boxen-5.1.2" = { name = "boxen"; packageName = "boxen"; - version = "5.0.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/boxen/-/boxen-5.0.1.tgz"; - sha512 = "49VBlw+PrWEF51aCmy7QIteYPIFZxSpvqBdP/2itCPPlJ49kj9zg/XPRFrdkne2W+CfwXUls8exMvu1RysZpKA=="; + url = "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz"; + sha512 = "9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ=="; }; }; "bplist-creator-0.0.6" = { @@ -13837,6 +13855,24 @@ let sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw=="; }; }; + "browser-sync-client-2.27.5" = { + name = "browser-sync-client"; + packageName = "browser-sync-client"; + version = "2.27.5"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.27.5.tgz"; + sha512 = "l2jtf60/exv0fQiZkhi3z8RgexYYLGS7DVDnyepkrp+oFAPlKW69daL6NrVSgrwu6lzSTCCTAiPXnUSrQ57e/Q=="; + }; + }; + "browser-sync-ui-2.27.5" = { + name = "browser-sync-ui"; + packageName = "browser-sync-ui"; + version = "2.27.5"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-2.27.5.tgz"; + sha512 = "KxBJhQ6XNbQ8w8UlkPa9/J5R0nBHgHuJUtDpEXQx1jBapDy32WGzD0NENDozP4zGNvJUgZk3N80hqB7YCieC3g=="; + }; + }; "browserify-16.5.2" = { name = "browserify"; packageName = "browserify"; @@ -13954,13 +13990,13 @@ let sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; }; }; - "browserslist-4.17.0" = { + "browserslist-4.17.1" = { name = "browserslist"; packageName = "browserslist"; - version = "4.17.0"; + version = "4.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.17.0.tgz"; - sha512 = "g2BJ2a0nEYvEFQC208q8mVAhfNwpZ5Mu8BwgtCdZKO3qx98HChmeg448fPdUzld8aFmfLgVh7yymqV+q1lJZ5g=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.17.1.tgz"; + sha512 = "aLD0ZMDSnF4lUt4ZDNgqi5BUn9BZ7YdQdI/cYlILrhdSSZJLU9aNZoD5/NBmM4SK34APB2e83MOsRt1EnkuyaQ=="; }; }; "brq-0.1.8" = { @@ -13972,6 +14008,24 @@ let sha512 = "6SDY1lJMKXgt5TZ6voJQMH2zV1XPWWtm203PSkx3DSg9AYNYuRfOPFSBDkNemabzgpzFW9/neR4YhTvyJml8rQ=="; }; }; + "bs-recipes-1.3.4" = { + name = "bs-recipes"; + packageName = "bs-recipes"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/bs-recipes/-/bs-recipes-1.3.4.tgz"; + sha1 = "0d2d4d48a718c8c044769fdc4f89592dc8b69585"; + }; + }; + "bs-snippet-injector-2.0.1" = { + name = "bs-snippet-injector"; + packageName = "bs-snippet-injector"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bs-snippet-injector/-/bs-snippet-injector-2.0.1.tgz"; + sha1 = "61b5393f11f52559ed120693100343b6edb04dd5"; + }; + }; "bs32-0.1.6" = { name = "bs32"; packageName = "bs32"; @@ -14648,6 +14702,15 @@ let sha512 = "i4uu6M4zuMUiyfZN4RU2+i9+peJh//pXhd9x1oSe1LBkZ3LEbCoygu8W0bXTukU1Jme2txKuotpCZRaC3FLxcQ=="; }; }; + "cacache-11.3.3" = { + name = "cacache"; + packageName = "cacache"; + version = "11.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz"; + sha512 = "p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA=="; + }; + }; "cacache-12.0.4" = { name = "cacache"; packageName = "cacache"; @@ -14756,6 +14819,15 @@ let sha512 = "A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw=="; }; }; + "calfinated-1.4.1" = { + name = "calfinated"; + packageName = "calfinated"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/calfinated/-/calfinated-1.4.1.tgz"; + sha1 = "5037e0e77d442b3353e131b04b7bbaf1198ddc6d"; + }; + }; "call-bind-1.0.2" = { name = "call-bind"; packageName = "call-bind"; @@ -14972,13 +15044,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001255" = { + "caniuse-lite-1.0.30001260" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001255"; + version = "1.0.30001260"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001255.tgz"; - sha512 = "F+A3N9jTZL882f/fg/WWVnKSu6IOo3ueLz4zwaOPbPYHNmM/ZaDUyzyJwS1mZhX7Ex5jqTyW599Gdelh5PDYLQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001260.tgz"; + sha512 = "Fhjc/k8725ItmrvW5QomzxLeojewxvqiYCKeFcfFEhut28IVLdpHU19dneOmltZQIE5HNbawj1HYD+1f2bM1Dg=="; }; }; "canvas-2.8.0" = { @@ -14990,13 +15062,13 @@ let sha512 = "gLTi17X8WY9Cf5GZ2Yns8T5lfBOcGgFehDFb+JQwDqdOoBOcECS9ZWMEAqMSVcMYwXD659J8NyzjRY/2aE+C2Q=="; }; }; - "canvg-3.0.7" = { + "canvg-3.0.8" = { name = "canvg"; packageName = "canvg"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/canvg/-/canvg-3.0.7.tgz"; - sha512 = "4sq6iL5Q4VOXS3PL1BapiXIZItpxYyANVzsAKpTPS5oq4u3SKbGfUcbZh2gdLCQ3jWpG/y5wRkMlBBAJhXeiZA=="; + url = "https://registry.npmjs.org/canvg/-/canvg-3.0.8.tgz"; + sha512 = "9De5heHfVRgCkln3CGEeSJMviN5U2RyxL4uutYoe8HxI60BjH2XnT2ZUHIp+ZaAZNTUd5Asqfut8WEEdANqfAg=="; }; }; "caporal-1.4.0" = { @@ -15116,15 +15188,6 @@ let sha512 = "0aaAPgW92lLmypb9iCd22k7tSD1FbF6dps8VQzmIBKY6ych2gO09b2vo/SbaLTmezJuB8Kh88Rvpl/Uq52mNZg=="; }; }; - "cbor-7.0.6" = { - name = "cbor"; - packageName = "cbor"; - version = "7.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cbor/-/cbor-7.0.6.tgz"; - sha512 = "rgt2RFogHGDLFU5r0kSfyeBc+de55DwYHP73KxKsQxsR5b0CYuQPH6AnJaXByiohpLdjQqj/K0SFcOV+dXdhSA=="; - }; - }; "cbor-8.0.0" = { name = "cbor"; packageName = "cbor"; @@ -15143,31 +15206,31 @@ let sha512 = "vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg=="; }; }; - "cdk8s-1.0.0-beta.30" = { + "cdk8s-1.0.0-beta.46" = { name = "cdk8s"; packageName = "cdk8s"; - version = "1.0.0-beta.30"; + version = "1.0.0-beta.46"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.30.tgz"; - sha512 = "U7esrJ2aQ89ACJY8TD0UWgP0dC30V+vy5ZZ8zSiHJyM5JL4N61pLWXDlrKAhpI3rFlrZn6h8YefkQJRM5aC2gw=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-1.0.0-beta.46.tgz"; + sha512 = "mThFg5t92Vu/pSpZVXppaokkSVIdFFnIN8pUoojIaiYL5gD1mG37IY1xt2+FDM6nncl1q6IzjKWipnGOoJYlcQ=="; }; }; - "cdk8s-plus-17-1.0.0-beta.57" = { - name = "cdk8s-plus-17"; - packageName = "cdk8s-plus-17"; - version = "1.0.0-beta.57"; + "cdk8s-plus-22-1.0.0-beta.4" = { + name = "cdk8s-plus-22"; + packageName = "cdk8s-plus-22"; + version = "1.0.0-beta.4"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-17/-/cdk8s-plus-17-1.0.0-beta.57.tgz"; - sha512 = "xEHt7qxEqqPY7L7Thfmkyx+KmaBT8aFcFlmlfOdKA6rv+PhSlWBmCMM9bFq4QI/k6Yd0+pMuY67dV9KvODcdgQ=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-1.0.0-beta.4.tgz"; + sha512 = "lxxXgDBaL3KtXDHsJy9Isg5LYctz7a9tiEtJ16zeJiGAJXqQo3VOpshV1eVbwD0E28l2NU1H2HLuFum1pw3C+w=="; }; }; - "cdktf-0.5.0" = { + "cdktf-0.6.3" = { name = "cdktf"; packageName = "cdktf"; - version = "0.5.0"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.5.0.tgz"; - sha512 = "V/3JOJLvD01vGy8Tvft7jH0NY3R7biKWqJ/BjGCx7+J9KAz6k9aFvtIpRhgcvXMo98B+lmdnMwSgfW2jXhnauQ=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.6.3.tgz"; + sha512 = "N0JxulsgED3uQQFjlKgl1sLzDtjX0sdDMpj9Zd8ejsH/JRhLDKOCqRWKukOFfW0X43TtU9r8SiLn3MagLmVG5w=="; }; }; "center-align-0.1.3" = { @@ -15521,6 +15584,15 @@ let sha1 = "5c710f2bab95653272842ba01c6ea61b3545ec35"; }; }; + "cheerio-0.22.0" = { + name = "cheerio"; + packageName = "cheerio"; + version = "0.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz"; + sha1 = "a9baa860a3f9b595a6b81b1a86873121ed3a269e"; + }; + }; "cheerio-1.0.0-rc.10" = { name = "cheerio"; packageName = "cheerio"; @@ -15755,13 +15827,13 @@ let sha1 = "01296a3e5d130cce34974eb509cbbc7d6f78dd3d"; }; }; - "chromecasts-1.10.0" = { + "chromecasts-1.10.1" = { name = "chromecasts"; packageName = "chromecasts"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/chromecasts/-/chromecasts-1.10.0.tgz"; - sha512 = "vrOiuHxqLb0bWRBlvyL18cHU8PcbZ7iJvwDB6aHdbtdIDVWuzWWZwDyAWHu54j4JNqyaAyYBJiJ6bbHInVcqBQ=="; + url = "https://registry.npmjs.org/chromecasts/-/chromecasts-1.10.1.tgz"; + sha512 = "NsbbMxwLEDevtJtVTrTkr5sQhJPZYJiwJ6RXQ1qO9RURtIlcLBnfoncfrjlQPRLAKuPETHkQcCbxYnqTHvILJA=="; }; }; "chromium-pickle-js-0.2.0" = { @@ -16070,31 +16142,22 @@ let sha1 = "7e673ee0dd39a611a486476e53f3c6b3941cb582"; }; }; - "cli-progress-3.9.0" = { + "cli-progress-3.9.1" = { name = "cli-progress"; packageName = "cli-progress"; - version = "3.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.9.0.tgz"; - sha512 = "g7rLWfhAo/7pF+a/STFH/xPyosaL1zgADhI0OM83hl3c7S43iGvJWEAV2QuDOnQ8i6EMBj/u4+NTd0d5L+4JfA=="; - }; - }; - "cli-progress-footer-1.1.1" = { - name = "cli-progress-footer"; - packageName = "cli-progress-footer"; - version = "1.1.1"; + version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/cli-progress-footer/-/cli-progress-footer-1.1.1.tgz"; - sha512 = "J0uW2u06pWI0tMKCbcCiMOZd8TbWj4EpuYgPo4Jiwih/FfGbd4dbLcJieO0Ior1pY1HBrnmCuHFk6GB9azE4pg=="; + url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.9.1.tgz"; + sha512 = "AXxiCe2a0Lm0VN+9L0jzmfQSkcZm5EYspfqXKaSIQKqIk+0hnkZ3/v1E9B39mkD6vYhKih3c/RPsJBSwq9O99Q=="; }; }; - "cli-progress-footer-2.0.0" = { + "cli-progress-footer-2.1.1" = { name = "cli-progress-footer"; packageName = "cli-progress-footer"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/cli-progress-footer/-/cli-progress-footer-2.0.0.tgz"; - sha512 = "+MWvSb0KGFOetUptNubegAYWj9NyDwI1XPrfvYE+YWOsufBinF/M7G3VLMjBEGvqSnLYM2nnAX76cHHh0eXsBg=="; + url = "https://registry.npmjs.org/cli-progress-footer/-/cli-progress-footer-2.1.1.tgz"; + sha512 = "fBEAKLDp/CCMzQSeEbvz4POvomCekmT0LodI/mchzrjIPeLXQHJ9Gb28leAqEjdc9wyV40cjsB2aWpvO5MA7Pw=="; }; }; "cli-spinner-0.2.10" = { @@ -16835,31 +16898,22 @@ let sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; }; }; - "colorette-1.2.2" = { - name = "colorette"; - packageName = "colorette"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz"; - sha512 = "MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="; - }; - }; - "colorette-1.3.0" = { + "colorette-1.4.0" = { name = "colorette"; packageName = "colorette"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz"; - sha512 = "ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w=="; + url = "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz"; + sha512 = "Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g=="; }; }; - "colorette-1.4.0" = { + "colorette-2.0.2" = { name = "colorette"; packageName = "colorette"; - version = "1.4.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz"; - sha512 = "Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g=="; + url = "https://registry.npmjs.org/colorette/-/colorette-2.0.2.tgz"; + sha512 = "iO5Ycn8HKVhTGGKpwJtyzrrvOGI9YC4u4dppP5yKSGP47ApaZNwX7ne4PtgpTzq+JBwQh6FrdAfCSYTBQe1+FA=="; }; }; "colornames-1.1.1" = { @@ -17213,13 +17267,13 @@ let sha512 = "Xvf85aAtu6v22+E5hfVoLHqyul/jyxh91zvqk/ioJTQuJR7Z78n7H558vMPKanPSRgIEeZemT92I2g9Y8LPbSQ=="; }; }; - "commander-8.1.0" = { + "commander-8.2.0" = { name = "commander"; packageName = "commander"; - version = "8.1.0"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-8.1.0.tgz"; - sha512 = "mf45ldcuHSYShkplHHGKWb4TrmwQadxOn7v4WuhDJy0ZVoY5JFajaRDKD0PNe5qXzBX0rhovjTnP6Kz9LETcuA=="; + url = "https://registry.npmjs.org/commander/-/commander-8.2.0.tgz"; + sha512 = "LLKxDvHeL91/8MIyTAD5BFMNtoIwztGPMiM/7Bl8rIPmHCZXRxmSWr91h57dpOpnQ6jIUqEWdXE/uBYMfiVZDA=="; }; }; "commandpost-1.4.0" = { @@ -17501,13 +17555,13 @@ let sha512 = "bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg=="; }; }; - "conf-10.0.2" = { + "conf-10.0.3" = { name = "conf"; packageName = "conf"; - version = "10.0.2"; + version = "10.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/conf/-/conf-10.0.2.tgz"; - sha512 = "iyy4ArqyQ/yrzNASNBN+jaylu53JRuq0ztvL6KAWYHj4iN56BVuhy2SrzEEHBodNbacZr2Pd/4nWhoAwc66T1g=="; + url = "https://registry.npmjs.org/conf/-/conf-10.0.3.tgz"; + sha512 = "4gtQ/Q36qVxBzMe6B7gWOAfni1VdhuHkIzxydHkclnwGmgN+eW4bb6jj73vigCfr7d3WlmqawvhZrpCUCTPYxQ=="; }; }; "conf-6.2.4" = { @@ -17618,6 +17672,15 @@ let sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52"; }; }; + "connect-3.6.6" = { + name = "connect"; + packageName = "connect"; + version = "3.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz"; + sha1 = "09eff6c55af7236e137135a72574858b6786f524"; + }; + }; "connect-3.7.0" = { name = "connect"; packageName = "connect"; @@ -17672,15 +17735,6 @@ let sha1 = "7890482bf5c71af6c5ca192be3136aed74428aad"; }; }; - "consola-2.15.3" = { - name = "consola"; - packageName = "consola"; - version = "2.15.3"; - src = fetchurl { - url = "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz"; - sha512 = "9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw=="; - }; - }; "console-browserify-1.1.0" = { name = "console-browserify"; packageName = "console-browserify"; @@ -17744,13 +17798,22 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.147" = { + "constructs-10.0.5" = { name = "constructs"; packageName = "constructs"; - version = "3.3.147"; + version = "10.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.147.tgz"; - sha512 = "xTSA87W5hscsHdFC2NcbJWALeMt8QWoCvVXRHPIuoBDDXdvBuNoqL2a5kY1yEWSMLQvBPnrDyinfz3twTX6dAw=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.0.5.tgz"; + sha512 = "IwOwekzrASFC3qt4ozCtV09rteAIAesuCGsW0p+uBfqHd2XcvA5CXqJjgf4eUqm6g8e/noXlVCMDWwC8GaLtrg=="; + }; + }; + "constructs-3.3.152" = { + name = "constructs"; + packageName = "constructs"; + version = "3.3.152"; + src = fetchurl { + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.152.tgz"; + sha512 = "66ByZlrzPUeY6BQ7Zs4hX81TutaKgqiieZxP7ln9voo4e6Py9mMrx/4PVgl+bwKQNw0m4ndtbkdZexuS16tiMw=="; }; }; "consume-http-header-1.0.0" = { @@ -17826,22 +17889,22 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "contentful-management-7.36.2" = { + "contentful-management-7.39.1" = { name = "contentful-management"; packageName = "contentful-management"; - version = "7.36.2"; + version = "7.39.1"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.36.2.tgz"; - sha512 = "pOyHyIuOygqQPDfF9C1MQKTAKAJcounClp4R5afhKkXDdh8jUPc34Ej9BACCtseo99Q9BftLQn49nmk9xJHylQ=="; + url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.39.1.tgz"; + sha512 = "1fdJ8890tHZBOTbpCSsDvZY9AQtY/FXQmzItECcFwNAIRz7cUMxtrSNPqK85KVEjyjAlqiV4PIbZnju6ItF4dQ=="; }; }; - "contentful-sdk-core-6.8.5" = { + "contentful-sdk-core-6.9.0" = { name = "contentful-sdk-core"; packageName = "contentful-sdk-core"; - version = "6.8.5"; + version = "6.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-sdk-core/-/contentful-sdk-core-6.8.5.tgz"; - sha512 = "Efmv/Jf0zeTdRNqCW6y+iMsNbDa/+KpxYOaYYz0z1qVd4q88qtZDJrvLdjPHtYvrcrvkhYtucVRFr9oe2b+cAA=="; + url = "https://registry.npmjs.org/contentful-sdk-core/-/contentful-sdk-core-6.9.0.tgz"; + sha512 = "fLwE0avEf81iDdJGVFUB5nC8AzI1OPg+YY33V8aFBgHkKMXpHI6zNInWnQGUekXCl2OAGKk5QkVfEAjvpkFGig=="; }; }; "continuable-1.1.8" = { @@ -17943,13 +18006,13 @@ let sha512 = "z5DAsn3uj1Vfp7po3gpt2Boc+Bdwmw2++ZHa5Ak9k0UKsYAO5mH1UBTN0qSCuJZREIhX6WU4E1p3IW2oRCNzQw=="; }; }; - "conventional-changelog-conventionalcommits-4.6.0" = { + "conventional-changelog-conventionalcommits-4.6.1" = { name = "conventional-changelog-conventionalcommits"; packageName = "conventional-changelog-conventionalcommits"; - version = "4.6.0"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.0.tgz"; - sha512 = "sj9tj3z5cnHaSJCYObA9nISf7eq/YjscLPoq6nmew4SiOjxqL2KRpK20fjnjVbpNDjJ2HR3MoVcWKXwbVvzS0A=="; + url = "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-4.6.1.tgz"; + sha512 = "lzWJpPZhbM1R0PIzkwzGBCnAkH5RKJzJfFQZcl/D+2lsJxAwGnDKBqn/F4C1RD31GJNn8NuKWQzAZDAVXPp2Mw=="; }; }; "conventional-changelog-core-4.2.4" = { @@ -18330,40 +18393,40 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.16.0" = { + "core-js-3.17.2" = { name = "core-js"; packageName = "core-js"; - version = "3.16.0"; + version = "3.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.16.0.tgz"; - sha512 = "5+5VxRFmSf97nM8Jr2wzOwLqRo6zphH2aX+7KsAUONObyzakDNq2G/bgbhinxB4PoV9L3aXQYhiDKyIKWd2c8g=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.17.2.tgz"; + sha512 = "XkbXqhcXeMHPRk2ItS+zQYliAMilea2euoMsnpRRdDad6b2VY6CQQcwz1K8AnWesfw4p165RzY0bTnr3UrbYiA=="; }; }; - "core-js-3.17.3" = { + "core-js-3.18.0" = { name = "core-js"; packageName = "core-js"; - version = "3.17.3"; + version = "3.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.17.3.tgz"; - sha512 = "lyvajs+wd8N1hXfzob1LdOCCHFU4bGMbqqmLn1Q4QlCpDqWPpGf+p0nj+LNrvDDG33j0hZXw2nsvvVpHysxyNw=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.18.0.tgz"; + sha512 = "WJeQqq6jOYgVgg4NrXKL0KLQhi0CT4ZOCvFL+3CQ5o7I6J8HkT5wd53EadMfqTDp1so/MT1J+w2ujhWcCJtN7w=="; }; }; - "core-js-compat-3.17.3" = { + "core-js-compat-3.18.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.17.3"; + version = "3.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.17.3.tgz"; - sha512 = "+in61CKYs4hQERiADCJsdgewpdl/X0GhEX77pjKgbeibXviIt2oxEjTc8O2fqHX8mDdBrDvX8MYD/RYsBv4OiA=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.18.0.tgz"; + sha512 = "tRVjOJu4PxdXjRMEgbP7lqWy1TWJu9a01oBkn8d+dNrhgmBwdTkzhHZpVJnEmhISLdoJI1lX08rcBcHi3TZIWg=="; }; }; - "core-js-pure-3.17.3" = { + "core-js-pure-3.18.0" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.17.3"; + version = "3.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.17.3.tgz"; - sha512 = "YusrqwiOTTn8058JDa0cv9unbXdIiIgcgI9gXso0ey4WgkFLd3lYlV9rp9n7nDCsYxXsMDTjA4m1h3T348mdlQ=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.18.0.tgz"; + sha512 = "ZnK+9vyuMhKulIGqT/7RHGRok8RtkHMEX/BGPHkHx+ouDkq+MUvf9mfIgdqhpmPDu8+V5UtRn/CbCRc9I4lX4w=="; }; }; "core-util-is-1.0.2" = { @@ -18609,13 +18672,13 @@ let sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; }; }; - "create-gatsby-1.13.0" = { + "create-gatsby-1.14.0" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "1.13.0"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.13.0.tgz"; - sha512 = "ypJeb+nj5uZybFeic+ab5myxGh21oZQ+OeCRkKHPL9NPZbzcvQE/y5lWXgVXHqy2/xf2IBnotkImrmiQiqPOxg=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.14.0.tgz"; + sha512 = "ba081Li7A7T7cHmcoE4oL+MO12k4ck5MWENPcuF9U8fTbOfICf+r3S0Mr+35YKbxr0w25RzhN5VcOS3+rokgbA=="; }; }; "create-graphback-1.0.1" = { @@ -19239,13 +19302,13 @@ let sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; }; }; - "csstype-3.0.8" = { + "csstype-3.0.9" = { name = "csstype"; packageName = "csstype"; - version = "3.0.8"; + version = "3.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/csstype/-/csstype-3.0.8.tgz"; - sha512 = "jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw=="; + url = "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz"; + sha512 = "rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw=="; }; }; "csurf-1.11.0" = { @@ -19446,13 +19509,13 @@ let sha512 = "4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw=="; }; }; - "d3-7.0.1" = { + "d3-7.0.3" = { name = "d3"; packageName = "d3"; - version = "7.0.1"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/d3/-/d3-7.0.1.tgz"; - sha512 = "74zonD4nAtxF9dtwFwJ3RuoHPh2D/UTFX26midBuMVH+7pRbOezuyLUIb8mbQMuYFlcUXT+xy++orCmnvMM/CA=="; + url = "https://registry.npmjs.org/d3/-/d3-7.0.3.tgz"; + sha512 = "BEQCpEXI+Z9OnnlXLaS6txoYZZvvXuRyjZoudPuAnWGVOzHxGWC0TL8XRUs7V7IeZQPLfvGztcl54+jgOe122g=="; }; }; "d3-array-1.2.4" = { @@ -19473,13 +19536,13 @@ let sha512 = "B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ=="; }; }; - "d3-array-3.0.2" = { + "d3-array-3.0.4" = { name = "d3-array"; packageName = "d3-array"; - version = "3.0.2"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/d3-array/-/d3-array-3.0.2.tgz"; - sha512 = "nTN4OC6ufZueotlexbxBd2z8xmG1eIfhvP2m1auH2ONps0L+AZn1r0JWuzMXZ6XgOj1VBOp7GGZmEs9NUFEBbA=="; + url = "https://registry.npmjs.org/d3-array/-/d3-array-3.0.4.tgz"; + sha512 = "ShFl90cxNqDaSynDF/Bik/kTzISqePqU3qo2fv6kSJEvF7y7tDCDpcU6WiT01rPO6zngZnrvJ/0j4q6Qg+5EQg=="; }; }; "d3-axis-1.0.12" = { @@ -19995,13 +20058,13 @@ let sha512 = "1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ=="; }; }; - "d3-scale-4.0.0" = { + "d3-scale-4.0.1" = { name = "d3-scale"; packageName = "d3-scale"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.0.tgz"; - sha512 = "foHQYKpWQcyndH1CGoHdUC4PECxTxonzwwBXGT8qu+Drb1FIc6ON6dG2P5f4hRRMkLiIKeWK7iFtdznDUrnuPQ=="; + url = "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.1.tgz"; + sha512 = "akUAsUujCFnw6Sf1dF7y/FXTxz+VvEIOB3ValKtLhNrzFp8q5wPO3VCAmsbCLJWRTxyJCZDoooodjOI1plFqlw=="; }; }; "d3-scale-chromatic-1.5.0" = { @@ -20445,13 +20508,13 @@ let sha512 = "hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw=="; }; }; - "date-fns-2.23.0" = { + "date-fns-2.24.0" = { name = "date-fns"; packageName = "date-fns"; - version = "2.23.0"; + version = "2.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/date-fns/-/date-fns-2.23.0.tgz"; - sha512 = "5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA=="; + url = "https://registry.npmjs.org/date-fns/-/date-fns-2.24.0.tgz"; + sha512 = "6ujwvwgPID6zbI0o7UbURi2vlLDR9uP26+tW6Lg+Ji3w7dd0i3DOcjcClLjLPranT60SSEFBwdSyYwn/ZkPIuw=="; }; }; "date-format-2.1.0" = { @@ -20508,22 +20571,22 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; - "dateformat-4.5.1" = { + "dateformat-4.6.3" = { name = "dateformat"; packageName = "dateformat"; - version = "4.5.1"; + version = "4.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/dateformat/-/dateformat-4.5.1.tgz"; - sha512 = "OD0TZ+B7yP7ZgpJf5K2DIbj3FZvFvxgFUuaqA/V5zTjAtAAXZ1E8bktHxmAGs4x5b7PflqA9LeQ84Og7wYtF7Q=="; + url = "https://registry.npmjs.org/dateformat/-/dateformat-4.6.3.tgz"; + sha512 = "2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA=="; }; }; - "dayjs-1.10.6" = { + "dayjs-1.10.7" = { name = "dayjs"; packageName = "dayjs"; - version = "1.10.6"; + version = "1.10.7"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.10.6.tgz"; - sha512 = "AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.10.7.tgz"; + sha512 = "P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig=="; }; }; "dayjs-1.8.36" = { @@ -21264,6 +21327,15 @@ let sha512 = "LFsIFEeLPlKvAKXu7j3ssIG6RT0TbI7/GhsqrI0DnHASEQjXQ0LUSYcjJteGgRGmZbl1TnMSxpNQIAiJ7Du5TQ=="; }; }; + "del-3.0.0" = { + name = "del"; + packageName = "del"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/del/-/del-3.0.0.tgz"; + sha1 = "53ecf699ffcbcb39637691ab13baf160819766e5"; + }; + }; "del-4.1.1" = { name = "del"; packageName = "del"; @@ -21696,6 +21768,15 @@ let sha512 = "y/Ev98AleGvl43YKTNcA2Q+lyFmsmCfTTNWy4cjEJxoLkbobcXtRS0Kvx06daCgr2GdtlwLfNzL553BkktfJoA=="; }; }; + "dev-ip-1.0.1" = { + name = "dev-ip"; + packageName = "dev-ip"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dev-ip/-/dev-ip-1.0.1.tgz"; + sha1 = "a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0"; + }; + }; "devtools-protocol-0.0.869402" = { name = "devtools-protocol"; packageName = "devtools-protocol"; @@ -22128,31 +22209,31 @@ let sha512 = "2FFKzmLGOnD+Y378bRKH+gTjRMuSpH7OKgPy31KjjfCoKZx7tU8Dmqfd/3fhG2d/4bppuN8/KtWMUZBAcUCRnQ=="; }; }; - "dockerfile-ast-0.3.1" = { + "dockerfile-ast-0.3.4" = { name = "dockerfile-ast"; packageName = "dockerfile-ast"; - version = "0.3.1"; + version = "0.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.3.1.tgz"; - sha512 = "sxFv+wY4TNC68+JkbZ4kPn3pAfnfvbFBUcvYAA9KFg7Es58FgWr+trskeDRWFkCFeuM1QIXeBC5exMeiAeW96Q=="; + url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.3.4.tgz"; + sha512 = "QjNH/VnTrWjlDekJtk5GBKbypcFUBdGexd+eOAeivwwSWky6bIJps1cw/qw1jU5K3TDMgtufAHaBh7OV5X/EqA=="; }; }; - "dockerfile-language-service-0.5.0" = { + "dockerfile-language-service-0.7.2" = { name = "dockerfile-language-service"; packageName = "dockerfile-language-service"; - version = "0.5.0"; + version = "0.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.5.0.tgz"; - sha512 = "63B8rASoOz69NI4a3ftC64mVTDnQhd6xXdu5J6PN53+2wEm6vhO+zf6R4A5/ssxB3nSnckV25OtHCdBX2CYluQ=="; + url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.7.2.tgz"; + sha512 = "kG2/HrdNz4Hp6O9F2akKSODufQ0BTwXE4hd4kCUOp99de47+r8GpWKOyqpJswr+kbvttPmxcnVdV8wT77c2p5g=="; }; }; - "dockerfile-utils-0.7.0" = { + "dockerfile-utils-0.9.2" = { name = "dockerfile-utils"; packageName = "dockerfile-utils"; - version = "0.7.0"; + version = "0.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.7.0.tgz"; - sha512 = "27Qh1oT1yjbAPbV/VheDZICoSOYfb9pEgkZSiQMbGQOXw0a4ZObDRNxqYQ2o9udVOTbb/HS4y/hm+reCpz8i9g=="; + url = "https://registry.npmjs.org/dockerfile-utils/-/dockerfile-utils-0.9.2.tgz"; + sha512 = "QgcYXSZFBBbPuiQskEAVnW3qSShSCSisLNt2wQZXupBQ/x1lFIyvVfWXk4OQqWoatHyAfUBiXDNx9eRXkmSALQ=="; }; }; "doctoc-2.0.1" = { @@ -22407,6 +22488,15 @@ let sha512 = "xGWt+NHAQS+4tpgbOAI08yxW0Pr256Gu/FNE2frZVTbgrBUn8M7tz7/ktS/LZ2MHeGqz6topj0/xY+y8R5FBFw=="; }; }; + "dompurify-2.3.3" = { + name = "dompurify"; + packageName = "dompurify"; + version = "2.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dompurify/-/dompurify-2.3.3.tgz"; + sha512 = "dqnqRkPMAjOZE0FogZ+ceJNM2dZ3V/yNOuFB7+39qpO93hHhfRpHw3heYQC7DPK9FqbQTfBKUJhiSfz4MvXYwg=="; + }; + }; "domutils-1.4.3" = { name = "domutils"; packageName = "domutils"; @@ -22776,6 +22866,15 @@ let sha512 = "iRDI1QeCQIhMCZk48DRDMVgQSSBDmbzzNhnxIo+pwx3swkfjMh6vh0nWLq1NdvGHLKH6wIrAM3vQWeTj6qeoug=="; }; }; + "easy-extender-2.3.4" = { + name = "easy-extender"; + packageName = "easy-extender"; + version = "2.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/easy-extender/-/easy-extender-2.3.4.tgz"; + sha512 = "8cAwm6md1YTiPpOvDULYJL4ZS6WfM5/cTeVVh4JsvyYZAoqlRVUpHL9Gr5Fy7HA6xcSZicUia3DeAgO3Us8E+Q=="; + }; + }; "easy-stack-1.0.1" = { name = "easy-stack"; packageName = "easy-stack"; @@ -22785,6 +22884,15 @@ let sha512 = "wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w=="; }; }; + "eazy-logger-3.1.0" = { + name = "eazy-logger"; + packageName = "eazy-logger"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eazy-logger/-/eazy-logger-3.1.0.tgz"; + sha512 = "/snsn2JqBtUSSstEl4R0RKjkisGHAhvYj89i7r3ytNUKW12y178KDZwXLXIgwDqLW6E/VRMT9qfld7wvFae8bQ=="; + }; + }; "ecc-jsbn-0.1.2" = { name = "ecc-jsbn"; packageName = "ecc-jsbn"; @@ -22884,13 +22992,13 @@ let sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; }; }; - "electron-13.3.0" = { + "electron-13.4.0" = { name = "electron"; packageName = "electron"; - version = "13.3.0"; + version = "13.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/electron/-/electron-13.3.0.tgz"; - sha512 = "d/BvOLDjI4i7yf9tqCuLL2fFGA2TrM/D9PyRpua+rJolG0qrwp/FohP02L0m+44kmPpofIo4l3NPwLmzyKKimA=="; + url = "https://registry.npmjs.org/electron/-/electron-13.4.0.tgz"; + sha512 = "KJGWS2qa0xZXIMPMDUNkRVO8/JxRd4+M0ejYYOzu2LIQ5ijecPzNuNR9nvDkml9XyyRBzu975FkhJcwD17ietQ=="; }; }; "electron-notarize-1.1.1" = { @@ -22911,13 +23019,13 @@ let sha512 = "icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ=="; }; }; - "electron-packager-15.3.0" = { + "electron-packager-15.4.0" = { name = "electron-packager"; packageName = "electron-packager"; - version = "15.3.0"; + version = "15.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/electron-packager/-/electron-packager-15.3.0.tgz"; - sha512 = "PHcykXinmjPyJcYoNGbOWNsOU25nIbMLHBAfg4caazWzYELFL14FshDZEqqrvVOMEUnqjx/Ktc1NmMIN5ZRomQ=="; + url = "https://registry.npmjs.org/electron-packager/-/electron-packager-15.4.0.tgz"; + sha512 = "JrrLcBP15KGrPj0cZ/ALKGmaQ4gJkn3mocf0E3bRKdR3kxKWYcDRpCvdhksYDXw/r3I6tMEcZ7XzyApWFXdVpw=="; }; }; "electron-rebuild-3.2.3" = { @@ -22929,13 +23037,13 @@ let sha512 = "9oxNmKlDCaf651c+yJWCDIBpF6A9aY+wQtasLEeR5AsPYPuOKEX6xHnC2+WgCLOC94JEpCZznecyC84fbwZq4A=="; }; }; - "electron-to-chromium-1.3.833" = { + "electron-to-chromium-1.3.849" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.833"; + version = "1.3.849"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.833.tgz"; - sha512 = "h+9aVaUHjyunLqtCjJF2jrJ73tYcJqo2cCGKtVAXH9WmnBsb8hiChRQ0P1uXjdxR6Wcfxibephy41c1YlZA/pA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.849.tgz"; + sha512 = "RweyW60HPOqIcxoKTGr38Yvtf2aliSUqX8dB3e9geJ0Bno0YLjcOX5F7/DPVloBkJWaPZ7xOM1A0Yme2T1A34w=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -23372,13 +23480,13 @@ let sha512 = "Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg=="; }; }; - "enhanced-resolve-5.8.2" = { + "enhanced-resolve-5.8.3" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz"; - sha512 = "F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA=="; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz"; + sha512 = "EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA=="; }; }; "enquirer-2.3.6" = { @@ -23633,6 +23741,15 @@ let sha512 = "MgtWFl5No+4S3TmhDmCz2ObFGm6lEpTnzbQi+Dd+pw4mlTIZTmM2iAs5gRlmx5zS9luzobCSBSI90JM/1/JgOw=="; }; }; + "es-module-lexer-0.9.0" = { + name = "es-module-lexer"; + packageName = "es-module-lexer"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.0.tgz"; + sha512 = "qU2eN/XHsrl3E4y7mK1wdWnyy5c8gXtCbfP6Xcsemm7fPUR1PIV1JhZfP7ojcN0Fzp69CfrS3u76h2tusvfKiQ=="; + }; + }; "es-to-primitive-1.2.1" = { name = "es-to-primitive"; packageName = "es-to-primitive"; @@ -23984,13 +24101,13 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; - "eslint-plugin-vue-7.17.0" = { + "eslint-plugin-vue-7.18.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "7.17.0"; + version = "7.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.17.0.tgz"; - sha512 = "Rq5R2QetDCgC+kBFQw1+aJ5B93tQ4xqZvoCUxuIzwTonngNArsdP8ChM8PowIzsJvRtWl4ltGh/bZcN3xhFWSw=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.18.0.tgz"; + sha512 = "ceDXlXYMMPMSXw7tdKUR42w9jlzthJGJ3Kvm3YrZ0zuQfvAySNxe8sm6VHuksBW0+060GzYXhHJG6IHVOfF83Q=="; }; }; "eslint-scope-3.7.3" = { @@ -24146,6 +24263,15 @@ let sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549"; }; }; + "esprima-1.2.2" = { + name = "esprima"; + packageName = "esprima"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz"; + sha1 = "76a0fd66fcfe154fd292667dc264019750b1657b"; + }; + }; "esprima-2.0.0" = { name = "esprima"; packageName = "esprima"; @@ -24758,6 +24884,15 @@ let sha512 = "8ORl1YRygYGPdR+zcClMqzaU+JQuvdNIw/s0RNwYluxNecEHkDEcXFmO6A5T79p7e48KI8iXJYt6KIn4Z9z4bg=="; }; }; + "exif-parser-0.1.12" = { + name = "exif-parser"; + packageName = "exif-parser"; + version = "0.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/exif-parser/-/exif-parser-0.1.12.tgz"; + sha1 = "58a9d2d72c02c1f6f02a0ef4a9166272b7760922"; + }; + }; "exit-0.1.2" = { name = "exit"; packageName = "exit"; @@ -24848,13 +24983,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.94" = { + "expo-pwa-0.0.95" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.94"; + version = "0.0.95"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.94.tgz"; - sha512 = "r/AYEtdRMrvPafgFxxIv7FXQQYgYFFm2YzxOVFBX2/ODs4HU/fNcxZ77kICn2jY9SHSmXps4TluHLpkr76Paxg=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.95.tgz"; + sha512 = "GV9rnBQ1HBwT2jPif11BoFdP9QXd0fFGq0QJd49U2/3UDT8IZIHj7np3StpbA6cz6h+l1aPo3jwXBB+kb/7xFQ=="; }; }; "express-2.5.11" = { @@ -25010,13 +25145,13 @@ let sha1 = "96d13fa41c8de8fa5dcbfa2dacace6f594272888"; }; }; - "ext-1.5.0" = { + "ext-1.6.0" = { name = "ext"; packageName = "ext"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/ext/-/ext-1.5.0.tgz"; - sha512 = "+ONcYoWj/SoQwUofMr94aGu05Ou4FepKi7N7b+O8T4jVfyIsZQV1/xeS8jpaBzF0csAk0KLXoHCxU7cKYZjo1Q=="; + url = "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz"; + sha512 = "sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg=="; }; }; "ext-list-2.2.2" = { @@ -25523,6 +25658,15 @@ let sha512 = "On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="; }; }; + "fastify-warning-0.2.0" = { + name = "fastify-warning"; + packageName = "fastify-warning"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fastify-warning/-/fastify-warning-0.2.0.tgz"; + sha512 = "s1EQguBw/9qtc1p/WTY4eq9WMRIACkj+HTcOIK1in4MV5aFaQC9ZCIt0dJ7pr5bIf4lPpHvAtP2ywpTNgs7hqw=="; + }; + }; "fastintcompression-0.0.4" = { name = "fastintcompression"; packageName = "fastintcompression"; @@ -25550,13 +25694,13 @@ let sha512 = "XJ+vbiXYjmxc32VEpXScAq7mBg3vqh90OjLfiuyQ0zAtXpgICdVgGjKHep1kLGQufyuCBiEYpl6ZKcw79chTpA=="; }; }; - "fastq-1.12.0" = { + "fastq-1.13.0" = { name = "fastq"; packageName = "fastq"; - version = "1.12.0"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.12.0.tgz"; - sha512 = "VNX0QkHK3RsXVKr9KrlUv/FoTa0NdbYoHHl7uXHv2rzyHSlxjdNAKug2twd9luJxpcyNeAgf5iPPMutJO67Dfg=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz"; + sha512 = "YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw=="; }; }; "fault-1.0.4" = { @@ -25766,6 +25910,24 @@ let sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; }; }; + "file-exists-5.0.1" = { + name = "file-exists"; + packageName = "file-exists"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/file-exists/-/file-exists-5.0.1.tgz"; + sha512 = "TeBMgeKbdSsQtcY2XqKY/yTa4BciMD/Gw8YcND0XMDZt4CDj87l1Wl4x7K0ravZ80tZcyIGMD0hj2VSRPR8M8Q=="; + }; + }; + "file-extension-4.0.5" = { + name = "file-extension"; + packageName = "file-extension"; + version = "4.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/file-extension/-/file-extension-4.0.5.tgz"; + sha512 = "l0rOL3aKkoi6ea7MNZe6OHgqYYpn48Qfflr8Pe9G9JPPTx5A+sfboK91ZufzIs59/lPqh351l0eb6iKU9J5oGg=="; + }; + }; "file-loader-3.0.1" = { name = "file-loader"; packageName = "file-loader"; @@ -25973,6 +26135,15 @@ let sha512 = "7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="; }; }; + "filesize-4.2.1" = { + name = "filesize"; + packageName = "filesize"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/filesize/-/filesize-4.2.1.tgz"; + sha512 = "bP82Hi8VRZX/TUBKfE24iiUGsB/sfm2WUrwTQyAzQrhO3V9IhcBBNBXMyzLY5orACxRyYJ3d2HeRVX+eFv4lmA=="; + }; + }; "filesize-6.1.0" = { name = "filesize"; packageName = "filesize"; @@ -25991,13 +26162,13 @@ let sha512 = "mjFIpOHC4jbfcTfoh4rkWpI31mF7viw9ikj/JyLoKzqlwG/YsefKfvYlYhdYdg/9mtK2z1AzgN/0LvVQ3zdlSQ=="; }; }; - "filesize-8.0.0" = { + "filesize-8.0.3" = { name = "filesize"; packageName = "filesize"; - version = "8.0.0"; + version = "8.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-8.0.0.tgz"; - sha512 = "sb690gQx3y/5KZIztgWAKM/r4Hf1V3R8mkAE0OhasMw2FDYduFTYCji8YN9BVpsGoMxrHPFvia1BMxwfLHX+fQ=="; + url = "https://registry.npmjs.org/filesize/-/filesize-8.0.3.tgz"; + sha512 = "UrhwVdUWmP0Jo9uLhVro8U36D4Yp3uT6pfXeNJHVRwyQrZjsqfnypOLthfnuB/bk1glUu7aIY947kyfoOfXuog=="; }; }; "filestream-5.0.0" = { @@ -26072,6 +26243,15 @@ let sha512 = "lO3ttPjHZRfjMcxWKb1j1eDhTFsu4meeR3lnMcnBFhk6RuLhvEiuALu2TlfL310ph4lCYYwgF/ElIjdP739tdg=="; }; }; + "finalhandler-1.1.0" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz"; + sha1 = "ce0b6855b45853e791b2fcc680046d88253dd7f5"; + }; + }; "finalhandler-1.1.1" = { name = "finalhandler"; packageName = "finalhandler"; @@ -26441,13 +26621,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.159.0" = { + "flow-parser-0.160.2" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.159.0"; + version = "0.160.2"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.159.0.tgz"; - sha512 = "/AFSLMSbqictmgPm+vrXBD0rLTsVRrlKfiGRoDjt/WhhUxqy5ZMuLVHbRD/g3C3JRnJgDrKSb3+piQoM1dzVGw=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.160.2.tgz"; + sha512 = "4QGORQvAkuYZH02gY9YRvOoV/BqXUEtMjTem/jxtxfLDp8BNW/LfyJxgksYnQoPIAT01CydkcKG03MTIDbqaFg=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -26612,13 +26792,13 @@ let sha512 = "VjAQdSLsl6AkpZNyrQJfO7BXLo4chnStqb055bumZMbRUPpVuPN3a4ktsnRCmrFZjtMlYLkyXiR5rAs4WOpC4Q=="; }; }; - "follow-redirects-1.14.3" = { + "follow-redirects-1.14.4" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.14.3"; + version = "1.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.3.tgz"; - sha512 = "3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz"; + sha512 = "zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g=="; }; }; "follow-redirects-1.5.10" = { @@ -26873,13 +27053,13 @@ let sha512 = "wJaE62fLaB3jCYvY2ZHjZvmKK2iiLiiehX38rz5QZxtdN8fVPJDeZUiVvJrHStdTc+23LHlyZuSEKgFc0pxi2g=="; }; }; - "fp-ts-2.11.1" = { + "fp-ts-2.11.3" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.11.1"; + version = "2.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.11.1.tgz"; - sha512 = "CJOfs+Heq/erkE5mqH2mhpsxCKABGmcLyeEwPxtbTlkLkItGUs6bmk2WqjB2SgoVwNwzTE5iKjPQJiq06CPs5g=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.11.3.tgz"; + sha512 = "qHI5iaVSFNFmdl6yDensWfFMk32iafAINCnqx8m486DV1+Jht/bTnA9CyahL+Xm7h2y3erinviVBIAWvv5bPYw=="; }; }; "fraction.js-4.1.1" = { @@ -27071,6 +27251,15 @@ let sha512 = "C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ=="; }; }; + "fs-extra-3.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz"; + sha1 = "3794f378c58b342ea7dbbb23095109c4b3b62291"; + }; + }; "fs-extra-4.0.3" = { name = "fs-extra"; packageName = "fs-extra"; @@ -27413,31 +27602,31 @@ let sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9"; }; }; - "gatsby-core-utils-2.13.0" = { + "gatsby-core-utils-2.14.0" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "2.13.0"; + version = "2.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.13.0.tgz"; - sha512 = "fkMAxiWFY8N26Iui/Wq8yfE2FY2b31bGJVtlIlSwLgfsoO7fpta64lxeivRtfpNLbAoywmWY/L8TC74GFlnuWg=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.14.0.tgz"; + sha512 = "HDMb1XMqysup9raLYWB0wIQU568R9qPounF7iAwjf2esFUVV5mdBTvxEpune/7yG0RmwhNPhgrEZo2rBHeJf7A=="; }; }; - "gatsby-recipes-0.24.0" = { + "gatsby-recipes-0.25.0" = { name = "gatsby-recipes"; packageName = "gatsby-recipes"; - version = "0.24.0"; + version = "0.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.24.0.tgz"; - sha512 = "azDY4tnOCy5/CK+Kv53CBIgzmEroAGe/mLaiW2PuizTQIdhoY3lg63ZXK6kPQHAq1F4qAYHGkBM4ECgSfaq5HA=="; + url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.25.0.tgz"; + sha512 = "eEbmmAWY78pL1zLrx0M0CNC4fMbzKza/Ug0vSQ7egfAqNk74Lt0csgODRGdBLVHbmRRKYmJpJIXK7NdE+ZWh4A=="; }; }; - "gatsby-telemetry-2.13.0" = { + "gatsby-telemetry-2.14.0" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "2.13.0"; + version = "2.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.13.0.tgz"; - sha512 = "PN9kKbZd0i2QkoVvHyCa3VjuRVIvBwjXTyZHwL+se5yrbYufZQXoyMiMMXFV48FvxMgE53ON1U2vtzeRvE8U2w=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.14.0.tgz"; + sha512 = "c8/1L1nkK1OcxYV7axyoyM+7nzM1WL7DXvgxJloI7NSwb6M3EgcWvgq9bmqUAfmWM29/whR07mO7nnl1jZntyA=="; }; }; "gauge-1.2.7" = { @@ -27467,13 +27656,13 @@ let sha512 = "6STz6KdQgxO4S/ko+AbjlFGGdGcknluoqU+79GOFCDqqyYj5OanQf9AjxwN0jCidtT+ziPMmPSt9E4hfQ0CwIQ=="; }; }; - "gaxios-4.3.1" = { + "gaxios-4.3.2" = { name = "gaxios"; packageName = "gaxios"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/gaxios/-/gaxios-4.3.1.tgz"; - sha512 = "9qXV7yrMCGzTrphl9/YGMVH41oSg0rhn1j3wJWed4Oqk45/hXDD2wBT5J1NjQcqTCcv4g3nFnyQ7reSRHNgBgw=="; + url = "https://registry.npmjs.org/gaxios/-/gaxios-4.3.2.tgz"; + sha512 = "T+ap6GM6UZ0c4E6yb1y/hy2UB6hTrqhglp3XfmU9qbLCGRYhLVV5aRPpC4EmoG8N8zOnkYCgoBz+ScvGAARY6Q=="; }; }; "gaze-1.1.3" = { @@ -27863,13 +28052,13 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "gh-release-fetch-2.0.2" = { + "gh-release-fetch-2.0.3" = { name = "gh-release-fetch"; packageName = "gh-release-fetch"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/gh-release-fetch/-/gh-release-fetch-2.0.2.tgz"; - sha512 = "VIlw5FzT8b31rwwH3A4zg05wd9R1/7vPYY+Dow14U1mXEkGF348+x8HUk5fY9py6icVVU3z/v4L7m5BV/7xxjA=="; + url = "https://registry.npmjs.org/gh-release-fetch/-/gh-release-fetch-2.0.3.tgz"; + sha512 = "g8q2GMzZASFm1TgU1JnVdbvGAmkrrsBWXDOdCcVuxShhfTPi26jY0tiUbPlEFYGa8dmMCxBOv7iWBX5hciTMkA=="; }; }; "git-apply-delta-0.0.7" = { @@ -28169,6 +28358,15 @@ let sha512 = "OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ=="; }; }; + "glob-7.2.0" = { + name = "glob"; + packageName = "glob"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz"; + sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; + }; + }; "glob-base-0.3.0" = { name = "glob-base"; packageName = "glob-base"; @@ -28584,15 +28782,6 @@ let sha1 = "2edeeb958084d0f8ea7988e5d995b1c7dfc14777"; }; }; - "goldengate-10.3.0" = { - name = "goldengate"; - packageName = "goldengate"; - version = "10.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/goldengate/-/goldengate-10.3.0.tgz"; - sha512 = "TDwMwK7j0vU/aOlQIkL6WqrYoFBOAYnJ9l2ueK3d60IHspycYKPyO9yBaX1bzsaS7nBH5YjuXBYncZK+12TSZQ=="; - }; - }; "goldengate-10.4.0" = { name = "goldengate"; packageName = "goldengate"; @@ -28620,13 +28809,13 @@ let sha512 = "Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ=="; }; }; - "google-auth-library-7.9.1" = { + "google-auth-library-7.9.2" = { name = "google-auth-library"; packageName = "google-auth-library"; - version = "7.9.1"; + version = "7.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.9.1.tgz"; - sha512 = "cWGykH2WBR+UuYPGRnGVZ6Cjq2ftQiEIFjQWNIRIauZH7hUWoYTr/lkKUqLTYt5dex77nlWWVQ8aPV80mhfp5w=="; + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.9.2.tgz"; + sha512 = "HjxbJt660a+YUTYAgYor87JCuBZvjUSNBExk4bXTEaMuCn8IHSDeHmFxKqThuDPrLCiKJp8blk/Ze8f7SI4N6g=="; }; }; "google-closure-compiler-js-20170910.0.1" = { @@ -28638,13 +28827,13 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.25.1" = { + "google-gax-2.25.4" = { name = "google-gax"; packageName = "google-gax"; - version = "2.25.1"; + version = "2.25.4"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.25.1.tgz"; - sha512 = "wvirrn34kKe42NRF9uy68ukM/2CWT2ce3abS2SOJaMe7Ecdya1Zcd54WAX9WAWnD0WoAfieeibD4o1Ijue8iJw=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.25.4.tgz"; + sha512 = "+Jd0FFOWyb8ieX53e6Sl5OYvHXoA1sWKfQ24ykR502NKgBTvPAh/RFcITihGePBJZ1E8pfh4MKWU0Sf+f1CK+A=="; }; }; "google-p12-pem-3.1.2" = { @@ -28845,13 +29034,13 @@ let sha512 = "h5mJWgZXpuZQzBAMWhVIOluGNIYUP043eh7BHcecRWhSkD4eiZAh+uM4XX2rGL1vig9XQ3JVYl9gmK+ajy+JPA=="; }; }; - "graphology-types-0.19.4" = { + "graphology-types-0.19.5" = { name = "graphology-types"; packageName = "graphology-types"; - version = "0.19.4"; + version = "0.19.5"; src = fetchurl { - url = "https://registry.npmjs.org/graphology-types/-/graphology-types-0.19.4.tgz"; - sha512 = "jBRgWBKCVzoSMmQh7I5KsPQcOai4FJLNdhPBtSTRfVcyafGZHxwt80z5EftRB6ZSyTiBqiolzu7n1CZEnRkAHA=="; + url = "https://registry.npmjs.org/graphology-types/-/graphology-types-0.19.5.tgz"; + sha512 = "zXJEDILlJ2JI+oUVjHkXZIRRZfWuwBEhOJagOARnt4eWuErBJZUJmiEOJjLDA0s0DQNFxIHD4+NRwsU4B0VxWw=="; }; }; "graphql-0.11.7" = { @@ -28890,13 +29079,13 @@ let sha512 = "GTCJtzJmkFLWRfFJuoo9RWWa/FfamUHgiFosxi/X1Ani4AVWbeyBenZTNX6dM+7WSbbFfTo/25eh0LLkwHMw2w=="; }; }; - "graphql-15.5.3" = { + "graphql-15.6.0" = { name = "graphql"; packageName = "graphql"; - version = "15.5.3"; + version = "15.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-15.5.3.tgz"; - sha512 = "sM+jXaO5KinTui6lbK/7b7H/Knj9BpjGxZ+Ki35v7YbUJxxdBCUqNM0h3CRVU1ZF9t5lNiBzvBCSYPvIwxPOQA=="; + url = "https://registry.npmjs.org/graphql/-/graphql-15.6.0.tgz"; + sha512 = "WJR872Zlc9hckiEPhXgyUftXH48jp2EjO5tgBBOyNMRJZ9fviL2mJBD6CAysk6N5S0r9BTs09Qk39nnJBkvOXQ=="; }; }; "graphql-compose-7.25.1" = { @@ -30718,13 +30907,13 @@ let sha512 = "boEiPCK848pNGACW1j111tJApu530e/UPpwbHytJZlrVf3YdgUIP1KL3aSi5xJFLUnuO8GLGl4lIsSeH8TaQQA=="; }; }; - "hypercore-9.11.0" = { + "hypercore-9.12.0" = { name = "hypercore"; packageName = "hypercore"; - version = "9.11.0"; + version = "9.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/hypercore/-/hypercore-9.11.0.tgz"; - sha512 = "/HwisY6gwkdMkEtn0vHkxrdJt6C0TK2YrnN59fCjSL3msfGLWOJ4lQxG39n0Ehd1dRdDWCj27MaTMI8krLU/Cw=="; + url = "https://registry.npmjs.org/hypercore/-/hypercore-9.12.0.tgz"; + sha512 = "wIlM4Iwl618NcmsY+1O/X08Cx/bY6ti3LXmQhRnPZFGQPqAeX0x53hASckW082IIAVWzXD3zcmREw5yEINzb4w=="; }; }; "hypercore-byte-stream-1.0.12" = { @@ -30898,22 +31087,22 @@ let sha512 = "bESly7s6X7cLMWCn4dsAVE/ttNbbB13o6jku2B7fV2wIV/g7NVC/yF7S3NiknGlftKn/uLU3fhMmbOfdBvQ5IA=="; }; }; - "hypertrie-5.1.1" = { + "hypertrie-5.1.2" = { name = "hypertrie"; packageName = "hypertrie"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/hypertrie/-/hypertrie-5.1.1.tgz"; - sha512 = "6PjBRPsTH+hqhMpjt1QmxXMFW6XaHNXkjxH1KrL1bp8Fpz7SPOvBNSaQVttvAP6GRzDKkeLraG4q3yJiSL4IhQ=="; + url = "https://registry.npmjs.org/hypertrie/-/hypertrie-5.1.2.tgz"; + sha512 = "kdzigFUWrCX5NTFvi28q5o3P7faP3QliAQpMfKRSrP5jtitqPfhTgXwstcxS+Vj7mP93R+unZlPYiwu6N9whzA=="; }; }; - "i-0.3.6" = { + "i-0.3.7" = { name = "i"; packageName = "i"; - version = "0.3.6"; + version = "0.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/i/-/i-0.3.6.tgz"; - sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d"; + url = "https://registry.npmjs.org/i/-/i-0.3.7.tgz"; + sha512 = "FYz4wlXgkQwIPqhzC5TdNMLSE5+GS1IIDJZY/1ZiEPCT2S3COUVZeT5OW4BmW4r5LHLQuOosSwsvnroG9GR59Q=="; }; }; "i18next-20.3.2" = { @@ -31177,6 +31366,15 @@ let sha512 = "aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA=="; }; }; + "immutable-3.8.2" = { + name = "immutable"; + packageName = "immutable"; + version = "3.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz"; + sha1 = "c2439951455bb39913daf281376f1530e104adf3"; + }; + }; "import-cwd-2.1.0" = { name = "import-cwd"; packageName = "import-cwd"; @@ -31474,13 +31672,13 @@ let sha512 = "zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw=="; }; }; - "init-package-json-2.0.4" = { + "init-package-json-2.0.5" = { name = "init-package-json"; packageName = "init-package-json"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/init-package-json/-/init-package-json-2.0.4.tgz"; - sha512 = "gUACSdZYka+VvnF90TsQorC+1joAVWNI724vBNj3RD0LLMeDss2IuzaeiQs0T4YzKs76BPHtrp/z3sn2p+KDTw=="; + url = "https://registry.npmjs.org/init-package-json/-/init-package-json-2.0.5.tgz"; + sha512 = "u1uGAtEFu3VA6HNl/yUWw57jmKEMx8SKOxHhxjGnOFUiIlFnohKDFg4ZrPpv9wWqk44nDxGJAtqjdQFm+9XXQA=="; }; }; "ink-2.7.1" = { @@ -31672,6 +31870,15 @@ let sha512 = "DHLKJwLPNgkfwNmsuEUKSejJFbkv0FMO9SMiQbjI3n5NQuCrSIBqP66ggqyz2a6t2qEolKrMjhQ3+W/xXgUQ+Q=="; }; }; + "inquirer-8.1.5" = { + name = "inquirer"; + packageName = "inquirer"; + version = "8.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-8.1.5.tgz"; + sha512 = "G6/9xUqmt/r+UvufSyrPpt84NYwhKZ9jLsgMbQzlx804XErNupor8WQdBnBRrXmBfTPpuwf1sV+ss2ovjgdXIg=="; + }; + }; "inquirer-autocomplete-prompt-1.4.0" = { name = "inquirer-autocomplete-prompt"; packageName = "inquirer-autocomplete-prompt"; @@ -31852,13 +32059,13 @@ let sha512 = "lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw=="; }; }; - "internmap-2.0.1" = { + "internmap-2.0.3" = { name = "internmap"; packageName = "internmap"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/internmap/-/internmap-2.0.1.tgz"; - sha512 = "Ujwccrj9FkGqjbY3iVoxD1VV+KdZZeENx0rphrtzmRXbFvkFO88L80BL/zeSIguX/7T+y8k04xqtgWgS5vxwxw=="; + url = "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz"; + sha512 = "5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg=="; }; }; "interpret-1.1.0" = { @@ -32356,6 +32563,15 @@ let sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="; }; }; + "is-builtin-module-3.1.0" = { + name = "is-builtin-module"; + packageName = "is-builtin-module"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.1.0.tgz"; + sha512 = "OV7JjAgOTfAFJmHZLvpSTb4qi0nIILDV1gWPYDnDJUTNFM5aGlRAhk4QcT8i7TuAleeEV5Fdkqn3t4mS+Q11fg=="; + }; + }; "is-callable-1.2.4" = { name = "is-callable"; packageName = "is-callable"; @@ -32950,6 +33166,15 @@ let sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; + "is-number-like-1.0.8" = { + name = "is-number-like"; + packageName = "is-number-like"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number-like/-/is-number-like-1.0.8.tgz"; + sha512 = "6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA=="; + }; + }; "is-number-object-1.0.6" = { name = "is-number-object"; packageName = "is-number-object"; @@ -33004,6 +33229,15 @@ let sha512 = "2Xj8sA0zDrAcaoWfBiNmc6VPWAgKDpim0T3J9Djq7vbm1UjwbUWzeuLu/FwC46g3cBbAn0E5R0xwVtOobM6Xxg=="; }; }; + "is-path-cwd-1.0.0" = { + name = "is-path-cwd"; + packageName = "is-path-cwd"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz"; + sha1 = "d225ec23132e89edd38fda767472e62e65f1106d"; + }; + }; "is-path-cwd-2.2.0" = { name = "is-path-cwd"; packageName = "is-path-cwd"; @@ -33013,6 +33247,15 @@ let sha512 = "w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ=="; }; }; + "is-path-in-cwd-1.0.1" = { + name = "is-path-in-cwd"; + packageName = "is-path-in-cwd"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz"; + sha512 = "FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ=="; + }; + }; "is-path-in-cwd-2.1.0" = { name = "is-path-in-cwd"; packageName = "is-path-in-cwd"; @@ -33769,13 +34012,13 @@ let sha512 = "0RHjbtw9QXeSYnIEY5Yrp2QZrdtz21xBDV9C/GIlY2POmgoS6a7qjkYS5siRKXScnuAj5/SPv1C3YForNCHTJA=="; }; }; - "istanbul-lib-coverage-3.0.0" = { + "istanbul-lib-coverage-3.0.1" = { name = "istanbul-lib-coverage"; packageName = "istanbul-lib-coverage"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz"; - sha512 = "UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg=="; + url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.1.tgz"; + sha512 = "GvCYYTxaCPqwMjobtVcVKvSHtAGe48MNhGjpK8LtVF8K0ISX7hCKl85LgtuaSneWVyQmaGcW3iXVV3GaZSLpmQ=="; }; }; "istanbul-lib-instrument-4.0.3" = { @@ -33850,6 +34093,15 @@ let sha1 = "d03f666ca4e6130138565997cacea54164203156"; }; }; + "iterm2-version-3.0.0" = { + name = "iterm2-version"; + packageName = "iterm2-version"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/iterm2-version/-/iterm2-version-3.0.0.tgz"; + sha512 = "R2SE/AQrE4IhlyRbBp7ASIjFO+Wlpfra2Q7GMZkOjQb890MLtKyINPawJ7fr+Z7CPgHoXj2J3BNyebBIbVn8PQ=="; + }; + }; "jade-0.26.3" = { name = "jade"; packageName = "jade"; @@ -34003,13 +34255,13 @@ let sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; }; }; - "jest-worker-27.1.1" = { + "jest-worker-27.2.0" = { name = "jest-worker"; packageName = "jest-worker"; - version = "27.1.1"; + version = "27.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.1.1.tgz"; - sha512 = "XJKCL7tu+362IUYTWvw8+3S75U7qMiYiRU6u5yqscB48bTvzwN6i8L/7wVTXiFLwkRsxARNM7TISnTvcgv9hxA=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.2.0.tgz"; + sha512 = "laB0ZVIBz+voh/QQy9dmUuuDsadixeerrKqyVpgPz+CCWiOYjOBabUXHIXZhsdvkWbLqSHbgkAHWl5cg24Q6RA=="; }; }; "jimp-compact-0.16.1" = { @@ -34021,13 +34273,13 @@ let sha512 = "dZ6Ra7u1G8c4Letq/B5EzAxj4tLFHL+cGtdpR+PVm4yzPDj+lCk+AbivWt1eOM+ikzkowtyV7qSqX6qr3t71Ww=="; }; }; - "jitdb-3.3.0" = { + "jitdb-3.4.0" = { name = "jitdb"; packageName = "jitdb"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jitdb/-/jitdb-3.3.0.tgz"; - sha512 = "lZvQN7Cv/nQ8eueyyT/U2RuDi5wKOTL1PP3TrTRuXXv7ENYBohvJfbUX/Rv6+JL84+aN82qjZeFb4UsllHWJ4w=="; + url = "https://registry.npmjs.org/jitdb/-/jitdb-3.4.0.tgz"; + sha512 = "TQUrWpifF3trL4Xk2e1DJn/Wk/FYPZE9QP+0yNzvo3KNDHlBtOYdufnH+otZh13kn1Nh0nt+ZWK8ENB2F34q8Q=="; }; }; "jju-1.4.0" = { @@ -34102,6 +34354,15 @@ let sha512 = "Apz3AqpJhToFlo70mwnlbVyqhJRagzhNKKp84ZMeTqe/Ay9oIno8unm7eFepdlR8m8wz/9JXJQxUjK/3Ku/cpg=="; }; }; + "jpeg-js-0.2.0" = { + name = "jpeg-js"; + packageName = "jpeg-js"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.2.0.tgz"; + sha1 = "53e448ec9d263e683266467e9442d2c5a2ef5482"; + }; + }; "jpeg-js-0.4.3" = { name = "jpeg-js"; packageName = "jpeg-js"; @@ -34120,6 +34381,16 @@ let sha1 = "f6f9f099f9882bad84585c6b1004344d6fadb33c"; }; }; + "jpgjs-git://github.com/notmasteryet/jpgjs" = { + name = "jpgjs"; + packageName = "jpgjs"; + version = "1.0.0"; + src = fetchgit { + url = "git://github.com/notmasteryet/jpgjs"; + rev = "f1d30922fda93417669246f5a25cf2393dd9c108"; + sha256 = "c1b7d85fad2ff0b6a2d1ed1140142c0450e3240a371703ad66d60cb3b5f612b6"; + }; + }; "jquery-3.6.0" = { name = "jquery"; packageName = "jquery"; @@ -34138,13 +34409,13 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "jquery.terminal-2.29.1" = { + "jquery.terminal-2.29.2" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.29.1"; + version = "2.29.2"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.29.1.tgz"; - sha512 = "YfZuBY2B/wpmqNXtaIJuDStomw/dWLxAqgMzdt2Kipq3+annRaSzF1l8Al/d8PCo4W6vg2DiKj5nvQf03k0UGA=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.29.2.tgz"; + sha512 = "pRJHCT9v29VYkZNWNLxaW1+ABgzgCsRB4uVjMkTjGsUqPfXiQAGWPszca0qbcsKnF/64vEuQ5BNOVpyoYPCaTw=="; }; }; "js-base64-2.6.4" = { @@ -34156,13 +34427,13 @@ let sha512 = "pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="; }; }; - "js-base64-3.7.0" = { + "js-base64-3.7.2" = { name = "js-base64"; packageName = "js-base64"; - version = "3.7.0"; + version = "3.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.0.tgz"; - sha512 = "hJiXqoqZKdNx7PNuqHx3ZOgwcvgCprV0cs9ZMeqERshhVZ3cmXc3HGR60mKsHHqVK18PCwGXnmPiPDbao7SOMQ=="; + url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.2.tgz"; + sha512 = "NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ=="; }; }; "js-beautify-1.14.0" = { @@ -34471,13 +34742,13 @@ let sha512 = "GOGAy5b+zCGeyYziBoNVXgamL2CEZKMj5moeemkyN4AUHUqugNk3fSul2Zdbxs2S13Suk0D9iYAgChDxew0bOw=="; }; }; - "jsii-srcmak-0.1.341" = { + "jsii-srcmak-0.1.353" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.341"; + version = "0.1.353"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.341.tgz"; - sha512 = "G8BUBXJDTXYsqpv5CWMSwYuGz21WdY1TRJZZVp+CIPTEbxCBc2nEJ41Ihsa1u8MCs9D1ddWGrX3JmZwqvMqUxw=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.353.tgz"; + sha512 = "XA4N72CqPEvdjD3SCRsCWhJIFZt+/8ekhDq8a/7k5t/9vGzdU1a79AvekqaP3tv4V1CGZqDgdyFeKvwcqEr6cw=="; }; }; "json-bigint-1.0.0" = { @@ -34768,13 +35039,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.2.17" = { + "json2jsii-0.2.29" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.2.17"; + version = "0.2.29"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.17.tgz"; - sha512 = "dU28KQ5UBvyGcc4QaQey98a2uTwwsnh+bP4EI6wnJjsCKjMKxSLFot1jwSCA/olaWIpJFGCIYif2IJ/0Dy5a8w=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.2.29.tgz"; + sha512 = "m+vJPKYurkWIMyVw0k+Qvogu/gVFdAEOA5Ff7p0h6ENLamc3o9bMrgB/5oMyZxsfN/2jaf+pUAEM8KAFUSO+MQ=="; }; }; "json3-3.2.6" = { @@ -34894,6 +35165,15 @@ let sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; }; }; + "jsonfile-3.0.1" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz"; + sha1 = "a5ecc6f65f53f662c4415c7675a0331d0992ec66"; + }; + }; "jsonfile-4.0.0" = { name = "jsonfile"; packageName = "jsonfile"; @@ -34903,6 +35183,15 @@ let sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; }; }; + "jsonfile-5.0.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-5.0.0.tgz"; + sha512 = "NQRZ5CRo74MhMMC3/3r5g2k4fjodJ/wh8MxjFbCViWKFjxrnudWSY5vomh+23ZaXzAS7J3fBZIR2dV6WbmfM0w=="; + }; + }; "jsonfile-6.1.0" = { name = "jsonfile"; packageName = "jsonfile"; @@ -34957,6 +35246,15 @@ let sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; }; }; + "jsonpath-1.1.1" = { + name = "jsonpath"; + packageName = "jsonpath"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonpath/-/jsonpath-1.1.1.tgz"; + sha512 = "l6Cg7jRpixfbgoWgkrl77dgEj8RPvND0wMH6TwQmi9Qs4TFfS9u5cUFnbeKTwj5ga5Y3BTGGNI28k117LJ009w=="; + }; + }; "jsonpath-plus-4.0.0" = { name = "jsonpath-plus"; packageName = "jsonpath-plus"; @@ -35281,16 +35579,6 @@ let sha1 = "02ea5aa5cf22225725579627ccfd6d266372289a"; }; }; - "kad-git://github.com/wikimedia/kad#master" = { - name = "kad"; - packageName = "kad"; - version = "1.3.6"; - src = fetchgit { - url = "git://github.com/wikimedia/kad"; - rev = "634a3fc7f60898ec541406d60ccf0d48556070e2"; - sha256 = "285413585c8cc029d7204b5babc30cde39715fea8c8a875b8ae3c0dff2643d68"; - }; - }; "kad-localstorage-0.0.7" = { name = "kad-localstorage"; packageName = "kad-localstorage"; @@ -36155,15 +36443,6 @@ let sha512 = "BbqAKApLb9ywUli+0a+PcV04SyJ/N1q/8qgCNe6U97KbPCS1BTksEuHFLYdvc8DltuhfxIUBqDZsC0bBGtl3lA=="; }; }; - "lightning-3.3.12" = { - name = "lightning"; - packageName = "lightning"; - version = "3.3.12"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-3.3.12.tgz"; - sha512 = "tq7AAMpjQ9sl58pW/qis/vOBzN7MCQ4F4n+ox4VQhyv1qVA+P2LgJq36I1Y6b4RX68+hK48u1eHDzSt527fEXA=="; - }; - }; "lightning-3.3.9" = { name = "lightning"; packageName = "lightning"; @@ -36173,15 +36452,6 @@ let sha512 = "z/bfkDEAKyN0HtN7rkiyVlDA3J5L/jxXsE4YuGfQPa8TyPWovyLdo6/aHP0mMy8n+G4tq0g2oKZ/1Z5ONJAVqA=="; }; }; - "lightning-3.4.0" = { - name = "lightning"; - packageName = "lightning"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-3.4.0.tgz"; - sha512 = "lD6PgHipqedfFcTEf/9mDF3s4KGO/lecr02W6zHBJHohNphuBUZS1z68kKRJAl3N4iHmDEfLxt+G86PBP0jhHw=="; - }; - }; "lightning-4.1.0" = { name = "lightning"; packageName = "lightning"; @@ -36200,13 +36470,31 @@ let sha512 = "DI21mqAdwBM/Os3pcAnBrpUCoaKQzJFTEv2c+DEJUzPBnpxRGGKGurlT5FDz9QZSTag7YgBb5ghsqtjQ2MlFWg=="; }; }; - "lightning-4.2.1" = { + "lightning-4.5.0" = { name = "lightning"; packageName = "lightning"; - version = "4.2.1"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-4.5.0.tgz"; + sha512 = "oKH9EVKxgPIWm2f3/7vLImQAZQVP2souwAMMg5njGdCPAlekA8KH+/r+Ltuv5jd1vQigwmQMkfmdZzd4qmOI8Q=="; + }; + }; + "lightning-4.6.0" = { + name = "lightning"; + packageName = "lightning"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-4.6.0.tgz"; + sha512 = "ZCDSFomdsUvDDaINbABPdglLEJfg+9iMs4BHa8Or+fW5FYwM0HA8l2D/yMxfCMx2DFZg7uuiZVpM8x/7/AbS0Q=="; + }; + }; + "lightning-4.7.0" = { + name = "lightning"; + packageName = "lightning"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-4.2.1.tgz"; - sha512 = "ltYLcoJcGjL9yuBpoZfi8tLZ+SwInX3l/BrZIK1d14Wlk0dAu8jhLPClPDm0kt91HULpnynl/xxeOPVdQqdsHA=="; + url = "https://registry.npmjs.org/lightning/-/lightning-4.7.0.tgz"; + sha512 = "HtoVfuc9p8fcAOTXOBgIfH04S91A/1xlUZTRnYAdZx0h2zMjQaZ5/mpbDQjQkBn4Swf0EOHkcSI82scKm37JQg=="; }; }; "lilconfig-2.0.3" = { @@ -36227,13 +36515,13 @@ let sha1 = "cc09c24467a0f0a1ed10a5196dba597cad3f65dc"; }; }; - "limitation-0.2.2" = { + "limitation-0.2.3" = { name = "limitation"; packageName = "limitation"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/limitation/-/limitation-0.2.2.tgz"; - sha512 = "kUfYO29baIJzY3S4/j7qaWl0GdjxT88SEaIcUN98YGdhYh+m7Zkt1N4jGubVF05A7dzjfjgtQD/NI5APKl38RQ=="; + url = "https://registry.npmjs.org/limitation/-/limitation-0.2.3.tgz"; + sha512 = "IpIBG7WniPI1Og0HYxlo8JRD2E2pExwuol7hjobcNZSYBBxAamPJdV91Q47uw5/KiUKA+We8a33sh6vD1PQ+Yw=="; }; }; "limiter-1.1.5" = { @@ -36353,13 +36641,13 @@ let sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; }; }; - "ln-accounting-5.0.1" = { + "ln-accounting-5.0.3" = { name = "ln-accounting"; packageName = "ln-accounting"; - version = "5.0.1"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-5.0.1.tgz"; - sha512 = "5hHO3/ZdKwVicDpgU0ElDnSqKSrqx9Cz7eD6r/3STjqLnLuOjj9/ILzPOgY3lPyD7j3gHifzuJg5dUx2Bxh0sg=="; + url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-5.0.3.tgz"; + sha512 = "C6aYABDRKoNLIooap5FZxvPFVcQjLYuHkbg5vTQHhydBMje8M/e8ZtHXWQNC3cC42W6dE7Nrdh1cCg1cYhNp6g=="; }; }; "ln-service-51.8.2" = { @@ -36371,15 +36659,6 @@ let sha512 = "X+AFuuw54NEr8UqbkJlEtqkmlpIpmji7BX+bYmYrEOZOtJca7PbaqspVWq+YB9qWw/OiuI76ly67KGTYM0QbCw=="; }; }; - "ln-service-51.8.5" = { - name = "ln-service"; - packageName = "ln-service"; - version = "51.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-51.8.5.tgz"; - sha512 = "1SU0eG9/LDy6k3UGXaahmoe1wOahAJkaidWpLX5Nmlfq72I0arad420smma5ZGXAW4wNlGR/gx68KZzzYI5D4A=="; - }; - }; "ln-service-52.0.1" = { name = "ln-service"; packageName = "ln-service"; @@ -36398,31 +36677,58 @@ let sha512 = "upswAJU9Mrfh3l+q46rvmRu8Pf7iYR2vkKyq16dgiBgxKw7fzvI8aL2Xi0xrtyoRUOUODOyEzO7/MRRhNKcvMA=="; }; }; - "ln-service-52.1.0" = { + "ln-service-52.4.0" = { name = "ln-service"; packageName = "ln-service"; - version = "52.1.0"; + version = "52.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-52.1.0.tgz"; - sha512 = "xB+Si8fQoHpmJWQDA3JFVxs/xV/c26OU2NsnkIRcbNQagwQtSKV08fcwbfKs3tpZLHQiyzmKos4XF82TfYtzeA=="; + url = "https://registry.npmjs.org/ln-service/-/ln-service-52.4.0.tgz"; + sha512 = "8fKd/Px3c57CyjmL5CRY88MmVQ2cBkz2kB/VB5SEThzqQJbwDz0nVCOE9T5+ZV7t3TSAuonPwuJJxaoCJCrRHA=="; }; }; - "ln-sync-0.4.7" = { + "ln-service-52.6.0" = { + name = "ln-service"; + packageName = "ln-service"; + version = "52.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-service/-/ln-service-52.6.0.tgz"; + sha512 = "tLJMrknIzK6MMIx/N1r8iRjVWBPFmt0S1hI2l+DNL6+ln930nSUN+/aW3SUZho48ACLPBJDSgXwAU50ExrC+rQ=="; + }; + }; + "ln-sync-2.0.0" = { name = "ln-sync"; packageName = "ln-sync"; - version = "0.4.7"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ln-sync/-/ln-sync-0.4.7.tgz"; - sha512 = "2yqc59OhK0affnkwhgw7iY4x2tKZTb8y8KSWxRHn6cSXL3clUJgXdTNOGr4Jp8j1TkTl0iRVnLSNZlRbtU4vVA=="; + url = "https://registry.npmjs.org/ln-sync/-/ln-sync-2.0.0.tgz"; + sha512 = "BrqRO1pxeRhaCTw8GdnLGwCsFQSnrJohXkVxuDQCQ4OCgLFKFS7TpFKS7INoJrLE1XpcGS8NtLLXjsA0Akcd3A=="; }; }; - "ln-telegram-3.2.11" = { + "ln-sync-2.0.1" = { + name = "ln-sync"; + packageName = "ln-sync"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-sync/-/ln-sync-2.0.1.tgz"; + sha512 = "+WJ/qQrDJu3sY48IXQf3r1jDe4AFyLRA0HV4Nm78zL2S6iZ+axXD/+4qVE9IN7OlMOfpkmAAunSu6tIlIltuLA=="; + }; + }; + "ln-telegram-3.3.0" = { name = "ln-telegram"; packageName = "ln-telegram"; - version = "3.2.11"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.3.0.tgz"; + sha512 = "rWrS5lO2oZhLbts7R58QDh1Hf/A/QIGA8Jew0iZrIFix9afiz3+xwJi5LFkB0nIaFnWvpOeFP4deDq3ADcF3Hw=="; + }; + }; + "load-bmfont-1.4.1" = { + name = "load-bmfont"; + packageName = "load-bmfont"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.2.11.tgz"; - sha512 = "JzgJQGGLuKM/v7Olk707AeIiB5imQacM5AOGEefI98pTMjrMJ9SRgMg7M39+AOLOT2R7MHXHDBk+41UGtbQZGQ=="; + url = "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.4.1.tgz"; + sha512 = "8UyQoYmdRDy81Brz6aLAUhfZLwr5zV0L3taTQ4hju7m6biuwiWiJXjPhBJxbUQJA8PrkvJ/7Enqmwk2sM14soA=="; }; }; "load-ip-set-2.2.1" = { @@ -36569,6 +36875,15 @@ let sha512 = "14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg=="; }; }; + "localtunnel-2.0.2" = { + name = "localtunnel"; + packageName = "localtunnel"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.2.tgz"; + sha512 = "n418Cn5ynvJd7m/N1d9WVJISLJF/ellZnfsLnx8WBWGzxv/ntNcFkJ1o6se5quUhCplfLGBNL5tYHiq5WF3Nug=="; + }; + }; "locate-java-home-1.1.2" = { name = "locate-java-home"; packageName = "locate-java-home"; @@ -37073,6 +37388,15 @@ let sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; }; }; + "lodash.assignin-4.2.0" = { + name = "lodash.assignin"; + packageName = "lodash.assignin"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz"; + sha1 = "ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"; + }; + }; "lodash.bind-2.4.1" = { name = "lodash.bind"; packageName = "lodash.bind"; @@ -37082,6 +37406,15 @@ let sha1 = "5d19fa005c8c4d236faf4742c7b7a1fcabe29267"; }; }; + "lodash.bind-4.2.1" = { + name = "lodash.bind"; + packageName = "lodash.bind"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz"; + sha1 = "7ae3017e939622ac31b7d7d7dcb1b34db1690d35"; + }; + }; "lodash.camelcase-4.3.0" = { name = "lodash.camelcase"; packageName = "lodash.camelcase"; @@ -37190,6 +37523,15 @@ let sha1 = "64762c48618082518ac3df4ccf5d5886dae20347"; }; }; + "lodash.filter-4.6.0" = { + name = "lodash.filter"; + packageName = "lodash.filter"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz"; + sha1 = "668b1d4981603ae1cc5a6fa760143e480b4c4ace"; + }; + }; "lodash.flatmap-4.5.0" = { name = "lodash.flatmap"; packageName = "lodash.flatmap"; @@ -37226,6 +37568,15 @@ let sha1 = "6fd7efb79691aecd67fdeac2761c98e701d6c39a"; }; }; + "lodash.foreach-4.5.0" = { + name = "lodash.foreach"; + packageName = "lodash.foreach"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz"; + sha1 = "1a6a35eace401280c7f06dddec35165ab27e3e53"; + }; + }; "lodash.forown-2.4.1" = { name = "lodash.forown"; packageName = "lodash.forown"; @@ -37352,6 +37703,15 @@ let sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; }; }; + "lodash.isfinite-3.3.2" = { + name = "lodash.isfinite"; + packageName = "lodash.isfinite"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz"; + sha1 = "fb89b65a9a80281833f0b7478b3a5104f898ebb3"; + }; + }; "lodash.isfunction-2.4.1" = { name = "lodash.isfunction"; packageName = "lodash.isfunction"; @@ -37478,6 +37838,15 @@ let sha1 = "4dbc0472b156be50a0b286855d1bd0b0c656098a"; }; }; + "lodash.map-4.6.0" = { + name = "lodash.map"; + packageName = "lodash.map"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz"; + sha1 = "771ec7839e3473d9c4cde28b19394c3562f4f6d3"; + }; + }; "lodash.memoize-3.0.4" = { name = "lodash.memoize"; packageName = "lodash.memoize"; @@ -37568,6 +37937,24 @@ let sha1 = "52f05610fff9ded422611441ed1fc123a03001b3"; }; }; + "lodash.reduce-4.6.0" = { + name = "lodash.reduce"; + packageName = "lodash.reduce"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz"; + sha1 = "f1ab6b839299ad48f784abbf476596f03b914d3b"; + }; + }; + "lodash.reject-4.6.0" = { + name = "lodash.reject"; + packageName = "lodash.reject"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz"; + sha1 = "80d6492dc1470864bbf583533b651f42a9f52415"; + }; + }; "lodash.repeat-4.1.0" = { name = "lodash.repeat"; packageName = "lodash.repeat"; @@ -37757,13 +38144,13 @@ let sha1 = "ec6662e4896408ed4ab6c542a3990b72cc080020"; }; }; - "log-6.1.0" = { + "log-6.2.0" = { name = "log"; packageName = "log"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/log/-/log-6.1.0.tgz"; - sha512 = "ZulFTrSNfKd8AlMNhl2sQ/jphhTReGeYYsB/ABV1u3jADp2wedQ7+uhSaXlBdu3VMM5PS0ribMFb0UJMesaGng=="; + url = "https://registry.npmjs.org/log/-/log-6.2.0.tgz"; + sha512 = "W1sDY5FqR6wlpygW8ZFSxCfBhKx/RzCHK5S+Br8zA14bAnwSgCm5hToIWzi0Yhy6x9Ppw7pyIV06r8F5cSRHUw=="; }; }; "log-driver-1.2.7" = { @@ -37775,13 +38162,13 @@ let sha512 = "U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg=="; }; }; - "log-node-8.0.0" = { + "log-node-8.0.1" = { name = "log-node"; packageName = "log-node"; - version = "8.0.0"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/log-node/-/log-node-8.0.0.tgz"; - sha512 = "ogrmq+slTOCXG6TMgXxZ2lkfm00CrnO8LLgvqpvEzDhzJ/DmOCGj2AlSjEClk36k7S4k1HNw3WLwF2nqx15SKQ=="; + url = "https://registry.npmjs.org/log-node/-/log-node-8.0.1.tgz"; + sha512 = "w6ii8zZo+O4Os9EBB0+ruaeVU6CysNgYj/cUDOtobBxnNPRHynjMjzyqjEuNKGT/AD89sZzGh0pS3/0ZPRR1iQ=="; }; }; "log-process-errors-6.3.0" = { @@ -37883,13 +38270,13 @@ let sha512 = "em5ojIhU18fIMOw/333mD+ZLE2fis0EzXl1ZwHx4iQzmpQi6odNiY/t+ITNr33JZhT9/KEaH+UPIipr6a9EjWg=="; }; }; - "logform-2.2.0" = { + "logform-2.3.0" = { name = "logform"; packageName = "logform"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.2.0.tgz"; - sha512 = "N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg=="; + url = "https://registry.npmjs.org/logform/-/logform-2.3.0.tgz"; + sha512 = "graeoWUH2knKbGthMtuG1EfaSPMZFZBIrhuJHhkS5ZseFBrc7DupCzihOQAzsK/qIKPQaPJ/lFQFctILUY5ARQ=="; }; }; "logidrom-0.3.1" = { @@ -38558,13 +38945,13 @@ let sha1 = "a65cd29087a92598b8791257a523e021222ac1f9"; }; }; - "map-obj-4.2.1" = { + "map-obj-4.3.0" = { name = "map-obj"; packageName = "map-obj"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz"; - sha512 = "+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ=="; + url = "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz"; + sha512 = "hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ=="; }; }; "map-stream-0.0.7" = { @@ -38747,13 +39134,13 @@ let sha512 = "HyxjAu6BRsdt6Xcv6TKVQnkz/E70TdGXEFHRYBGLncRE9lBFwDNLVtFojKxjJWgJ+5XxUwLaHXy+2sGBbDn+4A=="; }; }; - "markdown-it-multimd-table-4.1.0" = { + "markdown-it-multimd-table-4.1.1" = { name = "markdown-it-multimd-table"; packageName = "markdown-it-multimd-table"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-multimd-table/-/markdown-it-multimd-table-4.1.0.tgz"; - sha512 = "YNR7Td1gK3O+jLezL6Zfl80WNRn9iLAyXmCVAUSsTJ61drmJdHr7cWqr2CuWaSffBtnM0Zh0QBRUdmICoy+CDg=="; + url = "https://registry.npmjs.org/markdown-it-multimd-table/-/markdown-it-multimd-table-4.1.1.tgz"; + sha512 = "FIgU3m6sw60XTouDdBd4ASZAc7Ba5ER5YkZOfGw+7PS/VsSzFFLYKCrGIwxTt6LscoXK6/TbMIu/4kJfykbgBg=="; }; }; "markdown-it-sub-1.0.0" = { @@ -38891,13 +39278,13 @@ let sha512 = "+IUQJ5VlZoAFsM5MHNT7g3RHSkA3eETqhRCdXv4niUMAKHQ7lb1yvAcuGPmm4soxhmtX13u4Li6ZToXtvSEH+A=="; }; }; - "marked-terminal-4.1.1" = { + "marked-terminal-4.2.0" = { name = "marked-terminal"; packageName = "marked-terminal"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/marked-terminal/-/marked-terminal-4.1.1.tgz"; - sha512 = "t7Mdf6T3PvOEyN01c3tYxDzhyKZ8xnkp8Rs6Fohno63L/0pFTJ5Qtwto2AQVuDtbQiWzD+4E5AAu1Z2iLc8miQ=="; + url = "https://registry.npmjs.org/marked-terminal/-/marked-terminal-4.2.0.tgz"; + sha512 = "DQfNRV9svZf0Dm9Cf5x5xaVJ1+XjxQW6XjFJ5HFkVyK52SDpj5PCBzS5X5r2w9nHr3mlB0T5201UMLue9fmhUw=="; }; }; "marky-1.2.2" = { @@ -39458,13 +39845,13 @@ let sha512 = "QKFbPwGCh1ypmc2H8BUYpbapwT/x2AOCYZQogzSui4rUNes7WVMagQXsirPIfp18EarX0SSY9Fpg426nSjew4Q=="; }; }; - "memfs-3.2.4" = { + "memfs-3.3.0" = { name = "memfs"; packageName = "memfs"; - version = "3.2.4"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/memfs/-/memfs-3.2.4.tgz"; - sha512 = "2mDCPhuduRPOxlfgsXF9V+uqC6Jgz8zt/bNe4d4W7d5f6pCzHrWkxLNr17jKGXd4+j2kQNsAG2HARPnt74sqVQ=="; + url = "https://registry.npmjs.org/memfs/-/memfs-3.3.0.tgz"; + sha512 = "BEE62uMfKOavX3iG7GYX43QJ+hAeeWnwIAuJ/R6q96jaMtiLzhsxHJC8B1L7fK7Pt/vXDRwb3SG/yBpNGDPqzg=="; }; }; "memoize-one-5.2.1" = { @@ -39728,13 +40115,13 @@ let sha512 = "TIurLf/ustQNMXi5foClGTcEsRvH6DCvxeAKu68OrwHMOSM/M1pgPXb7qe52Svk1ClvmZuAVpLtP5FWKzPr/sw=="; }; }; - "mermaid-8.12.1" = { + "mermaid-8.13.0" = { name = "mermaid"; packageName = "mermaid"; - version = "8.12.1"; + version = "8.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/mermaid/-/mermaid-8.12.1.tgz"; - sha512 = "0UCcSF0FLoNcPBsRF4f9OIV32t41fV18//z8o3S+FDz2PbDA1CRGKdQF9IX84VP4Tv9kcgJI/oqJdcBEtB/GPA=="; + url = "https://registry.npmjs.org/mermaid/-/mermaid-8.13.0.tgz"; + sha512 = "/b8tCqyGhb+yiCQQ5cwpGcaesAfZV057kRBaUx+g6LHctebWaMvo5WmIPN+/jMHfLtAgCJIaQDZ1EsECz7FJIQ=="; }; }; "meros-1.1.4" = { @@ -40178,6 +40565,15 @@ let sha512 = "CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA=="; }; }; + "mime-db-1.50.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.50.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz"; + sha512 = "9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A=="; + }; + }; "mime-types-2.1.18" = { name = "mime-types"; packageName = "mime-types"; @@ -40430,13 +40826,13 @@ let sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg=="; }; }; - "minipass-3.1.3" = { + "minipass-3.1.5" = { name = "minipass"; packageName = "minipass"; - version = "3.1.3"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz"; - sha512 = "Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg=="; + url = "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz"; + sha512 = "+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw=="; }; }; "minipass-collect-1.0.2" = { @@ -40961,13 +41357,13 @@ let sha512 = "ja8+mFKIHdB1Tpl6vac+sktqy3gA8t9Mduom1BA75cI+R9AHnZOiaBQwpGiWnaVJLDGRdNhQmFaAqd7tkKSMGA=="; }; }; - "mri-1.1.6" = { + "mri-1.2.0" = { name = "mri"; packageName = "mri"; - version = "1.1.6"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/mri/-/mri-1.1.6.tgz"; - sha512 = "oi1b3MfbyGa7FJMP9GmLTttni5JoICpYBRlq+x5V16fZbLsnL9N3wFqqIm/nIG43FjUFkFh9Epzp/kzUGUnJxQ=="; + url = "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz"; + sha512 = "tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA=="; }; }; "mrmr-0.1.10" = { @@ -41132,6 +41528,16 @@ let sha512 = "TzxgGSLRLB7tqAlzjgd2x2ZE0cDsGFq4rs9W4yE5xp+7hlRXeUQGtXZsTGfGw2FwWB45rfe8DtXMYBpZGMLUng=="; }; }; + "multicast-dns-git://github.com/webtorrent/multicast-dns.git#fix-setMulticastInterface" = { + name = "multicast-dns"; + packageName = "multicast-dns"; + version = "7.2.3"; + src = fetchgit { + url = "git://github.com/webtorrent/multicast-dns.git"; + rev = "9cd95b2b8ac5843bf1da8bdb7f4092f1d7d6f17b"; + sha256 = "94ac6a61617c2ee660616d2323e3cbff2eeed5694e0c589714a22471122a7c1b"; + }; + }; "multicast-dns-service-types-1.1.0" = { name = "multicast-dns-service-types"; packageName = "multicast-dns-service-types"; @@ -41438,6 +41844,15 @@ let sha512 = "uH9geV4+roR1tohsrrqSOLCJ9Mh1iFcDI+9vUuydDlDxUS1UCAWUfuGb06p3dj3flzywquJNrGsQ7lHP8+4RVQ=="; }; }; + "named-regexp-0.1.1" = { + name = "named-regexp"; + packageName = "named-regexp"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/named-regexp/-/named-regexp-0.1.1.tgz"; + sha1 = "cd9c5383245fa5cbc712a73d669b1e4e2aef590d"; + }; + }; "nan-0.3.2" = { name = "nan"; packageName = "nan"; @@ -41510,6 +41925,15 @@ let sha512 = "7sBZo9wthqNJ7QXnfVXZL7fkKJLN55GLOdX+RyZT34UOvxxnFtJe/c7K0ZRLAKOvaY1xJThFFn0Usw2H9R6Frg=="; }; }; + "nanocolors-0.1.12" = { + name = "nanocolors"; + packageName = "nanocolors"; + version = "0.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/nanocolors/-/nanocolors-0.1.12.tgz"; + sha512 = "2nMHqg1x5PU+unxX7PGY7AuYxl2qDx7PSrTRjizr8sxdd3l/3hBuWWaki62qmtYm2U5i4Z5E7GbjlyDFhs9/EQ=="; + }; + }; "nanoguard-1.3.0" = { name = "nanoguard"; packageName = "nanoguard"; @@ -41961,13 +42385,13 @@ let sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; }; }; - "netlify-8.0.0" = { + "netlify-8.0.1" = { name = "netlify"; packageName = "netlify"; - version = "8.0.0"; + version = "8.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/netlify/-/netlify-8.0.0.tgz"; - sha512 = "BiQblBf85/GmerTZYxVH/1A4/O8qBvg0Qr8QX0MvxjAvO3j+jDUk1PSudMxNgJjU1zFw5pKM2/DBk70hP5gt+Q=="; + url = "https://registry.npmjs.org/netlify/-/netlify-8.0.1.tgz"; + sha512 = "bAUay/JDmUdmFSfW6BQuUGHuj498ALr/aS4Se3Juhgv1N0q1Whrp1uwGlkIgatrlP0lLL/zkTWc6hxmG1TqQcQ=="; }; }; "netlify-headers-parser-4.0.1" = { @@ -42403,13 +42827,13 @@ let sha512 = "V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="; }; }; - "node-fetch-2.6.2" = { + "node-fetch-2.6.5" = { name = "node-fetch"; packageName = "node-fetch"; - version = "2.6.2"; + version = "2.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz"; - sha512 = "aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA=="; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.5.tgz"; + sha512 = "mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ=="; }; }; "node-fetch-h2-2.3.0" = { @@ -42511,13 +42935,13 @@ let sha512 = "dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ=="; }; }; - "node-gyp-build-4.2.3" = { + "node-gyp-build-4.3.0" = { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.2.3"; + version = "4.3.0"; 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=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.3.0.tgz"; + sha512 = "iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q=="; }; }; "node-html-parser-1.4.9" = { @@ -42601,13 +43025,13 @@ let sha512 = "fPNFIp2hF/Dq7qLDzSg4vZ0J4e9v60gJR+Qx7RbjbWqzPDdEqeVpEx5CFeDAELIl+A/woaaNn1fQ5nEVerMxJg=="; }; }; - "node-object-hash-2.3.9" = { + "node-object-hash-2.3.10" = { name = "node-object-hash"; packageName = "node-object-hash"; - version = "2.3.9"; + version = "2.3.10"; src = fetchurl { - url = "https://registry.npmjs.org/node-object-hash/-/node-object-hash-2.3.9.tgz"; - sha512 = "NQt1YURrMPeQGZzW4lRbshUEF2PqxJEZYY4XJ/L+q33dI8yPYvnb7QXmwUcl1EuXluzeY4TEV+H6H0EmtI6f5g=="; + url = "https://registry.npmjs.org/node-object-hash/-/node-object-hash-2.3.10.tgz"; + sha512 = "jY5dPJzw6NHd/KPSfPKJ+IHoFS81/tJ43r34ZeNMXGzCOM8jwQDCD12HYayKIB6MuznrnqIYy2e891NA2g0ibA=="; }; }; "node-persist-2.1.0" = { @@ -42664,13 +43088,13 @@ let sha512 = "dBljNubVsolJkgfXUAF3KrCAO+hi5AXz+cftGjfHT76PyVB9pFUbAgTrkjZmKciC/B/14kEV5Ds+SwonqyTMfg=="; }; }; - "node-releases-1.1.75" = { + "node-releases-1.1.76" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.75"; + version = "1.1.76"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz"; - sha512 = "Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.76.tgz"; + sha512 = "9/IECtNr8dXNmPWmFXepT0/7o5eolGesHUa3mtr0KlgnCvnZxwh2qensKL42JJY2vQKC3nIBXetFAqR+PW1CmA=="; }; }; "node-source-walk-4.2.0" = { @@ -43366,13 +43790,13 @@ let sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="; }; }; - "nth-check-2.0.0" = { + "nth-check-2.0.1" = { name = "nth-check"; packageName = "nth-check"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz"; - sha512 = "i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q=="; + url = "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz"; + sha512 = "it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w=="; }; }; "nugget-2.0.1" = { @@ -43691,13 +44115,13 @@ let sha512 = "jgSbThcoR/s+XumvGMTMf81QVBmah+/Q7K7YduKeKVWL7N111unR2d6pZZarSk6kY/caeNxUDyxOvMWyzoU2eg=="; }; }; - "object-path-0.11.7" = { + "object-path-0.11.8" = { name = "object-path"; packageName = "object-path"; - version = "0.11.7"; + version = "0.11.8"; src = fetchurl { - url = "https://registry.npmjs.org/object-path/-/object-path-0.11.7.tgz"; - sha512 = "T4evaK9VfGGQskXBDILcn6F90ZD+WO3OwRFFQ2rmZdUH4vQeDBpiolTpVlPY2yj5xSepyILTjDyM6UvbbdHMZw=="; + url = "https://registry.npmjs.org/object-path/-/object-path-0.11.8.tgz"; + sha512 = "YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA=="; }; }; "object-to-arguments-0.0.8" = { @@ -43898,13 +44322,13 @@ let sha512 = "0HGaSR/E/seIhSzFxLkh0QqckuNSre4iGqSElZRUv1hVHH2YgrZ7xtQL9McwL8o1fh6HqkzykjUx0Iy2haVIUg=="; }; }; - "office-ui-fabric-react-7.175.2" = { + "office-ui-fabric-react-7.176.1" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.175.2"; + version = "7.176.1"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.175.2.tgz"; - sha512 = "8D57MG+F4m8aTbV4M9oeFQNdu8NNYSV8yI9wSL20FmdeYSCddqhrxW/JqivJMiDBn1Y4+dnjXLRahudUbePBQQ=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.176.1.tgz"; + sha512 = "dtONShq8XmhRR5J3oX/vwKTWhA49oBSmIXETkGWMHZ68oSBcykxwh4DsM1w7Bi2fpZD2SFlCkv6QDoJiezhxmA=="; }; }; "omggif-1.0.10" = { @@ -44393,13 +44817,13 @@ let sha512 = "ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A=="; }; }; - "openid-2.0.9" = { + "openid-2.0.10" = { name = "openid"; packageName = "openid"; - version = "2.0.9"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/openid/-/openid-2.0.9.tgz"; - sha512 = "LzsGBHUDU2FjW/aHjB99GXxuyEPVkFyU4Ub/df3K0hYGxD1qvYu7atPORLXddCufVkcZBpgbYxdLVG8uiY0fCA=="; + url = "https://registry.npmjs.org/openid/-/openid-2.0.10.tgz"; + sha512 = "EFTQ61/OUVhCeq78Y3rBpdKSuvgb0lwkU8nN4QTdcv0afc5MT7e4IVuZwgkMsgE993dmhbIhkxHFP3iTVJXWmw=="; }; }; "openpgp-4.10.10" = { @@ -44420,6 +44844,15 @@ let sha512 = "XLKtEfHxqrWyF1fzxznsv78w3csW41ucHnjiKnfzZLD5FN8UBDZZL1i4q0FR29zjxXhm+2Hop+5Vr/b8tKIvEg=="; }; }; + "openurl-1.1.1" = { + name = "openurl"; + packageName = "openurl"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openurl/-/openurl-1.1.1.tgz"; + sha1 = "3875b4b0ef7a52c156f0db41d4609dbb0f94b387"; + }; + }; "opn-3.0.3" = { name = "opn"; packageName = "opn"; @@ -44438,6 +44871,15 @@ let sha1 = "7abc22e644dff63b0a96d5ab7f2790c0f01abc95"; }; }; + "opn-5.3.0" = { + name = "opn"; + packageName = "opn"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz"; + sha512 = "bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g=="; + }; + }; "opn-5.5.0" = { name = "opn"; packageName = "opn"; @@ -44762,22 +45204,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-1.1.0" = { + "ot-builder-1.1.1" = { name = "ot-builder"; packageName = "ot-builder"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.1.0.tgz"; - sha512 = "IvQqHq33yHRKQuBzlzE6N3tXR2IktvBXeTvdASzib5Lqz84MJ1raGQrDNMimYxpRjcXZFJVfDgATYy5+gLhJIQ=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.1.1.tgz"; + sha512 = "bU1eH69ZopFnB9ZXdOLcpKq0FlsKPnyXGceDJBahftwCCSB7QS+zLXdnVIKAy8/aNmsZBS+8wxmKVdHZg21WDg=="; }; }; - "otb-ttc-bundle-1.1.0" = { + "otb-ttc-bundle-1.1.1" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.1.0.tgz"; - sha512 = "tn3jkqHfaVIQsecQyAUTNf/VAAfE5EQiDH3AyIb1OFXjcdp0P9pBZUd0E4iP+rQjVoN8eMy1uCgvde5M5ZqVrg=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.1.1.tgz"; + sha512 = "w7nw9ARB7IglOASVnrObB7RaKk/9PHJrNn9DP9bM6mSufKPXT0rpCeMFCIAS5nKHvegocFxHksPU10TWp80pdw=="; }; }; "ow-0.21.0" = { @@ -45023,6 +45465,15 @@ let sha512 = "LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="; }; }; + "p-map-1.2.0" = { + name = "p-map"; + packageName = "p-map"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz"; + sha512 = "r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA=="; + }; + }; "p-map-2.1.0" = { name = "p-map"; packageName = "p-map"; @@ -45059,13 +45510,13 @@ let sha512 = "RpYIIK1zXSNEOdwxcfe7FdvGcs7+y5n8rifMhMNWvaxRNMPINJHF5GDeuVxWqnfrcHPSCnp7Oo5yNXHId9Av2Q=="; }; }; - "p-memoize-4.0.1" = { + "p-memoize-4.0.2" = { name = "p-memoize"; packageName = "p-memoize"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/p-memoize/-/p-memoize-4.0.1.tgz"; - sha512 = "km0sP12uE0dOZ5qP+s7kGVf07QngxyG0gS8sYFvFWhqlgzOsSy+m71aUejf/0akxj5W7gE//2G74qTv6b4iMog=="; + url = "https://registry.npmjs.org/p-memoize/-/p-memoize-4.0.2.tgz"; + sha512 = "REJQ6EIeFmvT9O/u0H/ZVWjRII/1/0GhckleQX0yn+Uk9EdXTtmfnrfa3FwF8ZUrfUEe8NInvlRa0ZBKlMxxTA=="; }; }; "p-pipe-3.1.0" = { @@ -45365,13 +45816,13 @@ let sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac"; }; }; - "paid-services-2.0.1" = { + "paid-services-3.0.0" = { name = "paid-services"; packageName = "paid-services"; - version = "2.0.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/paid-services/-/paid-services-2.0.1.tgz"; - sha512 = "zbXKJneBdfu6gnl/H4ahUHPN7gyV2dO0kkz6U7sMm+VmWjPyJgRqpykbAE32YohJtcJCCmgHZf88cSMhRL9jpQ=="; + url = "https://registry.npmjs.org/paid-services/-/paid-services-3.0.0.tgz"; + sha512 = "BOsSlfeMeNjZRcs9FmDx+Z2UKjhOe32oH4ZywCiZgCvd6OFVL8ZQ2LLr6g+vzEpHWp44/AuPR7UtVtVIKrFlTg=="; }; }; "pako-0.2.9" = { @@ -45473,6 +45924,33 @@ let sha1 = "d3460bf1ddd0dfaeed42da754242e65fb684a81f"; }; }; + "parse-bmfont-ascii-1.0.6" = { + name = "parse-bmfont-ascii"; + packageName = "parse-bmfont-ascii"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-bmfont-ascii/-/parse-bmfont-ascii-1.0.6.tgz"; + sha1 = "11ac3c3ff58f7c2020ab22769079108d4dfa0285"; + }; + }; + "parse-bmfont-binary-1.0.6" = { + name = "parse-bmfont-binary"; + packageName = "parse-bmfont-binary"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-bmfont-binary/-/parse-bmfont-binary-1.0.6.tgz"; + sha1 = "d038b476d3e9dd9db1e11a0b0e53a22792b69006"; + }; + }; + "parse-bmfont-xml-1.1.4" = { + name = "parse-bmfont-xml"; + packageName = "parse-bmfont-xml"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-bmfont-xml/-/parse-bmfont-xml-1.1.4.tgz"; + sha512 = "bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ=="; + }; + }; "parse-conflict-json-1.1.1" = { name = "parse-conflict-json"; packageName = "parse-conflict-json"; @@ -46454,6 +46932,15 @@ let sha512 = "YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w=="; }; }; + "phin-2.9.3" = { + name = "phin"; + packageName = "phin"; + version = "2.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/phin/-/phin-2.9.3.tgz"; + sha512 = "CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA=="; + }; + }; "physical-cpu-count-2.0.0" = { name = "physical-cpu-count"; packageName = "physical-cpu-count"; @@ -46607,13 +47094,13 @@ let sha512 = "drPtqkkSf0ufx2gaea3TryFiBHdNIdXKf5LN0hTM82SXI4xVIve2wLwNg92e1MT6m3jASLu6VO7eGY6+mmGeyw=="; }; }; - "pino-6.13.0" = { + "pino-6.13.2" = { name = "pino"; packageName = "pino"; - version = "6.13.0"; + version = "6.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-6.13.0.tgz"; - sha512 = "mRXSTfa34tbfrWqCIp1sUpZLqBhcoaGapoyxfEwaWwJGMpLijlRdDKIQUyvq4M3DUfFH5vEglwSw8POZYwbThA=="; + url = "https://registry.npmjs.org/pino/-/pino-6.13.2.tgz"; + sha512 = "vmD/cabJ4xKqo9GVuAoAEeQhra8XJ7YydPV/JyIP+0zDtFTu5JSKdtt8eksGVWKtTSrNGcRrzJ4/IzvUWep3FA=="; }; }; "pino-std-serializers-3.2.0" = { @@ -46652,6 +47139,15 @@ let sha512 = "WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA=="; }; }; + "pixelmatch-4.0.2" = { + name = "pixelmatch"; + packageName = "pixelmatch"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pixelmatch/-/pixelmatch-4.0.2.tgz"; + sha1 = "8f47dcec5011b477b67db03c243bc1f3085e8854"; + }; + }; "pixiv-api-client-0.25.0" = { name = "pixiv-api-client"; packageName = "pixiv-api-client"; @@ -46706,13 +47202,13 @@ let sha512 = "NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA=="; }; }; - "pkg-fetch-3.2.2" = { + "pkg-fetch-3.2.3" = { name = "pkg-fetch"; packageName = "pkg-fetch"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.2.2.tgz"; - sha512 = "bLhFNT4cNnONxzbHo1H2mCCKuQkCR4dgQtv0gUZnWtp8TDP0v0UAXKHG7DXhAoTC5IYP3slLsFJtIda9ksny8g=="; + url = "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.2.3.tgz"; + sha512 = "bv9vYANgAZ2Lvxn5Dsq7E0rLqzcqYkV4gnwe2f7oHV9N4SVMfDOIjjFCRuuTltop5EmsOcu7XkQpB5A/pIgC1g=="; }; }; "pkg-up-2.0.0" = { @@ -47039,6 +47535,15 @@ let sha512 = "Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA=="; }; }; + "portscanner-2.1.1" = { + name = "portscanner"; + packageName = "portscanner"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/portscanner/-/portscanner-2.1.1.tgz"; + sha1 = "eabb409e4de24950f5a2a516d35ae769343fbb96"; + }; + }; "posix-character-classes-0.1.1" = { name = "posix-character-classes"; packageName = "posix-character-classes"; @@ -47112,6 +47617,15 @@ let sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A=="; }; }; + "postcss-8.3.7" = { + name = "postcss"; + packageName = "postcss"; + version = "8.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-8.3.7.tgz"; + sha512 = "9SaY7nnyQ63/WittqZYAvkkYPyKxchMKH71UDzeTmWuLSvxTRpeEeABZAzlCi55cuGcoFyoV/amX2BdsafQidQ=="; + }; + }; "postcss-calc-7.0.5" = { name = "postcss-calc"; packageName = "postcss-calc"; @@ -47904,22 +48418,22 @@ let sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg=="; }; }; - "prettier-2.3.0" = { + "prettier-2.3.2" = { name = "prettier"; packageName = "prettier"; - version = "2.3.0"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz"; - sha512 = "kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz"; + sha512 = "lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ=="; }; }; - "prettier-2.4.0" = { + "prettier-2.4.1" = { name = "prettier"; packageName = "prettier"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.4.0.tgz"; - sha512 = "DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz"; + sha512 = "9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA=="; }; }; "prettier-bytes-1.0.4" = { @@ -47949,13 +48463,13 @@ let sha512 = "2UzApPuxi2yRoyMlXMazgR6UcH9DKJhNgCviIwY3ixZ9THWSSrUww5vkiZ3C48WvpFl1M1y/oU63deSy1puWEA=="; }; }; - "prettier-plugin-svelte-2.3.1" = { + "prettier-plugin-svelte-2.4.0" = { name = "prettier-plugin-svelte"; packageName = "prettier-plugin-svelte"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.3.1.tgz"; - sha512 = "F1/r6OYoBq8Zgurhs1MN25tdrhPw0JW5JjioPRqpxbYdmrZ3gY/DzHGs0B6zwd4DLyRsfGB2gqhxUCbHt/D1fw=="; + url = "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.4.0.tgz"; + sha512 = "JwJ9bOz4XHLQtiLnX4mTSSDUdhu12WH8sTwy/XTDCSyPlah6IcV7NWeYBZscPEcceu2YnW8Y9sJCP40Z2UH9GA=="; }; }; "prettier-stylelint-0.4.2" = { @@ -48066,15 +48580,6 @@ let sha512 = "973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q=="; }; }; - "pretty-time-1.1.0" = { - name = "pretty-time"; - packageName = "pretty-time"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-time/-/pretty-time-1.1.0.tgz"; - sha512 = "28iF6xPQrP8Oa6uxE6a1biz+lWeTOAPKggvjB8HAs6nVMKZwf5bG++632Dx614hIWgUPkgivRfG+a8uAXGTIbA=="; - }; - }; "prettyjson-1.2.1" = { name = "prettyjson"; packageName = "prettyjson"; @@ -48129,13 +48634,13 @@ let sha512 = "dG2w7WtovUa4SiYTdWn9H8Bd4JNdei2djtkP/Bk9fXq81j5Q15ZPHYSwhUVvBRbp5zMkGtu0Yk62HuMcly0pRw=="; }; }; - "prismjs-1.24.1" = { + "prismjs-1.25.0" = { name = "prismjs"; packageName = "prismjs"; - version = "1.24.1"; + version = "1.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/prismjs/-/prismjs-1.24.1.tgz"; - sha512 = "mNPsedLuk90RVJioIky8ANZEwYm5w9LcvCXrxHlwf4fNVSn8jEipMybMkWUyyF0JhnC+C4VcOVSBuHRKs1L5Ow=="; + url = "https://registry.npmjs.org/prismjs/-/prismjs-1.25.0.tgz"; + sha512 = "WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg=="; }; }; "private-0.1.8" = { @@ -48246,15 +48751,6 @@ let sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; }; - "process-utils-2.6.0" = { - name = "process-utils"; - packageName = "process-utils"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/process-utils/-/process-utils-2.6.0.tgz"; - sha512 = "2zKFADQDvHiUDyJQTsBTdu1+Q2D/WtReBotZwXmD9oUueb0kNv4rXulK/78hMM+nclBNFZ/ZlHOJtobt8oHpqQ=="; - }; - }; "process-utils-4.0.0" = { name = "process-utils"; packageName = "process-utils"; @@ -48570,13 +49066,13 @@ let sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; }; }; - "proto3-json-serializer-0.1.3" = { + "proto3-json-serializer-0.1.4" = { name = "proto3-json-serializer"; packageName = "proto3-json-serializer"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-0.1.3.tgz"; - sha512 = "X0DAtxCBsy1NDn84huVFGOFgBslT2gBmM+85nY6/5SOAaCon1jzVNdvi74foIyFvs5CjtSbQsepsM5TsyNhqQw=="; + url = "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-0.1.4.tgz"; + sha512 = "bFzdsKU/zaTobWrRxRniMZIzzcgKYlmBWL1gAcTXZ2M7TQTGPI0JoYYs6bN7tpWj59ZCfwg7Ii/A2e8BbQGYnQ=="; }; }; "protobufjs-3.8.2" = { @@ -48615,13 +49111,13 @@ let sha512 = "5aFshI9SbhtcMiDiZZu3g2tMlZeS5lhni//AGJ7V34PQLU5JA91Cva7TIs6inZhYikS3OpnUzAUuL6YtS0CyDA=="; }; }; - "protocol-buffers-schema-3.5.2" = { + "protocol-buffers-schema-3.6.0" = { name = "protocol-buffers-schema"; packageName = "protocol-buffers-schema"; - version = "3.5.2"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.5.2.tgz"; - sha512 = "LPzSaBYp/TcbuSlpGwqT5jR9kvJ3Zp5ic2N5c2ybx6XB/lSfEHq2D7ja8AgoxHoMD91wXFALJoXsvshKPuXyew=="; + url = "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz"; + sha512 = "TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw=="; }; }; "protocols-1.4.8" = { @@ -49632,13 +50128,22 @@ let sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; }; }; - "puppeteer-10.2.0" = { + "puppeteer-1.20.0" = { name = "puppeteer"; packageName = "puppeteer"; - version = "10.2.0"; + version = "1.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-10.2.0.tgz"; - sha512 = "OR2CCHRashF+f30+LBOtAjK6sNtz2HEyTr5FqAvhf8lR/qB3uBRoIZOwQKgwoyZnMBsxX7ZdazlyBgGjpnkiMw=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-1.20.0.tgz"; + sha512 = "bt48RDBy2eIwZPrkgbcwHtb51mj2nKvHOPMaSH2IsWiv7lOG9k9zhaRzpDZafrk05ajMc3cu+lSQYYOfH2DkVQ=="; + }; + }; + "puppeteer-10.4.0" = { + name = "puppeteer"; + packageName = "puppeteer"; + version = "10.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-10.4.0.tgz"; + sha512 = "2cP8mBoqnu5gzAVpbZ0fRaobBWZM8GEUF4I1F6WbgHrKV/rz7SX8PG2wMymZgD0wo0UBlg2FBPNxlF/xlqW6+w=="; }; }; "puppeteer-9.1.1" = { @@ -49650,6 +50155,24 @@ let sha512 = "W+nOulP2tYd/ZG99WuZC/I5ljjQQ7EUw/jQGcIb9eu8mDlZxNY2SgcJXTLG9h5gRvqA3uJOe4hZXYsd3EqioMw=="; }; }; + "purescript-0.14.4" = { + name = "purescript"; + packageName = "purescript"; + version = "0.14.4"; + src = fetchurl { + url = "https://registry.npmjs.org/purescript/-/purescript-0.14.4.tgz"; + sha512 = "9Lq2qvyVkQoKUBSNOEBKIJjtD5sDwThurSt3SRdtSseaA03p1Fk7VxbUr9HV/gHLVZPIkOhPtjvZGUNs5U2PDA=="; + }; + }; + "purescript-installer-0.2.5" = { + name = "purescript-installer"; + packageName = "purescript-installer"; + version = "0.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/purescript-installer/-/purescript-installer-0.2.5.tgz"; + sha512 = "fQAWWP5a7scuchXecjpU4r4KEgSPuS6bBnaP01k9f71qqD28HaJ2m4PXHFkhkR4oATAxTPIGCtmTwtVoiBOHog=="; + }; + }; "purgecss-2.3.0" = { name = "purgecss"; packageName = "purgecss"; @@ -49695,13 +50218,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.166" = { + "pyright-1.1.170" = { name = "pyright"; packageName = "pyright"; - version = "1.1.166"; + version = "1.1.170"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.166.tgz"; - sha512 = "mO+iPT2dhHzlplAV3iKE6u4gUstGZxxLyMSRd1PKZqWhwhTCCGjn3/7VqbAwUt4fuhY8g0V+SAsu+MPT4H3FvQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.170.tgz"; + sha512 = "eoLp3FXvB+qGw6DMaC9xCNkIZMzdPMl5yERUXv1U/RF8AIuOcfjmG1171UL/TpXvoCLWGVArkWJcq8l5uBB35Q=="; }; }; "q-0.9.7" = { @@ -49848,6 +50371,15 @@ let sha512 = "M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg=="; }; }; + "qs-6.2.3" = { + name = "qs"; + packageName = "qs"; + version = "6.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz"; + sha1 = "1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"; + }; + }; "qs-6.3.2" = { name = "qs"; packageName = "qs"; @@ -49992,13 +50524,13 @@ let sha512 = "ULWhjjE8BmiICGn3G8+1L9wFpERNxkf8ysxkAer4+TFdRefDaXOCV5m92aMB9FtBVmn/8sETXLXY6BfW7hyaWQ=="; }; }; - "quick-format-unescaped-4.0.3" = { + "quick-format-unescaped-4.0.4" = { name = "quick-format-unescaped"; packageName = "quick-format-unescaped"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.3.tgz"; - sha512 = "MaL/oqh02mhEo5m5J2rwsVL23Iw2PEaGVHgT2vFt8AAsr0lfvQA5dpXo9TPu0rz7tSBdUPgkbam0j/fj5ZM8yg=="; + url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz"; + sha512 = "tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg=="; }; }; "quick-lru-1.1.0" = { @@ -51171,6 +51703,15 @@ let sha512 = "nRCcW9Sj7NuZwa2XvH9co8NPeXUBhZP7CRKJtU+cS6PW9FpCIFoI5ib0NT1ZrbNuPoRy0ylyCaUL8Gih4LSyFg=="; }; }; + "recursive-readdir-sync-1.0.6" = { + name = "recursive-readdir-sync"; + packageName = "recursive-readdir-sync"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/recursive-readdir-sync/-/recursive-readdir-sync-1.0.6.tgz"; + sha1 = "1dbf6d32f3c5bb8d3cde97a6c588d547a9e13d56"; + }; + }; "recursive-watch-1.1.4" = { name = "recursive-watch"; packageName = "recursive-watch"; @@ -51333,13 +51874,13 @@ let sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; }; }; - "regenerate-unicode-properties-8.2.0" = { + "regenerate-unicode-properties-9.0.0" = { name = "regenerate-unicode-properties"; packageName = "regenerate-unicode-properties"; - version = "8.2.0"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"; - sha512 = "F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA=="; + url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz"; + sha512 = "3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA=="; }; }; "regenerator-runtime-0.10.5" = { @@ -51441,13 +51982,13 @@ let sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; }; }; - "regexpu-core-4.7.1" = { + "regexpu-core-4.8.0" = { name = "regexpu-core"; packageName = "regexpu-core"; - version = "4.7.1"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz"; - sha512 = "ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ=="; + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.8.0.tgz"; + sha512 = "1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg=="; }; }; "register-protocol-win32-1.1.0" = { @@ -51513,13 +52054,13 @@ let sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="; }; }; - "regjsparser-0.6.9" = { + "regjsparser-0.7.0" = { name = "regjsparser"; packageName = "regjsparser"; - version = "0.6.9"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz"; - sha512 = "ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ=="; + url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.7.0.tgz"; + sha512 = "A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ=="; }; }; "rehype-parse-6.0.2" = { @@ -52431,6 +52972,15 @@ let sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a"; }; }; + "request-as-curl-0.1.0" = { + name = "request-as-curl"; + packageName = "request-as-curl"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request-as-curl/-/request-as-curl-0.1.0.tgz"; + sha1 = "f017ac5b2060e1c4fc9677575c381a08249d5bf7"; + }; + }; "request-light-0.2.5" = { name = "request-light"; packageName = "request-light"; @@ -52791,6 +53341,15 @@ let sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; }; }; + "resp-modifier-6.0.2" = { + name = "resp-modifier"; + packageName = "resp-modifier"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/resp-modifier/-/resp-modifier-6.0.2.tgz"; + sha1 = "b124de5c4fbafcba541f48ffa73970f4aa456b4f"; + }; + }; "responselike-1.0.2" = { name = "responselike"; packageName = "responselike"; @@ -53241,13 +53800,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.56.3" = { + "rollup-2.57.0" = { name = "rollup"; packageName = "rollup"; - version = "2.56.3"; + version = "2.57.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.56.3.tgz"; - sha512 = "Au92NuznFklgQCUcV96iXlxUbHuB1vQMaH76DHl5M11TotjOHwqk9CwcrT78+Tnv4FN9uTBxq6p4EJoYkpyekg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.57.0.tgz"; + sha512 = "bKQIh1rWKofRee6mv8SrF2HdP6pea5QkwBZSMImJysFj39gQuiV8MEPBjXOCpzk3wSYp63M2v2wkWBmFC8O/rg=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -53718,6 +54277,15 @@ let sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; }; }; + "safe-stable-stringify-1.1.1" = { + name = "safe-stable-stringify"; + packageName = "safe-stable-stringify"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-1.1.1.tgz"; + sha512 = "ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw=="; + }; + }; "safer-buffer-2.1.2" = { name = "safer-buffer"; packageName = "safer-buffer"; @@ -53799,13 +54367,13 @@ let sha1 = "478be1429500fcfaa780be88b3343ced7d2a9182"; }; }; - "sass-1.39.0" = { + "sass-1.42.1" = { name = "sass"; packageName = "sass"; - version = "1.39.0"; + version = "1.42.1"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.39.0.tgz"; - sha512 = "F4o+RhJkNOIG0b6QudYU8c78ZADKZjKDk5cyrf8XTKWfrgbtyVVXImFstJrc+1pkQDCggyidIOytq6gS4gCCZg=="; + url = "https://registry.npmjs.org/sass/-/sass-1.42.1.tgz"; + sha512 = "/zvGoN8B7dspKc5mC6HlaygyCBRvnyzzgD5khiaCfglWztY99cYoiTUksVx11NlnemrcfH5CEaCpsUKoW0cQqg=="; }; }; "sax-0.5.8" = { @@ -54447,13 +55015,13 @@ let sha1 = "f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"; }; }; - "service-runner-2.8.4" = { + "service-runner-2.9.0" = { name = "service-runner"; packageName = "service-runner"; - version = "2.8.4"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.8.4.tgz"; - sha512 = "x190eUDdtwmstQluk10aeA89gw0uTtm8OFzlXO6oMgv5MoCcp1PedNI1aCVsQoBHfiraExKhokvEZoxl6xTfQw=="; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.9.0.tgz"; + sha512 = "u5yFOwfPAaLo9oqbTWq0F02C3R/sohTbX5zqxWfoYe1bS3OpEyJsTGoRE5CGHum/RZcazxFpaVCrE+fIUvg3qA=="; }; }; "set-blocking-1.0.0" = { @@ -54870,22 +55438,22 @@ let sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; }; }; - "sign-addon-3.7.0" = { + "sign-addon-3.8.0" = { name = "sign-addon"; packageName = "sign-addon"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/sign-addon/-/sign-addon-3.7.0.tgz"; - sha512 = "XPLjMCcGuP5pPJSXpqFwKguIKxcteOx6dE1Bm2j92Brsro6pZYcklOpv4ohfRNW1UQp0J2cdi9zN2oNF4lMiRg=="; + url = "https://registry.npmjs.org/sign-addon/-/sign-addon-3.8.0.tgz"; + sha512 = "/KVjGIMGN/8nbSTzpq3orQzYs4YhlYOZF8OkZuG8TSIBns8sUR2vlUNvcgvJPGdpNJkrlienwFDsO1UkbDij1w=="; }; }; - "signal-exit-3.0.3" = { + "signal-exit-3.0.4" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"; - sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.4.tgz"; + sha512 = "rqYhcAnZ6d/vTPGghdrw7iumdcbXpsk1b8IG/rz+VWV51DM0p7XCtMoJ3qhPLIbp3tvyt3pKRbaaEMZYpHto8Q=="; }; }; "signals-1.0.0" = { @@ -55446,6 +56014,15 @@ let sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg=="; }; }; + "socket.io-2.4.0" = { + name = "socket.io"; + packageName = "socket.io"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.4.0.tgz"; + sha512 = "9UPJ1UTvKayuQfVv2IQ3k7tCQC/fboDyIK62i99dAQIyHKaBsNdTpwHLgKJ6guRWxRtC9H+138UwpaGuQO9uWQ=="; + }; + }; "socket.io-2.4.1" = { name = "socket.io"; packageName = "socket.io"; @@ -55635,13 +56212,13 @@ let sha512 = "vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ=="; }; }; - "socks-proxy-agent-6.0.0" = { + "socks-proxy-agent-6.1.0" = { name = "socks-proxy-agent"; packageName = "socks-proxy-agent"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.0.0.tgz"; - sha512 = "FIgZbQWlnjVEQvMkylz64/rUggGtrKstPnx8OZyYFG0tAFR8CSBtpXxSwbFLHyeXFn/cunFL7MpuSOvDSOPo9g=="; + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.1.0.tgz"; + sha512 = "57e7lwCN4Tzt3mXz25VxOErJKXlPfXmkMLnk310v/jwW20jWRVcgsOit+xNkN3eIEdB47GwnfAEBLacZ/wVIKg=="; }; }; "socks5-client-1.2.8" = { @@ -56013,6 +56590,15 @@ let sha512 = "q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA=="; }; }; + "spago-0.20.3" = { + name = "spago"; + packageName = "spago"; + version = "0.20.3"; + src = fetchurl { + url = "https://registry.npmjs.org/spago/-/spago-0.20.3.tgz"; + sha512 = "R4CWLP5IbaWoNIpS1QAUuDK2LKlKYqT5gBKVZL7ILilvCwdwS72u3NbGZbvx7VCRRZz4lG7zXUkqKNow7zh6wQ=="; + }; + }; "spark-md5-1.0.1" = { name = "spark-md5"; packageName = "spark-md5"; @@ -56499,13 +57085,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-2.4.0" = { + "ssb-db2-2.6.0" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "2.4.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.4.0.tgz"; - sha512 = "UMd6XqBGTHBNPduyEc0ynO+lkCn/8/NTedzDz9XRYQsqk4ed2Js0cWhqeREv0Bz+upfCMmPQBBHASPBw47XTOA=="; + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.6.0.tgz"; + sha512 = "xQq//UoHFdXObMFGMaMH4a2M2CTCY++1YmvXkD8RXZ/KdxmQx4UqrfI9gAr+EepUYWYoAV/sSphmTUoX39gm6Q=="; }; }; "ssb-ebt-5.6.7" = { @@ -56805,13 +57391,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.63" = { + "sscaff-1.2.75" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.63"; + version = "1.2.75"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.63.tgz"; - sha512 = "7T/JlrjNIc7kD+3mBvfE3JEpOAV0qstAEbCy3WOrMHWcgROAOESA9llkqQPcDQZB9bRV8JLqQIAgqVtpwljFOw=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.75.tgz"; + sha512 = "yb/3nwGbZI3KSpwdjjS5FbEZGhKXLvC5quA/x45Af2r7U4QvM8szr7xI6/Mi3amAJIO9alVyvNPrcvslqhe2gg=="; }; }; "ssh-config-1.1.6" = { @@ -56931,13 +57517,13 @@ let sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; }; }; - "stack-utils-2.0.3" = { + "stack-utils-2.0.5" = { name = "stack-utils"; packageName = "stack-utils"; - version = "2.0.3"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz"; - sha512 = "gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw=="; + url = "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz"; + sha512 = "xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA=="; }; }; "stackblur-canvas-2.5.0" = { @@ -57003,6 +57589,15 @@ let sha512 = "d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ=="; }; }; + "static-eval-2.0.2" = { + name = "static-eval"; + packageName = "static-eval"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/static-eval/-/static-eval-2.0.2.tgz"; + sha512 = "N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg=="; + }; + }; "static-eval-2.1.0" = { name = "static-eval"; packageName = "static-eval"; @@ -57066,6 +57661,15 @@ let sha512 = "+sGCE6FednJ/vI7vywErOg/mhVqmf6Zlktz7cdGRnF/cQWXD9ifMgtqU1CIIXmhSwm11SCk4zDN+bwNCvIR/Kg=="; }; }; + "statuses-1.3.1" = { + name = "statuses"; + packageName = "statuses"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz"; + sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"; + }; + }; "statuses-1.4.0" = { name = "statuses"; packageName = "statuses"; @@ -57084,15 +57688,6 @@ let sha1 = "161c7dac177659fd9811f43771fa99381478628c"; }; }; - "std-env-2.3.0" = { - name = "std-env"; - packageName = "std-env"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/std-env/-/std-env-2.3.0.tgz"; - sha512 = "4qT5B45+Kjef2Z6pE0BkskzsH0GO7GrND0wGlTM1ioUe3v0dGYx9ZJH0Aro/YyA8fqQ5EyIKDRjZojJYMFTflw=="; - }; - }; "stealthy-require-1.1.1" = { name = "stealthy-require"; packageName = "stealthy-require"; @@ -57354,6 +57949,15 @@ let sha512 = "Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg=="; }; }; + "stream-throttle-0.1.3" = { + name = "stream-throttle"; + packageName = "stream-throttle"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-throttle/-/stream-throttle-0.1.3.tgz"; + sha1 = "add57c8d7cc73a81630d31cd55d3961cfafba9c3"; + }; + }; "stream-to-array-2.3.0" = { name = "stream-to-array"; packageName = "stream-to-array"; @@ -57444,13 +58048,13 @@ let sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a"; }; }; - "streamx-2.11.1" = { + "streamx-2.11.2" = { name = "streamx"; packageName = "streamx"; - version = "2.11.1"; + version = "2.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/streamx/-/streamx-2.11.1.tgz"; - sha512 = "GG/cBcuwhKEu2MxJIdlFnrstgtwERx0yX0tjZUVFHmmq65ROrCEAVrfoYbNQnXdq76rH0Y/SuO9VcgW+ZPkeMQ=="; + url = "https://registry.npmjs.org/streamx/-/streamx-2.11.2.tgz"; + sha512 = "CoIBTrCoMKzhTMXZlMwlkjxCH+8e5H5C7WeuWKSlY5ldtCUMkkrLh5UT2+2OHAnpTPrjTimKQl/aXxgbhZtH5Q=="; }; }; "strftime-0.10.0" = { @@ -57615,13 +58219,13 @@ let sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; - "string-width-4.2.2" = { + "string-width-4.2.3" = { name = "string-width"; packageName = "string-width"; - version = "4.2.2"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz"; - sha512 = "XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA=="; + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"; + sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; "string.prototype.repeat-0.2.0" = { @@ -57822,13 +58426,22 @@ let sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; }; }; - "strip-ansi-7.0.0" = { + "strip-ansi-6.0.1" = { name = "strip-ansi"; packageName = "strip-ansi"; - version = "7.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.0.tgz"; - sha512 = "UhDTSnGF1dc0DRbUqr1aXwNoY3RgVkSWG8BrpnuFIxhP57IqbS7IRta2Gfiavds4yCxc5+fEAVVOgBZWnYkvzg=="; + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"; + sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; + }; + }; + "strip-ansi-7.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.0.1.tgz"; + sha512 = "cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw=="; }; }; "strip-ansi-control-characters-2.0.0" = { @@ -58479,22 +59092,22 @@ let sha512 = "mDAmaltQl6e5zU2VEtoWEf7eLTfuOTGr9zt+BpA3AGHo8MIhKiNSPE9OLTCTOMgj0vj/uL9QBbaNmpG4G1CgIA=="; }; }; - "svelte-preprocess-4.9.4" = { + "svelte-preprocess-4.9.5" = { name = "svelte-preprocess"; packageName = "svelte-preprocess"; - version = "4.9.4"; + version = "4.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.9.4.tgz"; - sha512 = "Z0mUQBGtE+ZZSv/HerRSHe7ukJokxjiPeHe7iPOIXseEoRw51H3K/Vh6OMIMstetzZ11vWO9rCsXSD/uUUArmA=="; + url = "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.9.5.tgz"; + sha512 = "RbJbtuwKbuZq9RyzlljZUmmFNaojrg/zUEyDrS8io7haTcuITQmE4NERx8qiqHreApo6cQst5Qtp4MxUwr58Ew=="; }; }; - "svelte2tsx-0.4.5" = { + "svelte2tsx-0.4.6" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.4.5"; + version = "0.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.4.5.tgz"; - sha512 = "5SbnH3rGA5eymeSidlPZ3qxL0P6SfJv0pWaoTVuJDxpHbI00dUZpuDTNn/WZ8yMXfU7vjY/QxKC/iYiDTbJEjg=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.4.6.tgz"; + sha512 = "flljgh/MbJDijo6Z1HhCfyzdRgn1Nd7QTuuxk9Oq5CzyBXZl/NJYh4otZZwUHnx5poy8k7Oxr2CBE3IBh89tmQ=="; }; }; "sver-compat-1.5.0" = { @@ -58776,13 +59389,13 @@ let sha512 = "33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA=="; }; }; - "systeminformation-5.8.7" = { + "systeminformation-5.9.4" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.8.7"; + version = "5.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.8.7.tgz"; - sha512 = "e7b47PXn+GvPHLZm7FxC+IgPs5lqqsrmw7xtdxrr0U8aivYZO6V3CawMqCy5bfGB/ghZh/7AWlJEoXUPLyH3iw=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.9.4.tgz"; + sha512 = "FOsiTn0CyJZoj9kIhla11ndsMzbbwwuriul81wpqIBt9IpbxHZ6P/oZCphIFgJrwqjTnme0Qp1HDzIkUD9Xr/g=="; }; }; "table-3.8.3" = { @@ -58930,13 +59543,13 @@ let sha512 = "4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA=="; }; }; - "tapable-2.2.0" = { + "tapable-2.2.1" = { name = "tapable"; packageName = "tapable"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/tapable/-/tapable-2.2.0.tgz"; - sha512 = "FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw=="; + url = "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz"; + sha512 = "GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="; }; }; "tape-2.3.3" = { @@ -59119,13 +59732,13 @@ let sha512 = "6u5UyW2KpMS/hwC4DKLGlicK/rVSYCahPFgF14ioP6BzwcDwQlciHCB/oWguvxLJaYGrvY6crzLHfjupFTBPXw=="; }; }; - "telegraf-4.4.1" = { + "telegraf-4.4.2" = { name = "telegraf"; packageName = "telegraf"; - version = "4.4.1"; + version = "4.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/telegraf/-/telegraf-4.4.1.tgz"; - sha512 = "jxV8fC/K6abcUTlhy/l8txJAmEJIkJoDu/cN0yXOJWLp9csfLIp+cD4qlwJ6ko+4EgOJmNZvWK7Tr2dxKolJQQ=="; + url = "https://registry.npmjs.org/telegraf/-/telegraf-4.4.2.tgz"; + sha512 = "OGt9w1LbxYUOsRk3htAavBnL9hqWycmJNiOmS74oARzxKFnYS/MdwW8b5CX9VLCJt537AXkm8/eBNiEYD8E7lQ=="; }; }; "temp-0.6.0" = { @@ -59272,6 +59885,15 @@ let sha1 = "597afac2fa6369a6f17860bce9c5f66d6ea0ca96"; }; }; + "term-img-3.0.0" = { + name = "term-img"; + packageName = "term-img"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/term-img/-/term-img-3.0.0.tgz"; + sha512 = "ZXwggmsv+mheSNZ0yOtpOBS5kTSosGPVcTeS9didqs2VRW0sIByYr2cLS1N2vlpGAjq5PKqmy6Z3hZEgcCG4Wg=="; + }; + }; "term-size-1.2.0" = { name = "term-size"; packageName = "term-size"; @@ -59290,6 +59912,15 @@ let sha512 = "wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg=="; }; }; + "terminal-image-0.1.2" = { + name = "terminal-image"; + packageName = "terminal-image"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/terminal-image/-/terminal-image-0.1.2.tgz"; + sha512 = "2dNHutFy2+EM93JGKw23avlgO9Uf1iBdKR87Lv9SYHUwPJmmDM9cN7mkyo65bLYP3AHMU9gDZV4HKTRbr99AAw=="; + }; + }; "terminal-kit-1.49.4" = { name = "terminal-kit"; packageName = "terminal-kit"; @@ -59326,13 +59957,13 @@ let sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; - "terser-5.7.2" = { + "terser-5.9.0" = { name = "terser"; packageName = "terser"; - version = "5.7.2"; + version = "5.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.7.2.tgz"; - sha512 = "0Omye+RD4X7X69O0eql3lC4Heh/5iLj3ggxR/B5ketZLOtLiOqukUgjw3q4PDnNQbsrkKr3UMypqStQG3XKRvw=="; + url = "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz"; + sha512 = "h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -59461,6 +60092,15 @@ let sha512 = "mHE7/pDw/Hk+Q6YdSMNRrZPl5bCuWnFLbF+bxW+MsWQ64dw+Ia9irkammYbH5I0hVMMcfwb0MQc5nbsjqgWeyQ=="; }; }; + "tfunk-4.0.0" = { + name = "tfunk"; + packageName = "tfunk"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tfunk/-/tfunk-4.0.0.tgz"; + sha512 = "eJQ0dGfDIzWNiFNYFVjJ+Ezl/GmwHaFTBTjrtqNPW0S7cuVDBrZrmzUz6VkMeCR4DZFqhd4YtLwsw3i2wYHswQ=="; + }; + }; "then-fs-2.0.0" = { name = "then-fs"; packageName = "then-fs"; @@ -59866,6 +60506,15 @@ let sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; }; }; + "tinycolor2-1.4.2" = { + name = "tinycolor2"; + packageName = "tinycolor2"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz"; + sha512 = "vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA=="; + }; + }; "tinyqueue-2.0.3" = { name = "tinyqueue"; packageName = "tinyqueue"; @@ -60478,13 +61127,13 @@ let sha512 = "L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A=="; }; }; - "tree-kit-0.7.1" = { + "tree-kit-0.7.3" = { name = "tree-kit"; packageName = "tree-kit"; - version = "0.7.1"; + version = "0.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/tree-kit/-/tree-kit-0.7.1.tgz"; - sha512 = "7v5c7ipKxUBR0J3P+WCGg6WqbFV/2glYmTuibgQtyna1DaNJk5mSM3oxPC2AZ/xQN1dTbFWvih4aSbwSBDfx4Q=="; + url = "https://registry.npmjs.org/tree-kit/-/tree-kit-0.7.3.tgz"; + sha512 = "BVxfUGNHKXS6TEOwKHioWSBivg6b5zfbdXtOWEE5ZpgQxG6gPtvFvjnsoKXTp2ASFmzSe6PhXemutmx8zUxFQQ=="; }; }; "tree-sitter-0.17.2" = { @@ -60658,13 +61307,13 @@ let sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="; }; }; - "ts-invariant-0.9.1" = { + "ts-invariant-0.9.3" = { name = "ts-invariant"; packageName = "ts-invariant"; - version = "0.9.1"; + version = "0.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.9.1.tgz"; - sha512 = "hSeYibh29ULlHkuEfukcoiyTct+s2RzczMLTv4x3NWC/YrBy7x7ps5eYq/b4Y3Sb9/uAlf54+/5CAEMVxPhuQw=="; + url = "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.9.3.tgz"; + sha512 = "HinBlTbFslQI0OHP07JLsSXPibSegec6r9ai5xxq/qHYCsIQbzpymLpDhAUsnXcSrDEcd0L62L8vsOEdzM0qlA=="; }; }; "ts-loader-8.0.4" = { @@ -61342,13 +61991,13 @@ let sha512 = "DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA=="; }; }; - "typescript-4.4.2" = { + "typescript-4.4.3" = { name = "typescript"; packageName = "typescript"; - version = "4.4.2"; + version = "4.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.4.2.tgz"; - sha512 = "gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz"; + sha512 = "4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA=="; }; }; "typescript-eslint-parser-16.0.1" = { @@ -61774,13 +62423,13 @@ let sha512 = "Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ=="; }; }; - "unicode-canonical-property-names-ecmascript-1.0.4" = { + "unicode-canonical-property-names-ecmascript-2.0.0" = { name = "unicode-canonical-property-names-ecmascript"; packageName = "unicode-canonical-property-names-ecmascript"; - version = "1.0.4"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"; - sha512 = "jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ=="; + url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"; + sha512 = "yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="; }; }; "unicode-emoji-modifier-base-1.0.0" = { @@ -61792,31 +62441,31 @@ let sha1 = "dbbd5b54ba30f287e2a8d5a249da6c0cef369459"; }; }; - "unicode-match-property-ecmascript-1.0.4" = { + "unicode-match-property-ecmascript-2.0.0" = { name = "unicode-match-property-ecmascript"; packageName = "unicode-match-property-ecmascript"; - version = "1.0.4"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"; - sha512 = "L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg=="; + url = "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz"; + sha512 = "5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q=="; }; }; - "unicode-match-property-value-ecmascript-1.2.0" = { + "unicode-match-property-value-ecmascript-2.0.0" = { name = "unicode-match-property-value-ecmascript"; packageName = "unicode-match-property-value-ecmascript"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"; - sha512 = "wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ=="; + url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz"; + sha512 = "7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="; }; }; - "unicode-property-aliases-ecmascript-1.1.0" = { + "unicode-property-aliases-ecmascript-2.0.0" = { name = "unicode-property-aliases-ecmascript"; packageName = "unicode-property-aliases-ecmascript"; - version = "1.1.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"; - sha512 = "PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg=="; + url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz"; + sha512 = "5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ=="; }; }; "unicode-trie-0.3.1" = { @@ -62963,6 +63612,15 @@ let sha1 = "d52b2fd632a99eca8d9d4a39eece014a6a2b0048"; }; }; + "utif-1.3.0" = { + name = "utif"; + packageName = "utif"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utif/-/utif-1.3.0.tgz"; + sha512 = "Rv9/OsKlBgMlLGai2EAoVheIbdBlndMunkXH4BuU81R2+Nky24I670OdGIb+NMpCbuHGyKjk9OQ7hdyOxuNXgw=="; + }; + }; "util-0.10.3" = { name = "util"; packageName = "util"; @@ -63440,13 +64098,13 @@ let sha1 = "cfde751860a15822db3b132bc59b116a4adaf01b"; }; }; - "vega-5.20.2" = { + "vega-5.21.0" = { name = "vega"; packageName = "vega"; - version = "5.20.2"; + version = "5.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega/-/vega-5.20.2.tgz"; - sha512 = "qmH7aD9GGPpssVdxL1xgcdxTbQzyRUeRR16Os385ymvQhiwCYQNA6+eXUPAZDTVLfk0RXu6Jzj6kUE5jQ80EVw=="; + url = "https://registry.npmjs.org/vega/-/vega-5.21.0.tgz"; + sha512 = "yqqRa9nAqYoAxe7sVhRpsh0b001fly7Yx05klPkXmrvzjxXd07gClW1mOuGgSnVQqo7jTp/LYgbO1bD37FbEig=="; }; }; "vega-canvas-1.2.6" = { @@ -63494,6 +64152,15 @@ let sha512 = "UwCu50Sqd8kNZ1X/XgiAY+QAyQUmGFAwyDu7y0T5fs6/TPQnDo/Bo346NgSgINBEhEKOAMY1Nd/rPOk4UEm/ew=="; }; }; + "vega-event-selector-3.0.0" = { + name = "vega-event-selector"; + packageName = "vega-event-selector"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-event-selector/-/vega-event-selector-3.0.0.tgz"; + sha512 = "Gls93/+7tEJGE3kUuUnxrBIxtvaNeF01VIFB2Q2Of2hBIBvtHX74jcAdDtkh5UhhoYGD8Q1J30P5cqEBEwtPoQ=="; + }; + }; "vega-expression-4.0.1" = { name = "vega-expression"; packageName = "vega-expression"; @@ -63503,6 +64170,15 @@ let sha512 = "ZrDj0hP8NmrCpdLFf7Rd/xMUHGoSYsAOTaYp7uXZ2dkEH5x0uPy5laECMc8TiQvL8W+8IrN2HAWCMRthTSRe2Q=="; }; }; + "vega-expression-5.0.0" = { + name = "vega-expression"; + packageName = "vega-expression"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-expression/-/vega-expression-5.0.0.tgz"; + sha512 = "y5+c2frq0tGwJ7vYXzZcfVcIRF/QGfhf2e+bV1Z0iQs+M2lI1II1GPDdmOcMKimpoCVp/D61KUJDIGE1DSmk2w=="; + }; + }; "vega-force-4.0.7" = { name = "vega-force"; packageName = "vega-force"; @@ -63521,13 +64197,13 @@ let sha512 = "oTAeub3KWm6nKhXoYCx1q9G3K43R6/pDMXvqDlTSUtjoY7b/Gixm8iLcir5S9bPjvH40n4AcbZsPmNfL/Up77A=="; }; }; - "vega-functions-5.12.0" = { + "vega-functions-5.12.1" = { name = "vega-functions"; packageName = "vega-functions"; - version = "5.12.0"; + version = "5.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.12.0.tgz"; - sha512 = "3hljmGs+gR7TbO/yYuvAP9P5laKISf1GKk4yRHLNdM61fWgKm8pI3f6LY2Hvq9cHQFTiJ3/5/Bx2p1SX5R4quQ=="; + url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.12.1.tgz"; + sha512 = "7cHfcjXOj27qEbh2FTzWDl7FJK4xGcMFF7+oiyqa0fp7BU/wNT5YdNV0t5kCX9WjV7mfJWACKV74usLJbyM6GA=="; }; }; "vega-geo-4.3.8" = { @@ -63548,31 +64224,31 @@ let sha512 = "4XaWK6V38/QOZ+vllKKTafiwL25m8Kd+ebHmDV+Q236ONHmqc/gv82wwn9nBeXPEfPv4FyJw2SRoqa2Jol6fug=="; }; }; - "vega-label-1.0.0" = { + "vega-label-1.1.0" = { name = "vega-label"; packageName = "vega-label"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-label/-/vega-label-1.0.0.tgz"; - sha512 = "hCdm2pcHgkKgxnzW9GvX5JmYNiUMlOXOibtMmBzvFBQHX3NiV9giQ5nsPiQiFbV08VxEPtM+VYXr2HyrIcq5zQ=="; + url = "https://registry.npmjs.org/vega-label/-/vega-label-1.1.0.tgz"; + sha512 = "LAThIiDEsZxYvbSkvPLJ93eJF+Ts8RXv1IpBh8gmew8XGmaLJvVkzdsMe7WJJwuaVEsK7ZZFyB/Inkp842GW6w=="; }; }; - "vega-loader-4.4.0" = { + "vega-loader-4.4.1" = { name = "vega-loader"; packageName = "vega-loader"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-loader/-/vega-loader-4.4.0.tgz"; - sha512 = "e5enQECdau7rJob0NFB5pGumh3RaaSWWm90+boxMy3ay2b4Ki/3XIvo+C4F1Lx04qSxvQF7tO2LJcklRm6nqRA=="; + url = "https://registry.npmjs.org/vega-loader/-/vega-loader-4.4.1.tgz"; + sha512 = "dj65i4qlNhK0mOmjuchHgUrF5YUaWrYpx0A8kXA68lBk5Hkx8FNRztkcl07CZJ1+8V81ymEyJii9jzGbhEX0ag=="; }; }; - "vega-parser-6.1.3" = { + "vega-parser-6.1.4" = { name = "vega-parser"; packageName = "vega-parser"; - version = "6.1.3"; + version = "6.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.1.3.tgz"; - sha512 = "8oiVhhW26GQ4GZBvolId8FVFvhn3s1KGgPlD7Z+4P2wkV+xe5Nqu0TEJ20F/cn3b88fd0Vj48X3BH3dlSeKNFg=="; + url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.1.4.tgz"; + sha512 = "tORdpWXiH/kkXcpNdbSVEvtaxBuuDtgYp9rBunVW9oLsjFvFXbSWlM1wvJ9ZFSaTfx6CqyTyGMiJemmr1QnTjQ=="; }; }; "vega-projection-1.4.5" = { @@ -63620,22 +64296,22 @@ let sha512 = "QaegQzbFE2yhYLNWAmHwAuguW3yTtQrmwvfxYT8tk0g+KKodrQ5WSmNrphWXhqwtsgVSvtdZkfp2IPeumcOQJg=="; }; }; - "vega-selections-5.3.0" = { + "vega-selections-5.3.1" = { name = "vega-selections"; packageName = "vega-selections"; - version = "5.3.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.3.0.tgz"; - sha512 = "vC4NPsuN+IffruFXfH0L3i2A51RgG4PqpLv85TvrEAIYnSkyKDE4bf+wVraR3aPdnLLkc3+tYuMi6le5FmThIA=="; + url = "https://registry.npmjs.org/vega-selections/-/vega-selections-5.3.1.tgz"; + sha512 = "cm4Srw1WHjcLGXX7GpxiUlfESv8XPu5b6Vh3mqMDPU94P2FO91SR9gei+EtRdt+KCFgIjr//MnRUjg/hAWwjkQ=="; }; }; - "vega-statistics-1.7.9" = { + "vega-statistics-1.7.10" = { name = "vega-statistics"; packageName = "vega-statistics"; - version = "1.7.9"; + version = "1.7.10"; src = fetchurl { - url = "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.7.9.tgz"; - sha512 = "T0sd2Z08k/mHxr1Vb4ajLWytPluLFYnsYqyk4SIS5czzUs4errpP2gUu63QJ0B7CKNu33vnS9WdOMOo/Eprr/Q=="; + url = "https://registry.npmjs.org/vega-statistics/-/vega-statistics-1.7.10.tgz"; + sha512 = "QLb12gcfpDZ9K5h3TLGrlz4UXDH9wSPyg9LLfOJZacxvvJEPohacUQNrGEAVtFO9ccUCerRfH9cs25ZtHsOZrw=="; }; }; "vega-time-2.0.4" = { @@ -63656,13 +64332,13 @@ let sha512 = "JGBhm5Bf6fiGTUSB5Qr5ckw/KU9FJcSV5xIe/y4IobM/i/KNwI1i1fP45LzP4F4yZc0DMTwJod2UvFHGk9plKA=="; }; }; - "vega-typings-0.21.0" = { + "vega-typings-0.22.0" = { name = "vega-typings"; packageName = "vega-typings"; - version = "0.21.0"; + version = "0.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-typings/-/vega-typings-0.21.0.tgz"; - sha512 = "dG0RtnJUn3+BQMO4NjjTdcp5UTBR56yQsLXPPCAFUHeLuycEVKlyhBa/kbvAZv2r+QxdeEYwKUNYy9CQotF5KA=="; + url = "https://registry.npmjs.org/vega-typings/-/vega-typings-0.22.0.tgz"; + sha512 = "TgBGRkZHQgcduGsoFKq3Scpn6eNY4L3p0YKRhgCPVU3HEaCeYkPFGaR8ynK+XrKmvrqpDv0YHIOwCt7Gn3RpCA=="; }; }; "vega-util-1.16.1" = { @@ -63674,6 +64350,15 @@ let sha512 = "FdgD72fmZMPJE99FxvFXth0IL4BbLA93WmBg/lvcJmfkK4Uf90WIlvGwaIUdSePIsdpkZjBPyQcHMQ8OcS8Smg=="; }; }; + "vega-util-1.17.0" = { + name = "vega-util"; + packageName = "vega-util"; + version = "1.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vega-util/-/vega-util-1.17.0.tgz"; + sha512 = "HTaydZd9De3yf+8jH66zL4dXJ1d1p5OIFyoBzFiOli4IJbwkL1jrefCKz6AHDm1kYBzDJ0X4bN+CzZSCTvNk1w=="; + }; + }; "vega-view-5.10.1" = { name = "vega-view"; packageName = "vega-view"; @@ -63719,13 +64404,13 @@ let sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="; }; }; - "verda-1.3.2" = { + "verda-1.4.0" = { name = "verda"; packageName = "verda"; - version = "1.3.2"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/verda/-/verda-1.3.2.tgz"; - sha512 = "uheYzfPZDvcyXX5nR/eAIB2jKtvbCPhmcEpbJESU7I3QykvIvZWozdb5MEdBAx9e6LyS6TqtBp6BwGBMTO7Xow=="; + url = "https://registry.npmjs.org/verda/-/verda-1.4.0.tgz"; + sha512 = "XzAxyH/99hE4B729ImVqv3TBYxDYwMsjVB8q4fIBOMtnsY9hvrT4xmiim9cRvwyKpCkF2uysyVbeMbFRqN3qgw=="; }; }; "verror-1.1.0" = { @@ -64088,22 +64773,13 @@ let sha1 = "614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"; }; }; - "vsce-1.88.0" = { - name = "vsce"; - packageName = "vsce"; - version = "1.88.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-1.88.0.tgz"; - sha512 = "FS5ou3G+WRnPPr/tWVs8b/jVzeDacgZHy/y7/QQW7maSPFEAmRt2bFGUJtJVEUDLBqtDm/3VGMJ7D31cF2U1tw=="; - }; - }; - "vsce-1.97.0" = { + "vsce-1.100.0" = { name = "vsce"; packageName = "vsce"; - version = "1.97.0"; + version = "1.100.0"; src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-1.97.0.tgz"; - sha512 = "5Rxj6qO0dN4FnzVS9G94osstx8R3r1OQP39G7WYERpoO9X+OSodVVkRhFDapPNjekfUNo+d5Qn7W1EtNQVoLCg=="; + url = "https://registry.npmjs.org/vsce/-/vsce-1.100.0.tgz"; + sha512 = "sY1NVSZkesioir/1w04igdSPKKHb4QAn7AngOQIKvNTvtFUFuEE/KrcURcld9Gai9W5167zaeifW5rWUsX3rLg=="; }; }; "vscode-css-languageservice-3.0.13" = { @@ -64817,13 +65493,13 @@ let sha512 = "hQ/cVKsNqGZ/UbZB/oakOGFqic00YAMM5/PEj3Bt4vKarv2jWIWzDbqlwT94qMs/exAQAsvMOq99sZblV92zxQ=="; }; }; - "walk-2.3.14" = { + "walk-2.3.15" = { name = "walk"; packageName = "walk"; - version = "2.3.14"; + version = "2.3.15"; src = fetchurl { - url = "https://registry.npmjs.org/walk/-/walk-2.3.14.tgz"; - sha512 = "5skcWAUmySj6hkBdH6B6+3ddMjVQYH5Qy9QGbPmN8kVmLteXk+yVXg+yfk1nbX30EYakahLrr8iPcCxJQSCBeg=="; + url = "https://registry.npmjs.org/walk/-/walk-2.3.15.tgz"; + sha512 = "4eRTBZljBfIISK1Vnt69Gvr2w/wc3U6Vtrw7qiN5iqYJPH7LElcYh/iU4XWhdCy2dZqv1ToMyYlybDylfG/5Vg=="; }; }; "walk-sync-0.3.4" = { @@ -65024,13 +65700,13 @@ let sha512 = "8G0xBj05hqZybCqBtW7RPZ/hWEtP3DiLTauQzGJZuZYfVRgw7qj7iaZ+8djNqJ4VPrdOO+pS2dR1JsTbsLxdYg=="; }; }; - "web3-utils-1.5.2" = { + "web3-utils-1.5.3" = { name = "web3-utils"; packageName = "web3-utils"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.2.tgz"; - sha512 = "quTtTeQJHYSxAwIBOCGEcQtqdVcFWX6mCFNoqnp+mRbq+Hxbs8CGgO/6oqfBx4OvxIOfCpgJWYVHswRXnbEu9Q=="; + url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.5.3.tgz"; + sha512 = "56nRgA+Ad9SEyCv39g36rTcr5fpsd4L9LgV3FK0aB66nAMazLAA6Qz4lH5XrUKPDyBIPGJIR+kJsyRtwcu2q1Q=="; }; }; "webassemblyjs-1.11.1" = { @@ -65051,6 +65727,15 @@ let sha1 = "3bf8258f7d318c7443c36f2e169402a1a6703506"; }; }; + "webidl-conversions-3.0.1" = { + name = "webidl-conversions"; + packageName = "webidl-conversions"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; + sha1 = "24534275e2a7bc6be7bc86611cc16ae0a5654871"; + }; + }; "webidl-conversions-4.0.2" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -65123,13 +65808,13 @@ let sha512 = "68VT2ZgG9EHs6h6UxfV2SEYewA9BA3SOLSnC2NEbJJiEwbAiueDL033R1xX0jzjmXvMh0oSeKnKgbO2bDXIEyQ=="; }; }; - "webpack-5.52.0" = { + "webpack-5.53.0" = { name = "webpack"; packageName = "webpack"; - version = "5.52.0"; + version = "5.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.52.0.tgz"; - sha512 = "yRZOat8jWGwBwHpco3uKQhVU7HYaNunZiJ4AkAVQkPCUGoZk/tiIXiwG+8HIy/F+qsiZvSOa+GLQOj3q5RKRYg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.53.0.tgz"; + sha512 = "RZ1Z3z3ni44snoWjfWeHFyzvd9HMVYDYC5VXmlYUT6NWgEOWdCNpad5Fve2CzzHoRED7WtsKe+FCyP5Vk4pWiQ=="; }; }; "webpack-bundle-analyzer-3.9.0" = { @@ -65276,13 +65961,13 @@ let sha512 = "y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA=="; }; }; - "webpack-sources-3.2.0" = { + "webpack-sources-3.2.1" = { name = "webpack-sources"; packageName = "webpack-sources"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.0.tgz"; - sha512 = "fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw=="; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.1.tgz"; + sha512 = "t6BMVLQ0AkjBOoRTZgqrWm7xbXMBzD+XDq2EZ96+vMfn3qKgsvdXZhbPZ4ElUOpdv4u+iiGe+w3+J75iy/bYGA=="; }; }; "webpack-stream-6.1.0" = { @@ -65294,15 +65979,6 @@ let sha512 = "kFMnDzFTzyvVmn4ajaj0xEJavvYizd3I/KmQ6C5aUstcAkNwZUidxkk/uEaEPSydaAn66v8ZcP1+bhKSshNJUQ=="; }; }; - "webpackbar-4.0.0" = { - name = "webpackbar"; - packageName = "webpackbar"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpackbar/-/webpackbar-4.0.0.tgz"; - sha512 = "k1qRoSL/3BVuINzngj09nIwreD8wxV4grcuhHTD8VJgUbGcy8lQSPqv+bM00B7F+PffwIsQ8ISd4mIwRbr23eQ=="; - }; - }; "webrtc-adapter-7.7.1" = { name = "webrtc-adapter"; packageName = "webrtc-adapter"; @@ -65384,6 +66060,15 @@ let sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="; }; }; + "whatwg-url-5.0.0" = { + name = "whatwg-url"; + packageName = "whatwg-url"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"; + sha1 = "966454e8765462e37644d3626f6742ce8b70965d"; + }; + }; "whatwg-url-6.5.0" = { name = "whatwg-url"; packageName = "whatwg-url"; @@ -65591,6 +66276,15 @@ let sha1 = "08d3f52056c66679299726fade0d432ae74b4704"; }; }; + "wikimedia-kad-fork-1.3.6" = { + name = "wikimedia-kad-fork"; + packageName = "wikimedia-kad-fork"; + version = "1.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/wikimedia-kad-fork/-/wikimedia-kad-fork-1.3.6.tgz"; + sha512 = "m+IxFN4JatoQPRo0N46xMh7tR6FSznb/ithIchAy7Wg9mrkc4/bE/3BhlJS410quFJFrJp8lJJp93g4uTbj4lA=="; + }; + }; "wikimedia-langconv-0.1.0" = { name = "wikimedia-langconv"; packageName = "wikimedia-langconv"; @@ -66140,15 +66834,6 @@ let sha512 = "YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A=="; }; }; - "ws-7.5.0" = { - name = "ws"; - packageName = "ws"; - version = "7.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.0.tgz"; - sha512 = "6ezXvzOZupqKj4jUqbQ9tXuJNo+BR2gU8fFRk3XCP3e0G6WT414u5ELe6Y0vtp7kmSJ3F7YWObSNr1ESsgi4vw=="; - }; - }; "ws-7.5.1" = { name = "ws"; packageName = "ws"; @@ -66185,15 +66870,6 @@ let sha512 = "uYhVJ/m9oXwEI04iIVmgLmugh2qrZihkywG9y5FfZV2ATeLIzHf93qs+tUNqlttbQK957/VX3mtwAS+UfIwA4g=="; }; }; - "ws-8.2.1" = { - name = "ws"; - packageName = "ws"; - version = "8.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.2.1.tgz"; - sha512 = "XkgWpJU3sHU7gX8f13NqTn6KQ85bd1WU7noBHTT8fSohx7OS1TPY8k+cyRPCzFkia7C4mM229yeHr1qK9sM4JQ=="; - }; - }; "ws-8.2.2" = { name = "ws"; packageName = "ws"; @@ -66284,13 +66960,13 @@ let sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ=="; }; }; - "xdl-59.1.0" = { + "xdl-59.2.0" = { name = "xdl"; packageName = "xdl"; - version = "59.1.0"; + version = "59.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/xdl/-/xdl-59.1.0.tgz"; - sha512 = "kEkXVds9GWYBV/oIPHvdhoTCQcP8bFG2H+OV6qfytw66gnGLrj0qYSfEvlg+0U0GLChONR37iukGCj19oFnYig=="; + url = "https://registry.npmjs.org/xdl/-/xdl-59.2.0.tgz"; + sha512 = "jeG34Ul/cHtMv8ZTcRd5Hvgs6Udj83VVlJWodb+sH/K/arG8zKKW9/JhJqBrcI9paxB0Fn/1osFsvv4akKYsrg=="; }; }; "xenvar-0.5.1" = { @@ -66392,6 +67068,15 @@ let sha512 = "A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="; }; }; + "xml-parse-from-string-1.0.1" = { + name = "xml-parse-from-string"; + packageName = "xml-parse-from-string"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz"; + sha1 = "a9029e929d3dbcded169f3c6e28238d95a5d5a28"; + }; + }; "xml2js-0.2.4" = { name = "xml2js"; packageName = "xml2js"; @@ -66554,6 +67239,15 @@ let sha512 = "z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g=="; }; }; + "xmldom-0.5.0" = { + name = "xmldom"; + packageName = "xmldom"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz"; + sha512 = "Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA=="; + }; + }; "xmldom-0.6.0" = { name = "xmldom"; packageName = "xmldom"; @@ -66618,6 +67312,15 @@ let sha1 = "fcd82267e9351c13f0fb9c73307f25331d29c63a"; }; }; + "xpath-0.0.23" = { + name = "xpath"; + packageName = "xpath"; + version = "0.0.23"; + src = fetchurl { + url = "https://registry.npmjs.org/xpath/-/xpath-0.0.23.tgz"; + sha1 = "f5e8fdc6bdc7e72885b3234f40cba2669580aafa"; + }; + }; "xpath-0.0.32" = { name = "xpath"; packageName = "xpath"; @@ -66690,13 +67393,13 @@ let sha512 = "2t7FahYnGJys6DpHLhajusId7R0Pm2yTmuL0GV9+mV0ZlaLSnb2toBmppATfg5sWIhZQGlsTLoecSzya+l4EAQ=="; }; }; - "xstate-4.23.4" = { + "xstate-4.25.0" = { name = "xstate"; packageName = "xstate"; - version = "4.23.4"; + version = "4.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/xstate/-/xstate-4.23.4.tgz"; - sha512 = "lWaUvyrd0HGhosyKnf8i9wBlszVaS+/uIs0EfnuPYNsZIh1BW9ed4bZ64P57wVYk2uln7v3u+Mv98FC+r8xrxQ=="; + url = "https://registry.npmjs.org/xstate/-/xstate-4.25.0.tgz"; + sha512 = "qP7lc/ypOuuWME4ArOBnzaCa90TfHkjiqYDmxpiCjPy6FcXstInA2vH6qRVAHbPXRK4KQIYfIEOk1X38P+TldQ=="; }; }; "xstream-11.14.0" = { @@ -66789,6 +67492,15 @@ let sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; }; }; + "yaml-2.0.0-8" = { + name = "yaml"; + packageName = "yaml"; + version = "2.0.0-8"; + src = fetchurl { + url = "https://registry.npmjs.org/yaml/-/yaml-2.0.0-8.tgz"; + sha512 = "QaYgJZMfWD6fKN/EYMk6w1oLWPCr1xj9QaPSZW5qkDb3y8nGCXhy2Ono+AF4F+CSL/vGcqswcAT0BaS//pgD2A=="; + }; + }; "yaml-ast-parser-0.0.43" = { name = "yaml-ast-parser"; packageName = "yaml-ast-parser"; @@ -66807,6 +67519,15 @@ let sha1 = "e52e84fea6983b93755e9b1564dba989b006b5a5"; }; }; + "yaml-include-1.2.1" = { + name = "yaml-include"; + packageName = "yaml-include"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yaml-include/-/yaml-include-1.2.1.tgz"; + sha512 = "d2Ayx9GykZwXHRdSlnlOOdcgbGzb8jjC0WPZicsTUjEbvwDMXDbJ8AMwLe8YCMa3BYeZSiUPcUYdUEjnwlUNGw=="; + }; + }; "yaml-js-0.0.8" = { name = "yaml-js"; packageName = "yaml-js"; @@ -66933,22 +67654,22 @@ let sha512 = "xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ=="; }; }; - "yargs-17.1.0" = { + "yargs-17.1.1" = { name = "yargs"; packageName = "yargs"; - version = "17.1.0"; + version = "17.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.1.0.tgz"; - sha512 = "SQr7qqmQ2sNijjJGHL4u7t8vyDZdZ3Ahkmo4sc1w5xI9TBX0QDdG/g4SFnxtWOsGLjwHQue57eFALfwFCnixgg=="; + url = "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz"; + sha512 = "c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ=="; }; }; - "yargs-17.1.1" = { + "yargs-17.2.0" = { name = "yargs"; packageName = "yargs"; - version = "17.1.1"; + version = "17.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz"; - sha512 = "c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ=="; + url = "https://registry.npmjs.org/yargs/-/yargs-17.2.0.tgz"; + sha512 = "UPeZv4h9Xv510ibpt5rdsUNzgD78nMa1rhxxCgvkKiq06hlKCEHJLiJ6Ub8zDg/wR6hedEI6ovnd2vCvJ4nusA=="; }; }; "yargs-3.10.0" = { @@ -67302,13 +68023,13 @@ let sha512 = "Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg=="; }; }; - "zen-observable-ts-1.2.2" = { + "zen-observable-ts-1.1.0" = { name = "zen-observable-ts"; packageName = "zen-observable-ts"; - version = "1.2.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-1.2.2.tgz"; - sha512 = "o15G3luGAPoWD2//djCQsnC7886KpgQETAvTwnDPMN33RS+XACoFR46fm5e3tC/WNTF0uzHPL91Yyakc280Xiw=="; + url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-1.1.0.tgz"; + sha512 = "1h4zlLSqI2cRLPJUHJFL8bCWHhkpuXkF+dbGkRaWjgDIG26DmzyshUMrdV/rL3UnR+mhaX4fRq8LPouq0MYYIA=="; }; }; "zeromq-5.2.8" = { @@ -67398,15 +68119,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "12.2.5"; + version = "12.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-12.2.5.tgz"; - sha512 = "O/NqRaFGx2jns03oWwhWBpilV4s7B8Zie6rgo2hJty1T3douGkK5kTO38N4Lebeayw8LTiPhT/JOrQTfFgXSjw=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-12.2.7.tgz"; + sha512 = "FH34528+126Cxh/+1cBppBas8tExizKSJgbjpT3zgV6ijwHD7apT5zU9R1TyOhQPd6BhyaURo9Hnsjg49W4bRA=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1202.5" - sources."@angular-devkit/core-12.2.5" - sources."@angular-devkit/schematics-12.2.5" + sources."@angular-devkit/architect-0.1202.7" + sources."@angular-devkit/core-12.2.7" + sources."@angular-devkit/schematics-12.2.7" sources."@gar/promisify-1.1.2" sources."@npmcli/fs-1.0.0" sources."@npmcli/git-2.1.0" @@ -67415,7 +68136,7 @@ in sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.6" - sources."@schematics/angular-12.2.5" + sources."@schematics/angular-12.2.7" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -67426,7 +68147,7 @@ in sources."ajv-formats-2.1.0" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."aproba-1.2.0" (sources."are-we-there-yet-1.1.7" // { @@ -67502,7 +68223,7 @@ in ]; }) sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" (sources."har-validator-5.1.5" // { @@ -67564,7 +68285,7 @@ in sources."mime-types-2.1.32" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" - sources."minipass-3.1.3" + sources."minipass-3.1.5" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" sources."minipass-flush-1.0.5" @@ -67623,17 +68344,17 @@ in sources."safer-buffer-2.1.2" sources."semver-7.3.5" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."smart-buffer-4.2.0" sources."socks-2.6.1" - sources."socks-proxy-agent-6.0.0" + sources."socks-proxy-agent-6.1.0" sources."source-map-0.7.3" sources."sourcemap-codec-1.4.8" sources."sshpk-1.16.1" sources."ssri-8.0.1" - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."symbol-observable-4.0.0" sources."tar-6.1.11" @@ -67699,7 +68420,7 @@ in sources."js-yaml-3.14.1" sources."json5-2.1.3" sources."lodash.clonedeep-4.5.0" - sources."map-obj-4.2.1" + sources."map-obj-4.3.0" sources."minimist-1.2.5" sources."quick-lru-4.0.1" sources."sprintf-js-1.0.3" @@ -67841,7 +68562,7 @@ in sources."glob-parent-3.1.0" (sources."glob-stream-6.1.0" // { dependencies = [ - sources."glob-7.1.7" + sources."glob-7.2.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" @@ -67901,7 +68622,7 @@ in sources."lead-1.0.0" sources."lodash.clonedeep-4.5.0" sources."lowercase-keys-1.0.1" - sources."map-obj-4.2.1" + sources."map-obj-4.3.0" sources."marky-1.2.2" sources."matcher-2.1.0" sources."mime-db-1.49.0" @@ -68034,10 +68755,10 @@ in "@bitwarden/cli" = nodeEnv.buildNodePackage { name = "_at_bitwarden_slash_cli"; packageName = "@bitwarden/cli"; - version = "1.18.0"; + version = "1.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.18.0.tgz"; - sha512 = "U3d1PHdlBE68r2t0p3GS+IA9BzrZXl7haTCiTwHBOoxKY5gL4Frm//duwCxfT1d8p9ucCiuAW6tDQsldSI5xhg=="; + url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.18.1.tgz"; + sha512 = "se1jAVO97eBE8JqBsqmFsUVaDL9h0eR45mra+Y5ebj5dXogfu9tMfLMqJ7O6/cC6fECgDuJF3hOZZ+99L7xk1A=="; }; dependencies = [ sources."@tootallnate/once-1.1.2" @@ -68051,7 +68772,7 @@ in sources."acorn-walk-7.2.0" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."asynckit-0.4.0" sources."big-integer-1.6.48" @@ -68118,7 +68839,13 @@ in sources."mimic-fn-2.1.0" sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."node-fetch-2.6.2" + (sources."node-fetch-2.6.5" // { + dependencies = [ + sources."tr46-0.0.3" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" + ]; + }) sources."node-forge-0.10.0" sources."nwsapi-2.2.0" sources."onetime-5.1.2" @@ -68136,11 +68863,11 @@ in sources."rxjs-6.6.7" sources."safer-buffer-2.1.2" sources."saxes-5.0.1" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."source-map-0.6.1" sources."steno-0.4.4" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."symbol-tree-3.2.4" sources."through-2.3.8" @@ -68188,7 +68915,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -68224,7 +68951,7 @@ in sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."JSONStream-1.3.5" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."array-ify-1.0.0" sources."arrify-1.0.1" @@ -68291,7 +69018,7 @@ in sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lru-cache-6.0.0" - sources."map-obj-4.2.1" + sources."map-obj-4.3.0" sources."meow-8.1.2" sources."merge-stream-2.0.0" sources."mimic-fn-2.1.0" @@ -68334,15 +69061,15 @@ in sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" 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.10" sources."split2-3.2.2" - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" sources."supports-color-7.2.0" @@ -68359,7 +69086,7 @@ in sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yaml-1.10.2" - sources."yargs-17.1.1" + sources."yargs-17.2.0" sources."yargs-parser-20.2.9" sources."yocto-queue-0.1.0" ]; @@ -68384,7 +69111,7 @@ in dependencies = [ sources."array-ify-1.0.0" sources."compare-func-2.0.0" - sources."conventional-changelog-conventionalcommits-4.6.0" + sources."conventional-changelog-conventionalcommits-4.6.1" sources."dot-prop-5.3.0" sources."is-obj-2.0.0" sources."lodash-4.17.21" @@ -68418,7 +69145,7 @@ in sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" sources."@leichtgewicht/ip-codec-2.0.3" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" sources."ansi-colors-3.2.3" @@ -68569,7 +69296,7 @@ in sources."hrpc-runtime-2.1.1" sources."hyperbeam-1.1.3" sources."hyperbee-1.6.3" - sources."hypercore-9.11.0" + sources."hypercore-9.12.0" (sources."hypercore-byte-stream-1.0.12" // { dependencies = [ sources."readable-stream-3.6.0" @@ -68599,7 +69326,7 @@ in ]; }) sources."hyperswarm-2.15.3" - sources."hypertrie-5.1.1" + sources."hypertrie-5.1.2" sources."identify-filetype-1.0.0" sources."ieee754-1.2.1" sources."immediate-3.3.0" @@ -68694,7 +69421,7 @@ in sources."nanoresource-promise-1.2.2" sources."napi-macros-2.0.0" sources."node-environment-flags-1.0.6" - sources."node-gyp-build-4.2.3" + sources."node-gyp-build-4.3.0" (sources."noise-peer-2.1.1" // { dependencies = [ sources."readable-stream-3.6.0" @@ -68729,7 +69456,7 @@ in sources."progress-string-1.2.2" sources."protocol-buffers-4.2.0" sources."protocol-buffers-encodings-1.1.1" - sources."protocol-buffers-schema-3.5.2" + sources."protocol-buffers-schema-3.6.0" sources."prr-1.0.1" sources."pseudomap-1.0.2" sources."pump-3.0.0" @@ -68808,7 +69535,7 @@ in sources."stream-collector-1.0.1" sources."stream-equal-1.1.1" sources."stream-shift-1.0.1" - sources."streamx-2.11.1" + sources."streamx-2.11.2" (sources."string-width-2.1.1" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -68872,14 +69599,14 @@ in sources."wide-align-1.1.3" (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" @@ -68913,39 +69640,41 @@ in "@nerdwallet/shepherd" = nodeEnv.buildNodePackage { name = "_at_nerdwallet_slash_shepherd"; packageName = "@nerdwallet/shepherd"; - version = "1.14.1"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@nerdwallet/shepherd/-/shepherd-1.14.1.tgz"; - sha512 = "oJbTkmm6OJryEoEj3MyOV7bgOFlrW0+o6efwaF/tEfskMmmv8+lfXoeLVJXASxF/G2IgpHAWBrna7xOE2PCmRg=="; + url = "https://registry.npmjs.org/@nerdwallet/shepherd/-/shepherd-1.15.1.tgz"; + sha512 = "8IusD7fBMXdTcdsHBt4jZb3fu4VmN8NppnXEigNn6AxbhGepntGuUN2Ve9FGQX+xcpJKRZsRtsbUnXmf62G83g=="; }; dependencies = [ sources."@hapi/hoek-9.2.0" sources."@hapi/topo-5.1.0" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" - sources."@octokit/auth-token-2.4.5" + sources."@octokit/auth-token-2.5.0" sources."@octokit/core-3.5.1" sources."@octokit/endpoint-6.0.12" sources."@octokit/graphql-4.8.0" - sources."@octokit/openapi-types-10.1.1" - sources."@octokit/plugin-paginate-rest-2.16.0" + sources."@octokit/openapi-types-10.5.0" + sources."@octokit/plugin-paginate-rest-2.16.4" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.10.1" + sources."@octokit/plugin-rest-endpoint-methods-5.11.1" + sources."@octokit/plugin-retry-3.0.9" sources."@octokit/request-5.6.1" sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.10.0" - sources."@octokit/types-6.27.0" + sources."@octokit/rest-18.11.0" + sources."@octokit/types-6.31.0" sources."@sideway/address-4.1.2" sources."@sideway/formula-3.0.0" sources."@sideway/pinpoint-2.0.0" sources."@types/js-yaml-3.12.7" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."argparse-1.0.10" sources."at-least-node-1.0.0" sources."base64-js-1.5.1" sources."before-after-hook-2.2.2" sources."bl-4.1.0" + sources."bottleneck-2.19.5" sources."buffer-5.7.1" sources."chalk-4.1.2" sources."child-process-promise-2.2.1" @@ -68978,7 +69707,7 @@ in sources."mimic-fn-2.1.0" sources."ms-2.1.2" sources."netrc-0.1.4" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" sources."node-version-1.2.0" sources."once-1.4.0" sources."onetime-5.1.2" @@ -68989,16 +69718,19 @@ in sources."readable-stream-3.6.0" sources."restore-cursor-3.1.0" sources."safe-buffer-5.2.1" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."simple-git-2.45.1" sources."sprintf-js-1.0.3" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" + sources."tr46-0.0.3" sources."universal-user-agent-6.0.0" sources."universalify-2.0.0" sources."util-deprecate-1.0.2" sources."wcwidth-1.0.1" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."wrappy-1.0.2" sources."yallist-2.1.2" @@ -69032,7 +69764,7 @@ in ]; }) sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -69057,7 +69789,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -69082,7 +69814,7 @@ in sources."ajv-keywords-3.5.2" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" sources."at-least-node-1.0.0" @@ -69092,11 +69824,11 @@ in sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.17.0" + sources."browserslist-4.17.1" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001255" + sources."caniuse-lite-1.0.30001260" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.2" @@ -69115,7 +69847,6 @@ in sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.4.0" sources."colors-1.4.0" sources."commander-4.1.1" sources."concat-map-0.0.1" @@ -69123,12 +69854,12 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.833" + sources."electron-to-chromium-1.3.849" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - (sources."enhanced-resolve-5.8.2" // { + (sources."enhanced-resolve-5.8.3" // { dependencies = [ - sources."tapable-2.2.0" + sources."tapable-2.2.1" ]; }) sources."error-ex-1.3.2" @@ -69161,7 +69892,7 @@ in sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."get-stream-5.2.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.8" @@ -69190,7 +69921,7 @@ in sources."is-stream-2.0.1" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" - (sources."jest-worker-27.1.1" // { + (sources."jest-worker-27.2.0" // { dependencies = [ sources."supports-color-8.1.1" ]; @@ -69214,7 +69945,7 @@ in sources."lru-cache-6.0.0" sources."macos-release-2.5.0" sources."magic-string-0.25.7" - sources."memfs-3.2.4" + sources."memfs-3.3.0" sources."merge-stream-2.0.0" sources."mime-db-1.49.0" sources."mime-types-2.1.32" @@ -69222,9 +69953,10 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mute-stream-0.0.8" + sources."nanocolors-0.1.12" sources."neo-async-2.6.2" sources."node-emoji-1.10.0" - sources."node-releases-1.1.75" + sources."node-releases-1.1.76" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" @@ -69272,7 +70004,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shelljs-0.8.4" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."source-list-map-2.0.1" sources."source-map-0.7.3" (sources."source-map-support-0.5.19" // { @@ -69281,17 +70013,22 @@ in ]; }) sources."sourcemap-codec-1.4.8" - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-bom-3.0.0" sources."strip-final-newline-2.0.0" sources."supports-color-7.2.0" sources."symbol-observable-4.0.0" sources."tapable-1.1.3" - (sources."terser-5.7.2" // { + (sources."terser-5.9.0" // { dependencies = [ sources."commander-2.20.3" + (sources."source-map-support-0.5.20" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) ]; }) (sources."terser-webpack-plugin-5.2.4" // { @@ -69325,7 +70062,7 @@ in sources."ajv-6.12.6" sources."json-schema-traverse-0.4.1" sources."schema-utils-3.1.1" - sources."tapable-2.2.0" + sources."tapable-2.2.1" ]; }) sources."webpack-node-externals-3.0.0" @@ -69361,7 +70098,7 @@ in }; dependencies = [ sources."@squoosh/lib-0.4.0" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."base64-js-1.5.1" sources."bl-4.1.0" @@ -69389,9 +70126,9 @@ in sources."readable-stream-3.6.0" sources."restore-cursor-3.1.0" sources."safe-buffer-5.2.1" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."util-deprecate-1.0.2" sources."wasm-feature-detect-1.2.11" @@ -69442,7 +70179,7 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-module-transforms-7.15.7" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.15.4" @@ -69450,12 +70187,12 @@ in sources."@babel/helper-simple-access-7.15.4" sources."@babel/helper-skip-transparent-expression-wrappers-7.15.4" sources."@babel/helper-split-export-declaration-7.15.4" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.15.4" sources."@babel/helpers-7.15.4" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.5" + sources."@babel/parser-7.15.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" sources."@babel/plugin-proposal-async-generator-functions-7.15.4" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -69466,7 +70203,7 @@ in sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" sources."@babel/plugin-proposal-numeric-separator-7.14.5" - sources."@babel/plugin-proposal-object-rest-spread-7.14.7" + sources."@babel/plugin-proposal-object-rest-spread-7.15.6" sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-proposal-private-methods-7.14.5" @@ -69522,7 +70259,7 @@ in sources."@babel/plugin-transform-typescript-7.15.4" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.15.4" + sources."@babel/preset-env-7.15.6" sources."@babel/preset-flow-7.14.5" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.15.0" @@ -69536,7 +70273,7 @@ in sources."@babel/runtime-7.15.4" sources."@babel/template-7.15.4" sources."@babel/traverse-7.15.4" - sources."@babel/types-7.15.4" + sources."@babel/types-7.15.6" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -69589,7 +70326,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -69604,13 +70341,13 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.13" sources."@vue/cli-ui-addon-widgets-4.5.13" - (sources."@vue/compiler-core-3.2.11" // { + (sources."@vue/compiler-core-3.2.16" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.2.11" - sources."@vue/shared-3.2.11" + sources."@vue/compiler-dom-3.2.16" + sources."@vue/shared-3.2.16" sources."@wry/equality-0.1.11" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -69678,7 +70415,7 @@ in sources."babel-core-7.0.0-bridge.0" sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-polyfill-corejs2-0.2.2" - sources."babel-plugin-polyfill-corejs3-0.2.4" + sources."babel-plugin-polyfill-corejs3-0.2.5" sources."babel-plugin-polyfill-regenerator-0.2.2" sources."backo2-1.0.2" sources."balanced-match-1.0.2" @@ -69712,7 +70449,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."browserslist-4.17.0" + sources."browserslist-4.17.1" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -69732,7 +70469,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001255" + sources."caniuse-lite-1.0.30001260" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -69767,7 +70504,6 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.4.0" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."commander-2.20.3" @@ -69789,12 +70525,12 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.17.3" // { + (sources."core-js-compat-3.18.0" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-js-pure-3.17.3" + sources."core-js-pure-3.18.0" sources."core-util-is-1.0.2" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -69860,7 +70596,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.833" + sources."electron-to-chromium-1.3.849" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -69922,7 +70658,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-2.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.12.0" + sources."fastq-1.13.0" sources."fd-slicer-1.1.0" sources."figures-3.2.0" sources."file-type-8.1.0" @@ -69943,7 +70679,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.159.0" + sources."flow-parser-0.160.2" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -69971,7 +70707,7 @@ in sources."getpass-0.1.7" sources."git-clone-0.1.0" sources."git-config-path-1.0.1" - sources."glob-7.1.7" + sources."glob-7.2.0" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -70168,6 +70904,7 @@ in sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."mute-stream-0.0.8" + sources."nanocolors-0.1.12" sources."nanoid-2.1.11" (sources."nanomatch-1.2.13" // { dependencies = [ @@ -70185,7 +70922,7 @@ in sources."neo-async-2.6.2" sources."nice-try-1.0.5" sources."node-dir-0.1.17" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" sources."node-ipc-9.2.1" sources."node-modules-regexp-1.0.0" (sources."node-notifier-9.0.1" // { @@ -70197,7 +70934,7 @@ in sources."which-2.0.2" ]; }) - sources."node-releases-1.1.75" + sources."node-releases-1.1.76" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -70227,7 +70964,7 @@ in }) sources."object-inspect-1.11.0" sources."object-keys-1.1.1" - sources."object-path-0.11.7" + sources."object-path-0.11.8" sources."object-visit-1.0.1" sources."object.assign-4.1.2" sources."object.getownpropertydescriptors-2.1.2" @@ -70287,7 +71024,7 @@ in }) sources."posix-character-classes-0.1.1" sources."prepend-http-2.0.0" - sources."prismjs-1.24.1" + sources."prismjs-1.25.0" sources."private-0.1.8" sources."process-exists-3.1.0" sources."process-nextick-args-2.0.1" @@ -70321,7 +71058,7 @@ in ]; }) sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-8.2.0" + sources."regenerate-unicode-properties-9.0.0" sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" (sources."regex-not-1.0.2" // { @@ -70330,9 +71067,9 @@ in sources."is-extendable-1.0.1" ]; }) - sources."regexpu-core-4.7.1" + sources."regexpu-core-4.8.0" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.9" // { + (sources."regjsparser-0.7.0" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -70383,7 +71120,7 @@ in sources."shellwords-0.1.1" sources."shortid-2.2.16" sources."side-channel-1.0.4" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."slash-3.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -70457,7 +71194,7 @@ in sources."steno-0.4.4" sources."streamsearch-0.1.2" sources."strict-uri-encode-1.1.0" - (sources."string-width-4.2.2" // { + (sources."string-width-4.2.3" // { dependencies = [ sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -70470,9 +71207,9 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."strip-ansi-6.0.0" // { + (sources."strip-ansi-6.0.1" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" ]; }) sources."strip-dirs-2.1.0" @@ -70530,6 +71267,7 @@ in sources."to-regex-range-2.1.1" sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" + sources."tr46-0.0.3" sources."trim-repeated-1.0.0" sources."ts-invariant-0.4.4" sources."tslib-1.14.1" @@ -70540,10 +71278,10 @@ in sources."typescript-4.1.6" sources."unbox-primitive-1.0.1" sources."unbzip2-stream-1.4.3" - sources."unicode-canonical-property-names-ecmascript-1.0.4" - sources."unicode-match-property-ecmascript-1.0.4" - sources."unicode-match-property-value-ecmascript-1.2.0" - sources."unicode-property-aliases-ecmascript-1.1.0" + sources."unicode-canonical-property-names-ecmascript-2.0.0" + sources."unicode-match-property-ecmascript-2.0.0" + sources."unicode-match-property-value-ecmascript-2.0.0" + sources."unicode-property-aliases-ecmascript-2.0.0" sources."union-value-1.0.1" sources."universalify-0.1.2" sources."unpipe-1.0.0" @@ -70592,6 +71330,8 @@ in }) sources."watch-1.0.2" sources."wcwidth-1.0.1" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."widest-line-3.1.0" @@ -70758,11 +71498,11 @@ in dependencies = [ sources."@babel/code-frame-7.14.5" sources."@babel/generator-7.15.4" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.5" + sources."@babel/parser-7.15.7" sources."@babel/template-7.15.4" - sources."@babel/types-7.15.4" + sources."@babel/types-7.15.6" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -70830,10 +71570,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.16.3"; + version = "1.16.4"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.16.3.tgz"; - sha512 = "Y4pSzPpJHovMA6uqpRTztraKFtchQm9rPbYd9s6UkEuqpYs45hFSY4j+ezkvGxU6Hvn2L6OLc+5dlaOr+P+QKQ=="; + url = "https://registry.npmjs.org/alloy/-/alloy-1.16.4.tgz"; + sha512 = "kiIlTMDCEP1PP9QtFQywlN/P/Ji0V+zbwCWkG8gF6V6uRIytd2bkpHP4iaFdV7fQJTrQSd9h71Wj4x60jGt6Mg=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -70854,38 +71594,37 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-module-transforms-7.15.7" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-replace-supers-7.15.4" sources."@babel/helper-simple-access-7.15.4" sources."@babel/helper-split-export-declaration-7.15.4" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.15.4" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.5" + sources."@babel/parser-7.15.7" sources."@babel/template-7.15.4" sources."@babel/traverse-7.15.4" - sources."@babel/types-7.15.4" + sources."@babel/types-7.15.6" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" sources."async-3.2.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.17.0" - sources."caniuse-lite-1.0.30001255" + sources."browserslist-4.17.1" + sources."caniuse-lite-1.0.30001260" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.4.0" sources."colors-1.4.0" - sources."commander-8.1.0" + sources."commander-8.2.0" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.833" + sources."electron-to-chromium-1.3.849" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -70931,7 +71670,8 @@ in sources."minimist-1.2.5" sources."moment-2.29.1" sources."ms-2.1.2" - sources."node-releases-1.1.75" + sources."nanocolors-0.1.12" + sources."node-releases-1.1.76" sources."node.extend-2.0.2" (sources."nomnom-1.8.1" // { dependencies = [ @@ -70971,22 +71711,22 @@ in asar = nodeEnv.buildNodePackage { name = "asar"; packageName = "asar"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/asar/-/asar-3.0.3.tgz"; - sha512 = "k7zd+KoR+n8pl71PvgElcoKHrVNiSXtw7odKbyNpmgKe7EGRF9Pnu3uLOukD37EvavKwVFxOUpqXTIZC5B5Pmw=="; + url = "https://registry.npmjs.org/asar/-/asar-3.1.0.tgz"; + sha512 = "vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ=="; }; dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" sources."commander-5.1.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."minimatch-3.0.4" @@ -71007,19 +71747,19 @@ in autoprefixer = nodeEnv.buildNodePackage { name = "autoprefixer"; packageName = "autoprefixer"; - version = "10.3.4"; + version = "10.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.4.tgz"; - sha512 = "EKjKDXOq7ug+jagLzmnoTRpTT0q1KVzEJqrJd0hCBa7FiG0WbFOBCcJCy2QkW1OckpO3qgttA1aWjVbeIPAecw=="; + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.5.tgz"; + sha512 = "2H5kQSsyoOMdIehTzIt/sC9ZDIgWqlkG/dbevm9B9xQZ1TDPBHpNUDW5ENqqQQzuaBWEo75JkV0LJe+o5Lnr5g=="; }; dependencies = [ - sources."browserslist-4.17.0" - sources."caniuse-lite-1.0.30001255" - sources."colorette-1.4.0" - sources."electron-to-chromium-1.3.833" + sources."browserslist-4.17.1" + sources."caniuse-lite-1.0.30001260" + sources."electron-to-chromium-1.3.849" sources."escalade-3.1.1" sources."fraction.js-4.1.1" - sources."node-releases-1.1.75" + sources."nanocolors-0.1.12" + sources."node-releases-1.1.76" sources."normalize-range-0.1.2" sources."postcss-value-parser-4.1.0" ]; @@ -71043,14 +71783,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.985.0" // { + (sources."aws-sdk-2.994.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -71079,7 +71819,7 @@ in sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-8.1.0" + sources."commander-8.2.0" sources."concat-map-0.0.1" sources."core-util-is-1.0.3" sources."css-select-4.1.3" @@ -71123,7 +71863,7 @@ in }) sources."get-stream-5.2.0" sources."get-uri-3.0.2" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."htmlparser2-6.1.0" @@ -71135,7 +71875,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-8.1.2" + sources."inquirer-8.1.5" sources."ip-1.1.5" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" @@ -71156,7 +71896,7 @@ in sources."mute-stream-0.0.8" sources."netmask-2.0.2" sources."node-fetch-2.6.1" - sources."nth-check-2.0.0" + sources."nth-check-2.0.1" sources."once-1.4.0" sources."onetime-5.1.2" sources."optionator-0.8.3" @@ -71179,7 +71919,7 @@ in sources."proxy-from-env-1.1.0" sources."pump-3.0.0" sources."punycode-1.3.2" - (sources."puppeteer-10.2.0" // { + (sources."puppeteer-10.4.0" // { dependencies = [ sources."debug-4.3.1" ]; @@ -71199,15 +71939,15 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.1" sources."setprototypeof-1.1.1" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" sources."statuses-1.5.0" - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" (sources."tar-fs-2.0.0" // { dependencies = [ @@ -71254,18 +71994,19 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "10.12.0"; + version = "10.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.12.0.tgz"; - sha512 = "G8UVRAfWYPQSJwLiw1eqh61jfDSFKt0cDEfNbTzgv9Z5X+WnaGvk/0XzHCpoqNfHqRxRO2Zf9KHkFXS007bm5A=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.18.1.tgz"; + sha512 = "QrMPcXaeybFz+kD4FlUr7phxJN/jSXoaxOmNtFQ+ZtPCc99m7IZFqP4Hk3Fj0OxcYHk1L1FlGN1sOoymuDaBtw=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" + sources."@alexbosworth/node-fetch-2.6.2" sources."@alexbosworth/saxophone-0.6.2" sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.3.7" // { dependencies = [ - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" ]; }) sources."@grpc/proto-loader-0.6.4" @@ -71300,7 +72041,7 @@ in sources."@types/ws-7.4.7" sources."abort-controller-3.0.0" sources."accepts-1.3.7" - sources."ajv-8.6.2" + sources."ajv-8.6.3" sources."ansi-0.3.1" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -71363,14 +72104,14 @@ in ]; }) sources."bolt09-0.1.5" - (sources."boxen-5.0.1" // { + (sources."boxen-5.1.2" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."chalk-4.1.2" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."type-fest-0.20.2" ]; @@ -71391,7 +72132,11 @@ in ]; }) sources."camelcase-6.2.0" - sources."caporal-1.4.0" + (sources."caporal-1.4.0" // { + dependencies = [ + sources."colorette-1.4.0" + ]; + }) sources."cbor-8.0.0" sources."cert-info-1.5.1" (sources."chalk-1.1.3" // { @@ -71410,10 +72155,10 @@ in sources."cli-width-2.2.1" (sources."cliui-7.0.4" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."clone-1.0.4" @@ -71421,7 +72166,7 @@ in sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colorette-1.3.0" + sources."colorette-2.0.2" sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."commander-6.2.1" @@ -71526,10 +72271,10 @@ in sources."imurmurhash-0.1.4" sources."inherits-2.0.4" sources."ini-2.0.0" - (sources."inquirer-8.1.2" // { + (sources."inquirer-8.1.5" // { dependencies = [ sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."chalk-4.1.2" sources."cli-cursor-3.1.0" @@ -71540,8 +72285,8 @@ in sources."mute-stream-0.0.8" sources."onetime-5.1.2" sources."restore-cursor-3.1.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."tmp-0.0.33" ]; @@ -71589,36 +72334,47 @@ in sources."bn.js-5.2.0" ]; }) - sources."ln-accounting-5.0.1" - (sources."ln-service-52.1.0" // { + (sources."ln-accounting-5.0.3" // { dependencies = [ - sources."@types/node-16.7.6" + sources."@grpc/proto-loader-0.6.5" + sources."@types/node-16.9.1" sources."bn.js-5.2.0" - sources."lightning-4.2.1" - sources."ws-8.2.1" + sources."lightning-4.5.0" + sources."ln-service-52.4.0" + sources."ws-8.2.2" ]; }) - (sources."ln-sync-0.4.7" // { + (sources."ln-service-52.6.0" // { dependencies = [ - sources."@grpc/grpc-js-1.3.6" - sources."@types/node-16.3.3" - sources."@types/request-2.48.6" - sources."async-3.2.0" + sources."@grpc/proto-loader-0.6.5" + sources."@types/node-16.9.1" sources."bn.js-5.2.0" - sources."cbor-7.0.6" - sources."colorette-1.2.2" - sources."lightning-3.4.0" - sources."nofilter-2.0.3" + sources."lightning-4.7.0" + sources."ws-8.2.2" ]; }) - (sources."ln-telegram-3.2.11" // { + (sources."ln-sync-2.0.1" // { dependencies = [ + sources."@grpc/proto-loader-0.6.5" + sources."@types/node-16.9.1" + sources."bn.js-5.2.0" + sources."lightning-4.7.0" + ]; + }) + (sources."ln-telegram-3.3.0" // { + dependencies = [ + sources."@grpc/proto-loader-0.6.5" sources."@types/node-16.6.1" - sources."bech32-2.0.0" sources."bn.js-5.2.0" - sources."goldengate-10.3.0" + sources."colorette-1.4.0" sources."lightning-4.1.0" sources."ln-service-52.0.1" + (sources."ln-sync-2.0.0" // { + dependencies = [ + sources."@types/node-16.9.1" + sources."lightning-4.6.0" + ]; + }) sources."ws-8.1.0" ]; }) @@ -71677,7 +72433,7 @@ in sources."negotiator-0.6.2" sources."node-addon-api-2.0.2" sources."node-fetch-2.6.1" - sources."node-gyp-build-4.2.3" + sources."node-gyp-build-4.3.0" sources."nofilter-3.0.3" sources."normalize-url-4.5.1" sources."npmlog-2.0.4" @@ -71689,13 +72445,13 @@ in sources."onetime-1.1.0" (sources."ora-5.4.1" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."chalk-4.1.2" sources."cli-cursor-3.1.0" sources."onetime-5.1.2" sources."restore-cursor-3.1.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" ]; }) @@ -71708,23 +72464,7 @@ in sources."semver-6.3.0" ]; }) - (sources."paid-services-2.0.1" // { - dependencies = [ - sources."@grpc/grpc-js-1.3.4" - sources."@grpc/proto-loader-0.6.3" - sources."@types/express-4.17.12" - sources."@types/node-15.12.5" - sources."@types/request-2.48.5" - sources."@types/ws-7.4.5" - sources."async-3.2.0" - sources."bn.js-5.2.0" - sources."cbor-7.0.5" - sources."lightning-3.3.12" - sources."ln-service-51.8.5" - sources."nofilter-2.0.3" - sources."ws-7.5.0" - ]; - }) + sources."paid-services-3.0.0" sources."parseurl-1.3.3" sources."path-to-regexp-0.1.7" sources."pinkie-2.0.4" @@ -71753,7 +72493,7 @@ in sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" ]; }) sources."proxy-addr-2.0.7" @@ -71807,7 +72547,7 @@ in sources."serve-static-1.14.1" sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."sjcl-1.0.8" (sources."slice-ansi-4.0.0" // { dependencies = [ @@ -71826,10 +72566,10 @@ in sources."supports-color-2.0.0" (sources."table-6.7.1" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) (sources."tabtab-2.2.2" // { @@ -71841,7 +72581,7 @@ in sources."strip-ansi-3.0.1" ]; }) - (sources."telegraf-4.4.1" // { + (sources."telegraf-4.4.2" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -71883,10 +72623,10 @@ in sources."wcwidth-1.0.1" (sources."widest-line-3.1.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."wif-2.0.6" @@ -71899,11 +72639,11 @@ in }) (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" @@ -71914,10 +72654,10 @@ in sources."yallist-4.0.0" (sources."yargs-16.2.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."yargs-parser-20.2.9" @@ -71991,7 +72731,7 @@ in sources."fs.realpath-1.0.0" sources."fuzzy-search-3.2.1" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."html-encoding-sniffer-1.0.2" @@ -72175,7 +72915,7 @@ in sources."safe-buffer-5.1.2" sources."semver-5.7.1" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."simple-concat-1.0.1" sources."simple-get-3.1.0" sources."state-toggle-1.0.3" @@ -72322,7 +73062,7 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.49.0" + sources."mime-db-1.50.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -72353,11 +73093,11 @@ in sources."resolve-1.20.0" (sources."rimraf-2.7.1" // { dependencies = [ - sources."glob-7.1.7" + sources."glob-7.2.0" ]; }) sources."semver-5.7.1" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" sources."spdx-correct-3.1.1" @@ -72479,7 +73219,7 @@ in sources."get-assigned-identifiers-1.2.0" sources."get-intrinsic-1.1.1" sources."get-symbol-description-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."has-1.0.3" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" @@ -72620,6 +73360,255 @@ in bypassCache = true; reconstructLock = true; }; + browser-sync = nodeEnv.buildNodePackage { + name = "browser-sync"; + packageName = "browser-sync"; + version = "2.27.5"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-sync/-/browser-sync-2.27.5.tgz"; + sha512 = "0GMEPDqccbTxwYOUGCk5AZloDj9I/1eDZCLXUKXu7iBJPznGGOnMHs88mrhaFL0fTA0R23EmsXX9nLZP+k5YzA=="; + }; + dependencies = [ + sources."accepts-1.3.7" + sources."after-0.8.2" + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."anymatch-3.1.2" + sources."arraybuffer.slice-0.0.7" + sources."async-1.5.2" + sources."async-each-series-0.1.1" + sources."axios-0.21.4" + sources."backo2-1.0.2" + sources."balanced-match-1.0.2" + sources."base64-arraybuffer-0.1.4" + sources."base64id-2.0.0" + sources."batch-0.6.1" + sources."binary-extensions-2.2.0" + sources."blob-0.0.5" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."browser-sync-client-2.27.5" + sources."browser-sync-ui-2.27.5" + sources."bs-recipes-1.3.4" + sources."bs-snippet-injector-2.0.1" + sources."bytes-3.1.0" + sources."camelcase-5.3.1" + sources."chalk-1.1.3" + sources."chokidar-3.5.2" + (sources."cliui-7.0.4" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."strip-ansi-6.0.1" + ]; + }) + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."commander-2.20.3" + sources."component-bind-1.0.0" + sources."component-emitter-1.3.0" + sources."component-inherit-0.0.3" + sources."concat-map-0.0.1" + (sources."connect-3.6.6" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."connect-history-api-fallback-1.6.0" + sources."cookie-0.4.1" + sources."debug-3.1.0" + sources."decamelize-1.2.0" + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."dev-ip-1.0.1" + sources."dlv-1.1.3" + sources."easy-extender-2.3.4" + sources."eazy-logger-3.1.0" + sources."ee-first-1.1.1" + sources."emoji-regex-8.0.0" + sources."encodeurl-1.0.2" + (sources."engine.io-3.5.0" // { + dependencies = [ + sources."debug-4.1.1" + sources."ms-2.1.3" + ]; + }) + sources."engine.io-client-3.5.2" + sources."engine.io-parser-2.2.1" + sources."escalade-3.1.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-1.0.5" + sources."etag-1.8.1" + sources."eventemitter3-4.0.7" + sources."fill-range-7.0.1" + (sources."finalhandler-1.1.0" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."find-up-4.1.0" + sources."follow-redirects-1.14.4" + sources."fresh-0.5.2" + sources."fs-extra-3.0.1" + sources."fsevents-2.3.2" + sources."get-caller-file-2.0.5" + sources."glob-parent-5.1.2" + sources."graceful-fs-4.2.8" + sources."has-ansi-2.0.0" + sources."has-binary2-1.0.3" + sources."has-cors-1.1.0" + (sources."http-errors-1.7.3" // { + dependencies = [ + sources."statuses-1.5.0" + ]; + }) + sources."http-proxy-1.18.1" + sources."iconv-lite-0.4.24" + sources."immutable-3.8.2" + sources."indexof-0.0.1" + sources."inherits-2.0.4" + sources."is-binary-path-2.1.0" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."is-number-like-1.0.8" + sources."is-wsl-1.1.0" + sources."isarray-2.0.1" + sources."jsonfile-3.0.1" + sources."limiter-1.1.5" + (sources."localtunnel-2.0.2" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + sources."yargs-17.1.1" + ]; + }) + sources."locate-path-5.0.0" + sources."lodash-4.17.21" + sources."lodash.isfinite-3.3.2" + sources."micromatch-4.0.4" + sources."mime-1.4.1" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" + sources."minimatch-3.0.4" + sources."mitt-1.2.0" + sources."ms-2.0.0" + sources."negotiator-0.6.2" + sources."normalize-path-3.0.0" + sources."on-finished-2.3.0" + sources."openurl-1.1.1" + sources."opn-5.3.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."parseqs-0.0.6" + sources."parseuri-0.0.6" + sources."parseurl-1.3.3" + sources."path-exists-4.0.0" + sources."picomatch-2.3.0" + sources."portscanner-2.1.1" + sources."qs-6.2.3" + sources."range-parser-1.2.1" + sources."raw-body-2.4.1" + sources."readdirp-3.6.0" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."requires-port-1.0.0" + (sources."resp-modifier-6.0.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."rx-4.1.0" + sources."rxjs-5.5.12" + sources."safer-buffer-2.1.2" + (sources."send-0.16.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."http-errors-1.6.3" + sources."inherits-2.0.3" + sources."setprototypeof-1.1.0" + sources."statuses-1.4.0" + ]; + }) + (sources."serve-index-1.9.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."http-errors-1.6.3" + sources."inherits-2.0.3" + sources."setprototypeof-1.1.0" + sources."statuses-1.5.0" + ]; + }) + sources."serve-static-1.13.2" + sources."server-destroy-1.0.1" + sources."set-blocking-2.0.0" + sources."setprototypeof-1.1.1" + (sources."socket.io-2.4.0" // { + dependencies = [ + sources."component-emitter-1.2.1" + sources."debug-4.1.1" + sources."ms-2.1.3" + sources."socket.io-parser-3.4.1" + ]; + }) + sources."socket.io-adapter-1.1.2" + sources."socket.io-client-2.4.0" + sources."socket.io-parser-3.3.2" + sources."statuses-1.3.1" + sources."stream-throttle-0.1.3" + (sources."string-width-4.2.3" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."strip-ansi-6.0.1" + ]; + }) + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."symbol-observable-1.0.1" + sources."tfunk-4.0.0" + sources."to-array-0.1.4" + sources."to-regex-range-5.0.1" + sources."toidentifier-1.0.0" + sources."ua-parser-js-0.7.28" + sources."universalify-0.1.2" + sources."unpipe-1.0.0" + sources."utils-merge-1.0.1" + sources."which-module-2.0.0" + (sources."wrap-ansi-7.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" + sources."strip-ansi-6.0.1" + ]; + }) + sources."ws-7.4.6" + sources."xmlhttprequest-ssl-1.6.3" + sources."y18n-5.0.8" + (sources."yargs-15.4.1" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" + sources."cliui-6.0.0" + sources."strip-ansi-6.0.1" + sources."wrap-ansi-6.2.0" + sources."y18n-4.0.3" + sources."yargs-parser-18.1.3" + ]; + }) + sources."yargs-parser-20.2.9" + sources."yeast-0.1.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Live CSS Reload & Browser Syncing"; + homepage = "https://browsersync.io/"; + license = "Apache-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; btc-rpc-explorer = nodeEnv.buildNodePackage { name = "btc-rpc-explorer"; packageName = "btc-rpc-explorer"; @@ -72630,10 +73619,10 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.5" - sources."@babel/types-7.15.4" + sources."@babel/parser-7.15.7" + sources."@babel/types-7.15.6" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@types/minimist-1.2.2" @@ -72796,7 +73785,7 @@ in ]; }) sources."find-up-4.1.0" - sources."follow-redirects-1.14.3" + sources."follow-redirects-1.14.4" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.2.0" @@ -72865,7 +73854,7 @@ in sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lru-cache-6.0.0" - sources."map-obj-4.2.1" + sources."map-obj-4.3.0" (sources."markdown-it-12.2.0" // { dependencies = [ sources."argparse-2.0.1" @@ -73094,7 +74083,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -73156,7 +74145,7 @@ in sources."co-3.1.0" sources."codepage-1.4.0" sources."combined-stream-1.0.8" - sources."commander-8.1.0" + sources."commander-8.2.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { @@ -73215,7 +74204,7 @@ in sources."get-browser-rtc-1.1.0" sources."get-stdin-4.0.1" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."got-1.2.2" sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" @@ -73391,7 +74380,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."semver-5.7.1" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" (sources."simple-peer-6.4.4" // { @@ -73496,28 +74485,627 @@ in bypassCache = true; reconstructLock = true; }; + carbon-now-cli = nodeEnv.buildNodePackage { + name = "carbon-now-cli"; + packageName = "carbon-now-cli"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/carbon-now-cli/-/carbon-now-cli-1.4.0.tgz"; + sha512 = "VVwArD/VAKG2p7Om8x5E7eEHNS/7b2agp8o7zM6i0XXento1XTkLynaQRsuwCtjJwSSvOvNTyRN/akiFQhGBDA=="; + }; + dependencies = [ + sources."@mrmlnc/readdir-enhanced-2.2.1" + sources."@nodelib/fs.stat-1.1.3" + sources."@samverschueren/stream-to-observable-0.3.1" + (sources."@sindresorhus/jimp-0.3.0" // { + dependencies = [ + sources."mime-1.6.0" + sources."minimist-0.0.8" + sources."mkdirp-0.5.1" + ]; + }) + sources."agent-base-4.3.0" + sources."ansi-align-2.0.0" + sources."ansi-escapes-3.2.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."any-observable-0.3.0" + (sources."app-path-2.2.0" // { + dependencies = [ + sources."execa-0.4.0" + sources."npm-run-path-1.0.0" + sources."path-key-1.0.0" + ]; + }) + sources."arch-2.2.0" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-find-index-1.0.2" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."array-unique-0.3.2" + sources."arrify-1.0.1" + sources."assign-symbols-1.0.0" + sources."async-limiter-1.0.1" + sources."atob-2.1.2" + sources."balanced-match-1.0.2" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."base64-js-1.5.1" + sources."bignumber.js-2.4.0" + sources."bmp-js-0.0.3" + sources."boxen-1.3.0" + sources."brace-expansion-1.1.11" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."buffer-crc32-0.2.13" + sources."buffer-equal-0.0.1" + sources."buffer-from-1.1.2" + sources."bytes-3.1.0" + sources."cache-base-1.0.1" + sources."call-me-maybe-1.0.1" + sources."camelcase-4.1.0" + sources."camelcase-keys-4.2.0" + sources."capture-stack-trace-1.0.1" + sources."chalk-2.4.2" + sources."chardet-0.7.0" + sources."ci-info-1.6.0" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."cli-boxes-1.0.0" + sources."cli-cursor-2.1.0" + (sources."cli-truncate-0.2.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."cli-width-2.2.1" + sources."clipboardy-1.2.3" + sources."code-point-at-1.1.0" + sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."component-emitter-1.3.0" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."configstore-3.1.5" + sources."copy-descriptor-0.1.1" + sources."core-util-is-1.0.3" + sources."create-error-class-3.0.2" + sources."cross-spawn-5.1.0" + sources."cross-spawn-async-2.2.5" + sources."crypto-random-string-1.0.0" + sources."currently-unhandled-0.4.1" + sources."date-fns-1.30.1" + sources."debug-2.6.9" + sources."decamelize-1.2.0" + (sources."decamelize-keys-1.1.0" // { + dependencies = [ + sources."map-obj-1.0.1" + ]; + }) + sources."decode-uri-component-0.2.0" + sources."deep-extend-0.6.0" + sources."define-property-2.0.2" + (sources."del-3.0.0" // { + dependencies = [ + (sources."globby-6.1.0" // { + dependencies = [ + sources."pify-2.3.0" + ]; + }) + ]; + }) + sources."depd-1.1.2" + sources."dir-glob-2.0.0" + sources."dom-walk-0.1.2" + sources."dot-prop-4.2.1" + sources."duplexer3-0.1.4" + sources."elegant-spinner-1.0.1" + sources."error-ex-1.3.2" + sources."es6-promise-4.2.8" + sources."es6-promisify-5.0.0" + sources."escape-string-regexp-1.0.5" + sources."execa-0.8.0" + sources."exif-parser-0.1.12" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."external-editor-3.1.0" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + sources."extract-zip-1.7.0" + sources."fast-glob-2.2.7" + sources."fd-slicer-1.1.0" + sources."figures-2.0.0" + sources."file-exists-5.0.1" + sources."file-extension-4.0.5" + sources."file-type-3.9.0" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."filter-obj-1.1.0" + sources."find-up-2.1.0" + sources."for-in-1.0.2" + sources."fragment-cache-0.2.1" + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + sources."get-stdin-6.0.0" + sources."get-stream-3.0.0" + sources."get-value-2.0.6" + sources."glob-7.2.0" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."glob-to-regexp-0.3.0" + sources."global-4.4.0" + sources."global-dirs-0.1.1" + sources."globby-8.0.2" + sources."got-6.7.1" + sources."graceful-fs-4.2.8" + sources."has-1.0.3" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + ]; + }) + sources."has-flag-3.0.0" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."hosted-git-info-2.8.9" + sources."http-errors-1.7.3" + (sources."https-proxy-agent-2.2.4" // { + dependencies = [ + sources."debug-3.2.7" + sources."ms-2.1.3" + ]; + }) + sources."iconv-lite-0.4.24" + sources."ignore-3.3.10" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" + sources."indent-string-3.2.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.8" + sources."inquirer-6.5.2" + sources."is-accessor-descriptor-1.0.0" + sources."is-arrayish-0.2.1" + sources."is-buffer-1.1.6" + sources."is-ci-1.2.1" + sources."is-core-module-2.6.0" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-function-1.0.2" + sources."is-glob-4.0.1" + sources."is-installed-globally-0.1.0" + sources."is-npm-1.0.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-obj-1.0.1" + sources."is-observable-1.1.0" + sources."is-path-cwd-1.0.0" + sources."is-path-in-cwd-1.0.1" + sources."is-path-inside-1.0.1" + sources."is-plain-obj-1.1.0" + sources."is-plain-object-2.0.4" + sources."is-promise-2.2.2" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.2.0" + sources."is-stream-1.1.0" + sources."is-windows-1.0.2" + sources."is-wsl-1.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."iterm2-version-3.0.0" + sources."jpeg-js-0.2.0" + sources."jpgjs-git://github.com/notmasteryet/jpgjs" + sources."json-parse-better-errors-1.0.2" + sources."jsonfile-5.0.0" + sources."kind-of-6.0.3" + sources."latest-version-3.1.0" + (sources."listr-0.14.3" // { + dependencies = [ + sources."p-map-2.1.0" + ]; + }) + sources."listr-silent-renderer-1.1.1" + (sources."listr-update-renderer-0.5.0" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."figures-1.7.0" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + sources."listr-verbose-renderer-0.5.0" + (sources."load-bmfont-1.4.1" // { + dependencies = [ + sources."mime-1.6.0" + ]; + }) + sources."load-json-file-4.0.0" + sources."locate-path-2.0.0" + sources."lodash-4.17.21" + (sources."log-symbols-1.0.2" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."ansi-styles-2.2.1" + sources."chalk-1.1.3" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + ]; + }) + sources."log-update-2.3.0" + sources."loud-rejection-1.6.0" + sources."lowercase-keys-1.0.1" + sources."lru-cache-4.1.5" + sources."make-dir-1.3.0" + sources."map-cache-0.2.2" + sources."map-obj-2.0.0" + sources."map-visit-1.0.0" + sources."meow-5.0.0" + sources."merge2-1.4.1" + sources."micromatch-3.1.10" + sources."mime-2.5.2" + sources."mimic-fn-1.2.0" + sources."min-document-2.19.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."minimist-options-3.0.2" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."mkdirp-0.5.5" + sources."ms-2.0.0" + sources."mute-stream-0.0.7" + sources."nanoid-2.1.11" + sources."nanomatch-1.2.13" + sources."normalize-package-data-2.5.0" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" + sources."once-1.4.0" + sources."onetime-2.0.1" + sources."opn-5.5.0" + sources."os-tmpdir-1.0.2" + sources."p-finally-1.0.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-map-1.2.0" + sources."p-try-1.0.0" + sources."package-json-4.0.1" + sources."pako-1.0.11" + sources."parse-bmfont-ascii-1.0.6" + sources."parse-bmfont-binary-1.0.6" + sources."parse-bmfont-xml-1.1.4" + sources."parse-headers-2.0.4" + sources."parse-json-4.0.0" + sources."pascalcase-0.1.1" + sources."path-dirname-1.0.2" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-is-inside-1.0.2" + sources."path-key-2.0.1" + sources."path-parse-1.0.7" + sources."path-type-3.0.0" + sources."pend-1.2.0" + sources."phin-2.9.3" + sources."pify-3.0.0" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + sources."pixelmatch-4.0.2" + (sources."plist-3.0.4" // { + dependencies = [ + sources."xmlbuilder-9.0.7" + ]; + }) + sources."pngjs-3.4.0" + sources."posix-character-classes-0.1.1" + sources."prepend-http-1.0.4" + sources."process-0.11.10" + sources."process-nextick-args-2.0.1" + sources."progress-2.0.3" + sources."proxy-from-env-1.1.0" + sources."pseudomap-1.0.2" + (sources."puppeteer-1.20.0" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) + sources."query-string-6.14.1" + sources."quick-lru-1.1.0" + sources."raw-body-2.4.1" + sources."rc-1.2.8" + sources."read-pkg-3.0.0" + sources."read-pkg-up-3.0.0" + sources."readable-stream-2.3.7" + sources."redent-2.0.0" + sources."regex-not-1.0.2" + sources."registry-auth-token-3.4.0" + sources."registry-url-3.1.0" + sources."repeat-element-1.1.4" + sources."repeat-string-1.6.1" + sources."resolve-1.20.0" + sources."resolve-url-0.2.1" + sources."restore-cursor-2.0.0" + sources."ret-0.1.15" + sources."rimraf-2.7.1" + sources."run-async-2.4.1" + sources."rxjs-6.6.7" + sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-5.7.1" + sources."semver-diff-2.1.0" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."setprototypeof-1.1.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.4" + sources."slash-1.0.0" + sources."slice-ansi-0.0.4" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.3" + sources."source-map-url-0.4.1" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.10" + sources."split-on-first-1.1.0" + sources."split-string-3.1.0" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."statuses-1.5.0" + sources."strict-uri-encode-2.0.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + sources."string_decoder-1.1.1" + (sources."strip-ansi-5.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + ]; + }) + sources."strip-bom-3.0.0" + sources."strip-eof-1.0.0" + sources."strip-indent-2.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-5.5.0" + sources."symbol-observable-1.2.0" + sources."temp-dir-1.0.0" + sources."tempy-0.2.1" + sources."term-img-3.0.0" + (sources."term-size-1.2.0" // { + dependencies = [ + sources."execa-0.7.0" + ]; + }) + sources."terminal-image-0.1.2" + sources."through-2.3.8" + sources."timed-out-4.0.1" + sources."tinycolor2-1.4.2" + sources."tmp-0.0.33" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."toidentifier-1.0.0" + sources."trim-newlines-2.0.0" + sources."tslib-1.14.1" + sources."typedarray-0.0.6" + sources."union-value-1.0.1" + sources."unique-string-1.0.0" + sources."universalify-0.1.2" + sources."unpipe-1.0.0" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."unzip-response-2.0.1" + sources."update-notifier-2.5.0" + sources."urix-0.1.0" + sources."url-parse-lax-1.0.0" + sources."use-3.1.1" + sources."utif-1.3.0" + sources."util-deprecate-1.0.2" + sources."validate-npm-package-license-3.0.4" + sources."which-1.3.1" + sources."widest-line-2.0.1" + (sources."wrap-ansi-3.0.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + sources."wrappy-1.0.2" + sources."write-file-atomic-2.4.3" + sources."ws-6.2.2" + sources."xdg-basedir-3.0.0" + sources."xhr-2.6.0" + sources."xml-parse-from-string-1.0.1" + sources."xml2js-0.4.23" + sources."xmlbuilder-11.0.1" + sources."xtend-4.0.2" + sources."yallist-2.1.2" + sources."yargs-parser-10.1.0" + sources."yauzl-2.10.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Beautiful images of your code — from right inside your terminal."; + homepage = "https://github.com/mixn/carbon-now-cli#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "1.0.0-beta.50"; + version = "1.0.0-beta.53"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.50.tgz"; - sha512 = "KLvdcMqAYTbrMp4ru2m5/a5pATm6Jf5yMuXmkRTI8MgCG4iVMeSOFAfZMqWpDr9OGHOTx+7Gn1ryC1hBHqYMYw=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.53.tgz"; + sha512 = "capf4GLjMJ0LDCI/AwmhTGjlNvw4ZPSR+jOxwSY3LazA7GuQMpPGAhaLqVVafZSXtlpdTKetnNnQexDbDh1Y3A=="; }; dependencies = [ sources."@jsii/check-node-1.34.0" sources."@jsii/spec-1.34.0" - sources."@types/node-12.20.24" - sources."@xmldom/xmldom-0.7.4" - sources."ansi-regex-5.0.0" + sources."@types/node-12.20.26" + sources."@xmldom/xmldom-0.7.5" + sources."ajv-8.6.3" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.5" sources."call-bind-1.0.2" sources."camelcase-6.2.0" sources."case-1.6.3" - sources."cdk8s-1.0.0-beta.30" - sources."cdk8s-plus-17-1.0.0-beta.57" + sources."cdk8s-1.0.0-beta.46" + sources."cdk8s-plus-22-1.0.0-beta.4" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" @@ -73530,7 +75118,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-3.3.147" + sources."constructs-3.3.152" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -73546,6 +75134,7 @@ in sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" + sources."fast-deep-equal-3.1.3" sources."find-up-4.1.0" sources."flatted-2.0.2" sources."foreach-2.0.5" @@ -73607,13 +75196,14 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.341" // { + (sources."jsii-srcmak-0.1.353" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.2.17" + sources."json-schema-traverse-1.0.0" + sources."json2jsii-0.2.29" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -73634,8 +75224,10 @@ in sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."path-exists-4.0.0" + sources."punycode-2.1.1" sources."regexp.prototype.flags-1.3.1" sources."require-directory-2.1.1" + sources."require-from-string-2.0.2" sources."require-main-filename-2.0.0" sources."rfdc-1.3.0" sources."semver-7.3.5" @@ -73649,22 +75241,23 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.63" + sources."sscaff-1.2.75" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" ]; }) - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string.prototype.repeat-0.2.0" sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."tslib-2.3.1" sources."typescript-3.9.10" sources."unbox-primitive-1.0.1" sources."universalify-2.0.0" + sources."uri-js-4.4.1" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" sources."which-module-2.0.0" @@ -73673,7 +75266,7 @@ in sources."xmlbuilder-15.1.1" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yaml-1.10.2" + sources."yaml-2.0.0-8" (sources."yargs-15.4.1" // { dependencies = [ sources."camelcase-5.3.1" @@ -73698,13 +75291,13 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.5.0"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.5.0.tgz"; - sha512 = "53HldFlYJdptaQ9yZyx8xuN0pxmBwI7yaVImmPwGmauoOYWsO89YrAjyPIiAaR+GWI8avbQeg3jz5Z1Q+MoIGA=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.6.3.tgz"; + sha512 = "bWY44GnPyUQGixmM6daB1xB2MqOunwQ0W/6K3NUCV6rZnl/mljWXfoIECEmbBonYxu02ojZQ60s7i7zryBBJ7g=="; }; dependencies = [ - sources."@apollo/client-3.4.10" + sources."@apollo/client-3.4.13" (sources."@apollo/protobufjs-1.2.2" // { dependencies = [ sources."@types/node-10.17.60" @@ -73719,23 +75312,23 @@ in }) sources."@babel/code-frame-7.14.5" sources."@babel/generator-7.15.4" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.5" + sources."@babel/parser-7.15.7" sources."@babel/template-7.15.4" - sources."@babel/types-7.15.4" - sources."@cdktf/hcl2cdk-0.5.0" - sources."@cdktf/hcl2json-0.5.0" + sources."@babel/types-7.15.6" + sources."@cdktf/hcl2cdk-0.6.3" + sources."@cdktf/hcl2json-0.6.3" (sources."@graphql-tools/graphql-file-loader-6.2.7" // { dependencies = [ sources."tslib-2.1.0" ]; }) - sources."@graphql-tools/import-6.4.0" + sources."@graphql-tools/import-6.4.1" (sources."@graphql-tools/load-6.2.8" // { dependencies = [ sources."tslib-2.2.0" @@ -73746,15 +75339,15 @@ in sources."@graphql-tools/utils-8.0.2" ]; }) - (sources."@graphql-tools/mock-8.3.1" // { + (sources."@graphql-tools/mock-8.4.0" // { dependencies = [ - sources."@graphql-tools/utils-8.2.2" + sources."@graphql-tools/utils-8.2.3" ]; }) (sources."@graphql-tools/schema-8.2.0" // { dependencies = [ sources."@graphql-tools/merge-8.1.2" - sources."@graphql-tools/utils-8.2.2" + sources."@graphql-tools/utils-8.2.3" ]; }) (sources."@graphql-tools/utils-7.10.0" // { @@ -73769,6 +75362,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" + sources."@npmcli/ci-detect-1.3.0" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -73789,17 +75383,18 @@ in sources."@types/express-serve-static-core-4.17.24" sources."@types/long-4.0.1" sources."@types/mime-1.3.2" - sources."@types/node-14.17.15" + sources."@types/node-14.17.18" sources."@types/node-fetch-2.5.12" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/serve-static-1.13.10" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" + sources."@types/zen-observable-0.8.3" sources."@wry/context-0.6.1" sources."@wry/equality-0.5.2" sources."@wry/trie-0.3.1" - sources."@xmldom/xmldom-0.7.4" + sources."@xmldom/xmldom-0.7.5" sources."accepts-1.3.7" sources."address-1.1.2" (sources."ansi-escapes-4.3.2" // { @@ -73807,7 +75402,7 @@ in sources."type-fest-0.21.3" ]; }) - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" (sources."anymatch-3.1.2" // { dependencies = [ @@ -73820,7 +75415,7 @@ in sources."apollo-server-caching-3.1.0" (sources."apollo-server-core-3.3.0" // { dependencies = [ - sources."@graphql-tools/utils-8.2.2" + sources."@graphql-tools/utils-8.2.3" ]; }) sources."apollo-server-env-4.0.3" @@ -73866,7 +75461,7 @@ in ]; }) sources."case-1.6.3" - sources."cdktf-0.5.0" + sources."cdktf-0.6.3" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -73908,7 +75503,7 @@ in ]; }) sources."concat-map-0.0.1" - sources."constructs-3.3.147" + sources."constructs-10.0.5" (sources."content-disposition-0.5.3" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -73918,7 +75513,7 @@ in sources."convert-to-spaces-1.0.2" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-pure-3.17.3" + sources."core-js-pure-3.18.0" sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."crc-32-1.2.0" @@ -73930,7 +75525,7 @@ in }) sources."cross-spawn-7.0.3" sources."cssfilter-0.0.10" - sources."date-fns-2.23.0" + sources."date-fns-2.24.0" sources."date-format-3.0.0" sources."debug-2.6.9" sources."decamelize-1.2.0" @@ -73984,14 +75579,14 @@ in }) sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.12.0" + sources."fastq-1.13.0" sources."fd-slicer-1.1.0" sources."figures-3.2.0" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" sources."find-up-4.1.0" sources."flatted-2.0.2" - sources."follow-redirects-1.14.3" + sources."follow-redirects-1.14.4" sources."foreach-2.0.5" sources."form-data-3.0.1" sources."forwarded-0.2.0" @@ -74015,8 +75610,8 @@ in sources."globby-11.0.3" sources."graceful-fs-4.2.8" sources."graphology-0.20.0" - sources."graphology-types-0.19.4" - sources."graphql-15.5.3" + sources."graphology-types-0.19.5" + sources."graphql-15.6.0" sources."graphql-subscriptions-1.2.1" sources."graphql-tag-2.12.5" sources."has-1.0.3" @@ -74050,7 +75645,7 @@ in sources."ink-spinner-4.0.2" sources."ink-text-input-4.0.1" sources."ink-use-stdout-dimensions-1.0.5" - sources."inquirer-8.1.2" + sources."inquirer-8.1.5" sources."internal-slot-1.0.3" sources."ipaddr.js-1.9.1" sources."is-arguments-1.1.1" @@ -74113,9 +75708,18 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.341" // { + (sources."jsii-srcmak-0.1.353" // { dependencies = [ + sources."ansi-styles-4.3.0" + sources."camelcase-5.3.1" + sources."cliui-6.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."fs-extra-9.1.0" + sources."wrap-ansi-6.2.0" + sources."y18n-4.0.3" + sources."yargs-15.4.1" + sources."yargs-parser-18.1.3" ]; }) sources."jsonfile-6.1.0" @@ -74147,7 +75751,7 @@ in sources."loose-envify-1.4.0" sources."lower-case-2.0.2" sources."lru-cache-6.0.0" - sources."map-obj-4.2.1" + sources."map-obj-4.3.0" sources."mdurl-1.0.1" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -74166,7 +75770,7 @@ in sources."ncp-2.0.0" sources."negotiator-0.6.2" sources."no-case-3.0.4" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" sources."normalize-path-2.1.1" sources."npm-run-path-4.0.1" sources."object-assign-4.1.1" @@ -74201,7 +75805,7 @@ in sources."path-type-4.0.0" sources."pend-1.2.0" sources."picomatch-2.3.0" - sources."prettier-2.4.0" + sources."prettier-2.4.1" sources."printj-1.1.2" sources."process-nextick-args-2.0.1" sources."prop-types-15.7.2" @@ -74259,7 +75863,7 @@ in sources."shebang-regex-3.0.0" sources."shell-quote-1.7.2" sources."side-channel-1.0.4" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."slash-3.0.0" (sources."slice-ansi-3.0.0" // { dependencies = [ @@ -74271,8 +75875,8 @@ in sources."sort-json-2.0.0" sources."source-map-0.5.7" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.63" - (sources."stack-utils-2.0.3" // { + sources."sscaff-1.2.75" + (sources."stack-utils-2.0.5" // { dependencies = [ sources."escape-string-regexp-2.0.0" ]; @@ -74286,7 +75890,7 @@ in sources."ms-2.1.2" ]; }) - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string.prototype.repeat-0.2.0" sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" @@ -74295,7 +75899,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-final-newline-2.0.0" (sources."subscriptions-transport-ws-0.9.19" // { dependencies = [ @@ -74310,7 +75914,8 @@ in sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - sources."ts-invariant-0.9.1" + sources."tr46-0.0.3" + sources."ts-invariant-0.9.3" sources."tslib-2.3.1" sources."type-fest-0.15.1" sources."type-is-1.6.18" @@ -74327,6 +75932,8 @@ in sources."value-or-promise-1.0.10" sources."vary-1.1.2" sources."wcwidth-1.0.1" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" @@ -74346,25 +75953,14 @@ in sources."xss-1.0.9" sources."y18n-5.0.8" sources."yallist-4.0.0" - (sources."yargs-15.4.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."camelcase-5.3.1" - sources."cliui-6.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."wrap-ansi-6.2.0" - sources."y18n-4.0.3" - sources."yargs-parser-18.1.3" - ]; - }) + sources."yargs-17.2.0" sources."yargs-parser-20.2.9" sources."yauzl-2.10.0" sources."yn-3.1.1" sources."yocto-queue-0.1.0" sources."yoga-layout-prebuilt-1.10.0" sources."zen-observable-0.8.15" - sources."zen-observable-ts-1.2.2" + sources."zen-observable-ts-1.1.0" sources."zip-stream-4.1.0" sources."zod-1.11.17" ]; @@ -74393,7 +75989,7 @@ in sources."commander-7.2.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."minimatch-3.0.4" @@ -74483,7 +76079,7 @@ in sources."semver-5.7.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -74577,10 +76173,10 @@ in coc-clangd = nodeEnv.buildNodePackage { name = "coc-clangd"; packageName = "coc-clangd"; - version = "0.14.1"; + version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.14.1.tgz"; - sha512 = "VhEqQMIWrFtF+qzA03kLfwU7fX9f3qIVWltTk4Gc3QLqcIM0qtmpqnSRS7x/jRtbh/kLk2ckuwupQE59sTigCQ=="; + url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.16.0.tgz"; + sha512 = "3NTHssw+ZxZiq1XZVbyfSKxgD0vZ96yBjzYh5l/kyr4413KibNTMgF2gTBMQsOnrfFmrfDz6RF5Yy2ie2EkZXw=="; }; buildInputs = globalBuildInputs; meta = { @@ -74595,10 +76191,10 @@ in coc-cmake = nodeEnv.buildNodePackage { name = "coc-cmake"; packageName = "coc-cmake"; - version = "0.1.1"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-cmake/-/coc-cmake-0.1.1.tgz"; - sha512 = "1cWC11FqQG6qUNi08xIBgojxR/Q4P2dCbcvVAQup4moCXYpTwF1YdtRmdLNBY6mpSw/5U7A1Sh/8FffrxIgj7A=="; + url = "https://registry.npmjs.org/coc-cmake/-/coc-cmake-0.2.0.tgz"; + sha512 = "hRCKiKikjEIUNrfBeb0IdbL3vvlU4inXtSOntfJF2Uhwv2V/KorK0KxdGeg6CTl6b0hhA53nieJaxQZSNVLfUA=="; }; buildInputs = globalBuildInputs; meta = { @@ -74711,7 +76307,7 @@ in sources."execa-2.1.0" sources."fs.realpath-1.0.0" sources."get-stream-5.2.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."globby-7.1.1" sources."ignore-3.3.10" sources."indent-string-4.0.0" @@ -74751,7 +76347,7 @@ in sources."semver-6.3.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."slash-1.0.0" sources."strip-final-newline-2.0.0" sources."trash-7.2.0" @@ -74800,10 +76396,13 @@ in }; dependencies = [ sources."isexe-2.0.0" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" + sources."tr46-0.0.3" sources."tslib-2.3.1" sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-uri-3.0.2" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-2.0.2" ]; buildInputs = globalBuildInputs; @@ -74841,7 +76440,7 @@ in sha512 = "7SHQYzpRKPrpaLcTm1UUk1zu9VvFEJKFqxwDIuqv/CL0cBTtEvlsfpVh9DOaMHlZPu8U8Lgyf04bHV/sFS1zJw=="; }; dependencies = [ - sources."typescript-4.4.2" + sources."typescript-4.4.3" ]; buildInputs = globalBuildInputs; meta = { @@ -74986,10 +76585,10 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.8.tgz"; - sha512 = "ruCWV8SWSngpJFZrwghzi2yVVZ+Pa0o0vsNN106GlhMFgjtV+YudjVsPw7gH9NLBU77Zlpya4vtxP3AhgGfQ2w=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.9.tgz"; + sha512 = "xy7flhVZAMTJbFVlZixkJ670aQqUSHGlw+jCU3+oSTCvd7QxYnWCHAEwmNXRwtndBoJlVh17ZvAiJsW802gCPg=="; }; dependencies = [ sources."@chemzqm/neovim-5.4.0" @@ -74999,7 +76598,7 @@ in sources."async-2.6.3" sources."await-semaphore-0.1.3" sources."balanced-match-1.0.2" - sources."big-integer-1.6.48" + sources."big-integer-1.6.49" sources."binary-0.3.0" sources."bluebird-3.4.7" sources."brace-expansion-1.1.11" @@ -75035,8 +76634,8 @@ in sources."fast-diff-1.2.0" sources."fb-watchman-2.0.1" sources."flatted-2.0.2" - sources."follow-redirects-1.14.3" - sources."fp-ts-2.11.1" + sources."follow-redirects-1.14.4" + sources."fp-ts-2.11.3" sources."fs-extra-8.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" @@ -75050,7 +76649,7 @@ in sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-bigints-1.0.1" @@ -75093,7 +76692,7 @@ in sources."metals-languageclient-0.4.2" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."minipass-3.1.3" + sources."minipass-3.1.5" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" @@ -75107,7 +76706,7 @@ in }) sources."ncp-2.0.0" sources."nice-try-1.0.5" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" sources."node-int64-0.4.0" sources."npm-run-path-2.0.2" sources."object-inspect-1.11.0" @@ -75133,7 +76732,7 @@ in sources."shebang-regex-1.0.0" sources."shell-quote-1.7.2" sources."side-channel-1.0.4" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -75145,6 +76744,7 @@ in sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."tar-6.1.11" + sources."tr46-0.0.3" sources."traverse-0.3.9" sources."tslib-2.3.1" sources."unbox-primitive-1.0.1" @@ -75161,6 +76761,8 @@ in sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-2.1.2" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-2.0.2" sources."which-boxed-primitive-1.0.2" sources."wrappy-1.0.2" @@ -75203,7 +76805,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -75235,7 +76837,7 @@ in ]; }) sources."ansi-colors-4.1.1" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."arr-diff-2.0.0" @@ -75282,7 +76884,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001255" + sources."caniuse-lite-1.0.30001260" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.2" // { @@ -75344,7 +76946,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.17.3" + sources."core-js-3.18.0" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" sources."cross-spawn-7.0.3" @@ -75380,7 +76982,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.833" + sources."electron-to-chromium-1.3.849" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -75510,7 +77112,7 @@ in sources."get-stdin-5.0.1" sources."get-stream-3.0.0" sources."get-value-2.0.6" - sources."glob-7.1.7" + sources."glob-7.2.0" (sources."glob-base-0.3.0" // { dependencies = [ sources."glob-parent-2.0.0" @@ -75697,6 +77299,7 @@ in }) sources."mkdirp-0.5.5" sources."ms-2.1.2" + sources."nanocolors-0.1.12" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -75836,7 +77439,7 @@ in sources."prelude-ls-1.2.1" sources."prepend-http-1.0.4" sources."preserve-0.2.0" - sources."prettier-2.4.0" + sources."prettier-2.4.1" sources."prettier-eslint-12.0.0" (sources."prettier-stylelint-0.4.2" // { dependencies = [ @@ -75932,7 +77535,7 @@ in }) sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."slash-1.0.0" (sources."slice-ansi-4.0.0" // { dependencies = [ @@ -75997,10 +77600,10 @@ in sources."kind-of-5.1.0" ]; }) - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."stringify-entities-1.3.2" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-bom-2.0.0" sources."strip-eof-1.0.0" (sources."strip-indent-1.0.1" // { @@ -76047,7 +77650,7 @@ in sources."svg-tags-1.0.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.6.2" + sources."ajv-8.6.3" sources."json-schema-traverse-1.0.0" ]; }) @@ -76179,13 +77782,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.166"; + version = "1.1.170"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.166.tgz"; - sha512 = "ler5AiK0fE5BbQ+RlkQYO+qzGUfFRmQW0XrSPFPCWgjvTfL20qXx7DU+lSZKRUJUQo3wXXHbnBnv7HHIOhokSw=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.170.tgz"; + sha512 = "s1ZMe4l790xph8cu+/nkoIpi2WVQibR8tFVpcDnT5EP2Hy7esFvjgz9NAHg+gFilQXVFg2d7Tm2+J1V+A7cZfw=="; }; dependencies = [ - sources."pyright-1.1.166" + sources."pyright-1.1.170" ]; buildInputs = globalBuildInputs; meta = { @@ -76345,12 +77948,12 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-module-transforms-7.15.7" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-replace-supers-7.15.4" sources."@babel/helper-simple-access-7.15.4" sources."@babel/helper-split-export-declaration-7.15.4" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.15.4" (sources."@babel/highlight-7.14.5" // { @@ -76358,10 +77961,10 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.5" + sources."@babel/parser-7.15.7" sources."@babel/template-7.15.4" sources."@babel/traverse-7.15.4" - sources."@babel/types-7.15.4" + sources."@babel/types-7.15.6" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -76372,8 +77975,8 @@ in sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.6" - sources."ajv-8.6.2" - sources."ansi-regex-5.0.0" + sources."ajv-8.6.3" + sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" sources."arrify-1.0.1" @@ -76387,11 +77990,11 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.17.0" + sources."browserslist-4.17.1" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001255" + sources."caniuse-lite-1.0.30001260" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -76429,7 +78032,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.833" + sources."electron-to-chromium-1.3.849" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -76441,7 +78044,7 @@ in sources."fast-diff-1.2.0" sources."fast-glob-3.2.7" sources."fastest-levenshtein-1.0.12" - sources."fastq-1.12.0" + sources."fastq-1.13.0" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" sources."find-up-4.1.0" @@ -76451,7 +78054,7 @@ in sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" sources."get-stdin-8.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."global-modules-2.0.0" sources."global-prefix-3.0.0" @@ -76508,7 +78111,7 @@ in sources."log-symbols-4.1.0" sources."longest-streak-2.0.4" sources."lru-cache-6.0.0" - sources."map-obj-4.2.1" + sources."map-obj-4.3.0" sources."mathml-tag-names-2.1.3" sources."mdast-util-from-markdown-0.8.5" sources."mdast-util-to-markdown-0.6.5" @@ -76526,7 +78129,8 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-1.1.75" + sources."nanocolors-0.1.12" + sources."node-releases-1.1.76" (sources."normalize-package-data-3.0.3" // { dependencies = [ sources."semver-7.3.5" @@ -76599,7 +78203,7 @@ in sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."semver-6.3.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."slash-3.0.0" (sources."slice-ansi-4.0.0" // { dependencies = [ @@ -76614,13 +78218,13 @@ in sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.10" sources."specificity-0.4.1" - sources."string-width-4.2.2" + sources."string-width-4.2.3" (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.1" ]; }) - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-indent-3.0.0" sources."style-search-0.1.0" sources."stylelint-13.13.1" @@ -76716,7 +78320,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/highlight-7.14.5" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -76733,7 +78337,7 @@ in sources."esprima-4.0.1" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."inflight-1.0.6" @@ -76809,7 +78413,7 @@ in sha512 = "RTet29nZNYrOWEuquBOAv3yFtWyHPE7xGbsHjRdNbTP6g9PF+2nV2TnDO+c/T5HAk/1J0lKKZBu6hZTnEJ2f4w=="; }; dependencies = [ - sources."typescript-4.4.2" + sources."typescript-4.4.3" ]; buildInputs = globalBuildInputs; meta = { @@ -76831,7 +78435,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -76845,7 +78449,7 @@ in sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ansi-colors-4.1.1" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."astral-regex-2.0.0" @@ -76875,7 +78479,7 @@ in sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" sources."eslint-7.32.0" - (sources."eslint-plugin-vue-7.17.0" // { + (sources."eslint-plugin-vue-7.18.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -76914,7 +78518,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globals-13.11.0" sources."has-1.0.3" @@ -76951,7 +78555,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" - sources."prettier-2.4.0" + sources."prettier-2.4.1" sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-3.2.0" @@ -76970,13 +78574,13 @@ in ]; }) sources."sprintf-js-1.0.3" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.6.2" + sources."ajv-8.6.3" sources."json-schema-traverse-1.0.0" ]; }) @@ -76992,7 +78596,7 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.4.2" + sources."typescript-4.4.3" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" sources."vls-0.7.4" @@ -77209,7 +78813,7 @@ in sources."get-proxy-2.1.0" sources."get-stream-3.0.0" sources."git-clone-0.1.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."got-6.7.1" sources."graceful-fs-4.2.8" sources."has-flag-3.0.0" @@ -77276,7 +78880,7 @@ in sources."semver-5.7.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."slash-2.0.0" (sources."string_decoder-1.1.1" // { dependencies = [ @@ -77355,7 +78959,7 @@ in sources."colors-1.4.0" sources."commander-2.20.3" sources."escape-string-regexp-1.0.5" - sources."follow-redirects-1.14.3" + sources."follow-redirects-1.14.4" sources."has-flag-3.0.0" sources."is-fullwidth-code-point-2.0.0" sources."log-symbols-2.2.0" @@ -77364,7 +78968,7 @@ in sources."onetime-2.0.1" sources."ora-1.4.0" sources."restore-cursor-2.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."supports-color-5.5.0" @@ -77401,17 +79005,16 @@ in sources."core-util-is-1.0.3" sources."enabled-2.0.0" sources."eventemitter3-4.0.7" - sources."fast-safe-stringify-2.1.1" sources."fecha-4.2.1" sources."fn.name-1.1.0" - sources."follow-redirects-1.14.3" + sources."follow-redirects-1.14.4" sources."http-proxy-1.18.1" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" sources."is-stream-2.0.1" sources."isarray-1.0.0" sources."kuler-2.0.0" - sources."logform-2.2.0" + sources."logform-2.3.0" sources."ms-2.1.3" sources."one-time-1.0.0" sources."process-nextick-args-2.0.1" @@ -77419,6 +79022,7 @@ in sources."readable-stream-3.6.0" sources."requires-port-1.0.0" sources."safe-buffer-5.2.1" + sources."safe-stable-stringify-1.1.1" sources."simple-swizzle-0.2.2" sources."stack-trace-0.0.10" sources."strftime-0.10.0" @@ -77456,14 +79060,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/highlight-7.14.5" sources."@hutson/parse-repository-url-3.0.2" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."JSONStream-1.3.5" sources."add-stream-1.0.0" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."array-ify-1.0.0" sources."arrify-1.0.1" @@ -77484,7 +79088,7 @@ in sources."conventional-changelog-angular-5.0.13" sources."conventional-changelog-atom-2.0.8" sources."conventional-changelog-codemirror-2.0.8" - sources."conventional-changelog-conventionalcommits-4.6.0" + sources."conventional-changelog-conventionalcommits-4.6.1" sources."conventional-changelog-core-4.2.4" sources."conventional-changelog-ember-2.0.9" sources."conventional-changelog-eslint-3.0.9" @@ -77556,7 +79160,7 @@ in sources."lodash-4.17.21" sources."lodash.ismatch-4.4.0" sources."lru-cache-6.0.0" - sources."map-obj-4.2.1" + sources."map-obj-4.3.0" (sources."meow-8.1.2" // { dependencies = [ sources."find-up-4.1.0" @@ -77627,9 +79231,9 @@ in sources."spdx-license-ids-3.0.10" sources."split-1.0.1" sources."split2-3.2.2" - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-bom-3.0.0" sources."strip-indent-3.0.0" sources."supports-color-5.5.0" @@ -77719,7 +79323,7 @@ in sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" - sources."big-integer-1.6.48" + sources."big-integer-1.6.49" (sources."body-parser-1.19.0" // { dependencies = [ sources."bytes-3.1.0" @@ -77731,11 +79335,11 @@ in }) (sources."boxen-4.2.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."bplist-parser-0.2.0" @@ -77862,7 +79466,7 @@ in sources."fast-glob-3.2.7" sources."fast-json-parse-1.0.3" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.12.0" + sources."fastq-1.13.0" sources."figures-2.0.0" sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { @@ -77883,7 +79487,7 @@ in sources."gauge-2.7.4" sources."get-stream-5.2.0" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."global-dirs-2.1.0" sources."globby-11.0.4" @@ -78028,7 +79632,7 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."minipass-3.1.3" + sources."minipass-3.1.5" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" sources."minipass-flush-1.0.5" @@ -78174,11 +79778,11 @@ in sources."setprototypeof-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."slash-3.0.0" sources."smart-buffer-4.2.0" sources."socks-2.6.1" - sources."socks-proxy-agent-6.0.0" + sources."socks-proxy-agent-6.1.0" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -78235,11 +79839,11 @@ in sources."wide-align-1.1.3" (sources."widest-line-3.1.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) (sources."windows-release-3.3.3" // { @@ -78283,14 +79887,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/highlight-7.14.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -78399,7 +80003,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-value-2.0.6" - sources."glob-7.1.7" + sources."glob-7.2.0" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -78454,7 +80058,7 @@ in sources."locate-path-5.0.0" sources."make-dir-3.1.0" sources."map-cache-0.2.2" - sources."map-obj-4.2.1" + sources."map-obj-4.3.0" sources."map-visit-1.0.0" sources."meow-6.1.1" sources."merge2-1.4.1" @@ -78661,7 +80265,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -78703,7 +80307,7 @@ in sources."es6-symbol-3.1.3" sources."escape-string-regexp-1.0.5" sources."event-emitter-0.3.5" - (sources."ext-1.5.0" // { + (sources."ext-1.6.0" // { dependencies = [ sources."type-2.5.0" ]; @@ -78771,7 +80375,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."snabbdom-0.7.0" sources."snabbdom-selector-1.2.1" sources."sorted-immutable-list-1.1.0" @@ -78839,7 +80443,7 @@ in sources."fs.realpath-1.0.0" sources."fstream-1.0.12" sources."fstream-ignore-1.0.5" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."hyperquest-2.1.3" @@ -79170,7 +80774,7 @@ in sources."fast-json-stable-stringify-2.1.0" (sources."fd-lock-1.2.0" // { dependencies = [ - sources."node-gyp-build-4.2.3" + sources."node-gyp-build-4.3.0" ]; }) sources."fd-read-stream-1.1.0" @@ -79190,7 +80794,7 @@ in sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."global-4.4.0" sources."global-dirs-0.1.1" sources."got-6.7.1" @@ -79421,7 +81025,7 @@ in }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" (sources."signed-varint-2.0.1" // { dependencies = [ sources."varint-5.0.2" @@ -79469,7 +81073,7 @@ in sources."sodium-javascript-0.5.6" (sources."sodium-native-2.4.9" // { dependencies = [ - sources."node-gyp-build-4.2.3" + sources."node-gyp-build-4.3.0" ]; }) sources."sodium-universal-2.0.0" @@ -79576,7 +81180,7 @@ in sources."util-deprecate-1.0.2" (sources."utp-native-2.5.3" // { dependencies = [ - sources."node-gyp-build-4.2.3" + sources."node-gyp-build-4.3.0" sources."readable-stream-3.6.0" sources."unordered-set-2.0.1" ]; @@ -79635,7 +81239,7 @@ in "deltachat-desktop-../../applications/networking/instant-messengers/deltachat-desktop" = nodeEnv.buildNodePackage { name = "deltachat-desktop"; packageName = "deltachat-desktop"; - version = "1.21.0"; + version = "1.22.2"; src = ../../applications/networking/instant-messengers/deltachat-desktop; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -79662,7 +81266,7 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-module-transforms-7.15.7" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.15.4" @@ -79670,12 +81274,12 @@ in sources."@babel/helper-simple-access-7.15.4" sources."@babel/helper-skip-transparent-expression-wrappers-7.15.4" sources."@babel/helper-split-export-declaration-7.15.4" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.15.4" sources."@babel/helpers-7.15.4" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.5" + sources."@babel/parser-7.15.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" sources."@babel/plugin-proposal-async-generator-functions-7.15.4" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -79686,7 +81290,7 @@ in sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" sources."@babel/plugin-proposal-numeric-separator-7.14.5" - sources."@babel/plugin-proposal-object-rest-spread-7.14.7" + sources."@babel/plugin-proposal-object-rest-spread-7.15.6" sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-proposal-private-methods-7.14.5" @@ -79743,21 +81347,21 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.15.4" + sources."@babel/preset-env-7.15.6" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-react-7.14.5" sources."@babel/runtime-7.15.4" sources."@babel/template-7.15.4" sources."@babel/traverse-7.15.4" - sources."@babel/types-7.15.4" - sources."@blueprintjs/colors-3.0.0" - sources."@blueprintjs/core-3.49.1" - sources."@blueprintjs/icons-3.29.0" + sources."@babel/types-7.15.6" + sources."@blueprintjs/colors-5.0.0-alpha.0" + sources."@blueprintjs/core-3.50.2" + sources."@blueprintjs/icons-3.30.1" sources."@electron/get-1.13.0" sources."@hypnosphi/create-react-context-0.3.1" sources."@mapbox/extent-0.4.0" - sources."@mapbox/geojson-coords-0.0.1" - sources."@mapbox/geojson-extent-1.0.0" + sources."@mapbox/geojson-coords-0.0.2" + sources."@mapbox/geojson-extent-1.0.1" sources."@mapbox/geojson-normalize-0.0.1" sources."@mapbox/geojson-rewind-0.5.1" sources."@mapbox/geojson-types-1.0.2" @@ -79770,13 +81374,13 @@ in sources."@mapbox/whoots-js-3.1.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/debounce-1.2.0" + sources."@types/debounce-1.2.1" sources."@types/dom4-2.0.2" - sources."@types/emoji-mart-3.0.5" + sources."@types/emoji-mart-3.0.6" sources."@types/geojson-7946.0.8" sources."@types/mapbox-gl-0.54.5" sources."@types/mime-types-2.1.1" - sources."@types/node-14.17.15" + sources."@types/node-14.17.18" sources."@types/node-fetch-2.5.12" sources."@types/prop-types-15.7.4" sources."@types/rc-1.2.0" @@ -79807,7 +81411,7 @@ in sources."atob-2.1.2" sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-polyfill-corejs2-0.2.2" - sources."babel-plugin-polyfill-corejs3-0.2.4" + sources."babel-plugin-polyfill-corejs3-0.2.5" sources."babel-plugin-polyfill-regenerator-0.2.2" (sources."base-0.11.2" // { dependencies = [ @@ -79822,7 +81426,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.17.0" + sources."browserslist-4.17.1" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."cache-base-1.0.1" @@ -79833,7 +81437,7 @@ in ]; }) sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001255" + sources."caniuse-lite-1.0.30001260" sources."chalk-2.4.2" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { @@ -79858,7 +81462,6 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.4.0" sources."combined-stream-1.0.8" sources."component-emitter-1.3.0" (sources."concat-stream-1.6.2" // { @@ -79875,8 +81478,8 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.17.3" - (sources."core-js-compat-3.17.3" // { + sources."core-js-3.18.0" + (sources."core-js-compat-3.18.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -79884,7 +81487,7 @@ in sources."core-util-is-1.0.3" sources."crypto-random-string-1.0.0" sources."csscolorparser-1.0.3" - sources."csstype-3.0.8" + sources."csstype-3.0.9" sources."debounce-1.2.1" sources."debug-4.3.2" sources."decode-uri-component-0.2.0" @@ -79901,8 +81504,8 @@ in sources."dom4-2.1.6" sources."duplexer3-0.1.4" sources."earcut-2.2.3" - sources."electron-13.3.0" - sources."electron-to-chromium-1.3.833" + sources."electron-13.4.0" + sources."electron-to-chromium-1.3.849" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -80077,11 +81680,12 @@ in sources."ms-2.1.2" sources."murmurhash-js-1.0.0" sources."nan-2.15.0" + sources."nanocolors-0.1.12" sources."nanomatch-1.2.13" sources."napi-macros-2.0.0" - sources."node-fetch-2.6.2" - sources."node-gyp-build-4.2.3" - sources."node-releases-1.1.75" + sources."node-fetch-2.6.5" + sources."node-gyp-build-4.3.0" + sources."node-releases-1.1.76" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" sources."normalize.css-8.0.1" @@ -80125,7 +81729,7 @@ in sources."progress-2.0.3" sources."prop-types-15.7.2" sources."proto-list-1.2.4" - sources."protocol-buffers-schema-3.5.2" + sources."protocol-buffers-schema-3.6.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qr.js-0.0.0" @@ -80153,14 +81757,14 @@ in ]; }) sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-8.2.0" + sources."regenerate-unicode-properties-9.0.0" sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.3.1" - sources."regexpu-core-4.7.1" + sources."regexpu-core-4.8.0" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.9" // { + (sources."regjsparser-0.7.0" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -80180,7 +81784,7 @@ in sources."rw-0.1.4" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" - (sources."sass-1.39.0" // { + (sources."sass-1.42.1" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -80285,6 +81889,7 @@ in sources."to-readable-stream-1.0.0" sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" + sources."tr46-0.0.3" sources."traverse-0.6.6" sources."tslib-1.13.0" sources."tunnel-0.0.6" @@ -80292,10 +81897,10 @@ in sources."typed-styles-0.0.7" sources."typedarray-0.0.6" sources."typescript-3.9.10" - sources."unicode-canonical-property-names-ecmascript-1.0.4" - sources."unicode-match-property-ecmascript-1.0.4" - sources."unicode-match-property-value-ecmascript-1.2.0" - sources."unicode-property-aliases-ecmascript-1.1.0" + sources."unicode-canonical-property-names-ecmascript-2.0.0" + sources."unicode-match-property-ecmascript-2.0.0" + sources."unicode-match-property-value-ecmascript-2.0.0" + sources."unicode-property-aliases-ecmascript-2.0.0" sources."union-value-1.0.1" sources."unique-string-1.0.0" sources."universalify-0.1.2" @@ -80318,7 +81923,9 @@ in sources."util-deprecate-1.0.2" sources."vt-pbf-3.1.3" sources."warning-4.0.3" + sources."webidl-conversions-3.0.1" sources."webrtc-adapter-7.7.1" + sources."whatwg-url-5.0.0" sources."wrappy-1.0.2" sources."xml-js-1.6.11" sources."yallist-4.0.0" @@ -80376,11 +81983,11 @@ in sources."del-6.0.0" sources."dir-glob-3.0.1" sources."fast-glob-3.2.7" - sources."fastq-1.12.0" + sources."fastq-1.13.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."fs.realpath-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globby-11.0.4" sources."graceful-fs-4.2.8" @@ -80441,15 +82048,15 @@ in dockerfile-language-server-nodejs = nodeEnv.buildNodePackage { name = "dockerfile-language-server-nodejs"; packageName = "dockerfile-language-server-nodejs"; - version = "0.6.0"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.6.0.tgz"; - sha512 = "+5bTaLsYJ+sb9bOzV7i6374Bb61jKlE3eh0mMlaLKwG9ZJO8r/pTMbsRNt9vXipkcJEvc9N8xZJyDs2EYnyfPA=="; + url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.7.1.tgz"; + sha512 = "mk1FkdckiNi0gxm/KIsgOJRpPROOqq27fF90f8CtetbaqRvL/mwKDTN2umLeRenJ4ayxdz/Gpf7gWOOQz1kZ1Q=="; }; dependencies = [ - sources."dockerfile-ast-0.3.1" - sources."dockerfile-language-service-0.5.0" - sources."dockerfile-utils-0.7.0" + sources."dockerfile-ast-0.3.4" + sources."dockerfile-language-service-0.7.2" + sources."dockerfile-utils-0.9.2" sources."vscode-jsonrpc-8.0.0-next.2" sources."vscode-languageserver-8.0.0-next.2" sources."vscode-languageserver-protocol-3.17.0-next.8" @@ -80469,15 +82076,15 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.73.0"; + version = "6.74.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.73.0.tgz"; - sha512 = "9QWk+d0xuT6W+AEvr06Zoh1rllXGkDMUH9LxFtey3Abv5E0M2qSvdspGvqb4d6Fw7BZiThX4tDabT6VNpxqftQ=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.74.0.tgz"; + sha512 = "hcT2HyGdWlqD+DUicipZd0CI4m49qgpa5HPGKAU7Qly6vClH/HgwV+VodFs9CTIEUoKZOq7qolxHAByt4lezPg=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.17.15" + sources."@types/node-14.17.18" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.4" @@ -80615,30 +82222,30 @@ in "@electron-forge/cli" = nodeEnv.buildNodePackage { name = "_at_electron-forge_slash_cli"; packageName = "@electron-forge/cli"; - version = "6.0.0-beta.60"; + version = "6.0.0-beta.61"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.60.tgz"; - sha512 = "bbppliO8kl54MHwe7hCNapzmaqP0RNUONFcK/fd9Od917+ib23KqRAgbrN4ukwKjXzIfzLfoAsEY06UgL0DvIg=="; + url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.61.tgz"; + sha512 = "0OMNfSl71UhjkhYx67yH9vGklfvqdKe0iiMw+R+/tvgArapUQ0AquNaALFY0xP2inVRnbpcwH2WsR0LaZQkJtg=="; }; dependencies = [ - sources."@electron-forge/async-ora-6.0.0-beta.60" - sources."@electron-forge/core-6.0.0-beta.60" - sources."@electron-forge/installer-base-6.0.0-beta.60" - sources."@electron-forge/installer-darwin-6.0.0-beta.60" - sources."@electron-forge/installer-deb-6.0.0-beta.60" - sources."@electron-forge/installer-dmg-6.0.0-beta.60" - sources."@electron-forge/installer-exe-6.0.0-beta.60" - sources."@electron-forge/installer-linux-6.0.0-beta.60" - sources."@electron-forge/installer-rpm-6.0.0-beta.60" - sources."@electron-forge/installer-zip-6.0.0-beta.60" - sources."@electron-forge/maker-base-6.0.0-beta.60" - sources."@electron-forge/plugin-base-6.0.0-beta.60" - sources."@electron-forge/publisher-base-6.0.0-beta.60" - sources."@electron-forge/shared-types-6.0.0-beta.60" - sources."@electron-forge/template-base-6.0.0-beta.60" - sources."@electron-forge/template-typescript-6.0.0-beta.60" - sources."@electron-forge/template-typescript-webpack-6.0.0-beta.60" - sources."@electron-forge/template-webpack-6.0.0-beta.60" + sources."@electron-forge/async-ora-6.0.0-beta.61" + sources."@electron-forge/core-6.0.0-beta.61" + sources."@electron-forge/installer-base-6.0.0-beta.61" + sources."@electron-forge/installer-darwin-6.0.0-beta.61" + sources."@electron-forge/installer-deb-6.0.0-beta.61" + sources."@electron-forge/installer-dmg-6.0.0-beta.61" + sources."@electron-forge/installer-exe-6.0.0-beta.61" + sources."@electron-forge/installer-linux-6.0.0-beta.61" + sources."@electron-forge/installer-rpm-6.0.0-beta.61" + sources."@electron-forge/installer-zip-6.0.0-beta.61" + sources."@electron-forge/maker-base-6.0.0-beta.61" + sources."@electron-forge/plugin-base-6.0.0-beta.61" + sources."@electron-forge/publisher-base-6.0.0-beta.61" + sources."@electron-forge/shared-types-6.0.0-beta.61" + sources."@electron-forge/template-base-6.0.0-beta.61" + sources."@electron-forge/template-typescript-6.0.0-beta.61" + sources."@electron-forge/template-typescript-webpack-6.0.0-beta.61" + sources."@electron-forge/template-webpack-6.0.0-beta.61" (sources."@electron/get-1.13.0" // { dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -80672,7 +82279,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@npmcli/fs-1.0.0" sources."@npmcli/move-file-1.1.2" - sources."@sindresorhus/is-4.0.1" + sources."@sindresorhus/is-4.2.0" sources."@szmarczak/http-timer-4.0.6" sources."@tootallnate/once-1.1.2" sources."@types/cacheable-request-6.0.2" @@ -80680,7 +82287,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" sources."@types/minimatch-3.0.5" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" @@ -80693,7 +82300,7 @@ in sources."type-fest-0.21.3" ]; }) - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."aproba-1.2.0" (sources."are-we-there-yet-1.1.7" // { @@ -80704,7 +82311,7 @@ in ]; }) sources."array-find-index-1.0.2" - (sources."asar-3.0.3" // { + (sources."asar-3.1.0" // { dependencies = [ sources."commander-5.1.0" ]; @@ -80747,7 +82354,7 @@ in (sources."cliui-7.0.4" // { dependencies = [ sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" + sources."string-width-4.2.3" ]; }) sources."clone-1.0.4" @@ -80762,7 +82369,7 @@ in sources."concat-map-0.0.1" sources."config-chain-1.1.13" sources."console-control-strings-1.1.0" - sources."core-js-3.17.3" + sources."core-js-3.18.0" sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" (sources."cross-spawn-windows-exe-1.2.0" // { @@ -80808,7 +82415,7 @@ in sources."debug-2.6.9" ]; }) - (sources."electron-packager-15.3.0" // { + (sources."electron-packager-15.4.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -80847,7 +82454,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.12.0" + sources."fastq-1.13.0" sources."fd-slicer-1.1.0" sources."figures-3.2.0" sources."filename-reserved-regex-2.0.0" @@ -80899,7 +82506,7 @@ in sources."get-stdin-4.0.1" sources."get-stream-5.2.0" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."global-agent-2.2.0" sources."global-modules-1.0.0" @@ -80933,10 +82540,10 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - (sources."inquirer-8.1.2" // { + (sources."inquirer-8.1.5" // { dependencies = [ sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" + sources."string-width-4.2.3" ]; }) sources."ip-1.1.5" @@ -81006,7 +82613,7 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."minipass-3.1.3" + sources."minipass-3.1.5" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" sources."minipass-flush-1.0.5" @@ -81024,9 +82631,9 @@ in }) sources."node-addon-api-3.2.1" sources."node-api-version-0.1.4" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" sources."node-gyp-8.2.0" - sources."node-gyp-build-4.2.3" + sources."node-gyp-build-4.3.0" sources."nopt-5.0.0" (sources."normalize-package-data-2.5.0" // { dependencies = [ @@ -81145,7 +82752,7 @@ in sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."single-line-log-1.1.2" sources."smart-buffer-4.2.0" sources."socks-2.6.1" @@ -81167,7 +82774,7 @@ in ]; }) sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" sources."strip-indent-1.0.1" @@ -81189,6 +82796,7 @@ in sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" + sources."tr46-0.0.3" sources."trim-newlines-1.0.0" sources."trim-repeated-1.0.0" sources."tslib-2.1.0" @@ -81211,12 +82819,14 @@ in ]; }) sources."wcwidth-1.0.1" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-2.0.2" sources."wide-align-1.1.3" (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" + sources."string-width-4.2.3" ]; }) sources."wrappy-1.0.2" @@ -81224,10 +82834,10 @@ in sources."xtend-2.1.2" sources."y18n-5.0.8" sources."yallist-4.0.0" - (sources."yargs-17.1.1" // { + (sources."yargs-17.2.0" // { dependencies = [ sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" + sources."string-width-4.2.3" ]; }) sources."yargs-parser-20.2.9" @@ -81300,18 +82910,18 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-module-transforms-7.15.7" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-replace-supers-7.15.4" sources."@babel/helper-simple-access-7.15.4" sources."@babel/helper-split-export-declaration-7.15.4" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.15.4" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.5" - sources."@babel/plugin-proposal-object-rest-spread-7.14.7" + sources."@babel/parser-7.15.7" + sources."@babel/plugin-proposal-object-rest-spread-7.15.6" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.14.7" @@ -81319,7 +82929,7 @@ in sources."@babel/plugin-transform-react-jsx-7.14.9" sources."@babel/template-7.15.4" sources."@babel/traverse-7.15.4" - sources."@babel/types-7.15.4" + sources."@babel/types-7.15.6" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/yoga-layout-1.9.2" @@ -81329,7 +82939,7 @@ in sources."type-fest-0.21.3" ]; }) - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."arch-2.2.0" sources."arrify-1.0.1" @@ -81338,13 +82948,13 @@ in sources."auto-bind-4.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.17.0" + sources."browserslist-4.17.1" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001255" + sources."caniuse-lite-1.0.30001260" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -81354,7 +82964,6 @@ in sources."code-excerpt-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.4.0" sources."commondir-1.0.1" sources."concat-map-0.0.1" (sources."conf-7.1.2" // { @@ -81374,7 +82983,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.833" + sources."electron-to-chromium-1.3.849" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -81391,7 +83000,7 @@ in sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" sources."get-stream-4.1.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."globals-11.12.0" sources."hard-rejection-2.1.0" sources."has-1.0.3" @@ -81450,7 +83059,7 @@ in ]; }) sources."map-age-cleaner-0.1.3" - sources."map-obj-4.2.1" + sources."map-obj-4.3.0" sources."mem-6.1.1" (sources."meow-7.1.1" // { dependencies = [ @@ -81463,8 +83072,9 @@ in sources."minimist-1.2.5" sources."minimist-options-4.1.0" sources."ms-2.1.2" + sources."nanocolors-0.1.12" sources."nice-try-1.0.5" - sources."node-releases-1.1.75" + sources."node-releases-1.1.76" sources."normalize-package-data-2.5.0" sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" @@ -81527,7 +83137,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.7.2" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."skin-tone-1.0.0" (sources."slice-ansi-3.0.0" // { dependencies = [ @@ -81541,13 +83151,13 @@ in sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.10" - (sources."stack-utils-2.0.3" // { + (sources."stack-utils-2.0.5" // { dependencies = [ sources."escape-string-regexp-2.0.0" ]; }) - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."strip-eof-1.0.0" sources."strip-indent-3.0.0" sources."supports-color-5.5.0" @@ -81606,7 +83216,7 @@ in src = ../../applications/video/epgstation; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -81617,7 +83227,7 @@ in sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" sources."@fluentui/keyboard-key-0.2.17" - sources."@fluentui/react-7.175.2" + sources."@fluentui/react-7.176.1" sources."@fluentui/react-focus-7.18.0" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" @@ -81632,7 +83242,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.208" + sources."@microsoft/load-themed-styles-1.10.216" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -81871,7 +83481,7 @@ in dependencies = [ sources."chownr-2.0.0" sources."fs-minipass-2.1.0" - sources."minipass-3.1.3" + sources."minipass-3.1.5" sources."minizlib-2.1.2" sources."p-map-4.0.0" sources."rimraf-3.0.2" @@ -82145,7 +83755,7 @@ in sources."express-4.17.1" sources."express-normalize-query-params-middleware-0.5.1" sources."express-openapi-7.0.1" - (sources."ext-1.5.0" // { + (sources."ext-1.6.0" // { dependencies = [ sources."type-2.5.0" ]; @@ -82169,7 +83779,7 @@ in sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-1.1.4" - sources."fastq-1.12.0" + sources."fastq-1.13.0" sources."figgy-pudding-3.5.2" sources."figures-2.0.0" sources."file-uri-to-path-1.0.0" @@ -82242,7 +83852,7 @@ in sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" (sources."glob-stream-6.1.0" // { dependencies = [ @@ -82509,17 +84119,17 @@ in }) (sources."minipass-collect-1.0.2" // { dependencies = [ - sources."minipass-3.1.3" + sources."minipass-3.1.5" ]; }) (sources."minipass-flush-1.0.5" // { dependencies = [ - sources."minipass-3.1.3" + sources."minipass-3.1.5" ]; }) (sources."minipass-pipeline-1.2.4" // { dependencies = [ - sources."minipass-3.1.3" + sources."minipass-3.1.5" ]; }) sources."minizlib-1.3.3" @@ -82660,7 +84270,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.175.2" + sources."office-ui-fabric-react-7.176.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -82887,7 +84497,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."sass-1.39.0" // { + (sources."sass-1.42.1" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -82919,7 +84529,7 @@ in sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" sources."sift-7.0.1" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."slash-3.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -82997,7 +84607,7 @@ in sources."sshpk-1.16.1" (sources."ssri-8.0.1" // { dependencies = [ - sources."minipass-3.1.3" + sources."minipass-3.1.5" ]; }) sources."stack-trace-0.0.10" @@ -83073,7 +84683,7 @@ in sources."yallist-3.1.1" ]; }) - (sources."terser-5.7.2" // { + (sources."terser-5.9.0" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -83315,7 +84925,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -83329,7 +84939,7 @@ in sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ansi-colors-4.1.1" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."astral-regex-2.0.0" @@ -83388,7 +84998,7 @@ in sources."flatted-3.2.2" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globals-13.11.0" sources."has-flag-3.0.0" @@ -83436,13 +85046,13 @@ in ]; }) sources."sprintf-js-1.0.3" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.6.2" + sources."ajv-8.6.3" sources."json-schema-traverse-1.0.0" ]; }) @@ -83476,7 +85086,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -83492,7 +85102,7 @@ in sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ansi-colors-4.1.1" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."astral-regex-2.0.0" @@ -83552,7 +85162,7 @@ in sources."flatted-3.2.2" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globals-13.11.0" sources."has-flag-4.0.0" @@ -83601,13 +85211,13 @@ in ]; }) sources."sprintf-js-1.0.3" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."strip-json-comments-3.1.1" sources."supports-color-8.1.1" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.6.2" + sources."ajv-8.6.3" sources."json-schema-traverse-1.0.0" ]; }) @@ -83651,10 +85261,10 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "4.11.0"; + version = "4.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.11.0.tgz"; - sha512 = "yGe0VODAZSgkXdENysg5bupr0xe2r4Uap4OlnnVM39AnT1NBzzRy+JZT8skHVa395ZHMou8ThTKlfd29Bj9rOQ=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.12.0.tgz"; + sha512 = "cDRfs9blUWPPicoWQ9FCGn7XPzuHfz6oQ63KIpDLMBnerMxNqwEjSQ9jvH5RbclRgKFIQcbDiaBagSIkn07g5g=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -83671,7 +85281,7 @@ in sources."@babel/helper-builder-binary-assignment-operator-visitor-7.15.4" (sources."@babel/helper-compilation-targets-7.15.4" // { dependencies = [ - sources."browserslist-4.17.0" + sources."browserslist-4.17.1" sources."semver-6.3.0" ]; }) @@ -83688,14 +85298,14 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-module-transforms-7.15.7" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-replace-supers-7.15.4" sources."@babel/helper-simple-access-7.15.4" sources."@babel/helper-skip-transparent-expression-wrappers-7.15.4" sources."@babel/helper-split-export-declaration-7.15.4" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.15.4" (sources."@babel/highlight-7.14.5" // { @@ -83703,11 +85313,11 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.5" + sources."@babel/parser-7.15.7" sources."@babel/plugin-proposal-class-properties-7.14.5" sources."@babel/plugin-proposal-export-default-from-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" - sources."@babel/plugin-proposal-object-rest-spread-7.14.7" + sources."@babel/plugin-proposal-object-rest-spread-7.15.6" sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-syntax-class-properties-7.12.13" @@ -83764,18 +85374,18 @@ in sources."@babel/code-frame-7.14.5" ]; }) - sources."@babel/types-7.15.4" + sources."@babel/types-7.15.6" sources."@dabh/diagnostics-2.0.2" sources."@expo/apple-utils-0.0.0-alpha.25" sources."@expo/bunyan-4.0.0" - sources."@expo/config-5.0.9" - (sources."@expo/config-plugins-3.1.0" // { + sources."@expo/config-6.0.0" + (sources."@expo/config-plugins-4.0.0" // { dependencies = [ sources."semver-7.3.5" ]; }) sources."@expo/config-types-42.0.0" - (sources."@expo/dev-server-0.1.84" // { + (sources."@expo/dev-server-0.1.85" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -83792,7 +85402,7 @@ in sources."temp-dir-2.0.0" ]; }) - sources."@expo/dev-tools-0.13.115" + sources."@expo/dev-tools-0.13.116" (sources."@expo/devcert-1.0.0" // { dependencies = [ sources."debug-3.2.7" @@ -83807,7 +85417,7 @@ in ]; }) sources."@expo/json-file-8.2.33" - sources."@expo/metro-config-0.1.84" + sources."@expo/metro-config-0.2.0" sources."@expo/osascript-2.0.30" (sources."@expo/package-manager-0.0.47" // { dependencies = [ @@ -83816,12 +85426,12 @@ in sources."semver-5.7.1" ]; }) - (sources."@expo/plist-0.0.14" // { + (sources."@expo/plist-0.0.15" // { dependencies = [ sources."xmlbuilder-14.0.0" ]; }) - sources."@expo/prebuild-config-2.1.0" + sources."@expo/prebuild-config-3.0.0" sources."@expo/results-1.0.0" (sources."@expo/rudder-sdk-node-1.0.7" // { dependencies = [ @@ -83837,7 +85447,7 @@ in }) sources."@expo/sdk-runtime-versions-1.0.0" sources."@expo/spawn-async-1.5.0" - (sources."@expo/webpack-config-0.15.0" // { + (sources."@expo/webpack-config-0.16.0" // { dependencies = [ (sources."@babel/core-7.9.0" // { dependencies = [ @@ -83902,11 +85512,12 @@ in sources."supports-color-7.2.0" ]; }) + sources."@react-native/normalize-color-2.0.0" sources."@segment/loosely-validate-event-2.0.0" sources."@sideway/address-4.1.2" sources."@sideway/formula-3.0.0" sources."@sideway/pinpoint-2.0.0" - sources."@sindresorhus/is-4.0.1" + sources."@sindresorhus/is-4.2.0" sources."@szmarczak/http-timer-4.0.6" sources."@tootallnate/once-1.1.2" sources."@types/cacheable-request-6.0.2" @@ -83930,7 +85541,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.30" // { + (sources."@types/webpack-4.41.31" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -83961,7 +85572,7 @@ in sources."@webassemblyjs/wast-parser-1.9.0" sources."@webassemblyjs/wast-printer-1.9.0" sources."@wry/equality-0.1.11" - sources."@xmldom/xmldom-0.7.4" + sources."@xmldom/xmldom-0.7.5" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."abbrev-1.1.1" @@ -83975,11 +85586,6 @@ in sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."alphanum-sort-1.0.2" - (sources."analytics-node-3.5.0" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -83994,7 +85600,7 @@ in ]; }) sources."ansi-html-0.0.7" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."any-promise-1.3.0" sources."anymatch-3.1.2" @@ -84048,6 +85654,7 @@ in (sources."babel-loader-8.1.0" // { dependencies = [ sources."loader-utils-1.4.0" + sources."schema-utils-2.7.1" ]; }) sources."babel-plugin-dynamic-import-node-2.3.3" @@ -84056,7 +85663,7 @@ in sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.2.4" + sources."babel-plugin-polyfill-corejs3-0.2.5" sources."babel-plugin-polyfill-regenerator-0.2.2" sources."babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0" sources."babel-preset-fbjs-3.4.0" @@ -84072,7 +85679,7 @@ in sources."base64url-3.0.1" sources."batch-0.6.1" sources."bcrypt-pbkdf-1.0.2" - sources."big-integer-1.6.48" + sources."big-integer-1.6.49" sources."big.js-5.2.2" sources."binary-extensions-2.2.0" sources."bindings-1.5.0" @@ -84090,7 +85697,7 @@ in ]; }) sources."boolbase-1.0.0" - (sources."boxen-5.0.1" // { + (sources."boxen-5.1.2" // { dependencies = [ sources."type-fest-0.20.2" ]; @@ -84127,7 +85734,7 @@ in sources."bytes-3.0.0" (sources."cacache-15.3.0" // { dependencies = [ - sources."minipass-3.1.3" + sources."minipass-3.1.5" sources."mkdirp-1.0.4" sources."rimraf-3.0.2" ]; @@ -84147,7 +85754,7 @@ in }) sources."camelcase-6.2.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001255" + sources."caniuse-lite-1.0.30001260" sources."caseless-0.12.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -84162,7 +85769,6 @@ in sources."chokidar-3.5.2" sources."chownr-2.0.0" sources."chrome-trace-event-1.0.3" - sources."ci-info-3.2.0" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { dependencies = [ @@ -84224,7 +85830,6 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.6.0" - sources."colorette-1.4.0" sources."colors-1.4.0" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" @@ -84251,7 +85856,6 @@ in ]; }) sources."connect-history-api-fallback-1.6.0" - sources."consola-2.15.3" sources."console-browserify-1.2.0" sources."console-control-strings-1.1.0" sources."constants-browserify-1.0.0" @@ -84278,14 +85882,15 @@ in ]; }) sources."pkg-dir-4.2.0" + sources."schema-utils-2.7.1" sources."semver-6.3.0" sources."serialize-javascript-4.0.0" ]; }) - sources."core-js-3.17.3" - (sources."core-js-compat-3.17.3" // { + sources."core-js-3.18.0" + (sources."core-js-compat-3.18.0" // { dependencies = [ - sources."browserslist-4.17.0" + sources."browserslist-4.17.1" sources."semver-7.0.0" ]; }) @@ -84313,6 +85918,7 @@ in dependencies = [ sources."camelcase-5.3.1" sources."loader-utils-1.4.0" + sources."schema-utils-2.7.1" sources."semver-6.3.0" ]; }) @@ -84419,7 +86025,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.833" + sources."electron-to-chromium-1.3.849" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -84498,7 +86104,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.94" // { + (sources."expo-pwa-0.0.95" // { dependencies = [ sources."commander-2.20.0" ]; @@ -84525,13 +86131,15 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fast-safe-stringify-2.1.1" - sources."fastq-1.12.0" + sources."fastq-1.13.0" sources."faye-websocket-0.10.0" sources."fecha-4.2.1" sources."figgy-pudding-3.5.2" - sources."figures-3.2.0" - sources."file-loader-6.0.0" + (sources."file-loader-6.0.0" // { + dependencies = [ + sources."schema-utils-2.7.1" + ]; + }) sources."file-uri-to-path-1.0.0" sources."filesize-6.1.0" sources."fill-range-7.0.1" @@ -84546,7 +86154,7 @@ in sources."find-yarn-workspace-root-2.0.0" sources."flush-write-stream-1.1.1" sources."fn.name-1.1.0" - sources."follow-redirects-1.14.3" + sources."follow-redirects-1.14.4" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -84582,7 +86190,7 @@ in sources."fs-extra-9.0.0" (sources."fs-minipass-2.1.0" // { dependencies = [ - sources."minipass-3.1.3" + sources."minipass-3.1.5" ]; }) sources."fs-write-stream-atomic-1.0.10" @@ -84667,7 +86275,11 @@ in sources."hsl-regex-1.0.0" sources."hsla-regex-1.0.0" sources."html-entities-1.4.0" - sources."html-loader-1.1.0" + (sources."html-loader-1.1.0" // { + dependencies = [ + sources."schema-utils-2.7.1" + ]; + }) (sources."html-minifier-terser-5.1.1" // { dependencies = [ sources."commander-4.1.1" @@ -84715,6 +86327,7 @@ in sources."iferr-0.1.5" sources."ignore-5.1.8" sources."ignore-walk-3.0.4" + sources."image-size-1.0.0" sources."immer-8.0.1" (sources."import-fresh-2.0.0" // { dependencies = [ @@ -84892,7 +86505,7 @@ in sources."chalk-2.4.2" ]; }) - sources."logform-2.2.0" + sources."logform-2.3.0" sources."loglevel-1.7.1" sources."loose-envify-1.4.0" (sources."lower-case-2.0.2" // { @@ -84909,7 +86522,7 @@ in }) (sources."make-fetch-happen-9.1.0" // { dependencies = [ - sources."minipass-3.1.3" + sources."minipass-3.1.5" ]; }) sources."map-cache-0.2.2" @@ -84960,37 +86573,37 @@ in }) (sources."minipass-collect-1.0.2" // { dependencies = [ - sources."minipass-3.1.3" + sources."minipass-3.1.5" ]; }) (sources."minipass-fetch-1.4.1" // { dependencies = [ - sources."minipass-3.1.3" + sources."minipass-3.1.5" ]; }) (sources."minipass-flush-1.0.5" // { dependencies = [ - sources."minipass-3.1.3" + sources."minipass-3.1.5" ]; }) (sources."minipass-json-stream-1.0.1" // { dependencies = [ - sources."minipass-3.1.3" + sources."minipass-3.1.5" ]; }) (sources."minipass-pipeline-1.2.4" // { dependencies = [ - sources."minipass-3.1.3" + sources."minipass-3.1.5" ]; }) (sources."minipass-sized-1.0.3" // { dependencies = [ - sources."minipass-3.1.3" + sources."minipass-3.1.5" ]; }) (sources."minizlib-2.1.2" // { dependencies = [ - sources."minipass-3.1.3" + sources."minipass-3.1.5" ]; }) sources."mississippi-3.0.0" @@ -85013,6 +86626,7 @@ in sources."mv-2.1.1" sources."mz-2.7.0" sources."nan-2.15.0" + sources."nanocolors-0.1.12" sources."nanomatch-1.2.13" sources."ncp-2.0.0" (sources."needle-2.9.1" // { @@ -85030,7 +86644,7 @@ in ]; }) sources."nocache-2.1.0" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" sources."node-forge-0.10.0" (sources."node-gyp-7.1.2" // { dependencies = [ @@ -85045,7 +86659,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.75" + sources."node-releases-1.1.76" sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" @@ -85069,14 +86683,14 @@ in (sources."npm-registry-fetch-11.0.0" // { dependencies = [ sources."hosted-git-info-4.0.2" - sources."minipass-3.1.3" + sources."minipass-3.1.5" sources."npm-package-arg-8.1.5" sources."semver-7.3.5" ]; }) sources."npm-run-path-2.0.2" sources."npmlog-4.1.2" - sources."nth-check-2.0.0" + sources."nth-check-2.0.1" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."ob1-0.59.0" @@ -85167,7 +86781,7 @@ in (sources."pacote-11.3.5" // { dependencies = [ sources."hosted-git-info-4.0.2" - sources."minipass-3.1.3" + sources."minipass-3.1.5" sources."mkdirp-1.0.4" sources."npm-package-arg-8.1.5" sources."rimraf-3.0.2" @@ -85374,7 +86988,6 @@ in sources."color-name-1.1.4" ]; }) - sources."pretty-time-1.1.0" sources."probe-image-size-6.0.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" @@ -85404,6 +87017,7 @@ in sources."querystring-0.2.0" sources."querystring-es3-0.2.1" sources."querystringify-2.2.0" + sources."queue-6.0.2" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" sources."randombytes-2.1.0" @@ -85433,6 +87047,7 @@ in sources."prompts-2.4.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" + sources."strip-ansi-6.0.0" sources."which-2.0.2" ]; }) @@ -85449,16 +87064,16 @@ in sources."redis-errors-1.2.0" sources."redis-parser-3.0.0" sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-8.2.0" + sources."regenerate-unicode-properties-9.0.0" sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.3.1" - sources."regexpu-core-4.7.1" + sources."regexpu-core-4.8.0" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.9" // { + (sources."regjsparser-0.7.0" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -85519,9 +87134,10 @@ in sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" + sources."safe-stable-stringify-1.1.1" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."schema-utils-2.7.1" + sources."schema-utils-3.1.1" sources."select-hose-2.0.0" sources."selfsigned-1.10.11" sources."semver-7.3.2" @@ -85557,7 +87173,7 @@ in sources."shebang-regex-1.0.0" sources."shell-quote-1.7.2" sources."side-channel-1.0.4" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."simple-plist-1.1.1" sources."simple-swizzle-0.2.2" sources."sisteransi-1.0.5" @@ -85606,7 +87222,7 @@ in ]; }) sources."socks-2.6.1" - sources."socks-proxy-agent-6.0.0" + sources."socks-proxy-agent-6.1.0" sources."source-list-map-2.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" @@ -85624,7 +87240,7 @@ in sources."sshpk-1.16.1" (sources."ssri-8.0.1" // { dependencies = [ - sources."minipass-3.1.3" + sources."minipass-3.1.5" ]; }) sources."stable-0.1.8" @@ -85648,7 +87264,6 @@ in ]; }) sources."statuses-1.4.0" - sources."std-env-2.3.0" sources."stream-browserify-2.0.2" sources."stream-buffers-2.2.0" sources."stream-each-1.2.3" @@ -85660,7 +87275,7 @@ in ]; }) sources."stream-shift-1.0.1" - (sources."string-width-4.2.2" // { + (sources."string-width-4.2.3" // { dependencies = [ sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -85669,10 +87284,14 @@ in sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" sources."string_decoder-1.1.1" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."style-loader-1.2.1" + (sources."style-loader-1.2.1" // { + dependencies = [ + sources."schema-utils-2.7.1" + ]; + }) (sources."stylehacks-4.0.3" // { dependencies = [ sources."postcss-selector-parser-3.1.2" @@ -85712,7 +87331,7 @@ in sources."tapable-1.1.3" (sources."tar-6.1.11" // { dependencies = [ - sources."minipass-3.1.3" + sources."minipass-3.1.5" sources."mkdirp-1.0.4" ]; }) @@ -85745,6 +87364,7 @@ in ]; }) sources."pkg-dir-4.2.0" + sources."schema-utils-2.7.1" sources."semver-6.3.0" sources."serialize-javascript-4.0.0" sources."source-map-0.6.1" @@ -85773,6 +87393,7 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" + sources."tr46-0.0.3" sources."traverse-0.6.6" sources."tree-kill-1.2.2" sources."triple-beam-1.3.0" @@ -85790,10 +87411,10 @@ in sources."uglify-js-3.14.2" sources."ultron-1.1.1" sources."unbox-primitive-1.0.1" - sources."unicode-canonical-property-names-ecmascript-1.0.4" - sources."unicode-match-property-ecmascript-1.0.4" - sources."unicode-match-property-value-ecmascript-1.2.0" - sources."unicode-property-aliases-ecmascript-1.1.0" + sources."unicode-canonical-property-names-ecmascript-2.0.0" + sources."unicode-match-property-ecmascript-2.0.0" + sources."unicode-match-property-value-ecmascript-2.0.0" + sources."unicode-property-aliases-ecmascript-2.0.0" sources."union-value-1.0.1" sources."uniq-1.0.1" sources."uniqs-2.0.0" @@ -85824,11 +87445,7 @@ in ]; }) sources."url-join-4.0.0" - (sources."url-loader-4.1.1" // { - dependencies = [ - sources."schema-utils-3.1.1" - ]; - }) + sources."url-loader-4.1.1" sources."url-parse-1.5.3" (sources."url-parse-lax-3.0.0" // { dependencies = [ @@ -85880,6 +87497,7 @@ in }) sources."wbuf-1.7.3" sources."wcwidth-1.0.1" + sources."webidl-conversions-3.0.1" (sources."webpack-4.43.0" // { dependencies = [ sources."braces-2.3.2" @@ -85997,17 +87615,9 @@ in sources."source-map-0.6.1" ]; }) - (sources."webpackbar-4.0.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-2.4.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."wrap-ansi-6.2.0" - ]; - }) sources."websocket-driver-0.6.5" sources."websocket-extensions-0.1.4" + sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-module-2.0.0" @@ -86044,7 +87654,7 @@ in sources."uuid-7.0.3" ]; }) - (sources."xdl-59.1.0" // { + (sources."xdl-59.2.0" // { dependencies = [ sources."bplist-parser-0.3.0" sources."chownr-1.1.4" @@ -86116,18 +87726,18 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-module-transforms-7.15.7" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-replace-supers-7.15.4" sources."@babel/helper-simple-access-7.15.4" sources."@babel/helper-split-export-declaration-7.15.4" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.15.4" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.5" - sources."@babel/plugin-proposal-object-rest-spread-7.14.7" + sources."@babel/parser-7.15.7" + sources."@babel/plugin-proposal-object-rest-spread-7.15.6" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.14.7" @@ -86135,9 +87745,9 @@ in sources."@babel/plugin-transform-react-jsx-7.14.9" sources."@babel/template-7.15.4" sources."@babel/traverse-7.15.4" - sources."@babel/types-7.15.4" + sources."@babel/types-7.15.6" sources."@types/minimist-1.2.2" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.9.2" sources."@types/yoga-layout-1.9.2" @@ -86147,7 +87757,7 @@ in sources."type-fest-0.21.3" ]; }) - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."arrify-1.0.1" sources."astral-regex-2.0.0" @@ -86156,7 +87766,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."brace-expansion-1.1.11" - sources."browserslist-4.17.0" + sources."browserslist-4.17.1" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."caller-callsite-2.0.0" @@ -86164,7 +87774,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001255" + sources."caniuse-lite-1.0.30001260" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" @@ -86175,7 +87785,6 @@ in sources."code-excerpt-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.4.0" sources."commondir-1.0.1" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" @@ -86189,7 +87798,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.869402" - sources."electron-to-chromium-1.3.833" + sources."electron-to-chromium-1.3.849" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -86204,7 +87813,7 @@ in sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" sources."get-stream-5.2.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."globals-11.12.0" sources."hard-rejection-2.1.0" sources."has-1.0.3" @@ -86243,7 +87852,7 @@ in sources."loose-envify-1.4.0" sources."lru-cache-6.0.0" sources."make-dir-3.1.0" - sources."map-obj-4.2.1" + sources."map-obj-4.3.0" (sources."meow-9.0.0" // { dependencies = [ sources."type-fest-0.18.1" @@ -86256,8 +87865,9 @@ in sources."minimist-options-4.1.0" sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" - sources."node-fetch-2.6.2" - sources."node-releases-1.1.75" + sources."nanocolors-0.1.12" + sources."node-fetch-2.6.5" + sources."node-releases-1.1.76" (sources."normalize-package-data-3.0.3" // { dependencies = [ sources."semver-7.3.5" @@ -86309,7 +87919,7 @@ in sources."scheduler-0.18.0" sources."semver-6.3.0" sources."shell-quote-1.7.2" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" (sources."slice-ansi-3.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -86322,29 +87932,32 @@ in sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.10" - (sources."stack-utils-2.0.3" // { + (sources."stack-utils-2.0.5" // { dependencies = [ sources."escape-string-regexp-2.0.0" ]; }) - sources."string-width-4.2.2" + sources."string-width-4.2.3" (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.1" ]; }) - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-indent-3.0.0" sources."supports-color-5.5.0" sources."tar-fs-2.1.1" sources."tar-stream-2.2.0" sources."through-2.3.8" sources."to-fast-properties-2.0.0" + sources."tr46-0.0.3" sources."trim-newlines-3.0.1" sources."type-fest-0.12.0" sources."unbzip2-stream-1.4.3" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."widest-line-3.1.0" (sources."wrap-ansi-6.2.0" // { dependencies = [ @@ -86374,10 +87987,10 @@ in fauna-shell = nodeEnv.buildNodePackage { name = "fauna-shell"; packageName = "fauna-shell"; - version = "0.12.5"; + version = "0.12.6"; src = fetchurl { - url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.12.5.tgz"; - sha512 = "yDfb49A/9LCm7/xwk7zRzcjzt4w6FKUPLtSy+sRuOA9h26sNwhh4CYOqj57VOF+N7G55XFixEb0/FGKvDl7AyA=="; + url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.12.6.tgz"; + sha512 = "8EB7YEcbD6jmmK9oYe1R/UR8q3Akb0PrDUbROCZ66LQlBiFKrwGbf1CCZ+RAFZOYyYGmQIEp1QQE0vX6FsZzbg=="; }; dependencies = [ (sources."@heroku-cli/color-1.1.14" // { @@ -86404,7 +88017,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.35" // { + (sources."@oclif/core-0.5.39" // { dependencies = [ sources."chalk-4.1.2" (sources."cli-ux-5.6.3" // { @@ -86456,7 +88069,7 @@ in ]; }) sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ansicolors-0.3.2" sources."argparse-1.0.10" @@ -86489,7 +88102,7 @@ in ]; }) sources."bluebird-3.7.2" - (sources."boxen-5.0.1" // { + (sources."boxen-5.1.2" // { dependencies = [ sources."chalk-4.1.2" sources."has-flag-4.0.0" @@ -86540,7 +88153,7 @@ in sources."clean-stack-3.0.1" sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" - sources."cli-progress-3.9.0" + sources."cli-progress-3.9.1" sources."cli-spinners-2.6.0" (sources."cli-table-0.3.6" // { dependencies = [ @@ -86647,7 +88260,7 @@ in sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.12.0" + sources."fastq-1.13.0" (sources."faunadb-4.4.1" // { dependencies = [ sources."chalk-4.1.2" @@ -86673,7 +88286,7 @@ in sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.3.0" (sources."globby-8.0.2" // { @@ -86745,7 +88358,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - (sources."inquirer-8.1.2" // { + (sources."inquirer-8.1.5" // { dependencies = [ sources."chalk-4.1.2" sources."has-flag-4.0.0" @@ -86827,7 +88440,7 @@ in ]; }) sources."nice-try-1.0.5" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" sources."normalize-url-2.0.1" sources."npm-run-path-2.0.2" sources."oauth-sign-0.9.0" @@ -86880,7 +88493,7 @@ in sources."posix-character-classes-0.1.1" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" - sources."prettier-2.4.0" + sources."prettier-2.4.1" sources."process-nextick-args-2.0.1" sources."psl-1.8.0" sources."punycode-2.1.1" @@ -86922,7 +88535,7 @@ in }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."slash-3.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -86981,13 +88594,13 @@ in }) sources."stealthy-require-1.1.1" sources."strict-uri-encode-1.1.0" - sources."string-width-4.2.2" + sources."string-width-4.2.3" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-eof-1.0.0" sources."supports-color-5.5.0" (sources."supports-hyperlinks-2.2.0" // { @@ -87007,6 +88620,7 @@ in sources."to-regex-3.0.2" sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" + sources."tr46-0.0.3" sources."treeify-1.1.0" sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" @@ -87038,6 +88652,8 @@ in ]; }) sources."wcwidth-1.0.1" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."widest-line-3.1.0" sources."word-wrap-1.2.3" @@ -87075,13 +88691,13 @@ in sources."@google-cloud/precise-date-2.0.4" sources."@google-cloud/projectify-2.1.1" sources."@google-cloud/promisify-2.0.4" - (sources."@google-cloud/pubsub-2.17.0" // { + (sources."@google-cloud/pubsub-2.18.0" // { dependencies = [ - sources."google-auth-library-7.9.1" + sources."google-auth-library-7.9.2" ]; }) sources."@grpc/grpc-js-1.3.7" - sources."@grpc/proto-loader-0.6.4" + sources."@grpc/proto-loader-0.6.5" sources."@jsdevtools/ono-7.1.3" (sources."@npmcli/fs-1.0.0" // { dependencies = [ @@ -87114,7 +88730,7 @@ in sources."@types/json-schema-7.0.9" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -87133,7 +88749,7 @@ in ]; }) sources."ansi-escapes-3.2.0" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ansicolors-0.3.2" sources."anymatch-3.1.2" @@ -87173,7 +88789,7 @@ in }) sources."basic-auth-connect-1.0.0" sources."bcrypt-pbkdf-1.0.2" - sources."big-integer-1.6.48" + sources."big-integer-1.6.49" sources."bignumber.js-9.0.1" sources."binary-0.3.0" sources."binary-extensions-2.2.0" @@ -87377,7 +88993,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."ext-1.5.0" // { + (sources."ext-1.6.0" // { dependencies = [ sources."type-2.5.0" ]; @@ -87388,7 +89004,6 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fast-safe-stringify-2.1.1" sources."fast-text-encoding-1.0.3" (sources."fast-url-parser-1.1.3" // { dependencies = [ @@ -87447,7 +89062,7 @@ in sources."strip-ansi-3.0.1" ]; }) - sources."gaxios-4.3.1" + sources."gaxios-4.3.2" sources."gcp-metadata-4.3.1" sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" @@ -87457,15 +89072,15 @@ in ]; }) sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."glob-slash-1.0.0" sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" sources."google-auth-library-6.1.6" - (sources."google-gax-2.25.1" // { + (sources."google-gax-2.25.4" // { dependencies = [ - sources."google-auth-library-7.9.1" + sources."google-auth-library-7.9.2" ]; }) sources."google-p12-pem-3.1.2" @@ -87606,7 +89221,7 @@ in sources."lodash.union-4.6.0" sources."lodash.values-2.4.1" sources."log-symbols-2.2.0" - (sources."logform-2.2.0" // { + (sources."logform-2.3.0" // { dependencies = [ sources."colors-1.4.0" ]; @@ -87638,7 +89253,7 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."minipass-3.1.3" + sources."minipass-3.1.5" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" sources."minipass-flush-1.0.5" @@ -87666,7 +89281,7 @@ in sources."next-tick-1.0.0" sources."nice-try-1.0.5" sources."node-emoji-1.11.0" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" sources."node-forge-0.10.0" (sources."node-gyp-8.2.0" // { dependencies = [ @@ -87729,7 +89344,7 @@ in sources."promise-breaker-5.0.0" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" - sources."proto3-json-serializer-0.1.3" + sources."proto3-json-serializer-0.1.4" sources."protobufjs-6.11.2" sources."proxy-addr-2.0.7" (sources."proxy-agent-4.0.1" // { @@ -87781,6 +89396,7 @@ in ]; }) sources."safe-buffer-5.2.1" + sources."safe-stable-stringify-1.1.1" sources."safer-buffer-2.1.2" sources."semver-5.7.1" (sources."semver-diff-3.1.1" // { @@ -87805,7 +89421,7 @@ in sources."setprototypeof-1.1.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."simple-swizzle-0.2.2" sources."smart-buffer-4.2.0" sources."socks-2.6.1" @@ -87823,9 +89439,9 @@ in sources."strip-ansi-3.0.1" ]; }) - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-json-comments-2.0.1" (sources."superstatic-7.1.0" // { dependencies = [ @@ -87885,6 +89501,7 @@ in sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" sources."toxic-1.0.1" + sources."tr46-0.0.3" sources."traverse-0.3.9" sources."triple-beam-1.3.0" sources."tslib-2.3.1" @@ -87915,7 +89532,7 @@ in }) (sources."update-notifier-5.1.0" // { dependencies = [ - sources."boxen-5.0.1" + sources."boxen-5.1.2" sources."camelcase-6.2.0" sources."chalk-4.1.2" sources."global-dirs-3.0.0" @@ -87942,6 +89559,8 @@ in ]; }) sources."wcwidth-1.0.1" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-1.3.1" (sources."wide-align-1.1.3" // { dependencies = [ @@ -87994,7 +89613,7 @@ in sha512 = "NptKAXT3UrePy8JfK6ww/yiwqjVipouoEYUucKVpLNOiOWsrZ7XtcG3iUWpb3yGUoaN7OEafsd3cEGFMIjoXUQ=="; }; dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" @@ -88007,7 +89626,7 @@ in sources."escalade-3.1.1" sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-fullwidth-code-point-3.0.0" @@ -88016,8 +89635,8 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."require-directory-2.1.1" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."y18n-5.0.8" @@ -88044,7 +89663,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -88059,7 +89678,7 @@ in sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."arrify-2.0.1" sources."astral-regex-2.0.0" @@ -88114,7 +89733,7 @@ in sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lru-cache-6.0.0" - sources."map-obj-4.2.1" + sources."map-obj-4.3.0" (sources."meow-8.1.2" // { dependencies = [ sources."type-fest-0.18.1" @@ -88174,14 +89793,14 @@ in sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."slice-ansi-3.0.0" 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.10" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" sources."supports-color-7.2.0" @@ -88224,11 +89843,11 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."argparse-1.0.10" sources."asn1-0.2.4" @@ -88333,7 +89952,7 @@ in sources."mkdirp-0.5.5" sources."mute-stream-0.0.8" sources."nedb-1.8.0" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" (sources."number-to-bn-1.7.0" // { dependencies = [ sources."bn.js-4.11.6" @@ -88370,21 +89989,22 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."stealthy-require-1.1.1" sources."strict-uri-encode-1.1.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."strip-hex-prefix-1.0.0" sources."supports-color-7.2.0" sources."through-2.3.8" sources."timed-out-4.0.1" sources."tmp-0.0.33" sources."tough-cookie-2.5.0" + sources."tr46-0.0.3" sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -88397,7 +90017,9 @@ in sources."utf8-3.0.0" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."web3-utils-1.5.2" + sources."web3-utils-1.5.3" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-module-2.0.0" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" @@ -88580,7 +90202,7 @@ in sources."get-intrinsic-1.1.1" sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" - sources."glob-7.1.7" + sources."glob-7.2.0" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -88597,7 +90219,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."i-0.3.6" + sources."i-0.3.7" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -88734,7 +90356,7 @@ in }) sources."shush-1.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -88865,7 +90487,7 @@ in }; dependencies = [ sources."@medv/blessed-2.0.1" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" @@ -88875,8 +90497,8 @@ in sources."indent-string-4.0.0" sources."is-fullwidth-code-point-3.0.0" sources."lossless-json-1.0.5" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" ]; buildInputs = globalBuildInputs; @@ -88910,10 +90532,10 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "3.13.0"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.13.0.tgz"; - sha512 = "QTJZUY4wPwXLuK4aP3GCqBpklruV2hv/jtf65ED5zfeF2YnZlFvrJXt40n9o1ptc5XYe/FF6yFBxu1Lwbt9qtg=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.14.0.tgz"; + sha512 = "1Az1EEQu0txRE8eZmOo9GOxRSjhJtFseinraiIEtSeHkYuM0/gjuoKVSrtmbBFNWdOZll6QYCO3sRl6sOrwb+g=="; }; dependencies = [ (sources."@ardatan/aggregate-error-0.0.6" // { @@ -88945,14 +90567,14 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-module-transforms-7.15.7" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-replace-supers-7.15.4" sources."@babel/helper-simple-access-7.15.4" sources."@babel/helper-skip-transparent-expression-wrappers-7.15.4" sources."@babel/helper-split-export-declaration-7.15.4" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.15.4" (sources."@babel/highlight-7.14.5" // { @@ -88960,7 +90582,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.5" + sources."@babel/parser-7.15.7" sources."@babel/plugin-proposal-object-rest-spread-7.10.4" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-syntax-jsx-7.14.5" @@ -88969,10 +90591,10 @@ in sources."@babel/plugin-transform-parameters-7.15.4" sources."@babel/plugin-transform-react-jsx-7.14.9" sources."@babel/runtime-7.15.4" - sources."@babel/standalone-7.15.5" + sources."@babel/standalone-7.15.7" sources."@babel/template-7.15.4" sources."@babel/traverse-7.15.4" - sources."@babel/types-7.15.4" + sources."@babel/types-7.15.6" sources."@graphql-tools/schema-7.1.5" sources."@graphql-tools/utils-7.10.0" sources."@hapi/address-2.1.4" @@ -88998,18 +90620,22 @@ in }) sources."@sideway/formula-3.0.0" sources."@sideway/pinpoint-2.0.0" - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" + sources."@sindresorhus/is-4.2.0" + sources."@szmarczak/http-timer-4.0.6" sources."@tokenizer/token-0.3.0" sources."@turist/fetch-7.1.7" sources."@turist/time-0.0.2" + sources."@types/cacheable-request-6.0.2" sources."@types/common-tags-1.8.1" + sources."@types/http-cache-semantics-4.0.1" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-patch-0.0.30" - sources."@types/node-16.9.0" + sources."@types/keyv-3.1.3" + sources."@types/node-16.9.6" sources."@types/node-fetch-2.5.12" + sources."@types/responselike-1.0.0" sources."@types/unist-2.0.6" sources."@types/yargs-15.0.14" sources."@types/yargs-parser-20.2.1" @@ -89024,7 +90650,7 @@ in ]; }) sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" sources."arch-2.2.0" @@ -89059,19 +90685,18 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.17.0" + sources."browserslist-4.17.1" sources."bytes-3.1.0" - (sources."cacheable-request-6.1.0" // { + sources."cacheable-lookup-5.0.4" + (sources."cacheable-request-7.0.2" // { dependencies = [ sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" - sources."normalize-url-4.5.1" ]; }) sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001255" + sources."caniuse-lite-1.0.30001260" sources."ccount-1.1.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -89102,7 +90727,7 @@ in sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."wrap-ansi-6.2.0" ]; }) @@ -89110,7 +90735,6 @@ in sources."collapse-white-space-1.0.6" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.4.0" sources."combined-stream-1.0.8" sources."common-tags-1.8.0" sources."concat-map-0.0.1" @@ -89121,8 +90745,8 @@ in ]; }) sources."content-type-1.0.4" - sources."contentful-management-7.36.2" - sources."contentful-sdk-core-6.8.5" + sources."contentful-management-7.39.1" + sources."contentful-sdk-core-6.9.0" sources."convert-hrtime-3.0.0" (sources."convert-source-map-1.8.0" // { dependencies = [ @@ -89132,7 +90756,7 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."cors-2.8.5" - sources."create-gatsby-1.13.0" + sources."create-gatsby-1.14.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -89144,9 +90768,13 @@ in sources."debug-4.3.2" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" - sources."decompress-response-3.3.0" + (sources."decompress-response-6.0.0" // { + dependencies = [ + sources."mimic-response-3.1.0" + ]; + }) sources."deep-extend-0.6.0" - sources."defer-to-connect-1.1.3" + sources."defer-to-connect-2.0.1" sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."destroy-1.0.4" @@ -89167,7 +90795,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.833" + sources."electron-to-chromium-1.3.849" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -89229,35 +90857,35 @@ in ]; }) sources."find-up-4.1.0" - sources."follow-redirects-1.14.3" + sources."follow-redirects-1.14.4" sources."form-data-3.0.1" sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs-exists-cached-1.0.0" - sources."fs-extra-8.1.0" + sources."fs-extra-10.0.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."gatsby-core-utils-2.13.0" - (sources."gatsby-recipes-0.24.0" // { + sources."gatsby-core-utils-2.14.0" + (sources."gatsby-recipes-0.25.0" // { dependencies = [ - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) - sources."gatsby-telemetry-2.13.0" + sources."gatsby-telemetry-2.14.0" sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-stdin-4.0.1" sources."get-stream-4.1.0" sources."git-up-4.0.5" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."global-dirs-3.0.0" sources."globals-11.12.0" - sources."got-9.6.0" + sources."got-11.8.2" sources."graceful-fs-4.2.8" - sources."graphql-15.5.3" + sources."graphql-15.6.0" sources."graphql-compose-7.25.1" sources."graphql-subscriptions-1.2.1" sources."graphql-type-json-0.3.2" @@ -89275,6 +90903,7 @@ in sources."inherits-2.0.3" ]; }) + sources."http2-wrapper-1.0.3" sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" @@ -89286,7 +90915,7 @@ in sources."inline-style-parser-0.1.1" (sources."inquirer-7.3.3" // { dependencies = [ - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."ipaddr.js-1.9.1" @@ -89345,10 +90974,10 @@ in }) sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - sources."json-buffer-3.0.0" + sources."json-buffer-3.0.1" sources."json5-2.2.0" - sources."jsonfile-4.0.0" - sources."keyv-3.1.0" + sources."jsonfile-6.1.0" + sources."keyv-4.0.3" sources."kleur-3.0.3" sources."latest-version-5.1.0" sources."locate-path-5.0.0" @@ -89358,7 +90987,7 @@ in sources."longest-streak-2.0.4" sources."loose-envify-1.4.0" sources."lower-case-2.0.2" - sources."lowercase-keys-1.0.1" + sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ @@ -89398,17 +91027,18 @@ in sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."mute-stream-0.0.8" + sources."nanocolors-0.1.12" sources."negotiator-0.6.2" sources."nice-try-1.0.5" sources."no-case-3.0.4" sources."node-eta-0.9.0" - sources."node-fetch-2.6.2" - sources."node-object-hash-2.3.9" - sources."node-releases-1.1.75" + sources."node-fetch-2.6.5" + sources."node-object-hash-2.3.10" + sources."node-releases-1.1.76" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" sources."npm-run-path-2.0.2" - sources."nth-check-2.0.0" + sources."nth-check-2.0.1" sources."object-assign-4.1.1" sources."object-inspect-1.11.0" sources."object-path-0.11.5" @@ -89418,13 +91048,30 @@ in sources."open-7.4.2" sources."opentracing-0.14.5" sources."os-tmpdir-1.0.2" - sources."p-cancelable-1.1.0" + sources."p-cancelable-2.1.1" sources."p-finally-1.0.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" (sources."package-json-6.5.0" // { dependencies = [ + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."lowercase-keys-2.0.0" + ]; + }) + sources."decompress-response-3.3.0" + sources."defer-to-connect-1.1.3" + sources."get-stream-5.2.0" + sources."got-9.6.0" + sources."json-buffer-3.0.0" + sources."keyv-3.1.0" + sources."lowercase-keys-1.0.1" + sources."normalize-url-4.5.1" + sources."p-cancelable-1.1.0" + sources."responselike-1.0.2" sources."semver-6.3.0" ]; }) @@ -89442,7 +91089,7 @@ in sources."picomatch-2.3.0" sources."pkg-dir-4.2.0" sources."prepend-http-2.0.0" - sources."prettier-2.4.0" + sources."prettier-2.4.1" sources."pretty-error-2.1.2" (sources."pretty-format-25.5.0" // { dependencies = [ @@ -89461,6 +91108,7 @@ in sources."pupa-2.1.1" sources."qs-6.10.1" sources."query-string-6.14.1" + sources."quick-lru-5.1.1" sources."range-parser-1.2.1" sources."raw-body-2.4.0" (sources."rc-1.2.8" // { @@ -89505,9 +91153,10 @@ in sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."resolve-1.20.0" + sources."resolve-alpn-1.2.1" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" - sources."responselike-1.0.2" + sources."responselike-2.0.0" sources."restore-cursor-3.1.0" sources."retry-0.12.0" sources."rimraf-3.0.2" @@ -89541,7 +91190,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."single-trailing-newline-1.0.0" sources."sisteransi-1.0.5" sources."source-map-0.7.3" @@ -89550,11 +91199,11 @@ in sources."state-toggle-1.0.3" sources."statuses-1.5.0" sources."strict-uri-encode-2.0.0" - (sources."string-width-4.2.2" // { + (sources."string-width-4.2.3" // { dependencies = [ sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."string_decoder-1.3.0" @@ -89579,6 +91228,7 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."token-types-4.1.1" + sources."tr46-0.0.3" sources."trim-0.0.1" sources."trim-trailing-lines-1.1.4" sources."trough-1.0.5" @@ -89604,11 +91254,11 @@ in ]; }) sources."unist-util-visit-parents-2.1.2" - sources."universalify-0.1.2" + sources."universalify-2.0.0" sources."unpipe-1.0.0" (sources."update-notifier-5.1.0" // { dependencies = [ - sources."boxen-5.0.1" + sources."boxen-5.1.2" sources."camelcase-6.2.0" sources."type-fest-0.20.2" ]; @@ -89623,6 +91273,8 @@ in sources."vfile-4.2.1" sources."vfile-location-2.0.6" sources."vfile-message-2.0.4" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."which-module-2.0.0" sources."widest-line-3.1.0" @@ -89631,14 +91283,14 @@ in sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."ws-7.5.5" sources."xdg-basedir-4.0.0" - sources."xstate-4.23.4" + sources."xstate-4.25.0" sources."xtend-4.0.2" sources."y18n-4.0.3" sources."yallist-4.0.0" @@ -89665,14 +91317,14 @@ in generator-code = nodeEnv.buildNodePackage { name = "generator-code"; packageName = "generator-code"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/generator-code/-/generator-code-1.6.0.tgz"; - sha512 = "AZQg3krSIoySkTfHUhcWdDAALT5rIRvlFI8EcbrFMjIgedYZk04HdxYtq8FGdsWD9D/3F2zQN++iuWXowQw8Ig=="; + url = "https://registry.npmjs.org/generator-code/-/generator-code-1.6.1.tgz"; + sha512 = "zTahNxes6nu0P0sXb1nQY7G30zYxEEEpI3z5TaWfn5T1jLY5Ui0ZAoRv6ry0exWpUK1DxoCTXWPskIuCcvk1tQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -89683,18 +91335,18 @@ in sources."supports-color-5.5.0" ]; }) - sources."@octokit/auth-token-2.4.5" + sources."@octokit/auth-token-2.5.0" sources."@octokit/core-3.5.1" sources."@octokit/endpoint-6.0.12" sources."@octokit/graphql-4.8.0" - sources."@octokit/openapi-types-10.1.1" - sources."@octokit/plugin-paginate-rest-2.16.0" + sources."@octokit/openapi-types-10.5.0" + sources."@octokit/plugin-paginate-rest-2.16.4" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.10.1" + sources."@octokit/plugin-rest-endpoint-methods-5.11.1" sources."@octokit/request-5.6.1" sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.10.0" - sources."@octokit/types-6.27.0" + sources."@octokit/rest-18.11.0" + sources."@octokit/types-6.31.0" sources."@types/normalize-package-data-2.4.1" sources."ansi-regex-2.1.1" sources."ansi-styles-4.3.0" @@ -89722,7 +91374,7 @@ in sources."get-stdin-4.0.1" sources."get-stream-5.2.0" sources."github-username-6.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-4.0.0" @@ -89748,7 +91400,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."ms-2.1.2" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -89783,7 +91435,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shelljs-0.8.4" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -89799,11 +91451,14 @@ in sources."supports-color-7.2.0" sources."taketalk-1.0.0" sources."text-table-0.2.0" + sources."tr46-0.0.3" sources."truncate-utf8-bytes-1.0.2" sources."type-fest-0.8.1" sources."universal-user-agent-6.0.0" sources."utf8-byte-length-1.0.4" sources."validate-npm-package-license-3.0.4" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-2.0.2" (sources."wrap-ansi-2.1.0" // { dependencies = [ @@ -89856,8 +91511,11 @@ in sources."has-flag-3.0.0" sources."iterall-1.3.0" sources."minimist-1.2.5" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" sources."supports-color-5.5.0" + sources."tr46-0.0.3" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -89956,7 +91614,7 @@ in sources."multiserver-scopes-1.0.0" sources."muxrpc-6.5.3" sources."nearley-2.20.1" - sources."node-gyp-build-4.2.3" + sources."node-gyp-build-4.3.0" sources."node-polyglot-1.0.0" sources."non-private-ip-1.4.4" sources."os-homedir-1.0.2" @@ -90110,7 +91768,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -90127,7 +91785,7 @@ in sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."agent-base-6.0.2" - sources."ajv-8.6.2" + sources."ajv-8.6.3" sources."ajv-formats-2.1.1" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -90139,14 +91797,14 @@ in ]; }) sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."arrify-1.0.1" sources."ast-types-0.13.4" sources."atomically-1.7.0" sources."base64-js-1.5.1" sources."bl-4.1.0" - (sources."boxen-5.0.1" // { + (sources."boxen-5.1.2" // { dependencies = [ sources."camelcase-6.2.0" sources."type-fest-0.20.2" @@ -90173,7 +91831,7 @@ in sources."clone-response-1.0.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."conf-10.0.2" + sources."conf-10.0.3" (sources."configstore-5.0.1" // { dependencies = [ sources."dot-prop-5.3.0" @@ -90252,7 +91910,7 @@ in sources."indent-string-4.0.0" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."inquirer-8.1.2" + sources."inquirer-8.1.5" (sources."inquirer-autocomplete-prompt-1.4.0" // { dependencies = [ sources."rxjs-6.6.7" @@ -90301,7 +91959,7 @@ in sources."semver-6.3.0" ]; }) - sources."map-obj-4.2.1" + sources."map-obj-4.3.0" (sources."meow-9.0.0" // { dependencies = [ sources."type-fest-0.18.1" @@ -90316,7 +91974,7 @@ in sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."netmask-2.0.2" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" sources."normalize-package-data-3.0.3" sources."normalize-url-4.5.1" sources."npm-run-path-4.0.1" @@ -90401,7 +92059,7 @@ in sources."setprototypeof-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" @@ -90411,9 +92069,9 @@ in sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.10" sources."statuses-1.5.0" - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" @@ -90422,6 +92080,7 @@ in sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" + sources."tr46-0.0.3" sources."trim-newlines-3.0.1" sources."tslib-2.1.0" sources."type-check-0.3.2" @@ -90437,6 +92096,8 @@ in sources."validate-npm-package-license-3.0.4" sources."vm2-3.9.3" sources."wcwidth-1.0.1" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-2.0.2" sources."widest-line-3.1.0" sources."word-wrap-1.2.3" @@ -90458,6 +92119,36 @@ in bypassCache = true; reconstructLock = true; }; + glob = nodeEnv.buildNodePackage { + name = "glob"; + packageName = "glob"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz"; + sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; + }; + dependencies = [ + sources."balanced-match-1.0.2" + sources."brace-expansion-1.1.11" + sources."concat-map-0.0.1" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."minimatch-3.0.4" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "a little globber"; + homepage = "https://github.com/isaacs/node-glob#readme"; + license = "ISC"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; graphql-cli = nodeEnv.buildNodePackage { name = "graphql-cli"; packageName = "graphql-cli"; @@ -90469,7 +92160,7 @@ in dependencies = [ sources."@ardatan/aggregate-error-0.0.6" sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -90480,7 +92171,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@exodus/schemasafe-1.0.0-rc.4" + sources."@exodus/schemasafe-1.0.0-rc.6" sources."@graphql-cli/common-4.1.0" sources."@graphql-cli/init-4.1.0" (sources."@graphql-tools/batch-execute-7.1.2" // { @@ -90511,7 +92202,7 @@ in sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/import-6.4.0" // { + (sources."@graphql-tools/import-6.4.1" // { dependencies = [ sources."tslib-2.3.1" ]; @@ -90540,7 +92231,7 @@ in (sources."@graphql-tools/schema-8.2.0" // { dependencies = [ sources."@graphql-tools/merge-8.1.2" - sources."@graphql-tools/utils-8.2.2" + sources."@graphql-tools/utils-8.2.3" sources."tslib-2.3.1" ]; }) @@ -90571,7 +92262,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -90624,8 +92315,8 @@ in sources."cli-width-3.0.0" (sources."cliui-7.0.4" // { dependencies = [ - sources."ansi-regex-5.0.0" - sources."strip-ansi-6.0.0" + sources."ansi-regex-5.0.1" + sources."strip-ansi-6.0.1" ]; }) sources."clone-1.0.4" @@ -90687,7 +92378,7 @@ in sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.1.1" - sources."fastq-1.12.0" + sources."fastq-1.13.0" sources."figlet-1.5.0" sources."figures-3.2.0" sources."fill-range-7.0.1" @@ -90706,7 +92397,7 @@ in sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globby-11.0.1" (sources."got-9.6.0" // { @@ -90749,12 +92440,12 @@ in sources."ini-1.3.8" (sources."inquirer-7.3.3" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."cli-cursor-3.1.0" sources."mimic-fn-2.1.0" sources."onetime-5.1.2" sources."restore-cursor-3.1.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."internal-slot-1.0.3" @@ -90842,7 +92533,7 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."minipass-3.1.3" + sources."minipass-3.1.5" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" @@ -90864,7 +92555,7 @@ in sources."oas-linter-3.2.2" (sources."oas-resolver-2.5.6" // { dependencies = [ - sources."yargs-17.1.1" + sources."yargs-17.2.0" ]; }) sources."oas-schema-walker-1.1.5" @@ -90880,13 +92571,13 @@ in sources."openapi-to-graphql-2.2.5" (sources."ora-5.1.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."cli-cursor-3.1.0" sources."log-symbols-4.1.0" sources."mimic-fn-2.1.0" sources."onetime-5.1.2" sources."restore-cursor-3.1.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."os-tmpdir-1.0.2" @@ -90956,16 +92647,16 @@ in sources."should-type-adaptors-1.1.0" sources."should-util-1.0.1" sources."side-channel-1.0.4" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."simple-git-2.21.0" sources."slash-3.0.0" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."string-env-interpolation-1.0.1" - (sources."string-width-4.2.2" // { + (sources."string-width-4.2.3" // { dependencies = [ - sources."ansi-regex-5.0.0" - sources."strip-ansi-6.0.0" + sources."ansi-regex-5.0.1" + sources."strip-ansi-6.0.1" ]; }) sources."string.prototype.trimend-1.0.4" @@ -90977,7 +92668,7 @@ in sources."supports-color-7.2.0" (sources."swagger2openapi-7.0.8" // { dependencies = [ - sources."yargs-17.1.1" + sources."yargs-17.2.0" ]; }) sources."symbol-observable-1.2.0" @@ -91008,8 +92699,8 @@ in sources."which-typed-array-1.1.7" (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."ansi-regex-5.0.0" - sources."strip-ansi-6.0.0" + sources."ansi-regex-5.0.1" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" @@ -91269,13 +92960,14 @@ in sources."cardinal-2.1.1" sources."chalk-1.1.3" sources."charm-0.1.2" - sources."cli-table-0.3.6" + sources."cli-table3-0.6.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."colors-1.0.3" + sources."colors-1.4.0" sources."core-util-is-1.0.3" sources."drawille-blessed-contrib-1.0.0" sources."drawille-canvas-blessed-contrib-0.1.3" + sources."emoji-regex-8.0.0" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" (sources."event-stream-0.9.8" // { @@ -91288,11 +92980,12 @@ in sources."has-flag-4.0.0" sources."here-0.0.2" sources."inherits-2.0.4" + sources."is-fullwidth-code-point-3.0.0" sources."isarray-0.0.1" sources."lodash-4.17.21" sources."map-canvas-0.1.5" sources."marked-2.1.3" - (sources."marked-terminal-4.1.1" // { + (sources."marked-terminal-4.2.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -91303,6 +92996,7 @@ in sources."memorystream-0.3.1" sources."node-emoji-1.11.0" sources."nopt-2.1.2" + sources."object-assign-4.1.1" sources."optimist-0.3.7" sources."picture-tuber-1.0.2" sources."png-js-0.1.1" @@ -91310,6 +93004,12 @@ in sources."redeyed-2.1.1" sources."sax-1.2.4" sources."sparkline-0.1.2" + (sources."string-width-4.2.3" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."strip-ansi-6.0.1" + ]; + }) sources."string_decoder-0.10.31" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" @@ -91318,7 +93018,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.8.7" + sources."systeminformation-5.9.4" sources."term-canvas-0.0.5" sources."type-fest-0.21.3" sources."wordwrap-0.0.3" @@ -91482,7 +93182,7 @@ in ]; }) sources."expand-tilde-2.0.2" - (sources."ext-1.5.0" // { + (sources."ext-1.6.0" // { dependencies = [ sources."type-2.5.0" ]; @@ -91522,7 +93222,7 @@ in sources."get-caller-file-1.0.3" sources."get-intrinsic-1.1.1" sources."get-value-2.0.6" - sources."glob-7.1.7" + sources."glob-7.2.0" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -91892,7 +93592,7 @@ in ]; }) sources."expand-tilde-2.0.2" - (sources."ext-1.5.0" // { + (sources."ext-1.6.0" // { dependencies = [ sources."type-2.5.0" ]; @@ -92230,84 +93930,49 @@ in htmlhint = nodeEnv.buildNodePackage { name = "htmlhint"; packageName = "htmlhint"; - version = "0.15.1"; + version = "0.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.15.1.tgz"; - sha512 = "uNbgqqBiD2ko4QQOYAHTPwDMluc9X81NwzlrJN7yExCoM6dHNgRFjVI+4TEdRrF/EqUzl1dpMUn7GYbu/qCKmA=="; + url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.15.2.tgz"; + sha512 = "ciCpeMEGZ7CbfK+MgK8ykV+wzUHz5he06mAiq8OQLuYN6pxFxZDAhwPwByirOYwdF3GV2M4s7spq2A/g/XMncQ=="; }; dependencies = [ - sources."ajv-6.12.6" + sources."@types/node-16.9.6" + sources."@types/node-fetch-2.5.12" sources."ansi-styles-4.3.0" - sources."asn1-0.2.4" - sources."assert-plus-1.0.0" sources."async-3.2.0" sources."asynckit-0.4.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" sources."balanced-match-1.0.2" - sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" - sources."caseless-0.12.0" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" sources."commander-5.1.0" sources."concat-map-0.0.1" - sources."core-util-is-1.0.2" - sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" - sources."ecc-jsbn-0.1.2" - sources."extend-3.0.2" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" + sources."form-data-3.0.1" sources."fs.realpath-1.0.0" - sources."getpass-0.1.7" - sources."glob-7.1.6" + sources."glob-7.1.7" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" sources."has-flag-4.0.0" - sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-dotfile-1.0.3" sources."is-extglob-1.0.0" sources."is-glob-2.0.1" - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" - sources."json-stringify-safe-5.0.1" - sources."jsprim-1.4.1" sources."mime-db-1.49.0" sources."mime-types-2.1.32" sources."minimatch-3.0.4" - sources."oauth-sign-0.9.0" + sources."node-fetch-2.6.5" sources."once-1.4.0" sources."parse-glob-3.0.4" sources."path-is-absolute-1.0.1" - sources."performance-now-2.1.0" - sources."psl-1.8.0" - sources."punycode-2.1.1" - sources."qs-6.5.2" - sources."request-2.88.2" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."sshpk-1.16.1" sources."strip-json-comments-3.1.0" sources."supports-color-7.2.0" - sources."tough-cookie-2.5.0" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."uri-js-4.4.1" - sources."uuid-3.4.0" - sources."verror-1.10.0" + sources."tr46-0.0.3" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."wrappy-1.0.2" sources."xml-1.0.1" ]; @@ -92324,10 +93989,10 @@ in http-server = nodeEnv.buildNodePackage { name = "http-server"; packageName = "http-server"; - version = "13.0.1"; + version = "13.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/http-server/-/http-server-13.0.1.tgz"; - sha512 = "ke9rphoNuqsOCHy4tA3b3W4Yuxy7VUIXcTHSLz6bkMDAJPQD4twjEatquelJBIPwNhZuC3+FYj/+dSaGHdKTCw=="; + url = "https://registry.npmjs.org/http-server/-/http-server-13.0.2.tgz"; + sha512 = "R8kvPT7qp11AMJWLZsRShvm6heIXdlR/+tL5oAWNG/86A/X+IAFX6q0F9SA2G+dR5aH/759+9PLH0V34Q6j4rg=="; }; dependencies = [ sources."async-2.6.3" @@ -92337,7 +94002,7 @@ in sources."corser-2.0.1" sources."debug-3.2.7" sources."eventemitter3-4.0.7" - sources."follow-redirects-1.14.3" + sources."follow-redirects-1.14.4" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."has-1.0.3" @@ -92500,7 +94165,7 @@ in sources."extsprintf-1.4.0" sources."fs.realpath-1.0.0" sources."fuzzyset.js-0.0.1" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."hue-sdk-0.1.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -92531,6 +94196,214 @@ in bypassCache = true; reconstructLock = true; }; + hyperpotamus = nodeEnv.buildNodePackage { + name = "hyperpotamus"; + packageName = "hyperpotamus"; + version = "0.38.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hyperpotamus/-/hyperpotamus-0.38.2.tgz"; + sha512 = "VavhoS9dr44WPPdtuBgHAge1uM/elPo8fAI6fMJ4Bs1NsOCgMOFg4g7FBo7ODgzmAaa2CjAFQGu1hIaY5UIqPg=="; + }; + dependencies = [ + sources."@fast-csv/format-4.3.5" + sources."@fast-csv/parse-4.3.6" + sources."@types/node-14.17.18" + sources."ajv-6.12.6" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" + sources."argparse-1.0.10" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."async-2.6.3" + sources."asynckit-0.4.0" + sources."aws-sdk-2.994.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.11.0" + sources."base64-js-1.5.1" + sources."bcrypt-pbkdf-1.0.2" + sources."bluebird-3.7.2" + sources."boolbase-1.0.0" + sources."buffer-4.9.2" + sources."calfinated-1.4.1" + sources."caseless-0.12.0" + sources."cheerio-0.22.0" + sources."cliui-7.0.4" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."colors-1.4.0" + sources."combined-stream-1.0.8" + sources."core-util-is-1.0.2" + sources."css-select-1.2.0" + sources."css-what-2.1.3" + sources."cycle-1.0.3" + sources."dashdash-1.14.1" + sources."debug-4.3.2" + sources."deep-is-0.1.4" + sources."delayed-stream-1.0.0" + sources."dom-serializer-0.1.1" + sources."domelementtype-1.3.1" + sources."domhandler-2.4.2" + sources."domutils-1.5.1" + sources."ecc-jsbn-0.1.2" + sources."emoji-regex-8.0.0" + sources."entities-1.1.2" + sources."escalade-3.1.1" + sources."escodegen-1.14.3" + sources."esprima-4.0.1" + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."events-1.1.1" + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."eyes-0.1.8" + sources."fast-csv-4.3.6" + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."get-caller-file-2.0.5" + sources."getpass-0.1.7" + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" + sources."htmlparser2-3.10.1" + sources."http-signature-1.2.0" + sources."ieee754-1.1.13" + sources."inherits-2.0.4" + (sources."ip-address-6.1.0" // { + dependencies = [ + sources."jsbn-1.1.0" + sources."sprintf-js-1.1.2" + ]; + }) + sources."is-fullwidth-code-point-3.0.0" + sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" + sources."isstream-0.1.2" + sources."jmespath-0.15.0" + sources."js-yaml-3.14.1" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + (sources."jsonpath-1.1.1" // { + dependencies = [ + sources."esprima-1.2.2" + ]; + }) + sources."jsprim-1.4.1" + sources."levn-0.3.0" + sources."lodash-4.17.21" + sources."lodash.assignin-4.2.0" + sources."lodash.bind-4.2.1" + sources."lodash.defaults-4.2.0" + sources."lodash.escaperegexp-4.1.2" + sources."lodash.filter-4.6.0" + sources."lodash.flatten-4.4.0" + sources."lodash.foreach-4.5.0" + sources."lodash.groupby-4.6.0" + sources."lodash.isboolean-3.0.3" + sources."lodash.isequal-4.5.0" + sources."lodash.isfunction-3.0.9" + sources."lodash.isnil-4.0.0" + sources."lodash.isundefined-3.0.1" + sources."lodash.map-4.6.0" + sources."lodash.merge-4.6.2" + sources."lodash.pick-4.4.0" + sources."lodash.reduce-4.6.0" + sources."lodash.reject-4.6.0" + sources."lodash.some-4.6.0" + sources."lodash.uniq-4.5.0" + sources."marked-2.1.3" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" + sources."minimist-1.2.5" + sources."mkdirp-0.5.5" + sources."moment-2.29.1" + sources."moment-timezone-0.5.33" + sources."ms-2.1.2" + sources."mute-stream-0.0.8" + sources."named-regexp-0.1.1" + sources."nth-check-1.0.2" + sources."oauth-sign-0.9.0" + sources."optionator-0.8.3" + sources."performance-now-2.1.0" + sources."prelude-ls-1.1.2" + (sources."prompt-1.2.0" // { + dependencies = [ + sources."async-0.9.2" + ]; + }) + sources."psl-1.8.0" + sources."punycode-1.3.2" + sources."qs-6.5.2" + sources."querystring-0.2.0" + sources."read-1.0.7" + sources."readable-stream-3.6.0" + sources."recursive-readdir-sync-1.0.6" + sources."request-2.88.2" + sources."request-as-curl-0.1.0" + sources."require-directory-2.1.1" + sources."revalidator-0.1.8" + sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" + sources."sax-1.2.1" + sources."semver-5.7.1" + sources."socks5-client-1.2.8" + sources."socks5-http-client-1.0.4" + sources."source-map-0.6.1" + sources."sprintf-js-1.0.3" + sources."sshpk-1.16.1" + sources."stack-trace-0.0.10" + sources."static-eval-2.0.2" + sources."string-width-4.2.3" + sources."string_decoder-1.3.0" + sources."strip-ansi-6.0.1" + (sources."tough-cookie-2.5.0" // { + dependencies = [ + sources."punycode-2.1.1" + ]; + }) + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-check-0.3.2" + sources."underscore-1.12.1" + (sources."uri-js-4.4.1" // { + dependencies = [ + sources."punycode-2.1.1" + ]; + }) + sources."url-0.10.3" + sources."util-deprecate-1.0.2" + sources."uuid-3.3.2" + sources."verror-1.10.0" + (sources."winston-2.4.5" // { + dependencies = [ + sources."async-1.0.0" + sources."colors-1.0.3" + ]; + }) + sources."word-wrap-1.2.3" + sources."wrap-ansi-7.0.0" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" + sources."xmldom-0.5.0" + sources."xpath-0.0.23" + sources."y18n-5.0.8" + sources."yaml-include-1.2.1" + sources."yargs-16.2.0" + sources."yargs-parser-20.2.9" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "YAML based HTTP script processing engine"; + homepage = "https://github.com/pmarkert/hyperpotamus/wiki"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; ijavascript = nodeEnv.buildNodePackage { name = "ijavascript"; packageName = "ijavascript"; @@ -92544,7 +94417,7 @@ in sources."jp-kernel-2.0.0" sources."nan-2.14.2" sources."nel-1.2.0" - sources."node-gyp-build-4.2.3" + sources."node-gyp-build-4.3.0" sources."uuid-3.4.0" sources."zeromq-5.2.8" ]; @@ -92853,9 +94726,12 @@ in sources."async-limiter-1.0.1" sources."chrome-remote-interface-0.27.2" sources."commander-2.11.0" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" sources."semver-5.7.1" sources."source-map-0.7.3" + sources."tr46-0.0.3" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."ws-6.2.2" ]; buildInputs = globalBuildInputs; @@ -92895,7 +94771,7 @@ in sources."fs-extra-0.24.0" sources."fs.realpath-1.0.0" sources."get-stream-4.1.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."historic-readline-1.0.8" sources."iconv-lite-0.6.3" @@ -92906,7 +94782,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.6.0" - sources."jquery.terminal-2.29.1" + sources."jquery.terminal-2.29.2" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -92918,14 +94794,14 @@ in sources."p-finally-1.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" - sources."prismjs-1.24.1" + sources."prismjs-1.25.0" sources."pump-3.0.0" sources."rimraf-2.7.1" sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."strip-eof-1.0.0" sources."wcwidth-1.0.1" sources."which-1.3.1" @@ -93049,7 +94925,7 @@ in sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."get-uri-3.0.2" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-flag-4.0.0" @@ -93167,7 +95043,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" (sources."slice-ansi-3.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -93190,16 +95066,16 @@ in sources."string_decoder-1.1.1" ]; }) - (sources."string-width-4.2.2" // { + (sources."string-width-4.2.3" // { dependencies = [ sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" ]; }) sources."string_decoder-1.3.0" - (sources."strip-ansi-6.0.0" // { + (sources."strip-ansi-6.0.1" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" ]; }) sources."strip-eof-1.0.0" @@ -93263,9 +95139,9 @@ in dependencies = [ sources."@iarna/toml-2.2.5" sources."@msgpack/msgpack-2.7.1" - sources."@ot-builder/bin-composite-types-1.1.0" - sources."@ot-builder/bin-util-1.1.0" - (sources."@ot-builder/cli-help-shower-1.1.0" // { + sources."@ot-builder/bin-composite-types-1.1.1" + sources."@ot-builder/bin-util-1.1.1" + (sources."@ot-builder/cli-help-shower-1.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -93275,42 +95151,42 @@ in sources."supports-color-7.2.0" ]; }) - sources."@ot-builder/cli-proc-1.1.0" - sources."@ot-builder/cli-shared-1.1.0" - sources."@ot-builder/common-impl-1.1.0" - sources."@ot-builder/errors-1.1.0" - sources."@ot-builder/io-bin-cff-1.1.0" - sources."@ot-builder/io-bin-encoding-1.1.0" - sources."@ot-builder/io-bin-ext-private-1.1.0" - sources."@ot-builder/io-bin-font-1.1.0" - sources."@ot-builder/io-bin-glyph-store-1.1.0" - sources."@ot-builder/io-bin-layout-1.1.0" - sources."@ot-builder/io-bin-metadata-1.1.0" - sources."@ot-builder/io-bin-metric-1.1.0" - sources."@ot-builder/io-bin-name-1.1.0" - sources."@ot-builder/io-bin-sfnt-1.1.0" - sources."@ot-builder/io-bin-ttf-1.1.0" - sources."@ot-builder/ot-1.1.0" - sources."@ot-builder/ot-encoding-1.1.0" - sources."@ot-builder/ot-ext-private-1.1.0" - sources."@ot-builder/ot-glyphs-1.1.0" - sources."@ot-builder/ot-layout-1.1.0" - sources."@ot-builder/ot-metadata-1.1.0" - sources."@ot-builder/ot-name-1.1.0" - sources."@ot-builder/ot-sfnt-1.1.0" - sources."@ot-builder/ot-standard-glyph-namer-1.1.0" - sources."@ot-builder/prelude-1.1.0" - sources."@ot-builder/primitive-1.1.0" - sources."@ot-builder/rectify-1.1.0" - sources."@ot-builder/stat-glyphs-1.1.0" - sources."@ot-builder/trace-1.1.0" - sources."@ot-builder/var-store-1.1.0" - sources."@ot-builder/variance-1.1.0" - sources."@unicode/unicode-13.0.0-1.2.0" - sources."@xmldom/xmldom-0.7.4" + sources."@ot-builder/cli-proc-1.1.1" + sources."@ot-builder/cli-shared-1.1.1" + sources."@ot-builder/common-impl-1.1.1" + sources."@ot-builder/errors-1.1.1" + sources."@ot-builder/io-bin-cff-1.1.1" + sources."@ot-builder/io-bin-encoding-1.1.1" + sources."@ot-builder/io-bin-ext-private-1.1.1" + sources."@ot-builder/io-bin-font-1.1.1" + sources."@ot-builder/io-bin-glyph-store-1.1.1" + sources."@ot-builder/io-bin-layout-1.1.1" + sources."@ot-builder/io-bin-metadata-1.1.1" + sources."@ot-builder/io-bin-metric-1.1.1" + sources."@ot-builder/io-bin-name-1.1.1" + sources."@ot-builder/io-bin-sfnt-1.1.1" + sources."@ot-builder/io-bin-ttf-1.1.1" + sources."@ot-builder/ot-1.1.1" + sources."@ot-builder/ot-encoding-1.1.1" + sources."@ot-builder/ot-ext-private-1.1.1" + sources."@ot-builder/ot-glyphs-1.1.1" + sources."@ot-builder/ot-layout-1.1.1" + sources."@ot-builder/ot-metadata-1.1.1" + sources."@ot-builder/ot-name-1.1.1" + sources."@ot-builder/ot-sfnt-1.1.1" + sources."@ot-builder/ot-standard-glyph-namer-1.1.1" + sources."@ot-builder/prelude-1.1.1" + sources."@ot-builder/primitive-1.1.1" + sources."@ot-builder/rectify-1.1.1" + sources."@ot-builder/stat-glyphs-1.1.1" + sources."@ot-builder/trace-1.1.1" + sources."@ot-builder/var-store-1.1.1" + sources."@ot-builder/variance-1.1.1" + sources."@unicode/unicode-13.0.0-1.2.1" + sources."@xmldom/xmldom-0.7.5" sources."aglfn-1.0.2" sources."amdefine-1.0.1" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."argparse-2.0.1" sources."async-0.9.2" @@ -93367,7 +95243,7 @@ in sources."fs-extra-10.0.0" sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."has-flag-3.0.0" sources."hashish-0.0.4" @@ -93388,8 +95264,8 @@ in sources."once-1.4.0" sources."onetime-5.1.2" sources."optionator-0.8.3" - sources."ot-builder-1.1.0" - sources."otb-ttc-bundle-1.1.0" + sources."ot-builder-1.1.1" + sources."otb-ttc-bundle-1.1.1" sources."passerror-1.1.1" sources."patel-0.35.1" sources."path-is-absolute-1.0.1" @@ -93410,13 +95286,13 @@ in ]; }) sources."seq-0.3.5" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.1" sources."spiro-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" (sources."stylus-0.54.8" // { dependencies = [ sources."semver-6.3.0" @@ -93433,7 +95309,7 @@ in sources."unicoderegexp-0.4.1" sources."universalify-2.0.0" sources."urix-0.1.0" - (sources."verda-1.3.2" // { + (sources."verda-1.4.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -93441,7 +95317,7 @@ in sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."supports-color-7.2.0" - sources."yargs-17.1.1" + sources."yargs-17.2.0" ]; }) sources."wawoff2-2.0.0" @@ -93533,7 +95409,7 @@ in sources."fast-json-patch-2.2.1" sources."fs.realpath-1.0.0" sources."get-func-name-2.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."has-flag-3.0.0" sources."hexer-1.5.0" sources."inflight-1.0.6" @@ -93654,7 +95530,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.985.0" // { + (sources."aws-sdk-2.994.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -93720,40 +95596,79 @@ in ]; }) sources."cwise-compiler-1.1.3" - sources."d3-5.16.0" - sources."d3-array-1.2.4" - sources."d3-axis-1.0.12" - sources."d3-brush-1.1.6" - sources."d3-chord-1.0.6" + sources."d3-7.0.3" + sources."d3-array-3.0.4" + sources."d3-axis-3.0.0" + sources."d3-brush-3.0.0" + sources."d3-chord-3.0.1" sources."d3-collection-1.0.7" - sources."d3-color-1.4.1" - sources."d3-contour-1.3.2" - sources."d3-dispatch-1.0.6" - sources."d3-drag-1.2.5" - sources."d3-dsv-1.2.0" - sources."d3-ease-1.0.7" - sources."d3-fetch-1.2.0" - sources."d3-force-1.2.1" - sources."d3-format-1.4.5" - sources."d3-geo-1.12.1" - sources."d3-hierarchy-1.1.9" - sources."d3-interpolate-1.4.0" - sources."d3-path-1.0.9" - sources."d3-polygon-1.0.6" - sources."d3-quadtree-1.0.7" - sources."d3-random-1.1.2" - sources."d3-scale-2.2.2" - sources."d3-scale-chromatic-1.5.0" - sources."d3-selection-1.4.2" - sources."d3-shape-1.3.7" - sources."d3-time-1.1.0" - sources."d3-time-format-2.3.0" - sources."d3-timer-1.0.10" - sources."d3-transition-1.3.2" + sources."d3-color-3.0.1" + sources."d3-contour-3.0.1" + sources."d3-delaunay-6.0.2" + sources."d3-dispatch-3.0.1" + sources."d3-drag-3.0.0" + (sources."d3-dsv-3.0.1" // { + dependencies = [ + sources."commander-7.2.0" + sources."iconv-lite-0.6.3" + ]; + }) + sources."d3-ease-3.0.1" + sources."d3-fetch-3.0.1" + sources."d3-force-3.0.0" + sources."d3-format-3.0.1" + sources."d3-geo-3.0.1" + sources."d3-hierarchy-3.0.1" + sources."d3-interpolate-3.0.1" + sources."d3-path-3.0.1" + sources."d3-polygon-3.0.1" + sources."d3-quadtree-3.0.1" + sources."d3-random-3.0.1" + sources."d3-scale-4.0.1" + sources."d3-scale-chromatic-3.0.0" + sources."d3-selection-3.0.0" + sources."d3-shape-3.0.1" + sources."d3-time-3.0.0" + sources."d3-time-format-4.0.0" + sources."d3-timer-3.0.1" + sources."d3-transition-3.0.1" sources."d3-voronoi-1.1.4" - sources."d3-zoom-1.8.3" + sources."d3-zoom-3.0.0" sources."dagre-0.8.5" - sources."dagre-d3-0.6.4" + (sources."dagre-d3-0.6.4" // { + dependencies = [ + sources."d3-5.16.0" + sources."d3-array-1.2.4" + sources."d3-axis-1.0.12" + sources."d3-brush-1.1.6" + sources."d3-chord-1.0.6" + sources."d3-color-1.4.1" + sources."d3-contour-1.3.2" + sources."d3-dispatch-1.0.6" + sources."d3-drag-1.2.5" + sources."d3-dsv-1.2.0" + sources."d3-ease-1.0.7" + sources."d3-fetch-1.2.0" + sources."d3-force-1.2.1" + sources."d3-format-1.4.5" + sources."d3-geo-1.12.1" + sources."d3-hierarchy-1.1.9" + sources."d3-interpolate-1.4.0" + sources."d3-path-1.0.9" + sources."d3-polygon-1.0.6" + sources."d3-quadtree-1.0.7" + sources."d3-random-1.1.2" + sources."d3-scale-2.2.2" + sources."d3-scale-chromatic-1.5.0" + sources."d3-selection-1.4.2" + sources."d3-shape-1.3.7" + sources."d3-time-1.1.0" + sources."d3-time-format-2.3.0" + sources."d3-timer-1.0.10" + sources."d3-transition-1.3.2" + sources."d3-zoom-1.8.3" + ]; + }) sources."dashdash-1.14.1" sources."data-urls-1.1.0" sources."debug-3.2.7" @@ -93762,6 +95677,7 @@ in sources."deep-extend-0.6.0" sources."deep-is-0.1.4" sources."deepmerge-2.2.1" + sources."delaunator-5.0.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -93816,7 +95732,7 @@ in sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" sources."find-up-2.1.0" - sources."follow-redirects-1.14.3" + sources."follow-redirects-1.14.4" sources."font-awesome-filetypes-2.1.0" sources."for-each-property-0.0.4" sources."for-each-property-deep-0.0.3" @@ -93842,7 +95758,7 @@ in sources."get-stdin-5.0.1" sources."getpass-0.1.7" sources."github-from-package-0.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.8" sources."graphlib-2.1.8" @@ -93898,6 +95814,7 @@ in sources."split-skip-0.0.1" ]; }) + sources."internmap-2.0.3" sources."iota-array-1.0.0" sources."ip-regex-2.1.0" sources."is-absolute-0.2.6" @@ -93975,7 +95892,7 @@ in sources."markdown-it-footnote-3.0.3" sources."markdown-it-ins-3.0.1" sources."markdown-it-mark-3.0.1" - (sources."markdown-it-multimd-table-4.1.0" // { + (sources."markdown-it-multimd-table-4.1.1" // { dependencies = [ sources."entities-2.0.3" sources."linkify-it-3.0.2" @@ -93988,7 +95905,7 @@ in sources."md5-2.3.0" sources."md5-file-4.0.0" sources."mdurl-1.0.1" - sources."mermaid-8.12.1" + sources."mermaid-8.13.0" sources."mime-db-1.49.0" sources."mime-types-2.1.32" sources."mimic-response-2.1.0" @@ -94123,6 +96040,7 @@ in sources."resolve-url-0.2.1" sources."retry-0.10.1" sources."rimraf-2.7.1" + sources."robust-predicates-3.0.1" sources."rw-1.3.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -94145,7 +96063,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."shellwords-0.1.1" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."simple-concat-1.0.1" sources."simple-get-3.1.0" sources."simple-swizzle-0.2.2" @@ -94226,7 +96144,7 @@ in sources."toidentifier-1.0.0" sources."tough-cookie-3.0.1" sources."tr46-1.0.1" - sources."tree-kit-0.7.1" + sources."tree-kit-0.7.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" @@ -94310,7 +96228,7 @@ in sources."config-chain-1.1.13" sources."editorconfig-0.15.3" sources."fs.realpath-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" @@ -94366,7 +96284,7 @@ in sha512 = "sxKt7h0vzCd+3Y81Ey2qinupL6DpRSZJclS04ugHDNmRUXGzqicMJ6iwayhSA0S0DwwX30c5ozyUthr1QKF6uw=="; }; dependencies = [ - sources."@babel/parser-7.15.5" + sources."@babel/parser-7.15.7" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.9.0" @@ -94428,7 +96346,7 @@ in sources."entities-1.0.0" sources."exit-0.1.2" sources."fs.realpath-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."htmlparser2-3.8.3" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -94580,7 +96498,7 @@ in sources."array-flatten-1.1.1" sources."basic-auth-2.0.1" sources."body-parser-1.19.0" - sources."boxen-5.0.1" + sources."boxen-5.1.2" sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -94594,8 +96512,8 @@ in sources."cli-boxes-2.2.1" (sources."cliui-7.0.4" // { dependencies = [ - sources."ansi-regex-5.0.0" - sources."strip-ansi-6.0.0" + sources."ansi-regex-5.0.1" + sources."strip-ansi-6.0.1" ]; }) sources."clone-response-1.0.2" @@ -94751,15 +96669,15 @@ in sources."serve-static-1.14.1" sources."server-destroy-1.0.1" sources."setprototypeof-1.1.1" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."statuses-1.5.0" sources."steno-0.4.4" - (sources."string-width-4.2.2" // { + (sources."string-width-4.2.3" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."strip-ansi-5.2.0" @@ -94779,8 +96697,8 @@ in sources."widest-line-3.1.0" (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."ansi-regex-5.0.0" - sources."strip-ansi-6.0.0" + sources."ansi-regex-5.0.1" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" @@ -95411,7 +97329,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.35" // { + (sources."@oclif/core-0.5.39" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -95432,14 +97350,14 @@ in }) sources."@oclif/plugin-help-3.3.0" sources."@oclif/screen-1.0.4" - (sources."@putdotio/api-client-8.17.0" // { + (sources."@putdotio/api-client-8.18.0" // { dependencies = [ sources."axios-0.21.4" ]; }) sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ansicolors-0.3.2" sources."argparse-1.0.10" @@ -95465,7 +97383,7 @@ in sources."chardet-0.7.0" sources."clean-stack-3.0.1" sources."cli-cursor-3.1.0" - sources."cli-progress-3.9.0" + sources."cli-progress-3.9.1" (sources."cli-ux-5.6.3" // { dependencies = [ sources."has-flag-4.0.0" @@ -95507,13 +97425,13 @@ in sources."escape-string-regexp-4.0.0" sources."esprima-4.0.1" sources."event-emitter-0.3.5" - sources."ext-1.5.0" + sources."ext-1.6.0" sources."external-editor-3.1.0" sources."extract-stack-2.0.0" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.12.0" + sources."fastq-1.13.0" (sources."figures-3.2.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" @@ -95521,7 +97439,7 @@ in }) sources."fill-range-7.0.1" sources."find-up-3.0.0" - sources."follow-redirects-1.14.3" + sources."follow-redirects-1.14.4" sources."form-data-3.0.1" sources."fs-extra-8.1.0" sources."function-bind-1.1.1" @@ -95607,11 +97525,11 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."slash-3.0.0" sources."sprintf-js-1.0.3" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."supports-color-5.5.0" (sources."supports-hyperlinks-2.2.0" // { dependencies = [ @@ -95679,9 +97597,9 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."accepts-1.3.7" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" sources."balanced-match-1.0.2" @@ -95727,12 +97645,12 @@ in sources."fill-range-7.0.1" sources."finalhandler-1.1.2" sources."flatted-2.0.2" - sources."follow-redirects-1.14.3" + sources."follow-redirects-1.14.4" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."get-caller-file-2.0.5" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.8" sources."http-errors-1.7.2" @@ -95801,8 +97719,8 @@ in sources."ms-2.1.2" ]; }) - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."tmp-0.2.1" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" @@ -95839,7 +97757,7 @@ in sha512 = "JErcr+qnJbmS7ZwHlm5mFKzM162WtALhxaTdkr1SDhi8oS+hSVAniGACqIFfMNvGhODGh6iBipOpMVykAYKfNw=="; }; dependencies = [ - sources."@babel/cli-7.15.4" + sources."@babel/cli-7.15.7" sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.15.0" (sources."@babel/core-7.15.5" // { @@ -95859,24 +97777,24 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-module-transforms-7.15.7" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-replace-supers-7.15.4" sources."@babel/helper-simple-access-7.15.4" sources."@babel/helper-split-export-declaration-7.15.4" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.15.4" sources."@babel/highlight-7.14.5" sources."@babel/node-7.15.4" - sources."@babel/parser-7.15.5" + sources."@babel/parser-7.15.7" sources."@babel/plugin-syntax-jsx-7.14.5" sources."@babel/plugin-transform-react-jsx-7.14.9" sources."@babel/register-7.15.3" sources."@babel/template-7.15.4" sources."@babel/traverse-7.15.4" - sources."@babel/types-7.15.4" + sources."@babel/types-7.15.6" sources."@tootallnate/once-1.1.2" sources."@xmpp/base64-0.12.1" sources."@xmpp/client-0.12.1" @@ -95916,7 +97834,7 @@ in sources."acorn-walk-7.2.0" sources."agent-base-6.0.2" sources."ansi-colors-4.1.1" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."array-flatten-1.1.1" sources."asn1.js-5.4.1" @@ -95937,12 +97855,12 @@ in sources."brace-expansion-1.1.11" sources."browser-or-node-1.3.0" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.17.0" + sources."browserslist-4.17.1" sources."buffer-from-1.1.2" sources."bytes-3.1.0" sources."bytesish-0.4.4" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001255" + sources."caniuse-lite-1.0.30001260" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chardet-1.3.0" @@ -95951,7 +97869,6 @@ in sources."clone-deep-4.0.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.4.0" sources."combined-stream-1.0.8" sources."commander-4.1.1" sources."commondir-1.0.1" @@ -95961,7 +97878,7 @@ in sources."convert-source-map-1.8.0" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.17.3" + sources."core-js-3.18.0" sources."cors-2.8.5" sources."create-hash-1.2.0" sources."create-hmac-1.1.7" @@ -95971,7 +97888,13 @@ in sources."cssom-0.3.8" ]; }) - sources."data-urls-2.0.0" + (sources."data-urls-2.0.0" // { + dependencies = [ + sources."tr46-2.1.0" + sources."webidl-conversions-6.1.0" + sources."whatwg-url-8.7.0" + ]; + }) sources."debug-4.3.2" sources."decimal.js-10.3.1" sources."decode-uri-component-0.2.0" @@ -95988,7 +97911,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.833" + sources."electron-to-chromium-1.3.849" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."enquirer-2.3.6" @@ -96034,7 +97957,7 @@ in sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-symbol-description-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."globals-11.12.0" sources."graceful-fs-4.2.8" sources."has-1.0.3" @@ -96086,6 +98009,9 @@ in sources."js-tokens-4.0.0" (sources."jsdom-16.7.0" // { dependencies = [ + sources."tr46-2.1.0" + sources."webidl-conversions-6.1.0" + sources."whatwg-url-8.7.0" sources."ws-7.5.5" ]; }) @@ -96110,12 +98036,13 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."ms-2.1.2" + sources."nanocolors-0.1.12" sources."negotiator-0.6.2" sources."node-environment-flags-1.0.6" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" sources."node-localstorage-1.3.1" sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.75" + sources."node-releases-1.1.76" sources."nwsapi-2.2.0" sources."object-assign-4.1.1" sources."object-inspect-1.11.0" @@ -96185,7 +98112,7 @@ in sources."split-on-first-1.1.0" sources."statuses-1.5.0" sources."strict-uri-encode-2.0.0" - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string.prototype.trimend-1.0.4" sources."string.prototype.trimstart-1.0.4" (sources."string_decoder-1.3.0" // { @@ -96193,13 +98120,13 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."supports-color-5.5.0" sources."symbol-tree-3.2.4" sources."to-fast-properties-2.0.0" sources."toidentifier-1.0.0" sources."tough-cookie-4.0.0" - sources."tr46-2.1.0" + sources."tr46-0.0.3" sources."type-check-0.3.2" sources."type-is-1.6.18" sources."unbox-primitive-1.0.1" @@ -96213,10 +98140,10 @@ in sources."vary-1.1.2" sources."w3c-hr-time-1.0.2" sources."w3c-xmlserializer-2.0.0" - sources."webidl-conversions-6.1.0" + sources."webidl-conversions-3.0.1" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-8.7.0" + sources."whatwg-url-5.0.0" sources."which-boxed-primitive-1.0.2" sources."word-wrap-1.2.3" (sources."wrap-ansi-7.0.0" // { @@ -96275,7 +98202,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-3.1.0" sources."glob-stream-6.1.0" sources."graceful-fs-4.2.8" @@ -96420,7 +98347,7 @@ in sources."get-caller-file-1.0.3" sources."get-stream-4.1.0" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -96431,7 +98358,7 @@ in ]; }) sources."http-signature-1.2.0" - sources."i-0.3.6" + sources."i-0.3.7" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" @@ -96528,7 +98455,7 @@ in sources."set-blocking-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."source-map-0.6.1" sources."sshpk-1.16.1" sources."stack-trace-0.0.10" @@ -96678,7 +98605,7 @@ in sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -96689,7 +98616,7 @@ in ]; }) sources."http-signature-1.2.0" - sources."i-0.3.6" + sources."i-0.3.7" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" @@ -96768,7 +98695,7 @@ in sources."sax-1.2.4" sources."secure-keys-1.0.0" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."source-map-0.6.1" sources."sshpk-1.16.1" sources."stack-trace-0.0.10" @@ -96816,14 +98743,14 @@ in sources."y18n-3.2.2" (sources."yargs-15.4.1" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."cliui-6.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."wrap-ansi-6.2.0" sources."y18n-4.0.3" ]; @@ -96854,7 +98781,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -96972,7 +98899,7 @@ in sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.6" - sources."@octokit/auth-token-2.4.5" + sources."@octokit/auth-token-2.5.0" sources."@octokit/core-3.5.1" (sources."@octokit/endpoint-6.0.12" // { dependencies = [ @@ -96980,19 +98907,19 @@ in ]; }) sources."@octokit/graphql-4.8.0" - sources."@octokit/openapi-types-10.1.1" + sources."@octokit/openapi-types-10.5.0" sources."@octokit/plugin-enterprise-rest-6.0.1" - sources."@octokit/plugin-paginate-rest-2.16.0" + sources."@octokit/plugin-paginate-rest-2.16.4" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.10.1" + sources."@octokit/plugin-rest-endpoint-methods-5.11.1" (sources."@octokit/request-5.6.1" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.10.0" - sources."@octokit/types-6.27.0" + sources."@octokit/rest-18.11.0" + sources."@octokit/types-6.31.0" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" @@ -97055,8 +98982,8 @@ in sources."cli-width-3.0.0" (sources."cliui-7.0.4" // { dependencies = [ - sources."ansi-regex-5.0.0" - sources."strip-ansi-6.0.0" + sources."ansi-regex-5.0.1" + sources."strip-ansi-6.0.1" ]; }) sources."clone-1.0.4" @@ -97141,7 +99068,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.12.0" + sources."fastq-1.13.0" sources."figures-3.2.0" sources."fill-range-7.0.1" sources."filter-obj-1.1.0" @@ -97187,7 +99114,7 @@ in sources."git-up-4.0.5" sources."git-url-parse-11.6.0" sources."gitconfiglocal-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globby-11.0.4" sources."graceful-fs-4.2.8" @@ -97223,7 +99150,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - (sources."init-package-json-2.0.4" // { + (sources."init-package-json-2.0.5" // { dependencies = [ sources."normalize-package-data-3.0.3" sources."read-package-json-4.1.1" @@ -97231,8 +99158,8 @@ in }) (sources."inquirer-7.3.3" // { dependencies = [ - sources."ansi-regex-5.0.0" - sources."strip-ansi-6.0.0" + sources."ansi-regex-5.0.1" + sources."strip-ansi-6.0.1" ]; }) sources."internal-slot-1.0.3" @@ -97301,7 +99228,7 @@ in ]; }) sources."make-fetch-happen-9.1.0" - sources."map-obj-4.2.1" + sources."map-obj-4.3.0" (sources."meow-8.1.2" // { dependencies = [ sources."hosted-git-info-2.8.9" @@ -97335,7 +99262,7 @@ in sources."arrify-1.0.1" ]; }) - sources."minipass-3.1.3" + sources."minipass-3.1.5" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" sources."minipass-flush-1.0.5" @@ -97351,7 +99278,13 @@ in sources."mute-stream-0.0.8" sources."negotiator-0.6.2" sources."neo-async-2.6.2" - sources."node-fetch-2.6.2" + (sources."node-fetch-2.6.5" // { + dependencies = [ + sources."tr46-0.0.3" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" + ]; + }) sources."node-gyp-7.1.2" sources."nopt-5.0.0" (sources."normalize-package-data-2.5.0" // { @@ -97488,12 +99421,12 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."slash-3.0.0" sources."slide-1.1.6" sources."smart-buffer-4.2.0" sources."socks-2.6.1" - sources."socks-proxy-agent-6.0.0" + sources."socks-proxy-agent-6.1.0" sources."sort-keys-2.0.0" sources."source-map-0.6.1" sources."spdx-correct-3.1.1" @@ -97506,10 +99439,10 @@ in sources."sshpk-1.16.1" sources."ssri-8.0.1" sources."strict-uri-encode-2.0.0" - (sources."string-width-4.2.2" // { + (sources."string-width-4.2.3" // { dependencies = [ - sources."ansi-regex-5.0.0" - sources."strip-ansi-6.0.0" + sources."ansi-regex-5.0.1" + sources."strip-ansi-6.0.1" ]; }) sources."string.prototype.trimend-1.0.4" @@ -97575,8 +99508,8 @@ in sources."wordwrap-1.0.0" (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."ansi-regex-5.0.0" - sources."strip-ansi-6.0.0" + sources."ansi-regex-5.0.1" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" @@ -98507,6 +100440,24 @@ in bypassCache = true; reconstructLock = true; }; + lodash = nodeEnv.buildNodePackage { + name = "lodash"; + packageName = "lodash"; + version = "4.17.21"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Lodash modular utilities."; + homepage = "https://lodash.com/"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; "lumo-build-deps-../interpreters/clojurescript/lumo" = nodeEnv.buildNodePackage { name = "lumo-build-deps"; packageName = "lumo-build-deps"; @@ -98529,7 +100480,7 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-module-transforms-7.15.7" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.15.4" @@ -98537,7 +100488,7 @@ in sources."@babel/helper-simple-access-7.15.4" sources."@babel/helper-skip-transparent-expression-wrappers-7.15.4" sources."@babel/helper-split-export-declaration-7.15.4" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.15.4" sources."@babel/helpers-7.15.4" @@ -98546,7 +100497,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.5" + sources."@babel/parser-7.15.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.15.4" @@ -98558,7 +100509,7 @@ in sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" sources."@babel/plugin-proposal-numeric-separator-7.14.5" - sources."@babel/plugin-proposal-object-rest-spread-7.14.7" + sources."@babel/plugin-proposal-object-rest-spread-7.15.6" sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-proposal-private-methods-7.14.5" @@ -98613,13 +100564,13 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - sources."@babel/preset-env-7.15.4" + sources."@babel/preset-env-7.15.6" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" sources."@babel/runtime-7.15.4" sources."@babel/template-7.15.4" sources."@babel/traverse-7.15.4" - sources."@babel/types-7.15.4" + sources."@babel/types-7.15.6" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -98640,7 +100591,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.9" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -98730,7 +100681,7 @@ in sources."babel-plugin-minify-simplify-0.5.1" sources."babel-plugin-minify-type-constructors-0.4.3" sources."babel-plugin-polyfill-corejs2-0.2.2" - sources."babel-plugin-polyfill-corejs3-0.2.4" + sources."babel-plugin-polyfill-corejs3-0.2.5" sources."babel-plugin-polyfill-regenerator-0.2.2" sources."babel-plugin-syntax-flow-6.18.0" sources."babel-plugin-transform-flow-strip-types-6.22.0" @@ -98797,7 +100748,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.17.0" + sources."browserslist-4.17.1" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.2" @@ -98813,7 +100764,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001255" + sources."caniuse-lite-1.0.30001260" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -98862,7 +100813,6 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colorette-1.4.0" sources."colors-1.4.0" (sources."combine-source-map-0.8.0" // { dependencies = [ @@ -98885,7 +100835,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.17.3" // { + (sources."core-js-compat-3.18.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -98937,7 +100887,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.833" + sources."electron-to-chromium-1.3.849" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -99042,7 +100992,7 @@ in sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" (sources."global-modules-2.0.0" // { dependencies = [ @@ -99137,7 +101087,7 @@ in sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" - sources."istanbul-lib-coverage-3.0.0" + sources."istanbul-lib-coverage-3.0.1" sources."istanbul-lib-instrument-4.0.3" sources."jest-haste-map-25.5.1" sources."jest-regex-util-25.2.6" @@ -99221,11 +101171,12 @@ in }) sources."ms-2.1.2" sources."nan-2.15.0" + sources."nanocolors-0.1.12" sources."nanomatch-1.2.13" sources."ncp-2.0.0" sources."neo-async-2.6.2" sources."nice-try-1.0.5" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" sources."node-int64-0.4.0" (sources."node-libs-browser-2.2.1" // { dependencies = [ @@ -99240,7 +101191,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.75" + sources."node-releases-1.1.76" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -99333,13 +101284,13 @@ in sources."readdirp-3.6.0" sources."realpath-native-2.0.0" sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-8.2.0" + sources."regenerate-unicode-properties-9.0.0" sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" - sources."regexpu-core-4.7.1" + sources."regexpu-core-4.8.0" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.9" // { + (sources."regjsparser-0.7.0" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -99403,7 +101354,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.7.2" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."simple-concat-1.0.1" sources."slash-3.0.0" (sources."snapdragon-0.8.2" // { @@ -99532,6 +101483,7 @@ in sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" sources."tough-cookie-2.5.0" + sources."tr46-0.0.3" sources."tty-browserify-0.0.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -99540,10 +101492,10 @@ in sources."typedarray-to-buffer-3.1.5" sources."umd-3.0.3" sources."undeclared-identifiers-1.1.3" - sources."unicode-canonical-property-names-ecmascript-1.0.4" - sources."unicode-match-property-ecmascript-1.0.4" - sources."unicode-match-property-value-ecmascript-1.2.0" - sources."unicode-property-aliases-ecmascript-1.1.0" + sources."unicode-canonical-property-names-ecmascript-2.0.0" + sources."unicode-match-property-ecmascript-2.0.0" + sources."unicode-match-property-value-ecmascript-2.0.0" + sources."unicode-property-aliases-ecmascript-2.0.0" sources."union-value-1.0.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" @@ -99598,6 +101550,7 @@ in sources."readdirp-2.2.1" ]; }) + sources."webidl-conversions-3.0.1" (sources."webpack-4.46.0" // { dependencies = [ sources."acorn-6.4.2" @@ -99627,6 +101580,7 @@ in sources."source-map-0.6.1" ]; }) + sources."whatwg-url-5.0.0" sources."which-2.0.2" sources."which-module-2.0.0" (sources."which-promise-1.0.0" // { @@ -99673,7 +101627,7 @@ in sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."minimatch-3.0.4" @@ -99929,7 +101883,7 @@ in sources."esutils-2.0.3" sources."event-emitter-0.3.5" sources."exit-hook-1.1.1" - (sources."ext-1.5.0" // { + (sources."ext-1.6.0" // { dependencies = [ sources."type-2.5.0" ]; @@ -99951,7 +101905,7 @@ in sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."globals-9.18.0" sources."glogg-1.0.2" sources."graceful-fs-4.2.8" @@ -100193,7 +102147,7 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -100207,47 +102161,84 @@ in sources."chownr-1.1.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-8.1.0" + sources."commander-8.2.0" sources."concat-map-0.0.1" - sources."d3-5.16.0" - sources."d3-array-1.2.4" - sources."d3-axis-1.0.12" - sources."d3-brush-1.1.6" - sources."d3-chord-1.0.6" + sources."d3-7.0.3" + sources."d3-array-3.0.4" + sources."d3-axis-3.0.0" + sources."d3-brush-3.0.0" + sources."d3-chord-3.0.1" sources."d3-collection-1.0.7" - sources."d3-color-1.4.1" - sources."d3-contour-1.3.2" - sources."d3-dispatch-1.0.6" - sources."d3-drag-1.2.5" - (sources."d3-dsv-1.2.0" // { + sources."d3-color-3.0.1" + sources."d3-contour-3.0.1" + sources."d3-delaunay-6.0.2" + sources."d3-dispatch-3.0.1" + sources."d3-drag-3.0.0" + (sources."d3-dsv-3.0.1" // { dependencies = [ - sources."commander-2.20.3" + sources."commander-7.2.0" ]; }) - sources."d3-ease-1.0.7" - sources."d3-fetch-1.2.0" - sources."d3-force-1.2.1" - sources."d3-format-1.4.5" - sources."d3-geo-1.12.1" - sources."d3-hierarchy-1.1.9" - sources."d3-interpolate-1.4.0" - sources."d3-path-1.0.9" - sources."d3-polygon-1.0.6" - sources."d3-quadtree-1.0.7" - sources."d3-random-1.1.2" - sources."d3-scale-2.2.2" - sources."d3-scale-chromatic-1.5.0" - sources."d3-selection-1.4.2" - sources."d3-shape-1.3.7" - sources."d3-time-1.1.0" - sources."d3-time-format-2.3.0" - sources."d3-timer-1.0.10" - sources."d3-transition-1.3.2" + sources."d3-ease-3.0.1" + sources."d3-fetch-3.0.1" + sources."d3-force-3.0.0" + sources."d3-format-3.0.1" + sources."d3-geo-3.0.1" + sources."d3-hierarchy-3.0.1" + sources."d3-interpolate-3.0.1" + sources."d3-path-3.0.1" + sources."d3-polygon-3.0.1" + sources."d3-quadtree-3.0.1" + sources."d3-random-3.0.1" + sources."d3-scale-4.0.1" + sources."d3-scale-chromatic-3.0.0" + sources."d3-selection-3.0.0" + sources."d3-shape-3.0.1" + sources."d3-time-3.0.0" + sources."d3-time-format-4.0.0" + sources."d3-timer-3.0.1" + sources."d3-transition-3.0.1" sources."d3-voronoi-1.1.4" - sources."d3-zoom-1.8.3" + sources."d3-zoom-3.0.0" sources."dagre-0.8.5" - sources."dagre-d3-0.6.4" + (sources."dagre-d3-0.6.4" // { + dependencies = [ + sources."commander-2.20.3" + sources."d3-5.16.0" + sources."d3-array-1.2.4" + sources."d3-axis-1.0.12" + sources."d3-brush-1.1.6" + sources."d3-chord-1.0.6" + sources."d3-color-1.4.1" + sources."d3-contour-1.3.2" + sources."d3-dispatch-1.0.6" + sources."d3-drag-1.2.5" + sources."d3-dsv-1.2.0" + sources."d3-ease-1.0.7" + sources."d3-fetch-1.2.0" + sources."d3-force-1.2.1" + sources."d3-format-1.4.5" + sources."d3-geo-1.12.1" + sources."d3-hierarchy-1.1.9" + sources."d3-interpolate-1.4.0" + sources."d3-path-1.0.9" + sources."d3-polygon-1.0.6" + sources."d3-quadtree-1.0.7" + sources."d3-random-1.1.2" + sources."d3-scale-2.2.2" + sources."d3-scale-chromatic-1.5.0" + sources."d3-selection-1.4.2" + sources."d3-shape-1.3.7" + sources."d3-time-1.1.0" + sources."d3-time-format-2.3.0" + sources."d3-timer-1.0.10" + sources."d3-transition-1.3.2" + sources."d3-zoom-1.8.3" + sources."iconv-lite-0.4.24" + ]; + }) sources."debug-4.3.1" + sources."delaunator-5.0.0" sources."devtools-protocol-0.0.901419" sources."dompurify-2.3.1" sources."end-of-stream-1.4.4" @@ -100257,18 +102248,19 @@ in sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" sources."get-stream-5.2.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graphlib-2.1.8" sources."has-flag-4.0.0" sources."https-proxy-agent-5.0.0" - sources."iconv-lite-0.4.24" + sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."internmap-2.0.3" sources."khroma-1.4.1" sources."locate-path-5.0.0" sources."lodash-4.17.21" - sources."mermaid-8.12.1" + sources."mermaid-8.13.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -100286,9 +102278,10 @@ in sources."progress-2.0.1" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-10.2.0" + sources."puppeteer-10.4.0" sources."readable-stream-3.6.0" sources."rimraf-3.0.2" + sources."robust-predicates-3.0.1" sources."rw-1.3.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -100343,10 +102336,10 @@ in sources."chokidar-3.5.2" (sources."cliui-7.0.4" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."color-convert-2.0.1" @@ -100411,20 +102404,20 @@ in sources."workerpool-6.1.5" (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" sources."y18n-5.0.8" (sources."yargs-16.2.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."yargs-parser-20.2.4" @@ -100520,7 +102513,7 @@ in sources."@librescore/fonts-0.4.1" sources."@librescore/sf3-0.3.0" sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."base64-js-1.5.1" sources."bl-4.1.0" @@ -100551,7 +102544,7 @@ in sources."log-symbols-4.1.0" sources."mimic-fn-2.1.0" sources."mute-stream-0.0.8" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" sources."onetime-5.1.2" sources."ora-5.4.1" sources."os-tmpdir-1.0.2" @@ -100561,18 +102554,21 @@ in sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."signal-exit-3.0.3" - sources."string-width-4.2.2" + sources."signal-exit-3.0.4" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."through-2.3.8" sources."tmp-0.0.33" + sources."tr46-0.0.3" sources."tslib-1.14.1" sources."type-fest-0.21.3" sources."util-deprecate-1.0.2" sources."wcwidth-1.0.1" + sources."webidl-conversions-3.0.1" sources."webmscore-0.18.0" + sources."whatwg-url-5.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -100647,10 +102643,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "6.8.11"; + version = "6.9.15"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.8.11.tgz"; - sha512 = "OdClfrRa1MAI1Oltk2x0dJx43EsM4NZtENDttlbv3ODaglimInvd1NSpyjzOM4gFluMt6GG2rzH2LQcFNM8IvQ=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.9.15.tgz"; + sha512 = "745oz8iT+BdHYBJYl7AOsHyYRhEjcLBbnydJuMHOgbPzl7XrLCX1SQ7M0h/BSQ7C18C9WFZ5qihFWtF/Vi4pcw=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -100681,7 +102677,7 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-module-transforms-7.15.7" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.15.4" @@ -100689,7 +102685,7 @@ in sources."@babel/helper-simple-access-7.15.4" sources."@babel/helper-skip-transparent-expression-wrappers-7.15.4" sources."@babel/helper-split-export-declaration-7.15.4" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.15.4" sources."@babel/helpers-7.15.4" @@ -100703,7 +102699,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.15.5" + sources."@babel/parser-7.15.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" sources."@babel/plugin-proposal-async-generator-functions-7.15.4" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -100714,7 +102710,7 @@ in sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" sources."@babel/plugin-proposal-numeric-separator-7.14.5" - sources."@babel/plugin-proposal-object-rest-spread-7.14.7" + sources."@babel/plugin-proposal-object-rest-spread-7.15.6" sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-proposal-private-methods-7.14.5" @@ -100766,7 +102762,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.15.4" // { + (sources."@babel/preset-env-7.15.6" // { dependencies = [ sources."semver-6.3.0" ]; @@ -100775,7 +102771,7 @@ in sources."@babel/runtime-7.15.4" sources."@babel/template-7.15.4" sources."@babel/traverse-7.15.4" - sources."@babel/types-7.15.4" + sources."@babel/types-7.15.6" sources."@bugsnag/browser-7.11.0" sources."@bugsnag/core-7.11.0" sources."@bugsnag/cuid-3.0.0" @@ -100785,7 +102781,7 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-26.6.2" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-18.8.0" // { + (sources."@netlify/build-18.13.1" // { dependencies = [ sources."resolve-2.0.0-next.3" ]; @@ -100797,15 +102793,15 @@ in sources."slash-3.0.0" ]; }) - (sources."@netlify/config-15.6.2" // { + (sources."@netlify/config-15.6.3" // { dependencies = [ sources."dot-prop-5.3.0" ]; }) sources."@netlify/esbuild-0.13.6" - sources."@netlify/framework-info-5.9.1" + sources."@netlify/framework-info-5.9.2" sources."@netlify/functions-utils-2.0.2" - (sources."@netlify/git-utils-2.0.1" // { + (sources."@netlify/git-utils-2.0.2" // { dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" @@ -100830,13 +102826,13 @@ in sources."@netlify/open-api-2.5.0" (sources."@netlify/plugin-edge-handlers-1.11.22" // { dependencies = [ - sources."@types/node-14.17.15" + sources."@types/node-14.17.18" ]; }) sources."@netlify/plugins-list-3.6.0" - sources."@netlify/routing-local-proxy-0.31.0" + sources."@netlify/routing-local-proxy-0.33.2" sources."@netlify/run-utils-2.0.1" - (sources."@netlify/zip-it-and-ship-it-4.20.0" // { + (sources."@netlify/zip-it-and-ship-it-4.23.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" @@ -100897,7 +102893,7 @@ in sources."tslib-2.3.1" ]; }) - (sources."@oclif/core-0.5.35" // { + (sources."@oclif/core-0.5.39" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" sources."ansi-styles-4.3.0" @@ -100966,7 +102962,7 @@ in ]; }) sources."@oclif/screen-1.0.4" - sources."@octokit/auth-token-2.4.5" + sources."@octokit/auth-token-2.5.0" sources."@octokit/core-3.5.1" (sources."@octokit/endpoint-6.0.12" // { dependencies = [ @@ -100974,18 +102970,18 @@ in ]; }) sources."@octokit/graphql-4.8.0" - sources."@octokit/openapi-types-10.1.1" - sources."@octokit/plugin-paginate-rest-2.16.0" + sources."@octokit/openapi-types-10.5.0" + sources."@octokit/plugin-paginate-rest-2.16.4" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.10.1" + sources."@octokit/plugin-rest-endpoint-methods-5.11.1" (sources."@octokit/request-5.6.1" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.10.0" - sources."@octokit/types-6.27.0" + sources."@octokit/rest-18.11.0" + sources."@octokit/types-6.31.0" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-18.1.0" // { dependencies = [ @@ -101018,7 +103014,7 @@ in sources."@types/istanbul-reports-3.0.1" sources."@types/keyv-3.1.3" sources."@types/minimatch-3.0.5" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."@types/node-fetch-2.5.12" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-1.17.1" @@ -101026,8 +103022,8 @@ in sources."@types/semver-7.3.8" sources."@types/yargs-15.0.14" sources."@types/yargs-parser-20.2.1" - sources."@typescript-eslint/types-4.31.0" - (sources."@typescript-eslint/typescript-estree-4.31.0" // { + sources."@typescript-eslint/types-4.31.2" + (sources."@typescript-eslint/typescript-estree-4.31.2" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" sources."array-union-2.1.0" @@ -101044,17 +103040,16 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@typescript-eslint/visitor-keys-4.31.0" + sources."@typescript-eslint/visitor-keys-4.31.2" sources."@ungap/from-entries-0.2.1" sources."accepts-1.3.7" - sources."acorn-8.5.0" sources."agent-base-6.0.2" (sources."aggregate-error-3.1.0" // { dependencies = [ sources."clean-stack-2.2.0" ]; }) - sources."ajv-8.6.2" + sources."ajv-8.6.3" (sources."all-node-versions-8.0.0" // { dependencies = [ sources."@jest/types-25.5.0" @@ -101081,7 +103076,7 @@ in ]; }) sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-5.2.0" sources."ansicolors-0.3.2" sources."any-observable-0.3.0" @@ -101120,7 +103115,7 @@ in sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.2.4" + sources."babel-plugin-polyfill-corejs3-0.2.5" sources."babel-plugin-polyfill-regenerator-0.2.2" sources."backoff-2.5.0" sources."balanced-match-1.0.2" @@ -101141,7 +103136,7 @@ in sources."raw-body-2.4.0" ]; }) - (sources."boxen-5.0.1" // { + (sources."boxen-5.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."type-fest-0.20.2" @@ -101154,7 +103149,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.17.0" + sources."browserslist-4.17.1" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -101178,7 +103173,7 @@ in sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001255" + sources."caniuse-lite-1.0.30001260" sources."cardinal-2.1.1" (sources."chalk-4.1.2" // { dependencies = [ @@ -101219,7 +103214,7 @@ in sources."clean-stack-3.0.1" sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" - sources."cli-progress-3.9.0" + sources."cli-progress-3.9.1" sources."cli-spinners-2.6.0" (sources."cli-truncate-0.2.1" // { dependencies = [ @@ -101263,7 +103258,6 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."color-string-1.6.0" - sources."colorette-1.4.0" sources."colors-1.4.0" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" @@ -101292,7 +103286,7 @@ in sources."readdirp-2.2.1" ]; }) - (sources."core-js-compat-3.17.3" // { + (sources."core-js-compat-3.18.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -101442,7 +103436,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.833" + sources."electron-to-chromium-1.3.849" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -101453,6 +103447,7 @@ in sources."envinfo-7.8.1" sources."error-ex-1.3.2" sources."error-stack-parser-2.0.6" + sources."es-module-lexer-0.9.0" sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" @@ -101526,7 +103521,7 @@ in sources."fast-glob-2.2.7" sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.1.1" - sources."fastq-1.12.0" + sources."fastq-1.13.0" sources."fd-slicer-1.1.0" sources."fecha-4.2.1" (sources."fetch-node-website-5.0.3" // { @@ -101576,7 +103571,7 @@ in sources."flush-write-stream-2.0.0" sources."fn.name-1.1.0" sources."folder-walker-3.2.0" - sources."follow-redirects-1.14.3" + sources."follow-redirects-1.14.4" sources."for-in-1.0.2" sources."form-data-3.0.1" sources."forwarded-0.2.0" @@ -101602,10 +103597,10 @@ in sources."get-port-5.1.1" sources."get-stream-6.0.1" sources."get-value-2.0.6" - sources."gh-release-fetch-2.0.2" + sources."gh-release-fetch-2.0.3" sources."git-repo-info-2.1.1" sources."gitconfiglocal-2.1.0" - sources."glob-7.1.7" + sources."glob-7.2.0" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -101741,6 +103736,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" + sources."is-builtin-module-3.1.0" (sources."is-ci-2.0.0" // { dependencies = [ sources."ci-info-2.0.0" @@ -101888,7 +103884,7 @@ in sources."wrap-ansi-3.0.1" ]; }) - (sources."logform-2.2.0" // { + (sources."logform-2.3.0" // { dependencies = [ sources."ms-2.1.3" ]; @@ -101903,7 +103899,7 @@ in ]; }) sources."map-cache-0.2.2" - sources."map-obj-4.2.1" + sources."map-obj-4.3.0" sources."map-visit-1.0.0" sources."maxstache-1.0.7" (sources."maxstache-stream-1.0.4" // { @@ -101951,12 +103947,13 @@ in ]; }) sources."mute-stream-0.0.7" + sources."nanocolors-0.1.12" sources."nanoid-3.1.25" sources."nanomatch-1.2.13" sources."natural-orderby-2.0.3" sources."negotiator-0.6.2" sources."nested-error-stacks-2.1.0" - (sources."netlify-8.0.0" // { + (sources."netlify-8.0.1" // { dependencies = [ sources."qs-6.10.1" ]; @@ -101965,8 +103962,8 @@ in sources."netlify-redirect-parser-11.0.2" sources."netlify-redirector-0.2.1" sources."nice-try-1.0.5" - sources."node-fetch-2.6.2" - sources."node-releases-1.1.75" + sources."node-fetch-2.6.5" + sources."node-releases-1.1.76" sources."node-source-walk-4.2.0" (sources."node-version-alias-1.0.1" // { dependencies = [ @@ -102154,7 +104151,7 @@ in sources."pinkie-promise-2.0.1" sources."pkg-dir-5.0.0" sources."posix-character-classes-0.1.1" - sources."postcss-8.3.6" + sources."postcss-8.3.7" sources."postcss-values-parser-2.0.1" sources."precinct-8.1.0" sources."precond-0.2.3" @@ -102208,15 +104205,15 @@ in sources."readdirp-3.6.0" sources."redeyed-2.1.1" sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-8.2.0" + sources."regenerate-unicode-properties-9.0.0" sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" - sources."regexpu-core-4.7.1" + sources."regexpu-core-4.8.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.9" // { + (sources."regjsparser-0.7.0" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -102242,7 +104239,7 @@ in sources."reusify-1.0.4" sources."rfdc-1.3.0" sources."rimraf-3.0.2" - sources."rollup-2.56.3" + sources."rollup-2.57.0" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -102261,6 +104258,7 @@ in sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" + sources."safe-stable-stringify-1.1.1" sources."safer-buffer-2.1.2" sources."seek-bzip-1.0.6" sources."semver-7.3.5" @@ -102291,7 +104289,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" (sources."simple-swizzle-0.2.2" // { dependencies = [ sources."is-arrayish-0.3.2" @@ -102385,9 +104383,9 @@ in sources."statsd-client-0.4.7" sources."statuses-1.5.0" sources."strict-uri-encode-1.1.0" - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.1.1" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-ansi-control-characters-2.0.0" sources."strip-bom-3.0.0" sources."strip-dirs-2.1.0" @@ -102421,7 +104419,7 @@ in sources."type-fest-0.16.0" ]; }) - (sources."terser-5.7.2" // { + (sources."terser-5.9.0" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -102452,6 +104450,7 @@ in sources."toidentifier-1.0.0" sources."toml-3.0.0" sources."tomlify-j0.4-3.0.0" + sources."tr46-0.0.3" sources."treeify-1.1.0" (sources."trim-repeated-1.0.0" // { dependencies = [ @@ -102466,13 +104465,13 @@ in sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.4.2" + sources."typescript-4.4.3" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" - sources."unicode-canonical-property-names-ecmascript-1.0.4" - sources."unicode-match-property-ecmascript-1.0.4" - sources."unicode-match-property-value-ecmascript-1.2.0" - sources."unicode-property-aliases-ecmascript-1.1.0" + sources."unicode-canonical-property-names-ecmascript-2.0.0" + sources."unicode-match-property-ecmascript-2.0.0" + sources."unicode-match-property-value-ecmascript-2.0.0" + sources."unicode-property-aliases-ecmascript-2.0.0" sources."union-value-1.0.1" sources."uniq-1.0.1" sources."unique-string-2.0.0" @@ -102518,7 +104517,9 @@ in ]; }) sources."wcwidth-1.0.1" + sources."webidl-conversions-3.0.1" sources."well-known-symbols-2.0.0" + sources."whatwg-url-5.0.0" sources."which-2.0.2" sources."which-module-2.0.0" sources."widest-line-3.1.0" @@ -102634,7 +104635,7 @@ in sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."has-unicode-2.0.1" sources."http-cache-semantics-4.1.0" @@ -102655,7 +104656,7 @@ in sources."lru-cache-6.0.0" sources."make-fetch-happen-8.0.14" sources."minimatch-3.0.4" - sources."minipass-3.1.3" + sources."minipass-3.1.5" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" sources."minipass-flush-1.0.5" @@ -102681,7 +104682,7 @@ in sources."safer-buffer-2.1.2" sources."semver-7.3.5" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" @@ -102711,10 +104712,10 @@ in node-gyp-build = nodeEnv.buildNodePackage { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.2.3"; + version = "4.3.0"; 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=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.3.0.tgz"; + sha512 = "iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -102754,7 +104755,7 @@ in sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" sources."biased-opener-0.2.8" - sources."big-integer-1.6.48" + sources."big-integer-1.6.49" sources."block-stream-0.0.9" sources."body-parser-1.19.0" sources."boom-2.10.1" @@ -102876,7 +104877,7 @@ in sources."negotiator-0.6.2" (sources."node-pre-gyp-0.6.39" // { dependencies = [ - sources."glob-7.1.7" + sources."glob-7.2.0" sources."rimraf-2.7.1" sources."semver-5.7.1" ]; @@ -102942,7 +104943,7 @@ in sources."serve-static-1.14.1" sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."sntp-1.0.9" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" @@ -102965,7 +104966,7 @@ in sources."tar-2.2.2" (sources."tar-pack-3.4.1" // { dependencies = [ - sources."glob-7.1.7" + sources."glob-7.2.0" sources."rimraf-2.7.1" ]; }) @@ -103052,7 +105053,7 @@ in sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."has-unicode-2.0.1" sources."iconv-lite-0.4.24" sources."ignore-walk-3.0.4" @@ -103089,7 +105090,7 @@ in sources."sax-1.2.4" sources."semver-5.7.1" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" @@ -103143,12 +105144,12 @@ in sources."@node-red/registry-2.0.6" sources."@node-red/runtime-2.0.6" sources."@node-red/util-2.0.6" - sources."@sindresorhus/is-4.0.1" + sources."@sindresorhus/is-4.2.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" @@ -103287,7 +105288,7 @@ in }) sources."fast-deep-equal-3.1.3" sources."finalhandler-1.1.2" - sources."follow-redirects-1.14.3" + sources."follow-redirects-1.14.4" sources."form-data-4.0.0" sources."forwarded-0.2.0" sources."fresh-0.5.2" @@ -103301,7 +105302,7 @@ in sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."get-stream-5.2.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."got-11.8.2" sources."graceful-fs-4.2.8" sources."has-unicode-2.0.1" @@ -103367,7 +105368,7 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."minipass-3.1.3" // { + (sources."minipass-3.1.5" // { dependencies = [ sources."yallist-4.0.0" ]; @@ -103401,12 +105402,12 @@ in sources."mute-stream-0.0.8" sources."negotiator-0.6.2" sources."node-addon-api-3.2.1" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" sources."node-red-admin-2.2.0" sources."nopt-5.0.0" sources."normalize-url-6.1.0" sources."npmlog-4.1.2" - sources."nth-check-2.0.0" + sources."nth-check-2.0.1" sources."number-is-nan-1.0.1" sources."oauth2orize-1.11.0" sources."object-assign-4.1.1" @@ -103462,7 +105463,7 @@ in sources."serve-static-1.14.1" sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" (sources."split2-3.2.2" // { dependencies = [ sources."readable-stream-3.6.0" @@ -103484,6 +105485,7 @@ in }) sources."toidentifier-1.0.0" sources."tough-cookie-4.0.0" + sources."tr46-0.0.3" sources."tslib-2.3.1" sources."type-is-1.6.18" sources."typedarray-0.0.6" @@ -103497,6 +105499,8 @@ in sources."utils-merge-1.0.1" sources."uuid-8.3.2" sources."vary-1.1.2" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."wide-align-1.1.3" sources."wrappy-1.0.2" sources."ws-7.5.1" @@ -103577,7 +105581,7 @@ in sources."function-bind-1.1.1" sources."gauge-2.7.4" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -103604,7 +105608,7 @@ in sources."mime-types-2.1.32" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."minipass-3.1.3" + sources."minipass-3.1.5" sources."minizlib-2.1.2" sources."mkdirp-0.5.5" sources."ncp-0.4.2" @@ -103661,7 +105665,7 @@ in sources."safer-buffer-2.1.2" sources."semver-7.3.5" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."slasp-0.0.4" sources."slide-1.1.6" sources."spdx-correct-3.1.1" @@ -103698,7 +105702,7 @@ in sources."core-util-is-1.0.2" ]; }) - sources."walk-2.3.14" + sources."walk-2.3.15" sources."wide-align-1.1.3" sources."wrappy-1.0.2" sources."yallist-4.0.0" @@ -103716,10 +105720,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "2.0.12"; + version = "2.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.12.tgz"; - sha512 = "egCTmNZdObdBxUBw6ZNwvZ/xzk24CKRs5K6d+5zbmrMr7rOpPmfPeF6OxM3DDpaRx331CQRFEktn+wrFFfBSOA=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.13.tgz"; + sha512 = "UMXMpsZsv1UXUttCn6gv8eQPhn6DR4BW+txnL3IN5IHqrCwcrT/yWHfL35UsClGXknTH79r5xbu+6J1zNHuSyA=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -103735,7 +105739,7 @@ in sources."anymatch-3.1.2" sources."balanced-match-1.0.2" sources."binary-extensions-2.2.0" - sources."boxen-4.2.0" + sources."boxen-5.1.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" (sources."cacheable-request-6.1.0" // { @@ -103744,8 +105748,8 @@ in sources."lowercase-keys-2.0.0" ]; }) - sources."camelcase-5.3.1" - (sources."chalk-3.0.0" // { + sources."camelcase-6.2.0" + (sources."chalk-4.1.2" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.2.0" @@ -103773,7 +105777,7 @@ in sources."fsevents-2.3.2" sources."get-stream-4.1.0" sources."glob-parent-5.1.2" - sources."global-dirs-2.1.0" + sources."global-dirs-3.0.0" sources."got-9.6.0" sources."graceful-fs-4.2.8" sources."has-flag-3.0.0" @@ -103782,14 +105786,14 @@ in sources."ignore-by-default-1.0.1" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" - sources."ini-1.3.7" + sources."ini-2.0.0" sources."is-binary-path-2.1.0" sources."is-ci-2.0.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" - sources."is-installed-globally-0.3.2" - sources."is-npm-4.0.0" + sources."is-installed-globally-0.4.0" + sources."is-npm-5.0.0" sources."is-number-7.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" @@ -103799,6 +105803,7 @@ in sources."keyv-3.1.0" sources."latest-version-5.1.0" sources."lowercase-keys-1.0.1" + sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" @@ -103823,7 +105828,11 @@ in sources."pstree.remy-1.1.8" sources."pump-3.0.0" sources."pupa-2.1.1" - sources."rc-1.2.8" + (sources."rc-1.2.8" // { + dependencies = [ + sources."ini-1.3.8" + ]; + }) sources."readdirp-3.6.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" @@ -103834,23 +105843,22 @@ in sources."semver-6.3.0" ]; }) - sources."signal-exit-3.0.3" - (sources."string-width-4.2.2" // { + sources."signal-exit-3.0.4" + (sources."string-width-4.2.3" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."strip-ansi-5.2.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - sources."term-size-2.2.1" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."touch-3.1.0" - sources."type-fest-0.8.1" + sources."type-fest-0.20.2" sources."typedarray-to-buffer-3.1.5" (sources."undefsafe-2.0.3" // { dependencies = [ @@ -103859,12 +105867,23 @@ in ]; }) sources."unique-string-2.0.0" - sources."update-notifier-4.1.3" + (sources."update-notifier-5.1.0" // { + dependencies = [ + sources."semver-7.3.5" + ]; + }) sources."url-parse-lax-3.0.0" sources."widest-line-3.1.0" + (sources."wrap-ansi-7.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."strip-ansi-6.0.1" + ]; + }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" + sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -103886,7 +105905,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -103912,7 +105931,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" sources."@types/minimist-1.2.2" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -103927,14 +105946,14 @@ in ]; }) sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."any-observable-0.5.1" sources."array-union-2.1.0" sources."arrify-1.0.1" sources."async-exit-hook-2.0.1" sources."balanced-match-1.0.2" - (sources."boxen-5.0.1" // { + (sources."boxen-5.1.2" // { dependencies = [ sources."camelcase-6.2.0" sources."type-fest-0.20.2" @@ -104008,7 +106027,7 @@ in sources."execa-5.1.1" sources."external-editor-3.1.0" sources."fast-glob-3.2.7" - sources."fastq-1.12.0" + sources."fastq-1.13.0" (sources."figures-3.2.0" // { dependencies = [ sources."escape-string-regexp-1.0.5" @@ -104020,7 +106039,7 @@ in sources."function-bind-1.1.1" sources."get-stream-6.0.1" sources."github-url-from-git-1.5.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."global-dirs-2.1.0" sources."globby-11.0.4" @@ -104184,12 +106203,7 @@ in ]; }) sources."map-age-cleaner-0.1.3" - sources."map-obj-4.2.1" - (sources."mem-6.1.1" // { - dependencies = [ - sources."mimic-fn-3.1.0" - ]; - }) + sources."map-obj-4.3.0" (sources."meow-8.1.2" // { dependencies = [ sources."type-fest-0.18.1" @@ -104235,7 +106249,7 @@ in sources."os-tmpdir-1.0.2" (sources."ow-0.21.0" // { dependencies = [ - sources."@sindresorhus/is-4.0.1" + sources."@sindresorhus/is-4.2.0" sources."type-fest-0.20.2" ]; }) @@ -104250,7 +106264,7 @@ in sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-map-4.0.0" - (sources."p-memoize-4.0.1" // { + (sources."p-memoize-4.0.2" // { dependencies = [ sources."mimic-fn-3.1.0" ]; @@ -104348,7 +106362,7 @@ in }) sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."slash-3.0.0" sources."slice-ansi-0.0.4" sources."spdx-correct-3.1.1" @@ -104356,8 +106370,8 @@ in sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.10" sources."split-1.0.1" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" @@ -104416,10 +106430,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.22.0"; + version = "7.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.22.0.tgz"; - sha512 = "HJnjTCrGGnacPMCSnrxuHGf2H4VdrY7hwTAK1RwByg0K96KIuTR4QNioFW+bnc/pW0uwpk9lLsDf4BeEQhTv2Q=="; + url = "https://registry.npmjs.org/npm/-/npm-7.24.1.tgz"; + sha512 = "U7/C++ZgB3zNH/kzhSJMnp3pO2iLrZRGUUXAgCCLB/by+sR+dKVhP/ik9+sTOGk9wk3zbmwHAYDT8igkv1ss0g=="; }; buildInputs = globalBuildInputs; meta = { @@ -104480,13 +106494,13 @@ in sources."aws4-1.11.0" sources."balanced-match-1.0.2" sources."bcrypt-pbkdf-1.0.2" - (sources."boxen-5.0.1" // { + (sources."boxen-5.1.2" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."brace-expansion-1.1.11" @@ -104544,7 +106558,7 @@ in sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fast-memoize-2.5.2" - sources."fastq-1.12.0" + sources."fastq-1.13.0" sources."figgy-pudding-3.5.2" sources."fill-range-7.0.1" sources."find-up-5.0.0" @@ -104557,7 +106571,7 @@ in sources."get-stdin-8.0.0" sources."get-stream-4.1.0" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" (sources."global-dirs-3.0.0" // { dependencies = [ @@ -104646,7 +106660,7 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."minipass-3.1.3" + sources."minipass-3.1.5" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" sources."minipass-flush-1.0.5" @@ -104725,12 +106739,12 @@ in }) sources."semver-utils-1.1.4" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."sisteransi-1.0.5" sources."slash-3.0.0" sources."smart-buffer-4.2.0" sources."socks-2.6.1" - sources."socks-proxy-agent-6.0.0" + sources."socks-proxy-agent-6.1.0" sources."spawn-please-1.0.0" sources."sshpk-1.16.1" sources."ssri-8.0.1" @@ -104765,20 +106779,20 @@ in sources."wide-align-1.1.3" (sources."widest-line-3.1.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" @@ -104881,7 +106895,7 @@ in }) sources."gauge-3.0.1" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-2.0.3" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -104938,7 +106952,7 @@ in sources."safer-buffer-2.1.2" sources."semver-4.3.6" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."slide-1.1.6" sources."sshpk-1.16.1" sources."string-width-2.1.1" @@ -104964,7 +106978,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."walk-2.3.14" + sources."walk-2.3.15" sources."wide-align-1.1.3" sources."wrappy-1.0.2" ]; @@ -105062,7 +107076,7 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-module-transforms-7.15.7" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.15.4" @@ -105070,12 +107084,12 @@ in sources."@babel/helper-simple-access-7.15.4" sources."@babel/helper-skip-transparent-expression-wrappers-7.15.4" sources."@babel/helper-split-export-declaration-7.15.4" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.15.4" sources."@babel/helpers-7.15.4" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.5" + sources."@babel/parser-7.15.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" sources."@babel/plugin-proposal-async-generator-functions-7.15.4" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -105086,7 +107100,7 @@ in sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" sources."@babel/plugin-proposal-numeric-separator-7.14.5" - sources."@babel/plugin-proposal-object-rest-spread-7.14.7" + sources."@babel/plugin-proposal-object-rest-spread-7.15.6" sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-proposal-private-methods-7.14.5" @@ -105142,7 +107156,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.15.4" // { + (sources."@babel/preset-env-7.15.6" // { dependencies = [ sources."semver-6.3.0" ]; @@ -105151,7 +107165,7 @@ in sources."@babel/runtime-7.15.4" sources."@babel/template-7.15.4" sources."@babel/traverse-7.15.4" - sources."@babel/types-7.15.4" + sources."@babel/types-7.15.6" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -105211,7 +107225,7 @@ in sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.2.4" + sources."babel-plugin-polyfill-corejs3-0.2.5" sources."babel-plugin-polyfill-regenerator-0.2.2" (sources."babel-runtime-6.26.0" // { dependencies = [ @@ -105256,7 +107270,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.17.0" + sources."browserslist-4.17.1" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -105273,7 +107287,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001255" + sources."caniuse-lite-1.0.30001260" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -105288,7 +107302,6 @@ in sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.6.0" - sources."colorette-1.4.0" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" sources."commander-2.20.3" @@ -105300,7 +107313,7 @@ in sources."convert-source-map-1.8.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.17.3" // { + (sources."core-js-compat-3.18.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -105411,7 +107424,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.833" + sources."electron-to-chromium-1.3.849" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -105475,7 +107488,7 @@ in sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -105521,7 +107534,7 @@ in sources."posthtml-0.15.2" sources."posthtml-parser-0.7.2" sources."source-map-0.7.3" - sources."terser-5.7.2" + sources."terser-5.9.0" ]; }) (sources."htmlparser2-6.1.0" // { @@ -105660,6 +107673,7 @@ in sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."nan-2.15.0" + sources."nanocolors-0.1.12" (sources."nanomatch-1.2.13" // { dependencies = [ sources."define-property-2.0.2" @@ -105676,7 +107690,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.75" + sources."node-releases-1.1.76" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" @@ -105822,7 +107836,7 @@ in }) sources."readdirp-2.2.1" sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-8.2.0" + sources."regenerate-unicode-properties-9.0.0" sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" (sources."regex-not-1.0.2" // { @@ -105831,9 +107845,9 @@ in sources."is-extendable-1.0.1" ]; }) - sources."regexpu-core-4.7.1" + sources."regexpu-core-4.8.0" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.9" // { + (sources."regjsparser-0.7.0" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -105884,7 +107898,7 @@ in sources."object-inspect-1.11.0" ]; }) - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" (sources."simple-swizzle-0.2.2" // { dependencies = [ sources."is-arrayish-0.3.2" @@ -105972,10 +107986,10 @@ in sources."postcss-selector-parser-6.0.2" ]; }) - sources."unicode-canonical-property-names-ecmascript-1.0.4" - sources."unicode-match-property-ecmascript-1.0.4" - sources."unicode-match-property-value-ecmascript-1.2.0" - sources."unicode-property-aliases-ecmascript-1.1.0" + sources."unicode-canonical-property-names-ecmascript-2.0.0" + sources."unicode-match-property-ecmascript-2.0.0" + sources."unicode-match-property-value-ecmascript-2.0.0" + sources."unicode-property-aliases-ecmascript-2.0.0" sources."unicode-trie-0.3.1" sources."union-value-1.0.1" sources."uniq-1.0.1" @@ -106153,7 +108167,7 @@ in sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."handlebars-4.7.7" sources."har-schema-2.0.0" @@ -106181,15 +108195,10 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - (sources."kad-git://github.com/wikimedia/kad#master" // { - dependencies = [ - sources."ms-0.7.3" - ]; - }) sources."kad-fs-0.0.4" sources."kad-localstorage-0.0.7" sources."kad-memstore-0.0.1" - sources."limitation-0.2.2" + sources."limitation-0.2.3" sources."locate-path-3.0.0" sources."lodash-4.17.21" sources."lodash.clone-4.5.0" @@ -106272,7 +108281,7 @@ in ]; }) sources."serve-static-1.14.1" - (sources."service-runner-2.8.4" // { + (sources."service-runner-2.9.0" // { dependencies = [ sources."semver-7.3.5" sources."yargs-14.2.3" @@ -106305,6 +108314,11 @@ in sources."vary-1.1.2" sources."verror-1.10.0" sources."which-module-2.0.0" + (sources."wikimedia-kad-fork-1.3.6" // { + dependencies = [ + sources."ms-0.7.3" + ]; + }) sources."wikimedia-langconv-0.1.0" sources."wikipeg-2.0.6" sources."wordwrap-1.0.0" @@ -106355,7 +108369,7 @@ in sources."find-yarn-workspace-root-2.0.0" sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."has-flag-3.0.0" sources."inflight-1.0.6" @@ -106424,7 +108438,7 @@ in sources."base64-js-0.0.8" sources."bencode-2.0.2" sources."bep53-range-1.1.1" - sources."big-integer-1.6.48" + sources."big-integer-1.6.49" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { dependencies = [ @@ -106499,7 +108513,7 @@ in sources."get-browser-rtc-1.1.0" sources."get-intrinsic-1.1.1" sources."get-stdin-4.0.1" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-ansi-2.0.0" @@ -106641,7 +108655,7 @@ in sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."server-destroy-1.0.1" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" sources."simple-peer-6.4.4" @@ -106842,7 +108856,7 @@ in sources."fs.realpath-1.0.0" sources."get-browser-rtc-1.1.0" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -107088,20 +109102,20 @@ in pkg = nodeEnv.buildNodePackage { name = "pkg"; packageName = "pkg"; - version = "5.3.1"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/pkg/-/pkg-5.3.1.tgz"; - sha512 = "jT/sptM1ZG++FNk+jnJYNoWLDQXYd7hqpnBhd5j18SNW1jJzNYo55RahuCiD0KN0PX9mb53GWCqKM0ia/mJytA=="; + url = "https://registry.npmjs.org/pkg/-/pkg-5.3.2.tgz"; + sha512 = "78X8Tt71TI11XjkZm/r9shTdFRooFiiRcT8nfYeeOou5VKCkCysQauwAAkJKb5yjfrUhk3CBNL4zv22/iLpdnw=="; }; dependencies = [ - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/parser-7.13.13" sources."@babel/types-7.13.12" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."agent-base-6.0.2" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.7" @@ -107140,7 +109154,7 @@ in sources."expand-template-2.0.3" sources."fast-glob-3.2.7" sources."fast-levenshtein-2.0.6" - sources."fastq-1.12.0" + sources."fastq-1.13.0" sources."fill-range-7.0.1" sources."from2-2.3.0" sources."fs-constants-1.0.0" @@ -107195,7 +109209,7 @@ in sources."semver-5.7.1" ]; }) - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" sources."noop-logger-0.1.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -107206,7 +109220,7 @@ in sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."picomatch-2.3.0" - sources."pkg-fetch-3.2.2" + sources."pkg-fetch-3.2.3" sources."prebuild-install-6.0.1" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" @@ -107222,15 +109236,15 @@ in sources."safe-buffer-5.1.2" sources."semver-7.3.5" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."simple-concat-1.0.1" sources."simple-get-3.1.0" sources."slash-3.0.0" sources."source-map-0.6.1" sources."stream-meter-1.0.4" - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.1.1" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."tar-fs-2.1.1" @@ -107241,11 +109255,14 @@ in }) sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" + sources."tr46-0.0.3" sources."tslib-2.1.0" sources."tunnel-agent-0.6.0" sources."type-check-0.3.2" sources."universalify-2.0.0" sources."util-deprecate-1.0.2" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-pm-runs-1.0.0" (sources."wide-align-1.1.3" // { dependencies = [ @@ -107293,7 +109310,7 @@ in sources."semver-5.7.1" ]; }) - (sources."@pm2/agent-2.0.0" // { + (sources."@pm2/agent-2.0.1" // { dependencies = [ sources."semver-7.2.3" ]; @@ -107357,7 +109374,7 @@ in sources."dayjs-1.8.36" sources."debug-4.3.2" sources."deep-is-0.1.4" - sources."degenerator-2.2.0" + sources."degenerator-3.0.1" sources."depd-1.1.2" sources."emitter-listener-1.1.2" sources."enquirer-2.3.6" @@ -107372,7 +109389,7 @@ in sources."fclone-1.0.11" sources."file-uri-to-path-2.0.0" sources."fill-range-7.0.1" - sources."follow-redirects-1.14.3" + sources."follow-redirects-1.14.4" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -107381,7 +109398,7 @@ in sources."get-uri-3.0.2" sources."git-node-fs-1.0.0" sources."git-sha1-0.1.2" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.8" sources."has-1.0.3" @@ -107429,8 +109446,8 @@ in }) sources."once-1.4.0" sources."optionator-0.8.3" - sources."pac-proxy-agent-4.1.0" - sources."pac-resolver-4.2.0" + sources."pac-proxy-agent-5.0.0" + sources."pac-resolver-5.0.0" sources."pako-0.2.9" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" @@ -107443,7 +109460,7 @@ in sources."pm2-sysmonit-1.2.8" sources."prelude-ls-1.1.2" sources."promptly-2.2.0" - sources."proxy-agent-4.0.1" + sources."proxy-agent-5.0.0" sources."proxy-from-env-1.1.0" sources."raw-body-2.4.1" sources."read-1.0.7" @@ -107463,7 +109480,7 @@ in }) sources."setprototypeof-1.1.1" sources."shimmer-1.2.1" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" @@ -107473,7 +109490,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-5.8.7" + sources."systeminformation-5.9.4" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tslib-2.3.1" @@ -107488,6 +109505,7 @@ in sources."async-2.6.3" ]; }) + sources."vm2-3.9.3" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."ws-7.4.6" @@ -107508,10 +109526,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.14.7"; + version = "6.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.14.7.tgz"; - sha512 = "/pjz4Eod3Heyxw/QCGLYpkZR8YNuzTTblgcVC+qvvYCtX0Wb5J9jVcbHoSRqC2jeo4ldtg8H9dssPlHlH50I7w=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.15.1.tgz"; + sha512 = "hYGK8xlLdMj/sFhOLJ+x8IotsOkBp01c2mdWdLeKlUdA6EOl/RNWRp+7dUWs3Si2E1zgdTiHsEgNGYffv0PyLQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -107554,13 +109572,13 @@ in postcss = nodeEnv.buildNodePackage { name = "postcss"; packageName = "postcss"; - version = "8.3.6"; + version = "8.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz"; - sha512 = "wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.3.7.tgz"; + sha512 = "9SaY7nnyQ63/WittqZYAvkkYPyKxchMKH71UDzeTmWuLSvxTRpeEeABZAzlCi55cuGcoFyoV/amX2BdsafQidQ=="; }; dependencies = [ - sources."colorette-1.4.0" + sources."nanocolors-0.1.12" sources."nanoid-3.1.25" sources."source-map-js-0.6.2" ]; @@ -107586,7 +109604,7 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" sources."array-union-2.1.0" @@ -107604,7 +109622,7 @@ in sources."emoji-regex-8.0.0" sources."escalade-3.1.1" sources."fast-glob-3.2.7" - sources."fastq-1.12.0" + sources."fastq-1.13.0" sources."fill-range-7.0.1" sources."fs-extra-9.1.0" sources."fsevents-2.3.2" @@ -107646,8 +109664,8 @@ in sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."slash-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" sources."universalify-2.0.0" @@ -107670,10 +109688,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.4.0.tgz"; - sha512 = "DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz"; + sha512 = "9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA=="; }; buildInputs = globalBuildInputs; meta = { @@ -107712,13 +109730,13 @@ in prisma = nodeEnv.buildNodePackage { name = "prisma"; packageName = "prisma"; - version = "3.0.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/prisma/-/prisma-3.0.1.tgz"; - sha512 = "ENmYAopd56nkds5/IOSTGixbkbUN2QdEzB4cp/mtaGB/G0OArbP6cnbA/9u02Pe29RdErbNOoIdCGASjpItJwQ=="; + url = "https://registry.npmjs.org/prisma/-/prisma-3.1.1.tgz"; + sha512 = "sha512-+eZtWIL6hnOKUOvqq9WLBzSw2d/EbTmOx1Td1LI8/0XE40ctXMLG2N1p6NK5/+yivGaoNJ9PDpPsPL9lO4nJrQ=="; }; dependencies = [ - sources."@prisma/engines-2.31.0-32.2452cc6313d52b8b9a96999ac0e974d0aedf88db" + sources."@prisma/engines-3.1.0-24.c22652b7e418506fab23052d569b85d3aec4883f" ]; buildInputs = globalBuildInputs; meta = { @@ -107744,8 +109762,12 @@ in sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" sources."gaze-1.1.3" - sources."glob-7.1.7" - sources."globule-1.3.3" + sources."glob-7.2.0" + (sources."globule-1.3.3" // { + dependencies = [ + sources."glob-7.1.7" + ]; + }) sources."inflight-1.0.6" sources."inherits-2.0.4" sources."isexe-2.0.0" @@ -107873,8 +109895,12 @@ in sources."function-bind-1.1.1" sources."gaze-1.1.3" sources."get-assigned-identifiers-1.2.0" - sources."glob-7.1.7" - sources."globule-1.3.3" + sources."glob-7.2.0" + (sources."globule-1.3.3" // { + dependencies = [ + sources."glob-7.1.7" + ]; + }) sources."graceful-fs-4.2.8" sources."has-1.0.3" (sources."hash-base-3.1.0" // { @@ -108035,22 +110061,193 @@ in purescript-language-server = nodeEnv.buildNodePackage { name = "purescript-language-server"; packageName = "purescript-language-server"; - version = "0.15.5"; + version = "0.15.7"; src = fetchurl { - url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.15.5.tgz"; - sha512 = "Km6LOus92Rab315/OhnILwslCseXbl8s53m0T8te0SYeYgNfUnxVh4/m/r217PAApicemaT3ZMdnXrtAZJ5U6Q=="; + url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.15.7.tgz"; + sha512 = "bl62M0n/fAq/ZWvyZD2Wpxlg5A9I0zyCnAvqdRsS052gbGlbyRmzJJz2kT2NexfZvubZT5EYTsENKI/zewUvuw=="; }; dependencies = [ + sources."ajv-6.12.6" + sources."ansi-escapes-3.2.0" + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."aproba-1.2.0" + sources."arch-2.2.0" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."asynckit-0.4.0" + sources."aws-sign2-0.7.0" + sources."aws4-1.11.0" + sources."balanced-match-1.0.2" + sources."bcrypt-pbkdf-1.0.2" + sources."bluebird-3.7.2" + sources."brace-expansion-1.1.11" + sources."buffer-from-1.1.2" + sources."byline-5.0.0" + sources."cacache-11.3.3" + sources."caseless-0.12.0" + sources."chalk-2.4.2" + sources."chownr-1.1.4" + sources."cli-cursor-2.1.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."combined-stream-1.0.8" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."copy-concurrently-1.0.5" + sources."core-util-is-1.0.3" + sources."cross-spawn-7.0.3" + sources."cyclist-1.0.1" + sources."dashdash-1.14.1" + sources."delayed-stream-1.0.0" + sources."duplexify-3.7.1" + sources."ecc-jsbn-0.1.2" + sources."emoji-regex-7.0.3" + sources."end-of-stream-1.4.4" + sources."env-paths-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."execa-2.1.0" + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."figgy-pudding-3.5.2" + sources."filesize-4.2.1" + sources."flush-write-stream-1.1.1" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."from2-2.3.0" + sources."fs-minipass-1.2.7" + sources."fs-write-stream-atomic-1.0.10" + sources."fs.realpath-1.0.0" + sources."get-stream-5.2.0" + sources."getpass-0.1.7" + sources."glob-7.2.0" + sources."graceful-fs-4.2.8" + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" + sources."has-flag-3.0.0" + sources."http-signature-1.2.0" + sources."iferr-0.1.5" + sources."imurmurhash-0.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-fullwidth-code-point-2.0.0" + sources."is-plain-obj-2.1.0" + sources."is-stream-2.0.1" + sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" sources."isexe-2.0.0" + sources."isstream-0.1.2" + sources."jsbn-0.1.1" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + sources."jsprim-1.4.1" + sources."log-symbols-3.0.0" + sources."log-update-3.4.0" + sources."lru-cache-5.1.1" + sources."merge-stream-2.0.0" + sources."mime-db-1.49.0" + sources."mime-types-2.1.32" + sources."mimic-fn-2.1.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."mississippi-3.0.0" + sources."mkdirp-0.5.5" + sources."move-concurrently-1.0.1" + sources."ms-2.1.3" + sources."npm-run-path-3.1.0" + sources."oauth-sign-0.9.0" + sources."once-1.4.0" + sources."onetime-5.1.2" + sources."p-finally-2.0.1" + sources."parallel-transform-1.2.0" + sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" + sources."performance-now-2.1.0" + sources."process-nextick-args-2.0.1" + sources."promise-inflight-1.0.1" + sources."psl-1.8.0" + sources."pump-3.0.0" + (sources."pumpify-1.5.1" // { + dependencies = [ + sources."pump-2.0.1" + ]; + }) + sources."punycode-2.1.1" + sources."purescript-0.14.4" + (sources."purescript-installer-0.2.5" // { + dependencies = [ + sources."which-1.3.1" + ]; + }) + sources."qs-6.5.2" + sources."readable-stream-2.3.7" + sources."request-2.88.2" + (sources."restore-cursor-2.0.0" // { + dependencies = [ + sources."mimic-fn-1.2.0" + sources."onetime-2.0.1" + ]; + }) + sources."rimraf-2.7.1" + sources."run-queue-1.0.3" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."shell-quote-1.7.2" + sources."signal-exit-3.0.4" + sources."spago-0.20.3" + sources."sshpk-1.16.1" + sources."ssri-6.0.2" + sources."stream-each-1.2.3" + sources."stream-shift-1.0.1" + sources."string-width-3.1.0" + sources."string_decoder-1.1.1" + sources."strip-ansi-5.2.0" + sources."strip-final-newline-2.0.0" + sources."supports-color-5.5.0" + (sources."tar-4.4.19" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) + sources."through2-2.0.5" + sources."tough-cookie-2.5.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."typedarray-0.0.6" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" + sources."uri-js-4.4.1" + sources."util-deprecate-1.0.2" sources."uuid-3.4.0" - sources."vscode-jsonrpc-6.0.0" + (sources."verror-1.10.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) + sources."vscode-jsonrpc-5.0.1" sources."vscode-languageserver-6.1.1" - sources."vscode-languageserver-protocol-3.16.0" + (sources."vscode-languageserver-protocol-3.16.0" // { + dependencies = [ + sources."vscode-jsonrpc-6.0.0" + ]; + }) sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.16.0" sources."vscode-uri-2.1.2" sources."which-2.0.2" + sources."wrap-ansi-5.1.0" + sources."wrappy-1.0.2" + sources."xtend-4.0.2" + sources."y18n-4.0.3" + sources."yallist-3.1.1" + sources."zen-observable-0.8.15" ]; buildInputs = globalBuildInputs; meta = { @@ -108109,22 +110306,11 @@ in dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@ungap/promise-all-settled-1.1.2" sources."agent-base-6.0.2" - sources."ansi-colors-4.1.1" - sources."ansi-regex-3.0.0" - sources."ansi-styles-4.3.0" - sources."anymatch-3.1.2" sources."appdata-path-1.0.0" - sources."argparse-2.0.1" sources."at-least-node-1.0.0" sources."axios-0.21.4" - sources."balanced-match-1.0.2" - sources."binary-extensions-2.2.0" sources."blueimp-md5-2.18.0" - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."browser-stdout-1.3.1" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" @@ -108132,172 +110318,72 @@ in ]; }) sources."call-bind-1.0.2" - sources."camelcase-6.2.0" - (sources."chalk-4.1.2" // { - dependencies = [ - sources."supports-color-7.2.0" - ]; - }) - sources."chokidar-3.5.1" - (sources."cliui-7.0.4" // { - dependencies = [ - sources."ansi-regex-5.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" - ]; - }) sources."clone-response-1.0.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" sources."colors-1.4.0" sources."commander-5.1.0" sources."compare-versions-3.6.0" - sources."concat-map-0.0.1" sources."debug-4.3.2" - sources."decamelize-4.0.0" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" - sources."diff-5.0.0" sources."duplexer3-0.1.4" - sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."escalade-3.1.1" - sources."escape-string-regexp-4.0.0" - sources."fill-range-7.0.1" - sources."find-up-5.0.0" - sources."flat-5.0.2" - sources."follow-redirects-1.14.3" + sources."follow-redirects-1.14.4" sources."fs-extra-9.1.0" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" - sources."glob-7.1.6" - sources."glob-parent-5.1.2" sources."got-9.6.0" sources."graceful-fs-4.2.8" - sources."growl-1.10.5" sources."has-1.0.3" - sources."has-flag-4.0.0" sources."has-symbols-1.0.2" - sources."he-1.2.0" sources."http-cache-semantics-4.1.0" sources."https-proxy-agent-5.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" sources."ini-1.3.8" sources."ip-1.1.5" - sources."is-binary-path-2.1.0" sources."is-docker-2.2.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" - sources."is-glob-4.0.1" - sources."is-number-7.0.0" - sources."is-plain-obj-2.1.0" sources."is-wsl-2.2.0" - sources."isexe-2.0.0" - sources."js-base64-3.7.0" - sources."js-yaml-4.0.0" + sources."js-base64-3.7.2" sources."json-buffer-3.0.0" sources."jsonfile-6.1.0" sources."keyv-3.1.0" sources."kleur-3.0.3" sources."latest-version-5.1.0" - sources."locate-path-6.0.0" sources."lodash.flatmap-4.5.0" - sources."log-symbols-4.0.0" sources."lowercase-keys-1.0.1" sources."mimic-response-1.0.1" - sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."mocha-8.4.0" // { - dependencies = [ - (sources."debug-4.3.1" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) - sources."ms-2.1.3" - ]; - }) sources."moment-2.29.1" sources."ms-2.1.2" - sources."nanoid-3.1.20" - sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" sources."object-inspect-1.11.0" sources."once-1.4.0" sources."open-7.4.2" sources."p-cancelable-1.1.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" sources."package-json-6.5.0" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."picomatch-2.3.0" sources."pixiv-api-client-0.25.0" sources."prepend-http-2.0.0" sources."prompts-2.4.1" sources."pump-3.0.0" sources."qs-6.10.1" - sources."randombytes-2.1.0" - (sources."rc-1.2.8" // { - dependencies = [ - sources."strip-json-comments-2.0.1" - ]; - }) - sources."readdirp-3.5.0" + sources."rc-1.2.8" sources."readline-sync-1.4.10" sources."register-protocol-win32-1.1.0" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" - sources."require-directory-2.1.1" sources."responselike-1.0.2" - sources."safe-buffer-5.2.1" sources."semver-6.3.0" - sources."serialize-javascript-5.0.1" sources."side-channel-1.0.4" sources."sisteransi-1.0.5" sources."smart-buffer-4.2.0" sources."socks-2.6.1" sources."socks-proxy-agent-5.0.1" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - sources."strip-json-comments-3.1.1" - sources."supports-color-8.1.1" + sources."strip-json-comments-2.0.1" sources."to-readable-stream-1.0.0" - sources."to-regex-range-5.0.1" sources."universalify-2.0.0" sources."url-parse-lax-3.0.0" - sources."which-2.0.2" - sources."wide-align-1.1.3" sources."winreg-1.2.4" - sources."workerpool-6.1.0" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" - ]; - }) sources."wrappy-1.0.2" - sources."y18n-5.0.8" - (sources."yargs-16.2.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" - ]; - }) - sources."yargs-parser-20.2.4" - sources."yargs-unparser-2.0.0" - sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -108312,10 +110398,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.166"; + version = "1.1.170"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.166.tgz"; - sha512 = "mO+iPT2dhHzlplAV3iKE6u4gUstGZxxLyMSRd1PKZqWhwhTCCGjn3/7VqbAwUt4fuhY8g0V+SAsu+MPT4H3FvQ=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.170.tgz"; + sha512 = "eoLp3FXvB+qGw6DMaC9xCNkIZMzdPMl5yERUXv1U/RF8AIuOcfjmG1171UL/TpXvoCLWGVArkWJcq8l5uBB35Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -108428,7 +110514,7 @@ in sources."minimist-1.2.5" sources."moment-2.29.1" sources."nice-try-1.0.5" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."object-inspect-1.4.1" @@ -108470,7 +110556,7 @@ in sources."shallow-copy-0.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."source-map-0.6.1" (sources."static-eval-2.1.0" // { dependencies = [ @@ -108509,6 +110595,7 @@ in ]; }) sources."tiny-inflate-1.0.3" + sources."tr46-0.0.3" sources."type-check-0.3.2" sources."typedarray-0.0.6" sources."typescript-3.2.4" @@ -108522,7 +110609,9 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."vlq-0.2.3" + sources."webidl-conversions-3.0.1" sources."whatwg-fetch-3.6.2" + sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."which-module-2.0.0" sources."word-wrap-1.2.3" @@ -108584,13 +110673,13 @@ in sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."get-symbol-description-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-bigints-1.0.1" sources."has-symbols-1.0.2" sources."has-tostringtag-1.0.0" - sources."i-0.3.6" + sources."i-0.3.7" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."internal-slot-1.0.3" @@ -108666,7 +110755,7 @@ in sha512 = "coA9MuNPfN+8TyFj7aOycw2e5W9t+sSgFOUyK30oDrh2MWWWHLjY0I4V1puyCconC2arggfDE2GYXvqOTCGv9Q=="; }; dependencies = [ - sources."@babel/cli-7.15.4" + sources."@babel/cli-7.15.7" sources."@babel/code-frame-7.14.5" sources."@babel/compat-data-7.15.0" (sources."@babel/core-7.15.5" // { @@ -108695,7 +110784,7 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-module-transforms-7.15.7" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-plugin-utils-7.14.5" sources."@babel/helper-remap-async-to-generator-7.15.4" @@ -108703,12 +110792,12 @@ in sources."@babel/helper-simple-access-7.15.4" sources."@babel/helper-skip-transparent-expression-wrappers-7.15.4" sources."@babel/helper-split-export-declaration-7.15.4" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helper-wrap-function-7.15.4" sources."@babel/helpers-7.15.4" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.5" + sources."@babel/parser-7.15.7" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4" sources."@babel/plugin-proposal-async-generator-functions-7.15.4" sources."@babel/plugin-proposal-class-properties-7.14.5" @@ -108720,7 +110809,7 @@ in sources."@babel/plugin-proposal-logical-assignment-operators-7.14.5" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.14.5" sources."@babel/plugin-proposal-numeric-separator-7.14.5" - sources."@babel/plugin-proposal-object-rest-spread-7.14.7" + sources."@babel/plugin-proposal-object-rest-spread-7.15.6" sources."@babel/plugin-proposal-optional-catch-binding-7.14.5" sources."@babel/plugin-proposal-optional-chaining-7.14.5" sources."@babel/plugin-proposal-private-methods-7.14.5" @@ -108783,7 +110872,7 @@ in sources."@babel/plugin-transform-typeof-symbol-7.14.5" sources."@babel/plugin-transform-unicode-escapes-7.14.5" sources."@babel/plugin-transform-unicode-regex-7.14.5" - (sources."@babel/preset-env-7.15.4" // { + (sources."@babel/preset-env-7.15.6" // { dependencies = [ sources."semver-6.3.0" ]; @@ -108795,13 +110884,13 @@ in sources."@babel/runtime-7.15.4" sources."@babel/template-7.15.4" sources."@babel/traverse-7.15.4" - sources."@babel/types-7.15.4" + sources."@babel/types-7.15.6" sources."@reach/router-1.3.4" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.4" sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -108895,7 +110984,7 @@ in sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.2.4" + sources."babel-plugin-polyfill-corejs3-0.2.5" sources."babel-plugin-polyfill-regenerator-0.2.2" sources."babel-plugin-transform-react-remove-prop-types-0.4.24" sources."babel-plugin-universal-import-4.0.2" @@ -108955,7 +111044,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."browserslist-4.17.0" + sources."browserslist-4.17.1" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -108989,7 +111078,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001255" + sources."caniuse-lite-1.0.30001260" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -109074,7 +111163,7 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.17.3" // { + (sources."core-js-compat-3.18.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -109218,7 +111307,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.833" + sources."electron-to-chromium-1.3.849" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -109352,7 +111441,7 @@ in sources."find-cache-dir-2.1.0" sources."find-up-3.0.0" sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.14.3" + sources."follow-redirects-1.14.4" sources."for-in-1.0.2" sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" @@ -109374,7 +111463,7 @@ in sources."get-value-2.0.6" sources."git-clone-0.1.0" sources."git-promise-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globals-11.12.0" (sources."globby-6.1.0" // { @@ -109619,8 +111708,12 @@ in ]; }) sources."mime-2.5.2" - sources."mime-db-1.49.0" - sources."mime-types-2.1.32" + sources."mime-db-1.50.0" + (sources."mime-types-2.1.32" // { + dependencies = [ + sources."mime-db-1.49.0" + ]; + }) sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -109646,6 +111739,7 @@ in sources."mutation-observer-1.0.3" sources."mute-stream-0.0.7" sources."nan-2.15.0" + sources."nanocolors-0.1.12" sources."nanomatch-1.2.13" sources."negotiator-0.6.2" sources."neo-async-2.6.2" @@ -109661,7 +111755,7 @@ in ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.75" + sources."node-releases-1.1.76" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" (sources."normalize-url-2.0.1" // { @@ -109933,16 +112027,16 @@ in sources."readable-stream-2.3.7" sources."readdirp-3.6.0" sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-8.2.0" + sources."regenerate-unicode-properties-9.0.0" sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.14.5" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.3.1" - sources."regexpu-core-4.7.1" + sources."regexpu-core-4.8.0" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.9" // { + (sources."regjsparser-0.7.0" // { dependencies = [ sources."jsesc-0.5.0" ]; @@ -109957,7 +112051,7 @@ in sources."dom-serializer-1.3.2" sources."domelementtype-2.2.0" sources."domutils-2.8.0" - sources."nth-check-2.0.0" + sources."nth-check-2.0.1" sources."strip-ansi-3.0.1" ]; }) @@ -110050,7 +112144,7 @@ in sources."shebang-regex-1.0.0" sources."shorthash-0.0.2" sources."side-channel-1.0.4" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" (sources."simple-swizzle-0.2.2" // { dependencies = [ sources."is-arrayish-0.3.2" @@ -110247,10 +112341,10 @@ in }) sources."unbox-primitive-1.0.1" sources."unbzip2-stream-1.4.3" - sources."unicode-canonical-property-names-ecmascript-1.0.4" - sources."unicode-match-property-ecmascript-1.0.4" - sources."unicode-match-property-value-ecmascript-1.2.0" - sources."unicode-property-aliases-ecmascript-1.1.0" + sources."unicode-canonical-property-names-ecmascript-2.0.0" + sources."unicode-match-property-ecmascript-2.0.0" + sources."unicode-match-property-value-ecmascript-2.0.0" + sources."unicode-property-aliases-ecmascript-2.0.0" sources."union-value-1.0.1" sources."uniq-1.0.1" sources."uniqs-2.0.0" @@ -110487,7 +112581,7 @@ in }) sources."acorn-walk-7.2.0" sources."agent-base-6.0.2" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."asynckit-0.4.0" sources."browser-process-hrtime-1.0.0" @@ -110511,7 +112605,7 @@ in sources."webidl-conversions-5.0.0" ]; }) - sources."dompurify-2.3.1" + sources."dompurify-2.3.3" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" sources."escodegen-2.0.0" @@ -110543,8 +112637,8 @@ in sources."safer-buffer-2.1.2" sources."saxes-5.0.1" sources."source-map-0.6.1" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."symbol-tree-3.2.4" sources."tough-cookie-4.0.0" sources."tr46-2.1.0" @@ -110562,7 +112656,7 @@ in sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" - sources."yargs-17.1.1" + sources."yargs-17.2.0" sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; @@ -110596,28 +112690,28 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-module-imports-7.15.4" sources."@babel/helper-split-export-declaration-7.15.4" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/highlight-7.14.5" - sources."@babel/parser-7.15.5" + sources."@babel/parser-7.15.7" sources."@babel/runtime-7.15.4" sources."@babel/template-7.15.4" sources."@babel/traverse-7.15.4" - sources."@babel/types-7.15.4" + sources."@babel/types-7.15.6" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" - sources."@exodus/schemasafe-1.0.0-rc.4" + sources."@exodus/schemasafe-1.0.0-rc.6" sources."@redocly/ajv-8.6.2" - (sources."@redocly/openapi-core-1.0.0-beta.58" // { + (sources."@redocly/openapi-core-1.0.0-beta.61" // { dependencies = [ - sources."@types/node-14.17.15" + sources."@types/node-14.17.18" ]; }) sources."@redocly/react-dropdown-aria-2.0.12" sources."@types/json-schema-7.0.9" sources."@types/node-15.14.9" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" sources."argparse-1.0.10" @@ -110692,7 +112786,7 @@ in ]; }) sources."domain-browser-1.2.0" - sources."dompurify-2.3.1" + sources."dompurify-2.3.3" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -110769,7 +112863,7 @@ in sources."mobx-react-lite-3.2.1" sources."ms-2.1.2" sources."neo-async-2.6.2" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" sources."node-fetch-h2-2.3.0" sources."node-libs-browser-2.2.1" sources."node-readfiles-0.2.0" @@ -110790,7 +112884,7 @@ in sources."picomatch-2.3.0" sources."polished-4.1.3" sources."postcss-value-parser-4.1.0" - sources."prismjs-1.24.1" + sources."prismjs-1.25.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."prop-types-15.7.2" @@ -110845,9 +112939,9 @@ in sources."stickyfill-1.1.1" sources."stream-browserify-2.0.2" sources."stream-http-2.8.3" - sources."string-width-4.2.2" + sources."string-width-4.2.3" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."styled-components-5.3.1" sources."supports-color-5.5.0" sources."swagger2openapi-7.0.8" @@ -110855,6 +112949,7 @@ in sources."to-arraybuffer-1.0.1" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" + sources."tr46-0.0.3" sources."tty-browserify-0.0.0" sources."uglify-js-3.14.2" (sources."uri-js-4.4.1" // { @@ -110875,6 +112970,8 @@ in }) sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.2" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."wordwrap-1.0.0" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -110887,7 +112984,7 @@ in sources."y18n-5.0.8" sources."yaml-1.10.2" sources."yaml-ast-parser-0.0.43" - sources."yargs-17.1.1" + sources."yargs-17.2.0" sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; @@ -110911,7 +113008,7 @@ in dependencies = [ sources."@types/yoga-layout-1.9.2" sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."array-find-index-1.0.2" sources."arrify-2.0.1" @@ -111005,7 +113102,7 @@ in sources."restore-cursor-3.1.0" sources."scheduler-0.18.0" sources."semver-5.7.1" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."slice-ansi-3.0.0" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" @@ -111018,8 +113115,8 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."strip-bom-3.0.0" sources."strip-indent-2.0.0" sources."supports-color-7.2.0" @@ -111071,7 +113168,7 @@ in sources."brace-expansion-1.1.11" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."minimatch-3.0.4" @@ -111092,10 +113189,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.56.3"; + version = "2.57.0"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.56.3.tgz"; - sha512 = "Au92NuznFklgQCUcV96iXlxUbHuB1vQMaH76DHl5M11TotjOHwqk9CwcrT78+Tnv4FN9uTBxq6p4EJoYkpyekg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.57.0.tgz"; + sha512 = "bKQIh1rWKofRee6mv8SrF2HdP6pea5QkwBZSMImJysFj39gQuiV8MEPBjXOCpzk3wSYp63M2v2wkWBmFC8O/rg=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -111113,11 +113210,11 @@ in "rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps" = nodeEnv.buildNodePackage { name = "rust-analyzer"; packageName = "rust-analyzer"; - version = "0.2.735"; + version = "0.2.751"; src = ../../misc/vscode-extensions/rust-analyzer/build-deps; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -111140,23 +113237,23 @@ in sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" sources."@types/mocha-8.2.3" - sources."@types/node-14.17.15" + sources."@types/node-14.17.18" sources."@types/node-fetch-2.5.12" sources."@types/vscode-1.60.0" - sources."@typescript-eslint/eslint-plugin-4.31.0" - sources."@typescript-eslint/experimental-utils-4.31.0" - sources."@typescript-eslint/parser-4.31.0" - sources."@typescript-eslint/scope-manager-4.31.0" - sources."@typescript-eslint/types-4.31.0" - sources."@typescript-eslint/typescript-estree-4.31.0" - sources."@typescript-eslint/visitor-keys-4.31.0" + sources."@typescript-eslint/eslint-plugin-4.31.2" + sources."@typescript-eslint/experimental-utils-4.31.2" + sources."@typescript-eslint/parser-4.31.2" + sources."@typescript-eslint/scope-manager-4.31.2" + sources."@typescript-eslint/types-4.31.2" + sources."@typescript-eslint/typescript-estree-4.31.2" + sources."@typescript-eslint/visitor-keys-4.31.2" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" sources."agent-base-6.0.2" sources."ajv-6.12.6" sources."ansi-colors-4.1.1" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" sources."argparse-1.0.10" @@ -111165,7 +113262,7 @@ in sources."asynckit-0.4.0" sources."azure-devops-node-api-11.0.1" sources."balanced-match-1.0.2" - sources."big-integer-1.6.48" + sources."big-integer-1.6.49" sources."binary-0.3.0" sources."binary-extensions-2.2.0" sources."bluebird-3.4.7" @@ -111203,8 +113300,8 @@ in sources."cross-spawn-7.0.3" sources."css-select-4.1.3" sources."css-what-5.0.1" - sources."d3-7.0.1" - sources."d3-array-3.0.2" + sources."d3-7.0.3" + sources."d3-array-3.0.4" sources."d3-axis-3.0.0" sources."d3-brush-3.0.0" sources."d3-chord-3.0.1" @@ -111240,7 +113337,7 @@ in sources."d3-polygon-3.0.1" sources."d3-quadtree-3.0.1" sources."d3-random-3.0.1" - sources."d3-scale-4.0.0" + sources."d3-scale-4.0.1" sources."d3-scale-chromatic-3.0.0" sources."d3-selection-3.0.0" sources."d3-shape-3.0.1" @@ -111311,7 +113408,7 @@ in sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.12.0" + sources."fastq-1.13.0" sources."fd-slicer-1.1.0" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" @@ -111331,7 +113428,7 @@ in sources."functional-red-black-tree-1.0.1" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globals-13.11.0" sources."globby-11.0.4" @@ -111341,6 +113438,7 @@ in sources."has-flag-3.0.0" sources."has-symbols-1.0.2" sources."he-1.2.0" + sources."hosted-git-info-4.0.2" sources."htmlparser2-6.1.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" @@ -111350,7 +113448,7 @@ in sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."internmap-2.0.1" + sources."internmap-2.0.3" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -111397,6 +113495,7 @@ in sources."ms-2.1.2" ]; }) + sources."glob-7.1.7" sources."has-flag-4.0.0" sources."js-yaml-4.1.0" sources."ms-2.1.3" @@ -111407,9 +113506,9 @@ in sources."mute-stream-0.0.8" sources."nanoid-3.1.23" sources."natural-compare-1.4.0" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" sources."normalize-path-3.0.0" - sources."nth-check-2.0.0" + sources."nth-check-2.0.1" sources."object-inspect-1.11.0" sources."once-1.4.0" sources."optionator-0.9.1" @@ -111458,6 +113557,7 @@ in sources."rw-1.3.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" + sources."sax-1.2.4" sources."semver-7.3.5" sources."serialize-javascript-6.0.0" sources."setimmediate-1.0.5" @@ -111474,24 +113574,25 @@ in ]; }) sources."sprintf-js-1.0.3" - sources."string-width-4.2.2" + sources."string-width-4.2.3" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.6.2" + sources."ajv-8.6.3" sources."json-schema-traverse-1.0.0" ]; }) sources."text-table-0.2.0" sources."tmp-0.2.1" sources."to-regex-range-5.0.1" + sources."tr46-0.0.3" sources."traverse-0.3.9" sources."tslib-2.3.1" (sources."tsutils-3.21.0" // { @@ -111503,7 +113604,7 @@ in sources."type-check-0.4.0" sources."type-fest-0.20.2" sources."typed-rest-client-1.8.6" - sources."typescript-4.4.2" + sources."typescript-4.4.3" sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" sources."underscore-1.13.1" @@ -111512,7 +113613,7 @@ in sources."url-join-1.1.0" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" - (sources."vsce-1.97.0" // { + (sources."vsce-1.100.0" // { dependencies = [ sources."chalk-2.4.2" sources."commander-6.2.1" @@ -111525,6 +113626,8 @@ in sources."vscode-languageserver-protocol-3.17.0-next.6" sources."vscode-languageserver-types-3.17.0-next.2" sources."vscode-test-1.6.1" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-2.0.2" (sources."wide-align-1.1.3" // { dependencies = [ @@ -111544,6 +113647,8 @@ in ]; }) sources."wrappy-1.0.2" + sources."xml2js-0.4.23" + sources."xmlbuilder-11.0.1" sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-16.2.0" @@ -111605,7 +113710,7 @@ in sources."commander-1.3.2" ]; }) - sources."follow-redirects-1.14.3" + sources."follow-redirects-1.14.4" sources."formidable-1.0.11" sources."fresh-0.2.0" sources."function-bind-1.1.1" @@ -111627,7 +113732,7 @@ in sources."node-wsfederation-0.1.1" sources."oauth-https://github.com/ciaranj/node-oauth/tarball/master" sources."object-inspect-1.11.0" - (sources."openid-2.0.9" // { + (sources."openid-2.0.10" // { dependencies = [ sources."qs-6.10.1" ]; @@ -111659,10 +113764,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.39.0"; + version = "1.42.1"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.39.0.tgz"; - sha512 = "F4o+RhJkNOIG0b6QudYU8c78ZADKZjKDk5cyrf8XTKWfrgbtyVVXImFstJrc+1pkQDCggyidIOytq6gS4gCCZg=="; + url = "https://registry.npmjs.org/sass/-/sass-1.42.1.tgz"; + sha512 = "/zvGoN8B7dspKc5mC6HlaygyCBRvnyzzgD5khiaCfglWztY99cYoiTUksVx11NlnemrcfH5CEaCpsUKoW0cQqg=="; }; dependencies = [ sources."anymatch-3.1.2" @@ -111716,10 +113821,10 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "12.0.0"; + version = "12.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-12.0.0.tgz"; - sha512 = "BkTsETQYynAZ7rXX414kg4X6EvuZQS3UVs1NY0VQYdRHSTYWPYcH38nnDh48D0x6ONuislgjag8uKlU2gTBImA=="; + url = "https://registry.npmjs.org/serve/-/serve-12.0.1.tgz"; + sha512 = "CQ4ikLpxg/wmNM7yivulpS6fhjRiFG6OjmP8ty3/c1SBnSk23fpKmLAV4HboTA2KrZhkUPlDfjDhnRmAjQ5Phw=="; }; dependencies = [ sources."@zeit/schemas-2.6.0" @@ -111804,7 +113909,7 @@ in }) sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."strip-eof-1.0.0" @@ -111832,10 +113937,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.57.0"; + version = "2.59.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.57.0.tgz"; - sha512 = "/gLzaqdisNlymMiQJMkFoACy7NXkOd7E67sbcOrENXuVb48QAS4PTT8VPkMNu6eQonlphGagbKhpqVmKzHJDmQ=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.59.0.tgz"; + sha512 = "HXUhoIOn0UyeJvtDcCDDvsmJqohXL/I2y7qTufqyB/1kpya0abW/OQ/Ox2HUtYR2dnw8xY8zJV3RSduYS5hg9A=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -111868,14 +113973,14 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.17.0" // { + (sources."@serverless/components-3.17.1" // { dependencies = [ (sources."@serverless/utils-4.1.0" // { dependencies = [ sources."js-yaml-4.1.0" ]; }) - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."argparse-2.0.1" sources."dotenv-8.6.0" (sources."js-yaml-3.14.1" // { @@ -111884,7 +113989,7 @@ in ]; }) sources."ramda-0.27.1" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."write-file-atomic-3.0.3" ]; }) @@ -111903,16 +114008,15 @@ in sources."jwt-decode-2.2.0" ]; }) - (sources."@serverless/platform-client-china-2.2.6" // { + (sources."@serverless/platform-client-china-2.2.7" // { dependencies = [ sources."dotenv-8.6.0" sources."js-yaml-3.14.1" ]; }) sources."@serverless/template-1.1.4" - (sources."@serverless/utils-5.10.0" // { + (sources."@serverless/utils-5.16.0" // { dependencies = [ - sources."cli-progress-footer-2.0.0" sources."get-stream-6.0.1" sources."has-flag-4.0.0" sources."supports-color-8.1.1" @@ -111928,14 +114032,14 @@ in sources."@types/caseless-0.12.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/lodash-4.14.172" + sources."@types/lodash-4.14.173" sources."@types/long-4.0.1" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."@types/request-2.48.7" sources."@types/request-promise-native-1.0.18" sources."@types/responselike-1.0.0" sources."@types/tough-cookie-4.0.1" - sources."adm-zip-0.5.5" + sources."adm-zip-0.5.6" sources."after-0.8.2" (sources."agent-base-6.0.2" // { dependencies = [ @@ -111991,7 +114095,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.985.0" // { + (sources."aws-sdk-2.994.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -112026,12 +114130,12 @@ in }) sources."blob-0.0.5" sources."bluebird-3.7.2" - (sources."boxen-5.0.1" // { + (sources."boxen-5.1.2" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."type-fest-0.20.2" ]; }) @@ -112081,13 +114185,7 @@ in ]; }) sources."cli-cursor-3.1.0" - (sources."cli-progress-footer-1.1.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."cli-color-1.4.0" - sources."process-utils-2.6.0" - ]; - }) + sources."cli-progress-footer-2.1.1" (sources."cli-sprintf-format-1.1.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -112132,7 +114230,7 @@ in ]; }) sources."dashdash-1.14.1" - sources."dayjs-1.10.6" + sources."dayjs-1.10.7" sources."debug-2.6.9" (sources."decompress-4.2.1" // { dependencies = [ @@ -112211,7 +114309,7 @@ in sources."events-1.1.1" sources."exit-on-epipe-1.0.1" sources."expand-template-2.0.3" - sources."ext-1.5.0" + sources."ext-1.6.0" sources."ext-list-2.2.2" sources."ext-name-5.0.0" sources."extend-3.0.2" @@ -112220,9 +114318,8 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fast-safe-stringify-2.1.1" sources."fastest-levenshtein-1.0.12" - sources."fastq-1.12.0" + sources."fastq-1.13.0" sources."fd-slicer-1.1.0" sources."fecha-4.2.1" sources."figures-3.2.0" @@ -112230,11 +114327,11 @@ in sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.3.0" - sources."filesize-8.0.0" + sources."filesize-8.0.3" sources."fill-range-7.0.1" sources."find-requires-1.0.0" sources."flat-5.0.2" - sources."follow-redirects-1.14.3" + sources."follow-redirects-1.14.4" sources."forever-agent-0.6.1" sources."form-data-2.5.1" sources."formidable-1.2.2" @@ -112259,12 +114356,12 @@ in sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."github-from-package-0.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globby-11.0.4" (sources."got-11.8.2" // { dependencies = [ - sources."@sindresorhus/is-4.0.1" + sources."@sindresorhus/is-4.2.0" sources."@szmarczak/http-timer-4.0.6" sources."cacheable-request-7.0.2" sources."decompress-response-6.0.0" @@ -112312,10 +114409,10 @@ in sources."ini-1.3.8" (sources."inquirer-7.3.3" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."inquirer-autocomplete-prompt-1.4.0" @@ -112385,14 +114482,14 @@ in sources."lodash.flatten-4.4.0" sources."lodash.isplainobject-4.0.6" sources."lodash.union-4.6.0" - sources."log-6.1.0" - (sources."log-node-8.0.0" // { + sources."log-6.2.0" + (sources."log-node-8.0.1" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-8.1.1" ]; }) - (sources."logform-2.2.0" // { + (sources."logform-2.3.0" // { dependencies = [ sources."ms-2.1.3" ]; @@ -112422,7 +114519,7 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."minipass-3.1.3" + sources."minipass-3.1.5" sources."minizlib-2.1.2" sources."mkdirp-0.5.5" sources."ms-2.0.0" @@ -112441,7 +114538,7 @@ in ]; }) sources."node-dir-0.1.17" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" sources."noop-logger-0.1.1" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" @@ -112533,6 +114630,7 @@ in sources."run-parallel-limit-1.1.0" sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" + sources."safe-stable-stringify-1.1.1" sources."safer-buffer-2.1.2" sources."sax-1.2.1" sources."seek-bzip-1.0.6" @@ -112542,7 +114640,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shortid-2.2.16" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" (sources."simple-git-2.45.1" // { @@ -112649,6 +114747,7 @@ in sources."to-regex-range-5.0.1" sources."token-types-4.1.1" sources."tough-cookie-2.5.0" + sources."tr46-0.0.3" sources."traverse-0.6.6" sources."trim-repeated-1.0.0" sources."triple-beam-1.3.0" @@ -112674,15 +114773,17 @@ in sources."util-deprecate-1.0.2" sources."uuid-8.3.2" sources."verror-1.10.0" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."which-pm-runs-1.0.0" sources."wide-align-1.1.3" (sources."widest-line-3.1.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."winston-3.2.1" @@ -112695,13 +114796,13 @@ in }) (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" @@ -113359,10 +115460,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.704.0"; + version = "1.720.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.704.0.tgz"; - sha512 = "vYt8Zp2O5Rce//JAqkivWKTSEGvSIvFMEPy6UM2tCUfRoQdk+398YP0l1yLsGfu8in4Q9A7H+Vy3om4fcFliYQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.720.0.tgz"; + sha512 = "NCy+57lvoggyM4WIzsNQyf2+fX6eZAqu2nznGq+RVfYBcwLgiDpg76oafrmp/rUtSIM1E+68cm1bJWSiNZqf7w=="; }; buildInputs = globalBuildInputs; meta = { @@ -113386,7 +115487,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -113549,7 +115650,7 @@ in sources."semver-diff-2.1.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -113642,7 +115743,7 @@ in sources."array-unique-0.2.1" sources."arrify-1.0.1" sources."assign-symbols-1.0.0" - (sources."async-append-only-log-3.0.9" // { + (sources."async-append-only-log-3.1.0" // { dependencies = [ sources."push-stream-11.0.1" ]; @@ -113949,7 +116050,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - (sources."jitdb-3.3.0" // { + (sources."jitdb-3.4.0" // { dependencies = [ sources."mkdirp-1.0.4" sources."push-stream-11.0.1" @@ -114044,7 +116145,7 @@ in sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-bindgen-loader-1.0.1" - sources."node-gyp-build-4.2.3" + sources."node-gyp-build-4.3.0" sources."non-private-ip-1.4.4" sources."normalize-path-2.1.1" sources."normalize-uri-1.1.3" @@ -114281,7 +116382,7 @@ in sources."right-pad-1.0.1" (sources."rimraf-2.7.1" // { dependencies = [ - sources."glob-7.1.7" + sources."glob-7.2.0" ]; }) sources."rng-0.2.2" @@ -114358,7 +116459,7 @@ in sources."ssb-client-4.9.0" sources."ssb-config-3.4.5" sources."ssb-db-19.2.0" - (sources."ssb-db2-2.4.0" // { + (sources."ssb-db2-2.6.0" // { dependencies = [ sources."abstract-leveldown-6.2.3" (sources."flumecodec-0.0.1" // { @@ -114366,7 +116467,7 @@ in sources."level-codec-6.2.0" ]; }) - sources."glob-7.1.7" + sources."glob-7.2.0" sources."level-6.0.1" sources."level-js-5.0.2" sources."mkdirp-1.0.4" @@ -114626,7 +116727,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.985.0" // { + (sources."aws-sdk-2.994.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -114811,7 +116912,7 @@ in sources."fd-slicer-1.1.0" sources."finalhandler-1.1.2" sources."find-up-3.0.0" - sources."follow-redirects-1.14.3" + sources."follow-redirects-1.14.4" sources."forever-agent-0.6.1" sources."form-data-2.1.4" sources."formidable-1.2.2" @@ -115017,7 +117118,7 @@ in sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" - (sources."openid-2.0.9" // { + (sources."openid-2.0.10" // { dependencies = [ sources."qs-6.10.1" ]; @@ -115160,7 +117261,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."slash-1.0.0" sources."sntp-1.0.9" (sources."socket.io-2.4.1" // { @@ -115253,7 +117354,7 @@ in sources."switchback-2.0.5" (sources."temp-0.8.4" // { dependencies = [ - sources."glob-7.1.7" + sources."glob-7.2.0" sources."rimraf-2.6.3" ]; }) @@ -115419,12 +117520,12 @@ in sources."@babel/helper-hoist-variables-7.15.4" sources."@babel/helper-member-expression-to-functions-7.15.4" sources."@babel/helper-module-imports-7.15.4" - sources."@babel/helper-module-transforms-7.15.4" + sources."@babel/helper-module-transforms-7.15.7" sources."@babel/helper-optimise-call-expression-7.15.4" sources."@babel/helper-replace-supers-7.15.4" sources."@babel/helper-simple-access-7.15.4" sources."@babel/helper-split-export-declaration-7.15.4" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/helper-validator-option-7.14.5" sources."@babel/helpers-7.15.4" (sources."@babel/highlight-7.14.5" // { @@ -115432,10 +117533,10 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.15.5" + sources."@babel/parser-7.15.7" sources."@babel/template-7.15.4" sources."@babel/traverse-7.15.4" - sources."@babel/types-7.15.4" + sources."@babel/types-7.15.6" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -115446,8 +117547,8 @@ in sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.6" - sources."ajv-8.6.2" - sources."ansi-regex-5.0.0" + sources."ajv-8.6.3" + sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" sources."arrify-1.0.1" @@ -115461,11 +117562,11 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.17.0" + sources."browserslist-4.17.1" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001255" + sources."caniuse-lite-1.0.30001260" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -115503,7 +117604,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.833" + sources."electron-to-chromium-1.3.849" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -115514,7 +117615,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fastest-levenshtein-1.0.12" - sources."fastq-1.12.0" + sources."fastq-1.13.0" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" sources."find-up-4.1.0" @@ -115524,7 +117625,7 @@ in sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" sources."get-stdin-8.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."global-modules-2.0.0" sources."global-prefix-3.0.0" @@ -115581,7 +117682,7 @@ in sources."log-symbols-4.1.0" sources."longest-streak-2.0.4" sources."lru-cache-6.0.0" - sources."map-obj-4.2.1" + sources."map-obj-4.3.0" sources."mathml-tag-names-2.1.3" sources."mdast-util-from-markdown-0.8.5" sources."mdast-util-to-markdown-0.6.5" @@ -115599,7 +117700,8 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-1.1.75" + sources."nanocolors-0.1.12" + sources."node-releases-1.1.76" (sources."normalize-package-data-3.0.3" // { dependencies = [ sources."semver-7.3.5" @@ -115671,7 +117773,7 @@ in sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."semver-6.3.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."slash-3.0.0" (sources."slice-ansi-4.0.0" // { dependencies = [ @@ -115686,13 +117788,13 @@ in sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.10" sources."specificity-0.4.1" - sources."string-width-4.2.2" + sources."string-width-4.2.3" (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.1" ]; }) - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-indent-3.0.0" sources."style-search-0.1.0" sources."sugarss-2.0.0" @@ -115736,13 +117838,16 @@ in svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; - version = "2.2.5"; + version = "2.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.2.5.tgz"; - sha512 = "EstDoqxjqWStWELh7Z0qytqUDl/ikdNEr21dveNc4fUDnhnqO2F2jHEufqoNnC3GfBji3GIUHvoXsp/I5lMbCg=="; + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.2.6.tgz"; + sha512 = "oJux/afbmcZO+N+ADXB88h6XANLie8Y2rh2qBlhgfkpr2c3t/q/T0w2JWrHqagaDL8zeNwO8a8RVFBkrRox8gg=="; }; dependencies = [ - sources."@types/node-16.9.0" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + sources."@types/node-16.9.6" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."ansi-styles-4.3.0" @@ -115760,10 +117865,12 @@ in sources."concat-map-0.0.1" sources."detect-indent-6.1.0" sources."es6-promise-3.3.1" + sources."fast-glob-3.2.7" + sources."fastq-1.13.0" sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" @@ -115775,19 +117882,24 @@ in sources."is-glob-4.0.1" sources."is-number-7.0.0" sources."magic-string-0.25.7" + sources."merge2-1.4.1" + sources."micromatch-4.0.4" sources."min-indent-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - sources."mri-1.1.6" + sources."mri-1.2.0" sources."normalize-path-3.0.0" sources."once-1.4.0" sources."parent-module-1.0.1" sources."path-is-absolute-1.0.1" sources."picomatch-2.3.0" + sources."queue-microtask-1.2.3" sources."readdirp-3.6.0" sources."resolve-from-4.0.0" + sources."reusify-1.0.4" sources."rimraf-2.7.1" + sources."run-parallel-1.2.0" sources."sade-1.7.4" sources."sander-0.5.1" sources."sorcery-0.10.0" @@ -115795,9 +117907,9 @@ in sources."sourcemap-codec-1.4.8" sources."strip-indent-3.0.0" sources."supports-color-7.2.0" - sources."svelte-preprocess-4.9.4" + sources."svelte-preprocess-4.9.5" sources."to-regex-range-5.0.1" - sources."typescript-4.4.2" + sources."typescript-4.4.3" sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; @@ -115813,36 +117925,34 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.14.7"; + version = "0.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.7.tgz"; - sha512 = "GuqBLvHE41ZB6G4EPhUeShDGav4k5TdMmNXk8j1fXGZSrwW+3Q7WmCNMqqeQgrNNtOg1UCUUx7XEjrvPu7RqDg=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.8.tgz"; + sha512 = "0Q05fnhAZ4YlHNC2WAcUO2DXv+YhavU1Vbz8pNq/qUbHYgFzQe4yRPEfTNhBvnWtpVAQsfFk/kwgKQj13MwOxQ=="; }; dependencies = [ sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-16.9.0" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + sources."@types/node-16.9.6" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."anymatch-3.1.2" - sources."balanced-match-1.0.2" sources."binary-extensions-2.2.0" - sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."chokidar-3.5.2" - sources."concat-map-0.0.1" sources."dedent-js-1.0.1" sources."detect-indent-6.1.0" sources."emmet-2.3.4" sources."estree-walker-2.0.2" + sources."fast-glob-3.2.7" + sources."fastq-1.13.0" sources."fill-range-7.0.1" - sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" - sources."glob-7.1.7" sources."glob-parent-5.1.2" - sources."inflight-1.0.6" - sources."inherits-2.0.4" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" @@ -115850,25 +117960,27 @@ in sources."jsonc-parser-2.3.1" sources."lodash-4.17.21" sources."lower-case-2.0.2" + sources."merge2-1.4.1" + sources."micromatch-4.0.4" sources."min-indent-1.0.1" - sources."minimatch-3.0.4" sources."no-case-3.0.4" sources."normalize-path-3.0.0" - sources."once-1.4.0" sources."pascal-case-3.1.2" - sources."path-is-absolute-1.0.1" sources."picomatch-2.3.0" - sources."prettier-2.3.0" - sources."prettier-plugin-svelte-2.3.1" + sources."prettier-2.3.2" + sources."prettier-plugin-svelte-2.4.0" + sources."queue-microtask-1.2.3" sources."readdirp-3.6.0" + sources."reusify-1.0.4" + sources."run-parallel-1.2.0" sources."source-map-0.7.3" sources."strip-indent-3.0.0" sources."svelte-3.38.3" sources."svelte-preprocess-4.7.4" - sources."svelte2tsx-0.4.5" + sources."svelte2tsx-0.4.6" sources."to-regex-range-5.0.1" sources."tslib-2.3.1" - sources."typescript-4.4.2" + sources."typescript-4.4.3" sources."vscode-css-languageservice-5.0.0" sources."vscode-emmet-helper-2.1.2" sources."vscode-html-languageservice-4.0.0" @@ -115883,7 +117995,6 @@ in sources."vscode-languageserver-types-3.16.0" sources."vscode-nls-5.0.0" sources."vscode-uri-2.1.2" - sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -115898,15 +118009,14 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "2.5.0"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-2.5.0.tgz"; - sha512 = "FSdBOOo271VyF/qZnOn1PgwCdt1v4Dx0Sey+U1jgqm1vqRYjPGdip0RGrFW6ItwtkBB8rHgHk26dlVr0uCs82Q=="; + url = "https://registry.npmjs.org/svgo/-/svgo-2.7.0.tgz"; + sha512 = "aDLsGkre4fTDCWvolyW+fs8ZJFABpzLXbtdK1y71CKnHzAnpDxKXPj2mNKj+pyOXUCzFHzuxRJ94XOFygOWV3w=="; }; dependencies = [ - sources."@trysound/sax-0.1.1" + sources."@trysound/sax-0.2.0" sources."boolbase-1.0.0" - sources."colorette-1.4.0" sources."commander-7.2.0" sources."css-select-4.1.3" sources."css-tree-1.1.3" @@ -115918,7 +118028,8 @@ in sources."domutils-2.8.0" sources."entities-2.2.0" sources."mdn-data-2.0.14" - sources."nth-check-2.0.0" + sources."nanocolors-0.1.12" + sources."nth-check-2.0.1" sources."source-map-0.6.1" sources."stable-0.1.8" ]; @@ -116132,7 +118243,7 @@ in sources."get-intrinsic-1.1.1" sources."get-stream-3.0.0" sources."get-value-2.0.6" - sources."glob-7.1.7" + sources."glob-7.2.0" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -116404,7 +118515,7 @@ in sources."shebang-regex-1.0.0" sources."side-channel-1.0.4" sources."sigmund-1.0.1" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."slash-1.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -116643,7 +118754,7 @@ in sources."module-alias-2.2.2" sources."moment-2.29.1" sources."ms-2.1.2" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" sources."oauth-sign-0.9.0" sources."p-limit-2.3.0" sources."p-locate-3.0.0" @@ -116674,12 +118785,15 @@ in sources."strip-ansi-5.2.0" sources."telegraf-3.39.0" sources."tough-cookie-2.5.0" + sources."tr46-0.0.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-1.0.3" sources."typegram-3.4.3" sources."uri-js-4.4.1" sources."uuid-3.4.0" sources."verror-1.10.0" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-module-2.0.0" sources."wrap-ansi-5.1.0" sources."ws-6.2.2" @@ -116756,7 +118870,7 @@ in sources."safe-buffer-5.1.2" sources."semver-5.7.1" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."simple-concat-1.0.1" sources."simple-get-3.1.0" sources."string-width-1.0.2" @@ -116805,7 +118919,7 @@ in sources."enhanced-resolve-2.3.0" sources."errno-0.1.8" sources."fs.realpath-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -116838,10 +118952,10 @@ in terser = nodeEnv.buildNodePackage { name = "terser"; packageName = "terser"; - version = "5.7.2"; + version = "5.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.7.2.tgz"; - sha512 = "0Omye+RD4X7X69O0eql3lC4Heh/5iLj3ggxR/B5ketZLOtLiOqukUgjw3q4PDnNQbsrkKr3UMypqStQG3XKRvw=="; + url = "https://registry.npmjs.org/terser/-/terser-5.9.0.tgz"; + sha512 = "h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ=="; }; dependencies = [ sources."buffer-from-1.1.2" @@ -116891,7 +119005,7 @@ in sources."@textlint/utils-12.0.2" sources."@types/mdast-3.0.10" sources."@types/unist-2.0.6" - sources."ajv-8.6.2" + sources."ajv-8.6.3" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."argparse-1.0.10" @@ -116938,7 +119052,7 @@ in sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."get-stdin-5.0.1" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."has-1.0.3" sources."has-ansi-2.0.0" @@ -117066,9 +119180,9 @@ in sources."strip-ansi-3.0.1" ]; }) - (sources."strip-ansi-6.0.0" // { + (sources."strip-ansi-6.0.1" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" ]; }) sources."strip-bom-2.0.0" @@ -117077,7 +119191,7 @@ in (sources."table-6.7.1" // { dependencies = [ sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" + sources."string-width-4.2.3" ]; }) sources."text-table-0.2.0" @@ -117171,7 +119285,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/highlight-7.14.5" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" @@ -117282,7 +119396,7 @@ in }) sources."git-diff-tree-1.1.0" sources."git-spawned-stream-1.0.1" - sources."glob-7.1.7" + sources."glob-7.2.0" (sources."global-dirs-2.1.0" // { dependencies = [ sources."ini-1.3.7" @@ -117362,7 +119476,7 @@ in sources."semver-6.3.0" ]; }) - sources."map-obj-4.2.1" + sources."map-obj-4.3.0" sources."map-stream-0.1.0" sources."markdown-escapes-1.0.4" sources."mdast-comment-marker-1.1.2" @@ -117462,7 +119576,7 @@ in sources."semver-6.3.0" ]; }) - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."sliced-1.0.1" sources."space-separated-tokens-1.1.5" (sources."spawn-to-readstream-0.1.3" // { @@ -117488,12 +119602,12 @@ in sources."sprintf-js-1.0.3" sources."state-toggle-1.0.3" sources."stream-combiner-0.0.4" - (sources."string-width-4.2.2" // { + (sources."string-width-4.2.3" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."string_decoder-0.10.31" @@ -117989,7 +120103,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.3" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -118065,7 +120179,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.17.3" + sources."core-js-3.18.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -118140,7 +120254,7 @@ in sources."gauge-2.7.4" sources."get-stream-5.2.0" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."got-11.5.2" sources."graceful-fs-4.2.8" sources."grapheme-splitter-1.0.4" @@ -118332,7 +120446,7 @@ in sources."serve-static-1.14.1" sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" (sources."socket.io-2.3.0" // { dependencies = [ sources."debug-4.1.1" @@ -118507,7 +120621,7 @@ in sources."fs-extra-9.0.1" sources."fs.realpath-1.0.0" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."har-schema-2.0.0" sources."har-validator-5.1.5" @@ -118804,7 +120918,7 @@ in sources."diff-2.2.3" sources."escape-string-regexp-1.0.5" sources."fs.realpath-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."has-ansi-2.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -118856,10 +120970,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "4.4.2"; + version = "4.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.4.2.tgz"; - sha512 = "gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz"; + sha512 = "4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA=="; }; buildInputs = globalBuildInputs; meta = { @@ -118896,11 +121010,11 @@ in sources."del-6.0.0" sources."dir-glob-3.0.1" sources."fast-glob-3.2.7" - sources."fastq-1.12.0" + sources."fastq-1.13.0" sources."fill-range-7.0.1" sources."fs-extra-10.0.0" sources."fs.realpath-1.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globby-11.0.4" sources."graceful-fs-4.2.8" @@ -119004,10 +121118,10 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-14.17.15" + sources."@types/node-14.17.18" sources."abbrev-1.1.1" sources."accepts-1.3.7" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" (sources."ansi-styles-4.3.0" // { dependencies = [ sources."color-convert-2.0.1" @@ -119085,7 +121199,6 @@ in sources."safe-buffer-5.2.1" ]; }) - sources."fast-safe-stringify-2.1.1" sources."fecha-4.2.1" sources."finalhandler-1.1.2" sources."fn.name-1.1.0" @@ -119095,7 +121208,7 @@ in sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" sources."getmac-5.17.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."got-9.6.0" sources."hasher-1.2.0" (sources."hogan.js-3.0.2" // { @@ -119127,7 +121240,7 @@ in sources."latest-version-5.1.0" sources."locks-0.2.2" sources."lodash-4.17.21" - (sources."logform-2.2.0" // { + (sources."logform-2.3.0" // { dependencies = [ sources."ms-2.1.3" ]; @@ -119194,6 +121307,7 @@ in sources."responselike-1.0.2" sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" + sources."safe-stable-stringify-1.1.1" sources."safer-buffer-2.1.2" (sources."semver-7.3.5" // { dependencies = [ @@ -119226,13 +121340,13 @@ in }) sources."stack-trace-0.0.10" sources."statuses-1.5.0" - sources."string-width-4.2.2" + sources."string-width-4.2.3" (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.1" ]; }) - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."strip-json-comments-2.0.1" (sources."temp-0.9.4" // { dependencies = [ @@ -119285,7 +121399,7 @@ in sha512 = "N+ENrder8z9zJQF9UM7K3/1LcfVW60omqeyaQsu6GN1BGdCgPm8gdHssn7WRD7vx+ABKc82IE1+pJyHOPkwe+w=="; }; dependencies = [ - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -119430,13 +121544,14 @@ in vega-cli = nodeEnv.buildNodePackage { name = "vega-cli"; packageName = "vega-cli"; - version = "5.20.2"; + version = "5.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.20.2.tgz"; - sha512 = "dp7CncooBn6zSacyoSRdlm+fS1mQ6PsCT2pFILUgsDzn3e/e56iQA2mjmob8DOqM1n/0xbVziVelH31M8fcYXw=="; + url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.21.0.tgz"; + sha512 = "UuxW79x2n0bYBexa3vblI2o4CPhIJTBGvA0remuNm74RjkjMkDHMXDriCs5sYQ7jYyekvROmvmC9t/Pn0g0+6Q=="; }; dependencies = [ sources."@mapbox/node-pre-gyp-1.0.5" + sources."@types/estree-0.0.50" sources."abbrev-1.1.1" sources."agent-base-6.0.2" sources."ansi-regex-2.1.1" @@ -119449,10 +121564,10 @@ in sources."chownr-2.0.0" (sources."cliui-7.0.4" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."code-point-at-1.1.0" @@ -119492,7 +121607,7 @@ in sources."function-bind-1.1.1" sources."gauge-2.7.4" sources."get-caller-file-2.0.5" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."has-1.0.3" sources."has-unicode-2.0.1" sources."https-proxy-agent-5.0.0" @@ -119511,12 +121626,12 @@ in }) sources."mimic-response-2.1.0" sources."minimatch-3.0.4" - sources."minipass-3.1.3" + sources."minipass-3.1.5" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."nan-2.15.0" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" sources."nopt-5.0.0" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -119534,7 +121649,7 @@ in sources."safer-buffer-2.1.2" sources."semver-7.3.5" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."simple-concat-1.0.1" sources."simple-get-3.1.0" sources."string-width-1.0.2" @@ -119542,55 +121657,58 @@ in sources."strip-ansi-3.0.1" sources."tar-6.1.11" sources."topojson-client-3.1.0" + sources."tr46-0.0.3" sources."util-deprecate-1.0.2" - sources."vega-5.20.2" + sources."vega-5.21.0" sources."vega-canvas-1.2.6" sources."vega-crossfilter-4.0.5" sources."vega-dataflow-5.7.4" sources."vega-encode-4.8.3" - sources."vega-event-selector-2.0.6" - sources."vega-expression-4.0.1" + sources."vega-event-selector-3.0.0" + sources."vega-expression-5.0.0" sources."vega-force-4.0.7" sources."vega-format-1.0.4" - sources."vega-functions-5.12.0" + sources."vega-functions-5.12.1" sources."vega-geo-4.3.8" sources."vega-hierarchy-4.0.9" - sources."vega-label-1.0.0" - sources."vega-loader-4.4.0" - sources."vega-parser-6.1.3" + sources."vega-label-1.1.0" + sources."vega-loader-4.4.1" + sources."vega-parser-6.1.4" sources."vega-projection-1.4.5" sources."vega-regression-1.0.9" sources."vega-runtime-6.1.3" sources."vega-scale-7.1.1" sources."vega-scenegraph-4.9.4" - sources."vega-selections-5.3.0" - sources."vega-statistics-1.7.9" + sources."vega-selections-5.3.1" + sources."vega-statistics-1.7.10" sources."vega-time-2.0.4" sources."vega-transforms-4.9.4" - sources."vega-typings-0.21.0" - sources."vega-util-1.16.1" + sources."vega-typings-0.22.0" + sources."vega-util-1.17.0" sources."vega-view-5.10.1" sources."vega-view-transforms-4.5.8" sources."vega-voronoi-4.1.5" sources."vega-wordcloud-4.1.3" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."wide-align-1.1.3" (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" sources."y18n-5.0.8" sources."yallist-4.0.0" - (sources."yargs-16.2.0" // { + (sources."yargs-17.2.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."yargs-parser-20.2.9" @@ -119615,7 +121733,7 @@ in }; dependencies = [ sources."@types/clone-2.1.1" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."array-flat-polyfill-1.0.1" sources."cliui-7.0.4" @@ -119630,8 +121748,8 @@ in sources."is-fullwidth-code-point-3.0.0" sources."json-stringify-pretty-compact-3.0.0" sources."require-directory-2.1.1" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."tslib-2.3.1" sources."vega-event-selector-2.0.6" sources."vega-expression-4.0.1" @@ -119662,7 +121780,7 @@ in dependencies = [ sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."@vercel/build-utils-2.12.2" sources."@vercel/go-1.2.3" sources."@vercel/node-1.12.1" @@ -119741,15 +121859,15 @@ in sources."responselike-1.0.2" sources."semver-6.3.0" sources."semver-diff-3.1.1" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."source-map-0.6.1" sources."source-map-support-0.5.20" - (sources."string-width-4.2.2" // { + (sources."string-width-4.2.3" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."strip-ansi-5.2.0" @@ -119808,7 +121926,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."chalk-2.4.2" @@ -119822,7 +121940,7 @@ in sources."acorn-jsx-5.3.2" sources."ajv-6.12.6" sources."ansi-colors-4.1.1" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."astral-regex-2.0.0" @@ -119852,7 +121970,7 @@ in sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" sources."eslint-7.32.0" - (sources."eslint-plugin-vue-7.17.0" // { + (sources."eslint-plugin-vue-7.18.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -119891,7 +122009,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globals-13.11.0" sources."has-1.0.3" @@ -119928,7 +122046,7 @@ in sources."path-key-3.1.1" sources."path-parse-1.0.7" sources."prelude-ls-1.2.1" - sources."prettier-2.4.0" + sources."prettier-2.4.1" sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-3.2.0" @@ -119947,13 +122065,13 @@ in ]; }) sources."sprintf-js-1.0.3" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.6.2" + sources."ajv-8.6.3" sources."json-schema-traverse-1.0.0" ]; }) @@ -119969,7 +122087,7 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.4.2" + sources."typescript-4.4.3" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" (sources."vue-eslint-parser-7.11.0" // { @@ -120173,7 +122291,7 @@ in sources."vscode-nls-4.1.2" ]; }) - sources."typescript-4.4.2" + sources."typescript-4.4.3" sources."vscode-css-languageservice-5.1.5" sources."vscode-html-languageservice-4.0.8" sources."vscode-json-languageservice-4.1.7" @@ -120198,10 +122316,10 @@ in "vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage { name = "vscode-lldb"; packageName = "vscode-lldb"; - version = "1.6.5"; + version = "1.6.7"; src = ../../misc/vscode-extensions/vscode-lldb/build-deps; dependencies = [ - sources."@discoveryjs/json-ext-0.5.3" + sources."@discoveryjs/json-ext-0.5.5" sources."@types/eslint-7.28.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" @@ -120240,7 +122358,7 @@ in sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" sources."argparse-2.0.1" - sources."azure-devops-node-api-10.2.2" + sources."azure-devops-node-api-11.0.1" sources."balanced-match-1.0.2" sources."big.js-5.2.2" sources."binary-extensions-2.2.0" @@ -120248,12 +122366,12 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" - sources."browserslist-4.17.0" + sources."browserslist-4.17.1" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."call-bind-1.0.2" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001255" + sources."caniuse-lite-1.0.30001260" (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" @@ -120265,10 +122383,10 @@ in sources."chrome-trace-event-1.0.3" (sources."cliui-7.0.4" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."clone-deep-4.0.1" @@ -120293,10 +122411,10 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.2" sources."domutils-2.8.0" - sources."electron-to-chromium-1.3.833" + sources."electron-to-chromium-1.3.849" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" - sources."enhanced-resolve-5.8.2" + sources."enhanced-resolve-5.8.3" sources."entities-2.2.0" sources."envinfo-7.8.1" sources."errno-0.1.8" @@ -120334,6 +122452,7 @@ in sources."has-flag-4.0.0" sources."has-symbols-1.0.2" sources."he-1.2.0" + sources."hosted-git-info-4.0.2" sources."htmlparser2-6.1.0" sources."human-signals-2.1.0" sources."import-local-3.0.2" @@ -120352,7 +122471,7 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."jest-worker-27.1.1" + sources."jest-worker-27.2.0" sources."js-yaml-4.0.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" @@ -120393,12 +122512,13 @@ in sources."mocha-8.4.0" sources."ms-2.1.3" sources."mute-stream-0.0.8" + sources."nanocolors-0.1.12" sources."nanoid-3.1.20" sources."neo-async-2.6.2" - sources."node-releases-1.1.75" + sources."node-releases-1.1.76" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" - sources."nth-check-2.0.0" + sources."nth-check-2.0.1" sources."object-inspect-1.11.0" sources."once-1.4.0" sources."onetime-5.1.2" @@ -120438,7 +122558,9 @@ in sources."resolve-1.20.0" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" + sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" + sources."sax-1.2.4" sources."schema-utils-3.1.1" sources."semver-5.7.1" sources."serialize-javascript-5.0.1" @@ -120446,7 +122568,7 @@ in sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."source-map-0.6.1" sources."source-map-support-0.5.20" sources."sprintf-js-1.0.3" @@ -120457,8 +122579,8 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-8.1.1" - sources."tapable-2.2.0" - (sources."terser-5.7.2" // { + sources."tapable-2.2.1" + (sources."terser-5.9.0" // { dependencies = [ sources."commander-2.20.3" sources."source-map-0.7.3" @@ -120469,7 +122591,7 @@ in sources."serialize-javascript-6.0.0" ]; }) - sources."tmp-0.0.29" + sources."tmp-0.2.1" sources."to-regex-range-5.0.1" (sources."ts-loader-8.3.0" // { dependencies = [ @@ -120481,14 +122603,14 @@ in sources."tslib-2.3.1" sources."tunnel-0.0.6" sources."typed-rest-client-1.8.6" - sources."typescript-4.4.2" + sources."typescript-4.4.3" sources."uc.micro-1.0.6" sources."underscore-1.13.1" sources."uri-js-4.4.1" sources."url-join-1.1.0" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" - (sources."vsce-1.88.0" // { + (sources."vsce-1.100.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -120502,36 +122624,38 @@ in sources."vscode-debugadapter-testsupport-1.49.0" sources."vscode-debugprotocol-1.49.0" sources."watchpack-2.2.0" - sources."webpack-5.52.0" + sources."webpack-5.53.0" (sources."webpack-cli-4.8.0" // { dependencies = [ sources."commander-7.2.0" ]; }) sources."webpack-merge-5.8.0" - sources."webpack-sources-3.2.0" + sources."webpack-sources-3.2.1" sources."which-2.0.2" sources."wide-align-1.1.3" sources."wildcard-2.0.0" sources."workerpool-6.1.0" (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" + sources."xml2js-0.4.23" + sources."xmlbuilder-11.0.1" sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yaml-1.10.2" (sources."yargs-16.2.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."yargs-parser-20.2.4" @@ -120653,7 +122777,7 @@ in sources."get-stream-3.0.0" sources."getpass-0.1.7" sources."git-clone-0.1.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."got-6.7.1" sources."graceful-fs-4.2.8" sources."gray-matter-2.1.1" @@ -120763,7 +122887,7 @@ in sources."safer-buffer-2.1.2" sources."seek-bzip-1.0.6" sources."semver-5.7.1" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" @@ -120846,7 +122970,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.14.5" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" sources."@babel/highlight-7.14.5" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -120863,7 +122987,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -121148,7 +123272,7 @@ in sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" sources."get-value-2.0.6" - sources."glob-7.1.7" + sources."glob-7.2.0" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -121495,7 +123619,7 @@ in sources."shebang-regex-1.0.0" sources."shellsubstitute-1.2.0" sources."sigmund-1.0.1" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."slash-1.0.0" sources."slice-ansi-2.1.0" (sources."snapdragon-0.8.2" // { @@ -121704,11 +123828,11 @@ in sources."vfile-message-3.0.2" (sources."vfile-reporter-6.0.2" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."supports-color-6.1.0" sources."unist-util-stringify-position-2.0.3" ]; @@ -121786,7 +123910,7 @@ in sha512 = "uhSNGU27KDT2e2v51l/NqMc59O7X0DG7CHonZOwsnvMHLvyudCLZgXCU8Rw4T8gpqg2asn50vfPHq7l3DGlN5w=="; }; dependencies = [ - sources."@babel/runtime-corejs3-7.15.4" + sources."@babel/runtime-7.15.4" sources."@mapbox/node-pre-gyp-1.0.5" sources."@tootallnate/once-1.1.2" sources."@types/raf-3.4.0" @@ -121810,26 +123934,26 @@ in sources."balanced-match-1.0.2" (sources."bit-field-1.5.3" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."fs-extra-10.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" - sources."yargs-17.1.1" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + sources."yargs-17.2.0" ]; }) sources."brace-expansion-1.1.11" sources."browser-process-hrtime-1.0.0" sources."btoa-1.2.1" sources."canvas-2.8.0" - sources."canvg-3.0.7" + sources."canvg-3.0.8" sources."chownr-2.0.0" (sources."cliui-7.0.4" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."code-point-at-1.1.0" @@ -121838,7 +123962,7 @@ in sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."core-js-pure-3.17.3" + sources."core-js-3.18.0" sources."core-util-is-1.0.3" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { @@ -121846,7 +123970,13 @@ in sources."cssom-0.3.8" ]; }) - sources."data-urls-2.0.0" + (sources."data-urls-2.0.0" // { + dependencies = [ + sources."tr46-2.1.0" + sources."webidl-conversions-6.1.0" + sources."whatwg-url-8.7.0" + ]; + }) sources."debug-4.3.2" sources."decimal.js-10.3.1" sources."decompress-response-4.2.1" @@ -121872,7 +124002,7 @@ in sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."get-caller-file-2.0.5" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."has-unicode-2.0.1" sources."html-encoding-sniffer-2.0.1" @@ -121884,7 +124014,13 @@ in sources."is-fullwidth-code-point-1.0.0" sources."is-potential-custom-element-name-1.0.1" sources."isarray-1.0.0" - sources."jsdom-16.7.0" + (sources."jsdom-16.7.0" // { + dependencies = [ + sources."tr46-2.1.0" + sources."webidl-conversions-6.1.0" + sources."whatwg-url-8.7.0" + ]; + }) sources."json5-2.2.0" sources."jsonfile-6.1.0" sources."levn-0.3.0" @@ -121901,12 +124037,12 @@ in sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."minipass-3.1.3" + sources."minipass-3.1.5" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."nan-2.15.0" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" sources."nopt-5.0.0" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -121934,7 +124070,7 @@ in sources."saxes-5.0.1" sources."semver-7.3.5" sources."set-blocking-2.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."simple-concat-1.0.1" sources."simple-get-3.1.0" sources."source-map-0.6.1" @@ -121951,7 +124087,7 @@ in sources."universalify-0.1.2" ]; }) - sources."tr46-2.1.0" + sources."tr46-0.0.3" sources."tspan-0.4.0" sources."type-check-0.3.2" sources."universalify-2.0.0" @@ -121959,18 +124095,18 @@ in sources."w3c-hr-time-1.0.2" sources."w3c-xmlserializer-2.0.0" sources."wavedrom-2.8.1" - sources."webidl-conversions-6.1.0" + sources."webidl-conversions-3.0.1" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" - sources."whatwg-url-8.7.0" + sources."whatwg-url-5.0.0" sources."wide-align-1.1.3" sources."word-wrap-1.2.3" (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" @@ -121981,10 +124117,10 @@ in sources."yallist-4.0.0" (sources."yargs-16.2.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) sources."yargs-parser-20.2.9" @@ -122002,14 +124138,14 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-6.3.0.tgz"; - sha512 = "yMpSFUN6396oMs09zN+gqYM8gozfz932gduLdRCtspt16qt33c8p+7crGkHkAQmLRloMn2c4I/1RKgMq02Vnhg=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-6.4.0.tgz"; + sha512 = "M8NLCvgpPbJ9spQPlBjNmSEg674lC1SPI/X5UK0tJoz8mqvL70mFTEWrFcmgjDewzh+/DFNKiIOQFPg1UXjYDw=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.14.9" + sources."@babel/helper-validator-identifier-7.15.7" (sources."@babel/highlight-7.14.5" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -122040,21 +124176,21 @@ in ]; }) sources."@humanwhocodes/object-schema-1.2.0" - sources."@mdn/browser-compat-data-3.3.14" + sources."@mdn/browser-compat-data-4.0.2" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.9.0" - sources."@types/yauzl-2.9.1" + sources."@types/node-16.9.6" + sources."@types/yauzl-2.9.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" - (sources."addons-linter-3.12.0" // { + (sources."addons-linter-3.14.0" // { dependencies = [ - sources."yargs-17.1.0" + sources."yargs-17.1.1" ]; }) - sources."addons-scanner-utils-4.9.0" - sources."adm-zip-0.5.5" + sources."addons-scanner-utils-4.10.0" + sources."adm-zip-0.5.6" sources."ajv-6.12.6" sources."ajv-merge-patch-4.1.0" (sources."ansi-align-3.0.0" // { @@ -122090,7 +124226,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."bluebird-2.9.34" sources."boolbase-1.0.0" - sources."boxen-5.0.1" + sources."boxen-5.1.2" sources."brace-expansion-1.1.11" sources."buffer-crc32-0.2.13" sources."buffer-equal-constant-time-1.0.1" @@ -122113,8 +124249,8 @@ in sources."cli-boxes-2.2.1" (sources."cliui-7.0.4" // { dependencies = [ - sources."ansi-regex-5.0.0" - sources."strip-ansi-6.0.0" + sources."ansi-regex-5.0.1" + sources."strip-ansi-6.0.1" ]; }) sources."clone-1.0.4" @@ -122129,7 +124265,7 @@ in sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."configstore-5.0.1" - sources."core-js-3.16.0" + sources."core-js-3.17.2" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" @@ -122177,7 +124313,7 @@ in sources."escape-string-regexp-4.0.0" (sources."eslint-7.32.0" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."debug-4.3.2" sources."eslint-visitor-keys-2.1.0" (sources."espree-7.3.1" // { @@ -122186,7 +124322,7 @@ in ]; }) sources."ms-2.1.2" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."eslint-plugin-no-unsanitized-3.1.5" @@ -122229,6 +124365,7 @@ in sources."fast-levenshtein-2.0.6" sources."fast-redact-3.0.2" sources."fast-safe-stringify-2.1.1" + sources."fastify-warning-0.2.0" sources."fd-slicer-1.1.0" sources."file-entry-cache-6.0.1" (sources."firefox-profile-4.2.0" // { @@ -122406,7 +124543,7 @@ in }) sources."normalize-url-4.5.1" sources."npm-run-path-4.0.1" - sources."nth-check-2.0.0" + sources."nth-check-2.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-is-1.1.5" @@ -122434,7 +124571,7 @@ in sources."path-key-3.1.1" sources."pend-1.2.0" sources."performance-now-2.1.0" - sources."pino-6.13.0" + sources."pino-6.13.2" sources."pino-std-serializers-3.2.0" sources."postcss-8.3.6" sources."prelude-ls-1.2.1" @@ -122447,7 +124584,7 @@ in sources."pupa-2.1.1" sources."qs-6.5.2" sources."queue-6.0.2" - sources."quick-format-unescaped-4.0.3" + sources."quick-format-unescaped-4.0.4" (sources."rc-1.2.8" // { dependencies = [ sources."ini-1.3.8" @@ -122497,8 +124634,8 @@ in sources."shebang-regex-3.0.0" sources."shell-quote-1.6.1" sources."shellwords-0.1.1" - sources."sign-addon-3.7.0" - sources."signal-exit-3.0.3" + sources."sign-addon-3.8.0" + sources."signal-exit-3.0.4" sources."slice-ansi-4.0.0" sources."sonic-boom-1.4.1" sources."source-map-0.6.1" @@ -122510,10 +124647,10 @@ in sources."sshpk-1.16.1" sources."stream-to-array-2.3.0" sources."stream-to-promise-3.0.0" - (sources."string-width-4.2.2" // { + (sources."string-width-4.2.3" // { dependencies = [ - sources."ansi-regex-5.0.0" - sources."strip-ansi-6.0.0" + sources."ansi-regex-5.0.1" + sources."strip-ansi-6.0.1" ]; }) (sources."string_decoder-1.1.1" // { @@ -122530,10 +124667,10 @@ in sources."supports-color-7.2.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.6.2" - sources."ansi-regex-5.0.0" + sources."ajv-8.6.3" + sources."ansi-regex-5.0.1" sources."json-schema-traverse-1.0.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" ]; }) sources."text-table-0.2.0" @@ -122571,8 +124708,8 @@ in sources."word-wrap-1.2.3" (sources."wrap-ansi-7.0.0" // { dependencies = [ - sources."ansi-regex-5.0.0" - sources."strip-ansi-6.0.0" + sources."ansi-regex-5.0.1" + sources."strip-ansi-6.0.1" ]; }) sources."wrappy-1.0.2" @@ -122605,17 +124742,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.52.0"; + version = "5.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.52.0.tgz"; - sha512 = "yRZOat8jWGwBwHpco3uKQhVU7HYaNunZiJ4AkAVQkPCUGoZk/tiIXiwG+8HIy/F+qsiZvSOa+GLQOj3q5RKRYg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.53.0.tgz"; + sha512 = "RZ1Z3z3ni44snoWjfWeHFyzvd9HMVYDYC5VXmlYUT6NWgEOWdCNpad5Fve2CzzHoRED7WtsKe+FCyP5Vk4pWiQ=="; }; dependencies = [ sources."@types/eslint-7.28.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.9" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -122637,14 +124774,13 @@ in sources."acorn-import-assertions-1.7.6" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.17.0" + sources."browserslist-4.17.1" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001255" + sources."caniuse-lite-1.0.30001260" sources."chrome-trace-event-1.0.3" - sources."colorette-1.4.0" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.833" - sources."enhanced-resolve-5.8.2" + sources."electron-to-chromium-1.3.849" + sources."enhanced-resolve-5.8.3" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" @@ -122660,15 +124796,16 @@ in sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" - sources."jest-worker-27.1.1" + sources."jest-worker-27.2.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."loader-runner-4.2.0" sources."merge-stream-2.0.0" sources."mime-db-1.49.0" sources."mime-types-2.1.32" + sources."nanocolors-0.1.12" sources."neo-async-2.6.2" - sources."node-releases-1.1.75" + sources."node-releases-1.1.76" sources."p-limit-3.1.0" sources."punycode-2.1.1" sources."randombytes-2.1.0" @@ -122678,8 +124815,8 @@ in sources."source-map-0.6.1" sources."source-map-support-0.5.20" sources."supports-color-8.1.1" - sources."tapable-2.2.0" - (sources."terser-5.7.2" // { + sources."tapable-2.2.1" + (sources."terser-5.9.0" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -122687,7 +124824,7 @@ in sources."terser-webpack-plugin-5.2.4" sources."uri-js-4.4.1" sources."watchpack-2.2.0" - sources."webpack-sources-3.2.0" + sources."webpack-sources-3.2.1" sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; @@ -122709,7 +124846,7 @@ in sha512 = "+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw=="; }; dependencies = [ - sources."@discoveryjs/json-ext-0.5.3" + sources."@discoveryjs/json-ext-0.5.5" sources."@webpack-cli/configtest-1.0.4" sources."@webpack-cli/info-1.3.0" sources."@webpack-cli/serve-1.5.2" @@ -122752,7 +124889,7 @@ in sources."shallow-clone-3.0.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."strip-final-newline-2.0.0" sources."v8-compile-cache-2.3.0" sources."webpack-merge-5.8.0" @@ -122772,10 +124909,10 @@ in webpack-dev-server = nodeEnv.buildNodePackage { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "4.1.1"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.1.1.tgz"; - sha512 = "Kl1mnCEw8Cy1Kw173gCxLIB242LfPKEOj9WoKhKz/MbryZTNrILzOJTk8kiczw/YUEPzn3gcltCQv6hDsLudRg=="; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.2.1.tgz"; + sha512 = "SQrIyQDZsTaF84p/WMAXNRKxjTeIaewhDIiHYZ423ENhNAsQWyubvqPTn0IoLMGkbhWyWv8/GYnCjItt0ZNC5w=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -122783,14 +124920,14 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/http-proxy-1.17.7" sources."@types/json-schema-7.0.9" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."@types/retry-0.12.1" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."ansi-html-community-0.0.8" - sources."ansi-regex-6.0.0" + sources."ansi-regex-6.0.1" sources."anymatch-3.1.2" sources."array-flatten-2.1.2" sources."array-union-2.1.0" @@ -122858,11 +124995,11 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.12.0" + sources."fastq-1.13.0" sources."faye-websocket-0.11.4" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."follow-redirects-1.14.3" + sources."follow-redirects-1.14.4" sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs-monkey-1.0.3" @@ -122871,7 +125008,7 @@ in sources."function-bind-1.1.1" sources."get-intrinsic-1.1.1" sources."get-stream-6.0.1" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globby-11.0.4" sources."graceful-fs-4.2.8" @@ -122928,7 +125065,7 @@ in sources."json-schema-traverse-0.4.1" sources."lodash-4.17.21" sources."media-typer-0.3.0" - sources."memfs-3.2.4" + sources."memfs-3.3.0" sources."merge-descriptors-1.0.1" sources."merge-stream-2.0.0" sources."merge2-1.4.1" @@ -123019,7 +125156,7 @@ in sources."setprototypeof-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."slash-3.0.0" sources."sockjs-0.3.21" (sources."spdy-4.0.2" // { @@ -123040,7 +125177,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."strip-ansi-7.0.0" + sources."strip-ansi-7.0.1" sources."strip-final-newline-2.0.0" sources."thunky-1.1.0" sources."to-regex-range-5.0.1" @@ -123100,7 +125237,7 @@ in ]; }) sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.12.0" + sources."fastq-1.13.0" sources."fill-range-7.0.1" sources."glob-parent-6.0.1" sources."globby-11.0.4" @@ -123141,10 +125278,10 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "3.5.4"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.5.4.tgz"; - sha512 = "7YZv5fSs6tf0JPSQT5eT02t+IgZR7sHPGGSbT2ZmE4VO3X1a4WhSIP4tIpQCNxbzcKCCe6NFimpTxlxXNF/KEQ=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-4.0.0.tgz"; + sha512 = "WFs8PWeUO3ck41NVy/fBNiWcmtyrvIanwdZguh2V8Gn27VZSfzcuazFWsbW+t5oNTFk9ToMwD5+PhV7ImzS07Q=="; }; dependencies = [ sources."@leichtgewicht/ip-codec-2.0.3" @@ -123159,10 +125296,10 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -123223,7 +125360,7 @@ in sources."chrome-dgram-3.0.6" sources."chrome-dns-1.0.1" sources."chrome-net-3.3.4" - (sources."chromecasts-1.10.0" // { + (sources."chromecasts-1.10.1" // { dependencies = [ sources."mime-1.6.0" ]; @@ -123276,7 +125413,7 @@ in sources."get-browser-rtc-1.1.0" sources."get-caller-file-2.0.5" sources."get-stdin-8.0.0" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."has-flag-4.0.0" sources."he-1.2.0" sources."http-node-git://github.com/feross/http-node#webtorrent" @@ -123330,7 +125467,7 @@ in sources."mp4-box-encoding-1.4.1" sources."mp4-stream-3.1.3" sources."ms-2.0.0" - (sources."multicast-dns-7.2.3" // { + (sources."multicast-dns-git://github.com/webtorrent/multicast-dns.git#fix-setMulticastInterface" // { dependencies = [ sources."thunky-1.1.0" ]; @@ -123340,7 +125477,7 @@ in sources."netmask-2.0.2" sources."network-address-1.1.2" sources."next-event-1.0.0" - sources."node-gyp-build-4.2.3" + sources."node-gyp-build-4.3.0" sources."node-ssdp-2.9.1" sources."nodebmc-0.0.7" sources."on-finished-2.3.0" @@ -123415,11 +125552,11 @@ in sources."stream-to-blob-2.0.1" sources."stream-to-blob-url-3.0.2" sources."stream-with-known-length-to-buffer-1.0.4" - sources."streamx-2.11.1" - sources."string-width-4.2.2" + sources."streamx-2.11.2" + sources."string-width-4.2.3" sources."string2compact-1.3.2" sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."thirty-two-1.0.2" sources."through-2.3.8" @@ -123470,7 +125607,7 @@ in sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" sources."y18n-5.0.8" - sources."yargs-17.1.1" + sources."yargs-17.2.0" sources."yargs-parser-20.2.9" ]; buildInputs = globalBuildInputs; @@ -123581,7 +125718,7 @@ in sha512 = "tpNqBCpTXplnduzw5XC+FF8zNJ9L/UXmvQyyQj7NKrDNavbJtHvzmZplL5ES/RCnjX7JR7W9wz5GVDXVP3dHUQ=="; }; dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" @@ -123596,7 +125733,7 @@ in sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."graceful-fs-4.2.8" sources."has-flag-4.0.0" sources."ignore-5.1.8" @@ -123613,8 +125750,8 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."require-directory-2.1.1" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."universalify-0.1.2" sources."wrap-ansi-7.0.0" @@ -123820,14 +125957,14 @@ in sources."config-chain-1.1.13" sources."configstore-3.1.5" sources."console-control-strings-1.1.0" - sources."core-js-3.17.3" + sources."core-js-3.18.0" sources."core-util-is-1.0.3" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" sources."dashdash-1.14.1" - sources."dateformat-4.5.1" + sources."dateformat-4.6.3" sources."debug-2.6.9" sources."debuglog-1.0.1" sources."decamelize-1.2.0" @@ -123874,7 +126011,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.7" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.12.0" + sources."fastq-1.13.0" sources."figures-2.0.0" sources."filelist-1.0.2" sources."fill-range-7.0.1" @@ -123895,7 +126032,7 @@ in sources."get-stdin-4.0.1" sources."get-stream-4.1.0" sources."getpass-0.1.7" - sources."glob-7.1.7" + sources."glob-7.2.0" sources."glob-parent-5.1.2" (sources."global-agent-2.2.0" // { dependencies = [ @@ -124080,7 +126217,7 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."minipass-3.1.3" + sources."minipass-3.1.5" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" sources."minipass-flush-1.0.5" @@ -124162,7 +126299,7 @@ in sources."open-6.4.0" (sources."ora-5.4.1" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."chalk-4.1.2" sources."cli-cursor-3.1.0" @@ -124172,7 +126309,7 @@ in sources."log-symbols-4.1.0" sources."onetime-5.1.2" sources."restore-cursor-3.1.0" - sources."strip-ansi-6.0.0" + sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" ]; }) @@ -124327,11 +126464,11 @@ in sources."set-blocking-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."signal-exit-3.0.3" + sources."signal-exit-3.0.4" sources."slash-3.0.0" sources."smart-buffer-4.2.0" sources."socks-2.6.1" - (sources."socks-proxy-agent-6.0.0" // { + (sources."socks-proxy-agent-6.1.0" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -124471,7 +126608,7 @@ in sources."pify-2.3.0" ]; }) - sources."walk-2.3.14" + sources."walk-2.3.15" sources."walk-up-path-1.0.0" sources."wcwidth-1.0.1" sources."which-1.3.1" @@ -124531,7 +126668,7 @@ in }) sources."get-stream-6.0.1" sources."has-flag-4.0.0" - sources."inquirer-8.1.2" + sources."inquirer-8.1.5" sources."is-fullwidth-code-point-3.0.0" sources."is-stream-2.0.1" sources."locate-path-6.0.0" @@ -124550,10 +126687,10 @@ in sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."string-width-4.2.2" - (sources."strip-ansi-6.0.0" // { + sources."string-width-4.2.3" + (sources."strip-ansi-6.0.1" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" ]; }) sources."supports-color-7.2.0" @@ -124598,9 +126735,9 @@ in sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/fs-extra-9.0.12" + sources."@types/fs-extra-9.0.13" sources."@types/minimist-1.2.2" - sources."@types/node-16.9.0" + sources."@types/node-16.9.6" sources."@types/node-fetch-2.5.12" sources."ansi-styles-4.3.0" sources."array-union-3.0.1" @@ -124615,7 +126752,7 @@ in sources."duplexer-0.1.2" sources."event-stream-3.3.4" sources."fast-glob-3.2.7" - sources."fastq-1.12.0" + sources."fastq-1.13.0" sources."fill-range-7.0.1" sources."form-data-3.0.1" sources."from-0.1.7" @@ -124636,7 +126773,7 @@ in sources."mime-db-1.49.0" sources."mime-types-2.1.32" sources."minimist-1.2.5" - sources."node-fetch-2.6.2" + sources."node-fetch-2.6.5" sources."path-type-4.0.0" sources."pause-stream-0.0.11" sources."picomatch-2.3.0" @@ -124650,7 +126787,10 @@ in sources."supports-color-7.2.0" sources."through-2.3.8" sources."to-regex-range-5.0.1" + sources."tr46-0.0.3" sources."universalify-2.0.0" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-2.0.2" ]; buildInputs = globalBuildInputs; diff --git a/nixpkgs/pkgs/development/ocaml-modules/bolt/default.nix b/nixpkgs/pkgs/development/ocaml-modules/bolt/default.nix index 54bc28697ec4..ea32d659f646 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/bolt/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/bolt/default.nix @@ -42,6 +42,8 @@ EOF # The custom `configure` script does not expect the --prefix # option. Installation is handled by ocamlfind. dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix b/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix index ec20eedd7688..090b96ece0cc 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/camomile/default.nix @@ -15,7 +15,11 @@ buildDunePackage rec { buildInputs = [ cppo ]; - configurePhase = "ocaml configure.ml --share $out/share/camomile"; + configurePhase = '' + runHook preConfigure + ocaml configure.ml --share $out/share/camomile + runHook postConfigure + ''; meta = { inherit (src.meta) homepage; diff --git a/nixpkgs/pkgs/development/ocaml-modules/cryptokit/default.nix b/nixpkgs/pkgs/development/ocaml-modules/cryptokit/default.nix index 272ff72d8c59..6a50c73103b7 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -11,7 +11,11 @@ buildDunePackage { sha256 = "0kzqkk451m69nqi5qiwak0rd0rp5vzi613gcngsiig7dyxwka61c"; }; - dontConfigure = true; + # dont do autotools configuration, but do trigger findlib's preConfigure hook + configurePhase = '' + runHook preConfigure + runHook postConfigure + ''; buildInputs = [ dune-configurator ncurses ]; propagatedBuildInputs = [ zarith zlib ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/easy-format/default.nix b/nixpkgs/pkgs/development/ocaml-modules/easy-format/default.nix index 6a3566fda2b6..161e263e129b 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/easy-format/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/easy-format/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation { sha256 = "00ga7mrlycjc99gzp3bgx6iwhf7i6j8856f8xzrf1yas7zwzgzm9"; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/nixpkgs/pkgs/development/ocaml-modules/erm_xmpp/default.nix index cff155f47098..9eaad7575ec3 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -16,9 +16,21 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; propagatedBuildInputs = [ erm_xml mirage-crypto mirage-crypto-rng base64 ]; - configurePhase = "ocaml setup.ml -configure --prefix $out"; - buildPhase = "ocaml setup.ml -build"; - installPhase = "ocaml setup.ml -install"; + configurePhase = '' + runHook preConfigure + ocaml setup.ml -configure --prefix $out + runHook postConfigure + ''; + buildPhase = '' + runHook preBuild + ocaml setup.ml -build + runHook postBuild + ''; + installPhase = '' + runHook preInstall + ocaml setup.ml -install + runHook postInstall + ''; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix index 5c7d36fcc08d..d1860788838a 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/extlib/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib cppo ]; createFindlibDestdir = true; - dontConfigure = true; makeFlags = lib.optional minimal "minimal=1"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/gen/default.nix b/nixpkgs/pkgs/development/ocaml-modules/gen/default.nix index 04d1a0816606..77fc0b63c55e 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/gen/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/gen/default.nix @@ -12,7 +12,9 @@ stdenv.mkDerivation { sha256 = "14b8vg914nb0yp1hgxzm29bg692m0gqncjj43b599s98s1cwl92h"; }; - buildInputs = [ ocaml findlib ocamlbuild qtest ounit ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ qtest ounit ]; + strictDeps = true; configureFlags = [ "--enable-tests" diff --git a/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix b/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix index cd1217b97101..aa787c9a91a0 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/hacl-star/raw.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { installTargets = "install-hacl-star-raw"; dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; buildInputs = [ which diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix index 23f2cb5cd651..8f7262b47760 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -514,7 +514,8 @@ with self; ppx_js_style = janePackage { pname = "ppx_js_style"; - hash = "1ahk4mv63s9cw8ji62598ggw6b3lqpaljqa2ya7w91lify3lb76q"; + version = "0.14.1"; + hash = "16ax6ww9h36xyn9acbm8zxv0ajs344sm37lgj2zd2bvgsqv24kxj"; minimumOCamlVersion = "4.04.2"; meta.description = "Code style checker for Jane Street Packages"; propagatedBuildInputs = [ octavius ppxlib ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix index fdb0d8034e69..62876e5eaf94 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix @@ -17,6 +17,8 @@ buildOcaml (args // { buildInputs = [ ocaml_oasis js_build_tools opaline ] ++ buildInputs; dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; configurePhase = "./configure --prefix $out"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix b/nixpkgs/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix index ff03c209190d..2f68ee8230e7 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix @@ -16,6 +16,8 @@ buildOcaml rec { buildInputs = [ ocaml_oasis opaline ]; dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; configurePhase = "./configure --prefix $prefix"; installPhase = "opaline -prefix $prefix -libdir $OCAMLFIND_DESTDIR ${name}.install"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix b/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix index d158e4216ab4..15678f89da3c 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/javalib/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { configureScript = "./configure.sh"; dontAddPrefix = "true"; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; propagatedBuildInputs = [ camlzip extlib ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix b/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix index 5a6daa54de39..bef06975ac55 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/labltk/default.nix @@ -38,6 +38,10 @@ let version = "8.06.10"; sha256 = "06cck7wijq4zdshzhxm6jyl8k3j0zglj2axsyfk6q1sq754zyf4a"; }; + "4.13" = mkNewParam { + version = "8.06.11"; + sha256 = "1zjpg9jvs6i9jvbgn6zgispwqiv8rxvaszxcx9ha9fax3wzhv9qy"; + }; }; param = params . ${lib.versions.majorMinor ocaml.version} or (throw "labltk is not available for OCaml ${ocaml.version}"); @@ -51,6 +55,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--use-findlib" "--installbindir" "$(out)/bin" ]; dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; buildFlags = [ "all" "opt" ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix b/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix index c8035eea42d3..2677f56584e7 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/mdx/default.nix @@ -1,21 +1,21 @@ { lib, fetchurl, buildDunePackage, ocaml , alcotest -, astring, cmdliner, cppo, fmt, logs, ocaml-version, odoc, ocaml_lwt, re, result, csexp +, astring, cmdliner, cppo, fmt, logs, ocaml-version, odoc-parser, ocaml_lwt, re, result, csexp , pandoc}: buildDunePackage rec { pname = "mdx"; - version = "1.10.1"; + version = "1.11.0"; useDune2 = true; src = fetchurl { url = "https://github.com/realworldocaml/mdx/releases/download/${version}/mdx-${version}.tbz"; - sha256 = "10d4sfv4qk9569kj46pcaw6cih40v6bkgd44lmsp7cyfhvl8pa9x"; + sha256 = "1hk8ffh3d9hiibrj6691khnbmjnfs9psmiawnrbgi0577bw030wx"; }; nativeBuildInputs = [ cppo ]; buildInputs = [ cmdliner ]; - propagatedBuildInputs = [ astring fmt logs result csexp ocaml-version odoc re ]; + propagatedBuildInputs = [ astring fmt logs result csexp ocaml-version odoc-parser re ]; checkInputs = [ alcotest ocaml_lwt pandoc ]; doCheck = true; @@ -31,6 +31,7 @@ buildDunePackage rec { meta = { homepage = "https://github.com/realworldocaml/mdx"; description = "Executable OCaml code blocks inside markdown files"; + changelog = "https://github.com/realworldocaml/mdx/raw/${version}/CHANGES.md"; license = lib.licenses.isc; maintainers = [ lib.maintainers.romildo ]; }; diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix index bdbbf1d8c67f..5c3ca95bb0d8 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; preConfigure = '' configureFlagsArray=( diff --git a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 25d45d9aed9b..96a66874c759 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -40,6 +40,8 @@ buildDunePackage rec { configureFlags = [ "--root $(out)" "--prefix /" ]; dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; postConfigure = '' make -C src confs diff --git a/nixpkgs/pkgs/development/ocaml-modules/omd/default.nix b/nixpkgs/pkgs/development/ocaml-modules/omd/default.nix index 8e5b4a23ce32..fee2f300eac7 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/omd/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/omd/default.nix @@ -11,7 +11,11 @@ stdenv.mkDerivation { createFindlibDestdir = true; - configurePhase = "ocaml setup.ml -configure --prefix $out"; + configurePhase = '' + runHook preConfigure + ocaml setup.ml -configure --prefix $out + runHook postConfigure + ''; meta = { description = "Extensible Markdown library and tool in OCaml"; diff --git a/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix b/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix index 6892a7a2e4d5..29213031f358 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/parany/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "parany"; - version = "12.0.3"; + version = "12.1.1"; useDune2 = true; minimumOCamlVersion = "4.03.0"; @@ -11,7 +11,7 @@ buildDunePackage rec { owner = "UnixJunkie"; repo = pname; rev = "v${version}"; - sha256 = "1j962ak68kvv62bczjqxwlwvdgcvjfcs36qwq12nnm0pwlzkhg33"; + sha256 = "0s2sbmywy4yyh69dcrcqd85hd8jcd7qgfczy79nam4bvn87bjm72"; }; propagatedBuildInputs = [ ocamlnet cpu ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/process/default.nix b/nixpkgs/pkgs/development/ocaml-modules/process/default.nix index 34ca51f07392..aecf03987ab1 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/process/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/process/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0m1ldah5r9gcq09d9jh8lhvr77910dygx5m309k1jm60ah9mdcab"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix b/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix index 68a8731201d6..30ac2cfb22dd 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/sawja/default.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation { configureScript = "./configure.sh"; dontAddPrefix = "true"; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; propagatedBuildInputs = [ javalib ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/seq/default.nix b/nixpkgs/pkgs/development/ocaml-modules/seq/default.nix index aa0546dd390b..44503668ff0a 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/seq/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/seq/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation ({ sha256 = "1cjpsc7q76yfgq9iyvswxgic4kfq2vcqdlmxjdjgd4lx87zvcwrv"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + strictDeps = true; createFindlibDestdir = true; diff --git a/nixpkgs/pkgs/development/ocaml-modules/syslog/default.nix b/nixpkgs/pkgs/development/ocaml-modules/syslog/default.nix index c97f1225663e..9614c404c5b9 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/syslog/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/syslog/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1kqpc55ppzv9n555qgqpda49n7nvkqimzisyjx2a7338r7q4r5bw"; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + strictDeps = true; buildFlags = [ "all" "opt" ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix b/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix index c89449264889..4befff2721b9 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/wasm/default.nix @@ -15,7 +15,11 @@ stdenv.mkDerivation rec { sha256 = "1kp72yv4k176i94np0m09g10cviqp2pnpm7jmiq6ik7fmmbknk7c"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; + strictDeps = true; + + # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together + hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; makeFlags = [ "-C" "interpreter" ]; diff --git a/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix b/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix index eed6b158d4a6..95351caee307 100644 --- a/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix +++ b/nixpkgs/pkgs/development/ocaml-modules/zarith/default.nix @@ -17,11 +17,13 @@ stdenv.mkDerivation rec { sha256 = "1jslm1rv1j0ya818yh23wf3bb6hz7qqj9pn5fwl45y9mqyqa01s9"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ pkg-config ocaml findlib ]; propagatedBuildInputs = [ gmp ]; + strictDeps = true; dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; configureFlags = [ "-installdir ${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib" ]; preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs"; diff --git a/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix b/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix index a4083707a072..8556294e2b68 100644 --- a/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix +++ b/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix @@ -6,7 +6,6 @@ , pytestCheckHook , pytest-asyncio , pytest-tornado -, pytest-cov , sqlalchemy , tornado , twisted @@ -22,12 +21,13 @@ buildPythonPackage rec { pname = "APScheduler"; - version = "3.7.0"; + version = "3.8.0"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1cab7f2521e107d07127b042155b632b7a1cd5e02c34be5a28ff62f77c900c6a"; + sha256 = "793b2d37c52ece53e34626619e6142e99b20b59a12155f39e1e6932e324f079d"; }; buildInputs = [ @@ -38,7 +38,6 @@ buildPythonPackage rec { pytest-asyncio pytest-tornado pytestCheckHook - pytest-cov sqlalchemy tornado twisted @@ -54,7 +53,14 @@ buildPythonPackage rec { setuptools ]; - disabledTests = lib.optionals stdenv.isDarwin [ + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov --tb=short" "" + ''; + + disabledTests = [ + "test_broken_pool" + ] ++ lib.optionals stdenv.isDarwin [ "test_submit_job" "test_max_instances" ]; @@ -65,5 +71,6 @@ buildPythonPackage rec { description = "A Python library that lets you schedule your Python code to be executed"; homepage = "https://github.com/agronholm/apscheduler"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/Cython/default.nix b/nixpkgs/pkgs/development/python-modules/Cython/default.nix index dcede9506e32..e22037cbbb9f 100644 --- a/nixpkgs/pkgs/development/python-modules/Cython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/Cython/default.nix @@ -12,8 +12,7 @@ }: let - excludedTests = [] - ++ [ "reimport_from_subinterpreter" ] + excludedTests = [ "reimport_from_subinterpreter" ] # cython's testsuite is not working very well with libc++ # We are however optimistic about things outside of testsuite still working ++ lib.optionals (stdenv.cc.isClang or false) [ "cpdef_extern_func" "libcpp_algo" ] @@ -26,19 +25,21 @@ let in buildPythonPackage rec { pname = "Cython"; - version = "0.29.22"; + version = "0.29.24"; src = fetchPypi { inherit pname version; - sha256 = "sha256-32uDx6bR2WfqiaKQPkqTE3djSil0WWUuRVFzTEgZVAY="; + sha256 = "sha256-zfBNB8NgCGDowuuq1Oj1KsP+shJFPBdkpJrAjIJ+hEM="; }; nativeBuildInputs = [ pkg-config ]; + checkInputs = [ gdb numpy ncurses ]; + buildInputs = [ glibcLocales ]; LC_ALL = "en_US.UTF-8"; @@ -71,9 +72,7 @@ in buildPythonPackage rec { # https://github.com/cython/cython/issues/2785 # Temporary solution doCheck = false; - -# doCheck = !stdenv.isDarwin; - + # doCheck = !stdenv.isDarwin; meta = { description = "An optimising static compiler for both the Python programming language and the extended Cython programming language"; diff --git a/nixpkgs/pkgs/development/python-modules/Fabric/default.nix b/nixpkgs/pkgs/development/python-modules/Fabric/default.nix index 2e70d3aa121e..de53512d0b47 100644 --- a/nixpkgs/pkgs/development/python-modules/Fabric/default.nix +++ b/nixpkgs/pkgs/development/python-modules/Fabric/default.nix @@ -1,9 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi , cryptography , invoke , mock , paramiko -, pytest +, pytestCheckHook , pytest-relaxed }: @@ -23,20 +25,21 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ invoke paramiko cryptography ]; - checkInputs = [ pytest mock pytest-relaxed ]; - # requires pytest_relaxed, which doesnt have official support for pytest>=5 - # https://github.com/bitprophet/pytest-relaxed/issues/12 + checkInputs = [ pytestCheckHook pytest-relaxed mock ]; + + # ==================================== ERRORS ==================================== + # ________________________ ERROR collecting test session _________________________ + # Direct construction of SpecModule has been deprecated, please use SpecModule.from_parent + # See https://docs.pytest.org/en/stable/deprecations.html#node-construction-changed-to-node-from-parent for more details. doCheck = false; - checkPhase = '' - pytest tests - ''; + pythonImportsCheck = [ "fabric" ]; meta = with lib; { description = "Pythonic remote execution"; - homepage = "https://www.fabfile.org/"; - license = licenses.bsd2; + homepage = "https://www.fabfile.org/"; + license = licenses.bsd2; maintainers = [ maintainers.costrouc ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/GitPython/default.nix b/nixpkgs/pkgs/development/python-modules/GitPython/default.nix index 6a1e6af55b20..7ae407908961 100644 --- a/nixpkgs/pkgs/development/python-modules/GitPython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/GitPython/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "gitpython"; - version = "3.1.23"; + version = "3.1.24"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "gitpython-developers"; repo = "GitPython"; rev = version; - sha256 = "sha256-1+jMg5pOrYJBgv/q9FFnR5Ujc8pwEPZHfLssNnt8nmA="; + sha256 = "sha256-KfR14EqXsDgIZUerk/hHDB0Z7IuqncbTNd/yNwrV9I0="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/Mako/default.nix b/nixpkgs/pkgs/development/python-modules/Mako/default.nix index 533e1317a091..cf3028612698 100644 --- a/nixpkgs/pkgs/development/python-modules/Mako/default.nix +++ b/nixpkgs/pkgs/development/python-modules/Mako/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "Mako"; - version = "1.1.4"; + version = "1.1.5"; src = fetchPypi { inherit pname version; - sha256 = "17831f0b7087c313c0ffae2bcbbd3c1d5ba9eeac9c38f2eb7b50e8c99fe9d5ab"; + sha256 = "169fa52af22a91900d852e937400e79f535496191c63712e3b9fda5a9bed6fc3"; }; propagatedBuildInputs = [ markupsafe ]; diff --git a/nixpkgs/pkgs/development/python-modules/Pygments/default.nix b/nixpkgs/pkgs/development/python-modules/Pygments/default.nix index 640c95bfcf9f..bb17af144cbe 100644 --- a/nixpkgs/pkgs/development/python-modules/Pygments/default.nix +++ b/nixpkgs/pkgs/development/python-modules/Pygments/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Pygments"; - version = "2.9.0"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "a18f47b506a429f6f4b9df81bb02beab9ca21d0a5fee38ed15aef65f0545519f"; + sha256 = "f398865f7eb6874156579fdf36bc840a03cab64d1cde9e93d68f46a425ec52c6"; }; propagatedBuildInputs = [ docutils ]; diff --git a/nixpkgs/pkgs/development/python-modules/ROPGadget/default.nix b/nixpkgs/pkgs/development/python-modules/ROPGadget/default.nix index 8c34e75139f6..6be0ed48e289 100644 --- a/nixpkgs/pkgs/development/python-modules/ROPGadget/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ROPGadget/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "ROPGadget"; - version = "6.5"; + version = "6.6"; src = fetchPypi { inherit pname version; - sha256 = "4c0e56f2ba0aef13b2c8ca286aad663525b92020b11bacd16791f5236247905c"; + sha256 = "dc61186e0114ec67ec7ce374df8fd2ddc2a7cba129a1242338e900a7483fba22"; }; propagatedBuildInputs = [ capstone ]; diff --git a/nixpkgs/pkgs/development/python-modules/Theano/default.nix b/nixpkgs/pkgs/development/python-modules/Theano/default.nix index e279100e9cc6..351f8dc9b711 100644 --- a/nixpkgs/pkgs/development/python-modules/Theano/default.nix +++ b/nixpkgs/pkgs/development/python-modules/Theano/default.nix @@ -8,19 +8,15 @@ , nose , numpy , scipy +, setuptools , six , libgpuarray , cudaSupport ? false, cudatoolkit , cudnnSupport ? false, cudnn -, nvidia_x11 }: assert cudnnSupport -> cudaSupport; -assert cudaSupport -> nvidia_x11 != null - && cudatoolkit != null - && cudnn != null; - let wrapped = command: buildTop: buildInputs: runCommandCC "${command}-wrapped" { inherit buildInputs; } '' @@ -81,7 +77,15 @@ in buildPythonPackage rec { # keep Nose around since running the tests by hand is possible from Python or bash checkInputs = [ nose ]; - propagatedBuildInputs = [ numpy numpy.blas scipy six libgpuarray_ ]; + # setuptools needed for cuda support + propagatedBuildInputs = [ + libgpuarray_ + numpy + numpy.blas + scipy + setuptools + six + ]; pythonImportsCheck = [ "theano" ]; diff --git a/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix b/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix index 76e8a8401fd4..79c1ecffb037 100644 --- a/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix +++ b/nixpkgs/pkgs/development/python-modules/acme-tiny/default.nix @@ -1,27 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools-scm, fusepy, fuse -, openssl }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, fusepy +, fuse +, openssl +}: buildPythonPackage rec { pname = "acme-tiny"; - version = "4.1.0"; + version = "5.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0jmg525n4n98hwy3hf303jbnq23z79sqwgliji9j7qcnph47gkgq"; + sha256 = "378549808eece574c3b5dcea82b216534949423d5c7ac241d9419212d676bc8d"; }; patchPhase = '' substituteInPlace acme_tiny.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"' - substituteInPlace tests/monkey.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"' substituteInPlace tests/test_module.py --replace '"openssl"' '"${openssl.bin}/bin/openssl"' - substituteInPlace tests/monkey.py --replace /etc/ssl/openssl.cnf ${openssl.out}/etc/ssl/openssl.cnf + substituteInPlace tests/utils.py --replace /etc/ssl/openssl.cnf ${openssl.out}/etc/ssl/openssl.cnf ''; buildInputs = [ setuptools-scm ]; + checkInputs = [ fusepy fuse ]; doCheck = false; # seems to hang, not sure + pythonImportsCheck = [ "acme_tiny" ]; + meta = with lib; { description = "A tiny script to issue and renew TLS certs from Let's Encrypt"; homepage = "https://github.com/diafygi/acme-tiny"; diff --git a/nixpkgs/pkgs/development/python-modules/acoustics/default.nix b/nixpkgs/pkgs/development/python-modules/acoustics/default.nix index 9047910a2138..e888d1241a50 100644 --- a/nixpkgs/pkgs/development/python-modules/acoustics/default.nix +++ b/nixpkgs/pkgs/development/python-modules/acoustics/default.nix @@ -1,32 +1,57 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest, numpy, scipy, matplotlib, pandas, tabulate, pythonOlder }: +{ lib +, buildPythonPackage +, fetchPypi +, matplotlib +, numpy +, pandas +, pytestCheckHook +, pythonOlder +, scipy +, tabulate +}: buildPythonPackage rec { pname = "acoustics"; version = "0.2.4.post0"; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ numpy scipy matplotlib pandas tabulate ]; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "a162625e5e70ed830fab8fab0ddcfe35333cb390cd24b0a827bcefc5bbcae97d"; }; - checkPhase = '' + propagatedBuildInputs = [ + matplotlib + numpy + pandas + scipy + tabulate + ]; + + checkInputs = [ + pytestCheckHook + ]; + + preCheck = '' export HOME=$TMPDIR mkdir -p $HOME/.matplotlib echo "backend: ps" > $HOME/.matplotlib/matplotlibrc - - pushd tests - py.test -Wignore::DeprecationWarning ./. - popd ''; - disabled = pythonOlder "3.6"; + pytestFlagsArray = [ + "-Wignore::DeprecationWarning" + ]; + + disabledTestPaths = [ + # All tests fail with TypeError + "tests/test_aio.py" + ]; + + pythonImportsCheck = [ "acoustics" ]; meta = with lib; { - description = "A package for acousticians"; + description = "Python package for acousticians"; maintainers = with maintainers; [ fridh ]; license = with licenses; [ bsd3 ]; homepage = "https://github.com/python-acoustics/python-acoustics"; diff --git a/nixpkgs/pkgs/development/python-modules/adjusttext/default.nix b/nixpkgs/pkgs/development/python-modules/adjusttext/default.nix new file mode 100644 index 000000000000..82613ffa52aa --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/adjusttext/default.nix @@ -0,0 +1,32 @@ +{ buildPythonPackage +, numpy +, matplotlib +, fetchFromGitHub +, lib +}: + +buildPythonPackage rec { + pname = "adjusttext"; + version = "0.7.3"; + + src = fetchFromGitHub { + owner = "Phlya"; + repo = pname; + rev = version; + sha256 = "02apaznnnmwmrn342f22dj5dldn56gdl9v5qix07ah6kgp9503yw"; + }; + + propagatedBuildInputs = [ matplotlib numpy ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "adjustText" ]; + + meta = with lib; { + description = "Iteratively adjust text position in matplotlib plots to minimize overlaps"; + homepage = "https://github.com/Phlya/adjustText"; + license = licenses.mit; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix b/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix index 752c905ee8e6..4d970b182217 100644 --- a/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix @@ -1,17 +1,17 @@ { lib, fetchPypi, buildPythonPackage -, agate, openpyxl, xlrd, pytestCheckHook +, agate, openpyxl, xlrd, olefile, pytestCheckHook }: buildPythonPackage rec { pname = "agate-excel"; - version = "0.2.3"; + version = "0.2.5"; src = fetchPypi { inherit pname version; - sha256 = "8f255ef2c87c436b7132049e1dd86c8e08bf82d8c773aea86f3069b461a17d52"; + sha256 = "62315708433108772f7f610ca769996b468a4ead380076dbaf6ffe262831b153"; }; - propagatedBuildInputs = [ agate openpyxl xlrd ]; + propagatedBuildInputs = [ agate openpyxl xlrd olefile ]; checkInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix b/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix index e9747b6f393d..c2e741bef176 100644 --- a/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix +++ b/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "agate-sql"; - version = "0.5.7"; + version = "0.5.8"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "7622c1f243b5a9a5efddfe28c36eeeb30081e43e3eb72e8f3da22c2edaecf4d8"; + sha256 = "581e062ae878cc087d3d0948670d46b16589df0790bf814524b0587a359f2ada"; }; propagatedBuildInputs = [ agate sqlalchemy ]; diff --git a/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/nixpkgs/pkgs/development/python-modules/ailment/default.nix index 551e26e71add..14a295713136 100644 --- a/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.9792"; + version = "9.0.10010"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c+E3ypmN69IyE0HagefrYN8bdCY7amRxa/PGoIX4/cQ="; + sha256 = "sha256-kEHbuc5gmurMznTyfn/KnZEClLHJgv2CzK4O30dIgTg="; }; propagatedBuildInputs = [ pyvex ]; diff --git a/nixpkgs/pkgs/development/python-modules/aioambient/default.nix b/nixpkgs/pkgs/development/python-modules/aioambient/default.nix index 16678c9f04e6..3e5c0c8dfe89 100644 --- a/nixpkgs/pkgs/development/python-modules/aioambient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioambient/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioambient"; - version = "1.2.6"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-EppnuZP62YTFI3UJUzBUj2m5TvFh1WiDz9smHY7We60="; + sha256 = "sha256-blejTXyLe3B2kNytBh+zJz0Q0xDP+Vo2SV9gc7OX6S0="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aioapns/default.nix b/nixpkgs/pkgs/development/python-modules/aioapns/default.nix new file mode 100644 index 000000000000..b9428449d2c8 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aioapns/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, fetchPypi +, h2 +, lib +, pyjwt +, pyopenssl +}: + +buildPythonPackage rec { + pname = "aioapns"; + version = "2.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "ea58ce685aa6d0ffbdc3be4a6999c7268b9c765f806d3e4da7677c098fb72cbc"; + }; + + propagatedBuildInputs = [ + h2 + pyopenssl + pyjwt + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "aioapns" ]; + + meta = with lib; { + description = "An efficient APNs Client Library for Python/asyncio"; + homepage = "https://github.com/Fatal1ty/aioapns"; + license = licenses.asl20; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix b/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix index e07b56d3f266..f6024c953fda 100644 --- a/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix @@ -10,18 +10,18 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "1.3.1"; + version = "1.4.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "8ecee55346651e0f4cbda883e3e16cfe11460b8d7adcc08d0017cbb867636ae1"; + sha256 = "09f06723d1d69c6d407d9a356ca65ab42a5b7b73a45be4b1ed0ed1a6b6057a9f"; }; # relax version constraints: aiobotocore works with newer botocore versions # the pinning used to match some `extras_require` we're not using. postPatch = '' - substituteInPlace setup.py --replace 'botocore>=1.20.49,<1.20.50' 'botocore' + substituteInPlace setup.py --replace 'botocore>=1.20.106,<1.20.107' 'botocore' ''; propagatedBuildInputs = [ wrapt aiohttp aioitertools botocore ]; diff --git a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix index 51ba773d8b2d..372865e69ddc 100644 --- a/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "9.0.0"; + version = "9.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z5PebH/x53lo62sHjBH/6H05UhXax3sVfYx5T0uw38s="; + sha256 = "1bkk6mj1h1zhhp4s1ps6g950vzgfbxdj9pw762fz238p48ccw90b"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix b/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix new file mode 100644 index 000000000000..7ec85d90f7d3 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix @@ -0,0 +1,53 @@ +{ lib +, aiohttp +, aresponses +, async-timeout +, backoff +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiogithubapi"; + version = "21.8.1"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ludeeus"; + repo = pname; + rev = version; + sha256 = "1l59bb956gymi2dkgg88mr0nc80wqvw2dv69qf4f1xr3jxy03qa2"; + }; + + postPatch = '' + # Upstream is releasing with the help of a CI to PyPI, GitHub releases + # are not in their focus + substituteInPlace setup.py \ + --replace 'version="main",' 'version="${version}",' + ''; + + propagatedBuildInputs = [ + aiohttp + async-timeout + backoff + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "aiogithubapi" ]; + + meta = with lib; { + description = "Python client for the GitHub API"; + homepage = "https://github.com/ludeeus/aiogithubapi"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aioprocessing/default.nix b/nixpkgs/pkgs/development/python-modules/aioprocessing/default.nix index 2f6b39678489..a4571a79b05d 100644 --- a/nixpkgs/pkgs/development/python-modules/aioprocessing/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioprocessing/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioprocessing"; version = "2.0.0"; - disabled = pythonOlder "3.4"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; diff --git a/nixpkgs/pkgs/development/python-modules/aiopvapi/default.nix b/nixpkgs/pkgs/development/python-modules/aiopvapi/default.nix new file mode 100644 index 000000000000..b8614d0c97d2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aiopvapi/default.nix @@ -0,0 +1,39 @@ +{ lib +, aiohttp +, async-timeout +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiopvapi"; + version = "1.6.14"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "02bl7q166j6rb8av9n1jz11xlwhrzmbkjq70mwr86qaj63pcxrak"; + }; + + propagatedBuildInputs = [ + aiohttp + async-timeout + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "aiopvapi" ]; + + meta = with lib; { + description = "Python API for the PowerView API"; + homepage = "https://github.com/sander76/aio-powerview-api"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aioredis/default.nix b/nixpkgs/pkgs/development/python-modules/aioredis/default.nix index fe48ba0e1e18..807b112772cf 100644 --- a/nixpkgs/pkgs/development/python-modules/aioredis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioredis/default.nix @@ -1,20 +1,27 @@ -{ lib, buildPythonPackage, fetchPypi -, pkgs, async-timeout, hiredis, isPyPy, isPy27 +{ lib +, buildPythonPackage +, fetchPypi +, async-timeout +, typing-extensions +, hiredis +, isPyPy +, pythonOlder }: buildPythonPackage rec { pname = "aioredis"; - version = "1.3.1"; + version = "2.0.0"; - disabled = isPy27; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0fi7jd5hlx8cnv1m97kv9hc4ih4l8v15wzkqwsp73is4n0qazy0m"; + sha256 = "3a2de4b614e6a5f8e104238924294dc4e811aefbe17ddf52c04a93cbf06e67db"; }; propagatedBuildInputs = [ async-timeout + typing-extensions ] ++ lib.optional (!isPyPy) hiredis; # Wants to run redis-server, hardcoded FHS paths, too much trouble. diff --git a/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix b/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix index 2682b1365645..f4d1541a1398 100644 --- a/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "2.0.4"; + version = "2.0.6"; format = "pyproject"; src = fetchFromGitHub { owner = "TomerFi"; repo = pname; rev = version; - sha256 = "sha256-n4JvtShs2/shJxAzxm6qyipVQ7e3QfeVwhnqu6RWZss="; + sha256 = "sha256-zgfgM3orhm2ZPp3Cf803adNzPeMOdRGX+sN6rhK1OT4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/aiowatttime/default.nix b/nixpkgs/pkgs/development/python-modules/aiowatttime/default.nix new file mode 100644 index 000000000000..39aa7974313c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/aiowatttime/default.nix @@ -0,0 +1,53 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-aiohttp +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiowatttime"; + version = "0.1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bachya"; + repo = pname; + rev = version; + sha256 = "1614p5ca7x9ipz7dgwhiz83dfwn6hyliawa8pr2j9y2kn8cg2sdm"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + aresponses + pytest-aiohttp + pytest-asyncio + pytestCheckHook + ]; + + # Ignore the examples directory as the files are prefixed with test_ + disabledTestPaths = [ "examples/" ]; + + pythonImportsCheck = [ "aiowatttime" ]; + + meta = with lib; { + description = "Python library for interacting with WattTime"; + homepage = "https://github.com/bachya/aiowatttime"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/aioymaps/default.nix b/nixpkgs/pkgs/development/python-modules/aioymaps/default.nix index 4a6d806dee1d..01765f6eedff 100644 --- a/nixpkgs/pkgs/development/python-modules/aioymaps/default.nix +++ b/nixpkgs/pkgs/development/python-modules/aioymaps/default.nix @@ -7,12 +7,13 @@ buildPythonPackage rec { pname = "aioymaps"; - version = "1.1.0"; + version = "1.2.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1rvgf4flvnpjj0sm14xlnfmmnlmkz6xq5h5mfb14amkfy76za3jm"; + sha256 = "sha256-YkSoxYf/Ti/gc1BFSYR24P3OzDrmcGWKhcOcrGpkRjU="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ajsonrpc/default.nix b/nixpkgs/pkgs/development/python-modules/ajsonrpc/default.nix index e5a81d9cfa6e..b3482cd74679 100644 --- a/nixpkgs/pkgs/development/python-modules/ajsonrpc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ajsonrpc/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "ajsonrpc"; - version = "1.1.0"; + version = "1.2.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1b5r8975wdnk3qnc1qjnn4lkxmqcir3brbwnxml9ii90dnsw408a"; + sha256 = "791bac18f0bf0dee109194644f151cf8b7ff529c4b8d6239ac48104a3251a19f"; }; checkInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/alembic/default.nix b/nixpkgs/pkgs/development/python-modules/alembic/default.nix index 9c7244b3c066..af8b1fc37215 100644 --- a/nixpkgs/pkgs/development/python-modules/alembic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/alembic/default.nix @@ -1,26 +1,56 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest, pytest-cov, mock, coverage, setuptools -, Mako, sqlalchemy, python-editor, python-dateutil +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, Mako +, python-dateutil +, sqlalchemy +, importlib-metadata +, importlib-resources +, pytest-xdist +, pytestCheckHook + }: buildPythonPackage rec { pname = "alembic"; - version = "1.6.5"; + version = "1.7.1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a21fedebb3fb8f6bbbba51a11114f08c78709377051384c9c5ead5705ee93a51"; + sha256 = "aea964d3dcc9c205b8759e4e9c1c3935ea3afeee259bffd7ed8414f8085140fb"; }; - buildInputs = [ pytest pytest-cov mock coverage ]; - propagatedBuildInputs = [ Mako sqlalchemy python-editor python-dateutil setuptools ]; + propagatedBuildInputs = [ + Mako + python-dateutil + sqlalchemy + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + pythonImportsCheck = [ + "alembic" + ]; + + checkInputs = [ + pytestCheckHook + pytest-xdist + ]; - # no traditional test suite - doCheck = false; + pytestFlagsArray = [ + "--numprocesses" "auto" + ]; meta = with lib; { homepage = "https://bitbucket.org/zzzeek/alembic"; description = "A database migration tool for SQLAlchemy"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/amcrest/default.nix b/nixpkgs/pkgs/development/python-modules/amcrest/default.nix index 478ab1811e48..d050a7563a74 100644 --- a/nixpkgs/pkgs/development/python-modules/amcrest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/amcrest/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , fetchFromGitHub , mock +, httpx , pytestCheckHook , pythonOlder , requests @@ -13,18 +14,19 @@ buildPythonPackage rec { pname = "amcrest"; - version = "1.8.1"; + version = "1.9.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "tchellomello"; repo = "python-amcrest"; rev = version; - sha256 = "sha256-a23AjLRNghu5CT3GHvnti0BHnku9CxLP1EkE0GrwB3w="; + sha256 = "0f9l8xbn40xwx2zzssx5qmkpmv82j6syj8ncnmm6z9dc5wpr6sw7"; }; propagatedBuildInputs = [ argcomplete + httpx requests urllib3 typing-extensions diff --git a/nixpkgs/pkgs/development/python-modules/angr/default.nix b/nixpkgs/pkgs/development/python-modules/angr/default.nix index 7ff5e8bb35c9..7ec9305689b3 100644 --- a/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -43,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.9792"; + version = "9.0.10010"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-zDy3dwhCNBtCAwflF/grdNsRllNUHJHMx1PQThHjcnw="; + sha256 = "sha256-UWg3lrBMfQsR09wbx8F2nml8eymk7V60gwFbPXwNqAw="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/angrop/default.nix b/nixpkgs/pkgs/development/python-modules/angrop/default.nix index 3bee7edbf520..e7a3585c0f57 100644 --- a/nixpkgs/pkgs/development/python-modules/angrop/default.nix +++ b/nixpkgs/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.9792"; + version = "9.0.10010"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rXhXzqjefsKvfsFky4XJd+RaF5z/TRWDg6+IYFIfP2w="; + sha256 = "sha256-VCVvJI98gyVZC2SPb5hd8FKLTYUhEILJtieb4IQGL2c="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix b/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix index 4abcec541a04..50188fe0e4a3 100644 --- a/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, pytestCheckHook, setuptools, setuptools-scm, toml }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, six, mock, pytestCheckHook, setuptools, setuptools-scm }: buildPythonPackage rec { pname = "ansi2html"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596"; }; - nativeBuildInputs = [ setuptools-scm toml ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ six setuptools ]; preCheck = "export PATH=$PATH:$out/bin"; diff --git a/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix b/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix index ba11ef11e3b8..9dc8eadb7775 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "1.4.7"; + version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "1bb56f9061c3238d89ec8871bc842f5b8d0e868f892347e8455c98d5b6fa58a1"; + sha256 = "c02b690803ec0be4453411c53743cd3fdca1dfc66dfa075794e14e717c5b61b3"; }; checkInputs = [ pytest mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/ansible/base.nix b/nixpkgs/pkgs/development/python-modules/ansible/base.nix index 68063f0d7787..3156ba18e106 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible/base.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible/base.nix @@ -28,11 +28,11 @@ let in buildPythonPackage rec { pname = "ansible-base"; - version = "2.10.13"; + version = "2.10.14"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0sKbGUblrgh4SgdiuMSMMvg15GSNb5l6bCqBt4/0860="; + sha256 = "sha256-gAxGRsWKWJf3HyIwFn21YmoZbeuiCPDvRWChg//Z39o="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/nixpkgs/pkgs/development/python-modules/ansible/core.nix b/nixpkgs/pkgs/development/python-modules/ansible/core.nix index 0e2d705cc887..b64942b10780 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible/core.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible/core.nix @@ -23,17 +23,17 @@ let ansible-collections = callPackage ./collections.nix { - version = "4.4.0"; - sha256 = "031n22j0lsmh69x6i6gkva81j68b4yzh1pbg3q2h4bknl85q46ag"; + version = "4.5.0"; + sha256 = "1c8dspqy4in7sgz10y1pggwnh1hv79wap7p7xhai0f0s6nr54lyc"; }; in buildPythonPackage rec { pname = "ansible-core"; - version = "2.11.4"; + version = "2.11.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Iuqnwt/myHXprjgDI/HLpiWcYFCl5MiBn4X5KzaD6kk="; + sha256 = "sha256-fTzkcBQSKQdFRwQ2NIXkhRP4rQ8AE4uIhw622IlT0SE="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/nixpkgs/pkgs/development/python-modules/ansible/legacy.nix b/nixpkgs/pkgs/development/python-modules/ansible/legacy.nix index e7687f9b99de..3957e109c7c0 100644 --- a/nixpkgs/pkgs/development/python-modules/ansible/legacy.nix +++ b/nixpkgs/pkgs/development/python-modules/ansible/legacy.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.25"; + version = "2.9.26"; src = fetchPypi { inherit pname version; - sha256 = "sha256-i88sL1xgnluREUyosOQibWA7h/K+cdyzOOi30626oo8="; + sha256 = "sha256-OuAqrSu+3PtBnOdevSpkjp3rc+ni2N6GyC1gR7G962M="; }; prePatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/apispec/default.nix b/nixpkgs/pkgs/development/python-modules/apispec/default.nix index 2753864fed81..c5777d7c5173 100644 --- a/nixpkgs/pkgs/development/python-modules/apispec/default.nix +++ b/nixpkgs/pkgs/development/python-modules/apispec/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "apispec"; - version = "4.7.1"; + version = "5.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1yf71c9nq1rfb5pkgmfw486fvywi1bjnmgwxcly7y3basf3980kr"; + sha256 = "9ac7a7a6000339a02d05404ef561e013375f170de01d8b238782f8fb83082b5b"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/apprise/default.nix b/nixpkgs/pkgs/development/python-modules/apprise/default.nix index 1aa9dc2b1027..fbcd7addb2a5 100644 --- a/nixpkgs/pkgs/development/python-modules/apprise/default.nix +++ b/nixpkgs/pkgs/development/python-modules/apprise/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "apprise"; - version = "0.9.4"; + version = "0.9.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Q7iZD9GG8vPxITpn87l3yGtU+L8jwvs2Qi329LHlKrI="; + sha256 = "sha256-vwkHA66xK4LGhdazZ0o93+cSpGwgiTCMm8IC8D4G1Y0="; }; nativeBuildInputs = [ Babel installShellFiles ]; diff --git a/nixpkgs/pkgs/development/python-modules/apycula/default.nix b/nixpkgs/pkgs/development/python-modules/apycula/default.nix new file mode 100644 index 000000000000..c2e581832fe4 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/apycula/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, setuptools-scm +, numpy +, pandas +, pillow +, crcmod +, openpyxl +}: + +buildPythonPackage rec { + pname = "apycula"; + version = "0.0.1a9"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit version; + pname = "Apycula"; + sha256 = "01shkaxakisgg253jdwjkd81vnjgfws3gi2wyrdxmkcg95wphk5y"; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = [ + numpy + pandas + pillow + crcmod + openpyxl + ]; + + # tests require a physical FPGA + doCheck = false; + + pythonImportsCheck = [ "apycula" ]; + + meta = with lib; { + description = "Open Source tools for Gowin FPGAs"; + homepage = "https://github.com/YosysHQ/apicula"; + license = licenses.mit; + maintainers = with maintainers; [ newam ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/arcam-fmj/default.nix b/nixpkgs/pkgs/development/python-modules/arcam-fmj/default.nix index 8d74db04d1fa..a1f4892a245f 100644 --- a/nixpkgs/pkgs/development/python-modules/arcam-fmj/default.nix +++ b/nixpkgs/pkgs/development/python-modules/arcam-fmj/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "arcam-fmj"; - version = "0.11.1"; + version = "0.12.0"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "elupus"; repo = "arcam_fmj"; rev = version; - sha256 = "sha256-Vs32LGRN6kxG8sswvuUwuUbLv9GXuhJeK0CUGoo2EgE="; + sha256 = "sha256-YkoABsOLEl1gSCRgZr0lLZGzicr3N5KRNLDjfuQhy2U="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index 18f6b9859af5..9ef6cd046d66 100644 --- a/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.9792"; + version = "9.0.10010"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-st4h/ck7hxIx2cZ241C4hEFJvFsTqHmawAB4zsfQ/oU="; + sha256 = "sha256-Eyquud4Cc0bU4z+ElWs/gPzuNRtNKPMxWjSLpwFlBXQ="; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/arrow/default.nix b/nixpkgs/pkgs/development/python-modules/arrow/default.nix index d47dd61c3d47..956dd5f40f2d 100644 --- a/nixpkgs/pkgs/development/python-modules/arrow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/arrow/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "arrow"; - version = "1.1.0"; + version = "1.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1n2vzyrirfj7fp0zn6iipm3i8bch0g4m14z02nrvlyjiyfmi7zmq"; + sha256 = "dee7602f6c60e3ec510095b5e301441bc56288cb8f51def14dcb3079f623823a"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/asn1/default.nix b/nixpkgs/pkgs/development/python-modules/asn1/default.nix new file mode 100644 index 000000000000..7a83703f862c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/asn1/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, future +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "asn1"; + version = "2.4.1"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "andrivet"; + repo = "python-asn1"; + rev = "v${version}"; + sha256 = "0g2d5cr1pxsm5ackba7padf7gvlgrgv807kh0312s5axjd2cww2l"; + }; + + propagatedBuildInputs = [ + future + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "enum-compat" "" + ''; + + pytestFlagsArray = [ "tests/test_asn1.py" ]; + + pythonImportsCheck = [ "asn1" ]; + + meta = with lib; { + description = "Python ASN.1 encoder and decoder"; + homepage = "https://github.com/andrivet/python-asn1"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/astroid/default.nix b/nixpkgs/pkgs/development/python-modules/astroid/default.nix index 59bd0bc7c369..a4694663bb6b 100644 --- a/nixpkgs/pkgs/development/python-modules/astroid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/astroid/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.5.6"; # Check whether the version is compatible with pylint + version = "2.7.3"; # Check whether the version is compatible with pylint disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/nWXzuWkerUDvFT/tJTZuhfju46MAM0cwosVH9BXoY8="; + sha256 = "08qxw58cdyglkni6ahyil4cmnb48zz0wr4v05gzqk4r5ifs4gl2m"; }; SETUPTOOLS_SCM_PRETEND_VERSION=version; diff --git a/nixpkgs/pkgs/development/python-modules/asttokens/default.nix b/nixpkgs/pkgs/development/python-modules/asttokens/default.nix index bb4cf989cddf..251205419fe4 100644 --- a/nixpkgs/pkgs/development/python-modules/asttokens/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asttokens/default.nix @@ -1,29 +1,35 @@ -{ lib, fetchPypi, fetchpatch, buildPythonPackage, - setuptools-scm, toml, six, astroid, pytest +{ lib +, fetchPypi +, buildPythonPackage +, setuptools-scm +, six +, astroid +, pytestCheckHook }: buildPythonPackage rec { pname = "asttokens"; - version = "2.0.4"; + version = "2.0.5"; src = fetchPypi { inherit pname version; - sha256 = "0a2ixiz04aw4p0aivxh47k3fa9ql804l3y5iv5gcih9aizi5fbm4"; + sha256 = "sha256-mlTBFPAsepSA1WVQkyVGo/H+cdigLxvHzNDuPuNc9NU="; }; - patches = [ - # Fixes compatibility with python 3.9, will be included in the next release - # after 2.0.4 - (fetchpatch { - url = "https://github.com/gristlabs/asttokens/commit/d8ff80ee7d2e64c5e1daf50cc38eb99663f1b1ac.patch"; - sha256 = "19y8n8vpzr2ijldbq5rh19sf0vz5azqqpkb9bx0ljjg98h6k7kjj"; - excludes = [ "setup.cfg" ]; - }) + nativeBuildInputs = [ + setuptools-scm ]; - propagatedBuildInputs = [ setuptools-scm toml six astroid ]; + propagatedBuildInputs = [ + six + astroid + ]; + + checkInputs = [ + pytestCheckHook + ]; - checkInputs = [ pytest ]; + pythonImportsCheck = [ "asttokens" ]; meta = with lib; { homepage = "https://github.com/gristlabs/asttokens"; diff --git a/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix b/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix index 7f235485b757..f9256b11ae78 100644 --- a/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.21.0"; + version = "0.21.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "sha256-GKvljxm2N4pC8Mh+UOW170VPB3va9X9BuQXp6OJ/SSQ="; + sha256 = "sha256-85MdzvNac199pZObhfGv33ycgzt4nr9eHYvSjMW6kq8="; }; propagatedBuildInputs = [ @@ -39,20 +39,22 @@ buildPythonPackage rec { disabledTests = [ # socket.gaierror: [Errno -2] Name or service not known - "test_get_local_ip" "test_async_get_local_ip" + "test_get_local_ip" # OSError: [Errno 101] Network is unreachable - "test_subscribe_fail" - "test_subscribe_auto_resubscribe" - "test_subscribe_manual_resubscribe" "test_auto_resubscribe_fail" + "test_init" "test_on_notify_dlna_event" "test_on_notify_upnp_event" - "test_unsubscribe" + "test_server_init" + "test_server_start" + "test_start_server" "test_subscribe" + "test_subscribe_auto_resubscribe" + "test_subscribe_fail" + "test_subscribe_manual_resubscribe" "test_subscribe_renew" - "test_start_server" - "test_init" + "test_unsubscribe" ] ++ lib.optionals stdenv.isDarwin [ "test_deferred_callback_url" ]; diff --git a/nixpkgs/pkgs/development/python-modules/asynccmd/default.nix b/nixpkgs/pkgs/development/python-modules/asynccmd/default.nix new file mode 100644 index 000000000000..623424047429 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/asynccmd/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, pythonOlder +}: + +buildPythonPackage rec { + pname = "asynccmd"; + version = "0.2.4"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "valentinmk"; + repo = pname; + rev = version; + sha256 = "02sa0k0zgwv0y8k00pd1yh4x7k7xqhdikk2c0avpih1204lcw26h"; + }; + + patches = [ + # Deprecation of asyncio.Task.all_tasks(), https://github.com/valentinmk/asynccmd/pull/2 + (fetchpatch { + name = "deprecation-python-38.patch"; + url = "https://github.com/valentinmk/asynccmd/commit/12afa60ac07db17e96755e266061f2c88cb545ff.patch"; + sha256 = "0l6sk93gj51qqrpw01a8iiyz14k6dd2z68vr9l9w9vx76l8725yf"; + }) + ]; + + # Tests are outdated + doCheck = false; + + pythonImportsCheck = [ "asynccmd" ]; + + meta = with lib; { + description = "Asyncio implementation of Cmd Python library"; + homepage = "https://github.com/valentinmk/asynccmd"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix b/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix index dc68584d668f..a2434a9cb626 100644 --- a/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/asyncstdlib/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asyncstdlib"; - version = "3.9.2"; + version = "3.10.1"; disabled = pythonOlder "3.7"; format = "flit"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "maxfischer2781"; repo = pname; rev = "v${version}"; - sha256 = "04z0x2n4a7503h6xf853p7if218magi98x397648wb21l4gh3zwv"; + sha256 = "sha256-D8XaBny/m6dXMz6k/FhVX/5t8guNdJsfiX4cVQV4VIY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/atenpdu/default.nix b/nixpkgs/pkgs/development/python-modules/atenpdu/default.nix index c8307608204a..4a8c0ff0f31a 100644 --- a/nixpkgs/pkgs/development/python-modules/atenpdu/default.nix +++ b/nixpkgs/pkgs/development/python-modules/atenpdu/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "atenpdu"; - version = "0.3.1"; + version = "0.3.2"; src = fetchPypi { inherit pname version; - sha256 = "1np9p3d180c26p54nw33alb003lhx6fprr21h45dd8gqk3slm13c"; + sha256 = "sha256-hlbrjx6WKVJYaxrMT4fiRXlxKRcQU4AIQUVgA8mbWa8="; }; propagatedBuildInputs = [ pysnmp ]; diff --git a/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix b/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix index 67701afc0eb0..41e0ede31c5d 100644 --- a/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "3.16.2"; + version = "3.18.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Slpwml1GDdxAZ4P6Vn2brrupRofiOHvmQF26l0gtTJM="; + sha256 = "sha256-jitJF+puXaLv3qyJOjLFetzxRpnlbi4BKS0TzDmCRe8="; }; propagatedBuildInputs = [ @@ -30,6 +30,8 @@ buildPythonPackage rec { disabledTests = [ # tries to ping websites (e.g. google.com) "can_timeout" + "test_options_are_created_by_default" + "test_options_are_used_and_override" ]; pythonImportsCheck = [ "auth0" ]; diff --git a/nixpkgs/pkgs/development/python-modules/authcaptureproxy/default.nix b/nixpkgs/pkgs/development/python-modules/authcaptureproxy/default.nix index a780ae59be70..c03b423932df 100644 --- a/nixpkgs/pkgs/development/python-modules/authcaptureproxy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/authcaptureproxy/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "authcaptureproxy"; - version = "1.0.1"; + version = "1.0.2"; format = "pyproject"; src = fetchFromGitHub { owner = "alandtse"; repo = "auth_capture_proxy"; rev = "v${version}"; - sha256 = "1fbrmh6qa3dm3q3zdxaa0fls94wardbcvnjgwxk686wpjgs1xrs4"; + sha256 = "1cg63qhf823nf785kyl96r7vyxfl6dlbwsmhcpny8vb65pl9gng5"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/autopage/default.nix b/nixpkgs/pkgs/development/python-modules/autopage/default.nix new file mode 100644 index 000000000000..9a2ca722a62b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/autopage/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "autopage"; + version = "0.4.0"; + + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "18f511d8ef2e4d3cc22a986d345eab0e03f95b9fa80b74ca63b7fb001551dc42"; + }; + + pythonImportsCheck = [ "autopage" ]; + + meta = with lib; { + description = "A library to provide automatic paging for console output"; + homepage = "https://github.com/zaneb/autopage"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/awkward/default.nix b/nixpkgs/pkgs/development/python-modules/awkward/default.nix index 53cd4671d2ca..62f383c56785 100644 --- a/nixpkgs/pkgs/development/python-modules/awkward/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awkward/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "25ae6114d5962c717cb87e3bc30a2f6eaa232b252cf8c51ba805b8f04664ae0d"; + sha256 = "3cb1b0e28f420232d894d89665d5c0c8241b99e56d806171f4faf5cdfec08ae1"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/python-modules/awscrt/default.nix b/nixpkgs/pkgs/development/python-modules/awscrt/default.nix index 08e0563b966b..82e046c7b378 100644 --- a/nixpkgs/pkgs/development/python-modules/awscrt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/awscrt/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.11.24"; + version = "0.12.3"; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation Security ]); @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "b8aa68bca404bf0085be0570eff5b542d01f7e8e3c0f9b0859abfe5e070162ff"; + sha256 = "441262c36b450286132fde7f110823f7ae7ae909c0f6483a0a2d56150b62f2b5"; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/azure-core/default.nix b/nixpkgs/pkgs/development/python-modules/azure-core/default.nix index 8dce5b8feb75..cd0a816815cd 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-core/default.nix @@ -15,14 +15,14 @@ }: buildPythonPackage rec { - version = "1.16.0"; + version = "1.17.0"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b1c7d2e01846074f258c8b2e592239aef836a2b1c27d8d0e8491a2c7e2906ef4"; + sha256 = "25407390dde142d3e41ecf78bb18cedda9b7f7a0af558d082dec711c4a334f46"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-batchai/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-batchai/default.nix index 6f7aedacfae2..0c005c3ea3c2 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-batchai/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-batchai/default.nix @@ -2,10 +2,9 @@ , buildPythonPackage , fetchPypi , azure-common +, azure-mgmt-core , azure-mgmt-nspkg , msrestazure -, python -, isPy3k }: buildPythonPackage rec { @@ -21,8 +20,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg - ]; + ]; pythonNamespaces = [ "azure.mgmt" ]; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix index 9d83e092f5d8..45158b8015d5 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerinstance"; - version = "8.0.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7aeb380af71fc35a71d6752fa25eb5b95fdb2a0027fa32e6f50bce87e2622916"; + sha256 = "041431c5a768ac652aac318a17f2a53b90db968494c79abbafec441d0be387ff"; }; propagatedBuildInputs = [ @@ -31,6 +31,8 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.containerinstance" ]; + meta = with lib; { description = "This is the Microsoft Azure Container Instance Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix index 3401ed898c8f..36a797a0e834 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix @@ -2,27 +2,28 @@ , buildPythonPackage , fetchPypi , python -, isPy3k , msrest , msrestazure , azure-common +, azure-mgmt-core , azure-mgmt-nspkg }: buildPythonPackage rec { pname = "azure-mgmt-iothubprovisioningservices"; - version = "0.2.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "8c37acfd1c33aba845f2e0302ef7266cad31cba503cc990a48684659acb7b91d"; + sha256 = "e5871b03488b5ae6dfc441cdbda40cb39c000635ee57c513053792b3c15826a9"; }; propagatedBuildInputs = [ msrest msrestazure azure-common + azure-mgmt-core azure-mgmt-nspkg ]; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix index 6cf775c2118e..4c7233203bb9 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/azure-mgmt-apimanagement/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.3.0"; + version = "2.1.0"; pname = "azure-mgmt-apimanagement"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ec363581ef950945447e45d259441cb690a4b790057c7b8470ad8a6eeca04feb"; + sha256 = "58296bd45e876df33f93f3a41c866c36476f5f3bd46818e8891308794f041c94"; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix index fb82c33ba9be..eeec10b5eade 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "2.0.0"; + version = "2.1.0"; pname = "azure-mgmt-kusto"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "81601479e2b6da3e69654462674ef1474218c4415ef25c1d9892939721732153"; + sha256 = "171ea8719f543bd0dd4f3d6fa2277162d763182fe8e61b4db03f02668c1685b5"; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix index d1f49355f8b9..29b0dd2eb1ca 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservices"; - version = "1.0.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ab87108c0d5ce27d80583b4bfad966ad07049dcbc0e9ac28c64aa6bbdae64e22"; + sha256 = "a7d3137d5c460f50ac2d44061d60a70b4f2779d4ca844b77419b5725e65e09be"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix index 5dd689b976e4..28102aca7396 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-servicebus"; - version = "7.0.0"; + version = "7.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ee859efec2ec9fc8d059811967b1cb17836f4f5786e7406494a42f51f0667822"; + sha256 = "d8ae7905fb7d3e24822daa20aa7bc5014f41aa18b48ea2d0161e997fc11a3d36"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix index a34ebae2b812..76f0d7a2b39c 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix @@ -1,5 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , azure-common +, azure-mgmt-core , msrest , msrestazure }: @@ -15,7 +16,12 @@ buildPythonPackage rec { extension = "zip"; }; - propagatedBuildInputs = [ azure-common msrest msrestazure ]; + propagatedBuildInputs = [ + azure-common + azure-mgmt-core + msrest + msrestazure + ]; # no tests included doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 86c5005c8769..3c47f7f0dad2 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { - version = "18.0.0"; + version = "19.0.0"; pname = "azure-mgmt-storage"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d17beb34273797fa89863632ff0e1eb9b6a55198abb8c7f05d84980762e5f71f"; + sha256 = "f05963e5a8696d0fd4dcadda4feecb9b382a380d2e461b3647704ac787d79876"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix b/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix index eb2fb40b3365..b6c639b6246b 100644 --- a/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "azure-storage-file-share"; - version = "12.5.0"; + version = "12.6.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ed82e9bf8d25d62e50996604fce701cec6a39ec0ceba6efbf8790f7f8b7746a8"; + sha256 = "7eb0cde00fbbb6b780da8bdd81312ab79de706c4a2601e4eded1bc430da680a8"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix b/nixpkgs/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix new file mode 100644 index 000000000000..4a8b98be01ba --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonPackage, fetchPypi +, azure-common +, azure-core +, msrest +}: + +buildPythonPackage rec { + pname = "azure-synapse-managedprivateendpoints"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "900eaeaccffdcd01012b248a7d049008c92807b749edd1c9074ca9248554c17e"; + }; + + propagatedBuildInputs = [ + azure-common + azure-core + msrest + ]; + + pythonNamespaces = [ "azure.synapse" ]; + + pythonImportsCheck = [ "azure.synapse.managedprivateendpoints" ]; + + meta = with lib; { + description = "Microsoft Azure Synapse Managed Private Endpoints Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/backports-entry-points-selectable/default.nix b/nixpkgs/pkgs/development/python-modules/backports-entry-points-selectable/default.nix index 02117f7282e3..abf6774ddef2 100644 --- a/nixpkgs/pkgs/development/python-modules/backports-entry-points-selectable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/backports-entry-points-selectable/default.nix @@ -1,36 +1,32 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, importlib-metadata -, pytestCheckHook -}: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools-scm, importlib-metadata }: buildPythonPackage rec { - pname = "backports.entry-points-selectable"; - version = "1.0.4"; + pname = "backports-entry-points-selectable"; + version = "1.1.0"; src = fetchPypi { + pname = "backports.entry_points_selectable"; inherit version; - # pypi project name and tarball name differ - pname = builtins.replaceStrings [ "-" ] [ "_" ] pname; - sha256 = "4acda84d96855beece3bf9aad9a1030aceb5f744b8ce9af7d5ee6dd672cdd3bd"; + sha256 = "988468260ec1c196dab6ae1149260e2f5472c9110334e5d51adcb77867361f6a"; }; - format = "pyproject"; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - checkInputs = [ - pytestCheckHook - ]; + # no tests + doCheck = false; + + pythonImportsCheck = [ "backports.entry_points_selectable" ]; + + pythonNamespaces = [ "backports" ]; meta = with lib; { description = "Compatibility shim providing selectable entry points for older implementations"; - license = licenses.mit; - maintainers = [ maintainers.sternenseemann ]; homepage = "https://github.com/jaraco/backports.entry_points_selectable"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/nixpkgs/pkgs/development/python-modules/backports_functools_lru_cache/default.nix index cb5665363f9c..21920c32b4d2 100644 --- a/nixpkgs/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/nixpkgs/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -30,6 +30,8 @@ buildPythonPackage rec { # Test fail on Python 2 doCheck = isPy3k; + pythonNamespaces = [ "backports" ]; + meta = { description = "Backport of functools.lru_cache"; homepage = "https://github.com/jaraco/backports.functools_lru_cache"; diff --git a/nixpkgs/pkgs/development/python-modules/bellows/default.nix b/nixpkgs/pkgs/development/python-modules/bellows/default.nix index e52e07627dbb..8caebee0ed5d 100644 --- a/nixpkgs/pkgs/development/python-modules/bellows/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bellows/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "zigpy"; repo = "bellows"; rev = version; - sha256 = "0qbsk5iv3vrpwz7kfmjdbc66rfkg788p6wwxbf6jzfarfhcgrh3k"; + sha256 = "sha256-lsGpCd4XgwP91JmRpV6ohXefd1Hm9C51Jk4shU6Irkw="; }; propagatedBuildInputs = [ @@ -46,10 +46,9 @@ buildPythonPackage rec { ]; disabledTests = [ - # RuntimeError: coroutine 'test_remigrate_forcibly_downgraded_v4' was never awaited - #"test_remigrate_forcibly_downgraded_v4" - # RuntimeError: Event loop is closed - "test_thread_already_stopped" + # AssertionError: assert 65534 is None + # https://github.com/zigpy/bellows/issues/436 + "test_startup_nwk_params" ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/beniget/default.nix b/nixpkgs/pkgs/development/python-modules/beniget/default.nix index f8733eeed626..51f641c51eb4 100644 --- a/nixpkgs/pkgs/development/python-modules/beniget/default.nix +++ b/nixpkgs/pkgs/development/python-modules/beniget/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "beniget"; - version = "0.4.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "72bbd47b1ae93690f5fb2ad3902ce1ae61dcd868ce6cfbf33e9bad71f9ed8749"; + sha256 = "75554b3b8ad0553ce2f607627dad3d95c60c441189875b98e097528f8e23ac0c"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix b/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix index f39e775fc257..f189572f12e3 100644 --- a/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.8.2"; + version = "1.8.3"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "7969d55e9ed07f6cf7dfd72ed696a05abe56a2f35e81a1ef677f3694b2adf606"; + sha256 = "a2940b447fdbea084311de55d415a1538299ad40ee1cc6ae711319c0734dc401"; }; # needs packages which are not available in nixpkgs diff --git a/nixpkgs/pkgs/development/python-modules/biplist/default.nix b/nixpkgs/pkgs/development/python-modules/biplist/default.nix index b3e9f7b83740..c6714c3d4cbc 100644 --- a/nixpkgs/pkgs/development/python-modules/biplist/default.nix +++ b/nixpkgs/pkgs/development/python-modules/biplist/default.nix @@ -1,10 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook }: buildPythonPackage rec { - version = "1.0.3"; pname = "biplist"; + version = "1.0.3"; src = fetchPypi { inherit pname version; @@ -12,12 +14,18 @@ buildPythonPackage rec { }; checkInputs = [ - pytest + pytestCheckHook + ]; + + disabledTests = [ + # Failing tests + "testConvertToXMLPlistWithData" + "testWriteToFile" + "testXMLPlist" + "testXMLPlistWithData" ]; - checkPhase = '' - pytest - ''; + pythonImportsCheck = [ "biplist" ]; meta = with lib; { homepage = "https://bitbucket.org/wooster/biplist/src/master/"; diff --git a/nixpkgs/pkgs/development/python-modules/bitarray/default.nix b/nixpkgs/pkgs/development/python-modules/bitarray/default.nix index ad20467f162d..43cc2dbd5bce 100644 --- a/nixpkgs/pkgs/development/python-modules/bitarray/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bitarray/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.3.3"; + version = "2.3.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Dt9jCkRxpIYnrsC4QM87jhCQEZHTKPZRFWBCBFneKC4="; + sha256 = "f19c62425576d3d1821ed711b94d1a4e5ede8f05ca121e99b6d978ed49c7a765"; }; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/bitlist/default.nix b/nixpkgs/pkgs/development/python-modules/bitlist/default.nix index 9dea05cac9ea..e985dbf28c0f 100644 --- a/nixpkgs/pkgs/development/python-modules/bitlist/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bitlist/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "bitlist"; - version = "0.4.0"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IL1tpP/F6O3BvJab6aC6r6PhRgKFpLp9aXmOK1rQXaU="; + sha256 = "sha256-bX/Z5FBm21gX4ax/HfqD2bNotZyNFX7dHCEN5uZzQJQ="; }; propagatedBuildInputs = [ @@ -24,6 +24,11 @@ buildPythonPackage rec { nose ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "parts~=1.0.3" "parts>=1.0.3" + ''; + pythonImportsCheck = [ "bitlist" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/black/default.nix b/nixpkgs/pkgs/development/python-modules/black/default.nix index 772ad57e7fe3..948d734d5317 100644 --- a/nixpkgs/pkgs/development/python-modules/black/default.nix +++ b/nixpkgs/pkgs/development/python-modules/black/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "black"; - version = "21.8b0"; + version = "21.9b0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-VwYI0oqjrxeSuYxKM326xjZ4d7R7EriKtCCVz8GmJ8I="; + sha256 = "sha256-feTPx+trcQ3jJXEtQBJWiRAdIdJSg+7X6ZmHIs8Q65E="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/block-io/default.nix b/nixpkgs/pkgs/development/python-modules/block-io/default.nix index b823b8711a53..a76132e3e211 100644 --- a/nixpkgs/pkgs/development/python-modules/block-io/default.nix +++ b/nixpkgs/pkgs/development/python-modules/block-io/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "block-io"; - version = "1.1.15"; + version = "2.0.4"; src = fetchPypi { inherit pname version; - sha256 = "97ea037a67af72037cb08cec7e0a9f7866ecdfaa1a8c8ebcc0f4b9359a1516d7"; + sha256 = "817c9cd2ff76659caca4bb3d6758d5782a85f8c0ea13b08c4e14f0c2a8b7586d"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/bokeh/default.nix b/nixpkgs/pkgs/development/python-modules/bokeh/default.nix index 6677d9ceacb9..925eb9c8f39d 100644 --- a/nixpkgs/pkgs/development/python-modules/bokeh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/bokeh/default.nix @@ -34,11 +34,11 @@ buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "2.3.2"; + version = "2.3.3"; src = fetchPypi { inherit pname version; - sha256 = "fcc0d0a3129ae457cdb0a4f503843a4d13d1f5d07af7748424ea8c7ddfc321f1"; + sha256 = "a5fdcc181835561447fcc5a371300973fce4114692d5853addec284d1cdeb677"; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/boto3/1_17.nix b/nixpkgs/pkgs/development/python-modules/boto3/1_17.nix new file mode 100644 index 000000000000..c8b8210f6503 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/boto3/1_17.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchPypi +, botocore +, jmespath +, s3transfer +, futures ? null +, docutils +, nose +, mock +, isPy3k +}: + +buildPythonPackage rec { + pname = "boto3"; + version = "1.17.97"; # N.B: if you change this, change botocore and awscli to a matching version + + src = fetchPypi { + inherit pname version; + sha256 = "0ab5afc51461c30f27aebef944211d16f47697b98ff8d2e2f6e49e59584853bb"; + }; + + propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; + checkInputs = [ docutils nose mock ]; + + checkPhase = '' + runHook preCheck + # This method is not in mock. It might have appeared in some versions. + sed -i 's/action.assert_called_once()/self.assertEqual(action.call_count, 1)/' \ + tests/unit/resources/test_factory.py + nosetests -d tests/unit --verbose + runHook postCheck + ''; + + # Network access + doCheck = false; + + pythonImportsCheck = [ "boto3" ]; + + meta = { + homepage = "https://github.com/boto/boto3"; + license = lib.licenses.asl20; + description = "AWS SDK for Python"; + longDescription = '' + Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for + Python, which allows Python developers to write software that makes use of + services like Amazon S3 and Amazon EC2. + ''; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/nixpkgs/pkgs/development/python-modules/boto3/default.nix index c8b8210f6503..3ecc2034d483 100644 --- a/nixpkgs/pkgs/development/python-modules/boto3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.17.97"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.18.31"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "0ab5afc51461c30f27aebef944211d16f47697b98ff8d2e2f6e49e59584853bb"; + sha256 = "sha256-WURdDh1VyMlnVpfqQcmKDYIImkvjB26mDjqHy+lNwUE="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/nixpkgs/pkgs/development/python-modules/botocore/1_20.nix b/nixpkgs/pkgs/development/python-modules/botocore/1_20.nix new file mode 100644 index 000000000000..d05c2decf497 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/botocore/1_20.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python-dateutil +, jmespath +, docutils +, ordereddict +, simplejson +, mock +, nose +, urllib3 +}: + +buildPythonPackage rec { + pname = "botocore"; + version = "1.20.97"; # N.B: if you change this, change boto3 and awscli to a matching version + + src = fetchPypi { + inherit pname version; + sha256 = "f7e119cf3e0f4a36100f0e983583afa91a84fb27c479a1716820aee4f2e190ab"; + }; + + propagatedBuildInputs = [ + python-dateutil + jmespath + docutils + ordereddict + simplejson + urllib3 + ]; + + checkInputs = [ mock nose ]; + + checkPhase = '' + nosetests -v + ''; + + # Network access + doCheck = false; + + pythonImportsCheck = [ "botocore" ]; + + meta = with lib; { + homepage = "https://github.com/boto/botocore"; + license = licenses.asl20; + description = "A low-level interface to a growing number of Amazon Web Services"; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/nixpkgs/pkgs/development/python-modules/botocore/default.nix index d05c2decf497..cdb3f54c855e 100644 --- a/nixpkgs/pkgs/development/python-modules/botocore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/botocore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.20.97"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.21.31"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "f7e119cf3e0f4a36100f0e983583afa91a84fb27c479a1716820aee4f2e190ab"; + sha256 = "sha256-WM0xXirglxrNs9fNqcnDa0HHMYH0GUOnRDgS1tPJrRg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/braintree/default.nix b/nixpkgs/pkgs/development/python-modules/braintree/default.nix index 6d64def54ab6..17681f053337 100644 --- a/nixpkgs/pkgs/development/python-modules/braintree/default.nix +++ b/nixpkgs/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "4.10.0"; + version = "4.12.0"; src = fetchPypi { inherit pname version; - sha256 = "f934a329c7a2b3f7058d5c733cc95da694f66afb5a789162ec701ba4d26a0d90"; + sha256 = "946abd50fe2843eec586ac3cec285d27dfae0cc5a43a64b505e8a2800b8a74a6"; }; propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/breathe/default.nix b/nixpkgs/pkgs/development/python-modules/breathe/default.nix index d863d9463992..7770996f423d 100644 --- a/nixpkgs/pkgs/development/python-modules/breathe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/breathe/default.nix @@ -1,13 +1,13 @@ { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }: buildPythonPackage rec { - version = "4.30.0"; + version = "4.31.0"; pname = "breathe"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "363dec85abc0c4b3f22628b0cf82cc2dc46c4397d8a18312d1a7d1365d49b014"; + sha256 = "925eeff96c6640cd857e4ddeae6f75464a1d5e2e08ee56dccce4043583ae2050"; }; propagatedBuildInputs = [ docutils six sphinx ]; diff --git a/nixpkgs/pkgs/development/python-modules/brotli/default.nix b/nixpkgs/pkgs/development/python-modules/brotli/default.nix index 1edc62317a64..0556c5b4e2a2 100644 --- a/nixpkgs/pkgs/development/python-modules/brotli/default.nix +++ b/nixpkgs/pkgs/development/python-modules/brotli/default.nix @@ -1,4 +1,7 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytest }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook }: buildPythonPackage rec { pname = "brotli"; @@ -16,15 +19,18 @@ buildPythonPackage rec { dontConfigure = true; - checkInputs = [ pytest ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - pytest python/tests - ''; + pytestFlagsArray = [ + "python/tests" + ]; - meta = { + meta = with lib; { homepage = "https://github.com/google/brotli"; description = "Generic-purpose lossless compression algorithm"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix b/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix index 4a4f56f5abf5..ca64d599534e 100644 --- a/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix @@ -1,5 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi -, frozendict, simplejson, six, isPy27 +{ lib +, buildPythonPackage +, fetchPypi +, frozendict +, simplejson +, six +, isPy27 +, pytestCheckHook }: buildPythonPackage rec { @@ -13,7 +19,15 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - frozendict simplejson six + frozendict + simplejson + six + ]; + + checkInputs = [ pytestCheckHook ]; + + disabledTests = [ + "test_frozen_dict" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/nixpkgs/pkgs/development/python-modules/casbin/default.nix index 3f2b26e9c5f9..b813eb47c697 100644 --- a/nixpkgs/pkgs/development/python-modules/casbin/default.nix +++ b/nixpkgs/pkgs/development/python-modules/casbin/default.nix @@ -4,11 +4,12 @@ , simpleeval , isPy27 , coveralls +, wcmatch }: buildPythonPackage rec { pname = "casbin"; - version = "0.20.0"; + version = "1.9.0"; disabled = isPy27; @@ -16,11 +17,12 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "1j7kd4rvf4myg4x4sm4njlhzkxm2m3cva9wmp9vx0nnpfdlyb67f"; + sha256 = "01prcwkmh3a4ggzjiaai489rrpmgwvqpjcavwjxw60mspyhsbv86"; }; propagatedBuildInputs = [ simpleeval + wcmatch ]; checkInputs = [ @@ -31,10 +33,14 @@ buildPythonPackage rec { coverage run -m unittest discover -s tests -t tests ''; + pythonImportsCheck = [ + "casbin" + ]; + meta = with lib; { description = "An authorization library that supports access control models like ACL, RBAC, ABAC in Python"; homepage = "https://github.com/casbin/pycasbin"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/censys/default.nix b/nixpkgs/pkgs/development/python-modules/censys/default.nix index 06e619676a67..0d14441932e3 100644 --- a/nixpkgs/pkgs/development/python-modules/censys/default.nix +++ b/nixpkgs/pkgs/development/python-modules/censys/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.0.6"; + version = "2.0.8"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "v${version}"; - sha256 = "sha256-Lbd2Pm79n0cFoGHC2rucxgZijzcVYVJJsq1yzqB9QLk="; + sha256 = "sha256-2qMUQ+MRrPzXlH+WUJ8DSXtrgaZp4OD36X8cX7cNIks="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cffi/default.nix b/nixpkgs/pkgs/development/python-modules/cffi/default.nix index 92899ed85e58..94aecdcc4ec4 100644 --- a/nixpkgs/pkgs/development/python-modules/cffi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cffi/default.nix @@ -2,11 +2,11 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.14.5"; + version = "1.14.6"; src = fetchPypi { inherit pname version; - sha256 = "fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c"; + sha256 = "c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix b/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix index d8e0af78e1cd..6f6d55502958 100644 --- a/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.53.0"; + version = "0.53.1"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "v${version}"; - sha256 = "sha256-UHcbbBoByoxW7+AUxu5mQmcvC3irHPQvBv4CbBXPTNo="; + sha256 = "1wj2pzrrmrdf3mkhnz1qx41rshvfpgwlrxrb80d63r098pnq6df8"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/charset-normalizer/default.nix b/nixpkgs/pkgs/development/python-modules/charset-normalizer/default.nix new file mode 100644 index 000000000000..dc0f5e1b296a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/charset-normalizer/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "charset-normalizer"; + version = "2.0.1"; + + src = fetchFromGitHub { + owner = "Ousret"; + repo = "charset_normalizer"; + rev = version; + sha256 = "04rnyrqay11kma9pzagi1mzhc0sq37ggpv39kad2d4ynm35v2hfq"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=charset_normalizer --cov-report=term-missing" "" + ''; + + pythonImportsCheck = [ "charset_normalizer" ]; + + meta = with lib; { + description = "Python module for encoding and language detection"; + homepage = "https://charset-normalizer.readthedocs.io/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix b/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix index e059725cad24..2873b7e99ef0 100644 --- a/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "4.14.3"; + version = "5.3.1"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; rev = "v${version}"; - sha256 = "1yrrcn9032r3l8y2cc1wvpydg4rkqvgkpyv1s7znby5mrxa1rjma"; + sha256 = "11jazr5s2rmcxbkpb79gllwlyxvji3f0ryfrj7mkbyvfnfv43gly"; }; sourceRoot = "source/packages/python/chart-studio"; diff --git a/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix b/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix index de833e18be8e..608f3a0cac68 100644 --- a/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/check-manifest/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "check-manifest"; - version = "0.46"; + version = "0.47"; src = fetchPypi { inherit pname version; - sha256 = "5895e42a012989bdc51854a02c82c8d6898112a4ab11f2d7878200520b49d428"; + sha256 = "56dadd260a9c7d550b159796d2894b6d0bcc176a94cbc426d9bb93e5e48d12ce"; }; # Test requires filesystem access diff --git a/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/nixpkgs/pkgs/development/python-modules/claripy/default.nix index 5a80bb1dc360..1db9b5959e65 100644 --- a/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.9792"; + version = "9.0.10010"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9jwD75leV02N5B7RaLF2DbC6GjhoDQMmkfFIO9MJ4Es="; + sha256 = "sha256-bcVbGDUTVLQ6ybPA2HjRlHJj1gnYK2dazhZXc9k0uSY="; }; # Use upstream z3 implementation diff --git a/nixpkgs/pkgs/development/python-modules/cle/default.nix b/nixpkgs/pkgs/development/python-modules/cle/default.nix index 0b4b0fc94d00..3d709b749d26 100644 --- a/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.9792"; + version = "9.0.10010"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lCRZj0/L/XNcnJNiLxPY2mCFZowV6hLEpHOEiCsyQ/0="; + sha256 = "sha256-Fq/xkcG6wLRaXG37UEf/3r+EsacpkP2iA+HZLT05ETg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cliff/default.nix b/nixpkgs/pkgs/development/python-modules/cliff/default.nix index bb856736d92b..8b8f536bab6f 100644 --- a/nixpkgs/pkgs/development/python-modules/cliff/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cliff/default.nix @@ -1,56 +1,54 @@ { lib , buildPythonPackage , fetchPypi +, autopage +, cmd2 , pbr , prettytable , pyparsing -, six -, stevedore , pyyaml -, cmd2 -, pytestCheckHook -, testtools -, fixtures -, which +, stevedore +, callPackage }: buildPythonPackage rec { pname = "cliff"; - version = "3.8.0"; + version = "3.9.0"; src = fetchPypi { inherit pname version; - sha256 = "8dd215d0a84c9a3ab2fa2aa700849f4e7b786639f66caa0ad4108c85dca95a7c"; + sha256 = "95363e9b43e2ec9599e33b5aea27a6953beda2d0673557916fa4f5796857daa3"; }; + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + propagatedBuildInputs = [ + autopage + cmd2 pbr prettytable pyparsing - six - stevedore pyyaml - cmd2 + stevedore ]; - postPatch = '' - sed -i -e '/cmd2/c\cmd2' -e '/PrettyTable/c\PrettyTable' requirements.txt - ''; + # check in passthru.tests.pytest to escape infinite recursion with stestr + doCheck = false; - checkInputs = [ fixtures pytestCheckHook testtools which ]; - # add some tests - pytestFlagsArray = [ - "cliff/tests/test_utils.py" - "cliff/tests/test_app.py" - "cliff/tests/test_command.py" - "cliff/tests/test_help.py" - "cliff/tests/test_lister.py" - ]; + pythonImportsCheck = [ "cliff" ]; + + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; meta = with lib; { description = "Command Line Interface Formulation Framework"; - homepage = "https://docs.openstack.org/cliff/latest/"; + homepage = "https://github.com/openstack/cliff"; license = licenses.asl20; - maintainers = [ maintainers.costrouc ]; + maintainers = teams.openstack.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/cliff/tests.nix b/nixpkgs/pkgs/development/python-modules/cliff/tests.nix new file mode 100644 index 000000000000..f7cc0226f2fc --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/cliff/tests.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, cliff +, docutils +, stestr +, testscenarios +}: + +buildPythonPackage rec { + pname = "cliff"; + inherit (cliff) version; + + src = cliff.src; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + cliff + docutils + stestr + testscenarios + ]; + + checkPhase = '' + stestr run + ''; +} diff --git a/nixpkgs/pkgs/development/python-modules/cmd2/default.nix b/nixpkgs/pkgs/development/python-modules/cmd2/default.nix index b5bbc88c341f..f74cf77c5e4a 100644 --- a/nixpkgs/pkgs/development/python-modules/cmd2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cmd2/default.nix @@ -1,60 +1,74 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k -, pyperclip, six, pyparsing, vim, wcwidth, colorama, attrs -, contextlib2 ? null, typing ? null, setuptools-scm -, pytest, mock ? null, pytest-mock -, which, glibcLocales +{ lib +, stdenv +, attrs +, buildPythonPackage +, colorama +, fetchPypi +, glibcLocales +, importlib-metadata +, pyperclip +, pytest-mock +, pytestCheckHook +, pythonOlder +, setuptools-scm +, typing-extensions +, vim +, wcwidth }: + buildPythonPackage rec { pname = "cmd2"; - version = "1.5.0"; + version = "2.1.2"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "701a8c9975c4abc45e5d13906ab149f959f812869106347323a3f89ac0e82a62"; + sha256 = "25dbb2e9847aaa686a8a21e84e3d101db8b79f5cb992e044fc54210ab8c0ad41"; }; - LC_ALL="en_US.UTF-8"; - - postPatch = lib.optionalString stdenv.isDarwin '' - # Fake the impure dependencies pbpaste and pbcopy - mkdir bin - echo '#!${stdenv.shell}' > bin/pbpaste - echo '#!${stdenv.shell}' > bin/pbcopy - chmod +x bin/{pbcopy,pbpaste} - export PATH=$(realpath bin):$PATH - ''; - - disabled = !isPy3k; + LC_ALL = "en_US.UTF-8"; buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ + attrs colorama pyperclip - six - pyparsing wcwidth - attrs - ] - ++ lib.optionals (pythonOlder "3.5") [contextlib2 typing] - ; + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + importlib-metadata + ]; + checkInputs = [ + pytestCheckHook + glibcLocales + pytest-mock + vim + ]; - doCheck = !stdenv.isDarwin; - # pytest-cov - # argcomplete will generate errors - checkInputs= [ pytest mock which vim glibcLocales pytest-mock ] - ++ lib.optional (pythonOlder "3.6") [ mock ]; - checkPhase = '' - # test_path_completion_user_expansion might be fixed in the next release - py.test -k 'not test_path_completion_user_expansion' + postPatch = '' + sed -i "/--cov/d" setup.cfg + '' + lib.optionalString stdenv.isDarwin '' + # Fake the impure dependencies pbpaste and pbcopy + mkdir bin + echo '#!${stdenv.shell}' > bin/pbpaste + echo '#!${stdenv.shell}' > bin/pbcopy + chmod +x bin/{pbcopy,pbpaste} + export PATH=$(realpath bin):$PATH ''; + doCheck = !stdenv.isDarwin; + + pythonImportsCheck = [ "cmd2" ]; + meta = with lib; { description = "Enhancements for standard library's cmd module"; homepage = "https://github.com/python-cmd2/cmd2"; + license = with licenses; [ mit ]; maintainers = with maintainers; [ teto ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/colorlog/default.nix b/nixpkgs/pkgs/development/python-modules/colorlog/default.nix index 39b64e4faf3e..6abb6ff023ad 100644 --- a/nixpkgs/pkgs/development/python-modules/colorlog/default.nix +++ b/nixpkgs/pkgs/development/python-modules/colorlog/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "colorlog"; - version = "5.0.1"; + version = "6.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8XwBOgaWKwL0RJ7gfP2+ayh98p78LJoVFbSjdvTliOo="; + sha256 = "af99440154a01f27c09256760ea3477982bf782721feaa345904e806879df4d8"; }; checkInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/commoncode/default.nix b/nixpkgs/pkgs/development/python-modules/commoncode/default.nix index 16d529b17f53..136a638c352c 100644 --- a/nixpkgs/pkgs/development/python-modules/commoncode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/commoncode/default.nix @@ -14,11 +14,11 @@ }: buildPythonPackage rec { pname = "commoncode"; - version = "21.6.11"; + version = "21.8.31"; src = fetchPypi { inherit pname version; - sha256 = "d6c8c985746a541913d5bb534c770f2422e5b4ac7a4ef765abc05c287a40ff4b"; + sha256 = "0e74c61226834393801e921ab125eae3b52361340278fb9a468c5c691d286c32"; }; dontConfigure = true; diff --git a/nixpkgs/pkgs/development/python-modules/configargparse/default.nix b/nixpkgs/pkgs/development/python-modules/configargparse/default.nix index 45ec7364a59a..1bb036b97df5 100644 --- a/nixpkgs/pkgs/development/python-modules/configargparse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/configargparse/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "configargparse"; - version = "1.4.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "bw2"; repo = "ConfigArgParse"; - rev = "v${version}"; - sha256 = "sha256-hzhjrdrXxjksvbHlTnQVsT350g0yuG1F21fElv6bLSA="; + rev = version; + sha256 = "1hgd0gfxycfnlddwsr8sl6ybxzp8rqhin16vphbl8q32wp5hhjd2"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/configparser/default.nix b/nixpkgs/pkgs/development/python-modules/configparser/default.nix index a939f6623c9c..3eeae353d115 100644 --- a/nixpkgs/pkgs/development/python-modules/configparser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/configparser/default.nix @@ -1,6 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools-scm -, toml -}: +{ lib, stdenv, buildPythonPackage, fetchPypi, setuptools-scm }: buildPythonPackage rec { pname = "configparser"; @@ -14,7 +12,7 @@ buildPythonPackage rec { # No tests available doCheck = false; - nativeBuildInputs = [ setuptools-scm toml ]; + nativeBuildInputs = [ setuptools-scm ]; preConfigure = '' export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8 diff --git a/nixpkgs/pkgs/development/python-modules/contextlib2/0.nix b/nixpkgs/pkgs/development/python-modules/contextlib2/0.nix new file mode 100644 index 000000000000..38d9fb696e28 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/contextlib2/0.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchPypi +, unittest2 +}: + +buildPythonPackage rec { + pname = "contextlib2"; + version = "0.6.0.post1"; + + src = fetchPypi { + inherit pname version; + sha256 = "01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e"; + }; + + checkInputs = [ unittest2 ]; + + meta = { + description = "Backports and enhancements for the contextlib module"; + homepage = "https://contextlib2.readthedocs.org/"; + license = lib.licenses.psfl; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/contextlib2/default.nix b/nixpkgs/pkgs/development/python-modules/contextlib2/default.nix index 38d9fb696e28..1387e786e7b7 100644 --- a/nixpkgs/pkgs/development/python-modules/contextlib2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/contextlib2/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "contextlib2"; - version = "0.6.0.post1"; + version = "21.6.0"; src = fetchPypi { inherit pname version; - sha256 = "01f490098c18b19d2bd5bb5dc445b2054d2fa97f09a4280ba2c5f3c394c8162e"; + sha256 = "ab1e2bfe1d01d968e1b7e8d9023bc51ef3509bba217bb730cee3827e1ee82869"; }; checkInputs = [ unittest2 ]; diff --git a/nixpkgs/pkgs/development/python-modules/coqpit/default.nix b/nixpkgs/pkgs/development/python-modules/coqpit/default.nix index a30c727eaa3c..c36e353e3bf2 100644 --- a/nixpkgs/pkgs/development/python-modules/coqpit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/coqpit/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "coqpit"; - version = "0.0.13"; + version = "0.0.14"; format = "setuptools"; src = fetchFromGitHub { owner = "coqui-ai"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YzCO/i0SMyXRAgiZ8Y97bHHuGFeSF8GqUjvNoHLwXZQ="; + sha256 = "041sx7ph8vfx8ivvm6hjj6s83p9lni2agwyrrncqwhcbjy9pbdf1"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/cryptacular/default.nix b/nixpkgs/pkgs/development/python-modules/cryptacular/default.nix index dccfddaea1ae..31c0ebace475 100644 --- a/nixpkgs/pkgs/development/python-modules/cryptacular/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cryptacular/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "cryptacular"; - version = "1.5.5"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "fb4d48716e88e4d050255ff0f065f6d437caa358ceef16ba5840c95cece224f9"; + sha256 = "7b529cb2b8a3c7e5be77921bf1ebc653d4d3a8f791375cc6f971b20db2404176"; }; buildInputs = [ coverage nose ]; diff --git a/nixpkgs/pkgs/development/python-modules/cryptography/default.nix b/nixpkgs/pkgs/development/python-modules/cryptography/default.nix index 9b35b5654e26..2fea6e89494d 100644 --- a/nixpkgs/pkgs/development/python-modules/cryptography/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cryptography/default.nix @@ -23,18 +23,18 @@ buildPythonPackage rec { pname = "cryptography"; - version = "3.4.7"; # Also update the hash in vectors.nix + version = "3.4.8"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; - sha256 = "04x7bhjkglxpllad10821vxddlmxdkd3gjvp35iljmnj2s0xw41x"; + sha256 = "072awar70cwfd2hnx0pvp1dkc7gw45mbm3wcyddvxz5frva5xk4l"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - sha256 = "1m6smky4nahwlp4hn6yzibrcxlbsw4nx162dsq48vlw8h1lgjl62"; + sha256 = "01h511h6l4qvjxbaw662m1l84pb4wrhwxmnb3qj6ik13mx2m477m"; }; cargoRoot = "src/rust"; diff --git a/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix b/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix index 0cb23d53c03c..7602582f8306 100644 --- a/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix +++ b/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1hh4j88ywil3jf62ppj1blygmdirbqz86pynd9lqfijiaym3mb57"; + sha256 = "1wl0ynh3lzhc6q59g8mybvijmnp195x7fjxlb3h3sgcraw14312c"; }; # No tests included diff --git a/nixpkgs/pkgs/development/python-modules/cucumber-tag-expressions/default.nix b/nixpkgs/pkgs/development/python-modules/cucumber-tag-expressions/default.nix index 6a2d1b1d31e6..09987ddb3bf2 100644 --- a/nixpkgs/pkgs/development/python-modules/cucumber-tag-expressions/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cucumber-tag-expressions/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cucumber-tag-expressions"; - version = "4.0.0"; + version = "4.0.2"; src = fetchPypi { inherit pname version; - sha256 = "83ce5fa87d1b37a690106aedf58a12d0d16758f38f73336f2c703e2bfe01d7db"; + sha256 = "4ef4e0513d4c26d42299ffed010ed5e24125b87fc64de2e74b979d4a84c8f522"; }; checkInputs = [ pytest pytest-html ]; diff --git a/nixpkgs/pkgs/development/python-modules/cupy/default.nix b/nixpkgs/pkgs/development/python-modules/cupy/default.nix index 6a072ab8e1a7..c165c9af7a20 100644 --- a/nixpkgs/pkgs/development/python-modules/cupy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cupy/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "cupy"; - version = "8.6.0"; + version = "9.4.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f3ed02ba18e38b4f3ed2c324fa08967e6714f59357ccb0b28badd9572e77500b"; + sha256 = "4402bd33a051e82f6888dab088a8d657714ca6d1e945b513dcc513a95a435bd5"; }; preConfigure = '' diff --git a/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix b/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix index d3cbc94f7153..70c29e1f30be 100644 --- a/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix @@ -17,13 +17,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); buildPythonPackage rec { pname = "cvxopt"; - version = "1.2.6"; + version = "1.2.7"; disabled = isPyPy; # hangs at [translation:info] src = fetchPypi { inherit pname version; - sha256 = "a4c433706fd0ad9d47e7f222773a7f7601766fb8e74b633524b3c3fce29aa73e"; + sha256 = "3f9db1f4d4e820aaea81d6fc21054c89dc6327c84f935dd5a1eda1af11e1d504"; }; buildInputs = [ blas lapack ]; diff --git a/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix b/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix index b6edb2ced1f2..42fa8fd8ddca 100644 --- a/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cx_Freeze"; - version = "6.6"; + version = "6.7"; src = fetchPypi { inherit pname version; - sha256 = "c4af8ad3f7e7d71e291c1dec5d0fb26bbe92df834b098ed35434c901fbd6762f"; + sha256 = "050f1dd133a04810bd7f38ac7ae3b290054acb2ff4f6e73f7a286266d153495d"; }; disabled = pythonOlder "3.5"; diff --git a/nixpkgs/pkgs/development/python-modules/cxxfilt/default.nix b/nixpkgs/pkgs/development/python-modules/cxxfilt/default.nix index 1cc5ad19bda2..117b12145764 100644 --- a/nixpkgs/pkgs/development/python-modules/cxxfilt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cxxfilt/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cxxfilt"; - version = "0.2.2"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "ef6810e76d16c95c11b96371e2d8eefd1d270ec03f9bcd07590e8dcc2c69e92b"; + sha256 = "7df6464ba5e8efbf0d8974c0b2c78b32546676f06059a83515dbdfa559b34214"; }; postPatch = let diff --git a/nixpkgs/pkgs/development/python-modules/cymem/default.nix b/nixpkgs/pkgs/development/python-modules/cymem/default.nix index c2de6d82a5bc..d2d010e9b12f 100644 --- a/nixpkgs/pkgs/development/python-modules/cymem/default.nix +++ b/nixpkgs/pkgs/development/python-modules/cymem/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - cython + cython ]; prePatch = '' @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Cython memory pool for RAII-style memory management"; homepage = "https://github.com/explosion/cymem"; license = licenses.mit; - maintainers = with maintainers; [ sdll ]; - }; + maintainers = with maintainers; [ ]; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix b/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix index 7719842fbad6..5e43a8f16648 100644 --- a/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "0.7.2"; + version = "0.7.3"; pname = "dask-jobqueue"; src = fetchPypi { inherit pname version; - sha256 = "1767f4146b2663d9d2eaef62b882a86e1df0bccdb8ae68ae3e5e546aa6796d35"; + sha256 = "682d7cc0e6b319b6ab83a7a898680c12e9c77ddc77df380b40041290f55d4e79"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix b/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix index eb18ac31fd03..1f9be870c975 100644 --- a/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask-xgboost/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "0.1.11"; + version = "0.2.0"; pname = "dask-xgboost"; src = fetchPypi { inherit pname version; - sha256 = "3fbe1bf4344dc74edfbe9f928c7e3e6acc26dc57cefd8da8ae56a15469c6941c"; + sha256 = "6d9c491dc4099f74a0df66c4d439d296c0f1fba97009fe93e21b2350f295b4ca"; }; propagatedBuildInputs = [ xgboost dask distributed ]; diff --git a/nixpkgs/pkgs/development/python-modules/dask/default.nix b/nixpkgs/pkgs/development/python-modules/dask/default.nix index 208856490b86..7850861486c3 100644 --- a/nixpkgs/pkgs/development/python-modules/dask/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dask/default.nix @@ -2,44 +2,51 @@ , stdenv , bokeh , buildPythonPackage +, cloudpickle +, distributed , fetchFromGitHub , fsspec -, pytestCheckHook -, pytest-rerunfailures -, pythonOlder -, cloudpickle +, jinja2 , numpy -, toolz -, dill +, packaging , pandas , partd +, pytest-rerunfailures , pytest-xdist +, pytestCheckHook +, pythonOlder +, pyyaml +, toolz , withExtraComplete ? false -, distributed }: buildPythonPackage rec { pname = "dask"; - version = "2021.06.2"; - disabled = pythonOlder "3.5"; + version = "2021.09.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - sha256 = "sha256-qvfjdijzlqaJQrDztRAVr5PudTaVd3WOTBid2ElZQgg="; + sha256 = "sha256-Gb6eQ5Hebx3mBNGvgB5yvM4dPsIxJl9ka++yYC/Zf7Q="; }; propagatedBuildInputs = [ - bokeh cloudpickle - dill fsspec - numpy - pandas + packaging partd + pyyaml toolz - ] ++ lib.optionals withExtraComplete [ + pandas + jinja2 + bokeh + numpy + ] ++ lib.optionals (withExtraComplete) [ + # infinite recursion between distributed and dask distributed ]; @@ -63,7 +70,11 @@ buildPythonPackage rec { ''; pytestFlagsArray = [ - "-n $NIX_BUILD_CORES" + # parallelize + "--numprocesses auto" + # rerun failed tests up to three times + "--reruns 3" + # don't run tests that require network access "-m 'not network'" ]; @@ -81,7 +92,16 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - pythonImportsCheck = [ "dask.dataframe" "dask" "dask.array" ]; + pythonImportsCheck = [ + "dask" + "dask.array" + "dask.bag" + "dask.bytes" + "dask.dataframe" + "dask.dataframe.io" + "dask.dataframe.tseries" + "dask.diagnostics" + ]; meta = with lib; { description = "Minimal task scheduling abstraction"; diff --git a/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix b/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix index 06a5b227d29a..38095ea009df 100644 --- a/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "8.1.12"; + version = "8.1.13"; src = fetchPypi { inherit pname version; - sha256 = "84e2db897731461a1d6bccd17923c7e8cd0f2512df018287b62fea55fd61891d"; + sha256 = "2833679bccd507e3eac9ec931cfae85c8070a78ad1286159475b7d3b79a40dc2"; }; sourceRoot = "."; diff --git a/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix b/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix index bfb179f035dc..196d3b913776 100644 --- a/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.5.5"; + version = "0.5.6"; src = fetchFromGitHub { owner = "lidatong"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b8oWl8AteVuGYb4E+M9aDS2ERgnKN8wS17Y/Bs7ajcI="; + sha256 = "09253p0zjqfaqap7jgfgjl1jswwnz7mb6x7dqix09id92mnb89mf"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/dateutils/default.nix b/nixpkgs/pkgs/development/python-modules/dateutils/default.nix new file mode 100644 index 000000000000..faa3b1155483 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/dateutils/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, python-dateutil, pytz }: + +buildPythonPackage rec { + pname = "dateutils"; + version = "0.6.12"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-A92QvLIVQb1OtLATY35PG1+USIHEbMbktnpgWeNw4/E="; + }; + + propagatedBuildInputs = [ + python-dateutil + pytz + ]; + + pythonImportsCheck = [ "dateutils" ]; + + meta = with lib; { + description = "Utilities for working with datetime objects."; + homepage = "https://github.com/jmcantrell/python-dateutils"; + license = licenses.bsd0; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/debtcollector/default.nix b/nixpkgs/pkgs/development/python-modules/debtcollector/default.nix index 75555569e235..df3d78394605 100644 --- a/nixpkgs/pkgs/development/python-modules/debtcollector/default.nix +++ b/nixpkgs/pkgs/development/python-modules/debtcollector/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; passthru.tests = { - pytest = callPackage ./tests.nix { }; + tests = callPackage ./tests.nix { }; }; pythonImportsCheck = [ "debtcollector" ]; diff --git a/nixpkgs/pkgs/development/python-modules/debugpy/default.nix b/nixpkgs/pkgs/development/python-modules/debugpy/default.nix index 10ed4c62e764..4392a3c2ecf4 100644 --- a/nixpkgs/pkgs/development/python-modules/debugpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/debugpy/default.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { "x86_64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch x86_64 -o attach_x86_64.dylib"; "i686-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch i386 -o attach_x86.dylib"; "aarch64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch arm64 -o attach_arm64.dylib"; - }.${stdenv.hostPlatform.system}} + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")} )''; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/decorator/4.nix b/nixpkgs/pkgs/development/python-modules/decorator/4.nix new file mode 100644 index 000000000000..8e8fd28f0b54 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/decorator/4.nix @@ -0,0 +1,21 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "decorator"; + version = "4.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rxzhk5zwiggk45hl53zydvy70lk654kg0nc1p54090p402jz9p3"; + }; + + meta = with lib; { + homepage = "https://pypi.python.org/pypi/decorator"; + description = "Better living through Python with decorators"; + license = lib.licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/decorator/default.nix b/nixpkgs/pkgs/development/python-modules/decorator/default.nix index 8e8fd28f0b54..f8d3f5c9ac61 100644 --- a/nixpkgs/pkgs/development/python-modules/decorator/default.nix +++ b/nixpkgs/pkgs/development/python-modules/decorator/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "decorator"; - version = "4.4.2"; + version = "5.0.9"; src = fetchPypi { inherit pname version; - sha256 = "1rxzhk5zwiggk45hl53zydvy70lk654kg0nc1p54090p402jz9p3"; + sha256 = "72ecfba4320a893c53f9706bebb2d55c270c1e51a28789361aa93e4a21319ed5"; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/deemix/default.nix b/nixpkgs/pkgs/development/python-modules/deemix/default.nix index 21c39e6d7b87..06b915e814de 100644 --- a/nixpkgs/pkgs/development/python-modules/deemix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/deemix/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "deemix"; - version = "3.4.4"; + version = "3.5.3"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HZg2zys92gH1j8WWgrzH3fpxoFDi+LPULmvlkUeB9Fw="; + sha256 = "36dc6279f547cc0947daceb568e2b5ac1e274655f642c133e2700c22892163ce"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix b/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix index 46a4774e1ca7..12ee63c0fd16 100644 --- a/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/deezer-py/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "deezer-py"; - version = "1.1.3"; + version = "1.2.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FdLSJFALeGcecLAHk9khJTKlMd3Mec/w/PGQOHqxYMQ="; + sha256 = "1b5664835975fda7a2519ba4b411cc5f2e4113e614ee140389b61844906d0c05"; }; propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix b/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix index 926dadd031cf..f8c754ebb841 100644 --- a/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix @@ -1,26 +1,27 @@ { lib , buildPythonPackage , fetchFromGitHub +, poetry-core +, pytest-mock +, pytest-vcr +, pytestCheckHook , pythonOlder , requests , tornado -, poetry-core -, pytestCheckHook -, pytest-cov -, pytest-vcr }: buildPythonPackage rec { pname = "deezer-python"; - version = "2.3.0"; - disabled = pythonOlder "3.6"; + version = "2.3.1"; format = "pyproject"; + disabled = pythonOlder "3.6"; + src = fetchFromGitHub { owner = "browniebroke"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pRYC0kJHJ5SKgDdGS1KkQEbv+DkF9oPw/A1GnB0AwfQ="; + sha256 = "sha256-0gkPwIz+nZJjxfucy71D0A5CFkhQaW32UH5t1DkuvEs="; }; nativeBuildInputs = [ @@ -29,8 +30,8 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytest-cov pytest-vcr + pytest-mock ]; propagatedBuildInputs = [ @@ -38,6 +39,13 @@ buildPythonPackage rec { tornado ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=deezer" "" + ''; + + pythonImportsCheck = [ "deezer" ]; + meta = with lib; { description = "A friendly Python wrapper around the Deezer API"; homepage = "https://github.com/browniebroke/deezer-python"; diff --git a/nixpkgs/pkgs/development/python-modules/distributed/default.nix b/nixpkgs/pkgs/development/python-modules/distributed/default.nix index ce0cf13e9a92..777d6d7d7400 100644 --- a/nixpkgs/pkgs/development/python-modules/distributed/default.nix +++ b/nixpkgs/pkgs/development/python-modules/distributed/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "distributed"; - version = "2021.6.2"; + version = "2021.9.0"; disabled = pythonOlder "3.6"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "sha256-19ESqGqwSdzvo7If0brqQhKiwD0iwkvVWtONIaf10Ug="; + sha256 = "sha256-IiKc0rJYODCtGC9AAOkjbww/VG7PdfrqJ32IHU9xWbo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/distro/default.nix b/nixpkgs/pkgs/development/python-modules/distro/default.nix index 885538de65ce..bf8675af941d 100644 --- a/nixpkgs/pkgs/development/python-modules/distro/default.nix +++ b/nixpkgs/pkgs/development/python-modules/distro/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "distro"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92"; + sha256 = "83f5e5a09f9c5f68f60173de572930effbcc0287bb84fdc4426cb4168c088424"; }; # tests are very targeted at individual linux distributions diff --git a/nixpkgs/pkgs/development/python-modules/django-cacheops/default.nix b/nixpkgs/pkgs/development/python-modules/django-cacheops/default.nix index c9344d3bd010..58900ac2cbf4 100644 --- a/nixpkgs/pkgs/development/python-modules/django-cacheops/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django-cacheops/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "django-cacheops"; - version = "5.1"; + version = "6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1YUc178whzhKH87PqN3bj1UDDu39b98SciW3W8oPmd0="; + sha256 = "78e161ebd96a32e28e19ec7da31f2afed9e62a79726b8b5f0ed12dd16c2e5841"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/django/3.nix b/nixpkgs/pkgs/development/python-modules/django/3.nix index 7ee41a962c73..48ed4d6d0e1c 100644 --- a/nixpkgs/pkgs/development/python-modules/django/3.nix +++ b/nixpkgs/pkgs/development/python-modules/django/3.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "Django"; - version = "3.2.5"; + version = "3.2.7"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1kam3301jl53vm0mhflwwsqy5d7kb5dksmjanlaj7v7xakm5z81x"; + sha256 = "95b318319d6997bac3595517101ad9cc83fe5672ac498ba48d1a410f47afecd2"; }; patches = lib.optional withGdal diff --git a/nixpkgs/pkgs/development/python-modules/django_environ/default.nix b/nixpkgs/pkgs/development/python-modules/django_environ/default.nix index 3f01a2b294a1..7c36db1d1187 100644 --- a/nixpkgs/pkgs/development/python-modules/django_environ/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django_environ/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-environ"; - version = "0.4.5"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "6c9d87660142608f63ec7d5ce5564c49b603ea8ff25da595fd6098f6dc82afde"; + sha256 = "b99bd3704221f8b717c8517d8146e53fdee509d9e99056be560060003b92213e"; }; # The testsuite fails to modify the base environment diff --git a/nixpkgs/pkgs/development/python-modules/django_taggit/default.nix b/nixpkgs/pkgs/development/python-modules/django_taggit/default.nix index cbfcc103c5c1..ab908c639a00 100644 --- a/nixpkgs/pkgs/development/python-modules/django_taggit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/django_taggit/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "django-taggit"; - version = "1.4.0"; + version = "1.5.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b9ed6e94bad0bed3bf062a6be7ee3db117fda02c6419c680d614197364ea018b"; + sha256 = "e5bb62891f458d55332e36a32e19c08d20142c43f74bc5656c803f8af25c084a"; }; propagatedBuildInputs = [ isort django ]; diff --git a/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index 82ff51fd3821..ad9afabadf2c 100644 --- a/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "djangorestframework_simplejwt"; - version = "4.7.1"; + version = "4.8.0"; src = fetchPypi { inherit pname version; - sha256 = "c0e9b617da337becb55e67935eb992fad84f861418e7ab5fb3e77a3fd18d4137"; + sha256 = "153c973c5c154baf566be431de8527c2bd62557fde7373ebcb0f02b73b28e07a"; }; propagatedBuildInputs = [ django djangorestframework pyjwt ]; diff --git a/nixpkgs/pkgs/development/python-modules/dpath/default.nix b/nixpkgs/pkgs/development/python-modules/dpath/default.nix index bfbeeaea0070..c9f3d5be6d49 100644 --- a/nixpkgs/pkgs/development/python-modules/dpath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dpath/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "dpath"; - version = "2.0.4"; + version = "2.0.5"; disabled = isPy27; # uses python3 imports src = fetchPypi { inherit pname version; - sha256 = "0qjaa4sjw0m4b91mm18074wpkhir3xx7s87qwckmzpfb165gk837"; + sha256 = "0kk7wl15r305496q13ka4r6n2r13j99rrrpy2b4575j704dk4x7g"; }; # use pytest as nosetests hangs diff --git a/nixpkgs/pkgs/development/python-modules/dpkt/default.nix b/nixpkgs/pkgs/development/python-modules/dpkt/default.nix index 74817e60cbcf..a1036e099ea8 100644 --- a/nixpkgs/pkgs/development/python-modules/dpkt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dpkt/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dpkt"; - version = "1.9.7.1"; + version = "1.9.7.2"; src = fetchPypi { inherit pname version; - sha256 = "74899d557ec4e337db29cecc80548b23a1205384d30ee407397cfb9ab178e3d4"; + sha256 = "80f977667ebbad2b5c4f7b7f45ee8bea6622fb71723f68a9a8fe6274520c853b"; }; # Project has no tests diff --git a/nixpkgs/pkgs/development/python-modules/dropbox/default.nix b/nixpkgs/pkgs/development/python-modules/dropbox/default.nix index 91317eb9f093..5b46c8183c81 100644 --- a/nixpkgs/pkgs/development/python-modules/dropbox/default.nix +++ b/nixpkgs/pkgs/development/python-modules/dropbox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dropbox"; - version = "11.19.0"; + version = "11.20.0"; src = fetchPypi { inherit pname version; - sha256 = "a56d200c47d7cd19f697e232a616342b224079f43abf4748bc55fb0c1de4346f"; + sha256 = "1aa351ec8bbb11cf3560e731b81d25f39c7edcb5fa92c06c5d68866cb9f90d54"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/einops/default.nix b/nixpkgs/pkgs/development/python-modules/einops/default.nix new file mode 100644 index 000000000000..34510762abf7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/einops/default.nix @@ -0,0 +1,54 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, numpy +, nose +, nbformat +, nbconvert +, jupyter +, chainer +, pytorch +, mxnet +, tensorflow +}: + +buildPythonPackage rec { + pname = "einops"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "arogozhnikov"; + repo = pname; + rev = "v${version}"; + sha256 = "0ix094cfh6w4bvx6ymp5dpm35y9nkaibcn1y50g6kwdp4f0473y8"; + }; + + checkInputs = [ + nose + numpy + # For notebook tests + nbformat + nbconvert + jupyter + # For backend tests + chainer + pytorch + mxnet + tensorflow + ]; + + # No CUDA in sandbox + EINOPS_SKIP_CUPY = 1; + + checkPhase = '' + export HOME=$TMPDIR + nosetests -v -w tests + ''; + + meta = { + description = "Flexible and powerful tensor operations for readable and reliable code"; + homepage = "https://github.com/arogozhnikov/einops"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ yl3dy ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/elementpath/default.nix b/nixpkgs/pkgs/development/python-modules/elementpath/default.nix index 538de4ba7de9..810b5dfedd01 100644 --- a/nixpkgs/pkgs/development/python-modules/elementpath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/elementpath/default.nix @@ -5,7 +5,7 @@ }: buildPythonPackage rec { - version = "2.3.1"; + version = "2.3.2"; pname = "elementpath"; disabled = pythonOlder "3.6"; @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "1imjilhmbw08469irlbr3am5zksbg327n7mznxfixrigq9d65qx6"; + sha256 = "01h68v077xbcnqn9v52i8d6s6i7ds3zycn3ddn11hc074m4gg3af"; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/nixpkgs/pkgs/development/python-modules/elmax/default.nix b/nixpkgs/pkgs/development/python-modules/elmax/default.nix index 775050acb0c9..db1ff91ee0eb 100644 --- a/nixpkgs/pkgs/development/python-modules/elmax/default.nix +++ b/nixpkgs/pkgs/development/python-modules/elmax/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "elmax"; - version = "0.1.2"; + version = "0.1.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-elmax"; rev = version; - sha256 = "sha256-Aq/OHxOmtUUmBNlFPu892C8AkTX+Ee0oca7D79InPXQ="; + sha256 = "sha256-OiVPjWqQw1u0OL6/uYlT+FP2XDh7l3OZyVtQfycHICI="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/emoji/default.nix b/nixpkgs/pkgs/development/python-modules/emoji/default.nix index 0dabc80b1ca2..2b20c7de4a39 100644 --- a/nixpkgs/pkgs/development/python-modules/emoji/default.nix +++ b/nixpkgs/pkgs/development/python-modules/emoji/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "emoji"; - version = "1.4.2"; + version = "1.5.2"; src = fetchFromGitHub { owner = "carpedm20"; repo = pname; - rev = "v.${version}"; - sha256 = "072m0l1wcbz1jiyc2x5dx0b4ks5zri7m5lhjjy9sgq4qwlqsnr5n"; + rev = "v${version}"; + sha256 = "11v8zqz183vpiyg2cp0fghb1hxqsn3yaydm1d97nqd9g2mfy37s1"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/env-canada/default.nix b/nixpkgs/pkgs/development/python-modules/env-canada/default.nix index 5ea89392826b..5e9492f90412 100644 --- a/nixpkgs/pkgs/development/python-modules/env-canada/default.nix +++ b/nixpkgs/pkgs/development/python-modules/env-canada/default.nix @@ -8,17 +8,18 @@ , pillow , pytestCheckHook , python-dateutil +, voluptuous }: buildPythonPackage rec { pname = "env-canada"; - version = "0.5.0"; + version = "0.5.13"; src = fetchFromGitHub { owner = "michaeldavie"; repo = "env_canada"; rev = "v${version}"; - sha256 = "0dgw2mf760r1y0mq8bcvx6y3bcqpaf8p97rzf7pd0pbwvwrcsj3n"; + sha256 = "sha256-Z/5YRvHcZgRuSQnaMbNIT93uSYvRzMWpdMy0M7tD2QI="; }; propagatedBuildInputs = [ @@ -28,6 +29,7 @@ buildPythonPackage rec { lxml pillow python-dateutil + voluptuous ]; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/eternalegypt/default.nix b/nixpkgs/pkgs/development/python-modules/eternalegypt/default.nix new file mode 100644 index 000000000000..c5c7d8a646cf --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/eternalegypt/default.nix @@ -0,0 +1,39 @@ +{ lib +, aiohttp +, attrs +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "eternalegypt"; + version = "0.0.13"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "amelchio"; + repo = pname; + rev = "v${version}"; + sha256 = "0wi2cqd81irqm873npkqg3mvdrb57idqdsp8qw8h0s7lk0kil1wi"; + }; + + propagatedBuildInputs = [ + aiohttp + attrs + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "eternalegypt" ]; + + meta = with lib; { + description = "Python API for Netgear LTE modems"; + homepage = "https://github.com/amelchio/eternalegypt"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/executing/default.nix b/nixpkgs/pkgs/development/python-modules/executing/default.nix index f0c67f3ae591..8ab6994ac415 100644 --- a/nixpkgs/pkgs/development/python-modules/executing/default.nix +++ b/nixpkgs/pkgs/development/python-modules/executing/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools-scm , asttokens }: @@ -15,6 +16,10 @@ buildPythonPackage rec { sha256 = "1hqx94h6l2wg9sljiaajfay2nr62sqa819w3bxrz8cdki1abdygv"; }; + nativeBuildInputs = [ + setuptools-scm + ]; + preBuild = '' export SETUPTOOLS_SCM_PRETEND_VERSION="${version}" ''; diff --git a/nixpkgs/pkgs/development/python-modules/extractcode/default.nix b/nixpkgs/pkgs/development/python-modules/extractcode/default.nix index 28dece127b12..a39205f5aeea 100644 --- a/nixpkgs/pkgs/development/python-modules/extractcode/default.nix +++ b/nixpkgs/pkgs/development/python-modules/extractcode/default.nix @@ -11,11 +11,11 @@ }: buildPythonPackage rec { pname = "extractcode"; - version = "21.6.2"; + version = "21.7.23"; src = fetchPypi { inherit pname version; - sha256 = "e665501438fedeb6e75335d880c8913a8cd894fd8adcf9c243eb6d48fad2d01c"; + sha256 = "58aa16d60cfcbd3695d7ea84a1e30d5ba9fa6f614b2ef4a6d0565b2ac5d4f757"; }; dontConfigure = true; diff --git a/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix b/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix index 98c7922c18f0..919c5a1aebd9 100644 --- a/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix @@ -41,8 +41,8 @@ buildPythonPackage rec { ]; disabledTestPaths = [ - # Missing support for later pytest-asyncio, https://github.com/jamesls/fakeredis/issues/307 - "test/test_aioredis1.py" + # AttributeError: 'AsyncGenerator' object has no attribute XXXX + "test/test_aioredis2.py" ]; pythonImportsCheck = [ "fakeredis" ]; diff --git a/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix b/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix new file mode 100644 index 000000000000..3b6b42a7678e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix @@ -0,0 +1,64 @@ +{ lib +, beautifulsoup4 +, buildPythonPackage +, click +, colorama +, fetchFromGitHub +, html2text +, lxml +, pytestCheckHook +, python-dateutil +, pytz +, requests +, simplejson +, tabulate +}: + +buildPythonPackage rec { + pname = "faraday-plugins"; + version = "1.5.3"; + + src = fetchFromGitHub { + owner = "infobyte"; + repo = "faraday_plugins"; + rev = "v${version}"; + sha256 = "0nyywpsyw7akwdah75s9mz5nz11y1hbynp08pvqifwdw49crih02"; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + click + colorama + html2text + lxml + python-dateutil + pytz + requests + simplejson + tabulate + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # faraday itself is currently not available + "tests/test_report_collection.py" + ]; + + disabledTests = [ + # Fail because of missing faraday + "test_detect_report" + "test_process_report_summary" + ]; + + pythonImportsCheck = [ "faraday_plugins" ]; + + meta = with lib; { + description = "Security tools report parsers for Faraday"; + homepage = "https://github.com/infobyte/faraday_plugins"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/fastapi/default.nix b/nixpkgs/pkgs/development/python-modules/fastapi/default.nix index 62aedf1f2117..f068c4cb735e 100644 --- a/nixpkgs/pkgs/development/python-modules/fastapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastapi/default.nix @@ -55,8 +55,18 @@ buildPythonPackage rec { # ignoring deprecation warnings to avoid test failure from # tests/test_tutorial/test_testing/test_tutorial001.py - pytestFlagsArray = [ "--ignore=tests/test_default_response_class.py" "-W ignore::DeprecationWarning"]; - disabledTests = [ "test_get_custom_response" ]; + pytestFlagsArray = [ + "--ignore=tests/test_default_response_class.py" + "-W ignore::DeprecationWarning" + ]; + + disabledTests = [ + "test_get_custom_response" + + # Failed: DID NOT RAISE <class 'starlette.websockets.WebSocketDisconnect'> + "test_websocket_invalid_data" + "test_websocket_no_credentials" + ]; meta = with lib; { homepage = "https://github.com/tiangolo/fastapi"; diff --git a/nixpkgs/pkgs/development/python-modules/fastavro/default.nix b/nixpkgs/pkgs/development/python-modules/fastavro/default.nix new file mode 100644 index 000000000000..0bc1246eb326 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/fastavro/default.nix @@ -0,0 +1,59 @@ +{ buildPythonPackage +, cython +, fetchFromGitHub +, isPy38 +, lib +, lz4 +, numpy +, pandas +, pytestCheckHook +, python-dateutil +, python-snappy +, pythonOlder +, zstandard +}: + +buildPythonPackage rec { + pname = "fastavro"; + version = "1.4.4"; + + disabled = pythonOlder "3.6"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "1sf8nqifwp0cggk59s22ygj3rm1nysa8b91xl8bpv2knqyjy1q32"; + }; + + preBuild = '' + export FASTAVRO_USE_CYTHON=1 + ''; + + nativeBuildInputs = [ cython ]; + + checkInputs = [ + lz4 + numpy + pandas + pytestCheckHook + python-dateutil + python-snappy + zstandard + ]; + + # Fails with "AttributeError: module 'fastavro._read_py' has no attribute + # 'CYTHON_MODULE'." Doesn't appear to be serious. See https://github.com/fastavro/fastavro/issues/112#issuecomment-387638676. + disabledTests = [ "test_cython_python" ]; + + # CLI tests are broken on Python 3.8. See https://github.com/fastavro/fastavro/issues/558. + disabledTestPaths = lib.optionals isPy38 [ "tests/test_main_cli.py" ]; + + pythonImportsCheck = [ "fastavro" ]; + + meta = with lib; { + description = "Fast read/write of AVRO files"; + homepage = "https://github.com/fastavro/fastavro"; + license = licenses.mit; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix b/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix index b3e27d7a5e81..a790f1623817 100644 --- a/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix @@ -1,30 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pytest-benchmark, wasmer }: +{ stdenv, lib, buildPythonPackage, fetchPypi, wasmer, wasmer-compiler-cranelift, pytestCheckHook, pytest-benchmark }: buildPythonPackage rec { pname = "fastdiff"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1ai95vjchl4396zjl1b69xfqvn9kn1y7c40d9l0qxdss0pcx6fk2"; + sha256 = "4dfa09c47832a8c040acda3f1f55fc0ab4d666f0e14e6951e6da78d59acd945a"; }; postPatch = '' substituteInPlace setup.py \ --replace 'pytest-runner' "" + substituteInPlace setup.cfg \ + --replace "collect_ignore = ['setup.py']" "" ''; - propagatedBuildInputs = [ wasmer ]; + propagatedBuildInputs = [ wasmer wasmer-compiler-cranelift ]; checkInputs = [ pytestCheckHook pytest-benchmark ]; pythonImportsCheck = [ "fastdiff" ]; - disabledTests = [ "test_native" ]; meta = with lib; { description = "A fast native implementation of diff algorithm with a pure Python fallback"; homepage = "https://github.com/syrusakbary/fastdiff"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; + # resulting compiled object panics at import + broken = stdenv.is32bit; }; } diff --git a/nixpkgs/pkgs/development/python-modules/fastimport/default.nix b/nixpkgs/pkgs/development/python-modules/fastimport/default.nix index fe46405eb3f1..bd5c270d686c 100644 --- a/nixpkgs/pkgs/development/python-modules/fastimport/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastimport/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "fastimport"; - version = "0.9.13"; + version = "0.9.14"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "486135a39edb85808fdbbe2c8009197978800a4544fca56cc2074df32e1304f3"; + sha256 = "6ac99dda4e7b0b3ae831507b6d0094802e6dd95891feafde8cc5c405b6c149ca"; }; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix b/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix index 756d08726c11..56fb6a53e14a 100644 --- a/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fastparquet/default.nix @@ -5,7 +5,6 @@ , numba , numpy , pandas -, pytest-runner , cramjam , fsspec , thrift @@ -14,26 +13,32 @@ buildPythonPackage rec { pname = "fastparquet"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - hash = "sha256-08hanzRnt6WuMriNNtOd+ZHycr2XBeIRav+5sgvT7Do="; + hash = "sha256-xV0AXNZSy4LSrHf11OP/+KDbeDQu8yF1ugX+W4mie1E="; }; - nativeBuildInputs = [ pytest-runner ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner'," "" \ + --replace "oldest-supported-numpy" "numpy" + ''; + propagatedBuildInputs = [ cramjam fsspec numba numpy pandas thrift ]; checkInputs = [ pytestCheckHook ]; # Workaround https://github.com/NixOS/nixpkgs/issues/123561 preCheck = '' mv fastparquet/test . - rm -rf fastparquet + rm -r fastparquet fastparquet_test="$out"/${python.sitePackages}/fastparquet/test ln -s `pwd`/test "$fastparquet_test" ''; + postCheck = '' rm "$fastparquet_test" ''; diff --git a/nixpkgs/pkgs/development/python-modules/fe25519/default.nix b/nixpkgs/pkgs/development/python-modules/fe25519/default.nix index 466de64453f4..89890b8e8cf2 100644 --- a/nixpkgs/pkgs/development/python-modules/fe25519/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fe25519/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "fe25519"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1m85qvw9dwxk81mv9k45c9n75pk8wqn70qkinqh56h5zv56vgq24"; + sha256 = "8819659f19b51713199a75fda5107c93fbb6e2cb4afef3164ce7932b5eb276b9"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/nixpkgs/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix index 5d2641970721..4b4d6bdd7fc2 100644 --- a/nixpkgs/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "ffmpeg-progress-yield"; - version = "0.0.4"; + version = "0.1.2"; src = fetchPypi { inherit pname version; - sha256 = "e944093e2c1b213da8fa4f0c276c1bad44e0b8ba8be7e4fd001f5132d16baef5"; + sha256 = "92ae36ff5cf38428bd3695629b5065d161c658fb0de0faf2c20cd7a99dac3820"; }; propagatedBuildInputs = [ colorama tqdm ]; diff --git a/nixpkgs/pkgs/development/python-modules/filetype/default.nix b/nixpkgs/pkgs/development/python-modules/filetype/default.nix index 4bbb6c41f543..2ec3807476d1 100644 --- a/nixpkgs/pkgs/development/python-modules/filetype/default.nix +++ b/nixpkgs/pkgs/development/python-modules/filetype/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "filetype"; - version = "1.0.7"; + version = "1.0.8"; src = fetchPypi { inherit pname version; - sha256 = "19vav4w8vvcnrps1mirjkrv4pr1khwn5ma6m5pgpxd4qip73wffs"; + sha256 = "77df14879b73fd9711b8bd4f465dadf2ecdafff0eac3b22c0bdb0ccba68db316"; }; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/fiona/default.nix b/nixpkgs/pkgs/development/python-modules/fiona/default.nix index a71e6fbaa7e0..987a8ca6209e 100644 --- a/nixpkgs/pkgs/development/python-modules/fiona/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fiona/default.nix @@ -1,16 +1,16 @@ { stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, pythonOlder , attrs, click, cligj, click-plugins, six, munch, enum34 , pytestCheckHook, boto3, mock, giflib, pytz -, gdal -, certifi +, gdal, certifi }: buildPythonPackage rec { - pname = "Fiona"; + pname = "fiona"; version = "1.8.20"; src = fetchPypi { - inherit pname version; + pname = "Fiona"; + inherit version; sha256 = "a70502d2857b82f749c09cb0dea3726787747933a2a1599b5ab787d74e3c143b"; }; @@ -42,11 +42,15 @@ buildPythonPackage rec { preCheck = '' rm -r fiona # prevent importing local fiona + # disable gdal deprecation warnings + export GDAL_ENABLE_DEPRECATED_DRIVER_GTM=YES ''; disabledTests = [ # Some tests access network, others test packaging "http" "https" "wheel" + # Assert not true + "test_no_append_driver_cannot_append" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix b/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix index d9eae8ffa585..22be871f745f 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-JWT-Extended"; - version = "4.2.3"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - sha256 = "22b8ffa7587d50aaf65f3009f1d55ef7287da8260eaf4655a5837e33479216c3"; + sha256 = "6e2b40d548b9dfc6051740c4552c097ac38e514e500c16c682d9a533d17ca418"; }; propagatedBuildInputs = [ python-dateutil flask pyjwt werkzeug ]; diff --git a/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix b/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix index 26f2ab4aea18..9f70e129ae1a 100644 --- a/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix @@ -1,25 +1,51 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, glibcLocales, flask, flask_sqlalchemy, flask_script, alembic }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, alembic +, flask +, flask_script +, flask_sqlalchemy +, python +}: buildPythonPackage rec { pname = "Flask-Migrate"; - version = "3.0.1"; + version = "3.1.0"; + format = "setuptools"; + disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "00m76kgdkk0w5bfq8hbqszpyaqk0yxdvmz4s67lvd36pc7wfhhjd"; + src = fetchFromGitHub { + owner = "miguelgrinberg"; + repo = pname; + rev = "v${version}"; + sha256 = "0zj7qpknvlhrh4fsp5sx4fwyx3sp41ynclka992zympm3xym9zyq"; }; - checkInputs = [ flask_script ] ++ lib.optional isPy3k glibcLocales; - propagatedBuildInputs = [ flask flask_sqlalchemy alembic ]; + propagatedBuildInputs = [ + alembic + flask + flask_sqlalchemy + ]; - # tests invoke the flask cli which uses click and therefore has py3k encoding troubles - preCheck = lib.optionalString isPy3k '' - export LANG="en_US.UTF-8" + pythonImportsCheck = [ + "flask_migrate" + ]; + + checkInputs = [ + flask_script + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck ''; meta = with lib; { description = "SQLAlchemy database migrations for Flask applications using Alembic"; - license = licenses.mit; homepage = "https://github.com/miguelgrinberg/Flask-Migrate"; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/flipr-api/default.nix b/nixpkgs/pkgs/development/python-modules/flipr-api/default.nix new file mode 100644 index 000000000000..418c7cf42fef --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/flipr-api/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, poetry-core +, requests-mock +, pythonOlder +, pytest-asyncio +, pytestCheckHook +, python-dateutil +, requests +}: + +buildPythonPackage rec { + pname = "flipr-api"; + version = "1.4.1"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "cnico"; + repo = pname; + rev = version; + sha256 = "00qkzr2g38fpa7ndnbfx9m4d50lmz0j74nkxif3amnkbl4m6l5vn"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + python-dateutil + requests + ]; + + checkInputs = [ + requests-mock + pytest-asyncio + pytestCheckHook + ]; + + patches = [ + # Switch to poetry-core, https://github.com/cnico/flipr-api/pull/4 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/cnico/flipr-api/commit/f14be1dfd4f46d4d43d9ea47e51cafca3cc18e86.patch"; + sha256 = "1fdi19cq21zcjx4g132k480yhi5y0x5qj2l0h8k5zky5cdxs58r6"; + }) + ]; + + pythonImportsCheck = [ "flipr_api" ]; + + meta = with lib; { + description = "Python client for Flipr API"; + homepage = "https://github.com/cnico/flipr-api"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/flit-core/default.nix b/nixpkgs/pkgs/development/python-modules/flit-core/default.nix index a4c6b99b07f4..7b2731595629 100644 --- a/nixpkgs/pkgs/development/python-modules/flit-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/flit-core/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage +, callPackage , flit -, isPy3k , toml , pytestCheckHook , testpath @@ -12,6 +12,11 @@ buildPythonPackage rec { version = "3.2.0"; format = "pyproject"; + outputs = [ + "out" + "testsout" + ]; + inherit (flit) src patches; preConfigure = '' @@ -22,19 +27,23 @@ buildPythonPackage rec { toml ]; - checkInputs = [ - pytestCheckHook - testpath - ]; + postInstall = '' + mkdir $testsout + cp -R ../tests $testsout/tests + ''; + + # check in passthru.tests.pytest to escape infinite recursion with setuptools-scm + doCheck = false; passthru.tests = { inherit flit; + pytest = callPackage ./tests.nix { }; }; - meta = { + meta = with lib; { description = "Distribution-building parts of Flit. See flit package for more information"; homepage = "https://github.com/takluyver/flit"; - license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.fridh ]; + license = licenses.bsd3; + maintainers = with maintainers; [ fridh SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/flit-core/tests.nix b/nixpkgs/pkgs/development/python-modules/flit-core/tests.nix new file mode 100644 index 000000000000..0fd13e80cb12 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/flit-core/tests.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage +, flit +, flit-core +, pytestCheckHook +, testpath +}: + +buildPythonPackage rec { + pname = "flit-core"; + inherit (flit-core) version; + + src = flit-core.testsout; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + flit + pytestCheckHook + testpath + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/fountains/default.nix b/nixpkgs/pkgs/development/python-modules/fountains/default.nix index b706930b3ef3..aec78779a7a4 100644 --- a/nixpkgs/pkgs/development/python-modules/fountains/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fountains/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "fountains"; - version = "0.2.1"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "0jk5y099g6ggaq5lwp0jlg4asyhcdxnl3him3ibmzc1k9nnknp30"; + sha256 = "fbf4e2cb11d60d3bafca5bb7c01c254d08a5541ed7ddfe00ef975eb173fb75a4"; }; propagatedBuildInputs = [ @@ -19,6 +19,7 @@ buildPythonPackage rec { # Project has no test doCheck = false; + pythonImportsCheck = [ "fountains" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/fpyutils/default.nix b/nixpkgs/pkgs/development/python-modules/fpyutils/default.nix index 0120391aee1b..493304428524 100644 --- a/nixpkgs/pkgs/development/python-modules/fpyutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fpyutils/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "fpyutils"; - version = "2.0.0"; + version = "2.0.1"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "frnmst"; repo = pname; rev = version; - sha256 = "1n15fvd6191ixxsza49fdd8j43hs0agagg8k9v6rc7by1ffqnl2b"; + sha256 = "1dksx5ykm7f1bi16wg8kqqqlnc874k3vg9kfjbbbalv8w0g2g2am"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/freetype-py/default.nix b/nixpkgs/pkgs/development/python-modules/freetype-py/default.nix index b0035e838447..13e033e8bc36 100644 --- a/nixpkgs/pkgs/development/python-modules/freetype-py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/freetype-py/default.nix @@ -1,4 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi, substituteAll, stdenv, setuptools-scm, freetype }: +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, substituteAll +, setuptools-scm +, freetype +, pytestCheckHook +}: buildPythonPackage rec { pname = "freetype-py"; @@ -20,6 +28,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ freetype ]; + preCheck = '' + cd tests + ''; + + checkInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "freetype" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/frozendict/default.nix b/nixpkgs/pkgs/development/python-modules/frozendict/default.nix index e172f3815b7e..4acf53563ded 100644 --- a/nixpkgs/pkgs/development/python-modules/frozendict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/frozendict/default.nix @@ -1,16 +1,47 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, pytestCheckHook +, setuptoolsBuildHook +, python +}: buildPythonPackage rec { pname = "frozendict"; - version = "1.2"; + version = "2.0.5"; # 2.0.6 breaks canonicaljson + format = "setuptools"; + + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp"; + sha256 = "sha256-wb7hwHDY2fZA4SjluHV2pEAAhgCfeGLRPAv4YA5iE9M="; }; - # frozendict does not come with tests - doCheck = false; + pythonImportsCheck = [ + "frozendict" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + preCheck = '' + rm -r frozendict + export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH + ''; + + disabledTests = [ + # TypeError: unsupported operand type(s) for |=: 'frozendict.frozendict' and 'dict' + "test_union" + ]; + + disabledTestPaths = [ + # unpackaged test dependency: coold + "test/test_coold.py" + "test/test_coold_subclass.py" + ]; meta = with lib; { homepage = "https://github.com/slezica/python-frozendict"; diff --git a/nixpkgs/pkgs/development/python-modules/fsspec/default.nix b/nixpkgs/pkgs/development/python-modules/fsspec/default.nix index 7b9315c8f8fd..befcde0c2838 100644 --- a/nixpkgs/pkgs/development/python-modules/fsspec/default.nix +++ b/nixpkgs/pkgs/development/python-modules/fsspec/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2021.07.0"; + version = "2021.08.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "intake"; repo = "filesystem_spec"; rev = version; - hash = "sha256-I0oR7qxMCB2egyOx69hY0++H7fzCdK3ZyyzCvP3yXAs="; + sha256 = "0xxzcp69div1sy975x82k754snbsksyqr73h6jiasdxj8wka49s0"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ftfy/default.nix b/nixpkgs/pkgs/development/python-modules/ftfy/default.nix index 2d3ff1febf5e..5ea93ec179ec 100644 --- a/nixpkgs/pkgs/development/python-modules/ftfy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ftfy/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { description = "Given Unicode text, make its representation consistent and possibly less broken"; homepage = "https://github.com/LuminosoInsight/python-ftfy"; license = licenses.mit; - maintainers = with maintainers; [ sdll aborsu ]; + maintainers = with maintainers; [ aborsu ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/furo/default.nix b/nixpkgs/pkgs/development/python-modules/furo/default.nix index e51661237809..c584ce433287 100644 --- a/nixpkgs/pkgs/development/python-modules/furo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/furo/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "furo"; - version = "2021.8.11b42"; + version = "2021.9.22"; format = "flit"; disable = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rhi2T57EfidQV1IHBkplCbzLlBCC5gVGmbkCf40s0qU="; + sha256 = "sha256-749l6cXyGbIarXXJmiCU0DsWQwrvH1dobOGePyT5VK8="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/gcovr/default.nix b/nixpkgs/pkgs/development/python-modules/gcovr/default.nix index 1332777189b1..5e9b32048f1f 100644 --- a/nixpkgs/pkgs/development/python-modules/gcovr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gcovr/default.nix @@ -3,20 +3,22 @@ , fetchPypi , jinja2 , lxml +, pygments }: buildPythonPackage rec { pname = "gcovr"; - version = "4.2"; + version = "5.0"; src = fetchPypi { inherit pname version; - sha256 = "0gyady7x3v3l9fm1zan0idaggqqcm31y7g5vxk7h05p5h7f39bjs"; + sha256 = "1d80264cbaadff356b3dda71b8c62b3aa803e5b3eb6d526a24932cd6660a2576"; }; propagatedBuildInputs = [ jinja2 lxml + pygments ]; # There are no unit tests in the pypi tarball. Most of the unit tests on the @@ -35,5 +37,4 @@ buildPythonPackage rec { license = licenses.bsd0; homepage = "https://www.gcovr.com/"; }; - } diff --git a/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix b/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix index db063747e8b1..65e18513185a 100644 --- a/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gcsfs/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "gcsfs"; - version = "2021.07.0"; + version = "2021.08.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - sha256 = "sha256-nC/uyhKKam3W+cOOTBULPeG6Hy2bExWYNOfDs1cPt1Y="; + sha256 = "sha256-SPQcSdEEbU791oqkvuwmvyvQ6HglvoWKMi5SdnRcEZI="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/gdown/default.nix b/nixpkgs/pkgs/development/python-modules/gdown/default.nix index bbb7c195d902..1528136bc394 100644 --- a/nixpkgs/pkgs/development/python-modules/gdown/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gdown/default.nix @@ -10,11 +10,11 @@ buildPythonApplication rec { pname = "gdown"; - version = "3.13.0"; + version = "3.13.1"; src = fetchPypi { inherit pname version; - sha256 = "d5f9389539673875712beba4936c4ace95d24324953c6f0408a858c534c0bf21"; + sha256 = "sha256-vh1NKRPk1e5cT3cVj8IrzmpaZ9yY2KtWrTGsCU9KkP4="; }; propagatedBuildInputs = [ filelock requests tqdm setuptools six ]; diff --git a/nixpkgs/pkgs/development/python-modules/gensim/default.nix b/nixpkgs/pkgs/development/python-modules/gensim/default.nix index 8972b356805a..5cf36c15dfad 100644 --- a/nixpkgs/pkgs/development/python-modules/gensim/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gensim/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "gensim"; - version = "4.1.0"; + version = "4.1.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0b09983048a97c7915ab50500bc53eeec438d26366041598709ec156db3eef1f"; + sha256 = "1932c257de4eccbb64cc40d46e8577a25f5f47b94b96019a969fb36150f11d15"; }; propagatedBuildInputs = [ smart-open numpy six scipy ]; diff --git a/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix b/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix index c4c0f41d8d17..077523bdb482 100644 --- a/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix @@ -1,31 +1,53 @@ { lib , buildPythonPackage , fetchPypi -, sqlalchemy -, shapely +, packaging , setuptools-scm -, pytest +, shapely +, sqlalchemy +, psycopg2 +, pytestCheckHook }: buildPythonPackage rec { pname = "GeoAlchemy2"; - version = "0.9.3"; + version = "0.9.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "56f969cf4ad6629ebcde73e807f7dac0a9375c79991b4f93efab191f37737a00"; + sha256 = "b0e56d4a945bdc0f8fa9edd50ecc912889ea68e0e3558a19160dcb0d5b1b65fc"; }; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ sqlalchemy shapely ]; + nativeBuildInputs = [ + setuptools-scm + ]; - # https://github.com/geoalchemy/geoalchemy2/blob/e05a676350b11f0e73609379dae5625c5de2e868/TEST.rst - doCheck = false; + propagatedBuildInputs = [ + packaging + shapely + sqlalchemy + ]; + + checkInputs = [ + psycopg2 + pytestCheckHook + ]; + + disabledTestPaths = [ + # tests require live postgis database + "tests/gallery/test_decipher_raster.py" + "tests/gallery/test_length_at_insert.py" + "tests/gallery/test_summarystatsagg.py" + "tests/gallery/test_type_decorator.py" + "tests/test_functional.py" + ]; meta = with lib; { + description = "Toolkit for working with spatial databases"; homepage = "http://geoalchemy.org/"; license = licenses.mit; - description = "Toolkit for working with spatial databases"; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/geoip2/default.nix b/nixpkgs/pkgs/development/python-modules/geoip2/default.nix index 7cb37780a58d..995db0636116 100644 --- a/nixpkgs/pkgs/development/python-modules/geoip2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/geoip2/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "4.2.0"; + version = "4.3.0"; pname = "geoip2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "906a1dbf15a179a1af3522970e8420ab15bb3e0afc526942cc179e12146d9c1d"; + sha256 = "599914784cea08b50fb50c22ed6a59143b5ff2d027ba782d2d5b6f3668293821"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/gevent-websocket/default.nix b/nixpkgs/pkgs/development/python-modules/gevent-websocket/default.nix index 7ff62a378ca9..24af4416ab3c 100644 --- a/nixpkgs/pkgs/development/python-modules/gevent-websocket/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gevent-websocket/default.nix @@ -17,10 +17,16 @@ buildPythonPackage rec { propagatedBuildInputs = [ gevent gunicorn ]; + # zero tests run + doCheck = false; + + pythonImportsCheck = [ "geventwebsocket" ]; + meta = with lib; { homepage = "https://www.gitlab.com/noppo/gevent-websocket"; description = "Websocket handler for the gevent pywsgi server, a Python network library"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix b/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix index 5563ff94baf5..fd759a0bd723 100644 --- a/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix @@ -1,32 +1,49 @@ { lib , buildPythonPackage +, pythonOlder , fetchPypi -, pytest -, gevent +, backports_ssl_match_hostname +, brotli , certifi +, gevent , six -, backports_ssl_match_hostname -, pythonOlder +, dpkt +, pytestCheckHook }: buildPythonPackage rec { pname = "geventhttpclient"; - version = "1.4.5"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "3f0ab18d84ef26ba0c9df73ae2a41ba30a46072b447f2e36c740400de4a63d44"; + sha256 = "4aead64253d2769a6528544f7812ce8d71ae13551d079f2d9a3533d72818f2e0"; }; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ gevent certifi six ] - ++ lib.optionals (pythonOlder "3.7") [ backports_ssl_match_hostname ]; + propagatedBuildInputs = [ + brotli + certifi + gevent + six + ] ++ lib.optionals (pythonOlder "3.7") [ + backports_ssl_match_hostname + ]; + + checkInputs = [ + dpkt + pytestCheckHook + ]; - # Several tests fail that require network - doCheck = false; - checkPhase = '' - py.test $out - ''; + disabledTests = [ + # socket.gaierror: [Errno -2] Name or service not known + "test_client_simple" + "test_client_without_leading_slas" + "test_request_with_headers" + "test_response_context_manager" + "test_client_ssl" + "test_ssl_fail_invalid_certificate" + "test_multi_queries_greenlet_safe" + ]; meta = with lib; { homepage = "https://github.com/gwik/geventhttpclient"; diff --git a/nixpkgs/pkgs/development/python-modules/goalzero/default.nix b/nixpkgs/pkgs/development/python-modules/goalzero/default.nix index c533af8b7fdc..b2cf6e7eadaf 100644 --- a/nixpkgs/pkgs/development/python-modules/goalzero/default.nix +++ b/nixpkgs/pkgs/development/python-modules/goalzero/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "goalzero"; - version = "0.1.59"; + version = "0.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0d0f11aa31672f3ef4ab617db92c87ef6f143804473022405f6da9d830f17638"; + sha256 = "6cb67cf772a758225b2e23b394feb697e8cbfb1aff5a2d7a17a0d4ccf61e55cd"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix b/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix index 2fd9247c8825..45d6044b8ea7 100644 --- a/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.15.0"; + version = "2.18.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-g3VIkjKCP0TGARlqlgUF4D7FjJXdtkFcax0ddrRo+Lo="; + sha256 = "a25661ec6cf4c159f41fe9c061c2bee31b2dddaf2ad787e23617048a25b53842"; }; # No tests included in archive diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-audit-log/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-audit-log/default.nix index 7d101c32284e..88e2378aaf74 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-audit-log/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-audit-log/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-audit-log"; - version = "0.1.0"; + version = "0.1.1"; src = fetchPypi { inherit pname version; - sha256 = "5bf5a53c641b13828154ab21fb209669be69d71cd462f5d6456bf87722fc0eeb"; + sha256 = "a87fdf3c393b830b35c8f7db09094790d0d7babb35068736bea64e1618d286fe"; }; propagatedBuildInputs = [ googleapis-common-protos protobuf ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index f6a62c544cf4..62956e1e46de 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.3.1"; + version = "3.3.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oCktt8wAYKewz6Ga4mIGVy0IWonXTqQvaO5MT4MkHMY="; + sha256 = "fcb71ebe5c5b232d24fe7d666b65709e4fc8db43263c8182e5ed8e5a52abefec"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix index be463f6a9633..05b2d954c4b8 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-dns"; - version = "0.33.0"; + version = "0.33.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-iPAJMzxefRjLA0tGUfjAs15ZJvcyBUJB1QCMfMBo96I="; + sha256 = "e4aa73fc6ca22764fd7294de19b602dff084d924c77366c136fb9c28e70ae739"; }; propagatedBuildInputs = [ google-api-core google-cloud-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix index 00276d581761..c0ec04b4330f 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.3.1"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - sha256 = "8f8e513cae105ba17c4d3949091bd816cbf6075c6ac91b1f7acb4d40359f8a5a"; + sha256 = "6e2eb65ccd75c6579214fb2099cfb98c57b2b4907ccb38a2ed21f00f492b7a50"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index 7784b910e188..0da292a342c6 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; - version = "0.32.4"; + version = "0.32.5"; src = fetchPypi { inherit pname version; - sha256 = "ee239455a5393b51018071678ec0f4cc58ddf0904390e9f317f704f158ab16ab"; + sha256 = "2f7b2a69f4506239a54f2d88dda872db27fdb0fdfa0d5a9494fefb7ae360aa20"; }; propagatedBuildInputs = [ google-api-core google-cloud-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 30174afcbb05..6436fe9d6089 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.7.0"; + version = "2.7.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gfNoCfh2ssHgYcQ1kfQedcfhpqsu3x50hdYrm11SKGo="; + sha256 = "84ae86a2320425df2e78d981d4ab26bff591ade1b978c18c929188b741a7b37d"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix index e84e7cc06dbf..1832978aab31 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.9.0"; + version = "3.10.0"; src = fetchPypi { inherit pname version; - sha256 = "53fe3d903363fb17db155fd05f5356d9b310a519fbebd53903aa426a31cad706"; + sha256 = "49b946f9ae67ebae69d39f1f4ceabe88971b880b92277ce037651db49e5cf167"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix index 7c414cc1321f..59d08bd8e5e9 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.8.0"; + version = "2.9.0"; src = fetchPypi { inherit pname version; - sha256 = "3750fd988082b880ed1ec6f3d59c4f29f4cd0df3804a58d6c151d4bf15d3a597"; + sha256 = "2368beb60e5cdeb6db527509cdcc8fc1156eddfc0c73da8f62d60658a551eee1"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix b/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix index 05a66406ce02..2c208511ee3f 100644 --- a/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-testutils"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2RaRhRvgnmr/trjAE+RBlVO5AZ54YEFcoRwcPCKCTKs="; + sha256 = "3d79051b6ca170c2a4f159bf56ac3f66c1e5360486121e72c06fdaa3911154bf"; }; propagatedBuildInputs = [ click google-auth six ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix b/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix index b36635654a9d..1e010f956013 100644 --- a/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-crc32c/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "google-crc32c"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "googleapis"; repo = "python-crc32c"; rev = "v${version}"; - sha256 = "058g69yp7x41mv0d84yp31jv64fpm4r25b86rvvqgc6n74w6jj7k"; + sha256 = "0snpqmj2avgqvfd7w26g03w78s6phwd8h55bvpjwm4lwj8hm8id7"; }; buildInputs = [ crc32c ]; diff --git a/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix b/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix index f29604c9da30..ad5cc9922c06 100644 --- a/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "2.0.2"; + version = "2.0.3"; src = fetchPypi { inherit pname version; - sha256 = "36d682161fdcbfa29681212c210fabecbf6849a505a0cbc54b7f70a10a5278a2"; + sha256 = "b4b4709d04a6a03cbec746c2b5cb18f1f9878bf1ef3cd61908842a3d94c20471"; }; propagatedBuildInputs = [ google-auth google-crc32c requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/gradient/default.nix b/nixpkgs/pkgs/development/python-modules/gradient/default.nix index 57b58699ec38..a0788070a965 100644 --- a/nixpkgs/pkgs/development/python-modules/gradient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gradient/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "gradient"; - version = "1.5.5"; + version = "1.7.4"; src = fetchPypi { inherit pname version; - sha256 = "fee5016afe5e61a640bb9d7e234a10926c17c9e83c876b617438ff5f5ce039ad"; + sha256 = "de1d33672f13d4de37a66ba9aebfd503a098d0ca26e5eb8b071e1c0dacd557ea"; }; postPatch = '' @@ -67,5 +67,8 @@ buildPythonPackage rec { license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; + # There is no support for click > 8 + # https://github.com/Paperspace/gradient-cli/issues/368 + broken = true; }; } diff --git a/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix b/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix index 7ac25424616a..1909dd99fe0f 100644 --- a/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "graphql-core"; - version = "3.1.5"; + version = "3.1.6"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "graphql-python"; repo = pname; rev = "v${version}"; - sha256 = "055gfvyax781f4zk4pl60y8yd90bnn4rkqh5i48pczaff0lwlfj1"; + sha256 = "1ip0yrqmnqncgpwvba18x020gkwr7csiw4zdy6mrdnvwf5qyam4x"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/green/default.nix b/nixpkgs/pkgs/development/python-modules/green/default.nix index 934c363245d7..540d3027b94e 100644 --- a/nixpkgs/pkgs/development/python-modules/green/default.nix +++ b/nixpkgs/pkgs/development/python-modules/green/default.nix @@ -1,29 +1,40 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k +{ lib +, buildPythonPackage +, isPy3k +, fetchPypi , colorama , coverage -, termstyle -, lxml , unidecode +, lxml }: buildPythonPackage rec { pname = "green"; - version = "3.2.6"; + version = "3.3.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "e51d4ff6e6885942d944304fedc7440a8f87917aa09526beeecb31a0dae655b8"; + sha256 = "a4d86f2dfa4ccbc86f24bcb9c9ab8bf34219c876c24e9f0603aab4dfe73bb575"; }; + patches = [ + ./tests.patch + ]; + + postPatch = '' + substituteInPlace green/test/test_integration.py \ + --subst-var-by green "$out/bin/green" + ''; + propagatedBuildInputs = [ - colorama coverage termstyle unidecode lxml + colorama coverage unidecode lxml ]; # let green run it's own test suite checkPhase = '' - $out/bin/green green + $out/bin/green -tvvv green ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/green/tests.patch b/nixpkgs/pkgs/development/python-modules/green/tests.patch new file mode 100644 index 000000000000..7e1c3be62e3f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/green/tests.patch @@ -0,0 +1,22 @@ +diff --git a/green/test/test_integration.py b/green/test/test_integration.py +index 0cf8cbb..40d9f6b 100644 +--- a/green/test/test_integration.py ++++ b/green/test/test_integration.py +@@ -41,9 +41,7 @@ class TestFinalizer(unittest.TestCase): + ) + fh.close() + args = [ +- sys.executable, +- "-m", +- "green.cmdline", ++ "@green@", + "--finalizer=test_finalizer0.msg", + "--maxtasksperchild=1", + ] +@@ -58,6 +56,5 @@ class TestFinalizer(unittest.TestCase): + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + env=env, +- timeout=10, + ).stdout.decode("utf-8") + self.assertIn("finalizer worked", output) diff --git a/nixpkgs/pkgs/development/python-modules/greenlet/default.nix b/nixpkgs/pkgs/development/python-modules/greenlet/default.nix index 4d829f3d6473..e997c7da3987 100644 --- a/nixpkgs/pkgs/development/python-modules/greenlet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/greenlet/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "greenlet"; - version = "1.1.0"; + version = "1.1.1"; disabled = isPyPy; # builtin for pypy src = fetchPypi { inherit pname version; - sha256 = "c87df8ae3f01ffb4483c796fe1b15232ce2b219f0b18126948616224d3f658ee"; + sha256 = "c0f22774cd8294078bdf7392ac73cf00bfa1e5e0ed644bd064fdabc5f2a2f481"; }; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/gssapi/default.nix b/nixpkgs/pkgs/development/python-modules/gssapi/default.nix index cbb81d3c7f61..ce2ba8d3730f 100644 --- a/nixpkgs/pkgs/development/python-modules/gssapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/gssapi/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "gssapi"; - version = "1.6.14"; + version = "1.7.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pythongssapi"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "sha256-pL8uvHUdev+nDG0nGh7j7VIJCIQv0egPoTa9hUMuEZc="; + sha256 = "0ybijgsr4ra7x1w86sva4qljhm54ilm2zv4z0ry1r14kq9hmjfa4"; }; # It's used to locate headers diff --git a/nixpkgs/pkgs/development/python-modules/h5py/default.nix b/nixpkgs/pkgs/development/python-modules/h5py/default.nix index 9e5921bb412d..dfa4288e54fc 100644 --- a/nixpkgs/pkgs/development/python-modules/h5py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/h5py/default.nix @@ -8,13 +8,13 @@ let mpi = hdf5.mpi; mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "3.2.1"; + version = "3.4.0"; pname = "h5py"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-iUdL6RG/zbNMvw2YuOxItXjCeon9sa5O51E/HvjZJJ4="; + sha256 = "ee1c683d91ab010d5e85cb61e8f9e7ee0d8eab545bf3dd50a9618f1d0e8f615e"; }; # avoid strict pinning of numpy diff --git a/nixpkgs/pkgs/development/python-modules/hdate/default.nix b/nixpkgs/pkgs/development/python-modules/hdate/default.nix index 5c8a2c1e9fc5..42736d0a04c2 100644 --- a/nixpkgs/pkgs/development/python-modules/hdate/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hdate/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "hdate"; - version = "0.10.3"; + version = "0.10.4"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "py-libhdate"; repo = "py-libhdate"; rev = "v${version}"; - sha256 = "sha256-6rOsG6qgq4woBhj25SNWvKshvFLBL/6MJiBZb+NPvdk="; + sha256 = "sha256-NF2ZA9ruW7sL2tLY11VAtyPRxGg2o5/mpv3ZsH/Zxb8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix b/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix index bf48d6cf5e76..9fa932c7e418 100644 --- a/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hdbscan/default.nix @@ -44,6 +44,8 @@ buildPythonPackage rec { "test_hdbscan_boruvka_balltree_matches" ]; + pythonImportsCheck = [ "hdbscan" ]; + meta = with lib; { description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; homepage = "https://github.com/scikit-learn-contrib/hdbscan"; diff --git a/nixpkgs/pkgs/development/python-modules/herepy/default.nix b/nixpkgs/pkgs/development/python-modules/herepy/default.nix index 13454e4e1966..9b1a50a532fa 100644 --- a/nixpkgs/pkgs/development/python-modules/herepy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/herepy/default.nix @@ -20,6 +20,11 @@ buildPythonPackage rec { sha256 = "sha256-05x3EQoyv38j4UcixN0sf5BI2oTjfasAIQyZqQSjdPM="; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "requests==2.25.1" "requests>=2.25.1" + ''; + propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/hiyapyco/default.nix b/nixpkgs/pkgs/development/python-modules/hiyapyco/default.nix index f443c58723e8..79693747cfac 100644 --- a/nixpkgs/pkgs/development/python-modules/hiyapyco/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hiyapyco/default.nix @@ -6,7 +6,7 @@ }: buildPythonPackage rec { - pname = "HiYaPyCo"; + pname = "hiyapyco"; version = "0.4.16"; src = fetchFromGitHub { @@ -16,17 +16,29 @@ buildPythonPackage rec { sha256 = "1ams9dp05yhgbg6255wrjgchl2mqg0s34d8b8prvql9lsh59s1fj"; }; - propagatedBuildInputs = [ pyyaml jinja2 ]; + propagatedBuildInputs = [ + pyyaml + jinja2 + ]; + + postPatch = '' + # Should no longer be needed with the next release + # https://github.com/zerwes/hiyapyco/pull/42 + substituteInPlace setup.py \ + --replace "Jinja2>1,<3" "Jinja2>1" + ''; checkPhase = '' set -e find test -name 'test_*.py' -exec python {} \; ''; + pythonImportsCheck = [ "hiyapyco" ]; + meta = with lib; { - description = "A simple python lib allowing hierarchical overlay of config files in YAML syntax, offering different merge methods and variable interpolation based on jinja2."; + description = "Python library allowing hierarchical overlay of config files in YAML syntax"; homepage = "https://github.com/zerwes/hiyapyco"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ veehaitch ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix b/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix index 7b92aeb269df..ecdfb790ebca 100644 --- a/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2021.8.1"; + version = "2021.9.1"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "0si22p461qydh874gkidiar89hrfx7lm7r7g6d1qi7lz8wlwcplv"; + sha256 = "sha256-CZlXnRe4yA6VJF48t73m2PbBRFzg0XTgT7J1N83Ojc4="; }; # tests require network connection diff --git a/nixpkgs/pkgs/development/python-modules/html5-parser/default.nix b/nixpkgs/pkgs/development/python-modules/html5-parser/default.nix index d20f0a9abfdb..3909c352185f 100644 --- a/nixpkgs/pkgs/development/python-modules/html5-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/html5-parser/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "html5-parser"; - version = "0.4.9"; + version = "0.4.10"; src = fetchPypi { inherit pname version; - sha256 = "25fe8f6848cbc15187f6748c0695df32bcf1b37df6420b6a01b4ebe1ec1ed48f"; + sha256 = "f9294418c0da95c2d5facc19d3dc32941093a6b8e3b3e4b36cc7b5a1697fbca4"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/python-modules/httpcore/default.nix b/nixpkgs/pkgs/development/python-modules/httpcore/default.nix index c6c7b3372140..089c2d9fcc42 100644 --- a/nixpkgs/pkgs/development/python-modules/httpcore/default.nix +++ b/nixpkgs/pkgs/development/python-modules/httpcore/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "httpcore"; - version = "0.13.6"; + version = "0.13.7"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "sha256-7G7jchOQTgcFSGZfoMPFm0NY9ofg5MM5Xn5lV+W9w8k="; + sha256 = "sha256-9hG9MqqEYMT2j7tXafToGYwHbJfp9/klNqZozHSbweE="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/httpretty/default.nix b/nixpkgs/pkgs/development/python-modules/httpretty/default.nix index f0c0b9b2ee99..78a529666139 100644 --- a/nixpkgs/pkgs/development/python-modules/httpretty/default.nix +++ b/nixpkgs/pkgs/development/python-modules/httpretty/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "httpretty"; - version = "1.1.3"; + version = "1.1.4"; # drop this for version > 0.9.7 # Flaky tests: https://github.com/gabrielfalcao/HTTPretty/pull/394 @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "229ade39175ea4324e767f29dc24e5f846fbc72bf80e1a919b2547a6574ff601"; + sha256 = "20de0e5dd5a18292d36d928cc3d6e52f8b2ac73daec40d41eb62dee154933b68"; }; propagatedBuildInputs = [ six ]; diff --git a/nixpkgs/pkgs/development/python-modules/httptools/default.nix b/nixpkgs/pkgs/development/python-modules/httptools/default.nix index 54b512be1fd4..0a5b510b0ad9 100644 --- a/nixpkgs/pkgs/development/python-modules/httptools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/httptools/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "httptools"; - version = "0.2.0"; + version = "0.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "94505026be56652d7a530ab03d89474dc6021019d6b8682281977163b3471ea0"; + sha256 = "3f9b4856d46ba1f0c850f4e84b264a9a8b4460acb20e865ec00978ad9fbaa4cf"; }; # tests are not included in pypi tarball diff --git a/nixpkgs/pkgs/development/python-modules/httpx/default.nix b/nixpkgs/pkgs/development/python-modules/httpx/default.nix index 6a9300566d59..014272bcc107 100644 --- a/nixpkgs/pkgs/development/python-modules/httpx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/httpx/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , brotlicffi , certifi +, charset-normalizer , h2 , httpcore , rfc3986 @@ -18,19 +19,20 @@ buildPythonPackage rec { pname = "httpx"; - version = "0.18.2"; + version = "0.19.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "0rr5b6z96yipvp4riqmmbkbcy0sdyzykcdwf5y9ryh27pxr8q8x4"; + sha256 = "sha256-bUxxeUYqOHBmSL2gPQG5cIq6k5QY4Kyhj9ToA5yZXPA="; }; propagatedBuildInputs = [ brotlicffi certifi + charset-normalizer h2 httpcore rfc3986 diff --git a/nixpkgs/pkgs/development/python-modules/humanize/default.nix b/nixpkgs/pkgs/development/python-modules/humanize/default.nix index 4c5bd0e3af25..85ec6257ea5d 100644 --- a/nixpkgs/pkgs/development/python-modules/humanize/default.nix +++ b/nixpkgs/pkgs/development/python-modules/humanize/default.nix @@ -9,13 +9,13 @@ }: buildPythonPackage rec { - version = "3.9.0"; + version = "3.11.0"; pname = "humanize"; disabled = isPy27; # setup.py no longer compatible src = fetchPypi { inherit pname version; - sha256 = "892a5b7b87763c4c6997a58382c2b1f4614048a2e01c23ef1bb0456e6f9d4d5d"; + sha256 = "4160cdc63fcd0daac27d2e1e218a31bb396fc3fe5712d153675d89432a03778f"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/hvac/default.nix b/nixpkgs/pkgs/development/python-modules/hvac/default.nix index 5eaf6f1199eb..c30566a45109 100644 --- a/nixpkgs/pkgs/development/python-modules/hvac/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hvac/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "hvac"; - version = "0.11.0"; + version = "0.11.2"; src = fetchPypi { inherit pname version; - sha256 = "9d5504e35388e665db5086edf75d2425831573c6569bb0bf3c2c6eaff30e034e"; + sha256 = "f905c59d32d88d3f67571fe5a8a78de4659e04798ad809de439f667247d13626"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix b/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix index 35f53864eb9d..4d0a1713d954 100644 --- a/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { # If you need these, you can just add them to your environment. pname = "hypothesis"; - version = "6.14.0"; + version = "6.17.3"; # Use github tarballs that includes tests src = fetchFromGitHub { owner = "HypothesisWorks"; repo = "hypothesis-python"; rev = "hypothesis-python-${version}"; - sha256 = "0yns81j3fnpdfaphk722xcnidqhgy0kmd7ik6aw7l795l0wivhxj"; + sha256 = "1g96q3l97lq3xps36cv147dvj44nh1b0k67z817x7zfwyw844sgn"; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; diff --git a/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix b/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix index 4bf1ca8d02f7..0d175989271c 100644 --- a/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix +++ b/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hypothesmith"; - version = "0.1.8"; + version = "0.1.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+f8EexXE7TEs49pX6idXD4bWtTzhKvnyXlnmV2oAQQo="; + sha256 = "039fd6aa0102f89df9df7ad4cff70aa8068678c13c3be2713c92568917317a04"; }; propagatedBuildInputs = [ hypothesis lark-parser libcst ]; diff --git a/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 8e7f4832c254..cc7572499da1 100644 --- a/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -1,11 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, codecov , pyjwt -, pylint , pytestCheckHook -, pytest-cov , python-dateutil , requests , responses @@ -14,30 +11,27 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.10.0"; + version = "3.11.3"; src = fetchPypi { inherit pname version; - sha256 = "ab9520be99066ec41a24e31ac653c28953adc8fc349f0fa53a598e1802a79cd6"; + sha256 = "c855d0111dd570f36497cdb8c11510ae8d14fb70698f20529e19f88485266233"; }; - checkInputs = [ - codecov - pylint - pytestCheckHook - pytest-cov - responses - tox - ]; - propagatedBuildInputs = [ pyjwt python-dateutil requests ]; - # Various tests try to access credential files which are not included with the source distribution + checkInputs = [ + pytestCheckHook + responses + tox + ]; + disabledTests = [ + # Various tests try to access credential files which are not included with the source distribution "test_configure_service" "test_cp4d_authenticator" "test_cwd" @@ -49,6 +43,12 @@ buildPythonPackage rec { "test_iam" "test_read_external_sources_2" "test_retry_config_external" + # assertion error due to requests brotli support + "test_http_client" + ]; + + disabledTestPaths = [ + "test/test_container_token_manager.py" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix b/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix index 49e4541143e9..a0c12758069b 100644 --- a/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "ibm-watson"; - version = "5.2.2"; + version = "5.3.0"; src = fetchFromGitHub { owner = "watson-developer-cloud"; repo = "python-sdk"; rev = "v${version}"; - sha256 = "sha256-bK6lcTKAVwAJDb5LqKRWR/4wcOKx7bRwWYC+WB5qJE4="; + sha256 = "0g63h7rf0710bxcsr115857bvz69sl2g5d13k5a7qi7hjh33bxrk"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/identify/default.nix b/nixpkgs/pkgs/development/python-modules/identify/default.nix index 8146d47c7b25..409653dec52a 100644 --- a/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "identify"; - version = "2.2.14"; + version = "2.2.15"; src = fetchFromGitHub { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hQpI69jBEtKYQuB+lx4oF2Ud77IajlAPYWl8IxtSTNo="; + sha256 = "sha256-mr778CszspTuKSPwXBDaehCMqbfkNFgAVzpkn7seVoU="; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix index 9d1755d81b97..a249b2dbfe19 100644 --- a/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "imageio-ffmpeg"; - version = "0.4.4"; + version = "0.4.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "73640a7a54f95e607addd637c766d56be31d975a64ddb97d14df012575ef1a5d"; + sha256 = "f2ea4245a2adad25dedf98d343159579167e549ac8c4691cef5eff980e20c139"; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix b/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix index d1cecdda42d9..392663e391d1 100644 --- a/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.44.0"; + version = "0.48.1"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - sha256 = "sha256-C9396yRSowaLe3E1s+rw8bah77znjfoIhLwJpcqhN6Y="; + sha256 = "sha256-AS407jsDk+dAz1DPM44vTUQEleohr9xKnjgCw5Rjs9M="; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/imdbpy/default.nix b/nixpkgs/pkgs/development/python-modules/imdbpy/default.nix index dea62f080093..ab4d2a5ce0c1 100644 --- a/nixpkgs/pkgs/development/python-modules/imdbpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/imdbpy/default.nix @@ -1,25 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, lxml, sqlalchemy }: +{ lib +, buildPythonPackage +, fetchPypi +, lxml +, sqlalchemy +}: buildPythonPackage rec { - pname = "IMDbPY"; - version = "2020.9.25"; + pname = "imdbpy"; + version = "2021.4.18"; src = fetchPypi { - inherit pname version; - sha256 = "1p3j9j1jcgbw4626cvgpryhvczy9gzlg0laz6lflgq17m129gin2"; + pname = "IMDbPY"; + inherit version; + sha256 = "af57f03638ba3b8ab3d696bfef0eeaf6414385c85f09260aba0a16b32174853f"; }; - patches = [ ./sql_error.patch ]; # Already fixed in master, but not yet in the current release. This can be removed upon the next version update + propagatedBuildInputs = [ + lxml + sqlalchemy + ]; - propagatedBuildInputs = [ lxml sqlalchemy ]; + # Tests require networking, and https://github.com/alberanid/imdbpy/issues/240 + doCheck = false; - doCheck = false; # Tests require networking, and https://github.com/alberanid/imdbpy/issues/240 pythonImportsCheck = [ "imdb" ]; meta = with lib; { + description = "Python package for retrieving and managing the data of the IMDb database"; homepage = "https://imdbpy.github.io/"; - description = "A Python package for retrieving and managing the data of the IMDb database"; - maintainers = [ maintainers.ivar ]; license = licenses.gpl2Only; + maintainers = with maintainers; [ ivar ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/imdbpy/sql_error.patch b/nixpkgs/pkgs/development/python-modules/imdbpy/sql_error.patch deleted file mode 100644 index 10770f4f1135..000000000000 --- a/nixpkgs/pkgs/development/python-modules/imdbpy/sql_error.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/imdb/parser/sql/__init__.py b/imdb/parser/sql/__init__.py -index cd4a3e3..3fcfdd4 100644 ---- a/imdb/parser/sql/__init__.py -+++ b/imdb/parser/sql/__init__.py -@@ -557,7 +557,6 @@ class IMDbSqlAccessSystem(IMDbBase): - """The class used to access IMDb's data through a SQL database.""" - - accessSystem = 'sql' -- _sql_logger = logging.getLogger('imdbpy.parser.sql') - - def __init__(self, uri, adultSearch=True, *arguments, **keywords): - """Initialize the access system.""" -@@ -582,7 +581,7 @@ class IMDbSqlAccessSystem(IMDbBase): - except ImportError as e: - raise IMDbError('unable to import SQLAlchemy') - # Set the connection to the database. -- self._sql_logger.debug('connecting to %s', uri) -+ logger.debug('connecting to %s', uri) - try: - self._connection = setConnection(uri, DB_TABLES) - except AssertionError as e: -@@ -593,7 +592,7 @@ class IMDbSqlAccessSystem(IMDbBase): - # Maps some IDs to the corresponding strings. - self._kind = {} - self._kindRev = {} -- self._sql_logger.debug('reading constants from the database') -+ logger.debug('reading constants from the database') - try: - for kt in KindType.select(): - self._kind[kt.id] = kt.kind -@@ -1616,7 +1615,7 @@ class IMDbSqlAccessSystem(IMDbBase): - return - if not hasattr(self, '_connection'): - return -- self._sql_logger.debug('closing connection to the database') -+ logger.debug('closing connection to the database') - try: - self._connection.close() - except: diff --git a/nixpkgs/pkgs/development/python-modules/iminuit/default.nix b/nixpkgs/pkgs/development/python-modules/iminuit/default.nix index 42a1d7c4ffdb..306d242d68a3 100644 --- a/nixpkgs/pkgs/development/python-modules/iminuit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/iminuit/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "iminuit"; - version = "2.6.1"; + version = "2.8.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "5fb8786bcad53762648ddacb008d18b49704ba5c011ade240004bfc5a628b4f6"; + sha256 = "8e22d81a53ce3316f0253bf0b7831bd72ac1122ca78896c2ee2e585178c5c9ae"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/python-modules/immutabledict/default.nix b/nixpkgs/pkgs/development/python-modules/immutabledict/default.nix index 54fef8720ca5..b45b852f85fc 100644 --- a/nixpkgs/pkgs/development/python-modules/immutabledict/default.nix +++ b/nixpkgs/pkgs/development/python-modules/immutabledict/default.nix @@ -7,22 +7,16 @@ buildPythonPackage rec { pname = "immutabledict"; - version = "2.1.0"; + version = "2.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "corenting"; repo = "immutabledict"; rev = "v${version}"; - sha256 = "1n71154nfb6vr41iv00xcwkxmwnn1vwzbr3s23bjvlhvmnjb48a8"; + sha256 = "sha256-Jf7ad3ImPfEvCBrUZ1NVXMCBqwLmd0hwpKfe9rVsehc="; }; - # https://github.com/corenting/immutabledict/issues/56 - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "poetry.masonry.api" "poetry.core.masonry.api" - ''; - nativeBuildInputs = [ poetry-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/impacket/default.nix b/nixpkgs/pkgs/development/python-modules/impacket/default.nix index 71f932ebe958..1c4106babe28 100644 --- a/nixpkgs/pkgs/development/python-modules/impacket/default.nix +++ b/nixpkgs/pkgs/development/python-modules/impacket/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, flask, ldapdomaindump, pycryptodomex, pyasn1, pyopenssl, chardet }: +{ lib, buildPythonPackage, fetchPypi, flask, ldapdomaindump, pycryptodomex, pyasn1, pyopenssl, chardet, setuptools }: buildPythonPackage rec { pname = "impacket"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1c1be8a50cdbe3cffc566ba64f552b1b28bcc79b7a406b833956b49c56d77184"; }; - propagatedBuildInputs = [ flask ldapdomaindump pycryptodomex pyasn1 pyopenssl chardet ]; + propagatedBuildInputs = [ flask ldapdomaindump pycryptodomex pyasn1 pyopenssl chardet setuptools ]; # fail with: # RecursionError: maximum recursion depth exceeded diff --git a/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix b/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix index d430c4cf29c2..d67a6c947517 100644 --- a/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "4.0.1"; + version = "4.6.4"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "importlib_metadata"; inherit version; - sha256 = "sha256-jFARluSfud9d9DgzvbHkMo9khHdj7IpQcDFItzeE1YE="; + sha256 = "sha256-ezCnjbKSLXim9H+zBoMVahTzxqpcwj93zIln6astAC8="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix b/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix index 2388fb1b26df..ca361f5b1191 100644 --- a/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix +++ b/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "importlib-resources"; - version = "5.1.2"; + version = "5.2.2"; src = fetchPypi { pname = "importlib_resources"; inherit version; - sha256 = "642586fc4740bd1cad7690f836b3321309402b20b332529f25617ff18e8e1370"; + sha256 = "sha256-pliCpND+X79wInNFa6LOdP5EiSwl5C4FespSa3AqbUs="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/in-place/default.nix b/nixpkgs/pkgs/development/python-modules/in-place/default.nix new file mode 100644 index 000000000000..6490aea35983 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/in-place/default.nix @@ -0,0 +1,33 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "in-place"; + version = "0.5.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "jwodder"; + repo = "inplace"; + rev = "v${version}"; + sha256 = "1w6q3d0gqz4mxvspd08l1nhsrw6rpzv1gnyj4ckx61b24f84p5gk"; + }; + + postPatch = '' + substituteInPlace tox.ini --replace "--cov=in_place --no-cov-on-fail" "" + ''; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "in_place" ]; + + meta = with lib; { + description = "In-place file processing"; + homepage = "https://github.com/jwodder/inplace"; + license = licenses.mit; + maintainers = with maintainers; [ samuela ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/inflect/default.nix b/nixpkgs/pkgs/development/python-modules/inflect/default.nix index 9081a30ac6be..ca454d432317 100644 --- a/nixpkgs/pkgs/development/python-modules/inflect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/inflect/default.nix @@ -3,7 +3,6 @@ , fetchPypi , isPy27 , setuptools-scm -, toml , pytestCheckHook }: @@ -17,7 +16,7 @@ buildPythonPackage rec { sha256 = "41a23f6788962e9775e40e2ecfb1d6455d02de315022afeedd3c5dc070019d73"; }; - nativeBuildInputs = [ setuptools-scm toml ]; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix b/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix index 437c10c3d849..6d2f9f30a4e5 100644 --- a/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.20.0"; + version = "1.21.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb-client-python"; rev = "v${version}"; - sha256 = "sha256-VBKGzoLn71BQ5drbdiDjbpfHuYKGqHhuSwq0iNwdfh4="; + sha256 = "081pwd3aa7kbgxqcl1hfi2ny4iapnxkcp9ypsfslr69d0khvfc4s"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/inform/default.nix b/nixpkgs/pkgs/development/python-modules/inform/default.nix index 2397c0bc4db6..9ef6fd1e0a1d 100644 --- a/nixpkgs/pkgs/development/python-modules/inform/default.nix +++ b/nixpkgs/pkgs/development/python-modules/inform/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "inform"; - version = "1.24"; + version = "1.25"; src = fetchFromGitHub { owner = "KenKundert"; repo = "inform"; rev = "v${version}"; - sha256 = "114cyff00j9r7qm2ld4w1a4kklr5gx570vk67p56gpr2553dkmly"; + sha256 = "1r56wmn21c7ggy33548l6dfjswhadkp2iaalfb7xgsxmq7qfcnax"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/intake-parquet/default.nix b/nixpkgs/pkgs/development/python-modules/intake-parquet/default.nix new file mode 100644 index 000000000000..49d5e1ed4b93 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/intake-parquet/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pandas +, dask +, fastparquet +, pyarrow +}: + +buildPythonPackage rec { + pname = "intake-parquet"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "intake"; + repo = pname; + rev = version; + sha256 = "037jd3qkk6dybssp570kzvaln2c6pk2avd2b5mll42gaxdxxnp02"; + }; + + propagatedBuildInputs = [ + pandas + dask + fastparquet + pyarrow + ]; + + postPatch = '' + # Break circular dependency + substituteInPlace requirements.txt \ + --replace "intake" "" + ''; + + doCheck = false; + + #pythonImportsCheck = [ "intake_parquet" ]; + + meta = with lib; { + description = "Parquet plugin for Intake"; + homepage = "https://github.com/intake/intake-parquet"; + license = licenses.bsd2; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/intake/default.nix b/nixpkgs/pkgs/development/python-modules/intake/default.nix index fff6d74b56a1..361469f540e1 100644 --- a/nixpkgs/pkgs/development/python-modules/intake/default.nix +++ b/nixpkgs/pkgs/development/python-modules/intake/default.nix @@ -5,12 +5,14 @@ , dask , holoviews , hvplot +, fsspec , jinja2 , msgpack , msgpack-numpy , numpy , pandas , panel +, intake-parquet , pyarrow , pytestCheckHook , pythonOlder @@ -23,12 +25,13 @@ buildPythonPackage rec { pname = "intake"; - version = "0.6.2"; + version = "0.6.3"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "b0cab1d185a703acb38eecb9cff3edd5cc7004fe18a36d5e42a8f7fffc9cca1c"; + sha256 = "f64543353f30d9440b953984f78b7a0954e5756d70c64243609d307ba488014f"; }; propagatedBuildInputs = [ @@ -49,7 +52,12 @@ buildPythonPackage rec { tornado ]; - checkInputs = [ pyarrow pytestCheckHook ]; + checkInputs = [ + fsspec + intake-parquet + pyarrow + pytestCheckHook + ]; postPatch = '' # Is in setup_requires but not used in setup.py... @@ -64,14 +72,12 @@ buildPythonPackage rec { ''; disabledTests = [ - # disable tests which touch network + # disable tests which touch network and are broken "test_discover" "test_filtered_compressed_cache" "test_get_dir" "test_remote_cat" "http" - - # broken test "test_read_pattern" "test_remote_arr" ]; @@ -80,6 +86,6 @@ buildPythonPackage rec { description = "Data load and catalog system"; homepage = "https://github.com/ContinuumIO/intake"; license = licenses.bsd2; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix b/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix new file mode 100644 index 000000000000..d050bd1c8d15 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/intensity-normalization/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pytestCheckHook +, matplotlib +, nibabel +, numpy +, scikit-fuzzy +, scikitimage +, scikit-learn +, scipy +, statsmodels +}: + +buildPythonPackage rec { + pname = "intensity-normalization"; + version = "2.0.1"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1c6inlhpxarvkniq8j5j2pgl32dmggn14s8c3c0xx15j7cg90413"; + }; + + postPatch = '' + substituteInPlace setup.cfg --replace "pytest-runner" "" + ''; + + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ + "intensity_normalization" + "intensity_normalization.normalize" + "intensity_normalization.plot" + "intensity_normalization.util" + ]; + propagatedBuildInputs = [ + matplotlib + nibabel + numpy + scikit-fuzzy + scikitimage + scikit-learn + scipy + statsmodels + ]; + + meta = with lib; { + homepage = "https://github.com/jcreinhold/intensity-normalization"; + description = "MRI intensity normalization tools"; + maintainers = with maintainers; [ bcdarwin ]; + license = licenses.asl20; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/invoke/default.nix b/nixpkgs/pkgs/development/python-modules/invoke/default.nix index 08d72cec4961..45c341c209cf 100644 --- a/nixpkgs/pkgs/development/python-modules/invoke/default.nix +++ b/nixpkgs/pkgs/development/python-modules/invoke/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "invoke"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "f0c560075b5fb29ba14dad44a7185514e94970d1b9d57dcd3723bec5fed92650"; + sha256 = "374d1e2ecf78981da94bfaf95366216aaec27c2d6a7b7d5818d92da55aa258d3"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/iotawattpy/default.nix b/nixpkgs/pkgs/development/python-modules/iotawattpy/default.nix new file mode 100644 index 000000000000..7eca486eea0b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/iotawattpy/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, httpx +, pythonOlder +}: + +buildPythonPackage rec { + pname = "iotawattpy"; + version = "0.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "1pyxm87lvd6zy0rx7r9jivk2li267r3xr0b9p6vf0v0vp9fmgsw3"; + }; + + propagatedBuildInputs = [ + httpx + ]; + + # Project doesn't tag releases or ship the tests with PyPI + # https://github.com/gtdiehl/iotawattpy/issues/14 + doCheck = false; + + pythonImportsCheck = [ "iotawattpy" ]; + + meta = with lib; { + description = "Python interface for the IoTaWatt device"; + homepage = "https://github.com/gtdiehl/iotawattpy"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix b/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix index 0d44c406349d..041818900978 100644 --- a/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix @@ -1,56 +1,39 @@ { lib , stdenv , buildPythonPackage +, callPackage , fetchPypi -, flaky +, debugpy , ipython , jupyter_client -, traitlets , tornado +, traitlets , pythonOlder -, pytestCheckHook -, nose }: buildPythonPackage rec { pname = "ipykernel"; - version = "5.5.5"; + version = "6.3.0"; src = fetchPypi { inherit pname version; - sha256 = "e976751336b51082a89fc2099fb7f96ef20f535837c398df6eab1283c2070884"; + sha256 = "5314690a638f893e2cc3bf3d25042920e9fbb873f7d8263033390264caeb95f4"; }; - propagatedBuildInputs = [ ipython jupyter_client traitlets tornado ]; - - checkInputs = [ pytestCheckHook nose flaky ]; - dontUseSetuptoolsCheck = true; - preCheck = '' - export HOME=$(mktemp -d) - ''; - disabledTests = lib.optionals stdenv.isDarwin ([ - # see https://github.com/NixOS/nixpkgs/issues/76197 - "test_subprocess_print" - "test_subprocess_error" - "test_ipython_start_kernel_no_userns" + propagatedBuildInputs = [ + debugpy + ipython + jupyter_client + tornado + traitlets + ]; - # https://github.com/ipython/ipykernel/issues/506 - "test_unc_paths" - ] ++ lib.optionals (pythonOlder "3.8") [ - # flaky test https://github.com/ipython/ipykernel/issues/485 - "test_shutdown" + # check in passthru.tests.pytest to escape infinite recursion with ipyparallel + doCheck = false; - # test regression https://github.com/ipython/ipykernel/issues/486 - "test_sys_path_profile_dir" - "test_save_history" - "test_help_output" - "test_write_kernel_spec" - "test_ipython_start_kernel_userns" - "ZMQDisplayPublisherTests" - ]); - - # Some of the tests use localhost networking. - __darwinAllowLocalNetworking = true; + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; meta = { description = "IPython Kernel for Jupyter"; diff --git a/nixpkgs/pkgs/development/python-modules/ipykernel/tests.nix b/nixpkgs/pkgs/development/python-modules/ipykernel/tests.nix new file mode 100644 index 000000000000..9375dbc2bfdc --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/ipykernel/tests.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, buildPythonPackage +, pythonOlder +, flaky +, ipykernel +, ipyparallel +, nose +, pytestCheckHook + +}: + +buildPythonPackage rec { + pname = "ipykernel-tests"; + inherit (ipykernel) version; + + src = ipykernel.src; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + flaky + ipykernel + ipyparallel + nose + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTests = lib.optionals stdenv.isDarwin ([ + # see https://github.com/NixOS/nixpkgs/issues/76197 + "test_subprocess_print" + "test_subprocess_error" + "test_ipython_start_kernel_no_userns" + + # https://github.com/ipython/ipykernel/issues/506 + "test_unc_paths" + ] ++ lib.optionals (pythonOlder "3.8") [ + # flaky test https://github.com/ipython/ipykernel/issues/485 + "test_shutdown" + + # test regression https://github.com/ipython/ipykernel/issues/486 + "test_sys_path_profile_dir" + "test_save_history" + "test_help_output" + "test_write_kernel_spec" + "test_ipython_start_kernel_userns" + "ZMQDisplayPublisherTests" + ]); + + # Some of the tests use localhost networking. + __darwinAllowLocalNetworking = true; +} diff --git a/nixpkgs/pkgs/development/python-modules/ipython/default.nix b/nixpkgs/pkgs/development/python-modules/ipython/default.nix index e036a3378643..548ba874cd70 100644 --- a/nixpkgs/pkgs/development/python-modules/ipython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ipython/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.24.1"; + version = "7.27.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "9bc24a99f5d19721fb8a2d1408908e9c0520a17fff2233ffe82620847f17f1b6"; + sha256 = "58b55ebfdfa260dad10d509702dc2857cb25ad82609506b070cf2d7b7df5af13"; }; prePatch = lib.optionalString stdenv.isDarwin '' diff --git a/nixpkgs/pkgs/development/python-modules/irc/default.nix b/nixpkgs/pkgs/development/python-modules/irc/default.nix index 60a960a204c4..423ec4ecf292 100644 --- a/nixpkgs/pkgs/development/python-modules/irc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/irc/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy3k , six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools -, setuptools-scm, jaraco_collections, importlib-metadata, toml +, setuptools-scm, jaraco_collections, importlib-metadata }: buildPythonPackage rec { @@ -28,7 +28,6 @@ buildPythonPackage rec { pytz jaraco_itertools jaraco_collections - toml ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/islpy/default.nix b/nixpkgs/pkgs/development/python-modules/islpy/default.nix index 736588aa4504..918d8be8e9f1 100644 --- a/nixpkgs/pkgs/development/python-modules/islpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/islpy/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "islpy"; - version = "2020.2.2"; + version = "2021.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "7eb7dfa41d6a67d9ee4ea4bb9f08bdbcbee42b364502136b7882cfd80ff427e0"; + sha256 = "b3f49de925149dbf2482e648016507cd66d0dce6668a1bc4de5e7a937e9c576d"; }; postConfigure = '' diff --git a/nixpkgs/pkgs/development/python-modules/isort/default.nix b/nixpkgs/pkgs/development/python-modules/isort/default.nix index 1195f0f6b097..b55fb9156814 100644 --- a/nixpkgs/pkgs/development/python-modules/isort/default.nix +++ b/nixpkgs/pkgs/development/python-modules/isort/default.nix @@ -6,17 +6,16 @@ , pytestCheckHook }: -let -in buildPythonPackage rec { +buildPythonPackage rec { pname = "isort"; - version = "5.6.4"; + version = "5.9.3"; format = "pyproject"; src = fetchFromGitHub { owner = "PyCQA"; repo = "isort"; rev = version; - sha256 = "1m7jpqssnbsn1ydrw1dn7nrcrggqcvj9v6mk5ampxmvk94xd2r2q"; + sha256 = "sha256-JbRZ/3Xz35tGoCNnQesR08Sjoz3yimxZyxhhOXGvmXw="; }; nativeBuildInputs = [ @@ -46,6 +45,7 @@ in buildPythonPackage rec { ''; pytestFlagsArray = [ + "--ignore=tests/benchmark/" # requires pytest-benchmark "--ignore=tests/integration/" # pulls in 10 other packages "--ignore=tests/unit/profiles/test_black.py" # causes infinite recursion to include black ]; @@ -63,6 +63,7 @@ in buildPythonPackage rec { # plugin not available "test_isort_literals_issue_1358" "test_isort_supports_formatting_plugins_issue_1353" + "test_sort_configurable_sort_issue_1732" "test_value_assignment_list" # profiles not available "test_isort_supports_shared_profiles_issue_970" diff --git a/nixpkgs/pkgs/development/python-modules/iterm2/default.nix b/nixpkgs/pkgs/development/python-modules/iterm2/default.nix index 3b98f25c566f..a1b777c1bb76 100644 --- a/nixpkgs/pkgs/development/python-modules/iterm2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/iterm2/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "iterm2"; - version = "1.21"; + version = "1.27"; src = fetchPypi { inherit pname version; - sha256 = "06be59e0314a2f0f32753eb2d44eb563e85253875bc8da64df5b4eeba7fc05bd"; + sha256 = "dcbd89d0502e72a9a41b055f5cf10b5a991f60fb12df29918d9c2183d1389abd"; }; propagatedBuildInputs = [ protobuf websockets ]; diff --git a/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix index a727e774ec30..aadb9f9028f1 100644 --- a/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaraco_classes/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 -, setuptools-scm, toml +, setuptools-scm , more-itertools , pytestCheckHook }: @@ -20,7 +20,7 @@ buildPythonPackage rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm toml ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ more-itertools ]; diff --git a/nixpkgs/pkgs/development/python-modules/jaraco_collections/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco_collections/default.nix index 060d45938118..46f2bfdff3fc 100644 --- a/nixpkgs/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaraco_collections/default.nix @@ -4,10 +4,10 @@ buildPythonPackage rec { pname = "jaraco.collections"; - version = "3.3.0"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "3662267424b55f10bf15b6f5dee6a6e48a2865c0ec50cc7a16040c81c55a98dc"; + sha256 = "344d14769d716e7496af879ac71b3c6ebdd46abc64bd9ec21d15248365aa3ac9"; }; pythonNamespaces = [ "jaraco" ]; diff --git a/nixpkgs/pkgs/development/python-modules/jaraco_functools/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco_functools/default.nix index 1fca58ebf733..3ad652af7643 100644 --- a/nixpkgs/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaraco_functools/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, setuptools-scm, toml +, setuptools-scm , more-itertools, backports_functools_lru_cache }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "bfcf7da71e2a0e980189b0744b59dba6c1dcf66dcd7a30f8a4413e478046b314"; }; - nativeBuildInputs = [ setuptools-scm toml ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ more-itertools backports_functools_lru_cache ]; diff --git a/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix b/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix index 3126ab999674..32e8aa23aeb4 100644 --- a/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jaraco.text"; - version = "3.5.0"; + version = "3.5.1"; src = fetchPypi { inherit pname version; - sha256 = "f07f1076814a17a98eb915948b9a0dc71b1891c833588066ec1feb04ea4389b1"; + sha256 = "ede4e9103443b62b3d1d193257dfb85aab7c69a6cef78a0887d64bb307a03bc3"; }; pythonNamespaces = [ "jaraco" ]; diff --git a/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix b/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix index 90f7c310faa8..96e8e4d7c34f 100644 --- a/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jdatetime"; - version = "3.6.2"; + version = "3.6.4"; src = fetchPypi { inherit pname version; - sha256 = "a589e35f0dab89283c1a3de9d70ed6cf657932aaed8e8ce1b0e5801aaab1da67"; + sha256 = "39d0be41076b3a3850c3bfa90817e7ed459edc0e9cadce37dc7229b11f121c7e"; }; propagatedBuildInputs = [ six ]; diff --git a/nixpkgs/pkgs/development/python-modules/jeepney/default.nix b/nixpkgs/pkgs/development/python-modules/jeepney/default.nix index 2acf0361bcbc..3079f152e444 100644 --- a/nixpkgs/pkgs/development/python-modules/jeepney/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jeepney/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , pythonOlder +, async-timeout , dbus , pytest , pytest-trio @@ -12,16 +13,17 @@ buildPythonPackage rec { pname = "jeepney"; - version = "0.7.0"; + version = "0.7.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1237cd64c8f7ac3aa4b3f332c4d0fb4a8216f39eaa662ec904302d4d77de5a54"; + sha256 = "fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f"; }; checkInputs = [ + async-timeout dbus pytest pytest-trio diff --git a/nixpkgs/pkgs/development/python-modules/jira/default.nix b/nixpkgs/pkgs/development/python-modules/jira/default.nix index a3f790abfc51..c7d8207aa3d9 100644 --- a/nixpkgs/pkgs/development/python-modules/jira/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jira/default.nix @@ -1,34 +1,56 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, pytest, pytest-runner, pbr, glibcLocales , pytest-cov -, requests, requests_oauthlib, requests-toolbelt, defusedxml -, ipython +{ lib +, buildPythonPackage +, fetchFromGitHub +, defusedxml +, flaky +, keyring +, requests-mock +, requests_oauthlib +, requests-toolbelt +, setuptools-scm +, setuptools-scm-git-archive +, pytestCheckHook }: buildPythonPackage rec { pname = "jira"; - version = "2.0.0"; + version = "3.0.1"; - PBR_VERSION = version; - - src = fetchPypi { - inherit pname version; - sha256 = "e2a94adff98e45b29ded030adc76103eab34fa7d4d57303f211f572bedba0e93"; + src = fetchFromGitHub { + owner = "pycontribs"; + repo = pname; + rev = version; + sha256 = "sha256-hAUAzkHPXFDlKEom+dkzr8GQ+sqK2Ci1/k+QuSNvifE="; }; - buildInputs = [ glibcLocales pytest pytest-cov pytest-runner pbr ]; - propagatedBuildInputs = [ requests requests_oauthlib requests-toolbelt defusedxml pbr ipython ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov-report=xml --cov jira" "" + ''; - # impure tests because of connectivity attempts to jira servers - doCheck = false; + nativeBuildInputs = [ setuptools-scm setuptools-scm-git-archive ]; - patches = [ ./sphinx-fix.patch ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - LC_ALL = "en_US.utf8"; + propagatedBuildInputs = [ + defusedxml + keyring + requests_oauthlib + requests-toolbelt + ]; - disabled = !isPy3k; + checkInputs = [ + flaky + pytestCheckHook + requests-mock + ]; + + # impure tests because of connectivity attempts to jira servers + doCheck = false; meta = with lib; { description = "This library eases the use of the JIRA REST API from Python."; + homepage = "https://github.com/pycontribs/jira"; license = licenses.bsd2; maintainers = with maintainers; [ globin ]; }; diff --git a/nixpkgs/pkgs/development/python-modules/jira/sphinx-fix.patch b/nixpkgs/pkgs/development/python-modules/jira/sphinx-fix.patch deleted file mode 100644 index ccc47ac4b9cf..000000000000 --- a/nixpkgs/pkgs/development/python-modules/jira/sphinx-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/setup.py b/setup.py -index c49a24d..31aeec2 100644 ---- a/setup.py -+++ b/setup.py -@@ -11,5 +11,5 @@ except ImportError: - - - setuptools.setup( -- setup_requires=['pbr>=3.0.0', 'setuptools>=17.1', 'pytest-runner', 'sphinx>=1.6.5'], -+ setup_requires=['pbr>=3.0.0', 'setuptools>=17.1', 'pytest-runner'], - pbr=True) diff --git a/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix index 1b352f1e24c9..f4eb9190aa4b 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -12,13 +12,13 @@ }: buildPythonPackage rec { - version = "2021.3.0"; + version = "2021.8.0"; pname = "jupyter-repo2docker"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "42e0cf67181bdd03b54dabde695befec0586ed68a4ec1240104e209997d776c4"; + sha256 = "9d1b3c3ec7944ea6b0a234d6fa77293a2d1ed1c080eba8466aba94f811b3465d"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/jupyter_client/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter_client/default.nix index fbc37c3f581b..e30b3cb63a71 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter_client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter_client/default.nix @@ -1,30 +1,34 @@ { lib , buildPythonPackage , fetchPypi -, traitlets +, entrypoints , jupyter_core -, pyzmq +, nest-asyncio , python-dateutil +, pyzmq +, tornado +, traitlets , isPyPy , py -, tornado }: buildPythonPackage rec { pname = "jupyter_client"; - version = "6.1.12"; + version = "7.0.2"; src = fetchPypi { inherit pname version; - sha256 = "c4bca1d0846186ca8be97f4d2fa6d2bae889cce4892a167ffa1ba6bd1f73e782"; + sha256 = "0c6cabd07e003a2e9692394bf1ae794188ad17d2e250ed747232d7a473aa772c"; }; propagatedBuildInputs = [ - traitlets + entrypoints jupyter_core - pyzmq + nest-asyncio python-dateutil + pyzmq tornado + traitlets ] ++ lib.optional isPyPy py; # Circular dependency with ipykernel diff --git a/nixpkgs/pkgs/development/python-modules/jupyter_server/default.nix b/nixpkgs/pkgs/development/python-modules/jupyter_server/default.nix index 72e1540e0781..76d0617f4c8a 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyter_server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyter_server/default.nix @@ -21,16 +21,17 @@ , anyio , websocket-client , requests +, requests-unixsocket }: buildPythonPackage rec { pname = "jupyter_server"; - version = "1.8.0"; + version = "1.11.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8f0c75e0a577536125ad62a442ebb7cf02746f1a69d907e8a273c6225d281237"; + sha256 = "sha256-irT0hKSiaY91fP8HadJ7XZkeAjKmZtVPTWraTmphMws="; }; propagatedBuildInputs = [ @@ -49,6 +50,7 @@ buildPythonPackage rec { prometheus-client anyio websocket-client + requests-unixsocket ]; checkInputs = [ @@ -59,9 +61,10 @@ buildPythonPackage rec { preCheck = '' export HOME=$(mktemp -d) + export PATH=$out/bin:$PATH ''; - pytestFlagsArray = [ "jupyter_server/tests/" ]; + pytestFlagsArray = [ "jupyter_server" ]; # disabled failing tests disabledTests = [ diff --git a/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix index 67769e24b328..dbff1660b1cc 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab_git"; - version = "0.30.1"; + version = "0.32.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "f44a33cf59b424e0b5ff984b18eae33e45dab1ef9dc1901b1dd23f9adff15df2"; + sha256 = "4c5743a05150ed7736e028aac15787a66735f160e9ae198dacc5a4bd1a727ce2"; }; propagatedBuildInputs = [ notebook nbdime git ]; diff --git a/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix index 6264bbb5c44e..9ab6b3b8423f 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.1.6"; + version = "3.1.13"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "6d2ada6a333861f33a1b555d3cb7b07aa9d1ab80f07997b3d0c43878a98c1174"; + sha256 = "48a6214ba8310d8bdb3eb6bac8eedf449c77d1bbb6f81b586267c158ad00b899"; }; nativeBuildInputs = [ jupyter-packaging ]; diff --git a/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix b/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix index cca40463b024..a56b5d86abef 100644 --- a/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "2.7.0"; + version = "2.8.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "31457ef564febc42043bc539356c804f6f9144f602e2852150bf0820ed6d7e18"; + sha256 = "39fd519e9b3275873bd15de891363c28f2649814f7bbc11c57469c60e8408e97"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/k5test/default.nix b/nixpkgs/pkgs/development/python-modules/k5test/default.nix index 80b62f1e4483..0079194f4fa7 100644 --- a/nixpkgs/pkgs/development/python-modules/k5test/default.nix +++ b/nixpkgs/pkgs/development/python-modules/k5test/default.nix @@ -2,19 +2,21 @@ , buildPythonPackage , fetchPypi , substituteAll -, six , krb5Full , findutils , which +, pythonOlder }: buildPythonPackage rec { pname = "k5test"; - version = "0.9.2"; + version = "0.10.0"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1lqp3jgfngyhaxjgj3n230hn90wsylwilh120yjf62h7b1s02mh8"; + sha256 = "fc5e7e5e286b2f331c1396c33f2a1cd8cf34e78d8d482168a50ffd8576a1455c"; }; patches = [ @@ -27,17 +29,15 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ - six - ]; - # No tests doCheck = false; + pythonImportsCheck = [ "k5test" ]; + meta = with lib; { description = "Library for setting up self-contained Kerberos 5 environment"; homepage = "https://github.com/pythongssapi/k5test"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/k5test/fix-paths.patch b/nixpkgs/pkgs/development/python-modules/k5test/fix-paths.patch index f99835b5f2a3..dc6caf815809 100644 --- a/nixpkgs/pkgs/development/python-modules/k5test/fix-paths.patch +++ b/nixpkgs/pkgs/development/python-modules/k5test/fix-paths.patch @@ -45,42 +45,74 @@ index e289fac..e2f486a 100644 if options_raw: return options_raw.split('\n') diff --git a/k5test/realm.py b/k5test/realm.py -index f57946b..ad78579 100644 +index 161e5ad..9f50049 100644 --- a/k5test/realm.py +++ b/k5test/realm.py -@@ -181,19 +181,13 @@ class K5Realm(object): - return path +@@ -90,7 +90,7 @@ class K5Realm(metaclass=abc.ABCMeta): + + if provider_cls == K5Realm: + krb5_config = _discover_path('krb5-config', +- '/usr/bin/krb5-config', kwargs) ++ '@krb5Full@/bin/krb5-config', kwargs) + + try: + krb5_version = subprocess.check_output( +@@ -101,7 +101,7 @@ class K5Realm(metaclass=abc.ABCMeta): + # macOS output doesn't contain Heimdal + if 'heimdal' in krb5_version.lower() or ( + sys.platform == 'darwin' and +- krb5_config == '/usr/bin/krb5-config'): ++ krb5_config == '@krb5Full@/bin/krb5-config'): + provider_cls = HeimdalRealm + else: + provider_cls = MITRealm +@@ -434,14 +434,14 @@ class MITRealm(K5Realm): + @property + def _default_paths(self): + return [ +- ('kdb5_util', 'kdb5_util', '/usr/sbin/kdb5_util'), +- ('krb5kdc', 'krb5kdc', '/usr/sbin/kdb5kdc'), +- ('kadmin', 'kadmin', '/usr/bin/admin'), +- ('kadmin_local', 'kadmin.local', '/usr/sbin/kadmin.local'), +- ('kadmind', 'kadmind', '/usr/sbin/kadmind'), +- ('kprop', 'kprop', '/usr/sbin/kprop'), +- ('_kinit', 'kinit', '/usr/bin/kinit'), +- ('_klist', 'klist', '/usr/bin/klist'), ++ ('kdb5_util', 'kdb5_util', '@krb5Full@/bin/kdb5_util'), ++ ('krb5kdc', 'krb5kdc', '@krb5Full@/bin/kdb5kdc'), ++ ('kadmin', 'kadmin', '@krb5Full@/bin/admin'), ++ ('kadmin_local', 'kadmin.local', '@krb5Full@/bin/kadmin.local'), ++ ('kadmind', 'kadmind', '@krb5Full@/bin/kadmind'), ++ ('kprop', 'kprop', '@krb5Full@/bin/kprop'), ++ ('_kinit', 'kinit', '@krb5Full@/bin/kinit'), ++ ('_klist', 'klist', '@krb5Full@/bin/klist'), + ] + + @property +@@ -585,12 +585,12 @@ class HeimdalRealm(K5Realm): - def _init_paths(self, **paths): -- self.kdb5_util = self._discover_path('kdb5_util', -- '/usr/sbin/kdb5_util', paths) -- self.krb5kdc = self._discover_path('krb5kdc', -- '/usr/sbin/krb5kdc', paths) -- self.kadmin_local = self._discover_path('kadmin_local', -- '/usr/sbin/kadmin.local', -- paths) -- self.kprop = self._discover_path('kprop', '/usr/sbin/kprop', paths) -- self.kadmind = self._discover_path('kadmind', -- '/usr/sbin/kadmind', paths) -- -- self._kinit = self._discover_path('kinit', '/usr/bin/kinit', paths) -- self._klist = self._discover_path('klist', '/usr/bin/klist', paths) -+ self.kdb5_util = '@krb5Full@/bin/kdb5_util' -+ self.krb5kdc = '@krb5Full@/bin/krb5kdc' -+ self.kadmin_local = '@krb5Full@/bin/kadmin.local' -+ self.kprop = '@krb5Full@/bin/kprop' -+ self.kadmind = '@krb5Full@/bin/kadmind' -+ self._kinit = '@krb5Full@/bin/kinit' -+ self._klist = '@krb5Full@/bin/klist' + return [ + ('krb5kdc', 'kdc', os.path.join(base, 'kdc')), +- ('kadmin', 'kadmin', '/usr/bin/kadmin'), +- ('kadmin_local', 'kadmin', '/usr/bin/kadmin'), ++ ('kadmin', 'kadmin', '@krb5Full@/bin/kadmin'), ++ ('kadmin_local', 'kadmin', '@krb5Full@/bin/kadmin'), + ('kadmind', 'kadmind', os.path.join(base, 'kadmind')), +- ('_kinit', 'kinit', '/usr/bin/kinit'), +- ('_klist', 'klist', '/usr/bin/klist'), +- ('_ktutil', 'ktutil', '/usr/bin/ktutil'), ++ ('_kinit', 'kinit', '@krb5Full@/bin/kinit'), ++ ('_klist', 'klist', '@krb5Full@/bin/klist'), ++ ('_ktutil', 'ktutil', '@krb5Full@/bin/ktutil'), + ] - def _create_conf(self, profile, filename): - with open(filename, 'w') as conf_file: + @property diff --git a/k5test/unit.py b/k5test/unit.py -index 4ee7f98..543d662 100644 +index 3c64b9e..59da1ab 100644 --- a/k5test/unit.py +++ b/k5test/unit.py @@ -38,7 +38,7 @@ _KRB_VERSION = None - def krb_minversion_test(target_version, problem): + def krb_minversion_test(target_version, problem, provider=None): global _KRB_VERSION if _KRB_VERSION is None: - _KRB_VERSION = _utils.get_output("krb5-config --version") diff --git a/nixpkgs/pkgs/development/python-modules/keyring/default.nix b/nixpkgs/pkgs/development/python-modules/keyring/default.nix index cea38abee395..cf765c06d869 100644 --- a/nixpkgs/pkgs/development/python-modules/keyring/default.nix +++ b/nixpkgs/pkgs/development/python-modules/keyring/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "keyring"; - version = "23.0.1"; + version = "23.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8"; + sha256 = "b7e0156667f5dcc73c1f63a518005cd18a4eb23fe77321194fefcc03748b21a4"; }; nativeBuildInputs = [ @@ -48,6 +48,9 @@ buildPythonPackage rec { disabledTests = lib.optionals (stdenv.isDarwin) [ "test_multiprocess_get" "test_multiprocess_get_after_native_get" + ] ++ [ + # E ValueError: too many values to unpack (expected 1) + "test_entry_point" ]; disabledTestPaths = [ diff --git a/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix b/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix index abcd04a1d307..a45be02b55b2 100644 --- a/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix @@ -1,15 +1,15 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six -, pytest, backports_unittest-mock, keyring, setuptools-scm, toml +, pytest, backports_unittest-mock, keyring, setuptools-scm }: buildPythonPackage rec { pname = "keyrings.alt"; - version = "4.0.2"; + version = "4.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "cc475635099d6edd7e475c5a479e5b4da5e811a3af04495a1e9ada488d16fe25"; + sha256 = "52ccb61d6f16c10f32f30d38cceef7811ed48e086d73e3bae86f0854352c4ab2"; }; postPatch = '' @@ -17,7 +17,7 @@ buildPythonPackage rec { --replace "--flake8" "" ''; - nativeBuildInputs = [ setuptools-scm toml ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ six ]; checkInputs = [ pytest keyring ] ++ lib.optional (pythonOlder "3.3") backports_unittest-mock; diff --git a/nixpkgs/pkgs/development/python-modules/keystoneauth1/default.nix b/nixpkgs/pkgs/development/python-modules/keystoneauth1/default.nix index 9eeb42b0b8c4..cecbc6fd1d26 100644 --- a/nixpkgs/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/nixpkgs/pkgs/development/python-modules/keystoneauth1/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "keystoneauth1"; - version = "4.3.1"; + version = "4.4.0"; src = fetchPypi { inherit pname version; - sha256 = "93605430a6d1424f31659bc5685e9dc1be9a6254e88c99f00cffc0a60c648a64"; + sha256 = "34662a6be67ab29424aabe6f99a8d7eb6b88d293109a07e60fea123ebffb314f"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix b/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix index 2b157494f919..e5649c58e465 100644 --- a/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "kiwisolver"; - version = "1.3.1"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "950a199911a8d94683a6b10321f9345d5a3a8433ec58b217ace979e18f16e248"; + sha256 = "fc4453705b81d03568d5b808ad8f09c77c47534f6ac2e72e733f9ca4714aa75c"; }; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; diff --git a/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix b/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix index 952527d5cab7..da3c36f6ce04 100644 --- a/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/kubernetes/default.nix @@ -1,34 +1,58 @@ -{ lib, buildPythonPackage, fetchPypi, pythonAtLeast, - ipaddress, websocket-client, urllib3, pyyaml, requests_oauthlib, python-dateutil, google-auth, adal, - isort, pytest, coverage, mock, sphinx, autopep8, pep8, codecov, recommonmark, nose }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# propgatedBuildInputs +, adal +, certifi +, google-auth +, python-dateutil +, pyyaml +, requests +, requests_oauthlib +, urllib3 +, websocket-client + +# tests +, pytestCheckHook +, mock +}: buildPythonPackage rec { pname = "kubernetes"; - version = "12.0.1"; - - prePatch = '' - sed -e 's/sphinx>=1.2.1,!=1.3b1,<1.4 # BSD/sphinx/' -i test-requirements.txt - - # This is used to randomize tests, which is not reproducible. Drop it. - sed -e '/randomize/d' -i test-requirements.txt - '' - # This is a python2 and python3.2 only requiremet since it is a backport of a python-3.3 api. - + (if (pythonAtLeast "3.3") then '' - sed -e '/ipaddress/d' -i requirements.txt - '' else ""); - - doCheck = pythonAtLeast "3"; - checkPhase = '' - py.test --ignore=kubernetes/dynamic/test_client.py - ''; - - src = fetchPypi { - inherit pname version; - sha256 = "ec52ea01d52e2ec3da255992f7e859f3a76f2bdb51cf65ba8cd71dfc309d8daa"; + version = "18.20.0"; + format = "setuptools"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "kubernetes-client"; + repo = "python"; + rev = "v${version}"; + sha256 = "1sawp62j7h0yksmg9jlv4ik9b9i1a1w9syywc9mv8x89wibf5ql1"; + fetchSubmodules = true; }; - checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ]; - propagatedBuildInputs = [ ipaddress websocket-client urllib3 pyyaml requests_oauthlib python-dateutil google-auth adal ]; + propagatedBuildInputs = [ + adal + certifi + google-auth + python-dateutil + pyyaml + requests + requests_oauthlib + urllib3 + websocket-client + ]; + + pythonImportsCheck = [ + "kubernetes" + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; meta = with lib; { description = "Kubernetes python client"; diff --git a/nixpkgs/pkgs/development/python-modules/labelbox/default.nix b/nixpkgs/pkgs/development/python-modules/labelbox/default.nix index 423185b6f226..5f8057df849d 100644 --- a/nixpkgs/pkgs/development/python-modules/labelbox/default.nix +++ b/nixpkgs/pkgs/development/python-modules/labelbox/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "labelbox"; - version = "2.6.0"; + version = "3.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Labelbox"; repo = "labelbox-python"; rev = "V${version}"; - sha256 = "1lkvc926i3c7isqhaja6k013qgla44cdhvkx76gpdyywq53i9mcb"; + sha256 = "0vp1lk7hipa4ixa1zcy99r9b5xb1gv54h4i0izx6fv4zf9m0gmw1"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/labgrid/default.nix b/nixpkgs/pkgs/development/python-modules/labgrid/default.nix index 86edc2f8d5e3..7aedf44d0676 100644 --- a/nixpkgs/pkgs/development/python-modules/labgrid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/labgrid/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "labgrid"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "labgrid-project"; repo = "labgrid"; rev = "v${version}"; - sha256 = "03dg0c5vahrdj1153pmd4653hjisq3cc6niqnwayjx5pjb15ikxk"; + sha256 = "17j013dw66h4jm1hl92g892sx9r9c48pnl7d58p1y0l4jfca8gmn"; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix b/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix index 9f787563e5a4..c1c67fd4c1ea 100644 --- a/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lark-parser/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "lark-parser"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "1ggvlzpdzlrxl46fgi8cfq2rzlwn21shpdkm4pknnhfjlsinv913"; + sha256 = "sha256-zcMGCn3ixD3dJg3GlC/ijs+U1JN1BodHLTXZc/5UR7Y="; }; # Optional import, but fixes some re known bugs & allows advanced regex features diff --git a/nixpkgs/pkgs/development/python-modules/launchpadlib/default.nix b/nixpkgs/pkgs/development/python-modules/launchpadlib/default.nix index e39e313baa7f..14833f7f622c 100644 --- a/nixpkgs/pkgs/development/python-modules/launchpadlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/launchpadlib/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "launchpadlib"; - version = "1.10.13"; + version = "1.10.14"; src = fetchPypi { inherit pname version; - sha256 = "5804d68ec93247194449d17d187e949086da0a4d044f12155fad269ef8515435"; + sha256 = "5edfc7f615c88475b3d8549731cb57e2d9bf15d0b9bc21a43e88626b67deef4b"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/lazr-restfulclient/default.nix b/nixpkgs/pkgs/development/python-modules/lazr-restfulclient/default.nix index cb78dfff1a29..74197621ee17 100644 --- a/nixpkgs/pkgs/development/python-modules/lazr-restfulclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lazr-restfulclient/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "lazr.restfulclient"; - version = "0.14.3"; + version = "0.14.4"; disabled = isPy27; # namespace is broken for python2 src = fetchPypi { inherit pname version; - sha256 = "9f28bbb7c00374159376bd4ce36b4dacde7c6b86a0af625aa5e3ae214651a690"; + sha256 = "bf0fd6b2749b3a2d02711f854c9d23704756f7afed21fb5d5b9809d72aa6d087"; }; propagatedBuildInputs = [ distro httplib2 oauthlib setuptools six wadllib ]; diff --git a/nixpkgs/pkgs/development/python-modules/lazr-uri/default.nix b/nixpkgs/pkgs/development/python-modules/lazr-uri/default.nix index 080eb4cdb0ed..4ba3b5d1cdcd 100644 --- a/nixpkgs/pkgs/development/python-modules/lazr-uri/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lazr-uri/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "lazr.uri"; - version = "1.0.5"; + version = "1.0.6"; disabled = isPy27; # namespace is broken for python2 src = fetchPypi { inherit pname version; - sha256 = "f36e7e40d5f8f2cf20ff2c81784a14a546e6c19c216d40a6617ebe0c96c92c49"; + sha256 = "5026853fcbf6f91d5a6b11ea7860a641fe27b36d4172c731f4aa16b900cf8464"; }; propagatedBuildInputs = [ setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/ldap3/default.nix b/nixpkgs/pkgs/development/python-modules/ldap3/default.nix index 3c613d74e272..cf82b166ec6d 100644 --- a/nixpkgs/pkgs/development/python-modules/ldap3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ldap3/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ldap3"; - version = "2.9"; + version = "2.9.1"; src = fetchPypi { inherit pname version; - sha256 = "18c3ee656a6775b9b0d60f7c6c5b094d878d1d90fc03d56731039f0a4b546a91"; + sha256 = "f3e7fc4718e3f09dda568b57100095e0ce58633bcabbed8667ce3f8fbaa4229f"; }; propagatedBuildInputs = [ pyasn1 ]; diff --git a/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix b/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix index bb5f71d73206..84c3ad8c614d 100644 --- a/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ledgerblue/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "ledgerblue"; - version = "0.1.37"; + version = "0.1.38"; src = fetchPypi { inherit pname version; - sha256 = "f34945c9bd4b9846ed9e48ecc239d3e9aec64c3a45411092d133260246169854"; + sha256 = "df1fffc4f586eaa95b8cf910176d28997e65a3ecd43d9c0af34e46078b6b6ee3"; }; propagatedBuildInputs = [ @@ -19,6 +19,8 @@ buildPythonPackage rec { # No tests doCheck = false; + pythonImportsCheck = [ "ledgerblue" ]; + meta = with lib; { description = "Python library to communicate with Ledger Blue/Nano S"; homepage = "https://github.com/LedgerHQ/blue-loader-python"; diff --git a/nixpkgs/pkgs/development/python-modules/lexid/default.nix b/nixpkgs/pkgs/development/python-modules/lexid/default.nix index 4307d52d8913..5ef175d57878 100644 --- a/nixpkgs/pkgs/development/python-modules/lexid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/lexid/default.nix @@ -2,13 +2,19 @@ buildPythonPackage rec { pname = "lexid"; - version = "2020.1005"; + version = "2021.1006"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "52333a2b9ebd14aa0dfeb33de72bd159c2dc31adb9c59cddfc486e2b69bfdcd1"; + sha256 = "509a3a4cc926d3dbf22b203b18a4c66c25e6473fb7c0e0d30374533ac28bafe5"; }; + prePatch = '' + # Disable lib3to6, since we're only building this on 3.6+ anyway. + substituteInPlace setup.py \ + --replace 'if any(arg.startswith("bdist") for arg in sys.argv):' 'if False:' + ''; + propagatedBuildInputs = [ click ]; checkInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/libarchive-c/default.nix b/nixpkgs/pkgs/development/python-modules/libarchive-c/default.nix index 73d99afda674..48262398fcbf 100644 --- a/nixpkgs/pkgs/development/python-modules/libarchive-c/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libarchive-c/default.nix @@ -1,23 +1,26 @@ -{ lib, stdenv +{ lib +, stdenv , buildPythonPackage -, fetchPypi -, pytest -, glibcLocales +, pythonAtLeast +, fetchFromGitHub , libarchive +, glibcLocales , mock +, pytestCheckHook }: buildPythonPackage rec { pname = "libarchive-c"; - version = "2.9"; - - src = fetchPypi { - inherit pname version; - sha256 = "9919344cec203f5db6596a29b5bc26b07ba9662925a05e24980b84709232ef60"; + version = "3.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Changaco"; + repo = "python-${pname}"; + rev = version; + sha256 = "1z4lqy9zlzymshzrcldsc9ipys2l7grqg4yff6ndl6dgbfb0g4jb"; }; - checkInputs = [ mock pytest glibcLocales ]; - LC_ALL="en_US.UTF-8"; postPatch = '' @@ -25,9 +28,20 @@ buildPythonPackage rec { "find_library('archive')" "'${libarchive.lib}/lib/libarchive${stdenv.hostPlatform.extensions.sharedLibrary}'" ''; - checkPhase = '' - py.test tests -k 'not test_check_archiveentry_with_unicode_entries_and_name_zip and not test_check_archiveentry_using_python_testtar' - ''; + pythonImportsCheck = [ + "libarchive" + ]; + + checkInputs = [ + glibcLocales + mock + pytestCheckHook + ]; + + disabledTests = lib.optionals (pythonAtLeast "3.9") [ + # causes python3.9 to segfault + "test_custom_writer_and_stream_reader" + ]; meta = with lib; { homepage = "https://github.com/Changaco/python-libarchive-c"; diff --git a/nixpkgs/pkgs/development/python-modules/libarcus/default.nix b/nixpkgs/pkgs/development/python-modules/libarcus/default.nix index 7b0b09dcb14c..4002f527a451 100644 --- a/nixpkgs/pkgs/development/python-modules/libarcus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libarcus/default.nix @@ -1,4 +1,5 @@ { lib, buildPythonPackage, python, fetchFromGitHub +, fetchpatch , cmake, sip_4, protobuf, pythonOlder }: buildPythonPackage rec { @@ -13,7 +14,16 @@ buildPythonPackage rec { sha256 = "1ahka8s8fjwymyr7pca7i7h51ikfr35zy4nkzfcjn946x7p0dprf"; }; - disabled = pythonOlder "3.4.0"; + patches = [ + # Fix build against protobuf 3.18+ + # https://github.com/Ultimaker/libArcus/issues/121 + (fetchpatch { + url = "https://raw.githubusercontent.com/coryan/vcpkg/f69b85aa403b04e7d442c90db3418d484e44024f/ports/arcus/0001-fix-protobuf-deprecated.patch"; + sha256 = "0bqj7pxzpwsamknd6gadj419x6mwx8wnlfzg4zqn6cax3cmasjb2"; + }) + ]; + + disabled = pythonOlder "3.4"; propagatedBuildInputs = [ sip_4 ]; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/python-modules/libcst/default.nix b/nixpkgs/pkgs/development/python-modules/libcst/default.nix index 5a1ef3b7f737..5b950ab57397 100644 --- a/nixpkgs/pkgs/development/python-modules/libcst/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libcst/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "libcst"; - version = "0.3.19"; + version = "0.3.20"; disabled = pythonOlder "3.6"; # Some files for tests missing from PyPi @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "instagram"; repo = pname; rev = "v${version}"; - sha256 = "012g1hyaj015k2sf38a7jnpzjic0f8j97ar84d0f00w2ifzwx4ma"; + sha256 = "063bl21gyyd25i2v0j6kz29cxxdfhng2nins4i2qblmac90f2nqy"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix b/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix index d061356490cb..2be115ae3658 100644 --- a/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix +++ b/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix @@ -1,5 +1,6 @@ { stdenv , lib +, addOpenGLRunpath , buildPythonPackage , fetchFromGitHub , cmake @@ -8,13 +9,10 @@ , six , nose , Mako -, cudaSupport ? false, cudatoolkit , nvidia_x11 +, cudaSupport ? false, cudatoolkit , openclSupport ? true, ocl-icd, clblas }: -assert cudaSupport -> nvidia_x11 != null - && cudatoolkit != null; - buildPythonPackage rec { pname = "libgpuarray"; version = "0.7.6"; @@ -32,8 +30,7 @@ buildPythonPackage rec { configurePhase = "cmakeConfigurePhase"; libraryPath = lib.makeLibraryPath ( - [] - ++ lib.optionals cudaSupport [ cudatoolkit.lib cudatoolkit.out nvidia_x11 ] + lib.optionals cudaSupport [ cudatoolkit.lib cudatoolkit.out ] ++ lib.optionals openclSupport ([ clblas ] ++ lib.optional (!stdenv.isDarwin) ocl-icd) ); @@ -55,6 +52,8 @@ buildPythonPackage rec { } fixRunPath $out/lib/libgpuarray.so + '' + lib.optionalString cudaSupport '' + addOpenGLRunpath $out/lib/libgpuarray.so ''; propagatedBuildInputs = [ @@ -63,7 +62,12 @@ buildPythonPackage rec { Mako ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ] ++ lib.optionals cudaSupport [ + addOpenGLRunpath + ]; + buildInputs = [ cython diff --git a/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix b/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix index c7d2221a22e2..e3b9e3bb7c8a 100644 --- a/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix +++ b/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix @@ -12,17 +12,17 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.36.0"; + version = "0.37.0"; disabled = isPyPy || !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "765128fdf5f149ed0b889ffbe2b05eb1717f8e20a5c87fa2b4018fbcce0fcfc9"; + sha256 = "6392b870cd018ec0c645d6bbb918d6aa0eeca8c62674baaee30862d6b6865b15"; }; nativeBuildInputs = [ llvm ]; - propagatedBuildInputs = [ ] ++ lib.optional (pythonOlder "3.4") enum34; + propagatedBuildInputs = lib.optional (pythonOlder "3.4") enum34; # Disable static linking # https://github.com/numba/llvmlite/issues/93 @@ -31,10 +31,12 @@ buildPythonPackage rec { substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" ''; + # Set directory containing llvm-config binary preConfigure = '' export LLVM_CONFIG=${llvm.dev}/bin/llvm-config ''; + checkPhase = '' ${python.executable} runtests.py ''; diff --git a/nixpkgs/pkgs/development/python-modules/mailsuite/default.nix b/nixpkgs/pkgs/development/python-modules/mailsuite/default.nix new file mode 100644 index 000000000000..23167af45b0e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/mailsuite/default.nix @@ -0,0 +1,39 @@ +{ buildPythonPackage +, fetchPypi +, pythonOlder +, lib + +# pythonPackages +, dnspython +, html2text +, mail-parser +, IMAPClient +}: + +buildPythonPackage rec { + pname = "mailsuite"; + version = "1.6.1"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "17bsnfjjzv8hx5h397p5pa92l6cqc53i0zjjz2p7bjj3xqzhs45a"; + }; + + propagatedBuildInputs = [ + dnspython + html2text + mail-parser + IMAPClient + ]; + + pythonImportsCheck = [ "mailsuite" ]; + + meta = { + description = "A Python package to simplify receiving, parsing, and sending email"; + homepage = "https://seanthegeek.github.io/mailsuite/"; + maintainers = with lib.maintainers; [ talyz ]; + license = lib.licenses.asl20; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix b/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix index ade031409b41..4daa619acc4f 100644 --- a/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix +++ b/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "marisa-trie"; - version = "0.7.5"; + version = "0.7.7"; src = fetchPypi { inherit pname version; - sha256 = "c73bc25d868e8c4ea7aa7f1e19892db07bba2463351269b05340ccfa06eb2baf"; + sha256 = "bbeafb7d92839dc221365340e79d012cb50ee48a1f3f30dd916eb35a8b93db00"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix b/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix index 8d75139dddcb..8ed57f3ff031 100644 --- a/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pytestCheckHook , pythonOlder , attrs @@ -14,7 +13,7 @@ buildPythonPackage rec { pname = "markdown-it-py"; - version = "1.0.0"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,18 +22,9 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = "v${version}"; - hash = "sha256-GA7P2I8N+i2ISsVgx58zyhrfKMcZ7pL4X9T/trbsr1Y="; + sha256 = "0h7rn3rcqfwmnqs97qczwkw9w5g4df8bgn6sw7k149svfqgrkf56"; }; - patches = [ - (fetchpatch { - # :arrow_up: UPGRADE: attrs -> v21 (#165) - # https://github.com/executablebooks/markdown-it-py/pull/165 - url = "https://github.com/executablebooks/markdown-it-py/commit/78381ffe1a651741594dc93e693b761422512fa2.patch"; - sha256 = "1kxhblpi4sycrs3rv50achr8g0wlgq33abg2acra26l736hlsya1"; - }) - ]; - propagatedBuildInputs = [ attrs linkify-it-py ] ++ lib.optional (pythonOlder "3.8") typing-extensions; diff --git a/nixpkgs/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/nixpkgs/pkgs/development/python-modules/marshmallow-dataclass/default.nix new file mode 100644 index 000000000000..145005fd5e39 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/marshmallow-dataclass/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, marshmallow +, marshmallow-enum +, pytestCheckHook +, pythonOlder +, typeguard +, typing-inspect +}: + +buildPythonPackage rec { + pname = "marshmallow-dataclass"; + version = "8.5.3"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "lovasoa"; + repo = "marshmallow_dataclass"; + rev = "v${version}"; + sha256 = "0mngkjfs2nxxr0y77n429hb22rmjxbnn95j4vwqr9y6q16bqxs0w"; + }; + + propagatedBuildInputs = [ + marshmallow + typing-inspect + ]; + + checkInputs = [ + marshmallow-enum + pytestCheckHook + typeguard + ]; + + pythonImportsCheck = [ "marshmallow_dataclass" ]; + + meta = with lib; { + description = "Automatic generation of marshmallow schemas from dataclasses"; + homepage = "https://github.com/lovasoa/marshmallow_dataclass"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/marshmallow-oneofschema/default.nix b/nixpkgs/pkgs/development/python-modules/marshmallow-oneofschema/default.nix index 343c5952a434..a4b15ce9a544 100644 --- a/nixpkgs/pkgs/development/python-modules/marshmallow-oneofschema/default.nix +++ b/nixpkgs/pkgs/development/python-modules/marshmallow-oneofschema/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "marshmallow-oneofschema"; - version = "2.1.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0s0yr7nv06sfgxglghl2vq74g3m49j60k1hi2qzfsv4bj8hvs35k"; + sha256 = "62cd2099b29188c92493c2940ee79d1bf2f2619a71721664e5a98ec2faa58237"; }; propagatedBuildInputs = [ marshmallow setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix index aa2784cd1dbb..6b5394ac2770 100644 --- a/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/nixpkgs/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -1,32 +1,43 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, lib , marshmallow - # Check Inputs +, pythonOlder , pytestCheckHook -, pytest-cov }: buildPythonPackage rec { pname = "marshmallow-polyfield"; - version = "5.9"; + version = "5.10"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Bachmann1234"; repo = pname; rev = "v${version}"; - sha256 = "15yx8ib5yx1xx6kq8wnfdmv9zm43k7y33c6zpq5rba6a30v4lcnd"; + sha256 = "sha256-oF5LBuDK4kqsAcKwidju+wFjigjy4CNbJ6bfWpGO1yQ="; }; propagatedBuildInputs = [ marshmallow ]; - # setuptools check can run, but won't find tests - checkInputs = [ pytestCheckHook pytest-cov ]; + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=marshmallow_polyfield" "" + ''; + + pythonImportsCheck = [ + "marshmallow" + ]; meta = with lib; { - description = "An unofficial extension to Marshmallow to allow for polymorphic fields"; + description = "Extension to Marshmallow to allow for polymorphic fields"; homepage = "https://github.com/Bachmann1234/marshmallow-polyfield"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; diff --git a/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix b/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix index 3de64fea37fa..a4f60d8202a4 100644 --- a/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/marshmallow/default.nix @@ -9,26 +9,27 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "3.11.1"; - disabled = pythonOlder "3.5"; + version = "3.13.0"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "marshmallow-code"; repo = pname; rev = version; - sha256 = "1ypm142y3giaqydc7fkigm9r057yp2sd1ng5zr2x3w3wbbj5yfm6"; + sha256 = "sha256-tP/RKo2Hzxz2bT7ybRs9wGzq7TpsmzmOPi3BGuSLDA0="; }; - pythonImportsCheck = [ - "marshmallow" - ]; - checkInputs = [ pytestCheckHook pytz simplejson ]; + pythonImportsCheck = [ + "marshmallow" + ]; + meta = with lib; { description = '' A lightweight library for converting complex objects to and from @@ -38,5 +39,4 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ cript0nauta ]; }; - } diff --git a/nixpkgs/pkgs/development/python-modules/mat2/default.nix b/nixpkgs/pkgs/development/python-modules/mat2/default.nix index 99d94d3d1a80..0d54656c1586 100644 --- a/nixpkgs/pkgs/development/python-modules/mat2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mat2/default.nix @@ -3,7 +3,6 @@ , python , pythonOlder , fetchFromGitLab -, fetchpatch , substituteAll , bubblewrap , exiftool @@ -22,7 +21,7 @@ buildPythonPackage rec { pname = "mat2"; - version = "0.12.1"; + version = "0.12.2"; disabled = pythonOlder "3.5"; @@ -31,7 +30,7 @@ buildPythonPackage rec { owner = "jvoisin"; repo = "mat2"; rev = version; - sha256 = "sha256-TxHelOr7ygp4R+dW+oJ034l2w9zrB4gn0QLs5Pa4EFE="; + sha256 = "sha256-KaHdBmTeBlCRaVkG3WsfDtFo45s/X69x7VGDYY7W5O8="; }; patches = [ @@ -50,18 +49,6 @@ buildPythonPackage rec { ./executable-name.patch # hardcode path to mat2 executable ./tests.patch - # remove for next release - (fetchpatch { - name = "fix-tests-ffmpeg-4.4.patch"; - url = "https://0xacab.org/jvoisin/mat2/-/commit/c9be50f968212b01f8d8ad85e59e19c3e67d8578.patch"; - sha256 = "0895dkv6575ps3drdfnli15cggx27n9irjx0axigrm4ql4ma0648"; - }) - # fix white space error in the tests for exiftool, remove for next release - (fetchpatch { - name = "fix-tests-exiftool.patch"; - url = "https://0xacab.org/jvoisin/mat2/-/commit/6df615281b2a649b85ff7670f6d87d3beed0b977.patch"; - sha256 = "1gix63n0mzavnqjq5ll0v210z4vdz4f93aq03bfzlgifxcd9vl1x"; - }) ]; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/mat2/paths.patch b/nixpkgs/pkgs/development/python-modules/mat2/paths.patch index e0144be9fef6..7e828d3f5339 100644 --- a/nixpkgs/pkgs/development/python-modules/mat2/paths.patch +++ b/nixpkgs/pkgs/development/python-modules/mat2/paths.patch @@ -1,15 +1,17 @@ diff --git a/dolphin/mat2.desktop b/dolphin/mat2.desktop -index e623962..5d69ae2 100644 +index d365bc5..56313e2 100644 --- a/dolphin/mat2.desktop +++ b/dolphin/mat2.desktop -@@ -7,5 +7,5 @@ Type=Service - [Desktop Action cleanMetadata] +@@ -8,6 +8,6 @@ Type=Service Name=Clean metadata + Name[de]=Metadaten löschen Name[es]=Limpiar metadatos -Icon=/usr/share/icons/hicolor/scalable/apps/mat2.svg -Exec=kdialog --yesno "$( mat2 -s %U )" --title "Clean Metadata?" && mat2 %U +-Exec[de]=kdialog --yesno "$( mat2 -s %U )" --title "Metadaten löschen?" && mat2 %U +Icon=@mat2svg@ -+Exec=@kdialog@ --yesno "$( @mat2@ -s %U )" --title "Clean Metadata?" && @mat2@ %U ++Exec=@kdialog@ --yesno "$( mat2 -s %U )" --title "Clean Metadata?" && mat2 %U ++Exec[de]=@kdialog@ --yesno "$( mat2 -s %U )" --title "Metadaten löschen?" && mat2 %U diff --git a/libmat2/bubblewrap.py b/libmat2/bubblewrap.py index 970d5dd..5d3c0b7 100644 --- a/libmat2/bubblewrap.py diff --git a/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix b/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix index beddaf6810dd..0e874d25f679 100644 --- a/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/matplotlib/default.nix @@ -17,14 +17,14 @@ let in buildPythonPackage rec { - version = "3.4.2"; + version = "3.4.3"; pname = "matplotlib"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "d8d994cefdff9aaba45166eb3de4f5211adb4accac85cbf97137e98f26ea0219"; + sha256 = "06032j0ccjxldx4z9kf97qps2g36mfgvy1nap3b9n75kzmnm4kzw"; }; XDG_RUNTIME_DIR = "/tmp"; diff --git a/nixpkgs/pkgs/development/python-modules/mattermostdriver/default.nix b/nixpkgs/pkgs/development/python-modules/mattermostdriver/default.nix index 7d9421b5d949..6a0be0696063 100644 --- a/nixpkgs/pkgs/development/python-modules/mattermostdriver/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mattermostdriver/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "mattermostdriver"; - version = "7.3.0"; + version = "7.3.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "17jqcpa1xd9n7bf4d5l7wmscls34kymv27gi17pyyfjxbwk5gsga"; + sha256 = "bf629c4b8f825bd7196208aa93995ac5077bd60939ba67cca314a7f13c1dbcea"; }; propagatedBuildInputs = [ websockets requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/nixpkgs/pkgs/development/python-modules/mautrix/default.nix index f0005eef61bf..1b8bcb293892 100644 --- a/nixpkgs/pkgs/development/python-modules/mautrix/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.10.5"; + version = "0.10.6"; src = fetchPypi { inherit pname version; - sha256 = "b7d52d72a9739963b6d39d5e58ef367c00490a90cf7795f23c8b2e2c140c8882"; + sha256 = "2738370469f8ce27efc37aa6e17319a4149246c9a0da822c8d81d948f0c7e1a7"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/maxcube-api/default.nix b/nixpkgs/pkgs/development/python-modules/maxcube-api/default.nix new file mode 100644 index 000000000000..36bcc35fc036 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/maxcube-api/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, python +}: + +buildPythonPackage rec { + pname = "maxcube-api"; + version = "0.4.3"; + format = "setuptools"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "hackercowboy"; + repo = "python-${pname}"; + rev = "V${version}"; + sha256 = "10k61gfpnqljf3p3qxr97xq7j67a9cr4ivd9v72hdni0znrbx6ym"; + }; + + postPatch = '' + substituteInPlace setup.py --replace "license=license" "license='MIT'" + ''; + + pythonImportsCheck = [ + "maxcube" + "maxcube.cube" + ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck + ''; + + meta = with lib; { + description = "eQ-3/ELV MAX! Cube Python API"; + homepage = "https://github.com/hackercowboy/python-maxcube-api"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix b/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix index d101cdfd0c2e..f33e63db02fe 100644 --- a/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "2.0.3"; + version = "2.1.0"; pname = "maxminddb"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "47e86a084dd814fac88c99ea34ba3278a74bc9de5a25f4b815b608798747c7dc"; + sha256 = "c47b8acba98d03b8c762684d899623c257976f3eb0c9d557ff865d20cddc9d6b"; }; buildInputs = [ libmaxminddb ]; diff --git a/nixpkgs/pkgs/development/python-modules/mechanize/default.nix b/nixpkgs/pkgs/development/python-modules/mechanize/default.nix index 5309855fb49e..aa309ff33cea 100644 --- a/nixpkgs/pkgs/development/python-modules/mechanize/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mechanize/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "mechanize"; - version = "0.4.6"; + version = "0.4.7"; src = fetchPypi { inherit pname version; - sha256 = "d16cea241253b5eb6380bf8a46627cad91d1f2c3f93a33279a31ce276d6c5d44"; + sha256 = "1773a8f5818398e0010e781dc0f942cd88b107a57424c904d545cd827c216809"; }; propagatedBuildInputs = [ html5lib ]; diff --git a/nixpkgs/pkgs/development/python-modules/migen/default.nix b/nixpkgs/pkgs/development/python-modules/migen/default.nix new file mode 100644 index 000000000000..41396e1c623b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/migen/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, colorama +}: + +buildPythonPackage rec { + pname = "migen"; + version = "unstable-2021-09-14"; + disabled = pythonOlder "3.3"; + + src = fetchFromGitHub { + owner = "m-labs"; + repo = "migen"; + rev = "a5bc262560238f93ceaad423820eb06843326274"; + sha256 = "32UjaIam/B7Gx6XbPcR067LcXfokJH2mATG9mU38a6o="; + }; + + propagatedBuildInputs = [ + colorama + ]; + + pythonImportsCheck = [ "migen" ]; + + meta = with lib; { + description = " A Python toolbox for building complex digital hardware"; + homepage = "https://m-labs.hk/migen"; + license = licenses.bsd2; + maintainers = with maintainers; [ l-as ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/minidump/default.nix b/nixpkgs/pkgs/development/python-modules/minidump/default.nix index 6c00ad650bb5..2f1f4718c611 100644 --- a/nixpkgs/pkgs/development/python-modules/minidump/default.nix +++ b/nixpkgs/pkgs/development/python-modules/minidump/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "minidump"; - version = "0.0.18"; + version = "0.0.20"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uf4KZc9C1gWRgHu4ttk1fpL2pG8oUb79uvCIlHItB/8="; + sha256 = "1rr91nnlzv7gnbcvv8qhbyx1kh2s4jdv7nv0qka5jya32rzjaigm"; }; # Upstream doesn't have tests diff --git a/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix b/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix index f9535ac0f31f..bd6ada6ecd10 100644 --- a/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix @@ -45,14 +45,14 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "7.0.2"; + version = "7.0.3"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0y5zsay9b6xgibs6m4gckw63jip35vsdfajsh1nw2zcb2xs1a7qs"; + sha256 = "sha256-j1lipshccPUpMR+o28hDyaJbrVgj6AHijFqOgVmrBkg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mkl-service/default.nix b/nixpkgs/pkgs/development/python-modules/mkl-service/default.nix index c54da3055e7c..be0ac454ee98 100644 --- a/nixpkgs/pkgs/development/python-modules/mkl-service/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mkl-service/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "mkl-service"; - version = "2.4.0"; + version = "2.4.0.post1"; src = fetchFromGitHub { owner = "IntelPython"; repo = "mkl-service"; rev = "v${version}"; - sha256 = "1x8j0ij582dyhay0gaqq45a2jz1m4fr8xw0v65ngviajj3cxmcpb"; + sha256 = "0ysjn8z1hkscb4cycbrvcb93r04w5793yylsy40h5dvjd04ns5jc"; }; MKLROOT = mkl; diff --git a/nixpkgs/pkgs/development/python-modules/mlflow/default.nix b/nixpkgs/pkgs/development/python-modules/mlflow/default.nix index 2940c111e5dc..b50d98513a2f 100644 --- a/nixpkgs/pkgs/development/python-modules/mlflow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mlflow/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "mlflow"; - version = "1.18.0"; + version = "1.20.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "8942089589d08c05c8a7fc66828c02a9233be462c421881b50bc2a0b183dfdbe"; + sha256 = "71764443c4942f181fee2d5bf44dd74a0507bcc5b62a1f1e08079d1f40a15fc0"; }; # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config diff --git a/nixpkgs/pkgs/development/python-modules/mne-python/default.nix b/nixpkgs/pkgs/development/python-modules/mne-python/default.nix index 2dfe06d51770..8e17eacbf7b5 100644 --- a/nixpkgs/pkgs/development/python-modules/mne-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mne-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mne-python"; - version = "0.23.0"; + version = "0.23.4"; disabled = isPy27; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "mne-tools"; repo = pname; rev = "v${version}"; - sha256 = "02fcnfsrc6sccv6x2rnx86g0zw0ivk5s8gx230g6pxfg3lap6knv"; + sha256 = "1kik52ssa6difkqz8xnvrcbpp4p7792hj1rcgyypb4q7sc048aqy"; }; propagatedBuildInputs = [ numpy scipy ]; diff --git a/nixpkgs/pkgs/development/python-modules/mocket/default.nix b/nixpkgs/pkgs/development/python-modules/mocket/default.nix index 73a3b07a64c3..8739c0812833 100644 --- a/nixpkgs/pkgs/development/python-modules/mocket/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mocket/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.9.42"; + version = "3.10.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1vvlbnbypd4z1pjlvhwhd89fn0mis5acfx4v25f1mfl04k63ffah"; + sha256 = "1fcb4203ae257145b97c865135b3a064b47f20f42dde88c8579f43d88f1a7dfb"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/monotonic/default.nix b/nixpkgs/pkgs/development/python-modules/monotonic/default.nix index e93bf206edaa..d775d5157191 100644 --- a/nixpkgs/pkgs/development/python-modules/monotonic/default.nix +++ b/nixpkgs/pkgs/development/python-modules/monotonic/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "monotonic"; - version = "1.5"; + version = "1.6"; src = fetchPypi { inherit pname version; - sha256 = "23953d55076df038541e648a53676fb24980f7a1be290cdda21300b3bc21dfb0"; + sha256 = "3a55207bcfed53ddd5c5bae174524062935efed17792e9de2ad0205ce9ad63f7"; }; __propagatedImpureHostDeps = lib.optional stdenv.isDarwin "/usr/lib/libc.dylib"; diff --git a/nixpkgs/pkgs/development/python-modules/monty/default.nix b/nixpkgs/pkgs/development/python-modules/monty/default.nix index ff236d9becc4..73325c24d94c 100644 --- a/nixpkgs/pkgs/development/python-modules/monty/default.nix +++ b/nixpkgs/pkgs/development/python-modules/monty/default.nix @@ -5,6 +5,7 @@ , msgpack , pytestCheckHook , numpy +, pandas , pydantic , pymongo , ruamel_yaml @@ -13,17 +14,21 @@ buildPythonPackage rec { pname = "monty"; - version = "2021.6.10"; + version = "2021.8.17"; disabled = pythonOlder "3.5"; # uses type annotations - # No tests in Pypi src = fetchFromGitHub { owner = "materialsvirtuallab"; repo = pname; rev = "v${version}"; - sha256 = "01fhl4pl5gj4ahph4lxcm0fmglh0bjw6jz9ckmgzviasg4l1j6h4"; + sha256 = "0lg6d0qk6iv476rcn45p5f50kips5g9s709cxddwnk5yrz57c4d0"; }; + postPatch = '' + substituteInPlace tests/test_os.py \ + --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#' + ''; + propagatedBuildInputs = [ ruamel_yaml tqdm @@ -33,15 +38,11 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook numpy + pandas pydantic pymongo ]; - preCheck = '' - substituteInPlace tests/test_os.py \ - --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#' - ''; - meta = with lib; { description = "Serves as a complement to the Python standard library by providing a suite of tools to solve many common problems"; longDescription = " diff --git a/nixpkgs/pkgs/development/python-modules/motor/default.nix b/nixpkgs/pkgs/development/python-modules/motor/default.nix index 318d519e57ce..b75936817426 100644 --- a/nixpkgs/pkgs/development/python-modules/motor/default.nix +++ b/nixpkgs/pkgs/development/python-modules/motor/default.nix @@ -1,23 +1,29 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, pymongo, mockupdb +{ lib +, buildPythonPackage +, fetchFromGitHub +, mockupdb +, pymongo +, pythonOlder }: buildPythonPackage rec { pname = "motor"; - version = "2.4.0"; + version = "2.5.1"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "mongodb"; repo = pname; rev = version; - sha256 = "1sgaqg98h35lazzdi015q1i60ig7krid8b10a5rm6lf755y8yj2c"; + sha256 = "sha256-r+HyIEC+Jafn7eMqkAldsZ5hbem+n+P76RJGAymmBks="; }; propagatedBuildInputs = [ pymongo ]; + checkInputs = [ mockupdb ]; + # network connections doCheck = false; - checkInputs = [ mockupdb ]; pythonImportsCheck = [ "motor" ]; diff --git a/nixpkgs/pkgs/development/python-modules/moviepy/default.nix b/nixpkgs/pkgs/development/python-modules/moviepy/default.nix index c3acdbe71ec2..a353816d252e 100644 --- a/nixpkgs/pkgs/development/python-modules/moviepy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/moviepy/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pythonAtLeast +, pythonOlder , numpy , decorator , imageio @@ -9,44 +9,56 @@ , proglog , requests , tqdm -# Advanced image processing (triples size of output) + # Advanced image processing (triples size of output) , advancedProcessing ? false -, opencv3 ? null -, scikitimage ? null -, scikit-learn ? null -, scipy ? null -, matplotlib ? null -, youtube-dl ? null +, opencv3 +, scikitimage +, scikit-learn +, scipy +, matplotlib +, youtube-dl }: -assert advancedProcessing -> ( - opencv3 != null && scikitimage != null && scikit-learn != null - && scipy != null && matplotlib != null && youtube-dl != null); - buildPythonPackage rec { pname = "moviepy"; version = "1.0.3"; - disabled = !(pythonAtLeast "3.4"); + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; sha256 = "2884e35d1788077db3ff89e763c5ba7bfddbd7ae9108c9bc809e7ba58fa433f5"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "decorator>=4.0.2,<5.0" "decorator>=4.0.2,<6.0" + ''; + # No tests, require network connection doCheck = false; propagatedBuildInputs = [ - numpy decorator imageio imageio-ffmpeg tqdm requests proglog - ] ++ (lib.optionals advancedProcessing [ - opencv3 scikitimage scikit-learn scipy matplotlib youtube-dl - ]); + numpy + decorator + imageio + imageio-ffmpeg + tqdm + requests + proglog + ] ++ lib.optionals advancedProcessing [ + opencv3 + scikitimage + scikit-learn + scipy + matplotlib + youtube-dl + ]; meta = with lib; { description = "Video editing with Python"; homepage = "https://zulko.github.io/moviepy/"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } diff --git a/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix b/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix index ca2ffea183b7..297026c18f72 100644 --- a/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix +++ b/nixpkgs/pkgs/development/python-modules/murmurhash/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { description = "Cython bindings for MurmurHash2"; homepage = "https://github.com/explosion/murmurhash"; license = licenses.mit; - maintainers = with maintainers; [ aborsu sdll ]; + maintainers = with maintainers; [ aborsu ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix index 0c871c90a3a5..e0a67d4f6505 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -3,10 +3,11 @@ , boto3 , buildPythonPackage , fetchFromGitHub +, isort , jinja2 , md-toc -, isort , mdformat +, poetry-core , pyparsing , pytestCheckHook , pythonOlder @@ -14,16 +15,22 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "4.14.1"; - disabled = pythonOlder "3.6"; + version = "5.4.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "vemel"; repo = "mypy_boto3_builder"; rev = version; - sha256 = "sha256-y55bPi70ldd528Olr2atXHm5JHiLNBZ396D9qwbBmkc="; + sha256 = "sha256-PS2MMpI/ezjHnI6vUoHTt0uuuB/w94OrOYBLNCpSxIE="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ black boto3 @@ -38,6 +45,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # Should be fixed with 5.x + "test_get_types" + ]; + pythonImportsCheck = [ "mypy_boto3_builder" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix index b25e838c96ff..8a92882ff364 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.17.97"; + version = "1.18.47"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "cc12897498213e6aa1530d9f75dadb3916fcd3ce376639560c2fede2c93c51b9"; + sha256 = "0687354a1970a157f293ff57f8b38379497b606643633912cc28f76e0333b301"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix b/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix index 6c6ea7b7b1c9..c7194d19b5cb 100644 --- a/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -1,17 +1,17 @@ -{ lib, fetchPypi, buildPythonApplication, protobuf, pythonOlder }: +{ lib, fetchPypi, buildPythonApplication, protobuf, types-protobuf, grpcio-tools, pythonOlder }: buildPythonApplication rec { pname = "mypy-protobuf"; - version = "2.4"; + version = "2.9"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "77e10c476cdd3ee14535c2357e64deac6b1a69f33eb500d795b064acda48c66f"; + sha256 = "278172935d7121c2f8c7c0a05518dd565a2b76d9e9c4a0a3fcd08a21fa685d43"; }; - propagatedBuildInputs = [ protobuf ]; + propagatedBuildInputs = [ protobuf types-protobuf grpcio-tools ]; meta = with lib; { description = "Generate mypy stub files from protobuf specs"; diff --git a/nixpkgs/pkgs/development/python-modules/nbclient/default.nix b/nixpkgs/pkgs/development/python-modules/nbclient/default.nix index 169b89f7b892..3b9986bae048 100644 --- a/nixpkgs/pkgs/development/python-modules/nbclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbclient/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "nbclient"; - version = "0.5.3"; + version = "0.5.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "db17271330c68c8c88d46d72349e24c147bb6f34ec82d8481a8f025c4d26589c"; + sha256 = "6c8ad36a28edad4562580847f9f1636fe5316a51a323ed85a24a4ad37d4aefce"; }; inherit doCheck; diff --git a/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix b/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix index 02eda2beb195..67d08f9e50ff 100644 --- a/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "nbconvert"; - version = "6.0.7"; + version = "6.1.0"; src = fetchPypi { inherit pname version; - sha256 = "cbbc13a86dfbd4d1b5dee106539de0795b4db156c894c2c5dc382062bbc29002"; + sha256 = "d22a8ff202644d31db254d24d52c3a96c82156623fcd7c7f987bba2612303ec9"; }; # Add $out/share/jupyter to the list of paths that are used to search for diff --git a/nixpkgs/pkgs/development/python-modules/nbdime/default.nix b/nixpkgs/pkgs/development/python-modules/nbdime/default.nix index 96fc94d43e85..a4cbe11fbe7a 100644 --- a/nixpkgs/pkgs/development/python-modules/nbdime/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbdime/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "nbdime"; - version = "2.1.0"; + version = "3.1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "4e3efdcfda31c3074cb565cd8e76e2e5421b1c4560c3a00c56f8679dd15590e5"; + sha256 = "12dc4390b355b26d07ac8d11d50efbcb54bae0ad5842b817131babd2f4567963"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/niluclient/default.nix b/nixpkgs/pkgs/development/python-modules/niluclient/default.nix new file mode 100644 index 000000000000..7f6aa69da61e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/niluclient/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "niluclient"; + version = "0.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "11ymn0cr4lchrcnf2xxlgljw223gwln01gxwr7mcgf95yc4006iq"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "niluclient" ]; + + meta = with lib; { + description = "Python client for getting air pollution data from NILU sensor stations"; + homepage = "https://github.com/hfurubotten/niluclient"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/node-semver/default.nix b/nixpkgs/pkgs/development/python-modules/node-semver/default.nix index 535ff621de5c..276011e65ea6 100644 --- a/nixpkgs/pkgs/development/python-modules/node-semver/default.nix +++ b/nixpkgs/pkgs/development/python-modules/node-semver/default.nix @@ -1,14 +1,14 @@ { lib, fetchPypi, buildPythonPackage, pytest }: buildPythonPackage rec { - version = "0.7.0"; + version = "0.8.1"; pname = "node-semver"; checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; - sha256 = "1p7ink1wajkc31r05k1yn37gk377033a9vhin8v4j757d4ha1f91"; + sha256 = "281600d009606f4f63ddcbe148992e235b39a69937b9c20359e2f4a2adbb1e00"; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/notus-scanner/default.nix b/nixpkgs/pkgs/development/python-modules/notus-scanner/default.nix new file mode 100644 index 000000000000..dbf01f3698d5 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/notus-scanner/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, paho-mqtt +, poetry-core +, psutil +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "notus-scanner"; + version = "unstable-2021-09-05"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "greenbone"; + repo = pname; + rev = "049f9a5e6439e4e5113e3b8f30b25ead12d42a56"; + sha256 = "1fjxyn8wg2kf6xy3pbh7d7yn20dk529p03xpqyz7s40n9nsxhnza"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + paho-mqtt + psutil + ]; + + checkInputs = [ + pytestCheckHook + ]; + + patches = [ + # Switch to poetry-core, https://github.com/greenbone/notus-scanner/pull/31 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/greenbone/notus-scanner/commit/b52eea317faca30d411096044f9e5ea20b58da65.patch"; + sha256 = "0q11aslhva47kkpsnpayra7spa849j894vqv34pjqhcnlyipqw6d"; + }) + ]; + + pythonImportsCheck = [ "notus.scanner" ]; + + meta = with lib; { + description = "Helper to create results from local security checks"; + homepage = "https://github.com/greenbone/notus-scanner"; + license = with licenses; [ agpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix b/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix index dcb326a05a94..d7b3db1f452a 100644 --- a/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ntc-templates"; - version = "2.3.1"; + version = "2.3.2"; format = "pyproject"; disabled = isPy27; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = pname; rev = "v${version}"; - sha256 = "0s4my422cdmjfz787a7697938qfnllxwx004jfp3a8alzw2h30g1"; + sha256 = "0sga86ajbh3a8wsb7q5mxzxhlg4fds8pr33ybjgi1sda4bvp2dvp"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/numba/default.nix b/nixpkgs/pkgs/development/python-modules/numba/default.nix index 74f7d4003dcd..287737900b89 100644 --- a/nixpkgs/pkgs/development/python-modules/numba/default.nix +++ b/nixpkgs/pkgs/development/python-modules/numba/default.nix @@ -12,28 +12,39 @@ }: buildPythonPackage rec { - version = "0.53.1"; + version = "0.54.0"; pname = "numba"; disabled = pythonOlder "3.6" || pythonAtLeast "3.10"; src = fetchPypi { inherit pname version; - sha256 = "9cd4e5216acdc66c4e9dab2dfd22ddb5bef151185c070d4a3cd8e78638aff5b0"; + sha256 = "bad6bd98ab2e41c34aa9c80b8d9737e07d92a53df4f74d3ada1458b0b516ccff"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "1.21" "1.22" + + substituteInPlace numba/__init__.py \ + --replace "(1, 20)" "(1, 21)" + ''; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; propagatedBuildInputs = [ numpy llvmlite setuptools ]; - pythonImportsCheck = [ "numba" ]; + # Copy test script into $out and run the test suite. checkPhase = '' ${python.interpreter} -m numba.runtests ''; + # ImportError: cannot import name '_typeconv' doCheck = false; + pythonImportsCheck = [ "numba" ]; + meta = with lib; { - homepage = "http://numba.pydata.org/"; + homepage = "https://numba.pydata.org/"; license = licenses.bsd2; description = "Compiling Python code using LLVM"; maintainers = with maintainers; [ fridh ]; diff --git a/nixpkgs/pkgs/development/python-modules/numpy/default.nix b/nixpkgs/pkgs/development/python-modules/numpy/default.nix index dbbd750acf5b..60f3bf1091ec 100644 --- a/nixpkgs/pkgs/development/python-modules/numpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/numpy/default.nix @@ -40,14 +40,14 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.20.3"; + version = "1.21.2"; format = "pyproject.toml"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e55185e51b18d788e49fe8305fd73ef4470596b33fc2c1ceb304566b99c71a69"; + sha256 = "423216d8afc5923b15df86037c6053bf030d15cc9e3224206ef868c2d63dd6dc"; }; patches = lib.optionals python.hasDistutilsCxxPatch [ @@ -73,6 +73,10 @@ in buildPythonPackage rec { ln -s ${cfg} site.cfg ''; + # Workaround flakey compiler feature detection + # https://github.com/numpy/numpy/issues/19624 + hardeningDisable = [ "strictoverflow" ]; + enableParallelBuilding = true; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/nunavut/default.nix b/nixpkgs/pkgs/development/python-modules/nunavut/default.nix index e8d032e16aba..c628abad8691 100644 --- a/nixpkgs/pkgs/development/python-modules/nunavut/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nunavut/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "nunavut"; - version = "1.2.2"; + version = "1.4.2"; disabled = pythonOlder "3.5"; # only python>=3.5 is supported src = fetchPypi { inherit pname version; - sha256 = "78ab56951172ecd92f9b66dbf9b0ea986dcc6899d462eeef74563ddf33a5a9a5"; + sha256 = "7238780e42a8d6b7fd3296273c76d35dbebb4520d6778472d556b68b77e2aade"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix b/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix new file mode 100644 index 000000000000..531e042c5b95 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix @@ -0,0 +1,84 @@ +{ lib +, buildPythonPackage +, cffi +, coloredlogs +, fetchFromGitHub +, ghostscript +, img2pdf +, importlib-resources +, jbig2enc +, leptonica +, pdfminer +, pikepdf +, pillow +, pluggy +, pngquant +, pytest-xdist +, pytestCheckHook +, reportlab +, setuptools +, setuptools-scm +, setuptools-scm-git-archive +, stdenv +, substituteAll +, tesseract4 +, tqdm +, unpaper +}: + +buildPythonPackage rec { + pname = "ocrmypdf"; + version = "12.5.0"; + + src = fetchFromGitHub { + owner = "jbarlow83"; + repo = "OCRmyPDF"; + rev = "v${version}"; + sha256 = "sha256-g80WedX+TGHE9EJ/RSgOc53PM17V3WZslUNaHoqKTo0="; + }; + + patches = [ + (substituteAll { + src = ./paths.patch; + gs = "${lib.getBin ghostscript}/bin/gs"; + jbig2 = "${lib.getBin jbig2enc}/bin/jbig2"; + liblept = "${lib.getLib leptonica}/lib/liblept${stdenv.hostPlatform.extensions.sharedLibrary}"; + pngquant = "${lib.getBin pngquant}/bin/pngquant"; + tesseract = "${lib.getBin tesseract4}/bin/tesseract"; + unpaper = "${lib.getBin unpaper}/bin/unpaper"; + }) + ]; + + nativeBuildInputs = [ + setuptools-scm-git-archive + setuptools-scm + ]; + + propagatedBuildInputs = [ + cffi + coloredlogs + img2pdf + importlib-resources + pdfminer + pikepdf + pillow + pluggy + reportlab + setuptools + tqdm + ]; + + checkInputs = [ + pytest-xdist + pytestCheckHook + ]; + + meta = with lib; { + homepage = "https://github.com/jbarlow83/OCRmyPDF"; + description = "Adds an OCR text layer to scanned PDF files, allowing them to be searched"; + license = with licenses; [ mpl20 mit ]; + platforms = platforms.linux; + maintainers = with maintainers; [ kiwi dotlambda ]; + changelog = "https://github.com/jbarlow83/OCRmyPDF/blob/v${version}/docs/release_notes.rst"; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/ocrmypdf/paths.patch b/nixpkgs/pkgs/development/python-modules/ocrmypdf/paths.patch new file mode 100644 index 000000000000..9bfcc7285541 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/ocrmypdf/paths.patch @@ -0,0 +1,160 @@ +diff --git a/src/ocrmypdf/_exec/ghostscript.py b/src/ocrmypdf/_exec/ghostscript.py +index 5c357f1b..f459763a 100644 +--- a/src/ocrmypdf/_exec/ghostscript.py ++++ b/src/ocrmypdf/_exec/ghostscript.py +@@ -25,28 +25,7 @@ from ocrmypdf.subprocess import get_version, run, run_polling_stderr + + log = logging.getLogger(__name__) + +-missing_gs_error = """ +---------------------------------------------------------------------- +-This error normally occurs when ocrmypdf find can't Ghostscript. +-Please ensure Ghostscript is installed and its location is added to +-the system PATH environment variable. +- +-For details see: +- https://ocrmypdf.readthedocs.io/en/latest/installation.html +---------------------------------------------------------------------- +-""" +- +-_gswin = None +-if os.name == 'nt': +- _gswin = which('gswin64c') +- if not _gswin: +- _gswin = which('gswin32c') +- if not _gswin: +- raise MissingDependencyError(missing_gs_error) +- _gswin = Path(_gswin).stem +- +-GS = _gswin if _gswin else 'gs' +-del _gswin ++GS = '@gs@' + + + def version(): +diff --git a/src/ocrmypdf/_exec/jbig2enc.py b/src/ocrmypdf/_exec/jbig2enc.py +index 2e8a058b..65a09088 100644 +--- a/src/ocrmypdf/_exec/jbig2enc.py ++++ b/src/ocrmypdf/_exec/jbig2enc.py +@@ -14,7 +14,7 @@ from ocrmypdf.subprocess import get_version, run + + + def version(): +- return get_version('jbig2', regex=r'jbig2enc (\d+(\.\d+)*).*') ++ return get_version('@jbig2@', regex=r'jbig2enc (\d+(\.\d+)*).*') + + + def available(): +@@ -27,7 +27,7 @@ def available(): + + def convert_group(*, cwd, infiles, out_prefix): + args = [ +- 'jbig2', ++ '@jbig2@', + '-b', + out_prefix, + '-s', # symbol mode (lossy) +@@ -46,7 +46,7 @@ def convert_group_mp(args): + + + def convert_single(*, cwd, infile, outfile): +- args = ['jbig2', '-p', infile] ++ args = ['@jbig2@', '-p', infile] + with open(outfile, 'wb') as fstdout: + proc = run(args, cwd=cwd, stdout=fstdout, stderr=PIPE) + proc.check_returncode() +diff --git a/src/ocrmypdf/_exec/pngquant.py b/src/ocrmypdf/_exec/pngquant.py +index ca8a4542..d0544174 100644 +--- a/src/ocrmypdf/_exec/pngquant.py ++++ b/src/ocrmypdf/_exec/pngquant.py +@@ -19,7 +19,7 @@ from ocrmypdf.subprocess import get_version, run + + + def version(): +- return get_version('pngquant', regex=r'(\d+(\.\d+)*).*') ++ return get_version('@pngquant@', regex=r'(\d+(\.\d+)*).*') + + + def available(): +@@ -46,7 +46,7 @@ def input_as_png(input_file: Path): + def quantize(input_file: Path, output_file: Path, quality_min: int, quality_max: int): + with input_as_png(input_file) as input_stream: + args = [ +- 'pngquant', ++ '@pngquant@', + '--force', + '--skip-if-larger', + '--quality', +diff --git a/src/ocrmypdf/_exec/tesseract.py b/src/ocrmypdf/_exec/tesseract.py +index 33ead41e..5840f7c1 100644 +--- a/src/ocrmypdf/_exec/tesseract.py ++++ b/src/ocrmypdf/_exec/tesseract.py +@@ -78,7 +78,7 @@ class TesseractVersion(StrictVersion): + + + def version(): +- return get_version('tesseract', regex=r'tesseract\s(.+)') ++ return get_version('@tesseract@', regex=r'tesseract\s(.+)') + + + def has_user_words(): +@@ -100,7 +100,7 @@ def get_languages(): + msg += output + return msg + +- args_tess = ['tesseract', '--list-langs'] ++ args_tess = ['@tesseract@', '--list-langs'] + try: + proc = run( + args_tess, +@@ -122,7 +122,7 @@ def get_languages(): + + + def tess_base_args(langs: List[str], engine_mode: Optional[int]) -> List[str]: +- args = ['tesseract'] ++ args = ['@tesseract@'] + if langs: + args.extend(['-l', '+'.join(langs)]) + if engine_mode is not None: +diff --git a/src/ocrmypdf/_exec/unpaper.py b/src/ocrmypdf/_exec/unpaper.py +index 3c3ae72c..d269966a 100644 +--- a/src/ocrmypdf/_exec/unpaper.py ++++ b/src/ocrmypdf/_exec/unpaper.py +@@ -31,7 +31,7 @@ log = logging.getLogger(__name__) + + + def version() -> str: +- return get_version('unpaper') ++ return get_version('@unpaper@') + + + def _setup_unpaper_io(tmpdir: Path, input_file: Path) -> Tuple[Path, Path]: +@@ -71,7 +71,7 @@ def _setup_unpaper_io(tmpdir: Path, input_file: Path) -> Tuple[Path, Path]: + def run( + input_file: Path, output_file: Path, *, dpi: DecFloat, mode_args: List[str] + ) -> None: +- args_unpaper = ['unpaper', '-v', '--dpi', str(round(dpi, 6))] + mode_args ++ args_unpaper = ['@unpaper@', '-v', '--dpi', str(round(dpi, 6))] + mode_args + + with TemporaryDirectory() as tmpdir: + input_pnm, output_pnm = _setup_unpaper_io(Path(tmpdir), input_file) +diff --git a/src/ocrmypdf/leptonica.py b/src/ocrmypdf/leptonica.py +index e4814f1a..fdaf7ea4 100644 +--- a/src/ocrmypdf/leptonica.py ++++ b/src/ocrmypdf/leptonica.py +@@ -33,14 +33,7 @@ from ocrmypdf.lib._leptonica import ffi + + logger = logging.getLogger(__name__) + +-if os.name == 'nt': +- from ocrmypdf.subprocess._windows import shim_env_path +- +- libname = 'liblept-5' +- os.environ['PATH'] = shim_env_path() +-else: +- libname = 'lept' +-_libpath = find_library(libname) ++_libpath = '@liblept@' + if not _libpath: + raise MissingDependencyError( + """ diff --git a/nixpkgs/pkgs/development/python-modules/openshift/default.nix b/nixpkgs/pkgs/development/python-modules/openshift/default.nix index 052d364982b3..78e0c53c9112 100644 --- a/nixpkgs/pkgs/development/python-modules/openshift/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openshift/default.nix @@ -1,23 +1,33 @@ -{ - lib - , buildPythonPackage - , fetchPypi - , jinja2 - , kubernetes - , ruamel-yaml - , six - , python-string-utils +{ lib +, buildPythonPackage +, fetchFromGitHub +, jinja2 +, kubernetes +, ruamel-yaml +, six +, python-string-utils +, pytest-bdd +, pytestCheckHook }: buildPythonPackage rec { pname = "openshift"; - version = "0.12.0"; + version = "0.12.1"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-aggRnD4goiZJPp4cngp8AIrJC/V46378cwUSfq8Xml4="; + src = fetchFromGitHub { + owner = "openshift"; + repo = "openshift-restclient-python"; + rev = "v${version}"; + sha256 = "1di55xg3nl4dwrrfw314p4mfm6593kdi7ia517v1sm6x5p4hjl78"; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "kubernetes ~= 12.0" "kubernetes" + + sed -i '/--cov/d' setup.cfg + ''; + propagatedBuildInputs = [ jinja2 kubernetes @@ -26,10 +36,18 @@ buildPythonPackage rec { six ]; - # tries to connect to the network - doCheck = false; pythonImportsCheck = ["openshift"]; + checkInputs = [ + pytest-bdd + pytestCheckHook + ]; + + disabledTestPaths = [ + # requires docker + "test/functional" + ]; + meta = with lib; { description = "Python client for the OpenShift API"; homepage = "https://github.com/openshift/openshift-restclient-python"; diff --git a/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix b/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix index 5e7442ebc5f0..ec45fd8d09b8 100644 --- a/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix @@ -1,26 +1,20 @@ { lib , buildPythonPackage +, callPackage , fetchPypi , appdirs , cryptography -, ddt , dogpile_cache -, hacking , jmespath , jsonpatch -, jsonschema , keystoneauth1 , munch , netifaces , os-service-types -, oslo-config -, oslotest , pbr -, prometheus-client -, requests-mock +, pyyaml , requestsexceptions -, stestr -, testscenarios +, stdenv }: buildPythonPackage rec { @@ -44,35 +38,15 @@ buildPythonPackage rec { os-service-types pbr requestsexceptions + pyyaml ]; - checkInputs = [ - ddt - hacking - jsonschema - oslo-config - oslotest - prometheus-client - requests-mock - stestr - testscenarios - ]; + # Checks moved to 'passthru.tests' to workaround slowness + doCheck = false; - checkPhase = '' - stestr run -e <(echo " - openstack.tests.unit.cloud.test_image.TestImage.test_create_image_task - openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_error_396 - openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_wait - openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails - openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails_different_attribute - openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match - openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match_with_none - openstack.tests.unit.test_stats.TestStats.test_list_projects - openstack.tests.unit.test_stats.TestStats.test_projects - openstack.tests.unit.test_stats.TestStats.test_servers - openstack.tests.unit.test_stats.TestStats.test_servers_no_detail - ") - ''; + passthru.tests = { + tests = callPackage ./tests.nix { }; + }; pythonImportsCheck = [ "openstack" ]; diff --git a/nixpkgs/pkgs/development/python-modules/openstacksdk/tests.nix b/nixpkgs/pkgs/development/python-modules/openstacksdk/tests.nix new file mode 100644 index 000000000000..7a379d3a019e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/openstacksdk/tests.nix @@ -0,0 +1,65 @@ +{ buildPythonPackage +, ddt +, hacking +, jsonschema +, lib +, openstacksdk +, oslo-config +, oslotest +, prometheus-client +, requests-mock +, stdenv +, stestr +, testscenarios +}: + +buildPythonPackage rec { + pname = "openstacksdk-tests"; + inherit (openstacksdk) version; + + src = openstacksdk.src; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + ddt + hacking + jsonschema + openstacksdk + oslo-config + oslotest + prometheus-client + requests-mock + stestr + testscenarios + ]; + + checkPhase = + let aarch64TestsExcluded = lib.optionalString stdenv.hostPlatform.isAarch64 '' + openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_node_set_provision_state_with_retries + openstack.tests.unit.cloud.test_role_assignment.TestRoleAssignment.test_grant_role_user_domain_exists + openstack.tests.unit.cloud.test_volume_backups.TestVolumeBackups.test_delete_volume_backup_force + openstack.tests.unit.object_store.v1.test_proxy.TestTempURLBytesPathAndKey.test_set_account_temp_url_key_second + openstack.tests.unit.cloud.test_security_groups.TestSecurityGroups.test_delete_security_group_neutron_not_found + ''; in + '' + stestr run -e <(echo "${aarch64TestsExcluded} + openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_wait_for_baremetal_node_lock_locked + openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_inspect_machine_inspect_failed + openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_inspect_machine_available_wait + openstack.tests.unit.cloud.test_baremetal_node.TestBaremetalNode.test_inspect_machine_wait + openstack.tests.unit.cloud.test_image.TestImage.test_create_image_task + openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_error_396 + openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_wait + openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails + openstack.tests.unit.test_resource.TestWaitForStatus.test_status_fails_different_attribute + openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match + openstack.tests.unit.test_resource.TestWaitForStatus.test_status_match_with_none + openstack.tests.unit.test_stats.TestStats.test_list_projects + openstack.tests.unit.test_stats.TestStats.test_projects + openstack.tests.unit.test_stats.TestStats.test_servers + openstack.tests.unit.test_stats.TestStats.test_servers_no_detail + ") + ''; +} diff --git a/nixpkgs/pkgs/development/python-modules/optuna/default.nix b/nixpkgs/pkgs/development/python-modules/optuna/default.nix index 0b496b5ef0f8..457d796d0b78 100644 --- a/nixpkgs/pkgs/development/python-modules/optuna/default.nix +++ b/nixpkgs/pkgs/development/python-modules/optuna/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "optuna"; - version = "2.8.0"; + version = "2.9.1"; disabled = isPy27; src = fetchFromGitHub { owner = "optuna"; repo = pname; rev = "v${version}"; - sha256 = "1w5vyl36mbk78a5028qa7dlzhavrs1dkx3q8m50ij37pa5cnyksz"; + sha256 = "1fx80qjrkmnvn2mg9fx26qn3sjlwnwqlmkaf6sqhdw79pn6khlpi"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/orjson/default.nix b/nixpkgs/pkgs/development/python-modules/orjson/default.nix new file mode 100644 index 000000000000..55fbb2df8e25 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/orjson/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, pythonOlder +, rustPlatform +, fetchFromGitHub +, buildPythonPackage +, libiconv +, numpy +, psutil +, pytestCheckHook +, python-dateutil +, pytz +, xxhash +}: + +buildPythonPackage rec { + pname = "orjson"; + version = "3.6.3"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ijl"; + repo = pname; + rev = version; + sha256 = "10clf13bp3fqd9b7n1isrfwz7sngcl1j6birqc1xyg9wzfw1kslj"; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "163rf8k7qb1whjf78i8v5dlyif1sgvd9xkj8li81j45abgzkq86w"; + }; + + format = "pyproject"; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + + checkInputs = [ + numpy + psutil + pytestCheckHook + python-dateutil + pytz + xxhash + ]; + + pythonImportsCheck = [ pname ]; + + meta = with lib; { + description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"; + homepage = "https://github.com/ijl/orjson"; + license = with licenses; [ asl20 mit ]; + platforms = platforms.unix; + maintainers = with maintainers; [ misuzu ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/os-service-types/default.nix b/nixpkgs/pkgs/development/python-modules/os-service-types/default.nix index 990af2ce6b9d..147685fb2b91 100644 --- a/nixpkgs/pkgs/development/python-modules/os-service-types/default.nix +++ b/nixpkgs/pkgs/development/python-modules/os-service-types/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { doCheck = false; passthru.tests = { - pytest = callPackage ./tests.nix { }; + tests = callPackage ./tests.nix { }; }; pythonImportsCheck = [ "os_service_types" ]; diff --git a/nixpkgs/pkgs/development/python-modules/osc-lib/default.nix b/nixpkgs/pkgs/development/python-modules/osc-lib/default.nix index 8d0f9d51fb00..560c8869b00f 100644 --- a/nixpkgs/pkgs/development/python-modules/osc-lib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/osc-lib/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "osc-lib"; - version = "2.4.1"; + version = "2.4.2"; src = fetchPypi { inherit pname version; - sha256 = "1ianpk32vwdllpbk4zhfifqb5b064cbmia2hm02lcrh2m76z0zi5"; + sha256 = "d6b530e3e50646840a6a5ef134e00f285cc4a04232c163f28585226ed40cc968"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/oslo-config/default.nix b/nixpkgs/pkgs/development/python-modules/oslo-config/default.nix index fface886eb94..125481d1e026 100644 --- a/nixpkgs/pkgs/development/python-modules/oslo-config/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oslo-config/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { doCheck = false; passthru.tests = { - pytest = callPackage ./tests.nix {}; + tests = callPackage ./tests.nix {}; }; pythonImportsCheck = [ "oslo_config" ]; diff --git a/nixpkgs/pkgs/development/python-modules/oslotest/default.nix b/nixpkgs/pkgs/development/python-modules/oslotest/default.nix index 66e06c8b3e72..aa646a08ee90 100644 --- a/nixpkgs/pkgs/development/python-modules/oslotest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/oslotest/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { doCheck = false; passthru.tests = { - pytest = callPackage ./tests.nix {}; + tests = callPackage ./tests.nix {}; }; pythonImportsCheck = [ "oslotest" ]; diff --git a/nixpkgs/pkgs/development/python-modules/ospd/default.nix b/nixpkgs/pkgs/development/python-modules/ospd/default.nix new file mode 100644 index 000000000000..2c90a0e066d7 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/ospd/default.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, buildPythonPackage +, defusedxml +, deprecated +, fetchFromGitHub +, lxml +, paramiko +, poetry +, psutil +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "ospd"; + version = "21.4.3"; + format = "pyproject"; + + disabled = pythonOlder "3.7" || stdenv.isDarwin; + + src = fetchFromGitHub { + owner = "greenbone"; + repo = pname; + rev = "v${version}"; + sha256 = "1i4nfvxgxibqmqb6jwih951960sm2zy00i1wnjfnwb6za1xkpbkp"; + }; + + nativeBuildInputs = [ + poetry + ]; + + propagatedBuildInputs = [ + defusedxml + deprecated + lxml + paramiko + psutil + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "ospd" ]; + + meta = with lib; { + description = "Framework for vulnerability scanners which support OSP"; + homepage = "https://github.com/greenbone/ospd"; + license = with licenses; [ agpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/p1monitor/default.nix b/nixpkgs/pkgs/development/python-modules/p1monitor/default.nix new file mode 100644 index 000000000000..4a7ce2aec3f2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/p1monitor/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "p1monitor"; + version = "1.0.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "klaasnicolaas"; + repo = "python-p1monitor"; + rev = "v${version}"; + sha256 = "1xfr097hmjppp6cfdvfjypxmr1sb9dasq1s3np2vd5d93w0p5123"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "p1monitor" ]; + + meta = with lib; { + description = "Python client for the P1 Monitor"; + homepage = "https://github.com/klaasnicolaas/python-p1monitor"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/nixpkgs/pkgs/development/python-modules/pandas/default.nix index b7e237a3e3ba..52a77826f2d6 100644 --- a/nixpkgs/pkgs/development/python-modules/pandas/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pandas/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pname = "pandas"; - version = "1.2.4"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "649ecab692fade3cbfcf967ff936496b0cfba0af00a55dfaacd82bdda5cb2279"; + sha256 = "cbcb84d63867af3411fa063af3de64902665bb5b3d40b25b2059e40603594e87"; }; nativeBuildInputs = [ cython ]; @@ -105,6 +105,8 @@ buildPythonPackage rec { "test_missing_required_dependency" # AssertionError with 1.2.3 "test_from_coo" + # AssertionError: No common DType exists for the given inputs + "test_comparison_invalid" ] ++ lib.optionals stdenv.isDarwin [ "test_locale" "test_clipboard" diff --git a/nixpkgs/pkgs/development/python-modules/panel/default.nix b/nixpkgs/pkgs/development/python-modules/panel/default.nix index 58ae09af14b9..3f6875f4986f 100644 --- a/nixpkgs/pkgs/development/python-modules/panel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/panel/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, bleach , bokeh , param , pyviz-comms @@ -12,10 +13,11 @@ }: let - node = callPackage ./node {}; -in buildPythonPackage rec { + node = callPackage ./node { }; +in +buildPythonPackage rec { pname = "panel"; - version = "0.11.3"; + version = "0.12.1"; # Don't forget to also update the node packages # 1. retrieve the package.json file @@ -23,7 +25,7 @@ in buildPythonPackage rec { # 3. node2nix src = fetchPypi { inherit pname version; - sha256 = "sha256-HpHYHysPE6MRxR0kek5C7sunHMfBsUGdZfxamz2jcLc="; + sha256 = "e4898d60abdb82f8a429df7f59dbf8bcaf7e19b3e633555512ceb4ce06678458"; }; # Since 0.10.0 panel attempts to fetch from the web. @@ -42,6 +44,7 @@ in buildPythonPackage rec { ''; propagatedBuildInputs = [ + bleach bokeh param pyviz-comms diff --git a/nixpkgs/pkgs/development/python-modules/panel/node/node-env.nix b/nixpkgs/pkgs/development/python-modules/panel/node/node-env.nix index c2b723195b77..21089c4d5459 100644 --- a/nixpkgs/pkgs/development/python-modules/panel/node/node-env.nix +++ b/nixpkgs/pkgs/development/python-modules/panel/node/node-env.nix @@ -391,13 +391,14 @@ let , dontStrip ? true , unpackPhase ? "true" , buildPhase ? "true" + , meta ? {} , ... }@args: let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; in stdenv.mkDerivation ({ - name = "node_${name}-${version}"; + name = "${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool @@ -446,6 +447,11 @@ let # Run post install hook, if provided runHook postInstall ''; + + meta = { + # default to Node.js' platforms + platforms = nodejs.meta.platforms; + } // meta; } // extraArgs); # Builds a node environment (a node_modules folder and a set of binaries) diff --git a/nixpkgs/pkgs/development/python-modules/panel/node/node-packages.nix b/nixpkgs/pkgs/development/python-modules/panel/node/node-packages.nix index 6e45b64d5c6f..78c7c4ac37d1 100644 --- a/nixpkgs/pkgs/development/python-modules/panel/node/node-packages.nix +++ b/nixpkgs/pkgs/development/python-modules/panel/node/node-packages.nix @@ -4,13 +4,22 @@ let sources = { - "@bokeh/bokehjs-2.3.1" = { + "@babel/runtime-7.15.3" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.15.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz"; + sha512 = "OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA=="; + }; + }; + "@bokeh/bokehjs-2.3.3" = { name = "_at_bokeh_slash_bokehjs"; packageName = "@bokeh/bokehjs"; - version = "2.3.1"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-2.3.1.tgz"; - sha512 = "DlNZaqAJFUw38IuSk2TUOcfyiK8Ya3kDRpYt/RgVUftIDW2CWLbBo47kbug9+ykEF49rcnlxcCXhNXzpg4V7gw=="; + url = "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-2.3.3.tgz"; + sha512 = "Zev3p5xnS47YsZo5hcGGNUdISH3mkVLKSc6LMVqEIRlnc7Ay79TD9bnApeYh90k0JU1pcMh0gEqHgwVOGPTZ/w=="; }; }; "@bokeh/numbro-1.6.2" = { @@ -31,13 +40,13 @@ let sha512 = "W9tm8Qdw5BrylbZbaVWaQMgLfW/klesnj6J3FnyWpo18hCCOFApccUD8iOnRv7bF6PHlgWk84mW3JT5RSzYKjA=="; }; }; - "@luma.gl/constants-8.4.4" = { + "@luma.gl/constants-8.5.5" = { name = "_at_luma.gl_slash_constants"; packageName = "@luma.gl/constants"; - version = "8.4.4"; + version = "8.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/@luma.gl/constants/-/constants-8.4.4.tgz"; - sha512 = "4e58QW6UKXkxiIvWSLoAnTc4cT8nvb0PhLzu1h8KiCuaDT5Vq8csOymcNOy/jhpfcIhHlmT1KwowF5m/DcOlKg=="; + url = "https://registry.npmjs.org/@luma.gl/constants/-/constants-8.5.5.tgz"; + sha512 = "3pDC7jFaXliDP7Gvr6pPkorLFBXDnuakNeN87aEYcIM+p3XrkF0rPnDQJEzwScWS9RIopXT858xmL3vG7IYsDw=="; }; }; "@types/debounce-1.2.0" = { @@ -58,31 +67,31 @@ let sha512 = "0L8Mq1+oaIW0oVzGUDbSW+HnTjCNb4CmoIQE5BkoHt/A7x20z0MJ1PnwfH3atty/vbWLGgvJwVu2Mz3SKFiEFw=="; }; }; - "@types/jquery-3.5.5" = { + "@types/jquery-3.5.6" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; - version = "3.5.5"; + version = "3.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.5.tgz"; - sha512 = "6RXU9Xzpc6vxNrS6FPPapN1SxSHgQ336WC6Jj/N8q30OiaBZ00l1GBgeP7usjVZPivSkGUfL1z/WW6TX989M+w=="; + url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.6.tgz"; + sha512 = "SmgCQRzGPId4MZQKDj9Hqc6kSXFNWZFHpELkyK8AQhf8Zr6HKfCzFv9ZC1Fv3FyQttJZOlap3qYb12h61iZAIg=="; }; }; - "@types/sizzle-2.3.2" = { + "@types/sizzle-2.3.3" = { name = "_at_types_slash_sizzle"; packageName = "@types/sizzle"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz"; - sha512 = "7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg=="; + url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz"; + sha512 = "JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ=="; }; }; - "@types/slickgrid-2.1.30" = { + "@types/slickgrid-2.1.31" = { name = "_at_types_slash_slickgrid"; packageName = "@types/slickgrid"; - version = "2.1.30"; + version = "2.1.31"; src = fetchurl { - url = "https://registry.npmjs.org/@types/slickgrid/-/slickgrid-2.1.30.tgz"; - sha512 = "9nTqNWD3BtEVK0CP+G+mBtvSrKTfQy3Dg5/al+GdTSVMHFm37UxsHJ1eURwPg7rYu6vc7xU95fGTCKMZbxsD5w=="; + url = "https://registry.npmjs.org/@types/slickgrid/-/slickgrid-2.1.31.tgz"; + sha512 = "t/LodOkh8yP+o2jKcHsC0hAjDh1kl4RSFXKWmR9+U5FwXE7VpipqiAkE1W3NnGNA3ni5xnKQJt/CNXurJWTQ6w=="; }; }; "choices.js-9.0.1" = { @@ -202,13 +211,13 @@ let sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; }; }; - "ext-1.4.0" = { + "ext-1.5.0" = { name = "ext"; packageName = "ext"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz"; - sha512 = "Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A=="; + url = "https://registry.npmjs.org/ext/-/ext-1.5.0.tgz"; + sha512 = "+ONcYoWj/SoQwUofMr94aGu05Ou4FepKi7N7b+O8T4jVfyIsZQV1/xeS8jpaBzF0csAk0KLXoHCxU7cKYZjo1Q=="; }; }; "fast-deep-equal-2.0.1" = { @@ -283,13 +292,13 @@ let sha1 = "04ef77862cff2bb79d30f7692095930222bf60f1"; }; }; - "htm-3.0.4" = { + "htm-3.1.0" = { name = "htm"; packageName = "htm"; - version = "3.0.4"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/htm/-/htm-3.0.4.tgz"; - sha512 = "VRdvxX3tmrXuT/Ovt59NMp/ORMFi4bceFMDjos1PV4E0mV+5votuID8R60egR9A4U8nLt238R/snlJGz3UYiTQ=="; + url = "https://registry.npmjs.org/htm/-/htm-3.1.0.tgz"; + sha512 = "L0s3Sid5r6YwrEvkig14SK3Emmc+kIjlfLhEGn2Vy3bk21JyDEes4MoDsbJk6luaPp8bugErnxPz86ZuAw6e5Q=="; }; }; "jquery-3.6.0" = { @@ -310,15 +319,6 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "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=="; - }; - }; "json-formatter-js-2.3.4" = { name = "json-formatter-js"; packageName = "json-formatter-js"; @@ -328,15 +328,6 @@ let sha512 = "gmAzYRtPRmYzeAT4T7+t3NhTF89JOAIioCVDddl9YDb3ls3kWcskirafw/MZGJaRhEU6fRimGJHl7CC7gaAI2Q=="; }; }; - "loose-envify-1.4.0" = { - name = "loose-envify"; - packageName = "loose-envify"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"; - sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; - }; - }; "mgrs-1.0.0" = { name = "mgrs"; packageName = "mgrs"; @@ -364,31 +355,40 @@ let sha512 = "4RtQ1+LHJKesDCNJrXkQcwXAWCrC2aggdLYMstS/G5fEWL+fXZbUA9pwVNHFghMGuFGRATlDLNInRaPeRKzpFQ=="; }; }; - "preact-10.5.13" = { + "preact-10.5.14" = { name = "preact"; packageName = "preact"; - version = "10.5.13"; + version = "10.5.14"; src = fetchurl { - url = "https://registry.npmjs.org/preact/-/preact-10.5.13.tgz"; - sha512 = "q/vlKIGNwzTLu+jCcvywgGrt+H/1P/oIRSD6mV4ln3hmlC+Aa34C7yfPI4+5bzW8pONyVXYS7SvXosy2dKKtWQ=="; + url = "https://registry.npmjs.org/preact/-/preact-10.5.14.tgz"; + sha512 = "KojoltCrshZ099ksUZ2OQKfbH66uquFoxHSbnwKbTJHeQNvx42EmC7wQVWNuDt6vC5s3nudRHFtKbpY4ijKlaQ=="; }; }; - "proj4-2.7.2" = { + "proj4-2.7.5" = { name = "proj4"; packageName = "proj4"; - version = "2.7.2"; + version = "2.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/proj4/-/proj4-2.7.2.tgz"; - sha512 = "x/EboBmIq48a9FED0Z9zWCXkd8VIpXHLsyEXljGtsnzeztC41bFjPjJ0S//wBbNLDnDYRe0e6c3FSSiqMCebDA=="; + url = "https://registry.npmjs.org/proj4/-/proj4-2.7.5.tgz"; + sha512 = "5ecXUXbHAfvdhfBQpU7EhUfPCQGUCPmVup/4gnZA3bJY3JcK/xxzm4QQDz1xiXokN6ux65VDczlCtBtKrTSpAQ=="; }; }; - "redux-4.0.5" = { + "redux-4.1.1" = { name = "redux"; packageName = "redux"; - version = "4.0.5"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/redux/-/redux-4.0.5.tgz"; - sha512 = "VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w=="; + url = "https://registry.npmjs.org/redux/-/redux-4.1.1.tgz"; + sha512 = "hZQZdDEM25UY2P493kPYuKqviVwZ58lEmGQNeQ+gXa+U0gYPUBf7NKYazbe3m+bs/DzM/ahN12DbF+NG8i0CWw=="; + }; + }; + "regenerator-runtime-0.13.9" = { + name = "regenerator-runtime"; + packageName = "regenerator-runtime"; + version = "0.13.9"; + src = fetchurl { + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; + sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; }; }; "sprintf-js-1.1.2" = { @@ -400,15 +400,6 @@ let sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; }; }; - "symbol-observable-1.2.0" = { - name = "symbol-observable"; - packageName = "symbol-observable"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz"; - sha512 = "e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="; - }; - }; "timezone-1.0.23" = { name = "timezone"; packageName = "timezone"; @@ -427,13 +418,13 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tslib-2.2.0" = { + "tslib-2.3.1" = { name = "tslib"; packageName = "tslib"; - version = "2.2.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz"; - sha512 = "gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz"; + sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="; }; }; "type-1.2.0" = { @@ -463,35 +454,36 @@ let sha1 = "3013e0ea181756306f1609e959cafbc722adb3e9"; }; }; - "wkt-parser-1.2.4" = { + "wkt-parser-1.3.1" = { name = "wkt-parser"; packageName = "wkt-parser"; - version = "1.2.4"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/wkt-parser/-/wkt-parser-1.2.4.tgz"; - sha512 = "ZzKnc7ml/91fOPh5bANBL4vUlWPIYYv11waCtWTkl2TRN+LEmBg60Q1MA8gqV4hEp4MGfSj9JiHz91zw/gTDXg=="; + url = "https://registry.npmjs.org/wkt-parser/-/wkt-parser-1.3.1.tgz"; + sha512 = "XK5qV+Y5gsygQfHx2/cS5a7Zxsgleaw8iX5UPC5eOXPc0TgJAu1JB9lr0iYYX3zAnN3p0aNiaN5c+1Bdblxwrg=="; }; }; }; args = { name = "_at_holoviz_slash_panel"; packageName = "@holoviz/panel"; - version = "0.11.3"; + version = "0.12.1"; src = ./.; dependencies = [ - sources."@bokeh/bokehjs-2.3.1" + sources."@babel/runtime-7.15.3" + sources."@bokeh/bokehjs-2.3.3" sources."@bokeh/numbro-1.6.2" (sources."@bokeh/slickgrid-2.4.2702" // { dependencies = [ sources."tslib-1.14.1" ]; }) - sources."@luma.gl/constants-8.4.4" + sources."@luma.gl/constants-8.5.5" sources."@types/debounce-1.2.0" sources."@types/gl-matrix-2.4.5" - sources."@types/jquery-3.5.5" - sources."@types/sizzle-2.3.2" - sources."@types/slickgrid-2.1.30" + sources."@types/jquery-3.5.6" + sources."@types/sizzle-2.3.3" + sources."@types/slickgrid-2.1.31" sources."choices.js-9.0.1" sources."d-1.0.1" sources."debounce-1.2.1" @@ -508,7 +500,7 @@ let sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" sources."event-emitter-0.3.5" - (sources."ext-1.4.0" // { + (sources."ext-1.5.0" // { dependencies = [ sources."type-2.5.0" ]; @@ -521,25 +513,23 @@ let sources."fuse.js-3.6.1" sources."gl-matrix-3.3.0" sources."hammerjs-2.0.8" - sources."htm-3.0.4" + sources."htm-3.1.0" sources."jquery-3.6.0" sources."jquery-ui-1.12.1" - sources."js-tokens-4.0.0" sources."json-formatter-js-2.3.4" - sources."loose-envify-1.4.0" sources."mgrs-1.0.0" sources."next-tick-1.0.0" sources."nouislider-14.7.0" - sources."preact-10.5.13" - sources."proj4-2.7.2" - sources."redux-4.0.5" + sources."preact-10.5.14" + sources."proj4-2.7.5" + sources."redux-4.1.1" + sources."regenerator-runtime-0.13.9" sources."sprintf-js-1.1.2" - sources."symbol-observable-1.2.0" sources."timezone-1.0.23" - sources."tslib-2.2.0" + sources."tslib-2.3.1" sources."type-1.2.0" sources."underscore.template-0.1.7" - sources."wkt-parser-1.2.4" + sources."wkt-parser-1.3.1" ]; buildInputs = globalBuildInputs; meta = { diff --git a/nixpkgs/pkgs/development/python-modules/panel/node/package.json b/nixpkgs/pkgs/development/python-modules/panel/node/package.json index f40e3773e23b..dc1d13ab4875 100644 --- a/nixpkgs/pkgs/development/python-modules/panel/node/package.json +++ b/nixpkgs/pkgs/development/python-modules/panel/node/package.json @@ -1,6 +1,6 @@ { "name": "@holoviz/panel", - "version": "0.11.1", + "version": "0.12.1", "description": "A high level dashboarding library for python visualization libraries.", "license": "BSD-3-Clause", "repository": { @@ -8,7 +8,7 @@ "url": "https://github.com/holoviz/panel.git" }, "dependencies": { - "@bokeh/bokehjs": "^2.3.0", + "@bokeh/bokehjs": "^2.3.3", "@luma.gl/constants": "^8.0.3", "@types/debounce": "^1.2.0", "@types/gl-matrix": "^2.4.5", diff --git a/nixpkgs/pkgs/development/python-modules/panflute/default.nix b/nixpkgs/pkgs/development/python-modules/panflute/default.nix index 332c4c16bd6a..4e161d4bfa3c 100644 --- a/nixpkgs/pkgs/development/python-modules/panflute/default.nix +++ b/nixpkgs/pkgs/development/python-modules/panflute/default.nix @@ -4,6 +4,7 @@ , pyyaml , buildPythonPackage , isPy3k +, fetchpatch }: buildPythonPackage rec{ @@ -16,6 +17,14 @@ buildPythonPackage rec{ inherit pname version; sha256 = "8a3d5dd2a10c3aa6fa8167713fedb47400f0e8ae6ea8346fd4b599842bb1882d"; }; + patches = [ + # Upstream has relaxed the version constaints for the click dependency + # but there hasn't been a release since then + (fetchpatch { + url = "https://github.com/sergiocorreia/panflute/commit/dee6c716a73072a968d67f8638a61de44025d8de.patch"; + sha256 = "sha256-Kj/NTcXsSkevpfr8OwoIQi0p6ChXDM6YgYDPNHJtJZo="; + }) + ]; propagatedBuildInputs = [ click pyyaml ]; diff --git a/nixpkgs/pkgs/development/python-modules/paramiko/default.nix b/nixpkgs/pkgs/development/python-modules/paramiko/default.nix index c2237f68524f..88d63f0de93f 100644 --- a/nixpkgs/pkgs/development/python-modules/paramiko/default.nix +++ b/nixpkgs/pkgs/development/python-modules/paramiko/default.nix @@ -6,7 +6,7 @@ , invoke , pynacl , pyasn1 -, pytest +, pytestCheckHook , pytest-relaxed , mock }: @@ -20,25 +20,21 @@ buildPythonPackage rec { sha256 = "7f36f4ba2c0d81d219f4595e35f70d56cc94f9ac40a6acdf51d6ca210ce65035"; }; - checkInputs = [ invoke pytest mock pytest-relaxed ]; propagatedBuildInputs = [ bcrypt cryptography pynacl pyasn1 ]; - __darwinAllowLocalNetworking = true; + checkInputs = [ invoke pytestCheckHook pytest-relaxed mock ]; + + disabledTestPaths = [ + "tests/test_sftp.py" + "tests/test_config.py" + ]; - # 2 sftp tests fail (skip for now) - # test_config relies on artifacts to be to downloaded - # RSA tests don't have valid keys - checkPhase = '' - pytest tests \ - --ignore=tests/test_sftp.py \ - --ignore=tests/test_config.py - ''; + __darwinAllowLocalNetworking = true; meta = with pkgs.lib; { homepage = "https://github.com/paramiko/paramiko/"; description = "Native Python SSHv2 protocol library"; license = licenses.lgpl21Plus; - longDescription = '' This is a library for making SSH2 connections (client or server). Emphasis is on using SSH2 as an alternative to SSL for making secure diff --git a/nixpkgs/pkgs/development/python-modules/parquet/default.nix b/nixpkgs/pkgs/development/python-modules/parquet/default.nix new file mode 100644 index 000000000000..ceaba917e832 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/parquet/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, python-snappy +, pythonOlder +, thriftpy2 +}: + +buildPythonPackage rec { + pname = "parquet"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "jcrobak"; + repo = "parquet-python"; + rev = "v${version}"; + sha256 = "1ahvg4dz9fzi4vdm9jmslq3v3jahjj17fdcc5fljgcw6h9yxyl2r"; + }; + + propagatedBuildInputs = [ + python-snappy + thriftpy2 + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # Fails with AttributeError + "test_bson" + "testFromExample" + ]; + + pythonImportsCheck = [ "thriftpy2" ]; + + meta = with lib; { + description = "Python implementation of the parquet columnar file format"; + homepage = "https://github.com/jcrobak/parquet-python"; + license = licenses.bsd2; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/parsedmarc/default.nix b/nixpkgs/pkgs/development/python-modules/parsedmarc/default.nix new file mode 100644 index 000000000000..b9fb35016c3b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/parsedmarc/default.nix @@ -0,0 +1,74 @@ +{ buildPythonPackage +, fetchPypi +, fetchurl +, pythonOlder +, lib +, nixosTests + +# pythonPackages +, tqdm +, dnspython +, expiringdict +, urllib3 +, requests +, publicsuffix2 +, xmltodict +, geoip2 +, IMAPClient +, dateparser +, elasticsearch-dsl +, kafka-python +, mailsuite +, lxml +, boto3 +}: + +let + dashboard = fetchurl { + url = "https://raw.githubusercontent.com/domainaware/parsedmarc/77331b55c54cb3269205295bd57d0ab680638964/grafana/Grafana-DMARC_Reports.json"; + sha256 = "0wbihyqbb4ndjg79qs8088zgrcg88km8khjhv2474y7nzjzkf43i"; + }; +in +buildPythonPackage rec { + pname = "parsedmarc"; + version = "7.0.1"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mi4hx410y7ikpfy1582lm252si0c3yryj0idqgqbx417fm21jjc"; + }; + + propagatedBuildInputs = [ + tqdm + dnspython + expiringdict + urllib3 + requests + publicsuffix2 + xmltodict + geoip2 + IMAPClient + dateparser + elasticsearch-dsl + kafka-python + mailsuite + lxml + boto3 + ]; + + pythonImportsCheck = [ "parsedmarc" ]; + + passthru = { + inherit dashboard; + tests = nixosTests.parsedmarc; + }; + + meta = { + description = "Python module and CLI utility for parsing DMARC reports"; + homepage = "https://domainaware.github.io/parsedmarc/"; + maintainers = with lib.maintainers; [ talyz ]; + license = lib.licenses.asl20; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/parts/default.nix b/nixpkgs/pkgs/development/python-modules/parts/default.nix index 83d7d7046f99..c615fe5a0307 100644 --- a/nixpkgs/pkgs/development/python-modules/parts/default.nix +++ b/nixpkgs/pkgs/development/python-modules/parts/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "parts"; - version = "1.0.3"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "a4137612bc050f606b4d6f9e6a554ebfb50633c8dd9699481f82271f84d9425f"; + sha256 = "2212129476f6d285c3aaab309b80b83664d13dca5a42c5ca3500bd32130af7ec"; }; # Project has no tests diff --git a/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix b/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix index b21536060d3a..757ddc7d9746 100644 --- a/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pathlib2"; - version = "2.3.5"; + version = "2.3.6"; src = fetchPypi { inherit pname version; - sha256 = "6cd9a47b597b37cc57de1c05e56fb1a1c9cc9fab04fe78c29acd090418529868"; + sha256 = "7d8bcb5555003cdf4a8d2872c538faa3a0f5d20630cb360e518ca3b981795e5f"; }; propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") scandir; diff --git a/nixpkgs/pkgs/development/python-modules/pathspec/default.nix b/nixpkgs/pkgs/development/python-modules/pathspec/default.nix index 1ad8a7564dd0..6a0281b756ec 100644 --- a/nixpkgs/pkgs/development/python-modules/pathspec/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pathspec/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-5WRJlDWiZz1Yb2shMLtblfBKO6Bvgbj4lbZRo8dqq7E="; + sha256 = "e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1"; }; meta = { diff --git a/nixpkgs/pkgs/development/python-modules/pathy/default.nix b/nixpkgs/pkgs/development/python-modules/pathy/default.nix index d656a752cf55..9108c3656dbd 100644 --- a/nixpkgs/pkgs/development/python-modules/pathy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pathy/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "pathy"; - version = "0.5.2"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nb8my/5rkc7thuHnXZHe1Hg8j+sLBlYyJcLHWrrKZ5M="; + sha256 = "f83f1eddf77dd86e824143eef8d9adbe0785c3cdd5ec0ed6c0edea3227385048"; }; propagatedBuildInputs = [ smart-open typer google-cloud-storage ]; diff --git a/nixpkgs/pkgs/development/python-modules/pbr/default.nix b/nixpkgs/pkgs/development/python-modules/pbr/default.nix index 9ce3d72a20d9..77e8d5c210a2 100644 --- a/nixpkgs/pkgs/development/python-modules/pbr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pbr/default.nix @@ -1,4 +1,9 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, callPackage +}: buildPythonPackage rec { pname = "pbr"; @@ -9,12 +14,21 @@ buildPythonPackage rec { sha256 = "42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd"; }; - # circular dependencies with fixtures + propagatedBuildInputs = [ setuptools ]; + + # check in passthru.tests.pytest to escape infinite recursion with fixtures doCheck = false; + passthru.tests = { + tests = callPackage ./tests.nix { }; + }; + + pythonImportsCheck = [ "pbr" ]; + meta = with lib; { - homepage = "http://docs.openstack.org/developer/pbr/"; - license = licenses.asl20; description = "Python Build Reasonableness"; + homepage = "https://github.com/openstack/pbr"; + license = licenses.asl20; + maintainers = teams.openstack.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pbr/tests.nix b/nixpkgs/pkgs/development/python-modules/pbr/tests.nix new file mode 100644 index 000000000000..a1c57684ce46 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pbr/tests.nix @@ -0,0 +1,49 @@ +{ stdenv +, buildPythonPackage +, git +, gnupg +, pbr +, mock +, sphinx +, stestr +, testresources +, testscenarios +, virtualenv +}: + +buildPythonPackage rec { + pname = "pbr"; + inherit (pbr) version; + + src = pbr.src; + + postPatch = '' + # only a small portion of the listed packages are actually needed for running the tests + # so instead of removing them one by one remove everything + rm test-requirements.txt + ''; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + pbr + git + gnupg + mock + sphinx + stestr + testresources + testscenarios + virtualenv + ]; + + checkPhase = '' + stestr run -e <(echo " + pbr.tests.test_core.TestCore.test_console_script_develop + pbr.tests.test_core.TestCore.test_console_script_install + pbr.tests.test_wsgi.TestWsgiScripts.test_with_argument + pbr.tests.test_wsgi.TestWsgiScripts.test_wsgi_script_run + ") + ''; +} diff --git a/nixpkgs/pkgs/development/python-modules/pdoc3/default.nix b/nixpkgs/pkgs/development/python-modules/pdoc3/default.nix index 66bed253cb86..1a3996311570 100644 --- a/nixpkgs/pkgs/development/python-modules/pdoc3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pdoc3/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pdoc3"; - version = "0.9.2"; + version = "0.10.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "9df5d931f25f353c69c46819a3bd03ef96dd286f2a70bb1b93a23a781f91faa1"; + sha256 = "5f22e7bcb969006738e1aa4219c75a32f34c2d62d46dc9d2fb2d3e0b0287e4b7"; }; nativeBuildInputs = [ setuptools-git setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/pefile/default.nix b/nixpkgs/pkgs/development/python-modules/pefile/default.nix index 508ba27b2943..1a793644fb29 100644 --- a/nixpkgs/pkgs/development/python-modules/pefile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pefile/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pefile"; - version = "2021.9.2"; + version = "2021.9.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "erocarrera"; repo = pname; rev = "v${version}"; - sha256 = "1pgsw84i9r6ydkfzqifgl5lvcz3cf3xz5c2543kl3q8mgb21wxaz"; + sha256 = "0sr17rmqpr874m8rpkp8xdz8kjshhimbfgq13qy4lscaiznmlf0d"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pex/default.nix b/nixpkgs/pkgs/development/python-modules/pex/default.nix index 96eaa96aef85..ad8aca089e37 100644 --- a/nixpkgs/pkgs/development/python-modules/pex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.49"; + version = "2.1.50"; src = fetchPypi { inherit pname version; - sha256 = "af536388eeede93111d8ef0af4a80cbb3d847c1a1470c6f34f3abe83deac1b91"; + sha256 = "c67365b26060452631c0083a0f5d50af3cba9287b84b2c157404c959cb4bb74d"; }; nativeBuildInputs = [ setuptools ]; diff --git a/nixpkgs/pkgs/development/python-modules/pg8000/default.nix b/nixpkgs/pkgs/development/python-modules/pg8000/default.nix index d8a002231057..aadcec698ae2 100644 --- a/nixpkgs/pkgs/development/python-modules/pg8000/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pg8000/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.21.1"; + version = "1.21.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HMvuyTtw4uhTLfOr3caQXHghkJyW3Oqu91G1fFKRhpo="; + sha256 = "36a3b517408334967c1fa0d29656da03608d63122a372ec92c85f49aed2d24e3"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/phik/default.nix b/nixpkgs/pkgs/development/python-modules/phik/default.nix index b309fb287d80..09a240f4c4a6 100644 --- a/nixpkgs/pkgs/development/python-modules/phik/default.nix +++ b/nixpkgs/pkgs/development/python-modules/phik/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "phik"; - version = "0.10.0"; + version = "0.12.0"; format = "wheel"; disabled = !isPy3k; src = fetchPypi { inherit pname version format; python = "py3"; - sha256 = "b745313c5ff9d6a3092eefa97f83fa4dbed178c9ce69161b655e95497cb2f38b"; + sha256 = "57db39d1c74c84a24d0270b63d1c629a5cb975462919895b96a8522ae0678408"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix b/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix index c04ccbd5281e..0b33c2ff56a6 100644 --- a/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix +++ b/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.31"; + version = "8.12.32"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CR7SsxWFZ/EsmfcZVwocys4AF585tE8ea4lfWdk9rcg="; + sha256 = "c52c9c3607483072303ba8d8759063edc44d2f8fe7b85afef40bd8d1aafb6483"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix b/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix index a7d9faf98a9c..027369d3d01a 100644 --- a/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix @@ -5,13 +5,12 @@ , fetchPypi , hypothesis , isPy3k +, jbig2dec , lxml +, mupdf , pillow , psutil , pybind11 -, pytest-cov -, pytest-helpers-namespace -, pytest-timeout , pytest-xdist , pytestCheckHook , python-dateutil @@ -20,18 +19,27 @@ , setuptools , setuptools-scm , setuptools-scm-git-archive +, substituteAll }: buildPythonPackage rec { pname = "pikepdf"; - version = "2.16.1"; + version = "3.1.0"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-4k3/avMfHrcy/LXbRniDXR8xJkOZb9zZ2+uKylK8Dd4="; + sha256 = "aeb813b5f36534d2bedf08487ab2b022c43f4c8a3e86e611c5f7c8fb97309db5"; }; + patches = [ + (substituteAll { + src = ./paths.patch; + jbig2dec = "${lib.getBin jbig2dec}/bin/jbig2dec"; + mudraw = "${lib.getBin mupdf}/bin/mudraw"; + }) + ]; + buildInputs = [ pybind11 qpdf @@ -45,11 +53,8 @@ buildPythonPackage rec { checkInputs = [ attrs hypothesis - pytest-helpers-namespace - pytest-timeout pytest-xdist psutil - pytest-cov pytestCheckHook python-dateutil python-xmp-toolkit @@ -62,17 +67,13 @@ buildPythonPackage rec { setuptools ]; - preBuild = '' - HOME=$TMPDIR - ''; - pythonImportsCheck = [ "pikepdf" ]; meta = with lib; { homepage = "https://github.com/pikepdf/pikepdf"; description = "Read and write PDFs with Python, powered by qpdf"; license = licenses.mpl20; - maintainers = [ maintainers.kiwi ]; + maintainers = with maintainers; [ kiwi dotlambda ]; changelog = "https://github.com/pikepdf/pikepdf/blob/${version}/docs/release_notes.rst"; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pikepdf/paths.patch b/nixpkgs/pkgs/development/python-modules/pikepdf/paths.patch new file mode 100644 index 000000000000..807041696ad6 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pikepdf/paths.patch @@ -0,0 +1,26 @@ +diff --git a/src/pikepdf/_methods.py b/src/pikepdf/_methods.py +index 70cdc9e..c3a14d0 100644 +--- a/src/pikepdf/_methods.py ++++ b/src/pikepdf/_methods.py +@@ -190,7 +190,7 @@ def _mudraw(buffer, fmt) -> bytes: + tmp_in.flush() + + proc = run( +- ['mudraw', '-F', fmt, '-o', '-', tmp_in.name], ++ ['@mudraw@', '-F', fmt, '-o', '-', tmp_in.name], + stdout=PIPE, + stderr=PIPE, + check=True, +diff --git a/src/pikepdf/jbig2.py b/src/pikepdf/jbig2.py +index 80cc910..64f6d31 100644 +--- a/src/pikepdf/jbig2.py ++++ b/src/pikepdf/jbig2.py +@@ -25,7 +25,7 @@ def extract_jbig2( + global_path = Path(tmpdir) / "global" + output_path = Path(tmpdir) / "outfile" + +- args = ["jbig2dec", "-e", "-o", os.fspath(output_path)] ++ args = ["@jbig2dec@", "-e", "-o", os.fspath(output_path)] + + # Get the raw stream, because we can't decode im_obj - that is why we are here + # (Strictly speaking we should remove any non-JBIG2 filters if double encoded) diff --git a/nixpkgs/pkgs/development/python-modules/pillow/default.nix b/nixpkgs/pkgs/development/python-modules/pillow/default.nix index af6c3d80deaf..c6bb944c232b 100644 --- a/nixpkgs/pkgs/development/python-modules/pillow/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pillow/default.nix @@ -5,13 +5,13 @@ import ./generic.nix (rec { pname = "Pillow"; - version = "8.3.1"; + version = "8.3.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "2cac53839bfc5cece8fdbe7f084d5e3ee61e1303cccc86511d351adcb9e2c792"; + sha256 = "1361y215ydmdh4il1vay5831aqivmpwgzjqrphqjdiq0ipnz7qyx"; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix b/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix index d51a83a05478..fc593e6a48fb 100644 --- a/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pkgconfig/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pkgconfig"; - version = "1.5.4"; + version = "1.5.5"; inherit (pkg-config) setupHooks @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c34503829fd226822fd93c902b1cf275516908a023a24be0a02ba687f3a00399"; + sha256 = "deb4163ef11f75b520d822d9505c1f462761b4309b1bb713d08689759ea8b899"; }; diff --git a/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix b/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix index 1b1834e324bb..6bfed6305a8a 100644 --- a/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pkginfo"; - version = "1.7.0"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "029a70cb45c6171c329dfc890cde0879f8c52d6f3922794796e06f577bb03db4"; + sha256 = "e7432f81d08adec7297633191bbf0bd47faf13cd8724c3a13250e51d542635bd"; }; doCheck = false; # I don't know why, but with doCheck = true it fails. diff --git a/nixpkgs/pkgs/development/python-modules/plac/default.nix b/nixpkgs/pkgs/development/python-modules/plac/default.nix index bf66f7d01f19..2bd50d87dc0b 100644 --- a/nixpkgs/pkgs/development/python-modules/plac/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plac/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { }; checkPhase = '' - cd doc - ${python.interpreter} -m unittest discover -p "*test_plac*" - ''; + cd doc + ${python.interpreter} -m unittest discover -p "*test_plac*" + ''; meta = with lib; { description = "Parsing the Command Line the Easy Way"; homepage = "https://github.com/micheles/plac"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ sdll ]; - }; + maintainers = with maintainers; [ ]; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix b/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix index 567fdd42d0d3..b864dedecfe7 100644 --- a/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, requests, pytest }: buildPythonPackage rec { - version = "7.4.0"; + version = "8.1.0"; pname = "plaid-python"; src = fetchPypi { inherit pname version; - sha256 = "ab70467116adc110b56eb5a1fdeed726307cc216e04dda46a782aa1a1468ce0e"; + sha256 = "b1f7b5b58ba3c171bb795352119d54797c8c50877bc376d26cd756de2453e9fd"; }; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/platformdirs/default.nix b/nixpkgs/pkgs/development/python-modules/platformdirs/default.nix index 90eb35f993a3..f49b8716211e 100644 --- a/nixpkgs/pkgs/development/python-modules/platformdirs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/platformdirs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "platformdirs"; - version = "2.2.0"; + version = "2.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "15f08czqfmxy1y947rlrsjs20jgsy2vc1wqhv4b08b3ijxj0jpqh"; + sha256 = "sha256-g2DPNN7VxK3EjOXOpSWA4a+PghZ7v2jmjw9+VQyCTBI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/nixpkgs/pkgs/development/python-modules/plexapi/default.nix b/nixpkgs/pkgs/development/python-modules/plexapi/default.nix index 2df3e3a17c84..eba416fd3562 100644 --- a/nixpkgs/pkgs/development/python-modules/plexapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plexapi/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.7.0"; + version = "4.7.1"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "1gh36ln9ki69rs7ml9syqq956i996rdi145qffjwb3736zylrzkp"; + sha256 = "sha256-kZREcjLBSWXGULEKfWiherRCl5UXLOw4f3JFaqs8dXw="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/plotly/default.nix b/nixpkgs/pkgs/development/python-modules/plotly/default.nix index e2496d6097d9..4b849dd016b8 100644 --- a/nixpkgs/pkgs/development/python-modules/plotly/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plotly/default.nix @@ -1,38 +1,35 @@ { lib , buildPythonPackage , fetchPypi -, decorator -, nbformat , pytz , requests -, retrying , six +, tenacity }: buildPythonPackage rec { pname = "plotly"; - version = "4.14.3"; + version = "5.3.0"; src = fetchPypi { inherit pname version; - sha256 = "14cxlfl79i9bh3awsf4xgwr14ywm7lnrz2a81s7gp0if77nsx2kx"; + sha256 = "b6dc306c56e7d5fa7d017718894099b27290b427abf4acad8e5b77fdc3bd32ec"; }; propagatedBuildInputs = [ - decorator - nbformat pytz requests - retrying six + tenacity ]; # No tests in archive doCheck = false; - meta = { + meta = with lib; { description = "Python plotting library for collaborative, interactive, publication-quality graphs"; homepage = "https://plot.ly/python/"; - license = with lib.licenses; [ mit ]; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pluggy/0.nix b/nixpkgs/pkgs/development/python-modules/pluggy/0.nix new file mode 100644 index 000000000000..30fa2e1945b2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pluggy/0.nix @@ -0,0 +1,34 @@ +{ buildPythonPackage +, lib +, fetchPypi +, setuptools-scm +, importlib-metadata +}: + +buildPythonPackage rec { + pname = "pluggy"; + version = "0.13.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"; + }; + + checkPhase = '' + py.test + ''; + + # To prevent infinite recursion with pytest + doCheck = false; + + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = [ importlib-metadata ]; + + meta = { + description = "Plugin and hook calling mechanisms for Python"; + homepage = "https://github.com/pytest-dev/pluggy"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pluggy/default.nix b/nixpkgs/pkgs/development/python-modules/pluggy/default.nix index 30fa2e1945b2..1a1c23f22d0a 100644 --- a/nixpkgs/pkgs/development/python-modules/pluggy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pluggy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pluggy"; - version = "0.13.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"; + sha256 = "4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"; }; checkPhase = '' diff --git a/nixpkgs/pkgs/development/python-modules/plugwise/default.nix b/nixpkgs/pkgs/development/python-modules/plugwise/default.nix index ececea7d7ddc..ca8af15b53ee 100644 --- a/nixpkgs/pkgs/development/python-modules/plugwise/default.nix +++ b/nixpkgs/pkgs/development/python-modules/plugwise/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.13.1"; + version = "0.14.5"; src = fetchFromGitHub { owner = pname; repo = "python-plugwise"; rev = "v${version}"; - sha256 = "1sv421aa6ip74ajxa5imnh188hyx9dq3vwkb6aifi14h2wpr9lh3"; + sha256 = "1kwks87raxs04dvnpmpn8l1cbzg5yb5nyinaqzxdsc6al83isbik"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/plyer/default.nix b/nixpkgs/pkgs/development/python-modules/plyer/default.nix new file mode 100644 index 000000000000..88dfd9a4a2bf --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/plyer/default.nix @@ -0,0 +1,63 @@ +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, keyring, mock, pytestCheckHook, stdenv }: + +buildPythonPackage rec { + pname = "plyer"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "kivy"; + repo = pname; + rev = version; + sha256 = "15z1wpq6s69s76r6akzgg340bpc21l2r1j8270gp7i1rpnffcjwm"; + }; + + patches = [ + # fix naming of the DOCUMENTS dir + (fetchpatch { + url = "https://github.com/rski/plyer/commit/99dabb2d62248fc3ea5705c2720abf71c9fc378b.patch"; + sha256 = "sha256-bbnw0TxH4FGTso5dopzquDCjrjZAy+6CJauqi/nfstA="; + }) + # fix handling of the ~/.config/user-dirs.dir file + (fetchpatch { + url = "https://github.com/rski/plyer/commit/f803697a1fe4fb5e9c729ee6ef1997b8d64f3ccd.patch"; + sha256 = "sha256-akuh//P5puz2PwcBRXZQ4KoGk+fxi4jn2H3pTIT5M78="; + }) + ]; + + postPatch = '' + rm -r examples + # remove all the wifi stuff. Depends on a python wifi module that has not been updated since 2016 + find -iname "wifi*" -exec rm {} \; + substituteInPlace plyer/__init__.py \ + --replace "wifi = Proxy('wifi', facades.Wifi)" "" \ + --replace "'wifi'" "" + substituteInPlace plyer/facades/__init__.py \ + --replace "from plyer.facades.wifi import Wifi" "" + ''; + + propagatedBuildInputs = [ keyring ]; + + checkInputs = [ mock pytestCheckHook ]; + + pytestFlagsArray = [ "plyer/tests" ]; + disabledTests = [ + # assumes dbus is not installed, it fails and is not very robust. + "test_notification_notifysend" + # fails during nix-build, but I am not able to explain why. + # The test and the API under test do work outside the nix build. + "test_uniqueid" + ]; + preCheck = '' + HOME=$(mktemp -d) + mkdir -p $HOME/.config/ $HOME/Pictures + ''; + + pythonImportsCheck = [ "plyer" ]; + + meta = with lib; { + description = "Plyer is a platform-independent api to use features commonly found on various platforms"; + homepage = "https://github.com/kivy/plyer"; + license = licenses.mit; + maintainers = with maintainers; [ rski ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix b/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix index 4d8c444dcd20..7eef9e740d31 100644 --- a/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 , importlib-metadata , intreehooks -, isort , pathlib2 , pep517 , pytest-mock @@ -13,14 +12,14 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "1.0.3"; + version = "1.0.4"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "07x0zagf9cfr7g3132jjd5byywkbnzpfbxjfjzpzpj70fqw70qrc"; + sha256 = "0jgd4d7m5y8ly8n0l9lcq7cjab2y3hifk90f343ksmjzssfd5lg3"; }; postPatch = lib.optionalString (pythonOlder "3.8") '' @@ -54,6 +53,9 @@ buildPythonPackage rec { pythonImportsCheck = [ "poetry.core" ]; + # allow for package to use pep420's native namespaces + pythonNamespaces = [ "poetry" ]; + meta = with lib; { description = "Core utilities for Poetry"; homepage = "https://github.com/python-poetry/poetry-core/"; diff --git a/nixpkgs/pkgs/development/python-modules/poetry/default.nix b/nixpkgs/pkgs/development/python-modules/poetry/default.nix index 7287797ef331..29477474c845 100644 --- a/nixpkgs/pkgs/development/python-modules/poetry/default.nix +++ b/nixpkgs/pkgs/development/python-modules/poetry/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "1.1.7"; + version = "1.1.8"; format = "pyproject"; disabled = isPy27; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "03cbzjw0sb8rs85iq191ndk9523d6qpymh2nhw5bvcxfvsf9042d"; + sha256 = "0qcgjb78nj69sppd8146519q9422xxg1bi34gyxy51sjkvd5lxhz"; }; postPatch = '' @@ -99,6 +99,9 @@ buildPythonPackage rec { }) ]; + # allow for package to use pep420's native namespaces + pythonNamespaces = [ "poetry" ]; + meta = with lib; { homepage = "https://python-poetry.org/"; description = "Python dependency management and packaging made easy"; diff --git a/nixpkgs/pkgs/development/python-modules/pontos/default.nix b/nixpkgs/pkgs/development/python-modules/pontos/default.nix index 8ee1e6d784e3..1264e40f30d1 100644 --- a/nixpkgs/pkgs/development/python-modules/pontos/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pontos/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, poetry +, poetry-core , pytestCheckHook , pythonOlder , colorful @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "21.7.4"; + version = "21.9.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,11 +21,11 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "v${version}"; - sha256 = "12z74fp21kv6jf4cwc4hd5xvl5lilhmpprcqimdg85pcddc4zwc2"; + sha256 = "1pgvpg5sjmd9p1i9lm39k4r5qsz158wfgwfa56rx0p8xqf00h1xp"; }; nativeBuildInputs = [ - poetry + poetry-core ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pook/default.nix b/nixpkgs/pkgs/development/python-modules/pook/default.nix index 480dc7dcba64..35829044c3cf 100644 --- a/nixpkgs/pkgs/development/python-modules/pook/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pook/default.nix @@ -2,7 +2,6 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, fetchpatch , furl , jsonschema , nose @@ -14,25 +13,16 @@ buildPythonPackage rec { pname = "pook"; - version = "1.0.1"; + version = "1.0.2"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "h2non"; repo = pname; rev = "v${version}"; - sha256 = "0z48vswj07kr2sdvq5qzrwqyijpmj2rlnh2z2b32id1mckr6nnz8"; + sha256 = "sha256-4OGcnuajGdBRlXCYwbTK/zLNQRrir60qCYajHRRCpkU="; }; - patches = [ - (fetchpatch { - # Will be fixed with the new release, https://github.com/h2non/pook/issues/69 - name = "use-match-keyword-in-pytest.patch"; - url = "https://github.com/h2non/pook/commit/2071da27701c82ce02b015e01e2aa6fd203e7bb5.patch"; - sha256 = "0i3qcpbdqqsnbygi46dyqamgkh9v8rhpbm4lkl75riw48j4n080k"; - }) - ]; - propagatedBuildInputs = [ aiohttp furl diff --git a/nixpkgs/pkgs/development/python-modules/prance/default.nix b/nixpkgs/pkgs/development/python-modules/prance/default.nix index 0f18a6ad2072..105fa9e180b7 100644 --- a/nixpkgs/pkgs/development/python-modules/prance/default.nix +++ b/nixpkgs/pkgs/development/python-modules/prance/default.nix @@ -1,51 +1,43 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , chardet -, pyyaml , requests +, ruamel_yaml , six , semver , pytestCheckHook -, pytest-cov -, pytest-runner , openapi-spec-validator }: buildPythonPackage rec { pname = "prance"; - version = "0.21.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "43ebe3a5b38f0c65c428427004c4d8ce8d7155ddad50610276c89c192680f138"; + version = "0.21.8.0"; + + src = fetchFromGitHub { + owner = "RonnyPfannschmidt"; + repo = pname; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-kGANMHfWwhW3ZBw2ZVCJZR/bV2EPhcydMKhDeDTVwcQ="; }; - buildInputs = [ - pytest-runner - ]; - propagatedBuildInputs = [ chardet - pyyaml requests + ruamel_yaml six semver ]; checkInputs = [ pytestCheckHook - pytest-cov openapi-spec-validator ]; postPatch = '' - substituteInPlace setup.py \ - --replace "tests_require = dev_require," "tests_require = None," \ - --replace "chardet~=4.0" "" \ - --replace "semver~=2.13" "" substituteInPlace setup.cfg \ - --replace "--cov-fail-under=90" "" + --replace "--cov=prance --cov-report=term-missing --cov-fail-under=90" "" ''; # Disable tests that require network diff --git a/nixpkgs/pkgs/development/python-modules/preshed/default.nix b/nixpkgs/pkgs/development/python-modules/preshed/default.nix index 4fc1adfbf018..a945dcf8f4e7 100644 --- a/nixpkgs/pkgs/development/python-modules/preshed/default.nix +++ b/nixpkgs/pkgs/development/python-modules/preshed/default.nix @@ -17,9 +17,9 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - cython - cymem - murmurhash + cython + cymem + murmurhash ]; checkInputs = [ @@ -34,6 +34,6 @@ buildPythonPackage rec { description = "Cython hash tables that assume keys are pre-hashed"; homepage = "https://github.com/explosion/preshed"; license = licenses.mit; - maintainers = with maintainers; [ sdll ]; - }; + maintainers = with maintainers; [ ]; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/prettytable/default.nix b/nixpkgs/pkgs/development/python-modules/prettytable/default.nix index 23702f8e8cfb..5b3253b31b39 100644 --- a/nixpkgs/pkgs/development/python-modules/prettytable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/prettytable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "prettytable"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "5882ed9092b391bb8f6e91f59bcdbd748924ff556bb7c634089d5519be87baa0"; + sha256 = "bd81678c108e6c73d4f1e47cd4283de301faaa6ff6220bcd1d4022038c56b416"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/priority/deadline.patch b/nixpkgs/pkgs/development/python-modules/priority/deadline.patch deleted file mode 100644 index f028953c28ab..000000000000 --- a/nixpkgs/pkgs/development/python-modules/priority/deadline.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9d933c3c6535c1c63291e3d35f4ada9135d422df Mon Sep 17 00:00:00 2001 -From: Alyssa Ross <hi@alyssa.is> -Date: Mon, 11 Mar 2019 02:08:43 +0000 -Subject: [PATCH] Allow test_period_of_repetition to be slow - -Recent versions of hypothesis default to a 200ms timeout, which wasn't -enough for my Thinkpad X220 to run this test. I've increased the timeout -for this single test to hopefully a reasonable amount for older -hardware. - -(cherry picked from commit 752beb3a32b59f54168816da531c9d2a387f9715) ---- - test/test_priority.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/test/test_priority.py b/test/test_priority.py -index c98a28d..013ce30 100644 ---- a/test/test_priority.py -+++ b/test/test_priority.py -@@ -12,7 +12,7 @@ import itertools - - import pytest - --from hypothesis import given -+from hypothesis import given, settings - from hypothesis.strategies import ( - integers, lists, tuples, sampled_from - ) -@@ -489,6 +489,7 @@ class TestPriorityTreeOutput(object): - fairness and equidistribution. - """ - @given(STREAMS_AND_WEIGHTS) -+ @settings(deadline=None) - def test_period_of_repetition(self, streams_and_weights): - """ - The period of repetition of a priority sequence is given by the sum of --- -2.19.2 - diff --git a/nixpkgs/pkgs/development/python-modules/priority/default.nix b/nixpkgs/pkgs/development/python-modules/priority/default.nix index a699f6ff812f..16908e90c9e6 100644 --- a/nixpkgs/pkgs/development/python-modules/priority/default.nix +++ b/nixpkgs/pkgs/development/python-modules/priority/default.nix @@ -1,28 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi, pytest, hypothesis }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, hypothesis +, pytestCheckHook +}: buildPythonPackage rec { pname = "priority"; - version = "1.3.0"; + version = "2.0.0"; + format = "setuptools"; + disabled = pythonOlder "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "1gpzn9k9zgks0iw5wdmad9b4dry8haiz2sbp6gycpjkzdld9dhbb"; + sha256 = "c965d54f1b8d0d0b19479db3924c7c36cf672dbf2aec92d43fbdaf4492ba18c0"; }; - patches = [ - # https://github.com/python-hyper/priority/pull/135 - ./deadline.patch + pythonImportsCheck = [ + "priority" ]; - checkInputs = [ pytest hypothesis ]; - checkPhase = '' - PYTHONPATH="src:$PYTHONPATH" pytest - ''; + checkInputs = [ + hypothesis + pytestCheckHook + ]; meta = with lib; { - homepage = "https://python-hyper.org/priority/"; description = "A pure-Python implementation of the HTTP/2 priority tree"; + homepage = "https://github.com/python-hyper/priority/"; license = licenses.mit; - maintainers = [ maintainers.qyliss ]; + maintainers = with maintainers; [ qyliss ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix b/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix index 60844bdc9e6f..972c0f0bb754 100644 --- a/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/progressbar2/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "progressbar2"; - version = "3.53.2"; + version = "3.53.3"; src = fetchPypi { inherit pname version; - sha256 = "8c150baaa33448c1e34a2cafa5108285d96f2c877bdf64fcbd77f26cb135435d"; + sha256 = "f4e1c2d48e608850c59f793d6e74ccdebbcbaac7ffe917d45e9646ec0d664d6d"; }; propagatedBuildInputs = [ python-utils ]; diff --git a/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix b/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix index 92810ec6a5fb..a642d6ba10d1 100644 --- a/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.9.17"; + version = "1.9.18"; src = fetchPypi { inherit pname version; - sha256 = "d01e11581442dfcc1bd73ac3278bdf1f98e9df8f083a11e5989632ff97322b65"; + sha256 = "d7e510790512f0bb8150c508531c8681c3d9d0ea63b3ba9b11bbf0952cbd69a8"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ptpython/default.nix b/nixpkgs/pkgs/development/python-modules/ptpython/default.nix index f6befe1bd622..cfe65a24ece3 100644 --- a/nixpkgs/pkgs/development/python-modules/ptpython/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ptpython/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "ptpython"; - version = "3.0.19"; + version = "3.0.20"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b3d41ce7c2ce0e7e55051347eae400fc56b9b42b1c4a9db25b19ccf6195bfc12"; + sha256 = "eafd4ced27ca5dc370881d4358d1ab5041b32d88d31af8e3c24167fe4af64ed6"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pudb/default.nix b/nixpkgs/pkgs/development/python-modules/pudb/default.nix index af653f260cd3..6df85ca5f089 100644 --- a/nixpkgs/pkgs/development/python-modules/pudb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pudb/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pudb"; - version = "2020.1"; + version = "2021.1"; src = fetchPypi { inherit pname version; - sha256 = "2ef23d3371439f13fffbe7f8b9fc180a19d4183dc9cab204d878d7c7766464bf"; + sha256 = "309ee82b45a0ffca0bc4c7f521fd3e357589c764f339bdf9dcabb7ad40692d6e"; }; propagatedBuildInputs = [ pygments urwid ]; diff --git a/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix b/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix index d67ddba02b9c..d3150b453a63 100644 --- a/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -8,23 +8,18 @@ , prometheus-client , py-air-control , pytestCheckHook -, setuptools-scm }: buildPythonPackage rec { pname = "py-air-control-exporter"; - version = "0.3.0"; + version = "0.3.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ece2e446273542e5c0352c9d6e80d8279132c6ada3649c59e87a711448801a3b"; + sha256 = "0cwhcyyjzc6wlj7jp5h7fcj1hl03wzrz1if3sg205kh2hfrzzlqq"; }; - nativeBuildInputs = [ - setuptools-scm - ]; - propagatedBuildInputs = [ click flask @@ -36,19 +31,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "pytest-runner" "" - substituteInPlace setup.cfg \ - --replace "--cov=py_air_control_exporter" "" - ''; - - disabledTests = [ - # Tests are outdated - "test_help" - "test_unknown_protocol" - ]; - pythonImportsCheck = [ "py_air_control_exporter" ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) py-air-control; }; diff --git a/nixpkgs/pkgs/development/python-modules/py3status/default.nix b/nixpkgs/pkgs/development/python-modules/py3status/default.nix index c8d5068e4e73..e027aaeb294b 100644 --- a/nixpkgs/pkgs/development/python-modules/py3status/default.nix +++ b/nixpkgs/pkgs/development/python-modules/py3status/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.38"; + version = "3.39"; src = fetchPypi { inherit pname version; - sha256 = "5660163a91590f320685263a738ab910c7a86346d9c85a68639a19ab83433ce6"; + sha256 = "d2a11dde0cc82d0eb5e938fe624f223d852ed848c57299ff562827bc4557375f"; }; doCheck = false; diff --git a/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 58d1d0c694a7..e0ff93697395 100644 --- a/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "3.8.3"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "afdd887fff42a963f13d09a1f4f5fd24aef08f4b8a594f2ac11e0a29022f1518"; + sha256 = "c84218af7e08e859e07cfe5645d9586ceaad51c24f0f4529a9ed0adafd5aa0bf"; }; propagatedBuildInputs = [ requests ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyads/default.nix b/nixpkgs/pkgs/development/python-modules/pyads/default.nix index 5b710b0da156..232221365fa4 100644 --- a/nixpkgs/pkgs/development/python-modules/pyads/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyads/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyads"; - version = "3.3.7"; + version = "3.3.8"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "stlehmann"; repo = pname; rev = version; - sha256 = "sha256-h3c6z+dmrOc1Q7E8YVJZJD2FsxoxqQX5J92SEweIpto="; + sha256 = "sha256-jhEVBndUOKM8rBX0LEqPTMLqbpizCiD7T+OCzbVgLM8="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pybids/default.nix b/nixpkgs/pkgs/development/python-modules/pybids/default.nix index 97187abd7591..daa879a58a0d 100644 --- a/nixpkgs/pkgs/development/python-modules/pybids/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pybids/default.nix @@ -14,12 +14,12 @@ }: buildPythonPackage rec { - version = "0.13.1"; + version = "0.13.2"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ySDhVX4drotnFiXXDK+9woQ3uigistudpMJYenYl47o="; + sha256 = "9692013af3b86b096b5423b88179c6c9b604baff5a6b6f89ba5f40429feb7a3e"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pybind11/default.nix b/nixpkgs/pkgs/development/python-modules/pybind11/default.nix index 3f825a06cd3c..e6be3f063fef 100644 --- a/nixpkgs/pkgs/development/python-modules/pybind11/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pybind11/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pybind11"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "pybind"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iEXoNTsfsDq79bKV7A4aOCHr11rT/cqnyLghEtGsaks="; + sha256 = "13nq16pxz4vck7jn936ymhm0y0q82hd7kkw0ip7k85cx7wywzbql"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/development/python-modules/pybullet/default.nix b/nixpkgs/pkgs/development/python-modules/pybullet/default.nix index 4d97b535606f..3a5d68f37e4a 100644 --- a/nixpkgs/pkgs/development/python-modules/pybullet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pybullet/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pybullet"; - version = "3.1.8"; + version = "3.1.9"; src = fetchPypi { inherit pname version; - sha256 = "a7e6c7c77cab39e1559c98e4290c5138247b15d3a26a76a23b2737c159f3f905"; + sha256 = "6fb4d48d5ba9c09cdd1ed732e8a1d48b41bca379e072268af3831774d8391300"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix b/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix index 6c97b3e3f440..e01c5e181981 100644 --- a/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "9.2.0"; + version = "9.2.1"; src = fetchPypi { inherit pname version; - sha256 = "6d34593575cf77565df47af4c75dd47c6a65831ec18a8c10b5367b2f1c172f0a"; + sha256 = "sha256-iD1ug2/18QaKi9ADZKFbTJhUKTCGSV6f2crNm01UwL8="; }; disabled = !isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix b/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix index fb0852e2bf11..07fe662f6ec0 100644 --- a/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "82"; + version = "83"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Kane610"; repo = "deconz"; rev = "v${version}"; - sha256 = "sha256-DdZ6bf+2rMjgjm5aRxcSRI/hN0zfP7uV8PaM40c9IJo="; + sha256 = "0azpdgmfby8plsp22hy1ip9vzbnmvf9brmah7hcwkpypg31rb61y"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix b/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix index c179688a8a5b..317691066f47 100644 --- a/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyfaidx"; - version = "0.6.1"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "fae5d2264f62f40e6f37090422a764197de610df36afb5ae827b167d34b8621a"; + sha256 = "d1258f8d053cba0c90fe329254e8ec59eb28b535b48d9d06e8c7f1d74b8e4531"; }; propagatedBuildInputs = [ six ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix b/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix index ab4c2f360760..217e552aa0e1 100644 --- a/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "4.5.0"; + version = "4.5.1"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "58b017b3437bbe97803a23755876c6d6aeb5aea37e52cec15e5d86b59c4c7295"; + sha256 = "002a065dcbf59c2caa039e4fc4ba01d1d636aa63ee9c794d4c9fc01f0e2d6dc0"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pyfronius/default.nix b/nixpkgs/pkgs/development/python-modules/pyfronius/default.nix index 682ae2ff620b..c6a68401342d 100644 --- a/nixpkgs/pkgs/development/python-modules/pyfronius/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyfronius/default.nix @@ -8,14 +8,15 @@ buildPythonPackage rec { pname = "pyfronius"; - version = "0.6.3"; + version = "0.7.0"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "nielstron"; repo = pname; rev = "release-${version}"; - sha256 = "19cgr0y4zfyghpw9hwl9immh5c464dlasnfd8q570k9f0q682249"; + sha256 = "1jp9vsllvzfnrkzmln2sp1ggr4pwaj47744n2ijz1wsf8v38nw2j"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyglet/default.nix b/nixpkgs/pkgs/development/python-modules/pyglet/default.nix index 66129553b736..7addcf531426 100644 --- a/nixpkgs/pkgs/development/python-modules/pyglet/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyglet/default.nix @@ -18,13 +18,13 @@ }: buildPythonPackage rec { - version = "1.5.20"; + version = "1.5.21"; pname = "pyglet"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "ce76ce598ac910fbae6aae0db00aac21d19d62bdc8c616ed6e6a6a395dc44513"; + sha256 = "5aaaddb06dc4b6f9ba08254d8d806a2bd2406925a9caf3a51fdffbd5d09728e2"; extension = "zip"; }; diff --git a/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix b/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix index 5dce573eaebb..89df38b80c50 100644 --- a/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyiqvia/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , aiohttp , aresponses +, backoff , fetchFromGitHub , poetry-core , pytest-aiohttp @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "pyiqvia"; - version = "1.0.1"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "18qzxxn9xw9rwv3qz8k3zxh9xxy8c7rs8xlsrdrcq9wb0dhd7p0r"; + sha256 = "sha256-uDcBpPHh+wQHI2vGjnumwVGt5ZOreVq+L3kOam97uW4="; }; nativeBuildInputs = [ @@ -30,6 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + backoff ]; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pykka/default.nix b/nixpkgs/pkgs/development/python-modules/pykka/default.nix index 075b607c772e..dfd84fe066d0 100644 --- a/nixpkgs/pkgs/development/python-modules/pykka/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pykka/default.nix @@ -1,21 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pytest-mock }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pytest-mock +}: buildPythonPackage rec { - pname = "Pykka"; - version = "2.0.3"; + pname = "pykka"; + version = "3.0.1"; + format = "pyproject"; + disabled = pythonOlder "3.6.1"; - src = fetchPypi { - inherit pname version; - sha256 = "4b9d2363365b3455a0204bf163f09bd351d24b938c618c79d975a9510e128e95"; + src = fetchFromGitHub { + owner = "jodal"; + repo = pname; + rev = "v${version}"; + sha256 = "1h3brgm8y4a9s991y0drkp0vvmxix9f2b49f9w6ibhkhr37gc0lh"; }; - checkInputs = [ pytestCheckHook pytest-mock ]; + nativeBuildInputs = [ + poetry-core + ]; + + checkInputs = [ + pytestCheckHook + pytest-mock + ]; meta = with lib; { homepage = "https://www.pykka.org/"; description = "A Python implementation of the actor model"; changelog = "https://github.com/jodal/pykka/blob/v${version}/docs/changes.rst"; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; license = licenses.asl20; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pykodi/default.nix b/nixpkgs/pkgs/development/python-modules/pykodi/default.nix index a0ca9a4c5737..d754a44ffd38 100644 --- a/nixpkgs/pkgs/development/python-modules/pykodi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pykodi/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pykodi"; - version = "0.2.5"; + version = "0.2.6"; src = fetchPypi { inherit pname version; - sha256 = "1al2q4jiqxjnz0j2xvs2hqzrz6fm3hmda5zjnkp8gdvgchd1cmn7"; + sha256 = "sha256-SDp2S9HeqejRM3cf4x+5RLUQMPhjieQaXoubwf9Q/d4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pylint/default.nix b/nixpkgs/pkgs/development/python-modules/pylint/default.nix index ef42bd43239a..2e4953ec7b9b 100644 --- a/nixpkgs/pkgs/development/python-modules/pylint/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylint/default.nix @@ -1,12 +1,13 @@ { stdenv , lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder , installShellFiles , astroid , isort , mccabe +, platformdirs , toml , pytest-benchmark , pytest-xdist @@ -15,13 +16,15 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.7.4"; + version = "2.10.2"; disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "bd38914c7731cdc518634a8d3c5585951302b6e2b6de60fbb3f7a0220e21eeee"; + src = fetchFromGitHub { + owner = "PyCQA"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-hkrkgUdC5LO1oSPFL6gvIk0zFpMw45gCmnoRbdPZuRs="; }; nativeBuildInputs = [ @@ -32,6 +35,7 @@ buildPythonPackage rec { astroid isort mccabe + platformdirs toml ]; @@ -58,6 +62,12 @@ buildPythonPackage rec { "-n auto" ]; + disabledTestPaths = [ + # tests miss multiple input files + # FileNotFoundError: [Errno 2] No such file or directory + "tests/pyreverse/test_writer.py" + ]; + disabledTests = lib.optionals stdenv.isDarwin [ "test_parallel_execution" "test_py3k_jobs_option" diff --git a/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix b/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix index 08924d515732..ac4531328fcf 100644 --- a/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2021.8.0"; + version = "2021.9.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "natekspencer"; repo = pname; rev = version; - sha256 = "sha256-Z7/j5ZZd8cOJhY/GfKUcDSJZvmU/TR/KDK60j1eYsik="; + sha256 = "sha256-S25x9k6vBwnmJq15y5PVUWaTujT9UNHvgIX9uH+N8dY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix b/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix index 364514b6b5d0..56e436e96d2c 100644 --- a/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2022.0.11"; + version = "2022.0.12"; src = fetchPypi { inherit pname version; - sha256 = "901d00105142c9added48275188e289e91b3098251ec107aef90acaef3ea6d0d"; + sha256 = "bad712c883a12d774a8a58c35abc5d582c5e5eafdbb5351dc06ebe98c28bd135"; }; nativeBuildInputs = [ glibcLocales ]; diff --git a/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix b/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix index 894e5c128e9e..5de1776d8244 100644 --- a/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.15"; + version = "2.4.16"; src = fetchPypi { inherit pname version; - sha256 = "106va20k0ahy0l2qvxf8k5pvqkgdmxbgzd9kij9fkrahlba5mx3v"; + sha256 = "99b77fdc1389dea7c9dbbfb70143fed707238e00c961ada73b79bcf15b21ca19"; }; propagatedBuildInputs = [ future lxml ]; diff --git a/nixpkgs/pkgs/development/python-modules/pymc3/default.nix b/nixpkgs/pkgs/development/python-modules/pymc3/default.nix index e322bb14f7ba..095f3baf97ae 100644 --- a/nixpkgs/pkgs/development/python-modules/pymc3/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymc3/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "pymc3"; - version = "3.11.2"; + version = "3.11.4"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "d3b93c8923ae8c8107c5adfd22f7c37fa0849a00a9723e0e0a0ca6afb582d6c3"; + sha256 = "3b88d1e6c85f7fb8a9b99d6f136ac860672170370ec4146338fdd160c3b3fd3f"; }; # No need for coverage stats in Nix builds diff --git a/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix b/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix index b96c5f8d15da..40dae5c6997b 100644 --- a/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "2.5.2"; + version = "2.5.3rc1"; src = fetchFromGitHub { owner = "riptideio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jqVfBAjIdRBB5AYd0ZkMi7qAUR6vSYeBI4OYEv+mKwE="; + sha256 = "sha256-jynljjTipN/Yx97RSWikcotxCqosNWSDH7GdwcSIiRU="; }; # Twisted asynchronous version is not supported due to a missing dependency diff --git a/nixpkgs/pkgs/development/python-modules/pymongo/default.nix b/nixpkgs/pkgs/development/python-modules/pymongo/default.nix index b81edaac6688..0d18175d7e6d 100644 --- a/nixpkgs/pkgs/development/python-modules/pymongo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymongo/default.nix @@ -1,20 +1,28 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "pymongo"; - version = "3.11.4"; + version = "3.12.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "539d4cb1b16b57026999c53e5aab857fe706e70ae5310cc8c232479923f932e6"; + sha256 = "sha256-uI0XQhWbyToHhzP5eJ9WPO8m9eNw66gQR2pxqpjl+8I="; }; # Tests call a running mongodb instance doCheck = false; + pythonImportsCheck = [ "pymongo" ]; + meta = with lib; { + description = "Python driver for MongoDB"; homepage = "https://github.com/mongodb/mongo-python-driver"; license = licenses.asl20; - description = "Python driver for MongoDB"; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pymyq/default.nix b/nixpkgs/pkgs/development/python-modules/pymyq/default.nix index 04a8b596e844..5f151aa46e23 100644 --- a/nixpkgs/pkgs/development/python-modules/pymyq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pymyq/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pymyq"; - version = "3.1.3"; + version = "3.1.4"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "arraylabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-V2u2wUSPwiF6o6OWhQVKiHtzhn0/rzyM6e2+a+D7UNA="; + sha256 = "sha256-B8CnyM0nQr8HWnD5toMd8A57j/UtnQ2aWys0netOAtA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pynanoleaf/default.nix b/nixpkgs/pkgs/development/python-modules/pynanoleaf/default.nix index 9bdf4885dd4f..9fab8f7b31c0 100644 --- a/nixpkgs/pkgs/development/python-modules/pynanoleaf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynanoleaf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pynanoleaf"; - version = "0.1.0"; + version = "0.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BiLJgsey7kIIeN5+CKKnrTB2bSKMNEbeMLwGi2LRLcg="; + sha256 = "32a083759c4f99e019e0013670487841f8edf807c7a07742a971fa18707072a7"; }; disabled = !isPy3k; diff --git a/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix b/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix index fa9db26b5e39..7256749f8dec 100644 --- a/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pynndescent/default.nix @@ -1,43 +1,40 @@ { lib , buildPythonPackage , fetchPypi -, nose +, joblib +, llvmlite +, numba , scikit-learn , scipy -, numba -, llvmlite -, joblib +, pytestCheckHook }: buildPythonPackage rec { pname = "pynndescent"; - version = "0.5.2"; + version = "0.5.4"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "0w87c2v0li2rdbx6qfc2lb6y6bxpdy3jwfgzfs1kcr4d1chj5zfr"; + sha256 = "221124cbad8e3cf3ed421a4089d80ac5a29d3215e76cb49effc1df887533d2a8"; }; propagatedBuildInputs = [ + joblib + llvmlite + numba scikit-learn scipy - numba - llvmlite - joblib ]; checkInputs = [ - nose + pytestCheckHook ]; - checkPhase = '' - nosetests - ''; - meta = with lib; { description = "Nearest Neighbor Descent"; homepage = "https://github.com/lmcinnes/pynndescent"; license = licenses.bsd2; - maintainers = [ maintainers.mic92 ]; + maintainers = with maintainers; [ mic92 ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyocr/default.nix b/nixpkgs/pkgs/development/python-modules/pyocr/default.nix index 099c9e237111..df20d3bb6c47 100644 --- a/nixpkgs/pkgs/development/python-modules/pyocr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyocr/default.nix @@ -1,6 +1,16 @@ -{ lib, fetchFromGitLab, buildPythonPackage, pillow, setuptools-scm, -setuptools-scm-git-archive , tesseract, cuneiform, isPy3k, substituteAll, -pytest, tox }: +{ lib +, fetchFromGitLab +, buildPythonPackage +, pillow +, setuptools-scm +, setuptools-scm-git-archive +, tesseract +, cuneiform +, isPy3k +, substituteAll +, pytestCheckHook +, tox +}: buildPythonPackage rec { pname = "pyocr"; @@ -17,20 +27,25 @@ buildPythonPackage rec { sha256 = "09ab86bmizpv94w3mdvdqkjyyvk1vafw3jqhkiw5xx7p180xn3il"; }; - patches = [ (substituteAll { - src = ./paths.patch; - inherit cuneiform tesseract; - }) + patches = [ + (substituteAll { + src = ./paths.patch; + inherit cuneiform tesseract; + }) ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + buildInputs = [ setuptools-scm setuptools-scm-git-archive ]; + propagatedBuildInputs = [ pillow ]; - checkInputs = [ pytest tox ]; - checkPhase = "pytest"; - meta = { + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { inherit (src.meta) homepage; description = "A Python wrapper for Tesseract and Cuneiform"; - license = lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix b/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix index 5560f3811fa3..f30f3758f31b 100644 --- a/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyopenuv/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pyopenuv"; - version = "2.1.0"; + version = "2.2.1"; format = "pyproject"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-S2X7cTArjiWOFjQGnrZ4AuhgN8t18wf9d6i9X5thRZg="; + sha256 = "sha256-9hpXVKCpVbUAoTxd5mHP9NK1dZxbrQUxrQrOEVHpaPo="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix b/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix index 6bd360036000..bd6b5d701dda 100644 --- a/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix +++ b/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, lz4 }: +, nose, shapely, pythonOlder, isPyPy, lz4, requests }: buildPythonPackage rec { pname = "pyosmium"; - version = "3.1.3"; + version = "3.2.0"; disabled = pythonOlder "3.4" || isPyPy; @@ -12,11 +12,12 @@ buildPythonPackage rec { owner = "osmcode"; repo = pname; rev = "v${version}"; - sha256 = "11ma8nr7k2ixwwb55fiqvrj5qbmpgkyfk0canz4l0m8b7rcw3qsc"; + sha256 = "0s9h1blz4vrgcvdiikbpi2d4cy69kg2s8ki4dzampm1s0pa92if5"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ libosmium protozero boost expat bzip2 zlib pybind11 lz4 ]; + propagatedBuildInputs = [ requests ]; preBuild = "cd .."; diff --git a/nixpkgs/pkgs/development/python-modules/pyp/default.nix b/nixpkgs/pkgs/development/python-modules/pyp/default.nix new file mode 100644 index 000000000000..4ef79bc90716 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyp/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, coreutils +, pythonOlder +, astunparse +, jq +, bc +}: + +buildPythonPackage rec { + pname = "pyp"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "hauntsaninja"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-K9dGmvy4siurmhqwNfg1dT0TWc6tCSaxfPyaJkYM2Vw="; + }; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ + astunparse + ]; + + preCheck = '' + export PATH=$out/bin:$PATH + ''; + checkInputs = [ + pytestCheckHook + coreutils + jq + bc + ]; + + meta = with lib; { + description = "Easily run Python at the shell! Magical, but never mysterious."; + homepage = "https://github.com/hauntsaninja/pyp"; + license = licenses.mit; + maintainers = with maintainers; [ rmcgibbo ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix b/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix index 3d3af7f4669b..ecb87d951b31 100644 --- a/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "pypandoc"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "NicklasTegner"; repo = pname; - rev = version; - sha256 = "163wkcm06klr68dadr9mb8gblj0ls26w097bjrg4f5j0533ysdpp"; + rev = "v${version}"; + sha256 = "0rssjig3nwdi4qvsjq7v7k8jyv6l9szfl5dp1a8s54c4j4dw37nh"; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyphen/default.nix b/nixpkgs/pkgs/development/python-modules/pyphen/default.nix index 2f573b67838b..74581ba7e33c 100644 --- a/nixpkgs/pkgs/development/python-modules/pyphen/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyphen/default.nix @@ -1,14 +1,26 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: buildPythonPackage rec { - pname = "Pyphen"; - version = "0.10.0"; + pname = "pyphen"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "719b21dfb4b04fbc11cc0f6112418535fe35474021120cccfffc43a25fe63128"; + sha256 = "e2c3ed82c3a04317df5102addafe89652b0876bc6c6265f5dd4c3efaf02315e8"; }; + preCheck = '' + sed -i '/addopts/d' pyproject.toml + ''; + + checkInputs = [ + pytestCheckHook + ]; + meta = with lib; { description = "Pure Python module to hyphenate text"; homepage = "https://github.com/Kozea/Pyphen"; diff --git a/nixpkgs/pkgs/development/python-modules/pyramid/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid/default.nix index 95333f746d0c..da9569b7fb73 100644 --- a/nixpkgs/pkgs/development/python-modules/pyramid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyramid/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "pyramid"; - version = "1.10.8"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "b7cd66595bef92f81764b976ddde2b2fa8e4f5f325e02f65f6ec7f3708b29cf6"; + sha256 = "45431b387587ed0fac6213b54d6e9f0936f0cc85238a8f5af7852fc9484c5c77"; }; checkInputs = [ webtest zope_component ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix b/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix index 47aa1deb5e26..9acffbde4333 100644 --- a/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyramid_mako/default.nix @@ -23,5 +23,8 @@ buildPythonPackage rec { description = "Mako template bindings for the Pyramid web framework"; license = licenses.bsd0; maintainers = with maintainers; []; + # broken on pyramid>=2.0 + # https://github.com/Pylons/pyramid_mako/issues/53 + broken = true; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyro4/default.nix b/nixpkgs/pkgs/development/python-modules/pyro4/default.nix index 3de7afd9668d..ffb8584f9411 100644 --- a/nixpkgs/pkgs/development/python-modules/pyro4/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyro4/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "Pyro4"; - version = "4.80"; + version = "4.81"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "46847ca703de3f483fbd0b2d22622f36eff03e6ef7ec7704d4ecaa3964cb2220"; + sha256 = "e130da06478b813173b959f7013d134865e07fbf58cc5f1a2598f99479cdac5f"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyroma/default.nix b/nixpkgs/pkgs/development/python-modules/pyroma/default.nix index 03eea0b8b5e9..9d2c220c472f 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroma/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroma/default.nix @@ -2,10 +2,10 @@ , buildPythonPackage , fetchFromGitHub , docutils +, python , pygments , setuptools , requests -, pytestCheckHook }: buildPythonPackage rec { @@ -26,16 +26,11 @@ buildPythonPackage rec { requests ]; - checkInputs = [ - pytestCheckHook - ]; - - pytestFlagsArray = [ "pyroma/tests.py" ]; - - disabledTests = [ - # PyPI tests require network access - "PyPITest" - ]; + # https://github.com/regebro/pyroma/blob/3.2/Makefile#L23 + # PyPITest requires network access + checkPhase = '' + ${python.interpreter} -m unittest -k 'not PyPITest' pyroma.tests + ''; pythonImportsCheck = [ "pyroma" ]; @@ -43,6 +38,6 @@ buildPythonPackage rec { description = "Test your project's packaging friendliness"; homepage = "https://github.com/regebro/pyroma"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ kamadorueda ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pyroute2-core/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2-core/default.nix index b61437134714..fe92d88beaec 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroute2-core/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroute2-core/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-core"; - version = "0.6.4"; + version = "0.6.5"; src = fetchPypi { pname = "pyroute2.core"; inherit version; - sha256 = "1kd5wda7nqcmrwy6b42nqgz570y99yjw3m6a1kxr8ag3859fwga5"; + sha256 = "sha256-Jm10Dq5A+mTdBFQfAH0022ls7PMVTLpb4w+nWmfUOFI="; }; # pyroute2 sub-modules have no tests diff --git a/nixpkgs/pkgs/development/python-modules/pyroute2-ethtool/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2-ethtool/default.nix index 812b71ef756e..6f2695507863 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroute2-ethtool/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroute2-ethtool/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-ethtool"; - version = "0.6.4"; + version = "0.6.5"; src = fetchPypi { pname = "pyroute2.ethtool"; inherit version; - sha256 = "04wxx2nn3rdsjcmck7fidzfdc42gpsjva2jc8p7a987b0j58r17s"; + sha256 = "sha256-yvgBS2dlIRNcR2DXLPWu72q7x/onUhD36VMzBzzHcVo="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyroute2-ipdb/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2-ipdb/default.nix index 0e9c457698bc..7411f49cb52a 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroute2-ipdb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroute2-ipdb/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-ipdb"; - version = "0.6.4"; + version = "0.6.5"; src = fetchPypi { pname = "pyroute2.ipdb"; inherit version; - sha256 = "0r4xq7h39qac309lpl7haaa4rqf6qzsypkgnsiran3w9jgr1hg75"; + sha256 = "sha256-8gKP0QE9iviIFQ0DPuz3U3ZXpL434MzOqYAICZYetXc="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyroute2-ipset/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2-ipset/default.nix index 34a99898e74c..5ab21f8f22c7 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroute2-ipset/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroute2-ipset/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-ipset"; - version = "0.6.4"; + version = "0.6.5"; src = fetchPypi { pname = "pyroute2.ipset"; inherit version; - sha256 = "sha256-V6aUGYv4PGhxHoEjgNuqoRbd6ftqirO/ofNDQEACTy8="; + sha256 = "sha256-rlJ8D5mXSCMKH2iNmit8JXst9tdDafROylMNAHeTt50="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyroute2-ndb/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2-ndb/default.nix index 4dcb6544074a..7caa902dfa7d 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroute2-ndb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroute2-ndb/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-ndb"; - version = "0.6.4"; + version = "0.6.5"; src = fetchPypi { pname = "pyroute2.ndb"; inherit version; - sha256 = "0q3py2n6w7nhdxi4l6vx8xpxh5if6hav4lcl5nwk8c4pgcrfd4vn"; + sha256 = "sha256-pNMJWE6e9seEKvT4MrSPxTRKsiXnDjhLrtG3/iuU2fg="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyroute2-nftables/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2-nftables/default.nix index 9554dd8cbe33..ec5ada77dd2e 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroute2-nftables/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroute2-nftables/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-nftables"; - version = "0.6.4"; + version = "0.6.5"; src = fetchPypi { pname = "pyroute2.nftables"; inherit version; - sha256 = "0mj897h86ifk4ncms71nz6qrrfzfq8hd81198vf1hm41wppgyxn1"; + sha256 = "sha256-sUVaY6PvwFDRCNVQ0cr9AR7d7W6JTZnnvfoC1ZK/bxY="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyroute2-nslink/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2-nslink/default.nix index e5b6fae90246..722ea0a12f9c 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroute2-nslink/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroute2-nslink/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-nslink"; - version = "0.6.4"; + version = "0.6.5"; src = fetchPypi { pname = "pyroute2.nslink"; inherit version; - sha256 = "0iz4vrv05x678ihhl2wdppxda82fxrq3d3sh7mka0pyb66a8mrik"; + sha256 = "sha256-KS5sKDKnNUTBxtW6cn9xF6qEflX4jXjpS31GB7KZmZ4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyroute2-protocols/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2-protocols/default.nix index bce291494a2d..ec3226f0cd98 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroute2-protocols/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroute2-protocols/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pyroute2-protocols"; - version = "0.6.4"; + version = "0.6.5"; src = fetchPypi { pname = "pyroute2.protocols"; inherit version; - sha256 = "0gb5r1msd14fhalfknhmg67l2hm802r4771i1srgl4rix1sk0yw8"; + sha256 = "sha256-lj9Q8ew+44m+Y72miQyuZhzjHmdLqYB+c2FK+ph1d84="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix b/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix index b4e035e89cce..9afea342e6d7 100644 --- a/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyroute2/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.6.4"; + version = "0.6.5"; src = fetchPypi { inherit pname version; - sha256 = "560b48a751b1150056ba553c89a31d563cc18ae2675b3793666adcaeb4fabfda"; + sha256 = "sha256-0JlciuuWwOTu1NYul8nXlQAKGjO3R9bcVDJmZYV88Rw="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix b/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix index 8a6eb47a46c7..75cecc7d7091 100644 --- a/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyrsistent/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pyrsistent"; - version = "0.17.3"; + version = "0.18.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e"; + sha256 = "773c781216f8c2900b42a7b638d5b517bb134ae1acbebe4d1e8f1f41ea60eb4b"; }; propagatedBuildInputs = [ six ]; diff --git a/nixpkgs/pkgs/development/python-modules/pysatochip/default.nix b/nixpkgs/pkgs/development/python-modules/pysatochip/default.nix index f24571a78cf1..a2e726903554 100644 --- a/nixpkgs/pkgs/development/python-modules/pysatochip/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysatochip/default.nix @@ -1,17 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi, pyscard, ecdsa, pyaes -, pythonOlder }: +{ lib +, buildPythonPackage +, fetchPypi +, certifi +, cryptography +, ecdsa +, pyaes +, pyopenssl +, pyscard +, pythonOlder +}: buildPythonPackage rec { pname = "pysatochip"; - version = "0.11.4"; + version = "0.12.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Jj/zZIS9aXmZ2xdi29Eun7iRIrIk9oBlrtN9+6opIMo="; + sha256 = "24db358a65c0402c299c0c62efcfbbfc98e494181cd30d3996949ac667d5b4d4"; }; - propagatedBuildInputs = [ pyscard ecdsa pyaes ]; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "cryptography==3.3.2" "cryptography" \ + --replace "ecdsa==0.15" "ecdsa" \ + --replace "pyopenssl==20.0.0" "pyopenssl" + ''; + + propagatedBuildInputs = [ cryptography ecdsa pyaes pyopenssl pyscard ]; + + checkInputs = [ certifi ]; pythonImportsCheck = [ "pysatochip" ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyscf/default.nix b/nixpkgs/pkgs/development/python-modules/pyscf/default.nix index 0af38e3f8bea..0be40b5dfe7c 100644 --- a/nixpkgs/pkgs/development/python-modules/pyscf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyscf/default.nix @@ -13,6 +13,10 @@ buildPythonPackage rec { sha256 = "0xbwkjxxysfpqz72qn6n4a0zr2h6sprbcal8j7kzymh7swjy117w"; }; + # Backport from the 2.0.0 alpha releases of PySCF. + # H5Py > 3.3 deprecates the file modes, that PySCF sets. + patches = [ ./h5py.patch ]; + buildInputs = [ libcint libxc diff --git a/nixpkgs/pkgs/development/python-modules/pyscf/h5py.patch b/nixpkgs/pkgs/development/python-modules/pyscf/h5py.patch new file mode 100644 index 000000000000..160128633208 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyscf/h5py.patch @@ -0,0 +1,13 @@ +diff --git a/pyscf/lib/misc.py b/pyscf/lib/misc.py +index ed43689ff..a8a0d0e20 100644 +--- a/pyscf/lib/misc.py ++++ b/pyscf/lib/misc.py +@@ -42,8 +42,6 @@ if h5py.version.version[:4] == '2.2.': + sys.stderr.write('h5py-%s is found in your environment. ' + 'h5py-%s has bug in threading mode.\n' + 'Async-IO is disabled.\n' % ((h5py.version.version,)*2)) +-if h5py.version.version[:2] == '3.': +- h5py.get_config().default_file_mode = 'a' + + c_double_p = ctypes.POINTER(ctypes.c_double) + c_int_p = ctypes.POINTER(ctypes.c_int) diff --git a/nixpkgs/pkgs/development/python-modules/pysdcp/default.nix b/nixpkgs/pkgs/development/python-modules/pysdcp/default.nix new file mode 100644 index 000000000000..b6b1798f7ae1 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pysdcp/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pysdcp"; + version = "1"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + pname = "pySDCP"; + inherit version; + sha256 = "07396lsn610izaravqc6j5f6m0wjrzgc0d1r9dwqzj15g5zfc7wm"; + }; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "pysdcp" ]; + + meta = with lib; { + description = "Python library to control SONY projectors"; + homepage = "https://github.com/Galala7/pySDCP"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch b/nixpkgs/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch index db6895edfbf8..37b318ebb7c7 100644 --- a/nixpkgs/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch +++ b/nixpkgs/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch @@ -1,100 +1,127 @@ -diff -ru PySDL2-0.9.7-old/sdl2/dll.py PySDL2-0.9.7/sdl2/dll.py ---- PySDL2-0.9.7-old/sdl2/dll.py 2020-02-15 09:36:29.000000000 +0100 -+++ PySDL2-0.9.7/sdl2/dll.py 2020-09-23 20:24:09.365497270 +0200 -@@ -94,15 +94,16 @@ - """Function wrapper around the different DLL functions. Do not use or - instantiate this one directly from your user code. - """ -- def __init__(self, libinfo, libnames, path=None): -+ def __init__(self, libinfo, libfile): - self._dll = None - self._libname = libinfo - self._version = None -- foundlibs = _findlib(libnames, path) -- dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset") -- if len(foundlibs) == 0: -- raise RuntimeError("could not find any library for %s (%s)" % -- (libinfo, dllmsg)) -+ #foundlibs = _findlib(libnames, path) -+ #dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset") -+ #if len(foundlibs) == 0: -+ # raise RuntimeError("could not find any library for %s (%s)" % -+ # (libinfo, dllmsg)) -+ foundlibs = [ libfile ] - for libfile in foundlibs: - try: - self._dll = CDLL(libfile) -@@ -117,9 +118,9 @@ - if self._dll is None: - raise RuntimeError("found %s, but it's not usable for the library %s" % - (foundlibs, libinfo)) -- if path is not None and sys.platform in ("win32",) and \ -- path in self._libfile: -- os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"]) -+ #if path is not None and sys.platform in ("win32",) and \ -+ # path in self._libfile: -+ # os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"]) - - def bind_function(self, funcname, args=None, returns=None, added=None): - """Binds the passed argument and return value types to the specified -@@ -220,7 +221,7 @@ - return - - try: -- dll = DLL("SDL2", ["SDL2", "SDL2-2.0"], os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2", "@sdl2@") - except RuntimeError as exc: - raise ImportError(exc) - -diff -ru PySDL2-0.9.7-old/sdl2/sdlgfx.py PySDL2-0.9.7/sdl2/sdlgfx.py ---- PySDL2-0.9.7-old/sdl2/sdlgfx.py 2020-02-02 11:07:00.000000000 +0100 -+++ PySDL2-0.9.7/sdl2/sdlgfx.py 2020-09-23 20:23:56.997419129 +0200 -@@ -39,8 +39,7 @@ - ] - - try: -- dll = DLL("SDL2_gfx", ["SDL2_gfx", "SDL2_gfx-1.0"], -- os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2_gfx", "@sdl2_gfx@") - except RuntimeError as exc: - raise ImportError(exc) - -diff -ru PySDL2-0.9.7-old/sdl2/sdlimage.py PySDL2-0.9.7/sdl2/sdlimage.py ---- PySDL2-0.9.7-old/sdl2/sdlimage.py 2020-02-02 11:07:00.000000000 +0100 -+++ PySDL2-0.9.7/sdl2/sdlimage.py 2020-09-23 20:23:50.085375658 +0200 -@@ -27,8 +27,7 @@ - ] - - try: -- dll = DLL("SDL2_image", ["SDL2_image", "SDL2_image-2.0"], -- os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2_image", "@sdl2_image@") - except RuntimeError as exc: - raise ImportError(exc) - -diff -ru PySDL2-0.9.7-old/sdl2/sdlmixer.py PySDL2-0.9.7/sdl2/sdlmixer.py ---- PySDL2-0.9.7-old/sdl2/sdlmixer.py 2020-02-02 11:07:00.000000000 +0100 -+++ PySDL2-0.9.7/sdl2/sdlmixer.py 2020-09-23 20:23:46.117350771 +0200 -@@ -53,8 +53,7 @@ - ] - - try: -- dll = DLL("SDL2_mixer", ["SDL2_mixer", "SDL2_mixer-2.0"], -- os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2_mixer", "@sdl2_mixer@") - except RuntimeError as exc: - raise ImportError(exc) - -diff -ru PySDL2-0.9.7-old/sdl2/sdlttf.py PySDL2-0.9.7/sdl2/sdlttf.py ---- PySDL2-0.9.7-old/sdl2/sdlttf.py 2020-02-02 11:07:00.000000000 +0100 -+++ PySDL2-0.9.7/sdl2/sdlttf.py 2020-09-23 20:23:40.069312931 +0200 -@@ -39,8 +39,7 @@ - ] - - try: -- dll = DLL("SDL2_ttf", ["SDL2_ttf", "SDL2_ttf-2.0"], -- os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2_ttf", "@sdl2_ttf@") - except RuntimeError as exc: - raise ImportError(exc) - +diff --git a/sdl2/dll.py b/sdl2/dll.py +index 6e30259..12e1f7d 100644 +--- a/sdl2/dll.py ++++ b/sdl2/dll.py +@@ -145,7 +145,7 @@ class DLL(object): + """Function wrapper around the different DLL functions. Do not use or + instantiate this one directly from your user code. + """ +- def __init__(self, libinfo, libnames, path=None): ++ def __init__(self, libinfo, libfile): + self._dll = None + self._deps = None + self._libname = libinfo +@@ -157,11 +157,12 @@ class DLL(object): + "SDL2_image": 2001, + "SDL2_gfx": 1003 + } +- foundlibs = _findlib(libnames, path) +- dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset") +- if len(foundlibs) == 0: +- raise RuntimeError("could not find any library for %s (%s)" % +- (libinfo, dllmsg)) ++ #foundlibs = _findlib(libnames, path) ++ #dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset") ++ #if len(foundlibs) == 0: ++ # raise RuntimeError("could not find any library for %s (%s)" % ++ # (libinfo, dllmsg)) ++ foundlibs = [ libfile ] + for libfile in foundlibs: + try: + self._dll = CDLL(libfile) +@@ -185,19 +186,19 @@ class DLL(object): + (foundlibs, libinfo)) + if _using_ms_store_python(): + self._deps = _preload_deps(libinfo, self._libfile) +- if path is not None and sys.platform in ("win32",) and \ +- path in self._libfile: +- os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"]) ++ #if path is not None and sys.platform in ("win32",) and \ ++ # path in self._libfile: ++ # os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"]) + + def bind_function(self, funcname, args=None, returns=None, added=None): + """Binds the passed argument and return value types to the specified + function. If the version of the loaded library is older than the + version where the function was added, an informative exception will + be raised if the bound function is called. + + Args: + funcname (str): The name of the function to bind. + args (List or None, optional): The data types of the C function's + arguments. Should be 'None' if function takes no arguments. + returns (optional): The return type of the bound C function. Should + be 'None' if function returns 'void'. +@@ -288,7 +289,7 @@ def nullfunc(*args): + return + + try: +- dll = DLL("SDL2", ["SDL2", "SDL2-2.0", "SDL2-2.0.0"], os.getenv("PYSDL2_DLL_PATH")) ++ dll = DLL("SDL2", "@sdl2@") + except RuntimeError as exc: + raise ImportError(exc) + +diff --git a/sdl2/sdlgfx.py b/sdl2/sdlgfx.py +index 090752e..a8a7488 100644 +--- a/sdl2/sdlgfx.py ++++ b/sdl2/sdlgfx.py +@@ -50,8 +50,7 @@ __all__ = [ + + + try: +- dll = DLL("SDL2_gfx", ["SDL2_gfx", "SDL2_gfx-1.0"], +- os.getenv("PYSDL2_DLL_PATH")) ++ dll = DLL("SDL2_gfx", "@sdl2_gfx@") + except RuntimeError as exc: + raise ImportError(exc) + +diff --git a/sdl2/sdlimage.py b/sdl2/sdlimage.py +index a6884e8..95d96df 100644 +--- a/sdl2/sdlimage.py ++++ b/sdl2/sdlimage.py +@@ -32,15 +32,14 @@ __all__ = [ + "IMG_LoadXCF_RW", "IMG_LoadWEBP_RW", "IMG_LoadXPM_RW", + "IMG_LoadXV_RW", "IMG_ReadXPMFromArray", + "IMG_GetError", "IMG_SetError", "IMG_SaveJPG", "IMG_SaveJPG_RW", +- ++ + # Python Functions + "get_dll_file" + ] + + + try: +- dll = DLL("SDL2_image", ["SDL2_image", "SDL2_image-2.0"], +- os.getenv("PYSDL2_DLL_PATH")) ++ dll = DLL("SDL2_image", "@sdl2_image@") + except RuntimeError as exc: + raise ImportError(exc) + +diff --git a/sdl2/sdlmixer.py b/sdl2/sdlmixer.py +index 9ad9b85..1c36289 100644 +--- a/sdl2/sdlmixer.py ++++ b/sdl2/sdlmixer.py +@@ -76,8 +76,7 @@ __all__ = [ + ] + + try: +- dll = DLL("SDL2_mixer", ["SDL2_mixer", "SDL2_mixer-2.0"], +- os.getenv("PYSDL2_DLL_PATH")) ++ dll = DLL("SDL2_mixer", "@sdl2_mixer@") + except RuntimeError as exc: + raise ImportError(exc) + +diff --git a/sdl2/sdlttf.py b/sdl2/sdlttf.py +index 9c2d951..bd5a16a 100644 +--- a/sdl2/sdlttf.py ++++ b/sdl2/sdlttf.py +@@ -54,8 +54,7 @@ __all__ = [ + + + try: +- dll = DLL("SDL2_ttf", ["SDL2_ttf", "SDL2_ttf-2.0"], +- os.getenv("PYSDL2_DLL_PATH")) ++ dll = DLL("SDL2_ttf", "@sdl2_ttf@") + except RuntimeError as exc: + raise ImportError(exc) + diff --git a/nixpkgs/pkgs/development/python-modules/pysdl2/default.nix b/nixpkgs/pkgs/development/python-modules/pysdl2/default.nix index be9663245bb5..10515ed7a6e9 100644 --- a/nixpkgs/pkgs/development/python-modules/pysdl2/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysdl2/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "PySDL2"; - version = "0.9.7"; + version = "0.9.9"; # The tests use OpenGL using find_library, which would have to be # patched; also they seem to actually open X windows and test stuff # like "screensaver disabling", which would have to be cleverly @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e4fcc8aa1108e4917cb56794575ee08c2a3d9c2c52620474e3ecc8538dadf209"; + sha256 = "45879ae588038d7cf7cb0289ae47af60722b394d0efa527bf4327103dc4dc918"; }; # Deliberately not in propagated build inputs; users can decide diff --git a/nixpkgs/pkgs/development/python-modules/pysiaalarm/default.nix b/nixpkgs/pkgs/development/python-modules/pysiaalarm/default.nix index 206d24a40dc5..6d59006fab47 100644 --- a/nixpkgs/pkgs/development/python-modules/pysiaalarm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysiaalarm/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pysiaalarm"; - version = "3.0.0"; + version = "3.0.1"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "b1c3a3d48d399bc91014167f59b23af601044d182db9267c23a9cf3559922122"; + sha256 = "sha256-96LSD1jL4Za7HF9vgplImeY57EQ9qa/hOdjQ/PPBq4A="; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/pyspcwebgw/default.nix b/nixpkgs/pkgs/development/python-modules/pyspcwebgw/default.nix new file mode 100644 index 000000000000..8c901f17747a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pyspcwebgw/default.nix @@ -0,0 +1,46 @@ +{ lib +, aiohttp +, aioresponses +, asynccmd +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "pyspcwebgw"; + version = "0.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "mbrrg"; + repo = pname; + rev = "v${version}"; + sha256 = "0pc25myjc2adqcx2lbns9kw0gy17x1qjgicmfj46n6fn0c786p9v"; + }; + + propagatedBuildInputs = [ + asynccmd + aiohttp + ]; + + checkInputs = [ + aioresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyspcwebgw" ]; + + meta = with lib; { + description = "Python module for the SPC Web Gateway REST API"; + homepage = "https://github.com/mbrrg/pyspcwebgw"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/pyspnego/default.nix b/nixpkgs/pkgs/development/python-modules/pyspnego/default.nix index 2f8e775e3404..a1793118d28d 100644 --- a/nixpkgs/pkgs/development/python-modules/pyspnego/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyspnego/default.nix @@ -2,6 +2,9 @@ , buildPythonPackage , cryptography , fetchFromGitHub +, gssapi +, krb5 +, ruamel-yaml , pytest-mock , pytestCheckHook , pythonOlder @@ -10,18 +13,22 @@ buildPythonPackage rec { pname = "pyspnego"; - version = "0.1.6"; - disabled = pythonOlder "3.6"; + version = "0.2.0"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jborean93"; repo = pname; rev = "v${version}"; - sha256 = "0pfh2x0539f0k2qi2pbjm64b2fqp64c63xxpinvg1yfaw915kgpb"; + sha256 = "sha256-puv9aq53NbjSuN561XFou404N9pIxvvMjZMgnNx3SjM="; }; propagatedBuildInputs = [ cryptography + gssapi + krb5 + ruamel-yaml ]; checkInputs = [ @@ -30,6 +37,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # struct.error: unpack requires a buffer of 1 bytes + "test_credssp_invalid_client_authentication" + ]; + LC_ALL = "en_US.UTF-8"; pythonImportsCheck = [ "spnego" ]; diff --git a/nixpkgs/pkgs/development/python-modules/pysyncobj/default.nix b/nixpkgs/pkgs/development/python-modules/pysyncobj/default.nix index 3afdacd18034..13936ba090c2 100644 --- a/nixpkgs/pkgs/development/python-modules/pysyncobj/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pysyncobj/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "pysyncobj"; - version = "0.3.8"; + version = "0.3.10"; src = fetchFromGitHub { owner = "bakwc"; repo = "PySyncObj"; rev = version; - sha256 = "sha256-T7ecy5/1eF0pYaOv74SBEp6V6Z23E2b9lo5Q/gig3Cw="; + sha256 = "sha256-tcoG0KZewPRYPwDSV7aqrAGw3NF4yj/Ukc+I7HHI9+I="; }; # Tests require network features diff --git a/nixpkgs/pkgs/development/python-modules/pytest-cases/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-cases/default.nix index 592a13506936..b8c1ab527220 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-cases/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-cases/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pytest-cases"; - version = "3.6.3"; + version = "3.6.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ExNiaSQGFbx5BB+K+PyW4OPghdpy3SKxhiVFH9okQ7g="; + sha256 = "sha256-m2oxE7q46TWadhZgpwTAHKep5ZN9LG1VNCRJkPz5W1E="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix index 01ec38458c9f..8cd73f483fa8 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -1,40 +1,50 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 -, six +, pythonOlder +, packaging , pytest , pytestCheckHook -, numpy , setuptools-scm }: buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "0.9.0"; - disabled = isPy27; # abandoned upstream + version = "0.10.1"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "6fe747418461d7b202824a3486ba8f4fa17a9bd0b1eddc743ba1d6d87f03391a"; + sha256 = "7e9e0912c206c53cd6ee996265aa99d5c99c9334e37d025ce6114bc0416ffc14"; }; nativeBuildInputs = [ setuptools-scm ]; + buildInputs = [ pytest ]; propagatedBuildInputs = [ - six - numpy + packaging ]; checkInputs = [ pytestCheckHook ]; + disabledTests = [ + # ERROR: usage: __main__.py [options] [file_or_dir] [file_or_dir] [...] + # __main__.py: error: unrecognized arguments: --remote-data + "test_remote_data_url" + "test_remote_data_float_cmp" + "test_remote_data_ignore_whitespace" + "test_remote_data_ellipsis" + "test_remote_data_requires" + "test_remote_data_ignore_warnings" + ]; + meta = with lib; { description = "Pytest plugin with advanced doctest features"; homepage = "https://astropy.org"; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix index 6e7fd37b915e..b0bc07b6c162 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-httpx/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pytest-httpx"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "Colin-b"; repo = "pytest_httpx"; rev = "v${version}"; - sha256 = "sha256-eyR0h0fW5a+L6QslTnM0TPvQCto06aMcKCE+b8LqHcQ="; + sha256 = "0lh7df3ysxmjzvx6242xb6qiwpfxrnj70kjmw5sndvzmy5dfpxfc"; }; buildInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-isort/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-isort/default.nix index fe74f692df5e..e628e6a158c5 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-isort/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-isort/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-isort"; - version = "1.3.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "46a12331a701e2f21d48548b2828c8b0a7956dbf1cd5347163f537deb24332dd"; + sha256 = "821a8c5c9c4f3a3c52cfa9c541fbe89ac9e28728125125af53724c4c3f129117"; }; propagatedBuildInputs = [ isort ]; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix index 0020a4bf433f..734e0e64b31d 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-randomly/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, factory_boy, faker, numpy, backports-entry-points-selectable +, factory_boy, faker, numpy, importlib-metadata , pytestCheckHook, pytest-xdist }: buildPythonPackage rec { pname = "pytest-randomly"; - version = "3.6.0"; + version = "3.10.1"; disabled = pythonOlder "3.6"; @@ -14,11 +14,11 @@ buildPythonPackage rec { repo = pname; owner = "pytest-dev"; rev = version; - sha256 = "17s7gx8b7sl7mp77f5dxzwbb32qliz9awrp6xz58bhjqp7pcsa5h"; + sha256 = "10z7hsr8yd80sf5113i61p0g1c0nqkx7p4xi19v3d133f6vjbh3k"; }; - propagatedBuildInputs = [ - backports-entry-points-selectable + propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ + importlib-metadata ]; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix index 19d031b6a2b1..1030f76050ca 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -4,6 +4,7 @@ , pytest , six , decorator +, pytestCheckHook }: buildPythonPackage rec { @@ -15,22 +16,23 @@ buildPythonPackage rec { sha256 = "e39a7e5b14e14dfff0de0ad720dfffa740c128d599ab14cfac13f4deb34164a6"; }; + # newer decorator versions are incompatible and cause the test suite to fail + # but only a few utility functions are used from this package which means it has no actual impact on test execution in paramiko and Fabric + postPatch = '' + substituteInPlace setup.py \ + --replace "decorator>=4,<5" "decorator>=4" \ + --replace "pytest>=3,<5" "pytest>=3" + ''; + buildInputs = [ pytest ]; - checkInputs = [ pytest ]; propagatedBuildInputs = [ six decorator ]; - patchPhase = '' - sed -i "s/pytest>=3,<5/pytest/g" setup.py - ''; + checkInputs = [ pytestCheckHook ]; - # skip tests due to dir requirements + # lots of assertion errors mainly around decorator doCheck = false; - checkPhase = '' - pytest tests - ''; - meta = with lib; { homepage = "https://pytest-relaxed.readthedocs.io/"; description = "Relaxed test discovery/organization for pytest"; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix index 140994cbf266..e5f8ce159f1f 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-snapshot"; - version = "0.6.1"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "ee8e9af118ff55ed13bf8e8b520714c52665ae44f6228563a600a08d62839b54"; + sha256 = "427b5ab088b25a1c8b63ce99725040664c840ff1f5a3891252723cce972897f9"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix index d7b0b660be98..94f587999773 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "1.1.2"; + version = "1.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "91f4513f7e5a1cf4f1eda25ab7f310497abe30e5f19b612fd80ba7d5f60b58a6"; + sha256 = "2c61ae6185ea7dc07ea0d4db3984be62f1a176a5c16615fd208c5945aa411599"; }; propagatedBuildInputs = [ coverage ]; diff --git a/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix index 0695b49191b4..fcd72ce9b976 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pytest-xprocess"; - version = "0.17.1"; + version = "0.18.1"; src = fetchPypi { inherit pname version; - sha256 = "59c739edee7f3f2258e7c77989241698e356c552f5efb28bb46b478616888bf6"; + sha256 = "fd9f30ed1584b5833bc34494748adf0fb9de3ca7bacc4e88ad71989c21cba266"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/pytest/4.nix b/nixpkgs/pkgs/development/python-modules/pytest/4.nix index c764b55d1f10..fd6d3507afb8 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest/4.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest/4.nix @@ -11,6 +11,11 @@ buildPythonPackage rec { sha256 = "50fa82392f2120cc3ec2ca0a75ee615be4c479e66669789771f1758332be4353"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "pluggy>=0.12,<1.0" "pluggy>=0.12,<2.0" + ''; + checkInputs = [ hypothesis mock ]; buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ] diff --git a/nixpkgs/pkgs/development/python-modules/pytest/5.nix b/nixpkgs/pkgs/development/python-modules/pytest/5.nix index b3e69578d7eb..b38c1a759fe3 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest/5.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest/5.nix @@ -30,6 +30,11 @@ buildPythonPackage rec { sha256 = "1n67lk8iwlsmfdm8663k8l7isllg1xd3n9p1yla7885szhdk6ybr"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "pluggy>=0.12,<1.0" "pluggy>=0.12,<2.0" + ''; + checkInputs = [ hypothesis pygments ]; nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytest/default.nix b/nixpkgs/pkgs/development/python-modules/pytest/default.nix index 19289426d71a..f2438622f6a6 100644 --- a/nixpkgs/pkgs/development/python-modules/pytest/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytest/default.nix @@ -19,14 +19,19 @@ buildPythonPackage rec { pname = "pytest"; - version = "6.2.4"; + version = "6.2.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "50bcad0a0b9c5a72c8e4e7c9855a3ad496ca6a881a3641b4260605450772c54b"; + sha256 = "131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89"; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pluggy>=0.12,<1.0.0a1" "pluggy>=0.23,<2.0" + ''; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-daemon/default.nix b/nixpkgs/pkgs/development/python-modules/python-daemon/default.nix index 246e253e191d..9df9bf8a593b 100644 --- a/nixpkgs/pkgs/development/python-modules/python-daemon/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-daemon/default.nix @@ -1,9 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi , docutils , lockfile , mock , pytest_4 , testscenarios +, testtools , twine }: @@ -16,13 +19,31 @@ buildPythonPackage rec { sha256 = "bda993f1623b1197699716d68d983bb580043cf2b8a66a01274d9b8297b0aeaf"; }; - nativeBuildInputs = [ twine ]; - propagatedBuildInputs = [ docutils lockfile ]; + nativeBuildInputs = [ + twine + ]; + + propagatedBuildInputs = [ + docutils + lockfile + ]; + + checkInputs = [ + pytest_4 + mock + testscenarios + testtools + ]; - checkInputs = [ pytest_4 mock testscenarios ]; + # tests disabled due to incompatibilities with testtools>=2.5.0 checkPhase = '' - pytest -k 'not detaches_process_context \ - and not standard_stream_file_descriptors' + runHook preCheck + pytest -k ' \ + not detaches_process_context and \ + not standard_stream_file_descriptors and \ + not test_module_has_attribute and \ + not test_module_attribute_has_duck_type' + runHook postCheck ''; pythonImportsCheck = [ @@ -35,6 +56,10 @@ buildPythonPackage rec { meta = with lib; { description = "Library to implement a well-behaved Unix daemon process"; homepage = "https://pagure.io/python-daemon/"; - license = [ licenses.gpl3Plus licenses.asl20 ]; + license = with licenses; [ + gpl3Plus + asl20 + ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix b/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix index 6fbda114d338..22bf7ea7ece4 100644 --- a/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-dotenv/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "python-dotenv"; - version = "0.17.1"; + version = "0.19.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "b1ae5e9643d5ed987fc57cc2583021e38db531946518130777734f9589b3141f"; + sha256 = "f521bc2ac9a8e03c736f62911605c5d83970021e3fa95b37d769e2bbbe9b6172"; }; propagatedBuildInputs = [ click ]; diff --git a/nixpkgs/pkgs/development/python-modules/python-ethtool/default.nix b/nixpkgs/pkgs/development/python-modules/python-ethtool/default.nix index 03c147397068..e758f4a1ef71 100644 --- a/nixpkgs/pkgs/development/python-modules/python-ethtool/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-ethtool/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "python-ethtool"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "fedora-python"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Sp7ssfLZ/1FEKrvX257pKcaureZ5mdpJ7jCEh/ft1l0="; + sha256 = "0arkcfq64a4fl88vjjsx4gd3mhcpa7mpq6sblpkgs4k4m9mccz6i"; }; postPatch = '' diff --git a/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix b/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix index 831ae6e39668..a5c40533c169 100644 --- a/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-gitlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "2.10.0"; + version = "2.10.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-N2s+mCOBzsc0RxxQKz2ixueFio300DyZNJnmp1k5UOY="; + sha256 = "7afa7d7c062fa62c173190452265a30feefb844428efc58ea5244f3b9fc0d40f"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-glanceclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-glanceclient/default.nix new file mode 100644 index 000000000000..754bac51ea68 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-glanceclient/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonApplication +, fetchPypi +, coreutils +, pbr +, prettytable +, keystoneauth1 +, requests +, warlock +, oslo-utils +, oslo-i18n +, wrapt +, pyopenssl +, stestr +, testscenarios +, ddt +, requests-mock +}: + +buildPythonApplication rec { + pname = "python-glanceclient"; + version = "3.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "417b9d814b43e62df4351f26a0d5569b801e9f99f7758bd8c82ef994c3629356"; + }; + + postPatch = '' + substituteInPlace glanceclient/tests/unit/v1/test_shell.py \ + --replace "/bin/echo" "${coreutils}/bin/echo" + ''; + + propagatedBuildInputs = [ + pbr + prettytable + keystoneauth1 + requests + warlock + oslo-utils + oslo-i18n + wrapt + pyopenssl + ]; + + checkInputs = [ + stestr + testscenarios + ddt + requests-mock + ]; + + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "glanceclient" ]; + + meta = with lib; { + description = "Python bindings for the OpenStack Images API"; + homepage = "https://github.com/openstack/python-glanceclient/"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-heatclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-heatclient/default.nix new file mode 100644 index 000000000000..cab28ef016d9 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-heatclient/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildPythonApplication +, fetchPypi +, pbr +, Babel +, cliff +, iso8601 +, osc-lib +, prettytable +, oslo-i18n +, oslo-serialization +, oslo-utils +, keystoneauth1 +, python-swiftclient +, pyyaml +, requests +, six +, stestr +, testscenarios +, requests-mock +}: + +buildPythonApplication rec { + pname = "python-heatclient"; + version = "2.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "b53529eb73f08c384181a580efaa42293cc35e0e1ecc4b0bc14a5c7b202019bb"; + }; + + propagatedBuildInputs = [ + pbr + Babel + cliff + iso8601 + osc-lib + prettytable + oslo-i18n + oslo-serialization + oslo-utils + keystoneauth1 + python-swiftclient + pyyaml + requests + six + ]; + + checkInputs = [ + stestr + testscenarios + requests-mock + ]; + + checkPhase = '' + stestr run -e <(echo " + heatclient.tests.unit.test_common_http.HttpClientTest.test_get_system_ca_file + ") + ''; + + pythonImportsCheck = [ "heatclient" ]; + + meta = with lib; { + description = "A client library for Heat built on the Heat orchestration API"; + homepage = "https://github.com/openstack/python-heatclient"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix b/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix index 861addf81eef..934f15a7a464 100644 --- a/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-hosts/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-hosts"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "5b9749ce807170fb340d044d3f971e1da4dac0ae6af8ce8db00b6758a920a2bc"; + sha256 = "8f827da4a1bf69d4f4f881f7d7ebc8b378967b60924aa4baea2c9d1debedf5fc"; }; # win_inet_pton is required for windows support diff --git a/nixpkgs/pkgs/development/python-modules/python-http-client/default.nix b/nixpkgs/pkgs/development/python-modules/python-http-client/default.nix index 8eece2ed4fee..b69c478ef27d 100644 --- a/nixpkgs/pkgs/development/python-modules/python-http-client/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-http-client/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "python_http_client"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = "sendgrid"; repo = "python-http-client"; rev = version; - sha256 = "0z7nvfq9wdcprwh88xn9p3vm15gb3ijdc8pxn0a133ini9hxxlpx"; + sha256 = "sha256-cZqyu67xP0UIKYbhYYTNL5kLiPjjMjayde75sqkHZhg="; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-ironicclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-ironicclient/default.nix new file mode 100644 index 000000000000..a09a65a2b4d0 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-ironicclient/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonApplication +, fetchPypi +, pbr +, appdirs +, cliff +, dogpile_cache +, jsonschema +, keystoneauth1 +, openstacksdk +, osc-lib +, oslo-utils +, pyyaml +, requests +, stevedore +, stestr +, requests-mock +, oslotest +}: + +buildPythonApplication rec { + pname = "python-ironicclient"; + version = "4.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "b55516a72b995f92fb434619cbc1e2effa604c7fcaa6ac4afb8f5af1ea8193a4"; + }; + + propagatedBuildInputs = [ + pbr + appdirs + cliff + dogpile_cache + jsonschema + keystoneauth1 + openstacksdk + osc-lib + oslo-utils + pyyaml + requests + stevedore + ]; + + checkInputs = [ + stestr + requests-mock + oslotest + ]; + + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "ironicclient" ]; + + meta = with lib; { + description = "A client for OpenStack bare metal provisioning API, includes a Python module (ironicclient) and CLI (baremetal)."; + homepage = "https://github.com/openstack/python-ironicclient"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-keystoneclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-keystoneclient/default.nix index d91a3a9d3139..8bf7ac5619a4 100644 --- a/nixpkgs/pkgs/development/python-modules/python-keystoneclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-keystoneclient/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "python-keystoneclient"; - version = "4.2.0"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - sha256 = "12jsiw82x2zcn8sf78xisf85kr28gl3jqj46a0wxx59v91p44j02"; + sha256 = "fd09b7790ce53c20dc94318ec4d76e1cf71908aed59baeb4c7a61c17afd3aad5"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix b/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix index 8a9fca2c5d0f..7d2bdf6c9929 100644 --- a/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix @@ -45,6 +45,12 @@ buildPythonPackage rec { sha256 = "sha256-RuZfCvYeO4mthZrg06UhwPp57qvuUI1yYyne5nzIHhE="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ + --replace "--cov pylsp --cov test" "" + ''; + propagatedBuildInputs = [ jedi pluggy @@ -52,14 +58,14 @@ buildPythonPackage rec { setuptools ujson ] ++ lib.optional withAutopep8 autopep8 - ++ lib.optional withFlake8 flake8 - ++ lib.optional withMccabe mccabe - ++ lib.optional withPycodestyle pycodestyle - ++ lib.optional withPydocstyle pydocstyle - ++ lib.optional withPyflakes pyflakes - ++ lib.optional withPylint pylint - ++ lib.optional withRope rope - ++ lib.optional withYapf yapf; + ++ lib.optional withFlake8 flake8 + ++ lib.optional withMccabe mccabe + ++ lib.optional withPycodestyle pycodestyle + ++ lib.optional withPydocstyle pydocstyle + ++ lib.optional withPyflakes pyflakes + ++ lib.optional withPylint pylint + ++ lib.optional withRope rope + ++ lib.optional withYapf yapf; checkInputs = [ flaky @@ -70,7 +76,10 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config"; + disabledTests = [ + # pytlint output changed + "test_lint_free_pylint" + ] ++ lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config"; disabledTestPaths = lib.optional (!withAutopep8) "test/plugins/test_autopep8_format.py" ++ lib.optional (!withRope) "test/plugins/test_completion.py" @@ -83,12 +92,6 @@ buildPythonPackage rec { ++ lib.optional (!withRope) "test/plugins/test_rope_rename.py" ++ lib.optional (!withYapf) "test/plugins/test_yapf_format.py"; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ - --replace "--cov pylsp --cov test" "" - ''; - preCheck = '' export HOME=$(mktemp -d); ''; diff --git a/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix new file mode 100644 index 000000000000..5ffe1a1ea730 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonApplication +, fetchPypi +, pbr +, oslo-config +, oslo-log +, oslo-serialization +, oslo-utils +, prettytable +, requests +, simplejson +, Babel +, osc-lib +, python-keystoneclient +, debtcollector +, callPackage +}: + +buildPythonApplication rec { + pname = "python-manilaclient"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "2d90af35c5beccc53fa6b0f5a3c4b330a065e86924c33c42b017f18943ab2b05"; + }; + + propagatedBuildInputs = [ + pbr + oslo-config + oslo-log + oslo-serialization + oslo-utils + prettytable + requests + simplejson + Babel + osc-lib + python-keystoneclient + debtcollector + ]; + + # Checks moved to 'passthru.tests' to workaround infinite recursion + doCheck = false; + + passthru.tests = { + tests = callPackage ./tests.nix { }; + }; + + pythonImportsCheck = [ "manilaclient" ]; + + meta = with lib; { + description = "Client library for OpenStack Manila API"; + homepage = "https://github.com/openstack/python-manilaclient"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-manilaclient/tests.nix b/nixpkgs/pkgs/development/python-modules/python-manilaclient/tests.nix new file mode 100644 index 000000000000..61615456225a --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-manilaclient/tests.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage +, python-manilaclient +, stestr +, ddt +, tempest +, mock +, python-openstackclient +}: + +buildPythonPackage rec { + pname = "python-manilaclient-tests"; + inherit (python-manilaclient) version; + + src = python-manilaclient.src; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + python-manilaclient + stestr + ddt + tempest + mock + python-openstackclient + ]; + + checkPhase = '' + stestr run + ''; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-osc/default.nix b/nixpkgs/pkgs/development/python-modules/python-osc/default.nix new file mode 100644 index 000000000000..5f060fd9b9e4 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-osc/default.nix @@ -0,0 +1,23 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "python-osc"; + version = "1.7.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "4c7d68a7719d9425ab2a4ee9a2b9d5a9f5b66593fb46e20e38f91e1452bea2d2"; + }; + + pythonImportsCheck = [ "pythonosc" ]; + + meta = with lib; { + description = "Open Sound Control server and client in pure python"; + homepage = "https://github.com/attwad/python-osc"; + license = licenses.unlicense; + maintainers = with maintainers; [ anirrudh ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix b/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix index 63dc4018b27d..a939caf49703 100644 --- a/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-rapidjson/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "1.0"; + version = "1.4"; pname = "python-rapidjson"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "a61fa61e41b0b85ba9e78444242fddcb3be724de1df79314e6b4766b66e4e11c"; + sha256 = "018c20d3983cccfdc9cfed64407d4ba861ef3d64fe324a486f7130431afdefa7"; }; LC_ALL="en_US.utf-8"; diff --git a/nixpkgs/pkgs/development/python-modules/python-sql/default.nix b/nixpkgs/pkgs/development/python-modules/python-sql/default.nix index a07941e5de4a..a32dcfa5f003 100644 --- a/nixpkgs/pkgs/development/python-modules/python-sql/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-sql/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-sql"; - version = "1.2.2"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "2d916357a0172c35eccac29064cd18cd41616fc60109a37dac0e9d11a0b1183a"; + sha256 = "9d603a6273f2f5966bab7ce77e1f50e88818d5237ac85e566e2dc84ebfabd176"; }; meta = { diff --git a/nixpkgs/pkgs/development/python-modules/python-status/default.nix b/nixpkgs/pkgs/development/python-modules/python-status/default.nix new file mode 100644 index 000000000000..2633d93c312f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python-status/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "python-status"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0lryrvmi04g7d38ilm4wfw717m0ddhylrzb5cm59lrp3ai3q572f"; + }; + + # Project doesn't ship tests yet + doCheck = false; + + pythonImportsCheck = [ "status" ]; + + meta = with lib; { + description = "HTTP Status for Humans"; + homepage = "https://github.com/avinassh/status/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix b/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix index b932d5c51e4c..aebc5d75988c 100644 --- a/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix +++ b/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix @@ -1,4 +1,12 @@ -{ lib, buildPythonApplication, fetchPypi, requests, six, pbr, setuptools }: +{ lib +, buildPythonApplication +, fetchPypi +, mock +, openstacksdk +, pbr +, python-keystoneclient +, stestr +}: buildPythonApplication rec { pname = "python-swiftclient"; @@ -9,26 +17,24 @@ buildPythonApplication rec { sha256 = "sha256-MTtEShTQ+bYoy/PoxS8sQnFlj56KM9QiKFHC5PD3t6A="; }; - nativeBuildInputs = [ pbr ]; + propagatedBuildInputs = [ pbr python-keystoneclient ]; - propagatedBuildInputs = [ requests six setuptools ]; + checkInputs = [ + mock + openstacksdk + stestr + ]; - # For the tests the following requirements are needed: - # https://github.com/openstack/python-swiftclient/blob/master/test-requirements.txt - # - # The ones missing in nixpkgs (currently) are: - # - hacking - # - keystoneauth - # - oslosphinx - # - stestr - # - reno - # - openstackdocstheme - doCheck = false; + checkPhase = '' + stestr run + ''; + + pythonImportsCheck = [ "swiftclient" ]; meta = with lib; { homepage = "https://github.com/openstack/python-swiftclient"; description = "Python bindings to the OpenStack Object Storage API"; license = licenses.asl20; - maintainers = with maintainers; [ c0deaddict SuperSandro2000 ]; + maintainers = teams.openstack.members; }; } diff --git a/nixpkgs/pkgs/development/python-modules/python3-application/default.nix b/nixpkgs/pkgs/development/python-modules/python3-application/default.nix new file mode 100644 index 000000000000..cddb354a5db2 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python3-application/default.nix @@ -0,0 +1,47 @@ +{ lib, isPy3k, buildPythonPackage, fetchFromGitHub, fetchpatch, zope_interface, twisted }: + +buildPythonPackage rec { + pname = "python3-application"; + version = "3.0.3"; + + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "AGProjects"; + repo = pname; + rev = version; + sha256 = "sha256-oscUI/Ag/UXmAi/LN1pPTdyqQe9aAfeQzhKFxaTmW3A="; + }; + + patches = [ + # Apply bugfix commit that is not yet part of a release + (fetchpatch { + name = "fix-time-import.patch"; + url = "https://github.com/AGProjects/${pname}/commit/695f7d769e69c84e065872ffb403157d0af282fd.patch"; + sha256 = "sha256-MGs8uUIFXkPXStOn5oCNNEMVmcKrq8YPl8Xvl3OTOUM="; + }) + ]; + + propagatedBuildInputs = [ zope_interface twisted ]; + + pythonImportsCheck = [ "application" ]; + + meta = with lib; { + description = "A collection of modules that are useful when building python applications"; + homepage = "https://github.com/AGProjects/python3-application"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ chanley ]; + longDescription = '' + This package is a collection of modules that are useful when building python applications. Their purpose is to eliminate the need to divert resources into implementing the small tasks that every application needs to do in order to run successfully and focus instead on the application logic itself. + The modules that the application package provides are: + 1. process - UNIX process and signal management. + 2. python - python utility classes and functions. + 3. configuration - a simple interface to handle configuration files. + 4. log - an extensible system logger for console and syslog. + 5. debug - memory troubleshooting and execution timing. + 6. system - interaction with the underlying operating system. + 7. notification - an application wide notification system. + 8. version - manage version numbers for applications and packages. + ''; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python3-eventlib/default.nix b/nixpkgs/pkgs/development/python-modules/python3-eventlib/default.nix new file mode 100644 index 000000000000..3c2413ff5943 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python3-eventlib/default.nix @@ -0,0 +1,34 @@ +{ lib, fetchFromGitHub, buildPythonPackage, isPy3k, zope_interface, twisted, greenlet }: + +buildPythonPackage rec { + pname = "python3-eventlib"; + version = "0.3.0"; + + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "AGProjects"; + repo = "python3-eventlib"; + rev = version; + sha256 = "sha256-LFW3rCGa7A8tk6SjgYgjkLQ+72GE2WN8wG+XkXYTAoQ="; + }; + + propagatedBuildInputs = [ zope_interface twisted greenlet ]; + + dontUseSetuptoolsCheck = true; + + pythonImportsCheck = [ "eventlib" ]; + + meta = with lib; { + description = "A networking library written in Python"; + homepage = "https://github.com/AGProjects/python3-eventlib"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ chanley ]; + longDescription = '' + Eventlib is a networking library written in Python. It achieves high + scalability by using non-blocking I/O while at the same time retaining + high programmer usability by using coroutines to make the non-blocking io + operations appear blocking at the source code level. + ''; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python3-gnutls/default.nix b/nixpkgs/pkgs/development/python-modules/python3-gnutls/default.nix new file mode 100644 index 000000000000..cda828113971 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python3-gnutls/default.nix @@ -0,0 +1,52 @@ +{ lib, fetchFromGitHub, substituteAll, buildPythonPackage, isPy3k, gnutls +, twisted, pyopenssl, service-identity }: + +buildPythonPackage rec { + pname = "python3-gnutls"; + version = "3.1.9"; + + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "AGProjects"; + repo = "python3-gnutls"; + rev = "324b78f7cd3d9fe58c89c7f0b2bf94199bd6a6e5"; # version not tagged + sha256 = "sha256-18T8bAHlNERHobsspUFvSC6ulN55nrFFb5aqNwU8T00="; + }; + + propagatedBuildInputs = [ twisted pyopenssl service-identity ]; + + patches = [ + (substituteAll { + src = ./libgnutls-path.patch; + gnutlslib = "${lib.getLib gnutls}/lib"; + }) + ]; + + pythonImportsCheck = [ "gnutls" ]; + + meta = with lib; { + description = "Python wrapper for the GnuTLS library"; + homepage = "https://github.com/AGProjects/python3-gnutls"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ chanley ]; + longDescription = '' + This package provides a high level object oriented wrapper around libgnutls, + as well as low level bindings to the GnuTLS types and functions via ctypes. + The high level wrapper hides the details of accessing the GnuTLS library via + ctypes behind a set of classes that encapsulate GnuTLS sessions, certificates + and credentials and expose them to python applications using a simple API. + + The package also includes a Twisted interface that has seamless intergration + with Twisted, providing connectTLS and listenTLS methods on the Twisted + reactor once imported (the methods are automatically attached to the reactor + by simply importing the GnuTLS Twisted interface module). + + The high level wrapper is written using the GnuTLS library bindings that are + made available via ctypes. This makes the wrapper very powerful and flexible + as it has direct access to all the GnuTLS internals and is also very easy to + extend without any need to write C code or recompile anything. + + ''; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/python3-gnutls/libgnutls-path.patch b/nixpkgs/pkgs/development/python-modules/python3-gnutls/libgnutls-path.patch new file mode 100644 index 000000000000..ff9b3aa69328 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/python3-gnutls/libgnutls-path.patch @@ -0,0 +1,42 @@ +diff --git a/gnutls/library/__init__.py b/gnutls/library/__init__.py +index c1d898a..b87bd2e 100644 +--- a/gnutls/library/__init__.py ++++ b/gnutls/library/__init__.py +@@ -18,35 +18,19 @@ def _library_locations(abi_version): + system = _get_system_name() + if system == "darwin": + library_names = ["libgnutls.%d.dylib" % abi_version] +- dynamic_loader_env_vars = ["DYLD_LIBRARY_PATH", "LD_LIBRARY_PATH"] +- additional_paths = ["/usr/local/lib", "/opt/local/lib", "/sw/lib"] + elif system == "windows": + library_names = ["libgnutls-%d.dll" % abi_version] +- dynamic_loader_env_vars = ["PATH"] +- additional_paths = ["."] + elif system == "cygwin": + library_names = ["cyggnutls-%d.dll" % abi_version] +- dynamic_loader_env_vars = ["LD_LIBRARY_PATH"] +- additional_paths = ["/usr/bin"] + else: + # Debian uses libgnutls-deb0.so.28, go figure + library_names = [ + "libgnutls.so.%d" % abi_version, + "libgnutls-deb0.so.%d" % abi_version, + ] +- dynamic_loader_env_vars = ["LD_LIBRARY_PATH"] +- additional_paths = ["/usr/local/lib"] + for library_name in library_names: +- for path in ( +- path +- for env_var in dynamic_loader_env_vars +- for path in os.environ.get(env_var, "").split(":") +- if os.path.isdir(path) +- ): +- yield os.path.join(path, library_name) +- yield library_name +- for path in additional_paths: +- yield os.path.join(path, library_name) ++ path = "@gnutlslib@" ++ yield os.path.join(path, library_name) + + + def _load_library(abi_versions): diff --git a/nixpkgs/pkgs/development/python-modules/pythran/default.nix b/nixpkgs/pkgs/development/python-modules/pythran/default.nix index cb25b09dad72..382a01e7b870 100644 --- a/nixpkgs/pkgs/development/python-modules/pythran/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pythran/default.nix @@ -2,6 +2,7 @@ , python , buildPythonPackage , fetchFromGitHub +, openmp , pytest-runner , ply , networkx @@ -34,7 +35,7 @@ in buildPythonPackage rec { # Hardcode path to mp library (substituteAll { src = ./0001-hardcode-path-to-libgomp.patch; - gomp = "${stdenv.cc.cc.lib}/lib/libgomp${stdenv.hostPlatform.extensions.sharedLibrary}"; + gomp = "${if stdenv.cc.isClang then openmp else stdenv.cc.cc.lib}/lib/libgomp${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ]; diff --git a/nixpkgs/pkgs/development/python-modules/pytibber/default.nix b/nixpkgs/pkgs/development/python-modules/pytibber/default.nix index e036197a1eca..1ca78b51e983 100644 --- a/nixpkgs/pkgs/development/python-modules/pytibber/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytibber/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.19.0"; + version = "0.20.0"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = version; - sha256 = "sha256-9xKt6OspdM7zWbVzjtvDPYuGyIW3K6ioASt53LOgdvk="; + sha256 = "sha256-q7DNRCJrt4B/u7QV4MocxmlfEdLmJMP7umv3+PJjIoE="; }; propagatedBuildInputs = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "tibber" ]; meta = with lib; { - description = "A python3 library to communicate with Tibber"; + description = "Python library to communicate with Tibber"; homepage = "https://github.com/Danielhiversen/pyTibber"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; diff --git a/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix b/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix index 593635ab42f8..e9bc58321df5 100644 --- a/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix +++ b/nixpkgs/pkgs/development/python-modules/pytorch/bin.nix @@ -18,7 +18,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "1.9.0"; + version = "1.9.1"; in buildPythonPackage { inherit version; @@ -67,6 +67,6 @@ in buildPythonPackage { changelog = "https://github.com/pytorch/pytorch/releases/tag/v${version}"; license = licenses.unfree; # Includes CUDA and Intel MKL. platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ junjihashimoto ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix b/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix index d6fbde19f0f3..0fbf9ae91287 100644 --- a/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix +++ b/nixpkgs/pkgs/development/python-modules/pytorch/binary-hashes.nix @@ -1,17 +1,26 @@ -version: { - x86_64-linux-37 = { - name = "torch-${version}-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torch-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-GOTC4HpSxd+3V4LNPy3Ig1+IAhm3U+6s/gOkKxD4AJE="; - }; - x86_64-linux-38 = { - name = "torch-${version}-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torch-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-29KiXQJWCRRn92+ZddBq3Q+zYIKavUxB5HL3HafO0gc="; - }; - x86_64-linux-39 = { - name = "torch-${version}-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torch-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-VCLRkELiF8KqlAMLFrP+TaW+m6jupG5+WdQKEQlVli0="; +# Warning: use the same CUDA version as pytorch-bin. +# +# Precompiled wheels can be found at: +# https://download.pytorch.org/whl/torch_stable.html + +# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. + +version : builtins.getAttr version { + "1.9.1" = { + x86_64-linux-37 = { + name = "torch-1.9.1-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu111/torch-1.9.1%2Bcu111-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-qzXbbpLX+ZlRv41oAyQRk3guU0n/6vuNzWw+nOieL6s="; + }; + x86_64-linux-38 = { + name = "torch-1.9.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu111/torch-1.9.1%2Bcu111-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-JUbcqugax08/iN1LKfXq0ohSpejmbKhbT0by7qMGAzw="; + }; + x86_64-linux-39 = { + name = "torch-1.9.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu111/torch-1.9.1%2Bcu111-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-wNLLtR9ZxKkVOTzwbAikM5H83pXyH+aPHVFyfrO4c1M="; + }; }; } diff --git a/nixpkgs/pkgs/development/python-modules/pytorch/prefetch.sh b/nixpkgs/pkgs/development/python-modules/pytorch/prefetch.sh new file mode 100755 index 000000000000..65007f11bf7b --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/pytorch/prefetch.sh @@ -0,0 +1,36 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-prefetch-scripts + +version=$1 + +bucket="https://download.pytorch.org/whl/cu111" + +url_and_key_list=( +"x86_64-linux-37 $bucket/torch-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl torch-${version}-cp37-cp37m-linux_x86_64.whl" +"x86_64-linux-38 $bucket/torch-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl" +"x86_64-linux-39 $bucket/torch-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl" +) + +hashfile=binary-hashes-"$version".nix +rm -f $hashfile +echo " \"$version\" = {" >> $hashfile + +for url_and_key in "${url_and_key_list[@]}"; do + key=$(echo "$url_and_key" | cut -d' ' -f1) + url=$(echo "$url_and_key" | cut -d' ' -f2) + name=$(echo "$url_and_key" | cut -d' ' -f3) + + echo "prefetching ${url}..." + hash=$(nix hash to-sri --type sha256 `nix-prefetch-url "$url" --name "$name"`) + + echo " $key = {" >> $hashfile + echo " name = \"$name\";" >> $hashfile + echo " url = \"$url\";" >> $hashfile + echo " hash = \"$hash\";" >> $hashfile + echo " };" >> $hashfile + + echo +done + +echo " };" >> $hashfile +echo "done." diff --git a/nixpkgs/pkgs/development/python-modules/pytube/default.nix b/nixpkgs/pkgs/development/python-modules/pytube/default.nix index 93ff39360830..bd5b9e374f16 100644 --- a/nixpkgs/pkgs/development/python-modules/pytube/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytube/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pytube"; - version = "10.9.3"; + version = "11.0.1"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "pytube"; repo = "pytube"; rev = "v${version}"; - sha256 = "sha256-x4u68O9dNhDZ+1Q+S4ou6zPqoR2/Yn5lcKgR2kyM/uo="; + sha256 = "04s4hganb6x0dlfyyg9gjah5z0vxd7bxzqwgvd28hqnf0iwc2byb"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix b/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix index 50f5c4559e4e..c9c97ad621f8 100644 --- a/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pyturbojpeg"; - version = "1.5.1"; + version = "1.5.4"; src = fetchPypi { pname = "PyTurboJPEG"; inherit version; - sha256 = "sha256-56FnJpnQzFPlz0v506CrwIHf9uV3R1LibnuEL7RcFCg="; + sha256 = "sha256-KU24J6iU2y8iLyxjJiuh6Zqx+t1PVBrleOf/mWnfA4I="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/pytwitchapi/default.nix b/nixpkgs/pkgs/development/python-modules/pytwitchapi/default.nix index 78cd978bc9ad..943642bfd64c 100644 --- a/nixpkgs/pkgs/development/python-modules/pytwitchapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pytwitchapi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytwitchapi"; - version = "2.3.0"; + version = "2.4.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Teekeks"; repo = "pyTwitchAPI"; rev = "v${version}"; - sha256 = "sha256-ax3FHyyyRfXSWKsoUi8ao5TL2alo0bQP+lWiDaPjf34="; + sha256 = "0fq1ky6nbrb47mlznl3vq8m86lqb6p78fvbcy8x3rm3m5zngxnz7"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix b/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix index 636a05718420..2b7b56a340d1 100644 --- a/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.25.0"; + version = "2.27.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "0mbx5gv6ns896mxzml8q9r9dn5wvnrb7gc5iw49fdwbb0yw9yhyx"; + sha256 = "1j14m4mdvpq740bxz3mhs5k02jfp425xig4yb13drx37p4yyl9zn"; }; checkInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyusb/default.nix b/nixpkgs/pkgs/development/python-modules/pyusb/default.nix index 43ae18741e1d..05fb6b682716 100644 --- a/nixpkgs/pkgs/development/python-modules/pyusb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyusb/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyusb"; - version = "1.1.1"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "7d449ad916ce58aff60b89aae0b65ac130f289c24d6a5b7b317742eccffafc38"; + sha256 = "a4cc7404a203144754164b8b40994e2849fde1cfff06b08492f12fff9d9de7b9"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/pyvera/default.nix b/nixpkgs/pkgs/development/python-modules/pyvera/default.nix index 2439bd468568..70392eda7b1d 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvera/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvera/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvera"; - version = "0.3.13"; + version = "0.3.14"; format = "pyproject"; src = fetchFromGitHub { owner = "pavoni"; repo = pname; rev = version; - sha256 = "0vh82bwgbq93jrwi9q4da534paknpak8hxi4wwlxh3qcvnpy1njv"; + sha256 = "sha256-CuXsyHlRw5zqDrQfMT4BzHsmox8MLRKxFKwR5M0XoEM="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index 4e3200c3fe70..786eb560662c 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.9792"; + version = "9.0.10010"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8AF7dCvQvBDjITRwi40KqMXcgiJpmKcK16ys1ybFIyk="; + sha256 = "sha256-1vAiDXMYiclK5P8QZUBuy6KllcAQm8d7rQpN+CBDVVA="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/nixpkgs/pkgs/development/python-modules/pyvips/default.nix b/nixpkgs/pkgs/development/python-modules/pyvips/default.nix index ea40fc573b63..c3eb750783fd 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvips/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvips/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pyvips"; - version = "2.1.14"; + version = "2.1.15"; src = fetchPypi { inherit pname version; - sha256 = "244e79c625be65237677c79424d4476de6c406805910015d4adbd0186c64a6a2"; + sha256 = "8bca4077dbdc1434dcbc6759407367b6561e3505aa9555b1bc0b45989dcf50b2"; }; nativeBuildInputs = [ pytest-runner pkgconfig pkg-config ]; diff --git a/nixpkgs/pkgs/development/python-modules/pyvolumio/default.nix b/nixpkgs/pkgs/development/python-modules/pyvolumio/default.nix index da3ac35c4622..f4164b884c74 100644 --- a/nixpkgs/pkgs/development/python-modules/pyvolumio/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyvolumio/default.nix @@ -7,20 +7,22 @@ buildPythonPackage rec { pname = "pyvolumio"; - version = "0.1.3"; + version = "0.1.4"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "OnFreund"; repo = "PyVolumio"; rev = "v${version}"; - sha256 = "0x2dzmd9lwnak2iy6v54y24qjq37y3nlfhsvx7hddgv8jj1klvap"; + sha256 = "0c6kcz9x0n9w67h2gncyhq0dw3q17nmzipcgx59pwqnn33jan5nf"; }; propagatedBuildInputs = [ aiohttp ]; # Project has no tests doCheck = false; + pythonImportsCheck = [ "pyvolumio" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix b/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix index 5aca8d6d66c6..816c46204f88 100644 --- a/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "22.1.0"; + version = "22.2.1"; src = fetchPypi { inherit pname version; - sha256 = "7040d6dd85ea65703904d023d7f57fab793d7ffee9ba9e14f3b897f34ff2415d"; + sha256 = "6d18c76676771fd891ca8e0e68da0bbfb88e30129835c0ade748016adb3b6242"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/qtpy/default.nix b/nixpkgs/pkgs/development/python-modules/qtpy/default.nix index 17e1d9dbe83b..7ee51449ed90 100644 --- a/nixpkgs/pkgs/development/python-modules/qtpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/qtpy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtPy"; - version = "1.9.0"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "13cw8l7zrhbdi03k1wl1pg9xdl4ahdfa7yz8gd0f23sxnm22rdrd"; + sha256 = "3d20f010caa3b2c04835d6a2f66f8873b041bdaf7a76085c2a0d7890cdd65ea9"; }; # no concrete propagatedBuildInputs as multiple backends are supposed diff --git a/nixpkgs/pkgs/development/python-modules/quantities/default.nix b/nixpkgs/pkgs/development/python-modules/quantities/default.nix index 233eb8a44b32..28e08eade43d 100644 --- a/nixpkgs/pkgs/development/python-modules/quantities/default.nix +++ b/nixpkgs/pkgs/development/python-modules/quantities/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , numpy -, python +, pytestCheckHook }: buildPythonPackage rec { @@ -14,15 +14,27 @@ buildPythonPackage rec { sha256 = "67546963cb2a519b1a4aa43d132ef754360268e5d551b43dd1716903d99812f0"; }; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ + numpy + ]; - checkPhase = '' - ${python.interpreter} setup.py test -V 1 - ''; + checkInputs = [ + pytestCheckHook + ]; - meta = { - description = "Quantities is designed to handle arithmetic and"; + disabledTests = [ + # Tests don't work with current numpy + # https://github.com/python-quantities/python-quantities/pull/195 + "test_arctan2" + "test_fix" + ]; + + pythonImportsCheck = [ "quantities" ]; + + meta = with lib; { + description = "Quantities is designed to handle arithmetic and conversions of physical quantities"; homepage = "https://python-quantities.readthedocs.io/"; - license = lib.licenses.bsd2; + license = licenses.bsd2; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/queuelib/default.nix b/nixpkgs/pkgs/development/python-modules/queuelib/default.nix index 7534974237a9..cd83914669e5 100644 --- a/nixpkgs/pkgs/development/python-modules/queuelib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/queuelib/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "queuelib"; - version = "1.6.1"; + version = "1.6.2"; src = fetchPypi { inherit pname version; - sha256 = "631d067c9be57e395c382d680d3653ca1452cd29e8da25c5e8d94b5c0c528c31"; + sha256 = "4b207267f2642a8699a1f806045c56eb7ad1a85a10c0e249884580d139c2fcd2"; }; buildInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix b/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix index 3fbb0fb4042c..fb767e5c4685 100644 --- a/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix +++ b/nixpkgs/pkgs/development/python-modules/r2pipe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "r2pipe"; - version = "1.5.3"; + version = "1.6.2"; postPatch = let r2lib = "${lib.getOutput "lib" radare2}/lib"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8f3708195c8a6e91c5753940fd348cd821df1389d23b889b01b3e88acf407485"; + sha256 = "088e1a0778f8021af90b9458c9b706ae3d303a3e6a5064e1ca25d4fd737dc3c7"; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't @@ -38,7 +38,6 @@ buildPythonPackage rec { import r2pipe r2 = r2pipe.open('${coreutils}/bin/ls') r2.cmd('a') - r2.quit() EOF ''; diff --git a/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix b/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix index 9c19f91b20f4..d02c557027f3 100644 --- a/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "1.6.0"; + version = "1.6.2"; disabled = pythonOlder "3.5"; @@ -19,7 +19,7 @@ buildPythonPackage rec { repo = "RapidFuzz"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-dJz6OzzjqWZwzDVJzJVUshK0HDP/Bz5cML0TrwVVcvg="; + sha256 = "sha256-tzjtvM5b9RD+Uqg5wT+FtSgjbAc0IgoDAmUFNpXQ9KA="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/rdflib-jsonld/default.nix b/nixpkgs/pkgs/development/python-modules/rdflib-jsonld/default.nix index 6e038dd33433..9a0b02c329f7 100644 --- a/nixpkgs/pkgs/development/python-modules/rdflib-jsonld/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rdflib-jsonld/default.nix @@ -17,5 +17,7 @@ buildPythonPackage rec { license = licenses.bsdOriginal; description = "rdflib extension adding JSON-LD parser and serializer"; maintainers = [ maintainers.koslambrou ]; + # incomptiable with rdflib 6.0.0, half of the test suite fails with import and atrribute errors + broken = true; }; } diff --git a/nixpkgs/pkgs/development/python-modules/rdflib/default.nix b/nixpkgs/pkgs/development/python-modules/rdflib/default.nix index 261ba794e70a..5b16e2f744e2 100644 --- a/nixpkgs/pkgs/development/python-modules/rdflib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rdflib/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "rdflib"; - version = "5.0.0"; + version = "6.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0mdi7xh4zcr3ngqwlgqdqf0i5bxghwfddyxdng1zwpiqkpa9s53q"; + sha256 = "7ce4d757eb26f4dd43205ec340d8c097f29e5adfe45d6ea20238c731dc679879"; }; propagatedBuildInputs = [isodate html5lib SPARQLWrapper ]; diff --git a/nixpkgs/pkgs/development/python-modules/regex/default.nix b/nixpkgs/pkgs/development/python-modules/regex/default.nix index 0445b02c1f33..92ce64d186db 100644 --- a/nixpkgs/pkgs/development/python-modules/regex/default.nix +++ b/nixpkgs/pkgs/development/python-modules/regex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2021.4.4"; + version = "2021.8.28"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Uro9P5uULEnX5LwQW7KFUcRAZfE5plBiq3kSvvEMmvs="; + sha256 = "f585cbbeecb35f35609edccb95efd95a3e35824cd7752b586503f7e6087303f1"; }; # Sources for different Python releases are located in same folder diff --git a/nixpkgs/pkgs/development/python-modules/renault-api/default.nix b/nixpkgs/pkgs/development/python-modules/renault-api/default.nix new file mode 100644 index 000000000000..9508a86e33b6 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/renault-api/default.nix @@ -0,0 +1,68 @@ +{ lib +, aiohttp +, aioresponses +, buildPythonPackage +, click +, dateparser +, fetchFromGitHub +, fetchpatch +, marshmallow-dataclass +, poetry-core +, pyjwt +, pythonOlder +, pytest-asyncio +, pytestCheckHook +, tabulate +}: + +buildPythonPackage rec { + pname = "renault-api"; + version = "0.1.4"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "hacf-fr"; + repo = pname; + rev = "v${version}"; + sha256 = "049kh63yk0r0falqbl5akcwgzqjrkqqhf9y537rrlzc85ihf28b8"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + click + dateparser + marshmallow-dataclass + pyjwt + tabulate + ]; + + checkInputs = [ + aioresponses + pytest-asyncio + pytestCheckHook + ]; + + patches = [ + # Switch to poetry-core, https://github.com/hacf-fr/renault-api/pull/371 + (fetchpatch { + name = "switch-to-poetry-core.patch"; + url = "https://github.com/hacf-fr/renault-api/commit/5457a612b9ff9f323e8449cbe9dbce465bd65a79.patch"; + sha256 = "0ds9m4j2qpv0nyg9p8dk9klnarl8wckwclddgnii6h47qci362yy"; + }) + ]; + + pythonImportsCheck = [ "renault_api" ]; + + meta = with lib; { + description = "Python library to interact with the Renault API"; + homepage = "https://github.com/hacf-fr/renault-api"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/reportlab/default.nix b/nixpkgs/pkgs/development/python-modules/reportlab/default.nix index c9f2600efe1e..71d4cd7425d1 100644 --- a/nixpkgs/pkgs/development/python-modules/reportlab/default.nix +++ b/nixpkgs/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.5.67"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "0cf2206c73fbca752c8bd39e12bb9ad7f2d01e6fcb2b25b9eaf94ea042fe86c9"; + sha256 = "68f9324000cfc5570b5a59a92306691b5d655078a399f20bc72c2581fe903261"; }; checkInputs = [ glibcLocales ]; diff --git a/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix b/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix index 787e9a6e279c..ca6cb7d23075 100644 --- a/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix +++ b/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix @@ -1,6 +1,8 @@ { lib +, appdirs , attrs , buildPythonPackage +, bson , cattrs , fetchFromGitHub , itsdangerous @@ -18,15 +20,16 @@ buildPythonPackage rec { pname = "requests-cache"; - version = "0.7.4"; - disabled = pythonOlder "3.6"; + version = "0.8.1"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "reclosedev"; repo = "requests-cache"; rev = "v${version}"; - sha256 = "sha256-FndKFdmEsp3TF2W4b7nhARi9ZOutlE43vvzYxiwbL08="; + sha256 = "sha256-HzOcPWmvUhqPtb/7Mnw6wWY7a4CwGRwPgq+7QoHJAc8="; }; nativeBuildInputs = [ @@ -34,7 +37,9 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + appdirs attrs + bson cattrs itsdangerous pyyaml diff --git a/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix b/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix index 9ebfaa77da5c..00277daf8a3e 100644 --- a/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix +++ b/nixpkgs/pkgs/development/python-modules/requests-pkcs12/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "requests-pkcs12"; - version = "1.12"; + version = "1.13"; src = fetchFromGitHub { owner = "m-click"; repo = "requests_pkcs12"; rev = version; - sha256 = "sha256-fMmca3QNr9UBpSHcVf0nHmGmvkW99bnmigHcWj0D2g0="; + sha256 = "0mc9zpa0d9gijf56mxmsxy4qdcm200ixhnm6i3y5xc2yfv9r6xqy"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/requests/default.nix b/nixpkgs/pkgs/development/python-modules/requests/default.nix index 8b5514f63936..f7c2cdbf27ac 100644 --- a/nixpkgs/pkgs/development/python-modules/requests/default.nix +++ b/nixpkgs/pkgs/development/python-modules/requests/default.nix @@ -1,7 +1,10 @@ { lib +, brotli +, brotlicffi , buildPythonPackage , certifi , chardet +, charset-normalizer , fetchPypi , idna , pytest-mock @@ -9,18 +12,23 @@ , pytestCheckHook , urllib3 , isPy27 +, isPy3k +, trustme }: buildPythonPackage rec { pname = "requests"; - version = "2.25.1"; + version = "2.26.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-J5c91KkEpPE7JjoZyGbBO5KjntHJZGVfAl8/jT11uAQ="; + sha256 = "sha256-uKpY+M95P/2HgtPYyxnmbvNverpDU+7IWedGeLAbB6c="; }; - patches = [ ./0001-Prefer-NixOS-Nix-default-CA-bundles-over-certifi.patch ]; + patches = [ + # Use the default NixOS CA bundle from the certifi package + ./0001-Prefer-NixOS-Nix-default-CA-bundles-over-certifi.patch + ]; postPatch = '' # Use latest idna @@ -28,16 +36,24 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + brotlicffi certifi + charset-normalizer chardet idna urllib3 + ] ++ lib.optionals (isPy3k) [ + brotlicffi + charset-normalizer + ] ++ lib.optionals (isPy27) [ + brotli ]; checkInputs = [ pytest-mock pytest-xdist pytestCheckHook + trustme ]; # AttributeError: 'KeywordMapping' object has no attribute 'get' diff --git a/nixpkgs/pkgs/development/python-modules/rich/default.nix b/nixpkgs/pkgs/development/python-modules/rich/default.nix index 323bd8ba8685..6c953a4579ea 100644 --- a/nixpkgs/pkgs/development/python-modules/rich/default.nix +++ b/nixpkgs/pkgs/development/python-modules/rich/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rich"; - version = "10.7.0"; + version = "10.9.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "willmcgugan"; repo = pname; rev = "v${version}"; - sha256 = "1drh08cmcn8dqi0mpfwscz3ljsv2s60kyhxy6iiw5si7rf717j4p"; + sha256 = "0lf2s7n9b31aavwl5xjl3x1pjc756s8pbk0whh5kag80z5v6qc32"; }; nativeBuildInputs = [ poetry-core ]; diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix index f5ab684f746f..b43227c8f539 100644 --- a/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "0.9.1"; + version = "0.9.2"; pname = "robotframework-requests"; src = fetchPypi { inherit pname version; - sha256 = "22ea105846b28ddfc49713c59a363ad636ece5e308476dea59e73e3c9b544755"; + sha256 = "b40f7869312b37975b6705057f73ee335dba8176bb784b607680c57d58c9ef62"; }; buildInputs = [ unittest2 ]; diff --git a/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix index 4d72a2b3b0a1..82a5fd3fed67 100644 --- a/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix +++ b/nixpkgs/pkgs/development/python-modules/robotframework-sshlibrary/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "3.6.0"; + version = "3.7.0"; pname = "robotframework-sshlibrary"; src = fetchPypi { inherit pname version; - sha256 = "169c343f4db71e1969169fa6f383ca7fff549aa8f83bdd3d9cbd03cea928b688"; + sha256 = "55bd5a11bb1fe60a5a83446e6a3e1e81b13fc671e3b660aa55912a263c1f63aa"; }; # unit tests are impure diff --git a/nixpkgs/pkgs/development/python-modules/ruamel_yaml/default.nix b/nixpkgs/pkgs/development/python-modules/ruamel_yaml/default.nix index 863b62c1bcce..efd418e454d4 100644 --- a/nixpkgs/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "ruamel.yaml"; - version = "0.17.9"; + version = "0.17.16"; src = fetchPypi { inherit pname version; - sha256 = "374373b4743aee9f6d9f40bea600fe020a7ac7ae36b838b4a6a93f72b584a14c"; + sha256 = "1a771fc92d3823682b7f0893ad56cb5a5c87c48e62b5399d6f42c8759a583b33"; }; # Tests use relative paths diff --git a/nixpkgs/pkgs/development/python-modules/s3fs/default.nix b/nixpkgs/pkgs/development/python-modules/s3fs/default.nix index 882f9e90e3f2..645a0b3566f9 100644 --- a/nixpkgs/pkgs/development/python-modules/s3fs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/s3fs/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2021.7.0"; + version = "2021.8.1"; src = fetchPypi { inherit pname version; - hash = "sha256-KTKU7I7QhgVhfbRA46UCKaQT3Bbc8yyUj66MvZsCrpY="; + sha256 = "0zwy2fr95s5wzrr2iwbayjh9xh421p6wf0m75szl7rw930v1kb2y"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/s3transfer/0_4.nix b/nixpkgs/pkgs/development/python-modules/s3transfer/0_4.nix new file mode 100644 index 000000000000..8cfd324f00a5 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/s3transfer/0_4.nix @@ -0,0 +1,52 @@ +{ lib +, fetchPypi +, pythonOlder +, buildPythonPackage +, docutils +, mock +, nose +, coverage +, wheel +, unittest2 +, botocore +, futures ? null +}: + +buildPythonPackage rec { + pname = "s3transfer"; + version = "0.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-ywIvSxZVHt67sxo3fT8JYA262nNj2MXbeXbn9Hcy4bI="; + }; + + propagatedBuildInputs = + [ + botocore + ] ++ lib.optional (pythonOlder "3") futures; + + buildInputs = [ + docutils + mock + nose + coverage + wheel + unittest2 + ]; + + checkPhase = '' + pushd s3transfer/tests + nosetests -v unit/ functional/ + popd + ''; + + # version on pypi has no tests/ dir + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/boto/s3transfer"; + license = licenses.asl20; + description = "A library for managing Amazon S3 transfers"; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix b/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix index e41e4165b9cb..9ed50fb9e49e 100644 --- a/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix @@ -14,15 +14,16 @@ buildPythonPackage rec { pname = "s3transfer"; - version = "0.4.2"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ywIvSxZVHt67sxo3fT8JYA262nNj2MXbeXbn9Hcy4bI="; + sha256 = "sha256-UO2CPh3FhorUDI3JIHL3V6oOZToZKEXJSjtnb0pi2kw="; }; propagatedBuildInputs = - [ botocore + [ + botocore ] ++ lib.optional (pythonOlder "3") futures; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix index 2b16b99bea73..23fa728a78a0 100644 --- a/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.54.0"; + version = "2.57.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uLsBHqzpcuTugRXBihdbib64l396m+os39OhP+tLLCM="; + sha256 = "b03b340fe54f91b0533d3ce19d5b7fdf403da21b5befab70a9915466e48f6e75"; }; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/sanic-testing/default.nix b/nixpkgs/pkgs/development/python-modules/sanic-testing/default.nix index b59781e5c459..5e7deb51362e 100644 --- a/nixpkgs/pkgs/development/python-modules/sanic-testing/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sanic-testing/default.nix @@ -19,6 +19,13 @@ buildPythonPackage rec { sha256 = "1pf619cd3dckn3d8gh18vbn7dflvb0mzpf6frx4y950x2j3rdplk"; }; + postPatch = '' + # https://github.com/sanic-org/sanic-testing/issues/19 + substituteInPlace setup.py \ + --replace '"websockets==8.1",' '"websockets>=9.1",' \ + --replace "httpx==0.18.*" "httpx" + ''; + propagatedBuildInputs = [ httpx sanic @@ -30,12 +37,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # https://github.com/sanic-org/sanic-testing/issues/19 - substituteInPlace setup.py \ - --replace '"websockets==8.1",' '"websockets>=9.1",' - ''; - # `sanic` is explicitly set to null when building `sanic` itself # to prevent infinite recursion. In that case we skip running # the package at all. diff --git a/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix b/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix index fa7dabc27293..177032aea7f3 100644 --- a/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix @@ -37,12 +37,12 @@ }: buildPythonPackage rec { pname = "scancode-toolkit"; - version = "21.6.7"; + version = "21.8.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "056923ce556cd6d402e5cc98567cb0331a1b6349d03ec565f8ce1c9c37f3a783"; + sha256 = "c18340067244274c67e166f701c60e747e1d0bccb17efc99f277a4bc0a5a13c6"; }; dontConfigure = true; diff --git a/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix b/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix index 007cca251436..e6342b90bba4 100644 --- a/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix +++ b/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "schema-salad"; - version = "8.1.20210716111910"; + version = "8.1.20210721123742"; src = fetchPypi { inherit pname version; - sha256 = "3f851b385d044c58d359285ba471298b6199478a4978f892a83b15cbfb282f25"; + sha256 = "1549555b9b5656cfc690716f04fb76b9fa002feb278638c446522f030632b450"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/scikit-fuzzy/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-fuzzy/default.nix index 7923565c3f4f..ef921c543e1f 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-fuzzy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-fuzzy/default.nix @@ -12,19 +12,22 @@ buildPythonPackage rec { pname = "scikit-fuzzy"; - version = "unstable-2020-10-03"; + version = "unstable-2021-03-31"; disabled = isPy27; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "eecf303b701e3efacdc9b9066207ef605d4facaa"; - sha256 = "18dl0017iqwc7446hqgabhibgjwdakhmycpis6zpvvkkv4ip5062"; + rev = "92ad3c382ac19707086204ac6cdf6e81353345a7"; + sha256 = "0q89p385nsg3lymlsqm3mw6y45vgrk6w9p30igbm59b7r9mkgdj8"; }; propagatedBuildInputs = [ networkx numpy scipy ]; checkInputs = [ matplotlib nose pytestCheckHook ]; + # test error: "ValueError: could not convert string to float: '2.6.2'" + disabledTestPaths = [ "skfuzzy/control/tests/test_controlsystem.py" ]; + meta = with lib; { homepage = "https://github.com/scikit-fuzzy/scikit-fuzzy"; description = "Fuzzy logic toolkit for scientific Python"; diff --git a/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix index ae982e4d3755..d4e31966da2c 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.7"; + version = "0.4.8"; format = "pyproject"; # fetch from github as we want the data files @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "v${version}"; - sha256 = "0bydqgl7pxmj7nb952p08q64d15d8hbvfdnzkbx9wr71mw7cf3vm"; + sha256 = "0x5p42c9iqwdx15gdvccddlx4a5a8aix7h01345afrlgpnnpqcv4"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix index f7d3fd63b17b..b34d3ff7b8de 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-image/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "scikit-image"; - version = "0.18.1"; + version = "0.18.3"; src = fetchPypi { inherit pname version; - sha256 = "fbb618ca911867bce45574c1639618cdfb5d94e207432b19bc19563d80d2f171"; + sha256 = "ecae99f93f4c5e9b1bf34959f4dc596c41f2f6b2fc407d9d9ddf85aebd3137ca"; }; nativeBuildInputs = [ cython ]; diff --git a/nixpkgs/pkgs/development/python-modules/scikit-learn-extra/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-learn-extra/default.nix new file mode 100644 index 000000000000..a91f4ed74f17 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/scikit-learn-extra/default.nix @@ -0,0 +1,57 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, numpy +, cython +, scipy +, scikit-learn +, matplotlib +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "scikit-learn-extra"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "scikit-learn-contrib"; + repo = pname; + rev = "v${version}"; + sha256 = "09v7a9jdycdrlqq349m1gbn8ppzv1bl5g3l72k6ywsx2xb01qw13"; + }; + + nativeBuildInputs = [ numpy cython ]; + propagatedBuildInputs = [ numpy scipy scikit-learn ]; + checkInputs = [ matplotlib pytestCheckHook ]; + + preCheck = '' + # Remove the package in the build dir, because Python defaults to it and + # ignores the one in Nix store with cythonized modules. + rm -r sklearn_extra + ''; + + pytestFlagsArray = [ "--pyargs sklearn_extra" ]; + disabledTestPaths = [ + "benchmarks" + "examples" + "doc" + ]; + disabledTests = [ + "build" # needs network connection + ]; + + # Check packages with cythonized modules + pythonImportsCheck = [ + "sklearn_extra" + "sklearn_extra.cluster" + "sklearn_extra.robust" + "sklearn_extra.utils" + ]; + + meta = { + description = "A set of tools for scikit-learn"; + homepage = "https://github.com/scikit-learn-contrib/scikit-learn-extra"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ yl3dy ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/scikit-learn/0.20.nix b/nixpkgs/pkgs/development/python-modules/scikit-learn/0.20.nix index 81915e83d2dc..0ed863755897 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-learn/0.20.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-learn/0.20.nix @@ -16,7 +16,8 @@ buildPythonPackage rec { sha256 = "1z3w2c50dwwa297j88pr16pyrjysagsvdj7vrlq40q8777rs7a6z"; }; - buildInputs = [ pillow gfortran glibcLocales ]; + nativeBuildInputs = [ gfortran ]; + buildInputs = [ pillow glibcLocales ]; propagatedBuildInputs = [ numpy scipy numpy.blas ]; checkInputs = [ pytest ]; diff --git a/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix b/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix index 6f4ad1d2bd15..e7ac79b42837 100644 --- a/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix @@ -38,7 +38,6 @@ buildPythonPackage rec { buildInputs = [ pillow - gfortran glibcLocales ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp @@ -46,6 +45,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython + gfortran ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix b/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix index 8921e0061aa6..f8f48793e902 100644 --- a/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "scikits.odes"; - version = "2.6.1"; + version = "2.6.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0kbf2n16h9s35x6pavlx6sff0pqr68i0x0609z92a4vadni32n6b"; + sha256 = "267d8bfa1e18d075d574158053d887562381e88176ebab856516b52b14860983"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/scipy/default.nix b/nixpkgs/pkgs/development/python-modules/scipy/default.nix index 7a9643aa7d24..2e19d2d42042 100644 --- a/nixpkgs/pkgs/development/python-modules/scipy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scipy/default.nix @@ -3,7 +3,9 @@ , fetchPypi , python , buildPythonPackage +, cython , gfortran +, pythran , nose , pytest , pytest-xdist @@ -13,18 +15,21 @@ buildPythonPackage rec { pname = "scipy"; - version = "1.6.3"; + version = "1.7.1"; src = fetchPypi { inherit pname version; - sha256 = "a75b014d3294fce26852a9d04ea27b5671d86736beb34acdfc05859246260707"; + sha256 = "6b47d5fa7ea651054362561a28b1ccc8da9368a39514c1bbf6c0977a1c376764"; }; - checkInputs = [ nose pytest pytest-xdist ]; - nativeBuildInputs = [ gfortran ]; + nativeBuildInputs = [ cython gfortran pythran ]; + buildInputs = [ numpy.blas pybind11 ]; + propagatedBuildInputs = [ numpy ]; + checkInputs = [ nose pytest pytest-xdist ]; + # Remove tests because of broken wrapper prePatch = '' rm scipy/linalg/tests/test_lapack.py @@ -41,7 +46,6 @@ buildPythonPackage rec { ln -s ${numpy.cfg} site.cfg ''; - # disable stackprotector on aarch64-darwin for now # # build error: diff --git a/nixpkgs/pkgs/development/python-modules/scp/default.nix b/nixpkgs/pkgs/development/python-modules/scp/default.nix index cba6ddc0acf6..47276ad305c7 100644 --- a/nixpkgs/pkgs/development/python-modules/scp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scp"; - version = "0.14.0"; + version = "0.14.1"; src = fetchPypi { inherit pname version; - sha256 = "ddbdb3ef8c068aa1fd37a5fa65a122a80673c9fd73fdc5668a4604f99ccf5943"; + sha256 = "b776bd6ce8c8385aa9a025b64a9815b5d798f12d4ef0d712d569503f62aece8b"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/scrapy-deltafetch/default.nix b/nixpkgs/pkgs/development/python-modules/scrapy-deltafetch/default.nix index 006c8ed03023..95091a0be765 100644 --- a/nixpkgs/pkgs/development/python-modules/scrapy-deltafetch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/scrapy-deltafetch/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "scrapy-deltafetch"; - version = "1.2.1"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1m511psddvlapg492ny36l8rzy7z4i39yx6a1agxzfz6s9b83fq8"; + sha256 = "13f7968bd0ffae133e2a1dede215e683b8c95285f046260603a5c3e25f2d57b0"; }; propagatedBuildInputs = [ bsddb3 scrapy ]; diff --git a/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix b/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix index 80933043b3b9..21b3f30e1323 100644 --- a/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix +++ b/nixpkgs/pkgs/development/python-modules/screeninfo/default.nix @@ -1,36 +1,50 @@ -{ lib, buildPythonApplication, fetchPypi, isPy27, isPy36, dataclasses, libX11, libXinerama, libXrandr }: +{ lib +, buildPythonApplication +, dataclasses +, fetchPypi +, libX11 +, libXinerama +, libXrandr +, pytestCheckHook +, pythonOlder +}: buildPythonApplication rec { pname = "screeninfo"; - version = "0.6.7"; - disabled = isPy27; # dataclasses isn't available for python2 + version = "0.7"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1c4bac1ca329da3f68cbc4d2fbc92256aa9bb8ff8583ee3e14f91f0a7baa69cb"; + sha256 = "12a97c3527e3544ac5dbd7c1204283e2653d655cbd15844c990a83b1b13ef500"; }; - # dataclasses is a compatibility shim for python 3.6 ONLY - patchPhase = if isPy36 then "" else '' - substituteInPlace setup.py \ - --replace "\"dataclasses\"," "" - '' + '' - substituteInPlace screeninfo/enumerators/xinerama.py \ - --replace "load_library(\"X11\")" "ctypes.cdll.LoadLibrary(\"${libX11}/lib/libX11.so\")" \ - --replace "load_library(\"Xinerama\")" "ctypes.cdll.LoadLibrary(\"${libXinerama}/lib/libXinerama.so\")" - substituteInPlace screeninfo/enumerators/xrandr.py \ - --replace "load_library(\"X11\")" "ctypes.cdll.LoadLibrary(\"${libX11}/lib/libX11.so\")" \ - --replace "load_library(\"Xrandr\")" "ctypes.cdll.LoadLibrary(\"${libXrandr}/lib/libXrandr.so\")" - ''; + propagatedBuildInputs = lib.optionals (pythonOlder "3.7") [ + dataclasses + ]; + + buildInputs = [ + libX11 + libXinerama + libXrandr + ]; + + checkInputs = [ + pytestCheckHook + ]; - propagatedBuildInputs = lib.optional isPy36 dataclasses; + disabledTestPaths = [ + # We don't have a screen + "screeninfo/test_screeninfo.py" + ]; - buildInputs = [ libX11 libXinerama libXrandr]; + pythonImportsCheck = [ "screeninfo" ]; meta = with lib; { description = "Fetch location and size of physical screens"; homepage = "https://github.com/rr-/screeninfo"; license = licenses.mit; - maintainers = [ maintainers.nickhu ]; + maintainers = with maintainers; [ nickhu ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix b/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix index c8e7a81df1f6..1032f6256bb6 100644 --- a/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "screenlogicpy"; - version = "0.4.2"; + version = "0.4.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "dieselrabbit"; repo = pname; rev = "v${version}"; - sha256 = "158y34d140bh93l143plq53l7n7mcnmqi5mj7hj0j1ljccxpjcnj"; + sha256 = "0v0nbwz0w2m7kzvcl0fh2v2rk5ldsq22siyxq6d401pkpzwih25c"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix b/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix index 5aabcc2d0f10..a9492c3e8fdf 100644 --- a/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.8.1"; + version = "6.8.2"; src = fetchFromGitHub { owner = pname; repo = "sendgrid-python"; rev = version; - sha256 = "sha256-rK/GouOv5RMDsn5NrCEtIz5a9wO6YATlhsRuhFuHaXY="; + sha256 = "sha256-TaewVBWQ6D5TH1TGXlXVBnW7K4HS/cFxJ6bcMv2DB+c="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix index ff58edbeb313..2f8930cd6767 100644 --- a/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix @@ -29,11 +29,11 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.3.1"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "0v72zzghlk6kvjg7fg4c4mfr1kasnwlpjzk1wyqd864nz9293sgb"; + sha256 = "4297555ddc37c7136740e6b547b7d68f5bca0b4832f94ac097e5d531a4c77528"; }; checkInputs = [ blinker botocore chalice django flask tornado bottle rq falcon sqlalchemy werkzeug trytond diff --git a/nixpkgs/pkgs/development/python-modules/service_identity/default.nix b/nixpkgs/pkgs/development/python-modules/service_identity/default.nix index 5465fe7c9942..d7c37e7c433b 100644 --- a/nixpkgs/pkgs/development/python-modules/service_identity/default.nix +++ b/nixpkgs/pkgs/development/python-modules/service_identity/default.nix @@ -1,37 +1,47 @@ { lib +, attrs , buildPythonPackage -, fetchFromGitHub -, pythonOlder , cryptography +, fetchFromGitHub +, idna , ipaddress , pyasn1 , pyasn1-modules -, idna -, attrs -, pytest +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { - pname = "service_identity"; - version = "18.1.0"; + pname = "service-identity"; + version = "21.1.0"; src = fetchFromGitHub { owner = "pyca"; repo = pname; rev = version; - sha256 = "1aw475ksmd4vpl8cwfdcsw2v063nbhnnxpy633sb75iqp9aazhlx"; + sha256 = "sha256-pWc2rU3ULqEukMhd1ySY58lTm3s8f/ayQ7CY4nG24AQ="; }; propagatedBuildInputs = [ - pyasn1 pyasn1-modules idna attrs cryptography - ] ++ lib.optionals (pythonOlder "3.3") [ ipaddress ]; + attrs + cryptography + idna + pyasn1 + pyasn1-modules + ] ++ lib.optionals (pythonOlder "3.3") [ + ipaddress + ]; + + checkInputs = [ + pytestCheckHook + ]; - checkInputs = [ pytest ]; - checkPhase = "py.test"; + pythonImportsCheck = [ "service_identity" ]; meta = with lib; { description = "Service identity verification for pyOpenSSL"; - license = licenses.mit; homepage = "https://service-identity.readthedocs.io"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/setuptools-scm/default.nix b/nixpkgs/pkgs/development/python-modules/setuptools-scm/default.nix index a4cff6d056b0..6713e5e84f4b 100644 --- a/nixpkgs/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/setuptools-scm/default.nix @@ -1,19 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi, toml }: +{ buildPythonPackage +, callPackage +, fetchPypi +, packaging +, tomli +, lib +}: buildPythonPackage rec { - pname = "setuptools_scm"; - version = "6.0.1"; + pname = "setuptools-scm"; + version = "6.3.1"; src = fetchPypi { - inherit pname version; - sha256 = "d1925a69cb07e9b29416a275b9fadb009a23c148ace905b2fb220649a6c18e92"; + pname = "setuptools_scm"; + inherit version; + sha256 = "sha256-D2omORKxN5jAKLmicdka873g5CeECRx5fezMOtOn9ZY="; }; - propagatedBuildInputs = [ toml ]; + propagatedBuildInputs = [ + packaging + tomli + ]; - # Requires pytest, circular dependency + pythonImportsCheck = [ + "setuptools_scm" + ]; + + # check in passhtru.tests.pytest to escape infinite recursion on pytest doCheck = false; - pythonImportsCheck = [ "setuptools_scm" ]; + + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; meta = with lib; { homepage = "https://github.com/pypa/setuptools_scm/"; diff --git a/nixpkgs/pkgs/development/python-modules/setuptools-scm/tests.nix b/nixpkgs/pkgs/development/python-modules/setuptools-scm/tests.nix new file mode 100644 index 000000000000..174b54aca9cd --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/setuptools-scm/tests.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, setuptools-scm +, pytestCheckHook +, git +, mercurial +, pip +, virtualenv +}: + +buildPythonPackage rec { + pname = "setuptools-scm-tests"; + inherit (setuptools-scm) version; + + src = setuptools-scm.src; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + pytestCheckHook + setuptools-scm + pip + virtualenv + git + mercurial + ]; + + disabledTests = [ + # network access + "test_pip_download" + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/simple-rest-client/default.nix b/nixpkgs/pkgs/development/python-modules/simple-rest-client/default.nix new file mode 100644 index 000000000000..b9b1cbe7b058 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/simple-rest-client/default.nix @@ -0,0 +1,55 @@ +{ lib +, asynctest +, buildPythonPackage +, fetchFromGitHub +, httpx +, pytest-asyncio +, pytest-httpserver +, pytestCheckHook +, python-slugify +, python-status +, pythonOlder +}: + +buildPythonPackage rec { + pname = "simple-rest-client"; + version = "1.0.8"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "allisson"; + repo = "python-simple-rest-client"; + rev = version; + sha256 = "12qxhrjhlbyyr1pkvwfkcxbsmyns5b0mfdn42vz310za5x76ldj3"; + }; + + propagatedBuildInputs = [ + httpx + python-slugify + python-status + ]; + + checkInputs = [ + asynctest + pytest-asyncio + pytest-httpserver + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + substituteInPlace pytest.ini \ + --replace " --cov=simple_rest_client --cov-report=term-missing" "" + ''; + + pythonImportsCheck = [ "simple_rest_client" ]; + + meta = with lib; { + description = "Simple REST client for Python"; + homepage = "https://github.com/allisson/python-simple-rest-client"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix b/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix index 592e23578095..ee0d273c1869 100644 --- a/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "simple-salesforce"; - version = "1.11.2"; + version = "1.11.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1xysym0b1qnxck4hbj5d0l5wapwfahmkr280f6iskz2hi5j2j1yb"; + sha256 = "17d6g7zfhlgd2n4mimjarl2x4hl7ww2lb4izidlns1hzqm8igg4y"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/simplejson/default.nix b/nixpkgs/pkgs/development/python-modules/simplejson/default.nix index 0d4d45cce5d6..52e55c71aff0 100644 --- a/nixpkgs/pkgs/development/python-modules/simplejson/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simplejson/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "simplejson"; - version = "3.17.3"; + version = "3.17.5"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ev1vKyxexPvTT+esf9ngUcHu70Brl27P3qbS5fK2HxU="; + sha256 = "1vljsd5bk12gasadkxcddwhmp38fj64x1aqi4frk3frq9lp8h3a1"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/simplekml/default.nix b/nixpkgs/pkgs/development/python-modules/simplekml/default.nix index 42e93d63faee..0d5020c59958 100644 --- a/nixpkgs/pkgs/development/python-modules/simplekml/default.nix +++ b/nixpkgs/pkgs/development/python-modules/simplekml/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "simplekml"; - version = "1.3.5"; + version = "1.3.6"; src = fetchPypi { inherit pname version; - sha256 = "17h48r1dsfz4g9xcxh1xq85h20hiz7qzzymc1gla96bj2wh4wyv5"; + sha256 = "cda687be2754395fcab664e908ebf589facd41e8436d233d2be37a69efb1c536"; }; # no tests are defined in 1.3.5 diff --git a/nixpkgs/pkgs/development/python-modules/singledispatch/default.nix b/nixpkgs/pkgs/development/python-modules/singledispatch/default.nix index 8fa62e835f22..837271b4d57c 100644 --- a/nixpkgs/pkgs/development/python-modules/singledispatch/default.nix +++ b/nixpkgs/pkgs/development/python-modules/singledispatch/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "singledispatch"; - version = "3.6.2"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "d5bb9405a4b8de48e36709238e8b91b4f6f300f81a5132ba2531a9a738eca391"; + sha256 = "c1a4d5c1da310c3fd8fccfb8d4e1cb7df076148fd5d858a819e37fffe44f3092"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix b/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix index d1ea00b7f3e5..f1be3dad3fb1 100644 --- a/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix +++ b/nixpkgs/pkgs/development/python-modules/skytemple-files/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "skytemple-files"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "1gpmgdas7x1zmszs9hlxjb6nk683901cy1kc0gyhz0rzdn5jg3lb"; + sha256 = "04n2g2lbff0fr3mkqma39j6acpbj73dbizz9hw5m15110idc577h"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix b/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix index 6183ee7b0cba..7d2391daad9b 100644 --- a/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.10.0"; + version = "3.11.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "sha256-FOpUO9bXrEOgYGmRmAhHnovzBafu6D2ZSLcgw0+0uzs="; + sha256 = "sha256-jfFNka+PZXXYz6r7gwoxoqK7SX2RRcDNlCSqVG3JPY0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/slowapi/default.nix b/nixpkgs/pkgs/development/python-modules/slowapi/default.nix index 921a191d5fa1..9ae293e455c7 100644 --- a/nixpkgs/pkgs/development/python-modules/slowapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/slowapi/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fastapi , fetchFromGitHub -, fetchpatch , limits , mock , hiro @@ -15,7 +14,7 @@ buildPythonPackage rec { pname = "slowapi"; - version = "0.1.4"; + version = "0.1.5"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +22,7 @@ buildPythonPackage rec { owner = "laurentS"; repo = pname; rev = "v${version}"; - sha256 = "0bnnzgv2wy145sdab54hljwv1b5029ndrr0y9rc2q0mraz8lf8lm"; + sha256 = "1wjnlhjfgil86h6i5yij723ncg18rqdprs1q6i68w4msaspwpxg9"; }; nativeBuildInputs = [ @@ -43,13 +42,10 @@ buildPythonPackage rec { starlette ]; - patches = [ - # Switch to poetry-core, https://github.com/laurentS/slowapi/pull/54 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/laurentS/slowapi/commit/fe165f2d479f4f8e4b7dd9cd88ec0ae847b490c5.patch"; - sha256 = "16vjxdjjiyg8zjrgfyg9q2ym2lmnms2zy5d2cg3ccg51cfl715fi"; - }) + disabledTests = [ + # E AssertionError: Regex pattern 'parameter `request` must be an instance of starlette.requests.Request' does not match 'This portal is not running'. + "test_endpoint_request_param_invalid" + "test_endpoint_response_param_invalid" ]; pythonImportsCheck = [ "slowapi" ]; diff --git a/nixpkgs/pkgs/development/python-modules/smart-meter-texas/default.nix b/nixpkgs/pkgs/development/python-modules/smart-meter-texas/default.nix index f8bd6825673c..a9364ad0d1f2 100644 --- a/nixpkgs/pkgs/development/python-modules/smart-meter-texas/default.nix +++ b/nixpkgs/pkgs/development/python-modules/smart-meter-texas/default.nix @@ -3,13 +3,14 @@ , pythonOlder , fetchFromGitHub , aiohttp +, asn1 , python-dateutil , tenacity }: buildPythonPackage rec { pname = "smart-meter-texas"; - version = "0.4.4"; + version = "0.4.7"; disabled = pythonOlder "3.6"; @@ -17,7 +18,7 @@ buildPythonPackage rec { owner = "grahamwetzler"; repo = "smart-meter-texas"; rev = "v${version}"; - sha256 = "sha256-jewibcsqWnl0OQ2oEEOSOcyyDCIGZiG4EZQfuFUbxK4="; + sha256 = "1hfvv3kpkc7i9mn58bjgvwjj0mi2syr8fv4r8bwbhq5sailma27j"; }; postPatch = '' @@ -27,6 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + asn1 python-dateutil tenacity ]; diff --git a/nixpkgs/pkgs/development/python-modules/smart-open/default.nix b/nixpkgs/pkgs/development/python-modules/smart-open/default.nix index 5e86281642af..bbe8b1b468ee 100644 --- a/nixpkgs/pkgs/development/python-modules/smart-open/default.nix +++ b/nixpkgs/pkgs/development/python-modules/smart-open/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "smart-open"; - version = "5.2.0"; + version = "5.2.1"; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "RaRe-Technologies"; repo = "smart_open"; rev = "v${version}"; - sha256 = "sha256-eC9BYHeACzGp382QBNgLcNMYDkHi0WXyEj/Re9ShXuA="; + sha256 = "13a1qsb4vwrhx45hz4qcl0d7bgv20ai5vsy7cq0q6qbj212nff19"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/smbprotocol/default.nix b/nixpkgs/pkgs/development/python-modules/smbprotocol/default.nix index 93f158508eb6..05825c6c9640 100644 --- a/nixpkgs/pkgs/development/python-modules/smbprotocol/default.nix +++ b/nixpkgs/pkgs/development/python-modules/smbprotocol/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "smbprotocol"; - version = "1.6.2"; + version = "1.7.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "jborean93"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nSWZfhZD++I5hM2ijqft2U95kyEe3h/nrSfiT3sQiKE="; + sha256 = "sha256-4nhgt9/LgoGucNehZkgs4XcneCq+fihWQHtwMbuSp2s="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/snitun/default.nix b/nixpkgs/pkgs/development/python-modules/snitun/default.nix index f09876eadb16..293b8069b58f 100644 --- a/nixpkgs/pkgs/development/python-modules/snitun/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snitun/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "snitun"; - version = "0.27.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "NabuCasa"; repo = pname; rev = version; - sha256 = "sha256-vx9F+Nat69Yadd+YpsnBCstnxCEICFJI14TdG6PvstI="; + sha256 = "sha256-IjdgxX6ed9IWMFaMXIXQWZWoODrZBzXtMAcMOIhPFVQ="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix b/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix index 0b0c961e7d09..e0f6c1b14d19 100644 --- a/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.5.1"; + version = "2.6.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8af2a51ac890d9e0ffe0cd509ba83198076e2564fb8fdc63c6814b773e70b33a"; + sha256 = "dbe6f7d84debd27b117e17fdb280be27695cf6ae54009c49495584d1b7776d1b"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index fd3385e858c5..1433ee1185f4 100644 --- a/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "snowflake-sqlalchemy"; - version = "1.3.1"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "f7c220db11c1abf3df67177fbcf0ea58d33d8531963f2d5df5f09fdac09b912f"; + sha256 = "51d9d923ebbfefe392582f6e3d0faa83f52e5eb6f190607820e055318dd2d2f8"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/snscrape/default.nix b/nixpkgs/pkgs/development/python-modules/snscrape/default.nix index a8f565aa3533..98933759f0bb 100644 --- a/nixpkgs/pkgs/development/python-modules/snscrape/default.nix +++ b/nixpkgs/pkgs/development/python-modules/snscrape/default.nix @@ -1,33 +1,48 @@ { lib +, beautifulsoup4 , buildPythonPackage -, isPy3k -, fetchPypi -, setuptools-scm -, setuptools -, requests +, fetchFromGitHub , lxml -, beautifulsoup4 +, pythonOlder +, pytz +, requests +, setuptools-scm }: buildPythonPackage rec { pname = "snscrape"; - version = "0.3.4"; + version = "unstable-2021-08-30"; - disabled = !isPy3k; + disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - sha256 = "36ba7f95c8bf5202749189f760e591952f19c849379c35ff598aafafe5d0cfef"; + src = fetchFromGitHub { + owner = "JustAnotherArchivist"; + repo = pname; + rev = "c76f1637ce1d7a154af83495b67ead2559cd5715"; + sha256 = "01x4961fxj1p98y6fcyxw5sv8fa87x41fdx9p31is12bdkmqxi6v"; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + lxml + requests + ] ++ lib.optionals (pythonOlder "3.9") [ + pytz + ]; + # There are no tests; make sure the executable works. checkPhase = '' export PATH=$PATH:$out/bin snscrape --help ''; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ setuptools requests lxml beautifulsoup4 ]; + pythonImportsCheck = [ "snscrape" ]; meta = with lib; { homepage = "https://github.com/JustAnotherArchivist/snscrape"; diff --git a/nixpkgs/pkgs/development/python-modules/soco/default.nix b/nixpkgs/pkgs/development/python-modules/soco/default.nix index 2360cc81e39a..624ef4e30fc9 100644 --- a/nixpkgs/pkgs/development/python-modules/soco/default.nix +++ b/nixpkgs/pkgs/development/python-modules/soco/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "soco"; - version = "0.23.3"; + version = "0.24.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; rev = "v${version}"; - sha256 = "sha256-T6gDImH/HfHg8e1YzUYB8zr2GJHRtF6vdYm2cSiXSb0="; + sha256 = "sha256-3VL2JFlukfQdjTP65X40OOsuCUVsY9kuvRKUZ3qEd+s="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sopel/default.nix b/nixpkgs/pkgs/development/python-modules/sopel/default.nix index d4052d8b12c8..ec4947ebfc45 100644 --- a/nixpkgs/pkgs/development/python-modules/sopel/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sopel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "sopel"; - version = "7.1.3"; + version = "7.1.4"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "0f9e673a7eac9dd3619c2e398e58fa2d8117afca5adb550ba07c66e16a90dbdb"; + sha256 = "d778ec2b92866eddf97d0809968bc5f9887cb5a000a518a4b67d8eb999cb775c"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/nixpkgs/pkgs/development/python-modules/spacy/default.nix index 3cabc1d6ba20..376686e0a6e5 100644 --- a/nixpkgs/pkgs/development/python-modules/spacy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spacy/default.nix @@ -78,6 +78,6 @@ buildPythonPackage rec { description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython"; homepage = "https://github.com/explosion/spaCy"; license = licenses.mit; - maintainers = with maintainers; [ sdll ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/spacy/legacy.nix b/nixpkgs/pkgs/development/python-modules/spacy/legacy.nix index f8b011d83ccf..9bb37e9beb18 100644 --- a/nixpkgs/pkgs/development/python-modules/spacy/legacy.nix +++ b/nixpkgs/pkgs/development/python-modules/spacy/legacy.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "spacy-legacy"; - version = "3.0.5"; + version = "3.0.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Uy94rjFllSj622RTzd6UJaQmIniCw4gpeq/X57QcIpA="; + sha256 = "b4725c5c161f0685ab4fce3fc912bc68aefdb7e102ba9848e852bb5842256c2f"; }; # checkInputs = [ pytestCheckHook spacy ]; diff --git a/nixpkgs/pkgs/development/python-modules/sphinx-argparse/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx-argparse/default.nix index 3f1a80c3c97b..bd7197b2bf2b 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinx-argparse/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinx-argparse/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sphinx-argparse"; - version = "0.2.5"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "05wc8f5hb3jsg2vh2jf7jsyan8d4i09ifrz2c8fp6f7x1zw9iav0"; + sha256 = "82151cbd43ccec94a1530155f4ad34f251aaca6a0ffd5516d7fadf952d32dc1e"; }; checkInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sphinx/default.nix b/nixpkgs/pkgs/development/python-modules/sphinx/default.nix index d37ccd3e4489..a04a0585019f 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinx/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch # propagatedBuildInputs , Babel , alabaster @@ -22,7 +23,6 @@ , sphinxcontrib-websupport # check phase , html5lib -, imagemagick , pytestCheckHook , typed-ast }: @@ -39,6 +39,14 @@ buildPythonPackage rec { sha256 = "sha256-0QdgHFX4r40BDHjpi9R40lXqT4n5ZgrIny+w070LZPE="; }; + patches = [ + (fetchpatch { + # Fix tests with pygments 2.10 + url = "https://github.com/sphinx-doc/sphinx/commit/bde6c8d2effc56dc8b9098abee796167f972c306.patch"; + sha256 = "0d0ddhgrrh7z9ix0f3zrc2gjb4d73f6ffm98zl62fzv5l4fd00lr"; + }) + ]; + propagatedBuildInputs = [ Babel alabaster @@ -61,7 +69,6 @@ buildPythonPackage rec { ]; checkInputs = [ - imagemagick html5lib pytestCheckHook ] ++ lib.optionals (pythonOlder "3.8") [ @@ -74,6 +81,10 @@ buildPythonPackage rec { "test_defaults" "test_defaults_json" "test_latex_images" + + # requires imagemagick (increases build closure size), doesn't + # test anything substantial + "test_ext_imgconverter" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix index 484b692f69f8..9f72e6f3d64f 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "1.8.1"; + version = "1.8.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "842c0a8f49c824803f7edee31cb1cabd5001a987553bec7b4681283ec9e47d4a"; + sha256 = "8c4ec5fbedc1e6e8f4692bcc4fcd1abcfb9e8dfca8a4ded60ad811a743c22ccc"; }; propagatedBuildInputs = [ astroid jinja2 pyyaml sphinx unidecode ]; diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix index 8ca631a2b3c9..4efdb2633f28 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "sphinxcontrib-htmlhelp"; - version = "1.0.3"; + version = "2.0.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "e8f5bb7e31b2dbb25b9cc435c8ab7a79787ebf7f906155729338f3156d93659b"; + sha256 = "f5f8bb2d0d629f398bf47d0d69c07bc13b65f75a81ad9e2f71a63d4b7a2f6db2"; }; diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch deleted file mode 100644 index 847a6e076918..000000000000 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/binary-paths.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/sphinxcontrib/tikz.py b/sphinxcontrib/tikz.py -index ee21113..a4f4589 100644 ---- a/sphinxcontrib/tikz.py -+++ b/sphinxcontrib/tikz.py -@@ -242,7 +242,7 @@ def render_tikz(self, node, libs='', stringsubst=False): - tf.write(latex) - tf.close() - -- system([self.builder.config.latex_engine, '--interaction=nonstopmode', -+ system(['@texLive@/bin/pdflatex', '--interaction=nonstopmode', - 'tikz-%s.tex' % shasum], - self.builder) - -@@ -281,7 +281,7 @@ def render_tikz(self, node, libs='', stringsubst=False): - '-sOutputFile=%s' % outfn, '-r' + resolution + 'x' + resolution, - '-f', 'tikz-%s.pdf' % shasum], self.builder) - elif self.builder.config.tikz_proc_suite == "pdf2svg": -- system(['pdf2svg', 'tikz-%s.pdf' % shasum, outfn], self.builder) -+ system(['@pdf2svg@/bin/pdf2svg', 'tikz-%s.pdf' % shasum, outfn], self.builder) - else: - self.builder._tikz_warned = True - raise TikzExtError('Error (tikz extension): Invalid configuration ' diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index 19f386d7d278..cc5412fe42ff 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -9,19 +9,18 @@ buildPythonPackage rec { pname = "sphinxcontrib-tikz"; - version = "0.4.13"; + version = "0.4.14"; src = fetchPypi { inherit pname version; - sha256 = "882e3ccfa202559bf77b90c93ee5eb13ec50cdd7714b3673dc6580dea7236740"; + sha256 = "1614a45c960b80009dd42f96689122c9c0781018a0c5ec5828f4cdc5e35b11ad"; }; - patches = [ - (substituteAll { - src = ./binary-paths.patch; - inherit texLive pdf2svg; - }) - ]; + postPatch = '' + substituteInPlace sphinxcontrib/tikz.py \ + --replace "config.latex_engine" "${texLive}/bin/pdflatex" \ + --replace "system(['pdf2svg'" "system(['${pdf2svg}/bin/pdf2svg'" + ''; propagatedBuildInputs = [ sphinx ]; diff --git a/nixpkgs/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix b/nixpkgs/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix index 21ada23d47f4..75e6dc8a61b2 100644 --- a/nixpkgs/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-httpdomain"; - version = "1.7.0"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "ac40b4fba58c76b073b03931c7b8ead611066a6aebccafb34dc19694f4eb6335"; + sha256 = "2059cfabd0cca8fcc3455cc8ffad92f0915a7d3bb03bfddba078a6a0f35beec5"; }; propagatedBuildInputs = [ sphinx ]; diff --git a/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix b/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix index fa29236563e4..5ce41d8d7575 100644 --- a/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "1.10.3"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "cecb0ca0115a42bab864c199a737c859a8534a510fc7edfa33dc42abcbb5287f"; + sha256 = "6c287207c7855bb581eae66ef8d990407382d5f9caccb1e0cabf909aaaf10c9b"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/spyder/default.nix b/nixpkgs/pkgs/development/python-modules/spyder/default.nix index 5aaf4cb4a757..dbe54d52e3a9 100644 --- a/nixpkgs/pkgs/development/python-modules/spyder/default.nix +++ b/nixpkgs/pkgs/development/python-modules/spyder/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "spyder"; - version = "4.2.5"; + version = "5.1.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "03159003f6ea51458e10000091e65e77888b095dba48e64ca2b36c75a648580c"; + sha256 = "6551acfd6fedfebd1f938ef67d3db415b33540f8377e7de3f4d4a2a11dd1b915"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; diff --git a/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix b/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix index 37e89abf8da9..819f29497246 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlalchemy/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "SQLAlchemy"; - version = "1.4.22"; + version = "1.4.23"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7BvibNzNYNGANZpSfVmA2VmiYmmix7GzJ6HuoMqzftg="; + sha256 = "sha256-dv8kaIH1KAib8ZOFExuWYZe7SUZTmQOW0s4TjipEdYM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix b/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix index 35f7d7c07c98..8f5f7fd619c5 100644 --- a/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix @@ -4,36 +4,38 @@ , pythonOlder , click , click-default-group +, dateutils , sqlite-fts4 , tabulate , pytestCheckHook -, pytest-runner -, black , hypothesis -, sqlite }: buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.9.1"; + version = "3.17"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a08ed62eb269e26ae9c35b9be9cd3d395b0522157e6543128a40cc5302d8aa81"; + sha256 = "77acd202aa568a1f6888c5d8879f306bb3f8acedc82df0df98eb615caa491abb"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner"' "" + ''; + propagatedBuildInputs = [ click click-default-group + dateutils sqlite-fts4 tabulate ]; checkInputs = [ pytestCheckHook - pytest-runner - black hypothesis ]; @@ -43,5 +45,4 @@ buildPythonPackage rec { license = licenses.asl20; maintainers = with maintainers; [ meatcar ]; }; - } diff --git a/nixpkgs/pkgs/development/python-modules/ssdp/default.nix b/nixpkgs/pkgs/development/python-modules/ssdp/default.nix index ac39cffa393e..bd73a6abaead 100644 --- a/nixpkgs/pkgs/development/python-modules/ssdp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ssdp/default.nix @@ -1,31 +1,51 @@ { lib , buildPythonPackage -, fetchPypi -, isPy27 +, fetchFromGitHub , pbr -, pytest -, isPy3k +, pytestCheckHook +, pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "ssdp"; - version = "1.0.1"; - disabled = !isPy3k; + version = "1.1.0"; - src = fetchPypi { - inherit pname version; - sha256 = "0yhjqs9jyvwmba8fi72xfi9k8pxy11wkz4iywayrg71ka3la49bk"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "codingjoe"; + repo = pname; + rev = version; + sha256 = "19d2b5frpq2qkfkpz173wpjk5jwhkjpk75p8q92nm8iv41nrzljy"; }; - buildInputs = [ pbr ]; - checkInputs = [ pytest ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + buildInputs = [ + pbr + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pytest-runner" "" \ + --replace "--cov=ssdp" "" + ''; - # test suite uses new async primitives - doCheck = !isPy27; + pythonImportsCheck = [ "ssdp" ]; meta = with lib; { + description = "Python asyncio library for Simple Service Discovery Protocol (SSDP)"; homepage = "https://github.com/codingjoe/ssdp"; - description = "Python asyncio library for Simple Service Discovery Protocol (SSDP)."; license = licenses.mit; + maintainers = with maintainers; [ fab ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/sseclient-py/default.nix b/nixpkgs/pkgs/development/python-modules/sseclient-py/default.nix index 05c3fc807465..54dfdd9d9498 100644 --- a/nixpkgs/pkgs/development/python-modules/sseclient-py/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sseclient-py/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "sseclient-py"; - version = "1.7"; + version = "1.7.2"; src = fetchFromGitHub { owner = "mpetazzoni"; repo = "sseclient"; rev = "sseclient-py-${version}"; - sha256 = "0iar4w8gryhjzqwy5k95q9gsv6xpmnwxkpz33418nw8hxlp86wfl"; + sha256 = "096spyv50jir81xiwkg9l88ycp1897d3443r6gi1by8nkp4chvix"; }; # based on tox.ini diff --git a/nixpkgs/pkgs/development/python-modules/starlette/default.nix b/nixpkgs/pkgs/development/python-modules/starlette/default.nix index 3079b60564f1..e8c130692125 100644 --- a/nixpkgs/pkgs/development/python-modules/starlette/default.nix +++ b/nixpkgs/pkgs/development/python-modules/starlette/default.nix @@ -4,6 +4,8 @@ , fetchFromGitHub , isPy27 , aiofiles +, anyio +, contextlib2 , graphene , itsdangerous , jinja2 @@ -12,22 +14,24 @@ , requests , aiosqlite , databases -, pytestCheckHook , pytest-asyncio +, pytestCheckHook +, pythonOlder +, trio , typing-extensions , ApplicationServices }: buildPythonPackage rec { pname = "starlette"; - version = "0.14.2"; - disabled = isPy27; + version = "0.16.0"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "0fz28czvwiww693ig9vwdja59xxs7m0yp1df32ms1hzr99666bia"; + sha256 = "sha256-/NYhRRZdi6I7CtLCohAqK4prsSUayOxa6sBKIJhPv+w="; }; postPatch = '' @@ -37,19 +41,27 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiofiles + anyio graphene itsdangerous jinja2 python-multipart pyyaml requests - ] ++ lib.optional stdenv.isDarwin [ ApplicationServices ]; + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + ] ++ lib.optionals (pythonOlder "3.7") [ + contextlib2 + ] ++ lib.optional stdenv.isDarwin [ + ApplicationServices + ]; checkInputs = [ aiosqlite databases pytest-asyncio pytestCheckHook + trio typing-extensions ]; @@ -57,8 +69,12 @@ buildPythonPackage rec { # fails to import graphql, but integrated graphql support is about to # be removed in 0.15, see https://github.com/encode/starlette/pull/1135. "tests/test_graphql.py" - # contextfunction was removed in Jinja 3.1 - "tests/test_templates.py" + ]; + + disabledTests = [ + # asserts fail due to inclusion of br in Accept-Encoding + "test_websocket_headers" + "test_request_headers" ]; pythonImportsCheck = [ "starlette" ]; diff --git a/nixpkgs/pkgs/development/python-modules/stdlib-list/default.nix b/nixpkgs/pkgs/development/python-modules/stdlib-list/default.nix new file mode 100644 index 000000000000..d654d2588066 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/stdlib-list/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchPypi +, python +}: + +buildPythonPackage rec { + pname = "stdlib-list"; + version = "0.8.0"; + format = "setuptools"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "17vdn4q0sdlndc2fr9svapxx6366hnrhkn0fswp1xmr0jxqh7rd1"; + }; + + pythonImportsCheck = [ + "stdlib_list" + ]; + + # tests see mismatches to our standard library + doCheck = false; + + meta = with lib; { + description = "A list of Python Standard Libraries"; + homepage = "https://github.com/jackmaney/python-stdlib-list"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/stestr/default.nix b/nixpkgs/pkgs/development/python-modules/stestr/default.nix index 88259dc718e1..1e5f965a8026 100644 --- a/nixpkgs/pkgs/development/python-modules/stestr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/stestr/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { doCheck = false; passthru.tests = { - pytest = callPackage ./tests.nix { }; + tests = callPackage ./tests.nix { }; }; pythonImportsCheck = [ "stestr" ]; diff --git a/nixpkgs/pkgs/development/python-modules/streamlabswater/default.nix b/nixpkgs/pkgs/development/python-modules/streamlabswater/default.nix new file mode 100644 index 000000000000..fc90ea222c77 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/streamlabswater/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "streamlabswater"; + version = "0.3.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = pname; + repo = "stream-python"; + rev = "v${version}"; + sha256 = "1lh1i1ksic9yhxnwc7mqm5qla98x85dfwj846kwldwam0vcrqlk7"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "streamlabswater" ]; + + meta = with lib; { + description = "Python library for the StreamLabs API"; + homepage = "https://github.com/streamlabswater/stream-python"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/sure/default.nix b/nixpkgs/pkgs/development/python-modules/sure/default.nix index ee21e9c45168..b8bb9a36586a 100644 --- a/nixpkgs/pkgs/development/python-modules/sure/default.nix +++ b/nixpkgs/pkgs/development/python-modules/sure/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "sure"; - version = "1.4.11"; + version = "2.0.0"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "3c8d5271fb18e2c69e2613af1ad400d8df090f1456081635bd3171847303cdaa"; + sha256 = "34ae88c846046742ef074036bf311dc90ab152b7bc09c342b281cebf676727a2"; }; buildInputs = [ rednose ]; diff --git a/nixpkgs/pkgs/development/python-modules/symengine/default.nix b/nixpkgs/pkgs/development/python-modules/symengine/default.nix index c20f2338fa2a..673e2682660b 100644 --- a/nixpkgs/pkgs/development/python-modules/symengine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/symengine/default.nix @@ -11,18 +11,19 @@ buildPythonPackage rec { pname = "symengine"; - version = "0.7.2"; + version = "0.8.1"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine.py"; rev = "v${version}"; - sha256 = "1xaclpvk7m6mbp70zrsvi3blz4v89pbsf7b6rpmx5903m6kxqr4m"; + sha256 = "0yyi3w03fk19i32jmns1baq3rpmf7xfykzkivc7dmnxmjmxvq2gr"; }; postConfigure = '' substituteInPlace setup.py \ - --replace "\"cmake\"" "\"${cmake}/bin/cmake\"" + --replace "\"cmake\"" "\"${cmake}/bin/cmake\"" \ + --replace "'cython>=0.29.24'" "'cython'" substituteInPlace cmake/FindCython.cmake \ --replace "SET(CYTHON_BIN cython" "SET(CYTHON_BIN ${cython}/bin/cython" diff --git a/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix b/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix index 5260a678e8c7..56a3b27e7b96 100644 --- a/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tableaudocumentapi"; - version = "0.6"; + version = "0.7"; src = fetchPypi { inherit pname version; - sha256 = "fc6d44b62cf6ea29916c073686e2f9f35c9902eccd57b8493f8d44a59a2f60d9"; + sha256 = "5b1d04817a0fba43d58e1ce23c64ad8dfe54dc029ba5ccae3908944555bb13e0"; }; # tests not inclued with release diff --git a/nixpkgs/pkgs/development/python-modules/tasklib/default.nix b/nixpkgs/pkgs/development/python-modules/tasklib/default.nix index 591f4cdabe96..8cb2a2f0278d 100644 --- a/nixpkgs/pkgs/development/python-modules/tasklib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tasklib/default.nix @@ -8,11 +8,11 @@ wsl_stub = writeShellScriptBin "wsl" "true"; in buildPythonPackage rec { pname = "tasklib"; - version = "2.3.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "7fe8676acb4559129c4e958be7704c12dccdbae302fff47c5398bc0dd1c9e563"; + sha256 = "3645594147107c92780e19ac437f09eb8b8eac950209fb92d3f71869a721234e"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/tempest/default.nix b/nixpkgs/pkgs/development/python-modules/tempest/default.nix new file mode 100644 index 000000000000..c85e4f5b29fe --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/tempest/default.nix @@ -0,0 +1,89 @@ +{ lib +, buildPythonApplication +, fetchPypi +, pbr +, cliff +, jsonschema +, testtools +, paramiko +, netaddr +, oslo-concurrency +, oslo-config +, oslo-log +, stestr +, oslo-serialization +, oslo-utils +, fixtures +, pyyaml +, subunit +, stevedore +, prettytable +, urllib3 +, debtcollector +, unittest2 +, hacking +, oslotest +, bash +, python3 +}: + +buildPythonApplication rec { + pname = "tempest"; + version = "29.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "2045963560f91241c56940af741f081e59212c65c9867dfcdabfe07f9dd4d255"; + }; + + propagatedBuildInputs = [ + pbr + cliff + jsonschema + testtools + paramiko + netaddr + oslo-concurrency + oslo-config + oslo-log + stestr + oslo-serialization + oslo-utils + fixtures + pyyaml + subunit + stevedore + prettytable + urllib3 + debtcollector + unittest2 + ]; + + checkInputs = [ + stestr + hacking + oslotest + ]; + + checkPhase = '' + # Tests expect these applications available as such. + mkdir -p bin + export PATH="$PWD/bin:$PATH" + printf '#!${bash}/bin/bash\nexec ${python3.interpreter} -m tempest.cmd.main "$@"\n' > bin/tempest + printf '#!${bash}/bin/bash\nexec ${python3.interpreter} -m tempest.cmd.subunit_describe_calls "$@"\n' > bin/subunit-describe-calls + chmod +x bin/* + + stestr --test-path tempest/tests run -e <(echo " + tempest.tests.lib.cli.test_execute.TestExecute.test_execute_with_prefix + ") + ''; + + pythonImportsCheck = [ "tempest" ]; + + meta = with lib; { + description = "An OpenStack integration test suite that runs against live OpenStack cluster and validates an OpenStack deployment"; + homepage = "https://github.com/openstack/tempest"; + license = licenses.asl20; + maintainers = teams.openstack.members; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/tempora/default.nix b/nixpkgs/pkgs/development/python-modules/tempora/default.nix index 8da8d622a7b3..7bd7605fc3ff 100644 --- a/nixpkgs/pkgs/development/python-modules/tempora/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tempora/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "tempora"; - version = "4.0.2"; + version = "4.1.1"; src = fetchPypi { inherit pname version; - sha256 = "10fdc29bf85fa0df39a230a225bb6d093982fc0825b648a414bbc06bddd79909"; + sha256 = "c54da0f05405f04eb67abbb1dff4448fd91428b58cb00f0f645ea36f6a927950"; }; disabled = pythonOlder "3.2"; diff --git a/nixpkgs/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix b/nixpkgs/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix index 1ae1aa471be5..843b9d6c3199 100644 --- a/nixpkgs/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix @@ -6,14 +6,15 @@ buildPythonPackage rec { pname = "tensorboard_plugin_profile"; - version = "2.4.0"; + version = "2.5.0"; format = "wheel"; src = fetchPypi { inherit pname version; format = "wheel"; + dist = "py3"; python = "py3"; - sha256 = "0z6dcjvkk3pzmmmjxi2ybawnfshz5qa3ga92kqj69ld1g9k3i9bj"; + sha256 = "16jch9py98h7wrffdiz6j0i3kdykxdp5m0kfxr1fxy2phqanpjqk"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/terminado/default.nix b/nixpkgs/pkgs/development/python-modules/terminado/default.nix index 27c159349b0a..aff355d963ce 100644 --- a/nixpkgs/pkgs/development/python-modules/terminado/default.nix +++ b/nixpkgs/pkgs/development/python-modules/terminado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "terminado"; - version = "0.10.1"; + version = "0.11.1"; src = fetchPypi { inherit pname version; - sha256 = "89d5dac2f4e2b39758a0ff9a3b643707c95a020a6df36e70583b88297cd59cbe"; + sha256 = "962b402edbb480718054dc37027bada293972ecadfb587b89f01e2b8660a2132"; }; propagatedBuildInputs = [ ptyprocess tornado ]; diff --git a/nixpkgs/pkgs/development/python-modules/termplotlib/default.nix b/nixpkgs/pkgs/development/python-modules/termplotlib/default.nix index dae40dcb993a..492d51dcb2ca 100644 --- a/nixpkgs/pkgs/development/python-modules/termplotlib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/termplotlib/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "termplotlib"; - version = "0.3.5"; + version = "0.3.8"; src = fetchFromGitHub { owner = "nschloe"; repo = pname; rev = "v${version}"; - sha256 = "1z6bw6lkbrgjyq3ndsx20gwpai4scm1q9rjh4rdz0rvja4jdcv3z"; + sha256 = "10k70pb7554cc2zwkcgxfak8nb7iqqw6njbnaqfdz07l4v9f6smm"; }; format = "pyproject"; diff --git a/nixpkgs/pkgs/development/python-modules/tern/default.nix b/nixpkgs/pkgs/development/python-modules/tern/default.nix index 0468ee6f84b1..b8aee5ab9315 100644 --- a/nixpkgs/pkgs/development/python-modules/tern/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tern/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "tern"; - version = "2.6.1"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "749c18ef493ebe3ac28624b2b26c6e38f77de2afd6a6579d2c92393d8fbdbd46"; + sha256 = "cfd59431cafd6adf05ccb94be964098d9301f83a03bf715def7861811e4a4b74"; }; preBuild = '' diff --git a/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix b/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix index 750b070804c3..d66ce20d697e 100644 --- a/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "0.18.3"; + version = "0.21.0"; format = "pyproject"; src = fetchFromGitHub { owner = "zabuldon"; repo = pname; rev = "v${version}"; - sha256 = "1hdc5gm6dg1vw6qfs3z6mg2m94scrvjphj0lin6pi8n3zqj1h26k"; + sha256 = "1rwp3aag21hdkis2wx680ckja0203grm7naldaj8d2kpy4697m54"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/testtools/default.nix b/nixpkgs/pkgs/development/python-modules/testtools/default.nix index 8ef3d9c4320f..a07117a1e46d 100644 --- a/nixpkgs/pkgs/development/python-modules/testtools/default.nix +++ b/nixpkgs/pkgs/development/python-modules/testtools/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "testtools"; - version = "2.4.0"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "64c974a6cca4385d05f4bbfa2deca1c39ce88ede31c3448bee86a7259a9a61c8"; + sha256 = "57c13433d94f9ffde3be6534177d10fb0c1507cc499319128958ca91a65cb23f"; }; propagatedBuildInputs = [ pbr python_mimeparse extras unittest2 ]; diff --git a/nixpkgs/pkgs/development/python-modules/texttable/default.nix b/nixpkgs/pkgs/development/python-modules/texttable/default.nix index a8c6d9dcfda8..b104bd845962 100644 --- a/nixpkgs/pkgs/development/python-modules/texttable/default.nix +++ b/nixpkgs/pkgs/development/python-modules/texttable/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "texttable"; - version = "1.6.3"; + version = "1.6.4"; src = fetchPypi { inherit pname version; - sha256 = "ce0faf21aa77d806bbff22b107cc22cce68dc9438f97a2df32c93e9afa4ce436"; + sha256 = "42ee7b9e15f7b225747c3fa08f43c5d6c83bc899f80ff9bae9319334824076e9"; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/thinc/default.nix b/nixpkgs/pkgs/development/python-modules/thinc/default.nix index 4aac0d756d46..6ad29d5736d6 100644 --- a/nixpkgs/pkgs/development/python-modules/thinc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/thinc/default.nix @@ -78,6 +78,6 @@ buildPythonPackage rec { description = "Practical Machine Learning for NLP in Python"; homepage = "https://github.com/explosion/thinc"; license = licenses.mit; - maintainers = with maintainers; [ aborsu sdll ]; + maintainers = with maintainers; [ aborsu ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/thriftpy2/default.nix b/nixpkgs/pkgs/development/python-modules/thriftpy2/default.nix new file mode 100644 index 000000000000..0d5f5afe4a5c --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/thriftpy2/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, cython +, fetchFromGitHub +, pythonOlder +, ply +, six +, tornado +}: + +buildPythonPackage rec { + pname = "thriftpy2"; + version = "0.4.14"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Thriftpy"; + repo = pname; + rev = "v${version}"; + sha256 = "17f57vsbym4c9yax128bhrwg2zjxcsgl3ja6422y8hyb38v5mdc3"; + }; + + nativeBuildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + ply + six + tornado + ]; + + # Not all needed files seems to be present + doCheck = false; + + pythonImportsCheck = [ "thriftpy2" ]; + + meta = with lib; { + description = "Python module for Apache Thrift"; + homepage = "https://github.com/Thriftpy/thriftpy2"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/tifffile/default.nix b/nixpkgs/pkgs/development/python-modules/tifffile/default.nix index 40654366ea21..236f3443ca6b 100644 --- a/nixpkgs/pkgs/development/python-modules/tifffile/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tifffile/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2021.6.14"; + version = "2021.8.8"; src = fetchPypi { inherit pname version; - sha256 = "a2f83d82800a8d83cbd04340f9d65a6873a970874947a6b823b1b1238e84cba6"; + sha256 = "8260f31c4700143e8374ff6cde5cef7fe54fc9b7313afe88329f407881901dc5"; }; patches = lib.optional isPy27 ./python2-regex-compat.patch; diff --git a/nixpkgs/pkgs/development/python-modules/tinydb/default.nix b/nixpkgs/pkgs/development/python-modules/tinydb/default.nix index 118317781281..958624f80935 100644 --- a/nixpkgs/pkgs/development/python-modules/tinydb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tinydb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tinydb"; - version = "4.5.1"; + version = "4.5.2"; disabled = pythonOlder "3.5"; format = "pyproject"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "msiemens"; repo = pname; rev = "v${version}"; - sha256 = "1p0whrljjh7cpigr1glszssxsi6adi4cj7y3976q8sj9z47bdx8a"; + sha256 = "0gyc9rk1adw4gynwnv4kfas0hxv1cql0sm5b3fsms39088ha894l"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/tlsh/default.nix b/nixpkgs/pkgs/development/python-modules/tlsh/default.nix index fbe474166c11..dfa7a95e3970 100644 --- a/nixpkgs/pkgs/development/python-modules/tlsh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tlsh/default.nix @@ -4,15 +4,15 @@ , cmake }: -buildPythonPackage { +buildPythonPackage rec { pname = "tlsh"; - version = "4.5.0"; + version = "4.10.0"; src = fetchFromGitHub { owner = "trendmicro"; repo = "tlsh"; - rev = "f2bb7a97cfb0f9418a750ba92c182d1091e6c159"; - sha256 = "1kxfhdwqjd4pjdlr1gjh2am8mxpaqmfq7rrxkjfi0mbisl1krkwb"; + rev = version; + sha256 = "sha256-9Vkj7a5xU/coFyM/8i8JB0DdnbgDAEMOjmmMF8ckKuE="; }; nativeBuildInputs = [ cmake ]; @@ -26,7 +26,7 @@ buildPythonPackage { meta = with lib; { description = "Trend Micro Locality Sensitive Hash"; - homepage = "http://tlsh.org/"; + homepage = "https://tlsh.org/"; license = licenses.asl20; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/development/python-modules/tomli/default.nix b/nixpkgs/pkgs/development/python-modules/tomli/default.nix index c658339dcd9c..79cd5a4f500c 100644 --- a/nixpkgs/pkgs/development/python-modules/tomli/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tomli/default.nix @@ -1,9 +1,8 @@ { lib , buildPythonPackage +, callPackage , fetchFromGitHub , flit-core -, pytestCheckHook -, python-dateutil }: buildPythonPackage rec { @@ -11,6 +10,11 @@ buildPythonPackage rec { version = "1.1.0"; format = "pyproject"; + outputs = [ + "out" + "testsout" + ]; + src = fetchFromGitHub { owner = "hukkin"; repo = pname; @@ -20,17 +24,24 @@ buildPythonPackage rec { nativeBuildInputs = [ flit-core ]; - checkInputs = [ - pytestCheckHook - python-dateutil - ]; + postInstall = '' + mkdir $testsout + cp -R benchmark/ pyproject.toml tests/ $testsout/ + ''; pythonImportsCheck = [ "tomli" ]; + # check in passthru.tests.pytest to escape infinite recursion with setuptools-scm + doCheck = false; + + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; + meta = with lib; { description = "A Python library for parsing TOML, fully compatible with TOML v1.0.0"; homepage = "https://github.com/hukkin/tomli"; license = licenses.mit; - maintainers = with maintainers; [ veehaitch ]; + maintainers = with maintainers; [ veehaitch SuperSandro2000 ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/tomli/tests.nix b/nixpkgs/pkgs/development/python-modules/tomli/tests.nix new file mode 100644 index 000000000000..5d3d67dbd128 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/tomli/tests.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage +, tomli +, pytestCheckHook +, python-dateutil +}: + +buildPythonPackage rec { + pname = "tomli-tests"; + inherit (tomli) version; + + src = tomli.testsout; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + pytestCheckHook + python-dateutil + tomli + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/toonapi/default.nix b/nixpkgs/pkgs/development/python-modules/toonapi/default.nix index 003670989920..8df8fa89a2ca 100644 --- a/nixpkgs/pkgs/development/python-modules/toonapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/toonapi/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "toonapi"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "frenck"; repo = "python-toonapi"; rev = "v${version}"; - sha256 = "1d4n615vlcgkvmchrfjw4h3ndav3ljmcfydxr2b41zn83mzizqdf"; + sha256 = "10jh6p0ww51cb9f8amd9jq3lmvby6n2k08qwcr2n8ijbbgyp0ibf"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix b/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix index ce91599da992..a69531f2d062 100644 --- a/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix +++ b/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix @@ -15,7 +15,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.9.1"; + version = "0.10.1"; in buildPythonPackage { inherit version; @@ -54,6 +54,6 @@ in buildPythonPackage { changelog = "https://github.com/pytorch/vision/releases/tag/v${version}"; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ junjihashimoto ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix b/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix index b9a991e24abb..239db8bdb864 100644 --- a/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/nixpkgs/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -3,20 +3,24 @@ # Precompiled wheels can be found at: # https://download.pytorch.org/whl/torch_stable.html -version: { - x86_64-linux-37 = { - name = "torchvision-${version}-cp37-cp37m-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torchvision-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl"; - hash = "sha256-7EMVB8KZg2I3P4RqnIVk/7OOAPA1OWOipns58cSCUrw="; - }; - x86_64-linux-38 = { - name = "torchvision-${version}-cp38-cp38-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torchvision-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl"; - hash = "sha256-VjsCBW9Lusr4aDQLqaFh5dpV/5ZJ5PDs7nY4CbCHDTA="; - }; - x86_64-linux-39 = { - name = "torchvision-${version}-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu111/torchvision-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl"; - hash = "sha256-pzR7TBE+WcAmozskoeOVBuMkGJf9tvsaXsUkTcu86N8="; +# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows. + +version : builtins.getAttr version { + "0.10.1" = { + x86_64-linux-37 = { + name = "torchvision-0.10.1-cp37-cp37m-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu111/torchvision-0.10.1%2Bcu111-cp37-cp37m-linux_x86_64.whl"; + hash = "sha256-1MdsCrOLGkYpfbtv011/b6QG+yKaE+O0jUKeUVj2BJY="; + }; + x86_64-linux-38 = { + name = "torchvision-0.10.1-cp38-cp38-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu111/torchvision-0.10.1%2Bcu111-cp38-cp38-linux_x86_64.whl"; + hash = "sha256-LtmsnNSa9g3tCdjW1jhu7AZlGgfyYIVh5/2R+WwcxSo="; + }; + x86_64-linux-39 = { + name = "torchvision-0.10.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu111/torchvision-0.10.1%2Bcu111-cp39-cp39-linux_x86_64.whl"; + hash = "sha256-ZOC/angyiLeOhe+7dAs0W6XlQRKK00T/iI+aBgFNpA0="; + }; }; } diff --git a/nixpkgs/pkgs/development/python-modules/torchvision/prefetch.sh b/nixpkgs/pkgs/development/python-modules/torchvision/prefetch.sh new file mode 100755 index 000000000000..f57ac96bdb63 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/torchvision/prefetch.sh @@ -0,0 +1,36 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-prefetch-scripts + +version=$1 + +bucket="https://download.pytorch.org/whl/cu111" + +url_and_key_list=( +"x86_64-linux-37 $bucket/torchvision-${version}%2Bcu111-cp37-cp37m-linux_x86_64.whl torchvision-${version}-cp37-cp37m-linux_x86_64.whl" +"x86_64-linux-38 $bucket/torchvision-${version}%2Bcu111-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl" +"x86_64-linux-39 $bucket/torchvision-${version}%2Bcu111-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl" +) + +hashfile=binary-hashes-"$version".nix +rm -f $hashfile +echo " \"$version\" = {" >> $hashfile + +for url_and_key in "${url_and_key_list[@]}"; do + key=$(echo "$url_and_key" | cut -d' ' -f1) + url=$(echo "$url_and_key" | cut -d' ' -f2) + name=$(echo "$url_and_key" | cut -d' ' -f3) + + echo "prefetching ${url}..." + hash=$(nix hash to-sri --type sha256 `nix-prefetch-url "$url" --name "$name"`) + + echo " $key = {" >> $hashfile + echo " name = \"$name\";" >> $hashfile + echo " url = \"$url\";" >> $hashfile + echo " hash = \"$hash\";" >> $hashfile + echo " };" >> $hashfile + + echo +done + +echo " };" >> $hashfile +echo "done." diff --git a/nixpkgs/pkgs/development/python-modules/towncrier/default.nix b/nixpkgs/pkgs/development/python-modules/towncrier/default.nix index 6b699a2fbc24..83215f5e0af3 100644 --- a/nixpkgs/pkgs/development/python-modules/towncrier/default.nix +++ b/nixpkgs/pkgs/development/python-modules/towncrier/default.nix @@ -3,6 +3,7 @@ , click-default-group , incremental , jinja2 +, mock , pytestCheckHook , toml , twisted @@ -11,11 +12,11 @@ buildPythonPackage rec { pname = "towncrier"; - version = "19.9.0"; + version = "21.3.0"; src = fetchPypi { inherit pname version; - sha256 = "19916889879353a8863f3de8cb1ef19b305a0b5cfd9d36159d76ca2fef08e9aa"; + sha256 = "6eed0bc924d72c98c000cb8a64de3bd566e5cb0d11032b73fcccf8a8f956ddfe"; }; propagatedBuildInputs = [ @@ -28,7 +29,12 @@ buildPythonPackage rec { # zope.interface collision doCheck = !isPy27; - checkInputs = [ git twisted pytestCheckHook ]; + checkInputs = [ + git + mock + twisted + pytestCheckHook + ]; pythonImportsCheck = [ "towncrier" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/tox/default.nix b/nixpkgs/pkgs/development/python-modules/tox/default.nix index 035bb9701bb5..c660327ad72e 100644 --- a/nixpkgs/pkgs/development/python-modules/tox/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.23.1"; + version = "3.24.3"; buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "307a81ddb82bd463971a273f33e9533a24ed22185f27db8ce3386bff27d324e3"; + sha256 = "c6c4e77705ada004283610fd6d9ba4f77bc85d235447f875df9f0ba1bc23b634"; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/tqdm/default.nix b/nixpkgs/pkgs/development/python-modules/tqdm/default.nix index fe2eb35d4df7..babea4357a79 100644 --- a/nixpkgs/pkgs/development/python-modules/tqdm/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tqdm/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.61.1"; + version = "4.62.2"; src = fetchPypi { inherit pname version; - sha256 = "24be966933e942be5f074c29755a95b315c69a91f839a29139bf26ffffe2d3fd"; + sha256 = "a4d6d112e507ef98513ac119ead1159d286deab17dffedd96921412c2d236ff5"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/traitlets/default.nix b/nixpkgs/pkgs/development/python-modules/traitlets/default.nix index 3bc05897af66..23412d0a6940 100644 --- a/nixpkgs/pkgs/development/python-modules/traitlets/default.nix +++ b/nixpkgs/pkgs/development/python-modules/traitlets/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "traitlets"; - version = "5.0.5"; + version = "5.1.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "178f4ce988f69189f7e523337a3e11d91c786ded9360174a3d9ca83e79bc5396"; + sha256 = "bd382d7ea181fbbcce157c133db9a829ce06edffe097bcf3ab945b435452b46d"; }; checkInputs = [ glibcLocales pytest mock ]; diff --git a/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix b/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix index 7f6ef31d318e..1a06448db996 100644 --- a/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "transmission-rpc"; - version = "3.2.7"; + version = "3.2.8"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "36c022fddb45084c0d9f63db34abf79b66a0f2bab6484f4ac32eb2744a06fa15"; + sha256 = "821eda19809dca7ad50eaf42ed8debb72ec0e3b1f04f63b8b2414a05075c132e"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index 12179e6a60a7..1da8a14e43bf 100644 --- a/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.9.29"; + version = "3.9.31"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YEddrun9rLcWk2u3Tfus8W014bU4BKWXWOOhCW/jSlY="; + sha256 = "cdb7e5b996a2ea180a53b283ac8fac4a8978ae31c860b55c14a205fc772144c2"; }; propagatedBuildInputs = [ numpy ]; diff --git a/nixpkgs/pkgs/development/python-modules/trustme/default.nix b/nixpkgs/pkgs/development/python-modules/trustme/default.nix index 556ca3e2e6ed..103878ccac69 100644 --- a/nixpkgs/pkgs/development/python-modules/trustme/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trustme/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "trustme"; - version = "0.8.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "3dcfbe186bf33d146347c6180b67564257f2708960027ab6d24fea2865daabca"; + sha256 = "sha256-XgeyPXDO7WTzuzauS5q8UjVMFsmNRasDe+4rX7/+WGw="; }; checkInputs = [ @@ -42,10 +42,12 @@ buildPythonPackage rec { # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; - meta = { + pythonImportsCheck = [ "trustme" ]; + + meta = with lib; { description = "High quality TLS certs while you wait, for the discerning tester"; homepage = "https://github.com/python-trio/trustme"; - license = with lib.licenses; [ mit asl20 ]; - maintainers = with lib.maintainers; [ catern ]; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ catern ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/trytond/default.nix b/nixpkgs/pkgs/development/python-modules/trytond/default.nix index d5ddf8f58802..75e1ee68e4b3 100644 --- a/nixpkgs/pkgs/development/python-modules/trytond/default.nix +++ b/nixpkgs/pkgs/development/python-modules/trytond/default.nix @@ -23,12 +23,12 @@ buildPythonApplication rec { pname = "trytond"; - version = "5.8.9"; + version = "6.0.5"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "5f14e9615ff91e18c146c74eb4c1cd56112662361a52c73389f15baced0bef18"; + sha256 = "3ccb98dbf905d99991ed0151e13c91cd9267e4aa104fa40097df4e02580dadfc"; }; # Tells the tests which database to use diff --git a/nixpkgs/pkgs/development/python-modules/twine/default.nix b/nixpkgs/pkgs/development/python-modules/twine/default.nix index da5c4a9c3f51..f5809b0a9b90 100644 --- a/nixpkgs/pkgs/development/python-modules/twine/default.nix +++ b/nixpkgs/pkgs/development/python-modules/twine/default.nix @@ -14,12 +14,13 @@ buildPythonPackage rec { pname = "twine"; - version = "3.4.1"; + version = "3.4.2"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a56c985264b991dc8a8f4234eb80c5af87fa8080d0c224ad8f2cd05a2c22e83b"; + sha256 = "4caec0f1ed78dc4c9b83ad537e453d03ce485725f2aea57f1bb3fdde78dae936"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/types-futures/default.nix b/nixpkgs/pkgs/development/python-modules/types-futures/default.nix new file mode 100644 index 000000000000..5e9ebe7fa7fd --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/types-futures/default.nix @@ -0,0 +1,18 @@ +{ buildPythonPackage, fetchPypi, lib }: + +buildPythonPackage rec { + pname = "types-futures"; + version = "3.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1p00wb93af01b6fw9wxk9qm4kbhqwb48nszmm16slsrc1nx4px25"; + }; + + meta = with lib; { + description = "Typing stubs for futures"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ andersk ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix b/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix new file mode 100644 index 000000000000..5d9737c5803e --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix @@ -0,0 +1,20 @@ +{ buildPythonPackage, fetchPypi, lib, types-futures }: + +buildPythonPackage rec { + pname = "types-protobuf"; + version = "3.17.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0r42kzspqna2b2jiz9bjzagrd4gbh0sd6jp4v7i9nv09y0ifrkrn"; + }; + + propagatedBuildInputs = [ types-futures ]; + + meta = with lib; { + description = "Typing stubs for protobuf"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ andersk ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix b/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix index 2fc5cc0d4503..4b3f9c1726c8 100644 --- a/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2021.1.0"; + version = "2021.1.2"; src = fetchPypi { inherit pname version; - sha256 = "0hzjz6wgzfyybcfli4rpmfxk49cn6x3slbs2xdmlnckvlahs5pxd"; + sha256 = "448828a06f2aaa840e57364d866c661645a045e532f817e4f10c8c3ab2b66651"; }; # Modules doesn't have tests diff --git a/nixpkgs/pkgs/development/python-modules/types-requests/default.nix b/nixpkgs/pkgs/development/python-modules/types-requests/default.nix index 2d7ccc052287..464b0d58762e 100644 --- a/nixpkgs/pkgs/development/python-modules/types-requests/default.nix +++ b/nixpkgs/pkgs/development/python-modules/types-requests/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.25.6"; + version = "2.25.9"; src = fetchPypi { inherit pname version; - sha256 = "1vh203dppi6457lwv7z46dc8rpanjlahk4v3394nq1jwyp0425g2"; + sha256 = "sha256-Tsi3Hac+U0Stub7nJadOyFmOcob5vLF1ANYn8ln+T7k="; }; # Modules doesn't have tests diff --git a/nixpkgs/pkgs/development/python-modules/typing-extensions/default.nix b/nixpkgs/pkgs/development/python-modules/typing-extensions/default.nix index fd8a25a485b9..939ca25eb1a3 100644 --- a/nixpkgs/pkgs/development/python-modules/typing-extensions/default.nix +++ b/nixpkgs/pkgs/development/python-modules/typing-extensions/default.nix @@ -4,11 +4,11 @@ let in buildPythonPackage rec { pname = "typing_extensions"; - version = "3.10.0.0"; + version = "3.10.0.2"; src = fetchPypi { inherit pname version; - sha256 = "50b6f157849174217d0656f99dc82fe932884fb250826c18350e159ec6cdf342"; + sha256 = "49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"; }; checkInputs = lib.optional (pythonOlder "3.5") typing; diff --git a/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix b/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix index c5514cfa53a4..363e1d12a55e 100644 --- a/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix +++ b/nixpkgs/pkgs/development/python-modules/tzlocal/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "tzlocal"; - version = "2.1"; + version = "2.1"; # version needs to be compatible with APScheduler propagatedBuildInputs = [ pytz ]; diff --git a/nixpkgs/pkgs/development/python-modules/userpath/default.nix b/nixpkgs/pkgs/development/python-modules/userpath/default.nix index d619cba0649d..6ce92e9f3b47 100644 --- a/nixpkgs/pkgs/development/python-modules/userpath/default.nix +++ b/nixpkgs/pkgs/development/python-modules/userpath/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "userpath"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256="1xpgdmdvhmmmdlivsqlzx1xvyj0gcnfp0j2ba5izmv3q2k5abfdj"; + sha256="sha256-3NZsX6mxo8EjYvMJu7W8eZK6yK+G0XtOaxpLFmoRxD8="; }; propagatedBuildInputs = [ click ]; diff --git a/nixpkgs/pkgs/development/python-modules/uvloop/default.nix b/nixpkgs/pkgs/development/python-modules/uvloop/default.nix index a762ec55ee36..c7e11ab6c258 100644 --- a/nixpkgs/pkgs/development/python-modules/uvloop/default.nix +++ b/nixpkgs/pkgs/development/python-modules/uvloop/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "uvloop"; - version = "0.15.2"; + version = "0.16.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "2bb0624a8a70834e54dde8feed62ed63b50bad7a1265c40d6403a2ac447bce01"; + sha256 = "f74bc20c7b67d1c27c72601c78cf95be99d5c2cdd4514502b4f3eb0933ff1228"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/velbus-aio/default.nix b/nixpkgs/pkgs/development/python-modules/velbus-aio/default.nix new file mode 100644 index 000000000000..b9d6b7151665 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/velbus-aio/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pyserial-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "velbus-aio"; + version = "2021.9.4"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Cereal2nd"; + repo = pname; + rev = version; + sha256 = "sha256-WywJ70tVniUX9RZTh9aswHgCEvWTggzABhSWoSRydUc="; + }; + + propagatedBuildInputs = [ + pyserial-asyncio + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ " velbusaio" ]; + + meta = with lib; { + description = "Python library to support the Velbus home automation system"; + homepage = "https://github.com/Cereal2nd/velbus-aio"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/vidstab/default.nix b/nixpkgs/pkgs/development/python-modules/vidstab/default.nix index 7137205b3508..b4a16c44a072 100644 --- a/nixpkgs/pkgs/development/python-modules/vidstab/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vidstab/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "1.7.3"; + version = "1.7.4"; pname = "vidstab"; src = fetchPypi { inherit pname version; - sha256 = "649a77a0c1b670d13a1bf411451945d7da439364dc0c33ee3636a23f1d82b456"; + sha256 = "865c4a097e2a8527aa8bfc96ab0bcc0d280a88cc93eabcc36531268f5d343ce1"; }; propagatedBuildInputs = [ numpy pandas imutils progress matplotlib ]; diff --git a/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix b/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix index 2bcfa88b6ae4..10e1ebbc87bc 100644 --- a/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix +++ b/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix @@ -1,6 +1,9 @@ -{ buildPythonPackage -, appdirs -, contextlib2 +{ stdenv +, lib +, buildPythonPackage +, pythonOlder +, isPy27 +, backports-entry-points-selectable , cython , distlib , fetchPypi @@ -8,26 +11,23 @@ , flaky , importlib-metadata , importlib-resources -, isPy27 -, lib , pathlib2 +, platformdirs , pytest-freezegun , pytest-mock , pytest-timeout , pytestCheckHook -, pythonOlder , setuptools-scm , six -, stdenv }: buildPythonPackage rec { pname = "virtualenv"; - version = "20.4.7"; + version = "20.7.2"; src = fetchPypi { inherit pname version; - sha256 = "14fdf849f80dbb29a4eb6caa9875d476ee2a5cf76a5f5415fa2f1606010ab467"; + sha256 = "9ef4e8ee4710826e98ff3075c9a4739e2cb1040de6a2a8d35db0055840dc96a0"; }; nativeBuildInputs = [ @@ -35,13 +35,12 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - appdirs + backports-entry-points-selectable distlib filelock + platformdirs six - ] ++ lib.optionals isPy27 [ - contextlib2 - ] ++ lib.optionals (isPy27 && !stdenv.hostPlatform.isWindows) [ + ] ++ lib.optionals (pythonOlder "3.4" && !stdenv.hostPlatform.isWindows) [ pathlib2 ] ++ lib.optionals (pythonOlder "3.7") [ importlib-resources diff --git a/nixpkgs/pkgs/development/python-modules/vispy/default.nix b/nixpkgs/pkgs/development/python-modules/vispy/default.nix index 849f25ef0df3..9ebbfcd77e87 100644 --- a/nixpkgs/pkgs/development/python-modules/vispy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vispy/default.nix @@ -1,15 +1,26 @@ -{ lib, buildPythonPackage, substituteAll, stdenv, - fetchPypi, numpy, cython, freetype-py, fontconfig, libGL, - setuptools-scm, setuptools-scm-git-archive - }: +{ lib +, stdenv +, buildPythonPackage +, substituteAll +, fetchPypi +, cython +, fontconfig +, freetype-py +, hsluv +, kiwisolver +, libGL +, numpy +, setuptools-scm +, setuptools-scm-git-archive +}: buildPythonPackage rec { pname = "vispy"; - version = "0.6.6"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "6f3c4d00be9e6761c046d520a86693d78a0925d47eeb2fc095e95dac776f74ee"; + sha256 = "6e482e68487f5384205d349f288580d6287fd690df4cdc3ad4c573afc39990f1"; }; patches = [ @@ -21,15 +32,37 @@ buildPythonPackage rec { ]; nativeBuildInputs = [ - cython setuptools-scm setuptools-scm-git-archive + cython + setuptools-scm + setuptools-scm-git-archive + ]; + + buildInputs = [ + libGL ]; propagatedBuildInputs = [ - numpy freetype-py fontconfig libGL + fontconfig + freetype-py + hsluv + kiwisolver + numpy ]; doCheck = false; # otherwise runs OSX code on linux. - pythonImportsCheck = [ "vispy" ]; + + pythonImportsCheck = [ + "vispy" + "vispy.color" + "vispy.geometry" + "vispy.gloo" + "vispy.glsl" + "vispy.io" + "vispy.plot" + "vispy.scene" + "vispy.util" + "vispy.visuals" + ]; meta = with lib; { homepage = "https://vispy.org/index.html"; diff --git a/nixpkgs/pkgs/development/python-modules/vivisect/default.nix b/nixpkgs/pkgs/development/python-modules/vivisect/default.nix index 43e54bda9d6c..5dc8bc2254d4 100644 --- a/nixpkgs/pkgs/development/python-modules/vivisect/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vivisect/default.nix @@ -10,12 +10,12 @@ }: buildPythonPackage rec { pname = "vivisect"; - version = "0.2.1"; + version = "1.0.4"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "8fc4d2097a1d0d8d97aa8c540984cb52432df759f04f2281a21a4e1b7d1a95a7"; + sha256 = "bd47b2cf5874cd2f74e6c36b8a97bf301785bacf9ac0297bbe78ec1b8c86c755"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix b/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix index 0a75600bb0f0..1a1c6a33acb3 100644 --- a/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "vowpalwabbit"; - version = "8.10.2"; + version = "8.11.0"; src = fetchPypi{ inherit pname version; - sha256 = "e9f7d525a6e88ebff41406409a5c31f79bb008f524fc63a61dc74bac6a1ac887"; + sha256 = "cfde0515a3fa4d224aad5461135372f3441ae1a64717ae6bff5e23509d70b0bd"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/wadllib/default.nix b/nixpkgs/pkgs/development/python-modules/wadllib/default.nix index fcddf538d88d..b169a93ff87f 100644 --- a/nixpkgs/pkgs/development/python-modules/wadllib/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wadllib/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "wadllib"; - version = "1.3.5"; + version = "1.3.6"; src = fetchPypi { inherit pname version; - sha256 = "84fecbaec2fef5ae2d7717a8115d271f18c6b5441eac861c58be8ca57f63c1d3"; + sha256 = "acd9ad6a2c1007d34ca208e1da6341bbca1804c0e6850f954db04bdd7666c5fc"; }; propagatedBuildInputs = [ setuptools lazr-uri ]; diff --git a/nixpkgs/pkgs/development/python-modules/wasmer/default.nix b/nixpkgs/pkgs/development/python-modules/wasmer/default.nix index d3881032af13..dff14d15b901 100644 --- a/nixpkgs/pkgs/development/python-modules/wasmer/default.nix +++ b/nixpkgs/pkgs/development/python-modules/wasmer/default.nix @@ -1,45 +1,99 @@ -{ lib -, stdenv +{ stdenv +, lib , rustPlatform +, callPackage , fetchFromGitHub , buildPythonPackage , libiconv +, llvm_11 +, libffi +, libxml2 +, ncurses +, zlib }: -buildPythonPackage rec { - pname = "wasmer"; - version = "1.0.0"; +let + common = + { pname + , buildAndTestSubdir + , cargoHash + , extraNativeBuildInputs ? [ ] + , extraBuildInputs ? [ ] + }: buildPythonPackage rec { + inherit pname; + version = "1.0.0"; + format = "pyproject"; - src = fetchFromGitHub { - owner = "wasmerio"; - repo = "wasmer-python"; - rev = version; - hash = "sha256-I1GfjLaPYMIHKh2m/5IQepUsJNiVUEJg49wyuuzUYtY="; - }; + outputs = [ "out" ] ++ lib.optional (pname == "wasmer") "testsout"; - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-txOOia1C4W+nsXuXp4EytEn82CFfSmiOYwRLC4WPImc="; - }; + src = fetchFromGitHub { + owner = "wasmerio"; + repo = "wasmer-python"; + rev = version; + hash = "sha256-I1GfjLaPYMIHKh2m/5IQepUsJNiVUEJg49wyuuzUYtY="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = cargoHash; + }; + + nativeBuildInputs = (with rustPlatform; [ cargoSetupHook maturinBuildHook ]) + ++ extraNativeBuildInputs; + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ] + ++ extraBuildInputs; - format = "pyproject"; + inherit buildAndTestSubdir; - nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; + postInstall = lib.optionalString (pname == "wasmer") '' + mkdir $testsout + cp -R tests $testsout/tests + ''; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + # check in passthru.tests.pytest because all packages are required to run the tests + doCheck = false; - buildAndTestSubdir = "packages/api"; + passthru.tests = lib.optionalAttrs (pname == "wasmer") { + pytest = callPackage ./tests.nix { }; + }; - doCheck = false; + pythonImportsCheck = [ "${lib.replaceStrings ["-"] ["_"] pname}" ]; - pythonImportsCheck = [ "wasmer" ]; + meta = with lib; { + description = "Python extension to run WebAssembly binaries"; + homepage = "https://github.com/wasmerio/wasmer-python"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; + }; +in +rec { + wasmer = common { + pname = "wasmer"; + buildAndTestSubdir = "packages/api"; + cargoHash = "sha256-txOOia1C4W+nsXuXp4EytEn82CFfSmiOYwRLC4WPImc="; + }; + + wasmer-compiler-cranelift = common { + pname = "wasmer-compiler-cranelift"; + buildAndTestSubdir = "packages/compiler-cranelift"; + cargoHash = "sha256-cHgAUwqnbQV3E5nUYGYQ48ntbIFfq4JXfU5IrSFZ3zI="; + }; + + wasmer-compiler-llvm = common { + pname = "wasmer-compiler-llvm"; + buildAndTestSubdir = "packages/compiler-llvm"; + cargoHash = "sha256-Jm22CC5S3pN/vdVvsGZdvtoAgPzWVLto8wavSJdxY3A="; + extraNativeBuildInputs = [ llvm_11 ]; + extraBuildInputs = [ libffi libxml2.out ncurses zlib ]; + }; - meta = with lib; { - description = "Python extension to run WebAssembly binaries"; - homepage = "https://github.com/wasmerio/wasmer-python"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ SuperSandro2000 ]; + wasmer-compiler-singlepass = common { + pname = "wasmer-compiler-singlepass"; + buildAndTestSubdir = "packages/compiler-singlepass"; + cargoHash = "sha256-lmqEo3+jYoN+4EEYphcoE4b84jdFcvYVycjrJ956Bh8="; }; } diff --git a/nixpkgs/pkgs/development/python-modules/wasmer/tests.nix b/nixpkgs/pkgs/development/python-modules/wasmer/tests.nix new file mode 100644 index 000000000000..bdb3adfe93ce --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/wasmer/tests.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, wasmer +, pytestCheckHook +, wasmer-compiler-cranelift +, wasmer-compiler-llvm +, wasmer-compiler-singlepass +}: + +buildPythonPackage rec { + pname = "wasmer-tests"; + inherit (wasmer) version; + + src = wasmer.testsout; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + pytestCheckHook + wasmer + wasmer-compiler-cranelift + wasmer-compiler-llvm + wasmer-compiler-singlepass + ]; +} diff --git a/nixpkgs/pkgs/development/python-modules/watchdog/default.nix b/nixpkgs/pkgs/development/python-modules/watchdog/default.nix index 921ed5af4aa1..7dab01b3ca09 100644 --- a/nixpkgs/pkgs/development/python-modules/watchdog/default.nix +++ b/nixpkgs/pkgs/development/python-modules/watchdog/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "watchdog"; - version = "2.1.3"; + version = "2.1.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5SNqjoYCq220uHNmTC01bDZas8rJb73sSXCtYWQV3UU="; + sha256 = "5563b005907613430ef3d4aaac9c78600dd5704e84764cb6deda4b3d72807f09"; }; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/nixpkgs/pkgs/development/python-modules/webargs/default.nix b/nixpkgs/pkgs/development/python-modules/webargs/default.nix index 6db909992f48..63ad60c9f084 100644 --- a/nixpkgs/pkgs/development/python-modules/webargs/default.nix +++ b/nixpkgs/pkgs/development/python-modules/webargs/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "webargs"; - version = "8.0.0"; + version = "8.0.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0xy6na8axc5wnp2wg3kvqbpl2iv0hx0rsnlrmrgkgp88znx6cmjn"; + sha256 = "bcce022250ee97cfbb0ad07b02388ac90a226ef4b479ec84317152345a565614"; }; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix b/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix index d3dce5018d97..898fa4556ec3 100644 --- a/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix +++ b/nixpkgs/pkgs/development/python-modules/werkzeug/default.nix @@ -8,15 +8,16 @@ , pytest-timeout , pytest-xprocess , pytestCheckHook - }: +}: buildPythonPackage rec { - pname = "Werkzeug"; + pname = "werkzeug"; version = "2.0.1"; disabled = pythonOlder "3.6"; src = fetchPypi { - inherit pname version; + pname = "Werkzeug"; + inherit version; sha256 = "0hlwawnn8c41f254qify5jnjj8xb97n294h09bqimzqhs0qdpq8x"; }; diff --git a/nixpkgs/pkgs/development/python-modules/wsgiprox/default.nix b/nixpkgs/pkgs/development/python-modules/wsgiprox/default.nix new file mode 100644 index 000000000000..af35c23e455f --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/wsgiprox/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, six +, certauth +}: + +buildPythonPackage rec { + pname = "wsgiprox"; + version = "1.5.2"; + + src = fetchFromGitHub { + owner = "webrecorder"; + repo = "wsgiprox"; + # https://github.com/webrecorder/wsgiprox/issues/8 + rev = "004870a87959e68ff28ff4362e4f0df28ec22030"; + sha256 = "sha256-EquddaNrVceyJHuQMCajKHGZX2Q7ebR0Zhvi2pl2WEw="; + }; + + propagatedBuildInputs = [ + six + certauth + ]; + + pythonImportsCheck = [ "wsgiprox" ]; + + # See https://github.com/webrecorder/wsgiprox/issues/6 + doCheck = false; + + meta = with lib; { + description = "Python WSGI Middleware for adding HTTP/S proxy support to any WSGI Application"; + homepage = "https://github.com/webrecorder/wsgiprox"; + license = licenses.asl20; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/nixpkgs/pkgs/development/python-modules/xarray/default.nix b/nixpkgs/pkgs/development/python-modules/xarray/default.nix index 675461a63cc6..ee07adeb9d5b 100644 --- a/nixpkgs/pkgs/development/python-modules/xarray/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xarray/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.18.2"; + version = "0.19.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "5d2e72a228286fcf60f66e16876bd27629a1a70bf64822c565f16515c4d10284"; + sha256 = "3a365ce09127fc841ba88baa63f37ca61376ffe389a6c5e66d52f2c88c23a62b"; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix b/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix index c975218e5b1d..de17aa849227 100644 --- a/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix @@ -1,15 +1,34 @@ -{ lib, fetchPypi, buildPythonPackage, pythonAtLeast, intervaltree, pyflakes, requests, lxml, google-i18n-address -, pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint, pyyaml, jinja2, configargparse, appdirs +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder +, intervaltree +, pyflakes +, requests +, lxml +, google-i18n-address +, pycountry +, html5lib +, six +, kitchen +, pypdf2 +, dict2xml +, weasyprint +, pyyaml +, jinja2 +, configargparse +, appdirs }: buildPythonPackage rec { pname = "xml2rfc"; - version = "3.8.0"; - disabled = pythonAtLeast "3.9"; + version = "3.10.0"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8e25a9d73acf57ade798fc67841277dbbdb81ced390e6f84362370305b127426"; + sha256 = "sha256-DJjGQAYFhXjAiJhWzxpQ0jRUSrnsNCcNz1KfPEjBoKE="; }; propagatedBuildInputs = [ @@ -31,12 +50,18 @@ buildPythonPackage rec { appdirs ]; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "jinja2>=2.11,<3.0" "jinja2>=2.11" + ''; + preCheck = '' export HOME=$(mktemp -d) ''; # lxml tries to fetch from the internet doCheck = false; + pythonImportsCheck = [ "xml2rfc" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/development/python-modules/xmlsec/default.nix b/nixpkgs/pkgs/development/python-modules/xmlsec/default.nix index b8c60f1b6425..0a9a0af0e543 100644 --- a/nixpkgs/pkgs/development/python-modules/xmlsec/default.nix +++ b/nixpkgs/pkgs/development/python-modules/xmlsec/default.nix @@ -9,18 +9,17 @@ , xmlsec , pkgconfig , setuptools-scm -, toml , lxml , hypothesis }: buildPythonPackage rec { pname = "xmlsec"; - version = "1.3.11"; + version = "1.3.12"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zS6q/38xeEoH3ZnOgfp2cxPfO6GDT6pBQ+4sBwAMrHo="; + sha256 = "2c86ac6ce570c9e04f04da0cd5e7d3db346e4b5b1d006311606368f17c756ef9"; }; # https://github.com/mehcode/python-xmlsec/issues/84#issuecomment-632930116 @@ -28,7 +27,7 @@ buildPythonPackage rec { ./reset-lxml-in-tests.patch ]; - nativeBuildInputs = [ pkg-config pkgconfig setuptools-scm toml ]; + nativeBuildInputs = [ pkg-config pkgconfig setuptools-scm ]; buildInputs = [ xmlsec libxslt libxml2 libtool ]; diff --git a/nixpkgs/pkgs/development/python-modules/yamlloader/default.nix b/nixpkgs/pkgs/development/python-modules/yamlloader/default.nix index d2b66cb073d7..97da02102c7f 100644 --- a/nixpkgs/pkgs/development/python-modules/yamlloader/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yamlloader/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "yamlloader"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "e96dc3dc6895d814c330c054c966d993fc81ef1dbf5a30a4bdafeb256359e058"; + sha256 = "8a297c7a197683ba02e5e2b882ffd6c6180d01bdefb534b69cd3962df020bfe6"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/yeelight/default.nix b/nixpkgs/pkgs/development/python-modules/yeelight/default.nix index 9416ff7ef4e2..b7472d68a83d 100644 --- a/nixpkgs/pkgs/development/python-modules/yeelight/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yeelight/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "yeelight"; - version = "0.7.3"; + version = "0.7.5"; disabled = pythonOlder "3.4"; src = fetchFromGitLab { owner = "stavros"; repo = "python-yeelight"; rev = "v${version}"; - sha256 = "sha256-sdSzriAgY3LSOeyPB2Pe1k9iamStZ1OlYXJZviRa+TY="; + sha256 = "sha256-lEroQ2Gy1ldeIkkSMYcXJk6j6Ls2zigImrIWOPq70D0="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/youtube-search-python/default.nix b/nixpkgs/pkgs/development/python-modules/youtube-search-python/default.nix index 818baf6b36f9..8f31c892d0d8 100644 --- a/nixpkgs/pkgs/development/python-modules/youtube-search-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/youtube-search-python/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "youtube-search-python"; - version = "1.4.7"; + version = "1.4.8"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "7f93d9ecfd9b965dc93782d8174b1c1888f8900e2a303254037ba34e1d0ebed4"; + sha256 = "aafa940d77ecd37bb7af802da53caed9be8861c6abe3004abb04315155b4a3ad"; }; propagatedBuildInputs = [ httpx ]; diff --git a/nixpkgs/pkgs/development/python-modules/yt/default.nix b/nixpkgs/pkgs/development/python-modules/yt/default.nix index 42bde9909b8c..9611b2722295 100644 --- a/nixpkgs/pkgs/development/python-modules/yt/default.nix +++ b/nixpkgs/pkgs/development/python-modules/yt/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "yt"; - version = "3.6.1"; + version = "4.0.1"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "be454f9d05dcbe0623328b4df43a1bfd1f0925e516be97399710452931a19bb0"; + sha256 = "6219cbf971871320a13679a57722c0363e50db5e6d4d64ea9d197461b2a7f70f"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix b/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix index 6ec5fda2ca58..8bf781ef3a42 100644 --- a/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "0.18.0"; + version = "0.19.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-RH0ballPSZQvesdUEsulnBkbbzVA2YrGWhMzRFvuwW0="; + sha256 = "dfd0271f7177173cea9c255730151a10a2fe4a32f9accd2fe31e7645936c90c5"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zarr/default.nix b/nixpkgs/pkgs/development/python-modules/zarr/default.nix index 9fc5589d281d..cc47fe9e5ac1 100644 --- a/nixpkgs/pkgs/development/python-modules/zarr/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zarr/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.9.1"; + version = "2.10.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "688afec069e0f85b87c1ef4572766f998309c64ab7bea1884cec60e92d109544"; + sha256 = "8ca8e505cadb4f7f97aab4e4193bb302b6338bf54593c98fe7581bf574ed864c"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zconfig/default.nix b/nixpkgs/pkgs/development/python-modules/zconfig/default.nix index a6a00ad821b8..521bca4ece8c 100644 --- a/nixpkgs/pkgs/development/python-modules/zconfig/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zconfig/default.nix @@ -1,32 +1,27 @@ -{ lib, stdenv +{ lib +, stdenv , fetchPypi -, fetchpatch , buildPythonPackage , zope_testrunner , manuel , docutils -, pythonAtLeast +, pygments }: buildPythonPackage rec { pname = "ZConfig"; - version = "3.5.0"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0s7aycxna07a04b4rswbkj4y5qh3gxy2mcsqb9dmy0iimj9f9550"; + sha256 = "sha256-oo6VoK4zV5V0fsytNbLLcI831Ex/Ml4qyyAemDMLFuU="; }; - patches = [ - # fixes 3.8+ logger validation issues, has been merged into master, remove next bump - (fetchpatch { - url = "https://github.com/zopefoundation/ZConfig/commit/f0c2990d35ac3c924ecc8be4a5c71c8e4abbd0e5.patch"; - sha256 = "1bjg3wrvii0rwzf3s0vlpzgg2ckj0h2zxkyxwjcr64s4k2vaq9ij"; - }) - ] ++ lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; + patches = lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; buildInputs = [ manuel docutils ]; propagatedBuildInputs = [ zope_testrunner ]; + checkInputs = [ pygments ]; meta = with lib; { description = "Structured Configuration Library"; diff --git a/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix index 618396a90b42..46377a238bfe 100644 --- a/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.36.2"; + version = "0.36.7"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - sha256 = "sha256-3QRrGfyMXiSas70IL19/DQAPf7I6vdg/itiZlD4/pvg="; + sha256 = "sha256-jGbYd56JCXYUE4N2He5Ds8vVcgfny1kUYbd1rL7upcM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix b/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix index 89db9de12b75..38a6d236d83c 100644 --- a/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.59"; + version = "0.0.61"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; rev = version; - sha256 = "1x6s44apl393as847ghbqr26h0y0h4w3wp53bs0m2nfbzjwin3i7"; + sha256 = "sha256-uDQAXH0p8Ly0ZbwNlkVo1b7fAXSu77U7v3BHd0B1YQk="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix b/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix index f41b3836db93..466026556e0a 100644 --- a/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "zigpy"; repo = pname; rev = version; - sha256 = "sha256-NpLhVQfezXbJQMvqqZjr9sc8tCjJgGu5Xk3C5/IDeUQ="; + sha256 = "sha256-9rxdnY5tMtPJLE/lRaphNR1L1vdhAxnIDoh8xCHmzjc="; }; propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ]; diff --git a/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix b/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix index 1279bb804de6..be522214164b 100644 --- a/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -7,11 +7,12 @@ , pytest-asyncio , pytestCheckHook , pythonOlder -, zigpy }: +, zigpy +}: buildPythonPackage rec { pname = "zigpy-xbee"; - version = "0.13.0"; + version = "0.14.0"; # https://github.com/Martiusweb/asynctest/issues/152 # broken by upstream python bug with asynctest and # is used exclusively by home-assistant with python 3.8 @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-xbee"; rev = version; - sha256 = "Krdqb9bYKwUC2cdNppB2+tLwWjzmzIHhXnQ1KRduofU="; + sha256 = "sha256-veAkaBHPYgVd3iwvnH/A2upYX4T/qXXNRcaysbRQvNI="; }; buildInputs = [ @@ -36,6 +37,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # assertion failure + # E assert ff:ff:ff:ff:ff:ff:ff:ff is None + "test_startup_api_mode_config_fails" + ]; + meta = with lib; { description = "A library which communicates with XBee radios for zigpy"; homepage = "https://github.com/zigpy/zigpy-xbee"; diff --git a/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix b/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix index 474e7f309e34..f8413d9aa17f 100644 --- a/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "zigpy-znp"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "zigpy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nnA/gVXBpCZFkspcO6kF3ZkEDu0vV0d9p1WNGVrN0u8="; + sha256 = "0jki9qmjazh0by02c0w17dyaz0nl3gzjiy064mj6pi502d175831"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zigpy/default.nix b/nixpkgs/pkgs/development/python-modules/zigpy/default.nix index 7dab5cda6cc5..af498c59cf06 100644 --- a/nixpkgs/pkgs/development/python-modules/zigpy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zigpy/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.36.1"; + version = "0.37.1"; src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy"; rev = version; - sha256 = "0rfif8ds6m9ndxnc0f02fivc2pwidf476ylyx9y2b1sa2qz36z5w"; + sha256 = "sha256-tDpu6tv8qwIPB3G5GKURtDi6QOYxF5jEVbzmJ2Px5W4="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zipp/default.nix b/nixpkgs/pkgs/development/python-modules/zipp/default.nix index 7ef26dbd7606..c070e2327772 100644 --- a/nixpkgs/pkgs/development/python-modules/zipp/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zipp/default.nix @@ -2,31 +2,22 @@ , buildPythonPackage , fetchPypi , setuptools-scm -, pytest -, pytest-flake8 , more-itertools -, toml }: buildPythonPackage rec { pname = "zipp"; - version = "3.4.1"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76"; + sha256 = "f5812b1e007e48cff63449a5e9f4e7ebea716b4111f9c4f9a645f91d579bf0c4"; }; - nativeBuildInputs = [ setuptools-scm toml ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ more-itertools ]; - checkInputs = [ pytest pytest-flake8 ]; - - checkPhase = '' - pytest - ''; - # Prevent infinite recursion with pytest doCheck = false; @@ -34,5 +25,6 @@ buildPythonPackage rec { description = "Pathlib-compatible object wrapper for zip files"; homepage = "https://github.com/jaraco/zipp"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/development/python-modules/zodb/default.nix b/nixpkgs/pkgs/development/python-modules/zodb/default.nix index aa7cc6c97ebd..e4f1e403cd97 100644 --- a/nixpkgs/pkgs/development/python-modules/zodb/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zodb/default.nix @@ -2,7 +2,6 @@ , fetchPypi , buildPythonPackage , python -, pythonAtLeast , zope_testrunner , transaction , six @@ -16,46 +15,43 @@ }: buildPythonPackage rec { - pname = "ZODB"; - version = "5.6.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1zh7rd182l15swkbkm3ib0wgyn16xasdz2mzry8k4lwk6dagnm26"; - }; - - # remove broken test - postPatch = '' - rm -vf src/ZODB/tests/testdocumentation.py - ''; - - # ZConfig 3.5.0 is not compatible with Python 3.8 - disabled = pythonAtLeast "3.8"; - - propagatedBuildInputs = [ - transaction - six - zope_interface - zodbpickle - zconfig - persistent - zc_lockfile - BTrees - ]; - - checkInputs = [ - manuel - zope_testrunner - ]; - - checkPhase = '' - ${python.interpreter} -m zope.testrunner --test-path=src [] - ''; - - meta = with lib; { - description = "Zope Object Database: object database and persistence"; - homepage = "https://pypi.python.org/pypi/ZODB"; - license = licenses.zpl21; - maintainers = with maintainers; [ goibhniu ]; - }; + pname = "ZODB"; + version = "5.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zh7rd182l15swkbkm3ib0wgyn16xasdz2mzry8k4lwk6dagnm26"; + }; + + # remove broken test + postPatch = '' + rm -vf src/ZODB/tests/testdocumentation.py + ''; + + propagatedBuildInputs = [ + transaction + six + zope_interface + zodbpickle + zconfig + persistent + zc_lockfile + BTrees + ]; + + checkInputs = [ + manuel + zope_testrunner + ]; + + checkPhase = '' + ${python.interpreter} -m zope.testrunner --test-path=src [] + ''; + + meta = with lib; { + description = "Zope Object Database: object database and persistence"; + homepage = "https://pypi.python.org/pypi/ZODB"; + license = licenses.zpl21; + maintainers = with maintainers; [ goibhniu ]; + }; } diff --git a/nixpkgs/pkgs/development/python-modules/zope_component/default.nix b/nixpkgs/pkgs/development/python-modules/zope_component/default.nix index 41c15fcd1307..a5cbcffe4336 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_component/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_component/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "zope.component"; - version = "5.0.0"; + version = "5.0.1"; src = fetchPypi { inherit pname version; - sha256 = "df541a0501c79123f9ac30c6686a9e45c2690c5c3ae4f2b7f4c6fd1a3aaaf614"; + sha256 = "32cbe426ba8fa7b62ce5b211f80f0718a0c749cc7ff09e3f4b43a57f7ccdf5e5"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix b/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix index 67e8a191d97a..2d1a5880d0de 100644 --- a/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zope_proxy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.proxy"; - version = "4.3.5"; + version = "4.4.0"; src = fetchPypi { inherit pname version; - sha256 = "a66a0d94e5b081d5d695e66d6667e91e74d79e273eee95c1747717ba9cb70792"; + sha256 = "b244904c5148067c3f1899d29a2c1a28faca747b143192c0f825e6bf3170a347"; }; propagatedBuildInputs = [ zope_interface ]; diff --git a/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix b/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix index 067b35dde6ad..a37ee67ed828 100644 --- a/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/nixpkgs/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.28.0"; + version = "0.30.0"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "137m9052ndbii0q6zw9vmwsfimai05q9np4wv06nw2p2mhy5x48p"; + sha256 = "sha256-KYMq0qDVLHzgaYljwYeK58aggD5kBAI1J/RsirGcVvs="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/r-modules/default.nix b/nixpkgs/pkgs/development/r-modules/default.nix index 40ffae5e80fd..149d9c0ac9fd 100644 --- a/nixpkgs/pkgs/development/r-modules/default.nix +++ b/nixpkgs/pkgs/development/r-modules/default.nix @@ -43,21 +43,29 @@ let # deriveBioc = mkDerive { mkHomepage = {name, biocVersion, ...}: "https://bioconductor.org/packages/${biocVersion}/bioc/html/${name}.html"; - mkUrls = {name, version, biocVersion}: [ "mirror://bioc/${biocVersion}/bioc/src/contrib/${name}_${version}.tar.gz" - "mirror://bioc/${biocVersion}/bioc/src/contrib/Archive/${name}/${name}_${version}.tar.gz" - "mirror://bioc/${biocVersion}/bioc/src/contrib/Archive/${name}_${version}.tar.gz" ]; + mkUrls = {name, version, biocVersion}: [ + "mirror://bioc/${biocVersion}/bioc/src/contrib/${name}_${version}.tar.gz" + "mirror://bioc/${biocVersion}/bioc/src/contrib/Archive/${name}/${name}_${version}.tar.gz" + "mirror://bioc/${biocVersion}/bioc/src/contrib/Archive/${name}_${version}.tar.gz" + ]; }; deriveBiocAnn = mkDerive { mkHomepage = {name, ...}: "http://www.bioconductor.org/packages/${name}.html"; - mkUrls = {name, version, biocVersion}: [ "mirror://bioc/${biocVersion}/data/annotation/src/contrib/${name}_${version}.tar.gz" ]; + mkUrls = {name, version, biocVersion}: [ + "mirror://bioc/${biocVersion}/data/annotation/src/contrib/${name}_${version}.tar.gz" + ]; }; deriveBiocExp = mkDerive { mkHomepage = {name, ...}: "http://www.bioconductor.org/packages/${name}.html"; - mkUrls = {name, version, biocVersion}: [ "mirror://bioc/${biocVersion}/data/experiment/src/contrib/${name}_${version}.tar.gz" ]; + mkUrls = {name, version, biocVersion}: [ + "mirror://bioc/${biocVersion}/data/experiment/src/contrib/${name}_${version}.tar.gz" + ]; }; deriveCran = mkDerive { mkHomepage = {name, snapshot, ...}: "http://mran.revolutionanalytics.com/snapshot/${snapshot}/web/packages/${name}/"; - mkUrls = {name, version, snapshot}: [ "http://mran.revolutionanalytics.com/snapshot/${snapshot}/src/contrib/${name}_${version}.tar.gz" ]; + mkUrls = {name, version, snapshot}: [ + "http://mran.revolutionanalytics.com/snapshot/${snapshot}/src/contrib/${name}_${version}.tar.gz" + ]; }; # Overrides package definitions with nativeBuildInputs. @@ -575,6 +583,7 @@ let "RandomFields" "rareNMtests" "rAverage" + "RclusTool" "Rcmdr" "RcmdrPlugin_coin" "RcmdrPlugin_depthTools" @@ -786,7 +795,9 @@ let }); RMySQL = old.RMySQL.overrideDerivation (attrs: { - MYSQL_DIR="${pkgs.libmysqlclient}"; + MYSQL_DIR = "${pkgs.libmysqlclient}"; + PKGCONFIG_CFLAGS = "-I${pkgs.libmysqlclient.dev}/include/mysql"; + NIX_CFLAGS_LINK = "-L${pkgs.libmysqlclient}/lib/mysql -lmysqlclient"; preConfigure = '' patchShebangs configure ''; diff --git a/nixpkgs/pkgs/development/r-modules/generate-r-packages.R b/nixpkgs/pkgs/development/r-modules/generate-r-packages.R index 1ac15ef79e79..f656fdca0922 100755 --- a/nixpkgs/pkgs/development/r-modules/generate-r-packages.R +++ b/nixpkgs/pkgs/development/r-modules/generate-r-packages.R @@ -1,9 +1,16 @@ #!/usr/bin/env Rscript library(data.table) library(parallel) +library(BiocManager) cl <- makeCluster(10) -biocVersion <- 3.12 +biocVersion <- BiocManager:::.version_map() +biocVersion <- biocVersion[biocVersion$R == getRversion()[, 1:2],c("Bioc", "BiocStatus")] +if ("release" %in% biocVersion$BiocStatus) { + biocVersion <- as.numeric(as.character(biocVersion[biocVersion$BiocStatus == "release", "Bioc"])) +} else { + biocVersion <- max(as.numeric(as.character(biocVersion$Bioc))) +} snapshotDate <- Sys.Date()-1 mirrorUrls <- list( bioc=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", biocVersion, "/bioc/src/contrib/") diff --git a/nixpkgs/pkgs/development/r-modules/generate-shell.nix b/nixpkgs/pkgs/development/r-modules/generate-shell.nix index beb378275087..1c96cf05cb54 100644 --- a/nixpkgs/pkgs/development/r-modules/generate-shell.nix +++ b/nixpkgs/pkgs/development/r-modules/generate-shell.nix @@ -5,13 +5,18 @@ stdenv.mkDerivation { buildCommand = "exit 1"; - buildInputs = [ wget ]; + buildInputs = [ + wget + cacert + nix + ]; nativeBuildInputs = [ (rWrapper.override { packages = with rPackages; [ data_table parallel + BiocManager ]; }) ]; diff --git a/nixpkgs/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb b/nixpkgs/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb index 2bf9d84caa06..3106e9c24ca7 100644 --- a/nixpkgs/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb +++ b/nixpkgs/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb @@ -34,6 +34,7 @@ paths.each do |path| ENV["BUNDLE_GEMFILE"] = #{gemfile.dump} ENV.delete 'BUNDLE_PATH' ENV['BUNDLE_FROZEN'] = '1' +ENV['BUNDLE_IGNORE_CONFIG'] = '1' Gem.paths = { 'GEM_HOME' => #{bundle_path.dump} } diff --git a/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix b/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix index 912bace20201..330664836821 100644 --- a/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix +++ b/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.2.20"; - source.sha256 = "259ba486173d72a71df43fee8e3bc8dcb868c8a65e0c4020af3a6f13c3a57ff8"; + version = "2.2.24"; + source.sha256 = "1x3czmqhlyb593ap7mxkk47idi2jnbnrpwj8xlsjdpi7iair9y62"; dontPatchShebangs = true; postFixup = '' diff --git a/nixpkgs/pkgs/development/ruby-modules/with-packages/Gemfile b/nixpkgs/pkgs/development/ruby-modules/with-packages/Gemfile index 401fa3c66b0f..a476912cdd7f 100644 --- a/nixpkgs/pkgs/development/ruby-modules/with-packages/Gemfile +++ b/nixpkgs/pkgs/development/ruby-modules/with-packages/Gemfile @@ -1,5 +1,6 @@ source 'https://rubygems.org' do gem 'addressable' + gem 'ansi' gem 'atk' gem 'awesome_print' gem 'bacon' diff --git a/nixpkgs/pkgs/development/tools/abuild/default.nix b/nixpkgs/pkgs/development/tools/abuild/default.nix new file mode 100644 index 000000000000..144ec8be9d4e --- /dev/null +++ b/nixpkgs/pkgs/development/tools/abuild/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchFromGitLab +, pkg-config +, openssl +, zlib +, busybox +}: + +stdenv.mkDerivation rec { + pname = "abuild"; + version = "3.7.0"; + + src = fetchFromGitLab { + domain = "gitlab.alpinelinux.org"; + owner = "alpine"; + repo = pname; + rev = "v${version}"; + sha256 = "1xsik9hyzzq861bi922sb5r8c6r4wpnpxz5kd30i9f20vvfpp5jx"; + }; + + buildInputs = [ + openssl + zlib + busybox + ]; + + nativeBuildInputs = [ + pkg-config + ]; + + patchPhase = '' + substituteInPlace ./Makefile \ + --replace 'chmod 4555' '#chmod 4555' + ''; + + makeFlags = [ + "prefix=${placeholder "out"}" + "CFLAGS=-Wno-error" + ]; + + installFlags = [ + "sysconfdir=${placeholder "out"}/etc" + ]; + + meta = with lib; { + description = "Alpine Linux build tools"; + homepage = "https://gitlab.alpinelinux.org/alpine/abuild"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ onny ]; + platforms = platforms.unix; + }; + +} diff --git a/nixpkgs/pkgs/development/tools/analysis/binlore/default.nix b/nixpkgs/pkgs/development/tools/analysis/binlore/default.nix new file mode 100644 index 000000000000..aba1c59b979d --- /dev/null +++ b/nixpkgs/pkgs/development/tools/analysis/binlore/default.nix @@ -0,0 +1,112 @@ +{ lib +, fetchFromGitHub +, runCommand +, yallback +, yara +}: + +/* TODO/CAUTION: + +I don't want to discourage use, but I'm not sure how stable +the API is. Have fun, but be prepared to track changes! :) + +For _now_, binlore is basically a thin wrapper around +`<invoke yara> | <postprocess with yallback>` with support +for running it on a derivation, saving the result in the +store, and aggregating results from a set of packages. + +In the longer term, I suspect there are more uses for this +general pattern (i.e., run some analysis tool that produces +a deterministic output and cache the result per package...). + +I'm not sure how that'll look and if it'll be the case that +binlore automatically collects all of them, or if you'll be +configuring which "kind(s)" of lore it generates. Nailing +that down will almost certainly mean reworking the API. + +*/ + +let + src = fetchFromGitHub { + owner = "abathur"; + repo = "binlore"; + rev = "v0.1.3"; + hash = "sha256-+rgv8gAQ3ptOpL/EhbKr/jq+k/4Lpn06/2qON+Ps2wE="; + }; + /* + binlore has one one more yallbacks responsible for + routing the appropriate lore to a named file in the + appropriate format. At some point I might try to do + something fancy with this, but for now the answer to + *all* questions about the lore are: the bare minimum + to get resholve over the next feature hump in time to + hopefully slip this feature in before the branch-off. + */ + # TODO: feeling really uninspired on the API + loreDef = { + # YARA rule file + rules = (src + /execers.yar); + # output filenames; "types" of lore + types = [ "execers" "wrappers" ]; + # shell rule callbacks; see github.com/abathur/yallback + yallback = (src + /execers.yall); + # TODO: + # - echo for debug, can be removed at some point + # - I really just wanted to put the bit after the pipe + # in here, but I'm erring on the side of flexibility + # since this form will make it easier to pilot other + # uses of binlore. + callback = lore: drv: overrides: '' + if [[ -d "${drv}/bin" ]]; then + echo generating binlore for $drv by running: + echo "${yara}/bin/yara ${lore.rules} ${drv}/bin | ${yallback}/bin/yallback ${lore.yallback}" + else + echo "failed to generate binlore for $drv (${drv}/bin doesn't exist)" + fi + '' + + /* + Override lore for some packages. Unsure, but for now: + 1. start with the ~name (pname-version) + 2. remove characters from the end until we find a match + in overrides/ + 3. execute the override script with the list of expected + lore types + */ + '' + i=''${#identifier} + filter= + while [[ $i > 0 ]] && [[ -z "$filter" ]]; do + if [[ -f "${overrides}/''${identifier:0:$i}" ]]; then + filter="${overrides}/''${identifier:0:$i}" + echo using "${overrides}/''${identifier:0:$i}" to generate overriden binlore for $drv + break + fi + ((i--)) || true # don't break build + done # || true # don't break build + if [[ -d "${drv}/bin" ]]; then + ${yara}/bin/yara ${lore.rules} ${drv}/bin | ${yallback}/bin/yallback ${lore.yallback} "$filter" + fi + ''; + }; + overrides = (src + /overrides); + +in rec { + collect = { lore ? loreDef, drvs }: (runCommand "more-binlore" { } '' + mkdir $out + for lorefile in ${toString lore.types}; do + cat ${lib.concatMapStrings (x: x + "/$lorefile ") (map (make lore) (map lib.getBin drvs))} > $out/$lorefile + done + ''); + # TODO: echo for debug, can be removed at some point + make = lore: drv: runCommand "${drv.name}-binlore" { + identifier = drv.name; + drv = drv; + } ('' + mkdir $out + touch $out/{${builtins.concatStringsSep "," lore.types}} + + ${lore.callback lore drv overrides} + + echo binlore for $drv written to $out + ''); +} diff --git a/nixpkgs/pkgs/development/tools/analysis/cvehound/default.nix b/nixpkgs/pkgs/development/tools/analysis/cvehound/default.nix new file mode 100644 index 000000000000..05073bba750d --- /dev/null +++ b/nixpkgs/pkgs/development/tools/analysis/cvehound/default.nix @@ -0,0 +1,41 @@ +{ lib, fetchFromGitHub, coccinelle, gnugrep, python3Packages }: + +with python3Packages; + +buildPythonApplication rec { + pname = "cvehound"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "evdenis"; + repo = "cvehound"; + rev = version; + sha256 = "sha256-m8vpea02flQ8elSvGWv9FqBhsEcBzRYjcUk+dc4kb2M="; + }; + + makeWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ coccinelle gnugrep ]}" + ]; + + propagatedBuildInputs = [ + psutil + setuptools + sympy + ]; + + checkInputs = [ + GitPython + pytestCheckHook + ]; + + # Tries to clone the kernel sources + doCheck = false; + + meta = with lib; { + description = "tool to check linux kernel source dump for known CVEs"; + homepage = "https://github.com/evdenis/cvehound"; + # See https://github.com/evdenis/cvehound/issues/22 + license = with licenses; [ gpl2Only gpl3Only ]; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index e87a6be9cc55..ee4e6d733fc5 100644 --- a/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.159.0"; + version = "0.160.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-NGYaevL6Jpv5rkYlSzIFMIn36ds7ecOJtEToQIzbOsU="; + sha256 = "sha256-pgNxiNzL7Mb/ueBhWBtUi4BGnLnemk3o05K/fqXWE6Q="; }; installPhase = '' diff --git a/nixpkgs/pkgs/development/tools/analysis/rizin/cutter.nix b/nixpkgs/pkgs/development/tools/analysis/rizin/cutter.nix index c1d8ab99063c..3082d9d4f829 100644 --- a/nixpkgs/pkgs/development/tools/analysis/rizin/cutter.nix +++ b/nixpkgs/pkgs/development/tools/analysis/rizin/cutter.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "cutter"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "rizinorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "sha256-CVVUXx6wt9vH3B7NrrlRGnOIrhXQPjV7GmX3O+KtMSM="; + sha256 = "sha256-OC04d3j8Dfsob1dUjNBc1pSQFxJlexzWJ4v0V3QNkno="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix b/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix index ff7717312f87..d76c63044ccd 100644 --- a/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "rizin"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz"; - sha256 = "sha256-lxVsPI+qLenZ0pelvxtHlQ6fhWdQeqoEEHrUGZ5Rdmg="; + sha256 = "sha256-+XW12VIaRfRkLc3Li6ItF4VQfWLNRvxZW2VGtxVYJxY="; }; mesonFlags = [ diff --git a/nixpkgs/pkgs/development/tools/analysis/sparse/default.nix b/nixpkgs/pkgs/development/tools/analysis/sparse/default.nix index efbc46448259..75541dc112a8 100644 --- a/nixpkgs/pkgs/development/tools/analysis/sparse/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/sparse/default.nix @@ -1,27 +1,36 @@ -{ fetchurl, lib, stdenv, pkg-config, libxml2, llvm, perl }: +{ callPackage, fetchurl, lib, stdenv, gtk3, pkg-config, libxml2, llvm, perl, sqlite }: -stdenv.mkDerivation rec { +let + GCC_BASE = "${stdenv.cc.cc}/lib/gcc/${stdenv.hostPlatform.uname.processor}-unknown-linux-gnu/${stdenv.cc.cc.version}"; +in stdenv.mkDerivation rec { pname = "sparse"; - version = "0.5.0"; + version = "0.6.3"; src = fetchurl { url = "mirror://kernel/software/devel/sparse/dist/${pname}-${version}.tar.xz"; - sha256 = "1mc86jc5xdrdmv17nqj2cam2yqygnj6ar1iqkwsx2y37ij8wy7wj"; + sha256 = "16d8c4dhipjzjf8z4z7pix1pdpqydz0v4r7i345f5s09hjnxpxnl"; }; preConfigure = '' - sed -i Makefile -e "s|^PREFIX=.*$|PREFIX=$out|g" + sed -i 's|"/usr/include"|"${stdenv.cc.libc.dev}/include"|' pre-process.c + sed -i 's|qx(\$ccom -print-file-name=)|"${GCC_BASE}"|' cgcc + makeFlags+=" PREFIX=$out" ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libxml2 llvm perl ]; + buildInputs = [ gtk3 libxml2 llvm perl sqlite ]; doCheck = true; + buildFlags = "GCC_BASE:=${GCC_BASE}"; - meta = { + passthru.tests = { + simple-execution = callPackage ./tests.nix { }; + }; + + meta = with lib; { description = "Semantic parser for C"; homepage = "https://git.kernel.org/cgit/devel/sparse/sparse.git/"; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.thoughtpolice ]; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice jkarlson ]; }; } diff --git a/nixpkgs/pkgs/development/tools/analysis/sparse/tests.nix b/nixpkgs/pkgs/development/tools/analysis/sparse/tests.nix new file mode 100644 index 000000000000..5eba254e537a --- /dev/null +++ b/nixpkgs/pkgs/development/tools/analysis/sparse/tests.nix @@ -0,0 +1,24 @@ +{ runCommand, gcc, sparse, writeText }: +let + src = writeText "CODE.c" '' + #include <stdio.h> + #include <stddef.h> + #include <stdlib.h> + + int main(int argc, char *argv[]) { + return EXIT_SUCCESS; + } + ''; +in + runCommand "${sparse.pname}-tests" { buildInputs = [ gcc sparse ]; meta.timeout = 3; } +'' + set -eu + ${sparse}/bin/cgcc ${src} > output 2>&1 || ret=$? + if [[ -z $(<output) ]]; then + mv output $out + else + echo "Test build returned $ret" + cat output + exit 1 + fi +'' diff --git a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix index 443d9b4b1e69..c645cd359032 100644 --- a/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.32.0"; + version = "0.32.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1yf725lfwhvkc1mvzqpl9wchwq2z4pz3z7bp0qlbgdym8z66x8wm"; + sha256 = "sha256-0DK6uTbuIVqrfsrTF0tAbx1WnVpc97nE0zuwTcFoBf8="; }; - vendorSha256 = "0jg8a6vx2n71awr2zdkiisx76qcnj3qj6vj1w9m1c9kczz3mc7m3"; + vendorSha256 = "sha256-ox5Wx/9sJhZq4kFuI/GQlmFzuo5xti8yV+FY0bdR6Ek="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix b/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix index 5ded1e5cab25..66e876ec81a8 100644 --- a/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix +++ b/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.58.6"; + version = "0.58.10"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FTrzEVTmMxXshDOvlSmQEwekde621KIclpFm1oEduEo="; + sha256 = "sha256-VMnc4frDBAkVc9hqUdXAiJ2vNsK9NzkLOUaQWhQQUBU="; }; goPackagePath = "github.com/aquasecurity/tfsec"; diff --git a/nixpkgs/pkgs/development/tools/analysis/yallback/default.nix b/nixpkgs/pkgs/development/tools/analysis/yallback/default.nix new file mode 100644 index 000000000000..17263d1766a8 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/analysis/yallback/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, coreutils +, bashInteractive +}: + +stdenv.mkDerivation rec { + version = "0.1.0"; + pname = "yallback"; + src = fetchFromGitHub { + owner = "abathur"; + repo = "yallback"; + rev = "v${version}"; + hash = "sha256-FaPqpxstKMhqLPFLIdenHgwzDE3gspBbJUSY95tblgI="; + }; + + buildInputs = [ coreutils bashInteractive ]; + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -Dv yallback $out/bin/yallback + wrapProgram $out/bin/yallback --prefix PATH : ${lib.makeBinPath [ coreutils ]} + ''; + + meta = with lib; { + description = "Callbacks for YARA rule matches"; + homepage = "https://github.com/abathur/yallback"; + license = licenses.mit; + maintainers = with maintainers; [ abathur ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/development/tools/apktool/default.nix b/nixpkgs/pkgs/development/tools/apktool/default.nix index cc991af145b3..3b9044a544a9 100644 --- a/nixpkgs/pkgs/development/tools/apktool/default.nix +++ b/nixpkgs/pkgs/development/tools/apktool/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "apktool"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { urls = [ "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" ]; - sha256 = "1r4z0z2c1drjd4ynpf36dklxs3hq1wdnzh63mk2yk4mmk75xg4mk"; + sha256 = "sha256-91CjzSwflC8n9ff9XRfq2jva/wpmQ/SduEfoQlef3aU="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix b/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix index 40c9958c3447..c370cddbe436 100644 --- a/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { --replace "Flask~=1.1.2" "Flask~=2.0" \ --replace "dateparser~=0.7" "dateparser>=0.7" \ --replace "docker~=4.2.0" "docker>=4.2.0" \ - --replace "requests==" "requests~=" \ + --replace "requests==" "requests #" \ --replace "watchdog==" "watchdog #" ''; diff --git a/nixpkgs/pkgs/development/tools/bashate/default.nix b/nixpkgs/pkgs/development/tools/bashate/default.nix index cc5d3aca2c3b..76e523170ca7 100644 --- a/nixpkgs/pkgs/development/tools/bashate/default.nix +++ b/nixpkgs/pkgs/development/tools/bashate/default.nix @@ -12,12 +12,12 @@ buildPythonApplication rec { pname = "bashate"; - version = "2.0.0"; + version = "2.1.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "05qsaaqfpvr6h4g19prbkpznwb9a4dwzyzivdzh9x80cgkq0r6gb"; + sha256 = "a0df143639715dc2fb6cf9aa6907e4a372d6f0a43afeffc55c5fb3ecfe3523c8"; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/tools/boost-build/default.nix b/nixpkgs/pkgs/development/tools/boost-build/default.nix index 5016aa590b5f..c6c66d4d212d 100644 --- a/nixpkgs/pkgs/development/tools/boost-build/default.nix +++ b/nixpkgs/pkgs/development/tools/boost-build/default.nix @@ -2,18 +2,36 @@ , stdenv , fetchFromGitHub , bison +# boost derivation to use for the src and version. +# This is used by the boost derivation to build +# a b2 matching their version (by overriding this +# argument). Infinite recursion is not an issue +# since we only look at src and version of boost. +, useBoost ? {} }: -stdenv.mkDerivation rec { +let + defaultVersion = "4.4.1"; +in + +stdenv.mkDerivation { pname = "boost-build"; - version = "4.4.1"; + version = + if useBoost ? version + then "boost-${useBoost.version}" + else defaultVersion; - src = fetchFromGitHub { + src = useBoost.src or (fetchFromGitHub { owner = "boostorg"; repo = "build"; - rev = version; + rev = defaultVersion; sha256 = "1r4rwlq87ydmsdqrik4ly5iai796qalvw7603mridg2nwcbbnf54"; - }; + }); + + # b2 is in a subdirectory of boost source tarballs + postUnpack = lib.optionalString (useBoost ? src) '' + sourceRoot="$sourceRoot/tools/build" + ''; patches = [ # Upstream defaults to gcc on darwin, but we use clang. @@ -32,8 +50,13 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + ./b2 install --prefix="$out" - ln -s b2 "$out/bin/bjam" + + # older versions of b2 created this symlink, + # which we want to support building via useBoost. + test -e "$out/bin/bjam" || ln -s b2 "$out/bin/bjam" + runHook postInstall ''; diff --git a/nixpkgs/pkgs/development/tools/buf/default.nix b/nixpkgs/pkgs/development/tools/buf/default.nix index 8bc4aee935b9..d2b84ee3f6ee 100644 --- a/nixpkgs/pkgs/development/tools/buf/default.nix +++ b/nixpkgs/pkgs/development/tools/buf/default.nix @@ -9,15 +9,15 @@ buildGoModule rec { pname = "buf"; - version = "0.52.0"; + version = "0.54.1"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WFL+ztFR8kV6cRY1Ax2TheH+xpA58CLnW69jDpMhe3M="; + sha256 = "sha256-v8n1K2YrN8o4IPA2u6Sg5zsOM08nppg29vlU6ycMj9U="; }; - vendorSha256 = "sha256-vbphThpEYDDm1iipcY0QXhKKuLSD87sAxiIUi7SfrAc="; + vendorSha256 = "sha256-WLQ8Bw/UgRVTFEKpDbv6VZkMHQm2tgxekH3J7Sd5vC8="; patches = [ # Skip a test that requires networking to be available to work. diff --git a/nixpkgs/pkgs/development/tools/buf/skip_test_requiring_dotgit.patch b/nixpkgs/pkgs/development/tools/buf/skip_test_requiring_dotgit.patch index c4a7803661ad..92626b72eff7 100644 --- a/nixpkgs/pkgs/development/tools/buf/skip_test_requiring_dotgit.patch +++ b/nixpkgs/pkgs/development/tools/buf/skip_test_requiring_dotgit.patch @@ -1,14 +1,14 @@ -diff --git a/internal/buf/cmd/buf/workspace_test.go b/internal/buf/cmd/buf/workspace_test.go -index e051690..8887837 100644 ---- a/internal/buf/cmd/buf/workspace_test.go -+++ b/internal/buf/cmd/buf/workspace_test.go -@@ -335,6 +335,9 @@ func TestWorkspaceNestedArchive(t *testing.T) { +diff --git a/private/buf/cmd/buf/workspace_test.go b/private/buf/cmd/buf/workspace_test.go +index 25e33dd..f593beb 100644 +--- a/private/buf/cmd/buf/workspace_test.go ++++ b/private/buf/cmd/buf/workspace_test.go +@@ -340,6 +340,9 @@ func TestWorkspaceNestedArchive(t *testing.T) { } func TestWorkspaceGit(t *testing.T) { + // Requires .git directory which we do not retain due to + // `leaveDotGit` non-determinism + t.Skip() + t.Skip("skip until the move to private/buf is merged") // Directory paths specified as a git reference within a workspace. t.Parallel() - testRunStdout( diff --git a/nixpkgs/pkgs/development/tools/buf/skip_test_requiring_network.patch b/nixpkgs/pkgs/development/tools/buf/skip_test_requiring_network.patch index 8d3e15c17ffb..1b0cdfb12c03 100644 --- a/nixpkgs/pkgs/development/tools/buf/skip_test_requiring_network.patch +++ b/nixpkgs/pkgs/development/tools/buf/skip_test_requiring_network.patch @@ -1,8 +1,8 @@ -diff --git a/internal/buf/internal/buftesting/buftesting.go b/internal/buf/internal/buftesting/buftesting.go -index dc8da0c..70ad299 100644 ---- a/internal/buf/internal/buftesting/buftesting.go -+++ b/internal/buf/internal/buftesting/buftesting.go -@@ -100,6 +100,10 @@ func RunActualProtoc( +diff --git a/private/bufpkg/buftesting/buftesting.go b/private/bufpkg/buftesting/buftesting.go +index 82b3ec4..ef8263a 100644 +--- a/private/bufpkg/buftesting/buftesting.go ++++ b/private/bufpkg/buftesting/buftesting.go +@@ -99,6 +99,10 @@ func RunActualProtoc( // GetGoogleapisDirPath gets the path to a clone of googleapis. func GetGoogleapisDirPath(t *testing.T, buftestingDirPath string) string { diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix index 314a1a8b0572..5000d42b47d8 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "bazel-remote"; - version = "2.1.1"; + version = "2.1.3"; src = fetchFromGitHub { owner = "buchgr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tPjjYudUI+LlmdnEvHh+kUpAbmhiNPYhjf8fMglrzIM="; + sha256 = "sha256-pTsiXyIgY0caKZbucwaJqdOs9a+w7PH6tVzNNNxqYyg="; }; - vendorSha256 = "sha256-JNVzy4WbpwH9ZfO78AHQM8pak/ZVQqapxxs9QraMhDo="; + vendorSha256 = "sha256-N0UfC/M6EBbnpBpOTNkGgFEJpTA3VQ2jg9M7kxQQQc8="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index 6cd378492e32..47e01c5ad807 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -27,12 +27,12 @@ }: let - version = "4.1.0"; + version = "4.2.1"; sourceRoot = "."; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "1svf9n345m0ag05hlcw3cwsl6bw2imcn4da25yyzcl3ar5axfxzk"; + sha256 = "Eup6oR4r2xLeHc65k5oi6W9aSAQ3yxfBIzedjg/fXoI="; }; # Update with `eval $(nix-build -A bazel.updater)`, @@ -56,7 +56,7 @@ let else srcs."java_tools_javac11_linux-v10.6.zip") srcs."coverage_output_generator-v2.5.zip" srcs.build_bazel_rules_nodejs - srcs."android_tools_pkg-0.19.0rc3.tar.gz" + srcs."android_tools_pkg-0.23.0.tar.gz" srcs.bazel_toolchains srcs.com_github_grpc_grpc srcs.upb diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json index 3027183aef39..4496343ec691 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/src-deps.json @@ -62,14 +62,14 @@ "patch_cmds_win": [ "Add-Content -Path BUILD -Value \"`nexports_files([`\"WORKSPACE`\"], visibility = [`\"//visibility:public`\"])`n\" -Force" ], - "sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837", - "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz" + "sha256": "ed5290594244c2eeab41f0104519bcef51e27c699ff4b379fcbd25215270513e", + "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.23.0.tar.gz" }, - "android_tools_pkg-0.19.0rc3.tar.gz": { - "name": "android_tools_pkg-0.19.0rc3.tar.gz", - "sha256": "ea5c0589a01e2a9f43c20e5c145d3530e3b3bdbe7322789bc5da38d0ca49b837", + "android_tools_pkg-0.23.0.tar.gz": { + "name": "android_tools_pkg-0.23.0.tar.gz", + "sha256": "ed5290594244c2eeab41f0104519bcef51e27c699ff4b379fcbd25215270513e", "urls": [ - "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.19.0rc3.tar.gz" + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.23.0.tar.gz" ] }, "b1c40e1de81913a3c40e5948f78719c28152486d.zip": { diff --git a/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 4ff5c39fac67..3c9adac6cb1d 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bazel-buildtools"; - version = "4.0.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "buildtools"; rev = version; - sha256 = "0q7b9zh38vblqs5lwhjk28km89p706aky4wv6bwz2vg9gl6bfclq"; + sha256 = "sha256-m6jTDFgjUpQrm77tCnpIRHUFJCFl7GKwu7NoHtoLNa4="; }; - vendorSha256 = "1w6i1lb72mfdyb901gpl9yc6ql73j5kik6li0j5jv5ab2m3j9qvf"; + vendorSha256 = "sha256-buMkRxVLlS2LBJGaGWeR41BsmE/0vgDS8s1VcRYN0fA="; preBuild = '' rm -r warn/docs diff --git a/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix b/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix index 1b4f74f91d43..d940e6ca54d1 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/bloop/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "1.4.8"; + version = "1.4.9"; bloop-coursier-channel = fetchurl { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-coursier.json"; - sha256 = "1hfd5gc98bp4p4m85jva2mlkh10q10n9s5136z8620mmjq93rx70"; + sha256 = "0yh9k98c0cq9ksi3g6rb1q1qblnhcznrc5z1y9ps8cvwv2lx8ly4"; }; bloop-bash = fetchurl { @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = if stdenv.isLinux && stdenv.isx86_64 then "1cs3ng6bj9s7xf6c4xaiqgg5qr34abnipfgc44sy2ljklr7x0jwa" - else if stdenv.isDarwin && stdenv.isx86_64 then "0l9vqvzcmxya1s04cps96skw4dslh3i3ks73dl53ing50zb0ga9r" + outputHash = if stdenv.isLinux && stdenv.isx86_64 then "1hxyzf430g95l6qz1qlq8wvizvy6j3a7a9crb3lcxd67cpbg3x7i" + else if stdenv.isDarwin && stdenv.isx86_64 then "0x5yqf3i8y6s5h27yr0jkpvj6ch25ckx2802dmaxlgq6gz0fx6w2" else throw "unsupported platform"; }; diff --git a/nixpkgs/pkgs/development/tools/build-managers/cmake/application-services.patch b/nixpkgs/pkgs/development/tools/build-managers/cmake/application-services.patch index f64e220eb29b..7c77336b41be 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/cmake/application-services.patch +++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/application-services.patch @@ -1,8 +1,8 @@ diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt -index 1b6bb00d4c..487114daa8 100644 +index 9a18184fd3..278d146dd1 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt -@@ -893,7 +893,6 @@ endif() +@@ -933,7 +933,6 @@ endif() # On Apple we need CoreFoundation and CoreServices if(APPLE) target_link_libraries(CMakeLib "-framework CoreFoundation") @@ -11,27 +11,25 @@ index 1b6bb00d4c..487114daa8 100644 if(WIN32 AND NOT UNIX) diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx -index a5ce5d18f4..3d6838ce82 100644 +index 77403b076a..d5aac95e1e 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx -@@ -43,11 +43,10 @@ - - struct cmLinkImplementation; +@@ -49,10 +49,6 @@ struct cmLinkImplementation; #if !defined(CMAKE_BOOTSTRAP) && defined(__APPLE__) --# define HAVE_APPLICATION_SERVICES --# include <ApplicationServices/ApplicationServices.h> -+# include <CoreFoundation/CoreFoundation.h> + # include <CoreFoundation/CoreFoundation.h> +-# if !TARGET_OS_IPHONE +-# define HAVE_APPLICATION_SERVICES +-# include <ApplicationServices/ApplicationServices.h> +-# endif #endif - - #if !defined(CMAKE_BOOTSTRAP) - # include "cmXMLParser.h" + #if !defined(CMAKE_BOOTSTRAP) diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt -index bfcaf30bb7..1da540aee5 100644 +index 79452ffff6..a848731b7e 100644 --- a/Utilities/cmlibarchive/CMakeLists.txt +++ b/Utilities/cmlibarchive/CMakeLists.txt -@@ -2007,11 +2007,6 @@ IF(ENABLE_TEST) +@@ -2013,11 +2013,6 @@ IF(ENABLE_TEST) ENDIF(ENABLE_TEST) ENDIF() diff --git a/nixpkgs/pkgs/development/tools/build-managers/cmake/darwin-always-set-runtime-c-flag.patch b/nixpkgs/pkgs/development/tools/build-managers/cmake/darwin-always-set-runtime-c-flag.patch new file mode 100644 index 000000000000..dc10e6b34231 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/darwin-always-set-runtime-c-flag.patch @@ -0,0 +1,14 @@ +Revert of commit 1af23c4de2c7d58c06171d70b37794b5c860d5f4. +--- b/Modules/Platform/Darwin.cmake ++++ a/Modules/Platform/Darwin.cmake +@@ -47,9 +47,7 @@ + set(CMAKE_SHARED_MODULE_SUFFIX ".so") + set(CMAKE_MODULE_EXISTS 1) + set(CMAKE_DL_LIBS "") ++set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") +-if(NOT "${_CURRENT_OSX_VERSION}" VERSION_LESS "10.5") +- set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") +-endif() + + foreach(lang C CXX OBJC OBJCXX) + set(CMAKE_${lang}_OSX_COMPATIBILITY_VERSION_FLAG "-compatibility_version ") diff --git a/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix b/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix index a29ac38eb136..33dbc25d9bf8 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix @@ -2,6 +2,7 @@ , bzip2, curlMinimal, expat, libarchive, xz, zlib, libuv, rhash , buildPackages # darwin attributes +, SystemConfiguration , ps , isBootstrap ? false , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) @@ -13,15 +14,14 @@ stdenv.mkDerivation rec { pname = "cmake" - + lib.optionalString isBootstrap "-boot" - + lib.optionalString useNcurses "-cursesUI" - + lib.optionalString withQt5 "-qt5UI"; - version = "3.19.7"; + + lib.optionalString isBootstrap "-boot" + + lib.optionalString useNcurses "-cursesUI" + + lib.optionalString withQt5 "-qt5UI"; + version = "3.21.2"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; - # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "sha256-WKFfDVagr8zDzFNxI0/Oc/zGyPnb13XYmOUQuDF1WI4="; + sha256 = "sha256-lCdeC2HIS7QnEPUyCiPG3LLG7gMq59KmFvU/aLPSFlk="; }; patches = [ @@ -34,7 +34,11 @@ stdenv.mkDerivation rec { # Derived from https://github.com/libuv/libuv/commit/1a5d4f08238dd532c3718e210078de1186a5920d ./libuv-application-services.patch - ] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch; + ] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch + # Derived from https://github.com/curl/curl/commit/31f631a142d855f069242f3e0c643beec25d1b51 + ++ lib.optional (stdenv.isDarwin && isBootstrap) ./remove-systemconfiguration-dep.patch + # On Darwin, always set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG. + ++ lib.optional stdenv.isDarwin ./darwin-always-set-runtime-c-flag.patch; outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" "info" ]; @@ -48,11 +52,11 @@ stdenv.mkDerivation rec { ++ lib.optionals buildDocs [ texinfo ] ++ lib.optionals withQt5 [ wrapQtAppsHook ]; - buildInputs = [] - ++ lib.optionals useSharedLibraries [ bzip2 curlMinimal expat libarchive xz zlib libuv rhash ] + buildInputs = lib.optionals useSharedLibraries [ bzip2 curlMinimal expat libarchive xz zlib libuv rhash ] ++ lib.optional useOpenSSL openssl ++ lib.optional useNcurses ncurses - ++ lib.optional withQt5 qtbase; + ++ lib.optional withQt5 qtbase + ++ lib.optional (stdenv.isDarwin && !isBootstrap) SystemConfiguration; propagatedBuildInputs = lib.optional stdenv.isDarwin ps; @@ -62,27 +66,24 @@ stdenv.mkDerivation rec { --subst-var-by libc_bin ${lib.getBin stdenv.cc.libc} \ --subst-var-by libc_dev ${lib.getDev stdenv.cc.libc} \ --subst-var-by libc_lib ${lib.getLib stdenv.cc.libc} - '' - # CC_FOR_BUILD and CXX_FOR_BUILD are used to bootstrap cmake - + '' + # CC_FOR_BUILD and CXX_FOR_BUILD are used to bootstrap cmake configureFlags="--parallel=''${NIX_BUILD_CORES:-1} CC=$CC_FOR_BUILD CXX=$CXX_FOR_BUILD $configureFlags" ''; configureFlags = [ "--docdir=share/doc/${pname}${version}" ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup - ++ lib.optional withQt5 "--qt-gui" - ++ lib.optionals buildDocs [ - "--sphinx-build=${sphinx}/bin/sphinx-build" - "--sphinx-man" - "--sphinx-info" - ] - # Workaround https://gitlab.kitware.com/cmake/cmake/-/issues/20568 - ++ lib.optionals stdenv.hostPlatform.is32bit [ - "CFLAGS=-D_FILE_OFFSET_BITS=64" - "CXXFLAGS=-D_FILE_OFFSET_BITS=64" - ] - ++ [ + ++ lib.optional withQt5 "--qt-gui" + ++ lib.optionals buildDocs [ + "--sphinx-build=${sphinx}/bin/sphinx-build" + "--sphinx-man" + "--sphinx-info" + ] + # Workaround https://gitlab.kitware.com/cmake/cmake/-/issues/20568 + ++ lib.optionals stdenv.hostPlatform.is32bit [ + "CFLAGS=-D_FILE_OFFSET_BITS=64" + "CXXFLAGS=-D_FILE_OFFSET_BITS=64" + ] ++ [ "--" # We should set the proper `CMAKE_SYSTEM_NAME`. # http://www.cmake.org/Wiki/CMake_Cross_Compiling @@ -117,8 +118,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://cmake.org/"; - changelog = "https://cmake.org/cmake/help/v${lib.versions.majorMinor version}/" - + "release/${lib.versions.majorMinor version}.html"; + changelog = "https://cmake.org/cmake/help/v${lib.versions.majorMinor version}/release/${lib.versions.majorMinor version}.html"; description = "Cross-Platform Makefile Generator"; longDescription = '' CMake is an open-source, cross-platform family of tools designed to diff --git a/nixpkgs/pkgs/development/tools/build-managers/cmake/remove-systemconfiguration-dep.patch b/nixpkgs/pkgs/development/tools/build-managers/cmake/remove-systemconfiguration-dep.patch new file mode 100644 index 000000000000..984aaf983067 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/build-managers/cmake/remove-systemconfiguration-dep.patch @@ -0,0 +1,89 @@ +From 76523ca5b2227085bb65253900e866b08a2b5efb Mon Sep 17 00:00:00 2001 +From: Tobias Mayer <tobim@fastmail.fm> +Date: Fri, 30 Jul 2021 10:50:16 +0200 +Subject: [PATCH] Disable NAT64 address synthesis on darwin + +This intentionally breaks the feature by partially reverting +https://github.com/curl/curl/commit/31f631a142d855f069242f3e0c643beec25d1b51 + +This is a stop-gap to get CMake to build without the SystemConfiguration +framework. +--- + Utilities/cmcurl/CMakeLists.txt | 8 -------- + Utilities/cmcurl/lib/curl_setup.h | 4 ---- + Utilities/cmcurl/lib/hostip.c | 17 ----------------- + 3 files changed, 29 deletions(-) + +diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt +index 16ef037ccc..17564bbb69 100644 +--- a/Utilities/cmcurl/CMakeLists.txt ++++ b/Utilities/cmcurl/CMakeLists.txt +@@ -511,14 +511,6 @@ if(CMAKE_USE_SECTRANSP) + list(APPEND CURL_LIBS "${COREFOUNDATION_FRAMEWORK}" "${SECURITY_FRAMEWORK}") + endif() + +-if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +- find_library(SYSTEMCONFIGURATION_FRAMEWORK "SystemConfiguration") +- if(NOT SYSTEMCONFIGURATION_FRAMEWORK) +- message(FATAL_ERROR "SystemConfiguration framework not found") +- endif() +- list(APPEND CURL_LIBS "${SYSTEMCONFIGURATION_FRAMEWORK}") +-endif() +- + if(CMAKE_USE_OPENSSL) + find_package(OpenSSL) + if(NOT OpenSSL_FOUND) +diff --git a/Utilities/cmcurl/lib/curl_setup.h b/Utilities/cmcurl/lib/curl_setup.h +index 2d13a40a55..35160bc0f5 100644 +--- a/Utilities/cmcurl/lib/curl_setup.h ++++ b/Utilities/cmcurl/lib/curl_setup.h +@@ -251,11 +251,7 @@ + * performing this task will result in a synthesized IPv6 address. + */ + #if defined(__APPLE__) && !defined(USE_ARES) +-#include <TargetConditionals.h> + #define USE_RESOLVE_ON_IPS 1 +-# if defined(TARGET_OS_OSX) && TARGET_OS_OSX +-# define CURL_OSX_CALL_COPYPROXIES 1 +-# endif + #endif + + #ifdef USE_LWIPSOCK +diff --git a/Utilities/cmcurl/lib/hostip.c b/Utilities/cmcurl/lib/hostip.c +index e0e3cfc2cb..45190a100b 100644 +--- a/Utilities/cmcurl/lib/hostip.c ++++ b/Utilities/cmcurl/lib/hostip.c +@@ -68,10 +68,6 @@ + #include "curl_memory.h" + #include "memdebug.h" + +-#if defined(ENABLE_IPV6) && defined(CURL_OSX_CALL_COPYPROXIES) +-#include <SystemConfiguration/SCDynamicStoreCopySpecific.h> +-#endif +- + #if defined(CURLRES_SYNCH) && \ + defined(HAVE_ALARM) && defined(SIGALRM) && defined(HAVE_SIGSETJMP) + /* alarm-based timeouts can only be used with all the dependencies satisfied */ +@@ -533,19 +529,6 @@ enum resolve_t Curl_resolv(struct Curl_easy *data, + return CURLRESOLV_ERROR; + } + +-#if defined(ENABLE_IPV6) && defined(CURL_OSX_CALL_COPYPROXIES) +- /* +- * The automagic conversion from IPv4 literals to IPv6 literals only works +- * if the SCDynamicStoreCopyProxies system function gets called first. As +- * Curl currently doesn't support system-wide HTTP proxies, we therefore +- * don't use any value this function might return. +- * +- * This function is only available on a macOS and is not needed for +- * IPv4-only builds, hence the conditions above. +- */ +- SCDynamicStoreCopyProxies(NULL); +-#endif +- + #ifndef USE_RESOLVE_ON_IPS + /* First check if this is an IPv4 address string */ + if(Curl_inet_pton(AF_INET, hostname, &in) > 0) +-- +2.32.0 + diff --git a/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix b/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix index f59e74b02f4e..95994e0924db 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/conan/default.nix @@ -21,13 +21,6 @@ let newPython = python3.override { sha256 = "1dv6mjsm67l1razcgmq66riqmsb36wns17mnipqr610v0z0zf5j0"; }; }); - urllib3 = super.urllib3.overridePythonAttrs (oldAttrs: rec { - version = "1.25.11"; - src = oldAttrs.src.override { - inherit version; - sha256 = "18hpzh1am1dqx81fypn57r2wk565fi4g14292qrc5jm1h9dalzld"; - }; - }); # https://github.com/conan-io/conan/issues/8876 pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec { version = "1.7.1"; @@ -59,14 +52,14 @@ let newPython = python3.override { }; in newPython.pkgs.buildPythonApplication rec { - version = "1.35.0"; + version = "1.40.0"; pname = "conan"; src = fetchFromGitHub { owner = "conan-io"; repo = "conan"; rev = version; - sha256 = "19rgylkjxvv47vz5vgh46rw108xskpv7lmax8y2fnm2wd1j3bq9c"; + sha256 = "1sb4w4wahasrwxkag1g79f135601sca6iafv4r4836f2vi48ka2d"; }; propagatedBuildInputs = with newPython.pkgs; [ @@ -106,12 +99,6 @@ in newPython.pkgs.buildPythonApplication rec { # Not enabled right now due to time constraints/failing tests that I didn't have time to track down doCheck = false; - postPatch = '' - substituteInPlace conans/requirements.txt \ - --replace "deprecation>=2.0, <2.1" "deprecation" \ - --replace "six>=1.10.0,<=1.15.0" "six>=1.10.0,<=1.16.0" - ''; - meta = with lib; { homepage = "https://conan.io"; description = "Decentralized and portable C/C++ package manager"; diff --git a/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix index cdcae79dde1e..5e2ef7ef9442 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix @@ -66,9 +66,9 @@ rec { gradle_latest = gradle_7; gradle_7 = gradleGen (gradleSpec { - version = "7.1.1"; - nativeVersion = "0.22-milestone-16"; - sha256 = "0p9nss2xywwhjbpdcyma3d0ijvkav9hzmldpkcp447ch92cqd2xz"; + version = "7.2"; + nativeVersion = "0.22-milestone-21"; + sha256 = "1pg6w5czysywsgdvmll5bwd2p6y99cn5sn3gw69cps9mkjd710gm"; }); gradle_6_8 = gradleGen (gradleSpec { diff --git a/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix b/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix index 280173dc0c0b..5d59478cdf49 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "qbs"; - version = "1.19.1"; + version = "1.20.0"; src = fetchFromGitHub { owner = "qbs"; repo = "qbs"; rev = "v${version}"; - sha256 = "sha256-td+xXxpjty5jgorlVySG+8yUd9hujInXIlCfqCRUg9k="; + sha256 = "sha256-gKabKjd8GT5eFmobUFK6IUQ+b8Jjn/Kr68i1fXgJS4Q="; }; nativeBuildInputs = [ qmake ]; diff --git a/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix b/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix index b79e9ff1b7f3..53cb289cb30e 100644 --- a/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/nixpkgs/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "d77c348e3f2fdfbd90b51ce0e5894405bb08687c"; - version = "2021-08-04"; + rev = "bd4c3e80a0a07c78407422de13039ce5889fb4b0"; + version = "2021-09-15"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "u0stt4w0iK4h+5PMkqjp9m8kqvrKvM3m7lBcV2yXPKU="; + sha256 = "NBERpDSY1FoGzD0AXJx1yTG37fjzw+VsTAgkIBfJdhs="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/development/tools/buildah/default.nix b/nixpkgs/pkgs/development/tools/buildah/default.nix index 7584adc0417f..ee30703c396d 100644 --- a/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.22.3"; + version = "1.23.0"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-e4Y398VyvoDo5WYyLeZJUMmb0HgWNBWj+hCPxdUlZNY="; + sha256 = "sha256-MhPbABGgQG0sAHVnUA9PUGqaVYWd/YsY2pyf8H4uTe8="; }; outputs = [ "out" "man" ]; diff --git a/nixpkgs/pkgs/development/tools/comby/default.nix b/nixpkgs/pkgs/development/tools/comby/default.nix index ca0a24133045..9b77740979e5 100644 --- a/nixpkgs/pkgs/development/tools/comby/default.nix +++ b/nixpkgs/pkgs/development/tools/comby/default.nix @@ -1,10 +1,20 @@ -{ ocamlPackages, fetchFromGitHub, lib, zlib, pkg-config, cacert, gmp, libev -, autoconf, sqlite, stdenv }: +{ ocamlPackages +, fetchFromGitHub +, lib +, zlib +, pkg-config +, cacert +, gmp +, libev +, autoconf +, sqlite +, stdenv +}: let - mkCombyPackage = { pname, extraBuildInputs ? [ ], extraNativeInputs ? [ ] }: + mkCombyPackage = { pname, extraBuildInputs ? [ ], extraNativeInputs ? [ ], preBuild ? "" }: ocamlPackages.buildDunePackage rec { - inherit pname; - version = "1.5.1"; + inherit pname preBuild; + version = "1.7.0"; useDune2 = true; minimumOcamlVersion = "4.08.1"; doCheck = true; @@ -13,7 +23,7 @@ let owner = "comby-tools"; repo = "comby"; rev = version; - sha256 = "1ipfrr6n1jyyryhm9zpn8wwgzfac1zgbjdjzrm00qcwc17r8x2hf"; + sha256 = "sha256-Y2RcYvJOSqppmxxG8IZ5GlFkXCOIQU+1jJZ6j+PBHC4"; }; nativeBuildInputs = [ @@ -41,9 +51,21 @@ let }; combyKernel = mkCombyPackage { pname = "comby-kernel"; }; -in mkCombyPackage { + combySemantic = mkCombyPackage { pname = "comby-semantic"; extraBuildInputs = [ ocamlPackages.cohttp-lwt-unix ]; }; +in +mkCombyPackage { pname = "comby"; + # tests have to be removed before building otherwise installPhase will fail + # cli tests expect a path to the built binary + preBuild = '' + substituteInPlace test/common/dune \ + --replace "test_cli_list" "" \ + --replace "test_cli_helper" "" \ + --replace "test_cli" "" + rm test/common/{test_cli_list,test_cli_helper,test_cli}.ml + ''; + extraBuildInputs = [ zlib gmp @@ -62,6 +84,7 @@ in mkCombyPackage { ocamlPackages.lwt_react ocamlPackages.tls combyKernel + combySemantic ] ++ (if !stdenv.isAarch32 && !stdenv.isAarch64 then [ ocamlPackages.hack_parallel ] else @@ -74,4 +97,5 @@ in mkCombyPackage { ocamlPackages.ppx_expect ocamlPackages.dune-configurator ]; + } diff --git a/nixpkgs/pkgs/development/tools/conftest/default.nix b/nixpkgs/pkgs/development/tools/conftest/default.nix index 74e823ad9b84..2abe30b413fe 100644 --- a/nixpkgs/pkgs/development/tools/conftest/default.nix +++ b/nixpkgs/pkgs/development/tools/conftest/default.nix @@ -2,18 +2,16 @@ buildGoModule rec { pname = "conftest"; - version = "0.27.0"; + version = "0.28.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "v${version}"; - sha256 = "sha256-Yc/aejGLMbAqpIRTVQQ3lv7/oyr7tVAy41Gx6198Eos="; + sha256 = "sha256-o2P14Nsu77AXO+UnMBXthhP3Q7kI7nd/lI6GFE2cs3M="; }; - vendorSha256 = "sha256-jI5bX6S2C0ckiiieVlaRNEsLS/5gGkC3o/xauDtCOjA="; - - doCheck = false; + vendorSha256 = "sha256-zzckZI/n00BBl166S7uonJFNQ4RJGLCkDyfLRoHZOtA="; ldflags = [ "-s" @@ -21,8 +19,18 @@ buildGoModule rec { "-X github.com/open-policy-agent/conftest/internal/commands.version=${version}" ]; + HOME = "$TMPDIR"; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/conftest --version | grep ${version} > /dev/null + ''; + meta = with lib; { description = "Write tests against structured configuration data"; + downloadPage = "https://github.com/open-policy-agent/conftest"; + homepage = "https://www.conftest.dev"; + license = licenses.asl20; longDescription = '' Conftest helps you write tests against structured configuration data. Using Conftest you can write tests for your Kubernetes configuration, @@ -33,8 +41,6 @@ buildGoModule rec { assertions. You can read more about Rego in 'How do I write policies' in the Open Policy Agent documentation. ''; - inherit (src.meta) homepage; - license = licenses.asl20; - maintainers = with maintainers; [ yurrriq jk ]; + maintainers = with maintainers; [ jk superherointj yurrriq ]; }; } diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index a9fbdb09d977..7ed0fa1911aa 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -3,13 +3,13 @@ nixosTests }: buildGoModule rec { name = "buildkite-agent-${version}"; - version = "3.32.1"; + version = "3.32.3"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-bwxxjpIBVzFfjewUwDjFNN9zcaL3ihYjWOlWdrhf1o0="; + sha256 = "sha256-uckFsM8UWkiDmTpLRu34qKdjgEQrbsa+K8QtVS2PJ7A="; }; vendorSha256 = "sha256-n3XRxpEKjHf7L7fcGscWTVKBtot9waZbLoS9cG0kHfI="; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 6eac6d52b799..a95f9914fe71 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,11 +1,11 @@ { lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { - version = "1.3.1"; + version = "1.4.0"; pname = "drone-cli"; revision = "v${version}"; - vendorSha256 = "sha256-IlQ83lhRiobjvXa4FvavwLAXe7Bi7oLXRAr+1kvIHhc="; + vendorSha256 = "sha256-v2ijRZ5xvYkL3YO7Xfgalzxzd9C5BKdaQF7VT5UoqOk="; doCheck = false; @@ -17,7 +17,7 @@ buildGoModule rec { owner = "drone"; repo = "drone-cli"; rev = revision; - sha256 = "sha256-EUvwKQgQTX8wX9h/rMlCYuB0S/OhPo4Ynlz5QQOWJlU="; + sha256 = "sha256-+70PWHGd8AQP6ih0b/+VOIbJcF8tSOAO9wsGqQWX+bU="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix index 0b000b0f4d83..feba78b0681b 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "7.4.0"; + version = "7.5.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-UvEPTZtQWztl7ZC1XrBxE8+emlXQjMG4IJEti5vVxUM="; + sha256 = "sha256-5+zAIvm4RgXc09HwSNlSjChL4NhMMiGDMtAVlmV/BYE="; }; - vendorSha256 = "sha256-IY+HGgoKNS/j3FGCX3F3EK1GehBjs3Z1K8V3O7a3swk="; + vendorSha256 = "sha256-Z6zxSbzn1/u+3Z9PeRl6iO0pVlw/lGtFjAuZpGrRDDY="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix index b7da1970da2b..c667eb8c12e9 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -30,16 +30,17 @@ let dotnetSdk = dotnetCorePackages.sdk_3_1; runtimeId = "linux-x64"; + fakeSha1 = "0000000000000000000000000000000000000000"; in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.281.1"; + version = "2.283.1"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; - rev = "c8caf59bb7adaa87c4cf8f61372670d338a13f2d"; # v${version} - sha256 = "sha256-Nl1FSjwweVqdQEVhqt4PEcqZbF7htNT279yx1nGuAe0="; + rev = "v${version}"; + sha256 = "sha256-S4Mql8lyHxahhYGoo91mlN6DrwKhyj1em0dv561j2l8="; }; nativeBuildInputs = [ @@ -67,8 +68,9 @@ stdenv.mkDerivation rec { ./patches/use-get-directory-for-diag.patch # Don't try to install systemd service ./patches/dont-install-systemd-service.patch - # Don't try to self-update runner (cannot be disabled, see https://github.com/actions/runner/issues/485) - ./patches/ignore-self-update.patch + # Prevent the runner from starting a self-update for new versions + # (upstream issue: https://github.com/actions/runner/issues/485) + ./patches/prevent-self-update.patch ]; postPatch = '' @@ -126,7 +128,7 @@ stdenv.mkDerivation rec { -p:PackageRuntime="${runtimeId}" \ -p:BUILDCONFIG="Release" \ -p:RunnerVersion="${version}" \ - -p:GitInfoCommitHash="${src.rev}" \ + -p:GitInfoCommitHash="${fakeSha1}" \ src/dir.proj runHook postBuild @@ -191,7 +193,7 @@ stdenv.mkDerivation rec { -p:PackageRuntime="${runtimeId}" \ -p:BUILDCONFIG="Debug" \ -p:RunnerVersion="${version}" \ - -p:GitInfoCommitHash="${src.rev}" \ + -p:GitInfoCommitHash="${fakeSha1}" \ src/dir.proj runHook postCheck diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/deps.nix b/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/deps.nix index a556a83aa49f..a0e9230517b6 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/deps.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/deps.nix @@ -9,1209 +9,1504 @@ in [ (fetchNuGet { - name = "Castle.Core"; + name = "castle.core"; version = "4.4.0"; sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; }) - (fetchNuGet { - name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.1.8"; - sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135"; + name = "microsoft.aspnetcore.app.runtime.linux-x64"; + version = "3.1.19"; + sha256 = "19z4zrchaxcz0a33c33n1qd11z9khj4323nfzsbzah0xxkkj8ka8"; }) - (fetchNuGet { - name = "Microsoft.AspNet.WebApi.Client"; + name = "microsoft.aspnet.webapi.client"; version = "5.2.4"; sha256 = "00fkczf69z2rwarcd8kjjdp47517a0ca6lggn72qbilsp03a5scj"; }) - (fetchNuGet { - name = "Microsoft.IdentityModel.Logging"; + name = "microsoft.csharp"; + version = "4.0.1"; + sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; + }) + (fetchNuGet { + name = "microsoft.identitymodel.logging"; version = "5.2.1"; sha256 = "1gpka9jm2gl6f07pcwzwvaxw9xq1a19i9fskn0qs921c5grhlp3g"; }) - (fetchNuGet { - name = "Microsoft.IdentityModel.Tokens"; + name = "microsoft.identitymodel.tokens"; version = "5.2.1"; sha256 = "03v6145vr1winq8xxfikydicds4f10qmy1ybyz2gfimnzzx51w00"; }) - (fetchNuGet { - name = "Microsoft.NetCore.App.Runtime.linux-x64"; - version = "3.1.8"; - sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa"; + name = "microsoft.netcore.app.runtime.linux-x64"; + version = "3.1.19"; + sha256 = "10c9bq1z8j173n9jzamgplbxq101yscwdhksshn1ybisn7cr5g0h"; }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; + name = "microsoft.netcore.platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; + name = "microsoft.netcore.platforms"; + version = "1.0.1-rc2-24027"; + sha256 = "1a0w5fv8slfr4q7m3mh78lb9awdwyz4zv3bb73vybkyq1f6z7lx8"; + }) + (fetchNuGet { + name = "microsoft.netcore.platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { - name = "Microsoft.NETCore.Platforms"; + name = "microsoft.netcore.platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) - (fetchNuGet { - name = "Microsoft.NETCore.Targets"; + name = "microsoft.netcore.runtime"; + version = "1.0.2-rc2-24027"; + sha256 = "0ippdn16381l8i2iy63i45nk0p303fjbd4amh7biwvqxgagfbvhh"; + }) + (fetchNuGet { + name = "microsoft.netcore.runtime.coreclr"; + version = "1.0.2-rc2-24027"; + sha256 = "05y0jz6vfl9zs0lmmwsz6arf7r0mg2dm93ymizrzmqn706krz45x"; + }) + (fetchNuGet { + name = "microsoft.netcore.runtime.native"; + version = "1.0.2-rc2-24027"; + sha256 = "11hpbbmnjbskw7s6sx32l6qzz63kshx0gyp3sawyxk82nbqrissl"; + }) + (fetchNuGet { + name = "microsoft.netcore.targets"; + version = "1.0.1"; + sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; + }) + (fetchNuGet { + name = "microsoft.netcore.targets"; + version = "1.0.1-rc2-24027"; + sha256 = "1j1458jska7540ng7fdf5i06k2vy71mxl5dld4x5s8gfndxpdzdj"; + }) + (fetchNuGet { + name = "microsoft.netcore.targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { - name = "Microsoft.NET.Test.Sdk"; + name = "microsoft.netcore.windows.apisets"; + version = "1.0.1-rc2-24027"; + sha256 = "034m9p417iq3yzipg393wp4bddsh80di9iad78vvvh7w5difdv0x"; + }) + (fetchNuGet { + name = "microsoft.net.test.sdk"; version = "15.0.0"; sha256 = "1ca9v53dphsgk22spilfwq1hjzp2sgrrj85v7hd7wfc6gjh31mb5"; }) - (fetchNuGet { - name = "Microsoft.TestPlatform.ObjectModel"; + name = "microsoft.testplatform.objectmodel"; version = "15.0.0"; sha256 = "0xqssz2y8jzqph6kv1fzy00wzjcnc2whhlf8jsszgpn69ld7f1rb"; }) - (fetchNuGet { - name = "Microsoft.TestPlatform.TestHost"; + name = "microsoft.testplatform.testhost"; version = "15.0.0"; sha256 = "1mi59wxwdqyzmkan0v9qrar96f50xs6k38xzv3l6ky859si2qk4b"; }) - (fetchNuGet { - name = "Microsoft.Win32.Primitives"; + name = "microsoft.win32.primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) - (fetchNuGet { - name = "Microsoft.Win32.Primitives"; + name = "microsoft.win32.primitives"; + version = "4.0.1-rc2-24027"; + sha256 = "1rvb076s4ksvmbvnxi4sv2f9f22izqp2rca0scjqya5x1qhcgkp0"; + }) + (fetchNuGet { + name = "microsoft.win32.primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { - name = "Microsoft.Win32.Registry"; + name = "microsoft.win32.registry"; version = "4.0.0"; sha256 = "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k"; }) - (fetchNuGet { - name = "Microsoft.Win32.Registry"; + name = "microsoft.win32.registry"; version = "4.4.0"; sha256 = "088j2anh1rnkxdcycw5kgp97ahk7cj741y6kask84880835arsb6"; }) - (fetchNuGet { - name = "Minimatch"; + name = "minimatch"; version = "2.0.0"; sha256 = "1k84q1bz1qq2nh35nip8vmi65wixsh5y7piln5b4n172xzhfqvx0"; }) - (fetchNuGet { - name = "Moq"; + name = "moq"; version = "4.11.0"; sha256 = "08bnk80scjjqnkdbjam8grcqrw2rvj9z7556hiznac7in3fcp77w"; }) - (fetchNuGet { - name = "NETStandard.Library"; + name = "netstandard.library"; + version = "1.5.0-rc2-24027"; + sha256 = "1kazwidj63w53r1s6fd8sgykb70kdic27fg9qhg74qzwm354imwm"; + }) + (fetchNuGet { + name = "netstandard.library"; version = "1.6.0"; sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; }) - (fetchNuGet { - name = "NETStandard.Library"; + name = "netstandard.library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - - (fetchNuGet { - name = "Newtonsoft.Json"; - version = "10.0.1"; - sha256 = "15ncqic3p2rzs8q8ppi0irl2miq75kilw4lh8yfgjq96id0ds3hv"; - }) - (fetchNuGet { - name = "Newtonsoft.Json"; + name = "newtonsoft.json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) - (fetchNuGet { - name = "Newtonsoft.Json"; + name = "newtonsoft.json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) - (fetchNuGet { - name = "Newtonsoft.Json.Bson"; + name = "newtonsoft.json.bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; }) - (fetchNuGet { - name = "runtime.any.System.Collections"; + name = "runtime.any.system.collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { - name = "runtime.any.System.Diagnostics.Tools"; + name = "runtime.any.system.diagnostics.tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) - (fetchNuGet { - name = "runtime.any.System.Diagnostics.Tracing"; + name = "runtime.any.system.diagnostics.tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) - (fetchNuGet { - name = "runtime.any.System.Globalization"; + name = "runtime.any.system.globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { - name = "runtime.any.System.Globalization.Calendars"; + name = "runtime.any.system.globalization.calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) - (fetchNuGet { - name = "runtime.any.System.IO"; + name = "runtime.any.system.io"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { - name = "runtime.any.System.Reflection"; + name = "runtime.any.system.reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { - name = "runtime.any.System.Reflection.Extensions"; + name = "runtime.any.system.reflection.extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { - name = "runtime.any.System.Reflection.Primitives"; + name = "runtime.any.system.reflection.primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { - name = "runtime.any.System.Resources.ResourceManager"; + name = "runtime.any.system.resources.resourcemanager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { - name = "runtime.any.System.Runtime"; + name = "runtime.any.system.runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { - name = "runtime.any.System.Runtime.Handles"; + name = "runtime.any.system.runtime.handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { - name = "runtime.any.System.Runtime.InteropServices"; + name = "runtime.any.system.runtime.interopservices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { - name = "runtime.any.System.Text.Encoding"; + name = "runtime.any.system.text.encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { - name = "runtime.any.System.Text.Encoding.Extensions"; + name = "runtime.any.system.text.encoding.extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) - (fetchNuGet { - name = "runtime.any.System.Threading.Tasks"; + name = "runtime.any.system.threading.tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { - name = "runtime.any.System.Threading.Timer"; + name = "runtime.any.system.threading.timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) - (fetchNuGet { - name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + name = + "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { - name = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + name = + "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { - name = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + name = + "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { - name = "runtime.native.System"; + name = "runtime.native.system"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) - (fetchNuGet { - name = "runtime.native.System"; + name = "runtime.native.system"; + version = "4.0.0-rc2-24027"; + sha256 = "0n3ndk1g5qdd892sjcz3y2qmg8ki8b001qfgl2fkwv5f52m65pz9"; + }) + (fetchNuGet { + name = "runtime.native.system"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { - name = "runtime.native.System.IO.Compression"; + name = "runtime.native.system.io.compression"; + version = "4.1.0"; + sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; + }) + (fetchNuGet { + name = "runtime.native.system.io.compression"; + version = "4.1.0-rc2-24027"; + sha256 = "1qnd05bsrz88cr4wnkq7haf2bwml2zzjcscjk94v8ka4isi1i89b"; + }) + (fetchNuGet { + name = "runtime.native.system.io.compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) - (fetchNuGet { - name = "runtime.native.System.Net.Http"; + name = "runtime.native.system.net.http"; + version = "4.0.1"; + sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; + }) + (fetchNuGet { + name = "runtime.native.system.net.http"; + version = "4.0.1-rc2-24027"; + sha256 = "0dpgj544rfdqlgjc1nwslwbq49mp286wyy6rfnklxlbfgc2mr216"; + }) + (fetchNuGet { + name = "runtime.native.system.net.http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.Apple"; + name = "runtime.native.system.security.cryptography"; + version = "4.0.0"; + sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; + }) + (fetchNuGet { + name = "runtime.native.system.security.cryptography"; + version = "4.0.0-rc2-24027"; + sha256 = "0pkd72vrqn1jxc20g8h2pgqz02xn2rfbl0m4i7b82xa8bc483jmz"; + }) + (fetchNuGet { + name = "runtime.native.system.security.cryptography.apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) - (fetchNuGet { - name = "runtime.native.System.Security.Cryptography.OpenSsl"; + name = "runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { - name = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + name = + "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { - name = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + name = + "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { - name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; + name = + "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) - (fetchNuGet { - name = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + name = + "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { - name = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + name = + "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { - name = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + name = + "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { - name = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + name = + "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { - name = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; + name = + "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { - name = "runtime.unix.Microsoft.Win32.Primitives"; + name = "runtime.unix.microsoft.win32.primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) - (fetchNuGet { - name = "runtime.unix.System.Console"; + name = "runtime.unix.system.console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) - (fetchNuGet { - name = "runtime.unix.System.Diagnostics.Debug"; + name = "runtime.unix.system.diagnostics.debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { - name = "runtime.unix.System.IO.FileSystem"; + name = "runtime.unix.system.io.filesystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) - (fetchNuGet { - name = "runtime.unix.System.Net.Primitives"; + name = "runtime.unix.system.net.primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) - (fetchNuGet { - name = "runtime.unix.System.Net.Sockets"; + name = "runtime.unix.system.net.sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) - (fetchNuGet { - name = "runtime.unix.System.Private.Uri"; + name = "runtime.unix.system.private.uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { - name = "runtime.unix.System.Runtime.Extensions"; + name = "runtime.unix.system.runtime.extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { - name = "Sdk"; - version = "1.0.0"; - sha256 = "0425gviagj8xl8mwl4bwn1v98j7407sdk78xgxk37z62vgcgs73w"; + name = "system.appcontext"; + version = "4.1.0"; + sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) - (fetchNuGet { - name = "System.AppContext"; + name = "system.appcontext"; + version = "4.1.0-rc2-24027"; + sha256 = "0c0x3sg12a5zwiamvxs9c4bhdwmmm9by6x5da58fbrzz7afbaaag"; + }) + (fetchNuGet { + name = "system.appcontext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) - (fetchNuGet { - name = "System.Buffers"; + name = "system.buffers"; + version = "4.0.0-rc2-24027"; + sha256 = "1mqnay87pkxih73984jf5fm14d0m6yjq4cv4cqbj37nmgm54ssjp"; + }) + (fetchNuGet { + name = "system.buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { - name = "System.Collections"; + name = "system.collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) - (fetchNuGet { - name = "System.Collections"; + name = "system.collections"; + version = "4.0.11-rc2-24027"; + sha256 = "0ijpgf7iy3mcvr9327craxsb0lsznprajqzjy59sspc75gk0yahq"; + }) + (fetchNuGet { + name = "system.collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { - name = "System.Collections.Concurrent"; + name = "system.collections.concurrent"; + version = "4.0.12"; + sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; + }) + (fetchNuGet { + name = "system.collections.concurrent"; + version = "4.0.12-rc2-24027"; + sha256 = "0yhc5q74vb9vb9cmyrr9p4dfql62dr7c8ajbaxnzzs917v2z68q4"; + }) + (fetchNuGet { + name = "system.collections.concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { - name = "System.Collections.Immutable"; + name = "system.collections.immutable"; version = "1.2.0"; sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m"; }) - (fetchNuGet { - name = "System.Collections.NonGeneric"; + name = "system.collections.nongeneric"; + version = "4.0.1"; + sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; + }) + (fetchNuGet { + name = "system.collections.nongeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) - (fetchNuGet { - name = "System.Collections.Specialized"; + name = "system.collections.specialized"; + version = "4.0.1"; + sha256 = "1wbv7y686p5x169rnaim7sln67ivmv6r57falrnx8aap9y33mam9"; + }) + (fetchNuGet { + name = "system.collections.specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) - (fetchNuGet { - name = "System.ComponentModel"; + name = "system.componentmodel"; + version = "4.0.1"; + sha256 = "0v4qpmqlzyfad2kswxxj2frnaqqhz9201c3yn8fmmarx5vlzg52z"; + }) + (fetchNuGet { + name = "system.componentmodel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) - (fetchNuGet { - name = "System.ComponentModel.EventBasedAsync"; + name = "system.componentmodel.eventbasedasync"; version = "4.0.11"; sha256 = "07r5i7xwban347nsfw28hhjwpr78ywksjyhywvhj1yr0s7sr00wh"; }) - (fetchNuGet { - name = "System.ComponentModel.Primitives"; + name = "system.componentmodel.primitives"; + version = "4.1.0"; + sha256 = "0wb5mnaag0w4fnyc40x19j8v2vshxp266razw64bcqfyj1whb1q0"; + }) + (fetchNuGet { + name = "system.componentmodel.primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) - (fetchNuGet { - name = "System.ComponentModel.TypeConverter"; + name = "system.componentmodel.typeconverter"; version = "4.1.0"; sha256 = "178cva9p1cs043h5n2fry5xkzr3wc9n0hwbxa8m3ymld9m6wcv0y"; }) - (fetchNuGet { - name = "System.ComponentModel.TypeConverter"; + name = "system.componentmodel.typeconverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) - (fetchNuGet { - name = "System.Console"; + name = "system.console"; + version = "4.0.0"; + sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; + }) + (fetchNuGet { + name = "system.console"; + version = "4.0.0-rc2-24027"; + sha256 = "072m313av0s5cfpr2rpq07p7c13dy4rh1ngigv3dnr1yyvab9081"; + }) + (fetchNuGet { + name = "system.console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) - (fetchNuGet { - name = "System.Diagnostics.Debug"; + name = "system.diagnostics.debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) - (fetchNuGet { - name = "System.Diagnostics.Debug"; + name = "system.diagnostics.debug"; + version = "4.0.11-rc2-24027"; + sha256 = "11rz0kdzk4bw9yc85jmskxla7i1bs61kladqzvymrg8xn3lk488a"; + }) + (fetchNuGet { + name = "system.diagnostics.debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { - name = "System.Diagnostics.DiagnosticSource"; + name = "system.diagnostics.diagnosticsource"; + version = "4.0.0"; + sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; + }) + (fetchNuGet { + name = "system.diagnostics.diagnosticsource"; + version = "4.0.0-rc2-24027"; + sha256 = "1cizj1xvaz7dm701r4bl6s08858j1r2794y7xx8abyw8j91c957w"; + }) + (fetchNuGet { + name = "system.diagnostics.diagnosticsource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) - (fetchNuGet { - name = "System.Diagnostics.Process"; + name = "system.diagnostics.process"; version = "4.1.0"; sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s"; }) - (fetchNuGet { - name = "System.Diagnostics.TextWriterTraceListener"; + name = "system.diagnostics.textwritertracelistener"; version = "4.0.0"; sha256 = "1xigiwkwyxak0dhm0p8i2zb7a9syly9cdb5s9zkr9rbad4f2fqhs"; }) - (fetchNuGet { - name = "System.Diagnostics.Tools"; + name = "system.diagnostics.tools"; + version = "4.0.1"; + sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; + }) + (fetchNuGet { + name = "system.diagnostics.tools"; + version = "4.0.1-rc2-24027"; + sha256 = "080gd86c1pkfkzz67ispkzxc426lfh82zajayiizbgwd6yqa7fv5"; + }) + (fetchNuGet { + name = "system.diagnostics.tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) - (fetchNuGet { - name = "System.Diagnostics.TraceSource"; + name = "system.diagnostics.tracesource"; version = "4.0.0"; sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; }) - (fetchNuGet { - name = "System.Diagnostics.TraceSource"; + name = "system.diagnostics.tracesource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; }) - (fetchNuGet { - name = "System.Diagnostics.Tracing"; + name = "system.diagnostics.tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) - (fetchNuGet { - name = "System.Diagnostics.Tracing"; + name = "system.diagnostics.tracing"; + version = "4.1.0-rc2-24027"; + sha256 = "0a0c24lm8yn0hbvd5m64lv7xhs2bmhm5fdpk89xvxj14zdarqhm6"; + }) + (fetchNuGet { + name = "system.diagnostics.tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) - (fetchNuGet { - name = "System.Dynamic.Runtime"; + name = "system.dynamic.runtime"; + version = "4.0.11"; + sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; + }) + (fetchNuGet { + name = "system.dynamic.runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { - name = "System.Globalization"; + name = "system.globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) - (fetchNuGet { - name = "System.Globalization"; + name = "system.globalization"; + version = "4.0.11-rc2-24027"; + sha256 = "0yl161lr85smzdfzb7fbk0lfrqk5ns71hcnws6vm3sn2aqvfmhpn"; + }) + (fetchNuGet { + name = "system.globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { - name = "System.Globalization.Calendars"; + name = "system.globalization.calendars"; + version = "4.0.1"; + sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; + }) + (fetchNuGet { + name = "system.globalization.calendars"; + version = "4.0.1-rc2-24027"; + sha256 = "0whr2qird567iyc137s10qs0xi6607kjii9wi8a8g1f9lybzlz5k"; + }) + (fetchNuGet { + name = "system.globalization.calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) - (fetchNuGet { - name = "System.Globalization.Extensions"; + name = "system.globalization.extensions"; + version = "4.0.1"; + sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; + }) + (fetchNuGet { + name = "system.globalization.extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { - name = "System.IdentityModel.Tokens.Jwt"; + name = "system.identitymodel.tokens.jwt"; version = "5.2.1"; sha256 = "08n1z9ngsi26qlhwpjzxafhwl3p279widfci64l2ahxf1gprfqsx"; }) - (fetchNuGet { - name = "System.IO"; + name = "system.io"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) - (fetchNuGet { - name = "System.IO"; + name = "system.io"; + version = "4.1.0-rc2-24027"; + sha256 = "0rwqmn743gl21xnb3rwqkdacshd5l86pn23mc4bviva3pbncbjs4"; + }) + (fetchNuGet { + name = "system.io"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { - name = "System.IO.Compression"; + name = "system.io.compression"; + version = "4.1.0"; + sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; + }) + (fetchNuGet { + name = "system.io.compression"; + version = "4.1.0-rc2-24027"; + sha256 = "07s5zxdw3ihxdv0mjxb2ywzg9phcp4bayrhkadzm95l4kcv0xaij"; + }) + (fetchNuGet { + name = "system.io.compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) - (fetchNuGet { - name = "System.IO.Compression.ZipFile"; + name = "system.io.compression.zipfile"; + version = "4.0.1"; + sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; + }) + (fetchNuGet { + name = "system.io.compression.zipfile"; + version = "4.0.1-rc2-24027"; + sha256 = "0np6vf9rnfasz0sqys56kpryc84qcqi1a1rfskmycdlxk182p3s2"; + }) + (fetchNuGet { + name = "system.io.compression.zipfile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) - (fetchNuGet { - name = "System.IO.FileSystem"; + name = "system.io.filesystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) - (fetchNuGet { - name = "System.IO.FileSystem"; + name = "system.io.filesystem"; + version = "4.0.1-rc2-24027"; + sha256 = "0hpw3ssnbcv9l1lnlcym2bv3h3sf2znif4brys2i3868s6h946k6"; + }) + (fetchNuGet { + name = "system.io.filesystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) - (fetchNuGet { - name = "System.IO.FileSystem.AccessControl"; + name = "system.io.filesystem.accesscontrol"; version = "4.4.0"; sha256 = "11sna2bv5ai4sivrs7g2gp7g0yjp02s0kasl01j3fa1cvnwwvgkv"; }) - (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; + name = "system.io.filesystem.primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) - (fetchNuGet { - name = "System.IO.FileSystem.Primitives"; + name = "system.io.filesystem.primitives"; + version = "4.0.1-rc2-24027"; + sha256 = "04q3sxrfxqgig9scmxblxlb6n6fypv535lby26pi20ixszs19dxc"; + }) + (fetchNuGet { + name = "system.io.filesystem.primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) - (fetchNuGet { - name = "System.Linq"; + name = "system.io.filesystem.watcher"; + version = "4.0.0-rc2-24027"; + sha256 = "0g2h4q0w42frdz101z2cxs4n9zpxvzb43wnzawx1f26vpilz7km4"; + }) + (fetchNuGet { + name = "system.linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) - (fetchNuGet { - name = "System.Linq"; + name = "system.linq"; + version = "4.1.0-rc2-24027"; + sha256 = "0icbsy0vq07achclz32jvnnfdchkgylsjj67gra3fn5906s40n24"; + }) + (fetchNuGet { + name = "system.linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { - name = "System.Linq.Expressions"; + name = "system.linq.expressions"; + version = "4.1.0"; + sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; + }) + (fetchNuGet { + name = "system.linq.expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { - name = "System.Net.Http"; + name = "system.net.http"; + version = "4.0.1-rc2-24027"; + sha256 = "1j9z5as3k7ydr4yi83lwh09hqj32g2ndpjgj25xvny5a32dl2mhz"; + }) + (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.NameResolution"; + name = "system.net.nameresolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) - (fetchNuGet { - name = "System.Net.Primitives"; + name = "system.net.primitives"; + version = "4.0.11"; + sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; + }) + (fetchNuGet { + name = "system.net.primitives"; + version = "4.0.11-rc2-24027"; + sha256 = "16wv24cb39639i7fcw005hh1rggyz2bgn51dpkdc67aq9lz76ivm"; + }) + (fetchNuGet { + name = "system.net.primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) - (fetchNuGet { - name = "System.Net.Sockets"; + name = "system.net.sockets"; + version = "4.1.0"; + sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; + }) + (fetchNuGet { + name = "system.net.sockets"; + version = "4.1.0-rc2-24027"; + sha256 = "062kbbvm17nhwmcxjnakfv3i23vrk6c9gmz6x8q79kcr5hxr40qs"; + }) + (fetchNuGet { + name = "system.net.sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) - (fetchNuGet { - name = "System.ObjectModel"; + name = "system.objectmodel"; + version = "4.0.12"; + sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; + }) + (fetchNuGet { + name = "system.objectmodel"; + version = "4.0.12-rc2-24027"; + sha256 = "065p89awfiz9kb304hqs7wkfpykd9z9kkv84ihm813msv54i8lvj"; + }) + (fetchNuGet { + name = "system.objectmodel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { - name = "System.Private.DataContractSerialization"; + name = "system.private.datacontractserialization"; version = "4.1.1"; sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r"; }) - (fetchNuGet { - name = "System.Private.DataContractSerialization"; + name = "system.private.datacontractserialization"; version = "4.3.0"; sha256 = "06fjipqvjp559rrm825x6pll8gimdj9x1n3larigh5hsm584gndw"; }) - (fetchNuGet { - name = "System.Private.Uri"; + name = "system.private.uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { - name = "System.Reflection"; + name = "system.reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) - (fetchNuGet { - name = "System.Reflection"; + name = "system.reflection"; + version = "4.1.0-rc2-24027"; + sha256 = "0717y8iqcw19g2zkcs0hkalvjhnpaq5mapd82kxkhiq1djgjhhi2"; + }) + (fetchNuGet { + name = "system.reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { - name = "System.Reflection.Emit"; + 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"; + 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"; + name = "system.reflection.emit.lightweight"; + version = "4.0.1"; + sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; + }) + (fetchNuGet { + name = "system.reflection.emit.lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { - name = "System.Reflection.Extensions"; + name = "system.reflection.extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) - (fetchNuGet { - name = "System.Reflection.Extensions"; + name = "system.reflection.extensions"; + version = "4.0.1-rc2-24027"; + sha256 = "0lgz7wwdb02vapa17hgdkf1jnq1mcsbq8gwy6a9iqd04d2mfanv7"; + }) + (fetchNuGet { + name = "system.reflection.extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { - name = "System.Reflection.Metadata"; + name = "system.reflection.metadata"; version = "1.3.0"; sha256 = "1y5m6kryhjpqqm2g3h3b6bzig13wkiw954x3b7icqjm6xypm1x3b"; }) - (fetchNuGet { - name = "System.Reflection.Primitives"; + name = "system.reflection.primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) - (fetchNuGet { - name = "System.Reflection.Primitives"; - version = "4.3.0"; - sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; + name = "system.reflection.primitives"; + version = "4.0.1-rc2-24027"; + sha256 = "1xjbwji89s69f9lq8wcjfkz8y9ym9zffgj2mg9bv0rxwyqcynpz8"; }) - (fetchNuGet { - name = "System.Reflection.TypeExtensions"; - version = "4.1.0"; - sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; + name = "system.reflection.primitives"; + version = "4.3.0"; + sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { - name = "System.Reflection.TypeExtensions"; + name = "system.reflection.typeextensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { - name = "System.Reflection.TypeExtensions"; + name = "system.reflection.typeextensions"; version = "4.4.0"; sha256 = "0n9r1w4lp2zmadyqkgp4sk9wy90sj4ygq4dh7kzamx26i9biys5h"; }) - (fetchNuGet { - name = "System.Resources.ResourceManager"; + name = "system.resources.resourcemanager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) - (fetchNuGet { - name = "System.Resources.ResourceManager"; + name = "system.resources.resourcemanager"; + version = "4.0.1-rc2-24027"; + sha256 = "06lkqk5hjkcna19inpda5fqbxvd9pq5cs61di7kmhrd2sgzbs6xj"; + }) + (fetchNuGet { + name = "system.resources.resourcemanager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { - name = "System.Runtime"; + name = "system.runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) - (fetchNuGet { - name = "System.Runtime"; + name = "system.runtime"; + version = "4.1.0-rc2-24027"; + sha256 = "1g5ghiyfb8njzfz39cswizjbxgaamil7kgkzgab93fhgk7jksmyg"; + }) + (fetchNuGet { + name = "system.runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { - name = "System.Runtime.Extensions"; + name = "system.runtime.extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) - (fetchNuGet { - name = "System.Runtime.Extensions"; + name = "system.runtime.extensions"; + version = "4.1.0-rc2-24027"; + sha256 = "09k4c6is31dpccwgb749055m2ad0b84rnapk69fmj3wjswacg26p"; + }) + (fetchNuGet { + name = "system.runtime.extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { - name = "System.Runtime.Handles"; + name = "system.runtime.handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) - (fetchNuGet { - name = "System.Runtime.Handles"; + name = "system.runtime.handles"; + version = "4.0.1-rc2-24027"; + sha256 = "0lw4amgaryahvija5xxb2vmybq7ks4b4ir7g7nc1xw6x9x58jf2q"; + }) + (fetchNuGet { + name = "system.runtime.handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { - name = "System.Runtime.InteropServices"; + name = "system.runtime.interopservices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) - (fetchNuGet { - name = "System.Runtime.InteropServices"; + name = "system.runtime.interopservices"; + version = "4.1.0-rc2-24027"; + sha256 = "0v5phdy7yr6d1q13fvb6hhd32k89l93z6x4hlkh5qhm1zlavaabl"; + }) + (fetchNuGet { + name = "system.runtime.interopservices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { - name = "System.Runtime.InteropServices.RuntimeInformation"; + name = "system.runtime.interopservices.pinvoke"; + version = "4.0.0-rc2-24027"; + sha256 = "0qsgwvr6ppvllblb64p5plr7ssbmwfxxc4qf6l1xfincza8np34r"; + }) + (fetchNuGet { + name = "system.runtime.interopservices.runtimeinformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) - (fetchNuGet { - name = "System.Runtime.InteropServices.RuntimeInformation"; + name = "system.runtime.interopservices.runtimeinformation"; + version = "4.0.0-rc2-24027"; + sha256 = "03pgqbgahfgvigyrsd08snzsryg90shfjlbdv4jk6yzfr27va3n2"; + }) + (fetchNuGet { + name = "system.runtime.interopservices.runtimeinformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) - (fetchNuGet { - name = "System.Runtime.Loader"; + name = "system.runtime.loader"; version = "4.0.0"; sha256 = "0lpfi3psqcp6zxsjk2qyahal7zaawviimc8lhrlswhip2mx7ykl0"; }) - (fetchNuGet { - name = "System.Runtime.Loader"; + name = "system.runtime.loader"; version = "4.3.0"; sha256 = "07fgipa93g1xxgf7193a6vw677mpzgr0z0cfswbvqqb364cva8dk"; }) - (fetchNuGet { - name = "System.Runtime.Numerics"; + name = "system.runtime.numerics"; + version = "4.0.1"; + sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; + }) + (fetchNuGet { + name = "system.runtime.numerics"; + version = "4.0.1-rc2-24027"; + sha256 = "1gkkc7njymmb12dd952q89x2h2jdrhp171vszsjqzh5q2ryj25gh"; + }) + (fetchNuGet { + name = "system.runtime.numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) - (fetchNuGet { - name = "System.Runtime.Serialization.Json"; + name = "system.runtime.serialization.json"; version = "4.0.2"; sha256 = "08ypbzs0sb302ga04ds5b2wxa2gg0q50zpa0nvc87ipjhs0v66dn"; }) - (fetchNuGet { - name = "System.Runtime.Serialization.Primitives"; + name = "system.runtime.serialization.primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) - (fetchNuGet { - name = "System.Runtime.Serialization.Primitives"; + name = "system.runtime.serialization.primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; }) - (fetchNuGet { - name = "System.Runtime.Serialization.Xml"; + name = "system.runtime.serialization.xml"; version = "4.3.0"; sha256 = "1b2cxl2h7s8cydbhbmxhvvq071n9ck61g08npg4gyw7nvg37rfni"; }) - (fetchNuGet { - name = "System.Security.AccessControl"; + name = "system.security.accesscontrol"; version = "4.4.0"; sha256 = "0ixqw47krkazsw0ycm22ivkv7dpg6cjz8z8g0ii44bsx4l8gcx17"; }) - (fetchNuGet { - name = "System.Security.Claims"; + name = "system.security.claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Algorithms"; + name = "system.security.cryptography.algorithms"; + version = "4.1.0-rc2-24027"; + sha256 = "183qanczf0jb6njgr9pibyr5jh0m8xwrja3j0pcdnzab0cii3n17"; + }) + (fetchNuGet { + name = "system.security.cryptography.algorithms"; version = "4.2.0"; sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Algorithms"; + name = "system.security.cryptography.algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Cng"; + name = "system.security.cryptography.cng"; + version = "4.2.0"; + sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; + }) + (fetchNuGet { + name = "system.security.cryptography.cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Cng"; + name = "system.security.cryptography.cng"; version = "4.4.0"; sha256 = "1grg9id80m358crr5y4q4rhhbrm122yw8jrlcl1ybi7nkmmck40n"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Csp"; + name = "system.security.cryptography.csp"; + version = "4.0.0"; + sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; + }) + (fetchNuGet { + name = "system.security.cryptography.csp"; + version = "4.0.0-rc2-24027"; + sha256 = "0nny9yvnhf3l5hjsy3ina8cha6sjln993vzkzdqka9d7rq1z23d5"; + }) + (fetchNuGet { + name = "system.security.cryptography.csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Encoding"; + name = "system.security.cryptography.encoding"; + version = "4.0.0"; + sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; + }) + (fetchNuGet { + name = "system.security.cryptography.encoding"; + version = "4.0.0-rc2-24027"; + sha256 = "19f83159vrfnfppzchjclk82w2x1mkvnx1y5yg1f238dpjb2ri8w"; + }) + (fetchNuGet { + name = "system.security.cryptography.encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) - (fetchNuGet { - name = "System.Security.Cryptography.OpenSsl"; + name = "system.security.cryptography.openssl"; + version = "4.0.0"; + sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; + }) + (fetchNuGet { + name = "system.security.cryptography.openssl"; + version = "4.0.0-rc2-24027"; + sha256 = "1mqw7xkh4pj110f249c4jpv9mg1sd8c2cr6kj2zc0mic325vvg0s"; + }) + (fetchNuGet { + name = "system.security.cryptography.openssl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Pkcs"; + name = "system.security.cryptography.pkcs"; version = "4.4.0"; sha256 = "1bn7d2czpc994qzdph4drv7p1cv4x55j2dhbmr113p0gs4hx33zh"; }) - (fetchNuGet { - name = "System.Security.Cryptography.Primitives"; + name = "system.security.cryptography.primitives"; + version = "4.0.0"; + sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; + }) + (fetchNuGet { + name = "system.security.cryptography.primitives"; + version = "4.0.0-rc2-24027"; + sha256 = "16zwyw3glsq2flq1crd0c24i336bc42rj28a9rjvvkg428vz4rf8"; + }) + (fetchNuGet { + name = "system.security.cryptography.primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) - (fetchNuGet { - name = "System.Security.Cryptography.ProtectedData"; + name = "system.security.cryptography.protecteddata"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; }) - (fetchNuGet { - name = "System.Security.Cryptography.X509Certificates"; + name = "system.security.cryptography.x509certificates"; + version = "4.1.0"; + sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; + }) + (fetchNuGet { + name = "system.security.cryptography.x509certificates"; + version = "4.1.0-rc2-24027"; + sha256 = "1gfxc9p73zak46klrfsyxgkcyzbvqnjarsm0wkvmj31n9g4dpjkz"; + }) + (fetchNuGet { + name = "system.security.cryptography.x509certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) - (fetchNuGet { - name = "System.Security.Principal"; + name = "system.security.principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) - (fetchNuGet { - name = "System.Security.Principal.Windows"; + name = "system.security.principal.windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) - (fetchNuGet { - name = "System.Security.Principal.Windows"; + name = "system.security.principal.windows"; version = "4.4.0"; sha256 = "11rr16fp68apc0arsymgj18w8ajs9a4366wgx9iqwny4glrl20wp"; }) - (fetchNuGet { - name = "System.ServiceProcess.ServiceController"; + name = "system.serviceprocess.servicecontroller"; version = "4.4.0"; sha256 = "0hyijvysbcjh20mbbgajg9wh04nkjd6y5lqxgm0a6m28zjcjshl6"; }) - (fetchNuGet { - name = "System.Text.Encoding"; + name = "system.text.encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) - (fetchNuGet { - name = "System.Text.Encoding"; + name = "system.text.encoding"; + version = "4.0.11-rc2-24027"; + sha256 = "0qkaldb06dwmi8gb940h75n9cs5rgy6sqcpa6f443mhahmagmsbd"; + }) + (fetchNuGet { + name = "system.text.encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { - name = "System.Text.Encoding.CodePages"; + name = "system.text.encoding.codepages"; version = "4.4.0"; sha256 = "07bzjnflxjk9vgpljfybrpqmvsr9qr2f20nq5wf11imwa5pbhgfc"; }) - (fetchNuGet { - name = "System.Text.Encoding.Extensions"; + name = "system.text.encoding.extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) - (fetchNuGet { - name = "System.Text.Encoding.Extensions"; + name = "system.text.encoding.extensions"; + version = "4.0.11-rc2-24027"; + sha256 = "02xic3hhfy48s50bxh25as1l9v3afgrhlxqfnd5ki4qirxly7qs6"; + }) + (fetchNuGet { + name = "system.text.encoding.extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) - (fetchNuGet { - name = "System.Text.RegularExpressions"; + name = "system.text.regularexpressions"; + version = "4.0.12-rc2-24027"; + sha256 = "1111sgvbxrxq9c1i0nziqddlzfdc2bsawd0jcf2nna9nkcn4d6br"; + }) + (fetchNuGet { + name = "system.text.regularexpressions"; + version = "4.1.0"; + sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; + }) + (fetchNuGet { + name = "system.text.regularexpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) - (fetchNuGet { - name = "System.Threading"; + name = "system.threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) - (fetchNuGet { - name = "System.Threading"; + name = "system.threading"; + version = "4.0.11-rc2-24027"; + sha256 = "0aa4zaqma4yagjd44m2j13gr9qzn8rv8dbz3p9mjdk0dx1zpi4iq"; + }) + (fetchNuGet { + name = "system.threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { - name = "System.Threading.Channels"; + name = "system.threading.channels"; version = "4.5.0"; sha256 = "0n6z3wjia7h2a5vl727p97riydnb6jhhkb1pdcnizza02dwkz0nz"; }) - (fetchNuGet { - name = "System.Threading.Tasks"; + name = "system.threading.overlapped"; + version = "4.0.1-rc2-24027"; + sha256 = "1ansaxwkc4xi2ngpiv8gjmv02d75y0nb4lfqzxy73r3radakqvdp"; + }) + (fetchNuGet { + name = "system.threading.tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) - (fetchNuGet { - name = "System.Threading.Tasks"; + name = "system.threading.tasks"; + version = "4.0.11-rc2-24027"; + sha256 = "0fsgdzdxm3yj1cym421ymn8x8anhyzgzc1529q5xd1vq4yknwfq0"; + }) + (fetchNuGet { + name = "system.threading.tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; + name = "system.threading.tasks.extensions"; + version = "4.0.0"; + sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; + }) + (fetchNuGet { + name = "system.threading.tasks.extensions"; + version = "4.0.0-rc2-24027"; + sha256 = "108sdqpy3ga6gzksl59w1k21a3jlrh8x2igyxh3dm3212rca1pyg"; + }) + (fetchNuGet { + name = "system.threading.tasks.extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { - name = "System.Threading.Tasks.Extensions"; + name = "system.threading.tasks.extensions"; version = "4.5.1"; sha256 = "1ikrplvw4m6pzjbq3bfbpr572n4i9mni577zvmrkaygvx85q3myw"; }) - (fetchNuGet { - name = "System.Threading.Thread"; + name = "system.threading.thread"; version = "4.0.0"; sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; }) - (fetchNuGet { - name = "System.Threading.ThreadPool"; - version = "4.0.10"; - sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx"; + name = "system.threading.thread"; + version = "4.0.0-rc2-24027"; + sha256 = "1gv963m4523m3m9gbn819bfzmhxqsv93m5kaqmbv4ijyziby2872"; }) - (fetchNuGet { - name = "System.Threading.ThreadPool"; + name = "system.threading.threadpool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) - (fetchNuGet { - name = "System.Threading.Timer"; + name = "system.threading.timer"; + version = "4.0.1"; + sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; + }) + (fetchNuGet { + name = "system.threading.timer"; + version = "4.0.1-rc2-24027"; + sha256 = "06kwi42lgf3zw3b5yw668ammbjl6208y182wyqaaqrxgn5gs4yh7"; + }) + (fetchNuGet { + name = "system.threading.timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) - (fetchNuGet { - name = "System.Xml.ReaderWriter"; + name = "system.xml.readerwriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) - (fetchNuGet { - name = "System.Xml.ReaderWriter"; + name = "system.xml.readerwriter"; + version = "4.0.11-rc2-24027"; + sha256 = "0vywggi6mqkbr6g1a1fh821hqfnyq1k829vlhfw908l7mj75k34d"; + }) + (fetchNuGet { + name = "system.xml.readerwriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) - (fetchNuGet { - name = "System.Xml.XDocument"; + name = "system.xml.xdocument"; + version = "4.0.11"; + sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; + }) + (fetchNuGet { + name = "system.xml.xdocument"; + version = "4.0.11-rc2-24027"; + sha256 = "1rvglifac6xq1lawm78w49fq9cl8zvs1g4vrsd2hhf0vb4i85p1z"; + }) + (fetchNuGet { + name = "system.xml.xdocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) - (fetchNuGet { - name = "System.Xml.XmlDocument"; + name = "system.xml.xmldocument"; version = "4.0.1"; sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; }) - (fetchNuGet { - name = "System.Xml.XmlDocument"; + name = "system.xml.xmldocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) - (fetchNuGet { - name = "System.Xml.XmlSerializer"; + name = "system.xml.xmlserializer"; + version = "4.0.11"; + sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; + }) + (fetchNuGet { + name = "system.xml.xmlserializer"; version = "4.3.0"; sha256 = "07pa4sx196vxkgl3csvdmw94nydlsm9ir38xxcs84qjn8cycd912"; }) - (fetchNuGet { - name = "System.Xml.XPath"; + name = "system.xml.xpath"; version = "4.0.1"; sha256 = "0fjqgb6y66d72d5n8qq1h213d9nv2vi8mpv8p28j3m9rccmsh04m"; }) - (fetchNuGet { - name = "System.Xml.XPath.XmlDocument"; + name = "system.xml.xpath.xmldocument"; version = "4.0.1"; sha256 = "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc"; }) - (fetchNuGet { name = "xunit"; version = "2.4.1"; sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"; }) - (fetchNuGet { name = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; }) - (fetchNuGet { name = "xunit.analyzers"; version = "0.10.0"; sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"; }) - (fetchNuGet { name = "xunit.assert"; version = "2.4.1"; sha256 = "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6"; }) - (fetchNuGet { name = "xunit.core"; version = "2.4.1"; sha256 = "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a"; }) - (fetchNuGet { name = "xunit.extensibility.core"; version = "2.4.1"; sha256 = "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050"; }) - (fetchNuGet { name = "xunit.extensibility.execution"; version = "2.4.1"; sha256 = "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia"; }) - (fetchNuGet { name = "xunit.runner.visualstudio"; version = "2.4.1"; sha256 = "0fln5pk18z98gp0zfshy1p9h6r9wc55nyqhap34k89yran646vhn"; }) - (fetchNuGet { - name = "YamlDotNet.Signed"; + name = "yamldotnet.signed"; version = "5.3.0"; sha256 = "1gnp5aa2zzg7v61bbn2ra1npy0p07szp5w8vqk44fdj3fcvrdxib"; }) - ] diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/patches/ignore-self-update.patch b/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/patches/ignore-self-update.patch deleted file mode 100644 index b505bbc7503b..000000000000 --- a/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/patches/ignore-self-update.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/Runner.Listener/Runner.cs b/src/Runner.Listener/Runner.cs -index 68b0b4e..5da21fe 100644 ---- a/src/Runner.Listener/Runner.cs -+++ b/src/Runner.Listener/Runner.cs -@@ -391,18 +391,7 @@ namespace GitHub.Runner.Listener - HostContext.WritePerfCounter($"MessageReceived_{message.MessageType}"); - if (string.Equals(message.MessageType, AgentRefreshMessage.MessageType, StringComparison.OrdinalIgnoreCase)) - { -- if (autoUpdateInProgress == false) -- { -- autoUpdateInProgress = true; -- var runnerUpdateMessage = JsonUtility.FromString<AgentRefreshMessage>(message.Body); -- var selfUpdater = HostContext.GetService<ISelfUpdater>(); -- selfUpdateTask = selfUpdater.SelfUpdate(runnerUpdateMessage, jobDispatcher, !runOnce && HostContext.StartupType != StartupType.Service, HostContext.RunnerShutdownToken); -- Trace.Info("Refresh message received, kick-off selfupdate background process."); -- } -- else -- { -- Trace.Info("Refresh message received, skip autoupdate since a previous autoupdate is already running."); -- } -+ Trace.Info("Ignoring received refresh message (would trigger self-update)."); - } - else if (string.Equals(message.MessageType, JobRequestMessageTypes.PipelineAgentJobRequest, StringComparison.OrdinalIgnoreCase)) - { diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/patches/prevent-self-update.patch b/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/patches/prevent-self-update.patch new file mode 100644 index 000000000000..da73cd75a096 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/patches/prevent-self-update.patch @@ -0,0 +1,25 @@ +From 8b77c9c61058842e031dd176df2b9c79bc2c0e28 Mon Sep 17 00:00:00 2001 +From: Vincent Haupert <mail@vincent-haupert.de> +Date: Sun, 12 Sep 2021 19:52:21 +0200 +Subject: [PATCH] Use a fake version to prevent self-update + +--- + src/Runner.Listener/MessageListener.cs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Runner.Listener/MessageListener.cs b/src/Runner.Listener/MessageListener.cs +index 71e5e43..29945e0 100644 +--- a/src/Runner.Listener/MessageListener.cs ++++ b/src/Runner.Listener/MessageListener.cs +@@ -65,7 +65,7 @@ namespace GitHub.Runner.Listener + { + Id = _settings.AgentId, + Name = _settings.AgentName, +- Version = BuildConstants.RunnerPackage.Version, ++ Version = "2.999.9", + OSDescription = RuntimeInformation.OSDescription, + }; + string sessionName = $"{Environment.MachineName ?? "RUNNER"}"; +-- +2.32.0 + diff --git a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index a507ba8650fa..98bd5ae31631 100644 --- a/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "14.2.0"; + version = "14.3.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.x86_64"; - sha256 = "1a5prg5yxs29zv8321cfqn1j638yihj7z7pniyd5aycgz5zra8lb"; + sha256 = "0r6pfw8hz7blzqcg92dr6iklry155mmp4z7f45a1j1w3nddaklfn"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.arm"; - sha256 = "0knw2r1lxri922283653vq9wkp1w85p0avhyajrik7c1wvi0flx6"; + sha256 = "0y1dz2ffkcizwkm6lcdll7i1y4h3q6ayl6c0370ayzi6yw788cb8"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0b444nf9ipslcqim54y4m4flfy3dg38vcvcbzic1p76hph8p7s93"; + sha256 = "092yy7371iypyq72vl4zdjp0w4a2ys6xm3cxxcxih8sc7sh8kxn6"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix b/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix index a7021411b4c3..6a100bb799d7 100644 --- a/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix +++ b/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix @@ -4,31 +4,26 @@ , pkg-config , protobuf , rustPlatform +, stdenv }: -rustPlatform.buildRustPackage rec { +let + node-api-lib = (if stdenv.isDarwin then "libquery_engine.dylib" else "libquery_engine.so"); +in rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "2.30.2"; + version = "3.1.1"; src = fetchFromGitHub { owner = "prisma"; repo = "prisma-engines"; rev = version; - sha256 = "sha256-i4r+TRC8454awbqe35Kg3M9xN2NnP8Sbd/dITtm9MDg="; + sha256 = "sha256-7c9jlqMKocA3Kp39zDu2in9nRw4hZRZO1+u/eFfzWa4="; }; - cargoPatches = [ - # Remove test from compilation targets: - # they add time to an already long compilation and some fail out-of-the-box. - ./no_tests.patch - ]; - # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "sha256-BldEj8+tzY0dIA/fdrPLsFn3ZdfoGq6GsomCUhQBoLM="; - - outputs = [ "out" "lib" "bin" ]; + cargoSha256 = "sha256-W3VaxG9taRv62RW6hQkfdGJo72uHK2X6JIESJEu3PXg="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl protobuf ]; @@ -44,8 +39,10 @@ rustPlatform.buildRustPackage rec { export SQLITE_MAX_EXPR_DEPTH=10000 ''; + cargoBuildFlags = "-p query-engine -p query-engine-node-api -p migration-engine-cli -p introspection-core -p prisma-fmt"; + postInstall = '' - cp target/release/libquery_engine.so $out/lib/libquery_engine.so.node + mv $out/lib/${node-api-lib} $out/lib/libquery_engine.node ''; # Tests are long to compile @@ -56,6 +53,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.prisma.io/"; license = licenses.asl20; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ pamplemousse ]; + maintainers = with maintainers; [ pamplemousse pimeys ]; }; } diff --git a/nixpkgs/pkgs/development/tools/database/prisma-engines/no_tests.patch b/nixpkgs/pkgs/development/tools/database/prisma-engines/no_tests.patch deleted file mode 100644 index fb88d92e485d..000000000000 --- a/nixpkgs/pkgs/development/tools/database/prisma-engines/no_tests.patch +++ /dev/null @@ -1,459 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 1070c7a30..310f7302f 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -479,18 +479,6 @@ version = "1.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - --[[package]] --name = "bitvec" --version = "0.19.5" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" --dependencies = [ -- "funty", -- "radium", -- "tap", -- "wyz", --] -- - [[package]] - name = "block-buffer" - version = "0.7.3" -@@ -706,19 +694,6 @@ dependencies = [ - "wasm-bindgen", - ] - --[[package]] --name = "console" --version = "0.14.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3993e6445baa160675931ec041a5e03ca84b9c6e32a056150d3aa2bdda0a1f45" --dependencies = [ -- "encode_unicode", -- "lazy_static", -- "libc", -- "terminal_size", -- "winapi", --] -- - [[package]] - name = "const_fn" - version = "0.4.5" -@@ -1011,24 +986,12 @@ dependencies = [ - "uuid", - ] - --[[package]] --name = "dtoa" --version = "0.4.8" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" -- - [[package]] - name = "either" - version = "1.6.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - --[[package]] --name = "encode_unicode" --version = "0.3.6" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" -- - [[package]] - name = "encoding" - version = "0.2.33" -@@ -1114,18 +1077,6 @@ dependencies = [ - "syn", - ] - --[[package]] --name = "enum_dispatch" --version = "0.3.5" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8946e241a7774d5327d92749c50806f275f57d031d2229ecbfd65469a8ad338e" --dependencies = [ -- "once_cell", -- "proc-macro2", -- "quote", -- "syn", --] -- - [[package]] - name = "enumflags2" - version = "0.7.1" -@@ -1261,12 +1212,6 @@ dependencies = [ - "percent-encoding", - ] - --[[package]] --name = "funty" --version = "1.1.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" -- - [[package]] - name = "futures" - version = "0.3.13" -@@ -1573,15 +1518,6 @@ dependencies = [ - "winapi", - ] - --[[package]] --name = "html-escape" --version = "0.2.7" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d64794b2265e97e459334ed47a7b7369ce8e8ee3d3450c0c363a0b563fc92233" --dependencies = [ -- "utf8-width", --] -- - [[package]] - name = "http" - version = "0.2.3" -@@ -1744,21 +1680,6 @@ version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" - --[[package]] --name = "insta" --version = "1.7.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c4a1b21a2971cea49ca4613c0e9fe8225ecaf5de64090fddc6002284726e9244" --dependencies = [ -- "console", -- "lazy_static", -- "serde", -- "serde_json", -- "serde_yaml", -- "similar", -- "uuid", --] -- - [[package]] - name = "instant" - version = "0.1.9" -@@ -1804,34 +1725,6 @@ dependencies = [ - "user-facing-errors", - ] - --[[package]] --name = "introspection-engine-tests" --version = "0.1.0" --dependencies = [ -- "barrel", -- "datamodel", -- "datamodel-connector", -- "enumflags2", -- "expect-test", -- "indoc", -- "introspection-connector", -- "introspection-core", -- "migration-connector", -- "pretty_assertions", -- "quaint", -- "serde_json", -- "sql-datamodel-connector", -- "sql-introspection-connector", -- "sql-migration-connector", -- "sql-schema-describer", -- "test-macros", -- "test-setup", -- "tokio", -- "tracing", -- "tracing-futures", -- "user-facing-errors", --] -- - [[package]] - name = "ipconfig" - version = "0.2.2" -@@ -2178,39 +2071,6 @@ dependencies = [ - "user-facing-errors", - ] - --[[package]] --name = "migration-engine-tests" --version = "0.1.0" --dependencies = [ -- "bigdecimal", -- "chrono", -- "connection-string", -- "datamodel", -- "datamodel-connector", -- "enumflags2", -- "expect-test", -- "indoc", -- "migration-connector", -- "migration-core", -- "once_cell", -- "pretty_assertions", -- "prisma-value", -- "quaint", -- "serde", -- "serde_json", -- "sql-datamodel-connector", -- "sql-migration-connector", -- "sql-schema-describer", -- "tempfile", -- "test-macros", -- "test-setup", -- "tokio", -- "tracing", -- "tracing-futures", -- "url", -- "user-facing-errors", --] -- - [[package]] - name = "mime" - version = "0.3.16" -@@ -2517,19 +2377,6 @@ dependencies = [ - "socket2 0.4.0", - ] - --[[package]] --name = "nom" --version = "6.1.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" --dependencies = [ -- "bitvec", -- "funty", -- "lexical-core", -- "memchr", -- "version_check", --] -- - [[package]] - name = "ntapi" - version = "0.3.6" -@@ -2773,18 +2620,6 @@ dependencies = [ - "winapi", - ] - --[[package]] --name = "parse-hyperlinks" --version = "0.19.6" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9dfd153802fdbad158c1dfa2c5df806a86955ae6e07758af642a4faaa03310ff" --dependencies = [ -- "html-escape", -- "nom", -- "percent-encoding", -- "thiserror", --] -- - [[package]] - name = "pbkdf2" - version = "0.7.5" -@@ -3388,72 +3223,6 @@ dependencies = [ - "user-facing-errors", - ] - --[[package]] --name = "query-engine-tests" --version = "0.1.0" --dependencies = [ -- "anyhow", -- "base64 0.13.0", -- "chrono", -- "colored", -- "datamodel-connector", -- "indoc", -- "insta", -- "prisma-value", -- "query-test-macros", -- "query-tests-setup", -- "serde_json", -- "tokio", -- "tracing", -- "tracing-futures", -- "uuid", --] -- --[[package]] --name = "query-test-macros" --version = "0.1.0" --dependencies = [ -- "darling", -- "indoc", -- "itertools 0.10.0", -- "proc-macro2", -- "query-tests-setup", -- "quote", -- "syn", --] -- --[[package]] --name = "query-tests-setup" --version = "0.1.0" --dependencies = [ -- "async-trait", -- "colored", -- "datamodel", -- "datamodel-connector", -- "enum_dispatch", -- "enumflags2", -- "indoc", -- "itertools 0.10.0", -- "lazy_static", -- "migration-core", -- "mongodb-datamodel-connector", -- "nom", -- "parse-hyperlinks", -- "prisma-models", -- "query-core", -- "regex", -- "request-handlers", -- "serde", -- "serde_json", -- "sql-datamodel-connector", -- "thiserror", -- "tokio", -- "tracing", -- "tracing-error", -- "tracing-futures", -- "tracing-subscriber", --] -- - [[package]] - name = "quick-error" - version = "1.2.3" -@@ -3469,12 +3238,6 @@ dependencies = [ - "proc-macro2", - ] - --[[package]] --name = "radium" --version = "0.5.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" -- - [[package]] - name = "rand" - version = "0.7.3" -@@ -3922,18 +3685,6 @@ dependencies = [ - "syn", - ] - --[[package]] --name = "serde_yaml" --version = "0.8.17" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "15654ed4ab61726bf918a39cb8d98a2e2995b002387807fa6ba58fdf7f59bb23" --dependencies = [ -- "dtoa", -- "linked-hash-map", -- "serde", -- "yaml-rust", --] -- - [[package]] - name = "serial_test" - version = "0.5.1" -@@ -4028,12 +3779,6 @@ dependencies = [ - "libc", - ] - --[[package]] --name = "similar" --version = "1.3.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1ad1d488a557b235fc46dae55512ffbfc429d2482b08b4d9435ab07384ca8aec" -- - [[package]] - name = "simple-mutex" - version = "1.1.5" -@@ -4372,12 +4117,6 @@ version = "0.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60" - --[[package]] --name = "tap" --version = "1.0.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" -- - [[package]] - name = "tempfile" - version = "3.2.0" -@@ -4392,16 +4131,6 @@ dependencies = [ - "winapi", - ] - --[[package]] --name = "terminal_size" --version = "0.1.16" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "86ca8ced750734db02076f44132d802af0b33b09942331f4459dde8636fd2406" --dependencies = [ -- "libc", -- "winapi", --] -- - [[package]] - name = "test-cli" - version = "0.1.0" -@@ -5094,12 +4823,6 @@ dependencies = [ - "user-facing-error-macros", - ] - --[[package]] --name = "utf8-width" --version = "0.1.4" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9071ac216321a4470a69fb2b28cfc68dcd1a39acd877c8be8e014df6772d8efa" -- - [[package]] - name = "uuid" - version = "0.8.2" -@@ -5361,18 +5084,3 @@ checksum = "7daf138b6b14196e3830a588acf1e86966c694d3e8fb026fb105b8b5dca07e6e" - dependencies = [ - "winapi", - ] -- --[[package]] --name = "wyz" --version = "0.2.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" -- --[[package]] --name = "yaml-rust" --version = "0.4.5" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" --dependencies = [ -- "linked-hash-map", --] -diff --git a/Cargo.toml b/Cargo.toml -index 2411986ea..2eb2bb82d 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -3,7 +3,6 @@ members = [ - "introspection-engine/connectors/introspection-connector", - "introspection-engine/connectors/sql-introspection-connector", - "introspection-engine/core", -- "introspection-engine/introspection-engine-tests", - "libs/datamodel/connectors/datamodel-connector", - "libs/datamodel/connectors/sql-datamodel-connector", - "libs/datamodel/connectors/mongodb-datamodel-connector", -@@ -12,14 +11,12 @@ members = [ - "migration-engine/connectors/sql-migration-connector", - "migration-engine/connectors/mongodb-migration-connector", - "migration-engine/core", -- "migration-engine/migration-engine-tests", - "query-engine/connectors/query-connector", - "query-engine/connectors/sql-query-connector", - "query-engine/connectors/mongodb-query-connector", - "query-engine/core", - "query-engine/query-engine", - "query-engine/query-engine-node-api", -- "query-engine/connector-test-kit-rs/query-engine-tests", - "query-engine/request-handlers", - "prisma-fmt", - "libs/datamodel/core", diff --git a/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix b/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix index 348111c5e4f9..62bef68b5064 100644 --- a/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix +++ b/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.6.5"; + version = "0.6.6"; disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-JUvwp4Ptu1URWO7wyeOCjwjGW4S0XqYZwNjCyR3H/rc="; + sha256 = "sha256-I7vsOQtXY/n2Zu0F94f5/uF1ia96R/qQw+duG7X8Dpo="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix b/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix index 4363ec430957..5175a0287601 100644 --- a/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { pname = "squirrel-sql"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; - sha256 = "0ni7cva0acrin5bkcfkiiv28sf58dzz7xsbl3y4536hmph0g68k6"; + sha256 = "sha256-pNcmIey50nWZghoXVGnm0EFzGoqBpAaJ2lhYvVzjWto="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/nixpkgs/pkgs/development/tools/delve/default.nix b/nixpkgs/pkgs/development/tools/delve/default.nix index 57f30ec3ae48..3ee608d4bb7f 100644 --- a/nixpkgs/pkgs/development/tools/delve/default.nix +++ b/nixpkgs/pkgs/development/tools/delve/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "delve"; - version = "1.7.0"; + version = "1.7.1"; goPackagePath = "github.com/go-delve/delve"; excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "go-delve"; repo = "delve"; rev = "v${version}"; - sha256 = "sha256-RfBDeBuI/Yk24Q2jX/Re7fvx1bhYWJjqLhRkNHCaM9k="; + sha256 = "sha256-dnmV7LZjq86AwLWXfWBGm1pmFM0uipv1FwR6EhV8CZQ="; }; subPackages = [ "cmd/dlv" ]; diff --git a/nixpkgs/pkgs/development/tools/devpi-server/default.nix b/nixpkgs/pkgs/development/tools/devpi-server/default.nix index b5ddda9f08b1..8e78bebebe9b 100644 --- a/nixpkgs/pkgs/development/tools/devpi-server/default.nix +++ b/nixpkgs/pkgs/development/tools/devpi-server/default.nix @@ -1,8 +1,23 @@ -{ lib, fetchFromGitHub, python3Packages, nginx }: +{ lib, fetchFromGitHub, python3, nginx }: -python3Packages.buildPythonApplication rec { +let + py = python3.override { + packageOverrides = self: super: { + # pyramid 2.0 no longer has a 'pyramid.compat' module + pyramid = super.pyramid.overridePythonAttrs (oldAttrs: rec { + version = "1.10.8"; + src = oldAttrs.src.override { + inherit version; + sha256 = "sha256-t81mWVvvkvgXZLl23d4rL6jk9fMl4C9l9ux/NwiynPY="; + }; + }); + }; + }; + +in with py.pkgs; +buildPythonApplication rec { pname = "devpi-server"; - version = "6.0.0.dev0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "devpi"; @@ -10,9 +25,15 @@ python3Packages.buildPythonApplication rec { rev = "68ee291ef29a93f6d921d4927aec8d13919b4a4c"; sha256 = "1ivd5dy9f2gq07w8n2gywa0n0d9wv8644l53ni9fz7i69jf8q2fm"; }; + sourceRoot = "source/server"; - propagatedBuildInputs = with python3Packages; [ + postPatch = '' + substituteInPlace setup.py \ + --replace "pluggy>=0.6.0,<1.0" "pluggy>=0.6.0,<2.0" + ''; + + propagatedBuildInputs = [ py appdirs devpi-common @@ -27,7 +48,7 @@ python3Packages.buildPythonApplication rec { waitress ]; - checkInputs = with python3Packages; [ + checkInputs = [ beautifulsoup4 nginx pytestCheckHook diff --git a/nixpkgs/pkgs/development/tools/dockle/default.nix b/nixpkgs/pkgs/development/tools/dockle/default.nix index 084f5eea21d3..9d6510c89d8d 100644 --- a/nixpkgs/pkgs/development/tools/dockle/default.nix +++ b/nixpkgs/pkgs/development/tools/dockle/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dockle"; - version = "0.3.15"; + version = "0.4.2"; src = fetchFromGitHub { owner = "goodwithtech"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jxFlbGJ95cSv08HcqrVufpTE5KkvAC9zOTQ2+JZWe5A="; + sha256 = "sha256-H+qJBwKh+jh5ECMPbPgGtXzF+mm73ut0+URqpNBc3SM="; }; - vendorSha256 = "sha256-h+2AcppNUJ7zjHeBzDy1iWoR3i7a2v0Pc7vOfoUqPOw="; + vendorSha256 = "sha256-klTIGmMKA6gp1strgvKnVBtYGQu2407UwxZ8brdGEkQ="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ btrfs-progs lvm2 ]; diff --git a/nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index b536dc940670..5586ed5c2301 100644 --- a/nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/nixpkgs/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -1,7 +1,7 @@ -{ lib, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome -, python2Packages }: +{ lib, fetchurl, pkg-config, libxml2, libxslt, intltool, gnome +, python3Packages, fetchpatch, bash }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "gnome-doc-utils"; version = "0.20.10"; @@ -12,28 +12,31 @@ python2Packages.buildPythonApplication rec { sha256 = "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb"; }; + patches = [ + # https://bugzilla.redhat.com/show_bug.cgi?id=438638 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/gnome-doc-utils/raw/6b8908abe5af61a952db7174c5d1843708d61f1b/f/gnome-doc-utils-0.14.0-package.patch"; + sha256 = "sha256-V2L2/30NoHY/wj3+dsombxveWRSUJb2YByOKtEgVx/0="; + }) + # python3 support + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/gnome-doc-utils/raw/6b8908abe5af61a952db7174c5d1843708d61f1b/f/gnome-doc-utils-0.20.10-python3.patch"; + sha256 = "sha256-niH/Yx5H44rsRgkCZS8LWLFB9ZvuInt75zugzoVUhH0="; + }) + ]; + nativeBuildInputs = [ intltool pkg-config libxslt.dev ]; - buildInputs = [ libxslt ]; + buildInputs = [ libxml2 libxslt bash ]; + propagatedBuildInputs = [ python3Packages.libxml2 ]; configureFlags = [ "--disable-scrollkeeper" ]; - preBuild = '' - substituteInPlace xml2po/xml2po/Makefile --replace '-e "s+^#!.*python.*+#!$(PYTHON)+"' '-e "s\"^#!.*python.*\"#!$(PYTHON)\""' - ''; - - propagatedBuildInputs = [ libxml2Python ]; - passthru = { updateScript = gnome.updateScript { packageName = pname; }; }; - postFixup = '' - # Do not propagate Python - rm $out/nix-support/propagated-build-inputs - ''; - meta = with lib; { description = "Collection of documentation utilities for the GNOME project"; homepage = "https://gitlab.gnome.org/GNOME/gnome-doc-utils"; diff --git a/nixpkgs/pkgs/development/tools/earthly/default.nix b/nixpkgs/pkgs/development/tools/earthly/default.nix index 53da9c1fb4ef..b44ef14c6cab 100644 --- a/nixpkgs/pkgs/development/tools/earthly/default.nix +++ b/nixpkgs/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.5.20"; + version = "0.5.22"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-wPtL5fH6s4qlG82udeg9Gv4iNBjDEeKNTDFHPsW4V/A="; + sha256 = "sha256-mwyL0o+f7hPvVhWBE7k5a56kzDpeM4rw8h5oLkgsqgc="; }; - vendorSha256 = "sha256-gydhh/EMSuE/beo+A2CRDdDnQGT6DMjMwthylT339I4="; + vendorSha256 = "sha256-pITTp9BqGfUFSF15pl5AM0npJuylJ+FcGw4xGaOi0/o="; ldflags = [ "-s" "-w" diff --git a/nixpkgs/pkgs/development/tools/efm-langserver/default.nix b/nixpkgs/pkgs/development/tools/efm-langserver/default.nix index 48d4059277d6..9fb1da1aaa53 100644 --- a/nixpkgs/pkgs/development/tools/efm-langserver/default.nix +++ b/nixpkgs/pkgs/development/tools/efm-langserver/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "efm-langserver"; - version = "0.0.36"; + version = "0.0.37"; src = fetchFromGitHub { owner = "mattn"; repo = "efm-langserver"; rev = "v${version}"; - sha256 = "sha256-X2z49KmJiKh1QtcDBZcqNiMhq5deVamS47w6gyVq7Oo="; + sha256 = "sha256-7weRR1+n0v2HHkM4iYAzWDazmPJUmJj5TQo+dG13B0M="; }; vendorSha256 = "sha256-tca+1SRrFyvU8ttHmfMFiGXd1A8rQSEWm1Mc2qp0EfI="; diff --git a/nixpkgs/pkgs/development/tools/electron/default.nix b/nixpkgs/pkgs/development/tools/electron/default.nix index 040c289720ce..737d6bc864c3 100644 --- a/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/nixpkgs/pkgs/development/tools/electron/default.nix @@ -105,33 +105,33 @@ rec { headers = "1zkdgpjrh1dc9j8qyrrrh49v24960yhvwi2c530qbpf2azgqj71b"; }; - electron_12 = mkElectron "12.1.0" { - x86_64-linux = "b573f88a892e3f282352466db711734a678289edce83271f16865d63df4e8c85"; - x86_64-darwin = "0c036793cfebb6ed680b13e11804560ec301fc26c68737045a3e9dcee3e8930b"; - i686-linux = "0dced2796addc5e5440ca58691efd3ad683ae41906dea84ef517dd855c3df5a1"; - armv7l-linux = "a1a07f550869f9a22b1ddc0f325ff5d60a792c7c8cf206c70f26c8d8867ced27"; - aarch64-linux = "58da83b9e5c231ba0078cb2723530ab1be2c97d0c4036c88c7146cdf1a08ddac"; - aarch64-darwin = "01e9f4c12f86eef6e79a594880b2415decad604fb1a7bb5d8086f6dcebc2de7c"; - headers = "040ikf5wcz9zm0kprpggl3jiw8lj4msnh8kjqaacjk480wgv6k5q"; + electron_12 = mkElectron "12.1.2" { + x86_64-linux = "e0ed1e223e956213f4f835573dd9c84aac3588c1d12ca67f81399534611a873d"; + x86_64-darwin = "6a0efef7cee47d5f7cff7edfe2f3eaa134368f9ac8741742dfcb49f59da51e59"; + i686-linux = "90c60083261bf86410f30d2588204276943cc7cbfe7751192723fdde6a67da72"; + armv7l-linux = "cdff93b3ee2ab175c45d1afa33c7dde38030abe54fe285804a0eb3f983f67bdd"; + aarch64-linux = "fe1351253cc8e9f6828de90957b40fab1cad31d38e88ef085c98a1b72d9cd14b"; + aarch64-darwin = "4b2a2b9986938f332894946b22fc6cac357f69aaa72afe61b6ca6084d48dce67"; + headers = "019rf1r9mk0hzhbl5fq48zr0l4y943biv2xwnpdhr5bm1wqpvz6l"; }; - electron_13 = mkElectron "13.3.0" { - x86_64-linux = "dae470d4685c1e18ea399cb4607d598a325d1a5143d1fabc15e3ec112a65b65b"; - x86_64-darwin = "d8c673aca3cd5b0d573c24c9fd29ff6f6cea52daa2e9feb680c7d05c7982cf53"; - i686-linux = "1569e39548493d4cc6a4feed1386ab18238705d20ed98078567db5439b9cafa5"; - armv7l-linux = "91e6dec7be053a599cf4b6ab13e577ddb68fb35bd7a786c4f7e31a73b663aa59"; - aarch64-linux = "147a43797e3aac97845a87f744cceacdfbed19b8017eea25f2e48cf519e20cfe"; - aarch64-darwin = "f0e0b7e1a9a1ce41abbc2b64a8f1070b966535b4c90e6e293481c2e47a3f1a90"; - headers = "1cxrpw5yzbv0gscmyzh0041smxirifp9f8nchn212csanjdycn6x"; + electron_13 = mkElectron "13.4.0" { + x86_64-linux = "383549a918c6e3990345adc3ba8bb6551ab73c7c945a3137d44cb6e109c4b849"; + x86_64-darwin = "902bf07fb7e84f824cce7addb31743eda375d9d4a3f41ac1cf74c152fb43250b"; + i686-linux = "f7c8570a1fcbeab9211f182b957c16e17914df529c474643e4ae24e397055542"; + armv7l-linux = "e783ec550da7e948e51be58dc395e14805b29053be084a1423edfcdccd639dbd"; + aarch64-linux = "3daac7966d6bb609d09780a13eeb9cf2cabdda79d25c4ba30b6fb6b95371c8b5"; + aarch64-darwin = "54c7cdaf0efaf9e9b19a5619a6403c656cd8c0f5d4108b6f6577f6968f263618"; + headers = "0wm92fppm9xqik9mbabpsh04da062q1sfhcdjczihxsfaxs3klaq"; }; - electron_14 = mkElectron "14.0.0" { - x86_64-linux = "0a40533a50a42e6668e5265a84e2983979eededbb61f9e201d569d8b1b37ce0f"; - x86_64-darwin = "4025c50cb9a0dce1a7b5d5698ee5412e55abeae386329ffe293152a8c42388e8"; - i686-linux = "955280a0eb862eef913f9f394c7c7574138a5a48ffa85c59e84cc0163564fbfa"; - armv7l-linux = "825684b3f759bc6c5d2e5be7c6a7679b7a1b8e0d9091f7d2f9904d0c24f6c978"; - aarch64-linux = "367e76b34dcc58371232c87f540dd227c51de94ce8a916761379c3c4b890dd80"; - aarch64-darwin = "0df8ced31e56243adb17f328e8d580a50e22d46403b2bb28d8922d2515904d94"; - headers = "129rw4a05ixkyiiag2dgadcm34ndfajd896k11siahcij7rn4j7g"; + electron_14 = mkElectron "14.0.1" { + x86_64-linux = "8a364aaff446f7ac034bcad7130330ce5a9384eb0f8736aca30ea1a4ffc7cb2f"; + x86_64-darwin = "66f14e804b0a40e50562fcb4ed44a0dca4fd27be5420b787045276fcb9a4b9fd"; + i686-linux = "7ee08215f4e6b144ee8a17796f0967c12ee6755c29617f398047e0d5e1dd52bb"; + armv7l-linux = "8dd205bb9fad6ae46344b524dda6e76991f67a78b67d6f6361431b2e5cb8e942"; + aarch64-linux = "02f8c4e0af9370082404f13ace86faa6e927ee9d5899722bb2fac50a030cb213"; + aarch64-darwin = "a8816214dd31c5a44a51fd43c6709e7a7fe69750e5e42b75bfa747402ea3f75f"; + headers = "08b6sx1bq1mshvdj1qzv8vxalmf8qb57qhs9krz0l4c7wf722idm"; }; } diff --git a/nixpkgs/pkgs/development/tools/esbuild/default.nix b/nixpkgs/pkgs/development/tools/esbuild/default.nix index 5399e863f949..f29a1b57df74 100644 --- a/nixpkgs/pkgs/development/tools/esbuild/default.nix +++ b/nixpkgs/pkgs/development/tools/esbuild/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.25"; + version = "0.13.0"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-2qYfev8x+DmtujIRNgwblTD31Lr+WvQQ/XXjjBOVusE="; + sha256 = "sha256-NPpWK99P4p8GM4MNaIT8MLPzRNHiRh2yrwqG1A0KluM="; }; - vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; + vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; meta = with lib; { description = "An extremely fast JavaScript bundler"; diff --git a/nixpkgs/pkgs/development/tools/fnm/default.nix b/nixpkgs/pkgs/development/tools/fnm/default.nix index a11163385893..4a9c05b4a4e6 100644 --- a/nixpkgs/pkgs/development/tools/fnm/default.nix +++ b/nixpkgs/pkgs/development/tools/fnm/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "fnm"; - version = "1.26.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "Schniz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wKtgMUt7QquT6mS3AI+XrZqbJOZxj6jlJi+7uC9w7xU="; + sha256 = "sha256-4qnisgWhdAWZda8iy9nkph7//bVKJuUeEDS1GaAx+FQ="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-TMhhCVVFTanKdbDp7L3ZaiNohWo5a/jFbQjdRiBlCkk="; + cargoSha256 = "sha256-f3wzuXH2ByXHHOq3zLaMtYm2HJ4BzmZe2e6DQ3V7qVo="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/frugal/default.nix b/nixpkgs/pkgs/development/tools/frugal/default.nix index af87dbf2d193..38944e41ce41 100644 --- a/nixpkgs/pkgs/development/tools/frugal/default.nix +++ b/nixpkgs/pkgs/development/tools/frugal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frugal"; - version = "3.14.8"; + version = "3.14.9"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oCqN9iG4+vBvIJoW1v4ww9SALlhcX5bEgqSjTArPQ2g="; + sha256 = "sha256-LyPa6x72dz59TYWYqTrpnqUpXz9Ruf+worLvIfFJRHY="; }; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/development/tools/fundoc/default.nix b/nixpkgs/pkgs/development/tools/fundoc/default.nix new file mode 100644 index 000000000000..47484b78759c --- /dev/null +++ b/nixpkgs/pkgs/development/tools/fundoc/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "fundoc"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "csssr"; + repo = pname; + rev = "v${version}"; + sha256 = "0nd03c2lz07ghaab67kgl5pw8z8mv6kwx3xzr4pqr7v5b983py6v"; + }; + + cargoSha256 = "sha256-6riBlCyqNN2nzgwfVfbRy1avT9b0PdetOrbmbaltsjE="; + + meta = with lib; { + description = "Language agnostic documentation generator"; + homepage = "https://github.com/csssr/fundoc"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/go-migrate/default.nix b/nixpkgs/pkgs/development/tools/go-migrate/default.nix index 261da1ddbdf7..c007d2d1ca2b 100644 --- a/nixpkgs/pkgs/development/tools/go-migrate/default.nix +++ b/nixpkgs/pkgs/development/tools/go-migrate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-migrate"; - version = "4.14.1"; + version = "4.15.0"; src = fetchFromGitHub { owner = "golang-migrate"; repo = "migrate"; rev = "v${version}"; - sha256 = "1mgs3bngghmirmn0pw351m54darv8d5iymlxcjqw3vr0cyn5aqj0"; + sha256 = "sha256-fl6gPKZlc8K6yD8xHC6XbmCHUJl6nI+X2I4JmXABWdY="; }; - vendorSha256 = "071gfyx6iqla8ir7ianw1z62rdsds9shakzqs9wn34ll1kdbd4rv"; + vendorSha256 = "sha256-/N1sglGPwb77HLnVOzMYlFPSmeUvWs+wld7Fd7rjWrA="; subPackages = [ "cmd/migrate" ]; diff --git a/nixpkgs/pkgs/development/tools/go-mockery/default.nix b/nixpkgs/pkgs/development/tools/go-mockery/default.nix index 598ee15a5f3d..7563146afa9b 100644 --- a/nixpkgs/pkgs/development/tools/go-mockery/default.nix +++ b/nixpkgs/pkgs/development/tools/go-mockery/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.9.0"; + version = "2.9.2"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-lR4EhFddP+ae1xpRW82w53yNoBG4RpMHk8w4XFGcli8="; + sha256 = "sha256-+r9he3rlANGusv0vIZPSninaouMftRsfJWnm3VngcXU="; }; vendorSha256 = "sha256-//V3ia3YP1hPgC1ipScURZ5uXU4A2keoG6dGuwaPBcA="; diff --git a/nixpkgs/pkgs/development/tools/go-toml/default.nix b/nixpkgs/pkgs/development/tools/go-toml/default.nix index 8a41e0a4d133..add3780de5fd 100644 --- a/nixpkgs/pkgs/development/tools/go-toml/default.nix +++ b/nixpkgs/pkgs/development/tools/go-toml/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "go-toml"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "pelletier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Vu/PS01JeSeg1KHkpqL12rTjRJFoc9rla48H/ei2HDM="; + sha256 = "sha256-1ENmSeo3TtTvhgwtbmq+O9n9fD/FqSUiCrSplkJNTTg="; }; goPackagePath = "github.com/pelletier/go-toml"; diff --git a/nixpkgs/pkgs/development/tools/gokart/default.nix b/nixpkgs/pkgs/development/tools/gokart/default.nix index 3c973126c7a2..7722e0b36afe 100644 --- a/nixpkgs/pkgs/development/tools/gokart/default.nix +++ b/nixpkgs/pkgs/development/tools/gokart/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gokart"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "praetorian-inc"; repo = pname; rev = "v${version}"; - sha256 = "0wfv33yi83klnnyfas7wnsnx34cf28k1yvq06lkii96fvnzcar36"; + sha256 = "sha256-iXdPQkKTRE2BE2yG2KKThpj7HrxXWwBFv2TobEwGLQQ="; }; vendorSha256 = "0l5aj7j9m412bgm9n553m2sh9fy9dpzd0bi3qn21gj7bfdcpagnd"; diff --git a/nixpkgs/pkgs/development/tools/gotestsum/default.nix b/nixpkgs/pkgs/development/tools/gotestsum/default.nix index 161aba5d68f6..5ab7497c9a22 100644 --- a/nixpkgs/pkgs/development/tools/gotestsum/default.nix +++ b/nixpkgs/pkgs/development/tools/gotestsum/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X gotest.tools/gotestsum/cmd.version=${version}" ]; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 3a356b36be9a..64e26698aed1 100644 --- a/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,4 +1,4 @@ -{ lib, supportedGhcVersions ? [ "884" "8107" ], stdenv, haskellPackages +{ lib, supportedGhcVersions ? [ "884" "8107" "901" ], stdenv, haskellPackages , haskell }: # # The recommended way to override this package is diff --git a/nixpkgs/pkgs/development/tools/hors/default.nix b/nixpkgs/pkgs/development/tools/hors/default.nix new file mode 100644 index 000000000000..579a2a27922f --- /dev/null +++ b/nixpkgs/pkgs/development/tools/hors/default.nix @@ -0,0 +1,28 @@ +{ lib, rustPlatform, fetchFromGitHub, stdenv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "hors"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "windsoilder"; + repo = pname; + rev = "v${version}"; + sha256 = "1q17i8zg7dwd8al42wfnkn891dy5hdhw4325plnihkarr50avbr0"; + }; + + cargoSha256 = "sha256-1PB/JvgfC6qABI+cIePqtsSlZXPqMGQIay9SCXJkV9o="; + + buildInputs = lib.optional stdenv.isDarwin Security; + + # requires network access + doCheck = false; + + meta = with lib; { + description = "Instant coding answers via the command line"; + homepage = "https://github.com/windsoilder/hors"; + changelog = "https://github.com/WindSoilder/hors/blob/v${version}/CHANGELOG.md"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/htmlq/default.nix b/nixpkgs/pkgs/development/tools/htmlq/default.nix index 2dedd39e9419..165b7cd07007 100644 --- a/nixpkgs/pkgs/development/tools/htmlq/default.nix +++ b/nixpkgs/pkgs/development/tools/htmlq/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "htmlq"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "mgdm"; repo = "htmlq"; rev = "v${version}"; - sha256 = "sha256-Q2zjrHKFWowx2yB1cdGxPnNnc8yQJz65HaX0yIqbHks="; + sha256 = "sha256-pTw+dsbbFwrPIxCimMsYfyAF2zVeudebxVtMQV1cJnE="; }; - cargoSha256 = "sha256-pPtKPVSdEtEPmQPpNRJ4uyguDRAW0YvKgdUw5OAtbjA="; + cargoSha256 = "sha256-jeoSA7w2bk0R3L+/FDn/b+ddTCqY8zFr/2GCxI7OCzM="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/nixpkgs/pkgs/development/tools/jbang/default.nix b/nixpkgs/pkgs/development/tools/jbang/default.nix index 48e349abd849..b1263379369f 100644 --- a/nixpkgs/pkgs/development/tools/jbang/default.nix +++ b/nixpkgs/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.79.0"; + version = "0.80.1"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-ZlFjG6zlS/VLZjU4SXuDviFh6lsKeuNpIXYnHi2QB7s="; + sha256 = "sha256-Hc0/4nN67FqmcLmAUU0GbWYwnPFiDHSwCRrlqbphWHA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/kafkacat/default.nix b/nixpkgs/pkgs/development/tools/kafkacat/default.nix index b60c36df7254..5493bf24428d 100644 --- a/nixpkgs/pkgs/development/tools/kafkacat/default.nix +++ b/nixpkgs/pkgs/development/tools/kafkacat/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "kafkacat"; - version = "1.7.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "edenhill"; repo = "kafkacat"; rev = version; - sha256 = "sha256-koDhj/RQc9fhfqjrJylhURw6tppPELhLlBGbNVJsii8="; + sha256 = "0z3bw00s269myfd1xqksjyznmgp74xfs09xqlq347adsgby3cmfs"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/konstraint/default.nix b/nixpkgs/pkgs/development/tools/konstraint/default.nix index db9edf3b6d35..a59b452b0a4a 100644 --- a/nixpkgs/pkgs/development/tools/konstraint/default.nix +++ b/nixpkgs/pkgs/development/tools/konstraint/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "konstraint"; - version = "0.14.2"; + version = "0.15.0"; src = fetchFromGitHub { owner = "plexsystems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ESkRycS+ObLaDkb28kvi9Wtc4Lc66qHFz0DYMjEa5eE="; + sha256 = "sha256-lnbci3SUVp/vyArrfRF1dgv0KnqcmGIalhsZjDOhpSg="; }; - vendorSha256 = "sha256-uvDYUm6REL1hvj77P/+1fMCE1n6ZUP6rp0ma8O2bVkU="; + vendorSha256 = "sha256-hfnpZgGIEpfHjM5J93D/aljN6j5XHGknpYXWeRV4Y4Q="; # Exclude go within .github folder excludedPackages = ".github"; diff --git a/nixpkgs/pkgs/development/tools/kube-prompt/default.nix b/nixpkgs/pkgs/development/tools/kube-prompt/default.nix index 1a7bd6e82892..1c6e8d56a6ac 100644 --- a/nixpkgs/pkgs/development/tools/kube-prompt/default.nix +++ b/nixpkgs/pkgs/development/tools/kube-prompt/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "kube-prompt"; - version = "1.0.5"; + version = "1.0.11"; rev = "v${version}"; goPackagePath = "github.com/c-bata/kube-prompt"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "c-bata"; repo = "kube-prompt"; - sha256 = "1c1y0n1yxcaxvhlsj7b0wvhi934b5g0s1mi46hh5amb9j3dhgq1c"; + sha256 = "sha256-9OWsITbC7YO51QzsRwDWvojU54DiuGJhkSGwmesEj9w="; }; subPackages = ["."]; diff --git a/nixpkgs/pkgs/development/tools/kube-prompt/deps.nix b/nixpkgs/pkgs/development/tools/kube-prompt/deps.nix index b8d9e200a8ca..a6c4bbd445c4 100644 --- a/nixpkgs/pkgs/development/tools/kube-prompt/deps.nix +++ b/nixpkgs/pkgs/development/tools/kube-prompt/deps.nix @@ -1,309 +1,993 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +# file generated from go.mod using vgo2nix (https://github.com/nix-community/vgo2nix) [ { - goPackagePath = "cloud.google.com/go"; + goPackagePath = "cloud.google.com/go"; fetch = { type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "aad3f485ee528456e0768f20397b4d9dd941e755"; - sha256 = "1cgabmg76axkbpm7zip3ym2mym6kwgc9cw9kil0inmckkh3x1ky8"; + url = "https://github.com/googleapis/google-cloud-go"; + rev = "v0.38.0"; + sha256 = "0n6n13b7lri2fmc4bn4ifszyawj31dpbzvyv0xafsf81440z8cyh"; + moduleDir = ""; }; } { - goPackagePath = "github.com/c-bata/go-prompt"; + goPackagePath = "github.com/Azure/go-autorest/autorest"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "autorest/v0.9.0"; + sha256 = "01fg6x3a6as2kh0km8kvjzjalq7xiqa17hnsdwawzlpnfpqgslvq"; + moduleDir = "autorest"; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest/autorest/adal"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "autorest/adal/v0.5.0"; + sha256 = "07zbbshyz1s9fj9ifa6zzks4wq7455rna50z1ahpgin92jk0s6la"; + moduleDir = "autorest/adal"; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest/autorest/date"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "autorest/date/v0.1.0"; + sha256 = "1w94wxjjkiv8m44rcdm1af9h0ap2r8kpp9198cxpxj8d5xxkaxpz"; + moduleDir = "autorest/date"; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest/autorest/mocks"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "autorest/mocks/v0.2.0"; + sha256 = "04jsq3bnz9s27kp45n7q5wj2fi3bxwvxrxcmiswrhqz4pj35b561"; + moduleDir = "autorest/mocks"; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest/logger"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "logger/v0.1.0"; + sha256 = "1w94wxjjkiv8m44rcdm1af9h0ap2r8kpp9198cxpxj8d5xxkaxpz"; + moduleDir = "logger"; + }; + } + { + goPackagePath = "github.com/Azure/go-autorest/tracing"; + fetch = { + type = "git"; + url = "https://github.com/Azure/go-autorest"; + rev = "tracing/v0.5.0"; + sha256 = "0n482cjr2pk6ql6awcnn6llrnygjzakihbjaahgmylf3znwil7jp"; + moduleDir = "tracing"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/NYTimes/gziphandler"; + fetch = { + type = "git"; + url = "https://github.com/NYTimes/gziphandler"; + rev = "56545f4a5d46"; + sha256 = "1fwk9wz6vrvq72f2gq8jhvd1nvv6grqgwrjq66vjpm0726pxar72"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/purell"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/purell"; + rev = "v1.0.0"; + sha256 = "1qhsy1nm96b9kb63svkvkqmmw15xg6irwcysisxdgzk64adfwqv1"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/urlesc"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/urlesc"; + rev = "5bd2802263f2"; + sha256 = "15y5r3asvm7196m3nza5xvdvlc2k11p6lfs6hi917hl7r9vgi6mp"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/c-bata/go-prompt"; fetch = { type = "git"; url = "https://github.com/c-bata/go-prompt"; - rev = "09daf6ae57865e436aab9ede6b66b490036e87de"; - sha256 = "1s58y0i67x2yvi3iisdhj2qqrbl4kz0viy06caip8ykhxpvvkq30"; + rev = "v0.2.5"; + sha256 = "1ny9a1cshl9h6rddk3j0ar6iya1iahaw623g7qbsrbdbx38xlip3"; + moduleDir = ""; }; } { - goPackagePath = "github.com/ghodss/yaml"; + goPackagePath = "github.com/client9/misspell"; + fetch = { + type = "git"; + url = "https://github.com/client9/misspell"; + rev = "v0.3.4"; + sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/dgrijalva/jwt-go"; + fetch = { + type = "git"; + url = "https://github.com/dgrijalva/jwt-go"; + rev = "v3.2.0"; + sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/docker/spdystream"; + fetch = { + type = "git"; + url = "https://github.com/docker/spdystream"; + rev = "449fdfce4d96"; + sha256 = "1412cpiis971iq1kxrirzirhj2708ispjh0x0dh879b66x8507sl"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/elazarl/goproxy"; + fetch = { + type = "git"; + url = "https://github.com/elazarl/goproxy"; + rev = "c4fc26588b6e"; + sha256 = "1s3v02px61a3hmvb47rqk598z5visayxq46k3c8dcrayhhngv2fw"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/emicklei/go-restful"; + fetch = { + type = "git"; + url = "https://github.com/emicklei/go-restful"; + rev = "ff4f55a20633"; + sha256 = "1v5lj5142abz3gvbygp6xghpdx4ps2lwswl8559ivaidahwnc21c"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/evanphx/json-patch"; + fetch = { + type = "git"; + url = "https://github.com/evanphx/json-patch"; + rev = "v4.2.0"; + sha256 = "0cfvyhl3hjfc4z8hbkfc40yafv6r7y513zgp3jwf88isbd13r7a6"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; fetch = { type = "git"; url = "https://github.com/ghodss/yaml"; - rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; - sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + rev = "73d445a93680"; + sha256 = "0pg53ky4sy3sp9j4n7vgf1p3gw4nbckwqfldcmmi9rf13kjh0mr7"; + moduleDir = ""; }; } { - goPackagePath = "github.com/gogo/protobuf"; + goPackagePath = "github.com/go-logr/logr"; + fetch = { + type = "git"; + url = "https://github.com/go-logr/logr"; + rev = "v0.1.0"; + sha256 = "0fhijjhxz4n2j5i24ckzv8r9kri3v44jdyklgbqjfq0xm7izqg14"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonpointer"; + rev = "46af16f9f7b1"; + sha256 = "0w0fphmdycjzbsm1vppdcjc9aqinkcdzcq3pxikdvdqh5p791gsc"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonreference"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonreference"; + rev = "13c6e3589ad9"; + sha256 = "1fh4xcl9ijww4bdq656sx981d57w2c9zx5148jsxlsg4bsvxmwis"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/go-openapi/spec"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/spec"; + rev = "6aced65f8501"; + sha256 = "0yf0nw7167yjpiqrikns5djarjpf2r07q6xnq9xb1cfsc4m7ynm4"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/go-openapi/swag"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/swag"; + rev = "1d0bd113de87"; + sha256 = "0fmk42chj20679n87n6sig3czs25lavyj6w208000n6kccv1ns3c"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; fetch = { type = "git"; url = "https://github.com/gogo/protobuf"; - rev = "636bf0302bc95575d69441b25a2603156ffdddf1"; - sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; + rev = "65acae22fc9d"; + sha256 = "0700alky9z0g9akhrzn20wf4jr1600d0clhs32sm8chnlbvidy46"; + moduleDir = ""; }; } { - goPackagePath = "github.com/golang/glog"; + goPackagePath = "github.com/golang/glog"; fetch = { type = "git"; url = "https://github.com/golang/glog"; - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + rev = "23def4e6c14b"; sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/golang/groupcache"; + fetch = { + type = "git"; + url = "https://github.com/golang/groupcache"; + rev = "02826c3e7903"; + sha256 = "0w46bsllddfij66nrg8jbfjsr54birvfww8a2fj9fmgyig5syn2x"; + moduleDir = ""; }; } { - goPackagePath = "github.com/golang/protobuf"; + goPackagePath = "github.com/golang/mock"; + fetch = { + type = "git"; + url = "https://github.com/golang/mock"; + rev = "v1.2.0"; + sha256 = "12ddj2g8ab87id6n2n67vnbhq6p8dvgsq1pzpqfriym4dk8w54fg"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; - sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; + rev = "v1.3.2"; + sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; + moduleDir = ""; }; } { - goPackagePath = "github.com/google/btree"; + goPackagePath = "github.com/google/btree"; fetch = { type = "git"; url = "https://github.com/google/btree"; - rev = "e89373fe6b4a7413d7acd6da1725b83ef713e6e4"; - sha256 = "0jlkjjlf8ilifgsb2bv0jfgl4cxl1bypx7a6pjkwz3xf6k8jd7mj"; + rev = "v1.0.0"; + sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.3.0"; + sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj"; + moduleDir = ""; }; } { - goPackagePath = "github.com/google/gofuzz"; + goPackagePath = "github.com/google/gofuzz"; fetch = { type = "git"; url = "https://github.com/google/gofuzz"; - rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1"; - sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; + rev = "v1.0.0"; + sha256 = "0qz439qvccm91w0mmjz4fqgx48clxdwagkvvx89cr43q1d4iry36"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/martian"; + fetch = { + type = "git"; + url = "https://github.com/google/martian"; + rev = "v2.1.0"; + sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/pprof"; + fetch = { + type = "git"; + url = "https://github.com/google/pprof"; + rev = "3ea8567a2e57"; + sha256 = "09rhjn3ms0a72dw0yzbp237p7yhqma772zspddn6mgkh3gi3kn4c"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.1"; + sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/googleapis/gax-go/v2"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gax-go"; + rev = "v2.0.4"; + sha256 = "1iwnm6ky1x53lgs44mw3hpdkjzrm5qd0kfs50m0qcq2ml5m1cwdm"; + moduleDir = ""; }; } { - goPackagePath = "github.com/googleapis/gnostic"; + goPackagePath = "github.com/googleapis/gnostic"; fetch = { type = "git"; url = "https://github.com/googleapis/gnostic"; - rev = "7c663266750e7d82587642f65e60bc4083f1f84e"; + rev = "v0.2.0"; sha256 = "0yh3ckd7m0r9h50wmxxvba837d0wb1k5yd439zq4p1kpp4390z12"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/gophercloud/gophercloud"; + fetch = { + type = "git"; + url = "https://github.com/gophercloud/gophercloud"; + rev = "v0.1.0"; + sha256 = "0794s9c144gphm4dh1wgba6ydsb4zdwgglj1p9im43jv0lvh6p81"; + moduleDir = ""; }; } { - goPackagePath = "github.com/gregjones/httpcache"; + goPackagePath = "github.com/gregjones/httpcache"; fetch = { type = "git"; url = "https://github.com/gregjones/httpcache"; - rev = "9cad4c3443a7200dd6400aef47183728de563a38"; + rev = "9cad4c3443a7"; sha256 = "0wjdwcwqqcx2d5y68qvhg6qyj977il5ijmnn9h9cd6wjbdy0ay6s"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "v0.5.1"; + sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; + moduleDir = ""; }; } { - goPackagePath = "github.com/imdario/mergo"; + goPackagePath = "github.com/hpcloud/tail"; + fetch = { + type = "git"; + url = "https://github.com/hpcloud/tail"; + rev = "v1.0.0"; + sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; fetch = { type = "git"; url = "https://github.com/imdario/mergo"; - rev = "9316a62528ac99aaecb4e47eadd6dc8aa6533d58"; + rev = "v0.3.5"; sha256 = "1mvgn89vp39gcpvhiq4n7nw5ipj7fk6h03jgc6fjwgvwvss213pb"; + moduleDir = ""; }; } { - goPackagePath = "github.com/json-iterator/go"; + goPackagePath = "github.com/json-iterator/go"; fetch = { type = "git"; url = "https://github.com/json-iterator/go"; - rev = "ab8a2e0c74be9d3be70b3184d9acc634935ded82"; - sha256 = "1x3wz44p1238gpyzkiiilvvrq9q8dwjdm9kdidq65yjq0zcn0sq4"; + rev = "v1.1.8"; + sha256 = "1kbp9fj6fxfql0ir59zb6v68l4bpwlmk76xm8vaikw1hp6y9bcss"; + moduleDir = ""; }; } { - goPackagePath = "github.com/mattn/go-colorable"; + goPackagePath = "github.com/jstemmer/go-junit-report"; + fetch = { + type = "git"; + url = "https://github.com/jstemmer/go-junit-report"; + rev = "af01ea7f8024"; + sha256 = "1lp3n94ris12hac02wi31f3whs88lcrzwgdg43a5j6cafg9p1d0s"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/kisielk/errcheck"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/errcheck"; + rev = "v1.2.0"; + sha256 = "0am6g10ipdxw84byscm7shda654882wjcbinq5c4696m6mhi2qrd"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/kisielk/gotool"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/gotool"; + rev = "v1.0.0"; + sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "d5b7844b561a"; + sha256 = "1g84l4wns28xjpn6nl1g33dcj3sfgxlkqqsa6w8fbq2kwyd50xka"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; fetch = { type = "git"; url = "https://github.com/mattn/go-colorable"; - rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + rev = "v0.1.7"; + sha256 = "08y5c01bvyqxraj3wc0di80gbp87178rsshb74x0p3m7wwfv82l3"; + moduleDir = ""; }; } { - goPackagePath = "github.com/mattn/go-isatty"; + goPackagePath = "github.com/mattn/go-isatty"; fetch = { type = "git"; url = "https://github.com/mattn/go-isatty"; - rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"; - sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; + rev = "v0.0.12"; + sha256 = "1dfsh27d52wmz0nmmzm2382pfrs2fcijvh6cgir7jbb4pnigr5w4"; + moduleDir = ""; }; } { - goPackagePath = "github.com/mattn/go-runewidth"; + goPackagePath = "github.com/mattn/go-runewidth"; fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb"; - sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g"; + rev = "v0.0.9"; + sha256 = "1mvlxcdwr0vwp8b2wqs6y7hk72y28sqh03dz5x0xkg48d4y9cplj"; + moduleDir = ""; }; } { - goPackagePath = "github.com/mattn/go-tty"; + goPackagePath = "github.com/mattn/go-tty"; fetch = { type = "git"; url = "https://github.com/mattn/go-tty"; - rev = "931426f7535ac39720c8909d70ece5a41a2502a6"; - sha256 = "00cb07v13xrfqm39m1j2h2zvj684gl9fzr51591i9a52a9m6xlj5"; + rev = "v0.0.3"; + sha256 = "0d1d63q02pc5k5ga8bw4yjbkrli2769vg237psajsskjirjy53vf"; + moduleDir = ""; }; } { - goPackagePath = "github.com/modern-go/concurrent"; + goPackagePath = "github.com/modern-go/concurrent"; fetch = { type = "git"; url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"; + rev = "bacd9c7ef1dd"; sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; + moduleDir = ""; }; } { - goPackagePath = "github.com/modern-go/reflect2"; + goPackagePath = "github.com/modern-go/reflect2"; fetch = { type = "git"; url = "https://github.com/modern-go/reflect2"; - rev = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd"; - sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49"; + rev = "v1.0.1"; + sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; + moduleDir = ""; }; } { - goPackagePath = "github.com/petar/GoLLRB"; + goPackagePath = "github.com/munnerz/goautoneg"; fetch = { type = "git"; - url = "https://github.com/petar/GoLLRB"; - rev = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4"; - sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0"; + url = "https://github.com/munnerz/goautoneg"; + rev = "a547fc61f48d"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + moduleDir = ""; }; } { - goPackagePath = "github.com/peterbourgon/diskv"; + goPackagePath = "github.com/mxk/go-flowrate"; + fetch = { + type = "git"; + url = "https://github.com/mxk/go-flowrate"; + rev = "cca7078d478f"; + sha256 = "0zqs39923ja0yypdmiqk6x8pgmfs3ms5x5sl1dqv9z6zyx2xy541"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/onsi/ginkgo"; + fetch = { + type = "git"; + url = "https://github.com/onsi/ginkgo"; + rev = "v1.10.1"; + sha256 = "033a42h1wzmji57p86igg9whvsbp6nvfdsypskw738ys903n3z4d"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/onsi/gomega"; + fetch = { + type = "git"; + url = "https://github.com/onsi/gomega"; + rev = "v1.7.0"; + sha256 = "09j6wq425wgzzsbwm9ckhfgl2capv3yyqbrf45qyrjwkzm49i02y"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/peterbourgon/diskv"; fetch = { type = "git"; url = "https://github.com/peterbourgon/diskv"; - rev = "5f041e8faa004a95c88a202771f4cc3e991971e6"; + rev = "v2.0.1"; sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b"; + moduleDir = ""; }; } { - goPackagePath = "github.com/pkg/term"; + goPackagePath = "github.com/pkg/term"; fetch = { type = "git"; url = "https://github.com/pkg/term"; - rev = "cda20d4ac917ad418d86e151eff439648b06185b"; - sha256 = "08frhz411dwyli5spfxn32d3ni9mrgdav51lmg8a1wpdmw0r0wwp"; + rev = "v1.1.0"; + sha256 = "0flyj256zv5qc7z3m3s147k46p9whr7hl06zzwgvy2dkjp90ff73"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "v1.2.2"; + sha256 = "0j9r65qgd58324m85lkl49vk9dgwd62g7dwvkfcm3k6i9dc555a9"; + moduleDir = ""; }; } { - goPackagePath = "github.com/spf13/pflag"; + goPackagePath = "github.com/spf13/pflag"; fetch = { type = "git"; url = "https://github.com/spf13/pflag"; - rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; - sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; + rev = "v1.0.5"; + sha256 = "0gpmacngd0gpslnbkzi263f5ishigzgh6pbdv9hp092rnjl4nd31"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.0"; + sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.4.0"; + sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; + moduleDir = ""; + }; + } + { + goPackagePath = "go.opencensus.io"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-go"; + rev = "v0.21.0"; + sha256 = "14s0a12xdzjvad0dgksgv8m3hh7nc585abvjkvyk6r67a29lxj6x"; + moduleDir = ""; }; } { - goPackagePath = "golang.org/x/crypto"; + goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9"; - sha256 = "0hjjk6k9dq7zllwsw9icdfbli12ii379q2lajd6l7lyw72wy28by"; + rev = "60c769a6c586"; + sha256 = "1wy2pg38dz29vf1h48yfqf8m3jqvwnbdw8vkk3ldlj5d8fbbbmv8"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/exp"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/exp"; + rev = "509febef88a4"; + sha256 = "02isrh39z8znrp5znplzy0dip2gnrl3jm1355raliyvhnhg04j6q"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "5614ed5bae6f"; + sha256 = "0fzn0zjv0x92xvfdq3a0v9w5sgkhr7hxkfy9zaqi8i57807z8bnx"; + moduleDir = ""; }; } { - goPackagePath = "golang.org/x/net"; + goPackagePath = "golang.org/x/net"; fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1"; - sha256 = "018zmn4kmg2mbngcciqal54slc3pl4ry5vlv0bw36fcxvnazxnbp"; + rev = "13f9640d40b9"; + sha256 = "1ba2767lvklnmfvb9jkwvd4m7z6326gaiz3rgylh795g88hy34g1"; + moduleDir = ""; }; } { - goPackagePath = "golang.org/x/oauth2"; + goPackagePath = "golang.org/x/oauth2"; fetch = { type = "git"; url = "https://go.googlesource.com/oauth2"; - rev = "ef147856a6ddbb60760db74283d2424e98c87bff"; - sha256 = "1q1vm1z40fx1grlrm7az4rln6v5pj9xi5n1cjqg5xgq4dsk9132y"; + rev = "0f29369cfe45"; + sha256 = "06jwpvx0x2gjn2y959drbcir5kd7vg87k0r1216abk6rrdzzrzi2"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "cd5d95a43a6e"; + sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; + moduleDir = ""; }; } { - goPackagePath = "golang.org/x/sys"; + goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "ac767d655b305d4e9612f5f6e33120b9176c4ad4"; - sha256 = "1ds29n5lh4j21hmzxz7vk7hv1k6sixc7f0zsdc9xqdg0j7d212zm"; + rev = "af09f7315aff"; + sha256 = "0kr94lzr8ngrc6913j5xh6g4r7g087dbdgnpzi6rjcl0bf8nsr22"; + moduleDir = ""; }; } { - goPackagePath = "golang.org/x/text"; + goPackagePath = "golang.org/x/text"; fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + rev = "v0.3.2"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + moduleDir = ""; }; } { - goPackagePath = "golang.org/x/time"; + goPackagePath = "golang.org/x/time"; fetch = { type = "git"; url = "https://go.googlesource.com/time"; - rev = "fbb02b2291d28baffd63558aa44b4b56f178d650"; - sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4"; + rev = "9d24e82272b4"; + sha256 = "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "e65039ee4138"; + sha256 = "0c094599cf70wdrms49a3879qkq122pqlp2av444gs2pvc8apdcx"; + moduleDir = ""; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/google-api-go-client"; + rev = "v0.4.0"; + sha256 = "1hzgrw5wasmcjlqpxsmryddzzw4cwyzf2vx14i9z51v1plwssijm"; + moduleDir = ""; }; } { - goPackagePath = "google.golang.org/appengine"; + goPackagePath = "google.golang.org/appengine"; fetch = { type = "git"; url = "https://github.com/golang/appengine"; - rev = "b1f26356af11148e710935ed1ac8a7f5702c7612"; - sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; + rev = "v1.5.0"; + sha256 = "0l7mkdnwhidv8m686x432vmx8z5nqcrr9f46ddgvrxbh4wvyfcll"; + moduleDir = ""; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/go-genproto"; + rev = "e7d98fc518a7"; + sha256 = "1cnavkyawwvfc5yl097ygnfy1ac69v4zc02gdfnq1bvgcvgmvnbi"; + moduleDir = ""; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "v1.19.0"; + sha256 = "1znqwpj7ix3dpzx4zch0q70sdl3z5lvbb7v3q4i8sf8kas3yv71v"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + moduleDir = ""; }; } { - goPackagePath = "gopkg.in/inf.v0"; + goPackagePath = "gopkg.in/inf.v0"; fetch = { type = "git"; - url = "https://github.com/go-inf/inf"; - rev = "d2d2541c53f18d2a059457998ce2876cc8e67cbf"; + url = "https://gopkg.in/inf.v0"; + rev = "v0.9.1"; sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; + moduleDir = ""; }; } { - goPackagePath = "gopkg.in/yaml.v2"; + goPackagePath = "gopkg.in/tomb.v1"; fetch = { type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + url = "https://gopkg.in/tomb.v1"; + rev = "dd632973f1e7"; + sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; + moduleDir = ""; }; } { - goPackagePath = "k8s.io/api"; + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.4"; + sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2"; + moduleDir = ""; + }; + } + { + goPackagePath = "honnef.co/go/tools"; + fetch = { + type = "git"; + url = "https://github.com/dominikh/go-tools"; + rev = "3f1c8253044a"; + sha256 = "0d3vgh0fgfj1z7i648g1s6x2pwxd07sxfjwg1xn3yagr9h06jh3h"; + moduleDir = ""; + }; + } + { + goPackagePath = "k8s.io/api"; fetch = { type = "git"; url = "https://github.com/kubernetes/api"; - rev = "072894a440bdee3a891dea811fe42902311cd2a3"; - sha256 = "1hlbfwak4adwkj74jdiw8kmapri9rqmmjssncqiq0xnwlkcyn0ig"; + rev = "v0.17.0"; + sha256 = "180gijj7nl6pgfgqg6h7rcpxissmq9c3axph8ld7llx0cwmsxdrb"; + moduleDir = ""; }; } { - goPackagePath = "k8s.io/apimachinery"; + goPackagePath = "k8s.io/apimachinery"; fetch = { type = "git"; url = "https://github.com/kubernetes/apimachinery"; - rev = "103fd098999dc9c0c88536f5c9ad2e5da39373ae"; - sha256 = "04navnpm59d75dhlz07rmay7m2izrf4m0i9xklxzqg7mlk9g20jc"; + rev = "v0.17.0"; + sha256 = "1418y3p2fx7zsf1anpwcma1fqnaymal12d6x33j600jf1y0j9g8i"; + moduleDir = ""; }; } { - goPackagePath = "k8s.io/client-go"; + goPackagePath = "k8s.io/client-go"; fetch = { type = "git"; url = "https://github.com/kubernetes/client-go"; - rev = "7d04d0e2a0a1a4d4a1cd6baa432a2301492e4e65"; - sha256 = "06rszpgckx9gmqz9gbq8wnl39d1dnl28wdgrygj2fhz5prhj0x4s"; + rev = "v0.17.0"; + sha256 = "1v8n92g18xb6b1wvl3p2slm0hbpf8agwdyslqn2wgnwyhhgi0rfg"; + moduleDir = ""; + }; + } + { + goPackagePath = "k8s.io/gengo"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/gengo"; + rev = "0689ccc1d7d6"; + sha256 = "10c0kbm07pzxwdxpsmcgqkcxqxaijyywvwj1rciw6ssfcgx7kdc5"; + moduleDir = ""; + }; + } + { + goPackagePath = "k8s.io/klog"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/klog"; + rev = "v1.0.0"; + sha256 = "1cgannfmldcrcksb2wqdn2b5qabqyxl9r25w9y4qbljw24hhnlvn"; + moduleDir = ""; + }; + } + { + goPackagePath = "k8s.io/kube-openapi"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/kube-openapi"; + rev = "30be4d16710a"; + sha256 = "13pksn2xzyhrz569zihqy78y9ckn4sf4f4x31w1czfwbs87n00gf"; + moduleDir = ""; + }; + } + { + goPackagePath = "k8s.io/utils"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/utils"; + rev = "e782cd3c129f"; + sha256 = "19dp1cfqmgwy4m4yyxzbmmzklxnff4ipqknsp7y9yi02q6h4gj7r"; + moduleDir = ""; + }; + } + { + goPackagePath = "sigs.k8s.io/structured-merge-diff"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes-sigs/structured-merge-diff"; + rev = "15d366b2352e"; + sha256 = "1anrx09ksgrwjwmbrcrk3hx8wyzjaakzmmn36nd23if36nv1xg11"; + moduleDir = ""; + }; + } + { + goPackagePath = "sigs.k8s.io/yaml"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes-sigs/yaml"; + rev = "v1.1.0"; + sha256 = "1p7hvjdr5jsyk7nys1g1pmgnf3ys6n320i6hds85afppk81k01kb"; + moduleDir = ""; }; } ] diff --git a/nixpkgs/pkgs/development/tools/metals/default.nix b/nixpkgs/pkgs/development/tools/metals/default.nix index 7a53090e823c..a0b9b813f4f0 100644 --- a/nixpkgs/pkgs/development/tools/metals/default.nix +++ b/nixpkgs/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.10.5"; + version = "0.10.6"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0n0y522izqlyls3sn2x6mdjy0pmhrl1kr7z5fqac6wrpgcsczf01"; + outputHash = "1f31z5isr34acv3nbsdigk3h426vind2zk5qvy44zmb5qmlb15x9"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix b/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix index a5a9d724a79e..94e230e6a12c 100644 --- a/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/arcanist/default.nix @@ -3,6 +3,7 @@ , flex , php , lib, stdenv +, installShellFiles }: # Make a custom wrapper. If `wrapProgram` is used, arcanist thinks .arc-wrapped is being @@ -29,7 +30,10 @@ stdenv.mkDerivation { rev = "2565cc7b4d1dbce6bc7a5b3c4e72ae94be4712fe"; sha256 = "0jiv4aj4m5750dqw9r8hizjkwiyxk4cg4grkr63sllsa2dpiibxw"; }; - buildInputs = [ bison flex php ]; + + buildInputs = [ php ]; + + nativeBuildInputs = [ bison flex installShellFiles ]; postPatch = lib.optionalString stdenv.isAarch64 '' substituteInPlace support/xhpast/Makefile \ @@ -37,18 +41,26 @@ stdenv.mkDerivation { ''; buildPhase = '' - make cleanall -C support/xhpast - make xhpast -C support/xhpast + runHook preBuild + make cleanall -C support/xhpast $makeFlags "''${makeFlagsArray[@]}" -j $NIX_BUILD_CORES + make xhpast -C support/xhpast $makeFlags "''${makeFlagsArray[@]}" -j $NIX_BUILD_CORES + runHook postBuild ''; installPhase = '' + runHook preInstall mkdir -p $out/bin $out/libexec - make install -C support/xhpast - make cleanall -C support/xhpast + make install -C support/xhpast $makeFlags "''${makeFlagsArray[@]}" -j $NIX_BUILD_CORES + make cleanall -C support/xhpast $makeFlags "''${makeFlagsArray[@]}" -j $NIX_BUILD_CORES cp -R . $out/libexec/arcanist ${makeArcWrapper "arc"} ${makeArcWrapper "phage"} + + $out/bin/arc shell-complete --generate -- + installShellCompletion --cmd arc --bash $out/libexec/arcanist/support/shell/rules/bash-rules.sh + installShellCompletion --cmd phage --bash $out/libexec/arcanist/support/shell/rules/bash-rules.sh + runHook postInstall ''; doInstallCheck = true; diff --git a/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix index 042aff09a5fc..4547f745a98f 100644 --- a/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/nixpkgs/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -2,10 +2,11 @@ stdenv.mkDerivation rec { # When updating, beware of https://github.com/NixOS/nixpkgs/pull/131928#issuecomment-896614165 - name = "automake-1.16.3"; + pname = "automake"; + version = "1.16.3"; src = fetchurl { - url = "mirror://gnu/automake/${name}.tar.xz"; + url = "mirror://gnu/automake/automake-${version}.tar.xz"; sha256 = "0fmz2fhmzcpacnprl5msphvaflwiy0hvpgmqlgfny72ddijzfazz"; }; @@ -27,18 +28,16 @@ stdenv.mkDerivation rec { # "fixed" path in generated files! dontPatchShebangs = true; - meta = { + meta = with lib; { branch = "1.16"; homepage = "https://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; - license = lib.licenses.gpl2Plus; - + license = licenses.gpl2Plus; longDescription = '' GNU Automake is a tool for automatically generating `Makefile.in' files compliant with the GNU Coding Standards. Automake requires the use of Autoconf. ''; - - platforms = lib.platforms.all; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/development/tools/misc/binutils/default.nix b/nixpkgs/pkgs/development/tools/misc/binutils/default.nix index 7a06e290a966..97f7a6dd8d03 100644 --- a/nixpkgs/pkgs/development/tools/misc/binutils/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/binutils/default.nix @@ -1,16 +1,24 @@ +let + execFormatIsELF = platform: platform.parsed.kernel.execFormat.name == "elf"; +in + { stdenv, lib, buildPackages , fetchFromGitHub, fetchurl, zlib, autoreconfHook, gettext # Enabling all targets increases output size to a multiple. , withAllTargets ? false, libbfd, libopcodes , enableShared ? !stdenv.hostPlatform.isStatic , noSysDirs -, gold ? true +, gold ? execFormatIsELF stdenv.targetPlatform , bison ? null , flex , texinfo , perl }: +# configure silently disables ld.gold if it's unsupported, +# so we need to make sure that intent matches result ourselves. +assert gold -> execFormatIsELF stdenv.targetPlatform; + # 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 @@ -70,6 +78,11 @@ stdenv.mkDerivation { # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=956ea65cd707707c0f725930214cbc781367a831 ./bfd-elf-Dont-read-non-existing-secondary-relocs.patch + # Fix building plv8’s v8. + # https://github.com/NixOS/nixpkgs/issues/134190 + # Obtained from: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=586e30940e640f67bd55bd72e1d1355a4faf8079 + ./gold-Update-GNU_PROPERTY_X86_XXX-macros.patch + ./CVE-2020-35448.patch ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch ++ # This patch was suggested by Nick Clifton to fix @@ -163,6 +176,7 @@ stdenv.mkDerivation { passthru = { inherit targetPrefix; + hasGold = gold; isGNU = true; }; diff --git a/nixpkgs/pkgs/development/tools/misc/binutils/gold-Update-GNU_PROPERTY_X86_XXX-macros.patch b/nixpkgs/pkgs/development/tools/misc/binutils/gold-Update-GNU_PROPERTY_X86_XXX-macros.patch new file mode 100644 index 000000000000..c4eef87a0c8d --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/binutils/gold-Update-GNU_PROPERTY_X86_XXX-macros.patch @@ -0,0 +1,292 @@ +From 586e30940e640f67bd55bd72e1d1355a4faf8079 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" <hjl.tools@gmail.com> +Date: Tue, 13 Oct 2020 05:20:49 -0700 +Subject: [PATCH] gold: Update GNU_PROPERTY_X86_XXX macros + +This patch updates GNU_PROPERTY_X86_XXX macros for gold: + +1. GNU_PROPERTY_X86_UINT32_AND_XXX: A 4-byte unsigned integer property. +A bit is set if it is set in all relocatable inputs: + + #define GNU_PROPERTY_X86_UINT32_AND_LO 0xc0000002 + #define GNU_PROPERTY_X86_UINT32_AND_HI 0xc0007fff + +2. GNU_PROPERTY_X86_UINT32_OR_XXX: A 4-byte unsigned integer property. +A bit is set if it is set in any relocatable inputs: + + #define GNU_PROPERTY_X86_UINT32_OR_LO 0xc0008000 + #define GNU_PROPERTY_X86_UINT32_OR_HI 0xc000ffff + +3. GNU_PROPERTY_X86_UINT32_OR_AND_XXX: A 4-byte unsigned integer property. +A bit is set if it is set in any relocatable inputs and the property is +present in all relocatable inputs: + + #define GNU_PROPERTY_X86_UINT32_OR_AND_LO 0xc0010000 + #define GNU_PROPERTY_X86_UINT32_OR_AND_HI 0xc0017fff + +4. GNU_PROPERTY_X86_FEATURE_2_NEEDED, GNU_PROPERTY_X86_FEATURE_2_USED +and GNU_PROPERTY_X86_FEATURE_2_XXX bits. + +GNU_PROPERTY_X86_FEATURE_1_AND is unchanged. GNU_PROPERTY_X86_ISA_1_USED +and GNU_PROPERTY_X86_ISA_1_NEEDED are updated to better support targeted +processors since GNU_PROPERTY_X86_ISA_1_?86 aren't isn't very useful. +A new set of GNU_PROPERTY_X86_ISA_1_XXX bits are defined. The previous +GNU_PROPERTY_X86_ISA_1_XXX macros are deprecated and renamed to +GNU_PROPERTY_X86_COMPAT_ISA_1_XXX and GNU_PROPERTY_X86_COMPAT_2_ISA_1_XXX. + +elfcpp/ + + * elfcpp.h (GNU_PROPERTY_X86_ISA_1_USED): Renamed to ... + (GNU_PROPERTY_X86_COMPAT_ISA_1_USED): This. + (GNU_PROPERTY_X86_ISA_1_NEEDED): Renamed to ... + (GNU_PROPERTY_X86_COMPAT_ISA_1_NEEDED): This. + (GNU_PROPERTY_X86_UINT32_AND_LO): New. + (GNU_PROPERTY_X86_UINT32_AND_HI): Likewise. + (GNU_PROPERTY_X86_UINT32_OR_LO): Likewise. + (GNU_PROPERTY_X86_UINT32_OR_HI): Likewise. + (GNU_PROPERTY_X86_UINT32_OR_AND_LO): Likewise. + (GNU_PROPERTY_X86_UINT32_OR_AND_HI): Likewise. + (GNU_PROPERTY_X86_COMPAT_2_ISA_1_NEEDED): New. + (GNU_PROPERTY_X86_COMPAT_2_ISA_1_NEEDED): Likewise. + (GNU_PROPERTY_X86_FEATURE_1_AND): Updated to + (GNU_PROPERTY_X86_UINT32_AND_LO + 0). + (GNU_PROPERTY_X86_ISA_1_NEEDED): New. Defined to + GNU_PROPERTY_X86_UINT32_OR_LO + 2. + (GNU_PROPERTY_X86_FEATURE_2_NEEDED): New. Defined to + (GNU_PROPERTY_X86_UINT32_OR_LO + 1). + (GNU_PROPERTY_X86_ISA_1_USED): New. Defined to + GNU_PROPERTY_X86_UINT32_OR_AND_LO + 2. + (GNU_PROPERTY_X86_FEATURE_2_USED): New. Defined to + (GNU_PROPERTY_X86_UINT32_OR_AND_LO + 1). + +gold/ + + * x86_64.cc (Target_x86_64::Target_x86_64): Initialize + feature_2_used_, feature_2_needed_ and object_feature_2_used_. + (Target_x86_64::feature_2_used_): New data member. + (Target_x86_64::feature_2_needed_): Likewise. + (Target_x86_64::object_isa_1_used_): Likewise. + (Target_x86_64::record_gnu_property): Support + GNU_PROPERTY_X86_COMPAT_ISA_1_USED, + GNU_PROPERTY_X86_COMPAT_ISA_1_NEEDED, + GNU_PROPERTY_X86_COMPAT_2_ISA_1_USED, + GNU_PROPERTY_X86_COMPAT_2_ISA_1_NEEDED, + GNU_PROPERTY_X86_FEATURE_2_USED and + GNU_PROPERTY_X86_FEATURE_2_NEEDED. + (Target_x86_64::merge_gnu_properties): Merge FEATURE_2_USED bits. + Initialize object_feature_2_used_. + (Target_x86_64::do_finalize_gnu_properties): Support + GNU_PROPERTY_X86_FEATURE_2_USED and + GNU_PROPERTY_X86_FEATURE_2_NEEDED. + * testsuite/gnu_property_a.S (GNU_PROPERTY_X86_ISA_1_USED): Set + to 0xc0010002. + (GNU_PROPERTY_X86_ISA_1_NEEDED): Set to 0xc0008002. + * testsuite/gnu_property_b.S (GNU_PROPERTY_X86_ISA_1_USED): Set + to 0xc0010002. + (GNU_PROPERTY_X86_ISA_1_NEEDED): Set to 0xc0008002. + * testsuite/gnu_property_c.S (GNU_PROPERTY_X86_ISA_1_USED): Set + to 0xc0010002. + (GNU_PROPERTY_X86_ISA_1_NEEDED): Set to 0xc0008002. + * testsuite/gnu_property_test.sh: Updated. +--- + elfcpp/ChangeLog | [omitted] + elfcpp/elfcpp.h | 18 ++++++++++++--- + gold/ChangeLog | [omitted] + gold/testsuite/gnu_property_a.S | 4 ++-- + gold/testsuite/gnu_property_b.S | 4 ++-- + gold/testsuite/gnu_property_c.S | 4 ++-- + gold/testsuite/gnu_property_test.sh | 4 ++-- + gold/x86_64.cc | 34 +++++++++++++++++++++++++++-- + 8 files changed, 110 insertions(+), 13 deletions(-) + +diff --git a/elfcpp/elfcpp.h b/elfcpp/elfcpp.h +index 65d803c00e2..4b6ff94a654 100644 +--- a/elfcpp/elfcpp.h ++++ b/elfcpp/elfcpp.h +@@ -1013,9 +1013,21 @@ enum + GNU_PROPERTY_STACK_SIZE = 1, + GNU_PROPERTY_NO_COPY_ON_PROTECTED = 2, + GNU_PROPERTY_LOPROC = 0xc0000000, +- GNU_PROPERTY_X86_ISA_1_USED = 0xc0000000, +- GNU_PROPERTY_X86_ISA_1_NEEDED = 0xc0000001, +- GNU_PROPERTY_X86_FEATURE_1_AND = 0xc0000002, ++ GNU_PROPERTY_X86_COMPAT_ISA_1_USED = 0xc0000000, ++ GNU_PROPERTY_X86_COMPAT_ISA_1_NEEDED = 0xc0000001, ++ GNU_PROPERTY_X86_UINT32_AND_LO = 0xc0000002, ++ GNU_PROPERTY_X86_UINT32_AND_HI = 0xc0007fff, ++ GNU_PROPERTY_X86_UINT32_OR_LO = 0xc0008000, ++ GNU_PROPERTY_X86_UINT32_OR_HI = 0xc000ffff, ++ GNU_PROPERTY_X86_UINT32_OR_AND_LO = 0xc0010000, ++ GNU_PROPERTY_X86_UINT32_OR_AND_HI = 0xc0017fff, ++ GNU_PROPERTY_X86_COMPAT_2_ISA_1_NEEDED = GNU_PROPERTY_X86_UINT32_OR_LO + 0, ++ GNU_PROPERTY_X86_COMPAT_2_ISA_1_USED = GNU_PROPERTY_X86_UINT32_OR_AND_LO + 0, ++ GNU_PROPERTY_X86_FEATURE_1_AND = GNU_PROPERTY_X86_UINT32_AND_LO + 0, ++ GNU_PROPERTY_X86_ISA_1_NEEDED = GNU_PROPERTY_X86_UINT32_OR_LO + 2, ++ GNU_PROPERTY_X86_FEATURE_2_NEEDED = GNU_PROPERTY_X86_UINT32_OR_LO + 1, ++ GNU_PROPERTY_X86_ISA_1_USED = GNU_PROPERTY_X86_UINT32_OR_AND_LO + 2, ++ GNU_PROPERTY_X86_FEATURE_2_USED = GNU_PROPERTY_X86_UINT32_OR_AND_LO + 1, + GNU_PROPERTY_HIPROC = 0xdfffffff, + GNU_PROPERTY_LOUSER = 0xe0000000, + GNU_PROPERTY_HIUSER = 0xffffffff +diff --git a/gold/testsuite/gnu_property_a.S b/gold/testsuite/gnu_property_a.S +index 463bc8e52fe..5fbbbc9c4bb 100644 +--- a/gold/testsuite/gnu_property_a.S ++++ b/gold/testsuite/gnu_property_a.S +@@ -1,8 +1,8 @@ + #define NT_GNU_PROPERTY_TYPE_0 5 + + #define GNU_PROPERTY_STACK_SIZE 1 +-#define GNU_PROPERTY_X86_ISA_1_USED 0xc0000000 +-#define GNU_PROPERTY_X86_ISA_1_NEEDED 0xc0000001 ++#define GNU_PROPERTY_X86_ISA_1_USED 0xc0010002 ++#define GNU_PROPERTY_X86_ISA_1_NEEDED 0xc0008002 + #define GNU_PROPERTY_X86_FEATURE_1_AND 0xc0000002 + + #if __SIZEOF_PTRDIFF_T__ == 8 +diff --git a/gold/testsuite/gnu_property_b.S b/gold/testsuite/gnu_property_b.S +index 0c0c038ead1..7028f73d7ab 100644 +--- a/gold/testsuite/gnu_property_b.S ++++ b/gold/testsuite/gnu_property_b.S +@@ -2,8 +2,8 @@ + + #define GNU_PROPERTY_STACK_SIZE 1 + #define GNU_PROPERTY_NO_COPY_ON_PROTECTED 2 +-#define GNU_PROPERTY_X86_ISA_1_USED 0xc0000000 +-#define GNU_PROPERTY_X86_ISA_1_NEEDED 0xc0000001 ++#define GNU_PROPERTY_X86_ISA_1_USED 0xc0010002 ++#define GNU_PROPERTY_X86_ISA_1_NEEDED 0xc0008002 + #define GNU_PROPERTY_X86_FEATURE_1_AND 0xc0000002 + + #if __SIZEOF_PTRDIFF_T__ == 8 +diff --git a/gold/testsuite/gnu_property_c.S b/gold/testsuite/gnu_property_c.S +index ace159a9a9d..c8cbd8bce28 100644 +--- a/gold/testsuite/gnu_property_c.S ++++ b/gold/testsuite/gnu_property_c.S +@@ -2,8 +2,8 @@ + + #define GNU_PROPERTY_STACK_SIZE 1 + #define GNU_PROPERTY_NO_COPY_ON_PROTECTED 2 +-#define GNU_PROPERTY_X86_ISA_1_USED 0xc0000000 +-#define GNU_PROPERTY_X86_ISA_1_NEEDED 0xc0000001 ++#define GNU_PROPERTY_X86_ISA_1_USED 0xc0010002 ++#define GNU_PROPERTY_X86_ISA_1_NEEDED 0xc0008002 + #define GNU_PROPERTY_X86_FEATURE_1_AND 0xc0000002 + + #if __SIZEOF_PTRDIFF_T__ == 8 +diff --git a/gold/testsuite/gnu_property_test.sh b/gold/testsuite/gnu_property_test.sh +index 1806d3474cc..a4096005b78 100755 +--- a/gold/testsuite/gnu_property_test.sh ++++ b/gold/testsuite/gnu_property_test.sh +@@ -77,8 +77,8 @@ check_count gnu_property_test.stdout "^ NOTE" 2 + + check gnu_property_test.stdout "stack size: 0x111100" + check gnu_property_test.stdout "no copy on protected" +-check gnu_property_test.stdout "x86 ISA used: i486, SSE2, SSE4_2, AVX512CD" +-check gnu_property_test.stdout "x86 ISA needed: i486, SSE2, SSE4_2, AVX512CD" ++check gnu_property_test.stdout "x86 ISA used: x86-64-v2, <unknown: 10>, <unknown: 100>, <unknown: 1000>" ++check gnu_property_test.stdout "x86 ISA needed: x86-64-v2, <unknown: 10>, <unknown: 100>, <unknown: 1000>" + check gnu_property_test.stdout "x86 feature: IBT" + + exit 0 +diff --git a/gold/x86_64.cc b/gold/x86_64.cc +index 9cb2cf0a322..378bac16f78 100644 +--- a/gold/x86_64.cc ++++ b/gold/x86_64.cc +@@ -706,8 +706,9 @@ class Target_x86_64 : public Sized_target<size, false> + rela_irelative_(NULL), copy_relocs_(elfcpp::R_X86_64_COPY), + got_mod_index_offset_(-1U), tlsdesc_reloc_info_(), + tls_base_symbol_defined_(false), isa_1_used_(0), isa_1_needed_(0), +- feature_1_(0), object_isa_1_used_(0), object_feature_1_(0), +- seen_first_object_(false) ++ feature_1_(0), feature_2_used_(0), feature_2_needed_(0), ++ object_isa_1_used_(0), object_feature_1_(0), ++ object_feature_2_used_(0), seen_first_object_(false) + { } + + // Hook for a new output section. +@@ -1382,6 +1383,8 @@ class Target_x86_64 : public Sized_target<size, false> + uint32_t isa_1_used_; + uint32_t isa_1_needed_; + uint32_t feature_1_; ++ uint32_t feature_2_used_; ++ uint32_t feature_2_needed_; + // Target-specific properties from the current object. + // These bits get ORed into ISA_1_USED_ after all properties for the object + // have been processed. But if either is all zeroes (as when the property +@@ -1391,6 +1394,7 @@ class Target_x86_64 : public Sized_target<size, false> + // These bits get ANDed into FEATURE_1_ after all properties for the object + // have been processed. + uint32_t object_feature_1_; ++ uint32_t object_feature_2_used_; + // Whether we have seen our first object, for use in initializing FEATURE_1_. + bool seen_first_object_; + }; +@@ -1594,9 +1598,15 @@ Target_x86_64<size>::record_gnu_property( + + switch (pr_type) + { ++ case elfcpp::GNU_PROPERTY_X86_COMPAT_ISA_1_USED: ++ case elfcpp::GNU_PROPERTY_X86_COMPAT_ISA_1_NEEDED: ++ case elfcpp::GNU_PROPERTY_X86_COMPAT_2_ISA_1_USED: ++ case elfcpp::GNU_PROPERTY_X86_COMPAT_2_ISA_1_NEEDED: + case elfcpp::GNU_PROPERTY_X86_ISA_1_USED: + case elfcpp::GNU_PROPERTY_X86_ISA_1_NEEDED: + case elfcpp::GNU_PROPERTY_X86_FEATURE_1_AND: ++ case elfcpp::GNU_PROPERTY_X86_FEATURE_2_USED: ++ case elfcpp::GNU_PROPERTY_X86_FEATURE_2_NEEDED: + if (pr_datasz != 4) + { + gold_warning(_("%s: corrupt .note.gnu.property section " +@@ -1625,6 +1635,12 @@ Target_x86_64<size>::record_gnu_property( + // If we see multiple feature props in one object, OR them together. + this->object_feature_1_ |= val; + break; ++ case elfcpp::GNU_PROPERTY_X86_FEATURE_2_USED: ++ this->object_feature_2_used_ |= val; ++ break; ++ case elfcpp::GNU_PROPERTY_X86_FEATURE_2_NEEDED: ++ this->feature_2_needed_ |= val; ++ break; + } + } + +@@ -1642,15 +1658,23 @@ Target_x86_64<size>::merge_gnu_properties(const Object*) + else if (this->isa_1_used_ != 0) + this->isa_1_used_ |= this->object_isa_1_used_; + this->feature_1_ &= this->object_feature_1_; ++ // If any object is missing the FEATURE_2_USED property, we must ++ // omit it from the output file. ++ if (this->object_feature_2_used_ == 0) ++ this->feature_2_used_ = 0; ++ else if (this->feature_2_used_ != 0) ++ this->feature_2_used_ |= this->object_feature_2_used_; + } + else + { + this->isa_1_used_ = this->object_isa_1_used_; + this->feature_1_ = this->object_feature_1_; ++ this->feature_2_used_ = this->object_feature_2_used_; + this->seen_first_object_ = true; + } + this->object_isa_1_used_ = 0; + this->object_feature_1_ = 0; ++ this->object_feature_2_used_ = 0; + } + + static inline void +@@ -1676,6 +1700,12 @@ Target_x86_64<size>::do_finalize_gnu_properties(Layout* layout) const + if (this->feature_1_ != 0) + add_property(layout, elfcpp::GNU_PROPERTY_X86_FEATURE_1_AND, + this->feature_1_); ++ if (this->feature_2_used_ != 0) ++ add_property(layout, elfcpp::GNU_PROPERTY_X86_FEATURE_2_USED, ++ this->feature_2_used_); ++ if (this->feature_2_needed_ != 0) ++ add_property(layout, elfcpp::GNU_PROPERTY_X86_FEATURE_2_NEEDED, ++ this->feature_2_needed_); + } + + // Write the first three reserved words of the .got.plt section. +-- +2.27.0 + diff --git a/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix b/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix index e9bc52874018..ee181a665818 100644 --- a/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -18,11 +18,11 @@ let }.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version."); in stdenv.mkDerivation rec { pname = "php-blackfire"; - version = "1.53.0"; + version = "1.66.0"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb"; - sha256 = "ApKj5gulTCzWh7oSAM+JWQnWviHCnHV3OJHegpXJL54="; + sha256 = "kfCIjsGSvaGCZtOIBdKcaeS+TJdVHICo7MSW8YxQ+/Y="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/development/tools/misc/ccache/default.nix b/nixpkgs/pkgs/development/tools/misc/ccache/default.nix index 018e65754d9d..a6fbacfa6f16 100644 --- a/nixpkgs/pkgs/development/tools/misc/ccache/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/ccache/default.nix @@ -60,12 +60,18 @@ let ccache = stdenv.mkDerivation rec { bashInteractive ] ++ lib.optional stdenv.isDarwin xcodebuild; - checkPhase = '' + checkPhase = let + badTests = [ + "test.trim_dir" # flaky on hydra (possibly filesystem-specific?) + ] ++ lib.optionals stdenv.isDarwin [ + "test.basedir" + "test.multi_arch" + "test.nocpp2" + ]; + in '' runHook preCheck export HOME=$(mktemp -d) - ctest --output-on-failure ${lib.optionalString stdenv.isDarwin '' - -E '^(test.nocpp2|test.basedir|test.multi_arch|test.trim_dir)$' - ''} + ctest --output-on-failure -E '^(${lib.concatStringsSep "|" badTests})$' runHook postCheck ''; diff --git a/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix b/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix index b99e8a734579..2f523d86247f 100644 --- a/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, graalvm11-ce, babashka, fetchurl, fetchFromGitHub, clojure }: +{ lib, stdenv, graalvm11-ce, babashka, fetchurl, fetchFromGitHub, clojure, writeScript }: stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "2021.07.12-12.30.59"; + version = "2021.09.13-22.25.35"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0iky3yh548xn28285x8gnjzc00f3i2b415wb2dhd9p9y2bgzhkld"; + sha256 = "0ypn0m81lbhx45y0ajpgk7id9g47l1gnihvqdjxw5m1j2hdwjdzr"; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp.jar"; - sha256 = "02k1k0slh1lm7k43d52jvgl0fdyp9gcr8csbr6yi71qbhy0axrmp"; + sha256 = "e93e334a4ada04a28e0b148b8364b9433b8d83f6417249d7bded7cc86d1fe081"; }; GRAALVM_HOME = graalvm11-ce; @@ -44,11 +44,32 @@ stdenv.mkDerivation rec { export HOME="$(mktemp -d)" ./clojure-lsp --version | fgrep -q '${version}' - ${babashka}/bin/bb integration-test/run-all.clj ./clojure-lsp + ${babashka}/bin/bb integration-test ./clojure-lsp runHook postCheck ''; + passthru.updateScript = writeScript "update-clojure-lsp" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts gnused jq nix + + set -eu -o pipefail + + latest_version=$(curl -s https://api.github.com/repos/clojure-lsp/clojure-lsp/releases/latest | jq --raw-output .tag_name) + + old_jar_hash=$(nix-instantiate --eval --strict -A "clojure-lsp.jar.drvAttrs.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g') + + curl -o clojure-lsp.jar -sL https://github.com/clojure-lsp/clojure-lsp/releases/download/$latest_version/clojure-lsp.jar + new_jar_hash=$(nix-hash --flat --type sha256 clojure-lsp.jar | sed -re 's|[+]|\\&|g') + + rm -f clojure-lsp.jar + + nixFile=$(nix-instantiate --eval --strict -A "clojure-lsp.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/') + + sed -i "$nixFile" -re "s|\"$old_jar_hash\"|\"$new_jar_hash\"|" + update-source-version clojure-lsp "$latest_version" + ''; + meta = with lib; { description = "Language Server Protocol (LSP) for Clojure"; homepage = "https://github.com/clojure-lsp/clojure-lsp"; diff --git a/nixpkgs/pkgs/development/tools/misc/cvise/default.nix b/nixpkgs/pkgs/development/tools/misc/cvise/default.nix index e24c133e8b90..80d2a73cc425 100644 --- a/nixpkgs/pkgs/development/tools/misc/cvise/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/cvise/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, cmake, flex +{ lib, buildPythonApplication, fetchFromGitHub, bash, cmake, flex , libclang, llvm, unifdef , pebble, psutil, pytestCheckHook, pytest-flake8 }: @@ -20,10 +20,16 @@ buildPythonApplication rec { ]; nativeBuildInputs = [ cmake flex llvm.dev ]; - buildInputs = [ libclang llvm llvm.dev unifdef ]; + buildInputs = [ bash libclang llvm llvm.dev unifdef ]; propagatedBuildInputs = [ pebble psutil ]; checkInputs = [ pytestCheckHook pytest-flake8 unifdef ]; + # 'cvise --command=...' generates a script with hardcoded shebang. + postPatch = '' + substituteInPlace cvise.py \ + --replace "#!/bin/bash" "#!${bash}/bin/bash" + ''; + preCheck = '' patchShebangs cvise.py ''; diff --git a/nixpkgs/pkgs/development/tools/misc/gdb/default.nix b/nixpkgs/pkgs/development/tools/misc/gdb/default.nix index ffe1fa3662f8..ea0002d78c0a 100644 --- a/nixpkgs/pkgs/development/tools/misc/gdb/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gdb/default.nix @@ -4,7 +4,7 @@ , fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages # Run time -, ncurses, readline, gmp, mpfr, expat, libipt, zlib, dejagnu +, ncurses, readline, gmp, mpfr, expat, libipt, zlib, dejagnu, sourceHighlight , pythonSupport ? stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.hostPlatform.isCygwin, python3 ? null , guile ? null @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config texinfo perl setupDebugInfoDirs ]; - buildInputs = [ ncurses readline gmp mpfr expat libipt zlib guile ] + buildInputs = [ ncurses readline gmp mpfr expat libipt zlib guile sourceHighlight ] ++ lib.optional pythonSupport python3 ++ lib.optional doCheck dejagnu; diff --git a/nixpkgs/pkgs/development/tools/misc/gnum4/darwin-secure-format.patch b/nixpkgs/pkgs/development/tools/misc/gnum4/darwin-secure-format.patch deleted file mode 100644 index b14d8be6ef16..000000000000 --- a/nixpkgs/pkgs/development/tools/misc/gnum4/darwin-secure-format.patch +++ /dev/null @@ -1,15 +0,0 @@ -With format string strictness, High Sierra also enforces that %n isn't used -in dynamic format strings, but we should just disable its use on darwin in -general. - ---- a/lib/vasnprintf.c 2017-06-22 15:19:15.000000000 -0700 -+++ b/lib/vasnprintf.c 2017-06-22 15:20:20.000000000 -0700 -@@ -4869,7 +4869,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t * - #endif - *fbp = dp->conversion; - #if USE_SNPRINTF --# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) -+# if !defined(__APPLE__) && !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) - fbp[1] = '%'; - fbp[2] = 'n'; - fbp[3] = '\0'; diff --git a/nixpkgs/pkgs/development/tools/misc/gnum4/default.nix b/nixpkgs/pkgs/development/tools/misc/gnum4/default.nix index d0b5911b71d9..806625934d95 100644 --- a/nixpkgs/pkgs/development/tools/misc/gnum4/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/gnum4/default.nix @@ -7,28 +7,17 @@ stdenv.mkDerivation rec { pname = "gnum4"; - version = "1.4.18"; + version = "1.4.19"; src = fetchurl { url = "mirror://gnu/m4/m4-${version}.tar.bz2"; - sha256 = "1xkwwq0sgv05cla0g0a01yzhk0wpsn9y40w9kh9miiiv0imxfh36"; + sha256 = "sha256-swapHA/ZO8QoDPwumMt6s5gf91oYe+oyk4EfRSyJqMg="; }; doCheck = false; configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ]; - # Upstream is aware of it; it may be in the next release. - patches = - [ - ./s_isdir.patch - (fetchurl { - url = "https://sources.debian.org/data/main/m/m4/1.4.18-2/debian/patches/01-fix-ftbfs-with-glibc-2.28.patch"; - sha256 = "12lmdnbml9lfvy0khpjc42riicddaz7li8wmbnsam7zsw6al11qk"; - }) - ] - ++ lib.optional stdenv.isDarwin ./darwin-secure-format.patch; - meta = { homepage = "https://www.gnu.org/software/m4/"; description = "GNU M4, a macro processor"; diff --git a/nixpkgs/pkgs/development/tools/misc/gnum4/s_isdir.patch b/nixpkgs/pkgs/development/tools/misc/gnum4/s_isdir.patch deleted file mode 100644 index a009a4ba4465..000000000000 --- a/nixpkgs/pkgs/development/tools/misc/gnum4/s_isdir.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fails to build with glibc 2.12.1 without this patch. - -http://lists.gnu.org/archive/html/bug-m4/2010-05/msg00002.html - ---- a/src/path.c -+++ b/src/path.c -@@ -22,6 +22,7 @@ - /* Handling of path search of included files via the builtins "include" - and "sinclude". */ - - #include "m4.h" -+#include "sys/stat.h" - - struct includes diff --git a/nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix b/nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix index 48e2139b74dc..7b179e7de8d2 100644 --- a/nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/inotify-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "inotify-tools"; - version = "3.20.11.0"; + version = "3.21.9.5"; src = fetchFromGitHub { repo = "inotify-tools"; owner = "rvoicilas"; rev = version; - sha256 = "1m8avqccrhm38krlhp88a7v949f3hrzx060bbrr5dp5qw2nmw9j2"; + sha256 = "sha256-2eMYCFqecpY/yvhwl5+kvQ+pkdWzhX6Xsb+rcJEK37c="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix b/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix index b1d59c9450ac..0e837b8fd614 100644 --- a/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix @@ -1,22 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, srcOnly, nim }: -let - astpatternmatching = fetchFromGitHub { - owner = "krux02"; - repo = "ast-pattern-matching"; - rev = "87f7d163421af5a4f5e5cb6da7b93278e6897e96"; - sha256 = "19mb5bb6riia8380p5dpc3q0vwgrj958dd6p7vw8vkvwiqrzg6zq"; - }; +{ lib, nimPackages, fetchFromGitHub, srcOnly, nim }: - jsonschema = fetchFromGitHub { - owner = "PMunch"; - repo = "jsonschema"; - rev = "7b41c03e3e1a487d5a8f6b940ca8e764dc2cbabf"; - sha256 = "1js64jqd854yjladxvnylij4rsz7212k31ks541pqrdzm6hpblbz"; - }; -in -stdenv.mkDerivation rec { +nimPackages.buildNimPackage rec { pname = "nimlsp"; version = "0.3.2"; + nimBinOnly = true; src = fetchFromGitHub { owner = "PMunch"; @@ -25,18 +12,15 @@ stdenv.mkDerivation rec { sha256 = "1lm823nvpp3bj9527jd8n1jxh6y8p8ngkfkj91p94m7ffai6jazq"; }; - nativeBuildInputs = [ nim ]; + buildInputs = with nimPackages; [ astpatternmatching jsonschema ]; - buildPhase = '' - export HOME=$TMPDIR - nim -d:release -p:${astpatternmatching}/src -p:${jsonschema}/src \ - c --threads:on -d:nimcore -d:nimsuggest -d:debugCommunication \ - -d:debugLogging -d:explicitSourcePath=${srcOnly nim.passthru.nim} -d:tempDir=/tmp src/nimlsp - ''; + nimFlags = [ + "--threads:on" + "-d:explicitSourcePath=${srcOnly nimPackages.nim.passthru.nim}" + "-d:tempDir=/tmp" + ]; - installPhase = '' - install -Dt $out/bin src/nimlsp - ''; + nimDefines = [ "nimcore" "nimsuggest" "debugCommunication" "debugLogging" ]; meta = with lib; { description = "Language Server Protocol implementation for Nim"; diff --git a/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix b/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix index a0c002d8a8c5..c1e283ece129 100644 --- a/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/patchelf/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "patchelf"; - version = "0.12"; + version = "0.13"; src = fetchurl { url = "https://github.com/NixOS/${pname}/releases/download/${version}/${pname}-${version}.tar.bz2"; - sha256 = "14npmdxppmh0ci140w8i8cy7zg1pnqg81a1mdsnza711ab7k36k9"; + sha256 = "1v8px6g0zvhfxqa1inmdqfj4gc8dm70x7874hri4s48szjyd8zjc"; }; setupHook = [ ./setup-hook.sh ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = stdenv.name == "stdenv-linux"; meta = with lib; { - homepage = "https://github.com/NixOS/patchelf/blob/master/README"; + homepage = "https://github.com/NixOS/patchelf"; license = licenses.gpl3; description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; maintainers = [ maintainers.eelco ]; diff --git a/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix b/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix index 1d790740e697..dd7f4ac881b4 100644 --- a/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/nixpkgs/pkgs/development/tools/misc/patchelf/unstable.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; meta = with lib; { - homepage = "https://github.com/NixOS/patchelf/blob/master/README"; + homepage = "https://github.com/NixOS/patchelf"; license = licenses.gpl3; description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; maintainers = [ maintainers.eelco ]; diff --git a/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix b/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix index 9fcd87f3476d..80c722221164 100644 --- a/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -1,21 +1,57 @@ -{ lib, fetchurl, appimageTools }: +{ lib, fetchurl, appimageTools, gtk3 }: let name = "saleae-logic-2"; - version = "2.3.33"; + version = "2.3.37"; src = fetchurl { url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage"; - sha256 = "09vypl03gj58byk963flskzkhl4qrd9qw1kh0sywbqnzbzvj5cgm"; + sha256 = "0jclzd4s1r6h2p1r0vhmzz3jnwpp7d41g70lcamrsxidxrmm8d45"; }; in appimageTools.wrapType2 { inherit name src; extraInstallCommands = - let appimageContents = appimageTools.extractType2 { inherit name src; }; in - '' - mkdir -p $out/etc/udev/rules.d - cp ${appimageContents}/resources/linux/99-SaleaeLogic.rules $out/etc/udev/rules.d/ - ''; + let + appimageContents = appimageTools.extractType2 { inherit name src; }; + in + '' + mkdir -p $out/etc/udev/rules.d + cp ${appimageContents}/resources/linux/99-SaleaeLogic.rules $out/etc/udev/rules.d/ + ''; + + profile = '' + export XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}''${XDG_DATA_DIRS:+:"''$XDG_DATA_DIRS"}" + ''; + + extraPkgs = pkgs: with pkgs; [ + wget + unzip + glib + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrender + xorg.libXtst + nss + nspr + dbus + gdk-pixbuf + gtk3 + pango + atk + cairo + expat + xorg.libXrandr + xorg.libXScrnSaver + alsa-lib + at-spi2-core + cups + ]; meta = with lib; { homepage = "https://www.saleae.com/"; diff --git a/nixpkgs/pkgs/development/tools/misc/strace/default.nix b/nixpkgs/pkgs/development/tools/misc/strace/default.nix index 785331fb50be..7e5490fcc3d4 100644 --- a/nixpkgs/pkgs/development/tools/misc/strace/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/strace/default.nix @@ -14,9 +14,7 @@ stdenv.mkDerivation rec { # On RISC-V platforms, LLVM's libunwind implementation is unsupported by strace. # The build will silently fall back and -k will not work on RISC-V. - buildInputs = [ perl.out libunwind ]; # support -k - - postPatch = "patchShebangs --host strace-graph"; + buildInputs = [ libunwind ]; # support -k configureFlags = [ "--enable-mpers=check" ]; diff --git a/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix b/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix index c10543e17689..dfb297cd8d6f 100644 --- a/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terracognita"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "cycloidio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-n+aCNKGujvmXSFmLo2h1d29NFgdk/G+ehGwMHCJQoU8="; + sha256 = "sha256-V+/RjvCPq27SBMk5EZhLCc98XnHgSqJVoFqob0nZVjo="; }; vendorSha256 = "sha256-i6AkLAXGOXe3jmAKKQN6aX/DvovSS9CYFYO28bYIdUw="; diff --git a/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix b/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix index 7ea4625bad11..b6eddf743500 100644 --- a/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x1HPr1xzByyNnuNr8B4vqdxw+EeFJsqse/FG1I/b0+g="; + sha256 = "sha256-sfAn9FkOs9/yA7ciRD9gWbx5VwZveqPMYBQhSBkzYlo="; }; - vendorSha256 = "sha256-f/y2i/aPeiUBiUaoCyehO8835qtxJkJsSh9/RAowsLI="; + vendorSha256 = "sha256-egv2+4esvfYccwmyHm23bec/QN6dGWvJVLG19959LPY="; ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ]; diff --git a/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix b/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix index ac20ca26f808..a6dd19bf4587 100644 --- a/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix +++ b/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraformer"; - version = "0.8.15"; + version = "0.8.16"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = version; - sha256 = "sha256-d8DOUvUj5hdc1kcd0vgMufVIOJqV0eG4sXQIX597L/w="; + sha256 = "sha256-W2Lt24wYYVLaQBtljWrReTZyHj6b9SPHKBdxaMJYUcU="; }; - vendorSha256 = "sha256-VQ3yZQqpq9KbAkBDnQAfOE+axlT0GhvUpMIjb59PYT0="; + vendorSha256 = "sha256-bJbPshTB5VOyyhY2iMVe1GLedRFbWBL4Q5eKLBsVrTA="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/development/tools/misc/texinfo/6.8.nix b/nixpkgs/pkgs/development/tools/misc/texinfo/6.8.nix new file mode 100644 index 000000000000..11435bf329f6 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/misc/texinfo/6.8.nix @@ -0,0 +1,4 @@ +import ./common.nix { + version = "6.8"; + sha256 = "1i7yb7mrp3inz25zbzv2pllr4y7d58v818f1as7iz8mw53nm7dwf"; +} diff --git a/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix b/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix index 1c5de083bc0d..d6e6bced405b 100644 --- a/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix +++ b/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix @@ -54,6 +54,12 @@ stdenv.mkDerivation { && !stdenv.isDarwin && !stdenv.isSunOS; # flaky + checkFlagsArray = if version == "6.8" then [ + # Test is known to fail on various locales on texinfo-6.8: + # https://lists.gnu.org/r/bug-texinfo/2021-07/msg00012.html + "XFAIL_TESTS=test_scripts/layout_formatting_fr_icons.sh" + ] else null; + meta = { homepage = "https://www.gnu.org/software/texinfo/"; description = "The GNU documentation system"; diff --git a/nixpkgs/pkgs/development/tools/nrpl/default.nix b/nixpkgs/pkgs/development/tools/nrpl/default.nix index 67a86ca8dec5..84147faf74e5 100644 --- a/nixpkgs/pkgs/development/tools/nrpl/default.nix +++ b/nixpkgs/pkgs/development/tools/nrpl/default.nix @@ -1,8 +1,9 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, makeWrapper, nim, pcre, tinycc }: +{ lib, nimPackages, fetchFromGitHub, fetchpatch, makeWrapper, pcre, tinycc }: -stdenv.mkDerivation { +nimPackages.buildNimPackage { pname = "nrpl"; version = "20150522"; + nimBinOnly = true; src = fetchFromGitHub { owner = "wheineman"; @@ -12,7 +13,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ nim pcre ]; + buildInputs = [ pcre ]; patches = [ (fetchpatch { @@ -24,16 +25,9 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-lpcre"; - buildPhase = '' - HOME=$TMPDIR - nim c -d:release nrpl.nim - ''; - - installPhase = "install -Dt $out/bin nrpl"; - postFixup = '' wrapProgram $out/bin/nrpl \ - --prefix PATH : ${lib.makeBinPath [ nim tinycc ]} + --prefix PATH : ${lib.makeBinPath [ nimPackages.nim tinycc ]} ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/ocaml/dune/1.nix b/nixpkgs/pkgs/development/tools/ocaml/dune/1.nix index ad908787911b..74deb9d2fa55 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/dune/1.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/dune/1.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ocaml, findlib }: +{ stdenv, lib, fetchurl, ocaml, findlib, ncurses }: if !lib.versionAtLeast ocaml.version "4.02" || lib.versionAtLeast ocaml.version "4.12" @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { sha256 = "1rkc8lqw30ifjaz8d81la6i8j05ffd0whpxqsbg6dci16945zjvp"; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + buildInputs = [ ncurses ]; + strictDeps = true; buildFlags = [ "release" ]; makeFlags = [ @@ -22,6 +24,8 @@ stdenv.mkDerivation rec { ]; dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; meta = with lib; { homepage = "https://dune.build/"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix b/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix index 00d593f75107..f80fabedebe4 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix @@ -13,11 +13,14 @@ stdenv.mkDerivation rec { sha256 = "09lzq04b642iy0ljp59p32lgk3q8iphjh8fkdp69q29l5frgwx5k"; }; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + strictDeps = true; buildFlags = "release"; dontAddPrefix = true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; installFlags = [ "PREFIX=${placeholder "out"}" "LIBDIR=$(OCAMLFIND_DESTDIR)" ]; diff --git a/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix b/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix index 2286c0945fcf..497a8ce91c1d 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/findlib/default.nix @@ -9,25 +9,23 @@ stdenv.mkDerivation rec { sha256 = "sha256-K0K4vVRIjWTEvzy3BUtLN70wwdwSvUMeoeTXrYqYD+I="; }; - buildInputs = [m4 ncurses ocaml]; + nativeBuildInputs = [m4 ocaml]; + buildInputs = [ ncurses ]; patches = [ ./ldconf.patch ./install_topfind.patch ]; dontAddPrefix=true; + dontAddStaticConfigureFlags = true; + configurePlatforms = []; - preConfigure='' - configureFlagsArray=( - -bindir $out/bin - -mandir $out/share/man - -sitelib $out/lib/ocaml/${ocaml.version}/site-lib - -config $out/etc/findlib.conf - ) - ''; + configureFlags = [ + "-bindir" "${placeholder "out"}/bin" + "-mandir" "${placeholder "out"}/share/man" + "-sitelib" "${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib" + "-config" "${placeholder "out"}/etc/findlib.conf" + ]; - buildPhase = '' - make all - make opt - ''; + buildFlags = [ "all" "opt" ]; setupHook = writeText "setupHook.sh" '' addOCamlPath () { @@ -37,6 +35,8 @@ stdenv.mkDerivation rec { if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs"; then export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs" fi + } + createOcamlDestDir () { export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml.version}/site-lib/" if test -n "''${createFindlibDestdir-}"; then mkdir -p $OCAMLFIND_DESTDIR @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { } addEnvHooks "$targetOffset" addOCamlPath + preConfigureHooks+=(createOcamlDestDir) ''; meta = { diff --git a/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix b/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix index 6854c7c20ca3..10c7bf63aa41 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/oasis/default.nix @@ -18,9 +18,21 @@ stdenv.mkDerivation { ocaml findlib ocamlbuild ocamlmod ocamlify ]; - configurePhase = "ocaml setup.ml -configure --prefix $out"; - buildPhase = "ocaml setup.ml -build"; - installPhase = "ocaml setup.ml -install"; + configurePhase = '' + runHook preConfigure + ocaml setup.ml -configure --prefix $out + runHook postConfigure + ''; + buildPhase = '' + runHook preBuild + ocaml setup.ml -build + runHook postBuild + ''; + installPhase = '' + runHook preInstall + ocaml setup.ml -install + runHook postInstall + ''; meta = with lib; { homepage = "http://oasis.forge.ocamlcore.org/"; diff --git a/nixpkgs/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/nixpkgs/pkgs/development/tools/ocaml/ocamlbuild/default.nix index 926838ede545..e3043d46ee5e 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -12,14 +12,22 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ ocaml findlib ]; + strictDeps = true; + + # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together + hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie"; configurePhase = '' + runHook preConfigure + make -f configure.make Makefile.config \ "OCAMLBUILD_PREFIX=$out" \ "OCAMLBUILD_BINDIR=$out/bin" \ "OCAMLBUILD_MANDIR=$out/share/man" \ "OCAMLBUILD_LIBDIR=$OCAMLFIND_DESTDIR" + + runHook postConfigure ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix b/nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix index 9cdacd289d49..d9ba33bb473e 100644 --- a/nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix +++ b/nixpkgs/pkgs/development/tools/ocaml/opaline/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1aj1fdqymq3pnr39h47hn3kxk5v9pnwx0jap1z2jzh78x970z21m"; }; - buildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild opam-file-format ]; + nativeBuildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild ]; + buildInputs = with ocamlPackages; [ opam-file-format ]; preInstall = "mkdir -p $out/bin"; diff --git a/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix index 2d87fea8ff55..39b5e15a59f5 100644 --- a/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix +++ b/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "open-policy-agent"; - version = "0.31.0"; + version = "0.32.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "sha256-SUMTyqzeaCTj/fVdDHFZkh43t+mIFGNt6wendOt9gfw="; + sha256 = "sha256-pd0bOE0cSi+93B0U46KpeC7AHgsV3oBJcT/wg8XED5Y="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/development/tools/operator-sdk/default.nix b/nixpkgs/pkgs/development/tools/operator-sdk/default.nix index 908a5e6c23da..23bd877a698e 100644 --- a/nixpkgs/pkgs/development/tools/operator-sdk/default.nix +++ b/nixpkgs/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5eW2yrlUI0B5YNi9BtDjPsTC2vwavEXAMppa5rv5xhE="; + sha256 = "sha256-+AWkzv6SI/d3p1ljopSyLg2qi1hv6PsynmVG7+lUSTw="; }; - vendorSha256 = "sha256-gATpYjGKxOfXUnfSZ5uXrVbIydiEbijYR2axPluE5YU="; + vendorSha256 = "sha256-jYBkC0IA2xbRa+56CW/5EWG8sYg3eRuFdLpOFSinuuw="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/oq/default.nix b/nixpkgs/pkgs/development/tools/oq/default.nix index 499398c5c5d8..1ae81793b56d 100644 --- a/nixpkgs/pkgs/development/tools/oq/default.nix +++ b/nixpkgs/pkgs/development/tools/oq/default.nix @@ -8,13 +8,13 @@ crystal.buildCrystalPackage rec { pname = "oq"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Blacksmoke16"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RJVAEbNLlYNnOL/RDG0R9f8fHhNWtR+IMnnjtLK4e34="; + sha256 = "sha256-oLy8Ts+wnI0LxtAH6vVqhS7nqNkaLs0/vK9GxfG4vU8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/development/tools/packer/default.nix b/nixpkgs/pkgs/development/tools/packer/default.nix index 7b86f8da10ed..b7e88fb18847 100644 --- a/nixpkgs/pkgs/development/tools/packer/default.nix +++ b/nixpkgs/pkgs/development/tools/packer/default.nix @@ -1,17 +1,25 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, fetchpatch }: buildGoModule rec { pname = "packer"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "sha256-VNOq9uhtzf1hdEn+bkAOYy4gZxP5ek0WaaS/71uJzrA="; + sha256 = "15kw4zy0p7hr6jm0202s0fk5ja3ff0pdir37qdifngm1x7id1vxc"; }; - vendorSha256 = "sha256-WYA/wZJg93+X4IAX9hOMRHVRQRyA4N4aDaScDgkGUIE="; + vendorSha256 = "1785yv48sn504zcig9szjw9s4dxb55dg9idh10i2gzfgbda2c3nf"; + + patches = [ + # https://github.com/hashicorp/packer/pull/11282 + (fetchpatch { + url = "https://github.com/hashicorp/packer/commit/dbf13803217e18c6cb567ffefc9476c4e0149e02.patch"; + sha256 = "1n038x6qnr75c5ci2jp8jcwp6yvlchcf2nydksb2s75ffvidjrsa"; + }) + ]; subPackages = [ "." ]; @@ -28,6 +36,7 @@ buildGoModule rec { homepage = "https://www.packer.io"; license = licenses.mpl20; maintainers = with maintainers; [ cstrahan zimbatm ma27 ]; + changelog = "https://github.com/hashicorp/packer/blob/v${version}/CHANGELOG.md"; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix b/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix index 59253a4f7da2..61fa49b0adba 100644 --- a/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix +++ b/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage rec { mkdir -p $out/share/kak/autoload/plugins cp rc/parinfer.kak $out/share/kak/autoload/plugins/ - rtpPath=$out/share/vim-plugins/parinfer-rust - mkdir -p $rtpPath/plugin + rtpPath=$out/plugin + mkdir -p $rtpPath sed "s,let s:libdir = .*,let s:libdir = '${placeholder "out"}/lib'," \ - plugin/parinfer.vim >$rtpPath/plugin/parinfer.vim + plugin/parinfer.vim > $rtpPath/parinfer.vim ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix b/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix index a945f3bdde03..c3b09b71d173 100644 --- a/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/re2c/default.nix @@ -1,23 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, python3 +}: stdenv.mkDerivation rec { pname = "re2c"; - version = "2.1.1"; + version = "2.2"; src = fetchFromGitHub { owner = "skvadrik"; repo = "re2c"; rev = version; - sha256 = "06nvk5sf4vrc2bvpj4vi2xwy3ggv548sn530drz5fi67nhzgga26"; + sha256 = "0snfxk1cf2f4dy4hcxd1fx1grav3di0qjgqqn97k85zsf9f6ys78"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + autoreconfHook + python3 + ]; doCheck = true; enableParallelBuilding = true; preCheck = '' - patchShebangs run_tests.sh + patchShebangs run_tests.py ''; meta = with lib; { diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix index 60704fdd780b..0b38d1d8e267 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -90,8 +90,9 @@ let in { name = - (lib.strings.removePrefix "tree-sitter-" - (lib.strings.removeSuffix "-grammar" name)) + (lib.strings.replaceStrings ["-"] ["_"] + (lib.strings.removePrefix "tree-sitter-" + (lib.strings.removeSuffix "-grammar" name))) + stdenv.hostPlatform.extensions.sharedLibrary; path = "${drv}/parser"; } diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 10c551c1442a..01108d1501aa 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -3,9 +3,13 @@ tree-sitter-bash = (builtins.fromJSON (builtins.readFile ./tree-sitter-bash.json)); tree-sitter-c = (builtins.fromJSON (builtins.readFile ./tree-sitter-c.json)); tree-sitter-c-sharp = (builtins.fromJSON (builtins.readFile ./tree-sitter-c-sharp.json)); + tree-sitter-clojure = (builtins.fromJSON (builtins.readFile ./tree-sitter-clojure.json)); tree-sitter-comment = (builtins.fromJSON (builtins.readFile ./tree-sitter-comment.json)); tree-sitter-cpp = (builtins.fromJSON (builtins.readFile ./tree-sitter-cpp.json)); tree-sitter-css = (builtins.fromJSON (builtins.readFile ./tree-sitter-css.json)); + tree-sitter-dart = (builtins.fromJSON (builtins.readFile ./tree-sitter-dart.json)); + tree-sitter-dot = (builtins.fromJSON (builtins.readFile ./tree-sitter-dot.json)); + tree-sitter-elisp = (builtins.fromJSON (builtins.readFile ./tree-sitter-elisp.json)); tree-sitter-embedded-template = (builtins.fromJSON (builtins.readFile ./tree-sitter-embedded-template.json)); tree-sitter-fennel = (builtins.fromJSON (builtins.readFile ./tree-sitter-fennel.json)); tree-sitter-fish = (builtins.fromJSON (builtins.readFile ./tree-sitter-fish.json)); @@ -27,6 +31,7 @@ tree-sitter-python = (builtins.fromJSON (builtins.readFile ./tree-sitter-python.json)); tree-sitter-ql = (builtins.fromJSON (builtins.readFile ./tree-sitter-ql.json)); tree-sitter-regex = (builtins.fromJSON (builtins.readFile ./tree-sitter-regex.json)); + tree-sitter-rst = (builtins.fromJSON (builtins.readFile ./tree-sitter-rst.json)); tree-sitter-ruby = (builtins.fromJSON (builtins.readFile ./tree-sitter-ruby.json)); tree-sitter-rust = (builtins.fromJSON (builtins.readFile ./tree-sitter-rust.json)); tree-sitter-scala = (builtins.fromJSON (builtins.readFile ./tree-sitter-scala.json)); @@ -36,6 +41,7 @@ tree-sitter-tsq = (builtins.fromJSON (builtins.readFile ./tree-sitter-tsq.json)); tree-sitter-typescript = (builtins.fromJSON (builtins.readFile ./tree-sitter-typescript.json)); tree-sitter-verilog = (builtins.fromJSON (builtins.readFile ./tree-sitter-verilog.json)); + tree-sitter-vim = (builtins.fromJSON (builtins.readFile ./tree-sitter-vim.json)); tree-sitter-yaml = (builtins.fromJSON (builtins.readFile ./tree-sitter-yaml.json)); tree-sitter-zig = (builtins.fromJSON (builtins.readFile ./tree-sitter-zig.json)); } diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json index eefde83db98b..8a9dd7be6db7 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c-sharp", - "rev": "87c1aba089207f0fcc022ed88138af5a3e4cf454", - "date": "2021-09-05T21:16:06+01:00", - "path": "/nix/store/wx1asjwcpcmizavl7z756q55z3mvn714-tree-sitter-c-sharp", - "sha256": "1c1s2x7bpirsrkr6cqj9v4czpgavyf6b9dg290l9v7vd9fg3zh6v", + "rev": "c9e1952d311cf87762a42a79cb801c7bef1af815", + "date": "2021-09-09T23:38:47+01:00", + "path": "/nix/store/cl05d3zpbbkhms5fmd6wc4jhasjhg12l-tree-sitter-c-sharp", + "sha256": "0kn7p203ij8vz1cdxmxvn85mf3hpmz08l5psza96xxif2lcz8li8", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json index 4e8c4521613f..2f589a92d2d8 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c", - "rev": "d09ab34013de8a30d97a1912fc30811f1172515f", - "date": "2021-08-16T09:37:46-07:00", - "path": "/nix/store/94lp3b3hgap1baci006329zl2i168scm-tree-sitter-c", - "sha256": "0wf85g82p5j1vlw7rphfcpwch4b8sbvp4kk095aqmmcsm7d7dxl4", + "rev": "f71e80b9f20c3968c131518ae8d272a3cf81a60b", + "date": "2021-09-18T14:26:00-05:00", + "path": "/nix/store/22iw8rdpmvxmyrsmxxbyx8yi44jq05qd-tree-sitter-c", + "sha256": "13qr8ms8w7y92a33p0wisg4kzj4q3dzi2bn7wd6x815j8hfz627q", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json new file mode 100644 index 000000000000..3fccfc5f7b01 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/sogaiu/tree-sitter-clojure", + "rev": "39bf0977d223879436c1425fe6bfeb3bcfd86f92", + "date": "2021-08-15T13:16:31+09:00", + "path": "/nix/store/7kpf74gw4a68fby6jiw4n7lc4jfkgcf4-tree-sitter-clojure", + "sha256": "0ryj75znysvyvv4qaghygx1srrhlwhfmzmdilm652prkgj6yzh6b", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json index 95a0ea8a478d..394040a79da0 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-cpp", - "rev": "5bb411db33c86b108c891fb2c1473ddc9fad9701", - "date": "2021-08-17T11:20:29-07:00", - "path": "/nix/store/a23w5pnww3wryjs1vimp5ggvgq9bg0rl-tree-sitter-cpp", - "sha256": "1gxd40ipbzjhlk2amsk09v67cjxk4wal60kxycnb04lp6wxwlm8b", + "rev": "8b112a131b910ec009853fc9dd1c27eae267a7a6", + "date": "2021-09-18T10:53:12-05:00", + "path": "/nix/store/bpfw6wckk0yfpr99nrv473g3r3b84vbv-tree-sitter-cpp", + "sha256": "0rskvx5krakfkkcmiv9qd0zf8rf63iaigv76x3dq7v00sj8m0xsn", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json index 9b67d955eeb5..d1d55711895c 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-css", - "rev": "7c390622166517b01445e0bb08f72831731d3088", - "date": "2021-08-17T11:20:41-07:00", - "path": "/nix/store/wx5dzm92k2zv53r5p2s3jv1sak8xdk57-tree-sitter-css", - "sha256": "01r63dqxhgvsc1gkfy0mqsq98dmvc2hdw3c5zdkzdbry8zqpyn8s", + "rev": "a03f1d2d1dfbf6f8e0fdca5f9ff030228241eb57", + "date": "2021-09-15T14:32:51-07:00", + "path": "/nix/store/zamdl9ixsmgi7rdsb7mx2a1g0i8gfvdy-tree-sitter-css", + "sha256": "0i5xf97m6vxgcpa21h2gzlgj9n5rlv9mz3w738bwvcz5k6nbx6np", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json new file mode 100644 index 000000000000..6d79d851fd4d --- /dev/null +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/usernobody14/tree-sitter-dart", + "rev": "6a25376685d1d47968c2cef06d4db8d84a70025e", + "date": "2021-06-04T09:39:40-06:00", + "path": "/nix/store/vdygn1702kn92k222kygk9i50h10z9km-tree-sitter-dart", + "sha256": "0z06sphmgjggx5j2rjfy3f85fh1m9s79sql8a7d4kvsamz9rwakl", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json new file mode 100644 index 000000000000..7adb92cdd601 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/rydesun/tree-sitter-dot", + "rev": "e6f55c43b87b81cc982e38d414f0147fefa2515c", + "date": "2021-09-01T14:36:57+08:00", + "path": "/nix/store/n5a6bzh8rf35865wvcr3cis9r0fn2047-tree-sitter-dot", + "sha256": "1s3fpd0lnbm3gk9nbskdkdjlmdm7kz0l0g2zipv1m7qkc05nnkfy", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json new file mode 100644 index 000000000000..43d38746c46f --- /dev/null +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/wilfred/tree-sitter-elisp", + "rev": "166777abacfe5821d3b7b6873e6d2fd70a99f348", + "date": "2021-09-05T23:34:46-07:00", + "path": "/nix/store/gfyr8hl9pj2i0dj0qqpwh53jphff2bcd-tree-sitter-elisp", + "sha256": "18798jb3cisrvhkmzhq2qxly19hxvznf9k1n5pzl8l1dhw1yvl2a", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json index e4d5751ab8b2..df550680b451 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json @@ -1,9 +1,9 @@ { "url": "https://github.com/travonted/tree-sitter-fennel", - "rev": "e10b04389094d9b96aa8489121c1f285562d701d", - "date": "2021-08-18T16:21:04-04:00", - "path": "/nix/store/rmlldcr0yq9c87lp96jrajbf5n4xin6r-tree-sitter-fennel", - "sha256": "1bavjjy8wbp1hkj1nps1lsqa9ihwhnj039hfi1fvgxv5j7il74ir", + "rev": "42823442a18dd2aa7b0b22dc719abb54abb3fe2e", + "date": "2021-09-08T19:22:08-04:00", + "path": "/nix/store/2v174r3fc3cqsy8yanq2kdcjqvzl1jx9-tree-sitter-fennel", + "sha256": "0a59hgx7mmdicw9fq2q8dcd2ffmcgjdkk3rpwj84ya1qiyvs5x5s", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index 3f04f23304dc..807c09a70fe5 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "acafd11d9e45b1c28b49ff798022022b29d8b450", - "date": "2021-08-27T16:35:25+02:00", - "path": "/nix/store/wmw8ppdkndwg3f8phdhws985ckxs0yvk-tree-sitter-haskell", - "sha256": "1zm8m7lpgmh4gr0iw0792bsqi5jpf3w0kx6l3s91clici69nwkiq", + "rev": "bf7d643b494b7c7eed909ed7fbd8447231152cb0", + "date": "2021-09-09T20:07:38+02:00", + "path": "/nix/store/nkx9qf63nwl1ql6gl3q1fm4ykqax1isx-tree-sitter-haskell", + "sha256": "1wlp6kncjadhfz8y2wn90gkbqf35iidrn0y1ga360l5wyzx1mpid", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index f5b7e3f1c092..a5d506dc2420 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "2cc5803225a307308005930b3bedb939b1543722", - "date": "2021-08-29T11:32:53-07:00", - "path": "/nix/store/kjviknhcrayrzv94i762zsy2kvpxpkx6-tree-sitter-javascript", - "sha256": "1xkll7g38j1vajylfaifbn6i5y5f22kmjfy2dxy9bk903assxy05", + "rev": "435db852fbeff8fe298e25ad967c634d9698eec0", + "date": "2021-09-13T13:32:20-07:00", + "path": "/nix/store/idvb37g3nqpidw0jviiw4b71sqpihhs0-tree-sitter-javascript", + "sha256": "0plc5jxxh1bm1dig6gsk1ma7gp29ad3p0169jd9xlagc4vysfgc3", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index ac5891e5409d..6c288b7cdae5 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "77d98f3ce47ea52ff39137be29bc6376951c2286", - "date": "2021-09-03T18:25:31+02:00", - "path": "/nix/store/l143h3fxi89kk7dcp71zjdhdfmfmr68s-tree-sitter-php", - "sha256": "15cl1mdclhjiw72xzkcmw0lxq2hv1bjf2xf2nkgibi7zp8s1qvyw", + "rev": "d1bdb1e535d39d4f93f7373f406e1837c8a7bb25", + "date": "2021-09-10T08:16:50+02:00", + "path": "/nix/store/4zzs4f1hz5il35pqyf355aps6k4a83i8-tree-sitter-php", + "sha256": "0ymkwlh1japlwsajxd06254qadzq9bvm5db02cg4n3zv0pkvyrzz", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index 0ba8de4a09cf..67800f5081a5 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-python", - "rev": "d6210ceab11e8d812d4ab59c07c81458ec6e5184", - "date": "2021-03-27T09:41:53-07:00", - "path": "/nix/store/4v24ahydid4hr7kj0xi41mgbpglfnnki-tree-sitter-python", - "sha256": "173lpxi4vqa42dcdr9aj5phg5g6ny9ns04djw9n86pasx2w66dhk", + "rev": "9b84b7fd9da1aa74c8a8afae58b7dcc4c109cda4", + "date": "2021-09-16T13:02:06+02:00", + "path": "/nix/store/vxh1bdkdqj3n6knlz6bbdyl5l4qj2a2v-tree-sitter-python", + "sha256": "0r5daw3pbqcaf08gnhghjr15n7vv43njvh4ky6vz985sjzdnjz02", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json new file mode 100644 index 000000000000..3e2a463b54f4 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/stsewd/tree-sitter-rst", + "rev": "a9281c2250e0d32750de159413cdd87120407389", + "date": "2021-09-17T19:21:59-05:00", + "path": "/nix/store/3cnj1q9xfl0yh096pahqvlrf66azyhsr-tree-sitter-rst", + "sha256": "1fxknsmkn3pz1km77mii3w917fdl6h57h4mnw20b0syn4v1ag07d", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json index adeb1e182735..47dea4c92cd2 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-typescript", - "rev": "83816f563c8d9d2f1b9c921206a7944d0c5904ad", - "date": "2021-08-17T11:21:26-07:00", - "path": "/nix/store/jwxdv5xbs92n43yqvxnwz443jvngxmqp-tree-sitter-typescript", - "sha256": "1w989z36pvfv7m4z9s9qq67l81p8rx37z53kqmsxsyc01wnpb4nr", + "rev": "3383cebec9c9546587d9fe00c2e565d91163014a", + "date": "2021-09-16T13:01:51-07:00", + "path": "/nix/store/ml188xckf51g1r6gw380svxsg639kjgc-tree-sitter-typescript", + "sha256": "0vgkhn36cyg134ygx5wzld3ic9rd4lq9s2rp2dkxh0zg610ilcms", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json new file mode 100644 index 000000000000..7302892c6bd2 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/vigoux/tree-sitter-viml", + "rev": "59595443fb486449f42db839934117221358a85f", + "date": "2021-08-31T08:57:29+02:00", + "path": "/nix/store/9sixkkk37c2bl09aik32cd1jd322ywri-tree-sitter-viml", + "sha256": "1kh3il5vwlz5qxi9553ks7a0dpwx1n7wnqkv5v8jhslhn7w1c1l1", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json index 538edddce644..e7a9dfc82677 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json @@ -1,9 +1,9 @@ { - "url": "https://github.com/GrayJack/tree-sitter-zig", - "rev": "41bbc7f7b94bde3e948e41e4d42673945238ff03", - "date": "2021-03-30T12:55:10-03:00", - "path": "/nix/store/av4xgzr3c1rhr7v4fa9mm68krd2qv1lg-tree-sitter-zig", - "sha256": "0gjxac43qpqc4332bp3mpdbvh7rqv0q3hvw8834b30ml5q0r0qr0", + "url": "https://github.com/maxxnino/tree-sitter-zig", + "rev": "5ca53bb7bd649069a6af48f4dfd32f3187491db1", + "date": "2021-09-06T21:30:14+09:00", + "path": "/nix/store/x2dfgc97jmvyq5fnbyg9w7rsjz8cknj6-tree-sitter-zig", + "sha256": "1c50pvza6l4snmvgj3by053j4z7asy828i9pi1zwm6121sl7ffpd", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix index 308ca3eeb69f..c6e819465a54 100644 --- a/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -70,10 +70,22 @@ let # If you need a grammar that already exists in the official orga, # make sure to give it a different name. otherGrammars = { + "tree-sitter-clojure" = { + orga = "sogaiu"; + repo = "tree-sitter-clojure"; + }; "tree-sitter-comment" = { orga = "stsewd"; repo = "tree-sitter-comment"; }; + "tree-sitter-dart" = { + orga = "usernobody14"; + repo = "tree-sitter-dart"; + }; + "tree-sitter-elisp" = { + orga = "wilfred"; + repo = "tree-sitter-elisp"; + }; "tree-sitter-nix" = { orga = "cstrahan"; repo = "tree-sitter-nix"; @@ -94,10 +106,18 @@ let orga = "ikatyang"; repo = "tree-sitter-markdown"; }; + "tree-sitter-rst" = { + orga = "stsewd"; + repo = "tree-sitter-rst"; + }; "tree-sitter-svelte" = { orga = "Himujjal"; repo = "tree-sitter-svelte"; }; + "tree-sitter-vim" = { + orga = "vigoux"; + repo = "tree-sitter-viml"; + }; "tree-sitter-yaml" = { orga = "ikatyang"; repo = "tree-sitter-yaml"; @@ -107,13 +127,17 @@ let repo = "tree-sitter-toml"; }; "tree-sitter-zig" = { - orga = "GrayJack"; + orga = "maxxnino"; repo = "tree-sitter-zig"; }; "tree-sitter-fish" = { orga = "ram02z"; repo = "tree-sitter-fish"; }; + "tree-sitter-dot" = { + orga = "rydesun"; + repo = "tree-sitter-dot"; + }; }; allGrammars = diff --git a/nixpkgs/pkgs/development/tools/pipenv/default.nix b/nixpkgs/pkgs/development/tools/pipenv/default.nix index 2eff05b04ea7..a3b41aa03e26 100644 --- a/nixpkgs/pkgs/development/tools/pipenv/default.nix +++ b/nixpkgs/pkgs/development/tools/pipenv/default.nix @@ -18,11 +18,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2020.11.15"; + version = "2021.5.29"; src = fetchPypi { inherit pname version; - sha256 = "8253fe6f9cfb3791a54da8a0571f73c918cb3457dd908684c1800a13a06ec4c1"; + sha256 = "05958fadcd70b2de6a27542fcd2bd72dd5c59c6d35307fdac3e06361fb06e30e"; }; LC_ALL = "en_US.UTF-8"; diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index b3803f54b60d..22ab12149285 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -5,7 +5,7 @@ }: let # Poetry2nix version - version = "1.19.0"; + version = "1.20.0"; inherit (poetryLib) isCompatible readTOML moduleName; diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index 867f6d985c12..f99ee3a26dec 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -38,7 +38,7 @@ pythonPackages.callPackage fileCandidates = let supportedRegex = ("^.*(" + builtins.concatStringsSep "|" supportedExtensions + ")"); - matchesVersion = fname: builtins.match ("^.*" + builtins.replaceStrings [ "." ] [ "\\." ] version + ".*$") fname != null; + matchesVersion = fname: builtins.match ("^.*" + builtins.replaceStrings [ "." "+" ] [ "\\." "\\+" ] version + ".*$") fname != null; hasSupportedExtension = fname: builtins.match supportedRegex fname != null; isCompatibleEgg = fname: ! lib.strings.hasSuffix ".egg" fname || lib.strings.hasSuffix "py${python.pythonVersion}.egg" fname; in @@ -96,6 +96,10 @@ pythonPackages.callPackage "setuptools_scm" "setuptools-scm" "toml" # Toml is an extra for setuptools-scm + "tomli" # tomli is an extra for later versions of setuptools-scm + "packaging" + "six" + "pyparsing" ]; baseBuildInputs = lib.optional (! lib.elem name skipSetupToolsSCM) pythonPackages.setuptools-scm; format = if isDirectory || isGit || isUrl then "pyproject" else fileInfo.format; diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index ca902e204d76..daf536561f11 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -58,6 +58,12 @@ self: super: ''; }); + argcomplete = super.argcomplete.overridePythonAttrs ( + old: rec { + buildInputs = (old.buildInputs or [ ]) ++ [ self.importlib-metadata ]; + } + ); + arpeggio = super.arpeggio.overridePythonAttrs ( old: { nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.pytest-runner ]; @@ -94,6 +100,20 @@ self: super: } ); + black = super.black.overridePythonAttrs ( + old: { + dontPreferSetupPy = true; + } + ); + + borgbackup = super.borgbackup.overridePythonAttrs ( + old: { + BORG_OPENSSL_PREFIX = pkgs.openssl.dev; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openssl pkgs.acl ]; + } + ); + cairocffi = super.cairocffi.overridePythonAttrs ( old: { inherit (pkgs.python3.pkgs.cairocffi) patches; @@ -165,6 +185,11 @@ self: super: } ); + cwcwidth = super.cwcwidth.overridePythonAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) + ++ [ self.cython ]; + }); + daphne = super.daphne.overridePythonAttrs (old: { postPatch = '' substituteInPlace setup.py --replace 'setup_requires=["pytest-runner"],' "" @@ -339,6 +364,12 @@ self: super: } ); + gitpython = super.gitpython.overridePythonAttrs ( + old: { + buildInputs = (old.buildInputs or [ ]) ++ [ self.typing-extensions ]; + } + ); + grpcio = super.grpcio.overridePythonAttrs (old: { nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.cython pkgs.pkg-config ]; buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.c-ares pkgs.openssl pkgs.zlib ]; @@ -549,6 +580,13 @@ self: super: } ); + jupyterlab-widgets = super.jupyterlab-widgets.overridePythonAttrs ( + old: rec { + buildInputs = (old.buildInputs or [ ]) ++ [ self.jupyter-packaging ]; + } + ); + + keyring = super.keyring.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) ++ [ @@ -581,8 +619,32 @@ self: super: propagatedBuildInputs = [ pkgs.libvirt ]; }); + licensecheck = super.licensecheck.overridePythonAttrs (old: { + dontPreferSetupPy = true; + }); + llvmlite = super.llvmlite.overridePythonAttrs ( - old: { + old: + let + llvm = + if lib.versionAtLeast old.version "0.37.0" then + pkgs.llvmPackages_11.llvm + else if (lib.versionOlder old.version "0.37.0" && lib.versionAtLeast old.version "0.34.0") then + pkgs.llvmPackages_10.llvm + else if (lib.versionOlder old.version "0.34.0" && lib.versionAtLeast old.version "0.33.0") then + pkgs.llvmPackages_9.llvm + else if (lib.versionOlder old.version "0.33.0" && lib.versionAtLeast old.version "0.29.0") then + pkgs.llvmPackages_8.llvm + else if (lib.versionOlder old.version "0.28.0" && lib.versionAtLeast old.version "0.27.0") then + pkgs.llvmPackages_7.llvm + else if (lib.versionOlder old.version "0.27.0" && lib.versionAtLeast old.version "0.23.0") then + pkgs.llvmPackages_6.llvm + else if (lib.versionOlder old.version "0.23.0" && lib.versionAtLeast old.version "0.21.0") then + pkgs.llvmPackages_5.llvm + else + pkgs.llvm; # Likely to fail. + in + { nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.llvm ]; # Disable static linking @@ -595,12 +657,12 @@ self: super: # Set directory containing llvm-config binary preConfigure = '' - export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config + export LLVM_CONFIG=${llvm.dev}/bin/llvm-config ''; __impureHostDeps = lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; - passthru = old.passthru // { llvm = pkgs.llvm; }; + passthru = old.passthru // { llvm = llvm; }; } ); @@ -651,6 +713,7 @@ self: super: cat > setup.cfg <<EOF [libs] system_freetype = True + system_qhull = True '' + lib.optionalString stdenv.isDarwin '' # LTO not working in darwin stdenv, see NixOS/nixpkgs/pull/19312 enable_lto = false @@ -661,12 +724,17 @@ self: super: propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.libpng pkgs.freetype + pkgs.qhull ] ++ lib.optionals enableGtk3 [ pkgs.cairo self.pycairo pkgs.gtk3 pkgs.gobject-introspection self.pygobject3 ] ++ lib.optionals enableTk [ pkgs.tcl pkgs.tk self.tkinter pkgs.libX11 ] ++ lib.optionals enableQt [ self.pyqt5 ] ; + preBuild = '' + cp -r ${pkgs.qhull} . + ''; + inherit (super.matplotlib) patches; } ); @@ -691,6 +759,12 @@ self: super: } ); + mmdet = super.mmdet.overridePythonAttrs ( + old: { + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytorch ]; + } + ); + molecule = if lib.versionOlder super.molecule.version "3.0.0" then (super.molecule.overridePythonAttrs ( @@ -760,7 +834,11 @@ self: super: mypy = super.mypy.overridePythonAttrs ( old: { - MYPY_USE_MYPYC = pkgs.stdenv.buildPlatform.is64bit; + MYPY_USE_MYPYC = + # is64bit: unfortunately the build would exhaust all possible memory on i686-linux. + stdenv.buildPlatform.is64bit + # Derivation fails to build since v0.900 if mypyc is enabled. + && lib.strings.versionOlder old.version "0.900"; } ); @@ -830,6 +908,12 @@ self: super: } ); + opencv-python = super.opencv-python.overridePythonAttrs ( + old: rec { + buildInputs = (old.buildInputs or [ ]) ++ [ self.scikit-build ]; + } + ); + openexr = super.openexr.overridePythonAttrs ( old: rec { buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.openexr pkgs.ilmbase ]; @@ -899,6 +983,12 @@ self: super: }; }) else super.pip; + platformdirs = super.platformdirs.overridePythonAttrs (old: { + postPatch = '' + substituteInPlace setup.py --replace 'setup()' 'setup(version="${old.version}")' + ''; + }); + poetry-core = super.poetry-core.overridePythonAttrs (old: { # "Vendor" dependencies (for build-system support) postPatch = '' @@ -1285,6 +1375,12 @@ self: super: } ); + pytest-randomly = super.pytest-randomly.overrideAttrs (old: { + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ + self.importlib-metadata + ]; + }); + pytest-runner = super.pytest-runner or super.pytestrunner; pytest-pylint = super.pytest-pylint.overridePythonAttrs ( @@ -1326,6 +1422,10 @@ self: super: } ); + pythran = super.pythran.overridePythonAttrs (old: { + buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; + }); + ffmpeg-python = super.ffmpeg-python.overridePythonAttrs ( old: { buildInputs = (old.buildInputs or [ ]) ++ [ self.pytest-runner ]; @@ -1350,6 +1450,13 @@ self: super: } ); + pywavelets = super.pywavelets.overridePythonAttrs ( + old: { + HDF5_DIR = "${pkgs.hdf5}"; + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) ++ [ pkgs.hdf5 ]; + } + ); + pyzmq = super.pyzmq.overridePythonAttrs ( old: { nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; @@ -1426,6 +1533,13 @@ self: super: ''; }); + ruamel-yaml = super.ruamel-yaml.overridePythonAttrs ( + old: { + propagatedBuildInputs = (old.propagatedBuildInputs or [ ]) + ++ [ self.ruamel-yaml-clib ]; + } + ); + scipy = super.scipy.overridePythonAttrs ( old: if old.format != "wheel" then { @@ -1479,18 +1593,28 @@ self: super: } ); - shellingham = - if lib.versionAtLeast super.shellingham.version "1.3.2" then - ( - super.shellingham.overridePythonAttrs ( - old: { - format = "pyproject"; - } - ) - ) else super.shellingham; + shellcheck-py = super.shellcheck-py.overridePythonAttrs (old: { + + # Make fetching/installing external binaries no-ops + preConfigure = + let + fakeCommand = "type('FakeCommand', (Command,), {'initialize_options': lambda self: None, 'finalize_options': lambda self: None, 'run': lambda self: None})"; + in + '' + substituteInPlace setup.py \ + --replace "'fetch_binaries': fetch_binaries," "'fetch_binaries': ${fakeCommand}," \ + --replace "'install_shellcheck': install_shellcheck," "'install_shellcheck': ${fakeCommand}," + ''; + + propagatedUserEnvPkgs = (old.propagatedUserEnvPkgs or [ ]) ++ [ + pkgs.shellcheck + ]; + + }); tables = super.tables.overridePythonAttrs ( old: { + buildInputs = (old.buildInputs or [ ]) ++ [ self.pywavelets ]; HDF5_DIR = "${pkgs.hdf5}"; nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.pkg-config ]; propagatedBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.hdf5 self.numpy self.numexpr ]; @@ -1508,6 +1632,27 @@ self: super: } ); + tensorboard = super.tensorboard.overridePythonAttrs ( + old: { + buildInputs = (old.buildInputs or [ ]) ++ [ + self.wheel + self.absl-py + ]; + HDF5_DIR = "${pkgs.hdf5}"; + propagatedBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ + pkgs.hdf5 + self.google-auth-oauthlib + self.tensorboard-plugin-wit + self.numpy + self.markdown + self.tensorboard-data-server + self.grpcio + self.protobuf + self.werkzeug + ]; + } + ); + tensorflow = super.tensorflow.overridePythonAttrs ( old: { postInstall = '' @@ -1667,6 +1812,14 @@ self: super: ''; }; + weblate-language-data = super.weblate-language-data.overridePythonAttrs ( + old: { + buildInputs = (old.buildInputs or [ ]) ++ [ + self.translate-toolkit + ]; + } + ); + wheel = let isWheel = super.wheel.src.isWheel or false; @@ -1887,7 +2040,7 @@ self: super: pendulum = super.pendulum.overridePythonAttrs (old: { # Technically incorrect, but fixes the build error.. preInstall = lib.optionalString stdenv.isLinux '' - mv ./dist/*.whl $(echo ./dist/*.whl | sed s/'manylinux_[0-9]*_[0-9]*'/'manylinux1'/) + mv --no-clobber ./dist/*.whl $(echo ./dist/*.whl | sed s/'manylinux_[0-9]*_[0-9]*'/'manylinux1'/) ''; }); @@ -1917,6 +2070,12 @@ self: super: }); tomli = super.tomli.overridePythonAttrs (old: { - buildInputs = (old.buildInputs or [ ]) ++ [ self.flit-core ]; + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ self.flit-core ]; + }); + + virtualenv = super.virtualenv.overridePythonAttrs (old: { + postPatch = '' + substituteInPlace setup.cfg --replace 'platformdirs>=2,<3' 'platformdirs' + ''; }); } diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix index 9e29c5301ab7..1f6978b98a2e 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix @@ -76,10 +76,11 @@ let if targetMachine != null then ( - x: x.platform == "manylinux1_${targetMachine}" - || x.platform == "manylinux2010_${targetMachine}" - || x.platform == "manylinux2014_${targetMachine}" - || x.platform == "any" + x: x.platform == "any" || lib.lists.any (e: hasInfix e x.platform) [ + "manylinux1_${targetMachine}" + "manylinux2010_${targetMachine}" + "manylinux2014_${targetMachine}" + ] ) else (x: x.platform == "any") diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix index 9c95194a537c..5098c5c3a90c 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix @@ -160,12 +160,12 @@ let hasElem = needle: haystack: builtins.elem needle (builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " haystack)); op = { "true" = x: y: true; - "<=" = x: y: (unmarshal x) <= (unmarshal y); - "<" = x: y: (unmarshal x) < (unmarshal y); + "<=" = x: y: op.">=" y x; + "<" = x: y: lib.versionOlder (unmarshal x) (unmarshal y); "!=" = x: y: x != y; "==" = x: y: x == y; - ">=" = x: y: (unmarshal x) >= (unmarshal y); - ">" = x: y: (unmarshal x) > (unmarshal y); + ">=" = x: y: lib.versionAtLeast (unmarshal x) (unmarshal y); + ">" = x: y: op."<" y x; "~=" = v: c: let parts = builtins.splitVersion c; diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock index c6073348e846..4f023f8e0981 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/poetry.lock @@ -98,7 +98,7 @@ pycparser = "*" [[package]] name = "cfgv" -version = "3.3.0" +version = "3.3.1" description = "Validate configuration and produce human readable error messages." category = "dev" optional = false @@ -228,7 +228,7 @@ test = ["pytest (>=3.6.0,!=3.9.0,!=3.9.1,!=3.9.2)", "pretend", "iso8601", "pytz" [[package]] name = "cryptography" -version = "3.4.7" +version = "3.4.8" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." category = "main" optional = false @@ -247,7 +247,7 @@ test = ["pytest (>=6.0)", "pytest-cov", "pytest-subtests", "pytest-xdist", "pret [[package]] name = "distlib" -version = "0.3.2" +version = "0.3.3" description = "Distribution utilities" category = "main" optional = false @@ -343,7 +343,7 @@ six = "*" [[package]] name = "identify" -version = "2.2.13" +version = "2.2.15" description = "File identification library for Python" category = "dev" optional = false @@ -525,7 +525,7 @@ python-versions = ">=3.4" [[package]] name = "more-itertools" -version = "8.8.0" +version = "8.10.0" description = "More routines for operating on iterables, beyond itertools" category = "dev" optional = false @@ -624,7 +624,7 @@ dev = ["pre-commit", "tox"] [[package]] name = "poetry-core" -version = "1.0.4" +version = "1.0.6" description = "Poetry PEP 517 Build Backend" category = "main" optional = false @@ -639,7 +639,7 @@ typing = {version = ">=3.7.4.1,<4.0.0.0", markers = "python_version >= \"2.7\" a [[package]] name = "pre-commit" -version = "2.14.0" +version = "2.15.0" description = "A framework for managing and maintaining multi-language pre-commit hooks." category = "dev" optional = false @@ -952,7 +952,7 @@ typing = {version = ">=3.6,<4.0", markers = "python_version >= \"2.7\" and pytho [[package]] name = "tox" -version = "3.24.2" +version = "3.24.4" description = "tox is a generic virtualenv management and test command line tool" category = "dev" optional = false @@ -983,7 +983,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <3.5" [[package]] name = "typing-extensions" -version = "3.10.0.0" +version = "3.10.0.2" description = "Backported and Experimental Type Hints for Python 3.5+" category = "main" optional = false @@ -1004,7 +1004,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [[package]] name = "virtualenv" -version = "20.7.2" +version = "20.8.0" description = "Virtual Python Environment builder" category = "main" optional = false @@ -1061,7 +1061,7 @@ testing = ["pathlib2", "unittest2", "jaraco.itertools", "func-timeout"] [metadata] lock-version = "1.1" python-versions = "~2.7 || ^3.5" -content-hash = "e45e80a8cc2d64595c7f7e7a494dc8e80a7c1cd9f87cfd89539330e74823c06a" +content-hash = "f29a657885ebf0c347d6426c52bbf926520555d4de7df43166738e0525361ded" [metadata.files] atomicwrites = [ @@ -1140,8 +1140,8 @@ cffi = [ {file = "cffi-1.14.6.tar.gz", hash = "sha256:c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd"}, ] cfgv = [ - {file = "cfgv-3.3.0-py2.py3-none-any.whl", hash = "sha256:b449c9c6118fe8cca7fa5e00b9ec60ba08145d281d52164230a69211c5d597a1"}, - {file = "cfgv-3.3.0.tar.gz", hash = "sha256:9e600479b3b99e8af981ecdfc80a0296104ee610cab48a5ae4ffd0b668650eb1"}, + {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"}, + {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"}, ] chardet = [ {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"}, @@ -1262,22 +1262,29 @@ cryptography = [ {file = "cryptography-3.3.2-cp36-abi3-win32.whl", hash = "sha256:3c284fc1e504e88e51c428db9c9274f2da9f73fdf5d7e13a36b8ecb039af6e6c"}, {file = "cryptography-3.3.2-cp36-abi3-win_amd64.whl", hash = "sha256:7951a966613c4211b6612b0352f5bf29989955ee592c4a885d8c7d0f830d0433"}, {file = "cryptography-3.3.2.tar.gz", hash = "sha256:5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed"}, - {file = "cryptography-3.4.7-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:3d8427734c781ea5f1b41d6589c293089704d4759e34597dce91014ac125aad1"}, - {file = "cryptography-3.4.7-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:8e56e16617872b0957d1c9742a3f94b43533447fd78321514abbe7db216aa250"}, - {file = "cryptography-3.4.7-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:37340614f8a5d2fb9aeea67fd159bfe4f5f4ed535b1090ce8ec428b2f15a11f2"}, - {file = "cryptography-3.4.7-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:240f5c21aef0b73f40bb9f78d2caff73186700bf1bc6b94285699aff98cc16c6"}, - {file = "cryptography-3.4.7-cp36-abi3-manylinux2014_x86_64.whl", hash = "sha256:1e056c28420c072c5e3cb36e2b23ee55e260cb04eee08f702e0edfec3fb51959"}, - {file = "cryptography-3.4.7-cp36-abi3-win32.whl", hash = "sha256:0f1212a66329c80d68aeeb39b8a16d54ef57071bf22ff4e521657b27372e327d"}, - {file = "cryptography-3.4.7-cp36-abi3-win_amd64.whl", hash = "sha256:de4e5f7f68220d92b7637fc99847475b59154b7a1b3868fb7385337af54ac9ca"}, - {file = "cryptography-3.4.7-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:26965837447f9c82f1855e0bc8bc4fb910240b6e0d16a664bb722df3b5b06873"}, - {file = "cryptography-3.4.7-pp36-pypy36_pp73-manylinux2014_x86_64.whl", hash = "sha256:eb8cc2afe8b05acbd84a43905832ec78e7b3873fb124ca190f574dca7389a87d"}, - {file = "cryptography-3.4.7-pp37-pypy37_pp73-manylinux2010_x86_64.whl", hash = "sha256:7ec5d3b029f5fa2b179325908b9cd93db28ab7b85bb6c1db56b10e0b54235177"}, - {file = "cryptography-3.4.7-pp37-pypy37_pp73-manylinux2014_x86_64.whl", hash = "sha256:ee77aa129f481be46f8d92a1a7db57269a2f23052d5f2433b4621bb457081cc9"}, - {file = "cryptography-3.4.7.tar.gz", hash = "sha256:3d10de8116d25649631977cb37da6cbdd2d6fa0e0281d014a5b7d337255ca713"}, + {file = "cryptography-3.4.8-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:a00cf305f07b26c351d8d4e1af84ad7501eca8a342dedf24a7acb0e7b7406e14"}, + {file = "cryptography-3.4.8-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:f44d141b8c4ea5eb4dbc9b3ad992d45580c1d22bf5e24363f2fbf50c2d7ae8a7"}, + {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:0a7dcbcd3f1913f664aca35d47c1331fce738d44ec34b7be8b9d332151b0b01e"}, + {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34dae04a0dce5730d8eb7894eab617d8a70d0c97da76b905de9efb7128ad7085"}, + {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1eb7bb0df6f6f583dd8e054689def236255161ebbcf62b226454ab9ec663746b"}, + {file = "cryptography-3.4.8-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:9965c46c674ba8cc572bc09a03f4c649292ee73e1b683adb1ce81e82e9a6a0fb"}, + {file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:3c4129fc3fdc0fa8e40861b5ac0c673315b3c902bbdc05fc176764815b43dd1d"}, + {file = "cryptography-3.4.8-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:695104a9223a7239d155d7627ad912953b540929ef97ae0c34c7b8bf30857e89"}, + {file = "cryptography-3.4.8-cp36-abi3-win32.whl", hash = "sha256:21ca464b3a4b8d8e86ba0ee5045e103a1fcfac3b39319727bc0fc58c09c6aff7"}, + {file = "cryptography-3.4.8-cp36-abi3-win_amd64.whl", hash = "sha256:3520667fda779eb788ea00080124875be18f2d8f0848ec00733c0ec3bb8219fc"}, + {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d2a6e5ef66503da51d2110edf6c403dc6b494cc0082f85db12f54e9c5d4c3ec5"}, + {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a305600e7a6b7b855cd798e00278161b681ad6e9b7eca94c721d5f588ab212af"}, + {file = "cryptography-3.4.8-pp36-pypy36_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:3fa3a7ccf96e826affdf1a0a9432be74dc73423125c8f96a909e3835a5ef194a"}, + {file = "cryptography-3.4.8-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:d9ec0e67a14f9d1d48dd87a2531009a9b251c02ea42851c060b25c782516ff06"}, + {file = "cryptography-3.4.8-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:5b0fbfae7ff7febdb74b574055c7466da334a5371f253732d7e2e7525d570498"}, + {file = "cryptography-3.4.8-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94fff993ee9bc1b2440d3b7243d488c6a3d9724cc2b09cdb297f6a886d040ef7"}, + {file = "cryptography-3.4.8-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:8695456444f277af73a4877db9fc979849cd3ee74c198d04fc0776ebc3db52b9"}, + {file = "cryptography-3.4.8-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:cd65b60cfe004790c795cc35f272e41a3df4631e2fb6b35aa7ac6ef2859d554e"}, + {file = "cryptography-3.4.8.tar.gz", hash = "sha256:94cc5ed4ceaefcbe5bf38c8fba6a21fc1d365bb8fb826ea1688e3370b2e24a1c"}, ] distlib = [ - {file = "distlib-0.3.2-py2.py3-none-any.whl", hash = "sha256:23e223426b28491b1ced97dc3bbe183027419dfc7982b4fa2f05d5f3ff10711c"}, - {file = "distlib-0.3.2.zip", hash = "sha256:106fef6dc37dd8c0e2c0a60d3fca3e77460a48907f335fa28420463a6f799736"}, + {file = "distlib-0.3.3-py2.py3-none-any.whl", hash = "sha256:c8b54e8454e5bf6237cc84c20e8264c3e991e824ef27e8f1e81049867d861e31"}, + {file = "distlib-0.3.3.zip", hash = "sha256:d982d0751ff6eaaab5e2ec8e691d949ee80eddf01a62eaa96ddb11531fe16b05"}, ] entrypoints = [ {file = "entrypoints-0.3-py2.py3-none-any.whl", hash = "sha256:589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19"}, @@ -1315,8 +1322,8 @@ httpretty = [ {file = "httpretty-0.9.7.tar.gz", hash = "sha256:66216f26b9d2c52e81808f3e674a6fb65d4bf719721394a1a9be926177e55fbe"}, ] identify = [ - {file = "identify-2.2.13-py2.py3-none-any.whl", hash = "sha256:7199679b5be13a6b40e6e19ea473e789b11b4e3b60986499b1f589ffb03c217c"}, - {file = "identify-2.2.13.tar.gz", hash = "sha256:7bc6e829392bd017236531963d2d937d66fc27cadc643ac0aba2ce9f26157c79"}, + {file = "identify-2.2.15-py2.py3-none-any.whl", hash = "sha256:de83a84d774921669774a2000bf87ebba46b4d1c04775f4a5d37deff0cf39f73"}, + {file = "identify-2.2.15.tar.gz", hash = "sha256:528a88021749035d5a39fe2ba67c0642b8341aaf71889da0e1ed669a429b87f0"}, ] idna = [ {file = "idna-2.10-py2.py3-none-any.whl", hash = "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"}, @@ -1362,8 +1369,8 @@ more-itertools = [ {file = "more_itertools-5.0.0-py3-none-any.whl", hash = "sha256:fe7a7cae1ccb57d33952113ff4fa1bc5f879963600ed74918f1236e212ee50b9"}, {file = "more-itertools-7.2.0.tar.gz", hash = "sha256:409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832"}, {file = "more_itertools-7.2.0-py3-none-any.whl", hash = "sha256:92b8c4b06dac4f0611c0729b2f2ede52b2e1bac1ab48f089c7ddc12e26bb60c4"}, - {file = "more-itertools-8.8.0.tar.gz", hash = "sha256:83f0308e05477c68f56ea3a888172c78ed5d5b3c282addb67508e7ba6c8f813a"}, - {file = "more_itertools-8.8.0-py3-none-any.whl", hash = "sha256:2cf89ec599962f2ddc4d568a05defc40e0a587fbc10d5989713638864c36be4d"}, + {file = "more-itertools-8.10.0.tar.gz", hash = "sha256:1debcabeb1df793814859d64a81ad7cb10504c24349368ccf214c664c474f41f"}, + {file = "more_itertools-8.10.0-py3-none-any.whl", hash = "sha256:56ddac45541718ba332db05f464bebfb0768110111affd27f66e0051f276fa43"}, ] msgpack = [ {file = "msgpack-1.0.2-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:b6d9e2dae081aa35c44af9c4298de4ee72991305503442a5c74656d82b581fe9"}, @@ -1428,12 +1435,12 @@ pluggy = [ {file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"}, ] poetry-core = [ - {file = "poetry-core-1.0.4.tar.gz", hash = "sha256:4b3847ad3e7b5deb88a35b23fa19762b9cef26828770cef3a5b47ffb508119c1"}, - {file = "poetry_core-1.0.4-py2.py3-none-any.whl", hash = "sha256:a99fa921cf84f0521644714bb4b531d9d8f839c64de20aa71fa137f7461a1516"}, + {file = "poetry-core-1.0.6.tar.gz", hash = "sha256:dd3c97003579242236890306836f2acc86d9741e6bea320dda6f844f16b0d845"}, + {file = "poetry_core-1.0.6-py2.py3-none-any.whl", hash = "sha256:4ef68b4a55a8a95a60e6a312317e5a2f2af7590cf3d46b6bfe648c1e5f13cc48"}, ] pre-commit = [ - {file = "pre_commit-2.14.0-py2.py3-none-any.whl", hash = "sha256:ec3045ae62e1aa2eecfb8e86fa3025c2e3698f77394ef8d2011ce0aedd85b2d4"}, - {file = "pre_commit-2.14.0.tar.gz", hash = "sha256:2386eeb4cf6633712c7cc9ede83684d53c8cafca6b59f79c738098b51c6d206c"}, + {file = "pre_commit-2.15.0-py2.py3-none-any.whl", hash = "sha256:a4ed01000afcb484d9eb8d504272e642c4c4099bbad3a6b27e519bd6a3e928a6"}, + {file = "pre_commit-2.15.0.tar.gz", hash = "sha256:3c25add78dbdfb6a28a651780d5c311ac40dd17f160eb3954a0c59da40a505a7"}, ] ptyprocess = [ {file = "ptyprocess-0.7.0-py2.py3-none-any.whl", hash = "sha256:4b41f3967fce3af57cc7e94b888626c18bf37a083e3651ca8feeb66d492fef35"}, @@ -1564,8 +1571,8 @@ tomlkit = [ {file = "tomlkit-0.7.2.tar.gz", hash = "sha256:d7a454f319a7e9bd2e249f239168729327e4dd2d27b17dc68be264ad1ce36754"}, ] tox = [ - {file = "tox-3.24.2-py2.py3-none-any.whl", hash = "sha256:d45d39203b10fdb2f6887c6779865e31de82cea07419a739844cc4bd4b3493e2"}, - {file = "tox-3.24.2.tar.gz", hash = "sha256:ae442d4d51d5a3afb3711e4c7d94f5ca8461afd27c53f5dd994aba34896cf02d"}, + {file = "tox-3.24.4-py2.py3-none-any.whl", hash = "sha256:5e274227a53dc9ef856767c21867377ba395992549f02ce55eb549f9fb9a8d10"}, + {file = "tox-3.24.4.tar.gz", hash = "sha256:c30b57fa2477f1fb7c36aa1d83292d5c2336cd0018119e1b1c17340e2c2708ca"}, ] typing = [ {file = "typing-3.10.0.0-py2-none-any.whl", hash = "sha256:c7219ef20c5fbf413b4567092adfc46fa6203cb8454eda33c3fc1afe1398a308"}, @@ -1573,17 +1580,17 @@ typing = [ {file = "typing-3.10.0.0.tar.gz", hash = "sha256:13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130"}, ] typing-extensions = [ - {file = "typing_extensions-3.10.0.0-py2-none-any.whl", hash = "sha256:0ac0f89795dd19de6b97debb0c6af1c70987fd80a2d62d1958f7e56fcc31b497"}, - {file = "typing_extensions-3.10.0.0-py3-none-any.whl", hash = "sha256:779383f6086d90c99ae41cf0ff39aac8a7937a9283ce0a414e5dd782f4c94a84"}, - {file = "typing_extensions-3.10.0.0.tar.gz", hash = "sha256:50b6f157849174217d0656f99dc82fe932884fb250826c18350e159ec6cdf342"}, + {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"}, + {file = "typing_extensions-3.10.0.2-py3-none-any.whl", hash = "sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34"}, + {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"}, ] urllib3 = [ {file = "urllib3-1.25.11-py2.py3-none-any.whl", hash = "sha256:f5321fbe4bf3fefa0efd0bfe7fb14e90909eb62a48ccda331726b4319897dd5e"}, {file = "urllib3-1.25.11.tar.gz", hash = "sha256:8d7eaa5a82a1cac232164990f04874c594c9453ec55eef02eab885aa02fc17a2"}, ] virtualenv = [ - {file = "virtualenv-20.7.2-py2.py3-none-any.whl", hash = "sha256:e4670891b3a03eb071748c569a87cceaefbf643c5bac46d996c5a45c34aa0f06"}, - {file = "virtualenv-20.7.2.tar.gz", hash = "sha256:9ef4e8ee4710826e98ff3075c9a4739e2cb1040de6a2a8d35db0055840dc96a0"}, + {file = "virtualenv-20.8.0-py2.py3-none-any.whl", hash = "sha256:a4b987ec31c3c9996cf1bc865332f967fe4a0512c41b39652d6224f696e69da5"}, + {file = "virtualenv-20.8.0.tar.gz", hash = "sha256:4da4ac43888e97de9cf4fdd870f48ed864bbfd133d2c46cbdec941fed4a25aef"}, ] wcwidth = [ {file = "wcwidth-0.2.5-py2.py3-none-any.whl", hash = "sha256:beb4802a9cebb9144e99086eff703a642a13d6a0052920003a230f3294bbe784"}, diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml index eb55fd122702..eb11360fe16f 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "poetry" -version = "1.1.8" +version = "1.1.10" description = "Python dependency management and packaging made easy." authors = [ "Sébastien Eustace <sebastien@eustace.io>" @@ -24,7 +24,7 @@ classifiers = [ [tool.poetry.dependencies] python = "~2.7 || ^3.5" -poetry-core = "~1.0.4" +poetry-core = "~1.0.6" cleo = "^0.8.1" clikit = "^0.6.2" crashtest = { version = "^0.3.0", python = "^3.6" } diff --git a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json index abb6993d4c2c..2973014f9109 100644 --- a/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json +++ b/nixpkgs/pkgs/development/tools/poetry2nix/poetry2nix/pkgs/poetry/src.json @@ -1,7 +1,7 @@ { "owner": "python-poetry", "repo": "poetry", - "rev": "bce13c14f73060b3abbb791dea585d8fde26eaef", - "sha256": "H3Za2p5Sh+K7f2TEFV7vQpCEUyiGBNTu1clIi86Sj2E=", + "rev": "ebc5484d72fb719a6ffe949cbe95acd98f5c249b", + "sha256": "S2HwolO7cU2c90ZcxPEiGjQ5PrOzZ6US22WLcWUJ0R8=", "fetchSubmodules": true } diff --git a/nixpkgs/pkgs/development/tools/protoc-gen-twirp_php/default.nix b/nixpkgs/pkgs/development/tools/protoc-gen-twirp_php/default.nix index 08c8214c637e..62d0274bf073 100644 --- a/nixpkgs/pkgs/development/tools/protoc-gen-twirp_php/default.nix +++ b/nixpkgs/pkgs/development/tools/protoc-gen-twirp_php/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protoc-gen-twirp_php"; - version = "0.7.1"; + version = "0.7.5"; # 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-94GN/Gq3RXXg83eUsmIcdF4VuK4syCgD0Zkc5eDiVYE="; + sha256 = "sha256-pHGGZaMBggBUu2CZCxWrZ592K5V93vPI2sZnFkqku2k="; }; - vendorSha256 = "sha256-gz4JELCffuh7dyFdBex8/SFZ1/PDXuC/93m3WNHwRss="; + vendorSha256 = "sha256-p7t+2QgPkcTmsK+jKcPCPDCchNup9F326yKc6JbJHOE="; subPackages = [ "protoc-gen-twirp_php" ]; diff --git a/nixpkgs/pkgs/development/tools/pscale/default.nix b/nixpkgs/pkgs/development/tools/pscale/default.nix index 477827b75a14..71977d1a74ef 100644 --- a/nixpkgs/pkgs/development/tools/pscale/default.nix +++ b/nixpkgs/pkgs/development/tools/pscale/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.65.0"; + version = "0.76.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-RIyxO2nTysJLdYQvlmhZpS8R2kkwN+XeTlk4Ocbk9C8="; + sha256 = "sha256-yfTfWMyRo1QP0QCbJOxNC1eAYmJQ/yKvWjThXd7r7Bc="; }; - vendorSha256 = "sha256-8zgWM5e+aKggGbLoL/Fmy7AuALVlLa74eHBxNGjTSy4="; + vendorSha256 = "sha256-dD+8ZraY0RvoGxJZSWG31Iif+R5CDNtQ9H7J8Ty0x7U="; meta = with lib; { homepage = "https://www.planetscale.com/"; diff --git a/nixpkgs/pkgs/development/tools/py-spy/default.nix b/nixpkgs/pkgs/development/tools/py-spy/default.nix index e0c1722a6116..3a31d772cd23 100644 --- a/nixpkgs/pkgs/development/tools/py-spy/default.nix +++ b/nixpkgs/pkgs/development/tools/py-spy/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "py-spy"; - version = "0.3.8"; + version = "0.3.9"; src = fetchFromGitHub { owner = "benfred"; repo = "py-spy"; rev = "v${version}"; - sha256 = "sha256-nb4ehJQGo6k4/gO2e54sBW1+eZ23jxgst142RPAn2jw="; + sha256 = "sha256-jGHTt3MMSNBVi9W3JRWxKrao1OXrV8mB1pXoiZcQ7SU="; }; NIX_CFLAGS_COMPILE = "-L${libunwind}/lib"; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { checkInputs = [ python3 ]; - cargoSha256 = "sha256-qiK/LBRF6YCK1rhOlvK7g7BxF5G5zPgWJ3dM2Le0Yio="; + cargoSha256 = "sha256-UW8fqauuE2e6NPsJP2YtjU8bwi60UWJvGvZ7dglmPA0="; meta = with lib; { description = "Sampling profiler for Python programs"; diff --git a/nixpkgs/pkgs/development/tools/richgo/default.nix b/nixpkgs/pkgs/development/tools/richgo/default.nix index f36c84c1ee09..4e11b5a64d84 100644 --- a/nixpkgs/pkgs/development/tools/richgo/default.nix +++ b/nixpkgs/pkgs/development/tools/richgo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "richgo"; - version = "0.3.6"; + version = "0.3.9"; src = fetchFromGitHub { owner = "kyoh86"; repo = "richgo"; rev = "v${version}"; - sha256 = "sha256-ehhrJlB0XzLHkspvP6vL8MtrjE12baBFkbqWMD41/Sg="; + sha256 = "sha256-yVt0iFH9tYCeIWJC16ve988xBXgt96357YiHfsxai7g="; }; - vendorSha256 = "sha256-986Abeeb1MHB/0yN1oud6t8wHD5B5MisRHKZcwOq4tU="; + vendorSha256 = "sha256-IJjJ4X3mv2PUmwzt5/hgv1N6R0w+EXGSrCS4q+INJrA="; doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/rnix-lsp/default.nix b/nixpkgs/pkgs/development/tools/rnix-lsp/default.nix index 09c8531c938b..d5a6f962c013 100644 --- a/nixpkgs/pkgs/development/tools/rnix-lsp/default.nix +++ b/nixpkgs/pkgs/development/tools/rnix-lsp/default.nix @@ -1,21 +1,23 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform, nixUnstable }: rustPlatform.buildRustPackage rec { pname = "rnix-lsp"; - version = "0.1.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "rnix-lsp"; rev = "v${version}"; - sha256 = "0fy620c34kxl27sd62x9mj0555bcdmnmbsxavmyiwb497z1m9wnn"; + sha256 = "sha256-54dtLkGAbQ4Sln/bs/sI0GaCbXyK8+vDD8QBgxaiCXg="; }; - cargoSha256 = "1akapxrh38g44531r25dgik8y5qyy9y6zb031hg8v61px2ajs39s"; + cargoSha256 = "sha256-Tw05eOIMJj+zX0fqtn6wJwolKNkYqfVuo/WO/WvYu2k="; + + checkInputs = [ nixUnstable ]; meta = with lib; { description = "A work-in-progress language server for Nix, with syntax checking and basic completion"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ma27 ]; }; } diff --git a/nixpkgs/pkgs/development/tools/rust-code-analysis/default.nix b/nixpkgs/pkgs/development/tools/rust-code-analysis/default.nix new file mode 100644 index 000000000000..d0c9d56a25e6 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust-code-analysis/default.nix @@ -0,0 +1,28 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "rust-code-analysis"; + version = "0.0.23"; + + src = fetchFromGitHub { + owner = "mozilla"; + repo = pname; + rev = "v${version}"; + sha256 = "1l9qr5rvbj542fx6g6h9p38z31kvwli39vipbmd3pvic2mpi6mzx"; + }; + + cargoSha256 = "sha256-++d/czDJVGzY8GvBpBKpP0Rum4J4RpT95S81IRUWY2M="; + + cargoBuildFlags = [ "--workspace" ]; + + meta = with lib; { + description = "Analyze and collect metrics on source code"; + homepage = "https://github.com/mozilla/rust-code-analysis"; + license = with licenses; [ + mit # grammars + mpl20 # code + ]; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "rust-code-analysis-cli"; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix b/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix index cc3907ba7f29..57d5c1e64d2f 100644 --- a/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix @@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec { pname = "rust-bindgen"; - version = "0.57.0"; + version = "0.59.1"; RUSTFLAGS = "--cap-lints warn"; # probably OK to remove after update @@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec { owner = "rust-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0d8+Rkb4h1DoFUQ7u2/kPR/fUUz0YvI+hNT4iXL3mxY="; + sha256 = "sha256-nCww9sr6kF7nCQeIGtOXddxD3dR/SJ0rqAc+RlZnUkQ="; }; - cargoSha256 = "0r60smhlx1992a1s1k5sxjpdqllb2xsqcimgx3ldp5fdkfphk3cw"; + cargoSha256 = "sha256-3EXYC/mwzVxo/ginvF1WFtS7ABE/ybyuKb58uMqfTDs="; #for substituteAll libclang = llvmPackages_latest.libclang.lib; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-all-features/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-all-features/default.nix new file mode 100644 index 000000000000..3d36b42ebe7c --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-all-features/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-all-features"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "frewsxcv"; + repo = pname; + rev = version; + sha256 = "1pdr34ygc0qmh0dyrw1qcrh1vgg9jv9lm6ypl3fgjzz7npdj1dw4"; + }; + + cargoSha256 = "sha256-BsRJo55gYT8OkDUBepWq48sW7QPt5OZkm8RR9f7HqZY="; + + meta = with lib; { + description = "A Cargo subcommand to build and test all feature flag combinations"; + homepage = "https://github.com/frewsxcv/cargo-all-features"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix index 71394c098907..8b4780d7ea08 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-c/default.nix @@ -1,11 +1,11 @@ { rustPlatform, stdenv, lib, fetchFromGitHub, fetchurl -, pkg-config, openssl +, pkg-config, curl, openssl , CoreFoundation, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "cargo-c"; - version = "0.8.1"; + version = "0.9.2"; src = stdenv.mkDerivation rec { name = "${pname}-source-${version}"; @@ -14,11 +14,11 @@ rustPlatform.buildRustPackage rec { owner = "lu-zero"; repo = pname; rev = "v${version}"; - sha256 = "0fd0xql5cbqgmir2z3ah91iasaq9133wmi5bnhiy3dv7drcqv4rc"; + sha256 = "0hvlrhmbplx4cj4l5fynihgr9cdh0rkpwvipizk1gpp6p1ksr5hz"; }; cargoLock = fetchurl { url = "https://github.com/lu-zero/${pname}/releases/download/v${version}/Cargo.lock"; - sha256 = "1xlh3h77rxhqyr1nkqyanb120lwdks6fklh202camqpmznd763g5"; + sha256 = "0ckn31asz7013206j153ig96602dxvxm6skdz1plan0h05j5mgah"; }; installPhase = '' @@ -28,12 +28,23 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "0b952xkg0l31laqlhsv3cqdag7v15k9na6xr6q9y8xwy1fjh9gzv"; + cargoSha256 = "0c0vn2pcy5px02mc0l4a3w7z9n8hc6br5w3ww6nrav5w6911jp52"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] + + nativeBuildInputs = [ pkg-config (lib.getDev curl) ]; + buildInputs = [ openssl curl ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ]; + # Ensure that we are avoiding build of the curl vendored in curl-sys + doInstallCheck = stdenv.hostPlatform.libc == "glibc"; + installCheckPhase = '' + runHook preInstallCheck + + ldd "$out/bin/cargo-cbuild" | grep libcurl.so + + runHook postInstallCheck + ''; + meta = with lib; { description = "A cargo subcommand to build and install C-ABI compatibile dynamic and static libraries"; longDescription = '' diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-cross/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-cross/default.nix index 276d6e50eeed..ff76a755cddc 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-cross/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-cross/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { owner = "rust-embedded"; repo = "cross"; rev = "v${version}"; - sha256 = "sha256:1py5w4kf612x4qxi190ilsrx0zzwdzk9i47ppvqblska1s47qa2w"; + sha256 = "1py5w4kf612x4qxi190ilsrx0zzwdzk9i47ppvqblska1s47qa2w"; }; cargoSha256 = "sha256-zk6cbN4iSHnyoeWupufVf2yQK6aq3S99uk9lqpjCw4c="; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ (fetchpatch { url = "https://github.com/rust-embedded/cross/commit/e86ad2e5a55218395df7eaaf91900e22b809083c.patch"; - sha256 = "sha256:1zrcj5fm3irmlrfkgb65kp2pjkry0rg5nn9pwsk9p0i6dpapjc7k"; + sha256 = "1zrcj5fm3irmlrfkgb65kp2pjkry0rg5nn9pwsk9p0i6dpapjc7k"; }) ]; @@ -36,5 +36,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rust-embedded/cross"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ otavio ]; + mainProgram = "cross"; }; } diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-deadlinks/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-deadlinks/default.nix new file mode 100644 index 000000000000..ebd66a9b0093 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-deadlinks/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-deadlinks"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "deadlinks"; + repo = pname; + rev = "${version}"; + sha256 = "1zd5zgq3346xijllr0qdvvmsilpawisrqgdmsqir8v3bk55ybj4g"; + }; + + cargoSha256 = "1ar3iwpy9mng4j09z4g3ynxra2qwc8454dnc0wjal4h16fk8gxwv"; + + checkFlags = [ + # uses internet + "--skip non_existent_http_link --skip working_http_check" + # expects top-level directory to be named "cargo-deadlinks" + "--skip simple_project::it_checks_okay_project_correctly" + ]; + + buildInputs = lib.optional stdenv.isDarwin Security; + + meta = with lib; { + description = "Cargo subcommand to check rust documentation for broken links"; + homepage = "https://github.com/deadlinks/cargo-deadlinks"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ newam ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-dephell/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-dephell/default.nix new file mode 100644 index 000000000000..0fe9a0605401 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-dephell/default.nix @@ -0,0 +1,26 @@ +{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-dephell"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "mimoo"; + repo = pname; + rev = "v${version}"; + sha256 = "1v3psrkjhgbkq9lm3698ac77qgk090jbly4r187nryj0vcmf9s1l"; + }; + + cargoSha256 = "0fwj782dbyj3ps16hxmq61drf8714863jb0d3mhivn3zlqawyyil"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + + meta = with lib; { + description = "A tool to analyze the third-party dependencies imported by a rust crate or rust workspace"; + homepage = "https://github.com/mimoo/cargo-dephell"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-diet/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-diet/default.nix new file mode 100644 index 000000000000..df50ed02d11a --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-diet/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-diet"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "the-lean-crate"; + repo = pname; + rev = "v${version}"; + sha256 = "1wxwf3i8qhak8b61iscsbndm4z7r5sg6iiarqlpf0y3lzb0yi5ah"; + }; + + cargoSha256 = "06scamzr1676q5lx75bm05hdr21mdiby84dpm1wf2va5qpq6mjyl"; + + meta = with lib; { + description = "Help computing optimal include directives for your Cargo.toml manifest"; + homepage = "https://github.com/the-lean-crate/cargo-diet"; + changelog = "https://github.com/the-lean-crate/cargo-diet/blob/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-feature/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-feature/default.nix index 062cb9f027d6..0f21e4326f3a 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-feature/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-feature/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-feature"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "Riey"; repo = pname; rev = "v${version}"; - sha256 = "0n5kzh756ghfs3cydlcn9mfvpgwy1cjg41h0nd9dbi5cr1fp9x1n"; + sha256 = "sha256-aUzmD5Dt0obXWDdZT6/Bzun2R1TLQYYELrN4xEG4hq8="; }; - cargoSha256 = "1jh1h6v4mxx03b4diw9325ga0k3js0czs504lx07hvbx8yai1wkq"; + cargoSha256 = "sha256-R8OaxlBAkK5YQPejOdLuCMeQlCbPcC/VQm9WHm31v54="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix new file mode 100644 index 000000000000..1e10d9eddcf0 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-llvm-lines"; + version = "0.4.12"; + + src = fetchFromGitHub { + owner = "dtolnay"; + repo = pname; + rev = version; + sha256 = "sha256-D4blt8kGD0mxysedRMZo/VNfwfYdJs8T2zoNjHRi0ng="; + }; + + cargoSha256 = "sha256-H2APBu9oHmtRGSB+VQT9V5C36awPy8fi6A2Qf1RsIbU="; + + meta = with lib; { + description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; + homepage = "https://github.com/dtolnay/cargo-llvm-lines"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-play/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-play/default.nix index f5faed06faf9..a4937ee412b8 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-play/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-play/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, rustPlatform }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-play"; @@ -13,8 +13,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1xkscd9ci9vlkmbsaxvavrna1xpi16xcf9ri879lw8bdh7sa3nx8"; - # some tests require internet access - doCheck = false; + # these tests require internet access + checkFlags = [ + "--skip=dtoa_test" + "--skip=infer_override" + ]; meta = with lib; { description = "Run your rust code without setting up cargo"; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix new file mode 100644 index 000000000000..836b959f1023 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-spellcheck/default.nix @@ -0,0 +1,32 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, libclang +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-spellcheck"; + version = "0.8.13"; + + src = fetchFromGitHub { + owner = "drahnr"; + repo = pname; + rev = "v${version}"; + sha256 = "0k88ma00gj8wjdvd7ysbbvqnf5sk1w8d3wqbi6qfxnqrc1k3hlv2"; + }; + + cargoSha256 = "0mmk0igm2s8sxi65zvikxhz52xhkyd3ljqy61mij7zlx95rf639x"; + + LIBCLANG_PATH = "${libclang.lib}/lib"; + + checkFlags = [ + "--skip checker::hunspell::tests::hunspell_binding_is_sane" + ]; + + meta = with lib; { + description = "Checks rust documentation for spelling and grammar mistakes"; + homepage = "https://github.com/drahnr/cargo-spellcheck"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ newam ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-supply-chain/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-supply-chain/default.nix new file mode 100644 index 000000000000..d5876f240a93 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-supply-chain/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchCrate, stdenv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-supply-chain"; + version = "0.2.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-zjDZJOUjnEQ03rmo5CdSY1emE6YohOPlf7SKuvNLuV0="; + }; + + cargoSha256 = "sha256-xSJ5rx8k+my0NeGYHZyvDzbM7uMdbViT7Ou9a9JACfs="; + + buildInputs = lib.optional stdenv.isDarwin Security; + + meta = with lib; { + description = "Gather author, contributor and publisher data on crates in your dependency graph"; + homepage = "https://github.com/rust-secure-code/cargo-supply-chain"; + changelog = "https://github.com/rust-secure-code/cargo-supply-chain/blob/master/CHANGELOG.md"; + license = with licenses; [ asl20 mit zlib ]; # any of three + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix new file mode 100644 index 000000000000..21a5b470a2e9 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix @@ -0,0 +1,26 @@ +{ lib, rustPlatform, fetchCrate, stdenv, DiskArbitration, Foundation, IOKit }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-tally"; + version = "1.0.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "16r60ddrqsss5nagfb5g49md8wwm4zbp9sffbm23bhlqhxh35y0i"; + }; + + cargoSha256 = "0ffq67vy0pa7va8j93g03bralz7lck6ds1hidbpzzkp13pdcgf97"; + + buildInputs = lib.optionals stdenv.isDarwin [ + DiskArbitration + Foundation + IOKit + ]; + + meta = with lib; { + description = "Graph the number of crates that depend on your crate over time"; + homepage = "https://github.com/dtolnay/cargo-tally"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix index 0a76ae0202c4..c08a714ce357 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.22"; + version = "0.1.23"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-z92q0uwL832Ph7sTpWpaa8e9Xrik9wnjQ7LBy/hY8KE="; + sha256 = "sha256-SDB2Xk2bEheXT0Lc1lrTkOyJAcAEsmUPU5R8Hy1SAUE="; }; - cargoSha256 = "sha256-4HguNyPIjpFqa80dDVFgXDK7pHOuFJdpFNxLARXxT2g="; + cargoSha256 = "sha256-gCGOXEjhT9bx3FYvtu3AoIOmgsU2WO1rmi/cKvD9WMY="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix b/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix index 46bd0a591a04..d349db0084c5 100644 --- a/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cargo-watch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "8.0.0"; + version = "8.1.1"; src = fetchFromGitHub { owner = "passcod"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3IgzMUCkcKUkhTb/ZNRONdvB6Ci0OBB1dcjtc65U8xE="; + sha256 = "sha256-wv1aD20VHar0V7oKOEKIX3klGVXauMXU4vL+NgNeZPk="; }; - cargoSha256 = "sha256-Xp/pxPKs41TXO/EUY5x8Bha7NUioMabbb73///fFr6U="; + cargoSha256 = "sha256-qhCDrZAG1FcPYKMj2C/m+5Dplko4Tpp1hGpRdGOK/Ds="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Foundation libiconv ]; diff --git a/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix b/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix index c1bc2fb4c07b..69963ea7d1fa 100644 --- a/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "0753dklr5lm1dmk6hy5khh8k3xyr5srfsq11l07685h71j7z0r00"; + sha256 = "sha256-BLiAFYkqVJSpeNPW7UF2PpAttd6ADGeQ9yneiVfNi4g="; }; - cargoSha256 = "0qyw0iqin7i31kk23ddsmywk7z0xxpd5n4q6dr6mf44y35a8krm8"; + cargoSha256 = "sha256-P58qANcl0mYqJDP1QnSx560y8BLH+ePTZ+uHuix89R4="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/nixpkgs/pkgs/development/tools/rust/maturin/default.nix b/nixpkgs/pkgs/development/tools/rust/maturin/default.nix index deb68d7d00b8..3cbf9c404c68 100644 --- a/nixpkgs/pkgs/development/tools/rust/maturin/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/maturin/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "0.10.6"; + version = "0.11.3"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-qWDrdS1zxe5woQSKLHhDSGJ1KF4SHk1mhaQApJXCCO4="; + hash = "sha256-jWkrjFQg0EqM+e/IT2n2E4lGL2kT/Wz7r5BLlzvWSO0="; }; - cargoHash = "sha256-NEXgb7yWQkqbbofd3oYQ5n+CmfaM2cWj8HwufrcRKkc="; + cargoHash = "sha256-+kXwMGeE2HD59EU0Dzvg8I6LcHiPV7SKSFqnCTfkKwY="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/rust/panamax/default.nix b/nixpkgs/pkgs/development/tools/rust/panamax/default.nix new file mode 100644 index 000000000000..0d040afd421d --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/panamax/default.nix @@ -0,0 +1,24 @@ +{ lib, rustPlatform, fetchCrate, pkg-config, openssl, stdenv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "panamax"; + version = "1.0.3"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-w4waFdzd/Ps0whOp39QLBE/YF2eyc4t2Ili7FskUt1M="; + }; + + cargoSha256 = "sha256-52snmkTFHI26xJo9qJkmqh1M5lLzhDxw8WT6uFd57aw="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + + meta = with lib; { + description = "Mirror rustup and crates.io repositories for offline Rust and cargo usage"; + homepage = "https://github.com/panamax-rs/panamax"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/rhack/default.nix b/nixpkgs/pkgs/development/tools/rust/rhack/default.nix new file mode 100644 index 000000000000..d141c43dd914 --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/rhack/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "rhack"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "nakabonne"; + repo = pname; + rev = "v${version}"; + sha256 = "088ynf65szaa86pxwwasn3wwi00z5pn7i8w9gh5dyn983z4d8237"; + }; + + cargoSha256 = "sha256-HmBh2qbO/HuNPfHKifq41IB5ResnGka2iaAsnwppm9s="; + + meta = with lib; { + description = "Temporary edit external crates that your project depends on"; + homepage = "https://github.com/nakabonne/rhack"; + license = licenses.bsd3; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index 7fc5c2b5b527..81bb8405d1b3 100644 --- a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -6,20 +6,23 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2021-09-06"; - cargoSha256 = "sha256-CTCDSoViyVMHxUKQz8fE+r3rkXf7yRgzZ90fZmMtcNM="; + version = "2021-09-20"; + cargoSha256 = "sha256-OPolZ0oXGRcKvWxXkRMjyEXzvf1p41hGfHBpbDbLJck="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-TacpTVvHAIs4kZ5vibj8luy/kryYwxY+OXFNPnqiXP0="; + sha256 = "sha256-k2UGz+h9++8wtV+XdGZbWysjkIDe+UNudKL46eisZzw="; }; patches = [ # Code format and git history check require more dependencies but don't really matter for packaging. # So just ignore them. ./ignore-git-and-rustfmt-tests.patch + + # Patch for our rust 1.54.0 in nixpkgs. Remove it when we have rust >= 1.55.0 + ./no-1-55-control-flow.patch ]; buildAndTestSubdir = "crates/rust-analyzer"; diff --git a/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-1-55-control-flow.patch b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-1-55-control-flow.patch new file mode 100644 index 000000000000..67f7686ffb4f --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/rust-analyzer/no-1-55-control-flow.patch @@ -0,0 +1,212 @@ +diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs +index 3b0c29e87..2841a39e2 100644 +--- a/crates/hir/src/lib.rs ++++ b/crates/hir/src/lib.rs +@@ -31,7 +31,7 @@ pub mod db; + + mod display; + +-use std::{iter, ops::ControlFlow, sync::Arc}; ++use std::{iter, sync::Arc}; + + use arrayvec::ArrayVec; + use base_db::{CrateDisplayName, CrateId, Edition, FileId}; +@@ -70,7 +70,7 @@ use itertools::Itertools; + use nameres::diagnostics::DefDiagnosticKind; + use once_cell::unsync::Lazy; + use rustc_hash::FxHashSet; +-use stdx::{format_to, impl_from}; ++use stdx::{format_to, impl_from, ControlFlow}; + use syntax::{ + ast::{self, AttrsOwner, NameOwner}, + AstNode, AstPtr, SmolStr, SyntaxKind, SyntaxNodePtr, +diff --git a/crates/hir_ty/src/method_resolution.rs b/crates/hir_ty/src/method_resolution.rs +index c88a8b653..039b5589e 100644 +--- a/crates/hir_ty/src/method_resolution.rs ++++ b/crates/hir_ty/src/method_resolution.rs +@@ -2,7 +2,7 @@ + //! For details about how this works in rustc, see the method lookup page in the + //! [rustc guide](https://rust-lang.github.io/rustc-guide/method-lookup.html) + //! and the corresponding code mostly in librustc_typeck/check/method/probe.rs. +-use std::{iter, ops::ControlFlow, sync::Arc}; ++use std::{iter, sync::Arc}; + + use arrayvec::ArrayVec; + use base_db::{CrateId, Edition}; +@@ -13,6 +13,7 @@ use hir_def::{ + }; + use hir_expand::name::Name; + use rustc_hash::{FxHashMap, FxHashSet}; ++use stdx::{try_control_flow, ControlFlow}; + + use crate::{ + autoderef, +@@ -483,7 +484,7 @@ pub fn iterate_method_candidates_dyn( + + let deref_chain = autoderef_method_receiver(db, krate, ty); + for i in 0..deref_chain.len() { +- iterate_method_candidates_with_autoref( ++ try_control_flow!(iterate_method_candidates_with_autoref( + &deref_chain[i..], + db, + env.clone(), +@@ -492,7 +493,7 @@ pub fn iterate_method_candidates_dyn( + visible_from_module, + name, + callback, +- )?; ++ )); + } + ControlFlow::Continue(()) + } +@@ -522,7 +523,7 @@ fn iterate_method_candidates_with_autoref( + name: Option<&Name>, + mut callback: &mut dyn FnMut(&Canonical<Ty>, AssocItemId) -> ControlFlow<()>, + ) -> ControlFlow<()> { +- iterate_method_candidates_by_receiver( ++ try_control_flow!(iterate_method_candidates_by_receiver( + &deref_chain[0], + &deref_chain[1..], + db, +@@ -532,7 +533,7 @@ fn iterate_method_candidates_with_autoref( + visible_from_module, + name, + &mut callback, +- )?; ++ )); + + let refed = Canonical { + binders: deref_chain[0].binders.clone(), +@@ -540,7 +541,7 @@ fn iterate_method_candidates_with_autoref( + .intern(&Interner), + }; + +- iterate_method_candidates_by_receiver( ++ try_control_flow!(iterate_method_candidates_by_receiver( + &refed, + deref_chain, + db, +@@ -550,7 +551,7 @@ fn iterate_method_candidates_with_autoref( + visible_from_module, + name, + &mut callback, +- )?; ++ )); + + let ref_muted = Canonical { + binders: deref_chain[0].binders.clone(), +@@ -586,7 +587,7 @@ fn iterate_method_candidates_by_receiver( + // be found in any of the derefs of receiver_ty, so we have to go through + // that. + for self_ty in std::iter::once(receiver_ty).chain(rest_of_deref_chain) { +- iterate_inherent_methods( ++ try_control_flow!(iterate_inherent_methods( + self_ty, + db, + env.clone(), +@@ -595,11 +596,11 @@ fn iterate_method_candidates_by_receiver( + krate, + visible_from_module, + &mut callback, +- )? ++ )) + } + + for self_ty in std::iter::once(receiver_ty).chain(rest_of_deref_chain) { +- iterate_trait_method_candidates( ++ try_control_flow!(iterate_trait_method_candidates( + self_ty, + db, + env.clone(), +@@ -608,7 +609,7 @@ fn iterate_method_candidates_by_receiver( + name, + Some(receiver_ty), + &mut callback, +- )? ++ )) + } + + ControlFlow::Continue(()) +@@ -624,7 +625,7 @@ fn iterate_method_candidates_for_self_ty( + name: Option<&Name>, + mut callback: &mut dyn FnMut(&Canonical<Ty>, AssocItemId) -> ControlFlow<()>, + ) -> ControlFlow<()> { +- iterate_inherent_methods( ++ try_control_flow!(iterate_inherent_methods( + self_ty, + db, + env.clone(), +@@ -633,7 +634,7 @@ fn iterate_method_candidates_for_self_ty( + krate, + visible_from_module, + &mut callback, +- )?; ++ )); + iterate_trait_method_candidates(self_ty, db, env, krate, traits_in_scope, name, None, callback) + } + +@@ -697,7 +698,7 @@ fn iterate_trait_method_candidates( + } + known_implemented = true; + // FIXME: we shouldn't be ignoring the binders here +- callback(self_ty, *item)? ++ try_control_flow!(callback(self_ty, *item)) + } + } + ControlFlow::Continue(()) +@@ -774,7 +775,7 @@ fn iterate_inherent_methods( + continue; + } + let receiver_ty = receiver_ty.unwrap_or(self_ty); +- callback(receiver_ty, item)?; ++ try_control_flow!(callback(receiver_ty, item)); + } + } + } +diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs +index 506d3ba3c..590963c17 100644 +--- a/crates/ide/src/hover.rs ++++ b/crates/ide/src/hover.rs +@@ -1,4 +1,4 @@ +-use std::{collections::HashSet, ops::ControlFlow}; ++use std::collections::HashSet; + + use either::Either; + use hir::{AsAssocItem, HasAttrs, HasSource, HirDisplay, Semantics, TypeInfo}; +@@ -12,7 +12,7 @@ use ide_db::{ + RootDatabase, + }; + use itertools::Itertools; +-use stdx::format_to; ++use stdx::{format_to, ControlFlow}; + use syntax::{ + algo, ast, display::fn_as_proc_macro_label, match_ast, AstNode, Direction, SyntaxKind::*, + SyntaxNode, SyntaxToken, TextRange, TextSize, T, +diff --git a/crates/stdx/src/lib.rs b/crates/stdx/src/lib.rs +index e7d4753de..fddf95147 100644 +--- a/crates/stdx/src/lib.rs ++++ b/crates/stdx/src/lib.rs +@@ -7,6 +7,22 @@ pub mod panic_context; + + pub use always_assert::{always, never}; + ++/// std::ops::ControlFlow from rust std 1.55.0 ++pub enum ControlFlow<B, C = ()> { ++ Continue(C), ++ Break(B), ++} ++ ++#[macro_export] ++macro_rules! try_control_flow { ++ ($e:expr) => { ++ match $e { ++ $crate::ControlFlow::Continue(c) => c, ++ $crate::ControlFlow::Break(b) => return $crate::ControlFlow::Break(b), ++ } ++ }; ++} ++ + #[inline(always)] + pub fn is_ci() -> bool { + option_env!("CI").is_some() + diff --git a/nixpkgs/pkgs/development/tools/rust/rust-script/default.nix b/nixpkgs/pkgs/development/tools/rust/rust-script/default.nix new file mode 100644 index 000000000000..b13a1f66db2d --- /dev/null +++ b/nixpkgs/pkgs/development/tools/rust/rust-script/default.nix @@ -0,0 +1,26 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "rust-script"; + version = "0.17.0"; + + src = fetchFromGitHub { + owner = "fornwall"; + repo = pname; + rev = "v${version}"; + sha256 = "0jz8hlvl31c5h8whd6pnpmslw6w6alkxijd9lhgric1yypiym9x3"; + }; + + cargoSha256 = "sha256-hg0QtxR1qm/x8G6HoN7xAyOwh9jiQvX2wWYjUR8YvMs="; + + # TODO: switch to `cargoCheckType = "false"` after #138822 is merged + # tests only work in debug mode + doCheck = false; + + meta = with lib; { + description = "Run Rust files and expressions as scripts without any setup or compilation step"; + homepage = "https://rust-script.org"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/development/tools/rust/rustup/default.nix b/nixpkgs/pkgs/development/tools/rust/rustup/default.nix index d18d1a0ec37b..f5e3b9ac4c2f 100644 --- a/nixpkgs/pkgs/development/tools/rust/rustup/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/rustup/default.nix @@ -22,16 +22,16 @@ in rustPlatform.buildRustPackage rec { pname = "rustup"; - version = "1.24.2"; + version = "1.24.3"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup"; rev = version; - sha256 = "sha256-uRCzVeTr5rr0CvE/1Uz7RHcw4Kt/sOItwcbZJBjjNjg="; + sha256 = "sha256-JpOOFwlTgwwBCrXOGYskFTgS6RZ7mHQJGT0jnHavxvI="; }; - cargoSha256 = "sha256-+E6Wa4QrMG/Ow3KehsxIzLzubXJQxCWo/rowC4MPdgk="; + cargoSha256 = "sha256-hAfGpKaWD94IxFFpnW9XwQp4P9clUX6mmekwodCK0Ag="; nativeBuildInputs = [ makeWrapper pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/rust/svd2rust/cargo-lock.patch b/nixpkgs/pkgs/development/tools/rust/svd2rust/cargo-lock.patch index acc9b053593b..62dd8427c358 100644 --- a/nixpkgs/pkgs/development/tools/rust/svd2rust/cargo-lock.patch +++ b/nixpkgs/pkgs/development/tools/rust/svd2rust/cargo-lock.patch @@ -2,473 +2,492 @@ diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,469 @@ +@@ -0,0 +1,488 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. ++version = 3 ++ +[[package]] +name = "aho-corasick" -+version = "0.7.15" ++version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +dependencies = [ -+ "memchr 2.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr", +] + +[[package]] +name = "ansi_term" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +dependencies = [ -+ "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi", +] + +[[package]] +name = "anyhow" -+version = "1.0.40" ++version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ -+ "hermit-abi 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.94 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi", ++ "libc", ++ "winapi", +] + +[[package]] +name = "autocfg" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" + +[[package]] +name = "bitflags" -+version = "1.2.1" ++version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "cast" -+version = "0.2.5" ++version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a" +dependencies = [ -+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rustc_version", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clap" +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.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vec_map 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", ++] ++ ++[[package]] ++name = "clap_conf" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "56039deda04adbf9af4e5595c199572dc276f4fe60b03a4c84c0186d4de649d8" ++dependencies = [ ++ "anyhow", ++ "clap", ++ "serde", ++ "thiserror", ++ "toml", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +dependencies = [ -+ "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" -+version = "0.8.0" ++version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +dependencies = [ -+ "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-epoch 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "crossbeam-epoch", ++ "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" -+version = "0.9.3" ++version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" +dependencies = [ -+ "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memoffset 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "crossbeam-utils", ++ "lazy_static", ++ "memoffset", ++ "scopeguard", +] + +[[package]] +name = "crossbeam-utils" -+version = "0.8.3" ++version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +dependencies = [ -+ "autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "lazy_static", +] + +[[package]] +name = "either" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" + +[[package]] +name = "env_logger" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +dependencies = [ -+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "termcolor 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty", ++ "humantime", ++ "log", ++ "regex", ++ "termcolor", +] + +[[package]] +name = "hermit-abi" -+version = "0.1.18" ++version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ -+ "libc 0.2.94 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", +] + +[[package]] +name = "humantime" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +dependencies = [ -+ "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quick-error", +] + +[[package]] +name = "inflections" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a" + +[[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.94" ++version = "0.2.102" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a2a5ac8f984bfcf3a823267e5fde638acc3325f6496633a5da6bb6eb2171e103" + +[[package]] +name = "log" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +dependencies = [ -+ "cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", +] + +[[package]] +name = "memchr" -+version = "2.3.4" ++version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" + +[[package]] +name = "memoffset" -+version = "0.6.3" ++version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +dependencies = [ -+ "autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ -+ "hermit-abi 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.94 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi", ++ "libc", +] + +[[package]] +name = "once_cell" -+version = "1.7.2" ++version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" + +[[package]] +name = "proc-macro2" -+version = "1.0.26" ++version = "1.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d" +dependencies = [ -+ "unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +dependencies = [ -+ "proc-macro2 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2", +] + +[[package]] +name = "rayon" -+version = "1.5.0" ++version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +dependencies = [ -+ "autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-deque 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "either 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon-core 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg", ++ "crossbeam-deque", ++ "either", ++ "rayon-core", +] + +[[package]] +name = "rayon-core" -+version = "1.9.0" ++version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +dependencies = [ -+ "crossbeam-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-deque 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "crossbeam-channel", ++ "crossbeam-deque", ++ "crossbeam-utils", ++ "lazy_static", ++ "num_cpus", +] + +[[package]] +name = "regex" -+version = "1.4.6" ++version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +dependencies = [ -+ "aho-corasick 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memchr 2.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex-syntax 0.6.23 (registry+https://github.com/rust-lang/crates.io-index)", ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", +] + +[[package]] +name = "regex-syntax" -+version = "0.6.23" ++version = "0.6.25" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" + +[[package]] +name = "rustc_version" -+version = "0.2.3" ++version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ -+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "semver", +] + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "semver" -+version = "0.9.0" ++version = "1.0.4" +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)", -+] ++checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" + +[[package]] -+name = "semver-parser" -+version = "0.7.0" ++name = "serde" ++version = "1.0.130" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "svd-parser" -+version = "0.10.1" ++version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "697e7645ad9f5311fe3d872d094b135627b1616aea9e1573dddd28ca522579b9" +dependencies = [ -+ "anyhow 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", -+ "once_cell 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rayon 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thiserror 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)", -+ "xmltree 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow", ++ "once_cell", ++ "rayon", ++ "regex", ++ "thiserror", ++ "xmltree", +] + +[[package]] +name = "svd2rust" -+version = "0.18.0" ++version = "0.19.0" +dependencies = [ -+ "anyhow 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cast 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "clap 2.33.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "inflections 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "svd-parser 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thiserror 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "anyhow", ++ "cast", ++ "clap", ++ "clap_conf", ++ "env_logger", ++ "inflections", ++ "log", ++ "proc-macro2", ++ "quote", ++ "svd-parser", ++ "syn", ++ "thiserror", +] + +[[package]] +name = "syn" -+version = "1.0.70" ++version = "1.0.76" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84" +dependencies = [ -+ "proc-macro2 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2", ++ "quote", ++ "unicode-xid", +] + +[[package]] +name = "termcolor" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +dependencies = [ -+ "winapi-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ -+ "unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width", +] + +[[package]] +name = "thiserror" -+version = "1.0.24" ++version = "1.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88" +dependencies = [ -+ "thiserror-impl 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" -+version = "1.0.24" ++version = "1.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c" +dependencies = [ -+ "proc-macro2 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "toml" ++version = "0.5.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" ++dependencies = [ ++ "serde", +] + +[[package]] +name = "unicode-width" -+version = "0.1.8" ++version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" + +[[package]] +name = "unicode-xid" -+version = "0.2.1" ++version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ -+ "winapi-i686-pc-windows-gnu 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-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ -+ "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "xml-rs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3c1cb601d29fe2c2ac60a2b2e5e293994d87a1f6fa9687a31a15270f909be9c2" +dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", +] + +[[package]] +name = "xmltree" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ff8eaee9d17062850f1e6163b509947969242990ee59a35801af437abe041e70" +dependencies = [ -+ "xml-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[metadata] -+"checksum aho-corasick 0.7.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" -+"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -+"checksum anyhow 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" -+"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -+"checksum autocfg 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" -+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+"checksum cast 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "cc38c385bfd7e444464011bb24820f40dd1c76bcdfa1b78611cb7c2e5cafab75" -+"checksum cfg-if 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -+"checksum clap 2.33.3 (registry+https://github.com/rust-lang/crates.io-index)" = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" -+"checksum crossbeam-channel 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" -+"checksum crossbeam-deque 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" -+"checksum crossbeam-epoch 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12" -+"checksum crossbeam-utils 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" -+"checksum either 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" -+"checksum env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" -+"checksum hermit-abi 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" -+"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -+"checksum inflections 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a" -+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+"checksum libc 0.2.94 (registry+https://github.com/rust-lang/crates.io-index)" = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" -+"checksum log 0.4.14 (registry+https://github.com/rust-lang/crates.io-index)" = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -+"checksum memchr 2.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" -+"checksum memoffset 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d" -+"checksum num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -+"checksum once_cell 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" -+"checksum proc-macro2 1.0.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" -+"checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -+"checksum quote 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" -+"checksum rayon 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" -+"checksum rayon-core 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" -+"checksum regex 1.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759" -+"checksum regex-syntax 0.6.23 (registry+https://github.com/rust-lang/crates.io-index)" = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" -+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -+"checksum scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -+"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 strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -+"checksum svd-parser 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6b787831d8f6a1549ccd1b0d62772d0526425a7da687f0f98591ab18e53bfe98" -+"checksum syn 1.0.70 (registry+https://github.com/rust-lang/crates.io-index)" = "b9505f307c872bab8eb46f77ae357c8eba1fdacead58ee5a850116b1d7f82883" -+"checksum termcolor 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" -+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+"checksum thiserror 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)" = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" -+"checksum thiserror-impl 1.0.24 (registry+https://github.com/rust-lang/crates.io-index)" = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" -+"checksum unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" -+"checksum unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" -+"checksum vec_map 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" -+"checksum winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+"checksum winapi-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+"checksum xml-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3c1cb601d29fe2c2ac60a2b2e5e293994d87a1f6fa9687a31a15270f909be9c2" -+"checksum xmltree 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff8eaee9d17062850f1e6163b509947969242990ee59a35801af437abe041e70" ++ "xml-rs", ++] diff --git a/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix b/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix index c66cbe3c2c82..5f67b335bc35 100644 --- a/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix +++ b/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix @@ -4,17 +4,17 @@ with rustPlatform; buildRustPackage rec { pname = "svd2rust"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "rust-embedded"; repo = "svd2rust"; rev = "v${version}"; - sha256 = "1p0zq3q4g9lr0ghavp7v1dwsqq19lkljkm1i2hsb1sk3pxa1f69n"; + sha256 = "04mm0l7cv2q5yjxrkpr7p0kxd4nmi0d7m4l436q8p492nvgb75zx"; }; cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "0c0f86x17fzav5q76z3ha3g00rbgyz2lm5a5v28ggy0jmg9xgsv6"; + cargoSha256 = "1v1qx0r3k86jipyaaggm25pinsqicmzvnzrxd0lr5xk77s1kvgid"; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/nixpkgs/pkgs/development/tools/skaffold/default.nix b/nixpkgs/pkgs/development/tools/skaffold/default.nix index dcacd997d7de..af590bff1557 100644 --- a/nixpkgs/pkgs/development/tools/skaffold/default.nix +++ b/nixpkgs/pkgs/development/tools/skaffold/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "skaffold"; - version = "1.30.0"; + version = "1.32.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "sha256-25qUVTHE2bj92cEYziqL2Ih6n7SXCPX/LAc6uvvS1ns="; + sha256 = "sha256-LvTAM3uYzSEhX7zz7Z+VcMYV5p80EnyaEIu0CmAUaSg="; }; - vendorSha256 = "sha256-mN2H9ohf/IiCSh+pppa3p67MoFPJyJPhtDkLOV2L7pc="; + vendorSha256 = "sha256-TUpHg4yvZ0WKcUFXjWh4Q4/gRtJ93xNa/gLkj5PYo/w="; subPackages = ["cmd/skaffold"]; diff --git a/nixpkgs/pkgs/development/tools/stylua/default.nix b/nixpkgs/pkgs/development/tools/stylua/default.nix index 6d299ce6ece5..1dcb32401283 100644 --- a/nixpkgs/pkgs/development/tools/stylua/default.nix +++ b/nixpkgs/pkgs/development/tools/stylua/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "12vflwk1h5ahamxiiaznx3k1ldi8il0adwb2rl58swmvfzbcm7y9"; + sha256 = "sha256-mHmLwgAyLEWfhSVy7WmJN1Z5BdA+3hoHujbKn2Q9fxI="; }; - cargoSha256 = "1glkfxz9apmsqbyl8fy5gwywbr6k7cv0l47w2nfimg92qn9xzgks"; + cargoSha256 = "sha256-1aze1U6NrL8KPK5v5NYCdyTTqoczkg32xR5V0jApQWw="; cargoBuildFlags = lib.optionals lua52Support [ "--features" "lua52" ] ++ lib.optionals luauSupport [ "--features" "luau" ]; diff --git a/nixpkgs/pkgs/development/tools/symfony-cli/default.nix b/nixpkgs/pkgs/development/tools/symfony-cli/default.nix index a57d666aa822..07d7c0ded366 100644 --- a/nixpkgs/pkgs/development/tools/symfony-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/symfony-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "symfony-cli"; - version = "4.25.5"; + version = "4.26.3"; src = fetchurl { url = "https://github.com/symfony/cli/releases/download/v${version}/symfony_linux_amd64.gz"; - sha256 = "sha256-DMyW2lKuoFVEguCQQ6efXrzvujL5H7PcgI0go98M0xI="; + sha256 = "sha256-les12GheTKr4XvZpE4YIyNMaXWizeB0COhDiMcYYC7o="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/development/tools/tabnine/default.nix b/nixpkgs/pkgs/development/tools/tabnine/default.nix index 3259a5fc41bd..2a4d1718a790 100644 --- a/nixpkgs/pkgs/development/tools/tabnine/default.nix +++ b/nixpkgs/pkgs/development/tools/tabnine/default.nix @@ -3,16 +3,16 @@ let platform = if stdenv.hostPlatform.system == "x86_64-linux" then { name = "x86_64-unknown-linux-musl"; - sha256 = "sha256-uy3+/+XMq56rO75mmSeOmE1HW7hhefaGwfY/QJPk3Ok="; + sha256 = "sha256-+jxjHE2/6IGptMlKXGebHcaIVokOP76ut325EbkdaA0="; } else if stdenv.hostPlatform.system == "x86_64-darwin" then { name = "x86_64-apple-darwin"; - sha256 = "sha256-EK7FbRzgaCXviOuBcRf/ElllRdakhDmOLsKkwrIEhBU="; + sha256 = "sha256-87Hy1akNrZWQbKutkv4CToTyMcxRc7Y24o1+vI4pev8="; } else throw "Not supported on ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation rec { pname = "tabnine"; # You can check the latest version with `curl -sS https://update.tabnine.com/bundles/version` - version = "3.5.49"; + version = "3.6.8"; src = fetchurl { url = "https://update.tabnine.com/bundles/${version}/${platform.name}/TabNine.zip"; diff --git a/nixpkgs/pkgs/development/tools/taplo-lsp/default.nix b/nixpkgs/pkgs/development/tools/taplo-lsp/default.nix index 9db148a9ad26..caa7facc0b5f 100644 --- a/nixpkgs/pkgs/development/tools/taplo-lsp/default.nix +++ b/nixpkgs/pkgs/development/tools/taplo-lsp/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "taplo-lsp"; - version = "0.2.4"; + version = "0.2.5"; src = fetchCrate { inherit pname version; - sha256 = "1a5v0x60iicv9snsr0a3lqbziyh38iqhiw11s2lqnr6l1hmp69jy"; + sha256 = "0a8y2fdkflc7lq0q40j7dr80hbj56bbsc585isbd7lk6xavg7cvi"; }; - cargoSha256 = "0ak70cwxcviv86b4zrcgqaxhdm6fxsji03mnacvp4pwlwv84ikkc"; + cargoSha256 = "133p5kmcfq5ksrri2f8jvnc1ljmsczq49gh3k0gmgby45yvy6xa1"; # excludes test_tcp since it fails cargoTestFlags = [ "test_stdio" ]; diff --git a/nixpkgs/pkgs/development/tools/treefmt/default.nix b/nixpkgs/pkgs/development/tools/treefmt/default.nix index 16da8e485b17..174f2273edfc 100644 --- a/nixpkgs/pkgs/development/tools/treefmt/default.nix +++ b/nixpkgs/pkgs/development/tools/treefmt/default.nix @@ -1,16 +1,16 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "treefmt"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "numtide"; repo = "treefmt"; rev = "v${version}"; - sha256 = "0h9xl887620d0b4y17nhkayr0raj8b7m6zsgx8gw4v9vdjkjbbpa"; + sha256 = "sha256-hnrMy8iYoaeWxZlhO9L1kQW3OgL6jHL1MxJpbNFLHZk="; }; - cargoSha256 = "04zmc2vaxsm4f1baissv3a6hnji3raixg891m3m8l13vin1a884q"; + cargoSha256 = "sha256-O7Ma6+Vniil5hIDd5JCWecTvkAjq7wMuuyfrzePDDq4="; meta = { description = "one CLI to format the code tree"; diff --git a/nixpkgs/pkgs/development/tools/trunk/default.nix b/nixpkgs/pkgs/development/tools/trunk/default.nix index e8a7392ff3b1..3abea5f49417 100644 --- a/nixpkgs/pkgs/development/tools/trunk/default.nix +++ b/nixpkgs/pkgs/development/tools/trunk/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "trunk"; - version = "0.10.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "thedodd"; repo = "trunk"; rev = "v${version}"; - sha256 = "W6d05MKquG1QFkvofqWk94+6j5q8yuAjNgZFG3Z3kNo="; + sha256 = "sha256-pFF3x4vfouqO49q+MVyvYS40cH8cVn4yB61o14K6ABY="; }; nativeBuildInputs = [ pkg-config ]; @@ -17,7 +17,10 @@ rustPlatform.buildRustPackage rec { then [ libiconv CoreServices Security ] else [ openssl ]; - cargoSha256 = "sha256-0ehz0ETNA2gOvTJUu8uq5H+bv4VXOJMq6AA8kn65m/Q="; + # requires network + checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ]; + + cargoSha256 = "sha256-Faj0xZkGTs5z5vMfr2BwN1/xm5vopewI9ZWkOhyPq9c="; meta = with lib; { homepage = "https://github.com/thedodd/trunk"; diff --git a/nixpkgs/pkgs/development/tools/vala-lint/default.nix b/nixpkgs/pkgs/development/tools/vala-lint/default.nix index 3c91880e16ed..e91bceeae7a3 100644 --- a/nixpkgs/pkgs/development/tools/vala-lint/default.nix +++ b/nixpkgs/pkgs/development/tools/vala-lint/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/development/tools/vcstool/default.nix b/nixpkgs/pkgs/development/tools/vcstool/default.nix index f37b17057e59..9d6fb1588a11 100644 --- a/nixpkgs/pkgs/development/tools/vcstool/default.nix +++ b/nixpkgs/pkgs/development/tools/vcstool/default.nix @@ -5,11 +5,11 @@ with python3Packages; buildPythonApplication rec { pname = "vcstool"; - version = "0.2.15"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "b1fce6fcef7b117b245a72dc8658a128635749d01dc7e9d1316490f89f9c2fde"; + sha256 = "04b3a963e15386660f139e5b95d293e43e3cb414e3b13e14ee36f5223032ee2c"; }; propagatedBuildInputs = [ pyyaml setuptools ]; diff --git a/nixpkgs/pkgs/development/tools/vendir/default.nix b/nixpkgs/pkgs/development/tools/vendir/default.nix index d45a5828c1ed..a58a0e95a38f 100644 --- a/nixpkgs/pkgs/development/tools/vendir/default.nix +++ b/nixpkgs/pkgs/development/tools/vendir/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vendir"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-vendir"; rev = "v${version}"; - sha256 = "sha256-LvpzynT+ibrE1F1uv7X0pVtzOrVFIxFqbZwM04e1Do0="; + sha256 = "sha256-6f9UF0UgwKG3Mdgy85pW2KVjC8nbnMTwQJqIWxA3Jp4="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/development/tools/vultr-cli/default.nix b/nixpkgs/pkgs/development/tools/vultr-cli/default.nix index 3b9cebb6439a..1c98d17276a4 100644 --- a/nixpkgs/pkgs/development/tools/vultr-cli/default.nix +++ b/nixpkgs/pkgs/development/tools/vultr-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vultr-cli"; - version = "2.8.0"; + version = "2.8.3"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BPeOud10cTsZ2flWRMf6F/i9JwnPPDFje3OZIAUa0O8="; + sha256 = "sha256-TQgyJBzcfvT004Op7p6Iq7olOebJMK3HuU7PtGBkNII="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/development/tools/wasm-pack/default.nix b/nixpkgs/pkgs/development/tools/wasm-pack/default.nix index 590518955121..cf151733ef69 100644 --- a/nixpkgs/pkgs/development/tools/wasm-pack/default.nix +++ b/nixpkgs/pkgs/development/tools/wasm-pack/default.nix @@ -9,20 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "wasm-pack"; - version = "0.9.1"; + version = "0.10.1"; src = fetchFromGitHub { owner = "rustwasm"; repo = "wasm-pack"; rev = "v${version}"; - sha256 = "1rqyfg6ajxxyfx87ar25nf5ck9hd0p12qgv98dicniqag8l4rvsr"; + sha256 = "sha256-I5TxpJTSus3fXMV0We9SCVMEERS0wIdYvC8SHo8zEHY="; }; - cargoPatches = [ - ./update-deps.patch - ]; - - cargoSha256 = "130gqvzpyr055xkqcy1r0y7l5k2dcv7n9zgr4ja7dm7iayzbwwi1"; + cargoSha256 = "sha256-MmbQb2JYaDpLijKRAxzD9pR4gh+Eoem0MtfdiuRC7Tg="; nativeBuildInputs = [ pkg-config ]; @@ -33,6 +29,9 @@ rustPlatform.buildRustPackage rec { libressl ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; + # Needed to get openssl-sys to use pkg-config. + OPENSSL_NO_VENDOR = 1; + # Most tests rely on external resources and build artifacts. # Disabling check here to work with build sandboxing. doCheck = false; diff --git a/nixpkgs/pkgs/development/tools/wasm-pack/update-deps.patch b/nixpkgs/pkgs/development/tools/wasm-pack/update-deps.patch deleted file mode 100644 index d61067438eeb..000000000000 --- a/nixpkgs/pkgs/development/tools/wasm-pack/update-deps.patch +++ /dev/null @@ -1,3625 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 9737a15..229ec35 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1,2439 +1,2574 @@ - # This file is automatically @generated by Cargo. - # It is not intended for manual editing. -+[[package]] -+name = "addr2line" -+version = "0.14.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7" -+dependencies = [ -+ "gimli", -+] -+ -+[[package]] -+name = "adler" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" -+ - [[package]] - name = "adler32" --version = "1.0.4" -+version = "1.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - - [[package]] - name = "aho-corasick" --version = "0.7.7" -+version = "0.7.15" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" - dependencies = [ -- "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memchr", - ] - - [[package]] - name = "ansi_term" - version = "0.11.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" - dependencies = [ -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.9", - ] - - [[package]] - name = "arrayref" - version = "0.3.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - - [[package]] - name = "arrayvec" --version = "0.5.1" -+version = "0.5.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - - [[package]] - name = "assert_cmd" - version = "0.11.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2dc477793bd82ec39799b6f6b3df64938532fdf2ab0d49ef817eac65856a5a1e" - dependencies = [ -- "escargot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "escargot", -+ "predicates", -+ "predicates-core", -+ "predicates-tree", - ] - - [[package]] - name = "atty" - version = "0.2.14" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" - dependencies = [ -- "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hermit-abi", -+ "libc", -+ "winapi 0.3.9", - ] - - [[package]] - name = "autocfg" - version = "0.1.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" - - [[package]] - name = "autocfg" --version = "1.0.0" -+version = "1.0.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - - [[package]] - name = "backtrace" --version = "0.3.43" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)", -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[[package]] --name = "backtrace-sys" --version = "0.1.32" -+version = "0.3.56" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc" - dependencies = [ -- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "addr2line", -+ "cfg-if 1.0.0", -+ "libc", -+ "miniz_oxide 0.4.3", -+ "object", -+ "rustc-demangle", - ] - - [[package]] - name = "base64" - version = "0.10.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" - dependencies = [ -- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder", - ] - - [[package]] - name = "base64" --version = "0.11.0" -+version = "0.13.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" - - [[package]] - name = "binary-install" - version = "0.0.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7b5bc5f8c50dd6a80d0b303ddab79f42ddcb52fd43d68107ecf622c551fd4cd4" - dependencies = [ -- "curl 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", -- "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "is_executable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "tar 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)", -- "zip 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "curl", -+ "dirs", -+ "failure", -+ "flate2", -+ "hex", -+ "is_executable", -+ "siphasher", -+ "tar", -+ "zip", - ] - - [[package]] - name = "bitflags" - version = "1.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - - [[package]] - name = "blake2b_simd" --version = "0.5.10" -+version = "0.5.11" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" - dependencies = [ -- "arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "arrayref", -+ "arrayvec", -+ "constant_time_eq", - ] - - [[package]] - name = "byteorder" --version = "1.3.2" -+version = "1.4.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b" - - [[package]] - name = "bytes" - version = "0.4.12" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" - dependencies = [ -- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder", -+ "either", -+ "iovec", - ] - - [[package]] - name = "bzip2" - version = "0.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" - dependencies = [ -- "bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bzip2-sys", -+ "libc", - ] - - [[package]] - name = "bzip2-sys" --version = "0.1.7" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[[package]] --name = "c2-chacha" --version = "0.2.3" -+version = "0.1.10+1.0.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "17fa3d1ac1ca21c5c4e36a97f3c3eb25084576f6fc47bf0139c1123434216c6c" - dependencies = [ -- "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc", -+ "libc", -+ "pkg-config", - ] - - [[package]] - name = "cargo_metadata" - version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "700b3731fd7d357223d0000f4dbf1808401b694609035c3c411fbc0cd375c426" - dependencies = [ -- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", -+ "semver", -+ "serde", -+ "serde_derive", -+ "serde_json", - ] - - [[package]] - name = "cc" --version = "1.0.50" -+version = "1.0.67" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" - - [[package]] - name = "cfg-if" - version = "0.1.10" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - - [[package]] --name = "chrono" --version = "0.4.10" -+name = "cfg-if" -+version = "1.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", --] -+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - - [[package]] --name = "clap" --version = "2.33.0" -+name = "chrono" -+version = "0.4.19" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" - dependencies = [ -- "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "num-integer", -+ "num-traits", -+ "time", -+ "winapi 0.3.9", - ] - - [[package]] --name = "clicolors-control" --version = "0.2.0" -+name = "clap" -+version = "2.33.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" - dependencies = [ -- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ansi_term", -+ "atty", -+ "bitflags", -+ "strsim", -+ "textwrap", -+ "unicode-width", -+ "vec_map", - ] - - [[package]] - name = "clicolors-control" --version = "1.0.1" -+version = "0.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1f84dec9bc083ce2503908cd305af98bd363da6f54bf8d4bf0ac14ee749ad5d1" - dependencies = [ -- "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "kernel32-sys", -+ "lazy_static 0.2.11", -+ "libc", -+ "winapi 0.3.9", - ] - - [[package]] - name = "cloudabi" - version = "0.0.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags", - ] - - [[package]] - name = "console" - version = "0.6.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ecd48adf136733979b49e15bc3b4c43cc0d3c85ece7bd08e6daa414c6fcb13e6" - dependencies = [ -- "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", -- "clicolors-control 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "atty", -+ "clicolors-control", -+ "lazy_static 1.4.0", -+ "libc", -+ "parking_lot 0.11.1", -+ "regex", -+ "termios", -+ "unicode-width", -+ "winapi 0.3.9", - ] - - [[package]] - name = "console" --version = "0.9.2" -+version = "0.14.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7cc80946b3480f421c2f17ed1cb841753a371c7c5104f51d507e13f532c856aa" - dependencies = [ -- "clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "encode_unicode", -+ "lazy_static 1.4.0", -+ "libc", -+ "regex", -+ "terminal_size", -+ "unicode-width", -+ "winapi 0.3.9", - ] - - [[package]] - name = "constant_time_eq" - version = "0.1.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - - [[package]] - name = "cookie" - version = "0.12.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5" - dependencies = [ -- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "time", -+ "url 1.7.2", - ] - - [[package]] - name = "cookie_store" - version = "0.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c" - dependencies = [ -- "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", -- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -- "try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cookie", -+ "failure", -+ "idna 0.1.5", -+ "log", -+ "publicsuffix", -+ "serde", -+ "serde_json", -+ "time", -+ "try_from", -+ "url 1.7.2", - ] - - [[package]] - name = "core-foundation" --version = "0.6.4" -+version = "0.9.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" - dependencies = [ -- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "core-foundation-sys", -+ "libc", - ] - - [[package]] - name = "core-foundation-sys" --version = "0.6.2" -+version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" - - [[package]] - name = "crc32fast" --version = "1.2.0" -+version = "1.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 1.0.0", - ] - - [[package]] - name = "crossbeam-deque" --version = "0.7.2" -+version = "0.7.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" - dependencies = [ -- "crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-epoch", -+ "crossbeam-utils 0.7.2", -+ "maybe-uninit", - ] - - [[package]] - name = "crossbeam-epoch" --version = "0.8.0" -+version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" - dependencies = [ -- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.1", -+ "cfg-if 0.1.10", -+ "crossbeam-utils 0.7.2", -+ "lazy_static 1.4.0", -+ "maybe-uninit", -+ "memoffset", -+ "scopeguard 1.1.0", - ] - - [[package]] - name = "crossbeam-queue" --version = "0.1.2" -+version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" - dependencies = [ -- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10", -+ "crossbeam-utils 0.7.2", -+ "maybe-uninit", - ] - - [[package]] - name = "crossbeam-utils" --version = "0.6.6" -+version = "0.7.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.1", -+ "cfg-if 0.1.10", -+ "lazy_static 1.4.0", - ] - - [[package]] - name = "crossbeam-utils" --version = "0.7.0" -+version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bae8f328835f8f5a6ceb6a7842a7f2d0c03692adb5c889347235d59194731fe3" - dependencies = [ -- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.1", -+ "cfg-if 1.0.0", -+ "lazy_static 1.4.0", -+ "loom", - ] - - [[package]] - name = "curl" --version = "0.4.25" -+version = "0.4.34" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e268162af1a5fe89917ae25ba3b0a77c8da752bdc58e7dbb4f15b91fbd33756e" - dependencies = [ -- "curl-sys 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)", -- "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -- "socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "curl-sys", -+ "libc", -+ "openssl-probe", -+ "openssl-sys", -+ "schannel", -+ "socket2", -+ "winapi 0.3.9", - ] - - [[package]] - name = "curl-sys" --version = "0.4.25" -+version = "0.4.40+curl-7.75.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2ffafc1c35958318bd7fdd0582995ce4c72f4f461a8e70499ccee83a619fd562" - dependencies = [ -- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", -- "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc", -+ "libc", -+ "libz-sys", -+ "openssl-sys", -+ "pkg-config", -+ "vcpkg", -+ "winapi 0.3.9", - ] - - [[package]] - name = "dialoguer" - version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1ad1c29a0368928e78c551354dbff79f103a962ad820519724ef0d74f1c62fa9" - dependencies = [ -- "console 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "console 0.14.0", -+ "lazy_static 1.4.0", -+ "tempfile 2.2.0", - ] - - [[package]] - name = "difference" - version = "2.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" - - [[package]] - name = "dirs" - version = "1.0.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" - dependencies = [ -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "redox_users", -+ "winapi 0.3.9", - ] - - [[package]] - name = "dtoa" --version = "0.4.5" -+version = "0.4.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "88d7ed2934d741c6b37e33e3832298e8850b53fd2d2bea03873375596c7cea4e" - - [[package]] - name = "either" --version = "1.5.3" -+version = "1.6.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - - [[package]] - name = "encode_unicode" - version = "0.3.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - - [[package]] - name = "encoding_rs" --version = "0.8.22" -+version = "0.8.28" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 1.0.0", - ] - - [[package]] - name = "env_logger" - version = "0.5.13" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38" - dependencies = [ -- "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", -- "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "atty", -+ "humantime", -+ "log", -+ "termcolor", - ] - - [[package]] - name = "error-chain" --version = "0.12.1" -+version = "0.12.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" - dependencies = [ -- "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "version_check", - ] - - [[package]] - name = "escargot" - version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ceb9adbf9874d5d028b5e4c5739d22b71988252b25c9c98fe7cf9738bee84597" - dependencies = [ -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0", -+ "log", -+ "serde", -+ "serde_json", - ] - - [[package]] - name = "failure" --version = "0.1.6" -+version = "0.1.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" - dependencies = [ -- "backtrace 0.3.43 (registry+https://github.com/rust-lang/crates.io-index)", -- "failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "backtrace", -+ "failure_derive", - ] - - [[package]] - name = "failure_derive" --version = "0.1.6" -+version = "0.1.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" - dependencies = [ -- "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", -- "synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.24", -+ "quote 1.0.9", -+ "syn 1.0.60", -+ "synstructure", - ] - - [[package]] - name = "filetime" --version = "0.2.8" -+version = "0.2.14" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 1.0.0", -+ "libc", -+ "redox_syscall 0.2.5", -+ "winapi 0.3.9", - ] - - [[package]] - name = "flate2" --version = "1.0.13" -+version = "1.0.14" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2cfff41391129e0a856d6d822600b8d71179d46879e310417eb9c762eb178b42" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10", -+ "crc32fast", -+ "libc", -+ "miniz_oxide 0.3.7", - ] - - [[package]] - name = "float-cmp" --version = "0.5.3" -+version = "0.8.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" - dependencies = [ -- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits", - ] - - [[package]] - name = "fnv" --version = "1.0.6" -+version = "1.0.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - - [[package]] - name = "foreign-types" - version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" - dependencies = [ -- "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "foreign-types-shared", - ] - - [[package]] - name = "foreign-types-shared" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -+ -+[[package]] -+name = "form_urlencoded" -+version = "1.0.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -+dependencies = [ -+ "matches", -+ "percent-encoding 2.1.0", -+] - - [[package]] - name = "fuchsia-cprng" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - - [[package]] - name = "fuchsia-zircon" - version = "0.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags", -+ "fuchsia-zircon-sys", - ] - - [[package]] - name = "fuchsia-zircon-sys" - version = "0.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - - [[package]] - name = "futures" --version = "0.1.29" -+version = "0.1.30" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4c7e4c2612746b0df8fed4ce0c69156021b704c9aefa360311c04e6e9e002eed" - - [[package]] - name = "futures-cpupool" - version = "0.1.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" - dependencies = [ -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures", -+ "num_cpus", -+] -+ -+[[package]] -+name = "generator" -+version = "0.6.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a9fed24fd1e18827652b4d55652899a1e9da8e54d91624dc3437a5bc3a9f9a9c" -+dependencies = [ -+ "cc", -+ "libc", -+ "log", -+ "rustversion", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "getrandom" -+version = "0.1.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -+dependencies = [ -+ "cfg-if 1.0.0", -+ "libc", -+ "wasi 0.9.0+wasi-snapshot-preview1", - ] - - [[package]] - name = "getrandom" --version = "0.1.14" -+version = "0.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 1.0.0", -+ "libc", -+ "wasi 0.10.2+wasi-snapshot-preview1", - ] - -+[[package]] -+name = "gimli" -+version = "0.23.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" -+ - [[package]] - name = "glob" - version = "0.2.11" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" - - [[package]] - name = "h2" - version = "0.1.26" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" - dependencies = [ -- "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", -- "indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "byteorder", -+ "bytes", -+ "fnv", -+ "futures", -+ "http", -+ "indexmap", -+ "log", -+ "slab", -+ "string", -+ "tokio-io", - ] - -+[[package]] -+name = "hashbrown" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" -+ - [[package]] - name = "heck" --version = "0.3.1" -+version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" - dependencies = [ -- "unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-segmentation", - ] - - [[package]] - name = "hermit-abi" --version = "0.1.6" -+version = "0.1.18" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" - dependencies = [ -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", - ] - - [[package]] - name = "hex" - version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" - - [[package]] - name = "http" - version = "0.1.21" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes", -+ "fnv", -+ "itoa", - ] - - [[package]] - name = "http-body" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes", -+ "futures", -+ "http", -+ "tokio-buf", - ] - - [[package]] - name = "httparse" --version = "1.3.4" -+version = "1.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "615caabe2c3160b313d52ccc905335f4ed5f10881dd63dc5699d47e90be85691" - - [[package]] - name = "human-panic" --version = "1.0.1" -+version = "1.0.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "39f357a500abcbd7c5f967c1d45c8838585b36743823b9d43488f24850534e36" - dependencies = [ -- "backtrace 0.3.43 (registry+https://github.com/rust-lang/crates.io-index)", -- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "os_type 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -- "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "backtrace", -+ "os_type", -+ "serde", -+ "serde_derive", -+ "termcolor", -+ "toml 0.5.8", -+ "uuid 0.8.2", - ] - - [[package]] - name = "humantime" - version = "1.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" - dependencies = [ -- "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quick-error", - ] - - [[package]] - name = "hyper" --version = "0.12.35" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)", -- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", -- "http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+version = "0.12.36" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c843caf6296fc1f93444735205af9ed4e109a539005abb2564ae1d6fad34c52" -+dependencies = [ -+ "bytes", -+ "futures", -+ "futures-cpupool", -+ "h2", -+ "http", -+ "http-body", -+ "httparse", -+ "iovec", -+ "itoa", -+ "log", -+ "net2", -+ "rustc_version", -+ "time", -+ "tokio", -+ "tokio-buf", -+ "tokio-executor", -+ "tokio-io", -+ "tokio-reactor", -+ "tokio-tcp", -+ "tokio-threadpool", -+ "tokio-timer", -+ "want", - ] - - [[package]] - name = "hyper-tls" - version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)", -- "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes", -+ "futures", -+ "hyper", -+ "native-tls", -+ "tokio-io", - ] - - [[package]] - name = "idna" - version = "0.1.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" - dependencies = [ -- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "matches", -+ "unicode-bidi", -+ "unicode-normalization", - ] - - [[package]] - name = "idna" --version = "0.2.0" -+version = "0.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21" - dependencies = [ -- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "matches", -+ "unicode-bidi", -+ "unicode-normalization", - ] - - [[package]] - name = "indexmap" --version = "1.3.1" -+version = "1.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b" -+dependencies = [ -+ "autocfg 1.0.1", -+ "hashbrown", -+] -+ -+[[package]] -+name = "instant" -+version = "0.1.9" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" - dependencies = [ -- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 1.0.0", - ] - - [[package]] - name = "iovec" - version = "0.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" - dependencies = [ -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", - ] - - [[package]] - name = "is_executable" - version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "302d553b8abc8187beb7d663e34c065ac4570b273bc9511a50e940e99409c577" - dependencies = [ -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.9", - ] - - [[package]] - name = "itoa" --version = "0.4.5" -+version = "0.4.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" - - [[package]] - name = "kernel32-sys" - version = "0.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" - dependencies = [ -- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.2.8", -+ "winapi-build", - ] - - [[package]] - name = "lazy_static" - version = "0.2.11" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" - - [[package]] - name = "lazy_static" - version = "1.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - - [[package]] - name = "libc" --version = "0.2.66" -+version = "0.2.86" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" - - [[package]] - name = "libz-sys" --version = "1.0.25" -+version = "1.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "602113192b08db8f38796c4e85c39e960c145965140e918018bcde1952429655" - dependencies = [ -- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc", -+ "libc", -+ "pkg-config", -+ "vcpkg", - ] - - [[package]] - name = "lock_api" - version = "0.1.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" - dependencies = [ -- "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "owning_ref", -+ "scopeguard 0.3.3", - ] - - [[package]] - name = "lock_api" --version = "0.3.3" -+version = "0.3.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" - dependencies = [ -- "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "scopeguard 1.1.0", -+] -+ -+[[package]] -+name = "lock_api" -+version = "0.4.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312" -+dependencies = [ -+ "scopeguard 1.1.0", - ] - - [[package]] - name = "log" --version = "0.4.8" -+version = "0.4.14" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -+dependencies = [ -+ "cfg-if 1.0.0", -+] -+ -+[[package]] -+name = "loom" -+version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d44c73b4636e497b4917eb21c33539efa3816741a2d3ff26c6316f1b529481a4" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 1.0.0", -+ "generator", -+ "scoped-tls", - ] - - [[package]] - name = "matches" - version = "0.1.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - - [[package]] - name = "maybe-uninit" - version = "2.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - - [[package]] - name = "memchr" --version = "2.3.0" -+version = "2.3.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" - - [[package]] - name = "memoffset" --version = "0.5.3" -+version = "0.5.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" - dependencies = [ -- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.1", - ] - - [[package]] - name = "mime" - version = "0.3.16" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - - [[package]] - name = "mime_guess" --version = "2.0.1" -+version = "2.0.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212" - dependencies = [ -- "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mime", -+ "unicase", - ] - - [[package]] - name = "miniz_oxide" --version = "0.3.5" -+version = "0.3.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" - dependencies = [ -- "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "adler32", -+] -+ -+[[package]] -+name = "miniz_oxide" -+version = "0.4.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" -+dependencies = [ -+ "adler", -+ "autocfg 1.0.1", - ] - - [[package]] - name = "mio" --version = "0.6.21" -+version = "0.6.23" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", -- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10", -+ "fuchsia-zircon", -+ "fuchsia-zircon-sys", -+ "iovec", -+ "kernel32-sys", -+ "libc", -+ "log", -+ "miow", -+ "net2", -+ "slab", -+ "winapi 0.2.8", - ] - - [[package]] - name = "miow" --version = "0.2.1" -+version = "0.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" - dependencies = [ -- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "kernel32-sys", -+ "net2", -+ "winapi 0.2.8", -+ "ws2_32-sys", - ] - - [[package]] - name = "native-tls" --version = "0.2.3" -+version = "0.2.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4" - dependencies = [ -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "openssl 0.10.27 (registry+https://github.com/rust-lang/crates.io-index)", -- "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)", -- "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -- "security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0", -+ "libc", -+ "log", -+ "openssl", -+ "openssl-probe", -+ "openssl-sys", -+ "schannel", -+ "security-framework", -+ "security-framework-sys", -+ "tempfile 3.2.0", - ] - - [[package]] - name = "net2" --version = "0.2.33" -+version = "0.2.37" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10", -+ "libc", -+ "winapi 0.3.9", - ] - - [[package]] - name = "normalize-line-endings" --version = "0.2.2" -+version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - - [[package]] - name = "num-integer" --version = "0.1.42" -+version = "0.1.44" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" - dependencies = [ -- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.1", -+ "num-traits", - ] - - [[package]] - name = "num-traits" --version = "0.2.11" -+version = "0.2.14" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" - dependencies = [ -- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.1", - ] - - [[package]] - name = "num_cpus" --version = "1.12.0" -+version = "1.13.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" - dependencies = [ -- "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hermit-abi", -+ "libc", - ] - -+[[package]] -+name = "object" -+version = "0.23.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" -+ -+[[package]] -+name = "once_cell" -+version = "1.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4ad167a2f54e832b82dbe003a046280dceffe5227b5f79e08e363a29638cfddd" -+ - [[package]] - name = "openssl" --version = "0.10.27" -+version = "0.10.32" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "038d43985d1ddca7a9900630d8cd031b56e4794eecc2e9ea39dd17aa04399a70" - dependencies = [ -- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags", -+ "cfg-if 1.0.0", -+ "foreign-types", -+ "lazy_static 1.4.0", -+ "libc", -+ "openssl-sys", - ] - - [[package]] - name = "openssl-probe" - version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" - - [[package]] - name = "openssl-src" --version = "111.6.1+1.1.1d" -+version = "111.14.0+1.1.1j" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "055b569b5bd7e5462a1700f595c7c7d487691d73b5ce064176af7f9f0cbb80a9" - dependencies = [ -- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc", - ] - - [[package]] - name = "openssl-sys" --version = "0.9.54" -+version = "0.9.60" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "921fc71883267538946025deffb622905ecad223c28efbfdef9bb59a0175f3e6" - dependencies = [ -- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "openssl-src 111.6.1+1.1.1d (registry+https://github.com/rust-lang/crates.io-index)", -- "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 1.0.1", -+ "cc", -+ "libc", -+ "openssl-src", -+ "pkg-config", -+ "vcpkg", - ] - - [[package]] - name = "os_type" - version = "2.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7edc011af0ae98b7f88cf7e4a83b70a54a75d2b8cb013d6efd02e5956207e9eb" - dependencies = [ -- "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex", - ] - - [[package]] - name = "owning_ref" --version = "0.4.0" -+version = "0.4.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce" - dependencies = [ -- "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "stable_deref_trait", - ] - - [[package]] - name = "parking_lot" - version = "0.6.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5" - dependencies = [ -- "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lock_api 0.1.5", -+ "parking_lot_core 0.3.1", - ] - - [[package]] - name = "parking_lot" - version = "0.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" - dependencies = [ -- "lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lock_api 0.3.4", -+ "parking_lot_core 0.6.2", -+ "rustc_version", - ] - - [[package]] - name = "parking_lot" --version = "0.10.0" -+version = "0.11.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" - dependencies = [ -- "lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "instant", -+ "lock_api 0.4.2", -+ "parking_lot_core 0.8.3", - ] - - [[package]] - name = "parking_lot_core" - version = "0.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c" - dependencies = [ -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "rand 0.5.6", -+ "rustc_version", -+ "smallvec 0.6.14", -+ "winapi 0.3.9", - ] - - [[package]] - name = "parking_lot_core" - version = "0.6.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10", -+ "cloudabi", -+ "libc", -+ "redox_syscall 0.1.57", -+ "rustc_version", -+ "smallvec 0.6.14", -+ "winapi 0.3.9", - ] - - [[package]] - name = "parking_lot_core" --version = "0.7.0" -+version = "0.8.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -- "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 1.0.0", -+ "instant", -+ "libc", -+ "redox_syscall 0.2.5", -+ "smallvec 1.6.1", -+ "winapi 0.3.9", - ] - - [[package]] - name = "percent-encoding" - version = "1.0.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - - [[package]] - name = "percent-encoding" - version = "2.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - - [[package]] - name = "pkg-config" --version = "0.3.17" --source = "registry+https://github.com/rust-lang/crates.io-index" -- --[[package]] --name = "podio" --version = "0.1.6" -+version = "0.3.19" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" - - [[package]] - name = "ppv-lite86" --version = "0.2.6" -+version = "0.2.10" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" - - [[package]] - name = "predicates" --version = "1.0.2" -+version = "1.0.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eeb433456c1a57cc93554dea3ce40b4c19c4057e41c55d4a0f3d84ea71c325aa" - dependencies = [ -- "difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "float-cmp 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "normalize-line-endings 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "difference", -+ "float-cmp", -+ "normalize-line-endings", -+ "predicates-core", -+ "regex", - ] - - [[package]] - name = "predicates-core" --version = "1.0.0" -+version = "1.0.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451" - - [[package]] - name = "predicates-tree" --version = "1.0.0" -+version = "1.0.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "15f553275e5721409451eb85e15fd9a860a6e5ab4496eb215987502b5f5391f2" - dependencies = [ -- "predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "predicates-core", -+ "treeline", - ] - - [[package]] - name = "proc-macro2" - version = "0.4.30" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" - dependencies = [ -- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.1.0", - ] - - [[package]] - name = "proc-macro2" --version = "1.0.8" -+version = "1.0.24" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" - dependencies = [ -- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.2.1", - ] - - [[package]] - name = "publicsuffix" - version = "1.5.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b" - dependencies = [ -- "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "error-chain", -+ "idna 0.2.2", -+ "lazy_static 1.4.0", -+ "regex", -+ "url 2.2.1", - ] - - [[package]] - name = "quick-error" - version = "1.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - - [[package]] - name = "quote" - version = "0.6.13" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" - dependencies = [ -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 0.4.30", - ] - - [[package]] - name = "quote" --version = "1.0.2" -+version = "1.0.9" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" - dependencies = [ -- "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.24", - ] - - [[package]] - name = "rand" - version = "0.3.23" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" - dependencies = [ -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "rand 0.4.6", - ] - - [[package]] - name = "rand" - version = "0.4.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" - dependencies = [ -- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "fuchsia-cprng", -+ "libc", -+ "rand_core 0.3.1", -+ "rdrand", -+ "winapi 0.3.9", - ] - - [[package]] - name = "rand" - version = "0.5.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" - dependencies = [ -- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cloudabi", -+ "fuchsia-cprng", -+ "libc", -+ "rand_core 0.3.1", -+ "winapi 0.3.9", - ] - - [[package]] - name = "rand" - version = "0.6.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" - dependencies = [ -- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 0.1.7", -+ "libc", -+ "rand_chacha 0.1.1", -+ "rand_core 0.4.2", -+ "rand_hc 0.1.0", -+ "rand_isaac", -+ "rand_jitter", -+ "rand_os", -+ "rand_pcg", -+ "rand_xorshift", -+ "winapi 0.3.9", - ] - - [[package]] - name = "rand" --version = "0.7.3" -+version = "0.8.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" - dependencies = [ -- "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "rand_chacha 0.3.0", -+ "rand_core 0.6.2", -+ "rand_hc 0.3.0", - ] - - [[package]] - name = "rand_chacha" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" - dependencies = [ -- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 0.1.7", -+ "rand_core 0.3.1", - ] - - [[package]] - name = "rand_chacha" --version = "0.2.1" -+version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" - dependencies = [ -- "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ppv-lite86", -+ "rand_core 0.6.2", - ] - - [[package]] - name = "rand_core" - version = "0.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" - dependencies = [ -- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.2", - ] - - [[package]] - name = "rand_core" - version = "0.4.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - - [[package]] - name = "rand_core" --version = "0.5.1" -+version = "0.6.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" - dependencies = [ -- "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "getrandom 0.2.2", - ] - - [[package]] - name = "rand_hc" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" - dependencies = [ -- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.3.1", - ] - - [[package]] - name = "rand_hc" --version = "0.2.0" -+version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" - dependencies = [ -- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.6.2", - ] - - [[package]] - name = "rand_isaac" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" - dependencies = [ -- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.3.1", - ] - - [[package]] - name = "rand_jitter" - version = "0.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" - dependencies = [ -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "rand_core 0.4.2", -+ "winapi 0.3.9", - ] - - [[package]] - name = "rand_os" - version = "0.1.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" - dependencies = [ -- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cloudabi", -+ "fuchsia-cprng", -+ "libc", -+ "rand_core 0.4.2", -+ "rdrand", -+ "winapi 0.3.9", - ] - - [[package]] - name = "rand_pcg" - version = "0.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" - dependencies = [ -- "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "autocfg 0.1.7", -+ "rand_core 0.4.2", - ] - - [[package]] - name = "rand_xorshift" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" - dependencies = [ -- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.3.1", - ] - - [[package]] - name = "rdrand" - version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" - dependencies = [ -- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.3.1", - ] - - [[package]] - name = "redox_syscall" --version = "0.1.56" -+version = "0.1.57" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" -+ -+[[package]] -+name = "redox_syscall" -+version = "0.2.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" -+dependencies = [ -+ "bitflags", -+] - - [[package]] - name = "redox_users" --version = "0.3.4" -+version = "0.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" - dependencies = [ -- "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -- "rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "getrandom 0.1.16", -+ "redox_syscall 0.1.57", -+ "rust-argon2", - ] - - [[package]] - name = "regex" --version = "1.3.4" -+version = "1.4.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a" - dependencies = [ -- "aho-corasick 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)", -- "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)", -- "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "aho-corasick", -+ "memchr", -+ "regex-syntax", -+ "thread_local", - ] - - [[package]] - name = "regex-syntax" --version = "0.6.14" -+version = "0.6.22" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" - - [[package]] - name = "remove_dir_all" --version = "0.5.2" -+version = "0.5.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" - dependencies = [ -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.9", - ] - - [[package]] - name = "reqwest" - version = "0.9.24" - source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)", -- "hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)", -- "hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", -- "mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -+checksum = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab" -+dependencies = [ -+ "base64 0.10.1", -+ "bytes", -+ "cookie", -+ "cookie_store", -+ "encoding_rs", -+ "flate2", -+ "futures", -+ "http", -+ "hyper", -+ "hyper-tls", -+ "log", -+ "mime", -+ "mime_guess", -+ "native-tls", -+ "serde", -+ "serde_json", -+ "serde_urlencoded", -+ "time", -+ "tokio", -+ "tokio-executor", -+ "tokio-io", -+ "tokio-threadpool", -+ "tokio-timer", -+ "url 1.7.2", -+ "uuid 0.7.4", -+ "winreg", - ] - - [[package]] - name = "rust-argon2" --version = "0.7.0" -+version = "0.8.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" - dependencies = [ -- "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "base64 0.13.0", -+ "blake2b_simd", -+ "constant_time_eq", -+ "crossbeam-utils 0.8.2", - ] - - [[package]] - name = "rustc-demangle" --version = "0.1.16" -+version = "0.1.18" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" - - [[package]] - name = "rustc_version" - version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" - dependencies = [ -- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "semver", - ] - -+[[package]] -+name = "rustversion" -+version = "1.0.4" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd" -+ - [[package]] - name = "ryu" --version = "1.0.2" -+version = "1.0.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - - [[package]] - name = "same-file" - version = "1.0.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" - dependencies = [ -- "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-util", - ] - - [[package]] - name = "schannel" --version = "0.1.16" -+version = "0.1.19" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" - dependencies = [ -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0", -+ "winapi 0.3.9", - ] - -+[[package]] -+name = "scoped-tls" -+version = "1.0.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" -+ - [[package]] - name = "scopeguard" - version = "0.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" - - [[package]] - name = "scopeguard" --version = "1.0.0" -+version = "1.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - - [[package]] - name = "security-framework" --version = "0.3.4" -+version = "2.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c1759c2e3c8580017a484a7ac56d3abc5a6c1feadf88db2f3633f12ae4268c69" - dependencies = [ -- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags", -+ "core-foundation", -+ "core-foundation-sys", -+ "libc", -+ "security-framework-sys", - ] - - [[package]] - name = "security-framework-sys" --version = "0.3.3" -+version = "2.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f99b9d5e26d2a71633cc4f2ebae7cc9f874044e0c351a27e17892d76dce5678b" - dependencies = [ -- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "core-foundation-sys", -+ "libc", - ] - - [[package]] - name = "semver" - version = "0.9.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" - dependencies = [ -- "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "semver-parser", -+ "serde", - ] - - [[package]] - name = "semver-parser" - version = "0.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - - [[package]] - name = "serde" --version = "1.0.104" -+version = "1.0.123" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" - dependencies = [ -- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive", - ] - - [[package]] - name = "serde_derive" --version = "1.0.104" -+version = "1.0.123" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" - dependencies = [ -- "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.24", -+ "quote 1.0.9", -+ "syn 1.0.60", - ] - - [[package]] - name = "serde_ignored" - version = "0.0.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "190e9765dcedb56be63b6e0993a006c7e3b071a016a304736e4a315dc01fb142" - dependencies = [ -- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde", - ] - - [[package]] - name = "serde_json" --version = "1.0.45" -+version = "1.0.62" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486" - dependencies = [ -- "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "itoa", -+ "ryu", -+ "serde", - ] - - [[package]] - name = "serde_urlencoded" - version = "0.5.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" - dependencies = [ -- "dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -- "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "dtoa", -+ "itoa", -+ "serde", -+ "url 1.7.2", - ] - - [[package]] - name = "serial_test" - version = "0.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "50bfbc39343545618d97869d77f38ed43e48dd77432717dbc7ed39d797f3ecbe" - dependencies = [ -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0", - ] - - [[package]] - name = "serial_test_derive" - version = "0.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "89dd85be2e2ad75b041c9df2892ac078fa6e0b90024028b2b9fb4125b7530f01" - dependencies = [ -- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", -+ "quote 0.6.13", -+ "syn 0.15.44", - ] - - [[package]] - name = "siphasher" - version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" - - [[package]] - name = "slab" - version = "0.4.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" - - [[package]] - name = "smallvec" --version = "0.6.13" -+version = "0.6.14" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" - dependencies = [ -- "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "maybe-uninit", - ] - - [[package]] - name = "smallvec" --version = "1.2.0" -+version = "1.6.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" - - [[package]] - name = "socket2" --version = "0.3.11" -+version = "0.3.19" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 1.0.0", -+ "libc", -+ "winapi 0.3.9", - ] - - [[package]] - name = "stable_deref_trait" --version = "1.1.1" -+version = "1.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - - [[package]] - name = "string" - version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes", - ] - - [[package]] - name = "strsim" - version = "0.8.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - - [[package]] - name = "structopt" - version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7" - dependencies = [ -- "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "structopt-derive 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", -+ "clap", -+ "structopt-derive", - ] - - [[package]] - name = "structopt-derive" - version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107" - dependencies = [ -- "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)", -+ "heck", -+ "proc-macro2 0.4.30", -+ "quote 0.6.13", -+ "syn 0.15.44", - ] - - [[package]] - name = "syn" - version = "0.15.44" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" - dependencies = [ -- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 0.4.30", -+ "quote 0.6.13", -+ "unicode-xid 0.1.0", - ] - - [[package]] - name = "syn" --version = "1.0.14" -+version = "1.0.60" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" - dependencies = [ -- "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.24", -+ "quote 1.0.9", -+ "unicode-xid 0.2.1", - ] - - [[package]] - name = "synstructure" --version = "0.12.3" -+version = "0.12.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" - dependencies = [ -- "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "proc-macro2 1.0.24", -+ "quote 1.0.9", -+ "syn 1.0.60", -+ "unicode-xid 0.2.1", - ] - - [[package]] - name = "tar" --version = "0.4.26" -+version = "0.4.33" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c0bcfbd6a598361fda270d82469fff3d65089dc33e175c9a131f7b4cd395f228" - dependencies = [ -- "filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -- "xattr 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[[package]] --name = "tempdir" --version = "0.3.7" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "filetime", -+ "libc", -+ "xattr", - ] - - [[package]] - name = "tempfile" - version = "2.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "11ce2fe9db64b842314052e2421ac61a73ce41b898dc8e3750398b219c5fc1e0" - dependencies = [ -- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "kernel32-sys", -+ "libc", -+ "rand 0.3.23", -+ "redox_syscall 0.1.57", -+ "winapi 0.2.8", - ] - - [[package]] - name = "tempfile" --version = "3.1.0" -+version = "3.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -- "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 1.0.0", -+ "libc", -+ "rand 0.8.3", -+ "redox_syscall 0.2.5", -+ "remove_dir_all", -+ "winapi 0.3.9", - ] - - [[package]] - name = "termcolor" --version = "0.3.6" -+version = "1.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" - dependencies = [ -- "wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-util", - ] - - [[package]] --name = "termcolor" --version = "1.1.0" -+name = "terminal_size" -+version = "0.1.16" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "86ca8ced750734db02076f44132d802af0b33b09942331f4459dde8636fd2406" - dependencies = [ -- "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", -+ "winapi 0.3.9", - ] - - [[package]] - name = "termios" --version = "0.3.1" -+version = "0.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" - dependencies = [ -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", - ] - - [[package]] - name = "textwrap" - version = "0.11.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+dependencies = [ -+ "unicode-width", -+] -+ -+[[package]] -+name = "thiserror" -+version = "1.0.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" - dependencies = [ -- "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thiserror-impl", -+] -+ -+[[package]] -+name = "thiserror-impl" -+version = "1.0.24" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" -+dependencies = [ -+ "proc-macro2 1.0.24", -+ "quote 1.0.9", -+ "syn 1.0.60", - ] - - [[package]] - name = "thread_local" --version = "1.0.1" -+version = "1.1.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" - dependencies = [ -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "once_cell", - ] - - [[package]] - name = "time" --version = "0.1.42" -+version = "0.1.43" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -+dependencies = [ -+ "libc", -+ "winapi 0.3.9", -+] -+ -+[[package]] -+name = "tinyvec" -+version = "1.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023" - dependencies = [ -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tinyvec_macros", - ] - -+[[package]] -+name = "tinyvec_macros" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" -+ - [[package]] - name = "tokio" - version = "0.1.22" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", -- "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes", -+ "futures", -+ "mio", -+ "num_cpus", -+ "tokio-current-thread", -+ "tokio-executor", -+ "tokio-io", -+ "tokio-reactor", -+ "tokio-tcp", -+ "tokio-threadpool", -+ "tokio-timer", - ] - - [[package]] - name = "tokio-buf" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes", -+ "either", -+ "futures", - ] - - [[package]] - name = "tokio-current-thread" --version = "0.1.6" -+version = "0.1.7" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e" - dependencies = [ -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures", -+ "tokio-executor", - ] - - [[package]] - name = "tokio-executor" --version = "0.1.9" -+version = "0.1.10" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" - dependencies = [ -- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.2", -+ "futures", - ] - - [[package]] - name = "tokio-io" --version = "0.1.12" -+version = "0.1.13" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes", -+ "futures", -+ "log", - ] - - [[package]] - name = "tokio-reactor" --version = "0.1.11" -+version = "0.1.12" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" - dependencies = [ -- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", -- "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.2", -+ "futures", -+ "lazy_static 1.4.0", -+ "log", -+ "mio", -+ "num_cpus", -+ "parking_lot 0.9.0", -+ "slab", -+ "tokio-executor", -+ "tokio-io", -+ "tokio-sync", - ] - - [[package]] - name = "tokio-sync" --version = "0.1.7" -+version = "0.1.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" - dependencies = [ -- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -+ "fnv", -+ "futures", - ] - - [[package]] - name = "tokio-tcp" --version = "0.1.3" -+version = "0.1.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" - dependencies = [ -- "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bytes", -+ "futures", -+ "iovec", -+ "mio", -+ "tokio-io", -+ "tokio-reactor", - ] - - [[package]] - name = "tokio-threadpool" --version = "0.1.17" -+version = "0.1.18" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" - dependencies = [ -- "crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-deque", -+ "crossbeam-queue", -+ "crossbeam-utils 0.7.2", -+ "futures", -+ "lazy_static 1.4.0", -+ "log", -+ "num_cpus", -+ "slab", -+ "tokio-executor", - ] - - [[package]] - name = "tokio-timer" --version = "0.2.12" -+version = "0.2.13" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" - dependencies = [ -- "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crossbeam-utils 0.7.2", -+ "futures", -+ "slab", -+ "tokio-executor", - ] - - [[package]] - name = "toml" - version = "0.4.10" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" - dependencies = [ -- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde", -+] -+ -+[[package]] -+name = "toml" -+version = "0.5.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" -+dependencies = [ -+ "serde", - ] - - [[package]] - name = "treeline" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" - - [[package]] - name = "try-lock" --version = "0.2.2" -+version = "0.2.3" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" - - [[package]] - name = "try_from" - version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10", - ] - - [[package]] - name = "unicase" - version = "2.6.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" - dependencies = [ -- "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "version_check", - ] - - [[package]] - name = "unicode-bidi" - version = "0.3.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" - dependencies = [ -- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "matches", - ] - - [[package]] - name = "unicode-normalization" --version = "0.1.12" -+version = "0.1.17" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" - dependencies = [ -- "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tinyvec", - ] - - [[package]] - name = "unicode-segmentation" --version = "1.6.0" -+version = "1.7.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" - - [[package]] - name = "unicode-width" --version = "0.1.7" -+version = "0.1.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - - [[package]] - name = "unicode-xid" - version = "0.1.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" - - [[package]] - name = "unicode-xid" --version = "0.2.0" -+version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" - - [[package]] - name = "url" - version = "1.7.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" - dependencies = [ -- "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "idna 0.1.5", -+ "matches", -+ "percent-encoding 1.0.1", - ] - - [[package]] - name = "url" --version = "2.1.1" -+version = "2.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b" - dependencies = [ -- "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "form_urlencoded", -+ "idna 0.2.2", -+ "matches", -+ "percent-encoding 2.1.0", - ] - - [[package]] - name = "uuid" --version = "0.6.5" -+version = "0.7.4" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" - dependencies = [ -- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.6.5", - ] - - [[package]] - name = "uuid" --version = "0.7.4" -+version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" - dependencies = [ -- "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "getrandom 0.2.2", - ] - - [[package]] - name = "vcpkg" --version = "0.2.8" -+version = "0.2.11" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb" - - [[package]] - name = "vec_map" --version = "0.8.1" --source = "registry+https://github.com/rust-lang/crates.io-index" -- --[[package]] --name = "version_check" --version = "0.1.5" -+version = "0.8.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - - [[package]] - name = "version_check" --version = "0.9.1" -+version = "0.9.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" - - [[package]] - name = "walkdir" - version = "2.3.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" - dependencies = [ -- "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "same-file", -+ "winapi 0.3.9", -+ "winapi-util", - ] - - [[package]] - name = "want" - version = "0.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" - dependencies = [ -- "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "futures", -+ "log", -+ "try-lock", - ] - - [[package]] - name = "wasi" - version = "0.9.0+wasi-snapshot-preview1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -+ -+[[package]] -+name = "wasi" -+version = "0.10.2+wasi-snapshot-preview1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - - [[package]] - name = "wasm-pack" - version = "0.9.1" - dependencies = [ -- "assert_cmd 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", -- "binary-install 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "cargo_metadata 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "console 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "curl 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)", -- "dialoguer 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "openssl 0.10.27 (registry+https://github.com/rust-lang/crates.io-index)", -- "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", -- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde_ignored 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)", -- "serial_test 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "serial_test_derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)", -- "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", -- "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "assert_cmd", -+ "atty", -+ "binary-install", -+ "cargo_metadata", -+ "chrono", -+ "console 0.6.2", -+ "curl", -+ "dialoguer", -+ "dirs", -+ "env_logger", -+ "failure", -+ "glob", -+ "human-panic", -+ "lazy_static 1.4.0", -+ "log", -+ "openssl", -+ "parking_lot 0.6.4", -+ "predicates", -+ "reqwest", -+ "semver", -+ "serde", -+ "serde_derive", -+ "serde_ignored", -+ "serde_json", -+ "serial_test", -+ "serial_test_derive", -+ "siphasher", -+ "strsim", -+ "structopt", -+ "tempfile 3.2.0", -+ "toml 0.4.10", -+ "walkdir", -+ "which", - ] - - [[package]] - name = "which" - version = "2.0.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164" - dependencies = [ -- "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "failure", -+ "libc", - ] - - [[package]] - name = "winapi" - version = "0.2.8" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - - [[package]] - name = "winapi" --version = "0.3.8" -+version = "0.3.9" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" - dependencies = [ -- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-i686-pc-windows-gnu", -+ "winapi-x86_64-pc-windows-gnu", - ] - - [[package]] - name = "winapi-build" - version = "0.1.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - - [[package]] - name = "winapi-i686-pc-windows-gnu" - version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - - [[package]] - name = "winapi-util" --version = "0.1.3" -+version = "0.1.5" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" - dependencies = [ -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.9", - ] - - [[package]] - name = "winapi-x86_64-pc-windows-gnu" - version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -- --[[package]] --name = "wincolor" --version = "0.1.6" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", --] -+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - - [[package]] - name = "winreg" - version = "0.6.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" - dependencies = [ -- "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.9", - ] - - [[package]] - name = "ws2_32-sys" - version = "0.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" - dependencies = [ -- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.2.8", -+ "winapi-build", - ] - - [[package]] - name = "xattr" - version = "0.2.2" - source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" - dependencies = [ -- "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc", - ] - - [[package]] - name = "zip" --version = "0.5.4" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -- "podio 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[metadata] --"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" --"checksum aho-corasick 0.7.7 (registry+https://github.com/rust-lang/crates.io-index)" = "5f56c476256dc249def911d6f7580b5fc7e875895b5d7ee88f5d602208035744" --"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" --"checksum arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" --"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" --"checksum assert_cmd 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2dc477793bd82ec39799b6f6b3df64938532fdf2ab0d49ef817eac65856a5a1e" --"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" --"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" --"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" --"checksum backtrace 0.3.43 (registry+https://github.com/rust-lang/crates.io-index)" = "7f80256bc78f67e7df7e36d77366f636ed976895d91fe2ab9efa3973e8fe8c4f" --"checksum backtrace-sys 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6575f128516de27e3ce99689419835fce9643a9b215a14d2b5b685be018491" --"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" --"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" --"checksum binary-install 0.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7b5bc5f8c50dd6a80d0b303ddab79f42ddcb52fd43d68107ecf622c551fd4cd4" --"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" --"checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" --"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" --"checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" --"checksum bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" --"checksum bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6584aa36f5ad4c9247f5323b0a42f37802b37a836f0ad87084d7a33961abe25f" --"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" --"checksum cargo_metadata 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "700b3731fd7d357223d0000f4dbf1808401b694609035c3c411fbc0cd375c426" --"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" --"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" --"checksum chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "31850b4a4d6bae316f7a09e691c944c28299298837edc0a03f755618c23cbc01" --"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" --"checksum clicolors-control 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1f84dec9bc083ce2503908cd305af98bd363da6f54bf8d4bf0ac14ee749ad5d1" --"checksum clicolors-control 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e" --"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" --"checksum console 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd48adf136733979b49e15bc3b4c43cc0d3c85ece7bd08e6daa414c6fcb13e6" --"checksum console 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "45e0f3986890b3acbc782009e2629dfe2baa430ac091519ce3be26164a2ae6c0" --"checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" --"checksum cookie 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "888604f00b3db336d2af898ec3c1d5d0ddf5e6d462220f2ededc33a87ac4bbd5" --"checksum cookie_store 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46750b3f362965f197996c4448e4a0935e791bf7d6631bfce9ee0af3d24c919c" --"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" --"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" --"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" --"checksum crossbeam-deque 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3aa945d63861bfe624b55d153a39684da1e8c0bc8fba932f7ee3a3c16cea3ca" --"checksum crossbeam-epoch 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5064ebdbf05ce3cb95e45c8b086f72263f4166b29b97f6baff7ef7fe047b55ac" --"checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" --"checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" --"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" --"checksum curl 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "06aa71e9208a54def20792d877bc663d6aae0732b9852e612c4a933177c31283" --"checksum curl-sys 0.4.25 (registry+https://github.com/rust-lang/crates.io-index)" = "0c38ca47d60b86d0cc9d42caa90a0885669c2abc9791f871c81f58cdf39e979b" --"checksum dialoguer 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1ad1c29a0368928e78c551354dbff79f103a962ad820519724ef0d74f1c62fa9" --"checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198" --"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901" --"checksum dtoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3" --"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" --"checksum encode_unicode 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" --"checksum encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8d03faa7fe0c1431609dfad7bbe827af30f82e1e2ae6f7ee4fca6bd764bc28" --"checksum env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)" = "15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38" --"checksum error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ab49e9dcb602294bc42f9a7dfc9bc6e936fca4418ea300dbfb84fe16de0b7d9" --"checksum escargot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ceb9adbf9874d5d028b5e4c5739d22b71988252b25c9c98fe7cf9738bee84597" --"checksum failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f8273f13c977665c5db7eb2b99ae520952fe5ac831ae4cd09d80c4c7042b5ed9" --"checksum failure_derive 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08" --"checksum filetime 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d" --"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f" --"checksum float-cmp 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75224bec9bfe1a65e2d34132933f2de7fe79900c96a0174307554244ece8150e" --"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" --"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" --"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" --"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" --"checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" --"checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" --"checksum futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef" --"checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" --"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" --"checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb" --"checksum h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462" --"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" --"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" --"checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" --"checksum http 0.1.21 (registry+https://github.com/rust-lang/crates.io-index)" = "d6ccf5ede3a895d8856620237b2f02972c1bbc78d2965ad7fe8838d4a0ed41f0" --"checksum http-body 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" --"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" --"checksum human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "21638c5955a6daf3ecc42cae702335fc37a72a4abcc6959ce457b31a7d43bbdd" --"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" --"checksum hyper 0.12.35 (registry+https://github.com/rust-lang/crates.io-index)" = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6" --"checksum hyper-tls 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3a800d6aa50af4b5850b2b0f659625ce9504df908e9733b635720483be26174f" --"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" --"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" --"checksum indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b54058f0a6ff80b6803da8faf8997cde53872b38f4023728f6830b06cd3c0dc" --"checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" --"checksum is_executable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "302d553b8abc8187beb7d663e34c065ac4570b273bc9511a50e940e99409c577" --"checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" --"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" --"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" --"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" --"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" --"checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" --"checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" --"checksum lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b" --"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" --"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" --"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" --"checksum memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223" --"checksum memoffset 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "75189eb85871ea5c2e2c15abbdd541185f63b408415e5051f5cac122d8c774b9" --"checksum mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" --"checksum mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1a0ed03949aef72dbdf3116a383d7b38b4768e6f960528cd6a6044aa9ed68599" --"checksum miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625" --"checksum mio 0.6.21 (registry+https://github.com/rust-lang/crates.io-index)" = "302dec22bcf6bae6dfb69c647187f4b4d0fb6f535521f7bc022430ce8e12008f" --"checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" --"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" --"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" --"checksum normalize-line-endings 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2e0a1a39eab95caf4f5556da9289b9e68f0aafac901b2ce80daaf020d3b733a8" --"checksum num-integer 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "3f6ea62e9d81a77cd3ee9a2a5b9b609447857f3d358704331e4ef39eb247fcba" --"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" --"checksum num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6" --"checksum openssl 0.10.27 (registry+https://github.com/rust-lang/crates.io-index)" = "e176a45fedd4c990e26580847a525e39e16ec32ac78957dbf62ded31b3abfd6f" --"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" --"checksum openssl-src 111.6.1+1.1.1d (registry+https://github.com/rust-lang/crates.io-index)" = "c91b04cb43c1a8a90e934e0cd612e2a5715d976d2d6cff4490278a0cddf35005" --"checksum openssl-sys 0.9.54 (registry+https://github.com/rust-lang/crates.io-index)" = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986" --"checksum os_type 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7edc011af0ae98b7f88cf7e4a83b70a54a75d2b8cb013d6efd02e5956207e9eb" --"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" --"checksum parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc" --"checksum parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5" --"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" --"checksum parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c" --"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" --"checksum parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7582838484df45743c8434fbff785e8edf260c28748353d44bc0da32e0ceabf1" --"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" --"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" --"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" --"checksum podio 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "780fb4b6698bbf9cf2444ea5d22411cef2953f0824b98f33cf454ec5615645bd" --"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" --"checksum predicates 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a9bfe52247e5cc9b2f943682a85a5549fb9662245caf094504e69a2f03fe64d4" --"checksum predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178" --"checksum predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124" --"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" --"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548" --"checksum publicsuffix 1.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3bbaa49075179162b49acac1c6aa45fb4dafb5f13cf6794276d77bc7fd95757b" --"checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" --"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" --"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" --"checksum rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" --"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" --"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" --"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" --"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" --"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" --"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" --"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" --"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" --"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" --"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" --"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" --"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" --"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" --"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" --"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" --"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" --"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" --"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" --"checksum redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" --"checksum regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8" --"checksum regex-syntax 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)" = "b28dfe3fe9badec5dbf0a79a9cccad2cfc2ab5484bdb3e44cbd1ae8b3ba2be06" --"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" --"checksum reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "f88643aea3c1343c804950d7bf983bd2067f5ab59db6d613a08e05572f2714ab" --"checksum rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" --"checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" --"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" --"checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" --"checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" --"checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" --"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" --"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" --"checksum security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df" --"checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895" --"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" --"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" --"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" --"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" --"checksum serde_ignored 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "190e9765dcedb56be63b6e0993a006c7e3b071a016a304736e4a315dc01fb142" --"checksum serde_json 1.0.45 (registry+https://github.com/rust-lang/crates.io-index)" = "eab8f15f15d6c41a154c1b128a22f2dfabe350ef53c40953d84e36155c91192b" --"checksum serde_urlencoded 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "642dd69105886af2efd227f75a520ec9b44a820d65bc133a9131f7d229fd165a" --"checksum serial_test 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50bfbc39343545618d97869d77f38ed43e48dd77432717dbc7ed39d797f3ecbe" --"checksum serial_test_derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "89dd85be2e2ad75b041c9df2892ac078fa6e0b90024028b2b9fb4125b7530f01" --"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" --"checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" --"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" --"checksum smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc" --"checksum socket2 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" --"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" --"checksum string 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d24114bfcceb867ca7f71a0d3fe45d45619ec47a6fbfa98cb14e14250bfa5d6d" --"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" --"checksum structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7" --"checksum structopt-derive 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107" --"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" --"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5" --"checksum synstructure 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "67656ea1dc1b41b1451851562ea232ec2e5a80242139f7e679ceccfb5d61f545" --"checksum tar 0.4.26 (registry+https://github.com/rust-lang/crates.io-index)" = "b3196bfbffbba3e57481b6ea32249fbaf590396a52505a2615adbb79d9d826d3" --"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" --"checksum tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "11ce2fe9db64b842314052e2421ac61a73ce41b898dc8e3750398b219c5fc1e0" --"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" --"checksum termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" --"checksum termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" --"checksum termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625" --"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" --"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" --"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" --"checksum tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" --"checksum tokio-buf 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" --"checksum tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443" --"checksum tokio-executor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "ca6df436c42b0c3330a82d855d2ef017cd793090ad550a6bc2184f4b933532ab" --"checksum tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926" --"checksum tokio-reactor 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "6732fe6b53c8d11178dcb77ac6d9682af27fc6d4cb87789449152e5377377146" --"checksum tokio-sync 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "d06554cce1ae4a50f42fba8023918afa931413aded705b560e29600ccf7c6d76" --"checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119" --"checksum tokio-threadpool 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "f0c32ffea4827978e9aa392d2f743d973c1dfa3730a2ed3f22ce1e6984da848c" --"checksum tokio-timer 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1739638e364e558128461fc1ad84d997702c8e31c2e6b18fb99842268199e827" --"checksum toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f" --"checksum treeline 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" --"checksum try-lock 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" --"checksum try_from 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b" --"checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" --"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" --"checksum unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" --"checksum unicode-segmentation 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" --"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" --"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" --"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" --"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" --"checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" --"checksum uuid 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e1436e58182935dcd9ce0add9ea0b558e8a87befe01c1a301e6020aeb0876363" --"checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" --"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" --"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" --"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" --"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" --"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" --"checksum want 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" --"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" --"checksum which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164" --"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" --"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" --"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" --"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" --"checksum winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80" --"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" --"checksum wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" --"checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" --"checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" --"checksum xattr 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" --"checksum zip 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e41ff37ba788e2169b19fa70253b70cb53d9f2db9fb9aea9bcfc5047e02c3bae" -+version = "0.5.10" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5a8977234acab718eb2820494b2f96cbb16004c19dddf88b7445b27381450997" -+dependencies = [ -+ "byteorder", -+ "bzip2", -+ "crc32fast", -+ "flate2", -+ "thiserror", -+ "time", -+] -diff --git a/Cargo.toml b/Cargo.toml -index 6e8c66f..3dba85e 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -21,7 +21,7 @@ failure = "0.1.2" - human-panic = "1.0.1" - glob = "0.2" - log = "0.4.6" --openssl = { version = '0.10.11', optional = true } -+openssl = { version = '0.10.32', optional = true } - parking_lot = "0.6" - reqwest = "0.9.14" - semver = "0.9.0" diff --git a/nixpkgs/pkgs/development/tools/wrangler/default.nix b/nixpkgs/pkgs/development/tools/wrangler/default.nix index 6191ba75f5dc..cdcb95b43488 100644 --- a/nixpkgs/pkgs/development/tools/wrangler/default.nix +++ b/nixpkgs/pkgs/development/tools/wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.19.2"; + version = "1.19.3"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RnnmhdfYAmqfi2aM2oYrieFNOkiae4WGfR5RoHeNfmw="; + sha256 = "sha256-2LtjaxDClVYPcsCA7v+5GN3MY5VkTJ8TDxz5l0Oq4sQ="; }; - cargoSha256 = "sha256-sneNRs4DPrNA84K73DVSxAAmZ2fqX6VyQhF8bKgIbaQ="; + cargoSha256 = "sha256-f/nYBBfxl9JHhdo00smm6rYYH2kfgJKaCw/wflVgABc="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/development/tools/yq-go/default.nix b/nixpkgs/pkgs/development/tools/yq-go/default.nix index 5bd458ecdd60..038fe25fec35 100644 --- a/nixpkgs/pkgs/development/tools/yq-go/default.nix +++ b/nixpkgs/pkgs/development/tools/yq-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "yq-go"; - version = "4.12.1"; + version = "4.13.2"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-3L4SM698SJvHw1eXxxxL9OehDqQ6Al1XBL2WRG49PZU="; + sha256 = "sha256-manTuR7/3FE+q08WTVAtKilPCQBK136O8w1r5OX9T08="; }; vendorSha256 = "sha256-u7elWOW/tz1ISM/KC1njkZmPi8AEEssZ5QtxK/+1/1I="; diff --git a/nixpkgs/pkgs/development/web/cypress/default.nix b/nixpkgs/pkgs/development/web/cypress/default.nix index a82542760c28..7522052ea9a6 100644 --- a/nixpkgs/pkgs/development/web/cypress/default.nix +++ b/nixpkgs/pkgs/development/web/cypress/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "8.3.0"; + version = "8.3.1"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "sha256-MmdAi/AZ4CI/dPWbJxAXYTg/h0Dr/eEVYcZLMHaDQQ0="; + sha256 = "sha256-aBnF3Ij7oTws+0qOHwIIioxy1sJslb02wn8eGyKFt/c="; }; # don't remove runtime deps diff --git a/nixpkgs/pkgs/development/web/deno/default.nix b/nixpkgs/pkgs/development/web/deno/default.nix index 71252c850818..83a49cceda5b 100644 --- a/nixpkgs/pkgs/development/web/deno/default.nix +++ b/nixpkgs/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.13.2"; + version = "1.14.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qAUQOTqVNTUSmKXoCwId4Bm6ashLLpY0QEWr8gyXxR4="; + sha256 = "sha256-WTBurNXI+t8S0f2ER6zw+6SlkzKYLDGFQcEVbXSQAtc="; }; - cargoSha256 = "sha256-pwP5XbWuK0g45zmamWUO9kiY8gzoNqk7nC7aGTCFhyY="; + cargoSha256 = "sha256-/ohAzcfsoarPicinsZf5fi2cQwYD1oW5TOdWP8RbXos="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/development/web/deno/librusty_v8.nix b/nixpkgs/pkgs/development/web/deno/librusty_v8.nix index 15c20cf4d768..ed2bca5d9bad 100644 --- a/nixpkgs/pkgs/development/web/deno/librusty_v8.nix +++ b/nixpkgs/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.26.0"; + version = "0.28.0"; shas = { - x86_64-linux = "sha256-eYvfsgkLuV//4NmnxTNgB5vGoQ2JdSpXwF34d1kNxBw="; - aarch64-linux = "sha256-t+0/bJI4q2XElYz398aig/widJEOAascOmv4qnnKMQY="; - x86_64-darwin = "sha256-lYJcx5Oe/nuF3l5coH4WIMbBbiFMwxNWlIYojrdiJfI="; - aarch64-darwin = "sha256-5blisZ4Z/f68fZg7aDr5WK4MNvL5IRZZSJrvFb9N5oY="; + x86_64-linux = "sha256-Kz2sAAUux1BcrU2vukGybSs+REAIRUWMxqZakRPEeic="; + aarch64-linux = "sha256-QXj9y6NrvxU6oL9QO2dYH4Fz+MbTzON7w8sTCei7Mqs="; + x86_64-darwin = "sha256-zW1g3DZ4Mh4j3UYE312dDkbX6ngg50GaKCHYPa6H0Dk="; + aarch64-darwin = "sha256-hLIRxApjTbkfDVPhK3EC7X/p6uQK5kOEILZfAmFV5AA="; }; } diff --git a/nixpkgs/pkgs/development/web/flyctl/default.nix b/nixpkgs/pkgs/development/web/flyctl/default.nix index fb239bccb400..e3573147a9c2 100644 --- a/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.233"; + version = "0.0.241"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-qDFO9QV6ItYv/QsnXFCViWo2CQj7hGZftVMD22QL+uQ="; + sha256 = "sha256-f+59wWAfdjyNkAUJJdrbK0c0NkPJ/UVToU2dwUlGwOM="; }; preBuild = '' @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "sha256-+g0VzgdArxUTT5wDw6ddZn9YDNOXHqysye6cIrCc3Iw="; + vendorSha256 = "sha256-bhufZQN2vkfU5c/luB/eCxPueIouhAUqnnPXWyJZRac="; doCheck = false; diff --git a/nixpkgs/pkgs/development/web/minify/default.nix b/nixpkgs/pkgs/development/web/minify/default.nix index 31c6ba9253bb..1c91fdef97eb 100644 --- a/nixpkgs/pkgs/development/web/minify/default.nix +++ b/nixpkgs/pkgs/development/web/minify/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minify"; - version = "2.9.21"; + version = "2.9.22"; src = fetchFromGitHub { owner = "tdewolff"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cHoQtvxofMet7j/PDKlFoVB9Qo5EMWcXqAwhqR4vNko="; + sha256 = "sha256-ph5PrM917qGwp7SLg6Ujfk5YJWFSlUBdW/JJRiwq7fw="; }; - vendorSha256 = "sha256-awlrjXXX9PWs4dt78yK4qNE1wCaA+tGL45tHQxxby8c="; + vendorSha256 = "sha256-0GKIGIVtMywpKxopsVrUZMgeXP/l76U2As8FiG2Niqw="; doCheck = false; diff --git a/nixpkgs/pkgs/development/web/nodejs/v16.nix b/nixpkgs/pkgs/development/web/nodejs/v16.nix index 2b2b042ac680..f89f98f63200 100644 --- a/nixpkgs/pkgs/development/web/nodejs/v16.nix +++ b/nixpkgs/pkgs/development/web/nodejs/v16.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "16.9.1"; - sha256 = "070k8i9a65r03xdchr200qixv053mim5irfvgg4pl3h57k2hxxcp"; + version = "16.10.0"; + sha256 = "04krpy0r8msv64rcf0vy2l2yzf0a401km8p5p7h12j9b4g51mp4p"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; } diff --git a/nixpkgs/pkgs/games/anki/bin.nix b/nixpkgs/pkgs/games/anki/bin.nix index 81de4f859683..3d1d22f293d5 100644 --- a/nixpkgs/pkgs/games/anki/bin.nix +++ b/nixpkgs/pkgs/games/anki/bin.nix @@ -3,16 +3,16 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "2.1.47"; + version = "2.1.48"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux.tar.bz2"; - sha256 = "sha256-cObvjXeDUDslfAhMOrlqyjidri6N7xLR2+LRz3hTdfg="; + sha256 = "sha256-1ZvC8CPnYMzCxxrko1FfmTvKiJT+7BhOdk52zLTnLGE="; }; darwin = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac.dmg"; - sha256 = "sha256-TwYrI9gSabJ5icOsygtEJRymkrSgCD8jDXMtpaJXgWg="; + sha256 = "sha256-HXYTpOxFxjQoqjs+04diy5d+GmS69dFNEfLI/E4NCXw="; }; }; @@ -48,8 +48,6 @@ if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // { name = "anki"; runScript = writeShellScript "anki-wrapper.sh" '' - # Wayland support is broken, disable via ENV variable - export QT_QPA_PLATFORM=xcb exec ${unpacked}/bin/anki ''; diff --git a/nixpkgs/pkgs/games/cataclysm-dda/stable.nix b/nixpkgs/pkgs/games/cataclysm-dda/stable.nix index a11837447f79..1429cdbf180e 100644 --- a/nixpkgs/pkgs/games/cataclysm-dda/stable.nix +++ b/nixpkgs/pkgs/games/cataclysm-dda/stable.nix @@ -10,17 +10,17 @@ let }; self = common.overrideAttrs (common: rec { - version = "0.F-1"; + version = "0.F-2"; src = fetchFromGitHub { owner = "CleverRaven"; repo = "Cataclysm-DDA"; rev = version; - sha256 = "sha256-bVIln8cLZ15qXpW5iB8Odqk0OQbNLLM8OiKybTzARA0="; + sha256 = "sha256-8AZOrO/Wxui+LqAZo8hURktMTycecIgOONUJmE3M+vM="; }; makeFlags = common.makeFlags ++ [ - # Makefile declares version as 0.F, even under 0.F-1 + # Makefile declares version as 0.F, even under 0.F-2 "VERSION=${version}" ]; diff --git a/nixpkgs/pkgs/games/crawl/default.nix b/nixpkgs/pkgs/games/crawl/default.nix index 6595f1ee0dc5..02e34e5f749d 100644 --- a/nixpkgs/pkgs/games/crawl/default.nix +++ b/nixpkgs/pkgs/games/crawl/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.27.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "crawl"; repo = "crawl"; rev = version; - sha256 = "sha256-TTdzFWoWn9OfxosEsxUjmDtPmtHukpT0J/0y4kUvBvo="; + sha256 = "sha256-fyI7OIzhYXNTjIgJLqApyPMmiG3iof1b5XuGudNanos="; }; # Patch hard-coded paths and remove force library builds diff --git a/nixpkgs/pkgs/games/empty-epsilon/0001-bundle-system-glm-in-seriousproton.patch b/nixpkgs/pkgs/games/empty-epsilon/0001-bundle-system-glm-in-seriousproton.patch index d59d548a4a46..a896f8c5867e 100644 --- a/nixpkgs/pkgs/games/empty-epsilon/0001-bundle-system-glm-in-seriousproton.patch +++ b/nixpkgs/pkgs/games/empty-epsilon/0001-bundle-system-glm-in-seriousproton.patch @@ -26,7 +26,7 @@ index cbd68ca..730df82 100644 target_link_libraries(seriousproton_deps INTERFACE - box2d lua glew ${SFML_LIBRARIES} -+ box2d lua glew ${SFML_LIBRARIES} glm ++ box2d lua glew ${SFML_LIBRARIES} glm::glm "$<$<BOOL:${WIN32}>:wsock32>" # LTO flag must be on the linker's list as well. "$<$<AND:$<BOOL:${CMAKE_COMPILER_IS_GNUCC}>,$<OR:$<CONFIG:RelWithDebInfo>,$<CONFIG:Release>>>:-flto>" diff --git a/nixpkgs/pkgs/games/fishfight/default.nix b/nixpkgs/pkgs/games/fishfight/default.nix new file mode 100644 index 000000000000..420d024d5f67 --- /dev/null +++ b/nixpkgs/pkgs/games/fishfight/default.nix @@ -0,0 +1,62 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, alsa-lib +, libGL +, libX11 +, libXi +, AudioToolbox +, Cocoa +, CoreAudio +, CoreFoundation +, IOKit +, OpenGL +}: + +rustPlatform.buildRustPackage rec { + pname = "fishfight"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "fishfight"; + repo = pname; + rev = "v${version}"; + sha256 = "0mbg9zshyg9hlbsk5npslbnwjf8fh6gxszi5hxks380z080cjxs2"; + }; + + cargoSha256 = "sha256-fZXqJ6a2erAQSgAZRwmkor94eMryjiq3gbY102pJb9Q="; + + buildInputs = lib.optionals stdenv.isLinux [ + alsa-lib + libGL + libX11 + libXi + ] ++ lib.optionals stdenv.isDarwin [ + AudioToolbox + Cocoa + CoreAudio + CoreFoundation + IOKit + OpenGL + ]; + + postPatch = '' + substituteInPlace assets/levels/levels.toml --replace assets $out/share/assets + substituteInPlace src/gui.rs --replace \"assets \"$out/share/assets + substituteInPlace src/main.rs --replace \"assets \"$out/share/assets + ''; + + postInstall = '' + mkdir $out/share + cp -r assets $out/share + ''; + + meta = with lib; { + description = "A tactical 2D shooter played by up to 4 players online or on a shared screen"; + homepage = "https://fishfight.org/"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "fishgame"; + }; +} diff --git a/nixpkgs/pkgs/games/multimc/0001-pick-latest-java-first.patch b/nixpkgs/pkgs/games/multimc/0001-pick-latest-java-first.patch index 31ab0497f8df..a65dcbfd037d 100644 --- a/nixpkgs/pkgs/games/multimc/0001-pick-latest-java-first.patch +++ b/nixpkgs/pkgs/games/multimc/0001-pick-latest-java-first.patch @@ -4,14 +4,14 @@ Date: Tue, 22 Jun 2021 21:50:11 +0300 Subject: [PATCH] pick latest java first --- - api/logic/java/JavaInstallList.cpp | 4 ++-- - api/logic/java/JavaUtils.cpp | 2 +- + launcher/java/JavaInstallList.cpp | 4 ++-- + launcher/java/JavaUtils.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/api/logic/java/JavaInstallList.cpp b/api/logic/java/JavaInstallList.cpp +diff --git a/launcher/java/JavaInstallList.cpp b/launcher/java/JavaInstallList.cpp index 0bded03c..40898e20 100644 ---- a/api/logic/java/JavaInstallList.cpp -+++ b/api/logic/java/JavaInstallList.cpp +--- a/launcher/java/JavaInstallList.cpp ++++ b/launcher/java/JavaInstallList.cpp @@ -120,8 +120,8 @@ void JavaInstallList::updateListData(QList<BaseVersionPtr> versions) bool sortJavas(BaseVersionPtr left, BaseVersionPtr right) @@ -23,10 +23,10 @@ index 0bded03c..40898e20 100644 return (*rleft) > (*rright); } -diff --git a/api/logic/java/JavaUtils.cpp b/api/logic/java/JavaUtils.cpp +diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp index 5f004a10..6d633631 100644 ---- a/api/logic/java/JavaUtils.cpp -+++ b/api/logic/java/JavaUtils.cpp +--- a/launcher/java/JavaUtils.cpp ++++ b/launcher/java/JavaUtils.cpp @@ -350,7 +350,6 @@ QList<QString> JavaUtils::FindJavaPaths() qDebug() << "Linux Java detection incomplete - defaulting to \"java\""; diff --git a/nixpkgs/pkgs/games/multimc/default.nix b/nixpkgs/pkgs/games/multimc/default.nix index 8e72b9588561..732a66ef8b41 100644 --- a/nixpkgs/pkgs/games/multimc/default.nix +++ b/nixpkgs/pkgs/games/multimc/default.nix @@ -1,15 +1,15 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, jdk8, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL }: +{ lib, mkDerivation, fetchFromGitHub, cmake, jdk8, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, libGL, msaClientID ? "" }: let libpath = with xorg; lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio libGL ]; in mkDerivation rec { pname = "multimc"; - version = "unstable-2021-06-21"; + version = "unstable-2021-09-08"; src = fetchFromGitHub { owner = "MultiMC"; repo = "MultiMC5"; - rev = "8179a89103833805d5374399d80a4305be1b8355"; - sha256 = "lPz6ZM7TjaixfwWMPaXijKZJQKFPrCegBhvbJ8Xg4P8="; + rev = "e2355eb276bf355ca4acf526a0f3cc390aa88f8b"; + sha256 = "3G9QPoAbC+uVfUYR0Kq6hnxl9c2mvCzIEYGjwfarQJ8="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake file makeWrapper ]; @@ -19,16 +19,20 @@ in mkDerivation rec { postPatch = '' # hardcode jdk paths - substituteInPlace api/logic/java/JavaUtils.cpp \ + substituteInPlace launcher/java/JavaUtils.cpp \ --replace 'scanJavaDir("/usr/lib/jvm")' 'javas.append("${jdk}/lib/openjdk/bin/java")' \ --replace 'scanJavaDir("/usr/lib32/jvm")' 'javas.append("${jdk8}/lib/openjdk/bin/java")' + + # add client ID + substituteInPlace notsecrets/Secrets.cpp \ + --replace 'QString MSAClientID = "";' 'QString MSAClientID = "${msaClientID}";' ''; cmakeFlags = [ "-DMultiMC_LAYOUT=lin-system" ]; postInstall = '' - install -Dm644 ../application/resources/multimc/scalable/multimc.svg $out/share/pixmaps/multimc.svg - install -Dm755 ../application/package/linux/multimc.desktop $out/share/applications/multimc.desktop + install -Dm644 ../launcher/resources/multimc/scalable/multimc.svg $out/share/pixmaps/multimc.svg + install -Dm755 ../launcher/package/linux/multimc.desktop $out/share/applications/multimc.desktop # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 wrapProgram $out/bin/multimc \ diff --git a/nixpkgs/pkgs/games/osu-lazer/deps.nix b/nixpkgs/pkgs/games/osu-lazer/deps.nix index c037a2dcf8c0..8866a38643f8 100644 --- a/nixpkgs/pkgs/games/osu-lazer/deps.nix +++ b/nixpkgs/pkgs/games/osu-lazer/deps.nix @@ -65,7 +65,7 @@ (fetchNuGet { name = "Markdig"; version = "0.25.0"; sha256 = "1f7iqkaphfyf6szjrp0633rj44wynqgiqyivbja5djyxjy4csfyy"; }) (fetchNuGet { name = "MessagePack"; version = "2.3.75"; sha256 = "0mcpxym6g47lyfalnr27mmavmgmd46k6f9g7id8cn1anbbvd4xv1"; }) (fetchNuGet { name = "MessagePack.Annotations"; version = "2.3.75"; sha256 = "06a1ys161gvw1sr771w909gwd1y4dizdvldknkhy8484drj90prd"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.5"; sha256 = "026m19pddhkx5idwpi6mp1yl9yfcfgm2qjp1jh54mdja1d7ng0vk"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1zlcdqscbgqz5yqfgn21l711ybplid97c6wg0gqbbd6920qmpidd"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Connections.Abstractions"; version = "5.0.8"; sha256 = "13k0p0k1gqk12hnxj4l5yjbyv8y51ggkybrqjjr3yf3411vyy4q2"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Client"; version = "5.0.8"; sha256 = "0rladdnd7g8gh7hj5gbrcp3dlspngad4xhgk0qmpzhlc3qr4snf2"; }) (fetchNuGet { name = "Microsoft.AspNetCore.Http.Connections.Common"; version = "5.0.8"; sha256 = "03d2ydy7zap5hri7k1f30d1i9jaqj0nijwgp2z6b36gwqck9rys7"; }) @@ -124,7 +124,7 @@ (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "2.2.0"; sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "5.0.1"; sha256 = "01ar5ba2sal9wnpa1xnnikhgb37vzhg2cspz45wf760jflpai2vv"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.5"; sha256 = "1h5yry6k9bpqqis2fb1901csb8kipm7anm174fjj41r317vzfjfa"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1b3lm6dc31yl9r0rian7zcmhpn949dyp4yhw4fsl4bkdpp4id085"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) diff --git a/nixpkgs/pkgs/games/pioneer/default.nix b/nixpkgs/pkgs/games/pioneer/default.nix index cd827131a706..82879d0a9d2d 100644 --- a/nixpkgs/pkgs/games/pioneer/default.nix +++ b/nixpkgs/pkgs/games/pioneer/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "pioneer"; - version = "20210203"; + version = "20210723"; src = fetchFromGitHub{ owner = "pioneerspacesim"; repo = "pioneer"; rev = version; - sha256 = "sha256-51HXbX15uB1Xf9Re7Qi41BnJ9OW+GeXQhylJ+HwP0f8="; + sha256 = "sha256-w+ECVv96MoS69815+X0PqguDiGDhHoTnAnnYtLpMScI="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/games/portmod/default.nix b/nixpkgs/pkgs/games/portmod/default.nix index 9db57d3e0a94..b677c63defeb 100644 --- a/nixpkgs/pkgs/games/portmod/default.nix +++ b/nixpkgs/pkgs/games/portmod/default.nix @@ -1,22 +1,22 @@ { lib, callPackage, python3Packages, fetchFromGitLab, cacert, rustPlatform, bubblewrap, git, perlPackages, imagemagick, fetchurl, fetchzip, - jre, makeWrapper, tr-patcher, tes3cmd }: + jre, makeWrapper, tr-patcher, tes3cmd, fetchpatch }: let - version = "2.0_beta9"; + version = "2.0.3"; src = fetchFromGitLab { owner = "portmod"; repo = "Portmod"; rev = "v${version}"; - sha256 = "0a598rb0z6gsdyr4n0lc0yc583njjii07p6vxw75xsh7292vxksc"; + sha256 = "sha256-vMdyaI1Ps7bFoRvwdVNVG9vPFEiGb7CPvKEWfxiM128="; }; portmod-rust = rustPlatform.buildRustPackage rec { inherit src version; pname = "portmod-rust"; - cargoHash = "sha256-7Ce+EIbZuOur7iGOUXNWiXReuZO54LQJu+sJPw1CJGg="; + cargoHash = "sha256-tAghZmlg34jHr8gtNgL3MQ8EI7K6/TfDcTbBjxdWLr0="; nativeBuildInputs = [ python3Packages.python ]; @@ -44,9 +44,18 @@ python3Packages.buildPythonApplication rec { prePatch = '' substituteInPlace setup.py \ --replace "from setuptools_rust import Binding, RustExtension" "" \ - --replace "RustExtension(\"portmod.portmod\", binding=Binding.PyO3, strip=True)" "" + --replace "RustExtension(\"portmodlib.portmod\", binding=Binding.PyO3, strip=True)" "" ''; + patches = [ + (fetchpatch { + # fix error when symlinks are present in the path (https://gitlab.com/portmod/portmod/-/merge_requests/393) + # happen with ~/.nix-profile + url = "https://gitlab.com/portmod/portmod/-/merge_requests/393.patch"; + sha256 = "sha256-XHifwD/Nh7UiMZdvSNudVF7qpBOpjGTKSr4VVdJqUdA="; + }) + ]; + propagatedBuildInputs = with python3Packages; [ setuptools-scm setuptools @@ -61,6 +70,7 @@ python3Packages.buildPythonApplication rec { redbaron patool packaging + fasteners ]; checkInputs = with python3Packages; [ @@ -68,7 +78,7 @@ python3Packages.buildPythonApplication rec { ] ++ bin-programs; preCheck = '' - cp ${portmod-rust}/lib/libportmod.so portmod/portmod.so + cp ${portmod-rust}/lib/libportmod.so portmodlib/portmod.so export HOME=$(mktemp -d) ''; @@ -79,11 +89,14 @@ python3Packages.buildPythonApplication rec { "test_execute_network_permissions" "test_execute_permissions_bleed" "test_git" + "test_sync" + "test_manifest" + "test_add_repo" ]; # for some reason, installPhase doesn't copy the compiled binary postInstall = '' - cp ${portmod-rust}/lib/libportmod.so $out/${python3Packages.python.sitePackages}/portmod/portmod.so + cp ${portmod-rust}/lib/libportmod.so $out/${python3Packages.python.sitePackages}/portmodlib/portmod.so makeWrapperArgs+=("--prefix" "GIT_SSL_CAINFO" ":" "${cacert}/etc/ssl/certs/ca-bundle.crt" \ "--prefix" "PATH" ":" "${lib.makeBinPath bin-programs }") diff --git a/nixpkgs/pkgs/games/qtads/default.nix b/nixpkgs/pkgs/games/qtads/default.nix index f966798ce4e6..13593044451e 100644 --- a/nixpkgs/pkgs/games/qtads/default.nix +++ b/nixpkgs/pkgs/games/qtads/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "qtads"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "realnc"; repo = pname; rev = "v${version}"; - sha256 = "02kk2hs20h9ffhylwms9f8zikmmlrz1nvbrm97gis9iljkyx035c"; + sha256 = "sha256-DxbVYFHIVFF/5ZeHIeu3k+btCvw/qfM7uoH5mb1ikoE="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/nixpkgs/pkgs/games/quakespasm/vulkan.nix b/nixpkgs/pkgs/games/quakespasm/vulkan.nix index c8882349ce27..a71f36f72376 100644 --- a/nixpkgs/pkgs/games/quakespasm/vulkan.nix +++ b/nixpkgs/pkgs/games/quakespasm/vulkan.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vkquake"; - version = "1.05.3"; + version = "1.11.0"; src = fetchFromGitHub { owner = "Novum"; repo = "vkQuake"; rev = version; - sha256 = "sha256-nrqxfJbTkaPgKozkS6ulUZNXymkpw0bbQBHUZEFnLhs="; + sha256 = "sha256-FbHqpBiTJWeJPBHUBTOIuXRoLttmDIpip5wUvuVw8YI="; }; sourceRoot = "source/Quake"; diff --git a/nixpkgs/pkgs/games/rpg-cli/default.nix b/nixpkgs/pkgs/games/rpg-cli/default.nix index 602bdb1ee31b..23396ebf978d 100644 --- a/nixpkgs/pkgs/games/rpg-cli/default.nix +++ b/nixpkgs/pkgs/games/rpg-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rpg-cli"; - version = "0.6.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "facundoolano"; repo = pname; rev = version; - sha256 = "sha256-R0Yaxe7Z1gPH0pvfytl5lOJKDZi4hN/upY/baMLc3Aw="; + sha256 = "sha256-Ih+1qO/VHkRp766WDe09xXL/pkby+sURopy7m5wRn4Y="; }; - cargoSha256 = "sha256-pvhZlj1uy5DZV+RBnqkUlVQPdQqGhh0YLE9aGFS3s1g="; + cargoSha256 = "sha256-Au7Nlpl4XOSG8rW0DaHFDqBr1kUY5Emyw6ff0htPc+I="; # tests assume the authors macbook, and thus fail doCheck = false; diff --git a/nixpkgs/pkgs/games/stuntrally/default.nix b/nixpkgs/pkgs/games/stuntrally/default.nix index bf9e034d7b4a..64e2dcc379b1 100644 --- a/nixpkgs/pkgs/games/stuntrally/default.nix +++ b/nixpkgs/pkgs/games/stuntrally/default.nix @@ -1,34 +1,59 @@ -{ lib, fetchurl, stdenv, cmake, boost, ogre, mygui, ois, SDL2, libvorbis, pkg-config -, makeWrapper, enet, libXcursor, bullet, openal }: +{ lib +, fetchFromGitHub +, stdenv +, cmake +, boost +, ogre +, mygui +, ois +, SDL2 +, libvorbis +, pkg-config +, makeWrapper +, enet +, libXcursor +, bullet +, openal +}: stdenv.mkDerivation rec { pname = "stunt-rally"; version = "2.6.1"; - src = fetchurl { - url = "https://github.com/stuntrally/stuntrally/archive/${version}.tar.gz"; - sha256 = "1zxq3x2g9pzafa2awx9jzqd33z6gnqj231cs07paxzrm89y51w4v"; + src = fetchFromGitHub { + owner = "stuntrally"; + repo = "stuntrally"; + rev = version; + hash = "sha256-1+Cc9I6TTa3b++/7Z2V+vAXcmFb2+wX7TnXEH6CRDWU="; }; - - tracks = fetchurl { - url = "https://github.com/stuntrally/tracks/archive/${version}.tar.gz"; - sha256 = "0x6lgpa4c2grl0vrhqrcs7jcysa3mmvpdl1v5xa0dsf6vkvfr0zs"; + tracks = fetchFromGitHub { + owner = "stuntrally"; + repo = "tracks"; + rev = version; + hash = "sha256-FbZc87j/9cp4LxNaEO2wNTvwk1Aq/IWcKD3rTGkzqj0="; }; # include/OGRE/OgreException.h:265:126: error: invalid conversion from # 'int' to 'Ogre::Exception::ExceptionCodes' [-fpermissive] - NIX_CFLAGS_COMPILE="-fpermissive"; + NIX_CFLAGS_COMPILE = "-fpermissive"; preConfigure = '' - pushd data - tar xf ${tracks} - mv tracks-${version} tracks - popd + ln -s ${tracks} data/tracks ''; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ boost ogre mygui ois SDL2 libvorbis - makeWrapper enet libXcursor bullet openal + buildInputs = [ + boost + ogre + mygui + ois + SDL2 + libvorbis + makeWrapper + enet + libXcursor + bullet + openal ]; meta = with lib; { diff --git a/nixpkgs/pkgs/games/the-powder-toy/default.nix b/nixpkgs/pkgs/games/the-powder-toy/default.nix index 8857e3868b52..6d7b4bccc955 100644 --- a/nixpkgs/pkgs/games/the-powder-toy/default.nix +++ b/nixpkgs/pkgs/games/the-powder-toy/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "the-powder-toy"; - version = "96.1.349"; + version = "96.2.350"; src = fetchFromGitHub { owner = "The-Powder-Toy"; repo = "The-Powder-Toy"; rev = "v${version}"; - sha256 = "sha256-MSN81kPaH8cWZO+QEOlMUQQghs1kn8CpsKA5SUC/RX8="; + sha256 = "sha256-OAy/Hd2UksNiIfTdpA+u9NzIq1pfe8RYG3slI4/LNnM="; }; nativeBuildInputs = [ meson ninja pkg-config python3 ]; diff --git a/nixpkgs/pkgs/games/tintin/default.nix b/nixpkgs/pkgs/games/tintin/default.nix index 73070db244f0..b813900ca39f 100644 --- a/nixpkgs/pkgs/games/tintin/default.nix +++ b/nixpkgs/pkgs/games/tintin/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, lib, zlib, pcre +, memorymappingHook, memstreamHook , tlsSupport ? true, gnutls ? null # ^ set { tlsSupport = false; } to reduce closure size by ~= 18.6 MB }: @@ -15,7 +16,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = lib.optional tlsSupport gnutls.dev; - buildInputs = [ zlib pcre ] ++ lib.optional tlsSupport gnutls; + buildInputs = [ zlib pcre ] + ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook memstreamHook ] + ++ lib.optional tlsSupport gnutls; preConfigure = '' cd src diff --git a/nixpkgs/pkgs/games/uqm/3dovideo.nix b/nixpkgs/pkgs/games/uqm/3dovideo.nix index 4ebbc9c49923..2281688949c8 100644 --- a/nixpkgs/pkgs/games/uqm/3dovideo.nix +++ b/nixpkgs/pkgs/games/uqm/3dovideo.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, requireFile, writeText, fetchurl, haskellPackages }: +{ stdenv, lib, requireFile, writeText, fetchFromGitHub, haskellPackages }: let makeSpin = num: let @@ -13,13 +13,15 @@ let slides.intro = 3DOVID:addons/3dovideo/intro/intro.duk '' + lib.concatMapStrings makeSpin (lib.range 0 24)); - helper = with haskellPackages; mkDerivation { + helper = with haskellPackages; mkDerivation rec { pname = "uqm3donix"; version = "0.1.0.0"; - src = fetchurl { - url = "https://github.com/aszlig/uqm3donix/archive/v0.1.0.0.tar.gz"; - sha256 = "0d40gpc3bqkw68varjxwgbdzxw0dvwqksijmvij5ixmlcspbjgvb"; + src = fetchFromGitHub { + owner = "aszlig"; + repo = "uqm3donix"; + rev = "v${version}"; + hash = "sha256-rK30u2PBysiSGSA9829F1Nom/wtoVN6rGTBneRKeWEw="; }; isLibrary = false; diff --git a/nixpkgs/pkgs/games/uqm/default.nix b/nixpkgs/pkgs/games/uqm/default.nix index a06c1b3b6652..5b67b9bce94e 100644 --- a/nixpkgs/pkgs/games/uqm/default.nix +++ b/nixpkgs/pkgs/games/uqm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkg-config, libGLU, libGL +{ stdenv, lib, fetchurl, fetchFromGitHub, pkg-config, libGLU, libGL , SDL, SDL_image, libpng, libvorbis, libogg, libmikmod , use3DOVideos ? false, requireFile ? null, writeText ? null @@ -12,7 +12,7 @@ assert use3DOVideos -> requireFile != null && writeText != null let videos = import ./3dovideo.nix { - inherit stdenv lib requireFile writeText fetchurl haskellPackages; + inherit stdenv lib requireFile writeText fetchFromGitHub haskellPackages; }; remixPacks = lib.imap1 (num: sha256: fetchurl rec { diff --git a/nixpkgs/pkgs/games/xsnow/default.nix b/nixpkgs/pkgs/games/xsnow/default.nix index ba0fcf784f4e..bd617196288c 100644 --- a/nixpkgs/pkgs/games/xsnow/default.nix +++ b/nixpkgs/pkgs/games/xsnow/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "xsnow"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "https://ratrabbit.nl/downloads/xsnow/xsnow-${version}.tar.gz"; - sha256 = "1xnpqbamhglv7xsxzlrlpvsz6bbzlrvdpn5x2n9baww9kcrkbwjg"; + sha256 = "sha256-3piLgcZXQicHisAqr5XxbFqAMHyK7HzU5Re0mvfOBhE="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/misc/base16-shell-preview/default.nix b/nixpkgs/pkgs/misc/base16-shell-preview/default.nix index 15e0596e4103..c5b806d65e5a 100644 --- a/nixpkgs/pkgs/misc/base16-shell-preview/default.nix +++ b/nixpkgs/pkgs/misc/base16-shell-preview/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "base16-shell-preview"; - version = "0.3.0"; + version = "1.0.0"; src = python3Packages.fetchPypi { inherit version; pname = "base16_shell_preview"; - sha256 = "0x2fbicrcqgf2dl7dqzm14dz08vjjziabaaw33wah3v9wv4rw7jq"; + sha256 = "098f3z81g3acgcrisipz0nh17n9kx7ld6h8dg26qz3nx31pngsxd"; }; # No tests diff --git a/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix index c46bb564a1ea..e5de7c116c7e 100644 --- a/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation { pname = "cnijfilter2"; - version = "6.00"; + version = "6.10"; src = fetchzip { - url = "https://gdlp01.c-wss.com/gds/9/0100010739/01/cnijfilter2-source-6.00-1.tar.gz"; - sha256 = "1n4vq44zya0n4a7jvq3yyqy7dcvc2911cjvxmq48zqicb2xdgafr"; + url = "https://gdlp01.c-wss.com/gds/1/0100010921/01/cnijfilter2-source-6.10-1.tar.gz"; + sha256 = "0w121issdjxdv5i9ksa5m23if6pz1r9ql8p894f1pqn16w0kw1ix"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/misc/cups/filters.nix b/nixpkgs/pkgs/misc/cups/filters.nix index 8b1e7fe8fc70..911892cb728e 100644 --- a/nixpkgs/pkgs/misc/cups/filters.nix +++ b/nixpkgs/pkgs/misc/cups/filters.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkg-config, cups, poppler, poppler_utils, fontconfig , libjpeg, libpng, perl, ijs, qpdf, dbus, avahi , makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript -, mupdf +, mupdf, dejavu_fonts, liblouis }: let @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "cups-filters"; - version = "1.25.12"; + version = "1.28.10"; src = fetchurl { url = "https://openprinting.org/download/cups-filters/${pname}-${version}.tar.xz"; - sha256 = "1kv25011iyzvd33n5zmmn1z2p6pzk26hmmw6qvjjnx8p3sp7raqn"; + sha256 = "sha256-z4yQRpTETPaJtXJORtI9qa5RJdVDdLNAxkIHfMKcqDc="; }; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -21,6 +21,7 @@ in stdenv.mkDerivation rec { buildInputs = [ cups poppler poppler_utils fontconfig libjpeg libpng perl ijs qpdf dbus avahi ghostscript mupdf + liblouis # braille embosser support ]; configureFlags = [ @@ -33,7 +34,7 @@ in stdenv.mkDerivation rec { "--enable-imagefilters" "--with-rcdir=no" "--with-shell=${stdenv.shell}" - "--with-test-font-path=/path-does-not-exist" + "--with-test-font-path=${dejavu_fonts}/share/fonts/truetype/DejaVuSans.ttf" ]; makeFlags = [ "CUPS_SERVERBIN=$(out)/lib/cups" "CUPS_DATADIR=$(out)/share/cups" "CUPS_SERVERROOT=$(out)/etc/cups" ]; @@ -60,7 +61,7 @@ in stdenv.mkDerivation rec { ''; enableParallelBuilding = true; - doCheck = false; # fails 4 out of 6 tests + doCheck = true; meta = { homepage = "http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters"; diff --git a/nixpkgs/pkgs/misc/emulators/melonDS/default.nix b/nixpkgs/pkgs/misc/emulators/melonDS/default.nix index a53d2bfc339e..bd3bffde54f2 100644 --- a/nixpkgs/pkgs/misc/emulators/melonDS/default.nix +++ b/nixpkgs/pkgs/misc/emulators/melonDS/default.nix @@ -2,40 +2,41 @@ , fetchFromGitHub , mkDerivation , cmake -, pkg-config -, SDL2 -, qtbase +, epoxy +, libarchive , libpcap , libslirp -, wrapGAppsHook +, pkg-config +, qtbase +, SDL2 }: mkDerivation rec { pname = "melonDS"; - version = "0.9.1"; + version = "0.9.3"; src = fetchFromGitHub { owner = "Arisotura"; repo = pname; rev = version; - sha256 = "sha256-bvi0Y+zwfEcsZMNxoH85hxwIGn0UIYlg/ZaE6yJ7vlo="; + sha256 = "1v8a060gbpx7rdkk2w4hym361l2wip7yjjn8wny1gfsa273k3zy5"; }; - nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - SDL2 - qtbase + epoxy + libarchive libpcap libslirp + qtbase + SDL2 ]; - cmakeFlags = [ "-UUNIX_PORTABLE" ]; - meta = with lib; { homepage = "http://melonds.kuribo64.net/"; description = "Work in progress Nintendo DS emulator"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ artemist benley shamilton ]; + maintainers = with maintainers; [ artemist benley shamilton xfix ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/misc/emulators/proton-caller/default.nix b/nixpkgs/pkgs/misc/emulators/proton-caller/default.nix index 0c3b786c11f5..d10c43642325 100644 --- a/nixpkgs/pkgs/misc/emulators/proton-caller/default.nix +++ b/nixpkgs/pkgs/misc/emulators/proton-caller/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "proton-caller"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "caverym"; repo = pname; rev = version; - sha256 = "sha256-GFZX+ss6LRosCsOuzjLu15BCdImhxH2D2kZQzF8zA90="; + sha256 = "sha256-k+cH86atuVoLCQ+I1zu08f4T+y0u8vnjo3VA+Otg+a4="; }; - cargoSha256 = "sha256-8HaMmvSUI5Zttlsx5tewwIR+iKBlp4w8XlRfI0tyBas="; + cargoSha256 = "sha256-rkgg96IdIhVXZ5y/ECUxNPyPV9Nv5XGAtlxAkILry2s="; meta = with lib; { description = "Run Windows programs with Proton"; diff --git a/nixpkgs/pkgs/misc/emulators/punes/default.nix b/nixpkgs/pkgs/misc/emulators/punes/default.nix index d3ad2f681997..860e90d23c33 100644 --- a/nixpkgs/pkgs/misc/emulators/punes/default.nix +++ b/nixpkgs/pkgs/misc/emulators/punes/default.nix @@ -19,13 +19,13 @@ mkDerivation rec { pname = "punes"; - version = "unstable-2021-07-19"; + version = "unstable-2021-09-11"; src = fetchFromGitHub { owner = "punesemu"; repo = "puNES"; - rev = "15ab85dabb220889419df0c249c06f3db2b09dc0"; - sha256 = "1w0c5lfdl9ha4sxxva6hcpcaa444px6x25471q37l69n71rmjpy8"; + rev = "60ca36fcb066c41d0b3f2b550ca94dc7d12d84d6"; + sha256 = "JOi6AE1bpAc/wj9fQqHrUNc6vceeUyP0phT2f9kcJTY="; }; postPatch = '' @@ -54,7 +54,7 @@ mkDerivation rec { }; meta = with lib; { - description = "Qt-based Nintendo Entertaiment System emulator and NSF/NSFe Music Player"; + description = "Qt-based Nintendo Entertainment System emulator and NSF/NSFe Music Player"; homepage = "https://github.com/punesemu/puNES"; license = licenses.gpl2Plus; maintainers = with maintainers; [ OPNA2608 ]; diff --git a/nixpkgs/pkgs/misc/emulators/ruffle/default.nix b/nixpkgs/pkgs/misc/emulators/ruffle/default.nix index 84837322e971..8cbdaf21a864 100644 --- a/nixpkgs/pkgs/misc/emulators/ruffle/default.nix +++ b/nixpkgs/pkgs/misc/emulators/ruffle/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "ruffle"; - version = "nightly-2021-05-14"; + version = "nightly-2021-09-17"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = pname; rev = version; - sha256 = "15azv8y7a4sgxvvhl7z45jyxj91b4nn681vband5726c7znskhwl"; + sha256 = "sha256-N4i13vx/hWzFf2DT3lToAAnbMgIaUL/B2C3WI1el3ps="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/ruffle_desktop --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib ''; - cargoSha256 = "0ihy4rgw9b4yqlqs87rx700h3a8wm02wpahhg7inic1lcag4bxif"; + cargoSha256 = "sha256-6B6bSIU15Ca1/lLYij9YjpFykbJhOGZieydNXis/Cw8="; meta = with lib; { description = "An Adobe Flash Player emulator written in the Rust programming language."; diff --git a/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix b/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix index 856a56f5f5eb..2e89aa296a23 100644 --- a/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix +++ b/nixpkgs/pkgs/misc/emulators/ryujinx/default.nix @@ -19,13 +19,13 @@ let ]; in stdenv.mkDerivation rec { pname = "ryujinx"; - version = "1.0.6954"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx + version = "1.0.7047"; # Versioning is based off of the official appveyor builds: https://ci.appveyor.com/project/gdkchan/ryujinx src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "31cbd09a75a9d5f4814c3907a060e0961eb2bb15"; - sha256 = "00qql0wmlzs722s0igip3v0yjlqhc31jcr7nghwibcqrmx031azk"; + rev = "7c5ead1c196d597384085cc9a609afdc89a43774"; + sha256 = "00c6il67y9ky0f8f97nn8aqm4klwz59842nsh554w98gwv8w1jjb"; }; nativeBuildInputs = [ dotnet-sdk_5 dotnetPackages.Nuget cacert makeWrapper wrapGAppsHook gobject-introspection gdk-pixbuf ]; diff --git a/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix b/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix index 6ae51812b3d5..6ebf7acd048e 100644 --- a/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix +++ b/nixpkgs/pkgs/misc/emulators/ryujinx/deps.nix @@ -11,18 +11,18 @@ (fetchNuGet { name = "GLibSharp"; version = "3.22.25.128"; sha256 = "1j8i5izk97ga30z1qpd765zqd2q5w71y8bhnkqq4bj59768fyxp5"; }) (fetchNuGet { name = "GtkSharp"; version = "3.22.25.128"; sha256 = "0z0wx0p3gc02r8d7y88k1rw307sb2vapbr1k1yc5qdc38fxz5jsy"; }) (fetchNuGet { name = "GtkSharp.Dependencies"; version = "1.1.0"; sha256 = "1g1rhcn38ww97638rds6l5bysra43hkhv47fy71fvq89623zgyxn"; }) - (fetchNuGet { name = "LibHac"; version = "0.12.0"; sha256 = "08r9b9cdcbz6339sw8r5dfy2a8iw53df0j3xq9rygkg02xspimld"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.5"; sha256 = "026m19pddhkx5idwpi6mp1yl9yfcfgm2qjp1jh54mdja1d7ng0vk"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.5"; sha256 = "09nsi9fa8kb3jpnim0hdap3jabskvpr4fmpvnj5wsh3gp91vqvgb"; }) - (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.5"; sha256 = "10g2vdsz685agqbd7h7dd9gvs584prpai0zv37r59wzlynj1assl"; }) + (fetchNuGet { name = "LibHac"; version = "0.13.3"; sha256 = "0mh7q1i9wk5mj7xc1rbsasfmd0d1y6xs5m4nllmclk4drzkzsi56"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1zlcdqscbgqz5yqfgn21l711ybplid97c6wg0gqbbd6920qmpidd"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.10"; sha256 = "0ir75jh4qas1v70y63hvd0rbyprcf97l47b2pgljhxk138z96s4y"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "5.0.10"; sha256 = "0qhyrprvbhcn980ycqvkchd4qy5shydi7pl0lbcl9cljivn60if3"; }) (fetchNuGet { name = "Microsoft.CodeCoverage"; version = "16.8.0"; sha256 = "1y05sjk7wgd29a47v1yhn2s1lrd8wgazkilvmjbvivmrrm3fqjs8"; }) (fetchNuGet { name = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { name = "Microsoft.DotNet.InternalAbstractions"; version = "1.0.0"; sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.5"; sha256 = "14d6wz593dwm2j3apd3ny10idk8bfxqgfrparhc1q7q4i66y21ws"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.5"; sha256 = "1233y31z46yqzjgwpa6mmb1h63iqp6wbly6mbwkjqm2adx1wkp47"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.5"; sha256 = "1h5yry6k9bpqqis2fb1901csb8kipm7anm174fjj41r317vzfjfa"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.5"; sha256 = "1a1ijdk61l0h25sj9ypcf96vz1c08ca7q5809g82qpi9m34kw8b8"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.5"; sha256 = "1gc4msk61jgj9ill4icp0mn523g411iqpxphp0fykfvqdpqyqg46"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.10"; sha256 = "1z8l02ypzbhbh0jp89ibc4dx61dvaa4l7cdn4s2zs0l492nz2ni8"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; version = "5.0.10"; sha256 = "07yr09al8cci38zmwqghpsf8jsg51a8qv6p156ph8b5714iq5jjq"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.10"; sha256 = "1b3lm6dc31yl9r0rian7zcmhpn949dyp4yhw4fsl4bkdpp4id085"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.10"; sha256 = "1pphlbhs1swr14g07hnvvwj9p983qqf6vqaq455bhpn6lin3z81f"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; version = "5.0.10"; sha256 = "0cn3nq7vmjwk8b5bh7hb5wzidz1msjmwyng6k1ngqdm49w9f0m2g"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) @@ -102,7 +102,7 @@ (fetchNuGet { name = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; }) (fetchNuGet { name = "Ryujinx.Audio.OpenAL.Dependencies"; version = "1.21.0.1"; sha256 = "0z5k42h252nr60d02p2ww9190d7k1kzrb26vil4ydfhxqqqv6w9l"; }) (fetchNuGet { name = "Ryujinx.Graphics.Nvdec.Dependencies"; version = "4.4.0-build7"; sha256 = "0g1l3lgs0ffxp64ka81v6q1cgsdirl1qlf73255v29r3v337074m"; }) - (fetchNuGet { name = "Ryujinx.SDL2-CS"; version = "2.0.15-build11"; sha256 = "0s4h69l2b508l5wxp4v4ip8k83k78p3963xxv8bfamin9517przi"; }) + (fetchNuGet { name = "Ryujinx.SDL2-CS"; version = "2.0.17-build18"; sha256 = "0j0vs6075c4fniydqxhpp18pg3x679mq463x4gxqgkri3vhpj4vl"; }) (fetchNuGet { name = "SharpZipLib"; version = "1.3.0"; sha256 = "1pizj82wisch28nfdaszwqm9bz19lnl0s5mq8c0zybm2vhnrhvk4"; }) (fetchNuGet { name = "SixLabors.Fonts"; version = "1.0.0-beta0013"; sha256 = "0r0aw8xxd32rwcawawcz6asiyggz02hnzg5hvz8gimq8hvwx1wql"; }) (fetchNuGet { name = "SixLabors.ImageSharp"; version = "1.0.2"; sha256 = "0fhk9sn8k18slfb26wz8mal0j699f7djwhxgv97snz6b10wynfaj"; }) @@ -176,7 +176,6 @@ (fetchNuGet { name = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { name = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; }) - (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0-preview.7.20364.11"; sha256 = "19sl184f6rjhfsizq0vapysazd6yd66lf638rszvrdhqlsxssz2m"; }) (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) (fetchNuGet { name = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) diff --git a/nixpkgs/pkgs/misc/ghostscript/default.nix b/nixpkgs/pkgs/misc/ghostscript/default.nix index 760ec2bc0534..369add0a586b 100644 --- a/nixpkgs/pkgs/misc/ghostscript/default.nix +++ b/nixpkgs/pkgs/misc/ghostscript/default.nix @@ -1,6 +1,6 @@ { config, stdenv, lib, fetchurl, pkg-config, zlib, expat, openssl, autoconf , libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec -, libiconv, ijs, lcms2, fetchpatch +, libiconv, ijs, lcms2, fetchpatch, callPackage , cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups ? null , x11Support ? cupsSupport, xlibsWrapper ? null # with CUPS, X11 only adds very little }: @@ -45,6 +45,11 @@ stdenv.mkDerivation rec { url = "https://github.com/ArtifexSoftware/ghostpdl/commit/41ef9a0bc36b9db7115fbe9623f989bfb47bbade.patch"; sha256 = "1qpc6q1fpxshqc0mqgg36kng47kgljk50bmr8p7wn21jgfkh7m8w"; }) + (fetchpatch { + url = "https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=a9bd3dec9fde"; + name = "CVE-2021-3781.patch"; + sha256 = "FvbH7cb3ZDCbNRz9DF0kDmLdF7OWNYk90wv44pimU58="; + }) ./urw-font-files.patch ./doc-no-ref.diff ]; @@ -85,7 +90,8 @@ stdenv.mkDerivation rec { "--with-cups-datadir=$(out)/share/cups" ]; - doCheck = true; + # make check does nothing useful + doCheck = false; # don't build/install statically linked bin/gs buildFlags = [ "so" ]; @@ -115,10 +121,25 @@ stdenv.mkDerivation rec { runHook preInstallCheck $out/bin/gs --version + pushd examples + for f in *.{ps,eps,pdf}; do + echo "Rendering $f" + $out/bin/gs \ + -dNOPAUSE \ + -dBATCH \ + -sDEVICE=bitcmyk \ + -sOutputFile=/dev/null \ + -r600 \ + -dBufferSpace=100000 \ + $f + done + popd # examples runHook postInstallCheck ''; + passthru.tests.test-corpus-render = callPackage ./test-corpus-render.nix {}; + meta = { homepage = "https://www.ghostscript.com/"; description = "PostScript interpreter (mainline version)"; diff --git a/nixpkgs/pkgs/misc/ghostscript/test-corpus-render.nix b/nixpkgs/pkgs/misc/ghostscript/test-corpus-render.nix new file mode 100644 index 000000000000..544392090ff7 --- /dev/null +++ b/nixpkgs/pkgs/misc/ghostscript/test-corpus-render.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchgit +, ghostscript +}: + +stdenv.mkDerivation { + pname = "ghostscript-test-corpus-render"; + version = "unstable-2020-02-19"; + + src = fetchgit { + url = "git://git.ghostscript.com/tests.git"; + rev = "efdd224340d9a407ed3ec22afa1cb127c8fee73c"; + sha256 = "1v1iqz897zzrwa8ng22zcf3y61ab5798jdwidgv10w1r9mjrl7ax"; + }; + + dontConfigure = true; + dontBuild = true; + + doCheck = true; + checkPhase = '' + find . -iregex '.*\.\(ps\|eps\|pdf\)' | while read f; do + echo "Rendering $f" + ${ghostscript}/bin/gs \ + -dNOPAUSE \ + -dBATCH \ + -sDEVICE=bitcmyk \ + -sOutputFile=/dev/null \ + -r600 \ + -dBufferSpace=100000 \ + $f + done + ''; + + installPhase = '' + touch $out + ''; +} diff --git a/nixpkgs/pkgs/misc/logging/beats/6.x.nix b/nixpkgs/pkgs/misc/logging/beats/6.x.nix index 81b8ba0ab5bf..1808197498b5 100644 --- a/nixpkgs/pkgs/misc/logging/beats/6.x.nix +++ b/nixpkgs/pkgs/misc/logging/beats/6.x.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, nixosTests, systemd }: +{ lib, fetchFromGitHub, fetchpatch, elk6Version, buildGoPackage, libpcap, nixosTests, systemd }: let beat = package : extraArgs : buildGoPackage (rec { name = "${package}-${version}"; @@ -15,6 +15,14 @@ let beat = package : extraArgs : buildGoPackage (rec { subPackages = [ package ]; + patches = [ + (fetchpatch { + # Build fix for aarch64, possibly other systems, merged in beats 7.x https://github.com/elastic/beats/pull/9493 + url = "https://github.com/elastic/beats/commit/5d796571de1aa2a299393d2045dacc2efac41a04.diff"; + sha256 = "sha256:0b79fljbi5xd3h8iiv1m38ad0zhmj09f187asc0m9rxlqrz2l9r2"; + }) + ]; + meta = with lib; { homepage = "https://www.elastic.co/products/beats"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/misc/pylode/default.nix b/nixpkgs/pkgs/misc/pylode/default.nix index 33e78bc15231..18e112346912 100644 --- a/nixpkgs/pkgs/misc/pylode/default.nix +++ b/nixpkgs/pkgs/misc/pylode/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "pyLODE"; - version = "2.8.6"; + version = "2.12.0"; src = fetchFromGitHub { owner = "RDFLib"; repo = pname; rev = version; - sha256 = "0zbk5lj9vlg32rmvw1himlw63kxd7sim7nzglrjs5zm6vpi4x5ch"; + sha256 = "sha256-X/YiJduAJNiceIrlCFwD2PFiMn3HVlzr9NzyDvYcql8="; }; propagatedBuildInputs = with python3Packages; [ @@ -22,7 +22,6 @@ python3Packages.buildPythonApplication rec { jinja2 markdown rdflib - rdflib-jsonld requests six beautifulsoup4 diff --git a/nixpkgs/pkgs/misc/screensavers/light-locker/default.nix b/nixpkgs/pkgs/misc/screensavers/light-locker/default.nix index ef1143f41430..0ad2c77dc7ef 100644 --- a/nixpkgs/pkgs/misc/screensavers/light-locker/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/light-locker/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { ConsoleKit/UPower or logind/systemd. ''; license = licenses.gpl2; - maintainers = with maintainers; [ obadz ] ++ pantheon.maintainers; + maintainers = with maintainers; [ obadz ] ++ teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/misc/vim-plugins/build-vim-plugin.nix b/nixpkgs/pkgs/misc/vim-plugins/build-vim-plugin.nix index b6c75e03654d..3d36edb32325 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/build-vim-plugin.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/build-vim-plugin.nix @@ -6,7 +6,7 @@ rec { addRtp = path: attrs: derivation: - derivation // { rtp = "${derivation}/${path}"; } // { + derivation // { rtp = "${derivation}"; } // { overrideAttrs = f: buildVimPlugin (attrs // f attrs); }; @@ -26,7 +26,11 @@ rec { addRtp "${rtpPath}/${path}" attrs (stdenv.mkDerivation (attrs // { name = namePrefix + name; - nativeBuildInputs = attrs.nativeBuildInputs or [] ++ [ vimGenDocHook ]; + # dont move the doc folder since vim expects it + forceShare= [ "man" "info" ]; + + nativeBuildInputs = attrs.nativeBuildInputs or [] + ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) vimGenDocHook; inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; installPhase = '' diff --git a/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 5c71669fc765..df4942fdbd74 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-09-06"; + version = "2021-09-21"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "35d0bd15194b95f0dc8483ee6e727fcf3d4c8b26"; - sha256 = "1ra8ns6n7xfjk032gw9yd8kvmm9ylwp06d04raz19nhalxi7ra9y"; + rev = "f8a4c78b5b293d11da9075373c9de0bb5afdeffe"; + sha256 = "0jmcsaz9hswcwkdmisggr34sn10mrfvybk5b8cmi86v8swz559yw"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -197,12 +197,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2021-07-17"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "af110b7f6080bdc4685cdd5551ba1f79a81910f1"; - sha256 = "1h2czb183lliib95jn4dxq8cn713s22dc4hd1cj19bzqy4j39qhi"; + rev = "cd4c8ceff0109e76b9c919267e1791f505a75815"; + sha256 = "172653xjmyz9a1m0zx3l5njybra5dmsv7b6i01s4w5dzlha5c2jn"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -365,12 +365,12 @@ final: prev: bufdelete-nvim = buildVimPluginFrom2Nix { pname = "bufdelete.nvim"; - version = "2021-09-06"; + version = "2021-09-09"; src = fetchFromGitHub { owner = "famiu"; repo = "bufdelete.nvim"; - rev = "6cf11ded5c8e6e3ea997b64a78be241e2d6c0614"; - sha256 = "1ah9snm88970cyy9f23r9pdjlmzy4y39s4wlx7zwxh6wrfdfnzr1"; + rev = "39d7bfa1802895920f2327b41ab8e41f4b14c866"; + sha256 = "0j1h6h6frngpwx4z42jpxlmpqh736lilvkxhdlc8hcx6cxvw3z0r"; }; meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; }; @@ -389,12 +389,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2021-09-02"; + version = "2021-09-21"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "bede234e1036ab04dd6c6caf3bd7f9ed1d194c3c"; - sha256 = "0rmibanlfyny2zb7rlw4zfw3xdhcqap70xr72a9m9frxvgdmgdnr"; + rev = "94211eac27c931f4458ce713fbe430b7cc82dea8"; + sha256 = "12r6fyhip1gxxskmzakd209zh8pw8wx0niz3519m6giss7chllif"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -413,12 +413,12 @@ final: prev: calendar-vim = buildVimPluginFrom2Nix { pname = "calendar.vim"; - version = "2021-01-30"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "4e454c2ca9a489f2631df24845615744bd594b61"; - sha256 = "12vmysyvavvf1173i0m7jfzh2jsfqx5p7mdm3iafg4iv0209rz66"; + rev = "eebee3aa5da63188b70c4fd75509dcfce77e2030"; + sha256 = "0n8i5jg3hvx6mj6grxcvdsanbyvg67gjiq18aq6kpdb1rcip0270"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -437,24 +437,24 @@ final: prev: caw-vim = buildVimPluginFrom2Nix { pname = "caw.vim"; - version = "2021-08-21"; + version = "2021-09-20"; src = fetchFromGitHub { owner = "tyru"; repo = "caw.vim"; - rev = "2c0cd18aa113cc255daf4366f1d01a7a25ce0110"; - sha256 = "1sa7mhqvfgyr3fsdyl9bjb7scw8ii4y9ig4n3qq77lm4k7snzp2v"; + rev = "3aefcb5a752a599a9200dd801d6bcb0b7606bf29"; + sha256 = "0v21vp0ngj60ksmyrk6f8ld25qqmx298nsd0v1kj2ysrcvj3hjb7"; }; meta.homepage = "https://github.com/tyru/caw.vim/"; }; chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-09-07"; + version = "2021-09-21"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "d578a9e0e95e67d01cd847bbd4caab62294ed241"; - sha256 = "1gjmind3dfl41mdjpp7z5zx5l41qv55ckq97zid639lhggi19hbv"; + rev = "037682510c0229437b4969dd1780d88b4eb10718"; + sha256 = "0y34w513wl77i5iq1930xv04hhd4ndiy21n728bj6bv7fkqbs95c"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -471,6 +471,18 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/changeColorScheme.vim/"; }; + cheatsheet-nvim = buildVimPluginFrom2Nix { + pname = "cheatsheet.nvim"; + version = "2021-09-20"; + src = fetchFromGitHub { + owner = "sudormrfbin"; + repo = "cheatsheet.nvim"; + rev = "3f0b718a030dd2c2757e053345de4f130f213514"; + sha256 = "0k1y57k14hgvjr7cq6likbwb2vdxmj6kiqbiqnk6arhnf8n614gi"; + }; + meta.homepage = "https://github.com/sudormrfbin/cheatsheet.nvim/"; + }; + CheckAttach = buildVimPluginFrom2Nix { pname = "CheckAttach"; version = "2019-05-08"; @@ -567,26 +579,50 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-calc/"; }; + cmp-conjure = buildVimPluginFrom2Nix { + pname = "cmp-conjure"; + version = "2021-09-10"; + src = fetchFromGitHub { + owner = "PaterJason"; + repo = "cmp-conjure"; + rev = "27cfdac78ec099a8d1e82b7a810f451ff0f80a30"; + sha256 = "1hbkafpqpzf4bzy8cyzg1zxnnpmhfkpz2vj8v8by5ym4qx8b747p"; + }; + meta.homepage = "https://github.com/PaterJason/cmp-conjure/"; + }; + cmp-emoji = buildVimPluginFrom2Nix { pname = "cmp-emoji"; - version = "2021-08-25"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-emoji"; - rev = "bbdcc00ecbae3bba18c648a6520d78f354853ce0"; - sha256 = "0zsda2dhhvqd1968xr6p8ndpai4vhb8xmk08nv038zg9csrqkqac"; + rev = "49f33af4609b0c306176e4f1408b3d7d845411a6"; + sha256 = "0x5yihz6b5shsz5kkwh95xqw6y66bhlvfwcp207khqk5vmvrk4mk"; }; meta.homepage = "https://github.com/hrsh7th/cmp-emoji/"; }; + cmp-latex-symbols = buildVimPluginFrom2Nix { + pname = "cmp-latex-symbols"; + version = "2021-09-10"; + src = fetchFromGitHub { + owner = "kdheepak"; + repo = "cmp-latex-symbols"; + rev = "29dc9e53d17cd1f26605888f85500c8ba79cebff"; + sha256 = "17qjw0yp0cmgyjy593qq6rfh7fgfwgb7mxg7a0kg1drjpncwv8gl"; + }; + meta.homepage = "https://github.com/kdheepak/cmp-latex-symbols/"; + }; + cmp-nvim-lsp = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp"; - version = "2021-09-03"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "f6f471898bc4b45eacd36eef9887847b73130e0e"; - sha256 = "1asr32w5q618pqggq9jwrbqs4kjp3ssbw5pca5wc7j2496vm2lhg"; + rev = "246a41c55668d5f84afcd805ee73b6e419375ae0"; + sha256 = "0ybnrs31i61l6z02fjz65ankxccd5587pnky4lsczcz12kpj6s4n"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; @@ -605,16 +641,40 @@ final: prev: cmp-path = buildVimPluginFrom2Nix { pname = "cmp-path"; - version = "2021-09-06"; + version = "2021-09-11"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-path"; - rev = "8450341c7e50cc8ae0faee1fafe60b3f516cea79"; - sha256 = "0f8apk6138d9kzcggmbxhrsckv73ld8kdgmw6hcj0ld80a1s683n"; + rev = "0016221b6143fd6bf308667c249e9dbdee835ae2"; + sha256 = "03k43xavw17bbjzmkknp9z4m8jv9hn6wyvjwaj1gpyz0n21kn5bb"; }; meta.homepage = "https://github.com/hrsh7th/cmp-path/"; }; + cmp-spell = buildVimPluginFrom2Nix { + pname = "cmp-spell"; + version = "2021-08-28"; + src = fetchFromGitHub { + owner = "f3fora"; + repo = "cmp-spell"; + rev = "7157c9fa1029269d97d9ed5632ec575bb71981b4"; + sha256 = "1xrc3zs9jz7dvdfhfx9ikg7abxgvjns0iqr9yzn3jzqm4a37zc62"; + }; + meta.homepage = "https://github.com/f3fora/cmp-spell/"; + }; + + cmp-treesitter = buildVimPluginFrom2Nix { + pname = "cmp-treesitter"; + version = "2021-09-11"; + src = fetchFromGitHub { + owner = "ray-x"; + repo = "cmp-treesitter"; + rev = "cdc1c4c6170278e119759da0b3c28d73f531a231"; + sha256 = "0h0hr086mdszqjk5417nk2fmnbdkyi29gmqirx15k323y53hnvd1"; + }; + meta.homepage = "https://github.com/ray-x/cmp-treesitter/"; + }; + cmp-vsnip = buildVimPluginFrom2Nix { pname = "cmp-vsnip"; version = "2021-08-25"; @@ -629,24 +689,24 @@ final: prev: cmp_luasnip = buildVimPluginFrom2Nix { pname = "cmp_luasnip"; - version = "2021-09-02"; + version = "2021-09-20"; src = fetchFromGitHub { owner = "saadparwaiz1"; repo = "cmp_luasnip"; - rev = "438632c7996fe633e1b0f60c9089e8e8637f1bb7"; - sha256 = "14h0d4ni5vahhxbqfa9smzyfcg73kp2iaxxfzhlkx4sq107byry3"; + rev = "a0fb34a0ecfd06ae74f90517bb4da1e27223ec34"; + sha256 = "1y6vpb5l2qy9vis2flm5s074lkhagbibgjwrzh8vzbfjghywadls"; }; meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/"; }; coc-clap = buildVimPluginFrom2Nix { pname = "coc-clap"; - version = "2021-05-10"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "vn-ki"; repo = "coc-clap"; - rev = "8622be2674f3197bec8a0c4cfd177eb8455f45e6"; - sha256 = "063azqsibg25iv2c9smn4k6933frrwarqz640b14c041sgi6h8cx"; + rev = "0f43b736899b9444704b11bd1835fa337f31ac11"; + sha256 = "03glw1mz1pbn2paj7bhmmwcb7f25p1fqm755mpzrs9phra8bnyis"; }; meta.homepage = "https://github.com/vn-ki/coc-clap/"; }; @@ -665,12 +725,12 @@ final: prev: coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2021-08-03"; + version = "2021-09-12"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "415535475c43fedb8bccd72fbcc00bb850113eb7"; - sha256 = "02blpv258ibzk2bz1bjcjcqiab9lb6ilhclj5s1abwblvn713i47"; + rev = "2d9deb2a3b05a0c09f01edda0a4abd542cb3eebd"; + sha256 = "0y1yh5sf0irk9rr0d5vzvf58y5q5i50b9wdpbjy1b4dfvnax00gn"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; @@ -822,12 +882,12 @@ final: prev: compe-tabnine = buildVimPluginFrom2Nix { pname = "compe-tabnine"; - version = "2021-09-04"; + version = "2021-09-14"; src = fetchFromGitHub { owner = "tzachar"; repo = "compe-tabnine"; - rev = "b00e1f9d597673bfcba39b6bfc620cea9e6c815a"; - sha256 = "0ryj8b60vvxb1q58xyv4hgrc1d7rjsbr21wn677xr13836knb5bw"; + rev = "33e4af509c27da9ef2c9c3002c01e3ec031797d4"; + sha256 = "1lzyia2s66kcxpr6d3db4rcgxlcddfg6gpz8rbg333hdasly383w"; }; meta.homepage = "https://github.com/tzachar/compe-tabnine/"; }; @@ -966,12 +1026,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-08-29"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "13147545ffe61def7d3bb1123c5c843715e9565c"; - sha256 = "0jr6c0s7g54ra8w5r5b8j6hx16ch7cg9rj60jakbqfc1qdi5y9jm"; + rev = "ca2ca0d874670ae78192b465501e9a061f9f8f06"; + sha256 = "07hg0sf2k1f3n67pj5abvalnd33vr1sdhyh1i7syk201a3kzj57n"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1002,12 +1062,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2021-09-06"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "736033d59b2940e35565ae37c3fd5cb024c2a134"; - sha256 = "09v5frr2mlqgvdw1kswv0r683xvg0j3k4wm3h00m0r929prqd6ll"; + rev = "89d1032cc53fc7f846af98d1c63a0bdb6d9b5a34"; + sha256 = "01xqkadd85a91z1did0d7mj1m805ilm88bsk0a893s66viyvqx57"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -1050,12 +1110,12 @@ final: prev: ctrlp-py-matcher = buildVimPluginFrom2Nix { pname = "ctrlp-py-matcher"; - version = "2021-04-08"; + version = "2021-09-20"; src = fetchFromGitHub { owner = "FelikZ"; repo = "ctrlp-py-matcher"; - rev = "24969b88702bca79a6bfd85256450936968cf55d"; - sha256 = "0fc2i14gsg6srjvmibz1d5dzzg9bry35pl5xs43l80xnhpkdndm8"; + rev = "940e267d4fecd81287a1bdecc8475bf079e9dca9"; + sha256 = "133xhi069ndcgj6wcgj5xvpf4m9c34zs9cnk35qpx13h2scxdsa4"; }; meta.homepage = "https://github.com/FelikZ/ctrlp-py-matcher/"; }; @@ -1134,12 +1194,12 @@ final: prev: defx-nvim = buildVimPluginFrom2Nix { pname = "defx.nvim"; - version = "2021-08-18"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "7e506d4b8cea834ef7e61a1f694540c5da418a25"; - sha256 = "16lg72l4zixhmd7pf8aliw3gwz2m25z90h8phmjj3d93w2g4q8zd"; + rev = "9983f2cee6374da84be1d0189cc9add7605eeb56"; + sha256 = "0r7illv3v53fqq9xvic10hgqgd2863gv0s0x94i8vj6y04g3h2lj"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1194,12 +1254,12 @@ final: prev: deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2021-08-26"; + version = "2021-09-13"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "355ae1f71be51faacd40a38e1046f1b1edef5788"; - sha256 = "1zwmhcjd5ygd3qq7jcb5yvprv081azwmp4x2cg3ijlazgh610ssa"; + rev = "03b772ed3e91b8bdbf5260d76f84c5e90a42a8f0"; + sha256 = "0nbwb2kcmd88zqk1v1zndbrjfpsj5jy99bzm81sx5k9yslhl854n"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1328,12 +1388,12 @@ final: prev: deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2021-09-06"; + version = "2021-09-08"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-lsp"; - rev = "a716897b958d1f1c0809d92a70e8d849a3d652e2"; - sha256 = "1zbh595vq0y8liipncpcc3rwh5dpfifbp623z2w5fx3jpic538xw"; + rev = "6299a22bedfb4f814d95cb0010291501472f8fd0"; + sha256 = "01gbjhzgy64398idd3hx0805aaa9ynsxyl52qirr16sy3ydpw0rc"; }; meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/"; }; @@ -1472,12 +1532,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2021-09-06"; + version = "2021-09-08"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "5965e8303be4bc50d26733a02e5c11100f98986c"; - sha256 = "12pxdha0zk8lwvgvqp02fwkvh5yvpzxf75865h5rxz69v1dqgspf"; + rev = "520bb5c34dd24e70fc063d28bd6d0e8181bff118"; + sha256 = "0iz98b75alndxlgyabprk7vmgshqjiigmqmha5pjfw92z4g5lyw8"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -1532,24 +1592,24 @@ final: prev: echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc.vim"; - version = "2021-08-12"; + version = "2021-09-19"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "3e907e05d0495f999149f50a1e6cd72972ee7cbe"; - sha256 = "0bdiz108l4aa5ma49lbmmp8ks8n17i6wzjsawd94rgsyl3j4j3ri"; + rev = "da6ce88098c71b1b959471af06b2f9f2412145a9"; + sha256 = "1n321bglnmd9xi7zrvg32l4ilanvx5aiqq4kcqrb9cai5dw8arla"; }; meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-09-03"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "9653ebf5bf63c4ea31c3b6cf758d6253c672a838"; - sha256 = "0qmpk36brpwl8wi7jw3sv3mvlrrzlww1kn5sa669g3sbdjkk7zpj"; + rev = "25fbb8d382aa43432ae76ac8c4725de3e4ce3551"; + sha256 = "0s2vihz6z33h5r1nly9h40s5yvrgpm8maa9xfbxqk6xf960kydi2"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1569,12 +1629,12 @@ final: prev: editorconfig-nvim = buildVimPluginFrom2Nix { pname = "editorconfig.nvim"; - version = "2021-09-02"; + version = "2021-09-15"; src = fetchFromGitHub { owner = "gpanders"; repo = "editorconfig.nvim"; - rev = "d9df2225615071bec85e5956a146ae0fabc960f6"; - sha256 = "02jjzmgjcaqvgnfnc81xnqfsgfnyyv9mv1xjz6s4vm823gmhi2li"; + rev = "4ebcc2fa7c2663d29df6ccffa5be95b8f266a138"; + sha256 = "13lwv7f0c6sgmpgxx07dpqc59czv69qz30jkgz2dsvjdnd6rvzif"; }; meta.homepage = "https://github.com/gpanders/editorconfig.nvim/"; }; @@ -1702,12 +1762,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2021-09-07"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "famiu"; repo = "feline.nvim"; - rev = "092442db0c7eb6087f0ae2cbeb776781bcc16176"; - sha256 = "0ac4r3qv5d91srxra71paa03h0wnw6hrfpwr0v9lsk58bv0fxbc2"; + rev = "5d152e2cc28c172b42f4caba8baf0973f6a6ece6"; + sha256 = "0mzvh62zphb35kjzx9d09k7sak6fqsk1lcmycgjxk4kydjiw68za"; }; meta.homepage = "https://github.com/famiu/feline.nvim/"; }; @@ -1726,12 +1786,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2021-08-08"; + version = "2021-09-19"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "ed2e422f047eb2cc8afcfecea9464984cfa801a0"; - sha256 = "0jr632pd274xhyji7b1l195i8avf20v4d9g8r4w1ryskirj1k3ry"; + rev = "264a73d4df15a9234a4ec74ecd70e9a0b9d45bf7"; + sha256 = "165kac22gmfm8f64rb5xgv8pqap2zh87xvhnd7i1fy34yzj0n514"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -1823,12 +1883,12 @@ final: prev: formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter.nvim"; - version = "2021-08-27"; + version = "2021-09-20"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "c80405aca78fda2f8da586d7d087c13fdd500d85"; - sha256 = "07s7yw0l9xbf55x67yqcxi5r1y9nj5pjx69rl38jffw1l6lnnbgj"; + rev = "2b187813f63d22f572ebe406711e2d0e81272f8e"; + sha256 = "0vbwagbx2wzalf9sp3w6fr06fllvj936id4yvafk73gp6ihsn1wj"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -1847,12 +1907,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-09-07"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "1fc5567b29bc9c2588eb0584a001a2dfb706030b"; - sha256 = "0q8dhnz3ykx3gk7myprkfa6vnvv8xjpj86faadfc6c01l1299f15"; + rev = "31cdf6ab00898ae80e2bfe870378a499697da725"; + sha256 = "0iafqh05h3v5bnvigrb6bnv0sn6lps64blqfnksr35i60yljw878"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -1871,16 +1931,28 @@ final: prev: fugitive-gitlab-vim = buildVimPluginFrom2Nix { pname = "fugitive-gitlab.vim"; - version = "2021-09-07"; + version = "2021-09-20"; src = fetchFromGitHub { owner = "shumphrey"; repo = "fugitive-gitlab.vim"; - rev = "befd5438ad55a80c6abb415f6c5a9a44275550bc"; - sha256 = "1m57c11b7q1sv6va0xzikha19bck6rgr539sjhnhppdy7nlk55lw"; + rev = "85d4e16e03b05964560514afe53bc74f9d445b02"; + sha256 = "1zvn4rz765yjxyhv71dxly9lzdp9r94762jprff0srpnsyjiypz2"; }; meta.homepage = "https://github.com/shumphrey/fugitive-gitlab.vim/"; }; + futhark-vim = buildVimPluginFrom2Nix { + pname = "futhark-vim"; + version = "2021-08-24"; + src = fetchFromGitHub { + owner = "BeneCollyridam"; + repo = "futhark-vim"; + rev = "fd7d053c74f150712eaa73999f44a3f95c8f08ff"; + sha256 = "17iwpqxkvflcimc066n5ljjbx603hpaqzk271r37qxdvk58jpn0w"; + }; + meta.homepage = "https://github.com/BeneCollyridam/futhark-vim/"; + }; + fwatch-nvim = buildVimPluginFrom2Nix { pname = "fwatch.nvim"; version = "2021-07-25"; @@ -1907,24 +1979,24 @@ final: prev: fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp.nvim"; - version = "2021-06-20"; + version = "2021-09-14"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "6683718524adec3ce58c848706bcc7f3aa6a09a1"; - sha256 = "12ccd7yf726s1gfcxhv7fnwfgwlkgvkqnds442k4i2m9ahs0pyj7"; + rev = "8757eccc3948aa6107448d7fee2de226f0b7040b"; + sha256 = "0fjjwqkb5xl2prk8im8ndci73zlaaazr5x92aa69qvsjkbzvq7fw"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; fzf-vim = buildVimPluginFrom2Nix { pname = "fzf.vim"; - version = "2021-09-02"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "980cd074395110964b66bfbc5c1f1ee237be3c86"; - sha256 = "0wpih3xcyr6nnmpqfikp47ay2pmxp1lr0fp7fxwql8sfjc29i76r"; + rev = "bd703a7a7d7afd113634a346290acc27dd314bfc"; + sha256 = "1q4kdcnwyivwddgn3svvi0zp9n1hbx0bfnfrzdfn327kgljsdfnr"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -1955,12 +2027,12 @@ final: prev: gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2021-09-01"; + version = "2021-09-11"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "07f6f93065ffc2aa6fe398eebbf31013a092701b"; - sha256 = "0g4cdx2n5l0fmfdv09h2kg96z04s7lyigi6f0xbp1axc2b8zxrzp"; + rev = "c38b35cb2b5c8b1a60b5cfd61749ec3b7268218b"; + sha256 = "1m43bq5cq8k9m71hha76pd1kq8nf9cs7jrgk25m15fc5ywaz4fag"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -2063,12 +2135,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2021-09-07"; + version = "2021-09-20"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "f2437cd95a9320c1021edd5fc5ac2e1f9e47fef3"; - sha256 = "1xyxi1cyqd0464q60kb2bpxd5vapkmq5a3g3qzvl4klr6syvrkgd"; + rev = "60403b46c67ee3ead7e59715ceab27a2affb2e6e"; + sha256 = "1mq5nyhy9cxp45bk261jzbh1yaniy0xh22v6yzqg5mfbjipmvcpc"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2135,12 +2207,12 @@ final: prev: goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2021-09-06"; + version = "2021-09-21"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "8093ded366e2e71e87f5e40da29994187c06fce1"; - sha256 = "0mm7vrmibcdsxn9b89q7skc0xcm9z5fi1bv0gg3cc8kb1gislnwf"; + rev = "0f2f5a960f4de920741614bc5142d9c83a775254"; + sha256 = "1g9mf0zyd5favsspy8sa7j25x0981n4fyhrdxix3m1dglcpc1h5b"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -2195,12 +2267,12 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2021-09-03"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "99260ca49fa587e4e3c75da429f6c76866651a6a"; - sha256 = "0rx2ma52q8pwwq8yr61wg3v0z3s7nb5zr5p15i596aa69a84a9pn"; + rev = "94477f86aba2eef070497c1624c7b8d06e183b15"; + sha256 = "1wpmk6addq754172fp4pxcad6sik85kssqzg23asjvk0sviaf9i7"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; @@ -2387,12 +2459,12 @@ final: prev: increment-activator = buildVimPluginFrom2Nix { pname = "increment-activator"; - version = "2020-03-09"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "nishigori"; repo = "increment-activator"; - rev = "bff5516da9103fb093ffc0dc993b8d535eacbceb"; - sha256 = "1swlv1mrck9s3n7fdg10c2nmlasf2fx8yfk01x3vii7l4aaa9w2y"; + rev = "55efcff88be45bd98cfdf7333dd718399373d10c"; + sha256 = "0q8990q9yxc85h69hssk4lry01qiqyi0hlnnx8l1kk218yar4q6h"; }; meta.homepage = "https://github.com/nishigori/increment-activator/"; }; @@ -2423,12 +2495,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2021-09-06"; + version = "2021-09-21"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "c4317837801c72686a342a9db4d4f7405857c82d"; - sha256 = "0sb49f6yba94zyvqqggiz7lwm31ch94rwz09p5jh4iys49kb4s4s"; + rev = "f39a3a58baa7f6dbe76db9c8b36473eedb27348d"; + sha256 = "00qwhvhfx8a6nbw6b2jjrgnj1drslqqx8yrd50324iblxhs9gbf4"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2700,12 +2772,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-08-31"; + version = "2021-09-19"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "880888469193a6bf020376bab098a7401a06e445"; - sha256 = "03hq263cqay01v6hazghma4h48j30kqpx6bbnwsar26m8vg6vpg1"; + rev = "f80ff99c434d4d233a4a8bf2d116289b6619fbcd"; + sha256 = "0l0jy9wj95vz86rzmf5yvrvmbapg8g6rfx8ls21i95kzbm02c435"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -2808,12 +2880,12 @@ final: prev: lightline-bufferline = buildVimPluginFrom2Nix { pname = "lightline-bufferline"; - version = "2021-08-19"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "mengelbrecht"; repo = "lightline-bufferline"; - rev = "0b1ec6fbb1fceebd88694e99fbc905d916c8b30a"; - sha256 = "19mwdnnvps3dr5125al5yqlbziirl100xz11jkp2rbk250pc5h8d"; + rev = "4d1ddf0508069395ed54e7eb38a47f04fb03a387"; + sha256 = "06x3zdfss58ky5z8kgca1gq2zvdqv1nfw3mgnlsj0qq52mj0jwgj"; }; meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; @@ -2844,12 +2916,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2021-09-07"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "5a856fdaf6298be5124e26bccaba68578b625b90"; - sha256 = "1x4h2dkyf6q434j75xzw0f7xm4633zm8fjm2sgrskvx1r4hbf480"; + rev = "6ca32a155406d11093f64fa97e0ba8c6802fb7e1"; + sha256 = "0f886hldkv4ws18m492lhymp92mxympp2maqr8zy4hh06i7k123a"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -2868,24 +2940,24 @@ final: prev: lir-nvim = buildVimPluginFrom2Nix { pname = "lir.nvim"; - version = "2021-08-27"; + version = "2021-09-20"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "ccbae9636949afa9d3afbcba93f35dba3437ad94"; - sha256 = "1lxh6vh4nnfldxqivnv1f03300pmm7cb5pvapa2afv6h8src8hzs"; + rev = "bc14ddcb173d332e62ce3712eb0ca3ac6d9fa59a"; + sha256 = "1sh13m98dni9dspjiwsaafzvg3nlwd41v5ma5achpzla80hzm2h1"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; lispdocs-nvim = buildVimPluginFrom2Nix { pname = "lispdocs.nvim"; - version = "2021-05-16"; + version = "2021-09-08"; src = fetchFromGitHub { owner = "tami5"; repo = "lispdocs.nvim"; - rev = "69fbcd854e9600b0f2c6f1c9ec4cb8fde8f5e6da"; - sha256 = "19n12m6rnv8blbavd2zkwwv6x7gjfziavc5i0zdh4h1l9x9hmwq3"; + rev = "811527775351070008549c3c2931f80f809fa25c"; + sha256 = "1idbl5wmj0svh01dfvcilzbx24xl4cc6i77pb3laizh4fz7x7vza"; }; meta.homepage = "https://github.com/tami5/lispdocs.nvim/"; }; @@ -2916,36 +2988,36 @@ final: prev: lsp-status-nvim = buildVimPluginFrom2Nix { pname = "lsp-status.nvim"; - version = "2021-09-06"; + version = "2021-09-15"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "lsp-status.nvim"; - rev = "a5990bfde2fb67c55575ece39b1c863d107acb60"; - sha256 = "10swm4zwdkgvn8pdqif1ai8kqshzm6bzw9k9jykpb8dxy2anj27y"; + rev = "e8e5303f9ee3d8dc327c97891eaa1257ba5d4eee"; + sha256 = "106l23n01czd8ndzfixggj8ifv80w0n19mjakac575sjrxhwbl52"; }; meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/"; }; lsp_extensions-nvim = buildVimPluginFrom2Nix { pname = "lsp_extensions.nvim"; - version = "2021-09-06"; + version = "2021-09-11"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "lsp_extensions.nvim"; - rev = "379a935b797f5f8a386bcbfd3b105da8007a9303"; - sha256 = "05q9i93xvp5p770fpg8wkyngq8ncr6b21fdkh9crcgfi1bp7rhqr"; + rev = "4011f4aec61ba59c734f5dbf52e91f258b99d985"; + sha256 = "0nzxadzc2namm1lxrklw6gqwdw6wvl2ddpg7c0alhw5c1j05lb64"; }; meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/"; }; lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2021-09-07"; + version = "2021-09-19"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "d7e5a2f5192dd09b30ccec7ad0de0323c8687e34"; - sha256 = "01v9crqps9d4wngjfnk535vqgyqqfgrfjyg3aydaa46lyj1ilcvr"; + rev = "99a81120838dad866a42823670e6b6666eb8c9c5"; + sha256 = "0mvv9xkks18d581jc6s2j2hkds3ajg7r9qsxxrrfn4g0n03gcka4"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3000,12 +3072,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-09-06"; + version = "2021-09-21"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "9748870f69236db39cc8eeb668d944bbe496634e"; - sha256 = "1fzqfl5isq31iqrl8m52ca8rrpn3rxh6xzwyr4czsx8fggi221dd"; + rev = "800e1876df24a178252520253eb63cb5c9f0e1b9"; + sha256 = "1w334jqw7b0bmrhx0036iaxb9lpi17vb1wq99kgwada7yxl5a72s"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3072,12 +3144,12 @@ final: prev: mattn-calendar-vim = buildVimPluginFrom2Nix { pname = "mattn-calendar-vim"; - version = "2021-09-06"; + version = "2021-09-13"; src = fetchFromGitHub { owner = "mattn"; repo = "calendar-vim"; - rev = "4cdf69c43d66500b1c1235f3c1c584f257115cb9"; - sha256 = "06phscsjqb3wnwdmb5w8rirj02fcz9svp5wdnzv9jkvj822ni4pr"; + rev = "6595a540a3fdf3d2a65ff18b3bf157540dc2602b"; + sha256 = "1186fbfhpb9n8cp79xbgq7q6a5sgndaldadrhshlq0nm3ajwv6v9"; }; meta.homepage = "https://github.com/mattn/calendar-vim/"; }; @@ -3108,12 +3180,12 @@ final: prev: minsnip-nvim = buildVimPluginFrom2Nix { pname = "minsnip.nvim"; - version = "2021-09-06"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "minsnip.nvim"; - rev = "0bcc73cb716b07d4286ef714f5a07d94204d484c"; - sha256 = "0k6dmqmw52scvwfr5w8dg7388cy95vdvgfw3f4prwyls60i9x55w"; + rev = "f145d2d01103eb2e1f895f9baf438f042ad3509e"; + sha256 = "03b20cb4cifrwfsnw2zgpgd9n5wx731ygkg2x2fj5n6hw1klbfzj"; }; meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/"; }; @@ -3384,12 +3456,12 @@ final: prev: neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2021-08-28"; + version = "2021-09-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "31e5725ab5666396921d86bcec2f0b6ea0028ce7"; - sha256 = "1mm827a9d848ypp6x77paqii37a1j70vwh3hayp8p7g3pv4cimjl"; + rev = "cd666d51cb4d03e509039fd35e5744bbf9db431b"; + sha256 = "0q3sdrdi78p09mns9mdpicvhrm8y6n1vna96n0v4yfjknkxa02yw"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; @@ -3420,24 +3492,24 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2021-08-30"; + version = "2021-09-14"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "3924dade3a0b06d1457958ea7aa181787478b464"; - sha256 = "1fr2lw5pfx9bs45c9knk9yz0p6pb5w51zlzqb5kr6c966hdq1msx"; + rev = "f072ef425be8a51d2130edeb7d773a1f8dc20313"; + sha256 = "0av57z1smv6nj64d5hdqgvzcrd3h0bypi1hcl22k5zpwmaqf40m2"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-09-03"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "2a9ce6bbe682c31dbd5cd59214eb0ae93dab4ab6"; - sha256 = "1pkdq2c1ac90zblrm10fbrjw3sxlifd87djnnnmc9r7xmvb4azxa"; + rev = "28e652d110e7bda263bd4b0cb3c1484dce89cd93"; + sha256 = "0106iy1zkd13i26dviv6w8jgm9hapimpj97passh2khac3ajln5c"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3456,12 +3528,12 @@ final: prev: neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2021-09-07"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "053d6bd3605a64f05de11a179cbab423fe759ebe"; - sha256 = "0qk3bhpjqi06jj1haydalvvsj7f7jbxbb168jc6i949694v406zj"; + rev = "8df876172fd9b8f6c023fcd5b84728a675cbdf91"; + sha256 = "0dqr9b2h0f2rxiw4lvws2gamwxdmnqb2qsk2ish47v7lnc772l2l"; }; meta.homepage = "https://github.com/neomake/neomake/"; }; @@ -3492,12 +3564,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2021-09-05"; + version = "2021-09-11"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "47a0a3d91ddde94488ccd03d38b5beeb296d3148"; - sha256 = "0n8scyjy3wx2l3anl3dyipx7rlayrjb5dlri2r81dr1s77vkch83"; + rev = "4c71e58684dee52f1f19f2d10e7dd4f9a50eaba7"; + sha256 = "0l12j53ga7ycm773jddi9nj0bkdjwh3d3cx9zgnxgn0ra0niq3fs"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -3516,24 +3588,24 @@ final: prev: neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2021-05-05"; + version = "2021-09-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "1315d10e60bd93483aaac4cc5a1623d13aede504"; - sha256 = "1w80id0123rbwmkicm8n053mp1wzqwh9lxxjmmp6bp6c2x97mgzk"; + rev = "24115acf7549620c1e64be1f996fe1cf5435d039"; + sha256 = "1jr4vk8r3p5qnd2l6v278c3ppggzxaq28dqmdg267rd34jybng8d"; }; meta.homepage = "https://github.com/Shougo/neosnippet-snippets/"; }; neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet.vim"; - version = "2021-08-22"; + version = "2021-09-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "3f6f5f8ad34d63ecb1060dbd6d7e2513238da528"; - sha256 = "14f0ksrn4grkpjfn766hxg1p19dryngxai33b2322dy0qaw244d2"; + rev = "0ab419e93f4256baed77229548195402e170afa8"; + sha256 = "1gsf5d610slh9cdy6i52fh0k98m5b7xvzp35l6cq008acgsvh575"; }; meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; @@ -3564,12 +3636,12 @@ final: prev: neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2021-08-30"; + version = "2021-09-13"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "5f8fbd1c8df54859c34c201515f734550fdb264e"; - sha256 = "0rdxf7qd1hn2s82c7z0f7mgaw2dmbhwdy4jdkiabdi9y5f4d66wh"; + rev = "9841e30f2cff5b1929620565c9289eb561bae75a"; + sha256 = "0h25wgv5fvkycfsvw6jb82jl3fb94fvay1ii91yqiailpwa2ig76"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -3624,12 +3696,12 @@ final: prev: nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2021-09-07"; + version = "2021-09-20"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "e5f24e2b8bc09ce6fc3488215d69ddb7cadc5f8d"; - sha256 = "13hbf5c67hi103yixc1jhp8gky02gy2hfq2im4sq7y1wwhgfxn0l"; + rev = "e731b845590017493224dfcb7403c2332105b700"; + sha256 = "1ksvs97cck1m8k1m6gngv62c7hh3l9ray82nmwyghs68mncn87nc"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; @@ -3696,36 +3768,36 @@ final: prev: nnn-vim = buildVimPluginFrom2Nix { pname = "nnn.vim"; - version = "2021-09-03"; + version = "2021-09-14"; src = fetchFromGitHub { owner = "mcchrish"; repo = "nnn.vim"; - rev = "c4c4d9531726c11892e32daa977c958ad47f7b97"; - sha256 = "1b84nh9c3pvlkgj2jldd9p8bmd3wzqxldl0y7gn6ny93f3ajgkb8"; + rev = "8833bbfa7b341896cbb9f3ed9a3b4687461e6aad"; + sha256 = "0ilkspfnlqflp0854gmha4v6zlnmslb83laab25a972svpqrg8pf"; }; meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; nord-vim = buildVimPluginFrom2Nix { pname = "nord-vim"; - version = "2021-07-10"; + version = "2021-09-12"; src = fetchFromGitHub { owner = "arcticicestudio"; repo = "nord-vim"; - rev = "7e8d8abec9226d3697a9725b24a7d840623c6b66"; - sha256 = "0zi86iqc6hznf6vnmhyk7rlqwmkl0gxvjsc55ygxkypa1075lqg3"; + rev = "c2aaac39e5cb6111dabd24be7098bf04947ca6ca"; + sha256 = "11iwjaypjkjd3s45dx3f7blpj0lkjs4jmp41sj7hlg2r7m64ss1g"; }; meta.homepage = "https://github.com/arcticicestudio/nord-vim/"; }; nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2021-08-20"; + version = "2021-09-20"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "d2b6f9d4688a381f26a652df7e1b6a49e9f33542"; - sha256 = "03jjx1mblqwdrz7g280wvdyq9sbfj6spf8k61gcq1gy7bb4qjfp7"; + rev = "ebd3ff7b96ff8f9e75ec19f77bd10cb2bb7c8e84"; + sha256 = "1grnvi8glqffbr1k4sifr0bg6dkflarzj3f6c2jbm98l4dk3vps8"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3744,24 +3816,24 @@ final: prev: nterm-nvim = buildVimPluginFrom2Nix { pname = "nterm.nvim"; - version = "2021-08-24"; + version = "2021-09-21"; src = fetchFromGitHub { owner = "jlesquembre"; repo = "nterm.nvim"; - rev = "bb612046c7775c6986e706b8ab31057ed8ca19b2"; - sha256 = "1r50z8c3jjx1ysazih298ni2iikblmj48gxh3k9p722kngfdsxjg"; + rev = "fb16fc215702b075574f83c0e332d47575da642e"; + sha256 = "1kcdkw4i1q889hnil70fjqqikzlzqcrhf0i5ab6y8mh5vpg6cp96"; }; meta.homepage = "https://github.com/jlesquembre/nterm.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2021-09-07"; + version = "2021-09-21"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "f9f4c8cd1a2af30bed35296a50eca8957fa99e3b"; - sha256 = "0yi1nhh0xh6fhqd52f6wsysylm3ls9xh7dy03990lmcv64wajx9j"; + rev = "96b977966810b5038cb3b96ec54247c7a63c9c92"; + sha256 = "1yhcm3p9msw09jh968isg09dqn49gfbjbdpvqd638siij70zs9ki"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3804,24 +3876,24 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-09-04"; + version = "2021-09-20"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "b9bb1713257ae73eec22d68579e3012134a3598c"; - sha256 = "0m71mqcsmi4masabpmidpyqc1r8v48zj2kzicg2fnw1xkmwjbh5n"; + rev = "19bb83320aec21d7fcb1514f3cb8bd8496d22ea8"; + sha256 = "18xwwdbzggfyy86mh1ji17a9b62d86cc1jnw9r93996ynqdrs87n"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2021-08-23"; + version = "2021-09-21"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "bb06f63bacdd6ca0ea6e5874843e5854ea01cb6f"; - sha256 = "1qginyalp9j9pv1pb0448ngvfjphhj03n30jjsnk7zq11pdcdrwg"; + rev = "3e9e1d9c2f49ddc018f7f6b934d7a14e0d87f266"; + sha256 = "14bz8csj0ci67fkj01jc8zrxq8pg00y4dz91dy8d5a37lzrj2s1z"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; @@ -3864,12 +3936,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2021-09-07"; + version = "2021-09-21"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "c44ae32bf52b95b0b98e08b6430b998bfde02cf8"; - sha256 = "0yhgimz1hqzb7sxhzv4hirzl89r2ri5y0h671rcl7xlhhzmmb7ks"; + rev = "0a8ca50d9e96ae5b84e71146b5eb9d30baabc84a"; + sha256 = "1lbp45hbwzprfpzrhkws853dnv1ax63bqnzav04bl787kk5ryajn"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -3912,24 +3984,24 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-09-02"; + version = "2021-09-20"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "980bdf8e68d626adba0fea7ef990966bd47052a1"; - sha256 = "06inkm5rw9lx14jz1z4r3q669wyqm46s3b6k6aiiz2b8dldz74ll"; + rev = "1ccfcc12f7d1019e4afa0a1bb64c371d0944d179"; + sha256 = "1xvvv6sxcsf6n3gxfrdxdcbvqfs8sc2fjwg6jz0rgbsavlis476b"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2021-09-06"; + version = "2021-09-10"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "8683ebb3a599cccb0ca1d850e9423debe193b468"; - sha256 = "1jd9cbwb4vpyp5mvc2zpz776j5b6313bmw3cij3q5fbg5mqzg23s"; + rev = "945ab8c0def213b26fb87f24c1953541b60bd7e8"; + sha256 = "11jznj4a45i6221s1izr17nhlayi6ry6ma0a7x01cblfzdcg60as"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -3972,36 +4044,36 @@ final: prev: nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2021-09-06"; + version = "2021-09-19"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "4c68a6463599ec432ee67b0eb337235c153c6b64"; - sha256 = "1mfi2si4x2qn5qww3lfp4827sjpa3j7ma4k1ypidpqq53fr2h8c8"; + rev = "aebf14fa2fdbdc468045d55d07641f498c548374"; + sha256 = "01hfm570hrx2paifnxxqirailxl5hfx22ay7j0cxk9v9z01p4dks"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-09-02"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "b0c31d84d8c53999365a8d38ebefd7f1e7221b9e"; - sha256 = "0cs47xpp1f6l9fsk320sk8kkqjanzwzg0718awzbj7rfbcvm865l"; + rev = "d380c831f7d0cb65d3ec3fc468392f79a79f678a"; + sha256 = "10s6qzma4fk8yd9yvfq52lslr2kzj7skl91yz0b19vv7mg9pclb1"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-09-03"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "20db45d5626c9441a9b8bb687dd8915db69b76cb"; - sha256 = "1yxrs62lpanaiw1m4wbxrhq9b7xqjmca8i2hscfzn3ydvdnd0bf4"; + rev = "fc8a5a3dfafd703a454a5a294ef8cc69d17b4ee6"; + sha256 = "1jn3ay74sf1z7mwm4sv4nz7lcq7qpyr2vx6h8j844nkb0azvhi5q"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -4020,72 +4092,72 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-09-06"; + version = "2021-09-21"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "3792030b5281a2f7bcc186e04440036b44648e90"; - sha256 = "0wq82v8z0vsnbakc5dnn0f00bjm3mirqdaq3zlq0z2gx7jkmldfg"; + rev = "2aae87e2f5f7afd2a6fb8c75bcb63908299390b2"; + sha256 = "1lxlh0jbz2krfl4f037h2x992yc5riqznq257rahy7n7nydd0yma"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; nvim-lightbulb = buildVimPluginFrom2Nix { pname = "nvim-lightbulb"; - version = "2021-08-21"; + version = "2021-09-21"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "e94e434f4549c9c331f875931b3e804fb1d2bc16"; - sha256 = "0043vzjp4p48xw03xn9g5l0daplg3rfijqxdq00kp0s6np3c312j"; + rev = "5b265fe19a3a60b6429b34c8cfdb0284ce52de33"; + sha256 = "0m2kq0rs0rkif8d8783dbd9dwahzih67zfz3wi58r5lsm4fnai9h"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-09-06"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "ea72eaae8809c0e475a8248aa665034d7d4520db"; - sha256 = "01mzyf0d5q0wmr9md6dj3yxlxqc3s80mz43ig3lkz7cgywjzn3qz"; + rev = "aa0b9fd746d73a5ebbc72c732c645e96423d4504"; + sha256 = "01jgxf8bgra4sgh63zpb5xga9lyb3bvpqcdzjk3vp6gyks66fb6h"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; nvim-lsputils = buildVimPluginFrom2Nix { pname = "nvim-lsputils"; - version = "2021-09-07"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "RishabhRD"; repo = "nvim-lsputils"; - rev = "0800dfa7307a64a3e195e62b775f20bb14f557af"; - sha256 = "0s9pp4azvvss8h38hx6r0b5a2nvsf72iqckmzhjnqnxs2w14b839"; + rev = "e09390daebda810e24c7feb060fde2ea51f99a6c"; + sha256 = "1638an4mx5z0w9w3sinr4s3h6y3wsmymqh59pb5s6rx9pimqw7b2"; }; meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; nvim-nonicons = buildVimPluginFrom2Nix { pname = "nvim-nonicons"; - version = "2021-07-03"; + version = "2021-09-14"; src = fetchFromGitHub { owner = "yamatsum"; repo = "nvim-nonicons"; - rev = "93450b02533516231e16ddc71f8ab1caf5005eaa"; - sha256 = "1mfvi3mzid0fwhgwrg8w4bjy0x6hz78jij60h0ivblvlfai6w0qr"; + rev = "c38ff086e0157b91d0951f83741170bdcf501a9d"; + sha256 = "1vjh82kjs4ki61r0lnidd8xpj6zvc0j4k76fbs7fy0ndzsbph6gw"; }; meta.homepage = "https://github.com/yamatsum/nvim-nonicons/"; }; nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2021-09-06"; + version = "2021-09-09"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "6602d0d2bec64994e2f3d5b2038e98cb67101828"; - sha256 = "0njp63lignvm7b6akq3v840wkyqfw2crips36rvxljy00d5q4smz"; + rev = "2f5559d38967587d4982bd70002b6e8091a7dfb3"; + sha256 = "0a51z3a2n9k80s60palm1gdry3n5zfv8vs8swvqla9zjvj3d960h"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -4104,12 +4176,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2021-09-05"; + version = "2021-09-09"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "ac9ce2834753eee1a8cdb8851567f968d2770870"; - sha256 = "1j4xdrk8lvjglkkadkvmcwap2ikgcvymsds2xzmix3xjn5kvrjxj"; + rev = "e4c243ebdbe1a224016d7139169789c9ba5d6426"; + sha256 = "0hq6m68ydmg24q5ksz5im61wvqdm08v7j3bp76vsw7x06igxp12l"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -4128,12 +4200,12 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2021-09-05"; + version = "2021-09-21"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-spectre"; - rev = "0f10e9fe2553cb8c0a1512924a2639035559e0bd"; - sha256 = "15bahq0gspjl263bjlpd199brf3ns126j2mrlfxsqzlcnc53y7za"; + rev = "966a8ca70599e818108b92f49ff45105df98f3cc"; + sha256 = "1x20a8pklmhanqvbiykwznwpgsg2mr6l2m3w6xkhjxpll7kb2vy4"; }; meta.homepage = "https://github.com/windwp/nvim-spectre/"; }; @@ -4152,24 +4224,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2021-09-04"; + version = "2021-09-12"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "71122d798482e30c599d78aa7ae4a756c6e81a79"; - sha256 = "1gdhq3q0r63z5qy29h833v8g77y1d6939z1n1y1skjay4y9krx2z"; + rev = "d7f73b5ae9c8fa85535c32e2861c2cb97df5d56b"; + sha256 = "15j4q0qa84mg5bnnr216njbq26pq0a9z5ggd6s0wdfzkiqkhswz1"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-07-18"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "27f5e99cdd1b4e7f6a5cc30016d990ebf81a561c"; - sha256 = "1msnzijwz4bj7hv8zkzp0x3y3dwwm3v5n63pmdx865d8ggb8dln6"; + rev = "47cfda2c6711077625c90902d7722238a8294982"; + sha256 = "14di7qm37m176r0qsbb0vmc3csya72rd5bszm6yk7lby8izfnqxa"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4224,36 +4296,36 @@ final: prev: nvim-ts-context-commentstring = buildVimPluginFrom2Nix { pname = "nvim-ts-context-commentstring"; - version = "2021-08-17"; + version = "2021-09-09"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "72a3f45a294a4a871101f820c6b94a29bd9b203f"; - sha256 = "12cpak7b2aw2wrfx6gpw4lqx9c65q4fibsy5vf3a7h5g1i6yjg2m"; + rev = "a2283cfc9f4aa892349004153ab54dfe8911241c"; + sha256 = "1zf9jfzxpc9n7vd40lm8c8yys8lsyq0rnv9ywwdwsfai4pjj3x0z"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-08-27"; + version = "2021-09-08"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "aa27d56bc53a82f501cd89cd797969f5e2211c61"; - sha256 = "1xaigr825wd1q4kxayki8a1pqfcyps07llfl6naa05k5x4g59izv"; + rev = "2f39c594a8d110bd4fcb75288a7d03cb93c81ea2"; + sha256 = "1aziya540ddix71xhivkqjrr3s57mwlgfwix3pg2gkwajjnwxwml"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2021-08-31"; + version = "2021-09-11"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "c8ce86df2ee0f5bb455c4188c8a4c77d3c9ef714"; - sha256 = "1n6cp02zmz3ykgw7ywh59fw48q13s3friql7cfbx8sdb1qsjmh8h"; + rev = "be8bb70502441e3bdd4911cf7998dc16d7535706"; + sha256 = "0sz6y0jzzb84ws5p8m49ry43dl9y0ahbppx5qy61i72bahv9hkpj"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -4344,12 +4416,12 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2021-08-30"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedark.nvim"; - rev = "7dc9734260e8af794ab69d6976a693e8c631d617"; - sha256 = "1hw9m6fasbpy67a4h2a0zw7231gpc4995aj6p4ljk4kw6672mnlw"; + rev = "8eceb078f8093c10b4a68d68203f4edf99db112a"; + sha256 = "1wnhgbi8hgrsnsq78iz7z1v7acfjrbhs08dykf0g4km03s4wa7qb"; }; meta.homepage = "https://github.com/olimorris/onedark.nvim/"; }; @@ -4392,24 +4464,36 @@ final: prev: open-browser-vim = buildVimPluginFrom2Nix { pname = "open-browser.vim"; - version = "2020-05-20"; + version = "2021-09-20"; src = fetchFromGitHub { owner = "tyru"; repo = "open-browser.vim"; - rev = "d6f1784685abdd86500fdb5fa2fbaf2aab833f18"; - sha256 = "1akgsq1v9v5klm995y09zmka0hbfsa0gr44gyp2nvqi9ggfadp0k"; + rev = "4d7131705ee97db15e10ec59f6de808feffa1f2e"; + sha256 = "1sxfflyrfly16l6b6lrga8r7mn7if7w9243lcx05jvp1sjdkw21n"; }; meta.homepage = "https://github.com/tyru/open-browser.vim/"; }; + orgmode-nvim = buildVimPluginFrom2Nix { + pname = "orgmode.nvim"; + version = "2021-09-21"; + src = fetchFromGitHub { + owner = "kristijanhusak"; + repo = "orgmode.nvim"; + rev = "09d3d87b5a48cb31b8b1ddd84a1aa2012771fb9a"; + sha256 = "1l1jlcabjhqbz7dv0mr1qwajavq288y1ki07sjq70r8dzpzprg27"; + }; + meta.homepage = "https://github.com/kristijanhusak/orgmode.nvim/"; + }; + packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2021-09-04"; + version = "2021-09-20"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "daec6c759f95cd8528e5dd7c214b18b4cec2658c"; - sha256 = "1mavf0rwrlvwd9bmxj1nnyd32jqrzn4wpiman8wpakf5dcn1i8gb"; + rev = "0a2d8cbaa2045bdf3797af7a5abb2d42d0edecb0"; + sha256 = "01xx86wj4yx730mpzzy805dh72ridvbhk5540zylbjxwwb5dh1y7"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -4428,12 +4512,12 @@ final: prev: papercolor-theme = buildVimPluginFrom2Nix { pname = "papercolor-theme"; - version = "2020-12-04"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "NLKNguyen"; repo = "papercolor-theme"; - rev = "845cfa94d95d404ff59e0bdc578b299279e1dc07"; - sha256 = "1r6p9ll3bfblz9sfzg0391zjswvmi8wwcc010w8mjsayjclmpwf8"; + rev = "643afbb7158b77cbd491fd9874a8758d0484255a"; + sha256 = "14dzmavrak99i2ahwwccxcqkkj9a1b7ch9mlmpg56y6y4v65ss1h"; }; meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/"; }; @@ -4500,24 +4584,24 @@ final: prev: playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2021-07-27"; + version = "2021-09-15"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "deb887b3f49d66654d9faa9778e8949fe0d80bc3"; - sha256 = "10jlgsqkplisa1fd7i36yb46fdsa0cx069bpwp2yl4ki2jys953j"; + rev = "787a7a8d4444e58467d6b3d4b88a497e7d494643"; + sha256 = "1y4dwbs40qn942x0hd93yrk04yiphy73b45vcjrknmxq9szhvhk0"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2021-09-01"; + version = "2021-09-21"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "06266e7bf675ba9af887fb6d1661b289fdd9bcf4"; - sha256 = "02c1y9ygzq8fmcgy7l4khpb141v2fww3gbl8vf0ds2f70zgglxs4"; + rev = "03ac32af651bb33acfc4ce20d5cb51bf5a424aa1"; + sha256 = "1rvw01i89mz43fzyxrynvfyxhb0xsijllf3y8yp5dvy61i9c7yar"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -4571,6 +4655,18 @@ final: prev: meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; + presenting-vim = buildVimPluginFrom2Nix { + pname = "presenting.vim"; + version = "2021-06-02"; + src = fetchFromGitHub { + owner = "sotte"; + repo = "presenting.vim"; + rev = "fd826318582ffccf2f79aff7bef365d68f2ca4fc"; + sha256 = "1s2c44ngv5vpszwg0nkcghb5flzq9pby1m0l7gr7vwb9p7xl3b83"; + }; + meta.homepage = "https://github.com/sotte/presenting.vim/"; + }; + PreserveNoEOL = buildVimPluginFrom2Nix { pname = "PreserveNoEOL"; version = "2013-06-14"; @@ -4765,36 +4861,36 @@ final: prev: Recover-vim = buildVimPluginFrom2Nix { pname = "Recover.vim"; - version = "2021-07-22"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "chrisbra"; repo = "Recover.vim"; - rev = "48b6bc12b560d3013cd30c7959e235993374c24b"; - sha256 = "1ia2bv7yigcv944rkqy7jlrzi71m3k9kzj1hjhyrk0c2rg738r94"; + rev = "222c311cd9495ee2fce8945eb5b846832f14ccac"; + sha256 = "0xmzm88fyf7z4crc6gadnxyaagzskgpvfd54ddcchfw90jl47n6a"; }; meta.homepage = "https://github.com/chrisbra/Recover.vim/"; }; refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2021-09-02"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "220685f62532d28af64def09266b8341502044cc"; - sha256 = "0pv78vkhsnhc690q449950abxlr6w88xj60g39hyx9y5wkq8aqks"; + rev = "fbea6d958aa337194d4c4fbcac9a983d7b99815e"; + sha256 = "0wpdy8ng64c0nn6fakg4yc4z8wrkligwfg70sdlyfcg2qi1skj87"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; registers-nvim = buildVimPluginFrom2Nix { pname = "registers.nvim"; - version = "2021-09-04"; + version = "2021-09-09"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "b99098afe11d275297715f06ddea4536e90eac7a"; - sha256 = "0f42zvbgqqv3vs5rplwwyx9pdsysm375nyr3fdb0xdfx2gn9wc38"; + rev = "3f522bd7375dc780714c1ebe7fe398f4e45f0e52"; + sha256 = "013n3ci6605qa6dvabg02nhln9s5ahh9gvzh07w3ikvb53wp31h4"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -4885,12 +4981,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2021-09-07"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "cd5105d76fc124634b53039c02ea253cc06bc9b9"; - sha256 = "1bhjzng02yfnlfr3kvh6lkl5vbpcmcd51kpgg7yjxmlzlga5k2k3"; + rev = "83bf0cabe040a6e02b59296622c838831a2b5c4f"; + sha256 = "0d2gl768rgd5l1wh9sq2z24rdmg5g27ib6fjfdcvxdlc2s5g333l"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -5041,12 +5137,12 @@ final: prev: sideways-vim = buildVimPluginFrom2Nix { pname = "sideways.vim"; - version = "2021-07-15"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "960afef88aef374d3525e1536bdd505727b42d67"; - sha256 = "08yj3p31d5gnd3qyv6dcpz87s3kwz1kgcb5h92w83wf64r6fzq61"; + rev = "56296bd82973139e6fc394689854b959e35c7cdd"; + sha256 = "1x93bnrywypqlywj5f70y5aaici5yqlpky456w15psfs84piyil7"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; @@ -5088,6 +5184,18 @@ final: prev: meta.homepage = "https://github.com/mopp/sky-color-clock.vim/"; }; + slimv = buildVimPluginFrom2Nix { + pname = "slimv"; + version = "2021-08-24"; + src = fetchFromGitHub { + owner = "kovisoft"; + repo = "slimv"; + rev = "1c1ef6dad577e8c5fb7d94ec3b6d698b68e7730d"; + sha256 = "03wy3apmzbrjxypq2xv1z71xnx7bkvhyarw5w1y3l8gl430vjmgi"; + }; + meta.homepage = "https://github.com/kovisoft/slimv/"; + }; + smartpairs-vim = buildVimPluginFrom2Nix { pname = "smartpairs.vim"; version = "2018-01-01"; @@ -5126,12 +5234,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-09-03"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "61b796d94e7b0110f1bdf321cc1d19a841697a42"; - sha256 = "1jan5ahp3rpr71qvjnd4jf4kxl7ijknaw3d3h0svlzhqd0pbq92p"; + rev = "7722b4b25bd6319ed059ecebeb7857471b8357c9"; + sha256 = "129lcawsg31xbbw0h63f92g0dy5idgdb4v8sd1rl5sp9qqvzfp5a"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -5247,12 +5355,12 @@ final: prev: sqlite-lua = buildVimPluginFrom2Nix { pname = "sqlite.lua"; - version = "2021-09-04"; + version = "2021-09-21"; src = fetchFromGitHub { owner = "tami5"; repo = "sqlite.lua"; - rev = "f43b038b4e1c05c457d36b89afe240089089358d"; - sha256 = "1681hzxz4pykb6svk18mhv8w5wr9c2m626sfyvpg9na25w4d7ijd"; + rev = "828cf63fd2494cd47bd6d2a3a5b927157d3204d1"; + sha256 = "0h34xl1ich9m4xgz3a9ck9liyya6swmmc9iqcr61lihhgh5fz3qz"; }; meta.homepage = "https://github.com/tami5/sqlite.lua/"; }; @@ -5355,24 +5463,24 @@ final: prev: swift-vim = buildVimPluginFrom2Nix { pname = "swift.vim"; - version = "2021-08-05"; + version = "2021-09-10"; src = fetchFromGitHub { owner = "keith"; repo = "swift.vim"; - rev = "e83ca052e88805b8b20bc2558e7995461665e306"; - sha256 = "1in7dz0h9a4phw57a3fk7h2lmn3hrcn17vaqjimpp7hwlc160467"; + rev = "3278cf3b0522e6f08eaf11275fedce619beffe9a"; + sha256 = "0hhi49iwkgzxhdixj0jbc4mbgad1irb056ijf7l5022r4k4gs2n8"; }; meta.homepage = "https://github.com/keith/swift.vim/"; }; symbols-outline-nvim = buildVimPluginFrom2Nix { pname = "symbols-outline.nvim"; - version = "2021-09-07"; + version = "2021-09-15"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "02ce2dab138a12a36c422ac58fabe9f5a35c664c"; - sha256 = "0z5a5q49csfgz0zdad11q75r8ck150ypj866199cl4j1mzb0xdgv"; + rev = "a8cab53271c97ff6d2a0c18756d7b4e71012d41c"; + sha256 = "1nkc0qj4birsydd278hkkjyvkyi69gva367h8fpnk0ss2i621rcc"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; @@ -5403,12 +5511,13 @@ final: prev: tabnine-vim = buildVimPluginFrom2Nix { pname = "tabnine-vim"; - version = "2021-09-02"; + version = "2021-09-19"; src = fetchFromGitHub { owner = "codota"; repo = "tabnine-vim"; - rev = "d0f294cbe6dcdd226240a7d2a598cbba05581389"; - sha256 = "1iq6j6g68q4c9dnsnf0i6p2z1ipygm9kmjzwz5i5rl52nhkc18f3"; + rev = "7700a2809a08c1774bba6fa140c61bbd9831e12a"; + sha256 = "1swc4y8njgr343hfc4qiyfxzavz9fhzg6hnrplxm3zm8i8fbqz68"; + fetchSubmodules = true; }; meta.homepage = "https://github.com/codota/tabnine-vim/"; }; @@ -5499,12 +5608,12 @@ final: prev: taskwiki = buildVimPluginFrom2Nix { pname = "taskwiki"; - version = "2021-08-13"; + version = "2021-09-21"; src = fetchFromGitHub { owner = "tools-life"; repo = "taskwiki"; - rev = "832293f9f797ce56a35be1a9c28ed8ddc3113364"; - sha256 = "0568xnfhf7kd31nf0l10rxd5gnp90wph3623wrxrg3al5ix7jy6n"; + rev = "70b33f336a0388c2d4fc72ecf7cab2245df580b8"; + sha256 = "1k3yh2ypzy6vwdvf1rrnswnpc9cqnjhvdsjal7yfqk2brvwawk46"; }; meta.homepage = "https://github.com/tools-life/taskwiki/"; }; @@ -5521,6 +5630,18 @@ final: prev: meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; + telescope-coc-nvim = buildVimPluginFrom2Nix { + pname = "telescope-coc.nvim"; + version = "2021-09-14"; + src = fetchFromGitHub { + owner = "fannheyward"; + repo = "telescope-coc.nvim"; + rev = "7b8aa399b31998b7adf3da505a1952b1310d429c"; + sha256 = "1x1m13yk222lay6j4w76y9ydbvn52022gif34d452n2x7jk0cvbf"; + }; + meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; + }; + telescope-dap-nvim = buildVimPluginFrom2Nix { pname = "telescope-dap.nvim"; version = "2021-03-26"; @@ -5547,12 +5668,12 @@ final: prev: telescope-fzf-native-nvim = buildVimPluginFrom2Nix { pname = "telescope-fzf-native.nvim"; - version = "2021-08-27"; + version = "2021-09-15"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "66c8705414483d768b25f7e19d445e3df0d62625"; - sha256 = "1hg908k21zbmdc4qmdnpq5kz4lfwdrghmxibcm5li6c5shb0rs1q"; + rev = "59e38e1661ffdd586cb7fc22ca0b5a05c7caf988"; + sha256 = "0ipdrzivz04921i1l81bc1xck5smi0c61isfj5g8zyl0mwa0dvrm"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; @@ -5620,12 +5741,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2021-09-07"; + version = "2021-09-20"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "12a44ededa1fc2426d40886feb4034230759a19a"; - sha256 = "0h2idrbi8ahldvgrlcl6hi5bjm2gwd4raz3k7mc3k34vmfk3r29z"; + rev = "60660334c70d9d81dccc10a563e01920b9455e76"; + sha256 = "1ss1yrbsp4hnw7h1aqb7bkpd9p594r0g1906sgsmcglyjyc1zasc"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5765,12 +5886,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2021-08-24"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "ef7a882a818d1bf2598bc58ca0bc158d097d499d"; - sha256 = "0sdp260jnal7qmdqskxwk5cg1c846fz65xr66b18s0y0lm5z53c2"; + rev = "f725433e59422d0514ffa2582c534da965b0e44f"; + sha256 = "0pd7cjzyiygybalqh7a0x84jdir8lrd2q5x7q9yjjnwy936k89c1"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -5979,6 +6100,18 @@ final: prev: meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/"; }; + vifm-vim = buildVimPluginFrom2Nix { + pname = "vifm.vim"; + version = "2021-09-21"; + src = fetchFromGitHub { + owner = "vifm"; + repo = "vifm.vim"; + rev = "858ef2d7a637b1c50c9266806473d895829d0775"; + sha256 = "1fbnhcxwic629nz49vp8qdxr164dqnlp7gfdb4qngj2j2mv6g44r"; + }; + meta.homepage = "https://github.com/vifm/vifm.vim/"; + }; + vim-abolish = buildVimPluginFrom2Nix { pname = "vim-abolish"; version = "2021-03-20"; @@ -6233,12 +6366,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-08-11"; + version = "2021-09-21"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "0de4c9df21abf9256091d205148601f718d3a12c"; - sha256 = "12k3kdxnmqhkb8f71cqrrf1xwphlcc7nbimlxkp7my5y75xrk6lx"; + rev = "26f922753a288df639b8d05d13ed62b9b04a26bc"; + sha256 = "0ikjcdx7c0k8skl6mwywpnqdprp64fhvpkvzz0v95s1p7pmjbl83"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -6315,6 +6448,30 @@ final: prev: meta.homepage = "https://github.com/ThePrimeagen/vim-apm/"; }; + vim-argumentative = buildVimPluginFrom2Nix { + pname = "vim-argumentative"; + version = "2014-11-24"; + src = fetchFromGitHub { + owner = "PeterRincker"; + repo = "vim-argumentative"; + rev = "63a5f7deb675c38126de626f4c00e000902462fe"; + sha256 = "06ggdw08gha51r8m35ncgbp6b52lcw52l297b8d9z1c4r6b0s1vj"; + }; + meta.homepage = "https://github.com/PeterRincker/vim-argumentative/"; + }; + + vim-argwrap = buildVimPluginFrom2Nix { + pname = "vim-argwrap"; + version = "2021-06-11"; + src = fetchFromGitHub { + owner = "FooSoft"; + repo = "vim-argwrap"; + rev = "f1c1d2b0c763ed77f9b9f2515ffff99a72c6a757"; + sha256 = "03mnvb9sb1angzyyhm7d708yzb26bnrqv1x7dy67r1b6rflvv4wz"; + }; + meta.homepage = "https://github.com/FooSoft/vim-argwrap/"; + }; + vim-asterisk = buildVimPluginFrom2Nix { pname = "vim-asterisk"; version = "2020-02-03"; @@ -6341,12 +6498,12 @@ final: prev: vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2021-07-22"; + version = "2021-09-13"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "80ba8b13a9699db20754623a0933095be65fc203"; - sha256 = "0crlkxc55lk37vy52yxwpp84bc3rd7a5am71xj9zl29a4xap5mdp"; + rev = "a65a58db77ad1b5889a68bedbea890c8161b7f8c"; + sha256 = "1frvyb3xpd4njh7ixg1ywj8x11ga343kqrmrgncb45scv12i7hx4"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; @@ -6413,16 +6570,28 @@ final: prev: vim-better-whitespace = buildVimPluginFrom2Nix { pname = "vim-better-whitespace"; - version = "2020-03-24"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "ntpeters"; repo = "vim-better-whitespace"; - rev = "8cf4b2175dd61416c2fe7d3234324a6c59d678de"; - sha256 = "1iga1xdzygnr9rhv0kw01nr3vahl2d486p06slmri2vy8ngzym0q"; + rev = "c5afbe91d29c5e3be81d5125ddcdc276fd1f1322"; + sha256 = "10xzxavz010a8ildkfmikyi0ly6rqi5d6a2ndzr0frd9ingbk79r"; }; meta.homepage = "https://github.com/ntpeters/vim-better-whitespace/"; }; + vim-bookmarks = buildVimPluginFrom2Nix { + pname = "vim-bookmarks"; + version = "2021-08-22"; + src = fetchFromGitHub { + owner = "MattesGroeger"; + repo = "vim-bookmarks"; + rev = "9cc5fa7ecc23b052bd524d07c85356c64b92aeef"; + sha256 = "1w8g9jvyi765sp2icjb6c20yn0y6w69zfyh37a367aqk7r76nbk5"; + }; + meta.homepage = "https://github.com/MattesGroeger/vim-bookmarks/"; + }; + vim-bracketed-paste = buildVimPluginFrom2Nix { pname = "vim-bracketed-paste"; version = "2018-05-22"; @@ -6533,12 +6702,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-09-07"; + version = "2021-09-20"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "84cbe8dc7bfcc53422971ae89f1eda4d95611d50"; - sha256 = "08scpqjkqmjl3wh58haa9ii9rabilllgb60jrj8sc4hs9zr4n04n"; + rev = "e5490b568561d51ea41ccc72e3cef88f85c8968a"; + sha256 = "19r3kgr2ahfyvm7slf6qvyxbzjviiq6ckkrqnkws6pr0n3jz1irl"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -6677,12 +6846,12 @@ final: prev: vim-commentary = buildVimPluginFrom2Nix { pname = "vim-commentary"; - version = "2021-03-23"; + version = "2021-09-14"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-commentary"; - rev = "349340debb34f6302931f0eb7139b2c11dfdf427"; - sha256 = "01lpfcn2hmvxddcf97f4qx5vksxj1hwrxb0c8ri59z9lb9z2hgjd"; + rev = "627308e30639be3e2d5402808ce18690557e8292"; + sha256 = "0d056h2vh3bzc3mcijq90y5c7rvg01zzxyfc826h4f79y1fz8jnp"; }; meta.homepage = "https://github.com/tpope/vim-commentary/"; }; @@ -6797,12 +6966,12 @@ final: prev: vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2021-08-23"; + version = "2021-09-20"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "6f8b99868fd5560d6eb47f82ca76ec62e3d5ae78"; - sha256 = "0n1hvyv9555rgi3qajy3d59v1nqdwcrr0l4nqzc0pr0cg9q7d6g3"; + rev = "8fcde4c500440757f04e38c039005319476d1471"; + sha256 = "1b6759y9s8sl6d96xzc2lx5qqh0x5sabls12hz0zj6s1736hs3sk"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -6929,12 +7098,12 @@ final: prev: vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2021-08-12"; + version = "2021-09-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "ed9538655a6ab3e8f48be7c32657ec974242845f"; - sha256 = "0zskv8isxg3yfsqw5bzi0n6ywhha63rnah4k6skjycawcb9i8bvv"; + rev = "c88f1b1e4fd428d826fa38c272ed80b6518d37eb"; + sha256 = "13zxw6779drlhcms5pmdxp5k4nmvxjzjsw64jkqjmabdsjlm0hz7"; }; meta.homepage = "https://github.com/tpope/vim-dispatch/"; }; @@ -7323,14 +7492,26 @@ final: prev: meta.homepage = "https://github.com/thinca/vim-ft-diff_fold/"; }; + vim-fubitive = buildVimPluginFrom2Nix { + pname = "vim-fubitive"; + version = "2020-09-10"; + src = fetchFromGitHub { + owner = "tommcdo"; + repo = "vim-fubitive"; + rev = "5717417ee75c39ea2f8f446a9491cdf99d5965e9"; + sha256 = "0lkp5i8s1214b9b1q9mg3aq32cvqzfd8q0i90bx9nf6n42cg2kjn"; + }; + meta.homepage = "https://github.com/tommcdo/vim-fubitive/"; + }; + vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-09-06"; + version = "2021-09-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "6f07d7e6cd23b7a76dc461fdfb1984717d233806"; - sha256 = "01kb2xhjd57irqzinvsiif60dkds6f80yjw7k2hl480szx62j57q"; + rev = "e1d382b3e7e7491acea8546ef3bdfa9ce7e54fef"; + sha256 = "1y1iascskvqq08020c7ks8xhn0b4zrsxva326iaa3ypwhsjada94"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -7385,12 +7566,12 @@ final: prev: vim-git = buildVimPluginFrom2Nix { pname = "vim-git"; - version = "2021-08-28"; + version = "2021-09-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-git"; - rev = "3d68c6dcaa303f0144b7657e00b46ef98f0deb82"; - sha256 = "060djzwpx5imlw3lb3kifp3gl0drn32a2dvb5baddg0kacahdvky"; + rev = "8565831452c355cd4aa49d6877c094c377cd5ce8"; + sha256 = "0i8h4wp036j1ll36gzqypxxxnwp6084127753pqg2c1pi37hk4mp"; }; meta.homepage = "https://github.com/tpope/vim-git/"; }; @@ -7457,12 +7638,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-09-03"; + version = "2021-09-12"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "4a429a0fc85c2a95b24544373516fdee805c3a56"; - sha256 = "07m51777mgww3ryclfcph7nvxrywc6zx9nzx9y5pqgcl8q87h711"; + rev = "abe94c3fcf681fde772f2906fbbdfecf5afda7c8"; + sha256 = "1fdl2rdvdjvyai2pj1v6cr21a10pcdg5277616lbfbbl3p7iak63"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -7481,12 +7662,12 @@ final: prev: vim-graphql = buildVimPluginFrom2Nix { pname = "vim-graphql"; - version = "2021-03-19"; + version = "2021-09-18"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "de5753e3fbd89f2939a43cfc2c6a2313ff129a21"; - sha256 = "15qy6adhgfwjh6jrw9902hl67qzhdi72kqgzdk5shgfyndzar25g"; + rev = "9a9fe186a73fce636398ee7f851466ef60c9fde5"; + sha256 = "0npqcpciq1pwm1ac6ldlyvrg7mhjg4ybrpmmld9b4nysiws97cnq"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -8288,12 +8469,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-08-28"; + version = "2021-09-20"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "4bbb22d694e1ca1132a9bbee4f491b48041e1710"; - sha256 = "035bf331rr4xbxi8mlnlhnvrg3q97lnpgzkgw1gc7d7rsbf0gz6p"; + rev = "daaa7dbde55d829dd456f458d90ae2ba98717ed2"; + sha256 = "1lqx3ixdf3l4pd4k2cbhxpsja66lm30bas4zciyxq5c9fgbpg091"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -8528,12 +8709,12 @@ final: prev: vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2021-09-05"; + version = "2021-09-20"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "3582a24f46c965cfe5d6b0c50f636f52168df650"; - sha256 = "0wmrc4z4l8rk96kkixb148d53jzdm4w4vxlqidjm8q4d9vxnf6sb"; + rev = "d02e928db459d3c9e9727d990838caa70b83714a"; + sha256 = "0qqyr1r4sgbwylr2i1rpqkx9ww2im5nk3c2qai420ywp3y4hr8x5"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -8684,12 +8865,12 @@ final: prev: vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2021-07-30"; + version = "2021-09-07"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "38476f9e61582d17d5e724fd3977913a9c0af5a4"; - sha256 = "1zadap09iqdbssmqf44543hhkga696bxfv3gjcxln6xjfwmvmrck"; + rev = "2f57074fc9f67128b30ce32949130a8dbda0b098"; + sha256 = "0b2kssdbzknc43jx4xjl0c4q4v01735d5wsr77zmb9vq3k48hd7j"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; @@ -8828,12 +9009,12 @@ final: prev: vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2021-07-28"; + version = "2021-09-10"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "ce31cd1d2f4e8eee9fd91325e4599f15cb9566fd"; - sha256 = "16wxmqq90n2153w1lkycq2drpcgdxmrsfiizz0m2vi17ph69avnr"; + rev = "4d4aa5fe553a47ef5c5c6d0a97bb487fdfda2d5b"; + sha256 = "0xavwlgmr2z86kkj1xg5c6ly2agaaa6l6mzsjnbmc98r720z6q88"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -8982,6 +9163,18 @@ final: prev: meta.homepage = "https://github.com/romainl/vim-qf/"; }; + vim-qlist = buildVimPluginFrom2Nix { + pname = "vim-qlist"; + version = "2019-07-18"; + src = fetchFromGitHub { + owner = "romainl"; + repo = "vim-qlist"; + rev = "be8fba124bf13314435b1faab8f628436d4cffb1"; + sha256 = "0ska2mzx3hqqkq3fd09r0hlk2j8xc8mbbwfky31x3cmzsb9dksqw"; + }; + meta.homepage = "https://github.com/romainl/vim-qlist/"; + }; + vim-qml = buildVimPluginFrom2Nix { pname = "vim-qml"; version = "2020-11-03"; @@ -9128,12 +9321,12 @@ final: prev: vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2021-09-05"; + version = "2021-09-10"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "10dfcbe875b392b6c98585bd0a07794f0cc78906"; - sha256 = "0gfzvxi890bmgp0c4wbfk5ppawm8cq187p73id2spj2zqhfgjhvn"; + rev = "a2b8e9151a5a753fc93ed86e3d1e030c65553874"; + sha256 = "0mmzwqlfc3kc4fqrwy69p97nmdlscjxalnn552qdvbb1nvxv7czi"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; @@ -9404,12 +9597,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-09-06"; + version = "2021-09-17"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "ef4f418e5326b2069ab767e4139b7bd3dfa5e0f0"; - sha256 = "1wxv22d79mv0jns0jcfkww4xyilwpvcmi82jd1b92l8b3xc6awyp"; + rev = "1648b3acf193682668f1ee8e566b03cfed2ac797"; + sha256 = "17db1v36mbhys1zhq9rv7g3gi3gdrl2b9x0gx4g5ffqh7nssw6wf"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -9524,12 +9717,12 @@ final: prev: vim-stylishask = buildVimPluginFrom2Nix { pname = "vim-stylishask"; - version = "2020-04-05"; + version = "2021-09-10"; src = fetchFromGitHub { owner = "alx741"; repo = "vim-stylishask"; - rev = "dcc12c724cec7f8aee7ad197752710eaa3bfd12c"; - sha256 = "09k1n6r9gy3jikss84y141dqqsgc1a1ia89jj0367an53pfl6dn2"; + rev = "4819e57980617eba24856ba6c0134596904ed901"; + sha256 = "03wz665s6lj42bhll4radpxyqhjylwnb20cgd2giyxd9ab7sy4cg"; }; meta.homepage = "https://github.com/alx741/vim-stylishask/"; }; @@ -9645,12 +9838,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2021-08-13"; + version = "2021-09-15"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "b980e646e5f91d6e65659737b584e484ef918984"; - sha256 = "073lpxmrs41zm0mqxf6pmf88xvkq1fngryl8rp1lcgkrwbl7isg4"; + rev = "bf200532aa8e2097af0f26e73b4f00c0cadb3118"; + sha256 = "1s6qqpj1iyrm2cxig3vhxmpb4mcg0d82j1ai7iz4r2rq008m2aqv"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -9667,6 +9860,18 @@ final: prev: meta.homepage = "https://github.com/glts/vim-textobj-comment/"; }; + vim-textobj-entire = buildVimPluginFrom2Nix { + pname = "vim-textobj-entire"; + version = "2018-01-19"; + src = fetchFromGitHub { + owner = "kana"; + repo = "vim-textobj-entire"; + rev = "64a856c9dff3425ed8a863b9ec0a21dbaee6fb3a"; + sha256 = "0kv0s85wbcxn9hrvml4hdzbpf49b1wwr3nk6gsz3p5rvfs6fbvmm"; + }; + meta.homepage = "https://github.com/kana/vim-textobj-entire/"; + }; + vim-textobj-function = buildVimPluginFrom2Nix { pname = "vim-textobj-function"; version = "2014-05-03"; @@ -9801,12 +10006,12 @@ final: prev: vim-toml = buildVimPluginFrom2Nix { pname = "vim-toml"; - version = "2020-12-08"; + version = "2021-09-21"; src = fetchFromGitHub { owner = "cespare"; repo = "vim-toml"; - rev = "3c5face8e8944a217af45bc5bb708ff7dfcf1a54"; - sha256 = "0g3hj9lcwd2vzcfkdrydhga2n82144llkvrxcjdn6zl84pjcvgd2"; + rev = "9a05931018f4046179b76dec5b3932b48f3e3fb9"; + sha256 = "11ck5flydf48hpagl0v6ik6cd05il6jv57hixnhg7pzyrjp5q26y"; }; meta.homepage = "https://github.com/cespare/vim-toml/"; }; @@ -9861,12 +10066,12 @@ final: prev: vim-twiggy = buildVimPluginFrom2Nix { pname = "vim-twiggy"; - version = "2021-08-25"; + version = "2021-09-16"; src = fetchFromGitHub { owner = "sodapopcan"; repo = "vim-twiggy"; - rev = "3561237047481c212b55942d9507c937841d3bc8"; - sha256 = "1099bnpagw6sv5j2rigsp2b9qc58dcyi4520hb0xz48zdvynkaac"; + rev = "16287d2261be67872870899744fd04a6802a9b87"; + sha256 = "0cfqvq2was7jdhcixnlrzh9qdm2n2sv17l7a2sys8slzl04v2c61"; }; meta.homepage = "https://github.com/sodapopcan/vim-twiggy/"; }; @@ -9897,12 +10102,12 @@ final: prev: vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; - version = "2021-08-26"; + version = "2021-09-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "c147741c643e2fef3458e8e44834c11ef85bdd9b"; - sha256 = "0lz2kdp8wmrnrcflsbfhmv42l81gvv00s3qfgf6926zxsr7r5kpl"; + rev = "9cf8b258e444b393784c32d7560fff25b24c79d3"; + sha256 = "0bd9k8446163n8f5f3w3sxvx2s72b2mv0zjphkxxyhy9h7jycmz8"; }; meta.homepage = "https://github.com/tpope/vim-unimpaired/"; }; @@ -9969,24 +10174,24 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-08-14"; + version = "2021-09-14"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "87d144b7451deb3ab55f1a3e3c5124cfab2b02fa"; - sha256 = "17gw992xvxsa6wyirah17xbsdi2gl4lif8ibvbs7dwagnkv01vyb"; + rev = "9ac8044206d32bea4dba34e77b6a3b7b87f65df6"; + sha256 = "0m488cfpl7yszyhgz12binrmxysa05wxypdgy83cdxb0npka20ff"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; vim-vsnip-integ = buildVimPluginFrom2Nix { pname = "vim-vsnip-integ"; - version = "2021-09-05"; + version = "2021-09-19"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip-integ"; - rev = "0a917e0a2c057185b71a4d8367aa69366ebe54e5"; - sha256 = "1fx8a798d7z2xl9jgwn9nvs1cskvi36c557v5yr4w8fc1afl6abm"; + rev = "21c77665bd9d57416be2b6d11378347e163cfaa4"; + sha256 = "0wpscf9mavc7g1494c53bghh733db7v02lvqv2ggskjygz7v7ikc"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/"; }; @@ -10005,12 +10210,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2021-08-23"; + version = "2021-09-09"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "1bef11e2f277984214a7bdca250c09199b57a80b"; - sha256 = "01f3mrbcpdg3dxhy0h2khjaj1fz63f4x8iwmbqbk9vp6r1qzwkkl"; + rev = "5ef2cc4c68af5d291ba85dc444ebb1b26158444c"; + sha256 = "1crzqn6g80kjhjsp9azh48xh9m5zcjr7vfazssh02sads02nppcw"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -10053,12 +10258,12 @@ final: prev: vim-wordmotion = buildVimPluginFrom2Nix { pname = "vim-wordmotion"; - version = "2021-07-26"; + version = "2021-09-12"; src = fetchFromGitHub { owner = "chaoren"; repo = "vim-wordmotion"; - rev = "0edeebdfa95c0a1fc5fbb83b8faf6b0b2cc3bf7e"; - sha256 = "0f9jfb9x1p43q3apyj68200dp8821qv8bdybax0c33hyxyzbz6n6"; + rev = "02e32fcb062553a8293992411677e12cacccb09d"; + sha256 = "1bbaxk5b0cvikmls4r0z3k0zxpmnjzwdv6grs0m6vfyiszcpvm1h"; }; meta.homepage = "https://github.com/chaoren/vim-wordmotion/"; }; @@ -10293,12 +10498,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-09-07"; + version = "2021-09-21"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "51d78fce5f95fb10ba84b8ab66e97d44d75df010"; - sha256 = "119x44yvva87f02rra9dm6xg8zmisa9ij9f8426vqpx4307p1wfc"; + rev = "eb782756ac46a1f09dfaa1664fae3b9722876b8a"; + sha256 = "08hcd0gai7hxs6632s3w4yp93kpvz0525rps68g0nyyr8blrlp0i"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -10306,12 +10511,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-09-07"; + version = "2021-09-21"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "5623fb4c44b2975dd89b0925ba3b952ffa33dfc6"; - sha256 = "0xd6ysq8f946wf4680gd12irdl9q3fqjpq6234d53k15b302lf71"; + rev = "562afdb82a58f105ae17c3e93e37ee233ae166a9"; + sha256 = "0nysplhi5yj7y4ngij284hp4g45f3qbf0fmssinhyl75miz102i4"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -10378,12 +10583,12 @@ final: prev: vista-vim = buildVimPluginFrom2Nix { pname = "vista.vim"; - version = "2021-08-03"; + version = "2021-09-20"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "cb908f21c23d9c9ebce678c8dbc7a0f876384b8c"; - sha256 = "0s2r7k1g7bzwy0yc7hx6iqyha3839jngr2db5gdihnc1niq9z8q5"; + rev = "f49ca3dbf334ac33d2629c510524285335031706"; + sha256 = "1pb6njvshml5vwk4wf1w62dgf2ph2farccka2ly2wwiij8ajk6qk"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -10438,12 +10643,12 @@ final: prev: wilder-nvim = buildVimPluginFrom2Nix { pname = "wilder.nvim"; - version = "2021-09-03"; + version = "2021-09-14"; src = fetchFromGitHub { owner = "gelguy"; repo = "wilder.nvim"; - rev = "8fb563901cada58e247336d380c85f884274b66c"; - sha256 = "0x696lnhs8qfn3k1c5m235y7zf2lwgk9d7azldwdg1ziiyvih4y4"; + rev = "15ff3a0e6fa1882fb4a2391d880c6465652718f5"; + sha256 = "15rb1g0hyp942s9hgpfzf27yz7w5aaym2phrvr51aybnjz6lm9ff"; }; meta.homepage = "https://github.com/gelguy/wilder.nvim/"; }; @@ -10559,12 +10764,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2021-08-05"; + version = "2021-09-19"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "518275b599ab6dd7844c24022f6aec505fb4b07c"; - sha256 = "0wkd83xlzfbk3h19gn3jhp6lpkb1wnxrhcdnczhdwhy81lizfq4w"; + rev = "4117a99861b537830d717c3113e3d584523bc573"; + sha256 = "1c0p1zk54rcn4ph1h17qyfrsdx90rgw7cc9hp1n8xpb9nhwvx494"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -10596,12 +10801,12 @@ final: prev: zenburn = buildVimPluginFrom2Nix { pname = "zenburn"; - version = "2020-09-08"; + version = "2021-09-15"; src = fetchFromGitHub { owner = "jnurmine"; repo = "zenburn"; - rev = "4ec3795d81fc83b6f43389a6291bfa99394473a8"; - sha256 = "148s2szjx61rp93nxa95552m87mn4n4ga00dlbvvv7sm607mvxd8"; + rev = "de2fa06a93fe1494638ec7b2fdd565898be25de6"; + sha256 = "0pmmc16gkypb3y87d5wg5g8c3cxhj01ah9khl82hfw564yw4ipqs"; }; meta.homepage = "https://github.com/jnurmine/zenburn/"; }; diff --git a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index d1a2bda12bea..5cca9d3a02a5 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -37,6 +37,9 @@ , xkb-switch , ycmd +# test dependencies +, neovim-unwrapped + # command-t dependencies , rake , ruby @@ -139,7 +142,7 @@ self: super: { dependencies = with self; [ completion-nvim ]; buildInputs = [ tabnine ]; postFixup = '' - mkdir $target/binaries + mkdir -p $target/binaries ln -s ${tabnine}/bin/TabNine $target/binaries/TabNine_$(uname -s) ''; }); @@ -392,6 +395,12 @@ self: super: { substituteInPlace $out/bin/minimap_generator.sh \ --replace "code-minimap" "${code-minimap}/bin/code-minimap" ''; + + doCheck = true; + checkPhase = '' + ${neovim-unwrapped}/bin/nvim -n -u NONE -i NONE -V1 --cmd "set rtp+=$out" --cmd "runtime! plugin/*.vim" -c "MinimapToggle" +quit! + ''; + }); ncm2 = super.ncm2.overrideAttrs (old: { @@ -480,9 +489,11 @@ self: super: { }); sqlite-lua = super.sqlite-lua.overrideAttrs (old: { - postPatch = '' + postPatch = let + libsqlite = "${sqlite.out}/lib/libsqlite3${stdenv.hostPlatform.extensions.sharedLibrary}"; + in '' substituteInPlace lua/sqlite/defs.lua \ - --replace "vim.g.sqlite_clib_path" "vim.g.sqlite_clib_path or '${sqlite.out}/lib/libsqlite3.so'" + --replace "path = vim.g.sqlite_clib_path" "path = vim.g.sqlite_clib_path or ${lib.escapeShellArg libsqlite}" ''; }); @@ -675,7 +686,7 @@ self: super: { libiconv ]; - cargoSha256 = "1hmbgqd22fy68n05vdb93wsdvws91m4i6nm1kq6bwwbhzhkvd7js"; + cargoSha256 = "sha256-zg8PKuzC1srCOtn0ZcqI9cZxMwN9hsf+sNhYgDg93Gs="; }; in '' @@ -825,6 +836,11 @@ self: super: { dependencies = with self; [ vim-repeat ]; }); + vim-textobj-entire = super.vim-textobj-entire.overrideAttrs (old: { + dependencies = with self; [ vim-textobj-user ]; + meta.maintainers = with lib.maintainers; [ farlion ]; + }); + vim-unimpaired = super.vim-unimpaired.overrideAttrs (old: { dependencies = with self; [ vim-repeat ]; }); diff --git a/nixpkgs/pkgs/misc/vim-plugins/vim-gen-doc-hook.sh b/nixpkgs/pkgs/misc/vim-plugins/vim-gen-doc-hook.sh index cbf666f8b74d..d5f0a00ebcc2 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/vim-gen-doc-hook.sh +++ b/nixpkgs/pkgs/misc/vim-plugins/vim-gen-doc-hook.sh @@ -5,7 +5,7 @@ echo "Sourcing vim-gen-doc-hook" vimPluginGenTags() { echo "Executing vimPluginGenTags" - target="$out/@rtpPath@/$pname" + target="$out/@rtpPath@" mkdir -p $out/@rtpPath@ # build help tags @@ -16,7 +16,7 @@ vimPluginGenTags() { exit 1 fi else - echo "No docs available" + echo "No docs available for $target" fi if [ -n "$addonInfo" ]; then diff --git a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index 009eb90c9e20..5f275b07fb70 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -40,6 +40,7 @@ b3nj5m1n/kommentary@main bakpakin/fennel.vim bazelbuild/vim-bazel bbchung/clighter8 +BeneCollyridam/futhark-vim benizi/vim-automkdir bhurlow/vim-parinfer bitc/vim-hdevtools @@ -145,8 +146,10 @@ esneider/YUNOcommit.vim euclidianAce/BetterLua.vim euclio/vim-markdown-composer f-person/git-blame.nvim +f3fora/cmp-spell famiu/bufdelete.nvim famiu/feline.nvim +fannheyward/telescope-coc.nvim farmergreg/vim-lastplace fatih/vim-go fcpg/vim-osc52 @@ -163,6 +166,7 @@ folke/tokyonight.nvim@main folke/trouble.nvim@main folke/twilight.nvim@main folke/which-key.nvim@main +FooSoft/vim-argwrap freitass/todo.txt-vim frigoeu/psc-ide-vim fruit-in/brainfuck-vim @@ -321,12 +325,14 @@ kana/vim-niceblock kana/vim-operator-replace kana/vim-operator-user kana/vim-tabpagecd +kana/vim-textobj-entire kana/vim-textobj-function kana/vim-textobj-user karb94/neoscroll.nvim kassio/neoterm kbenzie/vim-spirv kchmck/vim-coffee-script +kdheepak/cmp-latex-symbols@main kdheepak/lazygit.nvim KeitaNakamura/neodark.vim keith/investigate.vim @@ -341,9 +347,11 @@ konfekt/fastfold Konfekt/vim-alias konfekt/vim-DetectSpellLang kosayoda/nvim-lightbulb +kovisoft/slimv kristijanhusak/defx-git kristijanhusak/defx-icons kristijanhusak/deoplete-phpactor +kristijanhusak/orgmode.nvim kristijanhusak/vim-carbon-now-sh kristijanhusak/vim-dadbod-completion kristijanhusak/vim-dadbod-ui @@ -413,6 +421,7 @@ MarcWeber/vim-addon-toggle-buffer MarcWeber/vim-addon-xdebug markonm/traces.vim martinda/Jenkinsfile-vim-syntax +MattesGroeger/vim-bookmarks mattn/calendar-vim as mattn-calendar-vim mattn/emmet-vim mattn/vim-gist @@ -548,10 +557,12 @@ overcache/NeoSolarized p00f/nvim-ts-rainbow pangloss/vim-javascript parsonsmatt/intero-neovim +PaterJason/cmp-conjure pearofducks/ansible-vim peitalin/vim-jsx-typescript peterbjorgensen/sved peterhoeg/vim-qml +PeterRincker/vim-argumentative petRUShka/vim-opencl phaazon/hop.nvim phanviet/vim-monokai-pro @@ -589,6 +600,7 @@ raghur/vim-ghost Raimondi/delimitMate rakr/vim-one ray-x/aurora +ray-x/cmp-treesitter ray-x/lsp_signature.nvim rbgrouleff/bclose.vim rbong/vim-flog @@ -613,6 +625,7 @@ RobertAudi/securemodelines rodjek/vim-puppet romainl/vim-cool romainl/vim-qf +romainl/vim-qlist roman/golden-ratio romgrk/barbar.nvim romgrk/nvim-treesitter-context @@ -682,6 +695,7 @@ smiteshp/nvim-gps sodapopcan/vim-twiggy solarnz/arcanist.vim sonph/onehalf +sotte/presenting.vim srcery-colors/srcery-vim steelsojka/completion-buffers steelsojka/pears.nvim @@ -689,6 +703,7 @@ stefandtw/quickfix-reflector.vim stephpy/vim-yaml stevearc/aerial.nvim stsewd/fzf-checkout.vim +sudormrfbin/cheatsheet.nvim sunaku/vim-dasht sunjon/Shade.nvim svermeulen/vim-subversive @@ -734,6 +749,7 @@ tomasiser/vim-code-dark tomasr/molokai tomlion/vim-solidity tommcdo/vim-exchange +tommcdo/vim-fubitive tommcdo/vim-lion tommcdo/vim-ninja-feet tomtom/tcomment_vim @@ -792,6 +808,7 @@ urbit/hoon.vim Valloric/MatchTagAlways Valodim/deoplete-notmuch vhda/verilog_systemverilog.vim +vifm/vifm.vim vigoux/LanguageTool.nvim vim-airline/vim-airline vim-airline/vim-airline-themes diff --git a/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix b/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix index 0516a84ce953..10295ab6b2b0 100644 --- a/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix +++ b/nixpkgs/pkgs/misc/vim-plugins/vim-utils.nix @@ -187,8 +187,9 @@ let rtpPath = "."; - nativeImpl = packages: - (let + # Generates a packpath folder as expected by vim + packDir = packages: + let # dir is "start" or "opt" linkLuaPlugin = plugin: packageName: dir: '' mkdir -p $out/pack/${packageName}/${dir}/${plugin.pname}/lua @@ -197,15 +198,15 @@ let ''; linkVimlPlugin = plugin: packageName: dir: '' - mkdir -p $out/pack/${packageName}/${dir}/${plugin.pname} - ln -sf ${plugin}/${rtpPath}/* $out/pack/${packageName}/${dir}/${plugin.pname} + mkdir -p $out/pack/${packageName}/${dir}/${lib.getName plugin} + ln -sf ${plugin}/${rtpPath}/* $out/pack/${packageName}/${dir}/${lib.getName plugin} ''; link = pluginPath: if hasLuaModule pluginPath then linkLuaPlugin pluginPath else linkVimlPlugin pluginPath; - packageLinks = (packageName: {start ? [], opt ? []}: + packageLinks = packageName: {start ? [], opt ? []}: let # `nativeImpl` expects packages to be derivations, not strings (as # opposed to older implementations that have to maintain backwards @@ -230,21 +231,20 @@ let ++ [ "mkdir -p $out/pack/${packageName}/start/__python3_dependencies" "ln -s ${python3Env}/${python3Env.sitePackages} $out/pack/${packageName}/start/__python3_dependencies/python3" - ] - ); - packDir = (packages: + ]; + in stdenv.mkDerivation { name = "vim-pack-dir"; src = ./.; installPhase = lib.concatStringsSep "\n" (lib.flatten (lib.mapAttrsToList packageLinks packages)); preferLocalBuild = true; - } - ); - in + }; + + nativeImpl = packages: '' set packpath^=${packDir packages} set runtimepath^=${packDir packages} - ''); + ''; /* Generates a vimrc string @@ -292,12 +292,14 @@ let /* vim-plug is an extremely popular vim plugin manager. */ + /* Remove repeated "/." suffixes from a path */ + stripDots = path: lib.head (builtins.split "(/\\.)*$" path); plugImpl = ('' source ${vimPlugins.vim-plug.rtp}/plug.vim - call plug#begin('/dev/null') + silent! call plug#begin('/dev/null') - '' + (lib.concatMapStringsSep "\n" (pkg: "Plug '${pkg.rtp}'") plug.plugins) + '' + '' + (lib.concatMapStringsSep "\n" (pkg: "Plug '${stripDots pkg.rtp}'") plug.plugins) + '' call plug#end() ''); diff --git a/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/default.nix index c65307e50644..768000d47b41 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -104,8 +104,8 @@ let mktplcRef = { name = "ng-template"; publisher = "Angular"; - version = "12.1.2"; - sha256 = "sha256-fIHh1eRmu4zSgrtZr0XwLB+1Ad6a/0ABC55akGr0DOA="; + version = "12.2.0"; + sha256 = "sha256-CChkWKiLi/OcOm268d45pNwiyrKhztqYsQvJV/9z+Ag="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog"; @@ -117,15 +117,46 @@ let }; }; - antfu.icons-carbon = buildVscodeMarketplaceExtension { + antfu = { + icons-carbon = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "icons-carbon"; + publisher = "antfu"; + version = "0.2.2"; + sha256 = "0mfap16la09mn0jhvy8s3dainrmjz64vra7d0d4fbcpgg420kv3f"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + + slidev = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "antfu"; + name = "slidev"; + version = "0.3.2"; + sha256 = "sha256-vzmByEiKZIkd707Bs4RGQrMII5sghYlkQI6aAJOHFcY="; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + }; + + arcticicestudio.nord-visual-studio-code = buildVscodeMarketplaceExtension { mktplcRef = { - name = "icons-carbon"; - publisher = "antfu"; - version = "0.2.2"; - sha256 = "0mfap16la09mn0jhvy8s3dainrmjz64vra7d0d4fbcpgg420kv3f"; + name = "nord-visual-studio-code"; + publisher = "arcticicestudio"; + version = "0.18.0"; + sha256 = "sha256-Uo6peR+2ZNX6nwJ0Yar32Pe0rfBZ+f6ef1cYhUvVUbE="; }; meta = with lib; { + description = "An arctic, north-bluish clean and elegant Visual Studio Code theme."; + downloadPage = + "https://marketplace.visualstudio.com/items?itemName=arcticicestudio.nord-visual-studio-code"; + homepage = "https://github.com/arcticicestudio/nord-visual-studio-code"; license = licenses.mit; + maintainers = with maintainers; [ imgabe ]; }; }; @@ -163,6 +194,18 @@ let }; }; + asvetliakov.vscode-neovim = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-neovim"; + publisher = "asvetliakov"; + version = "0.0.82"; + sha256 = "17f0jzg9vdbqdjnnc5i1q28ij2kckvvxi7fw9szmyy754f074jb1"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + ms-python.vscode-pylance = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pylance"; @@ -362,6 +405,23 @@ let }; }; + denoland.vscode-deno = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-deno"; + publisher = "denoland"; + version = "3.9.1"; + sha256 = "sha256-OuGTjmJQFAWrYp7YnFpyo0NnnCcXYF8itYjGKMa3FCs="; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/denoland.vscode-deno/changelog"; + description = "A language server client for Deno"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=denoland.vscode-deno"; + homepage = "https://github.com/denoland/vscode_deno"; + license = licenses.mit; + maintainers = with maintainers; [ ratsclub ]; + }; + }; + dhall.dhall-lang = buildVscodeMarketplaceExtension { mktplcRef = { name = "dhall-lang"; @@ -564,6 +624,23 @@ let }; }; + faustinoaq.lex-flex-yacc-bison = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "lex-flex-yacc-bison"; + publisher = "faustinoaq"; + version = "0.0.3"; + sha256 = "6254f52157dc796eae7bf135ac88c1c9cc19d884625331a1e634f9768722cc3d"; + }; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/faustinoaq.lex-flex-yacc-bison/changelog"; + description = "Language support for Lex, Flex, Yacc and Bison."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=faustinoaq.lex-flex-yacc-bison"; + homepage = "https://github.com/faustinoaq/vscode-lex-flex-yacc-bison"; + license = licenses.mit; + maintainers = with maintainers; [ angustrau ]; + }; + }; + file-icons.file-icons = buildVscodeMarketplaceExtension { meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/file-icons.file-icons/changelog"; @@ -680,6 +757,16 @@ let }; github = { + copilot = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "github"; + name = "copilot"; + version = "1.4.2678"; + sha256 = "sha256-NryXLuMIZJngp2dBsGbNhBiblEthckw1Zk2vqMXIzFM="; + }; + meta = { license = lib.licenses.unfree; }; + }; + github-vscode-theme = buildVscodeMarketplaceExtension { mktplcRef = { name = "github-vscode-theme"; @@ -748,8 +835,8 @@ let mktplcRef = { name = "haskell"; publisher = "haskell"; - version = "1.1.0"; - sha256 = "1wg06lyk0qn9jd6gi007sg7v0z9z8gwq7x2449d4ihs9n3w5l0gb"; + version = "1.6.1"; + sha256 = "1l6nrbqkq1p62dkmzs4sy0rxbid3qa1104s3fd9fzkmc1sldzgsn"; }; meta = with lib; { license = licenses.mit; @@ -897,8 +984,8 @@ let mktplcRef = { name = "language-haskell"; publisher = "justusadam"; - version = "3.2.1"; - sha256 = "0lxp8xz17ciy93nj4lzxqvz71vw1zdyamrnh2n792yair8890rr6"; + version = "3.4.0"; + sha256 = "0ab7m5jzxakjxaiwmg0jcck53vnn183589bbxh3iiylkpicrv67y"; }; meta = { license = lib.licenses.bsd3; @@ -1048,6 +1135,18 @@ let }; }; + mvllow.rose-pine = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "mvllow"; + name = "rose-pine"; + version = "1.3.6"; + sha256 = "sha256-pKrwiA/ZArBfumT0VTauhINSDEbABWgBBzTZEE07wzk="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + naumovs.color-highlight = buildVscodeMarketplaceExtension { mktplcRef = { name = "color-highlight"; @@ -1320,6 +1419,18 @@ let }; }; + tabnine.tabnine-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "tabnine-vscode"; + publisher = "tabnine"; + version = "3.4.27"; + sha256 = "sha256-Xg/N59a38OKEWb/4anysslensUoj9ENcuobkyByFDxE="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + tamasfe.even-better-toml = buildVscodeMarketplaceExtension { mktplcRef = { name = "even-better-toml"; @@ -1362,6 +1473,18 @@ let }; }; + tobiasalthoff.atom-material-theme = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "atom-material-theme"; + publisher = "tobiasalthoff"; + version = "1.10.7"; + sha256 = "sha256-t5CKrDEbDCuo28wN+hiWrvkt3C9vQAPfV/nd3QBGQ/s="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + tomoki1207.pdf = buildVscodeMarketplaceExtension { mktplcRef = { name = "pdf"; @@ -1390,11 +1513,16 @@ let mktplcRef = { name = "errorlens"; publisher = "usernamehw"; - version = "3.2.4"; - sha256 = "0caxmf6v0s5kgp6cp3j1kk7slhspjv5kzhn4sq3miyl5jkrn95kx"; + version = "3.4.0"; + sha256 = "1x9rkyhbp15dwp6dikzpk9lzjnh9cnxac89gzx533681zld906m8"; }; - meta = { - license = lib.licenses.mit; + meta = with lib; { + changelog = "https://marketplace.visualstudio.com/items/usernamehw.errorlens/changelog"; + description = "Improve highlighting of errors, warnings and other language diagnostics."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=usernamehw.errorlens"; + homepage = "https://github.com/usernamehw/vscode-error-lens"; + license = licenses.mit; + maintainers = with maintainers; [ imgabe ]; }; }; diff --git a/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix index c111f01621b3..50a4dd26ee85 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix +++ b/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.4673"; - sha256 = "1ys3lilc2r3n250s6pfvadrabnvqpzy74awjmvw79jrbvvk1iw1z"; + version = "1.0.4836"; + sha256 = "7hK2ptNU2mQt3iTZgkrKU9ZTVN+m7VFmAlXHxkiPL+o="; }; }).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: { nativeBuildInputs = nativeBuildInputs ++ [ diff --git a/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json index a2216a58bee6..94eac5b41d3a 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -1,6 +1,6 @@ { "name": "rust-analyzer", - "version": "0.2.735", + "version": "0.2.751", "dependencies": { "https-proxy-agent": "^5.0.0", "node-fetch": "^2.6.1", diff --git a/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json index 86d7b1aa6fa4..ed08833f958b 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json +++ b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json @@ -1,6 +1,6 @@ { "name": "vscode-lldb", - "version": "1.6.5", + "version": "1.6.7", "dependencies": { "string-argv": "^0.3.1", "yaml": "^1.10.0", @@ -15,7 +15,7 @@ "memory-streams": "^0.1.3", "vscode-debugprotocol": "^1.47.0", "vscode-debugadapter-testsupport": "^1.47.0", - "vsce": "=1.88.0", + "vsce": "^1.88.0", "webpack": "^5.37.1", "webpack-cli": "^4.7.0", "ts-loader": "^8.0.0" diff --git a/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix index 819650bdb01a..93bb0e570dd0 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix +++ b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix @@ -5,7 +5,7 @@ assert lib.versionAtLeast python3.version "3.5"; let publisher = "vadimcn"; pname = "vscode-lldb"; - version = "1.6.5"; + version = "1.6.7"; vscodeExtUniqueId = "${publisher}.${pname}"; @@ -13,7 +13,7 @@ let owner = "vadimcn"; repo = "vscode-lldb"; rev = "v${version}"; - sha256 = "sha256-ppiEWFKJiUtlF8LSqBb8Xvg26B+wHcIZJhU+ANE4J2k="; + sha256 = "sha256-9rqdqpxUWcUV9RnZOTxg+zMW7wlTXZVkoKYHuv/lE7c="; }; lldb = callPackage ./lldb.nix {}; @@ -25,7 +25,7 @@ let # It will pollute the build environment of `buildRustPackage`. cargoPatches = [ ./reset-cargo-config.patch ]; - cargoSha256 = "sha256-ksRFlbtrFAbcX/Pc6rgWUHVl859GVUOvNckxM7Q971U="; + cargoSha256 = "sha256-KeZpjMCBdOJTLj8pA5WWi3EMyhhWw/+aik4IJqIs/mk="; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/update.sh b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/update.sh index 8511ea3b12ed..34bb5dbc33d5 100755 --- a/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/update.sh +++ b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/update.sh @@ -30,9 +30,6 @@ jq '{ name, version: $version, dependencies: (.dependencies + .devDependencies) "$src/package.json" \ > build-deps/package.json -# FIXME: vsce@1.93.0 breaks the build. -sed 's/"vsce": ".*"/"vsce": "=1.88.0"/' --in-place build-deps/package.json - # Regenerate nodePackages. cd "$nixpkgs/pkgs/development/node-packages" exec ./generate.sh diff --git a/nixpkgs/pkgs/os-specific/bsd/netbsd/compat.patch b/nixpkgs/pkgs/os-specific/bsd/netbsd/compat-cxx-safe-header.patch index f67ca2e50791..f67ca2e50791 100644 --- a/nixpkgs/pkgs/os-specific/bsd/netbsd/compat.patch +++ b/nixpkgs/pkgs/os-specific/bsd/netbsd/compat-cxx-safe-header.patch diff --git a/nixpkgs/pkgs/os-specific/bsd/netbsd/compat-dont-configure-twice.patch b/nixpkgs/pkgs/os-specific/bsd/netbsd/compat-dont-configure-twice.patch new file mode 100644 index 000000000000..1a69e73e255f --- /dev/null +++ b/nixpkgs/pkgs/os-specific/bsd/netbsd/compat-dont-configure-twice.patch @@ -0,0 +1,22 @@ +commit f2d0ff85e05b49e9d11735ce4810b242c1dbf5af +Author: John Ericson <John.Ericson@Obsidian.Systems> +Date: Wed Sep 1 15:38:56 2021 +0000 + + Make should not hit configure + +diff --git a/Makefile b/Makefile +index b5adb8a5f2e9..1a914ef16739 100644 +--- a/Makefile ++++ b/Makefile +@@ -76,11 +76,6 @@ _CURDIR:= ${.CURDIR} + + SRCS:= ${SRCS:M*.c} + +-config.cache: include/.stamp configure nbtool_config.h.in defs.mk.in +- rm -f ${.TARGET} +- CC=${HOST_CC:Q} CFLAGS=${HOST_CFLAGS:Q} LDFLAGS=${HOST_LDFLAGS:Q} \ +- ${HOST_SH} ${.CURDIR}/configure --cache-file=config.cache +- + defs.mk: config.cache + @touch ${.TARGET} + diff --git a/nixpkgs/pkgs/os-specific/bsd/netbsd/compat-no-force-native.patch b/nixpkgs/pkgs/os-specific/bsd/netbsd/compat-no-force-native.patch new file mode 100644 index 000000000000..cd442d95f412 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/bsd/netbsd/compat-no-force-native.patch @@ -0,0 +1,101 @@ +commit 5acf3bdea5140e90135d15d6479f29fbf624f75e +Author: John Ericson <John.Ericson@Obsidian.Systems> +Date: Wed Sep 1 15:38:56 2021 +0000 + + Don't force building and installing for the build platform + + Also remove `compat/` subdir from install directories. + +diff --git a/Makefile b/Makefile +index 4bcf227f0e75..9ed1d6eea6ff 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,6 @@ + # $NetBSD: Makefile,v 1.87 2019/05/08 02:25:50 thorpej Exp $ + +-HOSTLIB= nbcompat ++LIB= nbcompat + +-.include <bsd.hostinit.mk> ++.include <bsd.own.mk> + +@@ -94,63 +94,37 @@ include/.stamp: + + # Install rules + +-HOST_LIBDIR= ${TOOLDIR}/lib +-HOST_INCSDIR= ${TOOLDIR}/include +-HOST_SHAREDIR= ${TOOLDIR}/share +- +-install: .PHONY install.lib includes install.defs.mk +- +-# Install lib${HOSTLIB}.a in ${TOOLDIR}/lib +-install.lib: .PHONY ${HOST_LIBDIR}/lib${HOSTLIB}.a +-${HOST_LIBDIR}/lib${HOSTLIB}.a: lib${HOSTLIB}.a +- ${_MKTARGET_INSTALL} +- ${HOST_INSTALL_DIR} ${HOST_LIBDIR} +- ${HOST_INSTALL_FILE} -m ${LIBMODE} ${.ALLSRC} ${.TARGET} ++install: .PHONY includes install.defs.mk + + .for _f in ${INCFILES} +-HOST_INCINSTFILES+= ${HOST_INCSDIR}/compat/${_f} +-${HOST_INCSDIR}/compat/${_f}: ${_f} ++INCINSTFILES+= ${INCSDIR}/${_f} ++${INCSDIR}/${_f}: ${_f} + ${_MKTARGET_INSTALL} +- ${HOST_INSTALL_FILE} ${.ALLSRC} ${.TARGET} ++ ${INSTALL_FILE} ${.ALLSRC} ${.TARGET} + .endfor + + .for _d in ${INCSUBDIRS} +-HOST_INCINSTDIRS+= ${HOST_INCSDIR}/compat/${_d} +-${HOST_INCSDIR}/compat/${_d}: ++INCINSTDIRS+= ${INCSDIR}/${_d} ++${INCSDIR}/${_d}: + ${_MKTARGET_INSTALL} +- ${HOST_INSTALL_DIR} ${.TARGET} ++ ${INSTALL_DIR} ${.TARGET} + .endfor + +-# Install include files in ${TOOLDIR}/include/compat +-includes: .PHONY ${HOST_INCINSTDIRS} .WAIT ${HOST_INCINSTFILES} ++# Install include files in ${INCSDIR} ++includes: .PHONY ${INCINSTDIRS} .WAIT ${INCINSTFILES} + @(cd include && find . -name '*.h' -print | while read f ; do \ +- ${HOST_INSTALL_FILE} $$f ${HOST_INCSDIR}/compat/$$f ; \ ++ ${INSTALL_FILE} $$f ${INCSDIR}/$$f ; \ + done) + + +-# Install defs.mk in ${TOOLDIR}/share/compat +-install.defs.mk: .PHONY ${HOST_SHAREDIR}/compat/defs.mk +-${HOST_SHAREDIR}/compat/defs.mk: defs.mk ++# Install defs.mk in ${DATADIR} ++install.defs.mk: .PHONY ${DATADIR}/defs.mk ++${DATADIR}/defs.mk: defs.mk + ${_MKTARGET_INSTALL} +- ${HOST_INSTALL_DIR} ${HOST_SHAREDIR} +- ${HOST_INSTALL_DIR} ${HOST_SHAREDIR}/compat +- ${HOST_INSTALL_FILE} ${.ALLSRC} ${.TARGET} +- +-# bsd.hostlib.mk wants HOST_CPPFLAGS, not CPPFLAGS +- +-HOST_CPPFLAGS:= ${CPPFLAGS} +-CPPFLAGS:= # empty +- +-.include <bsd.hostlib.mk> +- +-# Use uninstalled copy of host-mkdep +-HOST_MKDEP_OBJ!= cd ${.CURDIR}/../host-mkdep && ${PRINTOBJDIR} +-HOST_MKDEP= ${HOST_MKDEP_OBJ}/host-mkdep +-MKDEP= ${HOST_MKDEP} ++ ${INSTALL_DIR} ${DATADIR} ++ ${INSTALL_FILE} ${.ALLSRC} ${.TARGET} + +-# Use uninstalled copy of the install program +-INSTALL_OBJ!= cd ${NETBSDSRCDIR}/tools/binstall && ${PRINTOBJDIR} +-INSTALL= ${INSTALL_OBJ}/xinstall ++.include <bsd.lib.mk> + + # Run "${TOOLDIR}/bin/nbmake-${MACHINE} regen" by hand after editing + # configure.ac. See more detailed instructions in configure.ac. diff --git a/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix b/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix index 1e9331480007..8f24d28409f9 100644 --- a/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix +++ b/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix @@ -16,6 +16,10 @@ let tag = "netbsd-${lib.replaceStrings ["."] ["-"] version}-RELEASE"; }; + netbsdSetupHook = makeSetupHook { + name = "netbsd-setup-hook"; + } ./setup-hook.sh; + otherSplices = { selfBuildBuild = pkgsBuildBuild.netbsd; selfBuildHost = pkgsBuildHost.netbsd; @@ -24,6 +28,12 @@ let selfTargetTarget = pkgsTargetTarget.netbsd or {}; # might be missing }; + defaultMakeFlags = [ + "MKSOFTFLOAT=${if stdenv.hostPlatform.gcc.float or (stdenv.hostPlatform.parsed.abi.float or "hard") == "soft" + then "yes" + else "no"}" + ]; + in lib.makeScopeWithSplicing splicePackages newScope @@ -60,7 +70,7 @@ in lib.makeScopeWithSplicing extraPaths = [ ]; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install tsort lorder mandoc groff statHook rsync ]; @@ -86,6 +96,8 @@ in lib.makeScopeWithSplicing BSD_PATH = attrs.path; + makeFlags = defaultMakeFlags; + strictDeps = true; meta = with lib; { @@ -93,6 +105,7 @@ in lib.makeScopeWithSplicing platforms = platforms.unix; license = licenses.bsd2; }; + } // lib.optionalAttrs stdenv'.hasCC { # TODO should CC wrapper set this? CPP = "${stdenv'.cc.targetPrefix}cpp"; @@ -118,7 +131,7 @@ in lib.makeScopeWithSplicing version = "9.2"; buildInputs = with self; []; - nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook rsync ]; + nativeBuildInputs = with buildPackages.netbsd; [ bsdSetupHook netbsdSetupHook rsync ]; skipIncludesPhase = true; @@ -126,6 +139,7 @@ in lib.makeScopeWithSplicing patchShebangs configure ${self.make.postPatch} ''; + buildPhase = '' runHook preBuild @@ -133,6 +147,7 @@ in lib.makeScopeWithSplicing runHook postBuild ''; + installPhase = '' runHook preInstall @@ -143,6 +158,7 @@ in lib.makeScopeWithSplicing runHook postInstall ''; + extraPaths = with self; [ make.src ] ++ make.extraPaths; }; @@ -159,13 +175,17 @@ in lib.makeScopeWithSplicing ./compat-setup-hook.sh ]; - # the build system re-runs `./configure` with `HOST_CC` (which is their - # name for Build CC) as a compiler to make `defs.mk`, which is installed - depsBuildBuild = [ buildPackages.stdenv.cc ] ++ commonDeps; - HOST_CC = "${buildPackages.stdenv.cc.targetPrefix}cc"; + preConfigure = '' + make include/.stamp configure nbtool_config.h.in defs.mk.in + ''; + + configurePlatforms = [ "build" "host" ]; + configureFlags = [ + "--cache-file=config.cache" + ]; nativeBuildInputs = with buildPackages.netbsd; commonDeps ++ [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal rsync ]; @@ -174,18 +194,36 @@ in lib.makeScopeWithSplicing # temporarily use gnuinstall for bootstrapping # bsdinstall will be built later - makeFlags = [ + makeFlags = defaultMakeFlags ++ [ "INSTALL=${buildPackages.coreutils}/bin/install" - "TOOLDIR=$(out)" + "DATADIR=$(out)/share" + # Can't sort object files yet + "LORDER=echo" + "TSORT=cat" + # Can't process man pages yet + "MKSHARE=no" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # GNU objcopy produces broken .a libs which won't link into dependers. + # Makefiles only invoke `$OBJCOPY -x/-X`, so cctools strip works here. + "OBJCOPY=${buildPackages.darwin.cctools}/bin/strip" ]; RENAME = "-D"; - patches = [ ./compat.patch ]; + passthru.tests = { netbsd-install = self.install; }; - postInstall = '' - mv $out/include/compat/* $out/include - rmdir $out/include/compat + patches = [ + ./compat-cxx-safe-header.patch + ./compat-dont-configure-twice.patch + ./compat-no-force-native.patch + ]; + + preInstall = '' + makeFlagsArray+=('INSTALL_FILE=''${INSTALL} ''${COPY} ''${PRESERVE} ''${RENAME}') + makeFlagsArray+=('INSTALL_DIR=''${INSTALL} -d') + makeFlagsArray+=('INSTALL_SYMLINK=''${INSTALL} ''${SYMLINK} ''${RENAME}') + ''; + postInstall = '' # why aren't these installed by netbsd? install -D compat_defs.h $out/include/compat_defs.h install -D $BSDSRCDIR/include/cdbw.h $out/include/cdbw.h @@ -238,7 +276,7 @@ in lib.makeScopeWithSplicing sha256 = "1f6pbz3qv1qcrchdxif8p5lbmnwl8b9nq615hsd3cyl4avd5bfqj"; extraPaths = with self; [ mtree.src make.src ]; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal mandoc groff rsync ]; @@ -254,6 +292,7 @@ in lib.makeScopeWithSplicing runHook postInstall ''; + setupHook = ./install-setup-hook.sh; }; fts = mkDerivation { @@ -262,7 +301,7 @@ in lib.makeScopeWithSplicing sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77"; version = "9.2"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook rsync + bsdSetupHook netbsdSetupHook rsync ]; propagatedBuildInputs = with self; compatIfNeeded; extraPaths = with self; [ @@ -298,7 +337,7 @@ in lib.makeScopeWithSplicing version = "9.2"; sha256 = "18nqwlndfc34qbbgqx5nffil37jfq9aw663ippasfxd2hlyc106x"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install mandoc groff rsync ]; @@ -320,7 +359,7 @@ in lib.makeScopeWithSplicing version = "9.2"; sha256 = "1dqvf9gin29nnq3c4byxc7lfd062pg7m84843zdy6n0z63hnnwiq"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install mandoc groff rsync ]; @@ -331,7 +370,7 @@ in lib.makeScopeWithSplicing version = "9.2"; sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install mandoc groff rsync ]; @@ -347,7 +386,41 @@ in lib.makeScopeWithSplicing path = "usr.bin/make"; sha256 = "0vi73yicbmbp522qzqvd979cx6zm5jakhy77xh73c1kygf8klccs"; version = "9.2"; - postPatch = '' + + postPatch = '' + substituteInPlace $BSDSRCDIR/share/mk/bsd.doc.mk \ + --replace '-o ''${DOCOWN}' "" \ + --replace '-g ''${DOCGRP}' "" + for mk in $BSDSRCDIR/share/mk/bsd.inc.mk $BSDSRCDIR/share/mk/bsd.kinc.mk; do + substituteInPlace $mk \ + --replace '-o ''${BINOWN}' "" \ + --replace '-g ''${BINGRP}' "" + done + substituteInPlace $BSDSRCDIR/share/mk/bsd.kmodule.mk \ + --replace '-o ''${KMODULEOWN}' "" \ + --replace '-g ''${KMODULEGRP}' "" + substituteInPlace $BSDSRCDIR/share/mk/bsd.lib.mk \ + --replace '-o ''${LIBOWN}' "" \ + --replace '-g ''${LIBGRP}' "" \ + --replace '-o ''${DEBUGOWN}' "" \ + --replace '-g ''${DEBUGGRP}' "" + substituteInPlace $BSDSRCDIR/share/mk/bsd.lua.mk \ + --replace '-o ''${LIBOWN}' "" \ + --replace '-g ''${LIBGRP}' "" + substituteInPlace $BSDSRCDIR/share/mk/bsd.man.mk \ + --replace '-o ''${MANOWN}' "" \ + --replace '-g ''${MANGRP}' "" + substituteInPlace $BSDSRCDIR/share/mk/bsd.nls.mk \ + --replace '-o ''${NLSOWN}' "" \ + --replace '-g ''${NLSGRP}' "" + substituteInPlace $BSDSRCDIR/share/mk/bsd.prog.mk \ + --replace '-o ''${BINOWN}' "" \ + --replace '-g ''${BINGRP}' "" \ + --replace '-o ''${RUMPBINOWN}' "" \ + --replace '-g ''${RUMPBINGRP}' "" \ + --replace '-o ''${DEBUGOWN}' "" \ + --replace '-g ''${DEBUGGRP}' "" + # make needs this to pick up our sys make files export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\"" @@ -433,11 +506,11 @@ in lib.makeScopeWithSplicing HOSTPROG = "tic"; buildInputs = with self; compatIfNeeded; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install mandoc groff nbperf ]; - makeFlags = [ "TOOLDIR=$(out)" ]; + makeFlags = defaultMakeFlags ++ [ "TOOLDIR=$(out)" ]; extraPaths = with self; [ libterminfo.src (fetchNetBSD "usr.bin/tic" "9.2" "1mwdfg7yx1g43ss378qsgl5rqhsxskqvsd2mqvrn38qw54i8v5i1") @@ -465,7 +538,7 @@ in lib.makeScopeWithSplicing sha256 = "1yz3n4hncdkk6kp595fh2q5lg150vpqg8iw2dccydkyw4y3hgsjj"; NIX_CFLAGS_COMPILE = [ "-DMAKE_BOOTSTRAP" ]; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install mandoc byacc flex rsync ]; buildInputs = with self; compatIfNeeded; @@ -483,15 +556,31 @@ in lib.makeScopeWithSplicing version = "9.2"; sha256 = "0nxnmj4c8s3hb9n3fpcmd0zl3l1nmhivqgi9a35sis943qvpgl9h"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install mandoc groff rsync nbperf rpcgen ]; + + # The makefiles define INCSDIR per subdirectory, so we have to set + # something else on the command line so those definitions aren't + # overridden. + postPatch = '' + find "$BSDSRCDIR" -name Makefile -exec \ + sed -i -E \ + -e 's_/usr/include_''${INCSDIR0}_' \ + {} \; + ''; + + # multiple header dirs, see above + postConfigure = '' + makeFlags=''${makeFlags/INCSDIR/INCSDIR0} + ''; + extraPaths = with self; [ common ]; headersOnly = true; noCC = true; meta.platforms = lib.platforms.netbsd; - makeFlags = [ "RPCGEN_CPP=${buildPackages.stdenv.cc.cc}/bin/cpp" ]; + makeFlags = defaultMakeFlags ++ [ "RPCGEN_CPP=${buildPackages.stdenv.cc.cc}/bin/cpp" ]; }; common = fetchNetBSD "common" "9.2" "1pfylz9r3ap5wnwwbwczbfjb1m5qdyspzbnmxmcdkpzz2zgj64b9"; @@ -502,15 +591,23 @@ in lib.makeScopeWithSplicing version = "9.2"; sha256 = "03s18q8d9giipf05bx199fajc2qwikji0djz7hw63d2lya6bfnpj"; - # Fix this error when building bootia32.efi and bootx64.efi: - # error: PHDR segment not covered by LOAD segment - patches = [ ./no-dynamic-linker.patch ]; + patches = [ + # Fix this error when building bootia32.efi and bootx64.efi: + # error: PHDR segment not covered by LOAD segment + ./no-dynamic-linker.patch + + # multiple header dirs, see above + ./sys-headers-incsdir.patch + ]; + + # multiple header dirs, see above + inherit (self.include) postPatch; CONFIG = "GENERIC"; propagatedBuildInputs = with self; [ include ]; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install tsort lorder statHook rsync uudecode config genassym ]; @@ -518,9 +615,11 @@ in lib.makeScopeWithSplicing pushd arch/$MACHINE/conf config $CONFIG popd - ''; + '' + # multiple header dirs, see above + + self.include.postConfigure; - makeFlags = [ "FIRMWAREDIR=$(out)/libdata/firmware" ]; + makeFlags = defaultMakeFlags ++ [ "FIRMWAREDIR=$(out)/libdata/firmware" ]; hardeningDisable = [ "pic" ]; MKKMOD = "no"; NIX_CFLAGS_COMPILE = [ "-Wa,--no-warn" ]; @@ -573,7 +672,7 @@ in lib.makeScopeWithSplicing sha256 = "02gm5a5zhh8qp5r5q5r7x8x6x50ir1i0ncgsnfwh1vnrz6mxbq7z"; extraPaths = with self; [ common libc.src sys.src ]; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal byacc install tsort lorder mandoc statHook ]; @@ -588,7 +687,7 @@ in lib.makeScopeWithSplicing buildInputs = with self; [ libterminfo libcurses ]; propagatedBuildInputs = with self; compatIfNeeded; SHLIBINSTALLDIR = "$(out)/lib"; - makeFlags = [ "LIBDO.terminfo=${self.libterminfo}/lib" ]; + makeFlags = defaultMakeFlags ++ [ "LIBDO.terminfo=${self.libterminfo}/lib" ]; postPatch = '' sed -i '1i #undef bool_t' el.h substituteInPlace config.h \ @@ -607,7 +706,7 @@ in lib.makeScopeWithSplicing version = "9.2"; sha256 = "0pq05k3dj0dfsczv07frnnji92mazmy2qqngqbx2zgqc1x251414"; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install tsort lorder mandoc statHook nbperf tic ]; buildInputs = with self; compatIfNeeded; @@ -640,7 +739,7 @@ in lib.makeScopeWithSplicing ] ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)="; propagatedBuildInputs = with self; compatIfNeeded; MKDOC = "no"; # missing vfontedpr - makeFlags = [ "LIBDO.terminfo=${self.libterminfo}/lib" ]; + makeFlags = defaultMakeFlags ++ [ "LIBDO.terminfo=${self.libterminfo}/lib" ]; postPatch = lib.optionalString (!stdenv.isDarwin) '' substituteInPlace printw.c \ --replace "funopen(win, NULL, __winwrite, NULL, NULL)" NULL \ @@ -667,10 +766,10 @@ in lib.makeScopeWithSplicing path = "lib/librpcsvc"; version = "9.2"; sha256 = "1q34pfiyjbrgrdqm46jwrsqms49ly6z3b0xh1wg331zga900vq5n"; - makeFlags = [ "INCSDIR=$(out)/include/rpcsvc" ]; + makeFlags = defaultMakeFlags ++ [ "INCSDIR=$(out)/include/rpcsvc" ]; meta.platforms = lib.platforms.netbsd; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install tsort lorder rpcgen statHook ]; @@ -748,7 +847,7 @@ in lib.makeScopeWithSplicing sha256 = "0al5jfazvhlzn9hvmnrbchx4d0gm282hq5gp4xs2zmj9ycmf6d03"; meta.platforms = lib.platforms.netbsd; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install mandoc groff flex byacc genassym gencat lorder tsort statHook rsync @@ -766,7 +865,7 @@ in lib.makeScopeWithSplicing # Hack to prevent a symlink being installed here for compatibility. SHLINKINSTALLDIR = "/usr/libexec"; USE_FORT = "yes"; - makeFlags = [ "BINDIR=$(out)/libexec" "CLIBOBJ=${self.libc}/lib" ]; + makeFlags = defaultMakeFlags ++ [ "BINDIR=$(out)/libexec" "CLIBOBJ=${self.libc}/lib" ]; extraPaths = with self; [ libc.src ] ++ libc.extraPaths; }; @@ -786,7 +885,7 @@ in lib.makeScopeWithSplicing (fetchNetBSD "external/bsd/jemalloc" "9.2" "0cq704swa0h2yxv4gc79z2lwxibk9k7pxh3q5qfs7axx3jx3n8kb") ]; nativeBuildInputs = with buildPackages.netbsd; [ - bsdSetupHook + bsdSetupHook netbsdSetupHook makeMinimal install mandoc groff flex byacc genassym gencat lorder tsort statHook rsync rpcgen @@ -797,7 +896,7 @@ in lib.makeScopeWithSplicing SHLIBINSTALLDIR = "$(out)/lib"; MKPICINSTALL = "yes"; NLSDIR = "$(out)/share/nls"; - makeFlags = [ "FILESDIR=$(out)/var/db"]; + makeFlags = defaultMakeFlags ++ [ "FILESDIR=$(out)/var/db"]; postInstall = '' pushd ${self.headers} find . -type d -exec mkdir -p $out/\{} \; @@ -851,7 +950,7 @@ in lib.makeScopeWithSplicing noCC = true; version = "9.2"; sha256 = "0svfc0byk59ri37pyjslv4c4rc7zw396r73mr593i78d39q5g3ad"; - makeFlags = [ "BINDIR=$(out)/share" ]; + makeFlags = defaultMakeFlags ++ [ "BINDIR=$(out)/share" ]; }; misc = mkDerivation { @@ -859,7 +958,7 @@ in lib.makeScopeWithSplicing noCC = true; version = "9.2"; sha256 = "1j2cdssdx6nncv8ffj7f7ybl7m9hadjj8vm8611skqdvxnjg6nbc"; - makeFlags = [ "BINDIR=$(out)/share" ]; + makeFlags = defaultMakeFlags ++ [ "BINDIR=$(out)/share" ]; }; man = mkDerivation { @@ -867,7 +966,7 @@ in lib.makeScopeWithSplicing noCC = true; version = "9.2"; sha256 = "1l4lmj4kmg8dl86x94sr45w0xdnkz8dn4zjx0ipgr9bnq98663zl"; - makeFlags = [ "FILESDIR=$(out)/share" ]; + makeFlags = defaultMakeFlags ++ [ "FILESDIR=$(out)/share" ]; }; # # END MISCELLANEOUS diff --git a/nixpkgs/pkgs/os-specific/bsd/netbsd/install-setup-hook.sh b/nixpkgs/pkgs/os-specific/bsd/netbsd/install-setup-hook.sh new file mode 100644 index 000000000000..4bfd4d785fac --- /dev/null +++ b/nixpkgs/pkgs/os-specific/bsd/netbsd/install-setup-hook.sh @@ -0,0 +1,8 @@ +addNetBSDInstallMakeFlags() { + export INSTALL_FILE="install -U -c" + export INSTALL_DIR="install -U -d" + export INSTALL_LINK="install -U -l h" + export INSTALL_SYMLINK="install -U -l s" +} + +preConfigureHooks+=(addNetBSDInstallMakeFlags) diff --git a/nixpkgs/pkgs/os-specific/bsd/netbsd/setup-hook.sh b/nixpkgs/pkgs/os-specific/bsd/netbsd/setup-hook.sh new file mode 100644 index 000000000000..fa8b19e7d8ce --- /dev/null +++ b/nixpkgs/pkgs/os-specific/bsd/netbsd/setup-hook.sh @@ -0,0 +1,15 @@ +mergeNetBSDSourceDir() { + # merge together all extra paths + # there should be a better way to do this + chmod -R u+w $BSDSRCDIR + for path in $extraPaths; do + rsync -Er --chmod u+w $path/ $BSDSRCDIR/ + done +} + +addNetBSDMakeFlags() { + makeFlags="INCSDIR=${!outputDev}/include $makeFlags" +} + +postUnpackHooks+=(mergeNetBSDSourceDir) +preConfigureHooks+=(addNetBSDMakeFlags) diff --git a/nixpkgs/pkgs/os-specific/bsd/netbsd/sys-headers-incsdir.patch b/nixpkgs/pkgs/os-specific/bsd/netbsd/sys-headers-incsdir.patch new file mode 100644 index 000000000000..ed85f8ea5b0c --- /dev/null +++ b/nixpkgs/pkgs/os-specific/bsd/netbsd/sys-headers-incsdir.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 3f1e18dc659d..163362b82f94 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,6 +2,8 @@ + + .include <bsd.own.mk> + ++INCSDIR= ${INCSDIR0} ++ + SUBDIR= altq arch compat dev fs miscfs \ + net net80211 netatalk netbt netcan netipsec netinet netinet6 \ + netmpls netsmb \ diff --git a/nixpkgs/pkgs/os-specific/bsd/setup-hook.sh b/nixpkgs/pkgs/os-specific/bsd/setup-hook.sh index 98fee66f5dfe..4bdfde68b62e 100644 --- a/nixpkgs/pkgs/os-specific/bsd/setup-hook.sh +++ b/nixpkgs/pkgs/os-specific/bsd/setup-hook.sh @@ -36,11 +36,6 @@ addMakeFlags() { export MKUNPRIVED=yes export EXTERNAL_TOOLCHAIN=yes - export INSTALL_FILE="install -U -c" - export INSTALL_DIR="xinstall -U -d" - export INSTALL_LINK="install -U -l h" - export INSTALL_SYMLINK="install -U -l s" - makeFlags="MACHINE=$MACHINE $makeFlags" makeFlags="MACHINE_ARCH=$MACHINE_ARCH $makeFlags" makeFlags="AR=$AR $makeFlags" @@ -63,15 +58,9 @@ addMakeFlags() { } setBSDSourceDir() { - # merge together all extra paths - # there should be a better way to do this sourceRoot=$PWD/$sourceRoot export BSDSRCDIR=$sourceRoot export _SRC_TOP_=$BSDSRCDIR - chmod -R u+w $sourceRoot - for path in $extraPaths; do - rsync -Er --chmod u+w $path/ $sourceRoot/ - done cd $sourceRoot if [ -d "$BSD_PATH" ] @@ -85,7 +74,7 @@ includesPhase() { local flagsArray=( $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - DESTDIR=${!outputInclude} includes + includes ) echoCmd 'includes flags' "${flagsArray[@]}" diff --git a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index cb85566b5128..66190b7b4e37 100644 --- a/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -69,7 +69,13 @@ appleDerivation' stdenv { #define TARGET_OS_UNIX 0 #define TARGET_OS_EMBEDDED 0 #define TARGET_OS_IPHONE 0 + #define TARGET_OS_IOS 0 + #define TARGET_OS_WATCH 0 + #define TARGET_OS_BRIDGE 0 + #define TARGET_OS_TV 0 + #define TARGET_OS_SIMULATOR 0 #define TARGET_IPHONE_SIMULATOR 0 + #define TARGET_OS_NANO 0 #define TARGET_OS_LINUX 0 #define TARGET_CPU_PPC 0 diff --git a/nixpkgs/pkgs/os-specific/darwin/sigtool/default.nix b/nixpkgs/pkgs/os-specific/darwin/sigtool/default.nix index 933ef784879f..4c573af95be1 100644 --- a/nixpkgs/pkgs/os-specific/darwin/sigtool/default.nix +++ b/nixpkgs/pkgs/os-specific/darwin/sigtool/default.nix @@ -1,24 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, makeWrapper, openssl }: +{ lib, stdenv, fetchFromGitHub, pkg-config, openssl }: -stdenv.mkDerivation { - name = "sigtool"; +stdenv.mkDerivation rec { + pname = "sigtool"; + version = "0.1.2"; src = fetchFromGitHub { owner = "thefloweringash"; repo = "sigtool"; - rev = "4a3719b42dc91c3f513df94048851cc98e7c7fcf"; - sha256 = "04ra1cx7k1sdbkj5yrvl0s3l333vpir8rnm8k1dh2zy1w0a6hpqa"; + rev = "v${version}"; + sha256 = "sha256-v4udqW37vwcqBdqfvfwHnoyXpuLFt188ekVCPCPsTPM"; }; - nativeBuildInputs = [ pkg-config makeWrapper ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; installFlags = [ "PREFIX=$(out)" ]; - - # Upstream (me) asserts the driver script is optional. - postInstall = '' - substitute $NIX_BUILD_TOP/$sourceRoot/codesign.sh $out/bin/codesign \ - --replace sigtool "$out/bin/sigtool" - chmod a+x $out/bin/codesign - ''; } diff --git a/nixpkgs/pkgs/os-specific/darwin/trash/trash.diff b/nixpkgs/pkgs/os-specific/darwin/trash/trash.diff index fa6edf98b3de..d96f6c9c4fef 100644 --- a/nixpkgs/pkgs/os-specific/darwin/trash/trash.diff +++ b/nixpkgs/pkgs/os-specific/darwin/trash/trash.diff @@ -7,7 +7,7 @@ index 5e4306f..9c975fc 100644 @echo ---- Compiling: @echo ====================================== - $(CC) -O2 -Wall -Wextra -Wpartial-availability -Wno-unguarded-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch i386 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES) -+ $(CC) -O2 -Wall -Wextra -Wpartial-availability -Wno-unguarded-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES) ++ $(CC) -O2 -Wall -Wextra -Wpartial-availability -Wno-unguarded-availability -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES) analyze: @echo diff --git a/nixpkgs/pkgs/os-specific/linux/915resolution/default.nix b/nixpkgs/pkgs/os-specific/linux/915resolution/default.nix index 57f8ba0d33b3..b67d737034e4 100644 --- a/nixpkgs/pkgs/os-specific/linux/915resolution/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/915resolution/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "915resolution-0.5.3"; + pname = "915resolution"; + version = "0.5.3"; src = fetchurl { - url = "http://915resolution.mango-lang.org/${name}.tar.gz"; + url = "http://915resolution.mango-lang.org/915resolution-${version}.tar.gz"; sha256 = "0hmmy4kkz3x6yigz6hk99416ybznd67dpjaxap50nhay9f1snk5n"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/acpid/default.nix b/nixpkgs/pkgs/os-specific/linux/acpid/default.nix index d28ff447681e..2b8dac0c8e43 100644 --- a/nixpkgs/pkgs/os-specific/linux/acpid/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/acpid/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "acpid-2.0.32"; + pname = "acpid"; + version = "2.0.32"; src = fetchurl { - url = "mirror://sourceforge/acpid2/${name}.tar.xz"; + url = "mirror://sourceforge/acpid2/acpid-${version}.tar.xz"; sha256 = "0zhmxnhnhg4v1viw82yjr22kram6k5k1ixznhayk8cnw7q5x7lpj"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/acpitool/default.nix b/nixpkgs/pkgs/os-specific/linux/acpitool/default.nix index 4a3d1a36bd74..d494e95e3db6 100644 --- a/nixpkgs/pkgs/os-specific/linux/acpitool/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/acpitool/default.nix @@ -7,10 +7,11 @@ let }; in stdenv.mkDerivation rec { - name = "acpitool-0.5.1"; + pname = "acpitool"; + version = "0.5.1"; src = fetchurl { - url = "mirror://sourceforge/acpitool/${name}.tar.bz2"; + url = "mirror://sourceforge/acpitool/acpitool-${version}.tar.bz2"; sha256 = "004fb6cd43102918b6302cf537a2db7ceadda04aef2e0906ddf230f820dad34f"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/afuse/default.nix b/nixpkgs/pkgs/os-specific/linux/afuse/default.nix index 75c44e111725..5bf32fbe6661 100644 --- a/nixpkgs/pkgs/os-specific/linux/afuse/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/afuse/default.nix @@ -1,11 +1,14 @@ -{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, fuse }: +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, fuse }: -stdenv.mkDerivation { - name = "afuse-0.4.1"; +stdenv.mkDerivation rec { + pname = "afuse"; + version = "0.4.1"; - src = fetchurl { - url = "https://github.com/pcarrier/afuse/archive/v0.4.1.tar.gz"; - sha256 = "1sfhicmxppkvdd4z9klfn63snb71gr9hff6xij1gzk94xg6m0ycc"; + src = fetchFromGitHub { + owner = "pcarrier"; + repo = "afuse"; + rev = "v${version}"; + sha256 = "06i855h8a1w2jfly2gfy7vwhb2fp74yxbf3r69s28lki2kzwjar6"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix b/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix index a627a7762a89..8ad48c41408b 100644 --- a/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-firmware/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, buildPackages, autoreconfHook, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - name = "alsa-firmware-1.2.1"; + pname = "alsa-firmware"; + version = "1.2.1"; src = fetchurl { - url = "mirror://alsa/firmware/${name}.tar.bz2"; + url = "mirror://alsa/firmware/alsa-firmware-${version}.tar.bz2"; sha256 = "1aq8z8ajpjvcx7bwhwp36bh5idzximyn77ygk3ifs0my3mbpr8mf"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix b/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix index 5acf8e560e3d..344913888d57 100644 --- a/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix @@ -20,7 +20,7 @@ }: let - apparmor-version = "3.0.1"; + apparmor-version = "3.0.3"; apparmor-meta = component: with lib; { homepage = "https://apparmor.net/"; @@ -32,7 +32,7 @@ let apparmor-sources = fetchurl { url = "https://launchpad.net/apparmor/${lib.versions.majorMinor apparmor-version}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; - sha256 = "096zbg3v7b51x7f1ly61mzd3iy9alad6sd4lam98j2d6v5ragbcg"; + sha256 = "0nasq8pdmzkrf856yg1v8z5hcs0nn6gw2qr60ab0a7j9ixfv0g8m"; }; aa-teardown = writeShellScript "aa-teardown" '' @@ -56,7 +56,7 @@ let name = "0003-Added-missing-typedef-definitions-on-parser.patch"; sha256 = "0yyaqz8jlmn1bm37arggprqz0njb4lhjni2d9c8qfqj0kll0bam0"; }) - ]; + ]; # Set to `true` after the next FIXME gets fixed or this gets some # common derivation infra. Too much copy-paste to fix one by one. diff --git a/nixpkgs/pkgs/os-specific/linux/audit/default.nix b/nixpkgs/pkgs/os-specific/linux/audit/default.nix index 30327fb1082e..6fa7ba28d8e3 100644 --- a/nixpkgs/pkgs/os-specific/linux/audit/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/audit/default.nix @@ -8,10 +8,11 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { - name = "audit-2.8.5"; # at the next release, remove the patches below! + pname = "audit"; + version = "2.8.5"; # at the next release, remove the patches below! src = fetchurl { - url = "https://people.redhat.com/sgrubb/audit/${name}.tar.gz"; + url = "https://people.redhat.com/sgrubb/audit/audit-${version}.tar.gz"; sha256 = "1dzcwb2q78q7x41shcachn7f4aksxbxd470yk38zh03fch1l2p8f"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/bbswitch/default.nix b/nixpkgs/pkgs/os-specific/linux/bbswitch/default.nix index fbd34afdaf8f..4d081225f11e 100644 --- a/nixpkgs/pkgs/os-specific/linux/bbswitch/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/bbswitch/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, kernel, runtimeShell }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel, runtimeShell }: let baseName = "bbswitch"; @@ -10,9 +10,11 @@ in stdenv.mkDerivation { inherit name; - src = fetchurl { - url = "https://github.com/Bumblebee-Project/${baseName}/archive/v${version}.tar.gz"; - sha256 = "0xql1nv8dafnrcg54f3jsi3ny3cd2ca9iv73pxpgxd2gfczvvjkn"; + src = fetchFromGitHub { + owner = "Bumblebee-Project"; + repo = "bbswitch"; + rev = "v${version}"; + hash = "sha256-FHC8myKnouNDERVds2QCJj1ZstjHrOzFpb+FDiSBjL4="; }; patches = [ diff --git a/nixpkgs/pkgs/os-specific/linux/bcc/default.nix b/nixpkgs/pkgs/os-specific/linux/bcc/default.nix index 221f38faa879..929981df4706 100644 --- a/nixpkgs/pkgs/os-specific/linux/bcc/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/bcc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , makeWrapper, cmake, llvmPackages, kernel , flex, bison, elfutils, python, luajit, netperf, iperf, libelf , systemtap, bash, libbpf @@ -29,6 +29,12 @@ python.pkgs.buildPythonApplication rec { # This is needed until we fix # https://github.com/NixOS/nixpkgs/issues/40427 ./fix-deadlock-detector-import.patch + # Add definition for BTF_KIND_FLOAT, added in Linux 5.14 + # Can be removed once linuxHeaders (used here via glibc) are bumped to 5.14+. + (fetchpatch { + url = "https://salsa.debian.org/debian/bpfcc/-/raw/71136ef5b66a2ecefd635a7aca2e0e835ff09095/debian/patches/0004-compat-defs.patch"; + sha256 = "05s1zxihwkvbl2r2mqc5dj7fpcipqyvwr11v8b9hqbwjkm3qpz40"; + }) ]; propagatedBuildInputs = [ python.pkgs.netaddr ]; diff --git a/nixpkgs/pkgs/os-specific/linux/bluez/default.nix b/nixpkgs/pkgs/os-specific/linux/bluez/default.nix index a3899fd47c58..3d345e68f3c3 100644 --- a/nixpkgs/pkgs/os-specific/linux/bluez/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/bluez/default.nix @@ -21,11 +21,11 @@ ]; in stdenv.mkDerivation rec { pname = "bluez"; - version = "5.60"; + version = "5.61"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz"; - sha256 = "sha256-cQmZWA0B7lnsWF5efAf9lO3e3AAaom/nRkxUb52UUwQ="; + sha256 = "sha256-g6/WxSF5VUv+q7y1OP7C62vpCorDxAhxtJ162LScQjs="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/os-specific/linux/bridge-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/bridge-utils/default.nix index 12655c3bed66..92e7606c9bdb 100644 --- a/nixpkgs/pkgs/os-specific/linux/bridge-utils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/bridge-utils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - name = "bridge-utils-1.5"; + pname = "bridge-utils"; + version = "1.5"; src = fetchurl { - url = "mirror://sourceforge/bridge/${name}.tar.gz"; + url = "mirror://sourceforge/bridge/bridge-utils-${version}.tar.gz"; sha256 = "42f9e5fb8f6c52e63a98a43b81bd281c227c529f194913e1c51ec48a393b6688"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/cpufrequtils/default.nix b/nixpkgs/pkgs/os-specific/linux/cpufrequtils/default.nix index 6f94d0f89254..d64996c4961e 100644 --- a/nixpkgs/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libtool, gettext }: stdenv.mkDerivation rec { - name = "cpufrequtils-008"; + pname = "cpufrequtils"; + version = "008"; src = fetchurl { - url = "http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/${name}.tar.gz"; + url = "http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-${version}.tar.gz"; sha256 = "127i38d4w1hv2dzdy756gmbhq25q3k34nqb2s0xlhsfhhdqs0lq0"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/cpupower-gui/default.nix b/nixpkgs/pkgs/os-specific/linux/cpupower-gui/default.nix new file mode 100644 index 000000000000..2fcc55e14cb3 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/cpupower-gui/default.nix @@ -0,0 +1,93 @@ +{ lib +, stdenv +, fetchFromGitHub +, buildPythonApplication +, appstream-glib +, dbus-python +, desktop-file-utils +, gettext +, glib +, gobject-introspection +, gtk3 +, hicolor-icon-theme +, libappindicator +, libhandy +, meson +, ninja +, pkg-config +, pygobject3 +, pyxdg +, systemd +, wrapGAppsHook +}: + +buildPythonApplication rec { + pname = "cpupower-gui"; + version = "1.0.0"; + + # This packages doesn't have a setup.py + format = "other"; + + src = fetchFromGitHub { + owner = "vagnum08"; + repo = pname; + rev = "v${version}"; + sha256 = "05lvpi3wgyi741sd8lgcslj8i7yi3wz7jwl7ca3y539y50hwrdas"; + }; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils # needed for update-desktop-database + gettext + glib # needed for glib-compile-schemas + gobject-introspection # need for gtk namespace to be available + hicolor-icon-theme # needed for postinstall script + meson + ninja + pkg-config + wrapGAppsHook + + # Python packages + dbus-python + libappindicator + pygobject3 + pyxdg + ]; + + buildInputs = [ + glib + gtk3 + libhandy + ]; + + propagatedBuildInputs = [ + dbus-python + libappindicator + pygobject3 + pyxdg + ]; + + mesonFlags = [ + "-Dsystemddir=${placeholder "out"}/lib/systemd" + ]; + + preConfigure = '' + patchShebangs build-aux/meson/postinstall.py + ''; + + strictDeps = false; + dontWrapGApps = true; + + makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; + + postFixup = '' + wrapPythonProgramsIn $out/lib "$out $propagatedBuildInputs" + ''; + + meta = with lib; { + description = "Change the frequency limits of your cpu and its governor"; + homepage = "https://github.com/vagnum08/cpupower-gui/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ unode ]; + }; +} diff --git a/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix b/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix index e7304e196798..9522e9e52241 100644 --- a/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/cryptsetup/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "cryptsetup"; - version = "2.3.6"; + version = "2.4.0"; outputs = [ "out" "dev" "man" ]; src = fetchurl { - url = "mirror://kernel/linux/utils/cryptsetup/v2.3/${pname}-${version}.tar.xz"; - sha256 = "sha256-spa3oh6ldsKxgGEcyxnQauyN3a7ffHBLDGqBIQwlY18="; + url = "mirror://kernel/linux/utils/cryptsetup/v2.4/${pname}-${version}.tar.xz"; + sha256 = "sha256-xci9oxFZqcAQ6nLnCAU8xCUs9e69ylIOFQq8Bgkof/g="; }; # Disable 4 test cases that fail in a sandbox @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-cryptsetup-reencrypt" "--with-crypto_backend=openssl" + "--disable-ssh-token" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/os-specific/linux/devmem2/default.nix b/nixpkgs/pkgs/os-specific/linux/devmem2/default.nix index 86f6f916cefc..fbf47204b3e6 100644 --- a/nixpkgs/pkgs/os-specific/linux/devmem2/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/devmem2/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation { - name = "devmem2-2004-08-05"; + pname = "devmem2"; + version = "unstable-2004-08-05"; src = fetchurl { urls = [ diff --git a/nixpkgs/pkgs/os-specific/linux/disk-indicator/default.nix b/nixpkgs/pkgs/os-specific/linux/disk-indicator/default.nix index f754882ccd01..8a083b8b894d 100644 --- a/nixpkgs/pkgs/os-specific/linux/disk-indicator/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/disk-indicator/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, libX11 }: stdenv.mkDerivation { - name = "disk-indicator-2014-05-19"; + pname = "disk-indicator"; + version = "unstable-2014-05-19"; src = fetchgit { url = "git://github.com/MeanEYE/Disk-Indicator.git"; diff --git a/nixpkgs/pkgs/os-specific/linux/dmidecode/default.nix b/nixpkgs/pkgs/os-specific/linux/dmidecode/default.nix index a4e09492debd..a12d97280f19 100644 --- a/nixpkgs/pkgs/os-specific/linux/dmidecode/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/dmidecode/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - name = "dmidecode-3.2"; + pname = "dmidecode"; + version = "3.2"; src = fetchurl { - url = "mirror://savannah/dmidecode/${name}.tar.xz"; + url = "mirror://savannah/dmidecode/dmidecode-${version}.tar.xz"; sha256 = "1pcfhcgs2ifdjwp7amnsr3lq95pgxpr150bjhdinvl505px0cw07"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/dmraid/default.nix b/nixpkgs/pkgs/os-specific/linux/dmraid/default.nix index c1e0dfc5ae43..3a6f31fa5523 100644 --- a/nixpkgs/pkgs/os-specific/linux/dmraid/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/dmraid/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, fetchpatch, lvm2 }: stdenv.mkDerivation rec { - name = "dmraid-1.0.0.rc16"; + pname = "dmraid"; + version = "1.0.0.rc16"; src = fetchurl { - url = "https://people.redhat.com/~heinzm/sw/dmraid/src/old/${name}.tar.bz2"; + url = "https://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-${version}.tar.bz2"; sha256 = "0m92971gyqp61darxbiri6a48jz3wq3gkp8r2k39320z0i6w8jgq"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/drbd/default.nix b/nixpkgs/pkgs/os-specific/linux/drbd/default.nix index ae3e986e14af..85be205749ac 100644 --- a/nixpkgs/pkgs/os-specific/linux/drbd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/drbd/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, flex, systemd, perl }: stdenv.mkDerivation rec { - name = "drbd-8.4.4"; + pname = "drbd"; + version = "8.4.4"; src = fetchurl { - url = "http://oss.linbit.com/drbd/8.4/${name}.tar.gz"; + url = "http://oss.linbit.com/drbd/8.4/drbd-${version}.tar.gz"; sha256 = "1w4889h1ak7gy9w33kd4fgjlfpgmp6hzfya16p1pkc13bjf22mm0"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/edac-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/edac-utils/default.nix index 63c539602f12..6171f8ed3073 100644 --- a/nixpkgs/pkgs/os-specific/linux/edac-utils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/edac-utils/default.nix @@ -2,7 +2,8 @@ , sysfsutils, dmidecode, kmod }: stdenv.mkDerivation { - name = "edac-utils-2015-01-07"; + pname = "edac-utils"; + version = "unstable-2015-01-07"; src = fetchFromGitHub { owner = "grondo"; diff --git a/nixpkgs/pkgs/os-specific/linux/ell/default.nix b/nixpkgs/pkgs/os-specific/linux/ell/default.nix index a43b9eff3c81..5fea8c197963 100644 --- a/nixpkgs/pkgs/os-specific/linux/ell/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.41"; + version = "0.43"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "sha256-UCE+PgGmbePlOoAc8jXxCX6fHr16qf1AQMKxizfSTJM="; + sha256 = "sha256-ttKFKV8spxnkFpZHV4Dn9BxJdjxYLWYrHY+qq6uAOlg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/os-specific/linux/firejail/default.nix b/nixpkgs/pkgs/os-specific/linux/firejail/default.nix index 1a9b7e34f5a2..47fce3df5332 100644 --- a/nixpkgs/pkgs/os-specific/linux/firejail/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/firejail/default.nix @@ -20,6 +20,9 @@ stdenv.mkDerivation rec { # By default fbuilder hardcodes the firejail binary to the install path. # On NixOS the firejail binary is a setuid wrapper available in $PATH. ./fbuilder-call-firejail-on-path.patch + # Disable symlink check on /etc/hosts, see + # https://github.com/netblue30/firejail/issues/2758#issuecomment-805174951 + ./remove-link-check.patch ]; prePatch = '' diff --git a/nixpkgs/pkgs/os-specific/linux/firejail/remove-link-check.patch b/nixpkgs/pkgs/os-specific/linux/firejail/remove-link-check.patch new file mode 100644 index 000000000000..477df57a2411 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/firejail/remove-link-check.patch @@ -0,0 +1,48 @@ +From ccc726f8ec877d8cda720daa2498e43629b6dd48 Mon Sep 17 00:00:00 2001 +From: Jonas Heinrich <onny@project-insanity.org> +Date: Sun, 19 Sep 2021 11:48:06 +0200 +Subject: [PATCH 1/2] remove hosts file link check + +--- + src/firejail/fs_hostname.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/src/firejail/fs_hostname.c b/src/firejail/fs_hostname.c +index 42255070c4..97ce70f9c1 100644 +--- a/src/firejail/fs_hostname.c ++++ b/src/firejail/fs_hostname.c +@@ -132,10 +132,6 @@ char *fs_check_hosts_file(const char *fname) { + invalid_filename(fname); + char *rv = expand_home(fname, cfg.homedir); + +- // no a link +- if (is_link(rv)) +- goto errexit; +- + // the user has read access to the file + if (access(rv, R_OK)) + goto errexit; + +From c2c51e7ca56075e7388b4f50922b148615d1b125 Mon Sep 17 00:00:00 2001 +From: Jonas Heinrich <onny@project-insanity.org> +Date: Sun, 19 Sep 2021 11:49:08 +0200 +Subject: [PATCH 2/2] remove hosts file link check + +--- + src/firejail/fs_hostname.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/firejail/fs_hostname.c b/src/firejail/fs_hostname.c +index 97ce70f9c1..b228707131 100644 +--- a/src/firejail/fs_hostname.c ++++ b/src/firejail/fs_hostname.c +@@ -154,9 +154,6 @@ void fs_mount_hosts_file(void) { + struct stat s; + if (stat("/etc/hosts", &s) == -1) + goto errexit; +- // not a link +- if (is_link("/etc/hosts")) +- goto errexit; + // owned by root + if (s.st_uid != 0) + goto errexit; diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix index 79de65fcb981..389078db0af5 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "b43-fwcutter-019"; + pname = "b43-fwcutter"; + version = "019"; src = fetchurl { - url = "https://bues.ch/b43/fwcutter/${name}.tar.bz2"; + url = "https://bues.ch/b43/fwcutter/b43-fwcutter-${version}.tar.bz2"; sha256 = "1ki1f5fy3yrw843r697f8mqqdz0pbsbqnvg4yzkhibpn1lqqbsnn"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix index 6cbaa4acb8d2..3363140ad569 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub }: with lib; stdenv.mkDerivation { - name = "rtl8192su-unstable-2016-10-05"; + pname = "rtl8192su"; + version = "unstable-2016-10-05"; src = fetchFromGitHub { owner = "chunkeey"; diff --git a/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix index a7bc36106996..4d0ae9a1d5a7 100644 --- a/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-firmware"; # Check Makefile when updating, make sure postInstall matches make install - version = "1.0.28"; + version = "1.0.29"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; rev = version; - sha256 = "sha256-hv8Vdpg/Tt3eo2AdFlOEG182jH5Oy7/BX3p1EMPQjnc="; + sha256 = "sha256-4wvVls6Z42GtC/MVFTvCv1UV/w5nt4p9oTMU4Bqh4JU="; }; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--workspace" ]; - cargoSha256 = "sha256-A39zvxvZB3j59giPAVeucHPzqwofnugmLweiPXh5Uzg="; + cargoSha256 = "sha256-x2FO4UWtsvUeKgPxaqjdxtp9vWJq9vLIqQPyGF8nQG4="; # Purposefully don't install systemd unit file, that's for NixOS postInstall = '' diff --git a/nixpkgs/pkgs/os-specific/linux/fswebcam/default.nix b/nixpkgs/pkgs/os-specific/linux/fswebcam/default.nix index 18cdc21f0b60..08c35d79f3dc 100644 --- a/nixpkgs/pkgs/os-specific/linux/fswebcam/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/fswebcam/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libv4l, gd }: stdenv.mkDerivation rec { - name = "fswebcam-20200725"; + pname = "fswebcam"; + version = "2020-07-25"; src = fetchurl { - url = "https://www.sanslogic.co.uk/fswebcam/files/${name}.tar.gz"; + url = "https://www.sanslogic.co.uk/fswebcam/files/fswebcam-${lib.replaceStrings ["."] [""] version}.tar.gz"; sha256 = "1dazsrcaw9s30zz3jpxamk9lkff5dkmflp1s0jjjvdbwa0k6k6ii"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/fxload/default.nix b/nixpkgs/pkgs/os-specific/linux/fxload/default.nix index 3255c992f864..8c1a778ec8bf 100644 --- a/nixpkgs/pkgs/os-specific/linux/fxload/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/fxload/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "fxload-2002_04_11"; +stdenv.mkDerivation rec { + pname = "fxload"; + version = "2002.04.11"; src = fetchurl { - url = "mirror://sourceforge/linux-hotplug/fxload-2002_04_11.tar.gz"; + url = "mirror://sourceforge/linux-hotplug/fxload-${lib.replaceStrings ["."] ["_"] version}.tar.gz"; sha256 = "1hql93bp3dxrv1p67nc63xsbqwljyynm997ysldrc3n9ifi6s48m"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/google-authenticator/default.nix b/nixpkgs/pkgs/os-specific/linux/google-authenticator/default.nix index ce90a1d432f7..fcf75ac7821a 100644 --- a/nixpkgs/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/google-authenticator/default.nix @@ -1,12 +1,14 @@ -{ stdenv, lib, fetchurl, autoreconfHook, pam, qrencode }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pam, qrencode }: stdenv.mkDerivation rec { pname = "google-authenticator-libpam"; version = "1.09"; - src = fetchurl { - url = "https://github.com/google/google-authenticator-libpam/archive/${version}.tar.gz"; - sha256 = "0dyhgizl2jcrnfn5sxipxawqrbr6qgjh7aggw8fz3hix861pj7db"; + src = fetchFromGitHub { + owner = "google"; + repo = "google-authenticator-libpam"; + rev = version; + hash = "sha256-DS0h6FWMNKnSSj039bH6iyWrERa5M7LBSkbyig6pyxY="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/os-specific/linux/hd-idle/default.nix b/nixpkgs/pkgs/os-specific/linux/hd-idle/default.nix index 3e4b08151463..301a218ff62e 100644 --- a/nixpkgs/pkgs/os-specific/linux/hd-idle/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/hd-idle/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hd-idle-1.05"; + pname = "hd-idle"; + version = "1.05"; src = fetchurl { - url = "mirror://sourceforge/project/hd-idle/${name}.tgz"; + url = "mirror://sourceforge/project/hd-idle/hd-idle-${version}.tgz"; sha256 = "031sm996s0rhy3z91b9xvyimsj2yd2fhsww2al2hxda5s5wzxzjf"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/ioport/default.nix b/nixpkgs/pkgs/os-specific/linux/ioport/default.nix index 543495ec2afc..6da154648fc2 100644 --- a/nixpkgs/pkgs/os-specific/linux/ioport/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/ioport/default.nix @@ -1,12 +1,16 @@ { lib, stdenv, perl, fetchurl }: -stdenv.mkDerivation { - name = "ioport-1.2"; +stdenv.mkDerivation rec { + pname = "ioport"; + version = "1.2"; + src = fetchurl { - url = "https://people.redhat.com/rjones/ioport/files/ioport-1.2.tar.gz"; + url = "https://people.redhat.com/rjones/ioport/files/ioport-${version}.tar.gz"; sha256 = "1h4d5g78y7kla0zl25jgyrk43wy3m3bygqg0blki357bc55irb3z"; }; + buildInputs = [ perl ]; + meta = with lib; { description = "Direct access to I/O ports from the command line"; homepage = "https://people.redhat.com/rjones/ioport/"; diff --git a/nixpkgs/pkgs/os-specific/linux/iotop-c/default.nix b/nixpkgs/pkgs/os-specific/linux/iotop-c/default.nix index ca0eddac6664..ea40ff79f64a 100644 --- a/nixpkgs/pkgs/os-specific/linux/iotop-c/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/iotop-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iotop-c"; - version = "1.18"; + version = "1.19"; src = fetchFromGitHub { owner = "Tomas-M"; repo = "iotop"; rev = "v${version}"; - sha256 = "sha256-5RbxryvRKWJvjuJJwDK6GYnwdtHGfW7XEc75q4omxIA="; + sha256 = "sha256-CuZwOIhjl6fpEvfw/4CTjKQkxazLL/NGujmNcx1Jrbc="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/os-specific/linux/iotop/default.nix b/nixpkgs/pkgs/os-specific/linux/iotop/default.nix index a91175aa59f3..0376ff1a55ec 100644 --- a/nixpkgs/pkgs/os-specific/linux/iotop/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/iotop/default.nix @@ -1,10 +1,11 @@ { lib, fetchurl, python3Packages, fetchpatch }: python3Packages.buildPythonApplication rec { - name = "iotop-0.6"; + pname = "iotop"; + version = "0.6"; src = fetchurl { - url = "http://guichaz.free.fr/iotop/files/${name}.tar.bz2"; + url = "http://guichaz.free.fr/iotop/files/iotop-${version}.tar.bz2"; sha256 = "0nzprs6zqax0cwq8h7hnszdl3d2m4c2d4vjfxfxbnjfs9sia5pis"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/iproute/default.nix b/nixpkgs/pkgs/os-specific/linux/iproute/default.nix index ea3c4d36958f..74003ff83b83 100644 --- a/nixpkgs/pkgs/os-specific/linux/iproute/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/iproute/default.nix @@ -1,17 +1,25 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv, fetchurl, fetchpatch , buildPackages, bison, flex, pkg-config , db, iptables, libelf, libmnl }: stdenv.mkDerivation rec { pname = "iproute2"; - version = "5.13.0"; + version = "5.14.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-cqLlN3TKyeZfe2F97rsgWfh+iWDW6XE+TXiM6pZvGzY="; + sha256 = "1m4ifnxq7lxnm95l5354z8dk3xj6w9isxmbz53266drgln2sf3r1"; }; + patches = [ + # To avoid ./configure failing due to invalid arguments: + (fetchpatch { # configure: restore backward compatibility + url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/patch/?id=a3272b93725a406bc98b67373da67a4bdf6fcdb0"; + sha256 = "0hyagh2lf6rrfss4z7ca8q3ydya6gg7vfhh25slhpgcn6lnk0xbv"; + }) + ]; + preConfigure = '' # Don't try to create /var/lib/arpd: sed -e '/ARPDDIR/d' -i Makefile diff --git a/nixpkgs/pkgs/os-specific/linux/iproute/mptcp.nix b/nixpkgs/pkgs/os-specific/linux/iproute/mptcp.nix index 127232139016..8a4cde0c79ed 100644 --- a/nixpkgs/pkgs/os-specific/linux/iproute/mptcp.nix +++ b/nixpkgs/pkgs/os-specific/linux/iproute/mptcp.nix @@ -11,12 +11,13 @@ iproute2.overrideAttrs (oa: rec { sha256 = "07fihvwlaj0ng8s8sxqhd0a9h1narcnp4ibk88km9cpsd32xv4q3"; }; - preConfigure = '' - # Don't try to create /var/lib/arpd: - sed -e '/ARPDDIR/d' -i Makefile + preConfigure = oa.preConfigure + '' patchShebangs configure ''; + # We override "patches" to never apply any iproute2 patches: + patches = [ ]; + meta = with lib; { homepage = "https://github.com/multipath-tcp/iproute-mptcp"; description = "IP-Route extensions for MultiPath TCP"; diff --git a/nixpkgs/pkgs/os-specific/linux/ipsec-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/ipsec-tools/default.nix index 33152cc51c13..f10364121a46 100644 --- a/nixpkgs/pkgs/os-specific/linux/ipsec-tools/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/ipsec-tools/default.nix @@ -7,10 +7,11 @@ # the time being. stdenv.mkDerivation rec { - name = "ipsec-tools-0.8.2"; + pname = "ipsec-tools"; + version = "0.8.2"; src = fetchurl { - url = "mirror://sourceforge/ipsec-tools/${name}.tar.bz2"; + url = "mirror://sourceforge/ipsec-tools/ipsec-tools-${version}.tar.bz2"; sha256 = "0b9gfbz78k2nj0k7jdlm5kajig628ja9qm0z5yksiwz22s3v7dlf"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/iwd/default.nix b/nixpkgs/pkgs/os-specific/linux/iwd/default.nix index e0a1a566d777..33e1f1783ab3 100644 --- a/nixpkgs/pkgs/os-specific/linux/iwd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/iwd/default.nix @@ -8,16 +8,17 @@ , readline , openssl , python3Packages +, fetchpatch }: stdenv.mkDerivation rec { pname = "iwd"; - version = "1.15"; + version = "1.17"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "sha256-qGQDIzJfeBT9VLwr9Ci9vXcM0ZvFvjL2E9PcKoZ8E94="; + sha256 = "sha256-uWWdKjxctz8fdiIkSiuOYNcZPhxEWDXaA8QPLnd/I9c="; }; outputs = [ "out" "man" ] @@ -56,6 +57,14 @@ stdenv.mkDerivation rec { "--with-systemd-networkdir=${placeholder "out"}/lib/systemd/network/" ]; + patches = [ + # Fix failure in test-eapol. Remove when bumping to 1.18 + (fetchpatch { + url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git/patch/?id=ed10b00afa3f4c087b46d7ba0b60a47bd05d8b39"; + sha256 = "0n8ixrbfh428ajncakcb9kd2n4fw82kw9sfskn1d9ny0lrg39nvg"; + }) + ]; + postUnpack = '' mkdir -p iwd/ell ln -s ${ell.src}/ell/useful.h iwd/ell/useful.h diff --git a/nixpkgs/pkgs/os-specific/linux/jujuutils/default.nix b/nixpkgs/pkgs/os-specific/linux/jujuutils/default.nix index 554898cedebc..12e4c15e62c0 100644 --- a/nixpkgs/pkgs/os-specific/linux/jujuutils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/jujuutils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, linuxHeaders }: -stdenv.mkDerivation { - name = "jujuutils-0.2"; +stdenv.mkDerivation rec { + pname = "jujuutils"; + version = "0.2"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jujuutils/jujuutils-0.2.tar.gz"; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jujuutils/jujuutils-${version}.tar.gz"; sha256 = "1r74m7s7rs9d6y7cffi7mdap3jf96qwm1v6jcw53x5cikgmfxn4x"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index c82f872e4889..717fdaee72a5 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -35,7 +35,12 @@ let options = { debug = { - DEBUG_INFO = if (features.debug or false) then yes else no; + # Necessary for BTF + DEBUG_INFO = mkMerge [ + (whenOlder "5.2" (if (features.debug or false) then yes else no)) + (whenAtLeast "5.2" yes) + ]; + DEBUG_INFO_BTF = whenAtLeast "5.2" (option yes); DEBUG_KERNEL = yes; DEBUG_DEVRES = no; DYNAMIC_DEBUG = yes; @@ -881,6 +886,22 @@ let # Keeping it a built-in ensures it will be used if possible. FB_SIMPLE = yes; + } // optionalAttrs (versionAtLeast version "5.4" && (stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "aarch64-linux")) { + # Required for various hardware features on Chrome OS devices + CHROME_PLATFORMS = yes; + CHROMEOS_TBMC = module; + + CROS_EC = module; + + CROS_EC_I2C = module; + CROS_EC_SPI = module; + CROS_EC_LPC = module; + CROS_EC_ISHTP = module; + + CROS_KBD_LED_BACKLIGHT = module; + } // optionalAttrs (versionAtLeast version "5.4" && stdenv.hostPlatform.system == "x86_64-linux") { + CHROMEOS_LAPTOP = module; + CHROMEOS_PSTORE = module; }; }; in diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index 70a180e737eb..832e516e6efd 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -13,26 +13,26 @@ }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.63-hardened1.patch", - "sha256": "1v1w6ybfkgqisdprny9bb658443hbld86r96cvzqdkmd8wfh4513", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.63-hardened1/linux-hardened-5.10.63-hardened1.patch" + "name": "linux-hardened-5.10.67-hardened1.patch", + "sha256": "1yvfqkcffrva9hf4ns0jkksnvkj58h87msim0yhanlyp5jyz3l1p", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.67-hardened1/linux-hardened-5.10.67-hardened1.patch" }, "5.13": { "extra": "-hardened1", - "name": "linux-hardened-5.13.15-hardened1.patch", - "sha256": "1g75jh5j9qbh4wbiy2wnc982i2gld2845ai47rczcj7ciycba8n7", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.15-hardened1/linux-hardened-5.13.15-hardened1.patch" + "name": "linux-hardened-5.13.19-hardened1.patch", + "sha256": "1cj99y2xn7l89lf4mn7arp0r98r4nmvql3ffjpngzv8hsf79xgg7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.13.19-hardened1/linux-hardened-5.13.19-hardened1.patch" }, "5.14": { "extra": "-hardened1", - "name": "linux-hardened-5.14.2-hardened1.patch", - "sha256": "0hcw61bavhyr9v621ajsrl2zgz7kc0z8r7p5kzm37dnlggwl4qh3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.2-hardened1/linux-hardened-5.14.2-hardened1.patch" + "name": "linux-hardened-5.14.6-hardened1.patch", + "sha256": "0db5jvbvrk93x745ylxwnmx6ldwhmaqdnb2hfa35j0i2xjaw4hxx", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.14.6-hardened1/linux-hardened-5.14.6-hardened1.patch" }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.144-hardened1.patch", - "sha256": "1vm19d5cwxw3l2s4h7sbzrhk60m24nhbjdlpqd1bkbm8x8zcp9f3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.144-hardened1/linux-hardened-5.4.144-hardened1.patch" + "name": "linux-hardened-5.4.147-hardened1.patch", + "sha256": "1jkvfpckmj9ig4nsxxiigawkay05lk8r9fps16iaq6lz2mf9vqsb", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.147-hardened1/linux-hardened-5.4.147-hardened1.patch" } } diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index 8869d0cf653c..4fd140a361c5 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.246"; + version = "4.14.247"; # 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 = "0fpgig84shpas1jc0h4s3aw9brkcq1as84gjbk4bfhc48bpi4mlw"; + sha256 = "1kdhlsqpmw68xnfiyx98id8wis6kkxca2d4n7w2ncax0kyzrwyz7"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index d081f92332b2..ada819f4850d 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.206"; + version = "4.19.207"; # 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 = "1h44lvzxd0cngj71bk8qba9dz7jlqj68ir6xjwfafglb81ppgsxp"; + sha256 = "1fb658n89xf9asnaqi0bnh64ir2f78bdqyjvfb983qad9wqsadym"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix index 1469508eb0e3..f1e4329c2d41 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.283"; + version = "4.4.284"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1d9v4h4cbc4i371lhhwpxbmg88gna6xyi2ahfvv0clz60802y982"; + sha256 = "00xkd2p181cfkys4nri93xy7snmn8g2481x3qz0js7g9p3kz5bqf"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix index 89f45b8021a2..22f506f56581 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.282"; + version = "4.9.283"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "059fin4si93ya13xy831w84q496ksxidpd3kyw38918sfy4p6wk7"; + sha256 = "0pdh1lyhdp5c5n39wpr622kgchgf30iqk853a2rv9m3s3fry50lm"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix index 313666a471a0..720b619049a0 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.64"; + version = "5.10.68"; # 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 = "02p36mf41nsa4bamw18vhgbca094q2blbqqljdsb9qid9b94pf1y"; + sha256 = "08cl4bg9k331apj5fjl3jx6s6l543dnbjc1cfvin951m7l787ahv"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.13.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.13.nix index 888c6a291969..3f5ae2e13f54 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.13.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.13.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.13.16"; + version = "5.13.19"; # 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 = "1ljigvcg4q6ckr8kna3q5iyjsy7x5mrf1ycqfy0ibbhn9hbqjna9"; + sha256 = "0yxbcd1k4l4cmdn0hzcck4s0yvhvq9fpwp120dv9cz4i9rrfqxz8"; }; } // (args.argsOverride or { })) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.14.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.14.nix index 2a07ac2a0a95..45d39795db6f 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.14.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.14.3"; + version = "5.14.7"; # 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 = "1n5808v3vb2c27pv4f8r4avqzqp20dylclbc83cj2872d6z41hy6"; + sha256 = "1avypasvic298823xzpzzkjbmfv9s8bjnmq92ri62qbakx23j9dg"; }; } // (args.argsOverride or { })) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix index 4d01f1a7e618..ff4f019fc51c 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.145"; + version = "5.4.148"; # 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 = "1yb8vk5sbnyswylkpqw5i4n9cmnmlrfmbrnmy3nif579q8p7ixsw"; + sha256 = "1cwibh0y112hip5yd0n692rv44jh4sk2g6mj5n44g754k4i366a6"; }; } // (args.argsOverride or {})) diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix index 118f0e632e65..e4c9f03539f6 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.13.15"; - suffix = "lqx1"; + version = "5.14.6"; + suffix = "lqx4"; in buildLinux (args // { @@ -14,11 +14,11 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-YDdBOB49NkX2V+lA7JeKRXfpo81/MSoLDOsPjphhBJA="; + sha256 = "sha256-arje/B/oXW/2QUHKi1vJ2n20zNbri1bcMU58mE0evOM="; }; extraMeta = { - branch = "5.13/master"; + branch = "5.14/master"; maintainers = with lib.maintainers; [ atemu ]; description = linux_zen.meta.description + " (Same as linux_zen but less aggressive release schedule)"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 826d99883e4d..daa3c67da962 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.59-rt52"; # updated by ./update-rt.sh + version = "5.10.65-rt53"; # 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 = "107anv16khx055rpkvfd532rdcfg4ffbs7bhp45hdqi3bz0ssg1k"; + sha256 = "0riyq1gdm18642fpnhpcw8hspcjqzprzhqnygjxabjjvrvdxxlzd"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0i66z1njppn9qvl8msarcgbvmgby6hv8w0k0rmlizwj09i1pmwdx"; + sha256 = "1sxyic3895dch3x7cabiip5lxv9wqypn22hcy02jg9825260cmd3"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 1f899af55aca..3c02140d1357 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.14.3"; + version = "5.14.7"; release = "1"; suffix = "xanmod${release}-cacule"; in @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-nl8DktW2TsV20ii/f41TsSotE/yBRBH3SYlWKLsfT50="; + sha256 = "sha256-W3NAiKMs5ZO/OesWzvfzGqgGa/5A49Gy0a8E4yWY2c8="; }; structuredExtraConfig = with lib.kernel; { diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix b/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix index b19b52132352..1c064059047e 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,7 +2,7 @@ let # having the full version string here makes it easier to update - modDirVersion = "5.14.1-zen1"; + modDirVersion = "5.14.3-zen1"; parts = lib.splitString "-" modDirVersion; version = lib.elemAt parts 0; suffix = lib.elemAt parts 1; @@ -19,7 +19,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${modDirVersion}"; - sha256 = "sha256-InfDIs+eELLJE5aw7mD8Jo7SlrpeI/ZuD3z4TyFf7/k="; + sha256 = "sha256-ByewBT+1z83jCuEMmNvtmhHaEk4qjHa2Kgue8wVfPIY="; }; structuredExtraConfig = with lib.kernel; { diff --git a/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix b/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix index 77add0aef539..12eca63e2162 100644 --- a/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,5 +1,5 @@ { lib, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl -, libelf, cpio, elfutils, zstd, gawk, python3Minimal +, libelf, cpio, elfutils, zstd, gawk, python3Minimal, zlib, pahole , writeTextFile }: @@ -316,10 +316,12 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat ++ optional (lib.versionAtLeast version "4.14" && lib.versionOlder version "5.8") libelf # Removed util-linuxMinimal since it should not be a dependency. ++ optionals (lib.versionAtLeast version "4.16") [ bison flex ] - ++ optional (lib.versionAtLeast version "5.2") cpio + ++ optionals (lib.versionAtLeast version "5.2") [ cpio pahole ] ++ optional (lib.versionAtLeast version "5.8") elfutils ; + buildInputs = optional (lib.versionAtLeast version "5.2") zlib; + hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; # Absolute paths for compilers avoid any PATH-clobbering issues. diff --git a/nixpkgs/pkgs/os-specific/linux/kmod/darwin.patch b/nixpkgs/pkgs/os-specific/linux/kmod/darwin.patch index e112e6915250..4d9931b03eef 100644 --- a/nixpkgs/pkgs/os-specific/linux/kmod/darwin.patch +++ b/nixpkgs/pkgs/os-specific/linux/kmod/darwin.patch @@ -69,14 +69,17 @@ diff --git a/shared/macro.h b/shared/macro.h index 4fc5405..b5a2702 100644 --- a/shared/macro.h +++ b/shared/macro.h -@@ -71,3 +71,7 @@ - #endif - - #define UNIQ __COUNTER__ -+ -+ #if !defined(__linux__) +@@ -53,6 +53,10 @@ + #define CONCATENATE(x, y) XCONCATENATE(x, y) + #define UNIQ(x) CONCATENATE(x, __COUNTER__) + ++#if !defined(__linux__) +#define program_invocation_short_name getprogname() +#endif ++ + /* Temporaries for importing index handling */ + #define NOFAIL(x) (x) + #define fatal(x...) do { } while (0) diff --git a/shared/missing.h b/shared/missing.h index 4c0d136..ad8ec0f 100644 --- a/shared/missing.h diff --git a/nixpkgs/pkgs/os-specific/linux/kmod/default.nix b/nixpkgs/pkgs/os-specific/linux/kmod/default.nix index ef8296cf16f0..2cb263854ab8 100644 --- a/nixpkgs/pkgs/os-specific/linux/kmod/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/kmod/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, autoreconfHook, pkg-config -, libxslt, xz, elf-header +, libxslt, xz, zstd, elf-header , withStatic ? stdenv.hostPlatform.isStatic }: @@ -9,23 +9,24 @@ let in stdenv.mkDerivation rec { pname = "kmod"; - version = "27"; + version = "29"; src = fetchurl { url = "mirror://kernel/linux/utils/kernel/${pname}/${pname}-${version}.tar.xz"; - sha256 = "035wzfzjx4nwidk747p8n085mgkvy531ppn16krrajx2dkqzply1"; + sha256 = "0am54mi5rk72g5q7k6l6f36gw3r9vwgjmyna43ywcjhqmakyx00b"; }; nativeBuildInputs = [ autoreconfHook pkg-config libxslt ]; - buildInputs = [ xz ] ++ lib.optional stdenv.isDarwin elf-header; + buildInputs = [ xz zstd ] ++ lib.optional stdenv.isDarwin elf-header; configureFlags = [ "--sysconfdir=/etc" "--with-xz" + "--with-zstd" "--with-modulesdirs=${modulesDirs}" ] ++ lib.optional withStatic "--enable-static"; - patches = [ ./module-dir.patch ./no-name-field.patch ] + patches = [ ./module-dir.patch ] ++ lib.optional stdenv.isDarwin ./darwin.patch ++ lib.optional withStatic ./enable-static.patch; @@ -49,7 +50,7 @@ in stdenv.mkDerivation rec { homepage = "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/"; downloadPage = "https://www.kernel.org/pub/linux/utils/kernel/kmod/"; changelog = "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/plain/NEWS?h=v${version}"; - license = licenses.lgpl21; + license = with licenses; [ lgpl21Plus gpl2Plus ]; # GPLv2+ for tools platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/os-specific/linux/kmod/no-name-field.patch b/nixpkgs/pkgs/os-specific/linux/kmod/no-name-field.patch deleted file mode 100644 index 282f59e55e52..000000000000 --- a/nixpkgs/pkgs/os-specific/linux/kmod/no-name-field.patch +++ /dev/null @@ -1,24 +0,0 @@ - ---- - tools/modinfo.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/tools/modinfo.c b/tools/modinfo.c -index 0231bb0..7b2259e 100644 ---- a/tools/modinfo.c -+++ b/tools/modinfo.c -@@ -178,7 +178,10 @@ static int modinfo_do(struct kmod_module *mod) - is_builtin = (filename == NULL); - - if (is_builtin) { -- printf("%-16s%s%c", "name:", kmod_module_get_name(mod), separator); -+ if (field == NULL || field != NULL && streq(field, "name")){ -+ printf("%-16s%s%c", "name:", -+ kmod_module_get_name(mod), separator); -+ } - filename = "(builtin)"; - } - --- -2.28.0 - diff --git a/nixpkgs/pkgs/os-specific/linux/kmscube/default.nix b/nixpkgs/pkgs/os-specific/linux/kmscube/default.nix index 6db3a9583ecd..53b4cd60fb1c 100644 --- a/nixpkgs/pkgs/os-specific/linux/kmscube/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/kmscube/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa, pkg-config }: stdenv.mkDerivation { - name = "kmscube-2018-06-17"; + pname = "kmscube"; + version = "unstable-2018-06-17"; src = fetchgit { url = "git://anongit.freedesktop.org/mesa/kmscube"; diff --git a/nixpkgs/pkgs/os-specific/linux/latencytop/default.nix b/nixpkgs/pkgs/os-specific/linux/latencytop/default.nix index 30ec6cdc7b51..56e412379f80 100644 --- a/nixpkgs/pkgs/os-specific/linux/latencytop/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/latencytop/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, fetchurl, ncurses, glib, pkg-config, gtk2 }: stdenv.mkDerivation rec { - name = "latencytop-0.5"; + pname = "latencytop"; + version = "0.5"; patchPhase = "sed -i s,/usr,$out, Makefile"; preInstall = "mkdir -p $out/sbin"; src = fetchurl { - urls = [ "http://latencytop.org/download/${name}.tar.gz" + urls = [ "http://latencytop.org/download/latencytop-${version}.tar.gz" "http://dbg.download.sourcemage.org/mirror/latencytop-0.5.tar.gz" ]; sha256 = "1vq3j9zdab6njly2wp900b3d5244mnxfm88j2bkiinbvxbxp4zwy"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/libatasmart/default.nix b/nixpkgs/pkgs/os-specific/linux/libatasmart/default.nix index c422f5e01bb4..d5be78e913b7 100644 --- a/nixpkgs/pkgs/os-specific/linux/libatasmart/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libatasmart/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, udev, buildPackages }: stdenv.mkDerivation rec { - name = "libatasmart-0.19"; + pname = "libatasmart"; + version = "0.19"; src = fetchurl { - url = "http://0pointer.de/public/${name}.tar.xz"; + url = "http://0pointer.de/public/libatasmart-${version}.tar.xz"; sha256 = "138gvgdwk6h4ljrjsr09pxk1nrki4b155hqdzyr8mlk3bwsfmw31"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix b/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix index 2e497584fab8..649ad88a3d18 100644 --- a/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix @@ -7,30 +7,15 @@ with builtins; stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.1.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - sha256 = "0ilnnm4q22f8fagwp8kb37licy4ks861i2iqh2djsypqhnxvx3fv"; + sha256 = "1by5w7g3i2fc10bi6f0j8jqi2nq0x8r973j2qx7qlfryjxr7b2v3"; }; - patches = [ - (fetchpatch { # included upstream for > 0.1.0 - name = "link-zlib.patch"; - url = "https://github.com/libbpf/libbpf/commit/8b14cb43ff837.diff"; - sha256 = "17mvjrs7s727drz013a8qlyj0345ldi2kph6pazcmxv6kl1qrz2z"; - }) - ]; - patchFlags = "-p2"; - # https://github.com/libbpf/libbpf/pull/201#issuecomment-689174740 - postPatch = '' - substituteInPlace ../scripts/check-reallocarray.sh \ - --replace 'mktemp /tmp/' 'mktemp ' \ - --replace '/bin/rm' 'rm' - ''; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ libelf zlib ]; diff --git a/nixpkgs/pkgs/os-specific/linux/libfabric/default.nix b/nixpkgs/pkgs/os-specific/linux/libfabric/default.nix deleted file mode 100644 index 2abe07b0964e..000000000000 --- a/nixpkgs/pkgs/os-specific/linux/libfabric/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, libpsm2 }: - -stdenv.mkDerivation rec { - pname = "libfabric"; - version = "1.13.0"; - - enableParallelBuilding = true; - - src = fetchFromGitHub { - owner = "ofiwg"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-felGKpdihOi4TCp95T1ti7fErQVphP0vYGRKEwlQt4Q="; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook ] ; - - buildInputs = [ libpsm2 ] ; - - configureFlags = [ "--enable-psm2=${libpsm2}" ] ; - - meta = with lib; { - homepage = "http://libfabric.org/"; - description = "Open Fabric Interfaces"; - license = with licenses; [ gpl2 bsd2 ]; - platforms = [ "x86_64-linux" ]; - maintainers = [ maintainers.bzizou ]; - }; -} diff --git a/nixpkgs/pkgs/os-specific/linux/libpsm2/default.nix b/nixpkgs/pkgs/os-specific/linux/libpsm2/default.nix index 1ac4580b13f1..8b979d479562 100644 --- a/nixpkgs/pkgs/os-specific/linux/libpsm2/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libpsm2/default.nix @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { buildInputs = [ numactl pkg-config ]; + makeFlags = [ + # Disable blanket -Werror to avoid build failures + # on fresh toolchains like gcc-11. + "WERROR=" + ]; + installFlags = [ "DESTDIR=$(out)" "UDEVDIR=/etc/udev" @@ -35,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/intel/opa-psm2"; description = "The PSM2 library supports a number of fabric media and stacks"; license = with licenses; [ gpl2 bsd3 ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.bzizou ]; }; } diff --git a/nixpkgs/pkgs/os-specific/linux/libvolume_id/default.nix b/nixpkgs/pkgs/os-specific/linux/libvolume_id/default.nix index 87b7d33c5d84..653094c91884 100644 --- a/nixpkgs/pkgs/os-specific/linux/libvolume_id/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/libvolume_id/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "libvolume_id-0.81.1"; +stdenv.mkDerivation rec { + pname = "libvolume_id"; + version = "0.81.1"; src = fetchurl { - url = "https://www.marcuscom.com/downloads/libvolume_id-0.81.1.tar.bz2"; + url = "https://www.marcuscom.com/downloads/libvolume_id-${version}.tar.bz2"; sha256 = "029z04vdxxsl8gycm9whcljhv6dy4b12ybsxdb99jr251gl1ifs5"; }; @@ -21,5 +22,6 @@ stdenv.mkDerivation { meta = with lib; { platforms = platforms.linux; license = licenses.gpl2; + homepage = "http://www.marcuscom.com/downloads/"; }; } diff --git a/nixpkgs/pkgs/os-specific/linux/lightum/default.nix b/nixpkgs/pkgs/os-specific/linux/lightum/default.nix index ec56a89ce88f..8da12d78bc93 100644 --- a/nixpkgs/pkgs/os-specific/linux/lightum/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/lightum/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, libX11, libXScrnSaver, libXext, glib, dbus, pkg-config, systemd }: stdenv.mkDerivation { - name = "lightum-2014-06-07"; + pname = "lightum"; + version = "unstable-2014-06-07"; src = fetchgit { url = "https://github.com/poliva/lightum"; rev = "123e6babe0669b23d4c1dfa5511088608ff2baa8"; diff --git a/nixpkgs/pkgs/os-specific/linux/lksctp-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/lksctp-tools/default.nix index 8bbd3ab7f427..19d6f10e3de1 100644 --- a/nixpkgs/pkgs/os-specific/linux/lksctp-tools/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/lksctp-tools/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "lksctp-tools-1.0.17"; + pname = "lksctp-tools"; + version = "1.0.17"; src = fetchurl { - url = "mirror://sourceforge/lksctp/${name}.tar.gz"; + url = "mirror://sourceforge/lksctp/lksctp-tools-${version}.tar.gz"; sha256 = "05da6c2v3acc18ndvmkrag6x5lf914b7s0xkkr6wkvrbvd621sqs"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/lm-sensors/default.nix b/nixpkgs/pkgs/os-specific/linux/lm-sensors/default.nix index 21324a5d6ce7..fda11400e8f5 100644 --- a/nixpkgs/pkgs/os-specific/linux/lm-sensors/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/lm-sensors/default.nix @@ -1,5 +1,12 @@ -{ lib, stdenv, fetchzip, bison, flex, which, perl -, sensord ? false, rrdtool ? null +{ lib +, stdenv +, fetchFromGitHub +, bison +, flex +, which +, perl +, sensord ? false +, rrdtool ? null }: assert sensord -> rrdtool != null; @@ -7,16 +14,18 @@ assert sensord -> rrdtool != null; stdenv.mkDerivation rec { pname = "lm-sensors"; version = "3.6.0"; - dashedVersion = lib.replaceStrings ["."] ["-"] version; + dashedVersion = lib.replaceStrings [ "." ] [ "-" ] version; - src = fetchzip { - url = "https://github.com/lm-sensors/lm-sensors/archive/V${dashedVersion}.tar.gz"; - sha256 = "1ipf6wjx037sqyhy0r5jh4983h216anq9l68ckn2x5c3qc4wfmzn"; + src = fetchFromGitHub { + owner = "lm-sensors"; + repo = "lm-sensors"; + rev = "V${dashedVersion}"; + hash = "sha256-9lfHCcODlS7sZMjQhK0yQcCBEoGyZOChx/oM0CU37sY="; }; nativeBuildInputs = [ bison flex which ]; buildInputs = [ perl ] - ++ lib.optional sensord rrdtool; + ++ lib.optional sensord rrdtool; makeFlags = [ "PREFIX=${placeholder "out"}" diff --git a/nixpkgs/pkgs/os-specific/linux/lsscsi/default.nix b/nixpkgs/pkgs/os-specific/linux/lsscsi/default.nix index 6286735b758b..d87820f24664 100644 --- a/nixpkgs/pkgs/os-specific/linux/lsscsi/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/lsscsi/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "lsscsi-0.32"; +stdenv.mkDerivation rec { + pname = "lsscsi"; + version = "0.32"; src = fetchurl { - url = "http://sg.danny.cz/scsi/lsscsi-0.32.tgz"; + url = "http://sg.danny.cz/scsi/lsscsi-${version}.tgz"; sha256 = "sha256-CoAOnpTcoqtwLWXXJ3eujK4Hjj100Ly+1kughJ6AKaE="; }; diff --git a/nixpkgs/pkgs/os-specific/linux/lvm2/default.nix b/nixpkgs/pkgs/os-specific/linux/lvm2/default.nix index 2e52e49639e2..fed7152d07ae 100644 --- a/nixpkgs/pkgs/os-specific/linux/lvm2/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/lvm2/default.nix @@ -67,23 +67,14 @@ stdenv.mkDerivation rec { sed -i 's|^#define LVM_CONFIGURE_LINE.*$|#define LVM_CONFIGURE_LINE "<removed>"|g' ./include/configure.h ''; - - patches = lib.optionals stdenv.hostPlatform.isMusl [ - (fetchpatch { - name = "fix-stdio-usage.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/lvm2/fix-stdio-usage.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; - sha256 = "0m6wr6qrvxqi2d2h054cnv974jq1v65lqxy05g1znz946ga73k3p"; - }) + patches = [ + # Musl fixes from Alpine. + ./fix-stdio-usage.patch (fetchpatch { name = "mallinfo.patch"; url = "https://git.alpinelinux.org/aports/plain/main/lvm2/mallinfo.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; sha256 = "0g6wlqi215i5s30bnbkn8w7axrs27y3bnygbpbnf64wwx7rxxlj0"; }) - (fetchpatch { - name = "mlockall-default-config.patch"; - url = "https://git.alpinelinux.org/aports/plain/main/lvm2/mlockall-default-config.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; - sha256 = "1ivbj3sphgf8n1ykfiv5rbw7s8dgnj5jcr9jl2v8cwf28lkacw5l"; - }) ]; doCheck = false; # requires root diff --git a/nixpkgs/pkgs/os-specific/linux/lvm2/fix-stdio-usage.patch b/nixpkgs/pkgs/os-specific/linux/lvm2/fix-stdio-usage.patch new file mode 100644 index 000000000000..59666ffbad5a --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/lvm2/fix-stdio-usage.patch @@ -0,0 +1,53 @@ +diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c +index 296618686..96343eeb7 100644 +--- a/lib/commands/toolcontext.c ++++ b/lib/commands/toolcontext.c +@@ -1619,7 +1619,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd, + /* FIXME Make this configurable? */ + reset_lvm_errno(1); + +-#ifndef VALGRIND_POOL ++#if !defined(VALGRIND_POOL) && defined(__GLIBC__) + /* Set in/out stream buffering before glibc */ + if (set_buffering + #ifdef SYS_gettid +@@ -2006,7 +2006,7 @@ void destroy_toolcontext(struct cmd_context *cmd) + + if (cmd->pending_delete_mem) + dm_pool_destroy(cmd->pending_delete_mem); +-#ifndef VALGRIND_POOL ++#if !defined(VALGRIND_POOL) && defined(__GLIBC__) + if (cmd->linebuffer) { + /* Reset stream buffering to defaults */ + if (is_valid_fd(STDIN_FILENO) && +diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c +index d97ff5720..bbbda82bd 100644 +--- a/tools/lvmcmdline.c ++++ b/tools/lvmcmdline.c +@@ -3342,7 +3342,7 @@ static int _check_standard_fds(void) + int err = is_valid_fd(STDERR_FILENO); + + if (!is_valid_fd(STDIN_FILENO) && +- !(stdin = fopen(_PATH_DEVNULL, "r"))) { ++ !freopen(_PATH_DEVNULL, "r", stdin)) { + if (err) + perror("stdin stream open"); + else +@@ -3352,7 +3352,7 @@ static int _check_standard_fds(void) + } + + if (!is_valid_fd(STDOUT_FILENO) && +- !(stdout = fopen(_PATH_DEVNULL, "w"))) { ++ !freopen(_PATH_DEVNULL, "w", stdout)) { + if (err) + perror("stdout stream open"); + /* else no stdout */ +@@ -3360,7 +3360,7 @@ static int _check_standard_fds(void) + } + + if (!is_valid_fd(STDERR_FILENO) && +- !(stderr = fopen(_PATH_DEVNULL, "w"))) { ++ !freopen(_PATH_DEVNULL, "w", stderr)) { + printf("stderr stream open: %s\n", + strerror(errno)); + return 0; diff --git a/nixpkgs/pkgs/os-specific/linux/mba6x_bl/default.nix b/nixpkgs/pkgs/os-specific/linux/mba6x_bl/default.nix index 441476d5f065..fe9c11ace1f6 100644 --- a/nixpkgs/pkgs/os-specific/linux/mba6x_bl/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -1,7 +1,8 @@ { fetchFromGitHub, kernel, lib, stdenv }: stdenv.mkDerivation { - name = "mba6x_bl-2016-12-08"; + pname = "mba6x_bl"; + version = "unstable-2016-12-08"; src = fetchFromGitHub { owner = "patjak"; diff --git a/nixpkgs/pkgs/os-specific/linux/mdadm/default.nix b/nixpkgs/pkgs/os-specific/linux/mdadm/default.nix index 935ded637097..01d2bba32a4d 100644 --- a/nixpkgs/pkgs/os-specific/linux/mdadm/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/mdadm/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, util-linux, coreutils, fetchurl, groff, system-sendmail }: stdenv.mkDerivation rec { - name = "mdadm-4.1"; + pname = "mdadm"; + version = "4.1"; src = fetchurl { - url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.xz"; + url = "mirror://kernel/linux/utils/raid/mdadm/mdadm-${version}.tar.xz"; sha256 = "0jjgjgqijpdp7ijh8slzzjjw690kydb1jjadf0x5ilq85628hxmb"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/mingetty/default.nix b/nixpkgs/pkgs/os-specific/linux/mingetty/default.nix index 8a2cf69dd368..eb58dc553676 100644 --- a/nixpkgs/pkgs/os-specific/linux/mingetty/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/mingetty/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "mingetty-1.08"; +stdenv.mkDerivation rec { + pname = "mingetty"; + version = "1.08"; src = fetchurl { - url = "mirror://sourceforge/mingetty/mingetty-1.08.tar.gz"; + url = "mirror://sourceforge/mingetty/mingetty-${version}.tar.gz"; sha256 = "05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix index eeea1d74dcac..da2ba4b9ff2d 100644 --- a/nixpkgs/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mkinitcpio-nfs-utils-0.3"; + pname = "mkinitcpio-nfs-utils"; + version = "0.3"; src = fetchurl { - url = "https://sources.archlinux.org/other/mkinitcpio/${name}.tar.xz"; + url = "https://sources.archlinux.org/other/mkinitcpio/mkinitcpio-nfs-utils-${version}.tar.xz"; sha256 = "0fc93sfk41ycpa33083kyd7i4y00ykpbhj5qlw611bjghj4x946j"; # ugh, upstream... - name = "${name}.tar.gz"; + name = "mkinitcpio-nfs-utils-${version}.tar.gz"; }; makeFlags = [ "DESTDIR=$(out)" "bindir=/bin" ]; diff --git a/nixpkgs/pkgs/os-specific/linux/mxu11x0/default.nix b/nixpkgs/pkgs/os-specific/linux/mxu11x0/default.nix index 3498625be757..d5129ca7f73a 100644 --- a/nixpkgs/pkgs/os-specific/linux/mxu11x0/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/mxu11x0/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, kernel }: stdenv.mkDerivation { - name = "mxu11x0-1.4-${kernel.version}"; + pname = "mxu11x0"; + version = "1.4-${kernel.version}"; src = fetchurl { url = "https://www.moxa.com/Moxa/media/PDIM/S100000385/moxa-uport-1000-series-linux-3.x-and-4.x-for-uport-11x0-series-driver-v1.4.tgz"; diff --git a/nixpkgs/pkgs/os-specific/linux/nss_ldap/default.nix b/nixpkgs/pkgs/os-specific/linux/nss_ldap/default.nix index 0121c4a6f1c8..23bc8ff0dfad 100644 --- a/nixpkgs/pkgs/os-specific/linux/nss_ldap/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/nss_ldap/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, openldap, perl}: -stdenv.mkDerivation { - name = "nss_ldap-265"; +stdenv.mkDerivation rec { + pname = "nss_ldap"; + version = "265"; src = fetchurl { - url = "http://www.padl.com/download/nss_ldap-265.tar.gz"; + url = "http://www.padl.com/download/nss_ldap-${version}.tar.gz"; sha256 = "1a16q9p97d2blrj0h6vl1xr7dg7i4s8x8namipr79mshby84vdbp"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/numad/default.nix b/nixpkgs/pkgs/os-specific/linux/numad/default.nix index 21d5a871f4e9..0526c02f75f8 100644 --- a/nixpkgs/pkgs/os-specific/linux/numad/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/numad/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "numad-0.5"; + pname = "numad"; + version = "0.5"; src = fetchurl { - url = "https://git.fedorahosted.org/cgit/numad.git/snapshot/${name}.tar.xz"; + url = "https://git.fedorahosted.org/cgit/numad.git/snapshot/numad-${version}.tar.xz"; sha256 = "08zd1yc3w00yv4mvvz5sq1gf91f6p2s9ljcd72m33xgnkglj60v4"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix index 7dccdccaf7b8..6d21a4fca61b 100644 --- a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -19,10 +19,10 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "470.63.01"; - sha256_64bit = "sha256:057dsc0j3136r5gc08id3rwz9c0x7i01xkcwfk77vqic9b6486kg"; - settingsSha256 = "sha256:0lizp4hn49yvca2yd76yh3awld98pkaa35a067lpcld35vb5brgv"; - persistencedSha256 = "sha256:1f3gdpa23ipjy2xwf7qnxmw7w8xxhqy25rmcz34xkngjf4fn4pbs"; + version = "470.74"; + sha256_64bit = "sha256:0snzrb78f283rl92r5cqnr7bdk3yfkqpjac80sqskwi9wgg17r9k"; + settingsSha256 = "sha256:0hd9973l0zd8a0ia1dysfrk30jqxff1rr07b79ggvqd1xnvv0iqn"; + persistencedSha256 = "sha256:0i8wfhz53hdnabdcx9awki3nk6xa6dadzn91iswhmfm4jj6964jf"; } else legacy_390; diff --git a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix index 282d9728821e..6f58e3e8f1d9 100644 --- a/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -111,7 +111,7 @@ let description = "X.org driver and kernel module for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ] ++ optionals (!i686bundled) [ "i686-linux" ]; - maintainers = with maintainers; [ baracoder ]; + maintainers = with maintainers; [ ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" inherit broken; }; diff --git a/nixpkgs/pkgs/os-specific/linux/opengl/xorg-sys/default.nix b/nixpkgs/pkgs/os-specific/linux/opengl/xorg-sys/default.nix index 33df8c0cc345..b7f1b6574404 100644 --- a/nixpkgs/pkgs/os-specific/linux/opengl/xorg-sys/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/opengl/xorg-sys/default.nix @@ -9,7 +9,8 @@ {lib, stdenv, xorg, expat, libdrm}: stdenv.mkDerivation { - name = "xorg-sys-opengl-3"; + pname = "xorg-sys-opengl"; + version = "3"; builder = ./builder.sh; neededLibs = map (p: p.out) [xorg.libXxf86vm xorg.libXext expat libdrm stdenv.cc.cc]; diff --git a/nixpkgs/pkgs/os-specific/linux/otpw/default.nix b/nixpkgs/pkgs/os-specific/linux/otpw/default.nix index fed7930bf148..14381ac68c16 100644 --- a/nixpkgs/pkgs/os-specific/linux/otpw/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/otpw/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pam }: stdenv.mkDerivation rec { - name = "otpw-1.3"; + pname = "otpw"; + version = "1.3"; src = fetchurl { - url = "https://www.cl.cam.ac.uk/~mgk25/download/${name}.tar.gz"; + url = "https://www.cl.cam.ac.uk/~mgk25/download/otpw-${version}.tar.gz"; sha256 = "1k3hc7xbxz6hkc55kvddi3cibafwf93ivn58sy1l888d3l5dwmrk"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/pam_ccreds/default.nix b/nixpkgs/pkgs/os-specific/linux/pam_ccreds/default.nix index bfe9ac7c830c..4b2cc7a3822b 100644 --- a/nixpkgs/pkgs/os-specific/linux/pam_ccreds/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/pam_ccreds/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, pam, openssl, db}: stdenv.mkDerivation rec { - name = "pam_ccreds-10"; + pname = "pam_ccreds"; + version = "10"; src = fetchurl { - url = "https://www.padl.com/download/${name}.tar.gz"; + url = "https://www.padl.com/download/pam_ccreds-${version}.tar.gz"; sha256 = "1h7zyg1b1h69civyvrj95w22dg0y7lgw3hq4gqkdcg35w1y76fhz"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/os-specific/linux/pam_krb5/default.nix b/nixpkgs/pkgs/os-specific/linux/pam_krb5/default.nix index cb04fa5b4242..af5fbccff052 100644 --- a/nixpkgs/pkgs/os-specific/linux/pam_krb5/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/pam_krb5/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pam, libkrb5 }: stdenv.mkDerivation rec { - name = "pam-krb5-4.10"; + pname = "pam-krb5"; + version = "4.10"; src = fetchurl { - url = "https://archives.eyrie.org/software/kerberos/${name}.tar.gz"; + url = "https://archives.eyrie.org/software/kerberos/pam-krb5-${version}.tar.gz"; sha256 = "09wzxd5zrj5bzqpb01qf148npj5k8hmd2bx2ij1qsy40hdxqyq79"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/pam_ldap/default.nix b/nixpkgs/pkgs/os-specific/linux/pam_ldap/default.nix index e327a551b231..988256808dbb 100644 --- a/nixpkgs/pkgs/os-specific/linux/pam_ldap/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/pam_ldap/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, pam, openldap, perl }: stdenv.mkDerivation rec { - name = "pam_ldap-186"; + pname = "pam_ldap"; + version = "186"; src = fetchurl { - url = "https://www.padl.com/download/${name}.tar.gz"; + url = "https://www.padl.com/download/pam_ldap-${version}.tar.gz"; sha256 = "0lv4f7hc02jrd2l3gqxd247qq62z11sp3fafn8lgb8ymb7aj5zn8"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/pam_usb/default.nix b/nixpkgs/pkgs/os-specific/linux/pam_usb/default.nix index 1a66e986d8b2..8411c4fdbfaf 100644 --- a/nixpkgs/pkgs/os-specific/linux/pam_usb/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/pam_usb/default.nix @@ -33,10 +33,11 @@ let in stdenv.mkDerivation rec { - name = "pam_usb-0.5.0"; + pname = "pam_usb"; + version = "0.5.0"; src = fetchurl { - url = "mirror://sourceforge/pamusb/${name}.tar.gz"; + url = "mirror://sourceforge/pamusb/pam_usb-${version}.tar.gz"; sha256 = "1g1w0s9d8mfld8abrn405ll5grv3xgs0b0hsganrz6qafdq9j7q1"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/pcmciautils/default.nix b/nixpkgs/pkgs/os-specific/linux/pcmciautils/default.nix index a4da6be691e9..bca58bd808eb 100644 --- a/nixpkgs/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/pcmciautils/default.nix @@ -7,10 +7,11 @@ # FIXME: should add an option to choose between hotplug and udev. stdenv.mkDerivation rec { - name = "pcmciautils-018"; + pname = "pcmciautils"; + version = "018"; src = fetchurl { - url = "https://kernel.org/pub/linux/utils/kernel/pcmcia/${name}.tar.gz"; + url = "https://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${version}.tar.gz"; sha256 = "0sfm3w2n73kl5w7gb1m6q8gy5k4rgwvzz79n6yhs9w3sag3ix8sk"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/perf-tools/default.nix b/nixpkgs/pkgs/os-specific/linux/perf-tools/default.nix index 113cceb50a45..8c3e31e45384 100644 --- a/nixpkgs/pkgs/os-specific/linux/perf-tools/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/perf-tools/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation { - name = "perf-tools-20171219"; + pname = "perf-tools"; + version = "unstable-2017-12-19"; src = fetchFromGitHub { owner = "brendangregg"; diff --git a/nixpkgs/pkgs/os-specific/linux/pflask/default.nix b/nixpkgs/pkgs/os-specific/linux/pflask/default.nix index f3e63133d1e1..92294b58e42a 100644 --- a/nixpkgs/pkgs/os-specific/linux/pflask/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/pflask/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchurl, python, wafHook }: +{ lib, stdenv, fetchFromGitHub, python, wafHook }: stdenv.mkDerivation rec { pname = "pflask"; - version = "git-2015-12-17"; - rev = "599418bb6453eaa0ccab493f9411f13726c1a636"; + version = "unstable-2015-12-17"; - src = fetchurl { - url = "https://github.com/ghedo/pflask/archive/${rev}.tar.gz"; - sha256 = "2545fca37f9da484b46b6fb5e3a9bbba6526a9725189fe4af5227ef6e6fca440"; + src = fetchFromGitHub { + owner = "ghedo"; + repo = "pflask"; + rev = "599418bb6453eaa0ccab493f9411f13726c1a636"; + hash = "sha256-0RjitZd2JUK7WUEJuw4qhUx3joY5OI0Hh74mTzp7GmY="; }; nativeBuildInputs = [ wafHook ]; @@ -15,9 +16,9 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight process containers for Linux"; - homepage = "https://ghedo.github.io/pflask/"; - license = lib.licenses.bsd2; - platforms = lib.platforms.linux; + homepage = "https://ghedo.github.io/pflask/"; + license = lib.licenses.bsd2; + platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/os-specific/linux/pm-utils/default.nix b/nixpkgs/pkgs/os-specific/linux/pm-utils/default.nix index 17723983c696..4076641717f4 100644 --- a/nixpkgs/pkgs/os-specific/linux/pm-utils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/pm-utils/default.nix @@ -12,10 +12,11 @@ let in stdenv.mkDerivation rec { - name = "pm-utils-1.4.1"; + pname = "pm-utils"; + version = "1.4.1"; src = fetchurl { - url = "https://pm-utils.freedesktop.org/releases/${name}.tar.gz"; + url = "https://pm-utils.freedesktop.org/releases/pm-utils-${version}.tar.gz"; sha256 = "02qc6zaf7ams6qcc470fwb6jvr4abv3lrlx16clqpn36501rkn4f"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/procdump/default.nix b/nixpkgs/pkgs/os-specific/linux/procdump/default.nix index 75ca2cb165e0..0b40a4dd0365 100644 --- a/nixpkgs/pkgs/os-specific/linux/procdump/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/procdump/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "procdump"; - version = "1.1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "Microsoft"; repo = "ProcDump-for-Linux"; rev = version; - sha256 = "0h5fhk39d10kjbinzw1yp6nr8w8l300mn9qxrkpivdkyfn6bpq2f"; + sha256 = "sha256-gVswAezHl7E2cBTJEQhPFXhHkzhWVHSpPF8m0s8+ekc="; }; nativeBuildInputs = [ zlib ]; diff --git a/nixpkgs/pkgs/os-specific/linux/qmk-udev-rules/default.nix b/nixpkgs/pkgs/os-specific/linux/qmk-udev-rules/default.nix new file mode 100644 index 000000000000..7fb5b092ca42 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/qmk-udev-rules/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub }: + +## Usage +# In NixOS, simply add this package to services.udev.packages: +# services.udev.packages = [ pkgs.qmk-udev-rules ]; + +stdenv.mkDerivation rec { + pname = "qmk-udev-rules"; + version = "0.13.23"; + + src = fetchFromGitHub { + owner = "qmk"; + repo = "qmk_firmware"; + rev = version; + sha256 = "08d2ri9g6lky3ixd5h0scm95hgc52lcjr3vcnmpdxn780q9ygmkm"; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + install -D util/udev/50-qmk.rules $out/lib/udev/rules.d/50-qmk.rules + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/qmk/qmk_firmware"; + description = "Official QMK udev rules list"; + platforms = platforms.linux; + license = licenses.gpl2Only; + maintainers = with maintainers; [ ekleog ]; + }; +} diff --git a/nixpkgs/pkgs/os-specific/linux/sch_cake/default.nix b/nixpkgs/pkgs/os-specific/linux/sch_cake/default.nix index 851a903cf072..facf690a9bd4 100644 --- a/nixpkgs/pkgs/os-specific/linux/sch_cake/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/sch_cake/default.nix @@ -3,7 +3,8 @@ assert lib.versionAtLeast kernel.version "4.4"; stdenv.mkDerivation { - name = "sch_cake-2017-07-16"; + pname = "sch_cake"; + version = "unstable-2017-07-16"; src = fetchFromGitHub { owner = "dtaht"; diff --git a/nixpkgs/pkgs/os-specific/linux/sdparm/default.nix b/nixpkgs/pkgs/os-specific/linux/sdparm/default.nix index 08e61a98f6b9..a9137b18f39d 100644 --- a/nixpkgs/pkgs/os-specific/linux/sdparm/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/sdparm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sdparm"; - version = "1.11"; + version = "1.12"; src = fetchurl { url = "http://sg.danny.cz/sg/p/${pname}-${version}.tar.xz"; - sha256 = "1nqjc4w2w47zavcbf5xmm53x1zbwgljaw1lpajcdi537cgy32fa8"; + sha256 = "sha256-xMnvr9vrZi4vlxJwfsSQkyvU0BC7ESmueplSZUburb4="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/os-specific/linux/smemstat/default.nix b/nixpkgs/pkgs/os-specific/linux/smemstat/default.nix index 64525052af20..1510981c1767 100644 --- a/nixpkgs/pkgs/os-specific/linux/smemstat/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/smemstat/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "smemstat"; - version = "0.02.08"; + version = "0.02.10"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/smemstat/smemstat-${version}.tar.xz"; - sha256 = "1agigvkv1868cskivzrwyiixl658x5bv7xpz4xjc8mlii4maivpp"; + sha256 = "sha256-Vrs1jOg5yHdEffVo769aaxSawo4iZtGrFJ65Nu+RhcU="; }; buildInputs = [ ncurses ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/nixpkgs/pkgs/os-specific/linux/sysfsutils/default.nix b/nixpkgs/pkgs/os-specific/linux/sysfsutils/default.nix index 4daac076e587..b5f067fffd72 100644 --- a/nixpkgs/pkgs/os-specific/linux/sysfsutils/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/sysfsutils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "sysfsutils-2.1.0"; + pname = "sysfsutils"; + version = "2.1.0"; src = fetchurl { - url = "mirror://sourceforge/linux-diag/${name}.tar.gz"; + url = "mirror://sourceforge/linux-diag/sysfsutils-${version}.tar.gz"; sha256 = "e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/sysklogd/default.nix b/nixpkgs/pkgs/os-specific/linux/sysklogd/default.nix index 78992a0f870a..4d9844f516b0 100644 --- a/nixpkgs/pkgs/os-specific/linux/sysklogd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/sysklogd/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "sysklogd-1.5.1"; +stdenv.mkDerivation rec { + pname = "sysklogd"; + version = "1.5.1"; src = fetchurl { - url = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.5.1.tar.gz"; + url = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-${version}.tar.gz"; sha256 = "00f2wy6f0qng7qzga4iicyzl9j8b7mp6mrpfky5jxj93ms2w2rji"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/sysstat/default.nix b/nixpkgs/pkgs/os-specific/linux/sysstat/default.nix index 2eff999ac7cf..2d5b3e2ab558 100644 --- a/nixpkgs/pkgs/os-specific/linux/sysstat/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/sysstat/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gettext, bzip2 }: stdenv.mkDerivation rec { - name = "sysstat-12.4.3"; + pname = "sysstat"; + version = "12.4.3"; src = fetchurl { - url = "http://pagesperso-orange.fr/sebastien.godard/${name}.tar.xz"; + url = "http://pagesperso-orange.fr/sebastien.godard/sysstat-${version}.tar.xz"; sha256 = "sha256-rkMkMfRarLyrrPu+Ep4lBeIVyvqc6ZbXVQxgkaRvC/0="; }; diff --git a/nixpkgs/pkgs/os-specific/linux/system76-power/default.nix b/nixpkgs/pkgs/os-specific/linux/system76-power/default.nix index fbc26ca87199..38ce20deeab8 100644 --- a/nixpkgs/pkgs/os-specific/linux/system76-power/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/system76-power/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "system76-power"; - version = "1.1.16"; + version = "1.1.17"; src = fetchFromGitHub { owner = "pop-os"; repo = "system76-power"; rev = version; - sha256 = "sha256-OtrhvUkNNgg6KlrqjwiBKL4zuQZBWevb0xgtSlEW2rQ="; + sha256 = "sha256-9ndukZPNB0qtU0hA9eUYpiAC8Tw1eF16W+sVU7XKvsg="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus libusb1 ]; - cargoSha256 = "sha256-ImACDbnUbwc0ZXgF3xxzes8+vUjt76B1xxgqzhgAYX4="; + cargoSha256 = "sha256-6mtBY77d2WAwTpj+g0KVpW/n39uanAL2GNHWC8Qbtqk="; postInstall = '' install -D -m 0644 data/system76-power.conf $out/etc/dbus-1/system.d/system76-power.conf diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/nixpkgs/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch index ac2d00181602..8a1cdc1da847 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch +++ b/nixpkgs/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -1,4 +1,4 @@ -From 2f4a5e9c9ef1cd57662e8bd4c24e1029a00d55b5 Mon Sep 17 00:00:00 2001 +From 57e31a2d4a5d5bd7a9e1cd8a0d8bc6a00624ad68 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Tue, 8 Jan 2013 15:46:30 +0100 Subject: [PATCH 01/19] Start device units for uninitialised encrypted devices @@ -13,7 +13,7 @@ unit. (However, this ignores the fsck unit, so it's not perfect...) 1 file changed, 4 deletions(-) diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in -index 7c22eefdb7..e3a55e00b5 100644 +index 25b8a590a6..d18999ea87 100644 --- a/rules.d/99-systemd.rules.in +++ b/rules.d/99-systemd.rules.in @@ -17,10 +17,6 @@ SUBSYSTEM=="ubi", TAG+="systemd" @@ -28,5 +28,5 @@ index 7c22eefdb7..e3a55e00b5 100644 SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root" SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks" -- -2.30.1 +2.32.0 diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/nixpkgs/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch index f54430f764e4..129e0825d9fe 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch +++ b/nixpkgs/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -1,4 +1,4 @@ -From 4e96b2e074c4a4f4ce900409872ce2f86704ee5b Mon Sep 17 00:00:00 2001 +From 43465a392b47238a32f8719f603ed9e2c9bb0363 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Fri, 12 Apr 2013 13:16:57 +0200 Subject: [PATCH 02/19] Don't try to unmount /nix or /nix/store @@ -12,7 +12,7 @@ https://github.com/NixOS/nixos/issues/126 2 files changed, 4 insertions(+) diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c -index 292b97cd69..791b8e6b7e 100644 +index f683f05981..5a04c2c2a6 100644 --- a/src/shared/fstab-util.c +++ b/src/shared/fstab-util.c @@ -40,6 +40,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) { @@ -25,10 +25,10 @@ index 292b97cd69..791b8e6b7e 100644 "/etc")) return true; diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c -index 3a72a13e1a..541320dc9d 100644 +index c2a26242c0..9936398f32 100644 --- a/src/shutdown/umount.c +++ b/src/shutdown/umount.c -@@ -500,6 +500,8 @@ static int delete_md(MountPoint *m) { +@@ -496,6 +496,8 @@ static int delete_md(MountPoint *m) { static bool nonunmountable_path(const char *path) { return path_equal(path, "/") @@ -38,5 +38,5 @@ index 3a72a13e1a..541320dc9d 100644 || path_equal(path, "/usr") #endif -- -2.30.1 +2.32.0 diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch index 37caffb97d76..91fdebc7ad38 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch +++ b/nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch @@ -1,4 +1,4 @@ -From 3d1b2e56a6ed6cc86a64f6f89765a2900e576402 Mon Sep 17 00:00:00 2001 +From a99666d3d7012c2162fdacf84a57fc0b848fd957 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Wed, 16 Apr 2014 10:59:28 +0200 Subject: [PATCH 03/19] Fix NixOS containers @@ -10,10 +10,10 @@ container, so checking early whether it exists will fail. 1 file changed, 2 insertions(+) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 7515380fcd..14f8a82eb8 100644 +index 04685fecba..0e5ece5f91 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -5323,6 +5323,7 @@ static int run(int argc, char *argv[]) { +@@ -5590,6 +5590,7 @@ static int run(int argc, char *argv[]) { goto finish; } } else { @@ -21,7 +21,7 @@ index 7515380fcd..14f8a82eb8 100644 const char *p, *q; if (arg_pivot_root_new) -@@ -5337,6 +5338,7 @@ static int run(int argc, char *argv[]) { +@@ -5604,6 +5605,7 @@ static int run(int argc, char *argv[]) { r = -EINVAL; goto finish; } @@ -30,5 +30,5 @@ index 7515380fcd..14f8a82eb8 100644 } else { -- -2.30.1 +2.32.0 diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch b/nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch index 2f14a9d6a7e8..bdd205dd29e8 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch +++ b/nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch @@ -1,4 +1,4 @@ -From 3a721cf70e952e933ef5374006bbb11a3a0ad36a Mon Sep 17 00:00:00 2001 +From 3f0780b25bdbe4156a2f761c90083bbba5f4d473 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Thu, 1 May 2014 14:10:10 +0200 Subject: [PATCH 04/19] Look for fsck in the right place @@ -8,7 +8,7 @@ Subject: [PATCH 04/19] Look for fsck in the right place 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c -index 510689f3b7..25cab5acae 100644 +index cd7adfaeb9..68cebdd158 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c @@ -368,7 +368,7 @@ static int run(int argc, char *argv[]) { @@ -21,5 +21,5 @@ index 510689f3b7..25cab5acae 100644 cmdline[i++] = "-T"; -- -2.30.1 +2.32.0 diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/nixpkgs/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch index 0acccacd6135..8680d147ad17 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch +++ b/nixpkgs/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch @@ -1,4 +1,4 @@ -From 8b7f881cf22e98e907506f4c403b9e304e332bf9 Mon Sep 17 00:00:00 2001 +From 82698c6a5142e710c302f9c38367ed00d8ec94ba Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Fri, 19 Dec 2014 14:46:17 +0100 Subject: [PATCH 05/19] Add some NixOS-specific unit directories @@ -10,14 +10,14 @@ units provided by packages installed into the default profile via Also, remove /usr and /lib as these don't exist on NixOS. --- src/basic/path-lookup.c | 17 ++--------------- - src/core/systemd.pc.in | 5 +++-- - 2 files changed, 5 insertions(+), 17 deletions(-) + src/core/systemd.pc.in | 8 ++++---- + 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c -index 96b82170d0..bf66bd6b77 100644 +index 05eb17d66c..1cd141d012 100644 --- a/src/basic/path-lookup.c +++ b/src/basic/path-lookup.c -@@ -94,11 +94,7 @@ int xdg_user_data_dir(char **ret, const char *suffix) { +@@ -91,11 +91,7 @@ int xdg_user_data_dir(char **ret, const char *suffix) { } static const char* const user_data_unit_paths[] = { @@ -29,7 +29,7 @@ index 96b82170d0..bf66bd6b77 100644 NULL }; -@@ -616,15 +612,13 @@ int lookup_paths_init( +@@ -613,15 +609,13 @@ int lookup_paths_init( persistent_config, SYSTEM_CONFIG_UNIT_DIR, "/etc/systemd/system", @@ -40,13 +40,13 @@ index 96b82170d0..bf66bd6b77 100644 STRV_IFNOTNULL(runtime_attached), STRV_IFNOTNULL(generator), - "/usr/local/lib/systemd/system", - SYSTEM_DATA_UNIT_PATH, + SYSTEM_DATA_UNIT_DIR, - "/usr/lib/systemd/system", - STRV_IFNOTNULL(flags & LOOKUP_PATHS_SPLIT_USR ? "/lib/systemd/system" : NULL), STRV_IFNOTNULL(generator_late)); break; -@@ -640,14 +634,11 @@ int lookup_paths_init( +@@ -637,14 +631,11 @@ int lookup_paths_init( persistent_config, USER_CONFIG_UNIT_DIR, "/etc/systemd/user", @@ -62,7 +62,7 @@ index 96b82170d0..bf66bd6b77 100644 STRV_IFNOTNULL(generator_late)); break; -@@ -797,7 +788,6 @@ char **generator_binary_paths(UnitFileScope scope) { +@@ -794,7 +785,6 @@ char **generator_binary_paths(UnitFileScope scope) { case UNIT_FILE_SYSTEM: add = strv_new("/run/systemd/system-generators", "/etc/systemd/system-generators", @@ -70,7 +70,7 @@ index 96b82170d0..bf66bd6b77 100644 SYSTEM_GENERATOR_DIR); break; -@@ -805,7 +795,6 @@ char **generator_binary_paths(UnitFileScope scope) { +@@ -802,7 +792,6 @@ char **generator_binary_paths(UnitFileScope scope) { case UNIT_FILE_USER: add = strv_new("/run/systemd/user-generators", "/etc/systemd/user-generators", @@ -78,7 +78,7 @@ index 96b82170d0..bf66bd6b77 100644 USER_GENERATOR_DIR); break; -@@ -844,12 +833,10 @@ char **env_generator_binary_paths(bool is_system) { +@@ -841,12 +830,10 @@ char **env_generator_binary_paths(bool is_system) { if (is_system) add = strv_new("/run/systemd/system-environment-generators", "/etc/systemd/system-environment-generators", @@ -92,10 +92,10 @@ index 96b82170d0..bf66bd6b77 100644 if (!add) diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in -index b5cc8f94a5..a701cd05f8 100644 +index fc0f8c34fa..ded74ce50a 100644 --- a/src/core/systemd.pc.in +++ b/src/core/systemd.pc.in -@@ -38,10 +38,11 @@ systemdsystemconfdir=${systemd_system_conf_dir} +@@ -38,10 +38,10 @@ systemdsystemconfdir=${systemd_system_conf_dir} systemd_user_conf_dir=${sysconfdir}/systemd/user systemduserconfdir=${systemd_user_conf_dir} @@ -105,10 +105,22 @@ index b5cc8f94a5..a701cd05f8 100644 -systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemd_user_unit_dir}:/usr/lib/systemd/user:/usr/share/systemd/user +systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/user:${systemduserunitdir} -+ systemduserunitpath=${systemd_user_unit_path} systemd_system_generator_dir=${root_prefix}/lib/systemd/system-generators +@@ -50,10 +50,10 @@ systemdsystemgeneratordir=${systemd_system_generator_dir} + systemd_user_generator_dir=${prefix}/lib/systemd/user-generators + systemdusergeneratordir=${systemd_user_generator_dir} + +-systemd_system_generator_path=/run/systemd/system-generators:/etc/systemd/system-generators:/usr/local/lib/systemd/system-generators:${systemd_system_generator_dir} ++systemd_system_generator_path=/run/systemd/system-generators:/etc/systemd/system-generators:${systemd_system_generator_dir} + systemdsystemgeneratorpath=${systemd_system_generator_path} + +-systemd_user_generator_path=/run/systemd/user-generators:/etc/systemd/user-generators:/usr/local/lib/systemd/user-generators:${systemd_user_generator_dir} ++systemd_user_generator_path=/run/systemd/user-generators:/etc/systemd/user-generators:${systemd_user_generator_dir} + systemdusergeneratorpath=${systemd_user_generator_path} + + systemd_sleep_dir=${root_prefix}/lib/systemd/system-sleep -- -2.30.1 +2.32.0 diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch b/nixpkgs/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch index bda27ac1762f..f6fa5833518c 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch +++ b/nixpkgs/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch @@ -1,4 +1,4 @@ -From 7a6529ee27028860b93bc539e8bbf3f2374d712f Mon Sep 17 00:00:00 2001 +From e2a8db60ebfb1e0477ce989f6c3d4a95f2e08120 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Mon, 11 May 2015 15:39:38 +0200 Subject: [PATCH 06/19] Get rid of a useless message in user sessions @@ -9,23 +9,23 @@ Namely lots of variants of in containers. --- - src/core/unit.c | 3 ++- + src/core/manager.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/core/unit.c b/src/core/unit.c -index 45a417a090..8af3cb08d6 100644 ---- a/src/core/unit.c -+++ b/src/core/unit.c -@@ -2163,7 +2163,8 @@ static void unit_check_binds_to(Unit *u) { - } +diff --git a/src/core/manager.c b/src/core/manager.c +index 8884437347..e23d47b4a4 100644 +--- a/src/core/manager.c ++++ b/src/core/manager.c +@@ -1375,7 +1375,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) { + if (!unit_is_bound_by_inactive(u, &culprit)) + continue; - assert(other); -- log_unit_info(u, "Unit is bound to inactive unit %s. Stopping, too.", other->id); -+ if (u->type != UNIT_MOUNT || detect_container() <= 0) -+ log_unit_info(u, "Unit is bound to inactive unit %s. Stopping, too.", other->id); +- log_unit_debug(u, "Unit is stopped because bound to inactive unit %s.", culprit->id); ++ if (u->type != UNIT_MOUNT || detect_container() <= 0) ++ log_unit_debug(u, "Unit is stopped because bound to inactive unit %s.", culprit->id); - /* A unit we need to run is gone. Sniff. Let's stop this. */ - r = manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, NULL, &error, NULL); + /* If stopping a unit fails continuously we might enter a stop loop here, hence stop acting on the + * service being unnecessary after a while. */ -- -2.30.1 +2.32.0 diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch b/nixpkgs/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch index d51e1c0f5668..17c53e2e5180 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch +++ b/nixpkgs/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch @@ -1,4 +1,4 @@ -From 5580303956ca7d8eb431d23c2af0030c9cc0e6e9 Mon Sep 17 00:00:00 2001 +From 56ae06b48c6852071dfc57c1203c04f07309d757 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner <gebner@gebner.org> Date: Sun, 6 Dec 2015 14:26:36 +0100 Subject: [PATCH 07/19] hostnamed, localed, timedated: disable methods that @@ -11,10 +11,10 @@ Subject: [PATCH 07/19] hostnamed, localed, timedated: disable methods that 3 files changed, 25 insertions(+) diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c -index a1794bdab1..77134731e1 100644 +index 36702f2fb0..669257ea2f 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c -@@ -643,6 +643,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ +@@ -797,6 +797,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ if (r < 0) return r; @@ -24,7 +24,7 @@ index a1794bdab1..77134731e1 100644 name = empty_to_null(name); context_read_etc_hostname(c); -@@ -702,6 +705,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess +@@ -860,6 +863,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess if (r < 0) return r; @@ -35,20 +35,20 @@ index a1794bdab1..77134731e1 100644 context_read_machine_info(c); diff --git a/src/locale/localed.c b/src/locale/localed.c -index 736dacdee9..53e0ee935e 100644 +index df0eb030d4..d026eae97e 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c -@@ -317,6 +317,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er +@@ -360,6 +360,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er if (r < 0) return r; + return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, -+ "Changing system settings via systemd is not supported on NixOS."); ++ "Changing system settings via systemd is not supported on NixOS."); + + use_localegen = locale_gen_check_available(); + /* If single locale without variable name is provided, then we assume it is LANG=. */ - if (strv_length(l) == 1 && !strchr(l[0], '=')) { - if (!locale_is_valid(l[0])) -@@ -432,6 +435,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro +@@ -485,6 +488,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro if (r < 0) return r; @@ -58,7 +58,7 @@ index 736dacdee9..53e0ee935e 100644 keymap = empty_to_null(keymap); keymap_toggle = empty_to_null(keymap_toggle); -@@ -606,6 +612,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err +@@ -665,6 +671,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err if (r < 0) return r; @@ -69,10 +69,10 @@ index 736dacdee9..53e0ee935e 100644 model = empty_to_null(model); variant = empty_to_null(variant); diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index 76fe04900d..e87c4c8919 100644 +index 66b454269d..0a8fe25d0f 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c -@@ -646,6 +646,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * +@@ -668,6 +668,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * if (r < 0) return r; @@ -83,7 +83,7 @@ index 76fe04900d..e87c4c8919 100644 if (!timezone_is_valid(z, LOG_DEBUG)) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z); -@@ -725,6 +729,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error +@@ -747,6 +751,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error if (r < 0) return r; @@ -93,7 +93,7 @@ index 76fe04900d..e87c4c8919 100644 if (lrtc == c->local_rtc && !fix_system) return sd_bus_reply_method_return(m, NULL); -@@ -907,6 +914,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error +@@ -930,6 +937,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error if (r < 0) return r; @@ -104,5 +104,5 @@ index 76fe04900d..e87c4c8919 100644 if (r < 0) return r; -- -2.30.1 +2.32.0 diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch b/nixpkgs/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch index 2b1c02b233c7..f272ef23dc01 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch +++ b/nixpkgs/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch @@ -1,32 +1,28 @@ -From 874698425f6d68fc0d662cb17c7c29e0af3e8c25 Mon Sep 17 00:00:00 2001 +From b783b2da164482f26ac5e6e347dc41930c072ea5 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov <ab@fmap.me> Date: Thu, 7 Jul 2016 02:47:13 +0300 Subject: [PATCH 08/19] Fix hwdb paths Patch by vcunat. --- - src/libsystemd/sd-hwdb/sd-hwdb.c | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) + src/libsystemd/sd-hwdb/hwdb-internal.h | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) -diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c -index cb3c77ce96..7b8c80071f 100644 ---- a/src/libsystemd/sd-hwdb/sd-hwdb.c -+++ b/src/libsystemd/sd-hwdb/sd-hwdb.c -@@ -297,13 +297,8 @@ static int trie_search_f(sd_hwdb *hwdb, const char *search) { - } +diff --git a/src/libsystemd/sd-hwdb/hwdb-internal.h b/src/libsystemd/sd-hwdb/hwdb-internal.h +index 5ddc2211e6..ee621eec46 100644 +--- a/src/libsystemd/sd-hwdb/hwdb-internal.h ++++ b/src/libsystemd/sd-hwdb/hwdb-internal.h +@@ -82,8 +82,5 @@ struct trie_value_entry2_f { + } _packed_; - static const char hwdb_bin_paths[] = -- "/etc/systemd/hwdb/hwdb.bin\0" - "/etc/udev/hwdb.bin\0" -- "/usr/lib/systemd/hwdb/hwdb.bin\0" --#if HAVE_SPLIT_USR -- "/lib/systemd/hwdb/hwdb.bin\0" --#endif -- UDEVLIBEXECDIR "/hwdb.bin\0"; -+ ; - - _public_ int sd_hwdb_new(sd_hwdb **ret) { - _cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL; + #define hwdb_bin_paths \ +- "/etc/systemd/hwdb/hwdb.bin\0" \ +- "/etc/udev/hwdb.bin\0" \ +- "/usr/lib/systemd/hwdb/hwdb.bin\0" \ +- _CONF_PATHS_SPLIT_USR_NULSTR("systemd/hwdb/hwdb.bin") \ +- UDEVLIBEXECDIR "/hwdb.bin\0" ++ "/etc/udev/hwdb.bin\0" ++ -- -2.30.1 +2.32.0 diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/nixpkgs/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch index a1e8ec963c71..791e47065d6f 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch +++ b/nixpkgs/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch @@ -1,4 +1,4 @@ -From 367d0dad3d1853048569e315931cb8a27e16a098 Mon Sep 17 00:00:00 2001 +From e24c05ef8cfe48c4f0ebdb92e8147ae2151e4c87 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov <ab@fmap.me> Date: Tue, 11 Oct 2016 13:12:08 +0300 Subject: [PATCH 09/19] Change /usr/share/zoneinfo to /etc/zoneinfo @@ -6,11 +6,11 @@ Subject: [PATCH 09/19] Change /usr/share/zoneinfo to /etc/zoneinfo NixOS uses this path. --- man/localtime.xml | 4 ++-- - src/basic/time-util.c | 6 +++--- + src/basic/time-util.c | 8 ++++---- src/firstboot/firstboot.c | 2 +- src/nspawn/nspawn.c | 4 ++-- src/timedate/timedated.c | 8 ++++---- - 5 files changed, 12 insertions(+), 12 deletions(-) + 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/man/localtime.xml b/man/localtime.xml index e486474c44..5f373d0723 100644 @@ -35,28 +35,37 @@ index e486474c44..5f373d0723 100644 <literal>Etc/UTC</literal>. The resulting link should lead to the corresponding binary diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index 5318d6378d..04069dc27b 100644 +index 5d162e8ffe..1bec83e555 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -1277,7 +1277,7 @@ int get_timezones(char ***ret) { - n_allocated = 2; - n_zones = 1; +@@ -1269,7 +1269,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) { + + assert(ret); - f = fopen("/usr/share/zoneinfo/zone1970.tab", "re"); + f = fopen("/etc/zoneinfo/zone1970.tab", "re"); - if (f) { - for (;;) { - _cleanup_free_ char *line = NULL; -@@ -1372,7 +1372,7 @@ bool timezone_is_valid(const char *name, int log_level) { + if (!f) + return -errno; + +@@ -1308,7 +1308,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) { + _cleanup_strv_free_ char **zones = NULL; + int r; + +- f = fopen("/usr/share/zoneinfo/tzdata.zi", "re"); ++ f = fopen("/etc/zoneinfo/tzdata.zi", "re"); + if (!f) + return -errno; + +@@ -1421,7 +1421,7 @@ int verify_timezone(const char *name, int log_level) { if (p - name >= PATH_MAX) - return false; + return -ENAMETOOLONG; - t = strjoina("/usr/share/zoneinfo/", name); + t = strjoina("/etc/zoneinfo/", name); fd = open(t, O_RDONLY|O_CLOEXEC); - if (fd < 0) { -@@ -1470,7 +1470,7 @@ int get_timezone(char **ret) { + if (fd < 0) +@@ -1512,7 +1512,7 @@ int get_timezone(char **ret) { if (r < 0) return r; /* returns EINVAL if not a symlink */ @@ -66,10 +75,10 @@ index 5318d6378d..04069dc27b 100644 return -EINVAL; diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c -index 742b43f9fc..f2cb121816 100644 +index 2cb4f80d5d..ebeaeac52f 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c -@@ -459,7 +459,7 @@ static int process_timezone(void) { +@@ -491,7 +491,7 @@ static int process_timezone(void) { if (isempty(arg_timezone)) return 0; @@ -79,10 +88,10 @@ index 742b43f9fc..f2cb121816 100644 (void) mkdir_parents(etc_localtime, 0755); if (symlink(e, etc_localtime) < 0) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 14f8a82eb8..8632dadec6 100644 +index 0e5ece5f91..cc46435472 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -1810,8 +1810,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u +@@ -1887,8 +1887,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid static const char *timezone_from_path(const char *path) { return PATH_STARTSWITH_SET( path, @@ -94,10 +103,10 @@ index 14f8a82eb8..8632dadec6 100644 static bool etc_writable(void) { diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index e87c4c8919..964a40ba81 100644 +index 0a8fe25d0f..2f02b9a520 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c -@@ -269,7 +269,7 @@ static int context_read_data(Context *c) { +@@ -279,7 +279,7 @@ static int context_read_data(Context *c) { r = get_timezone(&t); if (r == -EINVAL) @@ -106,7 +115,7 @@ index e87c4c8919..964a40ba81 100644 else if (r < 0) log_warning_errno(r, "Failed to get target of /etc/localtime: %m"); -@@ -293,7 +293,7 @@ static int context_write_data_timezone(Context *c) { +@@ -303,7 +303,7 @@ static int context_write_data_timezone(Context *c) { if (isempty(c->zone) || streq(c->zone, "UTC")) { @@ -115,7 +124,7 @@ index e87c4c8919..964a40ba81 100644 if (unlink("/etc/localtime") < 0 && errno != ENOENT) return -errno; -@@ -301,9 +301,9 @@ static int context_write_data_timezone(Context *c) { +@@ -311,9 +311,9 @@ static int context_write_data_timezone(Context *c) { return 0; } @@ -128,5 +137,5 @@ index e87c4c8919..964a40ba81 100644 return -ENOMEM; -- -2.30.1 +2.32.0 diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch b/nixpkgs/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch index 334156495fcf..d9b048113862 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch +++ b/nixpkgs/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch @@ -1,4 +1,4 @@ -From bf285fe7e12bd22f95c14bcefbb5008888c32bfa Mon Sep 17 00:00:00 2001 +From 09f6ca91b4131637038686dafd57b5da642c100e Mon Sep 17 00:00:00 2001 From: Imuli <i@imu.li> Date: Wed, 19 Oct 2016 08:46:47 -0400 Subject: [PATCH 10/19] localectl: use /etc/X11/xkb for list-x11-* @@ -10,10 +10,10 @@ NixOS has an option to link the xkb data files to /etc/X11, but not to 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locale/localectl.c b/src/locale/localectl.c -index 7d2e887660..91c5139eed 100644 +index 548ac8eb2c..5e372f1566 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c -@@ -277,7 +277,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { +@@ -280,7 +280,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { } state = NONE, look_for; int r; @@ -23,5 +23,5 @@ index 7d2e887660..91c5139eed 100644 return log_error_errno(errno, "Failed to open keyboard mapping list. %m"); -- -2.30.1 +2.32.0 diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/nixpkgs/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch index 902018ee4b91..f88b802b2988 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch +++ b/nixpkgs/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch @@ -1,4 +1,4 @@ -From 293b19c5fdbda1b4ee579a7e8ba12f024a6f34c9 Mon Sep 17 00:00:00 2001 +From d5716cd93fdaad16b590a581f39d95954f40748e Mon Sep 17 00:00:00 2001 From: Franz Pletz <fpletz@fnordicwalking.de> Date: Sun, 11 Feb 2018 04:37:44 +0100 Subject: [PATCH 11/19] build: don't create statedir and don't touch prefixdir @@ -8,11 +8,11 @@ Subject: [PATCH 11/19] build: don't create statedir and don't touch prefixdir 1 file changed, 3 deletions(-) diff --git a/meson.build b/meson.build -index 580964c3fa..f99d4f3ab5 100644 +index 738879eb21..453ee4b1c0 100644 --- a/meson.build +++ b/meson.build -@@ -3518,9 +3518,6 @@ install_data('LICENSE.GPL2', - 'src/libsystemd/sd-bus/GVARIANT-SERIALIZATION', +@@ -3538,9 +3538,6 @@ install_data('LICENSE.GPL2', + 'docs/GVARIANT-SERIALIZATION.md', install_dir : docdir) -meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir)) @@ -20,7 +20,7 @@ index 580964c3fa..f99d4f3ab5 100644 - ############################################################ - check_help = find_program('tools/check-help.sh') + # Ensure that changes to the docs/ directory do not break the -- -2.30.1 +2.32.0 diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch b/nixpkgs/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch index 05fce10e8568..f5a6fde26b1f 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch +++ b/nixpkgs/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch @@ -1,4 +1,4 @@ -From 63777e7f690b67952bf4571f8e09e5d8e769d3c0 Mon Sep 17 00:00:00 2001 +From 40a5df71e7af5feefacae9fc95bf94e72c6c12f4 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold <andreas@rammhold.de> Date: Fri, 2 Nov 2018 21:15:42 +0100 Subject: [PATCH 12/19] inherit systemd environment when calling generators. @@ -12,19 +12,20 @@ tries to gather environments with that they call "environment-generators" and then seems to pass that on to all the other executables that are being called from managers. --- - src/core/manager.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) + src/core/manager.c | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 6858950107..07a599ede7 100644 +index e23d47b4a4..1047aadebc 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -4142,9 +4142,14 @@ static int manager_run_generators(Manager *m) { +@@ -4145,10 +4145,15 @@ static int manager_run_generators(Manager *m) { argv[4] = NULL; RUN_WITH_UMASK(0022) - (void) execute_directories((const char* const*) paths, DEFAULT_TIMEOUT_USEC, NULL, NULL, -- (char**) argv, m->transient_environment, EXEC_DIR_PARALLEL | EXEC_DIR_IGNORE_ERRORS); +- (char**) argv, m->transient_environment, +- EXEC_DIR_PARALLEL | EXEC_DIR_IGNORE_ERRORS | EXEC_DIR_SET_SYSTEMD_EXEC_PID); - + (void) execute_directories((const char* const*) paths, DEFAULT_TIMEOUT_USEC, + // On NixOS we must propagate PATH to generators so they are @@ -33,10 +34,11 @@ index 6858950107..07a599ede7 100644 + // function (envp) is set to NULL. This propagates systemd's + // environment (e.g. PATH) that was setup + // before calling systemd from stage-2-init.sh. -+ NULL, NULL, (char**) argv, /* NixOS: use inherited env */ NULL, EXEC_DIR_PARALLEL | EXEC_DIR_IGNORE_ERRORS); ++ NULL, NULL, (char**) argv, /* NixOS: use inherited env */ NULL, ++ EXEC_DIR_PARALLEL | EXEC_DIR_IGNORE_ERRORS | EXEC_DIR_SET_SYSTEMD_EXEC_PID); r = 0; finish: -- -2.30.1 +2.32.0 diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch b/nixpkgs/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch index b9bab2d387e9..da6aa2627ff8 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch +++ b/nixpkgs/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch @@ -1,4 +1,4 @@ -From 561dc3b864d96753b5dc448e6e1a80460d5f0bc4 Mon Sep 17 00:00:00 2001 +From fe3aff271cf127c1484533237fe0a024e07ae7bc Mon Sep 17 00:00:00 2001 From: Andreas Rammhold <andreas@rammhold.de> Date: Thu, 9 May 2019 11:15:22 +0200 Subject: [PATCH 13/19] add rootprefix to lookup dir paths @@ -34,5 +34,5 @@ index 2e60abb4f1..732ec51d36 100644 #define CONF_PATHS(n) \ CONF_PATHS_USR(n) \ -- -2.30.1 +2.32.0 diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/nixpkgs/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch index c737b61e749a..1ed19358a151 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch +++ b/nixpkgs/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch @@ -1,4 +1,4 @@ -From 8f619304804b02f4e9d7a340ca90359f96adc6e8 Mon Sep 17 00:00:00 2001 +From 31732478745f7a200004fb8ec013f54dbc536f2e Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov <ab@fmap.me> Date: Thu, 25 Jul 2019 20:45:55 +0300 Subject: [PATCH 14/19] systemd-shutdown: execute scripts in @@ -10,7 +10,7 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c -index 0d07865542..26d974ef73 100644 +index a98cfc4d8a..b0b34edda7 100644 --- a/src/shutdown/shutdown.c +++ b/src/shutdown/shutdown.c @@ -312,7 +312,7 @@ int main(int argc, char *argv[]) { @@ -23,5 +23,5 @@ index 0d07865542..26d974ef73 100644 /* The log target defaults to console, but the original systemd process will pass its log target in through a * command line argument, which will override this default. Also, ensure we'll never log to the journal or -- -2.30.1 +2.32.0 diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/nixpkgs/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch index 3059216f7c58..2777de09fadb 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch +++ b/nixpkgs/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch @@ -1,4 +1,4 @@ -From 577b11afe38fc185d785ca8f125f518a4eb21a00 Mon Sep 17 00:00:00 2001 +From 3f2277b86f39cb55936ae11c2365feb283b547cb Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov <ab@fmap.me> Date: Thu, 25 Jul 2019 20:46:58 +0300 Subject: [PATCH 15/19] systemd-sleep: execute scripts in @@ -10,10 +10,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+) diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index 39ab554290..880ac7ccb0 100644 +index a3aeb24633..0ed6a34d79 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c -@@ -178,6 +178,7 @@ static int execute(char **modes, char **states) { +@@ -182,6 +182,7 @@ static int execute( }; static const char* const dirs[] = { SYSTEM_SLEEP_PATH, @@ -22,5 +22,5 @@ index 39ab554290..880ac7ccb0 100644 }; -- -2.30.1 +2.32.0 diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch b/nixpkgs/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch index ad19d910e1e7..6ef53e95d023 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch +++ b/nixpkgs/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch @@ -1,4 +1,4 @@ -From ba19f629c1806ca2d2ab58154e45bce4ae4a3f0c Mon Sep 17 00:00:00 2001 +From 330490aa8a44206bc03205654680913ab01408a1 Mon Sep 17 00:00:00 2001 From: Florian Klink <flokli@flokli.de> Date: Sat, 7 Mar 2020 22:40:27 +0100 Subject: [PATCH 16/19] kmod-static-nodes.service: Update ConditionFileNotEmpty @@ -10,10 +10,10 @@ On NixOS, kernel modules of the currently booted systems are located at 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in -index f4170d6a99..9a6a591bea 100644 +index 777e82d16b..b6abc2bba0 100644 --- a/units/kmod-static-nodes.service.in +++ b/units/kmod-static-nodes.service.in -@@ -12,7 +12,7 @@ Description=Create list of static device nodes for the current kernel +@@ -12,7 +12,7 @@ Description=Create List of Static Device Nodes DefaultDependencies=no Before=sysinit.target systemd-tmpfiles-setup-dev.service ConditionCapability=CAP_SYS_MODULE @@ -23,5 +23,5 @@ index f4170d6a99..9a6a591bea 100644 [Service] Type=oneshot -- -2.30.1 +2.32.0 diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/nixpkgs/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch index 585a0aa112e3..775c8e098479 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch +++ b/nixpkgs/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch @@ -1,4 +1,4 @@ -From c639f311bd27c2bff62a22c34bc92613aaf77587 Mon Sep 17 00:00:00 2001 +From 216018be7b422586b937dae8fd83f51989479a41 Mon Sep 17 00:00:00 2001 From: Florian Klink <flokli@flokli.de> Date: Sun, 8 Mar 2020 01:05:54 +0100 Subject: [PATCH 17/19] path-util.h: add placeholder for DEFAULT_PATH_NORMAL @@ -10,7 +10,7 @@ systemd itself uses extensively. 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/basic/path-util.h b/src/basic/path-util.h -index d613709f0b..5cced4c115 100644 +index 26e7362d1f..a8f8a863ec 100644 --- a/src/basic/path-util.h +++ b/src/basic/path-util.h @@ -24,11 +24,11 @@ @@ -29,5 +29,5 @@ index d613709f0b..5cced4c115 100644 #if HAVE_SPLIT_USR # define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR -- -2.30.1 +2.32.0 diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/0018-logind-seat-debus-show-CanMultiSession-again.patch b/nixpkgs/pkgs/os-specific/linux/systemd/0018-logind-seat-debus-show-CanMultiSession-again.patch index f634e74e663a..21d466b02bb8 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/0018-logind-seat-debus-show-CanMultiSession-again.patch +++ b/nixpkgs/pkgs/os-specific/linux/systemd/0018-logind-seat-debus-show-CanMultiSession-again.patch @@ -1,4 +1,4 @@ -From ebb37f81c28aaa80acd9187a7d77dcb3cb3828db Mon Sep 17 00:00:00 2001 +From beb594ff3bceb95598ffa8ec47c31bacb2449473 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Mon, 26 Oct 2020 21:21:38 +0100 Subject: [PATCH 18/19] logind-seat-debus: show CanMultiSession again @@ -9,10 +9,10 @@ Fixes the "switch user" function in Plasma < 5.20. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c -index a60ed2d3c2..69b6271075 100644 +index cceb3b1d2d..94b4723bb9 100644 --- a/src/login/logind-seat-dbus.c +++ b/src/login/logind-seat-dbus.c -@@ -450,7 +450,7 @@ static const sd_bus_vtable seat_vtable[] = { +@@ -419,7 +419,7 @@ static const sd_bus_vtable seat_vtable[] = { SD_BUS_PROPERTY("Id", "s", NULL, offsetof(Seat, id), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("ActiveSession", "(so)", property_get_active_session, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), @@ -22,5 +22,5 @@ index a60ed2d3c2..69b6271075 100644 SD_BUS_PROPERTY("CanGraphical", "b", property_get_can_graphical, 0, SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE), SD_BUS_PROPERTY("Sessions", "a(so)", property_get_sessions, 0, 0), -- -2.30.1 +2.32.0 diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/0019-pkg-config-derive-prefix-from-prefix.patch b/nixpkgs/pkgs/os-specific/linux/systemd/0019-pkg-config-derive-prefix-from-prefix.patch index 2d93cdef9a34..da071603557a 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/0019-pkg-config-derive-prefix-from-prefix.patch +++ b/nixpkgs/pkgs/os-specific/linux/systemd/0019-pkg-config-derive-prefix-from-prefix.patch @@ -1,4 +1,4 @@ -From 5439a516995f9fd57fc91c2cdd016bb18f31aadf Mon Sep 17 00:00:00 2001 +From 2e7477dc29095141a0556ded11f0ee370d82bfbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> Date: Sun, 6 Dec 2020 08:34:19 +0100 Subject: [PATCH 19/19] pkg-config: derive prefix from --prefix @@ -16,7 +16,7 @@ Co-Authored-By: Florian Klink <flokli@flokli.de> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in -index a701cd05f8..85d6911bdf 100644 +index ded74ce50a..0262f53154 100644 --- a/src/core/systemd.pc.in +++ b/src/core/systemd.pc.in @@ -11,7 +11,7 @@ @@ -24,10 +24,10 @@ index a701cd05f8..85d6911bdf 100644 # shall have underscores. -prefix=/usr -+prefix=@prefix@ - root_prefix=@rootprefix_noslash@ ++prefix={{PREFIX}} + root_prefix={{ROOTPREFIX_NOSLASH}} rootprefix=${root_prefix} - sysconf_dir=@sysconfdir@ + sysconf_dir={{SYSCONF_DIR}} -- -2.30.1 +2.32.0 diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/0020-core-respect-install_sysconfdir_samples-in-meson-fil.patch b/nixpkgs/pkgs/os-specific/linux/systemd/0020-core-respect-install_sysconfdir_samples-in-meson-fil.patch new file mode 100644 index 000000000000..4567c2fa3164 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/systemd/0020-core-respect-install_sysconfdir_samples-in-meson-fil.patch @@ -0,0 +1,31 @@ +From 1a2d24d210c9329e8b900fdb01576c57374581d8 Mon Sep 17 00:00:00 2001 +From: Andreas Rammhold <andreas@rammhold.de> +Date: Mon, 26 Jul 2021 16:57:43 +0200 +Subject: [PATCH 20/20] core: respect install_sysconfdir_samples in meson file + +The refactoring done in e11a25cadbe caused the configuration files to be +installed into the pkgsysconfdir regardless of the state of the +install_sysconfdir_samples boolean that indicated whether or not the +sample files should be installed. +--- + src/core/meson.build | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/core/meson.build b/src/core/meson.build +index f0d2c6f642..4ff7e00e36 100644 +--- a/src/core/meson.build ++++ b/src/core/meson.build +@@ -187,6 +187,10 @@ foreach item : in_files + file = item[0] + dir = item[1] + ++ if not install_sysconfdir_samples and dir == pkgsysconfdir ++ continue ++ endif ++ + custom_target( + file, + input : file + '.in', +-- +2.32.0 + diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/0021-login-respect-install_sysconfdir_samples-in-meson-fi.patch b/nixpkgs/pkgs/os-specific/linux/systemd/0021-login-respect-install_sysconfdir_samples-in-meson-fi.patch new file mode 100644 index 000000000000..b048249e0519 --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/systemd/0021-login-respect-install_sysconfdir_samples-in-meson-fi.patch @@ -0,0 +1,29 @@ +From 189ba3af8b21cfc53527453907e800a2917b1bfd Mon Sep 17 00:00:00 2001 +From: Andreas Rammhold <andreas@rammhold.de> +Date: Mon, 26 Jul 2021 17:20:34 +0200 +Subject: [PATCH] login: respect install_sysconfdir_samples in meson file + +The refactoring done in c900d89faa0 caused the configuration files to be +installed into the pkgsysconfdir regardless of the state of the +install_sysconfdir_samples boolean that indicates whether or not the +sample files should be installed. +--- + src/login/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/login/meson.build b/src/login/meson.build +index 8c20e6be65..b637adc9a2 100644 +--- a/src/login/meson.build ++++ b/src/login/meson.build +@@ -67,7 +67,7 @@ pam_systemd_c = files('pam_systemd.c') + + enable_logind = conf.get('ENABLE_LOGIND') == 1 + in_files = [ +- ['logind.conf', pkgsysconfdir, enable_logind], ++ ['logind.conf', pkgsysconfdir, enable_logind and install_sysconfdir_samples], + ['70-uaccess.rules', udevrulesdir, enable_logind and conf.get('HAVE_ACL') == 1], + ['71-seat.rules', udevrulesdir, enable_logind], + ['73-seat-late.rules', udevrulesdir, enable_logind], +-- +2.32.0 + diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/0022-core-Handle-lookup-paths-being-symlinks.patch b/nixpkgs/pkgs/os-specific/linux/systemd/0022-core-Handle-lookup-paths-being-symlinks.patch new file mode 100644 index 000000000000..c7d022b1ffde --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/systemd/0022-core-Handle-lookup-paths-being-symlinks.patch @@ -0,0 +1,80 @@ +From 5f17b65d30480e489e135b403a072b38535b2911 Mon Sep 17 00:00:00 2001 +From: Andreas Rammhold <andreas@rammhold.de> +Date: Wed, 18 Aug 2021 19:10:08 +0200 +Subject: [PATCH] core: handle lookup paths being symlinks + +With a recent change paths leaving the statically known lookup paths +would be treated differently then those that remained within those. That +was done (AFAIK) to consistently handle alias names. Unfortunately that +means that on some distributions, especially those where /etc/ consists +mostly of symlinks, would trigger that new detection for every single +unit in /etc/systemd/system. The reason for that is that the units +directory itself is already a symlink. +--- + src/basic/unit-file.c | 33 +++++++++++++++++++++++++++++++-- + 1 file changed, 31 insertions(+), 2 deletions(-) + +diff --git a/src/basic/unit-file.c b/src/basic/unit-file.c +index 884a0674a9..3ae2a115d0 100644 +--- a/src/basic/unit-file.c ++++ b/src/basic/unit-file.c +@@ -254,6 +254,7 @@ int unit_file_build_name_map( + + _cleanup_hashmap_free_ Hashmap *ids = NULL, *names = NULL; + _cleanup_set_free_free_ Set *paths = NULL; ++ _cleanup_strv_free_ char **expanded_search_paths = NULL; + uint64_t timestamp_hash; + char **dir; + int r; +@@ -273,6 +274,34 @@ int unit_file_build_name_map( + return log_oom(); + } + ++ /* Go over all our search paths, chase their symlinks and store the ++ * result in the expanded_search_paths list. ++ * ++ * This is important for cases where any of the unit directories itself ++ * are symlinks into other directories and would therefore cause all of ++ * the unit files to be recognized as linked units. ++ * ++ * This is important for distributions such as NixOS where most paths ++ * in /etc/ are symlinks to some other location on the filesystem (e.g. ++ * into /nix/store/). ++ */ ++ STRV_FOREACH(dir, (char**) lp->search_path) { ++ _cleanup_free_ char *resolved_dir = NULL; ++ r = strv_extend(&expanded_search_paths, *dir); ++ if (r < 0) ++ return log_oom(); ++ ++ r = chase_symlinks(*dir, NULL, 0, &resolved_dir, NULL); ++ if (r < 0) { ++ if (r != -ENOENT) ++ log_warning_errno(r, "Failed to resolve symlink %s, ignoring: %m", *dir); ++ continue; ++ } ++ ++ if (strv_consume(&expanded_search_paths, TAKE_PTR(resolved_dir)) < 0) ++ return log_oom(); ++ } ++ + STRV_FOREACH(dir, (char**) lp->search_path) { + struct dirent *de; + _cleanup_closedir_ DIR *d = NULL; +@@ -351,11 +380,11 @@ int unit_file_build_name_map( + continue; + } + +- /* Check if the symlink goes outside of our search path. ++ /* Check if the symlink goes outside of our (expanded) search path. + * If yes, it's a linked unit file or mask, and we don't care about the target name. + * Let's just store the link source directly. + * If not, let's verify that it's a good symlink. */ +- char *tail = path_startswith_strv(simplified, lp->search_path); ++ char *tail = path_startswith_strv(simplified, expanded_search_paths); + if (!tail) { + log_debug("%s: linked unit file: %s → %s", + __func__, filename, simplified); +-- +2.32.0 + diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/0023-path-util-make-find_executable-work-without-proc-mounted.patch b/nixpkgs/pkgs/os-specific/linux/systemd/0023-path-util-make-find_executable-work-without-proc-mounted.patch new file mode 100644 index 000000000000..026d0278797e --- /dev/null +++ b/nixpkgs/pkgs/os-specific/linux/systemd/0023-path-util-make-find_executable-work-without-proc-mounted.patch @@ -0,0 +1,29 @@ +From 93413acd3ef3a637a0f31a1d133b103e1dc81fd6 Mon Sep 17 00:00:00 2001 +From: Yu Watanabe <watanabe.yu+github@gmail.com> +Date: Mon, 23 Aug 2021 06:16:48 +0900 +Subject: [PATCH] path-util: make find_executable() work without /proc mounted + +Follow-up for 888f65ace6296ed61285d31db846babf1c11885e. + +Hopefully fixes #20514. +--- + src/basic/path-util.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/basic/path-util.c b/src/basic/path-util.c +index d11f254a9f6a..a21981616b59 100644 +--- a/src/basic/path-util.c ++++ b/src/basic/path-util.c +@@ -630,7 +630,11 @@ static int check_x_access(const char *path, int *ret_fd) { + return r; + + r = access_fd(fd, X_OK); +- if (r < 0) ++ if (r == -ENOSYS) { ++ /* /proc is not mounted. Fallback to access(). */ ++ if (access(path, X_OK) < 0) ++ return -errno; ++ } else if (r < 0) + return r; + + if (ret_fd) diff --git a/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/nixpkgs/pkgs/os-specific/linux/systemd/default.nix index 01d2db5b2f1a..9f92c34cee6b 100644 --- a/nixpkgs/pkgs/os-specific/linux/systemd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/systemd/default.nix @@ -12,7 +12,6 @@ , coreutils , gperf , getent -, patchelf , glibcLocales , glib , substituteAll @@ -40,6 +39,7 @@ , gnupg , zlib , xz +, tpm2-tss , libuuid , libapparmor , intltool @@ -58,6 +58,12 @@ , bashInteractive , libmicrohttpd + # the (optional) BPF feature requires bpftool, libbpf, clang and llmv-strip to be avilable during build time. + # Only libbpf should be a runtime dependency. +, bpftools +, libbpf +, llvmPackages + , withAnalyze ? true , withApparmor ? true , withCompression ? true # adds bzip2, lz4 and xz @@ -65,10 +71,12 @@ , withCryptsetup ? true , withDocumentation ? true , withEfi ? stdenv.hostPlatform.isEfi +, withFido2 ? true , withHomed ? false , withHostnamed ? true , withHwdb ? true , withImportd ? true +, withLibBPF ? false # currently fails while generating BPF objects , withLocaled ? true , withLogind ? true , withMachined ? true @@ -83,6 +91,7 @@ , withShellCompletions ? true , withTimedated ? true , withTimesyncd ? true +, withTpm2Tss ? true , withUserDb ? true , libfido2 , p11-kit @@ -90,7 +99,6 @@ # name argument , pname ? "systemd" - , libxslt , docbook_xsl , docbook_xml_dtd_42 @@ -108,15 +116,13 @@ assert withCoredump -> withCompression; assert withHomed -> withCryptsetup; -assert withCryptsetup -> -(cryptsetup != null); +assert withCryptsetup -> (cryptsetup != null); let wantCurl = withRemote || withImportd; - - version = "247.6"; + version = "249.4"; in stdenv.mkDerivation { - inherit version pname; + inherit pname version; # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly # This has proven to be less error-prone than the previous systemd fork. @@ -124,7 +130,7 @@ stdenv.mkDerivation { owner = "systemd"; repo = "systemd-stable"; rev = "v${version}"; - sha256 = "sha256-7XYEq3Qw25suwjbtPzx9lVPHUu9ZY/1bADXl2wQbkJc="; + sha256 = "0pqi9gbk9kgwvd0idf13ybxz7s4h5przn01bwj6fna44jr0wy41c"; }; # If these need to be regenerated, `git am path/to/00*.patch` them into a @@ -152,18 +158,26 @@ stdenv.mkDerivation { ./0018-logind-seat-debus-show-CanMultiSession-again.patch ./0019-pkg-config-derive-prefix-from-prefix.patch - # Fix -Werror=format. - (fetchpatch { - url = "https://github.com/systemd/systemd/commit/ab1aa6368a883bce88e3162fee2bea14aacedf23.patch"; - sha256 = "1b280l5jrjsg8qhsang199mpqjhkpix4c8bm3blknjnq9iv43add"; - }) - - # Fix CVE-2021-33910, disclosed 2021-07-20 - (fetchpatch { - name = "CVE-2021-33910.patch"; - url = "https://github.com/systemd/systemd/commit/441e0115646d54f080e5c3bb0ba477c892861ab9.patch"; - sha256 = "1g1lk95igaadg67kah9bpi4zsc01rg398sd1247ghjsvl5hxn4v4"; - }) + # In v249 a bunch of meson files had been touched as part of the migration to + # jinja2 for templating. Unfortunately some of those files lost the `install_sysconfdir_samples` check. + # The following two patches are part of a PR that was filed to fix those cases. + # https://github.com/systemd/systemd/pull/20303 + ./0020-core-respect-install_sysconfdir_samples-in-meson-fil.patch + ./0021-login-respect-install_sysconfdir_samples-in-meson-fi.patch + + # In v248 or v249 we started to get in trouble due to our /etc/systemd/sytem being + # a symlink and thus being treated differently by systemd. With the below + # patch we mitigate that effect by special casing all our root unit dirs + # if they are symlinks. This does exactly what we need (AFAICT). + ./0022-core-Handle-lookup-paths-being-symlinks.patch + + # The way files are being tested for being executable changed in v248/v249 + # which caused our confinement setup to fail as we do not mount /proc by + # default. + # The issue has been reported upstream and this patch carries the upstream + # fix for the same. Upstream now has a test for this scenario. + # https://github.com/systemd/systemd/issues/20514 + ./0023-path-util-make-find_executable-work-without-proc-mounted.patch ]; postPatch = '' @@ -177,14 +191,14 @@ stdenv.mkDerivation { "find_program('${stdenv.cc.bintools.targetPrefix}objcopy'" '' + ( let - # The folllowing dlopen patches ensure that all the features that are - # implemented via dlopen(3) are available (or explicitly deactivated) by - # pointing dlopen to the absolute store path instead of relying on the - # linkers runtime lookup code. + # The folllowing patches references to dynamic libraries to ensure that + # all the features that are implemented via dlopen(3) are available (or + # explicitly deactivated) by pointing dlopen to the absolute store path + # instead of relying on the linkers runtime lookup code. # - # All of the dlopen calls have to be handled. When new ones are introduced - # by upstream (or one of our patches) they must be explicitly declared, - # otherwise the build will fail. + # All of the shared library references have to be handled. When new ones + # are introduced by upstream (or one of our patches) they must be + # explicitly declared, otherwise the build will fail. # # As of systemd version 247 we've seen a few errors like `libpcre2.… not # found` when using e.g. --grep with journalctl. Those errors should @@ -203,32 +217,45 @@ stdenv.mkDerivation { # path location). # # To get a list of dynamically loaded libraries issue something like - # `grep -ri 'dlopen("lib' $src` and update the below list. - dlopenLibs = [ - # We did never provide support for libxkbcommon & qrencode - { name = "libxkbcommon.so.0"; pkg = null; } - { name = "libqrencode.so.4"; pkg = null; } - - # We did not provide libpwquality before so it is safe to disable it for - # now. - { name = "libpwquality.so.1"; pkg = null; } - - # Only include cryptsetup if it is enabled. We might not be able to - # provide it during "bootstrap" in e.g. the minimal systemd build as - # cryptsetup has udev (aka systemd) in it's dependencies. - { name = "libcryptsetup.so.12"; pkg = if withCryptsetup then cryptsetup else null; } - - # We are using libidn2 so we only provide that and ignore the others. - # Systemd does this decision during configure time and uses ifdef's to - # enable specific branches. We can safely ignore (nuke) the libidn "v1" - # libraries. - { name = "libidn2.so.0"; pkg = libidn2; } - { name = "libidn.so.12"; pkg = null; } - { name = "libidn.so.11"; pkg = null; } - - # journalctl --grep requires libpcre so lets provide it - { name = "libpcre2-8.so.0"; pkg = pcre2; } - ]; + # `grep -ri '"lib[a-zA-Z0-9-]*\.so[\.0-9a-zA-z]*"'' $src` and update the below list. + dlopenLibs = + let + opt = condition: pkg: if condition then pkg else null; + in + [ + # bpf compilation support + { name = "libbpf.so.0"; pkg = opt withLibBPF libbpf; } + + # We did never provide support for libxkbcommon & qrencode + { name = "libxkbcommon.so.0"; pkg = null; } + { name = "libqrencode.so.4"; pkg = null; } + + # We did not provide libpwquality before so it is safe to disable it for + # now. + { name = "libpwquality.so.1"; pkg = null; } + + # Only include cryptsetup if it is enabled. We might not be able to + # provide it during "bootstrap" in e.g. the minimal systemd build as + # cryptsetup has udev (aka systemd) in it's dependencies. + { name = "libcryptsetup.so.12"; pkg = opt withCryptsetup cryptsetup; } + + # We are using libidn2 so we only provide that and ignore the others. + # Systemd does this decision during configure time and uses ifdef's to + # enable specific branches. We can safely ignore (nuke) the libidn "v1" + # libraries. + { name = "libidn2.so.0"; pkg = libidn2; } + { name = "libidn.so.12"; pkg = null; } + { name = "libidn.so.11"; pkg = null; } + + # journalctl --grep requires libpcre so lets provide it + { name = "libpcre2-8.so.0"; pkg = pcre2; } + + # Support for TPM2 in systemd-cryptsetup, systemd-repart and systemd-cryptenroll + { name = "libtss2-esys.so.0"; pkg = opt withTpm2Tss tpm2-tss; } + { name = "libtss2-rc.so.0"; pkg = opt withTpm2Tss tpm2-tss; } + { name = "libtss2-mu.so.0"; pkg = opt withTpm2Tss tpm2-tss; } + { name = "libfido2.so.1"; pkg = opt withFido2 libfido2; } + ]; patchDlOpen = dl: let @@ -236,9 +263,9 @@ stdenv.mkDerivation { in if dl.pkg == null then '' # remove the dependency on the library by replacing it with an invalid path - for file in $(grep -lr 'dlopen("${dl.name}"' src); do + for file in $(grep -lr '"${dl.name}"' src); do echo "patching dlopen(\"${dl.name}\", …) in $file to an invalid store path ("/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}")…" - substituteInPlace "$file" --replace 'dlopen("${dl.name}"' 'dlopen("/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}"' + substituteInPlace "$file" --replace '"${dl.name}"' '"/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}"' done '' else '' # ensure that the library we provide actually exists @@ -247,22 +274,29 @@ stdenv.mkDerivation { exit 1 fi # make the path to the dependency explicit - for file in $(grep -lr 'dlopen("${dl.name}"' src); do + for file in $(grep -lr '"${dl.name}"' src); do echo "patching dlopen(\"${dl.name}\", …) in $file to ${library}…" - substituteInPlace "$file" --replace 'dlopen("${dl.name}"' 'dlopen("${library}"' + substituteInPlace "$file" --replace '"${dl.name}"' '"${library}"' done + ''; in # patch all the dlopen calls to contain absolute paths to the libraries lib.concatMapStringsSep "\n" patchDlOpen dlopenLibs ) - # finally ensure that there are no left-over dlopen calls that we didn't handle + # finally ensure that there are no left-over dlopen calls (or rather strings pointing to shared libraries) that we didn't handle + '' - if grep -qr 'dlopen("[^/]' src; then - echo "Found unhandled dlopen calls: " - grep -r 'dlopen("[^/]' src + if grep -qr '"lib[a-zA-Z0-9-]*\.so[\.0-9a-zA-z]*"' src; then + echo "Found unhandled dynamic library calls: " + grep -r '"lib[a-zA-Z0-9-]*\.so[\.0-9a-zA-z]*"' src exit 1 fi + '' + # Finally patch shebangs that might need patching. + # Should no longer be necessary with v250. + # https://github.com/systemd/systemd/pull/19638 + + '' + patchShebangs . ''; outputs = [ "out" "man" "dev" ]; @@ -273,9 +307,7 @@ stdenv.mkDerivation { gperf ninja meson - coreutils # meson calls date, stat etc. glibcLocales - patchelf getent m4 @@ -286,8 +318,14 @@ stdenv.mkDerivation { docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 - (buildPackages.python3Packages.python.withPackages (ps: with ps; [ python3Packages.lxml ])) - ]; + (buildPackages.python3Packages.python.withPackages (ps: with ps; [ lxml jinja2 ])) + ] + ++ lib.optional withLibBPF [ + bpftools + llvmPackages.clang + llvmPackages.libllvm + ] + ; buildInputs = [ @@ -315,12 +353,15 @@ stdenv.mkDerivation { ++ lib.optional withResolved libgpgerror ++ lib.optional withSelinux libselinux ++ lib.optional withRemote libmicrohttpd - ++ lib.optionals withHomed [ p11-kit libfido2 ] + ++ lib.optionals withHomed [ p11-kit ] + ++ lib.optionals (withHomed || withCryptsetup) [ libfido2 ] + ++ lib.optionals withLibBPF [ libbpf ] ; #dontAddPrefix = true; mesonFlags = [ + "-Dversion-tag=${version}" "-Ddbuspolicydir=${placeholder "out"}/share/dbus-1/system.d" "-Ddbussessionservicedir=${placeholder "out"}/share/dbus-1/services" "-Ddbussystemservicedir=${placeholder "out"}/share/dbus-1/system-services" @@ -368,14 +409,14 @@ stdenv.mkDerivation { "-Db_pie=true" "-Dinstall-sysconfdir=false" /* - As of now, systemd doesn't allow runtime configuration of these values. So - the settings in /etc/login.defs have no effect on it. Many people think this - should be supported however, see - - https://github.com/systemd/systemd/issues/3855 - - https://github.com/systemd/systemd/issues/4850 - - https://github.com/systemd/systemd/issues/9769 - - https://github.com/systemd/systemd/issues/9843 - - https://github.com/systemd/systemd/issues/10184 + As of now, systemd doesn't allow runtime configuration of these values. So + the settings in /etc/login.defs have no effect on it. Many people think this + should be supported however, see + - https://github.com/systemd/systemd/issues/3855 + - https://github.com/systemd/systemd/issues/4850 + - https://github.com/systemd/systemd/issues/9769 + - https://github.com/systemd/systemd/issues/9843 + - https://github.com/systemd/systemd/issues/10184 */ "-Dsystem-uid-max=999" "-Dsystem-gid-max=999" @@ -411,6 +452,8 @@ stdenv.mkDerivation { "-Dnss-mymachines=false" "-Dnss-resolve=false" "-Dnss-systemd=false" + ] ++ lib.optionals withLibBPF [ + "-Dbpf-framework=true" ]; preConfigure = '' @@ -459,7 +502,8 @@ stdenv.mkDerivation { --replace '"tar"' '"${gnutar}/bin/tar"' done - substituteInPlace src/journal/catalog.c \ + + substituteInPlace src/libsystemd/sd-journal/catalog.c \ --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/ ''; diff --git a/nixpkgs/pkgs/os-specific/linux/tbs/default.nix b/nixpkgs/pkgs/os-specific/linux/tbs/default.nix index d2b0bc08071e..f2a7b692baa3 100644 --- a/nixpkgs/pkgs/os-specific/linux/tbs/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/tbs/default.nix @@ -18,7 +18,8 @@ let }; in stdenv.mkDerivation { - name = "tbs-2018.04.18-${kernel.version}"; + pname = "tbs"; + version = "2018.04.18-${kernel.version}"; srcs = [ media build ]; sourceRoot = build.name; diff --git a/nixpkgs/pkgs/os-specific/linux/tunctl/default.nix b/nixpkgs/pkgs/os-specific/linux/tunctl/default.nix index 549a607b1522..646e3702fed0 100644 --- a/nixpkgs/pkgs/os-specific/linux/tunctl/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/tunctl/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl}: -stdenv.mkDerivation { - name = "tunctl-1.5"; +stdenv.mkDerivation rec { + pname = "tunctl"; + version = "1.5"; + src = fetchurl { - url = "mirror://sourceforge/tunctl/tunctl-1.5.tar.gz"; + url = "mirror://sourceforge/tunctl/tunctl-${version}.tar.gz"; sha256 = "aa2a6c4cc6bfacb11e0d9f62334a6638a0d435475c61230116f00b6af8b14fff"; }; diff --git a/nixpkgs/pkgs/os-specific/linux/usermount/default.nix b/nixpkgs/pkgs/os-specific/linux/usermount/default.nix index d0c690a95274..87b38b9af6e4 100644 --- a/nixpkgs/pkgs/os-specific/linux/usermount/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/usermount/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, pkg-config, dbus, libnotify, udisks2, gdk-pixbuf }: stdenv.mkDerivation { - name = "usermount-0.1"; + pname = "usermount"; + version = "0.1"; src = fetchgit { url = "https://github.com/tom5760/usermount.git"; diff --git a/nixpkgs/pkgs/os-specific/linux/v86d/default.nix b/nixpkgs/pkgs/os-specific/linux/v86d/default.nix index 36270cdfcc0e..254abb5838e8 100644 --- a/nixpkgs/pkgs/os-specific/linux/v86d/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/v86d/default.nix @@ -1,14 +1,19 @@ -{ lib, stdenv, fetchurl -, kernel, klibc +{ lib +, stdenv +, fetchFromGitHub +, kernel +, klibc }: stdenv.mkDerivation rec { name = "v86d-${version}-${kernel.version}"; version = "0.1.10"; - src = fetchurl { - url = "https://github.com/mjanusz/v86d/archive/v86d-${version}.tar.gz"; - sha256 = "1flnpp8rc945cxr6jr9dlm8mi8gr181zrp2say4269602s1a4ymg"; + src = fetchFromGitHub { + owner = "mjanusz"; + repo = "v86d"; + rev = "v86d-${version}"; + hash = "sha256-95LRzVbO/DyddmPwQNNQ290tasCGoQk7FDHlst6LkbA="; }; patchPhase = '' diff --git a/nixpkgs/pkgs/os-specific/linux/xf86-video-nested/default.nix b/nixpkgs/pkgs/os-specific/linux/xf86-video-nested/default.nix index 7c93fa91854b..bba646e583b8 100644 --- a/nixpkgs/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -3,7 +3,8 @@ }: stdenv.mkDerivation { - name = "xf86-video-nested-2017-06-12"; + pname = "xf86-video-nested"; + version = "unstable-2017-06-12"; src = fetchgit { url = "git://anongit.freedesktop.org/xorg/driver/xf86-video-nested"; diff --git a/nixpkgs/pkgs/os-specific/linux/zfs/default.nix b/nixpkgs/pkgs/os-specific/linux/zfs/default.nix index bf45a5037616..c9f0438c86f5 100644 --- a/nixpkgs/pkgs/os-specific/linux/zfs/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/zfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ pkgs, lib, stdenv, fetchFromGitHub , autoreconfHook269, util-linux, nukeReferences, coreutils , perl, nixosTests , configFile ? "all" @@ -16,7 +16,7 @@ , enablePython ? true # for determining the latest compatible linuxPackages -, linuxPackages_5_13 +, linuxPackages_5_14 ? pkgs.linuxKernel.packages.linux_5_14 }: with lib; @@ -196,6 +196,7 @@ let license = licenses.cddl; platforms = platforms.linux; maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ]; + mainProgram = "zfs"; # If your Linux kernel version is not yet supported by zfs, try zfsUnstable. # On NixOS set the option boot.zfs.enableUnstable. broken = buildKernel && (kernelCompatible != null) && !kernelCompatible; @@ -207,25 +208,28 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.14"; - latestCompatibleLinuxPackages = linuxPackages_5_13; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15"; + latestCompatibleLinuxPackages = linuxPackages_5_14; # this package should point to the latest release. - version = "2.1.0"; + version = "2.1.1"; - sha256 = "sha256-YdY4SStXZGBBdAHdM3R/unco7ztxI3s0/buPSNSeh5o="; + sha256 = "sha256-UUuJa5w/GsEvsgH/BnXFsP/dsOt9wwmPqKzDxLPrhiY="; }; zfsUnstable = common { # check the release notes for compatible kernels kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.15"; - latestCompatibleLinuxPackages = linuxPackages_5_13; + latestCompatibleLinuxPackages = linuxPackages_5_14; # this package should point to a version / git revision compatible with the latest kernel release - version = "unstable-2021-08-30"; - rev = "3b89d9518df2c7fd747e349873a3d4d498beb20e"; + # IMPORTANT: Always use a tagged release candidate or commits from the + # zfs-<version>-staging branch, because this is tested by the OpenZFS + # maintainers. + version = "2.1.1"; + # rev = "0000000000000000000000000000000000000000"; - sha256 = "sha256-wVbjpVrPQmhJmMqdGUf0IwlCIoOsT7Zfj5lxSKcOsgg="; + sha256 = "sha256-UUuJa5w/GsEvsgH/BnXFsP/dsOt9wwmPqKzDxLPrhiY="; isUnstable = true; }; diff --git a/nixpkgs/pkgs/servers/adguardhome/bins.nix b/nixpkgs/pkgs/servers/adguardhome/bins.nix new file mode 100644 index 000000000000..2489bd7a79d4 --- /dev/null +++ b/nixpkgs/pkgs/servers/adguardhome/bins.nix @@ -0,0 +1,19 @@ +{ fetchurl, fetchzip }: +{ +"x86_64-darwin" = fetchzip { + sha256 = "sha256-ec1l4KxKJH4Iwg9hW+xlxLADGLN1vParYaWIw7nCfKA="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.106.3/AdGuardHome_darwin_amd64.zip"; +}; +"i686-linux" = fetchurl { + sha256 = "sha256-9aGyC76WyzwHlAkR72kuNcd/68XdWWC3gfT92IuW2LY="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.106.3/AdGuardHome_linux_386.tar.gz"; +}; +"x86_64-linux" = fetchurl { + sha256 = "sha256-qJMymTxmoPlIhuJD6zFBWWwzz+CFx+9+MOrRiFtA4IY="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.106.3/AdGuardHome_linux_amd64.tar.gz"; +}; +"aarch64-linux" = fetchurl { + sha256 = "sha256-Z5hekNxeemqWsMu7n3UTmYCzdKp5Xsp9ku0G2LOqC80="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.106.3/AdGuardHome_linux_arm64.tar.gz"; +}; +} diff --git a/nixpkgs/pkgs/servers/adguardhome/default.nix b/nixpkgs/pkgs/servers/adguardhome/default.nix index 009b64666002..34f64edc6ba3 100644 --- a/nixpkgs/pkgs/servers/adguardhome/default.nix +++ b/nixpkgs/pkgs/servers/adguardhome/default.nix @@ -1,23 +1,24 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, fetchzip, system ? stdenv.targetPlatform }: stdenv.mkDerivation rec { pname = "adguardhome"; version = "0.106.3"; - src = fetchurl { - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v${version}/AdGuardHome_linux_amd64.tar.gz"; - sha256 = "11p081dqilga61zfziw5w37k6v2r84qynhz2hr4gk8367jck54x8"; - }; + src = (import ./bins.nix { inherit fetchurl fetchzip; }).${system}; installPhase = '' install -m755 -D ./AdGuardHome $out/bin/adguardhome ''; + passthru = { + updateScript = ./update.sh; + }; + meta = with lib; { homepage = "https://github.com/AdguardTeam/AdGuardHome"; description = "Network-wide ads & trackers blocking DNS server"; - platforms = platforms.linux; - maintainers = with maintainers; [ numkem ]; - license = licenses.gpl3; + platforms = [ "x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ numkem iagoq ]; + license = licenses.gpl3Only; }; } diff --git a/nixpkgs/pkgs/servers/adguardhome/update.sh b/nixpkgs/pkgs/servers/adguardhome/update.sh new file mode 100755 index 000000000000..69f1d8e97fde --- /dev/null +++ b/nixpkgs/pkgs/servers/adguardhome/update.sh @@ -0,0 +1,38 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p curl gnugrep nix-prefetch jq + +# This file is based on /pkgs/servers/gotify/update.sh + +set -euo pipefail + +dirname="$(dirname "$0")" +bins="$dirname/bins.nix" + +latest_release=$(curl --silent https://api.github.com/repos/AdguardTeam/AdGuardHome/releases/latest) +version=$(jq -r '.tag_name' <<<"$latest_release") + +echo "got version $version" + +declare -A systems +systems[linux_386]=i686-linux +systems[linux_amd64]=x86_64-linux +systems[linux_arm64]=aarch64-linux +systems[darwin_amd64]=x86_64-darwin + +echo '{ fetchurl, fetchzip }:' > "$bins" +echo '{' >> "$bins" + +for asset in $(curl --silent https://api.github.com/repos/AdguardTeam/AdGuardHome/releases/latest | jq -c '.assets[]') ; do + url="$(jq -r '.browser_download_url' <<< "$asset")" + adg_system="$(grep -Eo '(darwin|linux)_(386|amd64|arm64)' <<< "$url" || true)" + if [ -n "$adg_system" ]; then + fetch="$(grep '\.zip$' <<< "$url" > /dev/null && echo fetchzip || echo fetchurl)" + nix_system=${systems[$adg_system]} + nix_src="$(nix-prefetch -s --output nix $fetch --url $url)" + echo "\"$nix_system\" = $fetch $nix_src;" >> $bins + fi +done + +echo '}' >> "$bins" + +sed -i -r -e "s/version\s*?=\s*?.*?;/version = \"${version#v}\";/" "$dirname/default.nix" diff --git a/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix b/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix index 33541da86b28..357fbe36b207 100644 --- a/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.9.4"; + version = "3.9.6"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-L2ftgdk7QmWl3iQR52G4SwZyI4NURybVMQ1WtcHPvHE="; + sha256 = "sha256-YCVOMVsbOMczpZi02Ywd6M+AXrd5AMweCYn1WcyRHSw="; }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync ]; diff --git a/nixpkgs/pkgs/servers/atlassian/jira.nix b/nixpkgs/pkgs/servers/atlassian/jira.nix index 608326117f15..6f2f777745f4 100644 --- a/nixpkgs/pkgs/servers/atlassian/jira.nix +++ b/nixpkgs/pkgs/servers/atlassian/jira.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "atlassian-jira"; - version = "8.16.1"; + version = "8.19.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "sha256-0J+P4E9hYPbYBb6qvtBjH1jhKrDW187+309YBHORNZA="; + sha256 = "sha256-ewunieLbHCfdS/JjKo9P6S6kK98aUGsyfupUcMyULo4="; }; buildPhase = '' @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { description = "Proprietary issue tracking product, also providing project management functions"; homepage = "https://www.atlassian.com/software/jira"; license = licenses.unfree; - maintainers = with maintainers; [ fpletz globin ciil ]; + maintainers = with maintainers; [ fpletz globin ciil megheaiulian ]; }; } diff --git a/nixpkgs/pkgs/servers/bazarr/default.nix b/nixpkgs/pkgs/servers/bazarr/default.nix index 31c95bdb5f1b..e76d9d8cb5e3 100644 --- a/nixpkgs/pkgs/servers/bazarr/default.nix +++ b/nixpkgs/pkgs/servers/bazarr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bazarr"; - version = "0.9.8"; + version = "0.9.9"; sourceRoot = "."; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - sha256 = "sha256-ESmSfor28KIaZ68Sy+YRbumefHDxLZgBQ6XeUSYSR1c="; + sha256 = "sha256-0Qfjo0hazbV5Oi5hDk8/zc1sReRMzhkjkEiLIRiUOtk="; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/nixpkgs/pkgs/servers/beanstalkd/default.nix b/nixpkgs/pkgs/servers/beanstalkd/default.nix index 9bfe3182d653..71966a32cf0f 100644 --- a/nixpkgs/pkgs/servers/beanstalkd/default.nix +++ b/nixpkgs/pkgs/servers/beanstalkd/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, installShellFiles, nixosTests }: +{ lib, stdenv, fetchFromGitHub, installShellFiles, nixosTests }: stdenv.mkDerivation rec { version = "1.12"; pname = "beanstalkd"; - src = fetchurl { - url = "https://github.com/kr/beanstalkd/archive/v${version}.tar.gz"; - sha256 = "0gw8aygysnjzzfjgfzivy5vajla9adg2zcr4h8rrdf0xyykpwfpl"; + src = fetchFromGitHub { + owner = "kr"; + repo = "beanstalkd"; + rev = "v${version}"; + hash = "sha256-HChpVZ02l08CObrb4+ZEjBiXeQMMYi6zhSWUTDxuEao="; }; hardeningDisable = [ "fortify" ]; diff --git a/nixpkgs/pkgs/servers/calibre-web/default.nix b/nixpkgs/pkgs/servers/calibre-web/default.nix index ef322524ca92..b6dd0b987201 100644 --- a/nixpkgs/pkgs/servers/calibre-web/default.nix +++ b/nixpkgs/pkgs/servers/calibre-web/default.nix @@ -18,9 +18,9 @@ python3.pkgs.buildPythonApplication rec { 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" \ - --replace "PyPDF3>=1.0.0,<1.0.4" "PyPDF3>=1.0.0" + --replace "requests>=2.11.1,<2.25.0" "requests" \ + --replace "cps = calibreweb:main" "calibre-web = calibreweb:main" \ + --replace "PyPDF3>=1.0.0,<1.0.4" "PyPDF3>=1.0.0" ''; patches = [ diff --git a/nixpkgs/pkgs/servers/computing/slurm/default.nix b/nixpkgs/pkgs/servers/computing/slurm/default.nix index 6468f12c3d9c..546c56788ab9 100644 --- a/nixpkgs/pkgs/servers/computing/slurm/default.nix +++ b/nixpkgs/pkgs/servers/computing/slurm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "21.08.0.1"; + version = "21.08.1.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 = "0f1i64vby1qa2y9gv9a9x595s58p6dpw4yhljbgrc2wr7glvnfi3"; + sha256 = "13fd72ifa1ar8yjavdywzvlk4fzxzhybi30pzcdvjnijc9y52j4m"; }; outputs = [ "out" "dev" ]; diff --git a/nixpkgs/pkgs/servers/couchpotato/default.nix b/nixpkgs/pkgs/servers/couchpotato/default.nix index 40941123ebc4..d276c02487df 100644 --- a/nixpkgs/pkgs/servers/couchpotato/default.nix +++ b/nixpkgs/pkgs/servers/couchpotato/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, python2Packages, lib }: +{ fetchFromGitHub, python2Packages, lib }: with python2Packages; @@ -7,9 +7,11 @@ buildPythonApplication rec { version = "3.0.1"; disabled = isPy3k; - src = fetchurl { - url = "https://github.com/CouchPotato/CouchPotatoServer/archive/build/${version}.tar.gz"; - sha256 = "1xwjis3ijh1rff32mpdsphmsclf0lkpd3phpgxkccrigq1m9r3zh"; + src = fetchFromGitHub { + owner = "CouchPotato"; + repo = "CouchPotatoServer"; + rev = "build/${version}"; + hash = "sha256-0k8MqLnqYjhHPE9/jncTFIj1T4F2aXU4mXdeEimDB7M="; }; format = "other"; diff --git a/nixpkgs/pkgs/servers/fcgiwrap/default.nix b/nixpkgs/pkgs/servers/fcgiwrap/default.nix index 3e0a4e5d9940..eee65c3a5d1f 100644 --- a/nixpkgs/pkgs/servers/fcgiwrap/default.nix +++ b/nixpkgs/pkgs/servers/fcgiwrap/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, systemd, fcgi, autoreconfHook, pkg-config }: +{ lib, stdenv, fetchFromGitHub, systemd, fcgi, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "fcgiwrap"; version = "1.1.0"; - src = fetchurl { - url = "https://github.com/gnosek/fcgiwrap/archive/${version}.tar.gz"; - sha256 = "07y6s4mm86cv7p1ljz94sxnqa89y9amn3vzwsnbq5hrl4vdy0zac"; + src = fetchFromGitHub { + owner = "gnosek"; + repo = "fcgiwrap"; + rev = version; + hash = "sha256-znAsZk+aB2XO2NK8Mjc+DLwykYKHolnVQPErlaAx3Oc="; }; NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough"; diff --git a/nixpkgs/pkgs/servers/fishnet/assets.nix b/nixpkgs/pkgs/servers/fishnet/assets.nix deleted file mode 100644 index b150e8ed6370..000000000000 --- a/nixpkgs/pkgs/servers/fishnet/assets.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, xz -, autoPatchelfHook }: - -# Assets for fishnet: A collection of pre-built compressed stockfish binaries. -# We have to decompress them, patch them using auto-patchelf and compress them -# again so that a selection of them can be embedded into the fishnet binary. -stdenv.mkDerivation rec { - pname = "fishnet-assets"; - version = "unstable-2020-03-27"; - - src = fetchFromGitHub { - owner = "niklasf"; - repo = pname; - rev = "a1fe3ec6074ad9dc43e6d46e0d42fab5d7cce12c"; - sha256 = "1548wj2bs89b5w42z3c98hpnbln5w8p1909wyl7a63d8vkvnyn5l"; - }; - - relAssetsPath = "share/${pname}"; - - nativeBuildInputs = [ xz autoPatchelfHook ]; - - postPatch = '' - # Delete packed .exe files and all non .xz files (documentation and readme) - rm *.exe.xz - find \! -name "*.xz" -delete - # Extract .xz files, except *.nnue.xz - # We don't have to unpack the latter and it takes ages to repack - find -name "*.xz" \! -name "*.nnue.xz" | xargs unxz -v - ''; - - dontBuild = true; - - installPhase = '' - mkdir -p $out/${relAssetsPath} - cp ./* $out/${relAssetsPath} - ''; - - preFixup = '' - gatherLibraries '${stdenv.cc.cc.lib}' - ''; - - doDist = true; - distPhase = '' - # repack assets - find $out/${relAssetsPath} -type f \! -name "*.xz" | xargs xz -v - ''; - - meta = with lib; { - description = "Assets for fishnet, only required during build"; - homepage = "https://github.com/niklasf/fishnet-assets"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ tu-maurice ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/nixpkgs/pkgs/servers/fishnet/default.nix b/nixpkgs/pkgs/servers/fishnet/default.nix index be503567c567..784a5525133c 100644 --- a/nixpkgs/pkgs/servers/fishnet/default.nix +++ b/nixpkgs/pkgs/servers/fishnet/default.nix @@ -2,33 +2,34 @@ , stdenv , rustPlatform , fetchFromGitHub -, xz -, autoPatchelfHook }: +, fetchurl +}: let - assets = import ./assets.nix { - inherit lib stdenv fetchFromGitHub xz autoPatchelfHook; + nnueFile = "nn-6762d36ad265.nnue"; + nnue = fetchurl { + url = "https://tests.stockfishchess.org/api/nn/${nnueFile}"; + sha256 = "0727dsxfpns9fkyir95fybibqmigk5h45k154b2c5rk5s9md6qk7"; }; in rustPlatform.buildRustPackage rec { pname = "fishnet"; - version = "2.2.6"; + version = "2.4.0"; src = fetchFromGitHub { owner = "niklasf"; repo = pname; rev = "v${version}"; - sha256 = "0dmc58wzv758b82pjpfzcfi0hr14hqcr61cd9v5xlgk5w78cisjq"; + sha256 = "sha256-1Gl2vJFn9yVYH62yBJefAOBX/jJaFAdSZj2Lj3imcps="; + fetchSubmodules = true; }; - cargoSha256 = "1s37b0w1aav6gz399zncfp0zqh5sfy0zmabhl7n8p5cwlmlvnlsj"; - - preBuild = '' - rmdir ./assets - ln -snf ${assets}/${assets.relAssetsPath} ./assets + postPatch = '' + cp -v '${nnue}' 'Stockfish/src/${nnueFile}' + cp -v '${nnue}' 'Fairy-Stockfish/src/${nnueFile}' ''; - passthru.assets = assets; + cargoSha256 = "sha256-/s7Yyi2FUh+EDvgaHLgZ/FA6kk2FQrZr3L3B76fqTuc="; meta = with lib; { description = "Distributed Stockfish analysis for lichess.org"; diff --git a/nixpkgs/pkgs/servers/ftp/vsftpd/default.nix b/nixpkgs/pkgs/servers/ftp/vsftpd/default.nix index d78c7ca18d19..3aad0460b3fe 100644 --- a/nixpkgs/pkgs/servers/ftp/vsftpd/default.nix +++ b/nixpkgs/pkgs/servers/ftp/vsftpd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "vsftpd"; - version = "3.0.3"; + version = "3.0.5"; src = fetchurl { url = "https://security.appspot.com/downloads/vsftpd-${version}.tar.gz"; - sha256 = "1xsyjn68k3fgm2incpb3lz2nikffl9by2safp994i272wvv2nkcx"; + sha256 = "sha256-JrYCrkVLC6bZnvRKCba54N+n9nIoEGc23x8njHC8kdM="; }; buildInputs = [ libcap openssl pam ]; diff --git a/nixpkgs/pkgs/servers/gerbera/default.nix b/nixpkgs/pkgs/servers/gerbera/default.nix index acb8c139be6f..50ceb77829d9 100644 --- a/nixpkgs/pkgs/servers/gerbera/default.nix +++ b/nixpkgs/pkgs/servers/gerbera/default.nix @@ -65,13 +65,13 @@ let in stdenv.mkDerivation rec { pname = "gerbera"; - version = "1.8.2"; + version = "1.9.1"; src = fetchFromGitHub { repo = "gerbera"; owner = "gerbera"; rev = "v${version}"; - sha256 = "sha256-RVFzATHNCW4lR9dVrtY2fo2BiJrXPCpelBaUXBwOWyY="; + sha256 = "sha256-FtUKj3IhLMRs3VzawFgy6rnd+beW+Kvzq6tk8wPv7pw="; }; postPatch = lib.optionalString enableMysql '' diff --git a/nixpkgs/pkgs/servers/gpm/default.nix b/nixpkgs/pkgs/servers/gpm/default.nix index 4337820683d0..206ac6131e42 100644 --- a/nixpkgs/pkgs/servers/gpm/default.nix +++ b/nixpkgs/pkgs/servers/gpm/default.nix @@ -37,6 +37,11 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/gentoo/musl/5aed405d87dfa92a5cab1596f898e9dea07169b8/sys-libs/gpm/files/gpm-1.20.7-sysmacros.patch"; sha256 = "0lg4l9phvy2n8gy17qsn6zn0qq52vm8g01pgq5kqpr8sd3fb21c2"; }) + (fetchpatch { + # upstream build fix against -fno-common compilers like >=gcc-10 + url = "https://github.com/telmich/gpm/commit/f04f24dd5ca5c1c13608b144ab66e2ccd47f106a.patch"; + sha256 = "1q5hl5m61pci2f0x7r5in99rmqh328v1k0zj2693wdlafk9dabks"; + }) ]; preConfigure = '' ./autogen.sh diff --git a/nixpkgs/pkgs/servers/headscale/default.nix b/nixpkgs/pkgs/servers/headscale/default.nix index 06b2fa867e84..1b95ee18085b 100644 --- a/nixpkgs/pkgs/servers/headscale/default.nix +++ b/nixpkgs/pkgs/servers/headscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "headscale"; - version = "0.7.1"; + version = "0.8.1"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - sha256 = "sha256-/mpSIS3UajxFTQm+/Ko6e0hZ8kbPWSNNctaYKaGl8Gs="; + sha256 = "sha256-xNsdq8qcf2V+OQkRPBVys8SiusFoahezzQet19dYqlw="; }; vendorSha256 = "sha256-ususDOF/LznhK4EInHE7J/ItMjziGfP9Gn8/Q5wd78g="; diff --git a/nixpkgs/pkgs/servers/heisenbridge/default.nix b/nixpkgs/pkgs/servers/heisenbridge/default.nix index ac957f5e38ff..37b95cf8c942 100644 --- a/nixpkgs/pkgs/servers/heisenbridge/default.nix +++ b/nixpkgs/pkgs/servers/heisenbridge/default.nix @@ -1,24 +1,23 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, fetchurl, python3Packages }: python3Packages.buildPythonPackage rec { pname = "heisenbridge"; - version = "1.0.1"; + version = "1.2.0"; - src = fetchFromGitHub { - owner = "hifi"; - repo = "heisenbridge"; - rev = "v${version}"; - sha256 = "sha256-PaLOFZTeX7HxBiOc94x5sHuJYKRF1fR9ShmQN7IPuuo="; + # Use the release tarball because it has the version set correctly using the + # version.txt file. + src = fetchurl { + url = "https://github.com/hifi/heisenbridge/releases/download/v${version}/heisenbridge-${version}.tar.gz"; + sha256 = "sha256-xSqtgUlB7/4QWsq5+8YhxxfQyufpuscIIROJnlnFZn0="; }; propagatedBuildInputs = with python3Packages; [ aiohttp irc + mautrix pyyaml ]; - checkInputs = [ python3Packages.pytestCheckHook ]; - meta = with lib; { description = "A bouncer-style Matrix-IRC bridge."; homepage = "https://github.com/hifi/heisenbridge"; diff --git a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 28285fa2ee37..6204a43b2c53 100644 --- a/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.8.8"; + version = "2021.9.7"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -19,12 +19,13 @@ "air_quality" = ps: with ps; [ ]; "airly" = ps: with ps; [ airly ]; "airnow" = ps: with ps; [ pyairnow ]; + "airtouch4" = ps: with ps; [ ]; # missing inputs: airtouch4pyapi "airvisual" = ps: with ps; [ pyairvisual ]; "aladdin_connect" = ps: with ps; [ aladdin-connect ]; "alarm_control_panel" = ps: with ps; [ ]; "alarmdecoder" = ps: with ps; [ adext ]; "alert" = ps: with ps; [ ]; - "alexa" = ps: with ps; [ aiohttp-cors ]; + "alexa" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; "almond" = ps: with ps; [ aiohttp-cors pyalmond ]; "alpha_vantage" = ps: with ps; [ alpha-vantage ]; "amazon_polly" = ps: with ps; [ boto3 ]; @@ -111,9 +112,9 @@ "buienradar" = ps: with ps; [ buienradar ]; "caldav" = ps: with ps; [ caldav ]; "calendar" = ps: with ps; [ aiohttp-cors ]; - "camera" = ps: with ps; [ aiohttp-cors ]; + "camera" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; "canary" = ps: with ps; [ ha-ffmpeg py-canary ]; - "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa ifaddr mutagen plexapi plexauth plexwebsocket PyChromecast zeroconf ]; + "cast" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa ifaddr mutagen plexapi plexauth plexwebsocket PyChromecast zeroconf ]; "cert_expiry" = ps: with ps; [ ]; "channels" = ps: with ps; [ pychannels ]; "circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook @@ -127,7 +128,7 @@ "clicksend_tts" = ps: with ps; [ ]; "climacell" = ps: with ps; [ pyclimacell ]; "climate" = ps: with ps; [ ]; - "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; + "cloud" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa ]; "cloudflare" = ps: with ps; [ pycfdns ]; "cmus" = ps: with ps; [ ]; # missing inputs: pycmus "co2signal" = ps: with ps; [ ]; # missing inputs: co2signal @@ -159,7 +160,7 @@ "deconz" = ps: with ps; [ pydeconz ]; "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi - "default_config" = ps: with ps; [ pynacl aiodiscover aiohttp-cors async-upnp-client defusedxml distro emoji hass-nabucasa home-assistant-frontend ifaddr pillow scapy sqlalchemy zeroconf ]; + "default_config" = ps: with ps; [ pynacl pyturbojpeg aiodiscover aiohttp-cors async-upnp-client defusedxml emoji hass-nabucasa home-assistant-frontend ifaddr pillow pyserial pyudev scapy sqlalchemy zeroconf ]; "delijn" = ps: with ps; [ pydelijn ]; "deluge" = ps: with ps; [ deluge-client ]; "demo" = ps: with ps; [ aiohttp-cors ]; @@ -266,11 +267,12 @@ "firmata" = ps: with ps; [ pymata-express ]; "fitbit" = ps: with ps; [ aiohttp-cors fitbit ]; "fixer" = ps: with ps; [ fixerio ]; + "fjaraskupan" = ps: with ps; [ ]; # missing inputs: fjaraskupan "fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist - "flexit" = ps: with ps; [ pymodbus ]; # missing inputs: pyflexit + "flexit" = ps: with ps; [ pymodbus ]; "flic" = ps: with ps; [ pyflic ]; "flick_electric" = ps: with ps; [ pyflick ]; - "flipr" = ps: with ps; [ ]; # missing inputs: flipr-api + "flipr" = ps: with ps; [ flipr-api ]; "flo" = ps: with ps; [ aioflo ]; "flock" = ps: with ps; [ ]; "flume" = ps: with ps; [ pyflume ]; @@ -311,7 +313,7 @@ "geonetnz_quakes" = ps: with ps; [ aio-geojson-geonetnz-quakes ]; "geonetnz_volcano" = ps: with ps; [ aio-geojson-geonetnz-volcano ]; "gios" = ps: with ps; [ gios ]; - "github" = ps: with ps; [ PyGithub ]; + "github" = ps: with ps; [ aiogithubapi ]; "gitlab_ci" = ps: with ps; [ python-gitlab ]; "gitter" = ps: with ps; [ ]; # missing inputs: gitterpy "glances" = ps: with ps; [ glances-api ]; @@ -320,7 +322,7 @@ "goalzero" = ps: with ps; [ goalzero ]; "gogogate2" = ps: with ps; [ ismartgate ]; "google" = ps: with ps; [ google-api-python-client httplib2 oauth2client ]; - "google_assistant" = ps: with ps; [ aiohttp-cors ]; + "google_assistant" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; "google_cloud" = ps: with ps; [ google-cloud-texttospeech ]; "google_domains" = ps: with ps; [ ]; "google_maps" = ps: with ps; [ locationsharinglib ]; @@ -378,7 +380,7 @@ "hue" = ps: with ps; [ aiohue ]; "huisbaasje" = ps: with ps; [ huisbaasje-client ]; "humidifier" = ps: with ps; [ ]; - "hunterdouglas_powerview" = ps: with ps; [ ]; # missing inputs: aiopvapi + "hunterdouglas_powerview" = ps: with ps; [ aiopvapi ]; "hvv_departures" = ps: with ps; [ pygti ]; "hydrawise" = ps: with ps; [ hydrawiser ]; "hyperion" = ps: with ps; [ hyperion-py ]; @@ -392,7 +394,7 @@ "ign_sismologia" = ps: with ps; [ georss-ign-sismologia-client ]; "ihc" = ps: with ps; [ defusedxml ]; # missing inputs: ihcsdk "image" = ps: with ps; [ aiohttp-cors pillow ]; - "image_processing" = ps: with ps; [ aiohttp-cors ]; + "image_processing" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; "imap" = ps: with ps; [ aioimaplib ]; "imap_email_content" = ps: with ps; [ ]; "incomfort" = ps: with ps; [ incomfort-client ]; @@ -409,6 +411,7 @@ "intesishome" = ps: with ps; [ pyintesishome ]; "ios" = ps: with ps; [ aiohttp-cors ifaddr zeroconf ]; "iota" = ps: with ps; [ ]; # missing inputs: pyota + "iotawatt" = ps: with ps; [ iotawattpy ]; "iperf3" = ps: with ps; [ ]; # missing inputs: iperf3 "ipma" = ps: with ps; [ pyipma ]; "ipp" = ps: with ps; [ pyipp ]; @@ -490,7 +493,7 @@ "marytts" = ps: with ps; [ ]; # missing inputs: speak2mary "mastodon" = ps: with ps; [ mastodon-py ]; "matrix" = ps: with ps; [ matrix-client ]; - "maxcube" = ps: with ps; [ ]; # missing inputs: maxcube-api + "maxcube" = ps: with ps; [ maxcube-api ]; "mazda" = ps: with ps; [ pymazda ]; "mcp23017" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-mcp230xx "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ]; @@ -510,9 +513,9 @@ "mfi" = ps: with ps; [ ]; # missing inputs: mficlient "mhz19" = ps: with ps; [ pmsensor ]; "microsoft" = ps: with ps; [ ]; # missing inputs: pycsspeechtts - "microsoft_face" = ps: with ps; [ aiohttp-cors ]; - "microsoft_face_detect" = ps: with ps; [ aiohttp-cors ]; - "microsoft_face_identify" = ps: with ps; [ aiohttp-cors ]; + "microsoft_face" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; + "microsoft_face_detect" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; + "microsoft_face_identify" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; "miflora" = ps: with ps; [ bluepy ]; # missing inputs: miflora "mikrotik" = ps: with ps; [ librouteros ]; "mill" = ps: with ps; [ millheater ]; @@ -521,7 +524,7 @@ "minio" = ps: with ps; [ minio ]; "mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt "mjpeg" = ps: with ps; [ ]; - "mobile_app" = ps: with ps; [ pynacl aiohttp-cors emoji hass-nabucasa pillow ]; + "mobile_app" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors emoji hass-nabucasa pillow ]; "mochad" = ps: with ps; [ ]; # missing inputs: pymochad "modbus" = ps: with ps; [ pymodbus ]; "modem_callerid" = ps: with ps; [ ]; # missing inputs: basicmodem @@ -558,10 +561,10 @@ "nello" = ps: with ps; [ ]; # missing inputs: pynello "ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient "nest" = ps: with ps; [ aiohttp-cors ha-ffmpeg python-nest ]; # missing inputs: google-nest-sdm - "netatmo" = ps: with ps; [ aiohttp-cors hass-nabucasa pyatmo ]; + "netatmo" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa pyatmo ]; "netdata" = ps: with ps; [ netdata ]; "netgear" = ps: with ps; [ ]; # missing inputs: pynetgear - "netgear_lte" = ps: with ps; [ ]; # missing inputs: eternalegypt + "netgear_lte" = ps: with ps; [ eternalegypt ]; "netio" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pynetio "network" = ps: with ps; [ aiohttp-cors ifaddr ]; "neurio_energy" = ps: with ps; [ ]; # missing inputs: neurio @@ -571,9 +574,9 @@ "nfandroidtv" = ps: with ps; [ ]; # missing inputs: notifications-android-tv "nightscout" = ps: with ps; [ ]; # missing inputs: py-nightscout "niko_home_control" = ps: with ps; [ ]; # missing inputs: niko-home-control - "nilu" = ps: with ps; [ ]; # missing inputs: niluclient + "nilu" = ps: with ps; [ niluclient ]; "nissan_leaf" = ps: with ps; [ ]; # missing inputs: pycarwings2 - "nmap_tracker" = ps: with ps; [ getmac python-nmap ]; + "nmap_tracker" = ps: with ps; [ aiohttp-cors getmac ifaddr netmap ]; # missing inputs: mac-vendor-lookup "nmbs" = ps: with ps; [ ]; # missing inputs: pyrail "no_ip" = ps: with ps; [ ]; "noaa_tides" = ps: with ps; [ ]; # missing inputs: noaa-coops @@ -602,7 +605,7 @@ "ondilo_ico" = ps: with ps; [ aiohttp-cors ondilo ]; "onewire" = ps: with ps; [ ]; # missing inputs: pi1wire pyownet "onkyo" = ps: with ps; [ onkyo-eiscp ]; - "onvif" = ps: with ps; [ ha-ffmpeg zeep ]; # missing inputs: WSDiscovery onvif-zeep-async + "onvif" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: WSDiscovery onvif-zeep-async "openalpr_cloud" = ps: with ps; [ ]; "openalpr_local" = ps: with ps; [ ]; "opencv" = ps: with ps; [ numpy ]; # missing inputs: opencv-python-headless @@ -625,8 +628,9 @@ "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify "otp" = ps: with ps; [ pyotp ]; "ovo_energy" = ps: with ps; [ ovoenergy ]; - "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt ]; + "owntracks" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors hass-nabucasa paho-mqtt ]; "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt python-openzwave-mqtt ]; + "p1_monitor" = ps: with ps; [ p1monitor ]; "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera "pandora" = ps: with ps; [ pexpect ]; @@ -646,7 +650,7 @@ "ping" = ps: with ps; [ icmplib ]; "pioneer" = ps: with ps; [ ]; "pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2 - "plaato" = ps: with ps; [ aiohttp-cors hass-nabucasa pyplaato ]; + "plaato" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa pyplaato ]; "plant" = ps: with ps; [ sqlalchemy ]; "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket ]; "plugwise" = ps: with ps; [ plugwise ]; @@ -681,12 +685,12 @@ "quantum_gateway" = ps: with ps; [ ]; # missing inputs: quantum-gateway "qvr_pro" = ps: with ps; [ ]; # missing inputs: pyqvrpro "qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch - "rachio" = ps: with ps; [ aiohttp-cors hass-nabucasa rachiopy ]; + "rachio" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa rachiopy ]; "radarr" = ps: with ps; [ ]; "radiotherm" = ps: with ps; [ radiotherm ]; "rainbird" = ps: with ps; [ ]; # missing inputs: pyrainbird "raincloud" = ps: with ps; [ ]; # missing inputs: raincloudy - "rainforest_eagle" = ps: with ps; [ ]; # missing inputs: eagle200_reader uEagle + "rainforest_eagle" = ps: with ps; [ aioeagle ueagle ]; "rainmachine" = ps: with ps; [ regenmaschine ]; "random" = ps: with ps; [ ]; "raspihats" = ps: with ps; [ smbus-cffi ]; # missing inputs: raspihats @@ -699,7 +703,7 @@ "remember_the_milk" = ps: with ps; [ httplib2 ]; # missing inputs: RtmAPI "remote" = ps: with ps; [ ]; "remote_rpi_gpio" = ps: with ps; [ ]; # missing inputs: gpiozero - "renault" = ps: with ps; [ ]; # missing inputs: renault-api + "renault" = ps: with ps; [ renault-api ]; "repetier" = ps: with ps; [ ]; # missing inputs: pyrepetier "rest" = ps: with ps; [ jsonpath xmltodict ]; "rest_command" = ps: with ps; [ ]; @@ -728,7 +732,7 @@ "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound "sabnzbd" = ps: with ps; [ aiohttp-cors ifaddr netdisco zeroconf ]; # missing inputs: pysabnzbd - "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa home-assistant-frontend pillow sqlalchemy ]; + "safe_mode" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa home-assistant-frontend pillow sqlalchemy ]; "saj" = ps: with ps; [ ]; # missing inputs: pysaj "samsungtv" = ps: with ps; [ getmac samsungctl samsungtvws wakeonlan ]; "satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra @@ -779,7 +783,7 @@ "smappee" = ps: with ps; [ aiohttp-cors pysmappee ]; "smart_meter_texas" = ps: with ps; [ smart-meter-texas ]; "smarthab" = ps: with ps; [ smarthab ]; - "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa pysmartapp pysmartthings ]; + "smartthings" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa pysmartapp pysmartthings ]; "smarttub" = ps: with ps; [ python-smarttub ]; "smarty" = ps: with ps; [ ]; # missing inputs: pysmarty "smhi" = ps: with ps; [ smhi-pkg ]; @@ -799,10 +803,10 @@ "sonarr" = ps: with ps; [ sonarr ]; "songpal" = ps: with ps; [ python-songpal ]; "sonos" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr plexapi plexauth plexwebsocket soco zeroconf ]; - "sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp + "sony_projector" = ps: with ps; [ pysdcp ]; "soundtouch" = ps: with ps; [ aiohttp-cors ifaddr libsoundtouch zeroconf ]; "spaceapi" = ps: with ps; [ aiohttp-cors ]; - "spc" = ps: with ps; [ ]; # missing inputs: pyspcwebgw + "spc" = ps: with ps; [ pyspcwebgw ]; "speedtestdotnet" = ps: with ps; [ speedtest-cli ]; "spider" = ps: with ps; [ spiderpy ]; "splunk" = ps: with ps; [ ]; # missing inputs: hass_splunk @@ -820,7 +824,7 @@ "stiebel_eltron" = ps: with ps; [ pymodbus ]; # missing inputs: pystiebeleltron "stookalert" = ps: with ps; [ ]; # missing inputs: stookalert "stream" = ps: with ps; [ aiohttp-cors av ]; - "streamlabswater" = ps: with ps; [ ]; # missing inputs: streamlabswater + "streamlabswater" = ps: with ps; [ streamlabswater ]; "stt" = ps: with ps; [ aiohttp-cors ]; "subaru" = ps: with ps; [ subarulink ]; "suez_water" = ps: with ps; [ ]; # missing inputs: pysuez @@ -881,7 +885,7 @@ "todoist" = ps: with ps; [ todoist ]; "tof" = ps: with ps; [ ]; # missing inputs: RPi.GPIO VL53L1X2 "tomato" = ps: with ps; [ ]; - "toon" = ps: with ps; [ aiohttp-cors hass-nabucasa toonapi ]; + "toon" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa toonapi ]; "torque" = ps: with ps; [ aiohttp-cors ]; "totalconnect" = ps: with ps; [ total-connect-client ]; "touchline" = ps: with ps; [ ]; # missing inputs: pytouchline @@ -890,6 +894,7 @@ "traccar" = ps: with ps; [ aiohttp-cors stringcase ]; # missing inputs: pytraccar "trace" = ps: with ps; [ ]; "trackr" = ps: with ps; [ ]; # missing inputs: pytrackr + "tractive" = ps: with ps; [ aiotractive ]; "tradfri" = ps: with ps; [ pytradfri ]; "trafikverket_train" = ps: with ps; [ pytrafikverket ]; "trafikverket_weatherstation" = ps: with ps; [ pytrafikverket ]; @@ -916,13 +921,14 @@ "upb" = ps: with ps; [ upb-lib ]; "upc_connect" = ps: with ps; [ connect-box ]; "upcloud" = ps: with ps; [ upcloud-api ]; - "updater" = ps: with ps; [ distro ]; + "updater" = ps: with ps; [ ]; "upnp" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr zeroconf ]; "uptime" = ps: with ps; [ ]; "uptimerobot" = ps: with ps; [ ]; # missing inputs: pyuptimerobot + "usb" = ps: with ps; [ aiohttp-cors pyserial pyudev ]; "uscis" = ps: with ps; [ ]; # missing inputs: uscisstatus "usgs_earthquakes_feed" = ps: with ps; [ geojson-client ]; - "utility_meter" = ps: with ps; [ ]; + "utility_meter" = ps: with ps; [ croniter ]; "uvc" = ps: with ps; [ uvcclient ]; "vacuum" = ps: with ps; [ ]; "vallox" = ps: with ps; [ ]; # missing inputs: vallox-websocket-api @@ -987,10 +993,10 @@ "xs1" = ps: with ps; [ ]; # missing inputs: xs1-api-client "yale_smart_alarm" = ps: with ps; [ yalesmartalarmclient ]; "yamaha" = ps: with ps; [ rxv ]; - "yamaha_musiccast" = ps: with ps; [ aiomusiccast ]; + "yamaha_musiccast" = ps: with ps; [ aiohttp-cors aiomusiccast async-upnp-client defusedxml ifaddr zeroconf ]; "yandex_transport" = ps: with ps; [ aioymaps ]; "yandextts" = ps: with ps; [ ]; - "yeelight" = ps: with ps; [ yeelight ]; + "yeelight" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr yeelight ]; "yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower "yi" = ps: with ps; [ aioftp ha-ffmpeg ]; "youless" = ps: with ps; [ youless-api ]; @@ -1000,13 +1006,13 @@ "zeroconf" = ps: with ps; [ aiohttp-cors ifaddr zeroconf ]; "zerproc" = ps: with ps; [ pyzerproc ]; "zestimate" = ps: with ps; [ xmltodict ]; - "zha" = ps: with ps; [ aiohttp-cors bellows ifaddr pyserial-asyncio pyserial zeroconf zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ]; + "zha" = ps: with ps; [ aiohttp-cors bellows ifaddr pyserial-asyncio pyserial pyudev zeroconf zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy-znp zigpy ]; "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl "zodiac" = ps: with ps; [ ]; "zone" = ps: with ps; [ ]; "zoneminder" = ps: with ps; [ zm-py ]; "zwave" = ps: with ps; [ aiohttp-cors homeassistant-pyozw paho-mqtt pydispatcher python-openzwave-mqtt ]; - "zwave_js" = ps: with ps; [ aiohttp-cors zwave-js-server-python ]; + "zwave_js" = ps: with ps; [ aiohttp-cors pyserial pyudev zwave-js-server-python ]; }; } diff --git a/nixpkgs/pkgs/servers/home-assistant/default.nix b/nixpkgs/pkgs/servers/home-assistant/default.nix index 68a80dc41d7e..dc1799146145 100644 --- a/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -21,21 +21,22 @@ let defaultOverrides = [ - # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt - (mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270") - + # Pinned due to API changes in async-upnp-client>=0.20.0, remove after (self: super: { async-upnp-client = super.async-upnp-client.overridePythonAttrs (oldAttrs: rec { - version = "0.19.2"; + version = "0.20.0"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; - rev = version; - sha256 = "1v8d2lvxihqasn7866zssys16s0lgxkk6ri2dp4rr7wr8g9ixvdr"; + rev = "v${version}"; + sha256 = "sha256-jxYGOljV7tcsiAgpOhbXj7g7AwyP1kDDC83PiHG6ZFg="; }; }); }) + # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt + (mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270") + # Pinned due to API changes in iaqualink>=2.0, remove after # https://github.com/home-assistant/core/pull/48137 was merged (self: super: { @@ -95,6 +96,9 @@ let }); }) + # Pinned due to API changes in 0.1.0 + (mkOverride "poolsense" "0.0.8" "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp") + # Pinned due to changes in total-connect-client>0.58 which made the tests fails at the moment (self: super: { total-connect-client = super.total-connect-client.overridePythonAttrs (oldAttrs: rec { @@ -112,19 +116,6 @@ let (self: super: { home-assistant-frontend = self.callPackage ./frontend.nix { }; }) - - # Pinned due to incompability with aioesphomeapi 8.0.0 - (self: super: { - aioesphomeapi = super.aioesphomeapi.overrideAttrs (oldAttrs: rec { - version = "7.0.0"; - src = fetchFromGitHub { - owner = "esphome"; - repo = oldAttrs.pname; - rev = "v${version}"; - hash = "sha256-ho/1fpq4yAgmYNERPqs51oqr08ncaN9+GRTUUuGU7ps="; - }; - }); - }) ]; mkOverride = attrname: version: sha256: @@ -154,7 +145,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.8.8"; + hassVersion = "2021.9.7"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -171,7 +162,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1fj16qva04d9qhpnfxxacsp82vqqfha5c2zg4f850kld4qhwrgky"; + sha256 = "1vcdnxh671iqhlbf6811j537by2i03fhryp9r9x77477y2y0xd6k"; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -181,11 +172,11 @@ in with py.pkgs; buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace "attrs==21.2.0" "attrs" \ --replace "awesomeversion==21.4.0" "awesomeversion" \ --replace "bcrypt==3.1.7" "bcrypt" \ --replace "cryptography==3.3.2" "cryptography" \ --replace "pip>=8.0.3,<20.3" "pip" \ + --replace "requests==2.25.1" "requests>=2.25.1" \ --replace "ruamel.yaml==0.15.100" "ruamel.yaml" substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"' ''; @@ -232,6 +223,7 @@ in with py.pkgs; buildPythonApplication rec { pytest-xdist pytestCheckHook requests-mock + stdlib-list jsonpickle respx # required by tests/auth/mfa_modules @@ -370,6 +362,7 @@ in with py.pkgs; buildPythonApplication rec { "fireservicerota" "firmata" "flick_electric" + "flipr" "flo" "flume" "flunearyou" @@ -438,6 +431,7 @@ in with py.pkgs; buildPythonApplication rec { "hue" "huisbaasje" "humidifier" + "hunterdouglas_powerview" "hvv_departures" "hyperion" "ialarm" @@ -494,6 +488,7 @@ in with py.pkgs; buildPythonApplication rec { "mailbox" "manual" "manual_mqtt" + "maxcube" "mazda" "media_player" "media_source" @@ -552,6 +547,7 @@ in with py.pkgs; buildPythonApplication rec { "ovo_energy" "owntracks" "ozw" + "p1_monitor" "panel_custom" "panel_iframe" "persistent_notification" @@ -582,6 +578,7 @@ in with py.pkgs; buildPythonApplication rec { "recorder" "reddit" "remote" + "renault" "rest" "rest_command" "rflink" @@ -635,6 +632,7 @@ in with py.pkgs; buildPythonApplication rec { # "sonos" "soundtouch" "spaceapi" + "spc" "speedtestdotnet" "spider" "spotify" @@ -750,7 +748,7 @@ in with py.pkgs; buildPythonApplication rec { pytestFlagsArray = [ # parallelize test run - "--numprocesses auto" + "--numprocesses $NIX_BUILD_CORES" # assign tests grouped by file to workers "--dist loadfile" # retry racy tests that end in "RuntimeError: Event loop is closed" @@ -794,6 +792,11 @@ in with py.pkgs; buildPythonApplication rec { "--deselect tests/components/local_ip/test_config_flow.py::test_config_flow" # netatmo/test_select.py: NoneType object has no attribute state "--deselect tests/components/netatmo/test_select.py::test_select_schedule_thermostats" + # wemo/test_sensor.py: KeyError for various power attributes + "--deselect tests/components/wemo/test_sensor.py::TestInsightTodayEnergy::test_state_unavailable" + "--deselect tests/components/wemo/test_sensor.py::TestInsightCurrentPower::test_state_unavailable" + # tado/test_climate.py: Tries to connect to my.tado.com + "--deselect tests/components/tado/test_climate.py::test_air_con[" # helpers/test_system_info.py: AssertionError: assert 'Unknown' == 'Home Assistant Container' "--deselect tests/helpers/test_system_info.py::test_container_installationtype" # tests are located in tests/ @@ -831,8 +834,9 @@ in with py.pkgs; buildPythonApplication rec { "test_onboarding_core_no_rpi_power" # hue/test_sensor_base.py: Race condition when counting events "test_hue_events" - # august/test_lock.py: AssertionError: assert 'unlocked' == 'locked' + # august/test_lock.py: AssertionError: assert 'unlocked' == 'locked' / assert 'off' == 'on' "test_lock_update_via_pubnub" + "test_door_sense_update_via_pubnub" ]; preCheck = '' diff --git a/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/nixpkgs/pkgs/servers/home-assistant/frontend.nix index 926cb48ce30e..3e32f7276867 100644 --- a/nixpkgs/pkgs/servers/home-assistant/frontend.nix +++ b/nixpkgs/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20210809.0"; + version = "20210830.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5NWNDhQ7XKK9/tC+SbpwOm2MSA2VGHLcE1ggyl6vPkc="; + sha256 = "sha256-4sNCnYFQ4IjmMPj7axgienZUMDo+GwTJ38cEf0iZzJI="; }; # there is nothing to strip in this package diff --git a/nixpkgs/pkgs/servers/home-assistant/update.sh b/nixpkgs/pkgs/servers/home-assistant/update.sh index 56f7b0aaede8..8a47daf51c55 100755 --- a/nixpkgs/pkgs/servers/home-assistant/update.sh +++ b/nixpkgs/pkgs/servers/home-assistant/update.sh @@ -31,6 +31,8 @@ sed -i -e "s/hassVersion =.*/hassVersion = \"${TARGET_VERSION}\";/" \ ./parse-requirements.py +read + ( cd ../../.. nix-update --version "$TARGET_VERSION" --build home-assistant diff --git a/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix b/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix index a8caf1da17ba..2ec30cbf0a75 100644 --- a/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix +++ b/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix @@ -17,12 +17,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.48"; + version = "2.4.49"; pname = "apache-httpd"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "0v4npxnvih5mlxx6dywwhhfs8xvgcckc0hxzwk3hi0g8nbkjdj0v"; + sha256 = "0fqkfjcpdd40ji2279wfxh5hddb5jdxlnpjr0sbhva8fi7b6bfb5"; }; # FIXME: -dev depends on -doc diff --git a/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index eeabbc1f30dc..39f21b189378 100644 --- a/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, apacheHttpd }: +{ lib, stdenv, fetchFromGitHub, fetchurl, apacheHttpd }: let apache-24-patch = fetchurl { @@ -11,9 +11,11 @@ stdenv.mkDerivation rec { pname = "mod_fastcgi"; version = "2.4.7.1"; - src = fetchurl { - url = "https://github.com/FastCGI-Archives/mod_fastcgi/archive/${version}.tar.gz"; - sha256 = "12g6vcfl9jl8rqf8lzrkdxg2ngca310d3d6an563xqcgrkp8ga55"; + src = fetchFromGitHub { + owner = "FastCGI-Archives"; + repo = "mod_fastcgi"; + rev = version; + hash = "sha256-ovir59kCjKkgbraX23nsmzlMzGdeNTyj3MQd8cgvLsg="; }; patches = [ apache-24-patch ]; @@ -42,5 +44,6 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = [ lib.maintainers.peti ]; + broken = true; # patch 'compile-against-apache24.diff' no longer works }; } diff --git a/nixpkgs/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 6a029ce1dccd..945f34ac9161 100644 --- a/nixpkgs/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, apacheHttpd, python, ncurses }: +{ lib, stdenv, fetchFromGitHub, apacheHttpd, python, ncurses }: stdenv.mkDerivation rec { pname = "mod_wsgi"; version = "4.9.0"; - src = fetchurl { - url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz"; - sha256 = "sha256-Cm84CvhUuFoxUeVKPDO1IMSm4hqZvK165d37/jGnS1A="; + src = fetchFromGitHub { + owner = "GrahamDumpleton"; + repo = "mod_wsgi"; + rev = version; + hash = "sha256-gaWA6m4ENYtm88hCaoqrcIooA0TBI7Kj6fU6pPShoo4="; }; buildInputs = [ apacheHttpd python ncurses ]; diff --git a/nixpkgs/pkgs/servers/http/nginx/generic.nix b/nixpkgs/pkgs/servers/http/nginx/generic.nix index e13c0b4e9223..ecbf8071d611 100644 --- a/nixpkgs/pkgs/servers/http/nginx/generic.nix +++ b/nixpkgs/pkgs/servers/http/nginx/generic.nix @@ -119,15 +119,15 @@ stdenv.mkDerivation { ./nix-skip-check-logs-path.patch ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ (fetchpatch { - url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/102-sizeof_test_fix.patch"; + url = "https://raw.githubusercontent.com/openwrt/packages/c057dfb09c7027287c7862afab965a4cd95293a3/net/nginx/patches/102-sizeof_test_fix.patch"; sha256 = "0i2k30ac8d7inj9l6bl0684kjglam2f68z8lf3xggcc2i5wzhh8a"; }) (fetchpatch { - url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/101-feature_test_fix.patch"; + url = "https://raw.githubusercontent.com/openwrt/packages/c057dfb09c7027287c7862afab965a4cd95293a3/net/nginx/patches/101-feature_test_fix.patch"; sha256 = "0v6890a85aqmw60pgj3mm7g8nkaphgq65dj4v9c6h58wdsrc6f0y"; }) (fetchpatch { - url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/103-sys_nerr.patch"; + url = "https://raw.githubusercontent.com/openwrt/packages/c057dfb09c7027287c7862afab965a4cd95293a3/net/nginx/patches/103-sys_nerr.patch"; sha256 = "0s497x6mkz947aw29wdy073k8dyjq8j99lax1a1mzpikzr4rxlmd"; }) ] ++ mapModules "patches"); diff --git a/nixpkgs/pkgs/servers/http/nginx/mainline.nix b/nixpkgs/pkgs/servers/http/nginx/mainline.nix index 80e56d1bf0f0..1b63b06f2cb4 100644 --- a/nixpkgs/pkgs/servers/http/nginx/mainline.nix +++ b/nixpkgs/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.21.1"; - sha256 = "0q2m2pd9x287py54kp49ys5pwnn0j17x7jjl0cx1c5916h8h7fk8"; + version = "1.21.3"; + sha256 = "0nhps7igdqcpcy1r8677ar807rfclpylmz3y858a678m1np4lxql"; } diff --git a/nixpkgs/pkgs/servers/http/tomcat/default.nix b/nixpkgs/pkgs/servers/http/tomcat/default.nix index 506b692e68af..8b0f814177aa 100644 --- a/nixpkgs/pkgs/servers/http/tomcat/default.nix +++ b/nixpkgs/pkgs/servers/http/tomcat/default.nix @@ -32,13 +32,13 @@ let in { tomcat9 = common { versionMajor = "9"; - versionMinor = "0.46"; - sha256 = "02p1d7xkmfna5brwi5imjz83g5va1g6fxkiaj4q22l8jpkr6xf6h"; + versionMinor = "0.53"; + sha256 = "1zdnbb0bfbi7762lz69li0wf48jbfz1mv637jzcl42vbsxp4agkv"; }; tomcat10 = common { versionMajor = "10"; - versionMinor = "0.6"; - sha256 = "1bpcxpsfws3b8ykq53vrcx3f04mvs5if80p329jm3x2dvdvj3d9n"; + versionMinor = "0.11"; + sha256 = "1hjvsxxxavni7bis1hm56281ffmf4x0zdh65zqkrnhqa1rbs0lg2"; }; } diff --git a/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix b/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix index dfcbe5d0f18b..cf912d87a1d6 100644 --- a/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix +++ b/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tomcat-native"; - version = "1.2.30"; + version = "1.2.31"; src = fetchurl { url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz"; - sha512 = "51a8c55214de166cace193c3330abe77cabea56c2d05efc8c3408bc06369c328899376c94c572725ebe2887f2faf99fea05d1819fa84c712d57fd309d0476953"; + sha512 = "2aaa93f0acf3eb780d39faeda3ece3cf053d3b6e2918462f7183070e8ab32232e035e9062f7c07ceb621006d727d3596d9b4b948f4432b4f625327b72fdb0e49"; }; sourceRoot = "${pname}-${version}-src/native"; diff --git a/nixpkgs/pkgs/servers/imgproxy/default.nix b/nixpkgs/pkgs/servers/imgproxy/default.nix index fc099e905e5a..b71592e8f0f6 100644 --- a/nixpkgs/pkgs/servers/imgproxy/default.nix +++ b/nixpkgs/pkgs/servers/imgproxy/default.nix @@ -3,12 +3,12 @@ buildGoModule rec { pname = "imgproxy"; - version = "2.16.7"; + version = "2.17.0"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "sha256-7UGIkYChXIht/dyMhvPeu8oeGQEA7/Ns7+e56wEmAwQ="; + sha256 = "sha256-afprMKFyuo1Doi5K5EtzdiQY+fbx2LtEh3xxnPr+yjk="; rev = "v${version}"; }; diff --git a/nixpkgs/pkgs/servers/irc/inspircd/default.nix b/nixpkgs/pkgs/servers/irc/inspircd/default.nix index 59fb4d4e769c..7addb8ab3a1e 100644 --- a/nixpkgs/pkgs/servers/irc/inspircd/default.nix +++ b/nixpkgs/pkgs/servers/irc/inspircd/default.nix @@ -142,13 +142,13 @@ in stdenv.mkDerivation rec { pname = "inspircd"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1817gmxk4v7k5398d2fb6qkwadg0fd980gqmr80wdnppx450ikn7"; + sha256 = "083fp69fi4nhrw9v1dan5m3mgb19a2gpqnap356xs9nnqy01sgv7"; }; outputs = [ "bin" "lib" "man" "doc" "out" ]; diff --git a/nixpkgs/pkgs/servers/jicofo/default.nix b/nixpkgs/pkgs/servers/jicofo/default.nix index be774e6e5b1e..823545fa7bf6 100644 --- a/nixpkgs/pkgs/servers/jicofo/default.nix +++ b/nixpkgs/pkgs/servers/jicofo/default.nix @@ -2,10 +2,10 @@ let pname = "jicofo"; - version = "1.0-756"; + version = "1.0-798"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "07qmxqp1llpn8kh590iz35zk17c2k4yg7i43nb2l0sfm40crpwfz"; + sha256 = "55JagMfiBbBw0nqRxcMmfiwGF7B/1LA+pb5n6ZOZvag="; }; in stdenv.mkDerivation { diff --git a/nixpkgs/pkgs/servers/jitsi-videobridge/default.nix b/nixpkgs/pkgs/servers/jitsi-videobridge/default.nix index 79659b96c57a..0bf023668abc 100644 --- a/nixpkgs/pkgs/servers/jitsi-videobridge/default.nix +++ b/nixpkgs/pkgs/servers/jitsi-videobridge/default.nix @@ -2,10 +2,10 @@ let pname = "jitsi-videobridge2"; - version = "2.1-508-gb24f756c"; + version = "2.1-551-g2ad6eb0b"; src = fetchurl { url = "https://download.jitsi.org/stable/${pname}_${version}-1_all.deb"; - sha256 = "0kjsm3k7chgrfvvqxkp8xdw6wfrs122j4h8gcvyvpf9lg51p199g"; + sha256 = "XwVcjvBtJkZP46kGMnE4R1ax7Re725GMoV+pCnCNpak="; }; in stdenv.mkDerivation { diff --git a/nixpkgs/pkgs/servers/libreddit/default.nix b/nixpkgs/pkgs/servers/libreddit/default.nix index 744b5efe2100..1a2703b8ad45 100644 --- a/nixpkgs/pkgs/servers/libreddit/default.nix +++ b/nixpkgs/pkgs/servers/libreddit/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "libreddit"; - version = "0.14.14"; + version = "0.15.3"; src = fetchFromGitHub { owner = "spikecodes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-duirX+X8moByV1urdgXjzTQ2zOfCfz7etzjDxkSKvhk="; + sha256 = "sha256-G7QJhRmfqzDIfBHu8rSSMVlBoazY+0iDS7VJsmxaLqI="; }; - cargoSha256 = "sha256-pFCERBnN386rW8ajpLWUHteCTWRmEiR19Sp5d8HXc5Y="; + cargoSha256 = "sha256-xvPwzRGmRVe+Og78fKqcvf3I0uMR9DOdOXMNbuLI8sY="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/nixpkgs/pkgs/servers/livepeer/default.nix b/nixpkgs/pkgs/servers/livepeer/default.nix index c84dc85ef93e..b8a4f3c5569d 100644 --- a/nixpkgs/pkgs/servers/livepeer/default.nix +++ b/nixpkgs/pkgs/servers/livepeer/default.nix @@ -4,16 +4,16 @@ buildGoModule rec { pname = "livepeer"; - version = "0.5.15"; + version = "0.5.20"; runVend = true; - vendorSha256 = "sha256-PhkdbixJDA9Ym4cK5ALIYJgDQnO5GTbZ0XGsVHcvYYQ="; + vendorSha256 = "sha256-iFVScV3arPkBjMi8sCHIja4G2QeQDb2sgBrbTFyxKyw="; src = fetchFromGitHub { owner = "livepeer"; repo = "go-livepeer"; rev = "v${version}"; - sha256 = "sha256-ZB80QssqN9SBpmYk/QgPRVF88qedmNeUG+EkjxWz4rQ="; + sha256 = "sha256-cOxIL093Mi+g9Al/SQJ6vdaeBAXUN6ZGsSaVvEIiJpU="; }; # livepeer_cli has a vendoring problem diff --git a/nixpkgs/pkgs/servers/maddy/default.nix b/nixpkgs/pkgs/servers/maddy/default.nix index 88631112fa1c..658d5e34fb33 100644 --- a/nixpkgs/pkgs/servers/maddy/default.nix +++ b/nixpkgs/pkgs/servers/maddy/default.nix @@ -31,8 +31,8 @@ buildGoModule rec { meta = with lib; { description = "Composable all-in-one mail server"; - homepage = "https://foxcpp.dev/maddy"; + homepage = "https://maddy.email"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ lxea ]; + maintainers = with maintainers; []; }; } diff --git a/nixpkgs/pkgs/servers/mail/rspamd/default.nix b/nixpkgs/pkgs/servers/mail/rspamd/default.nix index 8e95e622b830..3b65b413a480 100644 --- a/nixpkgs/pkgs/servers/mail/rspamd/default.nix +++ b/nixpkgs/pkgs/servers/mail/rspamd/default.nix @@ -11,13 +11,13 @@ assert withHyperscan -> stdenv.isx86_64; stdenv.mkDerivation rec { pname = "rspamd"; - version = "2.7"; + version = "3.0"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - sha256 = "sha256-LMLRDnKfGpApVsIvPNY2nxl+H5+qeVvwvwr3wdyyhjs="; + sha256 = "sha256-MXnaQhTDV6ji5634TXA5vvXBlA/SilwM0YYL8DjQL9s="; }; hardeningEnable = [ "pie" ]; diff --git a/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/nixpkgs/pkgs/servers/matrix-synapse/default.nix index 9b7cd567a77c..058a9be261c3 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -4,19 +4,34 @@ , callPackage }: -with python3.pkgs; +let +py = python3.override { + packageOverrides = self: super: { + frozendict = super.frozendict.overridePythonAttrs (oldAttrs: rec { + version = "1.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp"; + }; + doCheck = false; + }); + }; +}; +in + +with py.pkgs; let - plugins = python3.pkgs.callPackage ./plugins { }; + plugins = py.pkgs.callPackage ./plugins { }; tools = callPackage ./tools { }; in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.42.0"; + version = "1.43.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wJFjjm9apRqjk5eN/kIEgecHgm/XLbtwXHEpM2pmvO8="; + sha256 = "sha256-t3ZXtEq/sHYymta4gYfmdBzpExyxepGQ4lzvZii2Q70="; }; patches = [ @@ -66,13 +81,13 @@ buildPythonApplication rec { doCheck = !stdenv.isDarwin; checkPhase = '' - PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests + PYTHONPATH=".:$PYTHONPATH" ${py.interpreter} -m twisted.trial -j $NIX_BUILD_CORES tests ''; passthru.tests = { inherit (nixosTests) matrix-synapse; }; passthru.plugins = plugins; passthru.tools = tools; - passthru.python = python3; + passthru.python = py; meta = with lib; { homepage = "https://matrix.org"; diff --git a/nixpkgs/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix b/nixpkgs/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix index b4247561da59..b7c291d6cc44 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "matrix-synapse-mjolnir-antispam"; - version = "0.1.19"; + version = "1.1.20"; src = fetchFromGitHub { owner = "matrix-org"; repo = "mjolnir"; rev = "v${version}"; - sha256 = "09g2h5qj725745ljxff4vh05zy7lzcmvdz0bkxxhpjhs48jdlq3k"; + sha256 = "06779z08qni1kgr292gpkxd2xvyg4apfnbhynli9qjp2vaf03wy9"; }; sourceRoot = "./source/synapse_antispam"; diff --git a/nixpkgs/pkgs/servers/matrix-synapse/plugins/pam.nix b/nixpkgs/pkgs/servers/matrix-synapse/plugins/pam.nix index 47ee28a7794c..a14fe6d6a6c5 100644 --- a/nixpkgs/pkgs/servers/matrix-synapse/plugins/pam.nix +++ b/nixpkgs/pkgs/servers/matrix-synapse/plugins/pam.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "matrix-synapse-pam"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "14mRh4X0r"; repo = "matrix-synapse-pam"; rev = "v${version}"; - sha256 = "10byma9hxz3g4sirw5sa4pvljn83h9vs7zc15chhpl2n14bdx45l"; + sha256 = "0jgz49cwiyih5cg3hr4byva04zjnq8aj7rima9874la9fc5sd2wf"; }; propagatedBuildInputs = [ twisted python-pam ]; diff --git a/nixpkgs/pkgs/servers/minio/default.nix b/nixpkgs/pkgs/servers/minio/default.nix index 9293b4c48f01..7fba57a94be6 100644 --- a/nixpkgs/pkgs/servers/minio/default.nix +++ b/nixpkgs/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2021-08-25T00-41-18Z"; + version = "2021-09-15T04-54-25Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-gwP1q+5vjgCnrnvWTxPC66fugVrilC1WbLk3SP4NXqA="; + sha256 = "sha256-h1RuYRduCZFCklwa/gvkTZXTi71UDb8ofMPb+X9KIuA="; }; - vendorSha256 = "sha256-JcgMJ6xz3h3YJ1zoSJLCWdWGmd12MPvxcIPX1ZbhpaM="; + vendorSha256 = "sha256-ccqa5ltblk1Z/RRJkC1h+EpkxylWdKXfNRYOeOzrPb4="; doCheck = false; diff --git a/nixpkgs/pkgs/servers/misc/gobgpd/default.nix b/nixpkgs/pkgs/servers/misc/gobgpd/default.nix index 75bc9f8e6088..0c58efe375ec 100644 --- a/nixpkgs/pkgs/servers/misc/gobgpd/default.nix +++ b/nixpkgs/pkgs/servers/misc/gobgpd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gobgpd"; - version = "2.30.0"; + version = "2.31.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-YerInFAUHFGEU0XSYeqKly9EiCq/uSjtMLnzI/ekSJ4="; + sha256 = "sha256-Q55BA5iMZP5D8lLfJn82fsxQ0SP5e4OdXtGly4j3dXU="; }; - vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY="; + vendorSha256 = "sha256-+dX/XByFW5/zvfXvyWePAv9X71dJEKaQf6xNXAXoMxw="; postConfigure = '' export CGO_ENABLED=0 diff --git a/nixpkgs/pkgs/servers/misc/navidrome/default.nix b/nixpkgs/pkgs/servers/misc/navidrome/default.nix index 15c424394f2e..f81a2c4d9ab6 100644 --- a/nixpkgs/pkgs/servers/misc/navidrome/default.nix +++ b/nixpkgs/pkgs/servers/misc/navidrome/default.nix @@ -1,20 +1,26 @@ -{ lib, stdenv, fetchurl, ffmpeg, ffmpegSupport ? true, makeWrapper, nixosTests }: +{ lib, stdenv, pkgs, fetchurl, ffmpeg, ffmpegSupport ? true, makeWrapper, nixosTests }: with lib; stdenv.mkDerivation rec { pname = "navidrome"; - version = "0.44.1"; + version = "0.45.1"; - src = fetchurl { + + src = fetchurl (if pkgs.system == "x86_64-linux" + then { url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; - sha256 = "sha256-2lnj6aNLPeLwxgyRUQFOQJDsOSMu9Banez8RMMQs74Y="; - }; + sha256 = "sha256-TZcXq51sKoeLPmcRpv4VILDmS6dsS7lxlJzTDH0tEWM="; + } + else { + url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_arm64.tar.gz"; + sha256 = "sha256-Va0DSmemj8hsaywoP6WKo/x+QQzSNwHCpU4VWs5lpbI="; + }); nativeBuildInputs = [ makeWrapper ]; unpackPhase = '' - tar xvf $src navidrome + tar xvf $src navidrome ''; installPhase = '' @@ -37,7 +43,7 @@ stdenv.mkDerivation rec { description = "Navidrome Music Server and Streamer compatible with Subsonic/Airsonic"; homepage = "https://www.navidrome.org/"; license = licenses.gpl3Only; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ aciceri ]; }; } diff --git a/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix index c7c3fb37b702..67e611e9bb7d 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/grafana-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.18.2"; + version = "0.18.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "agent"; - sha256 = "sha256-yTCFMnOSRgMqL9KD26cYeJcQ1rrUBOf8I+i7IPExP9I="; + sha256 = "sha256-NlktNBVljMgcivB0N/X3aAEJyZK2GyDD7o86qx/5YmQ="; }; vendorSha256 = "sha256-MZGOZB/mS3pmZuI35E/QkaNLLhbuW2DfZiih9OCXMj0="; diff --git a/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix index a87d30d73570..e67a23f13450 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -10,13 +10,13 @@ mkYarnPackage rec { pname = "grafana-image-renderer"; - version = "3.0.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - sha256 = "sha256-wg+cMAMqj4JORh5LPJnNELgsJYAxVgz2YPOl87WWda4="; + sha256 = "sha256-PEi8jreYCafKBa8M5Mo6/g03pS1PHvmhgMpuwIlUePY="; }; buildPhase = '' diff --git a/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json b/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json index c1db7f861816..1cd26f57b9fa 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json +++ b/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json @@ -21,7 +21,7 @@ "@grpc/grpc-js": "^1.0", "@grpc/proto-loader": "^0.5.4", "@hapi/boom": "^9.1.0", - "chokidar": "^3.5.1", + "chokidar": "^3.5.2", "eslint": "^7.13.0", "express": "^4.16.3", "express-prom-bundle": "^5.1.5", @@ -29,8 +29,9 @@ "lodash": "^4.17.21", "minimist": "^1.2.0", "morgan": "^1.9.0", + "on-finished": "^2.3.0", "prom-client": "^11.5.3", - "puppeteer": "^3.3.0", + "puppeteer": "^10.0.0", "puppeteer-cluster": "^0.22.0", "unique-filename": "^1.1.0", "winston": "^3.2.1" @@ -41,9 +42,9 @@ "husky": "^4.3.8", "lint-staged": "^9.5.0", "pkg": "^5.1.0", - "prettier": "^1.19.1", + "prettier": "2.2.1", "tsc-watch": "^4.2.3", - "typescript": "^3.8.3" + "typescript": "^4.3.2" }, "husky": { "hooks": { diff --git a/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock b/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock index 80fd4569e691..b58c74f73eee 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock +++ b/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock @@ -291,10 +291,12 @@ acorn@^7.4.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -agent-base@5: - version "5.1.1" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c" - integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g== +agent-base@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" aggregate-error@^3.0.0: version "3.1.0" @@ -373,7 +375,7 @@ any-observable@^0.3.0: resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b" integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog== -anymatch@~3.1.1: +anymatch@~3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== @@ -427,11 +429,11 @@ at-least-node@^1.0.0: integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== axios@^0.21.1: - version "0.21.1" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" - integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== + version "0.21.4" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" + integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== dependencies: - follow-redirects "^1.10.0" + follow-redirects "^1.14.0" balanced-match@^1.0.0: version "1.0.2" @@ -570,20 +572,20 @@ chalk@^4.0.0, chalk@^4.1.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chokidar@^3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" - integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== +chokidar@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" + integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ== dependencies: - anymatch "~3.1.1" + anymatch "~3.1.2" braces "~3.0.2" - glob-parent "~5.1.0" + glob-parent "~5.1.2" is-binary-path "~2.1.0" is-glob "~4.0.1" normalize-path "~3.0.0" - readdirp "~3.5.0" + readdirp "~3.6.0" optionalDependencies: - fsevents "~2.3.1" + fsevents "~2.3.2" chownr@^1.1.1: version "1.1.4" @@ -771,7 +773,7 @@ debug@2.6.9: dependencies: ms "2.0.0" -debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: +debug@4, debug@4.3.1, debug@^4.0.1, debug@^4.1.1: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== @@ -839,6 +841,11 @@ detect-libc@^1.0.3: resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= +devtools-protocol@0.0.883894: + version "0.0.883894" + resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.883894.tgz#d403f2c75cd6d71c916aee8dde9258da988a4da9" + integrity sha512-33idhm54QJzf3Q7QofMgCvIVSd2o9H3kQPWaKT/fhoZh+digc+WSiMhbkeG3iN79WY4Hwr9G05NpbhEVrsOYAg== + dir-glob@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" @@ -1124,7 +1131,7 @@ express@^4.16.3: utils-merge "1.0.1" vary "~1.1.2" -extract-zip@^2.0.0: +extract-zip@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== @@ -1228,6 +1235,14 @@ finalhandler@~1.1.2: statuses "~1.5.0" unpipe "~1.0.0" +find-up@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + find-up@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" @@ -1261,10 +1276,10 @@ fn.name@1.x.x: resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== -follow-redirects@^1.10.0: - version "1.14.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.0.tgz#f5d260f95c5f8c105894491feee5dc8993b402fe" - integrity sha512-0vRwd7RKQBTt+mgu87mtYeofLFZpTas2S9zY+jIeuLJMNvudIgF52nr19q40HOwH5RrhWIPuj9puybzSJiRrVg== +follow-redirects@^1.14.0: + version "1.14.3" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.3.tgz#6ada78118d8d24caee595595accdc0ac6abd022e" + integrity sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw== forwarded@~0.1.2: version "0.1.2" @@ -1309,7 +1324,7 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -fsevents@~2.3.1: +fsevents@~2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== @@ -1360,7 +1375,7 @@ github-from-package@0.0.0: resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= -glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0: +glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -1480,12 +1495,12 @@ http-errors@~1.7.2: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" -https-proxy-agent@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b" - integrity sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg== +https-proxy-agent@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== dependencies: - agent-base "5" + agent-base "6" debug "4" husky@^4.3.8: @@ -1845,6 +1860,13 @@ listr@^0.14.3: p-map "^2.0.0" rxjs "^6.3.3" +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + locate-path@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" @@ -1978,11 +2000,6 @@ mime@1.6.0: resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== -mime@^2.0.3: - version "2.5.2" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" - integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== - mimic-fn@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" @@ -2015,6 +2032,13 @@ mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== +mkdirp@^0.5.1: + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + dependencies: + minimist "^1.2.5" + morgan@^1.9.0: version "1.10.0" resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7" @@ -2081,6 +2105,11 @@ node-cleanup@^2.1.2: resolved "https://registry.yarnpkg.com/node-cleanup/-/node-cleanup-2.1.2.tgz#7ac19abd297e09a7f72a71545d951b517e4dde2c" integrity sha1-esGavSl+Caf3KnFUXZUbUX5N3iw= +node-fetch@2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" + integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== + noop-logger@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" @@ -2197,6 +2226,13 @@ p-is-promise@^3.0.0: resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-3.0.0.tgz#58e78c7dfe2e163cf2a04ff869e7c1dba64a5971" integrity sha512-Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ== +p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + p-limit@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" @@ -2204,6 +2240,13 @@ p-limit@^3.0.2: dependencies: yocto-queue "^0.1.0" +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + p-locate@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" @@ -2223,6 +2266,11 @@ p-map@^3.0.0: dependencies: aggregate-error "^3.0.0" +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + parent-module@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" @@ -2300,6 +2348,13 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d" integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg== +pkg-dir@4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" + integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== + dependencies: + find-up "^4.0.0" + pkg-dir@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760" @@ -2378,17 +2433,22 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= -prettier@^1.19.1: - version "1.19.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" - integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== +prettier@2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" + integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== process-nextick-args@~2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== -progress@^2.0.0, progress@^2.0.1, progress@^2.0.3: +progress@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.1.tgz#c9242169342b1c29d275889c95734621b1952e31" + integrity sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg== + +progress@^2.0.0, progress@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== @@ -2427,7 +2487,7 @@ proxy-addr@~2.0.5: forwarded "~0.1.2" ipaddr.js "1.9.1" -proxy-from-env@^1.0.0: +proxy-from-env@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== @@ -2459,21 +2519,23 @@ puppeteer-cluster@^0.22.0: dependencies: debug "^4.1.1" -puppeteer@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-3.3.0.tgz#95839af9fdc0aa4de7e5ee073a4c0adeb9e2d3d7" - integrity sha512-23zNqRltZ1PPoK28uRefWJ/zKb5Jhnzbbwbpcna2o5+QMn17F0khq5s1bdH3vPlyj+J36pubccR8wiNA/VE0Vw== - dependencies: - debug "^4.1.0" - extract-zip "^2.0.0" - https-proxy-agent "^4.0.0" - mime "^2.0.3" - progress "^2.0.1" - proxy-from-env "^1.0.0" - rimraf "^3.0.2" - tar-fs "^2.0.0" - unbzip2-stream "^1.3.3" - ws "^7.2.3" +puppeteer@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-10.0.0.tgz#1b597c956103e2d989ca17f41ba4693b20a3640c" + integrity sha512-AxHvCb9IWmmP3gMW+epxdj92Gglii+6Z4sb+W+zc2hTTu10HF0yg6hGXot5O74uYkVqG3lfDRLfnRpi6WOwi5A== + dependencies: + debug "4.3.1" + devtools-protocol "0.0.883894" + extract-zip "2.0.1" + https-proxy-agent "5.0.0" + node-fetch "2.6.1" + pkg-dir "4.2.0" + progress "2.0.1" + proxy-from-env "1.1.0" + rimraf "3.0.2" + tar-fs "2.0.0" + unbzip2-stream "1.3.3" + ws "7.4.6" qs@6.7.0: version "6.7.0" @@ -2532,10 +2594,10 @@ readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: string_decoder "^1.1.1" util-deprecate "^1.0.1" -readdirp@~3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" - integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== dependencies: picomatch "^2.2.1" @@ -2585,7 +2647,7 @@ reusify@^1.0.4: resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -rimraf@^3.0.0, rimraf@^3.0.2: +rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -2912,6 +2974,16 @@ table@^6.0.4: string-width "^4.2.0" strip-ansi "^6.0.0" +tar-fs@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.0.tgz#677700fc0c8b337a78bee3623fdc235f21d7afad" + integrity sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA== + dependencies: + chownr "^1.1.1" + mkdirp "^0.5.1" + pump "^3.0.0" + tar-stream "^2.0.0" + tar-fs@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" @@ -2922,7 +2994,7 @@ tar-fs@^2.0.0: pump "^3.0.0" tar-stream "^2.1.4" -tar-stream@^2.1.4: +tar-stream@^2.0.0, tar-stream@^2.1.4: version "2.2.0" resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== @@ -3037,15 +3109,15 @@ type-is@~1.6.17, type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" -typescript@^3.8.3: - version "3.9.9" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.9.tgz#e69905c54bc0681d0518bd4d587cc6f2d0b1a674" - integrity sha512-kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w== +typescript@^4.3.2: + version "4.3.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.2.tgz#399ab18aac45802d6f2498de5054fcbbe716a805" + integrity sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw== -unbzip2-stream@^1.3.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7" - integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg== +unbzip2-stream@1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz#d156d205e670d8d8c393e1c02ebd506422873f6a" + integrity sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg== dependencies: buffer "^5.2.1" through "^2.3.8" @@ -3175,7 +3247,7 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -ws@^7.2.3: +ws@7.4.6: version "7.4.6" resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== diff --git a/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix b/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix index 5cec9f36ef28..dcf5351e45bd 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix +++ b/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix @@ -354,11 +354,11 @@ }; } { - name = "agent_base___agent_base_5.1.1.tgz"; + name = "agent_base___agent_base_6.0.2.tgz"; path = fetchurl { - name = "agent_base___agent_base_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz"; - sha1 = "e8fb3f242959db44d63be665db7a8e739537a32c"; + name = "agent_base___agent_base_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz"; + sha1 = "49fff58577cfee3f37176feab4c22e00f86d7f77"; }; } { @@ -530,11 +530,11 @@ }; } { - name = "axios___axios_0.21.1.tgz"; + name = "axios___axios_0.21.4.tgz"; path = fetchurl { - name = "axios___axios_0.21.1.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz"; - sha1 = "22563481962f4d6bde9a76d516ef0e5d3c09b2b8"; + name = "axios___axios_0.21.4.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz"; + sha1 = "c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"; }; } { @@ -690,11 +690,11 @@ }; } { - name = "chokidar___chokidar_3.5.1.tgz"; + name = "chokidar___chokidar_3.5.2.tgz"; path = fetchurl { - name = "chokidar___chokidar_3.5.1.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz"; - sha1 = "ee9ce7bbebd2b79f49f304799d5468e31e14e68a"; + name = "chokidar___chokidar_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz"; + sha1 = "dba3976fcadb016f66fd365021d91600d01c1e75"; }; } { @@ -1018,6 +1018,14 @@ }; } { + name = "devtools_protocol___devtools_protocol_0.0.883894.tgz"; + path = fetchurl { + name = "devtools_protocol___devtools_protocol_0.0.883894.tgz"; + url = "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.883894.tgz"; + sha1 = "d403f2c75cd6d71c916aee8dde9258da988a4da9"; + }; + } + { name = "dir_glob___dir_glob_3.0.1.tgz"; path = fetchurl { name = "dir_glob___dir_glob_3.0.1.tgz"; @@ -1394,6 +1402,14 @@ }; } { + name = "find_up___find_up_4.1.0.tgz"; + path = fetchurl { + name = "find_up___find_up_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; + sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; + }; + } + { name = "find_up___find_up_5.0.0.tgz"; path = fetchurl { name = "find_up___find_up_5.0.0.tgz"; @@ -1434,11 +1450,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.14.0.tgz"; + name = "follow_redirects___follow_redirects_1.14.3.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.14.0.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.0.tgz"; - sha1 = "f5d260f95c5f8c105894491feee5dc8993b402fe"; + name = "follow_redirects___follow_redirects_1.14.3.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.3.tgz"; + sha1 = "6ada78118d8d24caee595595accdc0ac6abd022e"; }; } { @@ -1682,11 +1698,11 @@ }; } { - name = "https_proxy_agent___https_proxy_agent_4.0.0.tgz"; + name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; path = fetchurl { - name = "https_proxy_agent___https_proxy_agent_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz"; - sha1 = "702b71fb5520a132a66de1f67541d9e62154d82b"; + name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; + sha1 = "e2a90542abb68a762e0a0850f6c9edadfd8506b2"; }; } { @@ -2122,6 +2138,14 @@ }; } { + name = "locate_path___locate_path_5.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; + sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + }; + } + { name = "locate_path___locate_path_6.0.0.tgz"; path = fetchurl { name = "locate_path___locate_path_6.0.0.tgz"; @@ -2298,14 +2322,6 @@ }; } { - name = "mime___mime_2.5.2.tgz"; - path = fetchurl { - name = "mime___mime_2.5.2.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz"; - sha1 = "6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"; - }; - } - { name = "mimic_fn___mimic_fn_1.2.0.tgz"; path = fetchurl { name = "mimic_fn___mimic_fn_1.2.0.tgz"; @@ -2354,6 +2370,14 @@ }; } { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } + { name = "morgan___morgan_1.10.0.tgz"; path = fetchurl { name = "morgan___morgan_1.10.0.tgz"; @@ -2442,6 +2466,14 @@ }; } { + name = "node_fetch___node_fetch_2.6.1.tgz"; + path = fetchurl { + name = "node_fetch___node_fetch_2.6.1.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz"; + sha1 = "045bd323631f76ed2e2b55573394416b639a0052"; + }; + } + { name = "noop_logger___noop_logger_0.1.1.tgz"; path = fetchurl { name = "noop_logger___noop_logger_0.1.1.tgz"; @@ -2578,6 +2610,14 @@ }; } { + name = "p_limit___p_limit_2.3.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; + sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; + }; + } + { name = "p_limit___p_limit_3.1.0.tgz"; path = fetchurl { name = "p_limit___p_limit_3.1.0.tgz"; @@ -2586,6 +2626,14 @@ }; } { + name = "p_locate___p_locate_4.1.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; + sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + }; + } + { name = "p_locate___p_locate_5.0.0.tgz"; path = fetchurl { name = "p_locate___p_locate_5.0.0.tgz"; @@ -2610,6 +2658,14 @@ }; } { + name = "p_try___p_try_2.2.0.tgz"; + path = fetchurl { + name = "p_try___p_try_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; + sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; + }; + } + { name = "parent_module___parent_module_1.0.1.tgz"; path = fetchurl { name = "parent_module___parent_module_1.0.1.tgz"; @@ -2714,6 +2770,14 @@ }; } { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; + sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + }; + } + { name = "pkg_dir___pkg_dir_5.0.0.tgz"; path = fetchurl { name = "pkg_dir___pkg_dir_5.0.0.tgz"; @@ -2770,11 +2834,11 @@ }; } { - name = "prettier___prettier_1.19.1.tgz"; + name = "prettier___prettier_2.2.1.tgz"; path = fetchurl { - name = "prettier___prettier_1.19.1.tgz"; - url = "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz"; - sha1 = "f7d7f5ff8a9cd872a7be4ca142095956a60797cb"; + name = "prettier___prettier_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz"; + sha1 = "795a1a78dd52f073da0cd42b21f9c91381923ff5"; }; } { @@ -2786,6 +2850,14 @@ }; } { + name = "progress___progress_2.0.1.tgz"; + path = fetchurl { + name = "progress___progress_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/progress/-/progress-2.0.1.tgz"; + sha1 = "c9242169342b1c29d275889c95734621b1952e31"; + }; + } + { name = "progress___progress_2.0.3.tgz"; path = fetchurl { name = "progress___progress_2.0.3.tgz"; @@ -2858,11 +2930,11 @@ }; } { - name = "puppeteer___puppeteer_3.3.0.tgz"; + name = "puppeteer___puppeteer_10.0.0.tgz"; path = fetchurl { - name = "puppeteer___puppeteer_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-3.3.0.tgz"; - sha1 = "95839af9fdc0aa4de7e5ee073a4c0adeb9e2d3d7"; + name = "puppeteer___puppeteer_10.0.0.tgz"; + url = "https://registry.yarnpkg.com/puppeteer/-/puppeteer-10.0.0.tgz"; + sha1 = "1b597c956103e2d989ca17f41ba4693b20a3640c"; }; } { @@ -2922,11 +2994,11 @@ }; } { - name = "readdirp___readdirp_3.5.0.tgz"; + name = "readdirp___readdirp_3.6.0.tgz"; path = fetchurl { - name = "readdirp___readdirp_3.5.0.tgz"; - url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz"; - sha1 = "9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"; + name = "readdirp___readdirp_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz"; + sha1 = "74a370bd857116e245b29cc97340cd431a02a6c7"; }; } { @@ -3386,6 +3458,14 @@ }; } { + name = "tar_fs___tar_fs_2.0.0.tgz"; + path = fetchurl { + name = "tar_fs___tar_fs_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.0.tgz"; + sha1 = "677700fc0c8b337a78bee3623fdc235f21d7afad"; + }; + } + { name = "tar_fs___tar_fs_2.1.1.tgz"; path = fetchurl { name = "tar_fs___tar_fs_2.1.1.tgz"; @@ -3538,19 +3618,19 @@ }; } { - name = "typescript___typescript_3.9.9.tgz"; + name = "typescript___typescript_4.3.2.tgz"; path = fetchurl { - name = "typescript___typescript_3.9.9.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-3.9.9.tgz"; - sha1 = "e69905c54bc0681d0518bd4d587cc6f2d0b1a674"; + name = "typescript___typescript_4.3.2.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.3.2.tgz"; + sha1 = "399ab18aac45802d6f2498de5054fcbbe716a805"; }; } { - name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; + name = "unbzip2_stream___unbzip2_stream_1.3.3.tgz"; path = fetchurl { - name = "unbzip2_stream___unbzip2_stream_1.4.3.tgz"; - url = "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz"; - sha1 = "b0da04c4371311df771cdc215e87f2130991ace7"; + name = "unbzip2_stream___unbzip2_stream_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz"; + sha1 = "d156d205e670d8d8c393e1c02ebd506422873f6a"; }; } { diff --git a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index a297dd0eea95..bbcd7b6eadf9 100644 --- a/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "8.1.3"; + version = "8.1.5"; excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; @@ -10,12 +10,12 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-gJO21qTTiP6/8Oln0w89UYEYWb6pIlXvKfiALAUAjnM="; + sha256 = "sha256-Tr5U+bXBW7UIcmqrbmt/e82sZWLDMEObYsxl0INqXxw="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-1ZZMZEErt/OD55mEu/mF2XrsZcDVk700jRkTcYK14rE="; + sha256 = "sha256-yE7mhX3peYnTdiY0YwKJ7SMvz4iXmvJncz002vdFXFg="; }; vendorSha256 = "sha256-DFD6orsM5oDOLgHbCbrD+zNKVGbQT3Izm1VtNCZO40I="; diff --git a/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix b/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix index 21776c352af1..a4d82ef8406c 100644 --- a/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.72.1"; + version = "0.72.2"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pUbZY+TjSZNOrmRarYVUDI0HoIUMY0LacdFSdqQ/7D4="; + sha256 = "sha256-oiY3L4aBF+QhpZDTkwTmWPLoTgm+RUYCov5+gOxJqew="; }; nativeBuildInputs = [ makeWrapper ]; checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; - vendorSha256 = "sha256-trVfF4voye6CQ5WK78yBT86fgSUFyxaCtsZx6kXgYGE="; + vendorSha256 = "sha256-dfBJXA1Lc4+TL1nIk4bZ4m4QEO1r29GPyGtZrE+LrZc="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/servers/monitoring/prometheus/unbound-exporter.nix b/nixpkgs/pkgs/servers/monitoring/prometheus/unbound-exporter.nix index c7c8f3e5963a..952b9adc335b 100644 --- a/nixpkgs/pkgs/servers/monitoring/prometheus/unbound-exporter.nix +++ b/nixpkgs/pkgs/servers/monitoring/prometheus/unbound-exporter.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "unbound-telemetry"; - version = "unstable-2021-03-17"; + version = "unstable-2021-09-18"; src = fetchFromGitHub { owner = "svartalf"; repo = pname; - rev = "7f1b6d4e9e4b6a3216a78c23df745bcf8fc84021"; - sha256 = "xCelL6WGaTRhDJkkUdpdwj1zcKKAU2dyUv3mHeI4oAw="; + rev = "19e53b05828a43b7062b67a9cc6c84836ca26439"; + sha256 = "sha256-wkr9T6GlJP/PSv17z3MC7vC0cXg/Z6rGlhlCUHH3Ua4="; }; - cargoSha256 = "sha256-P3nAtYOuwNSLMP7q1L5zKTsZ6rJA/qL1mhVHzP3szi4="; + cargoSha256 = "sha256-6V39Wfqin2RK73rehsIwmqDkOin4FEiqJQjTKAEx9Vs="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix index d92219ea71d8..a830cfe3427b 100644 --- a/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.19.3"; + version = "1.20.0"; excludedPackages = "test"; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "sha256-14nwSLCurI9vNgZwad3qc2/yrvpc8Og8jojTCAfJ5F0="; + sha256 = "sha256-whsPXevnN/Kg09hcjEAeAduLZsYbo7IvUm5z4HodwrQ="; }; - vendorSha256 = "sha256-J48ezMi9+PxohDKFhBpbcu6fdojlZPXnQQw2IcyimTA="; + vendorSha256 = "sha256-VywVlCcdOV/TdXQBa88oU9V8U4EbuYMId4aT4YAY1Wk="; proxyVendor = true; ldflags = [ diff --git a/nixpkgs/pkgs/servers/monitoring/zabbix/agent2.nix b/nixpkgs/pkgs/servers/monitoring/zabbix/agent2.nix index 98fafa4265d6..97179fa26680 100644 --- a/nixpkgs/pkgs/servers/monitoring/zabbix/agent2.nix +++ b/nixpkgs/pkgs/servers/monitoring/zabbix/agent2.nix @@ -12,7 +12,7 @@ import ./versions.nix ({ version, sha256 }: modRoot = "src/go"; - vendorSha256 = "07caz0jfy0r1vb1h9mhb169wyn949z9xj0pmvyamr2d8y3k3hbyd"; + vendorSha256 = "1iyi7lnknr42gbv25illqnnjc7mshv73ih9anc6rxbf87n9s46ac"; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libiconv openssl pcre zlib ]; diff --git a/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix b/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix index 154bc235406e..749b68bdcc80 100644 --- a/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix +++ b/nixpkgs/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,11 +1,11 @@ generic: { v50 = generic { - version = "5.0.12"; - sha256 = "1gxlsmvz3m3dm4qqgx5qg5zjs680salah17mdzm3m27w8srg13i5"; + version = "5.0.15"; + sha256 = "1q9xwixzdj3w9qmarpp8xbkjphsz4m185br8g6i9f96676hrw5ww"; }; v40 = generic { - version = "4.0.31"; - sha256 = "1jfawwwqzd9bsywsn4qc7d1j2a4i8d92xg16k0f3y34pbmfm4603"; + version = "4.0.33"; + sha256 = "05pdqiql6xv1l7cn2piydsfjiaw6np0rbl1n5wg7bc7r4ikiyp4v"; }; } diff --git a/nixpkgs/pkgs/servers/nats-server/default.nix b/nixpkgs/pkgs/servers/nats-server/default.nix index 339c847898c3..2654ea43e7da 100644 --- a/nixpkgs/pkgs/servers/nats-server/default.nix +++ b/nixpkgs/pkgs/servers/nats-server/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "nats-server"; - version = "2.4.0"; + version = "2.6.0"; goPackagePath = "github.com/nats-io/${pname}"; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "sha256-v758qj1dy8zh3zfZxKkKALxZqNAxc1XdtTW4dxU4l5A="; + sha256 = "sha256-DggzXYPyu0dQ40L98VzxgN9S/35vLJJow9UjDtMz9rY="; }; meta = { diff --git a/nixpkgs/pkgs/servers/nitter/default.nix b/nixpkgs/pkgs/servers/nitter/default.nix index b5137c92b450..36bffaa3ec61 100644 --- a/nixpkgs/pkgs/servers/nitter/default.nix +++ b/nixpkgs/pkgs/servers/nitter/default.nix @@ -1,99 +1,9 @@ -{ lib -, stdenv -, nixosTests -, fetchFromGitHub -, nim -, libsass -}: +{ lib, nimPackages, nixosTests, fetchFromGitHub, libsass }: -let - jester = fetchFromGitHub { - owner = "dom96"; - repo = "jester"; - rev = "v0.5.0"; - sha256 = "0m8a4ss4460jd2lcbqcbdd68jhcy35xg7qdyr95mh8rflwvmcvhk"; - }; - karax = fetchFromGitHub { - owner = "karaxnim"; - repo = "karax"; - rev = "1.1.2"; - sha256 = "07ykrd21hd76vlmkqpvv5xvaxw6aaq87bky47p2420ni85a6d94j"; - }; - sass = fetchFromGitHub { - owner = "dom96"; - repo = "sass"; - rev = "e683aa1"; - sha256 = "0qvly5rilsqqsyvr67pqhglm55ndc4nd6v90jwswbnigxiqf79lc"; - }; - regex = fetchFromGitHub { - owner = "nitely"; - repo = "nim-regex"; - rev = "2e32fdc"; - sha256 = "1hrl40mwql7nh4wc7sdhmk8bj5728b93v5a93j49v660l0rn4qx8"; - }; - unicodedb = fetchFromGitHub { - owner = "nitely"; - repo = "nim-unicodedb"; - rev = "v0.9.0"; - sha256 = "06j8d0bjbpv1iibqlmrac4qb61ggv17hvh6nv4pbccqk1rlpxhsq"; - }; - unicodeplus= fetchFromGitHub { - owner = "nitely"; - repo = "nim-unicodeplus"; - rev = "v0.8.0"; - sha256 = "181wzwivfgplkqn5r4crhnaqgsza7x6fi23i86djb2dxvm7v6qxk"; - }; - segmentation = fetchFromGitHub { - owner = "nitely"; - repo = "nim-segmentation"; - rev = "v0.1.0"; - sha256 = "007bkx8dwy8n340zbp6wyqfsq9bh6q5ykav1ywdlwykyp1n909bh"; - }; - nimcrypto = fetchFromGitHub { - owner = "cheatfate"; - repo = "nimcrypto"; - rev = "a5742a9a214ac33f91615f3862c7b099aec43b00"; - sha256 = "0al0jsaicm8vyr63n909dq1glhvpra1n9sllmj0r7lsjsdb59wsz"; - }; - markdown = fetchFromGitHub { - owner = "soasme"; - repo = "nim-markdown"; - rev = "abdbe5e"; - sha256 = "0f3c1sxvhbbds43c9l8cz69pfpf984msj1lv4pb7bzpxb5zil2wy"; - }; - packedjson = fetchFromGitHub { - owner = "Araq"; - repo = "packedjson"; - rev = "7198cc8"; - sha256 = "1ay2zd88q8hvpvigsg8h0y5vc65hk3lk0d48fy9hwg4lcng19mp1"; - }; - supersnappy = fetchFromGitHub { - owner = "guzba"; - repo = "supersnappy"; - rev = "1.1.5"; - sha256 = "1y26sgnszvdf5sn7j0jx2dpd4i03mvbk9i9ni9kbyrs798bjwi6z"; - }; - redpool = fetchFromGitHub { - owner = "zedeus"; - repo = "redpool"; - rev = "57aeb25"; - sha256 = "0fph7qlia6fvya1zqzbgvww2hk5pd0vq1wlf9ij9jyn655mg0w3q"; - }; - frosty = fetchFromGitHub { - owner = "disruptek"; - repo = "frosty"; - rev = "0.3.1"; - sha256 = "0hd6484ihjgl57gmqyp5xfq5prycb49k0313fqky600mhz71nmyz"; - }; - redis = fetchFromGitHub { - owner = "zedeus"; - repo = "redis"; - rev = "94bcbf1"; - sha256 = "1p9zv4f4lqrjqa8fk98cb89b9fzlf866jc584ll9sws14904i80j"; - }; -in stdenv.mkDerivation rec { +nimPackages.buildNimPackage rec { pname = "nitter"; version = "unstable-2021-07-18"; + nimBinOnly = true; src = fetchFromGitHub { owner = "zedeus"; @@ -102,28 +12,33 @@ in stdenv.mkDerivation rec { sha256 = "1dl8ndyv8m1hnydrp5xilcpp2cfbp02d5jap3y42i4nazc9ar6p4"; }; - nativeBuildInputs = [ nim ]; - buildInputs = [ libsass ]; - - buildPhase = '' - runHook preBuild - export HOME=$TMPDIR - nim -d:release -p:${jester} -p:${karax} -p:${sass}/src -p:${regex}/src -p:${unicodedb}/src -p:${unicodeplus}/src -p:${segmentation}/src -p:${nimcrypto} -p:${markdown}/src -p:${packedjson} -p:${supersnappy}/src -p:${redpool}/src -p:${frosty} -p:${redis}/src c src/$pname - nim -p:${sass}/src c --hint[Processing]:off -r tools/gencss - runHook postBuild + buildInputs = with nimPackages; [ + jester + karax + sass + regex + unicodedb + unicodeplus + segmentation + nimcrypto + markdown + packedjson + supersnappy + redpool + frosty + redis + ]; + + postBuild = '' + nim c --hint[Processing]:off -r tools/gencss ''; - installPhase = '' - runHook preInstall - install -Dt $out/bin src/$pname + postInstall = '' mkdir -p $out/share/nitter cp -r public $out/share/nitter/public - runHook postInstall ''; - passthru.tests = { - inherit (nixosTests) nitter; - }; + passthru.tests = { inherit (nixosTests) nitter; }; meta = with lib; { description = "Alternative Twitter front-end"; diff --git a/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix b/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix index 71c8c4a45dc6..2ceb4afc0cd0 100644 --- a/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix +++ b/nixpkgs/pkgs/servers/nosql/apache-jena/binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena"; - version = "3.7.0"; + version = "4.2.0"; name="${baseName}-${version}"; url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz"; - sha256 = "12w125hlhcib23cckk77cx7p9rzs57dbmmn90f7v8107d437j4mq"; + sha256 = "1yiqlsp1g2fladal8mj164b9s0qsl5csllg54p7x7w63wf7gixnq"; }; buildInputs = [ makeWrapper diff --git a/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index 7084130eaef8..9be009f3b1f1 100644 --- a/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/nixpkgs/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="apache-jena-fuseki"; - version = "3.13.1"; + version = "4.2.0"; name="${baseName}-${version}"; url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz"; - sha256 = "018b07icvjhd44c046rxfjiczcs63cic77cymgg4w8pd3na06c7y"; + sha256 = "1x3va4yqmxh55lhr6ms85ks9v0lqkl3y41h0bpjdycp8j96lsy3h"; }; buildInputs = [ makeWrapper @@ -20,7 +20,8 @@ stdenv.mkDerivation { }; installPhase = '' cp -r . "$out" - ln -s "$out"/{fuseki-server,fuseki} "$out/bin" + chmod +x $out/fuseki + ln -s "$out"/{fuseki-backup,fuseki-server,fuseki} "$out/bin" for i in "$out"/bin/*; do wrapProgram "$i" \ --prefix "PATH" : "${java}/bin/" \ diff --git a/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix b/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix index bba51c6a8031..f786171d709f 100644 --- a/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix +++ b/nixpkgs/pkgs/servers/nosql/influxdb2/default.nix @@ -1,10 +1,10 @@ { buildGoModule , buildGoPackage , fetchFromGitHub +, fetchurl , go-bindata , lib , llvmPackages -, mkYarnPackage , pkg-config , rustPlatform , stdenv @@ -15,36 +15,21 @@ # dependencies nix expression. let - version = "2.0.6"; - shorthash = "4db98b4c9a"; # git rev-parse HEAD with 2.0.6 checked out - libflux_version = "0.115.0"; + version = "2.0.8"; + shorthash = "e91d41810f"; # git rev-parse HEAD with 2.0.8 checked out + libflux_version = "0.124.0"; src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb"; rev = "v${version}"; - sha256 = "1x74p87csx4m4cgijk57xs75nikv3bnh7skgnzk30ab1ar13iirw"; + sha256 = "0hbinnja13xr9ziyynjsnsbrxmyrvag7xdgfwq2ya28g07lw5wgq"; }; - ui = mkYarnPackage { - src = src; - packageJSON = ./influx-ui-package.json; - yarnLock = "${src}/ui/yarn.lock"; - yarnNix = ./influx-ui-yarndeps.nix; - configurePhase = '' - cp -r $node_modules ui/node_modules - rsync -r $node_modules/../deps/influxdb-ui/node_modules/ ui/node_modules - ''; - INFLUXDB_SHA = shorthash; - buildPhase = '' - pushd ui - yarn build:ci - popd - ''; - installPhase = '' - mv ui/build $out - ''; - distPhase = "true"; + ui = fetchurl { + url = "https://github.com/influxdata/ui/releases/download/OSS-v${version}/build.tar.gz"; + # https://github.com/influxdata/ui/releases/download/OSS-v${version}/sha256.txt + sha256 = "94965ae999a1098c26128141fbb849be3da9a723d509118eb6e0db4384ee01fc"; }; flux = rustPlatform.buildRustPackage { @@ -54,10 +39,10 @@ let owner = "influxdata"; repo = "flux"; rev = "v${libflux_version}"; - sha256 = "0zplwsk9xidv8l9sqbxqivy6q20ryd31fhrzspn1mjn4i45kkwz1"; + sha256 = "1g1qilfzxqbbjbfvgkf7k7spcnhzvlmrqacpqdl05418ywkp3v29"; }; sourceRoot = "source/libflux"; - cargoSha256 = "06gh466q7qkid0vs5scic0qqlz3h81yb00nwn8nwq8ppr5z2ijyq"; + cargoSha256 = "0farcjwnwwgfvcgbs5r6vsdrsiwq2mp82sjxkqb1pzqfls4ixcxj"; nativeBuildInputs = [ llvmPackages.libclang ]; buildInputs = lib.optional stdenv.isDarwin libiconv; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; @@ -85,7 +70,7 @@ in buildGoModule { nativeBuildInputs = [ go-bindata pkg-config ]; - vendorSha256 = "03pabm0h9q0v5dfdq9by2l2n32bz9imwalz0aw897vsrfhci0ldf"; + vendorSha256 = "1kar88vlm6px7smlnajpyf8qx6d481xk979qafpfb1xy8931781m"; subPackages = [ "cmd/influxd" "cmd/influx" ]; PKG_CONFIG_PATH = "${flux}/pkgconfig"; @@ -95,7 +80,8 @@ in buildGoModule { # the relevant go:generate directives, and run them by hand without # breaking hermeticity. preBuild = '' - ln -s ${ui} ui/build + tar -xzf ${ui} -C static/data + grep -RI -e 'go:generate.*go-bindata' | cut -f1 -d: | while read -r filename; do sed -i -e 's/go:generate.*go-bindata/go:generate go-bindata/' $filename pushd $(dirname $filename) diff --git a/nixpkgs/pkgs/servers/nosql/redis/default.nix b/nixpkgs/pkgs/servers/nosql/redis/default.nix index 77eae32e27f4..90de16b3ea16 100644 --- a/nixpkgs/pkgs/servers/nosql/redis/default.nix +++ b/nixpkgs/pkgs/servers/nosql/redis/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, lua, pkg-config, nixosTests , withSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isMusl, systemd -, tlsSupport ? true, openssl +# dependency ordering is broken at the moment when building with openssl +, tlsSupport ? !stdenv.hostPlatform.isStatic, openssl }: stdenv.mkDerivation rec { diff --git a/nixpkgs/pkgs/servers/osrm-backend/default.nix b/nixpkgs/pkgs/servers/osrm-backend/default.nix index 187a4c4adb11..ed163f2547df 100644 --- a/nixpkgs/pkgs/servers/osrm-backend/default.nix +++ b/nixpkgs/pkgs/servers/osrm-backend/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "osrm-backend"; - version = "5.25.0"; + version = "5.26.0"; src = fetchFromGitHub { owner = "Project-OSRM"; repo = "osrm-backend"; rev = "v${version}"; - sha256 = "sha256-wmhm3q93HTv4+VMlF9rhms4uw4LJBozOKTtHpDgAbrU="; + sha256 = "sha256-kqRYE26aeq7nCen56TJo3BlyLFWn4NMltsq+re64/VQ="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/servers/owncast/default.nix b/nixpkgs/pkgs/servers/owncast/default.nix new file mode 100644 index 000000000000..7359b8c2bae4 --- /dev/null +++ b/nixpkgs/pkgs/servers/owncast/default.nix @@ -0,0 +1,59 @@ +{ lib, buildGoModule, fetchFromGitHub, nixosTests, bash, which, ffmpeg, makeWrapper, coreutils, ... }: + +buildGoModule rec { + + pname = "owncast"; + version = "0.0.8"; + + src = fetchFromGitHub { + owner = "owncast"; + repo = "owncast"; + rev = "v${version}"; + sha256 = "0md4iafa767yxkwh6z8zpcjv9zd79ql2wapx9vzyd973ksvrdaw2"; + }; + + vendorSha256 = "sha256-bH2CWIgpOS974/P98n0R9ebGTJ0YoqPlH8UmxSYNHeM="; + + propagatedBuildInputs = [ ffmpeg ]; + + buildInputs = [ makeWrapper ]; + + preInstall = '' + mkdir -p $out + cp -r $src/{static,webroot} $out + ''; + + postInstall = let + + setupScript = '' + [ ! -d "$PWD/webroot" ] && ( + ${coreutils}/bin/cp --no-preserve=mode -r "${placeholder "out"}/webroot" "$PWD" + ) + + [ ! -d "$PWD/static" ] && ( + ${coreutils}/bin/ln -s "${placeholder "out"}/static" "$PWD" + ) + ''; + in '' + wrapProgram $out/bin/owncast \ + --run '${setupScript}' \ + --prefix PATH : ${lib.makeBinPath [ bash which ffmpeg ]} + ''; + + installCheckPhase = '' + runHook preCheck + $out/bin/owncast --help + runHook postCheck + ''; + + passthru.tests.owncast = nixosTests.testOwncast; + + meta = with lib; { + description = "self-hosted video live streaming solution"; + homepage = "https://owncast.online"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ MayNiklas ]; + }; + +} diff --git a/nixpkgs/pkgs/servers/pleroma/default.nix b/nixpkgs/pkgs/servers/pleroma/default.nix index 356d320d4d1f..21d65b40aace 100644 --- a/nixpkgs/pkgs/servers/pleroma/default.nix +++ b/nixpkgs/pkgs/servers/pleroma/default.nix @@ -7,14 +7,14 @@ beamPackages.mixRelease rec { pname = "pleroma"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitLab { domain = "git.pleroma.social"; owner = "pleroma"; repo = "pleroma"; rev = "v${version}"; - sha256 = "sha256-1zp/qVk2K3q8AtkfXab0MBAHaQnY5enVtfdu64FFPhg="; + sha256 = "sha256-XYZIf8/Vznl4FvVAOy5GVfTBTCwhfUol/3vWWIDwIxQ="; }; mixNixDeps = import ./mix.nix { diff --git a/nixpkgs/pkgs/servers/plex/raw.nix b/nixpkgs/pkgs/servers/plex/raw.nix index 62247d83ddee..802e53820796 100644 --- a/nixpkgs/pkgs/servers/plex/raw.nix +++ b/nixpkgs/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.24.1.4931-1a38e63c6"; + version = "1.24.3.5033-757abe6b4"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "1vsg90rlhynfk8wlbf080fv9wah7w8244pl878hjbi6yrjmz2s7g"; + sha256 = "063llf34h6dbzrysm98xwwmv8fwyk8vsc3sj7dniy9j29wwygwdz"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "08xai0jcpmj1hwkkkgc87v9xwszd5bvwhn36kp6v73jnv1l5cmqb"; + sha256 = "0cnv1i00xv7ls5yb9xlim4haal7bvn41p3zskbab85vwhffr9irx"; }; outputs = [ "out" "basedb" ]; diff --git a/nixpkgs/pkgs/servers/roon-server/default.nix b/nixpkgs/pkgs/servers/roon-server/default.nix index 61af3f2425e7..b657f1b957fa 100644 --- a/nixpkgs/pkgs/servers/roon-server/default.nix +++ b/nixpkgs/pkgs/servers/roon-server/default.nix @@ -11,15 +11,15 @@ , zlib }: stdenv.mkDerivation rec { pname = "roon-server"; - version = "1.8-814"; + version = "1.8-831"; # N.B. The URL is unstable. I've asked for them to provide a stable URL but # they have ignored me. If this package fails to build for you, you may need # to update the version and sha256. # c.f. https://community.roonlabs.com/t/latest-roon-server-is-not-available-for-download-on-nixos/118129 src = fetchurl { - url = "https://web.archive.org/web/20210729154130/http://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2"; - sha256 = "sha256-GbWcgNq+dmzoHNFZyB/QFCvJ7Hh48v8IuGS4WMNlKgI="; + url = "https://web.archive.org/web/20210921161727/http://download.roonlabs.com/builds/RoonServer_linuxx64.tar.bz2"; + sha256 = "sha256-SeMSC7K6DV7rVr1w/SqMnLvipoWbypS/gJnSZmpfXZk="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/servers/routinator/Cargo.toml.patch b/nixpkgs/pkgs/servers/routinator/Cargo.toml.patch new file mode 100644 index 000000000000..8bda0299bc88 --- /dev/null +++ b/nixpkgs/pkgs/servers/routinator/Cargo.toml.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 7f07b3b..7d7af0a 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -48,7 +48,7 @@ syslog = "5.0.0" + rustc_version = "0.4.0" + + [features] +-default = [ "socks", "ui"] ++default = [ "socks" ] + extra-debug = ["rpki/extra-debug"] + socks = [ "reqwest/socks" ] + rta = [] diff --git a/nixpkgs/pkgs/servers/routinator/default.nix b/nixpkgs/pkgs/servers/routinator/default.nix index 1ee312325923..4f85650b87f9 100644 --- a/nixpkgs/pkgs/servers/routinator/default.nix +++ b/nixpkgs/pkgs/servers/routinator/default.nix @@ -1,18 +1,27 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, Security }: +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, Security +}: rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - sha256 = "171zmqqkgdpbspn70sgsypnyw7m6q2x8izwxrzbyi5xslsgd24i4"; + sha256 = "sha256-ThgTGtTZ0LGm9nHJoy0KhnBFWNvKRjk7hoNTVVTeL/Y="; }; + cargoPatches = [ + ./Cargo.toml.patch + ]; + cargoSha256 = "sha256-mcx+qUtTUxeYP0PeJp1eOQwsdS6PPUx/m7TfAyqFiIM="; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0r1m1zv3mkmmaalln3ny6m33dyjqzdyfbmkcav05kz12xjdd94fs"; meta = with lib; { description = "An RPKI Validator written in Rust"; diff --git a/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix b/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix index c6897167cefa..e6605fb6ce26 100644 --- a/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix +++ b/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.17.2"; + version = "0.17.3"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - sha256 = "sha256-z3dT5WtchG3FeWZsqKOPUk9D5G6srr5+DgY0A0nWSzk="; + sha256 = "sha256-9V6yblRnOAZBYuGChjeDyOTWjCCVhdFxljSndEr7GdY="; }; - vendorSha256 = "sha256-buQW5jMnHyHc/oYdmfTnoktFRG3V3SNxn7t5mAwmiJI="; + vendorSha256 = "sha256-lFyRMoI+frzAa7sL8wIzUgzJRrCQjt9Ri8T9pHIpoug="; # Tests need docker doCheck = false; diff --git a/nixpkgs/pkgs/servers/sabnzbd/default.nix b/nixpkgs/pkgs/servers/sabnzbd/default.nix index 3e2592bb093b..0669d1004be0 100644 --- a/nixpkgs/pkgs/servers/sabnzbd/default.nix +++ b/nixpkgs/pkgs/servers/sabnzbd/default.nix @@ -20,14 +20,14 @@ let ]); path = lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { - version = "3.3.1"; + version = "3.4.0"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-OcasqRu6nh9hKepMbXVgZ49MeJTlWK+qPSkiBPgmYYo="; + sha256 = "sha256-zax+PuvCmYOlEhRmiCp7UOd9VI0i8dbgTPyTtqLuGUM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/servers/samba/4.x.nix b/nixpkgs/pkgs/servers/samba/4.x.nix index d75b204db293..8248becd3e42 100644 --- a/nixpkgs/pkgs/servers/samba/4.x.nix +++ b/nixpkgs/pkgs/servers/samba/4.x.nix @@ -45,11 +45,11 @@ with lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.14.4"; + version = "4.15.0"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "1fc9ix91hb1f35j69sk7rsi9pky2p0vsmw47s973bx801cm0kbw9"; + sha256 = "0h26s9lfdl8mccs9rfv1gr5f8snd95gjkrik6wl5ccb27044gwxi"; }; outputs = [ "out" "dev" "man" ]; diff --git a/nixpkgs/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch b/nixpkgs/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch index b8636958ee27..ff264fe1c0af 100644 --- a/nixpkgs/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch +++ b/nixpkgs/pkgs/servers/samba/build-find-pre-built-heimdal-build-tools-in-case-of-.patch @@ -1,6 +1,6 @@ -From e002d2ef2688d5433d2bd03aa4d77a0ec5ac4e63 Mon Sep 17 00:00:00 2001 -From: Uri Simchoni <uri@samba.org> -Date: Sun, 20 Oct 2019 00:03:14 +0300 +From f3f98c6ecc6febd8e79696672668e33d11fc19cb Mon Sep 17 00:00:00 2001 +From: Pascal Bach <pascal.bach@nextrem.ch> +Date: Wed, 22 Sep 2021 09:42:42 +0200 Subject: [PATCH] build: find pre-built heimdal build tools in case of embedded heimdal @@ -33,17 +33,22 @@ BUG: https://bugzilla.samba.org/show_bug.cgi?id=14164 Signed-off-by: Uri Simchoni <uri@samba.org> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> -[Bernd: rebased for version 4.11.13] +[Bachp: rebased for version 4.15.0] + +# Conflicts: +# wscript_configure_system_heimdal --- wscript_configure_embedded_heimdal | 11 +++++++++++ wscript_configure_system_heimdal | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_heimdal -index 8c55ae2a938..4fdae8062c5 100644 +index 1c7801f705e..edcab15a88e 100644 --- a/wscript_configure_embedded_heimdal +++ b/wscript_configure_embedded_heimdal -@@ -1 +1,12 @@ +@@ -6,3 +6,14 @@ if not conf.env['BISON']: + + conf.define('USING_EMBEDDED_HEIMDAL', 1) conf.RECURSE('source4/heimdal_build') + +def check_system_heimdal_binary(name): @@ -57,13 +62,13 @@ index 8c55ae2a938..4fdae8062c5 100644 +check_system_heimdal_binary("compile_et") +check_system_heimdal_binary("asn1_compile") diff --git a/wscript_configure_system_heimdal b/wscript_configure_system_heimdal -index 0ff6dad2f55..f77c177442f 100644 +index 67d8804d0ff..20aee31aac7 100644 --- a/wscript_configure_system_heimdal +++ b/wscript_configure_system_heimdal @@ -37,14 +37,6 @@ def check_system_heimdal_lib(name, functions='', headers='', onlyif=None): conf.define('USING_SYSTEM_%s' % name.upper(), 1) return True - + -def check_system_heimdal_binary(name): - if conf.LIB_MAY_BE_BUNDLED(name): - return False @@ -73,15 +78,18 @@ index 0ff6dad2f55..f77c177442f 100644 - return True - check_system_heimdal_lib("com_err", "com_right_r com_err", "com_err.h") - + if check_system_heimdal_lib("roken", "rk_socket_set_reuseaddr", "roken.h"): -@@ -96,7 +96,4 @@ +@@ -96,9 +88,6 @@ finally: #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'): # conf.define('USING_SYSTEM_TOMMATH', 1) - + -check_system_heimdal_binary("compile_et") -check_system_heimdal_binary("asn1_compile") - + conf.env.KRB5_VENDOR = 'heimdal' conf.define('USING_SYSTEM_KRB5', 1) --- -2.20.1 + conf.define('USING_SYSTEM_HEIMDAL', 1) +-- +2.33.0 + diff --git a/nixpkgs/pkgs/servers/search/meilisearch/default.nix b/nixpkgs/pkgs/servers/search/meilisearch/default.nix index 5a6b6342fa3b..7ec2937e1046 100644 --- a/nixpkgs/pkgs/servers/search/meilisearch/default.nix +++ b/nixpkgs/pkgs/servers/search/meilisearch/default.nix @@ -1,4 +1,5 @@ -{ lib +{ pkgs +, lib , stdenv , buildRustCrate , defaultCrateOverrides @@ -27,7 +28,7 @@ let }; }; cargo_nix = import ./Cargo.nix { - nixpkgs = ../../../..; + inherit pkgs; buildRustCrateForPkgs = customBuildRustCrateForPkgs; }; meilisearch-http = cargo_nix.workspaceMembers."meilisearch-http".build.override { @@ -45,4 +46,11 @@ stdenv.mkDerivation { ''; dontCheck = true; dontFixup = true; + meta = with lib; { + description = "Powerful, fast, and an easy to use search engine "; + homepage = https://docs.meilisearch.com/; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; } diff --git a/nixpkgs/pkgs/servers/sks/default.nix b/nixpkgs/pkgs/servers/sks/default.nix index 8e0ce6bedac5..0f21690bbee3 100644 --- a/nixpkgs/pkgs/servers/sks/default.nix +++ b/nixpkgs/pkgs/servers/sks/default.nix @@ -1,22 +1,36 @@ -{ lib, stdenv, fetchFromBitbucket, ocaml, zlib, db, perl, camlp4 }: +{ lib, stdenv, fetchFromGitHub, ocamlPackages, perl +, zlib, db +}: + +let + inherit (ocamlPackages) + ocaml + findlib + cryptokit + num + ; +in stdenv.mkDerivation rec { pname = "sks"; - version = "1.1.6"; + version = "unstable-2021-02-04"; - src = fetchFromBitbucket { - owner = "skskeyserver"; + src = fetchFromGitHub { + owner = "SKS-Keyserver"; repo = "sks-keyserver"; - rev = version; - sha256 = "00q5ma5rvl10rkc6cdw8d69bddgrmvy0ckqj3hbisy65l4idj2zm"; + rev = "c3ba6d5abb525dcb84745245631c410c11c07ec1"; + sha256 = "0fql07sc69hv6jy7x5svb19977cdsz0p1j8wv53k045a6v7rw1jw"; }; # pkgs.db provides db_stat, not db$major.$minor_stat - patches = [ ./adapt-to-nixos.patch ]; + patches = [ + ./adapt-to-nixos.patch + ]; outputs = [ "out" "webSamples" ]; - buildInputs = [ ocaml zlib db perl camlp4 ]; + nativeBuildInputs = [ ocaml findlib perl ]; + buildInputs = [ zlib db cryptokit num ]; makeFlags = [ "PREFIX=$(out)" "MANDIR=$(out)/share/man" ]; preConfigure = '' @@ -44,9 +58,9 @@ stdenv.mkDerivation rec { spotty connectivity, can fully synchronize with rest of the system. ''; inherit (src.meta) homepage; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ primeos fpletz globin ]; + maintainers = with maintainers; [ fpletz globin ]; }; } diff --git a/nixpkgs/pkgs/servers/slimserver/default.nix b/nixpkgs/pkgs/servers/slimserver/default.nix index 3e28f5010499..7296635c7ddc 100644 --- a/nixpkgs/pkgs/servers/slimserver/default.nix +++ b/nixpkgs/pkgs/servers/slimserver/default.nix @@ -1,13 +1,24 @@ -{ lib, fetchurl, makeWrapper -, perlPackages, flac, faad2, sox, lame, monkeysAudio, wavpack }: +{ lib +, fetchFromGitHub +, makeWrapper +, perlPackages +, flac +, faad2 +, sox +, lame +, monkeysAudio +, wavpack +}: perlPackages.buildPerlPackage rec { pname = "slimserver"; version = "7.9.2"; - src = fetchurl { - url = "https://github.com/Logitech/slimserver/archive/${version}.tar.gz"; - sha256 = "1rn9y7xvg5aqmgcbfpi7lcqy8d7hgwqx8b2llzpzrv7854zm1wcw"; + src = fetchFromGitHub { + owner = "Logitech"; + repo = "slimserver"; + rev = version; + hash = "sha256-P4CSu/ff6i48uWV5gXsJgayZ1S1s0RAqa5O5y3Y0g9Y="; }; buildInputs = [ @@ -73,7 +84,7 @@ perlPackages.buildPerlPackage rec { # relax audio scan version constraints substituteInPlace lib/Audio/Scan.pm --replace "0.93" "1.01" substituteInPlace modules.conf --replace "Audio::Scan 0.93 0.95" "Audio::Scan 0.93" - ''; + ''; preConfigurePhase = ""; diff --git a/nixpkgs/pkgs/servers/smcroute/default.nix b/nixpkgs/pkgs/servers/smcroute/default.nix index 9bf67988e1b6..b80d57dc8525 100644 --- a/nixpkgs/pkgs/servers/smcroute/default.nix +++ b/nixpkgs/pkgs/servers/smcroute/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "smcroute"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "troglobit"; repo = "smcroute"; rev = version; - sha256 = "sha256-r6f/tC2832yIMoXVIUKTolonzhnVWQY46HfP3pu5ndY="; + sha256 = "sha256-yycTH6p0Ep8bDRlq/086j+sznxCpqwDrHaN99AKShz8="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/servers/sql/dolt/default.nix b/nixpkgs/pkgs/servers/sql/dolt/default.nix index 2d9bf7283253..fb24a33c8625 100644 --- a/nixpkgs/pkgs/servers/sql/dolt/default.nix +++ b/nixpkgs/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.27.4"; + version = "0.28.4"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-q3zs402E3mqvxAuf/ll/ao9/c9NOWR7uYJMbieFXS1U="; + sha256 = "sha256-J/4YEiSmoWhs+pnJN21CwNwpujZ1cldLmgwajBB+IRU="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "sha256-zF7pofbYrVzEiW6zttyePuEWueqKRKclc0WrYwb1bCU="; + vendorSha256 = "sha256-l3jRQ4Z7xku1nMfYfc6nJ3qF6A1maY0tRfZpHCtsujI="; doCheck = false; diff --git a/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_2.nix b/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_2.nix new file mode 100644 index 000000000000..8b1c8b04bdce --- /dev/null +++ b/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_2.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./. (args // { + version = "3.2.3"; + sha256 = "1x1i4ck4c3sgkw083v02zk3rbkm5h0x1vl4m58j95q1qcijkiamn"; +}) diff --git a/nixpkgs/pkgs/servers/sql/mariadb/default.nix b/nixpkgs/pkgs/servers/sql/mariadb/default.nix index fa9b5c414ed9..a49c0549a668 100644 --- a/nixpkgs/pkgs/servers/sql/mariadb/default.nix +++ b/nixpkgs/pkgs/servers/sql/mariadb/default.nix @@ -22,14 +22,14 @@ mariadb = server // { }; common = rec { # attributes common to both builds - version = "10.5.11"; + version = "10.6.3"; src = fetchurl { urls = [ "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" ]; - sha256 = "0yn4bhqciy6jyig31rmkjc588l03k4bj3194yf9y6373bxh5643n"; + sha256 = "1nqq1g6h2gvsraqziv2qq42v7y6fzbfw357mh3d1zv7md9h2bhav"; name = "mariadb-${version}.tar.gz"; }; @@ -95,7 +95,7 @@ common = rec { # attributes common to both builds rm "$out"/bin/{mariadb_config,mysql_config} rm -r $out/include rm -r $out/lib/pkgconfig - rm -r $out/share/aclocal + rm -rf "$out"/share/aclocal ''; passthru.mysqlVersion = "5.7"; @@ -135,7 +135,7 @@ client = stdenv.mkDerivation (common // { ]; postInstall = common.postInstall + '' - rm -r "$out"/share/doc + rm -rf "$out"/share/doc rm "$out"/bin/{mysqltest,mytop} libmysqlclient_path=$(readlink -f $out/lib/libmysqlclient${libExt}) rm "$out"/lib/{libmariadb${libExt},libmysqlclient${libExt},libmysqlclient_r${libExt}} diff --git a/nixpkgs/pkgs/servers/sql/mariadb/galera/default.nix b/nixpkgs/pkgs/servers/sql/mariadb/galera/default.nix index 2b387db66cdc..1f4bbc0586ff 100644 --- a/nixpkgs/pkgs/servers/sql/mariadb/galera/default.nix +++ b/nixpkgs/pkgs/servers/sql/mariadb/galera/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "mariadb-galera"; - version = "26.4.8"; + version = "26.4.9"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; rev = "release_${version}"; - sha256 = "0rx710dfijiykpi41rhxx8vafk07bffv2nbl3d4ggc32rzv88369"; + sha256 = "1nf8vv0b9v7rjsxl93avgvv0lz5jjg91brnric0dhlnp2dzzxi6g"; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/servers/sql/materialize/default.nix b/nixpkgs/pkgs/servers/sql/materialize/default.nix index 184c3cc1ebc8..0aba7f758c66 100644 --- a/nixpkgs/pkgs/servers/sql/materialize/default.nix +++ b/nixpkgs/pkgs/servers/sql/materialize/default.nix @@ -40,22 +40,25 @@ let in rustPlatform.buildRustPackage rec { pname = "materialize"; - version = "0.8.3"; - rev = "3e47d280945f0ddbdc263fc643f067649f66eda1"; + version = "0.9.4"; + rev = "29d003cae5e9d46f8b11b2102ff0b9abf6608c2f"; src = fetchFromGitHub { owner = "MaterializeInc"; repo = pname; rev = "v${version}"; - sha256 = "15635hcw04nms133k9l5582xbk7frc86nka91yaafl63q6pwbdvg"; + sha256 = "021n05csyvza9ifq09qaxypgmlbp3a7xn6r1m4jn8d4rnz38wag6"; }; - cargoSha256 = "1fxqjhjs4bqq6nzax7xrhwjpv57dk90iw9fl8ilp41wzg7yvyhcm"; + cargoSha256 = "12fysxzmqnx7y7yg6fjcv1952s77d46pwi32vnsv62icgqfpw0j4"; nativeBuildInputs = [ cmake perl pkg-config ] # Provides the mig command used by the krb5-src build script ++ lib.optional stdenv.isDarwin bootstrap_cmds; + # Needed to get openssl-sys to use pkg-config. + OPENSSL_NO_VENDOR = 1; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv DiskArbitration Foundation ]; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/default.nix b/nixpkgs/pkgs/servers/sql/postgresql/default.nix index 1f9a1ffc018b..d991b858a300 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/default.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/default.nix @@ -198,18 +198,18 @@ let in self: { postgresql_9_6 = self.callPackage generic { - version = "9.6.22"; + version = "9.6.23"; psqlSchema = "9.6"; - sha256 = "0c19kzrj5ib5ygmavf5d6qvxdwrxzzz6jz1r2dl5b815208cscix"; + sha256 = "1fa735lrmv2vrfiixg73nh024gxlagcbrssklvgwdf0s82cgfjd8"; this = self.postgresql_9_6; thisAttr = "postgresql_9_6"; inherit self; }; postgresql_10 = self.callPackage generic { - version = "10.17"; + version = "10.18"; psqlSchema = "10.0"; # should be 10, but changing it is invasive - sha256 = "0v5jahkqm6gkq67s4bac3h7297bscn2ab6y128idi73cc1qq1wjs"; + sha256 = "009qpb02bq0rx0aaw5ck70gk07xwparhfxvlfimgihw2vhp7qisp"; this = self.postgresql_10; thisAttr = "postgresql_10"; inherit self; @@ -217,36 +217,36 @@ in self: { }; postgresql_11 = self.callPackage generic { - version = "11.12"; + version = "11.13"; psqlSchema = "11.1"; # should be 11, but changing it is invasive - sha256 = "016bacpmqxc676ipzc1l8zv1jj44mjz7dv7jhqazg3ibdfqxiyc7"; + sha256 = "0j5wnscnxa3sx8d39s55654df8aikmvkihfb0a02hrgmyygnihx0"; this = self.postgresql_11; thisAttr = "postgresql_11"; inherit self; }; postgresql_12 = self.callPackage generic { - version = "12.7"; + version = "12.8"; psqlSchema = "12"; - sha256 = "15frsmsl1n2i4p76ji0wng4lvnlzw6f01br4cs5xr3n88wgp9444"; + sha256 = "0an6v5bsp26d276wbdx76lsq6cq86hgi2fmkzwawnk63j3h02r72"; this = self.postgresql_12; thisAttr = "postgresql_12"; inherit self; }; postgresql_13 = self.callPackage generic { - version = "13.3"; + version = "13.4"; psqlSchema = "13"; - sha256 = "18dliq7h2l8irffhyyhdmfwx3si515q6gds3cxdjb9n7m17lbn9w"; + sha256 = "1kf0gcsrl5n25rjlvkh87aywmn28kbwvakm5c7j1qpr4j01y34za"; this = self.postgresql_13; thisAttr = "postgresql_13"; inherit self; }; postgresql_14 = self.callPackage generic { - version = "14beta1"; + version = "14beta3"; psqlSchema = "14"; - sha256 = "0lih2iykychhvis3mxqyp087m1hld3lyi48n3qwd2js44prxv464"; + sha256 = "1yjbc8q4hk9pvlfr3lwhk2zp4bavxqpil83ncl871nwk06c6b8if"; this = self.postgresql_14; thisAttr = "postgresql_14"; inherit self; diff --git a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix index d3ff2a56e3a8..010f8f819da9 100644 --- a/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix +++ b/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_ed25519.nix @@ -1,12 +1,13 @@ -{ lib, stdenv, fetchurl, postgresql }: +{ lib, stdenv, fetchFromGitLab, postgresql }: stdenv.mkDerivation rec { pname = "pg_ed25519"; version = "0.2"; - - src = fetchurl { - url = "https://gitlab.com/dwagin/${pname}/-/archive/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0q46pvk1vq5w3al6i3inzlw6w7za3n7p1gd4wfbbxzvzh7qnynda"; + src = fetchFromGitLab { + owner = "dwagin"; + repo = "pg_ed25519"; + rev = version; + sha256 = "16w3qx3wj81bzfhydl2pjhn8b1jak6h7ja9wq1kc626g0siggqi0"; }; buildInputs = [ postgresql ]; diff --git a/nixpkgs/pkgs/servers/sslh/default.nix b/nixpkgs/pkgs/servers/sslh/default.nix index e7637e26f14a..6add47454c2f 100644 --- a/nixpkgs/pkgs/servers/sslh/default.nix +++ b/nixpkgs/pkgs/servers/sslh/default.nix @@ -1,17 +1,19 @@ -{ lib, stdenv, fetchurl, libcap, libconfig, perl, tcp_wrappers, pcre, nixosTests }: +{ lib, stdenv, fetchFromGitHub, libcap, libconfig, perl, tcp_wrappers, pcre2, nixosTests }: stdenv.mkDerivation rec { pname = "sslh"; - version = "1.21c"; + version = "1.22c"; - src = fetchurl { - url = "https://www.rutschle.net/tech/sslh/sslh-v${version}.tar.gz"; - sha256 = "01p7w74ppszxgz6n41lqd6xqvc7bjk2dsc769dd1yb7q4qvpiziv"; + src = fetchFromGitHub { + owner = "yrutschle"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-A+nUWiOPoz/T5afZUzt5In01e049TgHisTF8P5Vj180="; }; postPatch = "patchShebangs *.sh"; - buildInputs = [ libcap libconfig perl tcp_wrappers pcre ]; + buildInputs = [ libcap libconfig perl tcp_wrappers pcre2 ]; makeFlags = [ "USELIBCAP=1" "USELIBWRAP=1" ]; diff --git a/nixpkgs/pkgs/servers/tailscale/default.nix b/nixpkgs/pkgs/servers/tailscale/default.nix index e4007cb6c2d0..1a592494f154 100644 --- a/nixpkgs/pkgs/servers/tailscale/default.nix +++ b/nixpkgs/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.14.0"; + version = "1.14.4"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-FlPb7PtX/q34I7DZBLB9RIlg9tjKqktwn7N8Pv02hYc="; + sha256 = "sha256-66akb1ru2JJe23Cr8q9mkMmmgqtezqh+Mc8aA+Rovb8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/servers/tautulli/default.nix b/nixpkgs/pkgs/servers/tautulli/default.nix index 7a48a9b2478a..8011dc211b85 100644 --- a/nixpkgs/pkgs/servers/tautulli/default.nix +++ b/nixpkgs/pkgs/servers/tautulli/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.7.5"; + version = "2.7.6"; format = "other"; pythonPath = [ setuptools ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "h4IRPUaqgb/AgqKJJEsHBydJOH2i//fpWzMFa0VM2ns="; + sha256 = "1j57n8bi8qzzx1nw23rfr1g8yidg7p600pbbfv4b1dfiw8633jsl"; }; installPhase = '' diff --git a/nixpkgs/pkgs/servers/teleport/default.nix b/nixpkgs/pkgs/servers/teleport/default.nix index 05094045fd32..42296b03260c 100644 --- a/nixpkgs/pkgs/servers/teleport/default.nix +++ b/nixpkgs/pkgs/servers/teleport/default.nix @@ -10,14 +10,14 @@ let in buildGoModule rec { pname = "teleport"; - version = "7.0.3"; + version = "7.1.2"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "sha256-pWe4n/HilieUYfoO0OElC9ccMaTOaMcVadUfWUJJGhk="; + sha256 = "sha256-1/Dmh7jTlGg3CqNZDFNIT8/OvgzkHG2m6Qs0ya4IM18="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/servers/unifi/default.nix b/nixpkgs/pkgs/servers/unifi/default.nix index 070324a5a15a..d2cbf8c0d520 100644 --- a/nixpkgs/pkgs/servers/unifi/default.nix +++ b/nixpkgs/pkgs/servers/unifi/default.nix @@ -52,7 +52,7 @@ in rec { }; unifi6 = generic { - version = "6.2.26"; - sha256 = "15mwl02v50j30vvsmky9kp42i04y38kipapczyi5srhbd9jddyh3"; + version = "6.4.54"; + sha256 = "05z0r47p6cl7yi7f9a40xrsr61ndm2904vway59q1acws5i5mm9g"; }; } diff --git a/nixpkgs/pkgs/servers/ursadb/default.nix b/nixpkgs/pkgs/servers/ursadb/default.nix index 5c699e5dfd28..836a5934d96b 100644 --- a/nixpkgs/pkgs/servers/ursadb/default.nix +++ b/nixpkgs/pkgs/servers/ursadb/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, cmake, zeromq, cppzmq }: +{ lib, stdenv, fetchFromGitHub, cmake, zeromq, cppzmq }: stdenv.mkDerivation rec { pname = "ursadb"; version = "1.2.0"; - src = fetchurl { - url = "https://github.com/CERT-Polska/ursadb/archive/v${version}.tar.gz"; - sha256 = "10dax3mswq0x4cfrpi31b7ii7bxl536wz1j11b7f5c0zw9pjxzym"; + src = fetchFromGitHub { + owner = "CERT-Polska"; + repo = "ursadb"; + rev = "v${version}"; + hash = "sha256-/EK1CKJ0IR7fkKSpQkONbWcz6uhUoAwK430ljNYsV5U="; }; installPhase = '' diff --git a/nixpkgs/pkgs/servers/vouch-proxy/default.nix b/nixpkgs/pkgs/servers/vouch-proxy/default.nix index 3c0551a2de87..4060917ad537 100644 --- a/nixpkgs/pkgs/servers/vouch-proxy/default.nix +++ b/nixpkgs/pkgs/servers/vouch-proxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vouch-proxy"; - version = "0.34.0"; + version = "0.34.1"; src = fetchFromGitHub { owner = "vouch"; repo = "vouch-proxy"; rev = "v${version}"; - sha256 = "sha256-xkCnBRGSryFf90dOeoZKQhugX66zkF/gYF1v6N9yjTQ="; + sha256 = "sha256-UUqETnvkdLBoxUHUpcfE3bxE7fZJEToDxz2Q6kN1/n4="; }; vendorSha256 = "sha256-ifH+420FIrib+zQtzzHtMMYd84BED+vgnRw4xToYIl4="; diff --git a/nixpkgs/pkgs/servers/web-apps/discourse/default.nix b/nixpkgs/pkgs/servers/web-apps/discourse/default.nix index ca0f30d78942..c699c9fb1ed2 100644 --- a/nixpkgs/pkgs/servers/web-apps/discourse/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/discourse/default.nix @@ -290,7 +290,7 @@ let cp -r . $out/share/discourse rm -r $out/share/discourse/log ln -sf /var/log/discourse $out/share/discourse/log - ln -sf /run/discourse/tmp $out/share/discourse/tmp + ln -sf /var/lib/discourse/tmp $out/share/discourse/tmp ln -sf /run/discourse/config $out/share/discourse/config ln -sf /run/discourse/assets/javascripts/plugins $out/share/discourse/app/assets/javascripts/plugins ln -sf /run/discourse/public $out/share/discourse/public diff --git a/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix b/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix index 40f8b1b43278..b7fd374cb6ea 100644 --- a/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix @@ -15,34 +15,42 @@ let # we need a different version than the one already available in nixpkgs esbuild-hedgedoc = buildGoModule rec { pname = "esbuild"; - version = "0.11.20"; + version = "0.12.27"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "009f2mfgzkzgxjh3034mzdkcvm5vz17sgy1cs604f0425i22z8qm"; + sha256 = "sha256-UclUTfm6fxoYEEdEEmO/j+WLZLe8SFzt7+Tej4bR0RU="; }; - vendorSha256 = "1n5538yik72x94vzfq31qaqrkpxds5xys1wlibw2gn2am0z5c06q"; + vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; }; in mkYarnPackage rec { pname = "hedgedoc"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = "hedgedoc"; repo = "hedgedoc"; rev = version; - sha256 = "1h2wyhap264iqm2jh0i05w0hb2j86jsq1plyl7k3an90w7wngyg1"; + sha256 = "sha256-hSKQGkI1+68Zf05RhgRKZo47buyobzjhURSZ30/h0PA="; }; nativeBuildInputs = [ which makeWrapper ]; extraBuildInputs = [ python2 esbuild-hedgedoc ]; yarnNix = ./yarn.nix; + + # FIXME(@Ma27) on the bump to 1.9.0 I had to patch this file manually: + # I replaced `midi "https://github.com/paulrosen/MIDI.js.git#abcjs"` with + # `midi "git+https://github.com/paulrosen/MIDI.js.git#abcjs"` on all occurrences. + # + # Without this change `yarn` attempted to download the code directly from GitHub, with + # the `git+`-prefix it actually uses the `midi.js` version from the offline cache + # created by `yarn2nix`. On future bumps this may be necessary as well! yarnLock = ./yarn.lock; packageJSON = ./package.json; diff --git a/nixpkgs/pkgs/servers/web-apps/hedgedoc/package.json b/nixpkgs/pkgs/servers/web-apps/hedgedoc/package.json index c7fb794a1b75..80d86d9ccb37 100644 --- a/nixpkgs/pkgs/servers/web-apps/hedgedoc/package.json +++ b/nixpkgs/pkgs/servers/web-apps/hedgedoc/package.json @@ -1,6 +1,6 @@ { "name": "HedgeDoc", - "version": "1.8.2", + "version": "1.9.0", "description": "The best platform to write and share markdown.", "main": "app.js", "license": "AGPL-3.0", @@ -21,7 +21,7 @@ "Idle.Js": "git+https://github.com/shawnmclean/Idle.js", "archiver": "^5.0.2", "async": "^3.0.0", - "aws-sdk": "^2.888.0", + "aws-sdk": "^2.987.0", "azure-storage": "^2.7.0", "base64url": "^3.0.0", "body-parser": "^1.15.2", @@ -29,7 +29,7 @@ "cheerio": "^0.22.0", "compression": "^1.6.2", "connect-flash": "^0.1.1", - "connect-session-sequelize": "^7.0.0", + "connect-session-sequelize": "^7.1.2", "cookie": "^0.4.0", "cookie-parser": "^1.4.3", "deep-freeze": "^0.0.1", @@ -40,7 +40,6 @@ "file-type": "^16.1.0", "formidable": "^1.0.17", "graceful-fs": "^4.1.11", - "handlebars": "^4.5.2", "helmet": "^4.5.0", "i18n": "^0.13.0", "is-svg": "^4.3.1", @@ -66,7 +65,7 @@ "meta-marked": "git+https://github.com/hedgedoc/meta-marked", "method-override": "^3.0.0", "minimist": "^1.2.0", - "minio": "^7.0.0", + "minio": "^7.0.19", "moment": "^2.17.1", "morgan": "^1.7.0", "mysql2": "^2.0.0", @@ -80,7 +79,7 @@ "passport-ldapauth": "^3.0.0", "passport-local": "^1.0.0", "passport-oauth2": "^1.4.0", - "passport-saml": "^2.0.0", + "passport-saml": "^3.1.2", "passport-twitter": "^1.0.4", "passport.socketio": "^3.7.0", "pdfobject": "^2.0.201604172", @@ -98,13 +97,11 @@ "sqlite3": "^5.0.0", "store": "^2.0.12", "string": "^3.3.3", - "tedious": "^6.6.0", "toobusy-js": "^0.5.1", "umzug": "^2.3.0", "uuid": "^8.0.0", "validator": "^13.0.0", "winston": "^3.1.0", - "ws": "^7.4.4", "xss": "^1.0.3" }, "resolutions": { @@ -133,7 +130,7 @@ "url": "https://shivering-isles.com" }, { - "name":"David Mehren", + "name": "David Mehren", "email": "hedgedoc@herrmehren.de" } ], @@ -142,6 +139,7 @@ "url": "https://github.com/hedgedoc/hedgedoc.git" }, "devDependencies": { + "abcjs": "5.12.0", "babel-cli": "6.26.0", "babel-core": "6.26.3", "babel-loader": "7.1.5", @@ -153,30 +151,31 @@ "bootstrap-validator": "0.11.9", "codemirror": "git+https://github.com/hedgedoc/CodeMirror.git", "copy-webpack-plugin": "6.4.1", - "css-loader": "5.2.4", + "css-loader": "5.2.7", "emojify.js": "1.1.0", - "esbuild-loader": "2.13.0", + "esbuild-loader": "2.15.1", "escape-html": "1.0.3", - "eslint": "7.26.0", - "eslint-config-standard": "16.0.2", - "eslint-plugin-import": "2.22.1", + "eslint": "7.32.0", + "eslint-config-standard": "16.0.3", + "eslint-plugin-import": "2.24.2", "eslint-plugin-node": "11.1.0", "eslint-plugin-promise": "5.1.0", "eslint-plugin-standard": "4.1.0", + "exports-loader": "1.1.1", "expose-loader": "1.0.3", "file-loader": "6.2.0", "file-saver": "2.0.5", "flowchart.js": "1.15.0", - "fork-awesome": "1.1.7", + "fork-awesome": "1.2.0", "gist-embed": "2.6.0", - "highlight.js": "10.7.2", + "highlight.js": "10.7.3", "html-webpack-plugin": "4.5.2", "imports-loader": "1.2.0", "ionicons": "2.0.1", "jquery": "3.6.0", "jquery-mousewheel": "3.1.13", "jquery-ui": "1.12.1", - "js-cookie": "2.2.1", + "js-cookie": "3.0.1", "js-sequence-diagrams": "git+https://github.com/hedgedoc/js-sequence-diagrams.git", "js-yaml": "3.14.1", "jsonlint": "1.6.3", @@ -185,29 +184,28 @@ "less-loader": "7.3.0", "list.js": "2.3.1", "mathjax": "2.7.9", - "mermaid": "8.10.1", - "mini-css-extract-plugin": "1.6.0", - "mocha": "8.4.0", + "mermaid": "8.12.1", + "mini-css-extract-plugin": "1.6.2", + "mocha": "9.1.1", "mock-require": "3.0.3", - "optimize-css-assets-webpack-plugin": "5.0.4", - "prismjs": "1.23.0", + "optimize-css-assets-webpack-plugin": "6.0.1", + "prismjs": "1.24.1", "raphael": "2.3.0", - "remark-cli": "9.0.0", - "remark-preset-lint-markdown-style-guide": "4.0.0", + "remark-cli": "10.0.0", + "remark-preset-lint-markdown-style-guide": "5.0.1", "reveal.js": "3.9.2", - "script-loader": "0.7.2", "select2": "3.5.2-browserify", "socket.io-client": "2.4.0", - "spin.js": "4.1.0", + "spin.js": "4.1.1", "string-loader": "0.0.1", - "turndown": "7.0.0", + "turndown": "7.1.1", "url-loader": "4.1.1", "velocity-animate": "1.5.2", "visibilityjs": "2.0.2", "viz.js": "1.8.2", "webpack": "4.46.0", - "webpack-cli": "4.7.0", - "webpack-merge": "5.7.3", + "webpack-cli": "4.8.0", + "webpack-merge": "5.8.0", "wurl": "2.5.4" }, "optionalDependencies": { diff --git a/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.lock b/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.lock index a404d95d8f44..e7020b832546 100644 --- a/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.lock +++ b/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.lock @@ -2,49 +2,6 @@ # yarn lockfile v1 -"@azure/abort-controller@^1.0.0": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-1.0.4.tgz#fd3c4d46c8ed67aace42498c8e2270960250eafd" - integrity sha512-lNUmDRVGpanCsiUN3NWxFTdwmdFI53xwhkTFfHDGTYk46ca7Ind3nanJc+U6Zj9Tv+9nTCWRBscWEW1DyKOpTw== - dependencies: - tslib "^2.0.0" - -"@azure/core-auth@^1.1.4": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.3.0.tgz#0d55517cf0650aefe755669aca8a2f3724fcf536" - integrity sha512-kSDSZBL6c0CYdhb+7KuutnKGf2geeT+bCJAgccB0DD7wmNJSsQPcF7TcuoZX83B7VK4tLz/u+8sOO/CnCsYp8A== - dependencies: - "@azure/abort-controller" "^1.0.0" - tslib "^2.0.0" - -"@azure/ms-rest-azure-env@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@azure/ms-rest-azure-env/-/ms-rest-azure-env-1.1.2.tgz#8505873afd4a1227ec040894a64fdd736b4a101f" - integrity sha512-l7z0DPCi2Hp88w12JhDTtx5d0Y3+vhfE7JKJb9O7sEz71Cwp053N8piTtTnnk/tUor9oZHgEKi/p3tQQmLPjvA== - -"@azure/ms-rest-js@^1.8.7": - version "1.11.2" - resolved "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-1.11.2.tgz#e83d512b102c302425da5ff03a6d76adf2aa4ae6" - integrity sha512-2AyQ1IKmLGKW7DU3/x3TsTBzZLcbC9YRI+yuDPuXAQrv3zar340K9wsxU413kHFIDjkWNCo9T0w5VtwcyWxhbQ== - dependencies: - "@azure/core-auth" "^1.1.4" - axios "^0.21.1" - form-data "^2.3.2" - tough-cookie "^2.4.3" - tslib "^1.9.2" - tunnel "0.0.6" - uuid "^3.2.1" - xml2js "^0.4.19" - -"@azure/ms-rest-nodeauth@2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@azure/ms-rest-nodeauth/-/ms-rest-nodeauth-2.0.2.tgz#037e29540c5625eaec718b8fcc178dd7ad5dfb96" - integrity sha512-KmNNICOxt3EwViAJI3iu2VH8t8BQg5J2rSAyO4IUYLF9ZwlyYsP419pdvl4NBUhluAP2cgN7dfD2V6E6NOMZlQ== - dependencies: - "@azure/ms-rest-azure-env" "^1.1.2" - "@azure/ms-rest-js" "^1.8.7" - adal-node "^0.1.28" - "@babel/code-frame@7.12.11": version "7.12.11" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" @@ -53,23 +10,23 @@ "@babel/highlight" "^7.10.4" "@babel/code-frame@^7.0.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" - integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb" + integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw== dependencies: - "@babel/highlight" "^7.12.13" + "@babel/highlight" "^7.14.5" -"@babel/helper-validator-identifier@^7.14.0": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288" - integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A== +"@babel/helper-validator-identifier@^7.14.5": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48" + integrity sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g== -"@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13": - version "7.14.0" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf" - integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg== +"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" + integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== dependencies: - "@babel/helper-validator-identifier" "^7.14.0" + "@babel/helper-validator-identifier" "^7.14.5" chalk "^2.0.0" js-tokens "^4.0.0" @@ -88,46 +45,73 @@ kuler "^2.0.0" "@discoveryjs/json-ext@^0.5.0": - version "0.5.2" - resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz#8f03a22a04de437254e8ce8cc84ba39689288752" - integrity sha512-HyYEUDeIj5rRQU2Hk5HTB2uHsbRQpF70nvMhVzi+VJR0X+xNEhjPui4/kBf3VeH/wqD28PT4sVOm8qqLjBrSZg== + version "0.5.3" + resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz#90420f9f9c6d3987f176a19a7d8e764271a2f55d" + integrity sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g== -"@eslint/eslintrc@^0.4.1": - version "0.4.1" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz#442763b88cecbe3ee0ec7ca6d6dd6168550cbf14" - integrity sha512-5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ== +"@eslint/eslintrc@^0.4.3": + version "0.4.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c" + integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw== dependencies: ajv "^6.12.4" debug "^4.1.1" espree "^7.3.0" - globals "^12.1.0" + globals "^13.9.0" ignore "^4.0.6" import-fresh "^3.2.1" js-yaml "^3.13.1" minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@nodelib/fs.scandir@2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69" - integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA== +"@gar/promisify@^1.0.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210" + integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw== + +"@humanwhocodes/config-array@^0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" + integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg== + dependencies: + "@humanwhocodes/object-schema" "^1.2.0" + debug "^4.1.1" + minimatch "^3.0.4" + +"@humanwhocodes/object-schema@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf" + integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w== + +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== dependencies: - "@nodelib/fs.stat" "2.0.4" + "@nodelib/fs.stat" "2.0.5" run-parallel "^1.1.9" -"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655" - integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q== +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== "@nodelib/fs.walk@^1.2.3": - version "1.2.6" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063" - integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow== + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== dependencies: - "@nodelib/fs.scandir" "2.1.4" + "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@npmcli/fs@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.0.0.tgz#589612cfad3a6ea0feafcb901d29c63fd52db09f" + integrity sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ== + dependencies: + "@gar/promisify" "^1.0.1" + semver "^7.3.5" + "@npmcli/move-file@^1.0.1": version "1.1.2" resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674" @@ -149,10 +133,15 @@ resolved "https://registry.yarnpkg.com/@passport-next/passport-strategy/-/passport-strategy-1.1.0.tgz#4c0df069e2ec9262791b9ef1e23320c1d73bdb74" integrity sha512-2KhFjtPueJG6xVj2HnqXt9BlANOfYCVLyu+pXYjPGBDT8yk+vQwc/6tsceIj+mayKcoxMau2JimggXRPHgoc8w== -"@tokenizer/token@^0.1.1": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.1.1.tgz#f0d92c12f87079ddfd1b29f614758b9696bc29e3" - integrity sha512-XO6INPbZCxdprl+9qa/AAbFFOMzzwqYxpjPgLICrMD6C2FCw6qfJOPcBk6JqqPLSaZ/Qx87qn4rpPmPMwaAK6w== +"@tokenizer/token@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.3.0.tgz#fe98a93fe789247e998c75e74e9c7c63217aa276" + integrity sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A== + +"@trysound/sax@0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" + integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== "@types/accepts@*": version "1.3.5" @@ -161,59 +150,63 @@ dependencies: "@types/node" "*" -"@types/anymatch@*": - version "1.3.1" - resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a" - integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA== - "@types/body-parser@*": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f" - integrity sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ== + version "1.19.1" + resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.1.tgz#0c0174c42a7d017b818303d4b5d969cb0b75929c" + integrity sha512-a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg== dependencies: "@types/connect" "*" "@types/node" "*" +"@types/concat-stream@^1.0.0": + version "1.6.1" + resolved "https://registry.yarnpkg.com/@types/concat-stream/-/concat-stream-1.6.1.tgz#24bcfc101ecf68e886aaedce60dfd74b632a1b74" + integrity sha512-eHE4cQPoj6ngxBZMvVf6Hw7Mh4jMW4U9lpGmS5GBPB9RYxlFg+CHaVN7ErNY4W9XfLIEn20b4VDYaIrbq0q4uA== + dependencies: + "@types/node" "*" + "@types/connect@*": - version "3.4.34" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.34.tgz#170a40223a6d666006d93ca128af2beb1d9b1901" - integrity sha512-ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ== + version "3.4.35" + resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" + integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== dependencies: "@types/node" "*" "@types/content-disposition@*": - version "0.5.3" - resolved "https://registry.yarnpkg.com/@types/content-disposition/-/content-disposition-0.5.3.tgz#0aa116701955c2faa0717fc69cd1596095e49d96" - integrity sha512-P1bffQfhD3O4LW0ioENXUhZ9OIa0Zn+P7M+pWgkCKaT53wVLSq0mrKksCID/FGHpFhRSxRGhgrQmfhRuzwtKdg== + version "0.5.4" + resolved "https://registry.yarnpkg.com/@types/content-disposition/-/content-disposition-0.5.4.tgz#de48cf01c79c9f1560bcfd8ae43217ab028657f8" + integrity sha512-0mPF08jn9zYI0n0Q/Pnz7C4kThdSt+6LD4amsrYDDpgBfrVWa3TcCOxKX1zkGgYniGagRv8heN2cbh+CAn+uuQ== "@types/cookies@*": - version "0.7.6" - resolved "https://registry.yarnpkg.com/@types/cookies/-/cookies-0.7.6.tgz#71212c5391a976d3bae57d4b09fac20fc6bda504" - integrity sha512-FK4U5Qyn7/Sc5ih233OuHO0qAkOpEcD/eG6584yEiLKizTFRny86qHLe/rej3HFQrkBuUjF4whFliAdODbVN/w== + version "0.7.7" + resolved "https://registry.yarnpkg.com/@types/cookies/-/cookies-0.7.7.tgz#7a92453d1d16389c05a5301eef566f34946cfd81" + integrity sha512-h7BcvPUogWbKCzBR2lY4oqaZbO3jXZksexYJVFvkrFeLgbZjQkU4x8pRq6eg2MHXQhY0McQdqmmsxRWlVAHooA== dependencies: "@types/connect" "*" "@types/express" "*" "@types/keygrip" "*" "@types/node" "*" -"@types/debug@^4.1.5": - version "4.1.5" - resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd" - integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ== +"@types/debug@^4.0.0": + version "4.1.7" + resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82" + integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg== + dependencies: + "@types/ms" "*" "@types/express-serve-static-core@^4.17.12", "@types/express-serve-static-core@^4.17.18": - version "4.17.19" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz#00acfc1632e729acac4f1530e9e16f6dd1508a1d" - integrity sha512-DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA== + version "4.17.24" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz#ea41f93bf7e0d59cd5a76665068ed6aab6815c07" + integrity sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA== dependencies: "@types/node" "*" "@types/qs" "*" "@types/range-parser" "*" "@types/express@*", "@types/express@^4.17.8": - version "4.17.11" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz#debe3caa6f8e5fcda96b47bd54e2f40c4ee59545" - integrity sha512-no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg== + version "4.17.13" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" + integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== dependencies: "@types/body-parser" "*" "@types/express-serve-static-core" "^4.17.18" @@ -221,29 +214,46 @@ "@types/serve-static" "*" "@types/geojson@^7946.0.7": - version "7946.0.7" - resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz#c8fa532b60a0042219cdf173ca21a975ef0666ad" - integrity sha512-wE2v81i4C4Ol09RtsWFAqg3BUitWbHSpSlIo+bNdsCJijO9sjme+zm+73ZMCa/qMC8UEERxzGbvmr1cffo2SiQ== + version "7946.0.8" + resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca" + integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA== + +"@types/hast@^2.0.0": + version "2.3.4" + resolved "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.4.tgz#8aa5ef92c117d20d974a82bdfb6a648b08c0bafc" + integrity sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g== + dependencies: + "@types/unist" "*" "@types/html-minifier-terser@^5.0.0": - version "5.1.1" - resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#3c9ee980f1a10d6021ae6632ca3e79ca2ec4fb50" - integrity sha512-giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA== + version "5.1.2" + resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz#693b316ad323ea97eed6b38ed1a3cc02b1672b57" + integrity sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w== "@types/http-assert@*": - version "1.5.1" - resolved "https://registry.yarnpkg.com/@types/http-assert/-/http-assert-1.5.1.tgz#d775e93630c2469c2f980fc27e3143240335db3b" - integrity sha512-PGAK759pxyfXE78NbKxyfRcWYA/KwW17X290cNev/qAsn9eQIxkH4shoNBafH37wewhDG/0p1cHPbK6+SzZjWQ== + version "1.5.3" + resolved "https://registry.yarnpkg.com/@types/http-assert/-/http-assert-1.5.3.tgz#ef8e3d1a8d46c387f04ab0f2e8ab8cb0c5078661" + integrity sha512-FyAOrDuQmBi8/or3ns4rwPno7/9tJTijVW6aQQjK02+kOQ8zmoNg2XJtAuQhvQcy1ASJq38wirX5//9J1EqoUA== "@types/http-errors@*": - version "1.8.0" - resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-1.8.0.tgz#682477dbbbd07cd032731cb3b0e7eaee3d026b69" - integrity sha512-2aoSC4UUbHDj2uCsCxcG/vRMXey/m17bC7UwitVm5hn22nI8O8Y9iDpA76Orc+DWkQ4zZrOKEshCqR/jSuXAHA== + version "1.8.1" + resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-1.8.1.tgz#e81ad28a60bee0328c6d2384e029aec626f1ae67" + integrity sha512-e+2rjEwK6KDaNOm5Aa9wNGgyS9oSZU/4pfSMMPYNOfjvFI0WVXm29+ITRFr6aKDvvKo7uU1jV68MW4ScsfDi7Q== + +"@types/is-empty@^1.0.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@types/is-empty/-/is-empty-1.2.0.tgz#16bc578060c9b0b6953339eea906c255a375bf86" + integrity sha512-brJKf2boFhUxTDxlpI7cstwiUtA2ovm38UzFTi9aZI6//ARncaV+Q5ALjCaJqXaMtdZk/oPTJnSutugsZR6h8A== + +"@types/js-yaml@^4.0.0": + version "4.0.3" + resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.3.tgz#9f33cd6fbf0d5ec575dc8c8fc69c7fec1b4eb200" + integrity sha512-5t9BhoORasuF5uCPr+d5/hdB++zRFUTMIZOzbNkr+jZh3yQht4HYbRDyj9fY8n2TZT30iW9huzav73x4NikqWg== -"@types/json-schema@^7.0.6": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" - integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== +"@types/json-schema@^7.0.8": + version "7.0.9" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" + integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== "@types/json5@^0.0.29": version "0.0.29" @@ -263,9 +273,9 @@ "@types/koa" "*" "@types/koa@*", "@types/koa@^2.11.4": - version "2.13.1" - resolved "https://registry.yarnpkg.com/@types/koa/-/koa-2.13.1.tgz#e29877a6b5ad3744ab1024f6ec75b8cbf6ec45db" - integrity sha512-Qbno7FWom9nNqu0yHZ6A0+RWt4mrYBhw3wpBAQ3+IuzGcLlfeYkzZrnMq5wsxulN2np8M4KKeUpTodsOsSad5Q== + version "2.13.4" + resolved "https://registry.yarnpkg.com/@types/koa/-/koa-2.13.4.tgz#10620b3f24a8027ef5cbae88b393d1b31205726b" + integrity sha512-dfHYMfU+z/vKtQB7NUrthdAEiSvnLebvBjwHtfFmpZmB7em2N3WVQdHgnFq+xvyVgxW5jKDmjWfLD3lw4g4uTw== dependencies: "@types/accepts" "*" "@types/content-disposition" "*" @@ -277,16 +287,16 @@ "@types/node" "*" "@types/ldapjs@^1.0.9": - version "1.0.10" - resolved "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.10.tgz#bac705c9e154b97d69496b5213cc28dbe9715a37" - integrity sha512-AMkMxkK/wjYtWebNH2O+rARfo7scBpW3T23g6zmGCwDgbyDbR79XWpcSqhPWdU+fChaF+I3dVyl9X2dT1CyI9w== + version "1.0.11" + resolved "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.11.tgz#34077176af2b06186bd54e4a38ceb6e852387fa4" + integrity sha512-O4D1frY6xy2mQr5WouNPeltMe5EHdmU4FxbLDC6TMDX5HXOuafusGu+7Y9WAoqBaYHZ5hcFa7jfkpggyexfeXQ== dependencies: "@types/node" "*" "@types/mdast@^3.0.0": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.3.tgz#2d7d671b1cd1ea3deb306ea75036c2a0407d2deb" - integrity sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw== + version "3.0.10" + resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz#4724244a82a4598884cbbe9bcfd73dff927ee8af" + integrity sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA== dependencies: "@types/unist" "*" @@ -295,53 +305,40 @@ resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== -"@types/node@*": - version "15.0.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz#51e9c0920d1b45936ea04341aa3e2e58d339fb67" - integrity sha512-p68+a+KoxpoB47015IeYZYRrdqMUcpbK8re/zpFB8Ld46LHC1lPEbp3EXgkEhAYEcPvjJF6ZO+869SQ0aH1dcA== +"@types/ms@*": + version "0.7.31" + resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" + integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== -"@types/node@^12.12.17": - version "12.20.12" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.12.tgz#fd9c1c2cfab536a2383ed1ef70f94adea743a226" - integrity sha512-KQZ1al2hKOONAs2MFv+yTQP1LkDWMrRJ9YCVRalXltOfXsBmH5IownLxQaiq0lnAHwAViLnh2aTYqrPcRGEbgg== +"@types/node@*", "@types/node@^16.0.0": + version "16.9.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.1.tgz#0611b37db4246c937feef529ddcc018cf8e35708" + integrity sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g== "@types/node@^14.14.28": - version "14.14.44" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz#df7503e6002847b834371c004b372529f3f85215" - integrity sha512-+gaugz6Oce6ZInfI/tK4Pq5wIIkJMEJUu92RB3Eu93mtj4wjjjz9EB5mLp5s1pSsLXdC/CPut/xF20ZzAQJbTA== - -"@types/node@^8.0.47": - version "8.10.66" - resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.66.tgz#dd035d409df322acc83dff62a602f12a5783bbb3" - integrity sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw== + version "14.17.15" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.15.tgz#d5ebfb62a69074ebb85cbe0529ad917bb8f2bae8" + integrity sha512-D1sdW0EcSCmNdLKBGMYb38YsHUS6JcM7yQ6sLQ9KuZ35ck7LYCKE7kYFHOO59ayFOY3zobWVZxf4KXhYHcHYFA== -"@types/q@^1.5.1": - version "1.5.4" - resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" - integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug== +"@types/parse5@^6.0.0": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-6.0.1.tgz#f8ae4fbcd2b9ba4ff934698e28778961f9cb22ca" + integrity sha512-ARATsLdrGPUnaBvxLhUlnltcMgn7pQG312S8ccdYlnyijabrX9RN/KN/iGj9Am96CoW8e/K9628BA7Bv4XHdrA== "@types/qs@*": - version "6.9.6" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.6.tgz#df9c3c8b31a247ec315e6996566be3171df4b3b1" - integrity sha512-0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA== + version "6.9.7" + resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" + integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== "@types/range-parser@*": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c" - integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA== - -"@types/readable-stream@^2.3.5", "@types/readable-stream@^2.3.9": - version "2.3.9" - resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.9.tgz#40a8349e6ace3afd2dd1b6d8e9b02945de4566a9" - integrity sha512-sqsgQqFT7HmQz/V5jH1O0fvQQnXAJO46Gg9LRO/JPfjmVmGUlcx831TZZO3Y3HtWhIkzf3kTsNT0Z0kzIhIvZw== - dependencies: - "@types/node" "*" - safe-buffer "*" + version "1.2.4" + resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" + integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== "@types/serve-static@*": - version "1.13.9" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.9.tgz#aacf28a85a05ee29a11fb7c3ead935ac56f33e4e" - integrity sha512-ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA== + version "1.13.10" + resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" + integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ== dependencies: "@types/mime" "^1" "@types/node" "*" @@ -351,42 +348,52 @@ resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA== +"@types/supports-color@^8.0.0": + version "8.1.1" + resolved "https://registry.yarnpkg.com/@types/supports-color/-/supports-color-8.1.1.tgz#1b44b1b096479273adf7f93c75fc4ecc40a61ee4" + integrity sha512-dPWnWsf+kzIG140B8z2w3fr5D03TLWbOAFQl45xUpI3vcizeXriNR5VYkWZ+WTMsUHqZ9Xlt3hrxGNANFyNQfw== + "@types/tapable@^1", "@types/tapable@^1.0.5": - version "1.0.7" - resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.7.tgz#545158342f949e8fd3bfd813224971ecddc3fac4" - integrity sha512-0VBprVqfgFD7Ehb2vd8Lh9TG3jP98gvr8rgehQqzztZNI7o8zS8Ad4jyZneKELphpuE212D8J70LnSNQSyO6bQ== + version "1.0.8" + resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.8.tgz#b94a4391c85666c7b73299fd3ad79d4faa435310" + integrity sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ== + +"@types/text-table@^0.2.0": + version "0.2.2" + resolved "https://registry.yarnpkg.com/@types/text-table/-/text-table-0.2.2.tgz#774c90cfcfbc8b4b0ebb00fecbe861dc8b1e8e26" + integrity sha512-dGoI5Af7To0R2XE8wJuc6vwlavWARsCh3UKJPjWs1YEqGUqfgBI/j/4GX0yf19/DsDPPf0YAXWAp8psNeIehLg== "@types/uglify-js@*": - version "3.13.0" - resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.13.0.tgz#1cad8df1fb0b143c5aba08de5712ea9d1ff71124" - integrity sha512-EGkrJD5Uy+Pg0NUR8uA4bJ5WMfljyad0G+784vLCNUkD+QwOJXUbBYExXfVGf7YtyzdQp3L/XMYcliB987kL5Q== + version "3.13.1" + resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.13.1.tgz#5e889e9e81e94245c75b6450600e1c5ea2878aea" + integrity sha512-O3MmRAk6ZuAKa9CHgg0Pr0+lUOqoMLpc9AS4R8ano2auvsg7IE8syF3Xh/NPr26TWklxYcqoEEFdzLLs1fV9PQ== dependencies: source-map "^0.6.1" -"@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2": - version "2.0.3" - resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e" - integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ== +"@types/unist@*", "@types/unist@^2.0.0": + version "2.0.6" + resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d" + integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ== "@types/webpack-sources@*": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.1.0.tgz#8882b0bd62d1e0ce62f183d0d01b72e6e82e8c10" - integrity sha512-LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg== + version "3.2.0" + resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-3.2.0.tgz#16d759ba096c289034b26553d2df1bf45248d38b" + integrity sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg== dependencies: "@types/node" "*" "@types/source-list-map" "*" source-map "^0.7.3" "@types/webpack@^4.41.8": - version "4.41.28" - resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.28.tgz#0069a2159b7ad4d83d0b5801942c17d54133897b" - integrity sha512-Nn84RAiJjKRfPFFCVR8LC4ueTtTdfWAMZ03THIzZWRJB+rX24BD3LqPSFnbMscWauEsT4segAsylPDIaZyZyLQ== + version "4.41.31" + resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.31.tgz#c35f252a3559ddf9c85c0d8b0b42019025e581aa" + integrity sha512-/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ== dependencies: - "@types/anymatch" "*" "@types/node" "*" "@types/tapable" "^1" "@types/uglify-js" "*" "@types/webpack-sources" "*" + anymatch "^3.0.0" source-map "^0.6.0" "@ungap/promise-all-settled@1.1.2": @@ -539,22 +546,27 @@ "@webassemblyjs/wast-parser" "1.9.0" "@xtuc/long" "4.2.2" -"@webpack-cli/configtest@^1.0.3": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.3.tgz#204bcff87cda3ea4810881f7ea96e5f5321b87b9" - integrity sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw== +"@webpack-cli/configtest@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.4.tgz#f03ce6311c0883a83d04569e2c03c6238316d2aa" + integrity sha512-cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ== -"@webpack-cli/info@^1.2.4": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.4.tgz#7381fd41c9577b2d8f6c2594fad397ef49ad5573" - integrity sha512-ogE2T4+pLhTTPS/8MM3IjHn0IYplKM4HbVNMCWA9N4NrdPzunwenpCsqKEXyejMfRu6K8mhauIPYf8ZxWG5O6g== +"@webpack-cli/info@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.3.0.tgz#9d78a31101a960997a4acd41ffd9b9300627fe2b" + integrity sha512-ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w== dependencies: envinfo "^7.7.3" -"@webpack-cli/serve@^1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.4.0.tgz#f84fd07bcacefe56ce762925798871092f0f228e" - integrity sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg== +"@webpack-cli/serve@^1.5.2": + version "1.5.2" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.5.2.tgz#ea584b637ff63c5a477f6f21604b5a205b72c9ec" + integrity sha512-vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw== + +"@xmldom/xmldom@^0.7.0", "@xmldom/xmldom@^0.7.2": + version "0.7.4" + resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.4.tgz#93b2f9486c88b6464e97f76c9ab49b0a548fbe57" + integrity sha512-wdxC79cvO7PjSM34jATd/RYZuYWQ8y/R7MidZl1NYYlbpFn1+spfjkiR3ZsJfcaTs2IyslBN7VwBBJwrYKM+zw== "@xtuc/ieee754@^1.2.0": version "1.2.0" @@ -566,10 +578,14 @@ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== +"@zxing/text-encoding@0.9.0": + version "0.9.0" + resolved "https://registry.yarnpkg.com/@zxing/text-encoding/-/text-encoding-0.9.0.tgz#fb50ffabc6c7c66a0c96b4c03e3d9be74864b70b" + integrity sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA== + "Idle.Js@git+https://github.com/shawnmclean/Idle.js": version "0.0.1" - uid db9beb3483a460ad638ec947867720f0ed066a62 - resolved "git+https://github.com/shawnmclean/Idle.js#db9beb3483a460ad638ec947867720f0ed066a62" + resolved "git+https://github.com/shawnmclean/Idle.js#2b57cc6e49d177b7ddce0cca00ef5cbe07453541" JSV@^4.0.x: version "4.0.2" @@ -581,6 +597,29 @@ abbrev@1: resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== +abcjs@5.10.3: + version "5.10.3" + resolved "https://registry.yarnpkg.com/abcjs/-/abcjs-5.10.3.tgz#294702140ec1caa292859ba9d2af0452f7e9e046" + integrity sha512-YGmW4CUWd7T2/HqZa/SQOTE+lXg7Z68HwwpJhHJBvdHqLi1uLCiYva1ZRGhB/MPyl1QKqJMfF+LQ1jGAEK69XQ== + dependencies: + midi "git+https://github.com/paulrosen/MIDI.js.git#abcjs" + +abcjs@5.11.0: + version "5.11.0" + resolved "https://registry.yarnpkg.com/abcjs/-/abcjs-5.11.0.tgz#397592ea6a56948aee64a8364f9a7a589e254300" + integrity sha512-kLehHwwttcTCVhKQaDkmqYbWBLAWmfyzYSbUQoEDAOTOX5RzDGakX8tXpzlsNHw6Lh8W8odZw44e0siwbG4TKA== + dependencies: + abcjs "5.10.3" + midi "git+https://github.com/paulrosen/MIDI.js.git#abcjs" + +abcjs@5.12.0: + version "5.12.0" + resolved "https://registry.yarnpkg.com/abcjs/-/abcjs-5.12.0.tgz#06fec076d570821309b0a12598cd356cd589eb08" + integrity sha512-pvi7SjOAKT7cRyRtywUSwYB0SNtRHKLxZUZ9Oc4E+nvpBHr8Z2/M9Pfyv3oIaiEpxlWTFK+B/H5t/DckiNFgpg== + dependencies: + abcjs "5.11.0" + midi "git+https://github.com/paulrosen/MIDI.js.git#abcjs" + abstract-logging@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/abstract-logging/-/abstract-logging-2.0.1.tgz#6b0c371df212db7129b57d2e7fcf282b8bf1c839" @@ -595,9 +634,9 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: negotiator "0.6.2" acorn-jsx@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" - integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== + version "5.3.2" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== acorn@^6.4.1: version "6.4.2" @@ -609,21 +648,6 @@ acorn@^7.4.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -adal-node@^0.1.28: - version "0.1.28" - resolved "https://registry.yarnpkg.com/adal-node/-/adal-node-0.1.28.tgz#468c4bb3ebbd96b1270669f4b9cba4e0065ea485" - integrity sha1-RoxLs+u9lrEnBmn0ucuk4AZepIU= - dependencies: - "@types/node" "^8.0.47" - async ">=0.6.0" - date-utils "*" - jws "3.x.x" - request ">= 2.52.0" - underscore ">= 1.3.1" - uuid "^3.1.0" - xmldom ">= 0.1.x" - xpath.js "~1.1.0" - after@0.8.2: version "0.8.2" resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" @@ -658,16 +682,16 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: uri-js "^4.2.2" ajv@^8.0.1: - version "8.3.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.3.0.tgz#25ee7348e32cdc4a1dbb38256bf6bdc451dd577c" - integrity sha512-RYE7B5An83d7eWnDR8kbdaIFqmKCNsP16ay1hDbJEU+sa0e3H9SebskCt0Uufem6cfAVu7Col6ubcn/W+Sm8/Q== + version "8.6.3" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz#11a66527761dc3e9a3845ea775d2d3c0414e8764" + integrity sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" require-from-string "^2.0.2" uri-js "^4.2.2" -alphanum-sort@^1.0.0: +alphanum-sort@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= @@ -692,6 +716,11 @@ ansi-regex@^5.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== +ansi-regex@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" + integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== + ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" @@ -737,7 +766,7 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.1.1" -anymatch@~3.1.1: +anymatch@^3.0.0, anymatch@~3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== @@ -780,9 +809,9 @@ archiver@^5.0.2: zip-stream "^4.1.0" are-we-there-yet@~1.1.2: - version "1.1.5" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" - integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== + version "1.1.7" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" + integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g== dependencies: delegates "^1.0.0" readable-stream "^2.0.6" @@ -821,17 +850,12 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= -array-filter@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83" - integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM= - array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= -array-includes@^3.1.1: +array-includes@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a" integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A== @@ -857,7 +881,7 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= -array.prototype.flat@^1.2.3: +array.prototype.flat@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123" integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg== @@ -921,16 +945,16 @@ async@0.9.x: resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0= -async@>=0.6.0, async@^3.0.0, async@^3.1.0, async@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz#b3a2685c5ebb641d3de02d161002c60fc9f85720" - integrity sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw== - async@^1.4.0: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo= +async@^3.0.0, async@^3.1.0, async@^3.2.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.1.tgz#d3274ec66d107a47476a4c49136aacdb00665fc8" + integrity sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg== + asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -941,17 +965,15 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -available-typed-arrays@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz#6b098ca9d8039079ee3f77f7b783c4480ba513f5" - integrity sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ== - dependencies: - array-filter "^1.0.0" +available-typed-arrays@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" + integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== -aws-sdk@^2.888.0: - version "2.904.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.904.0.tgz#45a53e918698e451f762e44005dfce177a50b7e6" - integrity sha512-BnlMgxiQ0as0LSigm/QVgdh8CoIVY29DItmnFOnL6ahJ5W/m1Xzpge2jJoj+gqwZ+QQvOO31dDYw9PtteiR/IQ== +aws-sdk@^2.987.0: + version "2.988.0" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.988.0.tgz#46538de14c4c5cd3d7718badedffd31471a0c0e9" + integrity sha512-2b56fPJ9vHgLnDeZ6NDgQzzJT/0NbSGNYIzGZx47/FROwoxRArqt9agiQ14y1zlXPsP9QNKPjp6HsW4IFLjGWQ== dependencies: buffer "4.9.2" events "1.1.1" @@ -974,16 +996,16 @@ aws4@^1.8.0: integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== axios@^0.21.1: - version "0.21.1" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8" - integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA== + version "0.21.4" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" + integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== dependencies: - follow-redirects "^1.10.0" + follow-redirects "^1.14.0" azure-storage@^2.7.0: - version "2.10.3" - resolved "https://registry.yarnpkg.com/azure-storage/-/azure-storage-2.10.3.tgz#c5966bf929d87587d78f6847040ea9a4b1d4a50a" - integrity sha512-IGLs5Xj6kO8Ii90KerQrrwuJKexLgSwYC4oLWmc11mzKe7Jt2E5IVg+ZQ8K53YWZACtVTMBNO3iGuA+4ipjJxQ== + version "2.10.4" + resolved "https://registry.yarnpkg.com/azure-storage/-/azure-storage-2.10.4.tgz#c481d207eabc05f57f019b209f7faa8737435104" + integrity sha512-zlfRPl4js92JC6+79C2EUmNGYjSknRl8pOiHQF78zy+pbOFOHtlBF6BU/OxPeHQX3gaa6NdEZnVydFxhhndkEw== dependencies: browserify-mime "~1.2.9" extend "^3.0.2" @@ -991,7 +1013,7 @@ azure-storage@^2.7.0: md5.js "1.3.4" readable-stream "~2.0.0" request "^2.86.0" - underscore "~1.8.3" + underscore "^1.12.1" uuid "^3.0.0" validator "~9.4.1" xml2js "0.2.8" @@ -1567,10 +1589,10 @@ backoff@^2.5.0: dependencies: precond "0.2" -bail@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776" - integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ== +bail@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/bail/-/bail-2.0.1.tgz#d676736373a374058a935aec81b94c12ba815771" + integrity sha512-d5FoTAr2S5DSUPKl85WNm2yUwsINN8eidIdIwsOge2t33DaOfOdSmmsI11jMN3GmALCXaw+Y6HMVHDzePshFAA== balanced-match@^1.0.0: version "1.0.2" @@ -1656,13 +1678,6 @@ bintrees@1.0.1: resolved "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.1.tgz#0e655c9b9c2435eaab68bf4027226d2b55a34524" integrity sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ= -bl@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/bl/-/bl-3.0.1.tgz#1cbb439299609e419b5a74d7fce2f8b37d8e5c6f" - integrity sha512-jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ== - dependencies: - readable-stream "^3.0.1" - bl@^4.0.3: version "4.1.0" resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" @@ -1861,31 +1876,26 @@ browserslist@^3.2.6: caniuse-lite "^1.0.30000844" electron-to-chromium "^1.3.47" -browserslist@^4.0.0: - version "4.16.6" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2" - integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ== +browserslist@^4.0.0, browserslist@^4.16.0, browserslist@^4.16.6: + version "4.17.0" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.0.tgz#1fcd81ec75b41d6d4994fb0831b92ac18c01649c" + integrity sha512-g2BJ2a0nEYvEFQC208q8mVAhfNwpZ5Mu8BwgtCdZKO3qx98HChmeg448fPdUzld8aFmfLgVh7yymqV+q1lJZ5g== dependencies: - caniuse-lite "^1.0.30001219" - colorette "^1.2.2" - electron-to-chromium "^1.3.723" + caniuse-lite "^1.0.30001254" + colorette "^1.3.0" + electron-to-chromium "^1.3.830" escalade "^3.1.1" - node-releases "^1.1.71" + node-releases "^1.1.75" buffer-crc32@^0.2.1, buffer-crc32@^0.2.13: version "0.2.13" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= -buffer-equal-constant-time@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" - integrity sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk= - buffer-from@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" - integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== buffer-writer@2.0.0: version "2.0.0" @@ -1926,6 +1936,13 @@ builtin-status-codes@^3.0.0: resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= +builtins@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/builtins/-/builtins-4.0.0.tgz#a8345420de82068fdc4d6559d0456403a8fb1905" + integrity sha512-qC0E2Dxgou1IHhvJSLwGDSTvokbRovU5zZFuDY6oY8Y2lF3nGt5Ad8YZK7GMtqzY84Wu7pXTPeHQeHcXSXsRhw== + dependencies: + semver "^7.0.0" + bytes@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" @@ -1958,10 +1975,11 @@ cacache@^12.0.2: y18n "^4.0.0" cacache@^15.0.5: - version "15.0.6" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.6.tgz#65a8c580fda15b59150fb76bf3f3a8e45d583099" - integrity sha512-g1WYDMct/jzW+JdWEyjaX2zoBkZ6ZT9VpOyp2I/VMtDsNLffNat3kqPFfi1eDRSK9/SuKGyORDHcQMcPF8sQ/w== + version "15.3.0" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb" + integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ== dependencies: + "@npmcli/fs" "^1.0.0" "@npmcli/move-file" "^1.0.1" chownr "^2.0.0" fs-minipass "^2.0.0" @@ -2003,38 +2021,11 @@ call-bind@^1.0.0, call-bind@^1.0.2: function-bind "^1.1.1" get-intrinsic "^1.0.2" -caller-callsite@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134" - integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ= - dependencies: - callsites "^2.0.0" - -caller-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4" - integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ= - dependencies: - caller-callsite "^2.0.0" - -callsites@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" - integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA= - callsites@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -camel-case@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73" - integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M= - dependencies: - no-case "^2.2.0" - upper-case "^1.1.1" - camel-case@^4.1.1: version "4.1.2" resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a" @@ -2043,12 +2034,7 @@ camel-case@^4.1.1: pascal-case "^3.1.2" tslib "^2.0.3" -camelcase@^5.0.0: - version "5.3.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" - integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== - -camelcase@^6.0.0, camelcase@^6.2.0: +camelcase@^6.0.0: version "6.2.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== @@ -2063,16 +2049,21 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001219: - version "1.0.30001228" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa" - integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001254: + version "1.0.30001257" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001257.tgz#150aaf649a48bee531104cfeda57f92ce587f6e5" + integrity sha512-JN49KplOgHSXpIsVSF+LUyhD8PUp6xPpAXeRrrcBh4KBeP7W864jHn6RvzJgDlrReyeVjMFJL3PLpPvKIxlIHA== caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= +ccount@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ccount/-/ccount-2.0.0.tgz#3d6fb55803832766a24c6f339abc507297eb5d25" + integrity sha512-VOR0NWFYX65n9gELQdcpqsie5L5ihBXuZGAgaPEp/U7IOSjnPMEH6geE+2f6lcekaNEfWzAHS45mPvSo5bqsUA== + chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -2084,7 +2075,7 @@ chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: +chalk@^2.0.0, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -2093,18 +2084,10 @@ chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" - integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -chalk@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" - integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== +chalk@^4.0.0, chalk@^4.1.0: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -2119,24 +2102,29 @@ chalk@~0.4.0: strip-ansi "~0.1.0" chance@^1.0.4: - version "1.1.7" - resolved "https://registry.yarnpkg.com/chance/-/chance-1.1.7.tgz#e99dde5ac16681af787b5ba94c8277c090d6cfe8" - integrity sha512-bua/2cZEfzS6qPm0vi3JEvGNbriDLcMj9lKxCQOjUcCJRcyjA7umP0zZm6bKWWlBN04vA0L99QGH/CZQawr0eg== + version "1.1.8" + resolved "https://registry.yarnpkg.com/chance/-/chance-1.1.8.tgz#5d6c2b78c9170bf6eb9df7acdda04363085be909" + integrity sha512-v7fi5Hj2VbR6dJEGRWLmJBA83LJMS47pkAbmROFxHWd9qmE1esHRZW8Clf1Fhzr3rjxnNZVCjOEv/ivFxeIMtg== -character-entities-legacy@^1.0.0: - version "1.1.4" - resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz#94bc1845dce70a5bb9d2ecc748725661293d8fc1" - integrity sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA== +character-entities-html4@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-2.0.0.tgz#55fcf3ed00febfe41f8f6a5709d25ab8ed73a449" + integrity sha512-dwT2xh5ZhUAjyP96k57ilMKoTQyASaw9IAMR9U5c1lCu2RUni6O6jxfpUEdO2RcPT6TJFvr8pqsbami4Jk+2oA== -character-entities@^1.0.0: - version "1.2.4" - resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz#e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b" - integrity sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw== +character-entities-legacy@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-2.0.0.tgz#57f4d00974c696e8f74e9f493e7fcb75b44d7ee7" + integrity sha512-YwaEtEvWLpFa6Wh3uVLrvirA/ahr9fki/NUd/Bd4OR6EdJ8D22hovYQEOUCBfQfcqnC4IAMGMsHXY1eXgL4ZZA== -character-reference-invalid@^1.0.0: - version "1.1.4" - resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" - integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg== +character-entities@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-2.0.0.tgz#508355fcc8c73893e0909efc1a44d28da2b6fdf3" + integrity sha512-oHqMj3eAuJ77/P5PaIRcqk+C3hdfNwyCD2DAUcD5gyXkegAuF2USC40CEqPscDk4I8FRGMTojGJQkXDsN5QlJA== + +character-reference-invalid@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-2.0.0.tgz#a0bdeb89c051fe7ed5d3158b2f06af06984f2813" + integrity sha512-pE3Z15lLRxDzWJy7bBHBopRwfI20sbrMVLQTC7xsPglCHf4Wv1e167OgYAFP78co2XlhojDyAqA+IAJse27//g== cheerio@^0.22.0: version "0.22.0" @@ -2160,20 +2148,20 @@ cheerio@^0.22.0: lodash.reject "^4.4.0" lodash.some "^4.4.0" -chokidar@3.5.1, chokidar@^3.0.0, chokidar@^3.4.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" - integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== +chokidar@3.5.2, chokidar@^3.0.0, chokidar@^3.4.1: + version "3.5.2" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" + integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ== dependencies: - anymatch "~3.1.1" + anymatch "~3.1.2" braces "~3.0.2" - glob-parent "~5.1.0" + glob-parent "~5.1.2" is-binary-path "~2.1.0" is-glob "~4.0.1" normalize-path "~3.0.0" - readdirp "~3.5.0" + readdirp "~3.6.0" optionalDependencies: - fsevents "~2.3.1" + fsevents "~2.3.2" chokidar@^1.6.1: version "1.7.0" @@ -2210,7 +2198,7 @@ chokidar@^2.1.8: optionalDependencies: fsevents "^1.2.7" -chownr@^1.1.1: +chownr@^1.1.1, chownr@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== @@ -2243,7 +2231,7 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" -clean-css@^4.1.6, clean-css@^4.2.1, clean-css@^4.2.3: +clean-css@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78" integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA== @@ -2255,15 +2243,6 @@ clean-stack@^2.0.0: resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== -clipboard@^2.0.0: - version "2.0.8" - resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.8.tgz#ffc6c103dd2967a83005f3f61976aa4655a4cdba" - integrity sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ== - dependencies: - good-listener "^1.2.2" - select "^1.1.2" - tiny-emitter "^2.0.0" - cliui@^7.0.2: version "7.0.4" resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" @@ -2290,20 +2269,6 @@ cls-bluebird@^2.1.0: is-bluebird "^1.0.2" shimmer "^1.1.0" -co@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/co/-/co-3.1.0.tgz#4ea54ea5a08938153185e15210c68d9092bc1b78" - integrity sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g= - -coa@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3" - integrity sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA== - dependencies: - "@types/q" "^1.5.1" - chalk "^2.4.1" - q "^1.1.2" - code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" @@ -2311,7 +2276,6 @@ code-point-at@^1.0.0: "codemirror@git+https://github.com/hedgedoc/CodeMirror.git": version "5.58.2" - uid f780b569b3717cdff4c8507538cc63101bfa02e1 resolved "git+https://github.com/hedgedoc/CodeMirror.git#f780b569b3717cdff4c8507538cc63101bfa02e1" collection-visit@^1.0.0: @@ -2346,10 +2310,10 @@ color-name@^1.0.0, color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-string@^1.5.2, color-string@^1.5.4: - version "1.5.5" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz#65474a8f0e7439625f3d27a6a19d89fc45223014" - integrity sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg== +color-string@^1.5.2: + version "1.6.0" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.6.0.tgz#c3915f61fe267672cb7e1e064c9d692219f6c312" + integrity sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA== dependencies: color-name "^1.0.0" simple-swizzle "^0.2.2" @@ -2362,18 +2326,15 @@ color@3.0.x: color-convert "^1.9.1" color-string "^1.5.2" -color@^3.0.0: - version "3.1.3" - resolved "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz#ca67fb4e7b97d611dcde39eceed422067d91596e" - integrity sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ== - dependencies: - color-convert "^1.9.1" - color-string "^1.5.4" +colord@^2.0.1, colord@^2.6: + version "2.7.0" + resolved "https://registry.yarnpkg.com/colord/-/colord-2.7.0.tgz#706ea36fe0cd651b585eb142fe64b6480185270e" + integrity sha512-pZJBqsHz+pYyw3zpX6ZRXWoCHM1/cvFikY9TV8G3zcejCaKE0lhankoj8iScyrrePA8C7yJ5FStfA9zbcOnw7Q== -colorette@^1.2.1, colorette@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" - integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== +colorette@^1.2.1, colorette@^1.2.2, colorette@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40" + integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g== colors@^1.2.1: version "1.4.0" @@ -2395,7 +2356,12 @@ combined-stream@^1.0.5, combined-stream@^1.0.6, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" -commander@2, commander@^2.11.0, commander@^2.19.0, commander@^2.20.0, commander@^2.20.3: +comma-separated-tokens@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.2.tgz#d4c25abb679b7751c880be623c1179780fe1dd98" + integrity sha512-G5yTt3KQN4Yn7Yk4ed73hlZ1evrFKXeUW3086p3PRFNp7m2vIjI6Pg+Kgb+oyzhd9F2qdcoj67+y3SdxL5XWsg== + +commander@2, commander@^2.11.0, commander@^2.20.0, commander@^2.20.3: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -2405,7 +2371,7 @@ commander@^4.1.1: resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== -commander@^7.0.0: +commander@^7.0.0, commander@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== @@ -2436,12 +2402,12 @@ component-inherit@0.0.3: integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM= compress-commons@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.0.tgz#25ec7a4528852ccd1d441a7d4353cd0ece11371b" - integrity sha512-ofaaLqfraD1YRTkrRKPCrGJ1pFeDG/MVCkVVV2FNGeWquSlqw5wOrwOfPQ1xF2u+blpeWASie5EubHz+vsNIgA== + version "4.1.1" + resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.1.tgz#df2a09a7ed17447642bad10a85cc9a19e5c42a7d" + integrity sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ== dependencies: buffer-crc32 "^0.2.13" - crc32-stream "^4.0.1" + crc32-stream "^4.0.2" normalize-path "^3.0.0" readable-stream "^3.6.0" @@ -2495,10 +2461,10 @@ connect-flash@^0.1.1: resolved "https://registry.yarnpkg.com/connect-flash/-/connect-flash-0.1.1.tgz#d8630f26d95a7f851f9956b1e8cc6732f3b6aa30" integrity sha1-2GMPJtlaf4UfmVax6MxnMvO2qjA= -connect-session-sequelize@^7.0.0: - version "7.1.1" - resolved "https://registry.yarnpkg.com/connect-session-sequelize/-/connect-session-sequelize-7.1.1.tgz#e96f33bb3f4560f286cc0e0aefec4f3d3c148fe5" - integrity sha512-sAygnRra0WrfpyHkKpw0uytuYKJO2PKHcregikkqcHaPWlaQsBB3LLBeNXdT9/BTJU20ZCPeiNschg6qW7u9Tw== +connect-session-sequelize@^7.1.2: + version "7.1.2" + resolved "https://registry.yarnpkg.com/connect-session-sequelize/-/connect-session-sequelize-7.1.2.tgz#03ae9a1bd2221526c63a66959b6ddd18599be2ac" + integrity sha512-g24R4u6IfowKl6ApklvkAaKHNtzaKqbwqXkrgkKgkCzlCxdRPZ7qgQ8tWWmeUuVq6GejT1B7M0X8CC4rGfMIRg== dependencies: debug "^4.1.1" deep-equal "^2.0.3" @@ -2518,11 +2484,6 @@ constants-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U= -contains-path@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a" - integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo= - content-disposition@0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" @@ -2536,9 +2497,9 @@ content-type@~1.0.4: integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== convert-source-map@^1.5.0, convert-source-map@^1.5.1: - version "1.7.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" - integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== + version "1.8.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" + integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== dependencies: safe-buffer "~5.1.1" @@ -2560,7 +2521,7 @@ cookie@0.4.0: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== -cookie@^0.4.0, cookie@~0.4.1: +cookie@0.4.1, cookie@^0.4.0, cookie@~0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== @@ -2616,20 +2577,15 @@ core-js@^2.4.0, core-js@^2.5.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== -core-util-is@1.0.2, core-util-is@~1.0.0: +core-util-is@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -cosmiconfig@^5.0.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" - integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA== - dependencies: - import-fresh "^2.0.0" - is-directory "^0.3.1" - js-yaml "^3.13.1" - parse-json "^4.0.0" +core-util-is@~1.0.0: + version "1.0.3" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" + integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== crc-32@^1.2.0: version "1.2.0" @@ -2639,7 +2595,7 @@ crc-32@^1.2.0: exit-on-epipe "~1.0.1" printj "~1.1.0" -crc32-stream@^4.0.1: +crc32-stream@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.2.tgz#c922ad22b38395abe9d3870f02fa8134ed709007" integrity sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w== @@ -2704,33 +2660,26 @@ crypto-browserify@^3.11.0: randombytes "^2.0.0" randomfill "^1.0.3" -css-b64-images@~0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/css-b64-images/-/css-b64-images-0.2.5.tgz#42005d83204b2b4a5d93b6b1a5644133b5927a02" - integrity sha1-QgBdgyBLK0pdk7axpWRBM7WSegI= - -css-color-names@0.0.4, css-color-names@^0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" - integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA= +css-color-names@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-1.0.1.tgz#6ff7ee81a823ad46e020fa2fd6ab40a887e2ba67" + integrity sha512-/loXYOch1qU1biStIFsHH8SxTmOseh1IJqFvy8IujXOm1h+QjUdDhkzOrR5HG8K8mlxREj0yfi8ewCHx0eMxzA== -css-declaration-sorter@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz#c198940f63a76d7e36c1e71018b001721054cb22" - integrity sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA== +css-declaration-sorter@^6.0.3: + version "6.1.3" + resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.3.tgz#e9852e4cf940ba79f509d9425b137d1f94438dc2" + integrity sha512-SvjQjNRZgh4ULK1LDJ2AduPKUKxIqmtU7ZAyi47BTV+M90Qvxr9AB6lKlLbDUfXqI9IQeYA8LbAsCZPpJEV3aA== dependencies: - postcss "^7.0.1" timsort "^0.3.0" -css-loader@5.2.4: - version "5.2.4" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.4.tgz#e985dcbce339812cb6104ef3670f08f9893a1536" - integrity sha512-OFYGyINCKkdQsTrSYxzGSFnGS4gNjcXkKkQgWxK138jgnPt+lepxdjSZNc8sHAl5vP3DhsJUxufWIjOwI8PMMw== +css-loader@5.2.7: + version "5.2.7" + resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae" + integrity sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg== dependencies: - camelcase "^6.2.0" icss-utils "^5.1.0" loader-utils "^2.0.0" - postcss "^8.2.10" + postcss "^8.2.15" postcss-modules-extract-imports "^3.0.0" postcss-modules-local-by-default "^4.0.0" postcss-modules-scope "^3.0.0" @@ -2739,20 +2688,16 @@ css-loader@5.2.4: schema-utils "^3.0.0" semver "^7.3.5" -css-select-base-adapter@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" - integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w== - -css-select@^2.0.0, css-select@^2.0.2: - version "2.1.0" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef" - integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ== +css-select@^4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067" + integrity sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA== dependencies: boolbase "^1.0.0" - css-what "^3.2.1" - domutils "^1.7.0" - nth-check "^1.0.2" + css-what "^5.0.0" + domhandler "^4.2.0" + domutils "^2.6.0" + nth-check "^2.0.0" css-select@~1.2.0: version "1.2.0" @@ -2764,15 +2709,7 @@ css-select@~1.2.0: domutils "1.5.1" nth-check "~1.0.1" -css-tree@1.0.0-alpha.37: - version "1.0.0-alpha.37" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22" - integrity sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg== - dependencies: - mdn-data "2.0.4" - source-map "^0.6.1" - -css-tree@^1.1.2: +css-tree@^1.1.2, css-tree@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== @@ -2785,10 +2722,10 @@ css-what@2.1: resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg== -css-what@^3.2.1: - version "3.4.2" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" - integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ== +css-what@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.0.1.tgz#3efa820131f4669a8ac2408f9c32e7c7de9f4cad" + integrity sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg== cssesc@^3.0.0: version "3.0.0" @@ -2800,75 +2737,57 @@ cssfilter@0.0.10: resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae" integrity sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4= -cssnano-preset-default@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz#920622b1fc1e95a34e8838203f1397a504f2d3ff" - integrity sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ== - dependencies: - css-declaration-sorter "^4.0.1" - cssnano-util-raw-cache "^4.0.1" - postcss "^7.0.0" - postcss-calc "^7.0.1" - postcss-colormin "^4.0.3" - postcss-convert-values "^4.0.1" - postcss-discard-comments "^4.0.2" - postcss-discard-duplicates "^4.0.2" - postcss-discard-empty "^4.0.1" - postcss-discard-overridden "^4.0.1" - postcss-merge-longhand "^4.0.11" - postcss-merge-rules "^4.0.3" - postcss-minify-font-values "^4.0.2" - postcss-minify-gradients "^4.0.2" - postcss-minify-params "^4.0.2" - postcss-minify-selectors "^4.0.2" - postcss-normalize-charset "^4.0.1" - postcss-normalize-display-values "^4.0.2" - postcss-normalize-positions "^4.0.2" - postcss-normalize-repeat-style "^4.0.2" - postcss-normalize-string "^4.0.2" - postcss-normalize-timing-functions "^4.0.2" - postcss-normalize-unicode "^4.0.1" - postcss-normalize-url "^4.0.1" - postcss-normalize-whitespace "^4.0.2" - postcss-ordered-values "^4.1.2" - postcss-reduce-initial "^4.0.3" - postcss-reduce-transforms "^4.0.2" - postcss-svgo "^4.0.3" - postcss-unique-selectors "^4.0.1" - -cssnano-util-get-arguments@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz#ed3a08299f21d75741b20f3b81f194ed49cc150f" - integrity sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8= - -cssnano-util-get-match@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz#c0e4ca07f5386bb17ec5e52250b4f5961365156d" - integrity sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0= - -cssnano-util-raw-cache@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz#b26d5fd5f72a11dfe7a7846fb4c67260f96bf282" - integrity sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA== - dependencies: - postcss "^7.0.0" - -cssnano-util-same-parent@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz#574082fb2859d2db433855835d9a8456ea18bbf3" - integrity sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q== +cssnano-preset-default@^5.1.4: + version "5.1.4" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.4.tgz#359943bf00c5c8e05489f12dd25f3006f2c1cbd2" + integrity sha512-sPpQNDQBI3R/QsYxQvfB4mXeEcWuw0wGtKtmS5eg8wudyStYMgKOQT39G07EbW1LB56AOYrinRS9f0ig4Y3MhQ== + dependencies: + css-declaration-sorter "^6.0.3" + cssnano-utils "^2.0.1" + postcss-calc "^8.0.0" + postcss-colormin "^5.2.0" + postcss-convert-values "^5.0.1" + postcss-discard-comments "^5.0.1" + postcss-discard-duplicates "^5.0.1" + postcss-discard-empty "^5.0.1" + postcss-discard-overridden "^5.0.1" + postcss-merge-longhand "^5.0.2" + postcss-merge-rules "^5.0.2" + postcss-minify-font-values "^5.0.1" + postcss-minify-gradients "^5.0.2" + postcss-minify-params "^5.0.1" + postcss-minify-selectors "^5.1.0" + postcss-normalize-charset "^5.0.1" + postcss-normalize-display-values "^5.0.1" + postcss-normalize-positions "^5.0.1" + postcss-normalize-repeat-style "^5.0.1" + postcss-normalize-string "^5.0.1" + postcss-normalize-timing-functions "^5.0.1" + postcss-normalize-unicode "^5.0.1" + postcss-normalize-url "^5.0.2" + postcss-normalize-whitespace "^5.0.1" + postcss-ordered-values "^5.0.2" + postcss-reduce-initial "^5.0.1" + postcss-reduce-transforms "^5.0.1" + postcss-svgo "^5.0.2" + postcss-unique-selectors "^5.0.1" + +cssnano-utils@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-2.0.1.tgz#8660aa2b37ed869d2e2f22918196a9a8b6498ce2" + integrity sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ== -cssnano@^4.1.10: - version "4.1.11" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.11.tgz#c7b5f5b81da269cb1fd982cb960c1200910c9a99" - integrity sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g== +cssnano@^5.0.2: + version "5.0.8" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.8.tgz#39ad166256980fcc64faa08c9bb18bb5789ecfa9" + integrity sha512-Lda7geZU0Yu+RZi2SGpjYuQz4HI4/1Y+BhdD0jL7NXAQ5larCzVn+PUGuZbDMYz904AXXCOgO5L1teSvgu7aFg== dependencies: - cosmiconfig "^5.0.0" - cssnano-preset-default "^4.0.8" - is-resolvable "^1.0.0" - postcss "^7.0.0" + cssnano-preset-default "^5.1.4" + is-resolvable "^1.1.0" + lilconfig "^2.0.3" + yaml "^1.10.2" -csso@^4.0.2: +csso@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA== @@ -3108,7 +3027,7 @@ d3-zoom@1: d3-selection "1" d3-transition "1" -d3@^5.14, d3@^5.7.0: +d3@^5.14, d3@^5.16.0: version "5.16.0" resolved "https://registry.yarnpkg.com/d3/-/d3-5.16.0.tgz#9c5e8d3b56403c79d4ed42fbd62f6113f199c877" integrity sha512-4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw== @@ -3155,7 +3074,7 @@ dagre-d3@^0.6.4: graphlib "^2.1.8" lodash "^4.17.15" -dagre@^0.8.4, dagre@^0.8.5: +dagre@^0.8.5: version "0.8.5" resolved "https://registry.yarnpkg.com/dagre/-/dagre-0.8.5.tgz#ba30b0055dac12b6c1fcc247817442777d06afee" integrity sha512-/aTqmnRta7x7MCCpExk7HQL2O4owCT2h8NT//9I1OQ9vt29Pa0BzSAkR5lwFUcQ7491yVi/3CXU9jQ5o0Mn2Sw== @@ -3170,11 +3089,6 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" -date-utils@*: - version "1.2.21" - resolved "https://registry.yarnpkg.com/date-utils/-/date-utils-1.2.21.tgz#61fb16cdc1274b3c9acaaffe9fc69df8720a2b64" - integrity sha1-YfsWzcEnSzyayq/+n8ad+HIKK2Q= - debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -3189,20 +3103,27 @@ debug@3.1.0, debug@~3.1.0: dependencies: ms "2.0.0" -debug@4.3.1, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: +debug@4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== dependencies: ms "2.1.2" -debug@^3.2.6: +debug@^3.2.6, debug@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" +debug@^4.0.0, debug@^4.0.1, debug@^4.1.1, debug@^4.3.1: + version "4.3.2" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" + integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== + dependencies: + ms "2.1.2" + debug@~4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" @@ -3252,9 +3173,9 @@ deep-freeze@^0.0.1: integrity sha1-OgsABd4YZygZ39OM0x+RF5yJPoQ= deep-is@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" - integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= + version "0.1.4" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" + integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== define-properties@^1.1.2, define-properties@^1.1.3: version "1.1.3" @@ -3290,31 +3211,26 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= -delegate@^3.1.2: - version "3.2.0" - resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166" - integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw== - delegates@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= -denque@^1.4.1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.0.tgz#773de0686ff2d8ec2ff92914316a47b73b1c73de" - integrity sha512-CYiCSgIF1p6EUByQPlGkKnP1M9g0ZV3qMIrqMqZqdwazygIA/YP2vrbcyl1h/WppKJTdl1F85cXIle+394iDAQ== - -depd@^2.0.0, depd@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" - integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== +denque@^1.4.1, denque@^1.5.0: + version "1.5.1" + resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.1.tgz#07f670e29c9a78f8faecb2566a1e2c11929c5cbf" + integrity sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw== depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= +depd@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + des.js@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843" @@ -3342,7 +3258,6 @@ detect-libc@^1.0.2: "diff-match-patch@git+https://github.com/hackmdio/diff-match-patch.git": version "1.1.1" - uid c2f8fb9d69aa9490b764850aa86ba442c93ccf78 resolved "git+https://github.com/hackmdio/diff-match-patch.git#c2f8fb9d69aa9490b764850aa86ba442c93ccf78" diff@5.0.0: @@ -3366,13 +3281,12 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" -doctrine@1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" - integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo= +doctrine@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" + integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw== dependencies: esutils "^2.0.2" - isarray "^1.0.0" doctrine@^3.0.0: version "3.0.0" @@ -3381,7 +3295,7 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" -dom-converter@^0.2: +dom-converter@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA== @@ -3396,6 +3310,15 @@ dom-serializer@0: domelementtype "^2.0.1" entities "^2.0.0" +dom-serializer@^1.0.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" + integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig== + dependencies: + domelementtype "^2.0.1" + domhandler "^4.2.0" + entities "^2.0.0" + dom-serializer@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0" @@ -3414,7 +3337,7 @@ domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1: resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== -domelementtype@^2.0.1: +domelementtype@^2.0.1, domelementtype@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A== @@ -3426,11 +3349,23 @@ domhandler@^2.3.0: dependencies: domelementtype "1" +domhandler@^4.0.0, domhandler@^4.2.0: + version "4.2.2" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.2.tgz#e825d721d19a86b8c201a35264e226c678ee755f" + integrity sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w== + dependencies: + domelementtype "^2.2.0" + domino@^2.1.6: version "2.1.6" resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.6.tgz#fe4ace4310526e5e7b9d12c7de01b7f485a57ffe" integrity sha512-3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ== +dompurify@2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.1.tgz#a47059ca21fd1212d3c8f71fdea6943b8bfbdf6a" + integrity sha512-xGWt+NHAQS+4tpgbOAI08yxW0Pr256Gu/FNE2frZVTbgrBUn8M7tz7/ktS/LZ2MHeGqz6topj0/xY+y8R5FBFw== + domutils@1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" @@ -3439,7 +3374,7 @@ domutils@1.5.1: dom-serializer "0" domelementtype "1" -domutils@^1.5.1, domutils@^1.7.0: +domutils@^1.5.1: version "1.7.0" resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg== @@ -3447,6 +3382,15 @@ domutils@^1.5.1, domutils@^1.7.0: dom-serializer "0" domelementtype "1" +domutils@^2.5.2, domutils@^2.6.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" + integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== + dependencies: + dom-serializer "^1.0.1" + domelementtype "^2.2.0" + domhandler "^4.2.0" + dot-case@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" @@ -3455,13 +3399,6 @@ dot-case@^3.0.4: no-case "^3.0.4" tslib "^2.0.3" -dot-prop@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" - integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== - dependencies: - is-obj "^2.0.0" - dottie@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/dottie/-/dottie-2.0.2.tgz#cc91c0726ce3a054ebf11c55fbc92a7f266dd154" @@ -3485,13 +3422,6 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" -ecdsa-sig-formatter@1.0.11: - version "1.0.11" - resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf" - integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ== - dependencies: - safe-buffer "^5.0.1" - ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -3504,10 +3434,10 @@ ejs@^3.0.0: dependencies: jake "^10.6.1" -electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.723: - version "1.3.727" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz#857e310ca00f0b75da4e1db6ff0e073cc4a91ddf" - integrity sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg== +electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.830: + version "1.3.836" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.836.tgz#823cb9c98f28c64c673920f1c90ea3826596eaf9" + integrity sha512-Ney3pHOJBWkG/AqYjrW0hr2AUCsao+2uvq9HUlRP8OlpSdk/zOHOUJP7eu0icDvePC9DlgffuelP4TnOJmMRUg== elliptic@^6.5.3: version "6.5.4" @@ -3527,6 +3457,11 @@ emoji-regex@^8.0.0: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== +emoji-regex@^9.2.2: + version "9.2.2" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" + integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== + emojify.js@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/emojify.js/-/emojify.js-1.1.0.tgz#079fff223307c9007f570785e8e4935d5c398beb" @@ -3625,13 +3560,6 @@ entities@~2.1.0: resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5" integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w== -entity-decode@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/entity-decode/-/entity-decode-2.0.2.tgz#e4f807e52c3294246e9347d1f2b02b07fd5f92e7" - integrity sha512-5CCY/3ci4MC1m2jlumNjWd7VBFt4VfFnmSqSNmVcXq4gxM3Vmarxtt+SvmBnzwLS669MWdVuXboNVj1qN2esVg== - dependencies: - he "^1.1.1" - envinfo@^7.7.3: version "7.8.1" resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" @@ -3644,34 +3572,36 @@ errno@^0.1.1, errno@^0.1.3, errno@~0.1.7: dependencies: prr "~1.0.1" -error-ex@^1.2.0, error-ex@^1.3.1: +error-ex@^1.3.1: version "1.3.2" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== dependencies: is-arrayish "^0.2.1" -es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2: - version "1.18.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz#ab80b359eecb7ede4c298000390bc5ac3ec7b5a4" - integrity sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw== +es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2, es-abstract@^1.18.5: + version "1.18.6" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.6.tgz#2c44e3ea7a6255039164d26559777a6d978cb456" + integrity sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ== dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" function-bind "^1.1.1" get-intrinsic "^1.1.1" + get-symbol-description "^1.0.0" has "^1.0.3" has-symbols "^1.0.2" - is-callable "^1.2.3" + internal-slot "^1.0.3" + is-callable "^1.2.4" is-negative-zero "^2.0.1" - is-regex "^1.1.2" - is-string "^1.0.5" - object-inspect "^1.9.0" + is-regex "^1.1.4" + is-string "^1.0.7" + object-inspect "^1.11.0" object-keys "^1.1.1" object.assign "^4.1.2" string.prototype.trimend "^1.0.4" string.prototype.trimstart "^1.0.4" - unbox-primitive "^1.0.0" + unbox-primitive "^1.0.1" es-get-iterator@^1.1.1: version "1.1.2" @@ -3701,22 +3631,23 @@ es6-error@^4.1.1: resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== -esbuild-loader@2.13.0: - version "2.13.0" - resolved "https://registry.yarnpkg.com/esbuild-loader/-/esbuild-loader-2.13.0.tgz#f5a3602a89a3b728506ae3e1887304fffeef9270" - integrity sha512-gC9lML8RGkTSWG2pJVEOZRLMoIluq1Jd7OzzVkOZKMzbMDMWDhXEwXLs60n+aglnAYa9GVrD/UXjTHkM51nBsg== +esbuild-loader@2.15.1: + version "2.15.1" + resolved "https://registry.yarnpkg.com/esbuild-loader/-/esbuild-loader-2.15.1.tgz#5a3940f5d20317f1a35720efa33e933f97c923e9" + integrity sha512-JRBL6uTeWplMbylNBt9gxLKMjD8wKnqGq786QV/cm/nPBSNA9/kC7/vNwCXTDPfYqHoWsjyfH7ub9ekN0kdAYQ== dependencies: - esbuild "^0.11.19" + esbuild "^0.12.21" joycon "^3.0.1" json5 "^2.2.0" loader-utils "^2.0.0" - type-fest "^1.0.1" + tapable "^2.2.0" + type-fest "^1.4.0" webpack-sources "^2.2.0" -esbuild@^0.11.19: - version "0.11.20" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.11.20.tgz#7cefa1aee8b372c184e42457885f7ce5d3e62a1e" - integrity sha512-QOZrVpN/Yz74xfat0H6euSgn3RnwLevY1mJTEXneukz1ln9qB+ieaerRMzSeETpz/UJWsBMzRVR/andBht5WKw== +esbuild@^0.12.21: + version "0.12.27" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.12.27.tgz#9bcfb837111c5e89b189188dde339515b213a724" + integrity sha512-G42siADcTdRU1qRBxhiIiVLG4gcEMyWV4CWfLBdSii+olCueZJHFRHc7EqQRnRvNkSQq88i0k1Oufw/YVueUWQ== escalade@^3.1.1: version "3.1.1" @@ -3728,7 +3659,7 @@ escape-html@1.0.3, escape-html@^1.0.3, escape-html@~1.0.3: resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= -escape-string-regexp@4.0.0: +escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== @@ -3738,25 +3669,25 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -eslint-config-standard@16.0.2: - version "16.0.2" - resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.2.tgz#71e91727ac7a203782d0a5ca4d1c462d14e234f6" - integrity sha512-fx3f1rJDsl9bY7qzyX8SAtP8GBSk6MfXFaTfaGgk12aAYW4gJSyRm7dM790L6cbXv63fvjY4XeSzXnb4WM+SKw== +eslint-config-standard@16.0.3: + version "16.0.3" + resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz#6c8761e544e96c531ff92642eeb87842b8488516" + integrity sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg== -eslint-import-resolver-node@^0.3.4: - version "0.3.4" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717" - integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA== +eslint-import-resolver-node@^0.3.6: + version "0.3.6" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd" + integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw== dependencies: - debug "^2.6.9" - resolve "^1.13.1" + debug "^3.2.7" + resolve "^1.20.0" -eslint-module-utils@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6" - integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA== +eslint-module-utils@^2.6.2: + version "2.6.2" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.2.tgz#94e5540dd15fe1522e8ffa3ec8db3b7fa7e7a534" + integrity sha512-QG8pcgThYOuqxupd06oYTZoNOGaUdTY1PqK+oS6ElF6vs4pBdk/aYxFVQQXzcrAqp9m7cl7lb2ubazX+g16k2Q== dependencies: - debug "^2.6.9" + debug "^3.2.7" pkg-dir "^2.0.0" eslint-plugin-es@^3.0.0: @@ -3767,24 +3698,26 @@ eslint-plugin-es@^3.0.0: eslint-utils "^2.0.0" regexpp "^3.0.0" -eslint-plugin-import@2.22.1: - version "2.22.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702" - integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw== +eslint-plugin-import@2.24.2: + version "2.24.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz#2c8cd2e341f3885918ee27d18479910ade7bb4da" + integrity sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q== dependencies: - array-includes "^3.1.1" - array.prototype.flat "^1.2.3" - contains-path "^0.1.0" + array-includes "^3.1.3" + array.prototype.flat "^1.2.4" debug "^2.6.9" - doctrine "1.5.0" - eslint-import-resolver-node "^0.3.4" - eslint-module-utils "^2.6.0" + doctrine "^2.1.0" + eslint-import-resolver-node "^0.3.6" + eslint-module-utils "^2.6.2" + find-up "^2.0.0" has "^1.0.3" + is-core-module "^2.6.0" minimatch "^3.0.4" - object.values "^1.1.1" - read-pkg-up "^2.0.0" - resolve "^1.17.0" - tsconfig-paths "^3.9.0" + object.values "^1.1.4" + pkg-up "^2.0.0" + read-pkg-up "^3.0.0" + resolve "^1.20.0" + tsconfig-paths "^3.11.0" eslint-plugin-node@11.1.0: version "11.1.0" @@ -3841,28 +3774,31 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== -eslint@7.26.0: - version "7.26.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.26.0.tgz#d416fdcdcb3236cd8f282065312813f8c13982f6" - integrity sha512-4R1ieRf52/izcZE7AlLy56uIHHDLT74Yzz2Iv2l6kDaYvEu9x+wMB5dZArVL8SYGXSYV2YAg70FcW5Y5nGGNIg== +eslint@7.32.0: + version "7.32.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d" + integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA== dependencies: "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.4.1" + "@eslint/eslintrc" "^0.4.3" + "@humanwhocodes/config-array" "^0.5.0" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" debug "^4.0.1" doctrine "^3.0.0" enquirer "^2.3.5" + escape-string-regexp "^4.0.0" eslint-scope "^5.1.1" eslint-utils "^2.1.0" eslint-visitor-keys "^2.0.0" espree "^7.3.1" esquery "^1.4.0" esutils "^2.0.2" + fast-deep-equal "^3.1.3" file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" - glob-parent "^5.0.0" + glob-parent "^5.1.2" globals "^13.6.0" ignore "^4.0.6" import-fresh "^3.0.0" @@ -3871,7 +3807,7 @@ eslint@7.26.0: js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" - lodash "^4.17.21" + lodash.merge "^4.6.2" minimatch "^3.0.4" natural-compare "^1.4.0" optionator "^0.9.1" @@ -3880,7 +3816,7 @@ eslint@7.26.0: semver "^7.2.1" strip-ansi "^6.0.0" strip-json-comments "^3.1.0" - table "^6.0.4" + table "^6.0.9" text-table "^0.2.0" v8-compile-cache "^2.0.3" @@ -3961,9 +3897,9 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: safe-buffer "^5.1.1" execa@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.0.0.tgz#4029b0007998a841fbd1032e5f4de86a3c1e3376" - integrity sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ== + version "5.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== dependencies: cross-spawn "^7.0.3" get-stream "^6.0.0" @@ -4007,6 +3943,15 @@ expand-range@^1.8.1: dependencies: fill-range "^2.1.0" +exports-loader@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/exports-loader/-/exports-loader-1.1.1.tgz#88c9a6877ee6a5519d7c41a016bdd99148421e69" + integrity sha512-CmyhIR2sJ3KOfVsHjsR0Yvo+0lhRhRMAevCbB8dhTVLHsZPs0lCQTvRmR9YNvBXDBxUuhmCE2f54KqEjZUaFrg== + dependencies: + loader-utils "^2.0.0" + schema-utils "^3.0.0" + source-map "^0.6.1" + expose-loader@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/expose-loader/-/expose-loader-1.0.3.tgz#5686d3b78cac8831c4af11c3dc361563deb8a9c0" @@ -4016,17 +3961,17 @@ expose-loader@1.0.3: schema-utils "^3.0.0" express-session@^1.14.2: - version "1.17.1" - resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.17.1.tgz#36ecbc7034566d38c8509885c044d461c11bf357" - integrity sha512-UbHwgqjxQZJiWRTMyhvWGvjBQduGCSBDhhZXYenziMFjxst5rMV+aJZ6hKPHZnPyHGsrqRICxtX8jtEbm/z36Q== + version "1.17.2" + resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.17.2.tgz#397020374f9bf7997f891b85ea338767b30d0efd" + integrity sha512-mPcYcLA0lvh7D4Oqr5aNJFMtBMKPLl++OKKxkHzZ0U0oDq1rpKBnkR5f5vCHR26VeArlTOEF9td4x5IjICksRQ== dependencies: - cookie "0.4.0" + cookie "0.4.1" cookie-signature "1.0.6" debug "2.6.9" depd "~2.0.0" on-headers "~1.0.2" parseurl "~1.3.3" - safe-buffer "5.2.0" + safe-buffer "5.2.1" uid-safe "~2.1.5" express@>=4.14: @@ -4121,22 +4066,21 @@ extsprintf@^1.2.0: resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= -fast-deep-equal@^3.1.1: +fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== fast-glob@^3.1.1, fast-glob@^3.2.4: - version "3.2.5" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661" - integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg== + version "3.2.7" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" + integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.0" + glob-parent "^5.1.2" merge2 "^1.3.0" - micromatch "^4.0.2" - picomatch "^2.2.1" + micromatch "^4.0.4" fast-json-stable-stringify@^2.0.0: version "2.1.0" @@ -4149,14 +4093,16 @@ fast-levenshtein@^2.0.6: integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= fast-safe-stringify@^2.0.4: - version "2.0.7" - resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743" - integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA== + version "2.1.1" + resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884" + integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA== fast-xml-parser@^3.17.5, fast-xml-parser@^3.19.0: - version "3.19.0" - resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.19.0.tgz#cb637ec3f3999f51406dd8ff0e6fc4d83e520d01" - integrity sha512-4pXwmBplsCPv8FOY1WRakF970TjNGnGnfbOnLqjlYvMiF1SR3yOHyxMR/YCXpPTOspNF5gwudqktIP4VsWkvBg== + version "3.20.0" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.20.0.tgz#b9ce9ddbc44d2cb7e38f846c5929c667bbf0936d" + integrity sha512-cMQwDJYVDjMPU56DviszewgMKuNzuf4NQSBuDf9RgZ6FKm5QEMxW05Za8lvnuL6moxoeZVUWBlL733WmovvV6g== + dependencies: + strnum "^1.0.3" fastest-levenshtein@^1.0.12: version "1.0.12" @@ -4164,16 +4110,16 @@ fastest-levenshtein@^1.0.12: integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow== fastq@^1.6.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858" - integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g== + version "1.13.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" + integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== dependencies: reusify "^1.0.4" -fault@^1.0.0, fault@^1.0.2: - version "1.0.4" - resolved "https://registry.yarnpkg.com/fault/-/fault-1.0.4.tgz#eafcfc0a6d214fc94601e170df29954a4f842f13" - integrity sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA== +fault@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/fault/-/fault-2.0.0.tgz#ad2198a6e28e344dcda76a7b32406b1039f0b707" + integrity sha512-JsDj9LFcoC+4ChII1QpXPA7YIaY8zmqPYw7h9j5n7St7a0BBKfNnwEBAUQRBx70o2q4rs+BeSNHk8Exm6xE7fQ== dependencies: format "^0.2.0" @@ -4187,13 +4133,6 @@ figgy-pudding@^3.5.1: resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw== -figures@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" - integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== - dependencies: - escape-string-regexp "^1.0.5" - file-entry-cache@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" @@ -4215,14 +4154,13 @@ file-saver@2.0.5: integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA== file-type@^16.1.0: - version "16.4.0" - resolved "https://registry.yarnpkg.com/file-type/-/file-type-16.4.0.tgz#464197e44bd94a452d77b09085d977ae0dad2df4" - integrity sha512-MDAkwha3wHg11Lp++2T3Gu347eC/DB4r7nYj6iZaf1l7UhGBh2746QKxg0BWC8w2dJsxUEmH8KvLueX+GthN2w== + version "16.5.3" + resolved "https://registry.yarnpkg.com/file-type/-/file-type-16.5.3.tgz#474b7e88c74724046abb505e9b8ed4db30c4fc06" + integrity sha512-uVsl7iFhHSOY4bEONLlTK47iAHtNsFHWP5YE4xJfZ4rnX7S1Q3wce09XgqSC7E/xh8Ncv/be1lNoyprlUH/x6A== dependencies: readable-web-to-node-stream "^3.0.0" - strtok3 "^6.0.3" - token-types "^2.0.0" - typedarray-to-buffer "^3.1.5" + strtok3 "^6.2.4" + token-types "^4.1.1" file-uri-to-path@1.0.0: version "1.0.0" @@ -4301,9 +4239,9 @@ find-cache-dir@^2.1.0: pkg-dir "^3.0.0" find-cache-dir@^3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880" - integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ== + version "3.3.2" + resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" + integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== dependencies: commondir "^1.0.1" make-dir "^3.0.2" @@ -4353,9 +4291,9 @@ flat@^5.0.2: integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== flatted@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469" - integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== + version "3.2.2" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561" + integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA== flowchart.js@1.15.0: version "1.15.0" @@ -4377,10 +4315,10 @@ fn.name@1.x.x: resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== -follow-redirects@^1.10.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43" - integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg== +follow-redirects@^1.14.0: + version "1.14.3" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.3.tgz#6ada78118d8d24caee595595accdc0ac6abd022e" + integrity sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw== for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" @@ -4404,10 +4342,10 @@ forever-agent@~0.6.1: resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= -fork-awesome@1.1.7: - version "1.1.7" - resolved "https://registry.yarnpkg.com/fork-awesome/-/fork-awesome-1.1.7.tgz#1427da1cac3d1713046ee88427e5fcecb9501d21" - integrity sha512-IHI7XCSXrKfUIWslse8c/PaaVDT1oBaYge+ju40ihL2ooiQeBpTr4wvIXhgTd2NuhntlvX+M5jYHAPTzNlmv0g== +fork-awesome@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fork-awesome/-/fork-awesome-1.2.0.tgz#acd43f1e1f54510fa45209c31385b4fde3a95003" + integrity sha512-MNwTBnnudMIweHfDtTY8TeR5fxIAZ2w9o8ITn5XDySqdxa4k5AH8IuAMa89RVxDxgPNlosZxqkFKN5UmHXuYSw== form-data@1.0.0-rc3: version "1.0.0-rc3" @@ -4418,15 +4356,6 @@ form-data@1.0.0-rc3: combined-stream "^1.0.5" mime-types "^2.1.3" -form-data@^2.3.2: - version "2.5.1" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4" - integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.6" - mime-types "^2.1.12" - form-data@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" @@ -4451,10 +4380,10 @@ formidable@~1.0.14: resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.0.17.tgz#ef5491490f9433b705faa77249c99029ae348559" integrity sha1-71SRSQ+UM7cF+qdyScmQKa40hVk= -forwarded@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" - integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= +forwarded@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" + integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== fragment-cache@^0.2.1: version "0.2.1" @@ -4481,7 +4410,7 @@ fs-constants@^1.0.0: resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== -fs-minipass@^1.2.5: +fs-minipass@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== @@ -4523,7 +4452,7 @@ fsevents@^1.0.0, fsevents@^1.2.7: bindings "^1.5.0" nan "^2.12.1" -fsevents@~2.3.1: +fsevents@~2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== @@ -4593,6 +4522,14 @@ get-stream@^6.0.0: resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== +get-symbol-description@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" + integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.1.1" + get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" @@ -4633,26 +4570,14 @@ glob-parent@^3.1.0: is-glob "^3.1.0" path-dirname "^1.0.0" -glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0: +glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== dependencies: is-glob "^4.0.1" -glob@7.1.6: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: +glob@7.1.7, glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: version "7.1.7" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== @@ -4664,17 +4589,10 @@ glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: once "^1.3.0" path-is-absolute "^1.0.0" -globals@^12.1.0: - version "12.4.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" - integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== - dependencies: - type-fest "^0.8.1" - -globals@^13.6.0: - version "13.8.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz#3e20f504810ce87a8d72e55aecf8435b50f4c1b3" - integrity sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q== +globals@^13.6.0, globals@^13.9.0: + version "13.11.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz#40ef678da117fe7bd2e28f1fab24951bd0255be7" + integrity sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g== dependencies: type-fest "^0.20.2" @@ -4684,9 +4602,9 @@ globals@^9.18.0: integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ== globby@^11.0.1: - version "11.0.3" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb" - integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg== + version "11.0.4" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" + integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg== dependencies: array-union "^2.1.0" dir-glob "^3.0.1" @@ -4695,19 +4613,12 @@ globby@^11.0.1: merge2 "^1.3.0" slash "^3.0.0" -good-listener@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50" - integrity sha1-1TswzfkxPf+33JoNR3CWqm0UXFA= - dependencies: - delegate "^3.1.2" - graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.2.0: - version "4.2.6" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" - integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== + version "4.2.8" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" + integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== -graphlib@^2.1.7, graphlib@^2.1.8: +graphlib@^2.1.8: version "2.1.8" resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.8.tgz#5761d414737870084c92ec7b5dbcb0592c9d35da" integrity sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A== @@ -4719,18 +4630,6 @@ growl@1.10.5: resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e" integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA== -handlebars@^4.5.2: - version "4.7.7" - resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" - integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA== - dependencies: - minimist "^1.2.5" - neo-async "^2.6.0" - source-map "^0.6.1" - wordwrap "^1.0.0" - optionalDependencies: - uglify-js "^3.1.4" - har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" @@ -4783,11 +4682,23 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== +has-flag@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-5.0.1.tgz#5483db2ae02a472d1d0691462fc587d1843cd940" + integrity sha512-CsNUt5x9LUdx6hnk/E2SZLsDyvfqANZSUq4+D3D8RzDJ2M+HDTIkF60ibS1vHaK55vzgiZw1bEPFG9yH7l33wA== + has-symbols@^1.0.1, has-symbols@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== +has-tostringtag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== + dependencies: + has-symbols "^1.0.2" + has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -4824,7 +4735,7 @@ has-values@^1.0.0: is-number "^3.0.0" kind-of "^4.0.0" -has@^1.0.0, has@^1.0.3: +has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== @@ -4848,7 +4759,68 @@ hash.js@^1.0.0, hash.js@^1.0.3: inherits "^2.0.3" minimalistic-assert "^1.0.1" -he@1.2.0, he@^1.1.1, he@^1.2.0: +hast-util-from-parse5@^7.0.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/hast-util-from-parse5/-/hast-util-from-parse5-7.1.0.tgz#c129dd3a24dd8a867ab8a029ca47e27aa54864b7" + integrity sha512-m8yhANIAccpU4K6+121KpPP55sSl9/samzQSQGpb0mTExcNh2WlvjtMwSWFhg6uqD4Rr6Nfa8N6TMypQM51rzQ== + dependencies: + "@types/hast" "^2.0.0" + "@types/parse5" "^6.0.0" + "@types/unist" "^2.0.0" + hastscript "^7.0.0" + property-information "^6.0.0" + vfile "^5.0.0" + vfile-location "^4.0.0" + web-namespaces "^2.0.0" + +hast-util-is-element@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/hast-util-is-element/-/hast-util-is-element-2.1.1.tgz#863019a27400dc4f1aedfa4900627f42fd75c2b7" + integrity sha512-ag0fiZfRWsPiR1udvnSbaazJLGv8qd8E+/e3rW8rUZhbKG4HNJmFL4QkEceN+22BgE+uozXY30z/s+2dL6Z++g== + dependencies: + "@types/hast" "^2.0.0" + "@types/unist" "^2.0.0" + +hast-util-parse-selector@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-3.1.0.tgz#a519e27e8b61bd5a98fad494ed06131ce68d9c3f" + integrity sha512-AyjlI2pTAZEOeu7GeBPZhROx0RHBnydkQIXlhnFzDi0qfXTmGUWoCYZtomHbrdrheV4VFUlPcfJ6LMF5T6sQzg== + dependencies: + "@types/hast" "^2.0.0" + +hast-util-to-html@^8.0.0: + version "8.0.2" + resolved "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-8.0.2.tgz#3445497508e2157a3169864eb43fb6ee929d3cbe" + integrity sha512-ipLhUTMyyJi9F/LXaNDG9BrRdshP6obCfmUZYbE/+T639IdzqAOkKN4DyrEyID0gbb+rsC3PKf0XlviZwzomhw== + dependencies: + "@types/hast" "^2.0.0" + ccount "^2.0.0" + comma-separated-tokens "^2.0.0" + hast-util-is-element "^2.0.0" + hast-util-whitespace "^2.0.0" + html-void-elements "^2.0.0" + property-information "^6.0.0" + space-separated-tokens "^2.0.0" + stringify-entities "^4.0.0" + unist-util-is "^5.0.0" + +hast-util-whitespace@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-2.0.0.tgz#4fc1086467cc1ef5ba20673cb6b03cec3a970f1c" + integrity sha512-Pkw+xBHuV6xFeJprJe2BBEoDV+AvQySaz3pPDRUs5PNZEMQjpXJJueqrpcHIXxnWTcAGi/UOCgVShlkY6kLoqg== + +hastscript@^7.0.0: + version "7.0.2" + resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-7.0.2.tgz#d811fc040817d91923448a28156463b2e40d590a" + integrity sha512-uA8ooUY4ipaBvKcMuPehTAB/YfFLSSzCwFSwT6ltJbocFUKH/GDHLN+tflq7lSRf9H86uOuxOFkh1KgIy3Gg2g== + dependencies: + "@types/hast" "^2.0.0" + comma-separated-tokens "^2.0.0" + hast-util-parse-selector "^3.0.0" + property-information "^6.0.0" + space-separated-tokens "^2.0.0" + +he@1.2.0, he@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== @@ -4858,15 +4830,10 @@ helmet@^4.5.0: resolved "https://registry.yarnpkg.com/helmet/-/helmet-4.6.0.tgz#579971196ba93c5978eb019e4e8ec0e50076b4df" integrity sha512-HVqALKZlR95ROkrnesdhbbZJFi/rIVSoNq6f3jA/9u6MIbTsPh3xZwihjeI5+DO/2sOV6HMHooXcEOuwskHpTg== -hex-color-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" - integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== - -highlight.js@10.7.2: - version "10.7.2" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.2.tgz#89319b861edc66c48854ed1e6da21ea89f847360" - integrity sha512-oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg== +highlight.js@10.7.3: + version "10.7.3" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531" + integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A== hmac-drbg@^1.0.1: version "1.0.1" @@ -4890,16 +4857,6 @@ hosted-git-info@^2.1.4: resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== -hsl-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e" - integrity sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4= - -hsla-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38" - integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg= - html-minifier-terser@^5.0.1: version "5.1.1" resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054" @@ -4913,18 +4870,10 @@ html-minifier-terser@^5.0.1: relateurl "^0.2.7" terser "^4.6.3" -html-minifier@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-4.0.0.tgz#cca9aad8bce1175e02e17a8c33e46d8988889f56" - integrity sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig== - dependencies: - camel-case "^3.0.0" - clean-css "^4.2.1" - commander "^2.19.0" - he "^1.2.0" - param-case "^2.1.1" - relateurl "^0.2.7" - uglify-js "^3.5.1" +html-void-elements@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-2.0.0.tgz#ea71bae0dd33de675cdda3c4ace1bc7584bb1071" + integrity sha512-4OYzQQsBt0G9bJ/nM9/DDsjm4+fVdzAaPJJcWk5QwA3GIAPxQEeOR0rsI8HbDHQz5Gta8pVvGnnTNSbZVEVvkQ== html-webpack-plugin@4.5.2: version "4.5.2" @@ -4941,7 +4890,7 @@ html-webpack-plugin@4.5.2: tapable "^1.1.3" util.promisify "1.0.0" -"htmlparser2@>= 3.1.5 <4", htmlparser2@^3.10.1, htmlparser2@^3.9.1: +"htmlparser2@>= 3.1.5 <4", htmlparser2@^3.9.1: version "3.10.1" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ== @@ -4953,6 +4902,16 @@ html-webpack-plugin@4.5.2: inherits "^2.0.1" readable-stream "^3.1.1" +htmlparser2@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" + integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A== + dependencies: + domelementtype "^2.0.1" + domhandler "^4.0.0" + domutils "^2.5.2" + entities "^2.0.0" + http-errors@1.7.2: version "1.7.2" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" @@ -5013,17 +4972,10 @@ iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.4: dependencies: safer-buffer ">= 2.1.2 < 3" -iconv-lite@^0.5.0: - version "0.5.2" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.2.tgz#af6d628dccfb463b7364d97f715e4b74b8c8c2b8" - integrity sha512-kERHXvpSaB4aU3eANwidg79K8FlrN77m8G9V+0vOR3HYaRifrlwMEpT7ZBJqLSEIHnEgJTHcWK82wwLwwKwtag== - dependencies: - safer-buffer ">= 2.1.2 < 3" - -iconv-lite@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01" - integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ== +iconv-lite@^0.6.2, iconv-lite@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== dependencies: safer-buffer ">= 2.1.2 < 3.0.0" @@ -5069,14 +5021,6 @@ image-size@~0.5.0: resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w= -import-fresh@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546" - integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY= - dependencies: - caller-path "^2.0.0" - resolve-from "^3.0.0" - import-fresh@^3.0.0, import-fresh@^3.2.1: version "3.3.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" @@ -5093,6 +5037,13 @@ import-local@^3.0.2: pkg-dir "^4.2.0" resolve-cwd "^3.0.0" +import-meta-resolve@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/import-meta-resolve/-/import-meta-resolve-1.1.1.tgz#244fd542fd1fae73550d4f8b3cde3bba1d7b2b18" + integrity sha512-JiTuIvVyPaUg11eTrNDx5bgQ/yMKMZffc7YSjvQeSMXy58DO2SQ8BtAf3xteZvmzvjYh14wnqNjL8XVeDy2o9A== + dependencies: + builtins "^4.0.0" + imports-loader@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/imports-loader/-/imports-loader-1.2.0.tgz#b06823d0bb42e6f5ff89bc893829000eda46693f" @@ -5113,11 +5064,6 @@ indent-string@^4.0.0: resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== -indexes-of@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" - integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc= - indexof@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" @@ -5161,6 +5107,15 @@ ini@^1.3.5, ini@~1.3.0: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== +internal-slot@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" + integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== + dependencies: + get-intrinsic "^1.1.0" + has "^1.0.3" + side-channel "^1.0.4" + interpret@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" @@ -5183,10 +5138,10 @@ ipaddr.js@1.9.1: resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== -is-absolute-url@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6" - integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY= +is-absolute-url@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698" + integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q== is-accessor-descriptor@^0.1.6: version "0.1.6" @@ -5202,25 +5157,26 @@ is-accessor-descriptor@^1.0.0: dependencies: kind-of "^6.0.0" -is-alphabetical@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d" - integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg== +is-alphabetical@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-2.0.0.tgz#ef6e2caea57c63450fffc7abb6cbdafc5eb96e96" + integrity sha512-5OV8Toyq3oh4eq6sbWTYzlGdnMT/DPI5I0zxUBxjiigQsZycpkKF3kskkao3JyYGuYDHvhgJF+DrjMQp9SX86w== -is-alphanumerical@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz#7eb9a2431f855f6b1ef1a78e326df515696c4dbf" - integrity sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A== +is-alphanumerical@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-2.0.0.tgz#0fbfeb6a72d21d91143b3d182bf6cf5909ee66f6" + integrity sha512-t+2GlJ+hO9yagJ+jU3+HSh80VKvz/3cG2cxbGGm4S0hjKuhWQXgPVUVOZz3tqZzMjhmphZ+1TIJTlRZRoe6GCQ== dependencies: - is-alphabetical "^1.0.0" - is-decimal "^1.0.0" + is-alphabetical "^2.0.0" + is-decimal "^2.0.0" is-arguments@^1.0.4, is-arguments@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9" - integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg== + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" + integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" + has-tostringtag "^1.0.0" is-arrayish@^0.2.1: version "0.2.1" @@ -5233,9 +5189,11 @@ is-arrayish@^0.3.1: integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== is-bigint@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a" - integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA== + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" + integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== + dependencies: + has-bigints "^1.0.1" is-binary-path@^1.0.0: version "1.0.1" @@ -5257,11 +5215,12 @@ is-bluebird@^1.0.2: integrity sha1-CWQ5Bg9KpBGr7hkUOoTWpVNG1uI= is-boolean-object@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8" - integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng== + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== dependencies: call-bind "^1.0.2" + has-tostringtag "^1.0.0" is-buffer@^1.1.5: version "1.1.6" @@ -5273,27 +5232,15 @@ is-buffer@^2.0.0: resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== -is-callable@^1.1.4, is-callable@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e" - integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ== - -is-color-stop@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345" - integrity sha1-z/9HGu5N1cnhWFmPvhKWe1za00U= - dependencies: - css-color-names "^0.0.4" - hex-color-regex "^1.1.0" - hsl-regex "^1.0.0" - hsla-regex "^1.0.0" - rgb-regex "^1.0.1" - rgba-regex "^1.0.0" +is-callable@^1.1.4, is-callable@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== -is-core-module@^2.2.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1" - integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A== +is-core-module@^2.2.0, is-core-module@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz#d7553b2526fe59b92ba3e40c8df757ec8a709e19" + integrity sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ== dependencies: has "^1.0.3" @@ -5312,14 +5259,16 @@ is-data-descriptor@^1.0.0: kind-of "^6.0.0" is-date-object@^1.0.1, is-date-object@^1.0.2: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5" - integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A== + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== + dependencies: + has-tostringtag "^1.0.0" -is-decimal@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz#65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5" - integrity sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw== +is-decimal@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-2.0.0.tgz#db1140337809fd043a056ae40a9bd1cdc563034c" + integrity sha512-QfrfjQV0LjoWQ1K1XSoEZkTAzSa14RKVMa5zg3SdAfzEmQzRM4+tbSFWb78creCeA9rNBzaZal92opi1TwPWZw== is-descriptor@^0.1.0: version "0.1.6" @@ -5339,11 +5288,6 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2: is-data-descriptor "^1.0.0" kind-of "^6.0.2" -is-directory@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" - integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= - is-dotfile@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" @@ -5405,6 +5349,18 @@ is-fullwidth-code-point@^3.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== +is-fullwidth-code-point@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz#fae3167c729e7463f8461ce512b080a49268aa88" + integrity sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ== + +is-generator-function@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" + integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A== + dependencies: + has-tostringtag "^1.0.0" + is-glob@^2.0.0, is-glob@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" @@ -5426,10 +5382,10 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" -is-hexadecimal@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7" - integrity sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw== +is-hexadecimal@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-2.0.0.tgz#8e1ec9f48fe3eabd90161109856a23e0907a65d5" + integrity sha512-vGOtYkiaxwIiR0+Ng/zNId+ZZehGfINwTzdrDqc6iubbnQWhnPuYymOzOKUDqa2cSl59yHnEh2h6MvRLQsyNug== is-map@^2.0.1, is-map@^2.0.2: version "2.0.2" @@ -5442,9 +5398,11 @@ is-negative-zero@^2.0.1: integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== is-number-object@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb" - integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw== + version "1.0.6" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0" + integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g== + dependencies: + has-tostringtag "^1.0.0" is-number@^2.1.0: version "2.1.0" @@ -5470,16 +5428,16 @@ is-number@^7.0.0: resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== -is-obj@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" - integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== - -is-plain-obj@^2.0.0, is-plain-obj@^2.1.0: +is-plain-obj@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA== +is-plain-obj@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.0.0.tgz#06c0999fd7574edf5a906ba5644ad0feb3a84d22" + integrity sha512-NXRbBtUdBioI73y/HmOhogw/U5msYPC9DAtGkJXeFcFWSFZw0mCUsPxk/snTuJHzNKA8kLBK4rH97RMB1BfCXw== + is-plain-object@^2.0.3, is-plain-object@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" @@ -5502,15 +5460,15 @@ is-property@^1.0.2: resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ= -is-regex@^1.1.1, is-regex@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f" - integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ== +is-regex@^1.1.1, is-regex@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== dependencies: call-bind "^1.0.2" - has-symbols "^1.0.2" + has-tostringtag "^1.0.0" -is-resolvable@^1.0.0: +is-resolvable@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg== @@ -5521,14 +5479,16 @@ is-set@^2.0.1, is-set@^2.0.2: integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g== is-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" - integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== -is-string@^1.0.5: - version "1.0.6" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f" - integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w== +is-string@^1.0.5, is-string@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" + integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== + dependencies: + has-tostringtag "^1.0.0" is-svg@^4.3.1: version "4.3.1" @@ -5544,22 +5504,27 @@ is-symbol@^1.0.2, is-symbol@^1.0.3: dependencies: has-symbols "^1.0.2" -is-typed-array@^1.1.3: - version "1.1.5" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.5.tgz#f32e6e096455e329eb7b423862456aa213f0eb4e" - integrity sha512-S+GRDgJlR3PyEbsX/Fobd9cqpZBuvUS+8asRqYDMLCb2qMzt1oz5m5oxQCxOgUDxiWsOVNi4yaF+/uvdlHlYug== +is-typed-array@^1.1.3, is-typed-array@^1.1.7: + version "1.1.8" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.8.tgz#cbaa6585dc7db43318bc5b89523ea384a6f65e79" + integrity sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA== dependencies: - available-typed-arrays "^1.0.2" + available-typed-arrays "^1.0.5" call-bind "^1.0.2" - es-abstract "^1.18.0-next.2" + es-abstract "^1.18.5" foreach "^2.0.5" - has-symbols "^1.0.1" + has-tostringtag "^1.0.0" -is-typedarray@^1.0.0, is-typedarray@~1.0.0: +is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= +is-unicode-supported@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" + integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== + is-weakmap@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2" @@ -5662,14 +5627,13 @@ jquery@3.6.0: resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470" integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw== -js-cookie@2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8" - integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ== +js-cookie@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.1.tgz#9e39b4c6c2f56563708d7d31f6f5f21873a92414" + integrity sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw== "js-sequence-diagrams@git+https://github.com/hedgedoc/js-sequence-diagrams.git": version "2.0.1" - uid bda0e49b6c2754f3c7158b1dfb9ccf26efc24b39 resolved "git+https://github.com/hedgedoc/js-sequence-diagrams.git#bda0e49b6c2754f3c7158b1dfb9ccf26efc24b39" dependencies: lodash "4.17.x" @@ -5688,7 +5652,7 @@ js-tokens@^3.0.2: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= -js-yaml@3.14.1, js-yaml@^3.13.1, js-yaml@^3.6.1: +js-yaml@3.14.1, js-yaml@^3.13.1: version "3.14.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== @@ -5696,25 +5660,13 @@ js-yaml@3.14.1, js-yaml@^3.13.1, js-yaml@^3.6.1: argparse "^1.0.7" esprima "^4.0.0" -js-yaml@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f" - integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q== - dependencies: - argparse "^2.0.1" - -js-yaml@~4.1.0: +js-yaml@4.1.0, js-yaml@^4.0.0, js-yaml@~4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== dependencies: argparse "^2.0.1" -jsbi@^3.1.1: - version "3.1.4" - resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-3.1.4.tgz#9654dd02207a66a4911b4e4bb74265bc2cbc9dd0" - integrity sha512-52QRRFSsi9impURE8ZUbzAMCLjPm4THO7H2fcuIvaaeFTbSysvkodbQQXIVsNgq/ypDbq6dJiuGKL0vZ/i9hUg== - jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" @@ -5831,29 +5783,12 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" -jwa@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a" - integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA== - dependencies: - buffer-equal-constant-time "1.0.1" - ecdsa-sig-formatter "1.0.11" - safe-buffer "^5.0.1" - -jws@3.x.x: - version "3.2.2" - resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304" - integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA== - dependencies: - jwa "^1.4.1" - safe-buffer "^5.0.1" - keymaster@1.6.2: version "1.6.2" resolved "https://registry.yarnpkg.com/keymaster/-/keymaster-1.6.2.tgz#e1ae54d0ea9488f9f60b66b668f02e9a1946c6eb" integrity sha1-4a5U0OqUiPn2C2a2aPAumhlGxus= -khroma@^1.1.0: +khroma@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/khroma/-/khroma-1.4.1.tgz#ad6a5b6a972befc5112ce5129887a1a83af2c003" integrity sha512-+GmxKvmiRuCcUYDgR7g5Ngo0JEDeOsGdNONdU2zsiBQaK4z19Y2NvXqfEDE0ZiIrg45GTZyAnPLVsLZZACYm3Q== @@ -5925,9 +5860,9 @@ ldapauth-fork@^5.0.1: lru-cache "^6.0.0" ldapjs@^2.2.1: - version "2.2.4" - resolved "https://registry.yarnpkg.com/ldapjs/-/ldapjs-2.2.4.tgz#d4e3f4ae2277b6e760a83ebd61f7f5c4097c446b" - integrity sha512-OoeAXPNPPt4D6qva2/p6rkCIHknyYFd42Vp8JhSazBs9BbkEBmoajzj2F0ElD3vR+yAuzIVCjqh1W4uR8dfn0A== + version "2.3.1" + resolved "https://registry.yarnpkg.com/ldapjs/-/ldapjs-2.3.1.tgz#04136815fb1f21d692ac87fab5961a04d86e8b04" + integrity sha512-kf0tHHLrpwKaBAQOhYHXgdeh2PkFuCCxWgLb1MRn67ZQVo787D2pij3mmHVZx193GIdM8xcfi8HF6AIYYnj0fQ== dependencies: abstract-logging "^2.0.0" asn1 "^0.2.4" @@ -5981,6 +5916,11 @@ libnpmconfig@^1.0.0: find-up "^3.0.0" ini "^1.3.5" +lilconfig@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.3.tgz#68f3005e921dafbd2a2afb48379986aa6d2579fd" + integrity sha512-EHKqr/+ZvdKCifpNrJCKxBTgk5XupZA3y/aCPY9mxfgBzmgh93Mt/WqjjQ38oMxXuvDokaKiM3lAgvSH2sjtHg== + lines-and-columns@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" @@ -6000,23 +5940,23 @@ list.js@2.3.1: dependencies: string-natural-compare "^2.0.2" -load-json-file@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" - integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg= +load-json-file@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" + integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs= dependencies: graceful-fs "^4.1.2" - parse-json "^2.2.0" - pify "^2.0.0" + parse-json "^4.0.0" + pify "^3.0.0" strip-bom "^3.0.0" -load-plugin@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/load-plugin/-/load-plugin-3.0.0.tgz#8f3ce57cf4e5111639911012487bc1c2ba3d0e6c" - integrity sha512-od7eKCCZ62ITvFf8nHHrIiYmgOHb4xVNDRDqxBWSaao5FZyyZVX8OmRCbwjDGPrSrgIulwPNyBsWCGnhiDC0oQ== +load-plugin@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/load-plugin/-/load-plugin-4.0.1.tgz#9a239b0337064c9b8aac82b0c9f89b067db487c5" + integrity sha512-4kMi+mOSn/TR51pDo4tgxROHfBHXsrcyEYSGHcJ1o6TtRaP2PsRM5EwmYbj1uiLDvbfA/ohwuSWZJzqGiai8Dw== dependencies: + import-meta-resolve "^1.0.0" libnpmconfig "^1.0.0" - resolve-from "^5.0.0" loader-runner@^2.4.0: version "2.4.0" @@ -6131,7 +6071,7 @@ lodash.memoize@^4.1.2: resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= -lodash.merge@^4.4.0: +lodash.merge@^4.4.0, lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== @@ -6176,12 +6116,13 @@ lodash@4.17.x, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4 resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -log-symbols@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920" - integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA== +log-symbols@4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" + integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== dependencies: - chalk "^4.0.0" + chalk "^4.1.0" + is-unicode-supported "^0.1.0" logform@^2.2.0: version "2.2.0" @@ -6199,10 +6140,10 @@ long@^4.0.0: resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== -longest-streak@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz#b8599957da5b5dab64dee3fe316fa774597d90e4" - integrity sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg== +longest-streak@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-3.0.0.tgz#f127e2bded83caa6a35ac5f7a2f2b2f94b36f3dc" + integrity sha512-XhUjWR5CFaQ03JOP+iSDS9koy8T5jfoImCZ4XprElw3BXsSk4MpVYOLw/6LTDKZhO13PlAXnB5gS4MHQTpkSOw== loose-envify@^1.0.0: version "1.4.0" @@ -6211,11 +6152,6 @@ loose-envify@^1.0.0: dependencies: js-tokens "^3.0.0 || ^4.0.0" -lower-case@^1.1.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" - integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw= - lower-case@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" @@ -6255,7 +6191,6 @@ lutim@^1.0.2: "lz-string@git+https://github.com/hackmdio/lz-string.git": version "1.4.4" - uid efd1f64676264d6d8871b01f4f375fc6ef4f9022 resolved "git+https://github.com/hackmdio/lz-string.git#efd1f64676264d6d8871b01f4f375fc6ef4f9022" make-dir@^1.0.0: @@ -6305,23 +6240,18 @@ map-visit@^1.0.0: object-visit "^1.0.0" mariadb@^2.1.2: - version "2.5.3" - resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-2.5.3.tgz#13a2267f7f1b572f9db997aaaa8c00f75d5a87e8" - integrity sha512-9ZbQ1zLqasLCQy6KDcPHtX7EUIMBlQ8p64gNR61+yfpCIWjPDji3aR56LvwbOz1QnQbVgYBOJ4J/pHoFN5MR+w== + version "2.5.4" + resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-2.5.4.tgz#c66daa35e2768b8c714c758453531c06ae4927f4" + integrity sha512-4vQgMRyBIN9EwSQG0vzjR9D8bscPH0dGPJt67qVlOkHSiSm0xUatg1Pft4o1LzORgeOW4PheiY/HBE9bYYmNCA== dependencies: "@types/geojson" "^7946.0.7" "@types/node" "^14.14.28" - denque "^1.4.1" - iconv-lite "^0.6.2" + denque "^1.5.0" + iconv-lite "^0.6.3" long "^4.0.0" moment-timezone "^0.5.33" please-upgrade-node "^3.2.0" -markdown-extensions@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/markdown-extensions/-/markdown-extensions-1.1.1.tgz#fea03b539faeaee9b4ef02a3769b455b189f7fc3" - integrity sha512-WWC0ZuMzCyDHYCasEGs4IPvLyTGftYwh6wIEOULOF0HXcqZlhwRzrK0w2VUlxWA98xnvb/jszw4ZSkJ6ADpM6Q== - markdown-it-abbr@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/markdown-it-abbr/-/markdown-it-abbr-1.0.4.tgz#d66b5364521cbb3dd8aa59dadfba2fb6865c8fd8" @@ -6343,9 +6273,9 @@ markdown-it-emoji@^2.0.0: integrity sha512-39j7/9vP/CPCKbEI44oV8yoPJTpvfeReTn/COgRhSpNrjWF3PfP/JUxxB0hxV6ynOY8KH8Y8aX9NMDdo6z+6YQ== markdown-it-footnote@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/markdown-it-footnote/-/markdown-it-footnote-3.0.2.tgz#1575ee7a093648d4e096aa33386b058d92ac8bc1" - integrity sha512-JVW6fCmZWjvMdDQSbOT3nnOQtd9iAXmw7hTSh26+v42BnvXeVyGMDBm5b/EZocMed2MbCAHiTX632vY0FyGB8A== + version "3.0.3" + resolved "https://registry.yarnpkg.com/markdown-it-footnote/-/markdown-it-footnote-3.0.3.tgz#e0e4c0d67390a4c5f0c75f73be605c7c190ca4d8" + integrity sha512-YZMSuCGVZAjzKMn+xqIco9d1cLGxbELHZ9do/TSYVzraooV8ypsppKNmUJ0fVH5ljkCInQAtFpm8Rb3eXSrt5w== markdown-it-imsize@^2.0.1: version "2.0.1" @@ -6383,9 +6313,9 @@ markdown-it-sup@^1.0.0: integrity sha1-y5yf+RpSVawI8/09YyhuFd8KH8M= markdown-it@^12.0.0: - version "12.0.6" - resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.0.6.tgz#adcc8e5fe020af292ccbdf161fe84f1961516138" - integrity sha512-qv3sVLl4lMT96LLtR7xeRJX11OUFjsaD5oVat2/SNBIb21bJXwal2+SklcRbTwGwqWpWH/HRtYavOoJE+seL8w== + version "12.2.0" + resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.2.0.tgz#091f720fd5db206f80de7a8d1f1a7035fd0d38db" + integrity sha512-Wjws+uCrVQRqOoJvze4HCqkKl1AsSh95iFAeQDwnyfxM09divCBSXlDR1uTvyUP3Grzpn4Ru8GeCxYPM8vkCQg== dependencies: argparse "^2.0.1" entities "~2.1.0" @@ -6393,10 +6323,10 @@ markdown-it@^12.0.0: mdurl "^1.0.1" uc.micro "^1.0.5" -marked@~2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/marked/-/marked-2.0.3.tgz#3551c4958c4da36897bda2a16812ef1399c8d6b0" - integrity sha512-5otztIIcJfPc2qGTN8cVtOJEjNJZ0jwa46INMagrYfk0EvqtRuEHLsEe0LrFS0/q+ZRKT0+kXK7P2T1AN5lWRA== +marked@~2.1.0: + version "2.1.3" + resolved "https://registry.yarnpkg.com/marked/-/marked-2.1.3.tgz#bd017cef6431724fd4b27e0657f5ceb14bff3753" + integrity sha512-/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA== math-interval-parser@^2.0.1: version "2.0.1" @@ -6437,59 +6367,57 @@ md5.js@^1.3.4: inherits "^2.0.1" safe-buffer "^5.1.2" -mdast-comment-marker@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/mdast-comment-marker/-/mdast-comment-marker-1.1.2.tgz#5ad2e42cfcc41b92a10c1421a98c288d7b447a6d" - integrity sha512-vTFXtmbbF3rgnTh3Zl3irso4LtvwUq/jaDvT2D1JqTGAwaipcS7RpTxzi6KjoRqI9n2yuAhzLDAC8xVTF3XYVQ== +mdast-comment-marker@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/mdast-comment-marker/-/mdast-comment-marker-2.0.0.tgz#1b97b8c01fc1ad0a213940e9dc50e787db349907" + integrity sha512-LQ4sf7vUzxz4mQQlzzBDgjaCJO5A0lkIAT9TyeNMfqaP31ooP1Qw9hprf7/V3NCo5FA1nvo5gbnfLVRY79QlDQ== -mdast-util-from-markdown@^0.8.0: - version "0.8.5" - resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz#d1ef2ca42bc377ecb0463a987910dae89bd9a28c" - integrity sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ== +mdast-util-from-markdown@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-1.0.0.tgz#c517313cd999ec2b8f6d447b438c5a9d500b89c9" + integrity sha512-uj2G60sb7z1PNOeElFwCC9b/Se/lFXuLhVKFOAY2EHz/VvgbupTQRNXPoZl7rGpXYL6BNZgcgaybrlSWbo7n/g== + dependencies: + "@types/mdast" "^3.0.0" + "@types/unist" "^2.0.0" + mdast-util-to-string "^3.0.0" + micromark "^3.0.0" + micromark-util-decode-numeric-character-reference "^1.0.0" + micromark-util-normalize-identifier "^1.0.0" + micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.0" + parse-entities "^3.0.0" + unist-util-stringify-position "^3.0.0" + +mdast-util-heading-style@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/mdast-util-heading-style/-/mdast-util-heading-style-2.0.0.tgz#19bcc14d96b4a6f24efbe1318409bd34af64bb7f" + integrity sha512-q9+WW2hJduW51LgV2r/fcU5wIt2GLFf0yYHxyi0f2aaxnC63ErBSOAJlhP6nbQ6yeG5rTCozbwOi4QNDPKV0zw== dependencies: "@types/mdast" "^3.0.0" - mdast-util-to-string "^2.0.0" - micromark "~2.11.0" - parse-entities "^2.0.0" - unist-util-stringify-position "^2.0.0" - -mdast-util-heading-style@^1.0.2: - version "1.0.6" - resolved "https://registry.yarnpkg.com/mdast-util-heading-style/-/mdast-util-heading-style-1.0.6.tgz#6410418926fd5673d40f519406b35d17da10e3c5" - integrity sha512-8ZuuegRqS0KESgjAGW8zTx4tJ3VNIiIaGFNEzFpRSAQBavVc7AvOo9I4g3crcZBfYisHs4seYh0rAVimO6HyOw== -mdast-util-to-markdown@^0.6.0: - version "0.6.5" - resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz#b33f67ca820d69e6cc527a93d4039249b504bebe" - integrity sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ== +mdast-util-to-markdown@^1.0.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-1.2.1.tgz#33e93c2409f8c1be17b832f90978e29830af5435" + integrity sha512-yj0UexEfdH0Zqw9CztzC5+J6OZKgCY6K0ommn56SBlPKIV3NGqk1Wo/zw1Q0e/kHb50wmQ8O9cwbOl7vmaJjxg== dependencies: + "@types/mdast" "^3.0.0" "@types/unist" "^2.0.0" - longest-streak "^2.0.0" - mdast-util-to-string "^2.0.0" - parse-entities "^2.0.0" - repeat-string "^1.0.0" - zwitch "^1.0.0" - -mdast-util-to-string@^1.0.2: - version "1.1.0" - resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz#27055500103f51637bd07d01da01eb1967a43527" - integrity sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A== + longest-streak "^3.0.0" + mdast-util-to-string "^3.0.0" + parse-entities "^3.0.0" + unist-util-visit "^4.0.0" + zwitch "^2.0.0" -mdast-util-to-string@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz#b8cfe6a713e1091cb5b728fc48885a4767f8b97b" - integrity sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w== +mdast-util-to-string@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz#56c506d065fbf769515235e577b5a261552d56e9" + integrity sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA== mdn-data@2.0.14: version "2.0.14" resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== -mdn-data@2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b" - integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA== - mdurl@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" @@ -6531,22 +6459,20 @@ merge2@^1.3.0: resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -mermaid@8.10.1: - version "8.10.1" - resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.10.1.tgz#9573f702024e2173f4aa07d9b207d750507cf838" - integrity sha512-KxwKEJDKy303TQdz5TQMFb/4u+gUL21CefUMGOfuigDh9powcYaNmuJ5BkHmO0jB3Y1z2zlsuKvHZ2CusWH5+A== +mermaid@8.12.1: + version "8.12.1" + resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.12.1.tgz#6b55617bcfc970a7bf724e027368b281feb62539" + integrity sha512-0UCcSF0FLoNcPBsRF4f9OIV32t41fV18//z8o3S+FDz2PbDA1CRGKdQF9IX84VP4Tv9kcgJI/oqJdcBEtB/GPA== dependencies: "@braintree/sanitize-url" "^3.1.0" - d3 "^5.7.0" - dagre "^0.8.4" + d3 "^5.16.0" + dagre "^0.8.5" dagre-d3 "^0.6.4" - entity-decode "^2.0.2" - graphlib "^2.1.7" - he "^1.2.0" - khroma "^1.1.0" - minify "^4.1.1" - moment-mini "^2.22.1" - stylis "^3.5.2" + dompurify "2.3.1" + graphlib "^2.1.8" + khroma "^1.4.1" + moment-mini "^2.24.0" + stylis "^4.0.10" messageformat-formatters@^2.0.1: version "2.0.1" @@ -6569,11 +6495,10 @@ messageformat@^2.3.0: "meta-marked@git+https://github.com/hedgedoc/meta-marked": version "0.4.5" - uid "3002adae670a6de0a845f3da7a7223d458c20d76" - resolved "git+https://github.com/hedgedoc/meta-marked#3002adae670a6de0a845f3da7a7223d458c20d76" + resolved "git+https://github.com/hedgedoc/meta-marked#6b3653c53a1727f697d0719626c55037b2f03753" dependencies: js-yaml "~4.1.0" - marked "~2.0.0" + marked "~2.1.0" method-override@^3.0.0: version "3.0.0" @@ -6590,13 +6515,185 @@ methods@~1.1.1, methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -micromark@~2.11.0: - version "2.11.4" - resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.11.4.tgz#d13436138eea826383e822449c9a5c50ee44665a" - integrity sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA== +micromark-core-commonmark@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/micromark-core-commonmark/-/micromark-core-commonmark-1.0.1.tgz#a64987cafe872e8b80bc8f2352a5d988586ac4f1" + integrity sha512-vEOw8hcQ3nwHkKKNIyP9wBi8M50zjNajtmI+cCUWcVfJS+v5/3WCh4PLKf7PPRZFUutjzl4ZjlHwBWUKfb/SkA== + dependencies: + micromark-factory-destination "^1.0.0" + micromark-factory-label "^1.0.0" + micromark-factory-space "^1.0.0" + micromark-factory-title "^1.0.0" + micromark-factory-whitespace "^1.0.0" + micromark-util-character "^1.0.0" + micromark-util-chunked "^1.0.0" + micromark-util-classify-character "^1.0.0" + micromark-util-html-tag-name "^1.0.0" + micromark-util-normalize-identifier "^1.0.0" + micromark-util-resolve-all "^1.0.0" + micromark-util-subtokenize "^1.0.0" + micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.1" + parse-entities "^3.0.0" + +micromark-factory-destination@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-factory-destination/-/micromark-factory-destination-1.0.0.tgz#fef1cb59ad4997c496f887b6977aa3034a5a277e" + integrity sha512-eUBA7Rs1/xtTVun9TmV3gjfPz2wEwgK5R5xcbIM5ZYAtvGF6JkyaDsj0agx8urXnO31tEO6Ug83iVH3tdedLnw== + dependencies: + micromark-util-character "^1.0.0" + micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.0" + +micromark-factory-label@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-factory-label/-/micromark-factory-label-1.0.0.tgz#b316ec479b474232973ff13b49b576f84a6f2cbb" + integrity sha512-XWEucVZb+qBCe2jmlOnWr6sWSY6NHx+wtpgYFsm4G+dufOf6tTQRRo0bdO7XSlGPu5fyjpJenth6Ksnc5Mwfww== + dependencies: + micromark-util-character "^1.0.0" + micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.0" + +micromark-factory-space@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-factory-space/-/micromark-factory-space-1.0.0.tgz#cebff49968f2b9616c0fcb239e96685cb9497633" + integrity sha512-qUmqs4kj9a5yBnk3JMLyjtWYN6Mzfcx8uJfi5XAveBniDevmZasdGBba5b4QsvRcAkmvGo5ACmSUmyGiKTLZew== + dependencies: + micromark-util-character "^1.0.0" + micromark-util-types "^1.0.0" + +micromark-factory-title@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-factory-title/-/micromark-factory-title-1.0.0.tgz#708f7a8044f34a898c0efdb4f55e4da66b537273" + integrity sha512-flvC7Gx0dWVWorXuBl09Cr3wB5FTuYec8pMGVySIp2ZlqTcIjN/lFohZcP0EG//krTptm34kozHk7aK/CleCfA== + dependencies: + micromark-factory-space "^1.0.0" + micromark-util-character "^1.0.0" + micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.0" + +micromark-factory-whitespace@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-factory-whitespace/-/micromark-factory-whitespace-1.0.0.tgz#e991e043ad376c1ba52f4e49858ce0794678621c" + integrity sha512-Qx7uEyahU1lt1RnsECBiuEbfr9INjQTGa6Err+gF3g0Tx4YEviPbqqGKNv/NrBaE7dVHdn1bVZKM/n5I/Bak7A== + dependencies: + micromark-factory-space "^1.0.0" + micromark-util-character "^1.0.0" + micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.0" + +micromark-util-character@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/micromark-util-character/-/micromark-util-character-1.1.0.tgz#d97c54d5742a0d9611a68ca0cd4124331f264d86" + integrity sha512-agJ5B3unGNJ9rJvADMJ5ZiYjBRyDpzKAOk01Kpi1TKhlT1APx3XZk6eN7RtSz1erbWHC2L8T3xLZ81wdtGRZzg== + dependencies: + micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.0" + +micromark-util-chunked@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-util-chunked/-/micromark-util-chunked-1.0.0.tgz#5b40d83f3d53b84c4c6bce30ed4257e9a4c79d06" + integrity sha512-5e8xTis5tEZKgesfbQMKRCyzvffRRUX+lK/y+DvsMFdabAicPkkZV6gO+FEWi9RfuKKoxxPwNL+dFF0SMImc1g== + dependencies: + micromark-util-symbol "^1.0.0" + +micromark-util-classify-character@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-util-classify-character/-/micromark-util-classify-character-1.0.0.tgz#cbd7b447cb79ee6997dd274a46fc4eb806460a20" + integrity sha512-F8oW2KKrQRb3vS5ud5HIqBVkCqQi224Nm55o5wYLzY/9PwHGXC01tr3d7+TqHHz6zrKQ72Okwtvm/xQm6OVNZA== + dependencies: + micromark-util-character "^1.0.0" + micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.0" + +micromark-util-combine-extensions@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.0.0.tgz#91418e1e74fb893e3628b8d496085639124ff3d5" + integrity sha512-J8H058vFBdo/6+AsjHp2NF7AJ02SZtWaVUjsayNFeAiydTxUwViQPxN0Hf8dp4FmCQi0UUFovFsEyRSUmFH3MA== + dependencies: + micromark-util-chunked "^1.0.0" + micromark-util-types "^1.0.0" + +micromark-util-decode-numeric-character-reference@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.0.0.tgz#dcc85f13b5bd93ff8d2868c3dba28039d490b946" + integrity sha512-OzO9AI5VUtrTD7KSdagf4MWgHMtET17Ua1fIpXTpuhclCqD8egFWo85GxSGvxgkGS74bEahvtM0WP0HjvV0e4w== + dependencies: + micromark-util-symbol "^1.0.0" + +micromark-util-encode@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-util-encode/-/micromark-util-encode-1.0.0.tgz#c409ecf751a28aa9564b599db35640fccec4c068" + integrity sha512-cJpFVM768h6zkd8qJ1LNRrITfY4gwFt+tziPcIf71Ui8yFzY9wG3snZQqiWVq93PG4Sw6YOtcNiKJfVIs9qfGg== + +micromark-util-html-tag-name@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.0.0.tgz#75737e92fef50af0c6212bd309bc5cb8dbd489ed" + integrity sha512-NenEKIshW2ZI/ERv9HtFNsrn3llSPZtY337LID/24WeLqMzeZhBEE6BQ0vS2ZBjshm5n40chKtJ3qjAbVV8S0g== + +micromark-util-normalize-identifier@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.0.0.tgz#4a3539cb8db954bbec5203952bfe8cedadae7828" + integrity sha512-yg+zrL14bBTFrQ7n35CmByWUTFsgst5JhA4gJYoty4Dqzj4Z4Fr/DHekSS5aLfH9bdlfnSvKAWsAgJhIbogyBg== + dependencies: + micromark-util-symbol "^1.0.0" + +micromark-util-resolve-all@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-util-resolve-all/-/micromark-util-resolve-all-1.0.0.tgz#a7c363f49a0162e931960c44f3127ab58f031d88" + integrity sha512-CB/AGk98u50k42kvgaMM94wzBqozSzDDaonKU7P7jwQIuH2RU0TeBqGYJz2WY1UdihhjweivStrJ2JdkdEmcfw== + dependencies: + micromark-util-types "^1.0.0" + +micromark-util-sanitize-uri@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.0.0.tgz#27dc875397cd15102274c6c6da5585d34d4f12b2" + integrity sha512-cCxvBKlmac4rxCGx6ejlIviRaMKZc0fWm5HdCHEeDWRSkn44l6NdYVRyU+0nT1XC72EQJMZV8IPHF+jTr56lAg== + dependencies: + micromark-util-character "^1.0.0" + micromark-util-encode "^1.0.0" + micromark-util-symbol "^1.0.0" + +micromark-util-subtokenize@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-util-subtokenize/-/micromark-util-subtokenize-1.0.0.tgz#6f006fa719af92776c75a264daaede0fb3943c6a" + integrity sha512-EsnG2qscmcN5XhkqQBZni/4oQbLFjz9yk3ZM/P8a3YUjwV6+6On2wehr1ALx0MxK3+XXXLTzuBKHDFeDFYRdgQ== dependencies: + micromark-util-chunked "^1.0.0" + micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.0" + +micromark-util-symbol@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/micromark-util-symbol/-/micromark-util-symbol-1.0.0.tgz#91cdbcc9b2a827c0129a177d36241bcd3ccaa34d" + integrity sha512-NZA01jHRNCt4KlOROn8/bGi6vvpEmlXld7EHcRH+aYWUfL3Wc8JLUNNlqUMKa0hhz6GrpUWsHtzPmKof57v0gQ== + +micromark-util-types@^1.0.0, micromark-util-types@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/micromark-util-types/-/micromark-util-types-1.0.1.tgz#8bb8a092d93d326bd29fe29602799f2d0d922fd4" + integrity sha512-UT0ylWEEy80RFYzK9pEaugTqaxoD/j0Y9WhHpSyitxd99zjoQz7JJ+iKuhPAgOW2MiPSUAx+c09dcqokeyaROA== + +micromark@^3.0.0: + version "3.0.5" + resolved "https://registry.yarnpkg.com/micromark/-/micromark-3.0.5.tgz#d24792c8a06f201d5608c106dbfadef34c299684" + integrity sha512-QfjERBnPw0G9mxhOCkkbRP0n8SX8lIBLrEKeEVceviUukqVMv3hWE4AgNTOK/W6GWqtPvvIHg2Apl3j1Dxm6aQ== + dependencies: + "@types/debug" "^4.0.0" debug "^4.0.0" - parse-entities "^2.0.0" + micromark-core-commonmark "^1.0.1" + micromark-factory-space "^1.0.0" + micromark-util-character "^1.0.0" + micromark-util-chunked "^1.0.0" + micromark-util-combine-extensions "^1.0.0" + micromark-util-decode-numeric-character-reference "^1.0.0" + micromark-util-encode "^1.0.0" + micromark-util-normalize-identifier "^1.0.0" + micromark-util-resolve-all "^1.0.0" + micromark-util-sanitize-uri "^1.0.0" + micromark-util-subtokenize "^1.0.0" + micromark-util-symbol "^1.0.0" + micromark-util-types "^1.0.1" + parse-entities "^3.0.0" micromatch@^2.1.5: version "2.3.11" @@ -6636,7 +6733,7 @@ micromatch@^3.1.10, micromatch@^3.1.4: snapdragon "^0.8.1" to-regex "^3.0.2" -micromatch@^4.0.2: +micromatch@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== @@ -6644,6 +6741,10 @@ micromatch@^4.0.2: braces "^3.0.1" picomatch "^2.2.3" +"midi@git+https://github.com/paulrosen/MIDI.js.git#abcjs": + version "0.4.2" + resolved "git+https://github.com/paulrosen/MIDI.js.git#e593ffef81a0350f99448e3ab8111957145ff6b2" + miller-rabin@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d" @@ -6652,17 +6753,17 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.47.0, "mime-db@>= 1.43.0 < 2": - version "1.47.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c" - integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw== +mime-db@1.49.0, "mime-db@>= 1.43.0 < 2": + version "1.49.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed" + integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA== mime-types@^2.1.12, mime-types@^2.1.14, mime-types@^2.1.27, mime-types@^2.1.3, mime-types@~2.1.19, mime-types@~2.1.24: - version "2.1.30" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d" - integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg== + version "2.1.32" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5" + integrity sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A== dependencies: - mime-db "1.47.0" + mime-db "1.49.0" mime@1.3.4: version "1.3.4" @@ -6679,28 +6780,15 @@ mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== -mini-css-extract-plugin@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.0.tgz#b4db2525af2624899ed64a23b0016e0036411893" - integrity sha512-nPFKI7NSy6uONUo9yn2hIfb9vyYvkFu95qki0e21DQ9uaqNKDP15DGpK0KnV6wDroWxPHtExrdEwx/yDQ8nVRw== +mini-css-extract-plugin@1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" + integrity sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q== dependencies: loader-utils "^2.0.0" schema-utils "^3.0.0" webpack-sources "^1.1.0" -minify@^4.1.1: - version "4.1.3" - resolved "https://registry.yarnpkg.com/minify/-/minify-4.1.3.tgz#58467922d14303f55a3a28fa79641371955b8fbd" - integrity sha512-ykuscavxivSmVpcCzsXmsVTukWYLUUtPhHj0w2ILvHDGqC+hsuTCihBn9+PJBd58JNvWTNg9132J9nrrI2anzA== - dependencies: - clean-css "^4.1.6" - css-b64-images "~0.2.5" - debug "^4.1.0" - html-minifier "^4.0.0" - terser "^4.0.0" - try-catch "^2.0.0" - try-to-catch "^1.0.2" - minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" @@ -6718,26 +6806,27 @@ minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" -minimist@^1.2.0, minimist@^1.2.5: +minimist@^1.0.0, minimist@^1.2.0, minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== -minio@^7.0.0: - version "7.0.18" - resolved "https://registry.yarnpkg.com/minio/-/minio-7.0.18.tgz#a2a6dae52a4dde9e35ed47cdf2accc21df4a512d" - integrity sha512-jVRjkw8A5Spf+ETY5OXQUcQckHriuUA3u2+MAcX36btLT8EytlOVivxIseXvyFf9cNn3dy5w1F1UyjMvHU+nqg== +minio@^7.0.19: + version "7.0.19" + resolved "https://registry.yarnpkg.com/minio/-/minio-7.0.19.tgz#ca47b68669e45237286709a8c06ecf89f992aa61" + integrity sha512-DOGKauWLdmj0/y2QKXdnrhqyzRFEnUteHi6q382uujg9TjSDrA84BiQVppS2Ew6V8Rcg+2IaRkF4GR34zw9sIA== dependencies: async "^3.1.0" block-stream2 "^2.0.0" es6-error "^4.1.1" fast-xml-parser "^3.17.5" json-stream "^1.0.0" - lodash "^4.17.20" + lodash "^4.17.21" mime-types "^2.1.14" mkdirp "^0.5.1" querystring "0.2.0" through2 "^3.0.1" + web-encoding "^1.1.5" xml "^1.0.0" xml2js "^0.4.15" @@ -6762,7 +6851,7 @@ minipass-pipeline@^1.2.2: dependencies: minipass "^3.0.0" -minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: +minipass@^2.6.0, minipass@^2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== @@ -6777,7 +6866,7 @@ minipass@^3.0.0, minipass@^3.1.1: dependencies: yallist "^4.0.0" -minizlib@^1.2.1: +minizlib@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== @@ -6816,7 +6905,7 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1: +"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -6828,33 +6917,33 @@ mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mocha@8.4.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.4.0.tgz#677be88bf15980a3cae03a73e10a0fc3997f0cff" - integrity sha512-hJaO0mwDXmZS4ghXsvPVriOhsxQ7ofcpQdm8dE+jISUOKopitvnXFQmpRR7jd2K6VBG6E26gU3IAbXXGIbu4sQ== +mocha@9.1.1: + version "9.1.1" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.1.1.tgz#33df2eb9c6262434630510c5f4283b36efda9b61" + integrity sha512-0wE74YMgOkCgBUj8VyIDwmLUjTsS13WV1Pg7l0SHea2qzZzlq7MDnfbPsHKcELBRk3+izEVkRofjmClpycudCA== dependencies: "@ungap/promise-all-settled" "1.1.2" ansi-colors "4.1.1" browser-stdout "1.3.1" - chokidar "3.5.1" + chokidar "3.5.2" debug "4.3.1" diff "5.0.0" escape-string-regexp "4.0.0" find-up "5.0.0" - glob "7.1.6" + glob "7.1.7" growl "1.10.5" he "1.2.0" - js-yaml "4.0.0" - log-symbols "4.0.0" + js-yaml "4.1.0" + log-symbols "4.1.0" minimatch "3.0.4" ms "2.1.3" - nanoid "3.1.20" - serialize-javascript "5.0.1" + nanoid "3.1.23" + serialize-javascript "6.0.0" strip-json-comments "3.1.1" supports-color "8.1.1" which "2.0.2" wide-align "1.1.3" - workerpool "6.1.0" + workerpool "6.1.5" yargs "16.2.0" yargs-parser "20.2.4" yargs-unparser "2.0.0" @@ -6867,7 +6956,7 @@ mock-require@3.0.3: get-caller-file "^1.0.2" normalize-path "^2.1.1" -moment-mini@^2.22.1: +moment-mini@^2.24.0: version "2.24.0" resolved "https://registry.yarnpkg.com/moment-mini/-/moment-mini-2.24.0.tgz#fa68d98f7fe93ae65bf1262f6abb5fb6983d8d18" integrity sha512-9ARkWHBs+6YJIvrIp0Ik5tyTTtP9PoV0Ssu2Ocq5y9v8+NOOpWiRshAp8c4rZVWTOe+157on/5G+zj5pwIQFEQ== @@ -6933,9 +7022,9 @@ mustache@^4.0.1: integrity sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ== mysql2@^2.0.0: - version "2.2.5" - resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-2.2.5.tgz#72624ffb4816f80f96b9c97fedd8c00935f9f340" - integrity sha512-XRqPNxcZTpmFdXbJqb+/CtYVLCx14x1RTeNMD4954L331APu75IC74GDqnZMEt1kwaXy6TySo55rF2F3YJS78g== + version "2.3.0" + resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-2.3.0.tgz#600f5cc27e397dfb77b59eac93666434f88e8079" + integrity sha512-0t5Ivps5Tdy5YHk5NdKwQhe/4Qyn2pload+S+UooDBvsqngtzujG1BaTWBihQLfeKO3t3122/GtusBtmHEHqww== dependencies: denque "^1.4.1" generate-function "^2.3.1" @@ -6954,14 +7043,14 @@ named-placeholders@^1.1.2: lru-cache "^4.1.3" nan@^2.12.1: - version "2.14.2" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" - integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== + version "2.15.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" + integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== -nanoid@3.1.20: - version "3.1.20" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788" - integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw== +nanoid@3.1.23: + version "3.1.23" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81" + integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw== nanoid@^2.1.0: version "2.1.11" @@ -6969,9 +7058,9 @@ nanoid@^2.1.0: integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA== nanoid@^3.1.23: - version "3.1.23" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81" - integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw== + version "3.1.25" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152" + integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q== nanomatch@^1.2.9: version "1.2.13" @@ -6990,20 +7079,15 @@ nanomatch@^1.2.9: snapdragon "^0.8.1" to-regex "^3.0.1" -native-duplexpair@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/native-duplexpair/-/native-duplexpair-1.0.0.tgz#7899078e64bf3c8a3d732601b3d40ff05db58fa0" - integrity sha1-eJkHjmS/PIo9cyYBs9QP8F21j6A= - natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= needle@^2.2.1, needle@^2.5.2: - version "2.6.0" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.6.0.tgz#24dbb55f2509e2324b4a99d61f413982013ccdbe" - integrity sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg== + version "2.9.1" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.9.1.tgz#22d1dffbe3490c2b83e301f7709b6736cd8f2684" + integrity sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ== dependencies: debug "^3.2.6" iconv-lite "^0.4.4" @@ -7014,18 +7098,11 @@ negotiator@0.6.2: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== -neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1: +neo-async@^2.5.0, neo-async@^2.6.1: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== -no-case@^2.2.0: - version "2.3.2" - resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac" - integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ== - dependencies: - lower-case "^1.1.1" - no-case@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" @@ -7035,14 +7112,14 @@ no-case@^3.0.4: tslib "^2.0.3" node-addon-api@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.1.0.tgz#98b21931557466c6729e51cb77cd39c965f42239" - integrity sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw== + version "3.2.1" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" + integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== node-fetch@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" - integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== + version "2.6.2" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.2.tgz#986996818b73785e47b1965cc34eb093a1d464d0" + integrity sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA== node-forge@^0.10.0: version "0.10.0" @@ -7050,9 +7127,9 @@ node-forge@^0.10.0: integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== node-gyp-build@^4.2.0: - version "4.2.3" - resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.2.3.tgz#ce6277f853835f718829efb47db20f3e4d9c4739" - integrity sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg== + version "4.3.0" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3" + integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q== node-gyp@3.x: version "3.8.0" @@ -7117,10 +7194,10 @@ node-pre-gyp@^0.11.0: semver "^5.3.0" tar "^4" -node-releases@^1.1.71: - version "1.1.71" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb" - integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg== +node-releases@^1.1.75: + version "1.1.75" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz#6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe" + integrity sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw== nomnom@^1.5.x: version "1.8.1" @@ -7167,10 +7244,10 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -normalize-url@^3.0.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" - integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg== +normalize-url@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" + integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== npm-bundled@^1.0.1: version "1.1.2" @@ -7210,7 +7287,14 @@ npm-run-path@^4.0.1: gauge "~2.7.3" set-blocking "~2.0.0" -nth-check@^1.0.2, nth-check@~1.0.1: +nth-check@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125" + integrity sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q== + dependencies: + boolbase "^1.0.0" + +nth-check@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg== @@ -7251,10 +7335,10 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-inspect@^1.9.0: - version "1.10.3" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369" - integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw== +object-inspect@^1.11.0, object-inspect@^1.9.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" + integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== object-is@^1.1.4: version "1.1.5" @@ -7286,7 +7370,7 @@ object.assign@^4.1.2: has-symbols "^1.0.1" object-keys "^1.1.1" -object.getownpropertydescriptors@^2.0.3, object.getownpropertydescriptors@^2.1.0: +object.getownpropertydescriptors@^2.0.3: version "2.1.2" resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz#1bd63aeacf0d5d2d2f31b5e393b03a7c601a23f7" integrity sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ== @@ -7310,15 +7394,14 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" -object.values@^1.1.0, object.values@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.3.tgz#eaa8b1e17589f02f698db093f7c62ee1699742ee" - integrity sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw== +object.values@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30" + integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg== dependencies: call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.18.0-next.2" - has "^1.0.3" + es-abstract "^1.18.2" on-finished@~2.3.0: version "2.3.0" @@ -7354,19 +7437,21 @@ onetime@^5.1.2: mimic-fn "^2.1.0" openid@2.x.x: - version "2.0.8" - resolved "https://registry.yarnpkg.com/openid/-/openid-2.0.8.tgz#e3a09b55641101156ad086971721a98d0723c547" - integrity sha512-ljI4GE6p4RYn9dLftlXw6TvlA+untAkoWBRpj4qIB4AJQWcDZ2lOVOJQ2tq346ok38mtGDBYRBvp3Q+AsuCBnQ== + version "2.0.9" + resolved "https://registry.yarnpkg.com/openid/-/openid-2.0.9.tgz#7d2bc03ed4c6bf4ccd05b128e3b0b33b6680205f" + integrity sha512-LzsGBHUDU2FjW/aHjB99GXxuyEPVkFyU4Ub/df3K0hYGxD1qvYu7atPORLXddCufVkcZBpgbYxdLVG8uiY0fCA== dependencies: - request "^2.88.2" + axios "^0.21.1" + qs "^6.5.2" -optimize-css-assets-webpack-plugin@5.0.4: - version "5.0.4" - resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.4.tgz#85883c6528aaa02e30bbad9908c92926bb52dc90" - integrity sha512-wqd6FdI2a5/FdoiCNNkEvLeA//lHHfG24Ln2Xm2qqdIk4aOlsR18jwpyOihqQ8849W3qu2DX8fOYxpvTMj+93A== +optimize-css-assets-webpack-plugin@6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-6.0.1.tgz#7719bceabba1f3891ec3ae04efb81a1cc99cd793" + integrity sha512-BshV2UZPfggZLdUfN3zFBbG4sl/DynUI+YCB6fRRDWaqO2OiWN8GPcp4Y0/fEV6B3k9Hzyk3czve3V/8B/SzKQ== dependencies: - cssnano "^4.1.10" + cssnano "^5.0.2" last-call-webpack-plugin "^3.0.0" + postcss "^8.2.1" optionator@^0.9.1: version "0.9.1" @@ -7497,13 +7582,6 @@ parallel-transform@^1.1.0: inherits "^2.0.3" readable-stream "^2.1.5" -param-case@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247" - integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc= - dependencies: - no-case "^2.2.0" - param-case@^3.0.3: version "3.0.4" resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" @@ -7530,17 +7608,17 @@ parse-asn1@^5.0.0, parse-asn1@^5.1.5: pbkdf2 "^3.0.3" safe-buffer "^5.1.1" -parse-entities@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz#53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8" - integrity sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ== +parse-entities@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-3.0.0.tgz#9ed6d6569b6cfc95ade058d683ddef239dad60dc" + integrity sha512-AJlcIFDNPEP33KyJLguv0xJc83BNvjxwpuUIcetyXUsLpVXAUCePJ5kIoYtEN2R1ac0cYaRu/vk9dVFkewHQhQ== dependencies: - character-entities "^1.0.0" - character-entities-legacy "^1.0.0" - character-reference-invalid "^1.0.0" - is-alphanumerical "^1.0.0" - is-decimal "^1.0.0" - is-hexadecimal "^1.0.0" + character-entities "^2.0.0" + character-entities-legacy "^2.0.0" + character-reference-invalid "^2.0.0" + is-alphanumerical "^2.0.0" + is-decimal "^2.0.0" + is-hexadecimal "^2.0.0" parse-glob@^3.0.4: version "3.0.4" @@ -7552,13 +7630,6 @@ parse-glob@^3.0.4: is-extglob "^1.0.0" is-glob "^2.0.0" -parse-json@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" - integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= - dependencies: - error-ex "^1.2.0" - parse-json@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" @@ -7582,6 +7653,11 @@ parse-node-version@^1.0.1: resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b" integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA== +parse5@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" + integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== + parseqs@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5" @@ -7662,18 +7738,18 @@ passport-local@^1.0.0: passport-strategy "1.x.x" passport-oauth1@1.x.x: - version "1.1.0" - resolved "https://registry.yarnpkg.com/passport-oauth1/-/passport-oauth1-1.1.0.tgz#a7de988a211f9cf4687377130ea74df32730c918" - integrity sha1-p96YiiEfnPRoc3cTDqdN8ycwyRg= + version "1.2.0" + resolved "https://registry.yarnpkg.com/passport-oauth1/-/passport-oauth1-1.2.0.tgz#5229d431781bf5b265bec86ce9a9cce58a756cf9" + integrity sha512-Sv2YWodC6jN12M/OXwmR4BIXeeIHjjbwYTQw4kS6tHK4zYzSEpxBgSJJnknBjICA5cj0ju3FSnG1XmHgIhYnLg== dependencies: oauth "0.9.x" passport-strategy "1.x.x" utils-merge "1.x.x" passport-oauth2@1.x.x, passport-oauth2@^1.4.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.5.0.tgz#64babbb54ac46a4dcab35e7f266ed5294e3c4108" - integrity sha512-kqBt6vR/5VlCK8iCx1/KpY42kQ+NEHZwsSyt4Y6STiNjU+wWICG1i8ucc1FapXDGO15C5O5VZz7+7vRzrDPXXQ== + version "1.6.0" + resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.0.tgz#5f599735e0ea40ea3027643785f81a3a9b4feb50" + integrity sha512-emXPLqLcVEcLFR/QvQXZcwLmfK8e9CqvMgmOFJxcNT3okSFMtUbRRKpY20x5euD+01uHsjjCa07DYboEeLXYiw== dependencies: base64url "3.x.x" oauth "0.9.x" @@ -7689,20 +7765,20 @@ passport-oauth@^1.0.0: passport-oauth1 "1.x.x" passport-oauth2 "1.x.x" -passport-saml@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/passport-saml/-/passport-saml-2.2.0.tgz#dbea6743cf06644cfb3f0d486e43d3c8812b150a" - integrity sha512-Qkr9WbhGY1AAAgslJ4yFn7ObQp/cLu2L1bubwXvl8vsvXQujPemKYhD3SwdilEIllZ/EPTlHgld+4wiPRYxd8Q== +passport-saml@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/passport-saml/-/passport-saml-3.1.2.tgz#34a0c2c423d729ce102e69fea9c22040910e6d43" + integrity sha512-EhD3/ofiz1vu7R72i4RskXk/dQG9GyDmXPdHJf5LYB+93B5kvKv5p+5lpZgO3z+Wf3eN0h/tGdGd6noyYdjY6g== dependencies: + "@xmldom/xmldom" "^0.7.2" debug "^4.3.1" - passport-strategy "*" - xml-crypto "^2.1.1" - xml-encryption "^1.2.3" + passport-strategy "^1.0.0" + xml-crypto "^2.1.3" + xml-encryption "^1.3.0" xml2js "^0.4.23" xmlbuilder "^15.1.1" - xmldom "0.5.x" -passport-strategy@*, passport-strategy@1.x.x, passport-strategy@^1.0.0: +passport-strategy@1.x.x, passport-strategy@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4" integrity sha1-tVOaqPwiWj0a0XlHbd8ja0QPUuQ= @@ -7761,21 +7837,21 @@ path-key@^3.0.0, path-key@^3.1.0: integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== path-parse@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" - integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= -path-type@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73" - integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM= +path-type@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" + integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg== dependencies: - pify "^2.0.0" + pify "^3.0.0" path-type@^4.0.0: version "4.0.0" @@ -7799,14 +7875,14 @@ pbkdf2@^3.0.3: sha.js "^2.4.8" pdfobject@^2.0.201604172: - version "2.2.5" - resolved "https://registry.yarnpkg.com/pdfobject/-/pdfobject-2.2.5.tgz#3e79dae8925a68f60c79423f56737bfd2d7e8a0b" - integrity sha512-B301nc24w02BMqrJoDOUBGRfHBqGtLztsdUyyhYsZaxD3R1DyNKtkDcilo+A4FYSW82k/LXAiXVREkYoqU2G4g== + version "2.2.6" + resolved "https://registry.yarnpkg.com/pdfobject/-/pdfobject-2.2.6.tgz#cb8a0b7697af88df8af017b5fd4a7a42abb6e031" + integrity sha512-3B8re2yWzBcI9Xa+QcRptw0ag5NQYyVHVxP1yEWW7aCm6ujvZa8z7/06uz/zZqsI2TDLzsED3yS4JEMwQdCGEg== -peek-readable@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-3.1.3.tgz#932480d46cf6aa553c46c68566c4fb69a82cd2b1" - integrity sha512-mpAcysyRJxmICBcBa5IXH7SZPvWkcghm6Fk8RekoS3v+BpbSzlZzuWbMx+GXrlUwESi9qHar4nVEZNMKylIHvg== +peek-readable@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-4.0.1.tgz#9a045f291db254111c3412c1ce4fec27ddd4d202" + integrity sha512-7qmhptnR0WMSpxT5rMHG9bW/mYSR1uqaPFj2MHvT+y/aOUu6msJijpKt5SkTDKySwg65OWG2JwTMBlgcbwMHrQ== performance-now@^2.1.0: version "2.1.0" @@ -7819,21 +7895,21 @@ pg-connection-string@^2.5.0: integrity sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ== pg-hstore@^2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/pg-hstore/-/pg-hstore-2.3.3.tgz#d1978c12a85359830b1388d3b0ff233b88928e96" - integrity sha512-qpeTpdkguFgfdoidtfeTho1Q1zPVPbtMHgs8eQ+Aan05iLmIs3Z3oo5DOZRclPGoQ4i68I1kCtQSJSa7i0ZVYg== + version "2.3.4" + resolved "https://registry.yarnpkg.com/pg-hstore/-/pg-hstore-2.3.4.tgz#4425e3e2a3e15d2a334c35581186c27cf2e9b8dd" + integrity sha512-N3SGs/Rf+xA1M2/n0JBiXFDVMzdekwLZLAO0g7mpDY9ouX+fDI7jS6kTq3JujmYbtNSJ53TJ0q4G98KVZSM4EA== dependencies: - underscore "^1.7.0" + underscore "^1.13.1" pg-int8@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c" integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw== -pg-pool@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.3.0.tgz#12d5c7f65ea18a6e99ca9811bd18129071e562fc" - integrity sha512-0O5huCql8/D6PIRFAlmccjphLYWC+JIzvUhSzXSpGaf+tjTZc4nn+Lr7mLXBbFJfvwbP0ywDv73EiaBsxn7zdg== +pg-pool@^3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.4.1.tgz#0e71ce2c67b442a5e862a9c182172c37eda71e9c" + integrity sha512-TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ== pg-protocol@^1.5.0: version "1.5.0" @@ -7852,14 +7928,14 @@ pg-types@^2.1.0: postgres-interval "^1.1.0" pg@^8.2.1: - version "8.6.0" - resolved "https://registry.yarnpkg.com/pg/-/pg-8.6.0.tgz#e222296b0b079b280cce106ea991703335487db2" - integrity sha512-qNS9u61lqljTDFvmk/N66EeGq3n6Ujzj0FFyNMGQr6XuEv4tgNTXvJQTfJdcvGit5p5/DWPu+wj920hAJFI+QQ== + version "8.7.1" + resolved "https://registry.yarnpkg.com/pg/-/pg-8.7.1.tgz#9ea9d1ec225980c36f94e181d009ab9f4ce4c471" + integrity sha512-7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA== dependencies: buffer-writer "2.0.0" packet-reader "1.0.0" pg-connection-string "^2.5.0" - pg-pool "^3.3.0" + pg-pool "^3.4.1" pg-protocol "^1.5.0" pg-types "^2.1.0" pgpass "1.x" @@ -7872,14 +7948,9 @@ pgpass@1.x: split2 "^3.1.1" picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: - version "2.2.3" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d" - integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg== - -pify@^2.0.0: version "2.3.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" - integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== pify@^3.0.0: version "3.0.0" @@ -7912,6 +7983,13 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" +pkg-up@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f" + integrity sha1-yBmscoBZpGHKscOImivjxJoATX8= + dependencies: + find-up "^2.1.0" + pkginfo@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.2.3.tgz#7239c42a5ef6c30b8f328439d9b9ff71042490f8" @@ -7939,123 +8017,105 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= -postcss-calc@^7.0.1: - version "7.0.5" - resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz#f8a6e99f12e619c2ebc23cf6c486fdc15860933e" - integrity sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg== +postcss-calc@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.0.0.tgz#a05b87aacd132740a5db09462a3612453e5df90a" + integrity sha512-5NglwDrcbiy8XXfPM11F3HeC6hoT9W7GUH/Zi5U/p7u3Irv4rHhdDcIZwG0llHXV4ftsBjpfWMXAnXNl4lnt8g== dependencies: - postcss "^7.0.27" postcss-selector-parser "^6.0.2" postcss-value-parser "^4.0.2" -postcss-colormin@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz#ae060bce93ed794ac71264f08132d550956bd381" - integrity sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw== +postcss-colormin@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.2.0.tgz#2b620b88c0ff19683f3349f4cf9e24ebdafb2c88" + integrity sha512-+HC6GfWU3upe5/mqmxuqYZ9B2Wl4lcoUUNkoaX59nEWV4EtADCMiBqui111Bu8R8IvaZTmqmxrqOAqjbHIwXPw== dependencies: - browserslist "^4.0.0" - color "^3.0.0" - has "^1.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + browserslist "^4.16.6" + caniuse-api "^3.0.0" + colord "^2.0.1" + postcss-value-parser "^4.1.0" -postcss-convert-values@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz#ca3813ed4da0f812f9d43703584e449ebe189a7f" - integrity sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ== +postcss-convert-values@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.0.1.tgz#4ec19d6016534e30e3102fdf414e753398645232" + integrity sha512-C3zR1Do2BkKkCgC0g3sF8TS0koF2G+mN8xxayZx3f10cIRmTaAnpgpRQZjNekTZxM2ciSPoh2IWJm0VZx8NoQg== dependencies: - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + postcss-value-parser "^4.1.0" -postcss-discard-comments@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz#1fbabd2c246bff6aaad7997b2b0918f4d7af4033" - integrity sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg== - dependencies: - postcss "^7.0.0" +postcss-discard-comments@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe" + integrity sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg== -postcss-discard-duplicates@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz#3fe133cd3c82282e550fc9b239176a9207b784eb" - integrity sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ== - dependencies: - postcss "^7.0.0" +postcss-discard-duplicates@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz#68f7cc6458fe6bab2e46c9f55ae52869f680e66d" + integrity sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA== -postcss-discard-empty@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz#c8c951e9f73ed9428019458444a02ad90bb9f765" - integrity sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w== - dependencies: - postcss "^7.0.0" +postcss-discard-empty@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz#ee136c39e27d5d2ed4da0ee5ed02bc8a9f8bf6d8" + integrity sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw== -postcss-discard-overridden@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz#652aef8a96726f029f5e3e00146ee7a4e755ff57" - integrity sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg== - dependencies: - postcss "^7.0.0" +postcss-discard-overridden@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz#454b41f707300b98109a75005ca4ab0ff2743ac6" + integrity sha512-Y28H7y93L2BpJhrdUR2SR2fnSsT+3TVx1NmVQLbcnZWwIUpJ7mfcTC6Za9M2PG6w8j7UQRfzxqn8jU2VwFxo3Q== -postcss-merge-longhand@^4.0.11: - version "4.0.11" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz#62f49a13e4a0ee04e7b98f42bb16062ca2549e24" - integrity sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw== +postcss-merge-longhand@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.2.tgz#277ada51d9a7958e8ef8cf263103c9384b322a41" + integrity sha512-BMlg9AXSI5G9TBT0Lo/H3PfUy63P84rVz3BjCFE9e9Y9RXQZD3+h3YO1kgTNsNJy7bBc1YQp8DmSnwLIW5VPcw== dependencies: - css-color-names "0.0.4" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - stylehacks "^4.0.0" + css-color-names "^1.0.1" + postcss-value-parser "^4.1.0" + stylehacks "^5.0.1" -postcss-merge-rules@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz#362bea4ff5a1f98e4075a713c6cb25aefef9a650" - integrity sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ== +postcss-merge-rules@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.2.tgz#d6e4d65018badbdb7dcc789c4f39b941305d410a" + integrity sha512-5K+Md7S3GwBewfB4rjDeol6V/RZ8S+v4B66Zk2gChRqLTCC8yjnHQ601omj9TKftS19OPGqZ/XzoqpzNQQLwbg== dependencies: - browserslist "^4.0.0" + browserslist "^4.16.6" caniuse-api "^3.0.0" - cssnano-util-same-parent "^4.0.0" - postcss "^7.0.0" - postcss-selector-parser "^3.0.0" - vendors "^1.0.0" + cssnano-utils "^2.0.1" + postcss-selector-parser "^6.0.5" + vendors "^1.0.3" -postcss-minify-font-values@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz#cd4c344cce474343fac5d82206ab2cbcb8afd5a6" - integrity sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg== +postcss-minify-font-values@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.1.tgz#a90cefbfdaa075bd3dbaa1b33588bb4dc268addf" + integrity sha512-7JS4qIsnqaxk+FXY1E8dHBDmraYFWmuL6cgt0T1SWGRO5bzJf8sUoelwa4P88LEWJZweHevAiDKxHlofuvtIoA== dependencies: - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + postcss-value-parser "^4.1.0" -postcss-minify-gradients@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz#93b29c2ff5099c535eecda56c4aa6e665a663471" - integrity sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q== +postcss-minify-gradients@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.2.tgz#7c175c108f06a5629925d698b3c4cf7bd3864ee5" + integrity sha512-7Do9JP+wqSD6Prittitt2zDLrfzP9pqKs2EcLX7HJYxsxCOwrrcLt4x/ctQTsiOw+/8HYotAoqNkrzItL19SdQ== dependencies: - cssnano-util-get-arguments "^4.0.0" - is-color-stop "^1.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + colord "^2.6" + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" -postcss-minify-params@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz#6b9cef030c11e35261f95f618c90036d680db874" - integrity sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg== +postcss-minify-params@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.1.tgz#371153ba164b9d8562842fdcd929c98abd9e5b6c" + integrity sha512-4RUC4k2A/Q9mGco1Z8ODc7h+A0z7L7X2ypO1B6V8057eVK6mZ6xwz6QN64nHuHLbqbclkX1wyzRnIrdZehTEHw== dependencies: - alphanum-sort "^1.0.0" - browserslist "^4.0.0" - cssnano-util-get-arguments "^4.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + alphanum-sort "^1.0.2" + browserslist "^4.16.0" + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" uniqs "^2.0.0" -postcss-minify-selectors@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz#e2e5eb40bfee500d0cd9243500f5f8ea4262fbd8" - integrity sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g== +postcss-minify-selectors@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54" + integrity sha512-NzGBXDa7aPsAcijXZeagnJBKBPMYLaJJzB8CQh6ncvyl2sIndLVWfbcDi0SBjRWk5VqEjXvf8tYwzoKf4Z07og== dependencies: - alphanum-sort "^1.0.0" - has "^1.0.0" - postcss "^7.0.0" - postcss-selector-parser "^3.0.0" + alphanum-sort "^1.0.2" + postcss-selector-parser "^6.0.5" postcss-modules-extract-imports@^3.0.0: version "3.0.0" @@ -8085,126 +8145,98 @@ postcss-modules-values@^4.0.0: dependencies: icss-utils "^5.0.0" -postcss-normalize-charset@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz#8b35add3aee83a136b0471e0d59be58a50285dd4" - integrity sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g== - dependencies: - postcss "^7.0.0" +postcss-normalize-charset@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0" + integrity sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg== -postcss-normalize-display-values@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz#0dbe04a4ce9063d4667ed2be476bb830c825935a" - integrity sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ== +postcss-normalize-display-values@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd" + integrity sha512-uupdvWk88kLDXi5HEyI9IaAJTE3/Djbcrqq8YgjvAVuzgVuqIk3SuJWUisT2gaJbZm1H9g5k2w1xXilM3x8DjQ== dependencies: - cssnano-util-get-match "^4.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" -postcss-normalize-positions@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz#05f757f84f260437378368a91f8932d4b102917f" - integrity sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA== +postcss-normalize-positions@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.1.tgz#868f6af1795fdfa86fbbe960dceb47e5f9492fe5" + integrity sha512-rvzWAJai5xej9yWqlCb1OWLd9JjW2Ex2BCPzUJrbaXmtKtgfL8dBMOOMTX6TnvQMtjk3ei1Lswcs78qKO1Skrg== dependencies: - cssnano-util-get-arguments "^4.0.0" - has "^1.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + postcss-value-parser "^4.1.0" -postcss-normalize-repeat-style@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz#c4ebbc289f3991a028d44751cbdd11918b17910c" - integrity sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q== +postcss-normalize-repeat-style@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.1.tgz#cbc0de1383b57f5bb61ddd6a84653b5e8665b2b5" + integrity sha512-syZ2itq0HTQjj4QtXZOeefomckiV5TaUO6ReIEabCh3wgDs4Mr01pkif0MeVwKyU/LHEkPJnpwFKRxqWA/7O3w== dependencies: - cssnano-util-get-arguments "^4.0.0" - cssnano-util-get-match "^4.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" -postcss-normalize-string@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz#cd44c40ab07a0c7a36dc5e99aace1eca4ec2690c" - integrity sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA== +postcss-normalize-string@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.1.tgz#d9eafaa4df78c7a3b973ae346ef0e47c554985b0" + integrity sha512-Ic8GaQ3jPMVl1OEn2U//2pm93AXUcF3wz+OriskdZ1AOuYV25OdgS7w9Xu2LO5cGyhHCgn8dMXh9bO7vi3i9pA== dependencies: - has "^1.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + postcss-value-parser "^4.1.0" -postcss-normalize-timing-functions@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz#8e009ca2a3949cdaf8ad23e6b6ab99cb5e7d28d9" - integrity sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A== +postcss-normalize-timing-functions@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.1.tgz#8ee41103b9130429c6cbba736932b75c5e2cb08c" + integrity sha512-cPcBdVN5OsWCNEo5hiXfLUnXfTGtSFiBU9SK8k7ii8UD7OLuznzgNRYkLZow11BkQiiqMcgPyh4ZqXEEUrtQ1Q== dependencies: - cssnano-util-get-match "^4.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" -postcss-normalize-unicode@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz#841bd48fdcf3019ad4baa7493a3d363b52ae1cfb" - integrity sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg== +postcss-normalize-unicode@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.1.tgz#82d672d648a411814aa5bf3ae565379ccd9f5e37" + integrity sha512-kAtYD6V3pK0beqrU90gpCQB7g6AOfP/2KIPCVBKJM2EheVsBQmx/Iof+9zR9NFKLAx4Pr9mDhogB27pmn354nA== dependencies: - browserslist "^4.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + browserslist "^4.16.0" + postcss-value-parser "^4.1.0" -postcss-normalize-url@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz#10e437f86bc7c7e58f7b9652ed878daaa95faae1" - integrity sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA== +postcss-normalize-url@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.0.2.tgz#ddcdfb7cede1270740cf3e4dfc6008bd96abc763" + integrity sha512-k4jLTPUxREQ5bpajFQZpx8bCF2UrlqOTzP9kEqcEnOfwsRshWs2+oAFIHfDQB8GO2PaUaSE0NlTAYtbluZTlHQ== dependencies: - is-absolute-url "^2.0.0" - normalize-url "^3.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + is-absolute-url "^3.0.3" + normalize-url "^6.0.1" + postcss-value-parser "^4.1.0" -postcss-normalize-whitespace@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz#bf1d4070fe4fcea87d1348e825d8cc0c5faa7d82" - integrity sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA== +postcss-normalize-whitespace@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.1.tgz#b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a" + integrity sha512-iPklmI5SBnRvwceb/XH568yyzK0qRVuAG+a1HFUsFRf11lEJTiQQa03a4RSCQvLKdcpX7XsI1Gen9LuLoqwiqA== dependencies: - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + postcss-value-parser "^4.1.0" -postcss-ordered-values@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz#0cf75c820ec7d5c4d280189559e0b571ebac0eee" - integrity sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw== +postcss-ordered-values@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.2.tgz#1f351426977be00e0f765b3164ad753dac8ed044" + integrity sha512-8AFYDSOYWebJYLyJi3fyjl6CqMEG/UVworjiyK1r573I56kb3e879sCJLGvR3merj+fAdPpVplXKQZv+ey6CgQ== dependencies: - cssnano-util-get-arguments "^4.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" -postcss-reduce-initial@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz#7fd42ebea5e9c814609639e2c2e84ae270ba48df" - integrity sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA== +postcss-reduce-initial@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.0.1.tgz#9d6369865b0f6f6f6b165a0ef5dc1a4856c7e946" + integrity sha512-zlCZPKLLTMAqA3ZWH57HlbCjkD55LX9dsRyxlls+wfuRfqCi5mSlZVan0heX5cHr154Dq9AfbH70LyhrSAezJw== dependencies: - browserslist "^4.0.0" + browserslist "^4.16.0" caniuse-api "^3.0.0" - has "^1.0.0" - postcss "^7.0.0" - -postcss-reduce-transforms@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz#17efa405eacc6e07be3414a5ca2d1074681d4e29" - integrity sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg== - dependencies: - cssnano-util-get-match "^4.0.0" - has "^1.0.0" - postcss "^7.0.0" - postcss-value-parser "^3.0.0" -postcss-selector-parser@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz#b310f5c4c0fdaf76f94902bbaa30db6aa84f5270" - integrity sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA== +postcss-reduce-transforms@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.1.tgz#93c12f6a159474aa711d5269923e2383cedcf640" + integrity sha512-a//FjoPeFkRuAguPscTVmRQUODP+f3ke2HqFNgGPwdYnpeC29RZdCBvGRGTsKpMURb/I3p6jdKoBQ2zI+9Q7kA== dependencies: - dot-prop "^5.2.0" - indexes-of "^1.0.1" - uniq "^1.0.1" + cssnano-utils "^2.0.1" + postcss-value-parser "^4.1.0" -postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: +postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5: version "6.0.6" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg== @@ -8212,51 +8244,36 @@ postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: cssesc "^3.0.0" util-deprecate "^1.0.2" -postcss-svgo@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.3.tgz#343a2cdbac9505d416243d496f724f38894c941e" - integrity sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw== +postcss-svgo@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.0.2.tgz#bc73c4ea4c5a80fbd4b45e29042c34ceffb9257f" + integrity sha512-YzQuFLZu3U3aheizD+B1joQ94vzPfE6BNUcSYuceNxlVnKKsOtdo6hL9/zyC168Q8EwfLSgaDSalsUGa9f2C0A== dependencies: - postcss "^7.0.0" - postcss-value-parser "^3.0.0" - svgo "^1.0.0" + postcss-value-parser "^4.1.0" + svgo "^2.3.0" -postcss-unique-selectors@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz#9446911f3289bfd64c6d680f073c03b1f9ee4bac" - integrity sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg== +postcss-unique-selectors@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.1.tgz#3be5c1d7363352eff838bd62b0b07a0abad43bfc" + integrity sha512-gwi1NhHV4FMmPn+qwBNuot1sG1t2OmacLQ/AX29lzyggnjd+MnVD5uqQmpXO3J17KGL2WAxQruj1qTd3H0gG/w== dependencies: - alphanum-sort "^1.0.0" - postcss "^7.0.0" + alphanum-sort "^1.0.2" + postcss-selector-parser "^6.0.5" uniqs "^2.0.0" -postcss-value-parser@^3.0.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" - integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== - postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== -postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.27: - version "7.0.35" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24" - integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg== - dependencies: - chalk "^2.4.2" - source-map "^0.6.1" - supports-color "^6.1.0" - -postcss@^8.2.10: - version "8.2.15" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.15.tgz#9e66ccf07292817d226fc315cbbf9bc148fbca65" - integrity sha512-2zO3b26eJD/8rb106Qu2o7Qgg52ND5HPjcyQiK2B98O388h43A448LCslC0dI2P97wCAQRJsFvwTRcXxTKds+Q== +postcss@^8.2.1, postcss@^8.2.15: + version "8.3.6" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.6.tgz#2730dd76a97969f37f53b9a6096197be311cc4ea" + integrity sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A== dependencies: colorette "^1.2.2" nanoid "^3.1.23" - source-map "^0.6.1" + source-map-js "^0.6.2" postgres-array@~2.0.0: version "2.0.0" @@ -8308,12 +8325,10 @@ printj@~1.1.0: resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222" integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ== -prismjs@1.23.0: - version "1.23.0" - resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.23.0.tgz#d3b3967f7d72440690497652a9d40ff046067f33" - integrity sha512-c29LVsqOaLbBHuIbsTxaKENh1N2EQBOHaWv7gkHN4dgRbxSREqDnDbtFJYdpPauS4YCplMSNCABQ6Eeor69bAA== - optionalDependencies: - clipboard "^2.0.0" +prismjs@1.24.1: + version "1.24.1" + resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.24.1.tgz#c4d7895c4d6500289482fa8936d9cdd192684036" + integrity sha512-mNPsedLuk90RVJioIky8ANZEwYm5w9LcvCXrxHlwf4fNVSn8jEipMybMkWUyyF0JhnC+C4VcOVSBuHRKs1L5Ow== private@^0.1.6, private@^0.1.8: version "0.1.8" @@ -8341,9 +8356,9 @@ progress@^2.0.0: integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== prom-client@^13.1.0: - version "13.1.0" - resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-13.1.0.tgz#1185caffd8691e28d32e373972e662964e3dba45" - integrity sha512-jT9VccZCWrJWXdyEtQddCDszYsiuWj5T0ekrPszi/WEegj3IZy6Mm09iOOVM86A4IKMWq8hZkT2dD9MaSe+sng== + version "13.2.0" + resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-13.2.0.tgz#99d13357912dd400f8911b77df19f7b328a93e92" + integrity sha512-wGr5mlNNdRNzEhRYXgboUU2LxHWIojxscJKmtG3R8f4/KiWqyYgXTLHs0+Ted7tG3zFT7pgHJbtomzZ1L0ARaQ== dependencies: tdigest "^0.1.1" @@ -8364,12 +8379,17 @@ promise-inflight@^1.0.1: resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= +property-information@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/property-information/-/property-information-6.0.1.tgz#7c668d9f2b9cb63bc3e105d8b8dfee7221a17800" + integrity sha512-F4WUUAF7fMeF4/JUFHNBWDaKDXi2jbvqBW/y6o5wsf3j19wTZ7S60TmtB5HoBhtgw7NKQRMWuz5vk2PR0CygUg== + proxy-addr@~2.0.5: - version "2.0.6" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf" - integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw== + version "2.0.7" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== dependencies: - forwarded "~0.1.2" + forwarded "0.2.0" ipaddr.js "1.9.1" prr@~1.0.1: @@ -8439,7 +8459,7 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -q@^1.1.2, q@^1.5.1: +q@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= @@ -8454,6 +8474,13 @@ qs@6.7.0: resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== +qs@^6.5.2: + version "6.10.1" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a" + integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg== + dependencies: + side-channel "^1.0.4" + qs@~6.5.2: version "6.5.2" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" @@ -8530,11 +8557,6 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -raw-loader@~0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa" - integrity sha1-DD0L6u2KAclm2Xh793goElKpeao= - rc@^1.2.7: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" @@ -8545,22 +8567,22 @@ rc@^1.2.7: minimist "^1.2.0" strip-json-comments "~2.0.1" -read-pkg-up@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" - integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4= +read-pkg-up@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07" + integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc= dependencies: find-up "^2.0.0" - read-pkg "^2.0.0" + read-pkg "^3.0.0" -read-pkg@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" - integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg= +read-pkg@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" + integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k= dependencies: - load-json-file "^2.0.0" + load-json-file "^4.0.0" normalize-package-data "^2.3.2" - path-type "^2.0.0" + path-type "^3.0.0" "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@^2.3.7, readable-stream@~2.3.6: version "2.3.7" @@ -8585,7 +8607,7 @@ readable-stream@1.0.27-1: isarray "0.0.1" string_decoder "~0.10.x" -"readable-stream@2 || 3", readable-stream@^3.0.0, readable-stream@^3.0.1, readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: +"readable-stream@2 || 3", readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== @@ -8607,11 +8629,10 @@ readable-stream@~2.0.0: util-deprecate "~1.0.1" readable-web-to-node-stream@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.1.tgz#3f619b1bc5dd73a4cfe5c5f9b4f6faba55dff845" - integrity sha512-4zDC6CvjUyusN7V0QLsXVB7pJCD9+vtrM9bYDRv6uBQ+SKfx36rp5AFNPRgh9auKRul/a1iFZJYXcCbwRL+SaA== + version "3.0.2" + resolved "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz#5d52bb5df7b54861fd48d015e93a2cb87b3ee0bb" + integrity sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw== dependencies: - "@types/readable-stream" "^2.3.9" readable-stream "^3.6.0" readdir-glob@^1.0.0: @@ -8630,10 +8651,10 @@ readdirp@^2.0.0, readdirp@^2.2.1: micromatch "^3.1.10" readable-stream "^2.0.2" -readdirp@~3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" - integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== dependencies: picomatch "^2.2.1" @@ -8643,9 +8664,9 @@ readline-sync@^1.4.7: integrity sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw== rechoir@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.0.tgz#32650fd52c21ab252aa5d65b19310441c7e03aca" - integrity sha512-ADsDEH2bvbjltXEP+hTIAmeFekTFK0V2BTxMkok6qILyAJEXV0AFfoWcAq4yfll5VdIMd/RVXq0lR+wQi5ZU3Q== + version "0.7.1" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686" + integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg== dependencies: resolve "^1.9.0" @@ -8702,9 +8723,9 @@ regexp.prototype.flags@^1.3.0: define-properties "^1.1.3" regexpp@^3.0.0, regexpp@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" - integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== + version "3.2.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" + integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== regexpu-core@^2.0.0: version "2.0.0" @@ -8727,537 +8748,656 @@ regjsparser@^0.1.4: dependencies: jsesc "~0.5.0" +rehype-parse@^8.0.0: + version "8.0.3" + resolved "https://registry.yarnpkg.com/rehype-parse/-/rehype-parse-8.0.3.tgz#a1947132a08a930d0c2b6fd2b3dbcc137457c07a" + integrity sha512-RGw0CVt+0S6KdvpE8bbP2Db9WXclQcIX7A0ufM3QFqAhTo/ddJMQrrI2j3cijlRPZlGK8R3pRgC8U5HyV76IDw== + dependencies: + "@types/hast" "^2.0.0" + hast-util-from-parse5 "^7.0.0" + parse5 "^6.0.0" + unified "^10.0.0" + +rehype-stringify@^9.0.0: + version "9.0.2" + resolved "https://registry.yarnpkg.com/rehype-stringify/-/rehype-stringify-9.0.2.tgz#2d95e06e246abbee504cf2f54c8d12f27d7bfd8e" + integrity sha512-BuVA6lAEYtOpXO2xuHLohAzz8UNoQAxAqYRqh4QEEtU39Co+P1JBZhw6wXA9hMWp+JLcmrxWH8+UKcNSr443Fw== + dependencies: + "@types/hast" "^2.0.0" + hast-util-to-html "^8.0.0" + unified "^10.0.0" + +rehype@^12.0.0: + version "12.0.0" + resolved "https://registry.yarnpkg.com/rehype/-/rehype-12.0.0.tgz#d5e80a206da2479b3564722bc2ba882e0f4240ec" + integrity sha512-gZcttmf9R5IYHb8AlI1rlmWqXS1yX0rSB/S5ZGJs8atfYZy2DobvH3Ic/gSzB+HL/+oOHPtBguw1TprfhxXBgQ== + dependencies: + "@types/hast" "^2.0.0" + rehype-parse "^8.0.0" + rehype-stringify "^9.0.0" + unified "^10.0.0" + relateurl@^0.2.7: version "0.2.7" resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= -remark-cli@9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/remark-cli/-/remark-cli-9.0.0.tgz#6f7951e7a72217535f2e32b7a6d3f638fe182f86" - integrity sha512-y6kCXdwZoMoh0Wo4Och1tDW50PmMc86gW6GpF08v9d+xUCEJE2wwXdQ+TnTaUamRnfFdU+fE+eNf2PJ53cyq8g== +remark-cli@10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/remark-cli/-/remark-cli-10.0.0.tgz#3b0e20f2ad3909f35c7a6fb3f721c82f6ff5beac" + integrity sha512-Yc5kLsJ5vgiQJl6xMLLJHqPac6OSAC5DOqKQrtmzJxSdJby2Jgr+OpIAkWQYwvbNHEspNagyoQnuwK2UCWg73g== dependencies: - markdown-extensions "^1.1.0" - remark "^13.0.0" - unified-args "^8.0.0" + remark "^14.0.0" + unified-args "^9.0.0" -remark-lint-blockquote-indentation@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-blockquote-indentation/-/remark-lint-blockquote-indentation-2.0.1.tgz#27347959acf42a6c3e401488d8210e973576b254" - integrity sha512-uJ9az/Ms9AapnkWpLSCJfawBfnBI2Tn1yUsPNqIFv6YM98ymetItUMyP6ng9NFPqDvTQBbiarulkgoEo0wcafQ== +remark-lint-blockquote-indentation@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-blockquote-indentation/-/remark-lint-blockquote-indentation-3.0.1.tgz#74591e6029c4c8c92bf0c1665e001b29a71522bd" + integrity sha512-CfjXeaomk3bxt1Y0Z4T/cKVoE+8lm5jw5C+jz8EieWNIziGNUlDxIAbMk1F1sO8EXc4LjkbTSq4zz8h1vOHkew== dependencies: - mdast-util-to-string "^1.0.2" + "@types/mdast" "^3.0.0" pluralize "^8.0.0" - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" -remark-lint-code-block-style@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-code-block-style/-/remark-lint-code-block-style-2.0.1.tgz#448b0f2660acfcdfff2138d125ff5b1c1279c0cb" - integrity sha512-eRhmnColmSxJhO61GHZkvO67SpHDshVxs2j3+Zoc5Y1a4zQT2133ZAij04XKaBFfsVLjhbY/+YOWxgvtjx2nmA== +remark-lint-code-block-style@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-code-block-style/-/remark-lint-code-block-style-3.0.1.tgz#be4434e3e8007bd3324227da876d3c59e2e960d6" + integrity sha512-B6338x1UggrAMe4gdmk1No2L/OkK1d1uCelekj6cnl+Pi5/HLlSw3lXIaOTRNIXOccT1zMmNApA4sDZ5qsQWtw== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" -remark-lint-definition-case@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-definition-case/-/remark-lint-definition-case-2.0.1.tgz#10340eb2f87acff41140d52ad7e5b40b47e6690a" - integrity sha512-M+XlThtQwEJLQnQb5Gi6xZdkw92rGp7m2ux58WMw/Qlcg02WgHR/O0OcHPe5VO5hMJrtI+cGG5T0svsCgRZd3w== +remark-lint-definition-case@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-definition-case/-/remark-lint-definition-case-3.0.1.tgz#15b2260ed0281398944c09f460ec48cb31a12fdc" + integrity sha512-MsMpHnlb82nBP8yv16hECd2Laq8gw0cMAgxFT72cIYgdNa3B277o20XgtmkKk1i6BxpbJ/1zI9MoLXV60dQ3wQ== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" -remark-lint-definition-spacing@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-definition-spacing/-/remark-lint-definition-spacing-2.0.1.tgz#97f01bf9bf77a7bdf8013b124b7157dd90b07c64" - integrity sha512-xK9DOQO5MudITD189VyUiMHBIKltW1oc55L7Fti3i9DedXoBG7Phm+V9Mm7IdWzCVkquZVgVk63xQdqzSQRrSQ== +remark-lint-definition-spacing@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-definition-spacing/-/remark-lint-definition-spacing-3.0.1.tgz#2599dc8cef6eb555b116a9634a226d812795fd87" + integrity sha512-jtCUaZ+6KP4nNutBoiWoqBfa2sMsD4uvvFbuU5MOlzI0wlMmaeAq1pxWuNtkK+w8AEk/8CzfCUrLct5w65KSLQ== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" -remark-lint-emphasis-marker@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-emphasis-marker/-/remark-lint-emphasis-marker-2.0.1.tgz#1d5ca2070d4798d16c23120726158157796dc317" - integrity sha512-7mpbAUrSnHiWRyGkbXRL5kfSKY9Cs8cdob7Fw+Z02/pufXMF4yRWaegJ5NTUu1RE+SKlF44wtWWjvcIoyY6/aw== +remark-lint-emphasis-marker@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-emphasis-marker/-/remark-lint-emphasis-marker-3.0.1.tgz#612d0126d99649484ad9a42ad854f3110ddc7536" + integrity sha512-5uwlHk4oDWDZIHSLkUoYBSrzzkpywy4J2kAy+CR5LW3HaV6YCFfm2/hAXiPIGCABH3KT35OoZZRoA8t4PJ51xw== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" -remark-lint-fenced-code-flag@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-fenced-code-flag/-/remark-lint-fenced-code-flag-2.0.1.tgz#2cb3ddb1157082c45760c7d01ca08e13376aaf62" - integrity sha512-+COnWHlS/h02FMxoZWxNlZW3Y8M0cQQpmx3aNCbG7xkyMyCKsMLg9EmRvYHHIbxQCuF3JT0WWx5AySqlc7d+NA== +remark-lint-fenced-code-flag@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-fenced-code-flag/-/remark-lint-fenced-code-flag-3.0.1.tgz#5282ece321f9e3e86dd7e1b30dbd50f0cdbb40e0" + integrity sha512-HsEhvalGxCauZO6OAnaVzIBycfaHLuyZxy1KlniWXQJKZ6EjRAsWwkZHYx9qfPl/ZW7zDG+xAoWTqdHjZW/BTg== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" -remark-lint-fenced-code-marker@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-fenced-code-marker/-/remark-lint-fenced-code-marker-2.0.1.tgz#7bbeb0fb45b0818a3c8a2d232cf0c723ade58ecf" - integrity sha512-lujpjm04enn3ma6lITlttadld6eQ1OWAEcT3qZzvFHp+zPraC0yr0eXlvtDN/0UH8mrln/QmGiZp3i8IdbucZg== +remark-lint-fenced-code-marker@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-fenced-code-marker/-/remark-lint-fenced-code-marker-3.0.1.tgz#3b09baa8305f86f27c81e1f4eaffd4ac4e51e7b0" + integrity sha512-vFRjlzyxtG3zdvmlTn6cV1YiZAivQwOzYRNnH5KavC39EZHDxqjQl84QTXshgfCzFupvYCi6ykATIa7obgx9jg== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" -remark-lint-file-extension@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/remark-lint-file-extension/-/remark-lint-file-extension-1.0.5.tgz#7e2feec02919aa3db5c71fda19d726a9e24a4c6c" - integrity sha512-oVQdf5vEomwHkfQ7R/mgmsWW2H/t9kSvnrxtVoNOHr+qnOEafKKDn+AFhioN2kqtjCZBAjSSrePs6xGKmXKDTw== +remark-lint-file-extension@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-file-extension/-/remark-lint-file-extension-2.0.1.tgz#e6777c2a322270066aa3c249d2836d326ba3f91d" + integrity sha512-A2N6XoLPbYyRhgXyTI7WlW9Nb9QvXQNXG514hjHdNNd0cL+5P4JU6vivgZiYfViCzOLgsys6hwhXBSC9ZQ45tw== dependencies: - unified-lint-rule "^1.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" -remark-lint-final-definition@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/remark-lint-final-definition/-/remark-lint-final-definition-2.1.0.tgz#b6e654c01ebcb1afc936d7b9cd74db8ec273e0bb" - integrity sha512-83K7n2icOHPfBzbR5Mr1o7cu8gOjD8FwJkFx/ly+rW+8SHfjCj4D3WOFGQ1xVdmHjfomBDXXDSNo2oiacADVXQ== +remark-lint-final-definition@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-final-definition/-/remark-lint-final-definition-3.0.1.tgz#9439d9531369b6a8bbbb25e2d550d5fe19a9202b" + integrity sha512-bzha13GTKFnQ0h4ZvaHadK6HxM2eRJj/yj59aXyvJkHFNx7i0sQn1884t3yYM4ppdDmO+cCMMgsVo8DxE8ifFA== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" -remark-lint-hard-break-spaces@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-hard-break-spaces/-/remark-lint-hard-break-spaces-2.0.1.tgz#2149b55cda17604562d040c525a2a0d26aeb0f0f" - integrity sha512-Qfn/BMQFamHhtbfLrL8Co/dbYJFLRL4PGVXZ5wumkUO5f9FkZC2RsV+MD9lisvGTkJK0ZEJrVVeaPbUIFM0OAw== +remark-lint-hard-break-spaces@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-hard-break-spaces/-/remark-lint-hard-break-spaces-3.0.1.tgz#aa5a968a6ecb609fddc0b3c73e578f4eb3fdf75a" + integrity sha512-CPjbfc9DcV4Qy3d8jyhh/QXsLD5uRtweb0d04p2MyzMDrqwXAq5X4MW3rId3JbVVl7o1AKXq1FdvqIMrh9Rpuw== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" -remark-lint-heading-increment@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-heading-increment/-/remark-lint-heading-increment-2.0.1.tgz#b578f251508a05d79bc2d1ae941e0620e23bf1d3" - integrity sha512-bYDRmv/lk3nuWXs2VSD1B4FneGT6v7a74FuVmb305hyEMmFSnneJvVgnOJxyKlbNlz12pq1IQ6MhlJBda/SFtQ== +remark-lint-heading-increment@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-heading-increment/-/remark-lint-heading-increment-3.0.1.tgz#12d264ea48b6db979433bf22b4145d116789361d" + integrity sha512-GDriIGIP+OaR+yZwTd+lKZhNBIdjqMsd+ByV7V8ekKJbbOh8/pXSwKr5Pv4UdvY+ISef5IrD/RnRMVuiorRfZA== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-visit "^4.0.0" -remark-lint-heading-style@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-heading-style/-/remark-lint-heading-style-2.0.1.tgz#8216fca67d97bbbeec8a19b6c71bfefc16549f72" - integrity sha512-IrFLNs0M5Vbn9qg51AYhGUfzgLAcDOjh2hFGMz3mx664dV6zLcNZOPSdJBBJq3JQR4gKpoXcNwN1+FFaIATj+A== +remark-lint-heading-style@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-heading-style/-/remark-lint-heading-style-3.0.1.tgz#8727db87ceab53d33c7016750acf3358b321d15f" + integrity sha512-/9rsTE+coYdUgT/spxg4ioorG2W5XdabLHajKjTOOQ4ME8Wa5fXHMJ3WpK3Vnz8ZKP7WQwTTPsKWIHcy5d6C+w== dependencies: - mdast-util-heading-style "^1.0.2" - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + mdast-util-heading-style "^2.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-visit "^4.0.0" -remark-lint-link-title-style@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-link-title-style/-/remark-lint-link-title-style-2.0.1.tgz#51a595c69fcfa73a245a030dfaa3504938a1173a" - integrity sha512-+Q7Ew8qpOQzjqbDF6sUHmn9mKgje+m2Ho8Xz7cEnGIRaKJgtJzkn/dZqQM/az0gn3zaN6rOuwTwqw4EsT5EsIg== +remark-lint-link-title-style@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-link-title-style/-/remark-lint-link-title-style-3.0.1.tgz#9fbbc8329cf7c693d307764662cc644415b143fe" + integrity sha512-5CgzNZtuI2/5/RdHKo9+Ritab8CUWv4wfBhPWRvTZDRmy+7POnKClZaNoxWVoH0/+/JMmeQpe31dgbT1Wh2uZA== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" - vfile-location "^3.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" + vfile-location "^4.0.0" -remark-lint-list-item-content-indent@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-list-item-content-indent/-/remark-lint-list-item-content-indent-2.0.1.tgz#96387459440dcd61e522ab02bff138b32bfaa63a" - integrity sha512-OzUMqavxyptAdG7vWvBSMc9mLW9ZlTjbW4XGayzczd3KIr6Uwp3NEFXKx6MLtYIM/vwBqMrPQUrObOC7A2uBpQ== +remark-lint-list-item-content-indent@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-list-item-content-indent/-/remark-lint-list-item-content-indent-3.0.1.tgz#1357e559e69163386f9666b20efd2951e6222416" + integrity sha512-bRn7V/T1J9d/BaRNTfu695xO48n4Ul8udEzMrKWxfDfCgOLfsVtj3NQD0iGFpvJ9R6zB7GGPka+SEQlIxpT9FQ== dependencies: + "@types/mdast" "^3.0.0" pluralize "^8.0.0" - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" -remark-lint-list-item-indent@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-list-item-indent/-/remark-lint-list-item-indent-2.0.1.tgz#c6472514e17bc02136ca87936260407ada90bf8d" - integrity sha512-4IKbA9GA14Q9PzKSQI6KEHU/UGO36CSQEjaDIhmb9UOhyhuzz4vWhnSIsxyI73n9nl9GGRAMNUSGzr4pQUFwTA== +remark-lint-list-item-indent@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-list-item-indent/-/remark-lint-list-item-indent-3.0.1.tgz#719ee34dec3f7b34cfd3fd2600806dc561fc748b" + integrity sha512-5/H5B2g6TTpJZiwMmBa/Drexwq5Dw50QoypTUgXwFETz91s7zvjy+IGGVoVv0L0LM0rCwblmgtLomqeWIyo9sA== dependencies: + "@types/mdast" "^3.0.0" pluralize "^8.0.0" - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" -remark-lint-list-item-spacing@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/remark-lint-list-item-spacing/-/remark-lint-list-item-spacing-3.0.0.tgz#14c18fe8c0f19231edb5cf94abda748bb773110b" - integrity sha512-SRUVonwdN3GOSFb6oIYs4IfJxIVR+rD0nynkX66qEO49/qDDT1PPvkndis6Nyew5+t+2V/Db9vqllL6SWbnEtw== +remark-lint-list-item-spacing@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-list-item-spacing/-/remark-lint-list-item-spacing-4.0.1.tgz#41add9734076d23671d043db09e2cd9154cd7dd5" + integrity sha512-/Y03NjqtCodzTUwR0eFEn4h/9KJOCSzq981dEEPd56oGcpKgMI5ev4OqI3TyIAtdmJZ9SH87Yv4dXwO6VJ9FoQ== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" -remark-lint-maximum-heading-length@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-maximum-heading-length/-/remark-lint-maximum-heading-length-2.0.1.tgz#56f240707a75b59bce3384ccc9da94548affa98f" - integrity sha512-1CjJ71YDqEpoOjUnc4wrwZV8ZGXWUIYRYeGoarAy3QKHepJL9M+zkdbOxZDfhc3tjVoDW/LWcgsW+DEpczgiMA== +remark-lint-maximum-heading-length@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-maximum-heading-length/-/remark-lint-maximum-heading-length-3.0.1.tgz#0ab8071f5c2fbdf8a28d23022f74c59bfdfaac75" + integrity sha512-VVNi4KyX9BgL5pSC281TLutsY1JUARDvBmhE3afQ0eSfJbrXi4tGOSjlHXpAS4TJXf1WUQQ7ETmmKu795dJdaw== dependencies: - mdast-util-to-string "^1.0.2" - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + mdast-util-to-string "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-visit "^4.0.0" -remark-lint-maximum-line-length@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/remark-lint-maximum-line-length/-/remark-lint-maximum-line-length-2.0.3.tgz#d0d15410637d61b031a83d7c78022ec46d6c858a" - integrity sha512-zyWHBFh1oPAy+gkaVFXiTHYP2WwriIeBtaarDqkweytw0+qmuikjVMJTWbQ3+XfYBreD7KKDM9SI79nkp0/IZQ== +remark-lint-maximum-line-length@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-maximum-line-length/-/remark-lint-maximum-line-length-3.0.1.tgz#685871fd6581148a32ca38719f9f1eb16d78c30f" + integrity sha512-R4hiRRx46xa3NE/AY8IKzPTRVyq1ZWrtWVd2KfWwNHmj7a6ASjb75DPzGyckZ46UAQq9mSBPsgL5Rfhq5XmggA== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" -remark-lint-no-auto-link-without-protocol@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-auto-link-without-protocol/-/remark-lint-no-auto-link-without-protocol-2.0.1.tgz#f75e5c24adb42385593e0d75ca39987edb70b6c4" - integrity sha512-TFcXxzucsfBb/5uMqGF1rQA+WJJqm1ZlYQXyvJEXigEZ8EAxsxZGPb/gOQARHl/y0vymAuYxMTaChavPKaBqpQ== +remark-lint-no-auto-link-without-protocol@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-auto-link-without-protocol/-/remark-lint-no-auto-link-without-protocol-3.0.1.tgz#8a70874368521bb40689b5421d8279796199c493" + integrity sha512-FdbB9O4SegELBreglpOXhMyusKORPS0X7KrBY/V+tDo4+2sJHMEEdiN4RbK2ofWwRP7V+muZ5WrscLliuAExQg== dependencies: - mdast-util-to-string "^1.0.2" - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" - -remark-lint-no-blockquote-without-marker@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/remark-lint-no-blockquote-without-marker/-/remark-lint-no-blockquote-without-marker-4.0.0.tgz#856fb64dd038fa8fc27928163caa24a30ff4d790" - integrity sha512-Y59fMqdygRVFLk1gpx2Qhhaw5IKOR9T38Wf7pjR07bEFBGUNfcoNVIFMd1TCJfCPQxUyJzzSqfZz/KT7KdUuiQ== + "@types/mdast" "^3.0.0" + mdast-util-to-string "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" + +remark-lint-no-blockquote-without-marker@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-blockquote-without-marker/-/remark-lint-no-blockquote-without-marker-5.0.1.tgz#31cb4264088b6db8c5a2824ab0a16f0ce37d5065" + integrity sha512-3aUFCV1BSqO15MuJ6fQept36An/vLo9VgAj1TRWk4Gsnaewbq7haT/m6eiYn5Ia8t2sSBbv4LKz1lwnj5nOVPQ== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.0.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" - vfile-location "^3.0.0" - -remark-lint-no-consecutive-blank-lines@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/remark-lint-no-consecutive-blank-lines/-/remark-lint-no-consecutive-blank-lines-3.0.0.tgz#c8fe11095b8f031a1406da273722bd4a9174bf41" - integrity sha512-kmzLlOLrapBKEngwYFTdCZDmeOaze6adFPB7G0EdymD9V1mpAlnneINuOshRLEDKK5fAhXKiZXxdGIaMPkiXrA== + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" + vfile-location "^4.0.0" + +remark-lint-no-consecutive-blank-lines@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-consecutive-blank-lines/-/remark-lint-no-consecutive-blank-lines-4.0.1.tgz#e9ff3613e25d42bd004e8ab065609a0393f16f2b" + integrity sha512-nvwglXFdR8ubTjSduK3cVdgBaKCH/DqV0kVkCKSQmLEl8NyozFH03VB/bhQDCrmSeNt6rYClBF0ppaHT27OmpA== dependencies: + "@types/mdast" "^3.0.0" + "@types/unist" "^2.0.0" pluralize "^8.0.0" - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" -remark-lint-no-duplicate-headings@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-duplicate-headings/-/remark-lint-no-duplicate-headings-2.0.1.tgz#4a4b70e029155ebcfc03d8b2358c427b69a87576" - integrity sha512-F6AP0FJcHIlkmq0pHX0J5EGvLA9LfhuYTvnNO8y3kvflHeRjFkDyt2foz/taXR8OcLQR51n/jIJiwrrSMbiauw== +remark-lint-no-duplicate-headings@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-duplicate-headings/-/remark-lint-no-duplicate-headings-3.0.1.tgz#9db2ba686606226178d6563a0213e83ac7a22c15" + integrity sha512-yUy6LwD58xXJgoEGAhLKeDvfCRTeaLiY8yAsY1khOTPsh9qc2JQFArG2DqmsDttm1rErDnFvggW44tAL6OQAHA== dependencies: - mdast-util-to-string "^1.0.2" - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-stringify-position "^2.0.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + mdast-util-to-string "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-position "^4.0.0" + unist-util-stringify-position "^3.0.0" + unist-util-visit "^4.0.0" + +remark-lint-no-emphasis-as-heading@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-emphasis-as-heading/-/remark-lint-no-emphasis-as-heading-3.0.1.tgz#0290da33cbce79b72ddf28f9878fccad64d3a0f2" + integrity sha512-jMsEhsC5s3gUgiNqTAKpQOATHa/6xM64X1YKq3D8RBOSqMHUrTDx2t9COa0MFqYzXmPQ5XfxZIkuW9QVBJPgCg== + dependencies: + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-visit "^4.0.0" -remark-lint-no-emphasis-as-heading@^2.0.0: +remark-lint-no-file-name-articles@^2.0.0: version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-emphasis-as-heading/-/remark-lint-no-emphasis-as-heading-2.0.1.tgz#fcc064133fe00745943c334080fed822f72711ea" - integrity sha512-z86+yWtVivtuGIxIC4g9RuATbgZgOgyLcnaleonJ7/HdGTYssjJNyqCJweaWSLoaI0akBQdDwmtJahW5iuX3/g== + resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-articles/-/remark-lint-no-file-name-articles-2.0.1.tgz#1265a3dab489f5c07a1c3e8a2167124ef5bd030f" + integrity sha512-9kZ/ydzJlntswJjsQEbPPx0tc6uAPuowmG/3aOCSE+6CjJ+bCQZiVLL3VhjktNyzFxDGTDN6LlbVwiyIHEUMwA== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" -remark-lint-no-file-name-articles@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-articles/-/remark-lint-no-file-name-articles-1.0.5.tgz#4ca3425f6613f94feaef6941028583299727c339" - integrity sha512-AQk5eTb3s3TAPPjiglZgqlQj4ycao+gPs8/XkdN1VCPUtewW0GgwoQe7YEuBKayJ6ioN8dGP37Kg/P/PlKaRQA== +remark-lint-no-file-name-consecutive-dashes@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-consecutive-dashes/-/remark-lint-no-file-name-consecutive-dashes-2.0.1.tgz#cab34dce03381b15dac50188198c24303bde4e71" + integrity sha512-e9ei9KwQSRzUQeYHEhCKUMDeavFOIj46NtuyZxYtrklOcblvaZLAV133UcFHk5CimdUj3dzTtFZebHdpvu5omw== dependencies: - unified-lint-rule "^1.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" -remark-lint-no-file-name-consecutive-dashes@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-consecutive-dashes/-/remark-lint-no-file-name-consecutive-dashes-1.0.5.tgz#e9a6f2aeab948aa249c8a8356359e3d8843a4c5c" - integrity sha512-Mg2IDsi790/dSdAzwnBnsMYdZm3qC2QgGwqOWcr0TPABJhhjC3p8r5fX4MNMTXI5It7B7bW9+ImmCeLOZiXkLg== +remark-lint-no-file-name-irregular-characters@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-irregular-characters/-/remark-lint-no-file-name-irregular-characters-2.0.1.tgz#7188d6bca6618d667237ceb553bf7a19fb421dd1" + integrity sha512-TvhfKpsE0UhUr6iIvInR/PC42fpmLGt+uBLtx1HBgRCUqkQUra8Ep2rRMaxvFp2ms1xX/p0pDtSCkXRUeV2Pug== dependencies: - unified-lint-rule "^1.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" -remark-lint-no-file-name-irregular-characters@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-irregular-characters/-/remark-lint-no-file-name-irregular-characters-1.0.5.tgz#6866f5b8370cdc916d55e7cf87bb6a55f9b6e0c6" - integrity sha512-Oe5i99qNUKc2bxmiH421o5B/kqlf1dfjAxpHNLhi2X2dXE91zRGavrlRM/4f4oR0N9Bqb3qB9JZPyMPWrzu9XA== +remark-lint-no-file-name-mixed-case@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-mixed-case/-/remark-lint-no-file-name-mixed-case-2.0.1.tgz#2e200fdb19d8b3249ba3cddbddf35c52590b7c1a" + integrity sha512-NG86/vR3tWoL6xrllUkvfg0y7k0eiG0N3KZVHEyOl1zGeARWaR+NXj9vHHIEahStnZ3e7bAcmL2tj+K/tGohcg== dependencies: - unified-lint-rule "^1.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" -remark-lint-no-file-name-mixed-case@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-mixed-case/-/remark-lint-no-file-name-mixed-case-1.0.5.tgz#3e37bfef74bbdd4b07aa9ef9dd452758f8b46731" - integrity sha512-ilrUCbHZin/ENwr8c3SC2chgkFsizXjBQIB/oZ7gnm1IkCkZPiMyXZAHdpwC/DjbrpGxfMYh9JmIHao4giS5+A== +remark-lint-no-file-name-outer-dashes@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-outer-dashes/-/remark-lint-no-file-name-outer-dashes-2.0.1.tgz#536344895ab351d8712180dd63ade2f59849fcef" + integrity sha512-INp+0gW5T2j6+sHglmDmCLL7/goVKCryXyf+ZApB5oWYBpVr2fLnHEHTUmkbQkksxe7me+VsB+WW/KN1PXGrtw== dependencies: - unified-lint-rule "^1.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" -remark-lint-no-file-name-outer-dashes@^1.0.0: - version "1.0.6" - resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-outer-dashes/-/remark-lint-no-file-name-outer-dashes-1.0.6.tgz#4e0e4d42a63f0fdfb856bb5d8d8112725656e700" - integrity sha512-rT8CmcIlenegS0Yst4maYXdZfqIjBOiRUY8j/KJkORF5tKH+3O1/S07025qPGmcRihzK3w4yO0K8rgkKQw0b9w== +remark-lint-no-heading-punctuation@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-heading-punctuation/-/remark-lint-no-heading-punctuation-3.0.1.tgz#e21744d80e7f06cb9c984c0bd4e3f3a284b51afd" + integrity sha512-PFXctxVdi1XycSc2yav72l72mK6JVE6O+tzc9cbW84L7ZYR/Bedq+1HWEYup3mGSTpL4lhcYDk6NSL1oshj6xA== dependencies: - unified-lint-rule "^1.0.0" + "@types/mdast" "^3.0.0" + mdast-util-to-string "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-visit "^4.0.0" -remark-lint-no-heading-punctuation@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-heading-punctuation/-/remark-lint-no-heading-punctuation-2.0.1.tgz#face59f9a95c8aa278a8ee0c728bc44cd53ea9ed" - integrity sha512-lY/eF6GbMeGu4cSuxfGHyvaQQBIq/6T/o+HvAR5UfxSTxmxZFwbZneAI2lbeR1zPcqOU87NsZ5ZZzWVwdLpPBw== +remark-lint-no-inline-padding@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-inline-padding/-/remark-lint-no-inline-padding-4.0.1.tgz#a89d4fd639e888ee97cac811b9c950f1787a08a5" + integrity sha512-UcjJ2XTf7kOmQo5mU/5AV+Gth1YYGcp+gYU4gS/CzdOLYstqsS/W+IN6ALJjEbdbtSyfWCElpxI4p/mW16Z90A== dependencies: - mdast-util-to-string "^1.0.2" - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + mdast-util-to-string "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-visit "^4.0.0" -remark-lint-no-inline-padding@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/remark-lint-no-inline-padding/-/remark-lint-no-inline-padding-3.0.0.tgz#14c2722bcddc648297a54298107a922171faf6eb" - integrity sha512-3s9uW3Yux9RFC0xV81MQX3bsYs+UY7nPnRuMxeIxgcVwxQ4E/mTJd9QjXUwBhU9kdPtJ5AalngdmOW2Tgar8Cg== +remark-lint-no-literal-urls@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-literal-urls/-/remark-lint-no-literal-urls-3.0.1.tgz#af87cc111f942a43edf2d2cc27d199b7785be141" + integrity sha512-3OAFcaZawfrFgZGrpuZlNPyuvfIURtUzDN7/Bl2X42ivqx4ih1OH9LtiBgz+J0g1DEWnC5ebOmDr7x6XLM76Fw== dependencies: - mdast-util-to-string "^1.0.2" - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-visit "^2.0.0" - -remark-lint-no-literal-urls@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-literal-urls/-/remark-lint-no-literal-urls-2.0.1.tgz#731908f9866c1880e6024dcee1269fb0f40335d6" - integrity sha512-IDdKtWOMuKVQIlb1CnsgBoyoTcXU3LppelDFAIZePbRPySVHklTtuK57kacgU5grc7gPM04bZV96eliGrRU7Iw== + "@types/mdast" "^3.0.0" + mdast-util-to-string "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" + +remark-lint-no-multiple-toplevel-headings@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-multiple-toplevel-headings/-/remark-lint-no-multiple-toplevel-headings-3.0.1.tgz#08e03c3b102748835bc7077fbec9b0543c8feff4" + integrity sha512-K62PKOOanFiFM4R0oHlo1PKWJa0dPPasQl28yzk6G2xZzqc5eJm5S3d0grU479jqEUbDQMaDQw282hO6WR/MbA== dependencies: - mdast-util-to-string "^1.0.2" - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" - -remark-lint-no-multiple-toplevel-headings@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-multiple-toplevel-headings/-/remark-lint-no-multiple-toplevel-headings-2.0.1.tgz#3ff2b505adf720f4ff2ad2b1021f8cfd50ad8635" - integrity sha512-VKSItR6c+u3OsE5pUiSmNusERNyQS9Nnji26ezoQ1uvy06k3RypIjmzQqJ/hCkSiF+hoyC3ibtrrGT8gorzCmQ== + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-position "^4.0.0" + unist-util-stringify-position "^3.0.0" + unist-util-visit "^4.0.0" + +remark-lint-no-shell-dollars@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-shell-dollars/-/remark-lint-no-shell-dollars-3.0.1.tgz#e9c092e07be2e308abd49b54c253010efb3e654c" + integrity sha512-QvnA8Ltj3FPaAqUu0DebKYv66LFndTk0fXVZ9rQWOjTEVIKImy9Dy59kVqwYMpCwZbJkpigu2bMl/7UG/BA0XA== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-stringify-position "^2.0.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-visit "^4.0.0" -remark-lint-no-shell-dollars@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/remark-lint-no-shell-dollars/-/remark-lint-no-shell-dollars-2.0.2.tgz#b2c6c3ed95e5615f8e5f031c7d271a18dc17618e" - integrity sha512-zhkHZOuyaD3r/TUUkkVqW0OxsR9fnSrAnHIF63nfJoAAUezPOu8D1NBsni6rX8H2DqGbPYkoeWrNsTwiKP0yow== +remark-lint-no-shortcut-reference-image@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-shortcut-reference-image/-/remark-lint-no-shortcut-reference-image-3.0.1.tgz#3cef27ef939debd385d9d3ba21bfb8afd3e011b4" + integrity sha512-0o0YO88Atib0eWloy5ZbL2IZ1axMNysbJI5j58sxMjEwLq1JORtGOR9Z6aHsOccS5yseeenw5w3DoMLB9PtJtw== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-visit "^4.0.0" -remark-lint-no-shortcut-reference-image@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-shortcut-reference-image/-/remark-lint-no-shortcut-reference-image-2.0.1.tgz#d174d12a57e8307caf6232f61a795bc1d64afeaa" - integrity sha512-2jcZBdnN6ecP7u87gkOVFrvICLXIU5OsdWbo160FvS/2v3qqqwF2e/n/e7D9Jd+KTq1mR1gEVVuTqkWWuh3cig== +remark-lint-no-shortcut-reference-link@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-shortcut-reference-link/-/remark-lint-no-shortcut-reference-link-3.0.1.tgz#3104ed6b82c6234eb6187481243f1b3890a1d506" + integrity sha512-uXujnVm5LXLtGyJkTIbn/uxDRu507B9vC8TieiX6HX8OjVeDWUjtcVJOaqeyLJGjV0Ri1Y+AegMNWx5eDBHTDQ== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-visit "^4.0.0" -remark-lint-no-shortcut-reference-link@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-shortcut-reference-link/-/remark-lint-no-shortcut-reference-link-2.0.1.tgz#8f963f81036e45cfb7061b3639e9c6952308bc94" - integrity sha512-pTZbslG412rrwwGQkIboA8wpBvcjmGFmvugIA+UQR+GfFysKtJ5OZMPGJ98/9CYWjw9Z5m0/EktplZ5TjFjqwA== +remark-lint-no-table-indentation@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-no-table-indentation/-/remark-lint-no-table-indentation-4.0.1.tgz#13a41252021b245ca60bfbe5a578755421316e65" + integrity sha512-GYBX5P1Vj0gO7S7JLU2tpYR5rg9xbeccPQ0ZgHYK4d7T9FjDwfE1hrdvlha3k8s3CFKqQ7MC0OgQw/2IN413MA== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" + vfile-location "^4.0.0" -remark-lint-no-table-indentation@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/remark-lint-no-table-indentation/-/remark-lint-no-table-indentation-3.0.0.tgz#f3c3fc24375069ec8e510f43050600fb22436731" - integrity sha512-+l7GovI6T+3LhnTtz/SmSRyOb6Fxy6tmaObKHrwb/GAebI/4MhFS1LVo3vbiP/RpPYtyQoFbbuXI55hqBG4ibQ== +remark-lint-ordered-list-marker-style@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-ordered-list-marker-style/-/remark-lint-ordered-list-marker-style-3.0.1.tgz#56f6a94d88dd8c74b8e444cd970bb3be6a575606" + integrity sha512-CGXvolLwfZIxG9hm4o7OXQXEEpu3r5oyTpYGteJDtOSrpVrBSqFKNq7lfhKYFQkcg2AMJYrH9XEexrYvAoUQOQ== dependencies: - unified-lint-rule "^1.0.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" - vfile-location "^3.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" -remark-lint-ordered-list-marker-style@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-ordered-list-marker-style/-/remark-lint-ordered-list-marker-style-2.0.1.tgz#183c31967e6f2ae8ef00effad03633f7fd00ffaa" - integrity sha512-Cnpw1Dn9CHn+wBjlyf4qhPciiJroFOEGmyfX008sQ8uGoPZsoBVIJx76usnHklojSONbpjEDcJCjnOvfAcWW1A== +remark-lint-ordered-list-marker-value@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-ordered-list-marker-value/-/remark-lint-ordered-list-marker-value-3.0.1.tgz#1296c0a758df6ea2e918769f013bff10ff5bd0d9" + integrity sha512-02tEsP+jKxZr7zhTVTbr6sThraTsUUKCmRdONBBwAFlK3bibZJYGMukjhR7rJtCbO/uHQqGX4VhEWPcOcCoaUg== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" -remark-lint-ordered-list-marker-value@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-ordered-list-marker-value/-/remark-lint-ordered-list-marker-value-2.0.1.tgz#0de343de2efb41f01eae9f0f7e7d30fe43db5595" - integrity sha512-blt9rS7OKxZ2NW8tqojELeyNEwPhhTJGVa+YpUkdEH+KnrdcD7Nzhnj6zfLWOx6jFNZk3jpq5nvLFAPteHaNKg== +remark-lint-rule-style@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-rule-style/-/remark-lint-rule-style-3.0.1.tgz#2473b4d8d866e6f27ef968d7071d2ed719ce999c" + integrity sha512-j1e60nfZJk0C6mvDZkiFwVu0b58f219ATlMNaZ9h8QdQhdxD/0kUnizJ7xW3wS4sHtCgkKGctAp04Ma0c+Dkhg== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" -remark-lint-rule-style@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-rule-style/-/remark-lint-rule-style-2.0.1.tgz#f59bd82e75d3eaabd0eee1c8c0f5513372eb553c" - integrity sha512-hz4Ff9UdlYmtO6Czz99WJavCjqCer7Cav4VopXt+yVIikObw96G5bAuLYcVS7hvMUGqC9ZuM02/Y/iq9n8pkAg== +remark-lint-strong-marker@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-strong-marker/-/remark-lint-strong-marker-3.0.1.tgz#54119b529d152ea7294ac761e866a3a6244c4405" + integrity sha512-J5dJviBd747vXBkFuA2j/Ni7RjTg+Mg2GgXlPHtbgDnal51CdN2WXDmbVG/A98+3P18MlysvQ7KnBrSiiuGBpQ== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" -remark-lint-strong-marker@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-strong-marker/-/remark-lint-strong-marker-2.0.1.tgz#1ad8f190c6ac0f8138b638965ccf3bcd18f6d4e4" - integrity sha512-8X2IsW1jZ5FmW9PLfQjkL0OVy/J3xdXLcZrG1GTeQKQ91BrPFyEZqUM2oM6Y4S6LGtxWer+neZkPZNroZoRPBQ== +remark-lint-table-cell-padding@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-table-cell-padding/-/remark-lint-table-cell-padding-4.0.1.tgz#0cfc515af12f4c2f123e8b5895a9ae635142f7e3" + integrity sha512-NdF0WHFOaMjeumRIrGHXVadwWkgnfJuMb96FGbf1HvSEv9l41PHkS1KTsL6Zoe1Cva57niAuarMv6xzcJqVjrA== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + "@types/unist" "^2.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" -remark-lint-table-cell-padding@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/remark-lint-table-cell-padding/-/remark-lint-table-cell-padding-3.0.0.tgz#a769ba1999984ff5f90294fb6ccb8aead7e8a12f" - integrity sha512-sEKrbyFZPZpxI39R8/r+CwUrin9YtyRwVn0SQkNQEZWZcIpylK+bvoKIldvLIXQPob+ZxklL0GPVRzotQMwuWQ== +remark-lint-table-pipe-alignment@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-table-pipe-alignment/-/remark-lint-table-pipe-alignment-3.0.1.tgz#70517c20ca24e4da830f71e09c39aabab1e5382e" + integrity sha512-uTp5ntlkTy0xsNfD6udM5zyHvBD9d+X+lpzk9Teog34rB6ETGSBSdtzxT9kxoA3/cEiZs6ojyMGCOy0VDtGv6g== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" -remark-lint-table-pipe-alignment@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-table-pipe-alignment/-/remark-lint-table-pipe-alignment-2.0.1.tgz#12b7e4c54473d69c9866cb33439c718d09cffcc5" - integrity sha512-O89U7bp0ja6uQkT2uQrNB76GaPvFabrHiUGhqEUnld21yEdyj7rgS57kn84lZNSuuvN1Oor6bDyCwWQGzzpoOQ== +remark-lint-table-pipes@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-table-pipes/-/remark-lint-table-pipes-4.0.1.tgz#529d6d5569eed1129b912df3c748005cc2f82046" + integrity sha512-om6i8SMSjMsR/mYlx5cMSoxXK+EFI8/n73qCVx/RAhFCIsW4TFR+gYmgFTyLr5Mp4vqjV3uYBIR9Ucv6Johauw== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" -remark-lint-table-pipes@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/remark-lint-table-pipes/-/remark-lint-table-pipes-3.0.0.tgz#b30b055d594cae782667eec91c6c5b35928ab259" - integrity sha512-QPokSazEdl0Y8ayUV9UB0Ggn3Jos/RAQwIo0z1KDGnJlGDiF80Jc6iU9RgDNUOjlpQffSLIfSVxH5VVYF/K3uQ== +remark-lint-unordered-list-marker-style@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/remark-lint-unordered-list-marker-style/-/remark-lint-unordered-list-marker-style-3.0.1.tgz#f50b3359444d32363541bd26e30e091eb9b4d866" + integrity sha512-DPveL2hhkcY608Bkn/Hx+C7pxviufpYyRiu0CnfFxkbLBlMgVdvVIOGCCOlhbvKuGtozmH/RCRsdIfzjlkXiew== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + unified "^10.0.0" + unified-lint-rule "^2.0.0" + unist-util-generated "^2.0.0" + unist-util-position "^4.0.0" + unist-util-visit "^4.0.0" -remark-lint-unordered-list-marker-style@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-unordered-list-marker-style/-/remark-lint-unordered-list-marker-style-2.0.1.tgz#e64692aa9594dbe7e945ae76ab2218949cd92477" - integrity sha512-8KIDJNDtgbymEvl3LkrXgdxPMTOndcux3BHhNGB2lU4UnxSpYeHsxcDgirbgU6dqCAfQfvMjPvfYk19QTF9WZA== +remark-lint@^9.0.0: + version "9.0.1" + resolved "https://registry.yarnpkg.com/remark-lint/-/remark-lint-9.0.1.tgz#85ede987d24b7def9a6cea4a4d40c2035723eaec" + integrity sha512-q4VFsA7LEG4REJhR2P4A6CU9b4cCQL53845CX74Z4N/W0EgB9mm/GXpYzjbEqgkMPl5ctP8yp/vBYTNmjfUCtw== dependencies: - unified-lint-rule "^1.0.0" - unist-util-generated "^1.1.0" - unist-util-position "^3.0.0" - unist-util-visit "^2.0.0" + "@types/mdast" "^3.0.0" + remark-message-control "^7.0.0" + unified "^10.1.0" -remark-lint@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/remark-lint/-/remark-lint-8.0.0.tgz#6e40894f4a39eaea31fc4dd45abfaba948bf9a09" - integrity sha512-ESI8qJQ/TIRjABDnqoFsTiZntu+FRifZ5fJ77yX63eIDijl/arvmDvT+tAf75/Nm5BFL4R2JFUtkHRGVjzYUsg== +remark-message-control@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/remark-message-control/-/remark-message-control-7.0.0.tgz#ba83d212fbde3e5e2adabd30697bf80b0b709ef7" + integrity sha512-KZySoC97TrMPYfIZ9vJ7wxvQwniy68K6WCY3vmSedDN5YuGfdVOpMj6sjaZQcqbWZV9n7BhrT70E3xaUTtk4hA== dependencies: - remark-message-control "^6.0.0" + "@types/mdast" "^3.0.0" + mdast-comment-marker "^2.0.0" + rehype "^12.0.0" + unified "^10.0.0" + unified-message-control "^4.0.0" + vfile "^5.0.0" -remark-message-control@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/remark-message-control/-/remark-message-control-6.0.0.tgz#955b054b38c197c9f2e35b1d88a4912949db7fc5" - integrity sha512-k9bt7BYc3G7YBdmeAhvd3VavrPa/XlKWR3CyHjr4sLO9xJyly8WHHT3Sp+8HPR8lEUv+/sZaffL7IjMLV0f6BA== +remark-parse@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-10.0.0.tgz#65e2b2b34d8581d36b97f12a2926bb2126961cb4" + integrity sha512-07ei47p2Xl7Bqbn9H2VYQYirnAFJPwdMuypdozWsSbnmrkgA2e2sZLZdnDNrrsxR4onmIzH/J6KXqKxCuqHtPQ== dependencies: - mdast-comment-marker "^1.0.0" - unified-message-control "^3.0.0" + "@types/mdast" "^3.0.0" + mdast-util-from-markdown "^1.0.0" + unified "^10.0.0" -remark-parse@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-9.0.0.tgz#4d20a299665880e4f4af5d90b7c7b8a935853640" - integrity sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw== +remark-preset-lint-markdown-style-guide@5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/remark-preset-lint-markdown-style-guide/-/remark-preset-lint-markdown-style-guide-5.0.1.tgz#a53018e4e44f4417b911968ee1ecc49aa3cff6a7" + integrity sha512-O/Es5sDhBcfwKu+9aQHs6Wj3NT3tb3bPGbSxw0cBaHdVAhNQV1+1yeQWzpoIk53vN5+7S4SeQwAx/Rsw1Youqw== dependencies: - mdast-util-from-markdown "^0.8.0" - -remark-preset-lint-markdown-style-guide@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/remark-preset-lint-markdown-style-guide/-/remark-preset-lint-markdown-style-guide-4.0.0.tgz#976b6ffd7f37aa90868e081a69241fcde3a297d4" - integrity sha512-gczDlfZ28Fz0IN/oddy0AH4CiTu9S8d3pJWUsrnwFiafjhJjPGobGE1OD3bksi53md1Bp4K0fzo99YYfvB4Sjw== - dependencies: - remark-lint "^8.0.0" - remark-lint-blockquote-indentation "^2.0.0" - remark-lint-code-block-style "^2.0.0" - remark-lint-definition-case "^2.0.0" - remark-lint-definition-spacing "^2.0.0" - remark-lint-emphasis-marker "^2.0.0" - remark-lint-fenced-code-flag "^2.0.0" - remark-lint-fenced-code-marker "^2.0.0" - remark-lint-file-extension "^1.0.0" - remark-lint-final-definition "^2.0.0" - remark-lint-hard-break-spaces "^2.0.0" - remark-lint-heading-increment "^2.0.0" - remark-lint-heading-style "^2.0.0" - remark-lint-link-title-style "^2.0.0" - remark-lint-list-item-content-indent "^2.0.0" - remark-lint-list-item-indent "^2.0.0" - remark-lint-list-item-spacing "^3.0.0" - remark-lint-maximum-heading-length "^2.0.0" - remark-lint-maximum-line-length "^2.0.0" - remark-lint-no-auto-link-without-protocol "^2.0.0" - remark-lint-no-blockquote-without-marker "^4.0.0" - remark-lint-no-consecutive-blank-lines "^3.0.0" - remark-lint-no-duplicate-headings "^2.0.0" - remark-lint-no-emphasis-as-heading "^2.0.0" - remark-lint-no-file-name-articles "^1.0.0" - remark-lint-no-file-name-consecutive-dashes "^1.0.0" - remark-lint-no-file-name-irregular-characters "^1.0.0" - remark-lint-no-file-name-mixed-case "^1.0.0" - remark-lint-no-file-name-outer-dashes "^1.0.0" - remark-lint-no-heading-punctuation "^2.0.0" - remark-lint-no-inline-padding "^3.0.0" - remark-lint-no-literal-urls "^2.0.0" - remark-lint-no-multiple-toplevel-headings "^2.0.0" - remark-lint-no-shell-dollars "^2.0.0" - remark-lint-no-shortcut-reference-image "^2.0.0" - remark-lint-no-shortcut-reference-link "^2.0.0" - remark-lint-no-table-indentation "^3.0.0" - remark-lint-ordered-list-marker-style "^2.0.0" - remark-lint-ordered-list-marker-value "^2.0.0" - remark-lint-rule-style "^2.0.0" - remark-lint-strong-marker "^2.0.0" - remark-lint-table-cell-padding "^3.0.0" - remark-lint-table-pipe-alignment "^2.0.0" - remark-lint-table-pipes "^3.0.0" - remark-lint-unordered-list-marker-style "^2.0.0" - -remark-stringify@^9.0.0: - version "9.0.1" - resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-9.0.1.tgz#576d06e910548b0a7191a71f27b33f1218862894" - integrity sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg== + "@types/mdast" "^3.0.0" + remark-lint "^9.0.0" + remark-lint-blockquote-indentation "^3.0.0" + remark-lint-code-block-style "^3.0.0" + remark-lint-definition-case "^3.0.0" + remark-lint-definition-spacing "^3.0.0" + remark-lint-emphasis-marker "^3.0.0" + remark-lint-fenced-code-flag "^3.0.0" + remark-lint-fenced-code-marker "^3.0.0" + remark-lint-file-extension "^2.0.0" + remark-lint-final-definition "^3.0.0" + remark-lint-hard-break-spaces "^3.0.0" + remark-lint-heading-increment "^3.0.0" + remark-lint-heading-style "^3.0.0" + remark-lint-link-title-style "^3.0.0" + remark-lint-list-item-content-indent "^3.0.0" + remark-lint-list-item-indent "^3.0.0" + remark-lint-list-item-spacing "^4.0.0" + remark-lint-maximum-heading-length "^3.0.0" + remark-lint-maximum-line-length "^3.0.0" + remark-lint-no-auto-link-without-protocol "^3.0.0" + remark-lint-no-blockquote-without-marker "^5.0.0" + remark-lint-no-consecutive-blank-lines "^4.0.0" + remark-lint-no-duplicate-headings "^3.0.0" + remark-lint-no-emphasis-as-heading "^3.0.0" + remark-lint-no-file-name-articles "^2.0.0" + remark-lint-no-file-name-consecutive-dashes "^2.0.0" + remark-lint-no-file-name-irregular-characters "^2.0.0" + remark-lint-no-file-name-mixed-case "^2.0.0" + remark-lint-no-file-name-outer-dashes "^2.0.0" + remark-lint-no-heading-punctuation "^3.0.0" + remark-lint-no-inline-padding "^4.0.0" + remark-lint-no-literal-urls "^3.0.0" + remark-lint-no-multiple-toplevel-headings "^3.0.0" + remark-lint-no-shell-dollars "^3.0.0" + remark-lint-no-shortcut-reference-image "^3.0.0" + remark-lint-no-shortcut-reference-link "^3.0.0" + remark-lint-no-table-indentation "^4.0.0" + remark-lint-ordered-list-marker-style "^3.0.0" + remark-lint-ordered-list-marker-value "^3.0.0" + remark-lint-rule-style "^3.0.0" + remark-lint-strong-marker "^3.0.0" + remark-lint-table-cell-padding "^4.0.0" + remark-lint-table-pipe-alignment "^3.0.0" + remark-lint-table-pipes "^4.0.0" + remark-lint-unordered-list-marker-style "^3.0.0" + unified "^10.0.0" + +remark-stringify@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-10.0.0.tgz#7f23659d92b2d5da489e3c858656d7bbe045f161" + integrity sha512-3LAQqJ/qiUxkWc7fUcVuB7RtIT38rvmxfmJG8z1TiE/D8zi3JGQ2tTcTJu9Tptdpb7gFwU0whRi5q1FbFOb9yA== dependencies: - mdast-util-to-markdown "^0.6.0" + "@types/mdast" "^3.0.0" + mdast-util-to-markdown "^1.0.0" + unified "^10.0.0" -remark@^13.0.0: - version "13.0.0" - resolved "https://registry.yarnpkg.com/remark/-/remark-13.0.0.tgz#d15d9bf71a402f40287ebe36067b66d54868e425" - integrity sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA== +remark@^14.0.0: + version "14.0.1" + resolved "https://registry.yarnpkg.com/remark/-/remark-14.0.1.tgz#a97280d4f2a3010a7d81e6c292a310dcd5554d80" + integrity sha512-7zLG3u8EUjOGuaAS9gUNJPD2j+SqDqAFHv2g6WMpE5CU9rZ6e3IKDM12KHZ3x+YNje+NMAuN55yx8S5msGSx7Q== dependencies: - remark-parse "^9.0.0" - remark-stringify "^9.0.0" - unified "^9.1.0" + "@types/mdast" "^3.0.0" + remark-parse "^10.0.0" + remark-stringify "^10.0.0" + unified "^10.0.0" remove-trailing-separator@^1.0.1: version "1.1.0" @@ -9265,22 +9405,22 @@ remove-trailing-separator@^1.0.1: integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= renderkid@^2.0.4: - version "2.0.5" - resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.5.tgz#483b1ac59c6601ab30a7a596a5965cabccfdd0a5" - integrity sha512-ccqoLg+HLOHq1vdfYNm4TBeaCDIi1FLt3wGojTDSvdewUv65oTmI3cnT2E4hRjl1gzKZIPK+KZrXzlUYKnR+vQ== + version "2.0.7" + resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.7.tgz#464f276a6bdcee606f4a15993f9b29fc74ca8609" + integrity sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ== dependencies: - css-select "^2.0.2" - dom-converter "^0.2" - htmlparser2 "^3.10.1" - lodash "^4.17.20" - strip-ansi "^3.0.0" + css-select "^4.1.3" + dom-converter "^0.2.0" + htmlparser2 "^6.1.0" + lodash "^4.17.21" + strip-ansi "^3.0.1" repeat-element@^1.1.2: version "1.1.4" resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== -repeat-string@^1.0.0, repeat-string@^1.5.0, repeat-string@^1.5.2, repeat-string@^1.6.1: +repeat-string@^1.5.2, repeat-string@^1.6.1: version "1.6.1" resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= @@ -9292,7 +9432,7 @@ repeating@^2.0.0: dependencies: is-finite "^1.0.0" -request@2.x, "request@>= 2.52.0", request@^2.86.0, request@^2.87.0, request@^2.88.0, request@^2.88.2: +request@2.x, request@^2.86.0, request@^2.87.0, request@^2.88.0: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== @@ -9335,11 +9475,6 @@ resolve-cwd@^3.0.0: dependencies: resolve-from "^5.0.0" -resolve-from@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" - integrity sha1-six699nWiBvItuZTM17rywoYh0g= - resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" @@ -9355,7 +9490,7 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.9.0: +resolve@^1.10.0, resolve@^1.10.1, resolve@^1.20.0, resolve@^1.9.0: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -9385,16 +9520,6 @@ reveal.js@3.9.2: resolved "https://registry.yarnpkg.com/reveal.js/-/reveal.js-3.9.2.tgz#7f63d3dfec338b6c313dcabdf006e8cf80e0b358" integrity sha512-Dvv2oA9FrtOHE2DWj5js8pMRfwq++Wmvsn1EyAdYLC80lBjTphns+tPsB652Bnvep9AVviuVS/b4XoVY9rXHLA== -rgb-regex@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1" - integrity sha1-wODWiC3w4jviVKR16O3UGRX+rrE= - -rgba-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3" - integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM= - rimraf@2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" @@ -9436,20 +9561,15 @@ rw@1: resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q= -safe-buffer@*, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" - integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== +safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== safe-regex@^1.1.0: version "1.1.0" @@ -9473,7 +9593,7 @@ sax@1.2.1: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a" integrity sha1-e45lYZCyKOgaZq6nSEgNgozS03o= -sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4: +sax@>=0.6.0, sax@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -9488,21 +9608,14 @@ schema-utils@^1.0.0: ajv-keywords "^3.1.0" schema-utils@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef" - integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA== + version "3.1.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" + integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== dependencies: - "@types/json-schema" "^7.0.6" + "@types/json-schema" "^7.0.8" ajv "^6.12.5" ajv-keywords "^3.5.2" -script-loader@0.7.2: - version "0.7.2" - resolved "https://registry.yarnpkg.com/script-loader/-/script-loader-0.7.2.tgz#2016db6f86f25f5cf56da38915d83378bb166ba7" - integrity sha512-UMNLEvgOAQuzK8ji8qIscM3GIrRCWN6MmMXGD4SD5l6cSycgGsCo0tX5xRnfQcoghqct0tjHjcykgI1PyBE2aA== - dependencies: - raw-loader "~0.5.1" - scrypt-kdf@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/scrypt-kdf/-/scrypt-kdf-2.0.1.tgz#3355224c52d398331b2cbf2b70a7be26b52c53e6" @@ -9513,11 +9626,6 @@ select2@3.5.2-browserify: resolved "https://registry.yarnpkg.com/select2/-/select2-3.5.2-browserify.tgz#dc4dafda38d67a734e8a97a46f0d3529ae05391d" integrity sha1-3E2v2jjWenNOipekbw01Ka4FOR0= -select@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d" - integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0= - semver-compare@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" @@ -9533,7 +9641,7 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.2.1, semver@^7.3.5: +semver@^7.0.0, semver@^7.2.1, semver@^7.3.5: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== @@ -9595,10 +9703,10 @@ sequelize@^5.21.1: validator "^10.11.0" wkx "^0.4.8" -serialize-javascript@5.0.1, serialize-javascript@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4" - integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA== +serialize-javascript@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" + integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== dependencies: randombytes "^2.1.0" @@ -9609,6 +9717,13 @@ serialize-javascript@^4.0.0: dependencies: randombytes "^2.1.0" +serialize-javascript@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4" + integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA== + dependencies: + randombytes "^2.1.0" + serve-static@1.14.1: version "1.14.1" resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" @@ -9683,7 +9798,7 @@ shortid@2.2.16: dependencies: nanoid "^2.1.0" -side-channel@^1.0.3: +side-channel@^1.0.3, side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== @@ -9723,11 +9838,6 @@ slice-ansi@^4.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" -sliced@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/sliced/-/sliced-1.0.1.tgz#0b3a662b5d04c3177b1926bea82b03f837a2ef41" - integrity sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E= - snapdragon-node@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" @@ -9822,6 +9932,11 @@ source-list-map@^2.0.0, source-list-map@^2.0.1: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== +source-map-js@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e" + integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug== + source-map-resolve@^0.5.0: version "0.5.3" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" @@ -9841,9 +9956,9 @@ source-map-support@^0.4.15: source-map "^0.5.6" source-map-support@~0.5.12: - version "0.5.19" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" - integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== + version "0.5.20" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9" + integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw== dependencies: buffer-from "^1.0.0" source-map "^0.6.0" @@ -9868,6 +9983,11 @@ source-map@^0.7.3: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== +space-separated-tokens@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-2.0.1.tgz#43193cec4fb858a2ce934b7f98b7f2c18107098b" + integrity sha512-ekwEbFp5aqSPKaqeY1PGrlGQxPNaq+Cnx4+bE2D8sciBQrHpbwoBbawqTN2+6jPs9IdWxxiUcN0K2pkczD3zmw== + spdx-correct@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" @@ -9890,14 +10010,14 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.7" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65" - integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ== + version "3.0.10" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz#0d9becccde7003d6c658d487dd48a32f0bf3014b" + integrity sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA== -spin.js@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/spin.js/-/spin.js-4.1.0.tgz#afcf12738fafd5f6aa0a385a5b4cec45c86a3555" - integrity sha512-WI8O1OdJlKjialIhB9Z5RfFFM4pI7Hohik76bB3N4Ep3N/vTDPZiRU8QeefyLbmpI5n2bFQXgticl2g+/KiKYA== +spin.js@4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/spin.js/-/spin.js-4.1.1.tgz#567464a08620541e523da856cb5f67af2d0f48ad" + integrity sha512-3cjbjZBw8TmZmvzcmlXqArUpefJ1vGgQZ+dh1CdyDyxZZNxNmw+2Dq5jyoP/OCqQP+z78rWgSJX9m3uMuGaxxw== split-string@^3.0.1, split-string@^3.0.2: version "3.1.0" @@ -10054,7 +10174,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: +string-width@^4.1.0, string-width@^4.2.0: version "4.2.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== @@ -10063,6 +10183,15 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" +string-width@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.0.1.tgz#0d8158335a6cfd8eb95da9b6b262ce314a036ffd" + integrity sha512-5ohWO/M4//8lErlUUtrFy3b11GtNOuMOU0ysKCDXFcfXuuvUXu95akgj/i8ofmaGdN0hCqyl6uu9i8dS/mQp5g== + dependencies: + emoji-regex "^9.2.2" + is-fullwidth-code-point "^4.0.0" + strip-ansi "^7.0.1" + string.prototype.trimend@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" @@ -10103,6 +10232,14 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" +stringify-entities@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-4.0.1.tgz#f483c9ca8d7e029edec9863c5a37c1f1e7702c8d" + integrity sha512-gmMQxKXPWIO3NXNSPyWNhlYcBNGpPA/487D+9dLPnU4xBnIrnHdr8cv5rGJOS/1BRxEXRb7uKwg7BA36IWV7xg== + dependencies: + character-entities-html4 "^2.0.0" + character-entities-legacy "^2.0.0" + strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" @@ -10124,6 +10261,13 @@ strip-ansi@^6.0.0: dependencies: ansi-regex "^5.0.0" +strip-ansi@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" + integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw== + dependencies: + ansi-regex "^6.0.1" + strip-ansi@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991" @@ -10154,28 +10298,31 @@ strip-json-comments@~2.0.1: resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= -strtok3@^6.0.3: - version "6.0.8" - resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-6.0.8.tgz#c839157f615c10ba0f4ae35067dad9959eeca346" - integrity sha512-QLgv+oiXwXgCgp2PdPPa+Jpp4D9imK9e/0BsyfeFMr6QL6wMVqoVn9+OXQ9I7MZbmUzN6lmitTJ09uwS2OmGcw== +strnum@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/strnum/-/strnum-1.0.3.tgz#bbc438bcb35fbbfc9c1e82f73097665b6ec6959e" + integrity sha512-GVoRjsqAYZkAH16GDzfTuafuwKxzKdaaCQyLaWf37gOP1e2PPbAKWoME1OmO+c4RCKMfNrrPRDLFCNBFU45N/A== + +strtok3@^6.2.4: + version "6.2.4" + resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-6.2.4.tgz#302aea64c0fa25d12a0385069ba66253fdc38a81" + integrity sha512-GO8IcFF9GmFDvqduIspUBwCzCbqzegyVKIsSymcMgiZKeCfrN9SowtUoi8+b59WZMAjIzVZic/Ft97+pynR3Iw== dependencies: - "@tokenizer/token" "^0.1.1" - "@types/debug" "^4.1.5" - peek-readable "^3.1.3" + "@tokenizer/token" "^0.3.0" + peek-readable "^4.0.1" -stylehacks@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5" - integrity sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g== +stylehacks@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb" + integrity sha512-Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA== dependencies: - browserslist "^4.0.0" - postcss "^7.0.0" - postcss-selector-parser "^3.0.0" + browserslist "^4.16.0" + postcss-selector-parser "^6.0.4" -stylis@^3.5.2: - version "3.5.4" - resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz#f665f25f5e299cf3d64654ab949a57c768b73fbe" - integrity sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q== +stylis@^4.0.10: + version "4.0.10" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.10.tgz#446512d1097197ab3f02fb3c258358c3f7a14240" + integrity sha512-m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg== superagent@1.8.3: version "1.8.3" @@ -10213,13 +10360,6 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" -supports-color@^6.0.0, supports-color@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" - integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== - dependencies: - has-flag "^3.0.0" - supports-color@^7.1.0: version "7.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" @@ -10227,29 +10367,30 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -svgo@^1.0.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167" - integrity sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw== - dependencies: - chalk "^2.4.1" - coa "^2.0.2" - css-select "^2.0.0" - css-select-base-adapter "^0.1.1" - css-tree "1.0.0-alpha.37" - csso "^4.0.2" - js-yaml "^3.13.1" - mkdirp "~0.5.1" - object.values "^1.1.0" - sax "~1.2.4" +supports-color@^9.0.0: + version "9.0.2" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-9.0.2.tgz#50f082888e4b0a4e2ccd2d0b4f9ef4efcd332485" + integrity sha512-ii6tc8ImGFrgMPYq7RVAMKkhPo9vk8uA+D3oKbJq/3Pk2YSMv1+9dUAesa9UxMbxBTvxwKTQffBahNVNxEvM8Q== + dependencies: + has-flag "^5.0.0" + +svgo@^2.3.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.6.0.tgz#f7d3064a91b0804ea28a9dbfc3b36ba2ed4dd8d4" + integrity sha512-ATpRmynNSjP/5hSM4Ij4Pg3L+BCN6IBES7wRLh1ZtVxJB7Xn8omiGttLW6v6ZbqrV5pCVB3XfdbUoY8IpgIwvw== + dependencies: + "@trysound/sax" "0.2.0" + colorette "^1.3.0" + commander "^7.2.0" + css-select "^4.1.3" + css-tree "^1.1.3" + csso "^4.2.0" stable "^0.1.8" - unquote "~1.1.1" - util.promisify "~1.0.0" -table@^6.0.4: - version "6.7.0" - resolved "https://registry.yarnpkg.com/table/-/table-6.7.0.tgz#26274751f0ee099c547f6cb91d3eff0d61d155b2" - integrity sha512-SAM+5p6V99gYiiy2gT5ArdzgM1dLDed0nkrWmG6Fry/bUS/m9x83BwpJUOf1Qj/x2qJd+thL6IkIx7qPGRxqBw== +table@^6.0.9: + version "6.7.1" + resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2" + integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg== dependencies: ajv "^8.0.1" lodash.clonedeep "^4.5.0" @@ -10263,6 +10404,11 @@ tapable@^1.0.0, tapable@^1.1.3: resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== +tapable@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" + integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== + tar-stream@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" @@ -10284,22 +10430,22 @@ tar@^2.0.0: inherits "2" tar@^4: - version "4.4.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" - integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== + version "4.4.19" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3" + integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA== dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.8.6" - minizlib "^1.2.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.3" + chownr "^1.1.4" + fs-minipass "^1.2.7" + minipass "^2.9.0" + minizlib "^1.3.3" + mkdirp "^0.5.5" + safe-buffer "^5.2.1" + yallist "^3.1.1" tar@^6.0.2: - version "6.1.0" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83" - integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA== + version "6.1.11" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" + integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" @@ -10315,23 +10461,6 @@ tdigest@^0.1.1: dependencies: bintrees "1.0.1" -tedious@^6.6.0: - version "6.7.0" - resolved "https://registry.yarnpkg.com/tedious/-/tedious-6.7.0.tgz#ad02365f16f9e0416b216e13d3f83c53addd42ca" - integrity sha512-8qr7+sB0h4SZVQBRWUgHmYuOEflAOl2eihvxk0fVNvpvGJV4V5UC/YmSvebyfgyfwWcPO22/AnSbYVZZqf9wuQ== - dependencies: - "@azure/ms-rest-nodeauth" "2.0.2" - "@types/node" "^12.12.17" - "@types/readable-stream" "^2.3.5" - bl "^3.0.0" - depd "^2.0.0" - iconv-lite "^0.5.0" - jsbi "^3.1.1" - native-duplexpair "^1.0.0" - punycode "^2.1.0" - readable-stream "^3.4.0" - sprintf-js "^1.1.2" - terser-webpack-plugin@^1.4.3: version "1.4.5" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b" @@ -10347,7 +10476,7 @@ terser-webpack-plugin@^1.4.3: webpack-sources "^1.4.0" worker-farm "^1.7.0" -terser@^4.0.0, terser@^4.1.2, terser@^4.6.3: +terser@^4.1.2, terser@^4.6.3: version "4.8.0" resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17" integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw== @@ -10394,11 +10523,6 @@ timsort@^0.3.0: resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= -tiny-emitter@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423" - integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q== - to-array@0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890" @@ -10446,25 +10570,25 @@ to-regex@^3.0.1, to-regex@^3.0.2: regex-not "^1.0.2" safe-regex "^1.1.0" -to-vfile@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/to-vfile/-/to-vfile-6.1.0.tgz#5f7a3f65813c2c4e34ee1f7643a5646344627699" - integrity sha512-BxX8EkCxOAZe+D/ToHdDsJcVI4HqQfmw0tCkp31zf3dNP/XWIAjU4CmeuSwsSoOzOTqHPOL0KUzyZqJplkD0Qw== +to-vfile@^7.0.0: + version "7.2.2" + resolved "https://registry.yarnpkg.com/to-vfile/-/to-vfile-7.2.2.tgz#5976568397ef664bc8df210676d082478822afbf" + integrity sha512-7WL+coet3qyaYb5vrVrfLtOUHgNv9E1D5SIsyVKmHKcgZefy77WMQRk7FByqGKNInoHOlY6xkTGymo29AwjUKg== dependencies: is-buffer "^2.0.0" - vfile "^4.0.0" + vfile "^5.1.0" toidentifier@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== -token-types@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/token-types/-/token-types-2.1.1.tgz#bd585d64902aaf720b8979d257b4b850b4d45c45" - integrity sha512-wnQcqlreS6VjthyHO3Y/kpK/emflxDBNhlNUPfh7wE39KnuDdOituXomIbyI79vBtF0Ninpkh72mcuRHo+RG3Q== +token-types@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/token-types/-/token-types-4.1.1.tgz#ef9e8c8e2e0ded9f1b3f8dbaa46a3228b113ba1a" + integrity sha512-hD+QyuUAyI2spzsI0B7gf/jJ2ggR4RjkAo37j3StuePhApJUwcWDjnHDOFdIWYSwNR28H14hpwm4EI+V1Ted1w== dependencies: - "@tokenizer/token" "^0.1.1" + "@tokenizer/token" "^0.3.0" ieee754 "^1.2.1" toobusy-js@^0.5.1: @@ -10477,7 +10601,7 @@ toposort-class@^1.0.1: resolved "https://registry.yarnpkg.com/toposort-class/-/toposort-class-1.0.1.tgz#7ffd1f78c8be28c3ba45cd4e1a3f5ee193bd9988" integrity sha1-f/0feMi+KMO6Rc1OGj9e4ZO9mYg= -tough-cookie@^2.4.3, tough-cookie@~2.5.0: +tough-cookie@~2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== @@ -10495,40 +10619,30 @@ triple-beam@^1.2.0, triple-beam@^1.3.0: resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== -trough@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" - integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA== - -try-catch@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/try-catch/-/try-catch-2.0.1.tgz#a35d354187c422f291a0bcfd9eb77e3a4f90c1e5" - integrity sha512-LsOrmObN/2WdM+y2xG+t16vhYrQsnV8wftXIcIOWZhQcBJvKGYuamJGwnU98A7Jxs2oZNkJztXlphEOoA0DWqg== - -try-to-catch@^1.0.2: - version "1.1.1" - resolved "https://registry.yarnpkg.com/try-to-catch/-/try-to-catch-1.1.1.tgz#770162dd13b9a0e55da04db5b7f888956072038a" - integrity sha512-ikUlS+/BcImLhNYyIgZcEmq4byc31QpC+46/6Jm5ECWkVFhf8SM2Fp/0pMVXPX6vk45SMCwrP4Taxucne8I0VA== +trough@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/trough/-/trough-2.0.2.tgz#94a3aa9d5ce379fc561f6244905b3f36b7458d96" + integrity sha512-FnHq5sTMxC0sk957wHDzRnemFnNBvt/gSY99HzK8F7UP5WAbvP70yX5bd7CjEQkN+TjdxwI7g7lJ6podqrG2/w== -tsconfig-paths@^3.9.0: - version "3.9.0" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b" - integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw== +tsconfig-paths@^3.11.0: + version "3.11.0" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz#954c1fe973da6339c78e06b03ce2e48810b65f36" + integrity sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA== dependencies: "@types/json5" "^0.0.29" json5 "^1.0.1" minimist "^1.2.0" strip-bom "^3.0.0" -tslib@^1.10.0, tslib@^1.9.2: +tslib@^1.10.0: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.0, tslib@^2.0.3: - version "2.2.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c" - integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w== +tslib@^2.0.3: + version "2.3.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" + integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== tty-browserify@0.0.0: version "0.0.0" @@ -10542,15 +10656,10 @@ tunnel-agent@^0.6.0: dependencies: safe-buffer "^5.0.1" -tunnel@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" - integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== - -turndown@7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/turndown/-/turndown-7.0.0.tgz#19b2a6a2d1d700387a1e07665414e4af4fec5225" - integrity sha512-G1FfxfR0mUNMeGjszLYl3kxtopC4O9DRRiMlMDDVHvU1jaBkGFg4qxIyjIk2aiKLHyDyZvZyu4qBO2guuYBy3Q== +turndown@7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/turndown/-/turndown-7.1.1.tgz#96992f2d9b40a1a03d3ea61ad31b5a5c751ef77f" + integrity sha512-BEkXaWH7Wh7e9bd2QumhfAXk5g34+6QUmmWx+0q6ThaVOLuLUqsnkq35HQ5SBHSaxjSfSM7US5o4lhJNH7B9MA== dependencies: domino "^2.1.6" @@ -10571,15 +10680,10 @@ type-fest@^0.20.2: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== -type-fest@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" - integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== - -type-fest@^1.0.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.1.1.tgz#210251e7f57357a1457269e6b34837fed067ac2c" - integrity sha512-RPDKc5KrIyKTP7Fk75LruUagqG6b+OTgXlCR2Z0aQDJFeIvL4/mhahSEtHmmVzXu4gmA0srkF/8FCH3WOWxTWA== +type-fest@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1" + integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA== type-is@~1.6.17, type-is@~1.6.18: version "1.6.18" @@ -10589,13 +10693,6 @@ type-is@~1.6.17, type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" -typedarray-to-buffer@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" - integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== - dependencies: - is-typedarray "^1.0.0" - typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" @@ -10606,11 +10703,6 @@ uc.micro@^1.0.1, uc.micro@^1.0.5: resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== -uglify-js@^3.1.4, uglify-js@^3.5.1: - version "3.13.6" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.6.tgz#6815ac7fdd155d03c83e2362bb717e5b39b74013" - integrity sha512-rRprLwl8RVaS+Qvx3Wh5hPfPBn9++G6xkGlUupya0s5aDmNjI7z3lnRLB3u7sN4OmbB0pWgzhM9BEJyiWAwtAA== - uid-safe@~2.1.5: version "2.1.5" resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.5.tgz#2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a" @@ -10619,9 +10711,9 @@ uid-safe@~2.1.5: random-bytes "~1.0.0" uid2@0.0.x: - version "0.0.3" - resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz#483126e11774df2f71b8b639dcd799c376162b82" - integrity sha1-SDEm4Rd03y9xuLY53NeZw3YWK4I= + version "0.0.4" + resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.4.tgz#033f3b1d5d32505f5ce5f888b9f3b667123c0a44" + integrity sha512-IevTus0SbGwQzYh3+fRsAMTVVPOoIVufzacXcHPmdlle1jUpq7BRL+mw3dgeLanvGZdwwbWhRV6XrcFNdBmjWA== umzug@^2.3.0: version "2.3.0" @@ -10630,7 +10722,7 @@ umzug@^2.3.0: dependencies: bluebird "^3.7.2" -unbox-primitive@^1.0.0: +unbox-primitive@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw== @@ -10645,7 +10737,7 @@ underscore@1.11.x: resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.11.0.tgz#dd7c23a195db34267186044649870ff1bab5929e" integrity sha512-xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw== -"underscore@>= 1.3.1", underscore@^1.7.0: +underscore@^1.12.1, underscore@^1.13.1: version "1.13.1" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.1.tgz#0c1c6bd2df54b6b69f2314066d65b6cde6fcf9d1" integrity sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g== @@ -10655,74 +10747,84 @@ underscore@~1.6.0: resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8" integrity sha1-izixDKze9jM3uLJOT/htRa6lKag= -underscore@~1.8.3: - version "1.8.3" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" - integrity sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI= - -unified-args@^8.0.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/unified-args/-/unified-args-8.1.0.tgz#a27dbe996a49fbbf3d9f5c6a98008ab9b0ee6ae5" - integrity sha512-t1HPS1cQPsVvt/6EtyWIbQGurza5684WGRigNghZRvzIdHm3LPgMdXPyGx0npORKzdiy5+urkF0rF5SXM8lBuQ== +unified-args@^9.0.0: + version "9.0.2" + resolved "https://registry.yarnpkg.com/unified-args/-/unified-args-9.0.2.tgz#0c14f555e73ee29c23f9a567942e29069f56e5a2" + integrity sha512-qSqryjoqfJSII4E4Z2Jx7MhXX2MuUIn6DsrlmL8UnWFdGtrWvEtvm7Rx5fKT5TPUz7q/Fb4oxwIHLCttvAuRLQ== dependencies: - camelcase "^5.0.0" - chalk "^3.0.0" + "@types/text-table" "^0.2.0" + camelcase "^6.0.0" + chalk "^4.0.0" chokidar "^3.0.0" - fault "^1.0.2" + fault "^2.0.0" json5 "^2.0.0" - minimist "^1.2.0" + minimist "^1.0.0" text-table "^0.2.0" - unified-engine "^8.0.0" - -unified-engine@^8.0.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/unified-engine/-/unified-engine-8.1.0.tgz#a846e11705fb8589d1250cd27500b56021d8a3e2" - integrity sha512-ptXTWUf9HZ2L9xto7tre+hSdSN7M9S0rypUpMAcFhiDYjrXLrND4If+8AZOtPFySKI/Zhfxf7GVAR34BqixDUA== - dependencies: + unified-engine "^9.0.0" + +unified-engine@^9.0.0: + version "9.0.4" + resolved "https://registry.yarnpkg.com/unified-engine/-/unified-engine-9.0.4.tgz#ee02b6a7f11e69a56f79cb8595065b8c3f02bda8" + integrity sha512-NFI+jC3DWZ23eBsWkOW2havz47DPG/DSyJEvBH+qA5cQHF6zlgiJYev7ksb/naOypZZ+cfhaCxCRo2BqrysYEw== + dependencies: + "@types/concat-stream" "^1.0.0" + "@types/debug" "^4.0.0" + "@types/is-empty" "^1.0.0" + "@types/js-yaml" "^4.0.0" + "@types/node" "^16.0.0" + "@types/unist" "^2.0.0" concat-stream "^2.0.0" debug "^4.0.0" - fault "^1.0.0" - figures "^3.0.0" - glob "^7.0.3" + fault "^2.0.0" + glob "^7.0.0" ignore "^5.0.0" is-buffer "^2.0.0" is-empty "^1.0.0" - is-plain-obj "^2.0.0" - js-yaml "^3.6.1" - load-plugin "^3.0.0" + is-plain-obj "^4.0.0" + js-yaml "^4.0.0" + load-plugin "^4.0.0" parse-json "^5.0.0" - to-vfile "^6.0.0" - trough "^1.0.0" - unist-util-inspect "^5.0.0" - vfile-reporter "^6.0.0" - vfile-statistics "^1.1.0" - -unified-lint-rule@^1.0.0: - version "1.0.6" - resolved "https://registry.yarnpkg.com/unified-lint-rule/-/unified-lint-rule-1.0.6.tgz#b4ab801ff93c251faa917a8d1c10241af030de84" - integrity sha512-YPK15YBFwnsVorDFG/u0cVVQN5G2a3V8zv5/N6KN3TCG+ajKtaALcy7u14DCSrJI+gZeyYquFL9cioJXOGXSvg== + to-vfile "^7.0.0" + trough "^2.0.0" + unist-util-inspect "^7.0.0" + vfile-message "^3.0.0" + vfile-reporter "^7.0.0" + vfile-statistics "^2.0.0" + +unified-lint-rule@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/unified-lint-rule/-/unified-lint-rule-2.0.1.tgz#85276c0d443dce7b76d65e4b8bcdc987323ec9e4" + integrity sha512-2RzZuuuWW+ifftM0zd/ZEng0Hb5lah+Zi+ZL/ybj8BrLO/TH2aQAMYvG+iC95aCg2FkWu/pcvVvHqsh2UMmzPg== dependencies: - wrapped "^1.0.1" + "@types/unist" "^2.0.0" + trough "^2.0.0" + unified "^10.0.0" + vfile "^5.0.0" -unified-message-control@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/unified-message-control/-/unified-message-control-3.0.3.tgz#d08c4564092a507668de71451a33c0d80e734bbd" - integrity sha512-oY5z2n8ugjpNHXOmcgrw0pQeJzavHS0VjPBP21tOcm7rc2C+5Q+kW9j5+gqtf8vfW/8sabbsK5+P+9QPwwEHDA== +unified-message-control@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/unified-message-control/-/unified-message-control-4.0.0.tgz#7cd313df526fc660f218b19a56377bb6957019a8" + integrity sha512-1b92N+VkPHftOsvXNOtkJm4wHlr+UDmTBF2dUzepn40oy9NxanJ9xS1RwUBTjXJwqr2K0kMbEyv1Krdsho7+Iw== dependencies: - unist-util-visit "^2.0.0" - vfile-location "^3.0.0" + "@types/unist" "^2.0.0" + unist-util-is "^5.0.0" + unist-util-visit "^3.0.0" + vfile "^5.0.0" + vfile-location "^4.0.0" + vfile-message "^3.0.0" -unified@^9.1.0: - version "9.2.1" - resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.1.tgz#ae18d5674c114021bfdbdf73865ca60f410215a3" - integrity sha512-juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA== +unified@^10.0.0, unified@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/unified/-/unified-10.1.0.tgz#4e65eb38fc2448b1c5ee573a472340f52b9346fe" + integrity sha512-4U3ru/BRXYYhKbwXV6lU6bufLikoAavTwev89H5UxY8enDFaAT2VXmIXYNm6hb5oHPng/EXr77PVyDFcptbk5g== dependencies: - bail "^1.0.0" + "@types/unist" "^2.0.0" + bail "^2.0.0" extend "^3.0.0" is-buffer "^2.0.0" - is-plain-obj "^2.0.0" - trough "^1.0.0" - vfile "^4.0.0" + is-plain-obj "^4.0.0" + trough "^2.0.0" + vfile "^5.0.0" union-value@^1.0.0: version "1.0.1" @@ -10734,11 +10836,6 @@ union-value@^1.0.0: is-extendable "^0.1.1" set-value "^2.0.1" -uniq@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" - integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8= - uniqs@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02" @@ -10758,62 +10855,74 @@ unique-slug@^2.0.0: dependencies: imurmurhash "^0.1.4" -unist-util-generated@^1.0.0, unist-util-generated@^1.1.0: - version "1.1.6" - resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b" - integrity sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg== +unist-util-generated@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-2.0.0.tgz#86fafb77eb6ce9bfa6b663c3f5ad4f8e56a60113" + integrity sha512-TiWE6DVtVe7Ye2QxOVW9kqybs6cZexNwTwSMVgkfjEReqy/xwGpAXb99OxktoWwmL+Z+Epb0Dn8/GNDYP1wnUw== -unist-util-inspect@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/unist-util-inspect/-/unist-util-inspect-5.0.1.tgz#168c8770a99902318ca268f8c391e294bcf44540" - integrity sha512-fPNWewS593JSmg49HbnE86BJKuBi1/nMWhDSccBvbARfxezEuJV85EaARR9/VplveiwCoLm2kWq+DhP8TBaDpw== +unist-util-inspect@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/unist-util-inspect/-/unist-util-inspect-7.0.0.tgz#98426f0219e24d011a27e32539be0693d9eb973e" + integrity sha512-2Utgv78I7PUu461Y9cdo+IUiiKSKpDV5CE/XD6vTj849a3xlpDAScvSJ6cQmtFBGgAmCn2wR7jLuXhpg1XLlJw== dependencies: - is-empty "^1.0.0" + "@types/unist" "^2.0.0" -unist-util-is@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.1.0.tgz#976e5f462a7a5de73d94b706bac1b90671b57797" - integrity sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg== +unist-util-is@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-5.1.1.tgz#e8aece0b102fa9bc097b0fef8f870c496d4a6236" + integrity sha512-F5CZ68eYzuSvJjGhCLPL3cYx45IxkqXSetCcRgUXtbcm50X2L9oOWQlfUfDdAf+6Pd27YDblBfdtmsThXmwpbQ== -unist-util-position@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.1.0.tgz#1c42ee6301f8d52f47d14f62bbdb796571fa2d47" - integrity sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA== +unist-util-position@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-4.0.1.tgz#f8484b2da19a897a0180556d160c28633070dbb9" + integrity sha512-mgy/zI9fQ2HlbOtTdr2w9lhVaiFUHWQnZrFF2EUoVOqtAUdzqMtNiD99qA5a1IcjWVR8O6aVYE9u7Z2z1v0SQA== -unist-util-stringify-position@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz#cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da" - integrity sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g== +unist-util-stringify-position@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-3.0.0.tgz#d517d2883d74d0daa0b565adc3d10a02b4a8cde9" + integrity sha512-SdfAl8fsDclywZpfMDTVDxA2V7LjtRDTOFd44wUJamgl6OlVngsqWjxvermMYf60elWHbxhuRCZml7AnuXCaSA== dependencies: - "@types/unist" "^2.0.2" + "@types/unist" "^2.0.0" -unist-util-visit-parents@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz#65a6ce698f78a6b0f56aa0e88f13801886cdaef6" - integrity sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg== +unist-util-visit-parents@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-4.1.1.tgz#e83559a4ad7e6048a46b1bdb22614f2f3f4724f2" + integrity sha512-1xAFJXAKpnnJl8G7K5KgU7FY55y3GcLIXqkzUj5QF/QVP7biUm0K0O2oqVkYsdjzJKifYeWn9+o6piAK2hGSHw== dependencies: "@types/unist" "^2.0.0" - unist-util-is "^4.0.0" + unist-util-is "^5.0.0" -unist-util-visit@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz#c3703893146df47203bb8a9795af47d7b971208c" - integrity sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q== +unist-util-visit-parents@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-5.0.0.tgz#5ae2440f8710a0c18a2b4ba0c4471d18e1090494" + integrity sha512-CVaLOYPM/EaFTYMytbaju3Tw4QI3DHnHFnL358FkEu0hZOzSm/hqBdVwOQDR60jF5ZzhB1tlZlRH0ll/yekZIQ== dependencies: "@types/unist" "^2.0.0" - unist-util-is "^4.0.0" - unist-util-visit-parents "^3.0.0" + unist-util-is "^5.0.0" + +unist-util-visit@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-3.1.0.tgz#9420d285e1aee938c7d9acbafc8e160186dbaf7b" + integrity sha512-Szoh+R/Ll68QWAyQyZZpQzZQm2UPbxibDvaY8Xc9SUtYgPsDzx5AWSk++UUt2hJuow8mvwR+rG+LQLw+KsuAKA== + dependencies: + "@types/unist" "^2.0.0" + unist-util-is "^5.0.0" + unist-util-visit-parents "^4.0.0" + +unist-util-visit@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-4.0.0.tgz#6e1f7e8e163921d20281354c38bfd3244b64580a" + integrity sha512-3HWTvrtU10/E7qgPznBfiOyG0TXj9W8c1GSfaI8L9GkaG1pLePiQPZ7E35a0R3ToQ/zcy4Im6aZ9WBgOTnv1MQ== + dependencies: + "@types/unist" "^2.0.0" + unist-util-is "^5.0.0" + unist-util-visit-parents "^5.0.0" unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= -unquote@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544" - integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ= - unset-value@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" @@ -10827,11 +10936,6 @@ upath@^1.1.1: resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== -upper-case@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598" - integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg= - uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" @@ -10899,16 +11003,6 @@ util.promisify@1.0.0: define-properties "^1.1.2" object.getownpropertydescriptors "^2.0.3" -util.promisify@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee" - integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA== - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.2" - has-symbols "^1.0.1" - object.getownpropertydescriptors "^2.1.0" - util@0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" @@ -10923,6 +11017,18 @@ util@^0.11.0: dependencies: inherits "2.0.3" +util@^0.12.3: + version "0.12.4" + resolved "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253" + integrity sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw== + dependencies: + inherits "^2.0.3" + is-arguments "^1.0.4" + is-generator-function "^1.0.7" + is-typed-array "^1.1.3" + safe-buffer "^5.1.2" + which-typed-array "^1.1.2" + utila@~0.4: version "0.4.0" resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" @@ -10938,7 +11044,7 @@ uuid@3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== -uuid@^3.0.0, uuid@^3.1.0, uuid@^3.2.1, uuid@^3.3.2, uuid@^3.3.3: +uuid@^3.0.0, uuid@^3.3.2, uuid@^3.3.3: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== @@ -11000,7 +11106,7 @@ velocity-animate@1.5.2: resolved "https://registry.yarnpkg.com/velocity-animate/-/velocity-animate-1.5.2.tgz#5a351d75fca2a92756f5c3867548b873f6c32105" integrity sha512-m6EXlCAMetKztO1ppBhGU1/1MR3IiEevO6ESq6rcrSQ3Q77xYSW13jkfXW88o4xMrkXJhy/U7j4wFR/twMB0Eg== -vendors@^1.0.0: +vendors@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e" integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w== @@ -11014,50 +11120,57 @@ verror@1.10.0, verror@^1.8.1: core-util-is "1.0.2" extsprintf "^1.2.0" -vfile-location@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-3.2.0.tgz#d8e41fbcbd406063669ebf6c33d56ae8721d0f3c" - integrity sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA== +vfile-location@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-4.0.1.tgz#06f2b9244a3565bef91f099359486a08b10d3a95" + integrity sha512-JDxPlTbZrZCQXogGheBHjbRWjESSPEak770XwWPfw5mTc1v1nWGLB/apzZxsx8a0SJVfF8HK8ql8RD308vXRUw== + dependencies: + "@types/unist" "^2.0.0" + vfile "^5.0.0" -vfile-message@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz#5b43b88171d409eae58477d13f23dd41d52c371a" - integrity sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ== +vfile-message@^3.0.0: + version "3.0.2" + resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-3.0.2.tgz#db7eaebe7fecb853010f2ef1664427f52baf8f74" + integrity sha512-UUjZYIOg9lDRwwiBAuezLIsu9KlXntdxwG+nXnjuQAHvBpcX3x0eN8h+I7TkY5nkCXj+cWVp4ZqebtGBvok8ww== dependencies: "@types/unist" "^2.0.0" - unist-util-stringify-position "^2.0.0" + unist-util-stringify-position "^3.0.0" -vfile-reporter@^6.0.0: - version "6.0.2" - resolved "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-6.0.2.tgz#cbddaea2eec560f27574ce7b7b269822c191a676" - integrity sha512-GN2bH2gs4eLnw/4jPSgfBjo+XCuvnX9elHICJZjVD4+NM0nsUrMTvdjGY5Sc/XG69XVTgLwj7hknQVc6M9FukA== +vfile-reporter@^7.0.0: + version "7.0.2" + resolved "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-7.0.2.tgz#2b3bfafb428581e72073c4337acdf82912385356" + integrity sha512-1bYxpyhl8vhAICiKR59vYyZHIOWsF7P1nV6xjaz3ZWAyOQDQhR4DjlOZo14+PiV9oLEWIrolvGHs0/2Bnaw5Vw== dependencies: - repeat-string "^1.5.0" - string-width "^4.0.0" - supports-color "^6.0.0" - unist-util-stringify-position "^2.0.0" - vfile-sort "^2.1.2" - vfile-statistics "^1.1.0" + "@types/supports-color" "^8.0.0" + string-width "^5.0.0" + supports-color "^9.0.0" + unist-util-stringify-position "^3.0.0" + vfile-sort "^3.0.0" + vfile-statistics "^2.0.0" -vfile-sort@^2.1.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/vfile-sort/-/vfile-sort-2.2.2.tgz#720fe067ce156aba0b411a01bb0dc65596aa1190" - integrity sha512-tAyUqD2R1l/7Rn7ixdGkhXLD3zsg+XLAeUDUhXearjfIcpL1Hcsj5hHpCoy/gvfK/Ws61+e972fm0F7up7hfYA== +vfile-sort@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/vfile-sort/-/vfile-sort-3.0.0.tgz#ee13d3eaac0446200a2047a3b45d78fad6b106e6" + integrity sha512-fJNctnuMi3l4ikTVcKpxTbzHeCgvDhnI44amA3NVDvA6rTC6oKCFpCVyT5n2fFMr3ebfr+WVQZedOCd73rzSxg== + dependencies: + vfile-message "^3.0.0" -vfile-statistics@^1.1.0: - version "1.1.4" - resolved "https://registry.yarnpkg.com/vfile-statistics/-/vfile-statistics-1.1.4.tgz#b99fd15ecf0f44ba088cc973425d666cb7a9f245" - integrity sha512-lXhElVO0Rq3frgPvFBwahmed3X03vjPF8OcjKMy8+F1xU/3Q3QU3tKEDp743SFtb74PdF0UWpxPvtOP0GCLheA== +vfile-statistics@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/vfile-statistics/-/vfile-statistics-2.0.0.tgz#f04ee3e3c666809a3c10c06021becd41ea9c8037" + integrity sha512-foOWtcnJhKN9M2+20AOTlWi2dxNfAoeNIoxD5GXcO182UJyId4QrXa41fWrgcfV3FWTjdEDy3I4cpLVcQscIMA== + dependencies: + vfile-message "^3.0.0" -vfile@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz#03f1dce28fc625c625bc6514350fbdb00fa9e624" - integrity sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA== +vfile@^5.0.0, vfile@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/vfile/-/vfile-5.1.0.tgz#18e78016f0f71e98d737d40f0fca921dc264a600" + integrity sha512-4o7/DJjEaFPYSh0ckv5kcYkJTHQgCKdL8ozMM1jLAxO9ox95IzveDPXCZp08HamdWq8JXTkClDvfAKaeLQeKtg== dependencies: "@types/unist" "^2.0.0" is-buffer "^2.0.0" - unist-util-stringify-position "^2.0.0" - vfile-message "^2.0.0" + unist-util-stringify-position "^3.0.0" + vfile-message "^3.0.0" visibilityjs@2.0.2: version "2.0.2" @@ -11092,20 +11205,34 @@ watchpack@^1.7.4: chokidar "^3.4.1" watchpack-chokidar2 "^2.0.1" +web-encoding@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/web-encoding/-/web-encoding-1.1.5.tgz#fc810cf7667364a6335c939913f5051d3e0c4864" + integrity sha512-HYLeVCdJ0+lBYV2FvNZmv3HJ2Nt0QYXqZojk3d9FJOLkwnuhzM9tmamh8d7HPM8QqjKH8DeHkFTx+CFlWpZZDA== + dependencies: + util "^0.12.3" + optionalDependencies: + "@zxing/text-encoding" "0.9.0" + +web-namespaces@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-2.0.0.tgz#1f6a2d7b5823329abaedeb6bdf09ef2fed35db13" + integrity sha512-dE7ELZRVWh0ceQsRgkjLgsAvwTuv3kcjSY/hLjqL0llleUlQBDjE9JkB9FCBY5F2mnFEwiyJoowl8+NVGHe8dw== + webfontloader@~1.6.x: version "1.6.28" resolved "https://registry.yarnpkg.com/webfontloader/-/webfontloader-1.6.28.tgz#db786129253cb6e8eae54c2fb05f870af6675bae" integrity sha1-23hhKSU8tujq5UwvsF+HCvZnW64= -webpack-cli@4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.0.tgz#3195a777f1f802ecda732f6c95d24c0004bc5a35" - integrity sha512-7bKr9182/sGfjFm+xdZSwgQuFjgEcy0iCTIBxRUeteJ2Kr8/Wz0qNJX+jw60LU36jApt4nmMkep6+W5AKhok6g== +webpack-cli@4.8.0: + version "4.8.0" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.8.0.tgz#5fc3c8b9401d3c8a43e2afceacfa8261962338d1" + integrity sha512-+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw== dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.0.3" - "@webpack-cli/info" "^1.2.4" - "@webpack-cli/serve" "^1.4.0" + "@webpack-cli/configtest" "^1.0.4" + "@webpack-cli/info" "^1.3.0" + "@webpack-cli/serve" "^1.5.2" colorette "^1.2.1" commander "^7.0.0" execa "^5.0.0" @@ -11116,10 +11243,10 @@ webpack-cli@4.7.0: v8-compile-cache "^2.2.0" webpack-merge "^5.7.3" -webpack-merge@5.7.3, webpack-merge@^5.7.3: - version "5.7.3" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz#2a0754e1877a25a8bbab3d2475ca70a052708213" - integrity sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA== +webpack-merge@5.8.0, webpack-merge@^5.7.3: + version "5.8.0" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" + integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q== dependencies: clone-deep "^4.0.1" wildcard "^2.0.0" @@ -11133,9 +11260,9 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack- source-map "~0.6.1" webpack-sources@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.2.0.tgz#058926f39e3d443193b6c31547229806ffd02bac" - integrity sha512-bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w== + version "2.3.1" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.1.tgz#570de0af163949fe272233c2cefe1b56f74511fd" + integrity sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA== dependencies: source-list-map "^2.0.1" source-map "^0.6.1" @@ -11191,17 +11318,16 @@ which-collection@^1.0.1: is-weakset "^2.0.1" which-typed-array@^1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.4.tgz#8fcb7d3ee5adf2d771066fba7cf37e32fe8711ff" - integrity sha512-49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA== + version "1.1.7" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.7.tgz#2761799b9a22d4b8660b3c1b40abaa7739691793" + integrity sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw== dependencies: - available-typed-arrays "^1.0.2" - call-bind "^1.0.0" - es-abstract "^1.18.0-next.1" + available-typed-arrays "^1.0.5" + call-bind "^1.0.2" + es-abstract "^1.18.5" foreach "^2.0.5" - function-bind "^1.1.1" - has-symbols "^1.0.1" - is-typed-array "^1.1.3" + has-tostringtag "^1.0.0" + is-typed-array "^1.1.7" which@1: version "1.3.1" @@ -11264,11 +11390,6 @@ word-wrap@^1.2.3: resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== -wordwrap@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" - integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= - worker-farm@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8" @@ -11276,10 +11397,10 @@ worker-farm@^1.7.0: dependencies: errno "~0.1.7" -workerpool@6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.0.tgz#a8e038b4c94569596852de7a8ea4228eefdeb37b" - integrity sha512-toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg== +workerpool@6.1.5: + version "6.1.5" + resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.5.tgz#0f7cf076b6215fd7e1da903ff6f22ddd1886b581" + integrity sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw== wrap-ansi@^7.0.0: version "7.0.0" @@ -11290,45 +11411,37 @@ wrap-ansi@^7.0.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrapped@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/wrapped/-/wrapped-1.0.1.tgz#c783d9d807b273e9b01e851680a938c87c907242" - integrity sha1-x4PZ2Aeyc+mwHoUWgKk4yHyQckI= - dependencies: - co "3.1.0" - sliced "^1.0.1" - wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= -ws@^7.4.4, ws@~7.4.2: - version "7.4.5" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1" - integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g== +ws@~7.4.2: + version "7.4.6" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" + integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== wurl@2.5.4: version "2.5.4" resolved "https://registry.yarnpkg.com/wurl/-/wurl-2.5.4.tgz#6af35a6c623296c4a0c607c4651d01b8f4e3fdec" integrity sha512-Vuo550m5YbqRcM/69zz3jVNsCUvFTWLRYQcYvnqNWQ4d0Bjg7aoaofbcsPTe4rM9A2/4xjd8uIf9viIUV9EMXQ== -xml-crypto@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-2.1.2.tgz#501506d42e466f6cd908c5a03182217231b4e4b8" - integrity sha512-DBhZXtBjENtLwJmeJhLUBwUm9YWNjCRvAx6ESP4VJyM9PDuKqZu2Fp5Y5HKqcdJT7vV7eI25Z4UBMezji6QloQ== +xml-crypto@^2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-2.1.3.tgz#6a7272b610ea3e4ea7f13e9e4876f1b20cbc32c8" + integrity sha512-MpXZwnn9JK0mNPZ5mnFIbNnQa+8lMGK4NtnX2FlJMfMWR60sJdFO9X72yO6ji068pxixzk53O7x0/iSKh6IhyQ== dependencies: - xmldom "^0.6.0" + "@xmldom/xmldom" "^0.7.0" xpath "0.0.32" -xml-encryption@^1.2.3: - version "1.2.4" - resolved "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.2.4.tgz#767d13f9ff2f979ff5657b93bd72aa729d34b66c" - integrity sha512-+4aSBIv/lwmv5PntfYsZyelOnCcyDmCt/MNxXUukRGlcWW8DObJ26obbVX3iXYRdqkLqbv3AKk8ntNCGKIq/UQ== +xml-encryption@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.3.0.tgz#4cad44a59bf8bdec76d7865ce0b89e13c09962f4" + integrity sha512-3P8C4egMMxSR1BmsRM+fG16a3WzOuUEQKS2U4c3AZ5v7OseIfdUeVkD8dwxIhuLryFZSRWUL5OP6oqkgU7hguA== dependencies: + "@xmldom/xmldom" "^0.7.0" escape-html "^1.0.3" node-forge "^0.10.0" - xmldom "~0.6.0" xpath "0.0.32" xml2js@0.2.8: @@ -11346,7 +11459,7 @@ xml2js@0.4.19: sax ">=0.6.0" xmlbuilder "~9.0.1" -xml2js@^0.4.15, xml2js@^0.4.19, xml2js@^0.4.23: +xml2js@^0.4.15, xml2js@^0.4.23: version "0.4.23" resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66" integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug== @@ -11379,31 +11492,16 @@ xmldom@0.1.x: resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff" integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ== -xmldom@0.5.x: - version "0.5.0" - resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz#193cb96b84aa3486127ea6272c4596354cb4962e" - integrity sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA== - -"xmldom@>= 0.1.x", xmldom@^0.6.0, xmldom@~0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz#43a96ecb8beece991cef382c08397d82d4d0c46f" - integrity sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg== - xmlhttprequest-ssl@~1.6.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.2.tgz#dd6899bfbcf684b554e393c30b13b9f3b001a7ee" - integrity sha512-tYOaldF/0BLfKuoA39QMwD4j2m8lq4DIncqj1yuNELX4vz9+z/ieG/vwmctjJce+boFHXstqhWnHSxc4W8f4qg== + version "1.6.3" + resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz#03b713873b01659dfa2c1c5d056065b27ddc2de6" + integrity sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q== xmlhttprequest@>=1.5.0: version "1.8.0" resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc" integrity sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw= -xpath.js@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/xpath.js/-/xpath.js-1.1.0.tgz#3816a44ed4bb352091083d002a383dd5104a5ff1" - integrity sha512-jg+qkfS4K8E7965sqaUl8mRngXiKb3WZGfONgE18pr03FUQiuSV6G+Ej4tS55B+rIQSFEIw3phdVAQ4pPqNWfQ== - xpath@0.0.32: version "0.0.32" resolved "https://registry.yarnpkg.com/xpath/-/xpath-0.0.32.tgz#1b73d3351af736e17ec078d6da4b8175405c48af" @@ -11444,7 +11542,7 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: +yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== @@ -11454,15 +11552,20 @@ yallist@^4.0.0: resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== +yaml@^1.10.2: + version "1.10.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== + yargs-parser@20.2.4: version "20.2.4" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== yargs-parser@^20.2.2: - version "20.2.7" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz#61df85c113edfb5a7a4e36eb8aa60ef423cbc90a" - integrity sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw== + version "20.2.9" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" + integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== yargs-unparser@2.0.0: version "2.0.0" @@ -11506,7 +11609,7 @@ zip-stream@^4.1.0: compress-commons "^4.1.0" readable-stream "^3.6.0" -zwitch@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920" - integrity sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw== +zwitch@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.2.tgz#91f8d0e901ffa3d66599756dde7f57b17c95dce1" + integrity sha512-JZxotl7SxAJH0j7dN4pxsTV6ZLXoLdGME+PsjkL/DaBrVryK9kTGq06GfKrwcSOqypP+fdXGoCHE36b99fWVoA== diff --git a/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.nix b/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.nix index 5d7cbc1c02db..8ba21d8f5f03 100644 --- a/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.nix +++ b/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.nix @@ -2,131 +2,123 @@ offline_cache = linkFarm "offline" packages; packages = [ { - name = "_azure_abort_controller___abort_controller_1.0.4.tgz"; + name = "_babel_code_frame___code_frame_7.12.11.tgz"; path = fetchurl { - name = "_azure_abort_controller___abort_controller_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/@azure/abort-controller/-/abort-controller-1.0.4.tgz"; - sha1 = "fd3c4d46c8ed67aace42498c8e2270960250eafd"; + name = "_babel_code_frame___code_frame_7.12.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz"; + sha1 = "f4ad435aa263db935b8f10f2c552d23fb716a63f"; }; } { - name = "_azure_core_auth___core_auth_1.3.0.tgz"; + name = "_babel_code_frame___code_frame_7.14.5.tgz"; path = fetchurl { - name = "_azure_core_auth___core_auth_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.3.0.tgz"; - sha1 = "0d55517cf0650aefe755669aca8a2f3724fcf536"; + name = "_babel_code_frame___code_frame_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz"; + sha1 = "23b08d740e83f49c5e59945fbf1b43e80bbf4edb"; }; } { - name = "_azure_ms_rest_azure_env___ms_rest_azure_env_1.1.2.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.9.tgz"; path = fetchurl { - name = "_azure_ms_rest_azure_env___ms_rest_azure_env_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/@azure/ms-rest-azure-env/-/ms-rest-azure-env-1.1.2.tgz"; - sha1 = "8505873afd4a1227ec040894a64fdd736b4a101f"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.9.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz"; + sha1 = "6654d171b2024f6d8ee151bf2509699919131d48"; }; } { - name = "_azure_ms_rest_js___ms_rest_js_1.11.2.tgz"; + name = "_babel_highlight___highlight_7.14.5.tgz"; path = fetchurl { - name = "_azure_ms_rest_js___ms_rest_js_1.11.2.tgz"; - url = "https://registry.yarnpkg.com/@azure/ms-rest-js/-/ms-rest-js-1.11.2.tgz"; - sha1 = "e83d512b102c302425da5ff03a6d76adf2aa4ae6"; + name = "_babel_highlight___highlight_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz"; + sha1 = "6861a52f03966405001f6aa534a01a24d99e8cd9"; }; } { - name = "_azure_ms_rest_nodeauth___ms_rest_nodeauth_2.0.2.tgz"; + name = "_braintree_sanitize_url___sanitize_url_3.1.0.tgz"; path = fetchurl { - name = "_azure_ms_rest_nodeauth___ms_rest_nodeauth_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/@azure/ms-rest-nodeauth/-/ms-rest-nodeauth-2.0.2.tgz"; - sha1 = "037e29540c5625eaec718b8fcc178dd7ad5dfb96"; + name = "_braintree_sanitize_url___sanitize_url_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-3.1.0.tgz"; + sha1 = "8ff71d51053cd5ee4981e5a501d80a536244f7fd"; }; } { - name = "_babel_code_frame___code_frame_7.12.11.tgz"; + name = "_dabh_diagnostics___diagnostics_2.0.2.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.12.11.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz"; - sha1 = "f4ad435aa263db935b8f10f2c552d23fb716a63f"; + name = "_dabh_diagnostics___diagnostics_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.2.tgz"; + sha1 = "290d08f7b381b8f94607dc8f471a12c675f9db31"; }; } { - name = "_babel_code_frame___code_frame_7.12.13.tgz"; + name = "_discoveryjs_json_ext___json_ext_0.5.3.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz"; - sha1 = "dcfc826beef65e75c50e21d3837d7d95798dd658"; + name = "_discoveryjs_json_ext___json_ext_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz"; + sha1 = "90420f9f9c6d3987f176a19a7d8e764271a2f55d"; }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; + name = "_eslint_eslintrc___eslintrc_0.4.3.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz"; - sha1 = "d26cad8a47c65286b15df1547319a5d0bcf27288"; + name = "_eslint_eslintrc___eslintrc_0.4.3.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz"; + sha1 = "9e42981ef035beb3dd49add17acb96e8ff6f394c"; }; } { - name = "_babel_highlight___highlight_7.14.0.tgz"; + name = "_gar_promisify___promisify_1.1.2.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.14.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz"; - sha1 = "3197e375711ef6bf834e67d0daec88e4f46113cf"; + name = "_gar_promisify___promisify_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz"; + sha1 = "30aa825f11d438671d585bd44e7fd564535fc210"; }; } { - name = "_braintree_sanitize_url___sanitize_url_3.1.0.tgz"; + name = "_humanwhocodes_config_array___config_array_0.5.0.tgz"; path = fetchurl { - name = "_braintree_sanitize_url___sanitize_url_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-3.1.0.tgz"; - sha1 = "8ff71d51053cd5ee4981e5a501d80a536244f7fd"; + name = "_humanwhocodes_config_array___config_array_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz"; + sha1 = "1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"; }; } { - name = "_dabh_diagnostics___diagnostics_2.0.2.tgz"; + name = "_humanwhocodes_object_schema___object_schema_1.2.0.tgz"; path = fetchurl { - name = "_dabh_diagnostics___diagnostics_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.2.tgz"; - sha1 = "290d08f7b381b8f94607dc8f471a12c675f9db31"; + name = "_humanwhocodes_object_schema___object_schema_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz"; + sha1 = "87de7af9c231826fdd68ac7258f77c429e0e5fcf"; }; } { - name = "_discoveryjs_json_ext___json_ext_0.5.2.tgz"; + name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; path = fetchurl { - name = "_discoveryjs_json_ext___json_ext_0.5.2.tgz"; - url = "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz"; - sha1 = "8f03a22a04de437254e8ce8cc84ba39689288752"; + name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; + sha1 = "7619c2eb21b25483f6d167548b4cfd5a7488c3d5"; }; } { - name = "_eslint_eslintrc___eslintrc_0.4.1.tgz"; + name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; path = fetchurl { - name = "_eslint_eslintrc___eslintrc_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.1.tgz"; - sha1 = "442763b88cecbe3ee0ec7ca6d6dd6168550cbf14"; + name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; + sha1 = "5bd262af94e9d25bd1e71b05deed44876a222e8b"; }; } { - name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz"; + name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; path = fetchurl { - name = "_nodelib_fs.scandir___fs.scandir_2.1.4.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; - sha1 = "d4b3549a5db5de2683e0c1071ab4f140904bbf69"; + name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; + sha1 = "e95737e8bb6746ddedf69c556953494f196fe69a"; }; } { - name = "_nodelib_fs.stat___fs.stat_2.0.4.tgz"; + name = "_npmcli_fs___fs_1.0.0.tgz"; path = fetchurl { - name = "_nodelib_fs.stat___fs.stat_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; - sha1 = "a3f2dd61bab43b8db8fa108a121cfffe4c676655"; - }; - } - { - name = "_nodelib_fs.walk___fs.walk_1.2.6.tgz"; - path = fetchurl { - name = "_nodelib_fs.walk___fs.walk_1.2.6.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; - sha1 = "cce9396b30aa5afe9e3756608f5831adcb53d063"; + name = "_npmcli_fs___fs_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.0.0.tgz"; + sha1 = "589612cfad3a6ea0feafcb901d29c63fd52db09f"; }; } { @@ -154,11 +146,19 @@ }; } { - name = "_tokenizer_token___token_0.1.1.tgz"; + name = "_tokenizer_token___token_0.3.0.tgz"; + path = fetchurl { + name = "_tokenizer_token___token_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.3.0.tgz"; + sha1 = "fe98a93fe789247e998c75e74e9c7c63217aa276"; + }; + } + { + name = "_trysound_sax___sax_0.2.0.tgz"; path = fetchurl { - name = "_tokenizer_token___token_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.1.1.tgz"; - sha1 = "f0d92c12f87079ddfd1b29f614758b9696bc29e3"; + name = "_trysound_sax___sax_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz"; + sha1 = "cccaab758af56761eb7bf37af6f03f326dd798ad"; }; } { @@ -170,107 +170,131 @@ }; } { - name = "_types_anymatch___anymatch_1.3.1.tgz"; + name = "_types_body_parser___body_parser_1.19.1.tgz"; + path = fetchurl { + name = "_types_body_parser___body_parser_1.19.1.tgz"; + url = "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.1.tgz"; + sha1 = "0c0174c42a7d017b818303d4b5d969cb0b75929c"; + }; + } + { + name = "_types_concat_stream___concat_stream_1.6.1.tgz"; path = fetchurl { - name = "_types_anymatch___anymatch_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz"; - sha1 = "336badc1beecb9dacc38bea2cf32adf627a8421a"; + name = "_types_concat_stream___concat_stream_1.6.1.tgz"; + url = "https://registry.yarnpkg.com/@types/concat-stream/-/concat-stream-1.6.1.tgz"; + sha1 = "24bcfc101ecf68e886aaedce60dfd74b632a1b74"; }; } { - name = "_types_body_parser___body_parser_1.19.0.tgz"; + name = "_types_connect___connect_3.4.35.tgz"; path = fetchurl { - name = "_types_body_parser___body_parser_1.19.0.tgz"; - url = "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz"; - sha1 = "0685b3c47eb3006ffed117cdd55164b61f80538f"; + name = "_types_connect___connect_3.4.35.tgz"; + url = "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz"; + sha1 = "5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"; }; } { - name = "_types_connect___connect_3.4.34.tgz"; + name = "_types_content_disposition___content_disposition_0.5.4.tgz"; path = fetchurl { - name = "_types_connect___connect_3.4.34.tgz"; - url = "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.34.tgz"; - sha1 = "170a40223a6d666006d93ca128af2beb1d9b1901"; + name = "_types_content_disposition___content_disposition_0.5.4.tgz"; + url = "https://registry.yarnpkg.com/@types/content-disposition/-/content-disposition-0.5.4.tgz"; + sha1 = "de48cf01c79c9f1560bcfd8ae43217ab028657f8"; }; } { - name = "_types_content_disposition___content_disposition_0.5.3.tgz"; + name = "_types_cookies___cookies_0.7.7.tgz"; path = fetchurl { - name = "_types_content_disposition___content_disposition_0.5.3.tgz"; - url = "https://registry.yarnpkg.com/@types/content-disposition/-/content-disposition-0.5.3.tgz"; - sha1 = "0aa116701955c2faa0717fc69cd1596095e49d96"; + name = "_types_cookies___cookies_0.7.7.tgz"; + url = "https://registry.yarnpkg.com/@types/cookies/-/cookies-0.7.7.tgz"; + sha1 = "7a92453d1d16389c05a5301eef566f34946cfd81"; }; } { - name = "_types_cookies___cookies_0.7.6.tgz"; + name = "_types_debug___debug_4.1.7.tgz"; path = fetchurl { - name = "_types_cookies___cookies_0.7.6.tgz"; - url = "https://registry.yarnpkg.com/@types/cookies/-/cookies-0.7.6.tgz"; - sha1 = "71212c5391a976d3bae57d4b09fac20fc6bda504"; + name = "_types_debug___debug_4.1.7.tgz"; + url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz"; + sha1 = "7cc0ea761509124709b8b2d1090d8f6c17aadb82"; }; } { - name = "_types_debug___debug_4.1.5.tgz"; + name = "_types_express_serve_static_core___express_serve_static_core_4.17.24.tgz"; path = fetchurl { - name = "_types_debug___debug_4.1.5.tgz"; - url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz"; - sha1 = "b14efa8852b7768d898906613c23f688713e02cd"; + name = "_types_express_serve_static_core___express_serve_static_core_4.17.24.tgz"; + url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz"; + sha1 = "ea41f93bf7e0d59cd5a76665068ed6aab6815c07"; }; } { - name = "_types_express_serve_static_core___express_serve_static_core_4.17.19.tgz"; + name = "_types_express___express_4.17.13.tgz"; path = fetchurl { - name = "_types_express_serve_static_core___express_serve_static_core_4.17.19.tgz"; - url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz"; - sha1 = "00acfc1632e729acac4f1530e9e16f6dd1508a1d"; + name = "_types_express___express_4.17.13.tgz"; + url = "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz"; + sha1 = "a76e2995728999bab51a33fabce1d705a3709034"; }; } { - name = "_types_express___express_4.17.11.tgz"; + name = "_types_geojson___geojson_7946.0.8.tgz"; path = fetchurl { - name = "_types_express___express_4.17.11.tgz"; - url = "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz"; - sha1 = "debe3caa6f8e5fcda96b47bd54e2f40c4ee59545"; + name = "_types_geojson___geojson_7946.0.8.tgz"; + url = "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz"; + sha1 = "30744afdb385e2945e22f3b033f897f76b1f12ca"; }; } { - name = "_types_geojson___geojson_7946.0.7.tgz"; + name = "_types_hast___hast_2.3.4.tgz"; path = fetchurl { - name = "_types_geojson___geojson_7946.0.7.tgz"; - url = "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.7.tgz"; - sha1 = "c8fa532b60a0042219cdf173ca21a975ef0666ad"; + name = "_types_hast___hast_2.3.4.tgz"; + url = "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.4.tgz"; + sha1 = "8aa5ef92c117d20d974a82bdfb6a648b08c0bafc"; }; } { - name = "_types_html_minifier_terser___html_minifier_terser_5.1.1.tgz"; + name = "_types_html_minifier_terser___html_minifier_terser_5.1.2.tgz"; path = fetchurl { - name = "_types_html_minifier_terser___html_minifier_terser_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"; - sha1 = "3c9ee980f1a10d6021ae6632ca3e79ca2ec4fb50"; + name = "_types_html_minifier_terser___html_minifier_terser_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz"; + sha1 = "693b316ad323ea97eed6b38ed1a3cc02b1672b57"; }; } { - name = "_types_http_assert___http_assert_1.5.1.tgz"; + name = "_types_http_assert___http_assert_1.5.3.tgz"; path = fetchurl { - name = "_types_http_assert___http_assert_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/@types/http-assert/-/http-assert-1.5.1.tgz"; - sha1 = "d775e93630c2469c2f980fc27e3143240335db3b"; + name = "_types_http_assert___http_assert_1.5.3.tgz"; + url = "https://registry.yarnpkg.com/@types/http-assert/-/http-assert-1.5.3.tgz"; + sha1 = "ef8e3d1a8d46c387f04ab0f2e8ab8cb0c5078661"; }; } { - name = "_types_http_errors___http_errors_1.8.0.tgz"; + name = "_types_http_errors___http_errors_1.8.1.tgz"; path = fetchurl { - name = "_types_http_errors___http_errors_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-1.8.0.tgz"; - sha1 = "682477dbbbd07cd032731cb3b0e7eaee3d026b69"; + name = "_types_http_errors___http_errors_1.8.1.tgz"; + url = "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-1.8.1.tgz"; + sha1 = "e81ad28a60bee0328c6d2384e029aec626f1ae67"; }; } { - name = "_types_json_schema___json_schema_7.0.7.tgz"; + name = "_types_is_empty___is_empty_1.2.0.tgz"; path = fetchurl { - name = "_types_json_schema___json_schema_7.0.7.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz"; - sha1 = "98a993516c859eb0d5c4c8f098317a9ea68db9ad"; + name = "_types_is_empty___is_empty_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@types/is-empty/-/is-empty-1.2.0.tgz"; + sha1 = "16bc578060c9b0b6953339eea906c255a375bf86"; + }; + } + { + name = "_types_js_yaml___js_yaml_4.0.3.tgz"; + path = fetchurl { + name = "_types_js_yaml___js_yaml_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.3.tgz"; + sha1 = "9f33cd6fbf0d5ec575dc8c8fc69c7fec1b4eb200"; + }; + } + { + name = "_types_json_schema___json_schema_7.0.9.tgz"; + path = fetchurl { + name = "_types_json_schema___json_schema_7.0.9.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz"; + sha1 = "97edc9037ea0c38585320b28964dde3b39e4660d"; }; } { @@ -298,27 +322,27 @@ }; } { - name = "_types_koa___koa_2.13.1.tgz"; + name = "_types_koa___koa_2.13.4.tgz"; path = fetchurl { - name = "_types_koa___koa_2.13.1.tgz"; - url = "https://registry.yarnpkg.com/@types/koa/-/koa-2.13.1.tgz"; - sha1 = "e29877a6b5ad3744ab1024f6ec75b8cbf6ec45db"; + name = "_types_koa___koa_2.13.4.tgz"; + url = "https://registry.yarnpkg.com/@types/koa/-/koa-2.13.4.tgz"; + sha1 = "10620b3f24a8027ef5cbae88b393d1b31205726b"; }; } { - name = "_types_ldapjs___ldapjs_1.0.10.tgz"; + name = "_types_ldapjs___ldapjs_1.0.11.tgz"; path = fetchurl { - name = "_types_ldapjs___ldapjs_1.0.10.tgz"; - url = "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.10.tgz"; - sha1 = "bac705c9e154b97d69496b5213cc28dbe9715a37"; + name = "_types_ldapjs___ldapjs_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.11.tgz"; + sha1 = "34077176af2b06186bd54e4a38ceb6e852387fa4"; }; } { - name = "_types_mdast___mdast_3.0.3.tgz"; + name = "_types_mdast___mdast_3.0.10.tgz"; path = fetchurl { - name = "_types_mdast___mdast_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.3.tgz"; - sha1 = "2d7d671b1cd1ea3deb306ea75036c2a0407d2deb"; + name = "_types_mdast___mdast_3.0.10.tgz"; + url = "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.10.tgz"; + sha1 = "4724244a82a4598884cbbe9bcfd73dff927ee8af"; }; } { @@ -330,123 +354,123 @@ }; } { - name = "_types_node___node_15.0.2.tgz"; + name = "_types_ms___ms_0.7.31.tgz"; path = fetchurl { - name = "_types_node___node_15.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-15.0.2.tgz"; - sha1 = "51e9c0920d1b45936ea04341aa3e2e58d339fb67"; + name = "_types_ms___ms_0.7.31.tgz"; + url = "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz"; + sha1 = "31b7ca6407128a3d2bbc27fe2d21b345397f6197"; }; } { - name = "_types_node___node_12.20.12.tgz"; + name = "_types_node___node_16.9.1.tgz"; path = fetchurl { - name = "_types_node___node_12.20.12.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-12.20.12.tgz"; - sha1 = "fd9c1c2cfab536a2383ed1ef70f94adea743a226"; + name = "_types_node___node_16.9.1.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.9.1.tgz"; + sha1 = "0611b37db4246c937feef529ddcc018cf8e35708"; }; } { - name = "_types_node___node_14.14.44.tgz"; + name = "_types_node___node_14.17.15.tgz"; path = fetchurl { - name = "_types_node___node_14.14.44.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz"; - sha1 = "df7503e6002847b834371c004b372529f3f85215"; + name = "_types_node___node_14.17.15.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.15.tgz"; + sha1 = "d5ebfb62a69074ebb85cbe0529ad917bb8f2bae8"; }; } { - name = "_types_node___node_8.10.66.tgz"; + name = "_types_parse5___parse5_6.0.1.tgz"; path = fetchurl { - name = "_types_node___node_8.10.66.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-8.10.66.tgz"; - sha1 = "dd035d409df322acc83dff62a602f12a5783bbb3"; + name = "_types_parse5___parse5_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/parse5/-/parse5-6.0.1.tgz"; + sha1 = "f8ae4fbcd2b9ba4ff934698e28778961f9cb22ca"; }; } { - name = "_types_q___q_1.5.4.tgz"; + name = "_types_qs___qs_6.9.7.tgz"; path = fetchurl { - name = "_types_q___q_1.5.4.tgz"; - url = "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz"; - sha1 = "15925414e0ad2cd765bfef58842f7e26a7accb24"; + name = "_types_qs___qs_6.9.7.tgz"; + url = "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz"; + sha1 = "63bb7d067db107cc1e457c303bc25d511febf6cb"; }; } { - name = "_types_qs___qs_6.9.6.tgz"; + name = "_types_range_parser___range_parser_1.2.4.tgz"; path = fetchurl { - name = "_types_qs___qs_6.9.6.tgz"; - url = "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.6.tgz"; - sha1 = "df9c3c8b31a247ec315e6996566be3171df4b3b1"; + name = "_types_range_parser___range_parser_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz"; + sha1 = "cd667bcfdd025213aafb7ca5915a932590acdcdc"; }; } { - name = "_types_range_parser___range_parser_1.2.3.tgz"; + name = "_types_serve_static___serve_static_1.13.10.tgz"; path = fetchurl { - name = "_types_range_parser___range_parser_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz"; - sha1 = "7ee330ba7caafb98090bece86a5ee44115904c2c"; + name = "_types_serve_static___serve_static_1.13.10.tgz"; + url = "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz"; + sha1 = "f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"; }; } { - name = "_types_readable_stream___readable_stream_2.3.9.tgz"; + name = "_types_source_list_map___source_list_map_0.1.2.tgz"; path = fetchurl { - name = "_types_readable_stream___readable_stream_2.3.9.tgz"; - url = "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.9.tgz"; - sha1 = "40a8349e6ace3afd2dd1b6d8e9b02945de4566a9"; + name = "_types_source_list_map___source_list_map_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz"; + sha1 = "0078836063ffaf17412349bba364087e0ac02ec9"; }; } { - name = "_types_serve_static___serve_static_1.13.9.tgz"; + name = "_types_supports_color___supports_color_8.1.1.tgz"; path = fetchurl { - name = "_types_serve_static___serve_static_1.13.9.tgz"; - url = "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.9.tgz"; - sha1 = "aacf28a85a05ee29a11fb7c3ead935ac56f33e4e"; + name = "_types_supports_color___supports_color_8.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/supports-color/-/supports-color-8.1.1.tgz"; + sha1 = "1b44b1b096479273adf7f93c75fc4ecc40a61ee4"; }; } { - name = "_types_source_list_map___source_list_map_0.1.2.tgz"; + name = "_types_tapable___tapable_1.0.8.tgz"; path = fetchurl { - name = "_types_source_list_map___source_list_map_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz"; - sha1 = "0078836063ffaf17412349bba364087e0ac02ec9"; + name = "_types_tapable___tapable_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.8.tgz"; + sha1 = "b94a4391c85666c7b73299fd3ad79d4faa435310"; }; } { - name = "_types_tapable___tapable_1.0.7.tgz"; + name = "_types_text_table___text_table_0.2.2.tgz"; path = fetchurl { - name = "_types_tapable___tapable_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.7.tgz"; - sha1 = "545158342f949e8fd3bfd813224971ecddc3fac4"; + name = "_types_text_table___text_table_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/@types/text-table/-/text-table-0.2.2.tgz"; + sha1 = "774c90cfcfbc8b4b0ebb00fecbe861dc8b1e8e26"; }; } { - name = "_types_uglify_js___uglify_js_3.13.0.tgz"; + name = "_types_uglify_js___uglify_js_3.13.1.tgz"; path = fetchurl { - name = "_types_uglify_js___uglify_js_3.13.0.tgz"; - url = "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.13.0.tgz"; - sha1 = "1cad8df1fb0b143c5aba08de5712ea9d1ff71124"; + name = "_types_uglify_js___uglify_js_3.13.1.tgz"; + url = "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.13.1.tgz"; + sha1 = "5e889e9e81e94245c75b6450600e1c5ea2878aea"; }; } { - name = "_types_unist___unist_2.0.3.tgz"; + name = "_types_unist___unist_2.0.6.tgz"; path = fetchurl { - name = "_types_unist___unist_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz"; - sha1 = "9c088679876f374eb5983f150d4787aa6fb32d7e"; + name = "_types_unist___unist_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz"; + sha1 = "250a7b16c3b91f672a24552ec64678eeb1d3a08d"; }; } { - name = "_types_webpack_sources___webpack_sources_2.1.0.tgz"; + name = "_types_webpack_sources___webpack_sources_3.2.0.tgz"; path = fetchurl { - name = "_types_webpack_sources___webpack_sources_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.1.0.tgz"; - sha1 = "8882b0bd62d1e0ce62f183d0d01b72e6e82e8c10"; + name = "_types_webpack_sources___webpack_sources_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-3.2.0.tgz"; + sha1 = "16d759ba096c289034b26553d2df1bf45248d38b"; }; } { - name = "_types_webpack___webpack_4.41.28.tgz"; + name = "_types_webpack___webpack_4.41.31.tgz"; path = fetchurl { - name = "_types_webpack___webpack_4.41.28.tgz"; - url = "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.28.tgz"; - sha1 = "0069a2159b7ad4d83d0b5801942c17d54133897b"; + name = "_types_webpack___webpack_4.41.31.tgz"; + url = "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.31.tgz"; + sha1 = "c35f252a3559ddf9c85c0d8b0b42019025e581aa"; }; } { @@ -602,27 +626,35 @@ }; } { - name = "_webpack_cli_configtest___configtest_1.0.3.tgz"; + name = "_webpack_cli_configtest___configtest_1.0.4.tgz"; + path = fetchurl { + name = "_webpack_cli_configtest___configtest_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.4.tgz"; + sha1 = "f03ce6311c0883a83d04569e2c03c6238316d2aa"; + }; + } + { + name = "_webpack_cli_info___info_1.3.0.tgz"; path = fetchurl { - name = "_webpack_cli_configtest___configtest_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.3.tgz"; - sha1 = "204bcff87cda3ea4810881f7ea96e5f5321b87b9"; + name = "_webpack_cli_info___info_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.3.0.tgz"; + sha1 = "9d78a31101a960997a4acd41ffd9b9300627fe2b"; }; } { - name = "_webpack_cli_info___info_1.2.4.tgz"; + name = "_webpack_cli_serve___serve_1.5.2.tgz"; path = fetchurl { - name = "_webpack_cli_info___info_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.2.4.tgz"; - sha1 = "7381fd41c9577b2d8f6c2594fad397ef49ad5573"; + name = "_webpack_cli_serve___serve_1.5.2.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.5.2.tgz"; + sha1 = "ea584b637ff63c5a477f6f21604b5a205b72c9ec"; }; } { - name = "_webpack_cli_serve___serve_1.4.0.tgz"; + name = "_xmldom_xmldom___xmldom_0.7.4.tgz"; path = fetchurl { - name = "_webpack_cli_serve___serve_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.4.0.tgz"; - sha1 = "f84fd07bcacefe56ce762925798871092f0f228e"; + name = "_xmldom_xmldom___xmldom_0.7.4.tgz"; + url = "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.4.tgz"; + sha1 = "93b2f9486c88b6464e97f76c9ab49b0a548fbe57"; }; } { @@ -642,13 +674,21 @@ }; } { + name = "_zxing_text_encoding___text_encoding_0.9.0.tgz"; + path = fetchurl { + name = "_zxing_text_encoding___text_encoding_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/@zxing/text-encoding/-/text-encoding-0.9.0.tgz"; + sha1 = "fb50ffabc6c7c66a0c96b4c03e3d9be74864b70b"; + }; + } + { name = "Idle.js"; path = let repo = fetchgit { url = "https://github.com/shawnmclean/Idle.js"; - rev = "db9beb3483a460ad638ec947867720f0ed066a62"; - sha256 = "1pa8cqbr758vx1q2ymsmbkp9cz3b7bghxzi90zc4hfq1nzav5w85"; + rev = "2b57cc6e49d177b7ddce0cca00ef5cbe07453541"; + sha256 = "194m65wax0q2iqc1237iix6gsyyzjjmbifk4lm0bni7x2qa5alrx"; }; in runCommand "Idle.js" { buildInputs = [gnutar]; } '' @@ -674,6 +714,30 @@ }; } { + name = "abcjs___abcjs_5.10.3.tgz"; + path = fetchurl { + name = "abcjs___abcjs_5.10.3.tgz"; + url = "https://registry.yarnpkg.com/abcjs/-/abcjs-5.10.3.tgz"; + sha1 = "294702140ec1caa292859ba9d2af0452f7e9e046"; + }; + } + { + name = "abcjs___abcjs_5.11.0.tgz"; + path = fetchurl { + name = "abcjs___abcjs_5.11.0.tgz"; + url = "https://registry.yarnpkg.com/abcjs/-/abcjs-5.11.0.tgz"; + sha1 = "397592ea6a56948aee64a8364f9a7a589e254300"; + }; + } + { + name = "abcjs___abcjs_5.12.0.tgz"; + path = fetchurl { + name = "abcjs___abcjs_5.12.0.tgz"; + url = "https://registry.yarnpkg.com/abcjs/-/abcjs-5.12.0.tgz"; + sha1 = "06fec076d570821309b0a12598cd356cd589eb08"; + }; + } + { name = "abstract_logging___abstract_logging_2.0.1.tgz"; path = fetchurl { name = "abstract_logging___abstract_logging_2.0.1.tgz"; @@ -690,11 +754,11 @@ }; } { - name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; - sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b"; + name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; + sha1 = "7ed5bb55908b3b2f1bc55c6af1653bada7f07937"; }; } { @@ -714,14 +778,6 @@ }; } { - name = "adal_node___adal_node_0.1.28.tgz"; - path = fetchurl { - name = "adal_node___adal_node_0.1.28.tgz"; - url = "https://registry.yarnpkg.com/adal-node/-/adal-node-0.1.28.tgz"; - sha1 = "468c4bb3ebbd96b1270669f4b9cba4e0065ea485"; - }; - } - { name = "after___after_0.8.2.tgz"; path = fetchurl { name = "after___after_0.8.2.tgz"; @@ -762,11 +818,11 @@ }; } { - name = "ajv___ajv_8.3.0.tgz"; + name = "ajv___ajv_8.6.3.tgz"; path = fetchurl { - name = "ajv___ajv_8.3.0.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-8.3.0.tgz"; - sha1 = "25ee7348e32cdc4a1dbb38256bf6bdc451dd577c"; + name = "ajv___ajv_8.6.3.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz"; + sha1 = "11a66527761dc3e9a3845ea775d2d3c0414e8764"; }; } { @@ -810,6 +866,14 @@ }; } { + name = "ansi_regex___ansi_regex_6.0.1.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz"; + sha1 = "3183e38fae9a65d7cb5e53945cd5897d0260a06a"; + }; + } + { name = "ansi_styles___ansi_styles_2.2.1.tgz"; path = fetchurl { name = "ansi_styles___ansi_styles_2.2.1.tgz"; @@ -898,11 +962,11 @@ }; } { - name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; path = fetchurl { - name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; - sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21"; + name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; + sha1 = "b15474a932adab4ff8a50d9adfa7e4e926f21146"; }; } { @@ -954,14 +1018,6 @@ }; } { - name = "array_filter___array_filter_1.0.0.tgz"; - path = fetchurl { - name = "array_filter___array_filter_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz"; - sha1 = "baf79e62e6ef4c2a4c0b831232daffec251f9d83"; - }; - } - { name = "array_flatten___array_flatten_1.1.1.tgz"; path = fetchurl { name = "array_flatten___array_flatten_1.1.1.tgz"; @@ -1082,14 +1138,6 @@ }; } { - name = "async___async_3.2.0.tgz"; - path = fetchurl { - name = "async___async_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-3.2.0.tgz"; - sha1 = "b3a2685c5ebb641d3de02d161002c60fc9f85720"; - }; - } - { name = "async___async_1.5.2.tgz"; path = fetchurl { name = "async___async_1.5.2.tgz"; @@ -1098,6 +1146,14 @@ }; } { + name = "async___async_3.2.1.tgz"; + path = fetchurl { + name = "async___async_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-3.2.1.tgz"; + sha1 = "d3274ec66d107a47476a4c49136aacdb00665fc8"; + }; + } + { name = "asynckit___asynckit_0.4.0.tgz"; path = fetchurl { name = "asynckit___asynckit_0.4.0.tgz"; @@ -1114,19 +1170,19 @@ }; } { - name = "available_typed_arrays___available_typed_arrays_1.0.2.tgz"; + name = "available_typed_arrays___available_typed_arrays_1.0.5.tgz"; path = fetchurl { - name = "available_typed_arrays___available_typed_arrays_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz"; - sha1 = "6b098ca9d8039079ee3f77f7b783c4480ba513f5"; + name = "available_typed_arrays___available_typed_arrays_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz"; + sha1 = "92f95616501069d07d10edb2fc37d3e1c65123b7"; }; } { - name = "aws_sdk___aws_sdk_2.904.0.tgz"; + name = "aws_sdk___aws_sdk_2.988.0.tgz"; path = fetchurl { - name = "aws_sdk___aws_sdk_2.904.0.tgz"; - url = "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.904.0.tgz"; - sha1 = "45a53e918698e451f762e44005dfce177a50b7e6"; + name = "aws_sdk___aws_sdk_2.988.0.tgz"; + url = "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.988.0.tgz"; + sha1 = "46538de14c4c5cd3d7718badedffd31471a0c0e9"; }; } { @@ -1146,19 +1202,19 @@ }; } { - name = "axios___axios_0.21.1.tgz"; + name = "axios___axios_0.21.4.tgz"; path = fetchurl { - name = "axios___axios_0.21.1.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz"; - sha1 = "22563481962f4d6bde9a76d516ef0e5d3c09b2b8"; + name = "axios___axios_0.21.4.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz"; + sha1 = "c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"; }; } { - name = "azure_storage___azure_storage_2.10.3.tgz"; + name = "azure_storage___azure_storage_2.10.4.tgz"; path = fetchurl { - name = "azure_storage___azure_storage_2.10.3.tgz"; - url = "https://registry.yarnpkg.com/azure-storage/-/azure-storage-2.10.3.tgz"; - sha1 = "c5966bf929d87587d78f6847040ea9a4b1d4a50a"; + name = "azure_storage___azure_storage_2.10.4.tgz"; + url = "https://registry.yarnpkg.com/azure-storage/-/azure-storage-2.10.4.tgz"; + sha1 = "c481d207eabc05f57f019b209f7faa8737435104"; }; } { @@ -1634,11 +1690,11 @@ }; } { - name = "bail___bail_1.0.5.tgz"; + name = "bail___bail_2.0.1.tgz"; path = fetchurl { - name = "bail___bail_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz"; - sha1 = "b6fa133404a392cbc1f8c4bf63f5953351e7a776"; + name = "bail___bail_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/bail/-/bail-2.0.1.tgz"; + sha1 = "d676736373a374058a935aec81b94c12ba815771"; }; } { @@ -1754,14 +1810,6 @@ }; } { - name = "bl___bl_3.0.1.tgz"; - path = fetchurl { - name = "bl___bl_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/bl/-/bl-3.0.1.tgz"; - sha1 = "1cbb439299609e419b5a74d7fce2f8b37d8e5c6f"; - }; - } - { name = "bl___bl_4.1.0.tgz"; path = fetchurl { name = "bl___bl_4.1.0.tgz"; @@ -1962,11 +2010,11 @@ }; } { - name = "browserslist___browserslist_4.16.6.tgz"; + name = "browserslist___browserslist_4.17.0.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.16.6.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz"; - sha1 = "d7901277a5a88e554ed305b183ec9b0c08f66fa2"; + name = "browserslist___browserslist_4.17.0.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.0.tgz"; + sha1 = "1fcd81ec75b41d6d4994fb0831b92ac18c01649c"; }; } { @@ -1978,19 +2026,11 @@ }; } { - name = "buffer_equal_constant_time___buffer_equal_constant_time_1.0.1.tgz"; - path = fetchurl { - name = "buffer_equal_constant_time___buffer_equal_constant_time_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"; - sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"; - }; - } - { - name = "buffer_from___buffer_from_1.1.1.tgz"; + name = "buffer_from___buffer_from_1.1.2.tgz"; path = fetchurl { - name = "buffer_from___buffer_from_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; - sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; + name = "buffer_from___buffer_from_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz"; + sha1 = "2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"; }; } { @@ -2042,6 +2082,14 @@ }; } { + name = "builtins___builtins_4.0.0.tgz"; + path = fetchurl { + name = "builtins___builtins_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/builtins/-/builtins-4.0.0.tgz"; + sha1 = "a8345420de82068fdc4d6559d0456403a8fb1905"; + }; + } + { name = "bytes___bytes_3.0.0.tgz"; path = fetchurl { name = "bytes___bytes_3.0.0.tgz"; @@ -2066,11 +2114,11 @@ }; } { - name = "cacache___cacache_15.0.6.tgz"; + name = "cacache___cacache_15.3.0.tgz"; path = fetchurl { - name = "cacache___cacache_15.0.6.tgz"; - url = "https://registry.yarnpkg.com/cacache/-/cacache-15.0.6.tgz"; - sha1 = "65a8c580fda15b59150fb76bf3f3a8e45d583099"; + name = "cacache___cacache_15.3.0.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz"; + sha1 = "dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"; }; } { @@ -2090,30 +2138,6 @@ }; } { - name = "caller_callsite___caller_callsite_2.0.0.tgz"; - path = fetchurl { - name = "caller_callsite___caller_callsite_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz"; - sha1 = "847e0fce0a223750a9a027c54b33731ad3154134"; - }; - } - { - name = "caller_path___caller_path_2.0.0.tgz"; - path = fetchurl { - name = "caller_path___caller_path_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz"; - sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; - }; - } - { - name = "callsites___callsites_2.0.0.tgz"; - path = fetchurl { - name = "callsites___callsites_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz"; - sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; - }; - } - { name = "callsites___callsites_3.1.0.tgz"; path = fetchurl { name = "callsites___callsites_3.1.0.tgz"; @@ -2122,14 +2146,6 @@ }; } { - name = "camel_case___camel_case_3.0.0.tgz"; - path = fetchurl { - name = "camel_case___camel_case_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz"; - sha1 = "ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"; - }; - } - { name = "camel_case___camel_case_4.1.2.tgz"; path = fetchurl { name = "camel_case___camel_case_4.1.2.tgz"; @@ -2138,14 +2154,6 @@ }; } { - name = "camelcase___camelcase_5.3.1.tgz"; - path = fetchurl { - name = "camelcase___camelcase_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz"; - sha1 = "e3c9b31569e106811df242f715725a1f4c494320"; - }; - } - { name = "camelcase___camelcase_6.2.0.tgz"; path = fetchurl { name = "camelcase___camelcase_6.2.0.tgz"; @@ -2162,11 +2170,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001228.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001257.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001228.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz"; - sha1 = "bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"; + name = "caniuse_lite___caniuse_lite_1.0.30001257.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001257.tgz"; + sha1 = "150aaf649a48bee531104cfeda57f92ce587f6e5"; }; } { @@ -2178,6 +2186,14 @@ }; } { + name = "ccount___ccount_2.0.0.tgz"; + path = fetchurl { + name = "ccount___ccount_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ccount/-/ccount-2.0.0.tgz"; + sha1 = "3d6fb55803832766a24c6f339abc507297eb5d25"; + }; + } + { name = "chalk___chalk_1.1.3.tgz"; path = fetchurl { name = "chalk___chalk_1.1.3.tgz"; @@ -2194,19 +2210,11 @@ }; } { - name = "chalk___chalk_3.0.0.tgz"; + name = "chalk___chalk_4.1.2.tgz"; path = fetchurl { - name = "chalk___chalk_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz"; - sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; - }; - } - { - name = "chalk___chalk_4.1.1.tgz"; - path = fetchurl { - name = "chalk___chalk_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz"; - sha1 = "c80b3fab28bf6371e6863325eee67e618b77e6ad"; + name = "chalk___chalk_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz"; + sha1 = "aac4e2b7734a740867aeb16bf02aad556a1e7a01"; }; } { @@ -2218,35 +2226,43 @@ }; } { - name = "chance___chance_1.1.7.tgz"; + name = "chance___chance_1.1.8.tgz"; + path = fetchurl { + name = "chance___chance_1.1.8.tgz"; + url = "https://registry.yarnpkg.com/chance/-/chance-1.1.8.tgz"; + sha1 = "5d6c2b78c9170bf6eb9df7acdda04363085be909"; + }; + } + { + name = "character_entities_html4___character_entities_html4_2.0.0.tgz"; path = fetchurl { - name = "chance___chance_1.1.7.tgz"; - url = "https://registry.yarnpkg.com/chance/-/chance-1.1.7.tgz"; - sha1 = "e99dde5ac16681af787b5ba94c8277c090d6cfe8"; + name = "character_entities_html4___character_entities_html4_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-2.0.0.tgz"; + sha1 = "55fcf3ed00febfe41f8f6a5709d25ab8ed73a449"; }; } { - name = "character_entities_legacy___character_entities_legacy_1.1.4.tgz"; + name = "character_entities_legacy___character_entities_legacy_2.0.0.tgz"; path = fetchurl { - name = "character_entities_legacy___character_entities_legacy_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz"; - sha1 = "94bc1845dce70a5bb9d2ecc748725661293d8fc1"; + name = "character_entities_legacy___character_entities_legacy_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-2.0.0.tgz"; + sha1 = "57f4d00974c696e8f74e9f493e7fcb75b44d7ee7"; }; } { - name = "character_entities___character_entities_1.2.4.tgz"; + name = "character_entities___character_entities_2.0.0.tgz"; path = fetchurl { - name = "character_entities___character_entities_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/character-entities/-/character-entities-1.2.4.tgz"; - sha1 = "e12c3939b7eaf4e5b15e7ad4c5e28e1d48c5b16b"; + name = "character_entities___character_entities_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/character-entities/-/character-entities-2.0.0.tgz"; + sha1 = "508355fcc8c73893e0909efc1a44d28da2b6fdf3"; }; } { - name = "character_reference_invalid___character_reference_invalid_1.1.4.tgz"; + name = "character_reference_invalid___character_reference_invalid_2.0.0.tgz"; path = fetchurl { - name = "character_reference_invalid___character_reference_invalid_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz"; - sha1 = "083329cda0eae272ab3dbbf37e9a382c13af1560"; + name = "character_reference_invalid___character_reference_invalid_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-2.0.0.tgz"; + sha1 = "a0bdeb89c051fe7ed5d3158b2f06af06984f2813"; }; } { @@ -2258,11 +2274,11 @@ }; } { - name = "chokidar___chokidar_3.5.1.tgz"; + name = "chokidar___chokidar_3.5.2.tgz"; path = fetchurl { - name = "chokidar___chokidar_3.5.1.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz"; - sha1 = "ee9ce7bbebd2b79f49f304799d5468e31e14e68a"; + name = "chokidar___chokidar_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz"; + sha1 = "dba3976fcadb016f66fd365021d91600d01c1e75"; }; } { @@ -2338,14 +2354,6 @@ }; } { - name = "clipboard___clipboard_2.0.8.tgz"; - path = fetchurl { - name = "clipboard___clipboard_2.0.8.tgz"; - url = "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.8.tgz"; - sha1 = "ffc6c103dd2967a83005f3f61976aa4655a4cdba"; - }; - } - { name = "cliui___cliui_7.0.4.tgz"; path = fetchurl { name = "cliui___cliui_7.0.4.tgz"; @@ -2370,22 +2378,6 @@ }; } { - name = "co___co_3.1.0.tgz"; - path = fetchurl { - name = "co___co_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/co/-/co-3.1.0.tgz"; - sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78"; - }; - } - { - name = "coa___coa_2.0.2.tgz"; - path = fetchurl { - name = "coa___coa_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz"; - sha1 = "43f6c21151b4ef2bf57187db0d73de229e3e7ec3"; - }; - } - { name = "code_point_at___code_point_at_1.1.0.tgz"; path = fetchurl { name = "code_point_at___code_point_at_1.1.0.tgz"; @@ -2450,11 +2442,11 @@ }; } { - name = "color_string___color_string_1.5.5.tgz"; + name = "color_string___color_string_1.6.0.tgz"; path = fetchurl { - name = "color_string___color_string_1.5.5.tgz"; - url = "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz"; - sha1 = "65474a8f0e7439625f3d27a6a19d89fc45223014"; + name = "color_string___color_string_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/color-string/-/color-string-1.6.0.tgz"; + sha1 = "c3915f61fe267672cb7e1e064c9d692219f6c312"; }; } { @@ -2466,19 +2458,19 @@ }; } { - name = "color___color_3.1.3.tgz"; + name = "colord___colord_2.7.0.tgz"; path = fetchurl { - name = "color___color_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz"; - sha1 = "ca67fb4e7b97d611dcde39eceed422067d91596e"; + name = "colord___colord_2.7.0.tgz"; + url = "https://registry.yarnpkg.com/colord/-/colord-2.7.0.tgz"; + sha1 = "706ea36fe0cd651b585eb142fe64b6480185270e"; }; } { - name = "colorette___colorette_1.2.2.tgz"; + name = "colorette___colorette_1.4.0.tgz"; path = fetchurl { - name = "colorette___colorette_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz"; - sha1 = "cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"; + name = "colorette___colorette_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz"; + sha1 = "5190fbb87276259a86ad700bff2c6d6faa3fca40"; }; } { @@ -2506,6 +2498,14 @@ }; } { + name = "comma_separated_tokens___comma_separated_tokens_2.0.2.tgz"; + path = fetchurl { + name = "comma_separated_tokens___comma_separated_tokens_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.2.tgz"; + sha1 = "d4c25abb679b7751c880be623c1179780fe1dd98"; + }; + } + { name = "commander___commander_2.20.3.tgz"; path = fetchurl { name = "commander___commander_2.20.3.tgz"; @@ -2570,11 +2570,11 @@ }; } { - name = "compress_commons___compress_commons_4.1.0.tgz"; + name = "compress_commons___compress_commons_4.1.1.tgz"; path = fetchurl { - name = "compress_commons___compress_commons_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.0.tgz"; - sha1 = "25ec7a4528852ccd1d441a7d4353cd0ece11371b"; + name = "compress_commons___compress_commons_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.1.tgz"; + sha1 = "df2a09a7ed17447642bad10a85cc9a19e5c42a7d"; }; } { @@ -2626,11 +2626,11 @@ }; } { - name = "connect_session_sequelize___connect_session_sequelize_7.1.1.tgz"; + name = "connect_session_sequelize___connect_session_sequelize_7.1.2.tgz"; path = fetchurl { - name = "connect_session_sequelize___connect_session_sequelize_7.1.1.tgz"; - url = "https://registry.yarnpkg.com/connect-session-sequelize/-/connect-session-sequelize-7.1.1.tgz"; - sha1 = "e96f33bb3f4560f286cc0e0aefec4f3d3c148fe5"; + name = "connect_session_sequelize___connect_session_sequelize_7.1.2.tgz"; + url = "https://registry.yarnpkg.com/connect-session-sequelize/-/connect-session-sequelize-7.1.2.tgz"; + sha1 = "03ae9a1bd2221526c63a66959b6ddd18599be2ac"; }; } { @@ -2658,14 +2658,6 @@ }; } { - name = "contains_path___contains_path_0.1.0.tgz"; - path = fetchurl { - name = "contains_path___contains_path_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz"; - sha1 = "fe8cf184ff6670b6baef01a9d4861a5cbec4120a"; - }; - } - { name = "content_disposition___content_disposition_0.5.3.tgz"; path = fetchurl { name = "content_disposition___content_disposition_0.5.3.tgz"; @@ -2682,11 +2674,11 @@ }; } { - name = "convert_source_map___convert_source_map_1.7.0.tgz"; + name = "convert_source_map___convert_source_map_1.8.0.tgz"; path = fetchurl { - name = "convert_source_map___convert_source_map_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz"; - sha1 = "17a2cb882d7f77d3490585e2ce6c524424a3a442"; + name = "convert_source_map___convert_source_map_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz"; + sha1 = "f3373c32d21b4d780dd8004514684fb791ca4369"; }; } { @@ -2778,11 +2770,11 @@ }; } { - name = "cosmiconfig___cosmiconfig_5.2.1.tgz"; + name = "core_util_is___core_util_is_1.0.3.tgz"; path = fetchurl { - name = "cosmiconfig___cosmiconfig_5.2.1.tgz"; - url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz"; - sha1 = "040f726809c591e77a17c0a3626ca45b4f168b1a"; + name = "core_util_is___core_util_is_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz"; + sha1 = "a6042d3634c2b27e9328f837b965fac83808db85"; }; } { @@ -2842,51 +2834,35 @@ }; } { - name = "css_b64_images___css_b64_images_0.2.5.tgz"; - path = fetchurl { - name = "css_b64_images___css_b64_images_0.2.5.tgz"; - url = "https://registry.yarnpkg.com/css-b64-images/-/css-b64-images-0.2.5.tgz"; - sha1 = "42005d83204b2b4a5d93b6b1a5644133b5927a02"; - }; - } - { - name = "css_color_names___css_color_names_0.0.4.tgz"; - path = fetchurl { - name = "css_color_names___css_color_names_0.0.4.tgz"; - url = "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz"; - sha1 = "808adc2e79cf84738069b646cb20ec27beb629e0"; - }; - } - { - name = "css_declaration_sorter___css_declaration_sorter_4.0.1.tgz"; + name = "css_color_names___css_color_names_1.0.1.tgz"; path = fetchurl { - name = "css_declaration_sorter___css_declaration_sorter_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz"; - sha1 = "c198940f63a76d7e36c1e71018b001721054cb22"; + name = "css_color_names___css_color_names_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/css-color-names/-/css-color-names-1.0.1.tgz"; + sha1 = "6ff7ee81a823ad46e020fa2fd6ab40a887e2ba67"; }; } { - name = "css_loader___css_loader_5.2.4.tgz"; + name = "css_declaration_sorter___css_declaration_sorter_6.1.3.tgz"; path = fetchurl { - name = "css_loader___css_loader_5.2.4.tgz"; - url = "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.4.tgz"; - sha1 = "e985dcbce339812cb6104ef3670f08f9893a1536"; + name = "css_declaration_sorter___css_declaration_sorter_6.1.3.tgz"; + url = "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.3.tgz"; + sha1 = "e9852e4cf940ba79f509d9425b137d1f94438dc2"; }; } { - name = "css_select_base_adapter___css_select_base_adapter_0.1.1.tgz"; + name = "css_loader___css_loader_5.2.7.tgz"; path = fetchurl { - name = "css_select_base_adapter___css_select_base_adapter_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz"; - sha1 = "3b2ff4972cc362ab88561507a95408a1432135d7"; + name = "css_loader___css_loader_5.2.7.tgz"; + url = "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.7.tgz"; + sha1 = "9b9f111edf6fb2be5dc62525644cbc9c232064ae"; }; } { - name = "css_select___css_select_2.1.0.tgz"; + name = "css_select___css_select_4.1.3.tgz"; path = fetchurl { - name = "css_select___css_select_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz"; - sha1 = "6a34653356635934a81baca68d0255432105dbef"; + name = "css_select___css_select_4.1.3.tgz"; + url = "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz"; + sha1 = "a70440f70317f2669118ad74ff105e65849c7067"; }; } { @@ -2898,14 +2874,6 @@ }; } { - name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; - path = fetchurl { - name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; - url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz"; - sha1 = "98bebd62c4c1d9f960ec340cf9f7522e30709a22"; - }; - } - { name = "css_tree___css_tree_1.1.3.tgz"; path = fetchurl { name = "css_tree___css_tree_1.1.3.tgz"; @@ -2922,11 +2890,11 @@ }; } { - name = "css_what___css_what_3.4.2.tgz"; + name = "css_what___css_what_5.0.1.tgz"; path = fetchurl { - name = "css_what___css_what_3.4.2.tgz"; - url = "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz"; - sha1 = "ea7026fcb01777edbde52124e21f327e7ae950e4"; + name = "css_what___css_what_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/css-what/-/css-what-5.0.1.tgz"; + sha1 = "3efa820131f4669a8ac2408f9c32e7c7de9f4cad"; }; } { @@ -2946,51 +2914,27 @@ }; } { - name = "cssnano_preset_default___cssnano_preset_default_4.0.8.tgz"; - path = fetchurl { - name = "cssnano_preset_default___cssnano_preset_default_4.0.8.tgz"; - url = "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz"; - sha1 = "920622b1fc1e95a34e8838203f1397a504f2d3ff"; - }; - } - { - name = "cssnano_util_get_arguments___cssnano_util_get_arguments_4.0.0.tgz"; - path = fetchurl { - name = "cssnano_util_get_arguments___cssnano_util_get_arguments_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz"; - sha1 = "ed3a08299f21d75741b20f3b81f194ed49cc150f"; - }; - } - { - name = "cssnano_util_get_match___cssnano_util_get_match_4.0.0.tgz"; + name = "cssnano_preset_default___cssnano_preset_default_5.1.4.tgz"; path = fetchurl { - name = "cssnano_util_get_match___cssnano_util_get_match_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz"; - sha1 = "c0e4ca07f5386bb17ec5e52250b4f5961365156d"; + name = "cssnano_preset_default___cssnano_preset_default_5.1.4.tgz"; + url = "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.4.tgz"; + sha1 = "359943bf00c5c8e05489f12dd25f3006f2c1cbd2"; }; } { - name = "cssnano_util_raw_cache___cssnano_util_raw_cache_4.0.1.tgz"; + name = "cssnano_utils___cssnano_utils_2.0.1.tgz"; path = fetchurl { - name = "cssnano_util_raw_cache___cssnano_util_raw_cache_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz"; - sha1 = "b26d5fd5f72a11dfe7a7846fb4c67260f96bf282"; + name = "cssnano_utils___cssnano_utils_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-2.0.1.tgz"; + sha1 = "8660aa2b37ed869d2e2f22918196a9a8b6498ce2"; }; } { - name = "cssnano_util_same_parent___cssnano_util_same_parent_4.0.1.tgz"; + name = "cssnano___cssnano_5.0.8.tgz"; path = fetchurl { - name = "cssnano_util_same_parent___cssnano_util_same_parent_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz"; - sha1 = "574082fb2859d2db433855835d9a8456ea18bbf3"; - }; - } - { - name = "cssnano___cssnano_4.1.11.tgz"; - path = fetchurl { - name = "cssnano___cssnano_4.1.11.tgz"; - url = "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.11.tgz"; - sha1 = "c7b5f5b81da269cb1fd982cb960c1200910c9a99"; + name = "cssnano___cssnano_5.0.8.tgz"; + url = "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.8.tgz"; + sha1 = "39ad166256980fcc64faa08c9bb18bb5789ecfa9"; }; } { @@ -3314,14 +3258,6 @@ }; } { - name = "date_utils___date_utils_1.2.21.tgz"; - path = fetchurl { - name = "date_utils___date_utils_1.2.21.tgz"; - url = "https://registry.yarnpkg.com/date-utils/-/date-utils-1.2.21.tgz"; - sha1 = "61fb16cdc1274b3c9acaaffe9fc69df8720a2b64"; - }; - } - { name = "debug___debug_2.6.9.tgz"; path = fetchurl { name = "debug___debug_2.6.9.tgz"; @@ -3354,6 +3290,14 @@ }; } { + name = "debug___debug_4.3.2.tgz"; + path = fetchurl { + name = "debug___debug_4.3.2.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; + sha1 = "f0a49c18ac8779e31d4a0c6029dfb76873c7428b"; + }; + } + { name = "debug___debug_4.1.1.tgz"; path = fetchurl { name = "debug___debug_4.1.1.tgz"; @@ -3402,11 +3346,11 @@ }; } { - name = "deep_is___deep_is_0.1.3.tgz"; + name = "deep_is___deep_is_0.1.4.tgz"; path = fetchurl { - name = "deep_is___deep_is_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; - sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + name = "deep_is___deep_is_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz"; + sha1 = "a6f2dce612fadd2ef1f519b73551f17e85199831"; }; } { @@ -3450,14 +3394,6 @@ }; } { - name = "delegate___delegate_3.2.0.tgz"; - path = fetchurl { - name = "delegate___delegate_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz"; - sha1 = "b66b71c3158522e8ab5744f720d8ca0c2af59166"; - }; - } - { name = "delegates___delegates_1.0.0.tgz"; path = fetchurl { name = "delegates___delegates_1.0.0.tgz"; @@ -3466,19 +3402,11 @@ }; } { - name = "denque___denque_1.5.0.tgz"; - path = fetchurl { - name = "denque___denque_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/denque/-/denque-1.5.0.tgz"; - sha1 = "773de0686ff2d8ec2ff92914316a47b73b1c73de"; - }; - } - { - name = "depd___depd_2.0.0.tgz"; + name = "denque___denque_1.5.1.tgz"; path = fetchurl { - name = "depd___depd_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz"; - sha1 = "b696163cc757560d09cf22cc8fad1571b79e76df"; + name = "denque___denque_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/denque/-/denque-1.5.1.tgz"; + sha1 = "07f670e29c9a78f8faecb2566a1e2c11929c5cbf"; }; } { @@ -3490,6 +3418,14 @@ }; } { + name = "depd___depd_2.0.0.tgz"; + path = fetchurl { + name = "depd___depd_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz"; + sha1 = "b696163cc757560d09cf22cc8fad1571b79e76df"; + }; + } + { name = "des.js___des.js_1.0.1.tgz"; path = fetchurl { name = "des.js___des.js_1.0.1.tgz"; @@ -3562,11 +3498,11 @@ }; } { - name = "doctrine___doctrine_1.5.0.tgz"; + name = "doctrine___doctrine_2.1.0.tgz"; path = fetchurl { - name = "doctrine___doctrine_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz"; - sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa"; + name = "doctrine___doctrine_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz"; + sha1 = "5cd01fc101621b42c4cd7f5d1a66243716d3f39d"; }; } { @@ -3594,6 +3530,14 @@ }; } { + name = "dom_serializer___dom_serializer_1.3.2.tgz"; + path = fetchurl { + name = "dom_serializer___dom_serializer_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz"; + sha1 = "6206437d32ceefaec7161803230c7a20bc1b4d91"; + }; + } + { name = "dom_serializer___dom_serializer_0.1.1.tgz"; path = fetchurl { name = "dom_serializer___dom_serializer_0.1.1.tgz"; @@ -3634,6 +3578,14 @@ }; } { + name = "domhandler___domhandler_4.2.2.tgz"; + path = fetchurl { + name = "domhandler___domhandler_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.2.tgz"; + sha1 = "e825d721d19a86b8c201a35264e226c678ee755f"; + }; + } + { name = "domino___domino_2.1.6.tgz"; path = fetchurl { name = "domino___domino_2.1.6.tgz"; @@ -3642,6 +3594,14 @@ }; } { + name = "dompurify___dompurify_2.3.1.tgz"; + path = fetchurl { + name = "dompurify___dompurify_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.1.tgz"; + sha1 = "a47059ca21fd1212d3c8f71fdea6943b8bfbdf6a"; + }; + } + { name = "domutils___domutils_1.5.1.tgz"; path = fetchurl { name = "domutils___domutils_1.5.1.tgz"; @@ -3658,19 +3618,19 @@ }; } { - name = "dot_case___dot_case_3.0.4.tgz"; + name = "domutils___domutils_2.8.0.tgz"; path = fetchurl { - name = "dot_case___dot_case_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz"; - sha1 = "9b2b670d00a431667a8a75ba29cd1b98809ce751"; + name = "domutils___domutils_2.8.0.tgz"; + url = "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz"; + sha1 = "4437def5db6e2d1f5d6ee859bd95ca7d02048135"; }; } { - name = "dot_prop___dot_prop_5.3.0.tgz"; + name = "dot_case___dot_case_3.0.4.tgz"; path = fetchurl { - name = "dot_prop___dot_prop_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz"; - sha1 = "90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"; + name = "dot_case___dot_case_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz"; + sha1 = "9b2b670d00a431667a8a75ba29cd1b98809ce751"; }; } { @@ -3698,14 +3658,6 @@ }; } { - name = "ecdsa_sig_formatter___ecdsa_sig_formatter_1.0.11.tgz"; - path = fetchurl { - name = "ecdsa_sig_formatter___ecdsa_sig_formatter_1.0.11.tgz"; - url = "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz"; - sha1 = "ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf"; - }; - } - { name = "ee_first___ee_first_1.1.1.tgz"; path = fetchurl { name = "ee_first___ee_first_1.1.1.tgz"; @@ -3722,11 +3674,11 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.727.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.836.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.727.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz"; - sha1 = "857e310ca00f0b75da4e1db6ff0e073cc4a91ddf"; + name = "electron_to_chromium___electron_to_chromium_1.3.836.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.836.tgz"; + sha1 = "823cb9c98f28c64c673920f1c90ea3826596eaf9"; }; } { @@ -3746,6 +3698,14 @@ }; } { + name = "emoji_regex___emoji_regex_9.2.2.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_9.2.2.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz"; + sha1 = "840c8803b0d8047f4ff0cf963176b32d4ef3ed72"; + }; + } + { name = "emojify.js___emojify.js_1.1.0.tgz"; path = fetchurl { name = "emojify.js___emojify.js_1.1.0.tgz"; @@ -3850,14 +3810,6 @@ }; } { - name = "entity_decode___entity_decode_2.0.2.tgz"; - path = fetchurl { - name = "entity_decode___entity_decode_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/entity-decode/-/entity-decode-2.0.2.tgz"; - sha1 = "e4f807e52c3294246e9347d1f2b02b07fd5f92e7"; - }; - } - { name = "envinfo___envinfo_7.8.1.tgz"; path = fetchurl { name = "envinfo___envinfo_7.8.1.tgz"; @@ -3882,11 +3834,11 @@ }; } { - name = "es_abstract___es_abstract_1.18.0.tgz"; + name = "es_abstract___es_abstract_1.18.6.tgz"; path = fetchurl { - name = "es_abstract___es_abstract_1.18.0.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz"; - sha1 = "ab80b359eecb7ede4c298000390bc5ac3ec7b5a4"; + name = "es_abstract___es_abstract_1.18.6.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.6.tgz"; + sha1 = "2c44e3ea7a6255039164d26559777a6d978cb456"; }; } { @@ -3914,19 +3866,19 @@ }; } { - name = "esbuild_loader___esbuild_loader_2.13.0.tgz"; + name = "esbuild_loader___esbuild_loader_2.15.1.tgz"; path = fetchurl { - name = "esbuild_loader___esbuild_loader_2.13.0.tgz"; - url = "https://registry.yarnpkg.com/esbuild-loader/-/esbuild-loader-2.13.0.tgz"; - sha1 = "f5a3602a89a3b728506ae3e1887304fffeef9270"; + name = "esbuild_loader___esbuild_loader_2.15.1.tgz"; + url = "https://registry.yarnpkg.com/esbuild-loader/-/esbuild-loader-2.15.1.tgz"; + sha1 = "5a3940f5d20317f1a35720efa33e933f97c923e9"; }; } { - name = "esbuild___esbuild_0.11.20.tgz"; + name = "esbuild___esbuild_0.12.27.tgz"; path = fetchurl { - name = "esbuild___esbuild_0.11.20.tgz"; - url = "https://registry.yarnpkg.com/esbuild/-/esbuild-0.11.20.tgz"; - sha1 = "7cefa1aee8b372c184e42457885f7ce5d3e62a1e"; + name = "esbuild___esbuild_0.12.27.tgz"; + url = "https://registry.yarnpkg.com/esbuild/-/esbuild-0.12.27.tgz"; + sha1 = "9bcfb837111c5e89b189188dde339515b213a724"; }; } { @@ -3962,27 +3914,27 @@ }; } { - name = "eslint_config_standard___eslint_config_standard_16.0.2.tgz"; + name = "eslint_config_standard___eslint_config_standard_16.0.3.tgz"; path = fetchurl { - name = "eslint_config_standard___eslint_config_standard_16.0.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.2.tgz"; - sha1 = "71e91727ac7a203782d0a5ca4d1c462d14e234f6"; + name = "eslint_config_standard___eslint_config_standard_16.0.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz"; + sha1 = "6c8761e544e96c531ff92642eeb87842b8488516"; }; } { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.6.tgz"; path = fetchurl { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz"; - sha1 = "85ffa81942c25012d8231096ddf679c03042c717"; + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.6.tgz"; + url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz"; + sha1 = "4048b958395da89668252001dbd9eca6b83bacbd"; }; } { - name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; + name = "eslint_module_utils___eslint_module_utils_2.6.2.tgz"; path = fetchurl { - name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz"; - sha1 = "579ebd094f56af7797d19c9866c9c9486629bfa6"; + name = "eslint_module_utils___eslint_module_utils_2.6.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.2.tgz"; + sha1 = "94e5540dd15fe1522e8ffa3ec8db3b7fa7e7a534"; }; } { @@ -3994,11 +3946,11 @@ }; } { - name = "eslint_plugin_import___eslint_plugin_import_2.22.1.tgz"; + name = "eslint_plugin_import___eslint_plugin_import_2.24.2.tgz"; path = fetchurl { - name = "eslint_plugin_import___eslint_plugin_import_2.22.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz"; - sha1 = "0896c7e6a0cf44109a2d97b95903c2bb689d7702"; + name = "eslint_plugin_import___eslint_plugin_import_2.24.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz"; + sha1 = "2c8cd2e341f3885918ee27d18479910ade7bb4da"; }; } { @@ -4066,11 +4018,11 @@ }; } { - name = "eslint___eslint_7.26.0.tgz"; + name = "eslint___eslint_7.32.0.tgz"; path = fetchurl { - name = "eslint___eslint_7.26.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.26.0.tgz"; - sha1 = "d416fdcdcb3236cd8f282065312813f8c13982f6"; + name = "eslint___eslint_7.32.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz"; + sha1 = "c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"; }; } { @@ -4178,11 +4130,11 @@ }; } { - name = "execa___execa_5.0.0.tgz"; + name = "execa___execa_5.1.1.tgz"; path = fetchurl { - name = "execa___execa_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/execa/-/execa-5.0.0.tgz"; - sha1 = "4029b0007998a841fbd1032e5f4de86a3c1e3376"; + name = "execa___execa_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz"; + sha1 = "f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"; }; } { @@ -4218,6 +4170,14 @@ }; } { + name = "exports_loader___exports_loader_1.1.1.tgz"; + path = fetchurl { + name = "exports_loader___exports_loader_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/exports-loader/-/exports-loader-1.1.1.tgz"; + sha1 = "88c9a6877ee6a5519d7c41a016bdd99148421e69"; + }; + } + { name = "expose_loader___expose_loader_1.0.3.tgz"; path = fetchurl { name = "expose_loader___expose_loader_1.0.3.tgz"; @@ -4226,11 +4186,11 @@ }; } { - name = "express_session___express_session_1.17.1.tgz"; + name = "express_session___express_session_1.17.2.tgz"; path = fetchurl { - name = "express_session___express_session_1.17.1.tgz"; - url = "https://registry.yarnpkg.com/express-session/-/express-session-1.17.1.tgz"; - sha1 = "36ecbc7034566d38c8509885c044d461c11bf357"; + name = "express_session___express_session_1.17.2.tgz"; + url = "https://registry.yarnpkg.com/express-session/-/express-session-1.17.2.tgz"; + sha1 = "397020374f9bf7997f891b85ea338767b30d0efd"; }; } { @@ -4314,11 +4274,11 @@ }; } { - name = "fast_glob___fast_glob_3.2.5.tgz"; + name = "fast_glob___fast_glob_3.2.7.tgz"; path = fetchurl { - name = "fast_glob___fast_glob_3.2.5.tgz"; - url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz"; - sha1 = "7939af2a656de79a4f1901903ee8adcaa7cb9661"; + name = "fast_glob___fast_glob_3.2.7.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz"; + sha1 = "fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"; }; } { @@ -4338,19 +4298,19 @@ }; } { - name = "fast_safe_stringify___fast_safe_stringify_2.0.7.tgz"; + name = "fast_safe_stringify___fast_safe_stringify_2.1.1.tgz"; path = fetchurl { - name = "fast_safe_stringify___fast_safe_stringify_2.0.7.tgz"; - url = "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz"; - sha1 = "124aa885899261f68aedb42a7c080de9da608743"; + name = "fast_safe_stringify___fast_safe_stringify_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz"; + sha1 = "c406a83b6e70d9e35ce3b30a81141df30aeba884"; }; } { - name = "fast_xml_parser___fast_xml_parser_3.19.0.tgz"; + name = "fast_xml_parser___fast_xml_parser_3.20.0.tgz"; path = fetchurl { - name = "fast_xml_parser___fast_xml_parser_3.19.0.tgz"; - url = "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.19.0.tgz"; - sha1 = "cb637ec3f3999f51406dd8ff0e6fc4d83e520d01"; + name = "fast_xml_parser___fast_xml_parser_3.20.0.tgz"; + url = "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.20.0.tgz"; + sha1 = "b9ce9ddbc44d2cb7e38f846c5929c667bbf0936d"; }; } { @@ -4362,19 +4322,19 @@ }; } { - name = "fastq___fastq_1.11.0.tgz"; + name = "fastq___fastq_1.13.0.tgz"; path = fetchurl { - name = "fastq___fastq_1.11.0.tgz"; - url = "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz"; - sha1 = "bb9fb955a07130a918eb63c1f5161cc32a5d0858"; + name = "fastq___fastq_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz"; + sha1 = "616760f88a7526bdfc596b7cab8c18938c36b98c"; }; } { - name = "fault___fault_1.0.4.tgz"; + name = "fault___fault_2.0.0.tgz"; path = fetchurl { - name = "fault___fault_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/fault/-/fault-1.0.4.tgz"; - sha1 = "eafcfc0a6d214fc94601e170df29954a4f842f13"; + name = "fault___fault_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/fault/-/fault-2.0.0.tgz"; + sha1 = "ad2198a6e28e344dcda76a7b32406b1039f0b707"; }; } { @@ -4394,14 +4354,6 @@ }; } { - name = "figures___figures_3.2.0.tgz"; - path = fetchurl { - name = "figures___figures_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz"; - sha1 = "625c18bd293c604dc4a8ddb2febf0c88341746af"; - }; - } - { name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; path = fetchurl { name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; @@ -4426,11 +4378,11 @@ }; } { - name = "file_type___file_type_16.4.0.tgz"; + name = "file_type___file_type_16.5.3.tgz"; path = fetchurl { - name = "file_type___file_type_16.4.0.tgz"; - url = "https://registry.yarnpkg.com/file-type/-/file-type-16.4.0.tgz"; - sha1 = "464197e44bd94a452d77b09085d977ae0dad2df4"; + name = "file_type___file_type_16.5.3.tgz"; + url = "https://registry.yarnpkg.com/file-type/-/file-type-16.5.3.tgz"; + sha1 = "474b7e88c74724046abb505e9b8ed4db30c4fc06"; }; } { @@ -4506,11 +4458,11 @@ }; } { - name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; + name = "find_cache_dir___find_cache_dir_3.3.2.tgz"; path = fetchurl { - name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz"; - sha1 = "89b33fad4a4670daa94f855f7fbe31d6d84fe880"; + name = "find_cache_dir___find_cache_dir_3.3.2.tgz"; + url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz"; + sha1 = "b30c5b6eff0730731aea9bbd9dbecbd80256d64b"; }; } { @@ -4562,11 +4514,11 @@ }; } { - name = "flatted___flatted_3.1.1.tgz"; + name = "flatted___flatted_3.2.2.tgz"; path = fetchurl { - name = "flatted___flatted_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz"; - sha1 = "c4b489e80096d9df1dfc97c79871aea7c617c469"; + name = "flatted___flatted_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz"; + sha1 = "64bfed5cb68fe3ca78b3eb214ad97b63bedce561"; }; } { @@ -4594,11 +4546,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.14.1.tgz"; + name = "follow_redirects___follow_redirects_1.14.3.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz"; - sha1 = "d9114ded0a1cfdd334e164e6662ad02bfd91ff43"; + name = "follow_redirects___follow_redirects_1.14.3.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.3.tgz"; + sha1 = "6ada78118d8d24caee595595accdc0ac6abd022e"; }; } { @@ -4634,11 +4586,11 @@ }; } { - name = "fork_awesome___fork_awesome_1.1.7.tgz"; + name = "fork_awesome___fork_awesome_1.2.0.tgz"; path = fetchurl { - name = "fork_awesome___fork_awesome_1.1.7.tgz"; - url = "https://registry.yarnpkg.com/fork-awesome/-/fork-awesome-1.1.7.tgz"; - sha1 = "1427da1cac3d1713046ee88427e5fcecb9501d21"; + name = "fork_awesome___fork_awesome_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/fork-awesome/-/fork-awesome-1.2.0.tgz"; + sha1 = "acd43f1e1f54510fa45209c31385b4fde3a95003"; }; } { @@ -4650,14 +4602,6 @@ }; } { - name = "form_data___form_data_2.5.1.tgz"; - path = fetchurl { - name = "form_data___form_data_2.5.1.tgz"; - url = "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz"; - sha1 = "f2cbec57b5e59e23716e128fe44d4e5dd23895f4"; - }; - } - { name = "form_data___form_data_2.3.3.tgz"; path = fetchurl { name = "form_data___form_data_2.3.3.tgz"; @@ -4690,11 +4634,11 @@ }; } { - name = "forwarded___forwarded_0.1.2.tgz"; + name = "forwarded___forwarded_0.2.0.tgz"; path = fetchurl { - name = "forwarded___forwarded_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz"; - sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; + name = "forwarded___forwarded_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz"; + sha1 = "2269936428aad4c15c7ebe9779a84bf0b2a81811"; }; } { @@ -4858,6 +4802,14 @@ }; } { + name = "get_symbol_description___get_symbol_description_1.0.0.tgz"; + path = fetchurl { + name = "get_symbol_description___get_symbol_description_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz"; + sha1 = "7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"; + }; + } + { name = "get_value___get_value_2.0.6.tgz"; path = fetchurl { name = "get_value___get_value_2.0.6.tgz"; @@ -4914,14 +4866,6 @@ }; } { - name = "glob___glob_7.1.6.tgz"; - path = fetchurl { - name = "glob___glob_7.1.6.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; - sha1 = "141f33b81a7c2492e125594307480c46679278a6"; - }; - } - { name = "glob___glob_7.1.7.tgz"; path = fetchurl { name = "glob___glob_7.1.7.tgz"; @@ -4930,19 +4874,11 @@ }; } { - name = "globals___globals_12.4.0.tgz"; - path = fetchurl { - name = "globals___globals_12.4.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz"; - sha1 = "a18813576a41b00a24a97e7f815918c2e19925f8"; - }; - } - { - name = "globals___globals_13.8.0.tgz"; + name = "globals___globals_13.11.0.tgz"; path = fetchurl { - name = "globals___globals_13.8.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz"; - sha1 = "3e20f504810ce87a8d72e55aecf8435b50f4c1b3"; + name = "globals___globals_13.11.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz"; + sha1 = "40ef678da117fe7bd2e28f1fab24951bd0255be7"; }; } { @@ -4954,27 +4890,19 @@ }; } { - name = "globby___globby_11.0.3.tgz"; - path = fetchurl { - name = "globby___globby_11.0.3.tgz"; - url = "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz"; - sha1 = "9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"; - }; - } - { - name = "good_listener___good_listener_1.2.2.tgz"; + name = "globby___globby_11.0.4.tgz"; path = fetchurl { - name = "good_listener___good_listener_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz"; - sha1 = "d53b30cdf9313dffb7dc9a0d477096aa6d145c50"; + name = "globby___globby_11.0.4.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz"; + sha1 = "2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"; }; } { - name = "graceful_fs___graceful_fs_4.2.6.tgz"; + name = "graceful_fs___graceful_fs_4.2.8.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.6.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz"; - sha1 = "ff040b2b0853b23c3d31027523706f1885d76bee"; + name = "graceful_fs___graceful_fs_4.2.8.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha1 = "e412b8d33f5e006593cbd3cee6df9f2cebbe802a"; }; } { @@ -4994,14 +4922,6 @@ }; } { - name = "handlebars___handlebars_4.7.7.tgz"; - path = fetchurl { - name = "handlebars___handlebars_4.7.7.tgz"; - url = "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz"; - sha1 = "9ce33416aad02dbd6c8fafa8240d5d98004945a1"; - }; - } - { name = "har_schema___har_schema_2.0.0.tgz"; path = fetchurl { name = "har_schema___har_schema_2.0.0.tgz"; @@ -5074,6 +4994,14 @@ }; } { + name = "has_flag___has_flag_5.0.1.tgz"; + path = fetchurl { + name = "has_flag___has_flag_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-5.0.1.tgz"; + sha1 = "5483db2ae02a472d1d0691462fc587d1843cd940"; + }; + } + { name = "has_symbols___has_symbols_1.0.2.tgz"; path = fetchurl { name = "has_symbols___has_symbols_1.0.2.tgz"; @@ -5082,6 +5010,14 @@ }; } { + name = "has_tostringtag___has_tostringtag_1.0.0.tgz"; + path = fetchurl { + name = "has_tostringtag___has_tostringtag_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; + sha1 = "7e133818a7d394734f941e73c3d3f9291e658b25"; + }; + } + { name = "has_unicode___has_unicode_2.0.1.tgz"; path = fetchurl { name = "has_unicode___has_unicode_2.0.1.tgz"; @@ -5146,6 +5082,54 @@ }; } { + name = "hast_util_from_parse5___hast_util_from_parse5_7.1.0.tgz"; + path = fetchurl { + name = "hast_util_from_parse5___hast_util_from_parse5_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/hast-util-from-parse5/-/hast-util-from-parse5-7.1.0.tgz"; + sha1 = "c129dd3a24dd8a867ab8a029ca47e27aa54864b7"; + }; + } + { + name = "hast_util_is_element___hast_util_is_element_2.1.1.tgz"; + path = fetchurl { + name = "hast_util_is_element___hast_util_is_element_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/hast-util-is-element/-/hast-util-is-element-2.1.1.tgz"; + sha1 = "863019a27400dc4f1aedfa4900627f42fd75c2b7"; + }; + } + { + name = "hast_util_parse_selector___hast_util_parse_selector_3.1.0.tgz"; + path = fetchurl { + name = "hast_util_parse_selector___hast_util_parse_selector_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-3.1.0.tgz"; + sha1 = "a519e27e8b61bd5a98fad494ed06131ce68d9c3f"; + }; + } + { + name = "hast_util_to_html___hast_util_to_html_8.0.2.tgz"; + path = fetchurl { + name = "hast_util_to_html___hast_util_to_html_8.0.2.tgz"; + url = "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-8.0.2.tgz"; + sha1 = "3445497508e2157a3169864eb43fb6ee929d3cbe"; + }; + } + { + name = "hast_util_whitespace___hast_util_whitespace_2.0.0.tgz"; + path = fetchurl { + name = "hast_util_whitespace___hast_util_whitespace_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-2.0.0.tgz"; + sha1 = "4fc1086467cc1ef5ba20673cb6b03cec3a970f1c"; + }; + } + { + name = "hastscript___hastscript_7.0.2.tgz"; + path = fetchurl { + name = "hastscript___hastscript_7.0.2.tgz"; + url = "https://registry.yarnpkg.com/hastscript/-/hastscript-7.0.2.tgz"; + sha1 = "d811fc040817d91923448a28156463b2e40d590a"; + }; + } + { name = "he___he_1.2.0.tgz"; path = fetchurl { name = "he___he_1.2.0.tgz"; @@ -5162,19 +5146,11 @@ }; } { - name = "hex_color_regex___hex_color_regex_1.1.0.tgz"; + name = "highlight.js___highlight.js_10.7.3.tgz"; path = fetchurl { - name = "hex_color_regex___hex_color_regex_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz"; - sha1 = "4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"; - }; - } - { - name = "highlight.js___highlight.js_10.7.2.tgz"; - path = fetchurl { - name = "highlight.js___highlight.js_10.7.2.tgz"; - url = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.2.tgz"; - sha1 = "89319b861edc66c48854ed1e6da21ea89f847360"; + name = "highlight.js___highlight.js_10.7.3.tgz"; + url = "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz"; + sha1 = "697272e3991356e40c3cac566a74eef681756531"; }; } { @@ -5202,22 +5178,6 @@ }; } { - name = "hsl_regex___hsl_regex_1.0.0.tgz"; - path = fetchurl { - name = "hsl_regex___hsl_regex_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz"; - sha1 = "d49330c789ed819e276a4c0d272dffa30b18fe6e"; - }; - } - { - name = "hsla_regex___hsla_regex_1.0.0.tgz"; - path = fetchurl { - name = "hsla_regex___hsla_regex_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz"; - sha1 = "c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"; - }; - } - { name = "html_minifier_terser___html_minifier_terser_5.1.1.tgz"; path = fetchurl { name = "html_minifier_terser___html_minifier_terser_5.1.1.tgz"; @@ -5226,11 +5186,11 @@ }; } { - name = "html_minifier___html_minifier_4.0.0.tgz"; + name = "html_void_elements___html_void_elements_2.0.0.tgz"; path = fetchurl { - name = "html_minifier___html_minifier_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/html-minifier/-/html-minifier-4.0.0.tgz"; - sha1 = "cca9aad8bce1175e02e17a8c33e46d8988889f56"; + name = "html_void_elements___html_void_elements_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-2.0.0.tgz"; + sha1 = "ea71bae0dd33de675cdda3c4ace1bc7584bb1071"; }; } { @@ -5250,6 +5210,14 @@ }; } { + name = "htmlparser2___htmlparser2_6.1.0.tgz"; + path = fetchurl { + name = "htmlparser2___htmlparser2_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz"; + sha1 = "c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"; + }; + } + { name = "http_errors___http_errors_1.7.2.tgz"; path = fetchurl { name = "http_errors___http_errors_1.7.2.tgz"; @@ -5306,19 +5274,11 @@ }; } { - name = "iconv_lite___iconv_lite_0.5.2.tgz"; - path = fetchurl { - name = "iconv_lite___iconv_lite_0.5.2.tgz"; - url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.5.2.tgz"; - sha1 = "af6d628dccfb463b7364d97f715e4b74b8c8c2b8"; - }; - } - { - name = "iconv_lite___iconv_lite_0.6.2.tgz"; + name = "iconv_lite___iconv_lite_0.6.3.tgz"; path = fetchurl { - name = "iconv_lite___iconv_lite_0.6.2.tgz"; - url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz"; - sha1 = "ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"; + name = "iconv_lite___iconv_lite_0.6.3.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz"; + sha1 = "a52f80bf38da1952eb5c681790719871a1a72501"; }; } { @@ -5386,14 +5346,6 @@ }; } { - name = "import_fresh___import_fresh_2.0.0.tgz"; - path = fetchurl { - name = "import_fresh___import_fresh_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz"; - sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; - }; - } - { name = "import_fresh___import_fresh_3.3.0.tgz"; path = fetchurl { name = "import_fresh___import_fresh_3.3.0.tgz"; @@ -5410,6 +5362,14 @@ }; } { + name = "import_meta_resolve___import_meta_resolve_1.1.1.tgz"; + path = fetchurl { + name = "import_meta_resolve___import_meta_resolve_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/import-meta-resolve/-/import-meta-resolve-1.1.1.tgz"; + sha1 = "244fd542fd1fae73550d4f8b3cde3bba1d7b2b18"; + }; + } + { name = "imports_loader___imports_loader_1.2.0.tgz"; path = fetchurl { name = "imports_loader___imports_loader_1.2.0.tgz"; @@ -5434,14 +5394,6 @@ }; } { - name = "indexes_of___indexes_of_1.0.1.tgz"; - path = fetchurl { - name = "indexes_of___indexes_of_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz"; - sha1 = "f30f716c8e2bd346c7b67d3df3915566a7c05607"; - }; - } - { name = "indexof___indexof_0.0.1.tgz"; path = fetchurl { name = "indexof___indexof_0.0.1.tgz"; @@ -5506,6 +5458,14 @@ }; } { + name = "internal_slot___internal_slot_1.0.3.tgz"; + path = fetchurl { + name = "internal_slot___internal_slot_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz"; + sha1 = "7347e307deeea2faac2ac6205d4bc7d34967f59c"; + }; + } + { name = "interpret___interpret_2.2.0.tgz"; path = fetchurl { name = "interpret___interpret_2.2.0.tgz"; @@ -5538,11 +5498,11 @@ }; } { - name = "is_absolute_url___is_absolute_url_2.1.0.tgz"; + name = "is_absolute_url___is_absolute_url_3.0.3.tgz"; path = fetchurl { - name = "is_absolute_url___is_absolute_url_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz"; - sha1 = "50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"; + name = "is_absolute_url___is_absolute_url_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz"; + sha1 = "96c6a22b6a23929b11ea0afb1836c36ad4a5d698"; }; } { @@ -5562,27 +5522,27 @@ }; } { - name = "is_alphabetical___is_alphabetical_1.0.4.tgz"; + name = "is_alphabetical___is_alphabetical_2.0.0.tgz"; path = fetchurl { - name = "is_alphabetical___is_alphabetical_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz"; - sha1 = "9e7d6b94916be22153745d184c298cbf986a686d"; + name = "is_alphabetical___is_alphabetical_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-2.0.0.tgz"; + sha1 = "ef6e2caea57c63450fffc7abb6cbdafc5eb96e96"; }; } { - name = "is_alphanumerical___is_alphanumerical_1.0.4.tgz"; + name = "is_alphanumerical___is_alphanumerical_2.0.0.tgz"; path = fetchurl { - name = "is_alphanumerical___is_alphanumerical_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz"; - sha1 = "7eb9a2431f855f6b1ef1a78e326df515696c4dbf"; + name = "is_alphanumerical___is_alphanumerical_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-2.0.0.tgz"; + sha1 = "0fbfeb6a72d21d91143b3d182bf6cf5909ee66f6"; }; } { - name = "is_arguments___is_arguments_1.1.0.tgz"; + name = "is_arguments___is_arguments_1.1.1.tgz"; path = fetchurl { - name = "is_arguments___is_arguments_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz"; - sha1 = "62353031dfbee07ceb34656a6bde59efecae8dd9"; + name = "is_arguments___is_arguments_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz"; + sha1 = "15b3f88fda01f2a97fec84ca761a560f123efa9b"; }; } { @@ -5602,11 +5562,11 @@ }; } { - name = "is_bigint___is_bigint_1.0.2.tgz"; + name = "is_bigint___is_bigint_1.0.4.tgz"; path = fetchurl { - name = "is_bigint___is_bigint_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz"; - sha1 = "ffb381442503235ad245ea89e45b3dbff040ee5a"; + name = "is_bigint___is_bigint_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz"; + sha1 = "08147a1875bc2b32005d41ccd8291dffc6691df3"; }; } { @@ -5634,11 +5594,11 @@ }; } { - name = "is_boolean_object___is_boolean_object_1.1.1.tgz"; + name = "is_boolean_object___is_boolean_object_1.1.2.tgz"; path = fetchurl { - name = "is_boolean_object___is_boolean_object_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz"; - sha1 = "3c0878f035cb821228d350d2e1e36719716a3de8"; + name = "is_boolean_object___is_boolean_object_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz"; + sha1 = "5c6dc200246dd9321ae4b885a114bb1f75f63719"; }; } { @@ -5658,27 +5618,19 @@ }; } { - name = "is_callable___is_callable_1.2.3.tgz"; - path = fetchurl { - name = "is_callable___is_callable_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz"; - sha1 = "8b1e0500b73a1d76c70487636f368e519de8db8e"; - }; - } - { - name = "is_color_stop___is_color_stop_1.1.0.tgz"; + name = "is_callable___is_callable_1.2.4.tgz"; path = fetchurl { - name = "is_color_stop___is_color_stop_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz"; - sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; + name = "is_callable___is_callable_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz"; + sha1 = "47301d58dd0259407865547853df6d61fe471945"; }; } { - name = "is_core_module___is_core_module_2.4.0.tgz"; + name = "is_core_module___is_core_module_2.6.0.tgz"; path = fetchurl { - name = "is_core_module___is_core_module_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz"; - sha1 = "8e9fc8e15027b011418026e98f0e6f4d86305cc1"; + name = "is_core_module___is_core_module_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz"; + sha1 = "d7553b2526fe59b92ba3e40c8df757ec8a709e19"; }; } { @@ -5698,19 +5650,19 @@ }; } { - name = "is_date_object___is_date_object_1.0.4.tgz"; + name = "is_date_object___is_date_object_1.0.5.tgz"; path = fetchurl { - name = "is_date_object___is_date_object_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz"; - sha1 = "550cfcc03afada05eea3dd30981c7b09551f73e5"; + name = "is_date_object___is_date_object_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz"; + sha1 = "0841d5536e724c25597bf6ea62e1bd38298df31f"; }; } { - name = "is_decimal___is_decimal_1.0.4.tgz"; + name = "is_decimal___is_decimal_2.0.0.tgz"; path = fetchurl { - name = "is_decimal___is_decimal_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-decimal/-/is-decimal-1.0.4.tgz"; - sha1 = "65a3a5958a1c5b63a706e1b333d7cd9f630d3fa5"; + name = "is_decimal___is_decimal_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-decimal/-/is-decimal-2.0.0.tgz"; + sha1 = "db1140337809fd043a056ae40a9bd1cdc563034c"; }; } { @@ -5730,14 +5682,6 @@ }; } { - name = "is_directory___is_directory_0.3.1.tgz"; - path = fetchurl { - name = "is_directory___is_directory_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz"; - sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; - }; - } - { name = "is_dotfile___is_dotfile_1.0.3.tgz"; path = fetchurl { name = "is_dotfile___is_dotfile_1.0.3.tgz"; @@ -5826,6 +5770,22 @@ }; } { + name = "is_fullwidth_code_point___is_fullwidth_code_point_4.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz"; + sha1 = "fae3167c729e7463f8461ce512b080a49268aa88"; + }; + } + { + name = "is_generator_function___is_generator_function_1.0.10.tgz"; + path = fetchurl { + name = "is_generator_function___is_generator_function_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz"; + sha1 = "f1558baf1ac17e0deea7c0415c438351ff2b3c72"; + }; + } + { name = "is_glob___is_glob_2.0.1.tgz"; path = fetchurl { name = "is_glob___is_glob_2.0.1.tgz"; @@ -5850,11 +5810,11 @@ }; } { - name = "is_hexadecimal___is_hexadecimal_1.0.4.tgz"; + name = "is_hexadecimal___is_hexadecimal_2.0.0.tgz"; path = fetchurl { - name = "is_hexadecimal___is_hexadecimal_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz"; - sha1 = "cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"; + name = "is_hexadecimal___is_hexadecimal_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-2.0.0.tgz"; + sha1 = "8e1ec9f48fe3eabd90161109856a23e0907a65d5"; }; } { @@ -5874,11 +5834,11 @@ }; } { - name = "is_number_object___is_number_object_1.0.5.tgz"; + name = "is_number_object___is_number_object_1.0.6.tgz"; path = fetchurl { - name = "is_number_object___is_number_object_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz"; - sha1 = "6edfaeed7950cff19afedce9fbfca9ee6dd289eb"; + name = "is_number_object___is_number_object_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz"; + sha1 = "6a7aaf838c7f0686a50b4553f7e54a96494e89f0"; }; } { @@ -5914,14 +5874,6 @@ }; } { - name = "is_obj___is_obj_2.0.0.tgz"; - path = fetchurl { - name = "is_obj___is_obj_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; - sha1 = "473fb05d973705e3fd9620545018ca8e22ef4982"; - }; - } - { name = "is_plain_obj___is_plain_obj_2.1.0.tgz"; path = fetchurl { name = "is_plain_obj___is_plain_obj_2.1.0.tgz"; @@ -5930,6 +5882,14 @@ }; } { + name = "is_plain_obj___is_plain_obj_4.0.0.tgz"; + path = fetchurl { + name = "is_plain_obj___is_plain_obj_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.0.0.tgz"; + sha1 = "06c0999fd7574edf5a906ba5644ad0feb3a84d22"; + }; + } + { name = "is_plain_object___is_plain_object_2.0.4.tgz"; path = fetchurl { name = "is_plain_object___is_plain_object_2.0.4.tgz"; @@ -5962,11 +5922,11 @@ }; } { - name = "is_regex___is_regex_1.1.3.tgz"; + name = "is_regex___is_regex_1.1.4.tgz"; path = fetchurl { - name = "is_regex___is_regex_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz"; - sha1 = "d029f9aff6448b93ebbe3f33dac71511fdcbef9f"; + name = "is_regex___is_regex_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz"; + sha1 = "eef5663cd59fa4c0ae339505323df6854bb15958"; }; } { @@ -5986,19 +5946,19 @@ }; } { - name = "is_stream___is_stream_2.0.0.tgz"; + name = "is_stream___is_stream_2.0.1.tgz"; path = fetchurl { - name = "is_stream___is_stream_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz"; - sha1 = "bde9c32680d6fae04129d6ac9d921ce7815f78e3"; + name = "is_stream___is_stream_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz"; + sha1 = "fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"; }; } { - name = "is_string___is_string_1.0.6.tgz"; + name = "is_string___is_string_1.0.7.tgz"; path = fetchurl { - name = "is_string___is_string_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz"; - sha1 = "3fe5d5992fb0d93404f32584d4b0179a71b54a5f"; + name = "is_string___is_string_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz"; + sha1 = "0dd12bf2006f255bb58f695110eff7491eebc0fd"; }; } { @@ -6018,11 +5978,11 @@ }; } { - name = "is_typed_array___is_typed_array_1.1.5.tgz"; + name = "is_typed_array___is_typed_array_1.1.8.tgz"; path = fetchurl { - name = "is_typed_array___is_typed_array_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.5.tgz"; - sha1 = "f32e6e096455e329eb7b423862456aa213f0eb4e"; + name = "is_typed_array___is_typed_array_1.1.8.tgz"; + url = "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.8.tgz"; + sha1 = "cbaa6585dc7db43318bc5b89523ea384a6f65e79"; }; } { @@ -6034,6 +5994,14 @@ }; } { + name = "is_unicode_supported___is_unicode_supported_0.1.0.tgz"; + path = fetchurl { + name = "is_unicode_supported___is_unicode_supported_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"; + sha1 = "3f26c76a809593b52bfa2ecb5710ed2779b522a7"; + }; + } + { name = "is_weakmap___is_weakmap_2.0.1.tgz"; path = fetchurl { name = "is_weakmap___is_weakmap_2.0.1.tgz"; @@ -6186,11 +6154,11 @@ }; } { - name = "js_cookie___js_cookie_2.2.1.tgz"; + name = "js_cookie___js_cookie_3.0.1.tgz"; path = fetchurl { - name = "js_cookie___js_cookie_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz"; - sha1 = "69e106dc5d5806894562902aa5baec3744e9b2b8"; + name = "js_cookie___js_cookie_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.1.tgz"; + sha1 = "9e39b4c6c2f56563708d7d31f6f5f21873a92414"; }; } { @@ -6200,7 +6168,7 @@ repo = fetchgit { url = "https://github.com/hedgedoc/js-sequence-diagrams.git"; rev = "bda0e49b6c2754f3c7158b1dfb9ccf26efc24b39"; - sha256 = "0d2zf62fmad760rg9hrkyhp03k5apms3fm0mf64yy8q6p3iw7jvw"; + sha256 = "0rl29jmhv7vhadzb6d08hi9g64227r9j10fh3d0lbgxinrib5gma"; }; in runCommand "js-sequence-diagrams.git" { buildInputs = [gnutar]; } '' @@ -6234,14 +6202,6 @@ }; } { - name = "js_yaml___js_yaml_4.0.0.tgz"; - path = fetchurl { - name = "js_yaml___js_yaml_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz"; - sha1 = "f426bc0ff4b4051926cd588c71113183409a121f"; - }; - } - { name = "js_yaml___js_yaml_4.1.0.tgz"; path = fetchurl { name = "js_yaml___js_yaml_4.1.0.tgz"; @@ -6250,14 +6210,6 @@ }; } { - name = "jsbi___jsbi_3.1.4.tgz"; - path = fetchurl { - name = "jsbi___jsbi_3.1.4.tgz"; - url = "https://registry.yarnpkg.com/jsbi/-/jsbi-3.1.4.tgz"; - sha1 = "9654dd02207a66a4911b4e4bb74265bc2cbc9dd0"; - }; - } - { name = "jsbn___jsbn_0.1.1.tgz"; path = fetchurl { name = "jsbn___jsbn_0.1.1.tgz"; @@ -6410,22 +6362,6 @@ }; } { - name = "jwa___jwa_1.4.1.tgz"; - path = fetchurl { - name = "jwa___jwa_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz"; - sha1 = "743c32985cb9e98655530d53641b66c8645b039a"; - }; - } - { - name = "jws___jws_3.2.2.tgz"; - path = fetchurl { - name = "jws___jws_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz"; - sha1 = "001099f3639468c9414000e99995fa52fb478304"; - }; - } - { name = "keymaster___keymaster_1.6.2.tgz"; path = fetchurl { name = "keymaster___keymaster_1.6.2.tgz"; @@ -6522,11 +6458,11 @@ }; } { - name = "ldapjs___ldapjs_2.2.4.tgz"; + name = "ldapjs___ldapjs_2.3.1.tgz"; path = fetchurl { - name = "ldapjs___ldapjs_2.2.4.tgz"; - url = "https://registry.yarnpkg.com/ldapjs/-/ldapjs-2.2.4.tgz"; - sha1 = "d4e3f4ae2277b6e760a83ebd61f7f5c4097c446b"; + name = "ldapjs___ldapjs_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/ldapjs/-/ldapjs-2.3.1.tgz"; + sha1 = "04136815fb1f21d692ac87fab5961a04d86e8b04"; }; } { @@ -6562,6 +6498,14 @@ }; } { + name = "lilconfig___lilconfig_2.0.3.tgz"; + path = fetchurl { + name = "lilconfig___lilconfig_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.3.tgz"; + sha1 = "68f3005e921dafbd2a2afb48379986aa6d2579fd"; + }; + } + { name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; path = fetchurl { name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; @@ -6586,19 +6530,19 @@ }; } { - name = "load_json_file___load_json_file_2.0.0.tgz"; + name = "load_json_file___load_json_file_4.0.0.tgz"; path = fetchurl { - name = "load_json_file___load_json_file_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz"; - sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; + name = "load_json_file___load_json_file_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz"; + sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; }; } { - name = "load_plugin___load_plugin_3.0.0.tgz"; + name = "load_plugin___load_plugin_4.0.1.tgz"; path = fetchurl { - name = "load_plugin___load_plugin_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/load-plugin/-/load-plugin-3.0.0.tgz"; - sha1 = "8f3ce57cf4e5111639911012487bc1c2ba3d0e6c"; + name = "load_plugin___load_plugin_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/load-plugin/-/load-plugin-4.0.1.tgz"; + sha1 = "9a239b0337064c9b8aac82b0c9f89b067db487c5"; }; } { @@ -6826,11 +6770,11 @@ }; } { - name = "log_symbols___log_symbols_4.0.0.tgz"; + name = "log_symbols___log_symbols_4.1.0.tgz"; path = fetchurl { - name = "log_symbols___log_symbols_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz"; - sha1 = "69b3cc46d20f448eccdb75ea1fa733d9e821c920"; + name = "log_symbols___log_symbols_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz"; + sha1 = "3fbdbb95b4683ac9fc785111e792e558d4abd503"; }; } { @@ -6850,11 +6794,11 @@ }; } { - name = "longest_streak___longest_streak_2.0.4.tgz"; + name = "longest_streak___longest_streak_3.0.0.tgz"; path = fetchurl { - name = "longest_streak___longest_streak_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/longest-streak/-/longest-streak-2.0.4.tgz"; - sha1 = "b8599957da5b5dab64dee3fe316fa774597d90e4"; + name = "longest_streak___longest_streak_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/longest-streak/-/longest-streak-3.0.0.tgz"; + sha1 = "f127e2bded83caa6a35ac5f7a2f2b2f94b36f3dc"; }; } { @@ -6866,14 +6810,6 @@ }; } { - name = "lower_case___lower_case_1.1.4.tgz"; - path = fetchurl { - name = "lower_case___lower_case_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz"; - sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"; - }; - } - { name = "lower_case___lower_case_2.0.2.tgz"; path = fetchurl { name = "lower_case___lower_case_2.0.2.tgz"; @@ -6986,19 +6922,11 @@ }; } { - name = "mariadb___mariadb_2.5.3.tgz"; - path = fetchurl { - name = "mariadb___mariadb_2.5.3.tgz"; - url = "https://registry.yarnpkg.com/mariadb/-/mariadb-2.5.3.tgz"; - sha1 = "13a2267f7f1b572f9db997aaaa8c00f75d5a87e8"; - }; - } - { - name = "markdown_extensions___markdown_extensions_1.1.1.tgz"; + name = "mariadb___mariadb_2.5.4.tgz"; path = fetchurl { - name = "markdown_extensions___markdown_extensions_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/markdown-extensions/-/markdown-extensions-1.1.1.tgz"; - sha1 = "fea03b539faeaee9b4ef02a3769b455b189f7fc3"; + name = "mariadb___mariadb_2.5.4.tgz"; + url = "https://registry.yarnpkg.com/mariadb/-/mariadb-2.5.4.tgz"; + sha1 = "c66daa35e2768b8c714c758453531c06ae4927f4"; }; } { @@ -7034,11 +6962,11 @@ }; } { - name = "markdown_it_footnote___markdown_it_footnote_3.0.2.tgz"; + name = "markdown_it_footnote___markdown_it_footnote_3.0.3.tgz"; path = fetchurl { - name = "markdown_it_footnote___markdown_it_footnote_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/markdown-it-footnote/-/markdown-it-footnote-3.0.2.tgz"; - sha1 = "1575ee7a093648d4e096aa33386b058d92ac8bc1"; + name = "markdown_it_footnote___markdown_it_footnote_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/markdown-it-footnote/-/markdown-it-footnote-3.0.3.tgz"; + sha1 = "e0e4c0d67390a4c5f0c75f73be605c7c190ca4d8"; }; } { @@ -7098,19 +7026,19 @@ }; } { - name = "markdown_it___markdown_it_12.0.6.tgz"; + name = "markdown_it___markdown_it_12.2.0.tgz"; path = fetchurl { - name = "markdown_it___markdown_it_12.0.6.tgz"; - url = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.0.6.tgz"; - sha1 = "adcc8e5fe020af292ccbdf161fe84f1961516138"; + name = "markdown_it___markdown_it_12.2.0.tgz"; + url = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.2.0.tgz"; + sha1 = "091f720fd5db206f80de7a8d1f1a7035fd0d38db"; }; } { - name = "marked___marked_2.0.3.tgz"; + name = "marked___marked_2.1.3.tgz"; path = fetchurl { - name = "marked___marked_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/marked/-/marked-2.0.3.tgz"; - sha1 = "3551c4958c4da36897bda2a16812ef1399c8d6b0"; + name = "marked___marked_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/marked/-/marked-2.1.3.tgz"; + sha1 = "bd017cef6431724fd4b27e0657f5ceb14bff3753"; }; } { @@ -7162,51 +7090,43 @@ }; } { - name = "mdast_comment_marker___mdast_comment_marker_1.1.2.tgz"; - path = fetchurl { - name = "mdast_comment_marker___mdast_comment_marker_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/mdast-comment-marker/-/mdast-comment-marker-1.1.2.tgz"; - sha1 = "5ad2e42cfcc41b92a10c1421a98c288d7b447a6d"; - }; - } - { - name = "mdast_util_from_markdown___mdast_util_from_markdown_0.8.5.tgz"; + name = "mdast_comment_marker___mdast_comment_marker_2.0.0.tgz"; path = fetchurl { - name = "mdast_util_from_markdown___mdast_util_from_markdown_0.8.5.tgz"; - url = "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz"; - sha1 = "d1ef2ca42bc377ecb0463a987910dae89bd9a28c"; + name = "mdast_comment_marker___mdast_comment_marker_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/mdast-comment-marker/-/mdast-comment-marker-2.0.0.tgz"; + sha1 = "1b97b8c01fc1ad0a213940e9dc50e787db349907"; }; } { - name = "mdast_util_heading_style___mdast_util_heading_style_1.0.6.tgz"; + name = "mdast_util_from_markdown___mdast_util_from_markdown_1.0.0.tgz"; path = fetchurl { - name = "mdast_util_heading_style___mdast_util_heading_style_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/mdast-util-heading-style/-/mdast-util-heading-style-1.0.6.tgz"; - sha1 = "6410418926fd5673d40f519406b35d17da10e3c5"; + name = "mdast_util_from_markdown___mdast_util_from_markdown_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-1.0.0.tgz"; + sha1 = "c517313cd999ec2b8f6d447b438c5a9d500b89c9"; }; } { - name = "mdast_util_to_markdown___mdast_util_to_markdown_0.6.5.tgz"; + name = "mdast_util_heading_style___mdast_util_heading_style_2.0.0.tgz"; path = fetchurl { - name = "mdast_util_to_markdown___mdast_util_to_markdown_0.6.5.tgz"; - url = "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz"; - sha1 = "b33f67ca820d69e6cc527a93d4039249b504bebe"; + name = "mdast_util_heading_style___mdast_util_heading_style_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-heading-style/-/mdast-util-heading-style-2.0.0.tgz"; + sha1 = "19bcc14d96b4a6f24efbe1318409bd34af64bb7f"; }; } { - name = "mdast_util_to_string___mdast_util_to_string_1.1.0.tgz"; + name = "mdast_util_to_markdown___mdast_util_to_markdown_1.2.1.tgz"; path = fetchurl { - name = "mdast_util_to_string___mdast_util_to_string_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz"; - sha1 = "27055500103f51637bd07d01da01eb1967a43527"; + name = "mdast_util_to_markdown___mdast_util_to_markdown_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-1.2.1.tgz"; + sha1 = "33e93c2409f8c1be17b832f90978e29830af5435"; }; } { - name = "mdast_util_to_string___mdast_util_to_string_2.0.0.tgz"; + name = "mdast_util_to_string___mdast_util_to_string_3.1.0.tgz"; path = fetchurl { - name = "mdast_util_to_string___mdast_util_to_string_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz"; - sha1 = "b8cfe6a713e1091cb5b728fc48885a4767f8b97b"; + name = "mdast_util_to_string___mdast_util_to_string_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz"; + sha1 = "56c506d065fbf769515235e577b5a261552d56e9"; }; } { @@ -7218,14 +7138,6 @@ }; } { - name = "mdn_data___mdn_data_2.0.4.tgz"; - path = fetchurl { - name = "mdn_data___mdn_data_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz"; - sha1 = "699b3c38ac6f1d728091a64650b65d388502fd5b"; - }; - } - { name = "mdurl___mdurl_1.0.1.tgz"; path = fetchurl { name = "mdurl___mdurl_1.0.1.tgz"; @@ -7282,11 +7194,11 @@ }; } { - name = "mermaid___mermaid_8.10.1.tgz"; + name = "mermaid___mermaid_8.12.1.tgz"; path = fetchurl { - name = "mermaid___mermaid_8.10.1.tgz"; - url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.10.1.tgz"; - sha1 = "9573f702024e2173f4aa07d9b207d750507cf838"; + name = "mermaid___mermaid_8.12.1.tgz"; + url = "https://registry.yarnpkg.com/mermaid/-/mermaid-8.12.1.tgz"; + sha1 = "6b55617bcfc970a7bf724e027368b281feb62539"; }; } { @@ -7319,8 +7231,8 @@ let repo = fetchgit { url = "https://github.com/hedgedoc/meta-marked"; - rev = "3002adae670a6de0a845f3da7a7223d458c20d76"; - sha256 = "1rgmap95akwf9z72msxpqcfy95h8pqz9c8vn9xvvibfb5jf46lv0"; + rev = "6b3653c53a1727f697d0719626c55037b2f03753"; + sha256 = "0yh3hyx2h57lnfs2wcyj90qw0vrm57adf2fks9q5hjr5zgqy9sfw"; }; in runCommand "meta-marked" { buildInputs = [gnutar]; } '' @@ -7346,11 +7258,163 @@ }; } { - name = "micromark___micromark_2.11.4.tgz"; + name = "micromark_core_commonmark___micromark_core_commonmark_1.0.1.tgz"; + path = fetchurl { + name = "micromark_core_commonmark___micromark_core_commonmark_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/micromark-core-commonmark/-/micromark-core-commonmark-1.0.1.tgz"; + sha1 = "a64987cafe872e8b80bc8f2352a5d988586ac4f1"; + }; + } + { + name = "micromark_factory_destination___micromark_factory_destination_1.0.0.tgz"; + path = fetchurl { + name = "micromark_factory_destination___micromark_factory_destination_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-factory-destination/-/micromark-factory-destination-1.0.0.tgz"; + sha1 = "fef1cb59ad4997c496f887b6977aa3034a5a277e"; + }; + } + { + name = "micromark_factory_label___micromark_factory_label_1.0.0.tgz"; + path = fetchurl { + name = "micromark_factory_label___micromark_factory_label_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-factory-label/-/micromark-factory-label-1.0.0.tgz"; + sha1 = "b316ec479b474232973ff13b49b576f84a6f2cbb"; + }; + } + { + name = "micromark_factory_space___micromark_factory_space_1.0.0.tgz"; + path = fetchurl { + name = "micromark_factory_space___micromark_factory_space_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-factory-space/-/micromark-factory-space-1.0.0.tgz"; + sha1 = "cebff49968f2b9616c0fcb239e96685cb9497633"; + }; + } + { + name = "micromark_factory_title___micromark_factory_title_1.0.0.tgz"; + path = fetchurl { + name = "micromark_factory_title___micromark_factory_title_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-factory-title/-/micromark-factory-title-1.0.0.tgz"; + sha1 = "708f7a8044f34a898c0efdb4f55e4da66b537273"; + }; + } + { + name = "micromark_factory_whitespace___micromark_factory_whitespace_1.0.0.tgz"; + path = fetchurl { + name = "micromark_factory_whitespace___micromark_factory_whitespace_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-factory-whitespace/-/micromark-factory-whitespace-1.0.0.tgz"; + sha1 = "e991e043ad376c1ba52f4e49858ce0794678621c"; + }; + } + { + name = "micromark_util_character___micromark_util_character_1.1.0.tgz"; + path = fetchurl { + name = "micromark_util_character___micromark_util_character_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-character/-/micromark-util-character-1.1.0.tgz"; + sha1 = "d97c54d5742a0d9611a68ca0cd4124331f264d86"; + }; + } + { + name = "micromark_util_chunked___micromark_util_chunked_1.0.0.tgz"; + path = fetchurl { + name = "micromark_util_chunked___micromark_util_chunked_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-chunked/-/micromark-util-chunked-1.0.0.tgz"; + sha1 = "5b40d83f3d53b84c4c6bce30ed4257e9a4c79d06"; + }; + } + { + name = "micromark_util_classify_character___micromark_util_classify_character_1.0.0.tgz"; + path = fetchurl { + name = "micromark_util_classify_character___micromark_util_classify_character_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-classify-character/-/micromark-util-classify-character-1.0.0.tgz"; + sha1 = "cbd7b447cb79ee6997dd274a46fc4eb806460a20"; + }; + } + { + name = "micromark_util_combine_extensions___micromark_util_combine_extensions_1.0.0.tgz"; + path = fetchurl { + name = "micromark_util_combine_extensions___micromark_util_combine_extensions_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.0.0.tgz"; + sha1 = "91418e1e74fb893e3628b8d496085639124ff3d5"; + }; + } + { + name = "micromark_util_decode_numeric_character_reference___micromark_util_decode_numeric_character_reference_1.0.0.tgz"; + path = fetchurl { + name = "micromark_util_decode_numeric_character_reference___micromark_util_decode_numeric_character_reference_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.0.0.tgz"; + sha1 = "dcc85f13b5bd93ff8d2868c3dba28039d490b946"; + }; + } + { + name = "micromark_util_encode___micromark_util_encode_1.0.0.tgz"; + path = fetchurl { + name = "micromark_util_encode___micromark_util_encode_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-encode/-/micromark-util-encode-1.0.0.tgz"; + sha1 = "c409ecf751a28aa9564b599db35640fccec4c068"; + }; + } + { + name = "micromark_util_html_tag_name___micromark_util_html_tag_name_1.0.0.tgz"; + path = fetchurl { + name = "micromark_util_html_tag_name___micromark_util_html_tag_name_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.0.0.tgz"; + sha1 = "75737e92fef50af0c6212bd309bc5cb8dbd489ed"; + }; + } + { + name = "micromark_util_normalize_identifier___micromark_util_normalize_identifier_1.0.0.tgz"; + path = fetchurl { + name = "micromark_util_normalize_identifier___micromark_util_normalize_identifier_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.0.0.tgz"; + sha1 = "4a3539cb8db954bbec5203952bfe8cedadae7828"; + }; + } + { + name = "micromark_util_resolve_all___micromark_util_resolve_all_1.0.0.tgz"; + path = fetchurl { + name = "micromark_util_resolve_all___micromark_util_resolve_all_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-resolve-all/-/micromark-util-resolve-all-1.0.0.tgz"; + sha1 = "a7c363f49a0162e931960c44f3127ab58f031d88"; + }; + } + { + name = "micromark_util_sanitize_uri___micromark_util_sanitize_uri_1.0.0.tgz"; + path = fetchurl { + name = "micromark_util_sanitize_uri___micromark_util_sanitize_uri_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.0.0.tgz"; + sha1 = "27dc875397cd15102274c6c6da5585d34d4f12b2"; + }; + } + { + name = "micromark_util_subtokenize___micromark_util_subtokenize_1.0.0.tgz"; + path = fetchurl { + name = "micromark_util_subtokenize___micromark_util_subtokenize_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-subtokenize/-/micromark-util-subtokenize-1.0.0.tgz"; + sha1 = "6f006fa719af92776c75a264daaede0fb3943c6a"; + }; + } + { + name = "micromark_util_symbol___micromark_util_symbol_1.0.0.tgz"; + path = fetchurl { + name = "micromark_util_symbol___micromark_util_symbol_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-symbol/-/micromark-util-symbol-1.0.0.tgz"; + sha1 = "91cdbcc9b2a827c0129a177d36241bcd3ccaa34d"; + }; + } + { + name = "micromark_util_types___micromark_util_types_1.0.1.tgz"; path = fetchurl { - name = "micromark___micromark_2.11.4.tgz"; - url = "https://registry.yarnpkg.com/micromark/-/micromark-2.11.4.tgz"; - sha1 = "d13436138eea826383e822449c9a5c50ee44665a"; + name = "micromark_util_types___micromark_util_types_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/micromark-util-types/-/micromark-util-types-1.0.1.tgz"; + sha1 = "8bb8a092d93d326bd29fe29602799f2d0d922fd4"; + }; + } + { + name = "micromark___micromark_3.0.5.tgz"; + path = fetchurl { + name = "micromark___micromark_3.0.5.tgz"; + url = "https://registry.yarnpkg.com/micromark/-/micromark-3.0.5.tgz"; + sha1 = "d24792c8a06f201d5608c106dbfadef34c299684"; }; } { @@ -7378,6 +7442,22 @@ }; } { + name = "MIDI.js.git"; + path = + let + repo = fetchgit { + url = "https://github.com/paulrosen/MIDI.js.git"; + rev = "e593ffef81a0350f99448e3ab8111957145ff6b2"; + sha256 = "0vhb1harjvr6vzbqwqdhrfc9r3nk3lpl2srm895r977fq3ngkc2a"; + }; + in + runCommand "MIDI.js.git" { buildInputs = [gnutar]; } '' + # Set u+w because tar-fs can't unpack archives with read-only dirs + # https://github.com/mafintosh/tar-fs/issues/79 + tar cf $out --mode u+w -C ${repo} . + ''; + } + { name = "miller_rabin___miller_rabin_4.0.1.tgz"; path = fetchurl { name = "miller_rabin___miller_rabin_4.0.1.tgz"; @@ -7386,19 +7466,19 @@ }; } { - name = "mime_db___mime_db_1.47.0.tgz"; + name = "mime_db___mime_db_1.49.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.47.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz"; - sha1 = "8cb313e59965d3c05cfbf898915a267af46a335c"; + name = "mime_db___mime_db_1.49.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz"; + sha1 = "f3dfde60c99e9cf3bc9701d687778f537001cbed"; }; } { - name = "mime_types___mime_types_2.1.30.tgz"; + name = "mime_types___mime_types_2.1.32.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.30.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz"; - sha1 = "6e7be8b4c479825f85ed6326695db73f9305d62d"; + name = "mime_types___mime_types_2.1.32.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz"; + sha1 = "1d00e89e7de7fe02008db61001d9e02852670fd5"; }; } { @@ -7426,19 +7506,11 @@ }; } { - name = "mini_css_extract_plugin___mini_css_extract_plugin_1.6.0.tgz"; + name = "mini_css_extract_plugin___mini_css_extract_plugin_1.6.2.tgz"; path = fetchurl { - name = "mini_css_extract_plugin___mini_css_extract_plugin_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.0.tgz"; - sha1 = "b4db2525af2624899ed64a23b0016e0036411893"; - }; - } - { - name = "minify___minify_4.1.3.tgz"; - path = fetchurl { - name = "minify___minify_4.1.3.tgz"; - url = "https://registry.yarnpkg.com/minify/-/minify-4.1.3.tgz"; - sha1 = "58467922d14303f55a3a28fa79641371955b8fbd"; + name = "mini_css_extract_plugin___mini_css_extract_plugin_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz"; + sha1 = "83172b4fd812f8fc4a09d6f6d16f924f53990ca8"; }; } { @@ -7474,11 +7546,11 @@ }; } { - name = "minio___minio_7.0.18.tgz"; + name = "minio___minio_7.0.19.tgz"; path = fetchurl { - name = "minio___minio_7.0.18.tgz"; - url = "https://registry.yarnpkg.com/minio/-/minio-7.0.18.tgz"; - sha1 = "a2a6dae52a4dde9e35ed47cdf2accc21df4a512d"; + name = "minio___minio_7.0.19.tgz"; + url = "https://registry.yarnpkg.com/minio/-/minio-7.0.19.tgz"; + sha1 = "ca47b68669e45237286709a8c06ecf89f992aa61"; }; } { @@ -7570,11 +7642,11 @@ }; } { - name = "mocha___mocha_8.4.0.tgz"; + name = "mocha___mocha_9.1.1.tgz"; path = fetchurl { - name = "mocha___mocha_8.4.0.tgz"; - url = "https://registry.yarnpkg.com/mocha/-/mocha-8.4.0.tgz"; - sha1 = "677be88bf15980a3cae03a73e10a0fc3997f0cff"; + name = "mocha___mocha_9.1.1.tgz"; + url = "https://registry.yarnpkg.com/mocha/-/mocha-9.1.1.tgz"; + sha1 = "33df2eb9c6262434630510c5f4283b36efda9b61"; }; } { @@ -7666,11 +7738,11 @@ }; } { - name = "mysql2___mysql2_2.2.5.tgz"; + name = "mysql2___mysql2_2.3.0.tgz"; path = fetchurl { - name = "mysql2___mysql2_2.2.5.tgz"; - url = "https://registry.yarnpkg.com/mysql2/-/mysql2-2.2.5.tgz"; - sha1 = "72624ffb4816f80f96b9c97fedd8c00935f9f340"; + name = "mysql2___mysql2_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/mysql2/-/mysql2-2.3.0.tgz"; + sha1 = "600f5cc27e397dfb77b59eac93666434f88e8079"; }; } { @@ -7682,19 +7754,19 @@ }; } { - name = "nan___nan_2.14.2.tgz"; + name = "nan___nan_2.15.0.tgz"; path = fetchurl { - name = "nan___nan_2.14.2.tgz"; - url = "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz"; - sha1 = "f5376400695168f4cc694ac9393d0c9585eeea19"; + name = "nan___nan_2.15.0.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz"; + sha1 = "3f34a473ff18e15c1b5626b62903b5ad6e665fee"; }; } { - name = "nanoid___nanoid_3.1.20.tgz"; + name = "nanoid___nanoid_3.1.23.tgz"; path = fetchurl { - name = "nanoid___nanoid_3.1.20.tgz"; - url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz"; - sha1 = "badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788"; + name = "nanoid___nanoid_3.1.23.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz"; + sha1 = "f744086ce7c2bc47ee0a8472574d5c78e4183a81"; }; } { @@ -7706,11 +7778,11 @@ }; } { - name = "nanoid___nanoid_3.1.23.tgz"; + name = "nanoid___nanoid_3.1.25.tgz"; path = fetchurl { - name = "nanoid___nanoid_3.1.23.tgz"; - url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz"; - sha1 = "f744086ce7c2bc47ee0a8472574d5c78e4183a81"; + name = "nanoid___nanoid_3.1.25.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz"; + sha1 = "09ca32747c0e543f0e1814b7d3793477f9c8e152"; }; } { @@ -7722,14 +7794,6 @@ }; } { - name = "native_duplexpair___native_duplexpair_1.0.0.tgz"; - path = fetchurl { - name = "native_duplexpair___native_duplexpair_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/native-duplexpair/-/native-duplexpair-1.0.0.tgz"; - sha1 = "7899078e64bf3c8a3d732601b3d40ff05db58fa0"; - }; - } - { name = "natural_compare___natural_compare_1.4.0.tgz"; path = fetchurl { name = "natural_compare___natural_compare_1.4.0.tgz"; @@ -7738,11 +7802,11 @@ }; } { - name = "needle___needle_2.6.0.tgz"; + name = "needle___needle_2.9.1.tgz"; path = fetchurl { - name = "needle___needle_2.6.0.tgz"; - url = "https://registry.yarnpkg.com/needle/-/needle-2.6.0.tgz"; - sha1 = "24dbb55f2509e2324b4a99d61f413982013ccdbe"; + name = "needle___needle_2.9.1.tgz"; + url = "https://registry.yarnpkg.com/needle/-/needle-2.9.1.tgz"; + sha1 = "22d1dffbe3490c2b83e301f7709b6736cd8f2684"; }; } { @@ -7762,14 +7826,6 @@ }; } { - name = "no_case___no_case_2.3.2.tgz"; - path = fetchurl { - name = "no_case___no_case_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz"; - sha1 = "60b813396be39b3f1288a4c1ed5d1e7d28b464ac"; - }; - } - { name = "no_case___no_case_3.0.4.tgz"; path = fetchurl { name = "no_case___no_case_3.0.4.tgz"; @@ -7778,19 +7834,19 @@ }; } { - name = "node_addon_api___node_addon_api_3.1.0.tgz"; + name = "node_addon_api___node_addon_api_3.2.1.tgz"; path = fetchurl { - name = "node_addon_api___node_addon_api_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.1.0.tgz"; - sha1 = "98b21931557466c6729e51cb77cd39c965f42239"; + name = "node_addon_api___node_addon_api_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz"; + sha1 = "81325e0a2117789c0128dab65e7e38f07ceba161"; }; } { - name = "node_fetch___node_fetch_2.6.1.tgz"; + name = "node_fetch___node_fetch_2.6.2.tgz"; path = fetchurl { - name = "node_fetch___node_fetch_2.6.1.tgz"; - url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz"; - sha1 = "045bd323631f76ed2e2b55573394416b639a0052"; + name = "node_fetch___node_fetch_2.6.2.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.2.tgz"; + sha1 = "986996818b73785e47b1965cc34eb093a1d464d0"; }; } { @@ -7802,11 +7858,11 @@ }; } { - name = "node_gyp_build___node_gyp_build_4.2.3.tgz"; + name = "node_gyp_build___node_gyp_build_4.3.0.tgz"; path = fetchurl { - name = "node_gyp_build___node_gyp_build_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.2.3.tgz"; - sha1 = "ce6277f853835f718829efb47db20f3e4d9c4739"; + name = "node_gyp_build___node_gyp_build_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz"; + sha1 = "9f256b03e5826150be39c764bf51e993946d71a3"; }; } { @@ -7834,11 +7890,11 @@ }; } { - name = "node_releases___node_releases_1.1.71.tgz"; + name = "node_releases___node_releases_1.1.75.tgz"; path = fetchurl { - name = "node_releases___node_releases_1.1.71.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz"; - sha1 = "cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"; + name = "node_releases___node_releases_1.1.75.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz"; + sha1 = "6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe"; }; } { @@ -7890,11 +7946,11 @@ }; } { - name = "normalize_url___normalize_url_3.3.0.tgz"; + name = "normalize_url___normalize_url_6.1.0.tgz"; path = fetchurl { - name = "normalize_url___normalize_url_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz"; - sha1 = "b2e1c4dc4f7c6d57743df733a4f5978d18650559"; + name = "normalize_url___normalize_url_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz"; + sha1 = "40d0885b535deffe3f3147bec877d05fe4c5668a"; }; } { @@ -7938,6 +7994,14 @@ }; } { + name = "nth_check___nth_check_2.0.0.tgz"; + path = fetchurl { + name = "nth_check___nth_check_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz"; + sha1 = "1bb4f6dac70072fc313e8c9cd1417b5074c0a125"; + }; + } + { name = "nth_check___nth_check_1.0.2.tgz"; path = fetchurl { name = "nth_check___nth_check_1.0.2.tgz"; @@ -7994,11 +8058,11 @@ }; } { - name = "object_inspect___object_inspect_1.10.3.tgz"; + name = "object_inspect___object_inspect_1.11.0.tgz"; path = fetchurl { - name = "object_inspect___object_inspect_1.10.3.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz"; - sha1 = "c2aa7d2d09f50c99375704f7a0adf24c5782d369"; + name = "object_inspect___object_inspect_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz"; + sha1 = "9dceb146cedd4148a0d9e51ab88d34cf509922b1"; }; } { @@ -8058,11 +8122,11 @@ }; } { - name = "object.values___object.values_1.1.3.tgz"; + name = "object.values___object.values_1.1.4.tgz"; path = fetchurl { - name = "object.values___object.values_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.3.tgz"; - sha1 = "eaa8b1e17589f02f698db093f7c62ee1699742ee"; + name = "object.values___object.values_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz"; + sha1 = "0d273762833e816b693a637d30073e7051535b30"; }; } { @@ -8106,19 +8170,19 @@ }; } { - name = "openid___openid_2.0.8.tgz"; + name = "openid___openid_2.0.9.tgz"; path = fetchurl { - name = "openid___openid_2.0.8.tgz"; - url = "https://registry.yarnpkg.com/openid/-/openid-2.0.8.tgz"; - sha1 = "e3a09b55641101156ad086971721a98d0723c547"; + name = "openid___openid_2.0.9.tgz"; + url = "https://registry.yarnpkg.com/openid/-/openid-2.0.9.tgz"; + sha1 = "7d2bc03ed4c6bf4ccd05b128e3b0b33b6680205f"; }; } { - name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_5.0.4.tgz"; + name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_6.0.1.tgz"; path = fetchurl { - name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_5.0.4.tgz"; - url = "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.4.tgz"; - sha1 = "85883c6528aaa02e30bbad9908c92926bb52dc90"; + name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-6.0.1.tgz"; + sha1 = "7719bceabba1f3891ec3ae04efb81a1cc99cd793"; }; } { @@ -8274,14 +8338,6 @@ }; } { - name = "param_case___param_case_2.1.1.tgz"; - path = fetchurl { - name = "param_case___param_case_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz"; - sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247"; - }; - } - { name = "param_case___param_case_3.0.4.tgz"; path = fetchurl { name = "param_case___param_case_3.0.4.tgz"; @@ -8306,11 +8362,11 @@ }; } { - name = "parse_entities___parse_entities_2.0.0.tgz"; + name = "parse_entities___parse_entities_3.0.0.tgz"; path = fetchurl { - name = "parse_entities___parse_entities_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/parse-entities/-/parse-entities-2.0.0.tgz"; - sha1 = "53c6eb5b9314a1f4ec99fa0fdf7ce01ecda0cbe8"; + name = "parse_entities___parse_entities_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-entities/-/parse-entities-3.0.0.tgz"; + sha1 = "9ed6d6569b6cfc95ade058d683ddef239dad60dc"; }; } { @@ -8322,14 +8378,6 @@ }; } { - name = "parse_json___parse_json_2.2.0.tgz"; - path = fetchurl { - name = "parse_json___parse_json_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz"; - sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; - }; - } - { name = "parse_json___parse_json_4.0.0.tgz"; path = fetchurl { name = "parse_json___parse_json_4.0.0.tgz"; @@ -8354,6 +8402,14 @@ }; } { + name = "parse5___parse5_6.0.1.tgz"; + path = fetchurl { + name = "parse5___parse5_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz"; + sha1 = "e1a1c085c569b3dc08321184f19a39cc27f7c30b"; + }; + } + { name = "parseqs___parseqs_0.0.6.tgz"; path = fetchurl { name = "parseqs___parseqs_0.0.6.tgz"; @@ -8450,19 +8506,19 @@ }; } { - name = "passport_oauth1___passport_oauth1_1.1.0.tgz"; + name = "passport_oauth1___passport_oauth1_1.2.0.tgz"; path = fetchurl { - name = "passport_oauth1___passport_oauth1_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/passport-oauth1/-/passport-oauth1-1.1.0.tgz"; - sha1 = "a7de988a211f9cf4687377130ea74df32730c918"; + name = "passport_oauth1___passport_oauth1_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/passport-oauth1/-/passport-oauth1-1.2.0.tgz"; + sha1 = "5229d431781bf5b265bec86ce9a9cce58a756cf9"; }; } { - name = "passport_oauth2___passport_oauth2_1.5.0.tgz"; + name = "passport_oauth2___passport_oauth2_1.6.0.tgz"; path = fetchurl { - name = "passport_oauth2___passport_oauth2_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.5.0.tgz"; - sha1 = "64babbb54ac46a4dcab35e7f266ed5294e3c4108"; + name = "passport_oauth2___passport_oauth2_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.0.tgz"; + sha1 = "5f599735e0ea40ea3027643785f81a3a9b4feb50"; }; } { @@ -8474,11 +8530,11 @@ }; } { - name = "passport_saml___passport_saml_2.2.0.tgz"; + name = "passport_saml___passport_saml_3.1.2.tgz"; path = fetchurl { - name = "passport_saml___passport_saml_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/passport-saml/-/passport-saml-2.2.0.tgz"; - sha1 = "dbea6743cf06644cfb3f0d486e43d3c8812b150a"; + name = "passport_saml___passport_saml_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/passport-saml/-/passport-saml-3.1.2.tgz"; + sha1 = "34a0c2c423d729ce102e69fea9c22040910e6d43"; }; } { @@ -8562,11 +8618,11 @@ }; } { - name = "path_parse___path_parse_1.0.6.tgz"; + name = "path_parse___path_parse_1.0.7.tgz"; path = fetchurl { - name = "path_parse___path_parse_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz"; - sha1 = "d62dbb5679405d72c4737ec58600e9ddcf06d24c"; + name = "path_parse___path_parse_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz"; + sha1 = "fbc114b60ca42b30d9daf5858e4bd68bbedb6735"; }; } { @@ -8578,11 +8634,11 @@ }; } { - name = "path_type___path_type_2.0.0.tgz"; + name = "path_type___path_type_3.0.0.tgz"; path = fetchurl { - name = "path_type___path_type_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz"; - sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; + name = "path_type___path_type_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz"; + sha1 = "cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"; }; } { @@ -8610,19 +8666,19 @@ }; } { - name = "pdfobject___pdfobject_2.2.5.tgz"; + name = "pdfobject___pdfobject_2.2.6.tgz"; path = fetchurl { - name = "pdfobject___pdfobject_2.2.5.tgz"; - url = "https://registry.yarnpkg.com/pdfobject/-/pdfobject-2.2.5.tgz"; - sha1 = "3e79dae8925a68f60c79423f56737bfd2d7e8a0b"; + name = "pdfobject___pdfobject_2.2.6.tgz"; + url = "https://registry.yarnpkg.com/pdfobject/-/pdfobject-2.2.6.tgz"; + sha1 = "cb8a0b7697af88df8af017b5fd4a7a42abb6e031"; }; } { - name = "peek_readable___peek_readable_3.1.3.tgz"; + name = "peek_readable___peek_readable_4.0.1.tgz"; path = fetchurl { - name = "peek_readable___peek_readable_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/peek-readable/-/peek-readable-3.1.3.tgz"; - sha1 = "932480d46cf6aa553c46c68566c4fb69a82cd2b1"; + name = "peek_readable___peek_readable_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/peek-readable/-/peek-readable-4.0.1.tgz"; + sha1 = "9a045f291db254111c3412c1ce4fec27ddd4d202"; }; } { @@ -8642,11 +8698,11 @@ }; } { - name = "pg_hstore___pg_hstore_2.3.3.tgz"; + name = "pg_hstore___pg_hstore_2.3.4.tgz"; path = fetchurl { - name = "pg_hstore___pg_hstore_2.3.3.tgz"; - url = "https://registry.yarnpkg.com/pg-hstore/-/pg-hstore-2.3.3.tgz"; - sha1 = "d1978c12a85359830b1388d3b0ff233b88928e96"; + name = "pg_hstore___pg_hstore_2.3.4.tgz"; + url = "https://registry.yarnpkg.com/pg-hstore/-/pg-hstore-2.3.4.tgz"; + sha1 = "4425e3e2a3e15d2a334c35581186c27cf2e9b8dd"; }; } { @@ -8658,11 +8714,11 @@ }; } { - name = "pg_pool___pg_pool_3.3.0.tgz"; + name = "pg_pool___pg_pool_3.4.1.tgz"; path = fetchurl { - name = "pg_pool___pg_pool_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.3.0.tgz"; - sha1 = "12d5c7f65ea18a6e99ca9811bd18129071e562fc"; + name = "pg_pool___pg_pool_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.4.1.tgz"; + sha1 = "0e71ce2c67b442a5e862a9c182172c37eda71e9c"; }; } { @@ -8682,11 +8738,11 @@ }; } { - name = "pg___pg_8.6.0.tgz"; + name = "pg___pg_8.7.1.tgz"; path = fetchurl { - name = "pg___pg_8.6.0.tgz"; - url = "https://registry.yarnpkg.com/pg/-/pg-8.6.0.tgz"; - sha1 = "e222296b0b079b280cce106ea991703335487db2"; + name = "pg___pg_8.7.1.tgz"; + url = "https://registry.yarnpkg.com/pg/-/pg-8.7.1.tgz"; + sha1 = "9ea9d1ec225980c36f94e181d009ab9f4ce4c471"; }; } { @@ -8698,19 +8754,11 @@ }; } { - name = "picomatch___picomatch_2.2.3.tgz"; - path = fetchurl { - name = "picomatch___picomatch_2.2.3.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz"; - sha1 = "465547f359ccc206d3c48e46a1bcb89bf7ee619d"; - }; - } - { - name = "pify___pify_2.3.0.tgz"; + name = "picomatch___picomatch_2.3.0.tgz"; path = fetchurl { - name = "pify___pify_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz"; - sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + name = "picomatch___picomatch_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz"; + sha1 = "f1f061de8f6a4bf022892e2d128234fb98302972"; }; } { @@ -8754,6 +8802,14 @@ }; } { + name = "pkg_up___pkg_up_2.0.0.tgz"; + path = fetchurl { + name = "pkg_up___pkg_up_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz"; + sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; + }; + } + { name = "pkginfo___pkginfo_0.2.3.tgz"; path = fetchurl { name = "pkginfo___pkginfo_0.2.3.tgz"; @@ -8794,107 +8850,107 @@ }; } { - name = "postcss_calc___postcss_calc_7.0.5.tgz"; + name = "postcss_calc___postcss_calc_8.0.0.tgz"; path = fetchurl { - name = "postcss_calc___postcss_calc_7.0.5.tgz"; - url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz"; - sha1 = "f8a6e99f12e619c2ebc23cf6c486fdc15860933e"; + name = "postcss_calc___postcss_calc_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.0.0.tgz"; + sha1 = "a05b87aacd132740a5db09462a3612453e5df90a"; }; } { - name = "postcss_colormin___postcss_colormin_4.0.3.tgz"; + name = "postcss_colormin___postcss_colormin_5.2.0.tgz"; path = fetchurl { - name = "postcss_colormin___postcss_colormin_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz"; - sha1 = "ae060bce93ed794ac71264f08132d550956bd381"; + name = "postcss_colormin___postcss_colormin_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.2.0.tgz"; + sha1 = "2b620b88c0ff19683f3349f4cf9e24ebdafb2c88"; }; } { - name = "postcss_convert_values___postcss_convert_values_4.0.1.tgz"; + name = "postcss_convert_values___postcss_convert_values_5.0.1.tgz"; path = fetchurl { - name = "postcss_convert_values___postcss_convert_values_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz"; - sha1 = "ca3813ed4da0f812f9d43703584e449ebe189a7f"; + name = "postcss_convert_values___postcss_convert_values_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.0.1.tgz"; + sha1 = "4ec19d6016534e30e3102fdf414e753398645232"; }; } { - name = "postcss_discard_comments___postcss_discard_comments_4.0.2.tgz"; + name = "postcss_discard_comments___postcss_discard_comments_5.0.1.tgz"; path = fetchurl { - name = "postcss_discard_comments___postcss_discard_comments_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz"; - sha1 = "1fbabd2c246bff6aaad7997b2b0918f4d7af4033"; + name = "postcss_discard_comments___postcss_discard_comments_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz"; + sha1 = "9eae4b747cf760d31f2447c27f0619d5718901fe"; }; } { - name = "postcss_discard_duplicates___postcss_discard_duplicates_4.0.2.tgz"; + name = "postcss_discard_duplicates___postcss_discard_duplicates_5.0.1.tgz"; path = fetchurl { - name = "postcss_discard_duplicates___postcss_discard_duplicates_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz"; - sha1 = "3fe133cd3c82282e550fc9b239176a9207b784eb"; + name = "postcss_discard_duplicates___postcss_discard_duplicates_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz"; + sha1 = "68f7cc6458fe6bab2e46c9f55ae52869f680e66d"; }; } { - name = "postcss_discard_empty___postcss_discard_empty_4.0.1.tgz"; + name = "postcss_discard_empty___postcss_discard_empty_5.0.1.tgz"; path = fetchurl { - name = "postcss_discard_empty___postcss_discard_empty_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz"; - sha1 = "c8c951e9f73ed9428019458444a02ad90bb9f765"; + name = "postcss_discard_empty___postcss_discard_empty_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz"; + sha1 = "ee136c39e27d5d2ed4da0ee5ed02bc8a9f8bf6d8"; }; } { - name = "postcss_discard_overridden___postcss_discard_overridden_4.0.1.tgz"; + name = "postcss_discard_overridden___postcss_discard_overridden_5.0.1.tgz"; path = fetchurl { - name = "postcss_discard_overridden___postcss_discard_overridden_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz"; - sha1 = "652aef8a96726f029f5e3e00146ee7a4e755ff57"; + name = "postcss_discard_overridden___postcss_discard_overridden_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz"; + sha1 = "454b41f707300b98109a75005ca4ab0ff2743ac6"; }; } { - name = "postcss_merge_longhand___postcss_merge_longhand_4.0.11.tgz"; + name = "postcss_merge_longhand___postcss_merge_longhand_5.0.2.tgz"; path = fetchurl { - name = "postcss_merge_longhand___postcss_merge_longhand_4.0.11.tgz"; - url = "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz"; - sha1 = "62f49a13e4a0ee04e7b98f42bb16062ca2549e24"; + name = "postcss_merge_longhand___postcss_merge_longhand_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.2.tgz"; + sha1 = "277ada51d9a7958e8ef8cf263103c9384b322a41"; }; } { - name = "postcss_merge_rules___postcss_merge_rules_4.0.3.tgz"; + name = "postcss_merge_rules___postcss_merge_rules_5.0.2.tgz"; path = fetchurl { - name = "postcss_merge_rules___postcss_merge_rules_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz"; - sha1 = "362bea4ff5a1f98e4075a713c6cb25aefef9a650"; + name = "postcss_merge_rules___postcss_merge_rules_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.2.tgz"; + sha1 = "d6e4d65018badbdb7dcc789c4f39b941305d410a"; }; } { - name = "postcss_minify_font_values___postcss_minify_font_values_4.0.2.tgz"; + name = "postcss_minify_font_values___postcss_minify_font_values_5.0.1.tgz"; path = fetchurl { - name = "postcss_minify_font_values___postcss_minify_font_values_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz"; - sha1 = "cd4c344cce474343fac5d82206ab2cbcb8afd5a6"; + name = "postcss_minify_font_values___postcss_minify_font_values_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.1.tgz"; + sha1 = "a90cefbfdaa075bd3dbaa1b33588bb4dc268addf"; }; } { - name = "postcss_minify_gradients___postcss_minify_gradients_4.0.2.tgz"; + name = "postcss_minify_gradients___postcss_minify_gradients_5.0.2.tgz"; path = fetchurl { - name = "postcss_minify_gradients___postcss_minify_gradients_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz"; - sha1 = "93b29c2ff5099c535eecda56c4aa6e665a663471"; + name = "postcss_minify_gradients___postcss_minify_gradients_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.2.tgz"; + sha1 = "7c175c108f06a5629925d698b3c4cf7bd3864ee5"; }; } { - name = "postcss_minify_params___postcss_minify_params_4.0.2.tgz"; + name = "postcss_minify_params___postcss_minify_params_5.0.1.tgz"; path = fetchurl { - name = "postcss_minify_params___postcss_minify_params_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz"; - sha1 = "6b9cef030c11e35261f95f618c90036d680db874"; + name = "postcss_minify_params___postcss_minify_params_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.1.tgz"; + sha1 = "371153ba164b9d8562842fdcd929c98abd9e5b6c"; }; } { - name = "postcss_minify_selectors___postcss_minify_selectors_4.0.2.tgz"; + name = "postcss_minify_selectors___postcss_minify_selectors_5.1.0.tgz"; path = fetchurl { - name = "postcss_minify_selectors___postcss_minify_selectors_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz"; - sha1 = "e2e5eb40bfee500d0cd9243500f5f8ea4262fbd8"; + name = "postcss_minify_selectors___postcss_minify_selectors_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz"; + sha1 = "4385c845d3979ff160291774523ffa54eafd5a54"; }; } { @@ -8930,107 +8986,99 @@ }; } { - name = "postcss_normalize_charset___postcss_normalize_charset_4.0.1.tgz"; + name = "postcss_normalize_charset___postcss_normalize_charset_5.0.1.tgz"; path = fetchurl { - name = "postcss_normalize_charset___postcss_normalize_charset_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz"; - sha1 = "8b35add3aee83a136b0471e0d59be58a50285dd4"; + name = "postcss_normalize_charset___postcss_normalize_charset_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz"; + sha1 = "121559d1bebc55ac8d24af37f67bd4da9efd91d0"; }; } { - name = "postcss_normalize_display_values___postcss_normalize_display_values_4.0.2.tgz"; + name = "postcss_normalize_display_values___postcss_normalize_display_values_5.0.1.tgz"; path = fetchurl { - name = "postcss_normalize_display_values___postcss_normalize_display_values_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz"; - sha1 = "0dbe04a4ce9063d4667ed2be476bb830c825935a"; + name = "postcss_normalize_display_values___postcss_normalize_display_values_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz"; + sha1 = "62650b965981a955dffee83363453db82f6ad1fd"; }; } { - name = "postcss_normalize_positions___postcss_normalize_positions_4.0.2.tgz"; + name = "postcss_normalize_positions___postcss_normalize_positions_5.0.1.tgz"; path = fetchurl { - name = "postcss_normalize_positions___postcss_normalize_positions_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz"; - sha1 = "05f757f84f260437378368a91f8932d4b102917f"; + name = "postcss_normalize_positions___postcss_normalize_positions_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.1.tgz"; + sha1 = "868f6af1795fdfa86fbbe960dceb47e5f9492fe5"; }; } { - name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_4.0.2.tgz"; + name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_5.0.1.tgz"; path = fetchurl { - name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz"; - sha1 = "c4ebbc289f3991a028d44751cbdd11918b17910c"; + name = "postcss_normalize_repeat_style___postcss_normalize_repeat_style_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.1.tgz"; + sha1 = "cbc0de1383b57f5bb61ddd6a84653b5e8665b2b5"; }; } { - name = "postcss_normalize_string___postcss_normalize_string_4.0.2.tgz"; + name = "postcss_normalize_string___postcss_normalize_string_5.0.1.tgz"; path = fetchurl { - name = "postcss_normalize_string___postcss_normalize_string_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz"; - sha1 = "cd44c40ab07a0c7a36dc5e99aace1eca4ec2690c"; + name = "postcss_normalize_string___postcss_normalize_string_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.1.tgz"; + sha1 = "d9eafaa4df78c7a3b973ae346ef0e47c554985b0"; }; } { - name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_4.0.2.tgz"; + name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_5.0.1.tgz"; path = fetchurl { - name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz"; - sha1 = "8e009ca2a3949cdaf8ad23e6b6ab99cb5e7d28d9"; + name = "postcss_normalize_timing_functions___postcss_normalize_timing_functions_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.1.tgz"; + sha1 = "8ee41103b9130429c6cbba736932b75c5e2cb08c"; }; } { - name = "postcss_normalize_unicode___postcss_normalize_unicode_4.0.1.tgz"; + name = "postcss_normalize_unicode___postcss_normalize_unicode_5.0.1.tgz"; path = fetchurl { - name = "postcss_normalize_unicode___postcss_normalize_unicode_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz"; - sha1 = "841bd48fdcf3019ad4baa7493a3d363b52ae1cfb"; + name = "postcss_normalize_unicode___postcss_normalize_unicode_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.1.tgz"; + sha1 = "82d672d648a411814aa5bf3ae565379ccd9f5e37"; }; } { - name = "postcss_normalize_url___postcss_normalize_url_4.0.1.tgz"; + name = "postcss_normalize_url___postcss_normalize_url_5.0.2.tgz"; path = fetchurl { - name = "postcss_normalize_url___postcss_normalize_url_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz"; - sha1 = "10e437f86bc7c7e58f7b9652ed878daaa95faae1"; + name = "postcss_normalize_url___postcss_normalize_url_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.0.2.tgz"; + sha1 = "ddcdfb7cede1270740cf3e4dfc6008bd96abc763"; }; } { - name = "postcss_normalize_whitespace___postcss_normalize_whitespace_4.0.2.tgz"; + name = "postcss_normalize_whitespace___postcss_normalize_whitespace_5.0.1.tgz"; path = fetchurl { - name = "postcss_normalize_whitespace___postcss_normalize_whitespace_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz"; - sha1 = "bf1d4070fe4fcea87d1348e825d8cc0c5faa7d82"; + name = "postcss_normalize_whitespace___postcss_normalize_whitespace_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.1.tgz"; + sha1 = "b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a"; }; } { - name = "postcss_ordered_values___postcss_ordered_values_4.1.2.tgz"; + name = "postcss_ordered_values___postcss_ordered_values_5.0.2.tgz"; path = fetchurl { - name = "postcss_ordered_values___postcss_ordered_values_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz"; - sha1 = "0cf75c820ec7d5c4d280189559e0b571ebac0eee"; + name = "postcss_ordered_values___postcss_ordered_values_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.2.tgz"; + sha1 = "1f351426977be00e0f765b3164ad753dac8ed044"; }; } { - name = "postcss_reduce_initial___postcss_reduce_initial_4.0.3.tgz"; + name = "postcss_reduce_initial___postcss_reduce_initial_5.0.1.tgz"; path = fetchurl { - name = "postcss_reduce_initial___postcss_reduce_initial_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz"; - sha1 = "7fd42ebea5e9c814609639e2c2e84ae270ba48df"; + name = "postcss_reduce_initial___postcss_reduce_initial_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.0.1.tgz"; + sha1 = "9d6369865b0f6f6f6b165a0ef5dc1a4856c7e946"; }; } { - name = "postcss_reduce_transforms___postcss_reduce_transforms_4.0.2.tgz"; + name = "postcss_reduce_transforms___postcss_reduce_transforms_5.0.1.tgz"; path = fetchurl { - name = "postcss_reduce_transforms___postcss_reduce_transforms_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz"; - sha1 = "17efa405eacc6e07be3414a5ca2d1074681d4e29"; - }; - } - { - name = "postcss_selector_parser___postcss_selector_parser_3.1.2.tgz"; - path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz"; - sha1 = "b310f5c4c0fdaf76f94902bbaa30db6aa84f5270"; + name = "postcss_reduce_transforms___postcss_reduce_transforms_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.1.tgz"; + sha1 = "93c12f6a159474aa711d5269923e2383cedcf640"; }; } { @@ -9042,27 +9090,19 @@ }; } { - name = "postcss_svgo___postcss_svgo_4.0.3.tgz"; + name = "postcss_svgo___postcss_svgo_5.0.2.tgz"; path = fetchurl { - name = "postcss_svgo___postcss_svgo_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.3.tgz"; - sha1 = "343a2cdbac9505d416243d496f724f38894c941e"; + name = "postcss_svgo___postcss_svgo_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.0.2.tgz"; + sha1 = "bc73c4ea4c5a80fbd4b45e29042c34ceffb9257f"; }; } { - name = "postcss_unique_selectors___postcss_unique_selectors_4.0.1.tgz"; + name = "postcss_unique_selectors___postcss_unique_selectors_5.0.1.tgz"; path = fetchurl { - name = "postcss_unique_selectors___postcss_unique_selectors_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz"; - sha1 = "9446911f3289bfd64c6d680f073c03b1f9ee4bac"; - }; - } - { - name = "postcss_value_parser___postcss_value_parser_3.3.1.tgz"; - path = fetchurl { - name = "postcss_value_parser___postcss_value_parser_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz"; - sha1 = "9ff822547e2893213cf1c30efa51ac5fd1ba8281"; + name = "postcss_unique_selectors___postcss_unique_selectors_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.1.tgz"; + sha1 = "3be5c1d7363352eff838bd62b0b07a0abad43bfc"; }; } { @@ -9074,19 +9114,11 @@ }; } { - name = "postcss___postcss_7.0.35.tgz"; - path = fetchurl { - name = "postcss___postcss_7.0.35.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz"; - sha1 = "d2be00b998f7f211d8a276974079f2e92b970e24"; - }; - } - { - name = "postcss___postcss_8.2.15.tgz"; + name = "postcss___postcss_8.3.6.tgz"; path = fetchurl { - name = "postcss___postcss_8.2.15.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-8.2.15.tgz"; - sha1 = "9e66ccf07292817d226fc315cbbf9bc148fbca65"; + name = "postcss___postcss_8.3.6.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-8.3.6.tgz"; + sha1 = "2730dd76a97969f37f53b9a6096197be311cc4ea"; }; } { @@ -9162,11 +9194,11 @@ }; } { - name = "prismjs___prismjs_1.23.0.tgz"; + name = "prismjs___prismjs_1.24.1.tgz"; path = fetchurl { - name = "prismjs___prismjs_1.23.0.tgz"; - url = "https://registry.yarnpkg.com/prismjs/-/prismjs-1.23.0.tgz"; - sha1 = "d3b3967f7d72440690497652a9d40ff046067f33"; + name = "prismjs___prismjs_1.24.1.tgz"; + url = "https://registry.yarnpkg.com/prismjs/-/prismjs-1.24.1.tgz"; + sha1 = "c4d7895c4d6500289482fa8936d9cdd192684036"; }; } { @@ -9210,11 +9242,11 @@ }; } { - name = "prom_client___prom_client_13.1.0.tgz"; + name = "prom_client___prom_client_13.2.0.tgz"; path = fetchurl { - name = "prom_client___prom_client_13.1.0.tgz"; - url = "https://registry.yarnpkg.com/prom-client/-/prom-client-13.1.0.tgz"; - sha1 = "1185caffd8691e28d32e373972e662964e3dba45"; + name = "prom_client___prom_client_13.2.0.tgz"; + url = "https://registry.yarnpkg.com/prom-client/-/prom-client-13.2.0.tgz"; + sha1 = "99d13357912dd400f8911b77df19f7b328a93e92"; }; } { @@ -9234,11 +9266,19 @@ }; } { - name = "proxy_addr___proxy_addr_2.0.6.tgz"; + name = "property_information___property_information_6.0.1.tgz"; path = fetchurl { - name = "proxy_addr___proxy_addr_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz"; - sha1 = "fdc2336505447d3f2f2c638ed272caf614bbb2bf"; + name = "property_information___property_information_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/property-information/-/property-information-6.0.1.tgz"; + sha1 = "7c668d9f2b9cb63bc3e105d8b8dfee7221a17800"; + }; + } + { + name = "proxy_addr___proxy_addr_2.0.7.tgz"; + path = fetchurl { + name = "proxy_addr___proxy_addr_2.0.7.tgz"; + url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz"; + sha1 = "f19fe69ceab311eeb94b42e70e8c2070f9ba1025"; }; } { @@ -9346,6 +9386,14 @@ }; } { + name = "qs___qs_6.10.1.tgz"; + path = fetchurl { + name = "qs___qs_6.10.1.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz"; + sha1 = "4931482fa8d647a5aab799c5271d2133b981fb6a"; + }; + } + { name = "qs___qs_6.5.2.tgz"; path = fetchurl { name = "qs___qs_6.5.2.tgz"; @@ -9442,14 +9490,6 @@ }; } { - name = "raw_loader___raw_loader_0.5.1.tgz"; - path = fetchurl { - name = "raw_loader___raw_loader_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz"; - sha1 = "0c3d0beaed8a01c966d9787bf778281252a979aa"; - }; - } - { name = "rc___rc_1.2.8.tgz"; path = fetchurl { name = "rc___rc_1.2.8.tgz"; @@ -9458,19 +9498,19 @@ }; } { - name = "read_pkg_up___read_pkg_up_2.0.0.tgz"; + name = "read_pkg_up___read_pkg_up_3.0.0.tgz"; path = fetchurl { - name = "read_pkg_up___read_pkg_up_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; - sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; + name = "read_pkg_up___read_pkg_up_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz"; + sha1 = "3ed496685dba0f8fe118d0691dc51f4a1ff96f07"; }; } { - name = "read_pkg___read_pkg_2.0.0.tgz"; + name = "read_pkg___read_pkg_3.0.0.tgz"; path = fetchurl { - name = "read_pkg___read_pkg_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz"; - sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; + name = "read_pkg___read_pkg_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz"; + sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; }; } { @@ -9506,11 +9546,11 @@ }; } { - name = "readable_web_to_node_stream___readable_web_to_node_stream_3.0.1.tgz"; + name = "readable_web_to_node_stream___readable_web_to_node_stream_3.0.2.tgz"; path = fetchurl { - name = "readable_web_to_node_stream___readable_web_to_node_stream_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.1.tgz"; - sha1 = "3f619b1bc5dd73a4cfe5c5f9b4f6faba55dff845"; + name = "readable_web_to_node_stream___readable_web_to_node_stream_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz"; + sha1 = "5d52bb5df7b54861fd48d015e93a2cb87b3ee0bb"; }; } { @@ -9530,11 +9570,11 @@ }; } { - name = "readdirp___readdirp_3.5.0.tgz"; + name = "readdirp___readdirp_3.6.0.tgz"; path = fetchurl { - name = "readdirp___readdirp_3.5.0.tgz"; - url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz"; - sha1 = "9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"; + name = "readdirp___readdirp_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz"; + sha1 = "74a370bd857116e245b29cc97340cd431a02a6c7"; }; } { @@ -9546,11 +9586,11 @@ }; } { - name = "rechoir___rechoir_0.7.0.tgz"; + name = "rechoir___rechoir_0.7.1.tgz"; path = fetchurl { - name = "rechoir___rechoir_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.0.tgz"; - sha1 = "32650fd52c21ab252aa5d65b19310441c7e03aca"; + name = "rechoir___rechoir_0.7.1.tgz"; + url = "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz"; + sha1 = "9478a96a1ca135b5e88fc027f03ee92d6c645686"; }; } { @@ -9618,11 +9658,11 @@ }; } { - name = "regexpp___regexpp_3.1.0.tgz"; + name = "regexpp___regexpp_3.2.0.tgz"; path = fetchurl { - name = "regexpp___regexpp_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz"; - sha1 = "206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"; + name = "regexpp___regexpp_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz"; + sha1 = "0425a2768d8f23bad70ca4b90461fa2f1213e1b2"; }; } { @@ -9650,6 +9690,30 @@ }; } { + name = "rehype_parse___rehype_parse_8.0.3.tgz"; + path = fetchurl { + name = "rehype_parse___rehype_parse_8.0.3.tgz"; + url = "https://registry.yarnpkg.com/rehype-parse/-/rehype-parse-8.0.3.tgz"; + sha1 = "a1947132a08a930d0c2b6fd2b3dbcc137457c07a"; + }; + } + { + name = "rehype_stringify___rehype_stringify_9.0.2.tgz"; + path = fetchurl { + name = "rehype_stringify___rehype_stringify_9.0.2.tgz"; + url = "https://registry.yarnpkg.com/rehype-stringify/-/rehype-stringify-9.0.2.tgz"; + sha1 = "2d95e06e246abbee504cf2f54c8d12f27d7bfd8e"; + }; + } + { + name = "rehype___rehype_12.0.0.tgz"; + path = fetchurl { + name = "rehype___rehype_12.0.0.tgz"; + url = "https://registry.yarnpkg.com/rehype/-/rehype-12.0.0.tgz"; + sha1 = "d5e80a206da2479b3564722bc2ba882e0f4240ec"; + }; + } + { name = "relateurl___relateurl_0.2.7.tgz"; path = fetchurl { name = "relateurl___relateurl_0.2.7.tgz"; @@ -9658,411 +9722,411 @@ }; } { - name = "remark_cli___remark_cli_9.0.0.tgz"; + name = "remark_cli___remark_cli_10.0.0.tgz"; path = fetchurl { - name = "remark_cli___remark_cli_9.0.0.tgz"; - url = "https://registry.yarnpkg.com/remark-cli/-/remark-cli-9.0.0.tgz"; - sha1 = "6f7951e7a72217535f2e32b7a6d3f638fe182f86"; + name = "remark_cli___remark_cli_10.0.0.tgz"; + url = "https://registry.yarnpkg.com/remark-cli/-/remark-cli-10.0.0.tgz"; + sha1 = "3b0e20f2ad3909f35c7a6fb3f721c82f6ff5beac"; }; } { - name = "remark_lint_blockquote_indentation___remark_lint_blockquote_indentation_2.0.1.tgz"; + name = "remark_lint_blockquote_indentation___remark_lint_blockquote_indentation_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_blockquote_indentation___remark_lint_blockquote_indentation_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-blockquote-indentation/-/remark-lint-blockquote-indentation-2.0.1.tgz"; - sha1 = "27347959acf42a6c3e401488d8210e973576b254"; + name = "remark_lint_blockquote_indentation___remark_lint_blockquote_indentation_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-blockquote-indentation/-/remark-lint-blockquote-indentation-3.0.1.tgz"; + sha1 = "74591e6029c4c8c92bf0c1665e001b29a71522bd"; }; } { - name = "remark_lint_code_block_style___remark_lint_code_block_style_2.0.1.tgz"; + name = "remark_lint_code_block_style___remark_lint_code_block_style_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_code_block_style___remark_lint_code_block_style_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-code-block-style/-/remark-lint-code-block-style-2.0.1.tgz"; - sha1 = "448b0f2660acfcdfff2138d125ff5b1c1279c0cb"; + name = "remark_lint_code_block_style___remark_lint_code_block_style_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-code-block-style/-/remark-lint-code-block-style-3.0.1.tgz"; + sha1 = "be4434e3e8007bd3324227da876d3c59e2e960d6"; }; } { - name = "remark_lint_definition_case___remark_lint_definition_case_2.0.1.tgz"; + name = "remark_lint_definition_case___remark_lint_definition_case_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_definition_case___remark_lint_definition_case_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-definition-case/-/remark-lint-definition-case-2.0.1.tgz"; - sha1 = "10340eb2f87acff41140d52ad7e5b40b47e6690a"; + name = "remark_lint_definition_case___remark_lint_definition_case_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-definition-case/-/remark-lint-definition-case-3.0.1.tgz"; + sha1 = "15b2260ed0281398944c09f460ec48cb31a12fdc"; }; } { - name = "remark_lint_definition_spacing___remark_lint_definition_spacing_2.0.1.tgz"; + name = "remark_lint_definition_spacing___remark_lint_definition_spacing_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_definition_spacing___remark_lint_definition_spacing_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-definition-spacing/-/remark-lint-definition-spacing-2.0.1.tgz"; - sha1 = "97f01bf9bf77a7bdf8013b124b7157dd90b07c64"; + name = "remark_lint_definition_spacing___remark_lint_definition_spacing_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-definition-spacing/-/remark-lint-definition-spacing-3.0.1.tgz"; + sha1 = "2599dc8cef6eb555b116a9634a226d812795fd87"; }; } { - name = "remark_lint_emphasis_marker___remark_lint_emphasis_marker_2.0.1.tgz"; + name = "remark_lint_emphasis_marker___remark_lint_emphasis_marker_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_emphasis_marker___remark_lint_emphasis_marker_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-emphasis-marker/-/remark-lint-emphasis-marker-2.0.1.tgz"; - sha1 = "1d5ca2070d4798d16c23120726158157796dc317"; + name = "remark_lint_emphasis_marker___remark_lint_emphasis_marker_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-emphasis-marker/-/remark-lint-emphasis-marker-3.0.1.tgz"; + sha1 = "612d0126d99649484ad9a42ad854f3110ddc7536"; }; } { - name = "remark_lint_fenced_code_flag___remark_lint_fenced_code_flag_2.0.1.tgz"; + name = "remark_lint_fenced_code_flag___remark_lint_fenced_code_flag_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_fenced_code_flag___remark_lint_fenced_code_flag_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-fenced-code-flag/-/remark-lint-fenced-code-flag-2.0.1.tgz"; - sha1 = "2cb3ddb1157082c45760c7d01ca08e13376aaf62"; + name = "remark_lint_fenced_code_flag___remark_lint_fenced_code_flag_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-fenced-code-flag/-/remark-lint-fenced-code-flag-3.0.1.tgz"; + sha1 = "5282ece321f9e3e86dd7e1b30dbd50f0cdbb40e0"; }; } { - name = "remark_lint_fenced_code_marker___remark_lint_fenced_code_marker_2.0.1.tgz"; + name = "remark_lint_fenced_code_marker___remark_lint_fenced_code_marker_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_fenced_code_marker___remark_lint_fenced_code_marker_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-fenced-code-marker/-/remark-lint-fenced-code-marker-2.0.1.tgz"; - sha1 = "7bbeb0fb45b0818a3c8a2d232cf0c723ade58ecf"; + name = "remark_lint_fenced_code_marker___remark_lint_fenced_code_marker_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-fenced-code-marker/-/remark-lint-fenced-code-marker-3.0.1.tgz"; + sha1 = "3b09baa8305f86f27c81e1f4eaffd4ac4e51e7b0"; }; } { - name = "remark_lint_file_extension___remark_lint_file_extension_1.0.5.tgz"; + name = "remark_lint_file_extension___remark_lint_file_extension_2.0.1.tgz"; path = fetchurl { - name = "remark_lint_file_extension___remark_lint_file_extension_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-file-extension/-/remark-lint-file-extension-1.0.5.tgz"; - sha1 = "7e2feec02919aa3db5c71fda19d726a9e24a4c6c"; + name = "remark_lint_file_extension___remark_lint_file_extension_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-file-extension/-/remark-lint-file-extension-2.0.1.tgz"; + sha1 = "e6777c2a322270066aa3c249d2836d326ba3f91d"; }; } { - name = "remark_lint_final_definition___remark_lint_final_definition_2.1.0.tgz"; + name = "remark_lint_final_definition___remark_lint_final_definition_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_final_definition___remark_lint_final_definition_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-final-definition/-/remark-lint-final-definition-2.1.0.tgz"; - sha1 = "b6e654c01ebcb1afc936d7b9cd74db8ec273e0bb"; + name = "remark_lint_final_definition___remark_lint_final_definition_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-final-definition/-/remark-lint-final-definition-3.0.1.tgz"; + sha1 = "9439d9531369b6a8bbbb25e2d550d5fe19a9202b"; }; } { - name = "remark_lint_hard_break_spaces___remark_lint_hard_break_spaces_2.0.1.tgz"; + name = "remark_lint_hard_break_spaces___remark_lint_hard_break_spaces_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_hard_break_spaces___remark_lint_hard_break_spaces_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-hard-break-spaces/-/remark-lint-hard-break-spaces-2.0.1.tgz"; - sha1 = "2149b55cda17604562d040c525a2a0d26aeb0f0f"; + name = "remark_lint_hard_break_spaces___remark_lint_hard_break_spaces_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-hard-break-spaces/-/remark-lint-hard-break-spaces-3.0.1.tgz"; + sha1 = "aa5a968a6ecb609fddc0b3c73e578f4eb3fdf75a"; }; } { - name = "remark_lint_heading_increment___remark_lint_heading_increment_2.0.1.tgz"; + name = "remark_lint_heading_increment___remark_lint_heading_increment_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_heading_increment___remark_lint_heading_increment_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-heading-increment/-/remark-lint-heading-increment-2.0.1.tgz"; - sha1 = "b578f251508a05d79bc2d1ae941e0620e23bf1d3"; + name = "remark_lint_heading_increment___remark_lint_heading_increment_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-heading-increment/-/remark-lint-heading-increment-3.0.1.tgz"; + sha1 = "12d264ea48b6db979433bf22b4145d116789361d"; }; } { - name = "remark_lint_heading_style___remark_lint_heading_style_2.0.1.tgz"; + name = "remark_lint_heading_style___remark_lint_heading_style_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_heading_style___remark_lint_heading_style_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-heading-style/-/remark-lint-heading-style-2.0.1.tgz"; - sha1 = "8216fca67d97bbbeec8a19b6c71bfefc16549f72"; + name = "remark_lint_heading_style___remark_lint_heading_style_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-heading-style/-/remark-lint-heading-style-3.0.1.tgz"; + sha1 = "8727db87ceab53d33c7016750acf3358b321d15f"; }; } { - name = "remark_lint_link_title_style___remark_lint_link_title_style_2.0.1.tgz"; + name = "remark_lint_link_title_style___remark_lint_link_title_style_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_link_title_style___remark_lint_link_title_style_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-link-title-style/-/remark-lint-link-title-style-2.0.1.tgz"; - sha1 = "51a595c69fcfa73a245a030dfaa3504938a1173a"; + name = "remark_lint_link_title_style___remark_lint_link_title_style_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-link-title-style/-/remark-lint-link-title-style-3.0.1.tgz"; + sha1 = "9fbbc8329cf7c693d307764662cc644415b143fe"; }; } { - name = "remark_lint_list_item_content_indent___remark_lint_list_item_content_indent_2.0.1.tgz"; + name = "remark_lint_list_item_content_indent___remark_lint_list_item_content_indent_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_list_item_content_indent___remark_lint_list_item_content_indent_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-list-item-content-indent/-/remark-lint-list-item-content-indent-2.0.1.tgz"; - sha1 = "96387459440dcd61e522ab02bff138b32bfaa63a"; + name = "remark_lint_list_item_content_indent___remark_lint_list_item_content_indent_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-list-item-content-indent/-/remark-lint-list-item-content-indent-3.0.1.tgz"; + sha1 = "1357e559e69163386f9666b20efd2951e6222416"; }; } { - name = "remark_lint_list_item_indent___remark_lint_list_item_indent_2.0.1.tgz"; + name = "remark_lint_list_item_indent___remark_lint_list_item_indent_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_list_item_indent___remark_lint_list_item_indent_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-list-item-indent/-/remark-lint-list-item-indent-2.0.1.tgz"; - sha1 = "c6472514e17bc02136ca87936260407ada90bf8d"; + name = "remark_lint_list_item_indent___remark_lint_list_item_indent_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-list-item-indent/-/remark-lint-list-item-indent-3.0.1.tgz"; + sha1 = "719ee34dec3f7b34cfd3fd2600806dc561fc748b"; }; } { - name = "remark_lint_list_item_spacing___remark_lint_list_item_spacing_3.0.0.tgz"; + name = "remark_lint_list_item_spacing___remark_lint_list_item_spacing_4.0.1.tgz"; path = fetchurl { - name = "remark_lint_list_item_spacing___remark_lint_list_item_spacing_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-list-item-spacing/-/remark-lint-list-item-spacing-3.0.0.tgz"; - sha1 = "14c18fe8c0f19231edb5cf94abda748bb773110b"; + name = "remark_lint_list_item_spacing___remark_lint_list_item_spacing_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-list-item-spacing/-/remark-lint-list-item-spacing-4.0.1.tgz"; + sha1 = "41add9734076d23671d043db09e2cd9154cd7dd5"; }; } { - name = "remark_lint_maximum_heading_length___remark_lint_maximum_heading_length_2.0.1.tgz"; + name = "remark_lint_maximum_heading_length___remark_lint_maximum_heading_length_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_maximum_heading_length___remark_lint_maximum_heading_length_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-maximum-heading-length/-/remark-lint-maximum-heading-length-2.0.1.tgz"; - sha1 = "56f240707a75b59bce3384ccc9da94548affa98f"; + name = "remark_lint_maximum_heading_length___remark_lint_maximum_heading_length_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-maximum-heading-length/-/remark-lint-maximum-heading-length-3.0.1.tgz"; + sha1 = "0ab8071f5c2fbdf8a28d23022f74c59bfdfaac75"; }; } { - name = "remark_lint_maximum_line_length___remark_lint_maximum_line_length_2.0.3.tgz"; + name = "remark_lint_maximum_line_length___remark_lint_maximum_line_length_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_maximum_line_length___remark_lint_maximum_line_length_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-maximum-line-length/-/remark-lint-maximum-line-length-2.0.3.tgz"; - sha1 = "d0d15410637d61b031a83d7c78022ec46d6c858a"; + name = "remark_lint_maximum_line_length___remark_lint_maximum_line_length_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-maximum-line-length/-/remark-lint-maximum-line-length-3.0.1.tgz"; + sha1 = "685871fd6581148a32ca38719f9f1eb16d78c30f"; }; } { - name = "remark_lint_no_auto_link_without_protocol___remark_lint_no_auto_link_without_protocol_2.0.1.tgz"; + name = "remark_lint_no_auto_link_without_protocol___remark_lint_no_auto_link_without_protocol_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_no_auto_link_without_protocol___remark_lint_no_auto_link_without_protocol_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-no-auto-link-without-protocol/-/remark-lint-no-auto-link-without-protocol-2.0.1.tgz"; - sha1 = "f75e5c24adb42385593e0d75ca39987edb70b6c4"; + name = "remark_lint_no_auto_link_without_protocol___remark_lint_no_auto_link_without_protocol_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-auto-link-without-protocol/-/remark-lint-no-auto-link-without-protocol-3.0.1.tgz"; + sha1 = "8a70874368521bb40689b5421d8279796199c493"; }; } { - name = "remark_lint_no_blockquote_without_marker___remark_lint_no_blockquote_without_marker_4.0.0.tgz"; + name = "remark_lint_no_blockquote_without_marker___remark_lint_no_blockquote_without_marker_5.0.1.tgz"; path = fetchurl { - name = "remark_lint_no_blockquote_without_marker___remark_lint_no_blockquote_without_marker_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-no-blockquote-without-marker/-/remark-lint-no-blockquote-without-marker-4.0.0.tgz"; - sha1 = "856fb64dd038fa8fc27928163caa24a30ff4d790"; + name = "remark_lint_no_blockquote_without_marker___remark_lint_no_blockquote_without_marker_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-blockquote-without-marker/-/remark-lint-no-blockquote-without-marker-5.0.1.tgz"; + sha1 = "31cb4264088b6db8c5a2824ab0a16f0ce37d5065"; }; } { - name = "remark_lint_no_consecutive_blank_lines___remark_lint_no_consecutive_blank_lines_3.0.0.tgz"; + name = "remark_lint_no_consecutive_blank_lines___remark_lint_no_consecutive_blank_lines_4.0.1.tgz"; path = fetchurl { - name = "remark_lint_no_consecutive_blank_lines___remark_lint_no_consecutive_blank_lines_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-no-consecutive-blank-lines/-/remark-lint-no-consecutive-blank-lines-3.0.0.tgz"; - sha1 = "c8fe11095b8f031a1406da273722bd4a9174bf41"; + name = "remark_lint_no_consecutive_blank_lines___remark_lint_no_consecutive_blank_lines_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-consecutive-blank-lines/-/remark-lint-no-consecutive-blank-lines-4.0.1.tgz"; + sha1 = "e9ff3613e25d42bd004e8ab065609a0393f16f2b"; }; } { - name = "remark_lint_no_duplicate_headings___remark_lint_no_duplicate_headings_2.0.1.tgz"; + name = "remark_lint_no_duplicate_headings___remark_lint_no_duplicate_headings_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_no_duplicate_headings___remark_lint_no_duplicate_headings_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-no-duplicate-headings/-/remark-lint-no-duplicate-headings-2.0.1.tgz"; - sha1 = "4a4b70e029155ebcfc03d8b2358c427b69a87576"; + name = "remark_lint_no_duplicate_headings___remark_lint_no_duplicate_headings_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-duplicate-headings/-/remark-lint-no-duplicate-headings-3.0.1.tgz"; + sha1 = "9db2ba686606226178d6563a0213e83ac7a22c15"; }; } { - name = "remark_lint_no_emphasis_as_heading___remark_lint_no_emphasis_as_heading_2.0.1.tgz"; + name = "remark_lint_no_emphasis_as_heading___remark_lint_no_emphasis_as_heading_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_no_emphasis_as_heading___remark_lint_no_emphasis_as_heading_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-no-emphasis-as-heading/-/remark-lint-no-emphasis-as-heading-2.0.1.tgz"; - sha1 = "fcc064133fe00745943c334080fed822f72711ea"; + name = "remark_lint_no_emphasis_as_heading___remark_lint_no_emphasis_as_heading_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-emphasis-as-heading/-/remark-lint-no-emphasis-as-heading-3.0.1.tgz"; + sha1 = "0290da33cbce79b72ddf28f9878fccad64d3a0f2"; }; } { - name = "remark_lint_no_file_name_articles___remark_lint_no_file_name_articles_1.0.5.tgz"; + name = "remark_lint_no_file_name_articles___remark_lint_no_file_name_articles_2.0.1.tgz"; path = fetchurl { - name = "remark_lint_no_file_name_articles___remark_lint_no_file_name_articles_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-no-file-name-articles/-/remark-lint-no-file-name-articles-1.0.5.tgz"; - sha1 = "4ca3425f6613f94feaef6941028583299727c339"; + name = "remark_lint_no_file_name_articles___remark_lint_no_file_name_articles_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-file-name-articles/-/remark-lint-no-file-name-articles-2.0.1.tgz"; + sha1 = "1265a3dab489f5c07a1c3e8a2167124ef5bd030f"; }; } { - name = "remark_lint_no_file_name_consecutive_dashes___remark_lint_no_file_name_consecutive_dashes_1.0.5.tgz"; + name = "remark_lint_no_file_name_consecutive_dashes___remark_lint_no_file_name_consecutive_dashes_2.0.1.tgz"; path = fetchurl { - name = "remark_lint_no_file_name_consecutive_dashes___remark_lint_no_file_name_consecutive_dashes_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-no-file-name-consecutive-dashes/-/remark-lint-no-file-name-consecutive-dashes-1.0.5.tgz"; - sha1 = "e9a6f2aeab948aa249c8a8356359e3d8843a4c5c"; + name = "remark_lint_no_file_name_consecutive_dashes___remark_lint_no_file_name_consecutive_dashes_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-file-name-consecutive-dashes/-/remark-lint-no-file-name-consecutive-dashes-2.0.1.tgz"; + sha1 = "cab34dce03381b15dac50188198c24303bde4e71"; }; } { - name = "remark_lint_no_file_name_irregular_characters___remark_lint_no_file_name_irregular_characters_1.0.5.tgz"; + name = "remark_lint_no_file_name_irregular_characters___remark_lint_no_file_name_irregular_characters_2.0.1.tgz"; path = fetchurl { - name = "remark_lint_no_file_name_irregular_characters___remark_lint_no_file_name_irregular_characters_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-no-file-name-irregular-characters/-/remark-lint-no-file-name-irregular-characters-1.0.5.tgz"; - sha1 = "6866f5b8370cdc916d55e7cf87bb6a55f9b6e0c6"; + name = "remark_lint_no_file_name_irregular_characters___remark_lint_no_file_name_irregular_characters_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-file-name-irregular-characters/-/remark-lint-no-file-name-irregular-characters-2.0.1.tgz"; + sha1 = "7188d6bca6618d667237ceb553bf7a19fb421dd1"; }; } { - name = "remark_lint_no_file_name_mixed_case___remark_lint_no_file_name_mixed_case_1.0.5.tgz"; + name = "remark_lint_no_file_name_mixed_case___remark_lint_no_file_name_mixed_case_2.0.1.tgz"; path = fetchurl { - name = "remark_lint_no_file_name_mixed_case___remark_lint_no_file_name_mixed_case_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-no-file-name-mixed-case/-/remark-lint-no-file-name-mixed-case-1.0.5.tgz"; - sha1 = "3e37bfef74bbdd4b07aa9ef9dd452758f8b46731"; + name = "remark_lint_no_file_name_mixed_case___remark_lint_no_file_name_mixed_case_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-file-name-mixed-case/-/remark-lint-no-file-name-mixed-case-2.0.1.tgz"; + sha1 = "2e200fdb19d8b3249ba3cddbddf35c52590b7c1a"; }; } { - name = "remark_lint_no_file_name_outer_dashes___remark_lint_no_file_name_outer_dashes_1.0.6.tgz"; + name = "remark_lint_no_file_name_outer_dashes___remark_lint_no_file_name_outer_dashes_2.0.1.tgz"; path = fetchurl { - name = "remark_lint_no_file_name_outer_dashes___remark_lint_no_file_name_outer_dashes_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-no-file-name-outer-dashes/-/remark-lint-no-file-name-outer-dashes-1.0.6.tgz"; - sha1 = "4e0e4d42a63f0fdfb856bb5d8d8112725656e700"; + name = "remark_lint_no_file_name_outer_dashes___remark_lint_no_file_name_outer_dashes_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-file-name-outer-dashes/-/remark-lint-no-file-name-outer-dashes-2.0.1.tgz"; + sha1 = "536344895ab351d8712180dd63ade2f59849fcef"; }; } { - name = "remark_lint_no_heading_punctuation___remark_lint_no_heading_punctuation_2.0.1.tgz"; + name = "remark_lint_no_heading_punctuation___remark_lint_no_heading_punctuation_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_no_heading_punctuation___remark_lint_no_heading_punctuation_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-no-heading-punctuation/-/remark-lint-no-heading-punctuation-2.0.1.tgz"; - sha1 = "face59f9a95c8aa278a8ee0c728bc44cd53ea9ed"; + name = "remark_lint_no_heading_punctuation___remark_lint_no_heading_punctuation_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-heading-punctuation/-/remark-lint-no-heading-punctuation-3.0.1.tgz"; + sha1 = "e21744d80e7f06cb9c984c0bd4e3f3a284b51afd"; }; } { - name = "remark_lint_no_inline_padding___remark_lint_no_inline_padding_3.0.0.tgz"; + name = "remark_lint_no_inline_padding___remark_lint_no_inline_padding_4.0.1.tgz"; path = fetchurl { - name = "remark_lint_no_inline_padding___remark_lint_no_inline_padding_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-no-inline-padding/-/remark-lint-no-inline-padding-3.0.0.tgz"; - sha1 = "14c2722bcddc648297a54298107a922171faf6eb"; + name = "remark_lint_no_inline_padding___remark_lint_no_inline_padding_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-inline-padding/-/remark-lint-no-inline-padding-4.0.1.tgz"; + sha1 = "a89d4fd639e888ee97cac811b9c950f1787a08a5"; }; } { - name = "remark_lint_no_literal_urls___remark_lint_no_literal_urls_2.0.1.tgz"; + name = "remark_lint_no_literal_urls___remark_lint_no_literal_urls_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_no_literal_urls___remark_lint_no_literal_urls_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-no-literal-urls/-/remark-lint-no-literal-urls-2.0.1.tgz"; - sha1 = "731908f9866c1880e6024dcee1269fb0f40335d6"; + name = "remark_lint_no_literal_urls___remark_lint_no_literal_urls_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-literal-urls/-/remark-lint-no-literal-urls-3.0.1.tgz"; + sha1 = "af87cc111f942a43edf2d2cc27d199b7785be141"; }; } { - name = "remark_lint_no_multiple_toplevel_headings___remark_lint_no_multiple_toplevel_headings_2.0.1.tgz"; + name = "remark_lint_no_multiple_toplevel_headings___remark_lint_no_multiple_toplevel_headings_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_no_multiple_toplevel_headings___remark_lint_no_multiple_toplevel_headings_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-no-multiple-toplevel-headings/-/remark-lint-no-multiple-toplevel-headings-2.0.1.tgz"; - sha1 = "3ff2b505adf720f4ff2ad2b1021f8cfd50ad8635"; + name = "remark_lint_no_multiple_toplevel_headings___remark_lint_no_multiple_toplevel_headings_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-multiple-toplevel-headings/-/remark-lint-no-multiple-toplevel-headings-3.0.1.tgz"; + sha1 = "08e03c3b102748835bc7077fbec9b0543c8feff4"; }; } { - name = "remark_lint_no_shell_dollars___remark_lint_no_shell_dollars_2.0.2.tgz"; + name = "remark_lint_no_shell_dollars___remark_lint_no_shell_dollars_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_no_shell_dollars___remark_lint_no_shell_dollars_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-no-shell-dollars/-/remark-lint-no-shell-dollars-2.0.2.tgz"; - sha1 = "b2c6c3ed95e5615f8e5f031c7d271a18dc17618e"; + name = "remark_lint_no_shell_dollars___remark_lint_no_shell_dollars_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-shell-dollars/-/remark-lint-no-shell-dollars-3.0.1.tgz"; + sha1 = "e9c092e07be2e308abd49b54c253010efb3e654c"; }; } { - name = "remark_lint_no_shortcut_reference_image___remark_lint_no_shortcut_reference_image_2.0.1.tgz"; + name = "remark_lint_no_shortcut_reference_image___remark_lint_no_shortcut_reference_image_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_no_shortcut_reference_image___remark_lint_no_shortcut_reference_image_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-no-shortcut-reference-image/-/remark-lint-no-shortcut-reference-image-2.0.1.tgz"; - sha1 = "d174d12a57e8307caf6232f61a795bc1d64afeaa"; + name = "remark_lint_no_shortcut_reference_image___remark_lint_no_shortcut_reference_image_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-shortcut-reference-image/-/remark-lint-no-shortcut-reference-image-3.0.1.tgz"; + sha1 = "3cef27ef939debd385d9d3ba21bfb8afd3e011b4"; }; } { - name = "remark_lint_no_shortcut_reference_link___remark_lint_no_shortcut_reference_link_2.0.1.tgz"; + name = "remark_lint_no_shortcut_reference_link___remark_lint_no_shortcut_reference_link_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_no_shortcut_reference_link___remark_lint_no_shortcut_reference_link_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-no-shortcut-reference-link/-/remark-lint-no-shortcut-reference-link-2.0.1.tgz"; - sha1 = "8f963f81036e45cfb7061b3639e9c6952308bc94"; + name = "remark_lint_no_shortcut_reference_link___remark_lint_no_shortcut_reference_link_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-shortcut-reference-link/-/remark-lint-no-shortcut-reference-link-3.0.1.tgz"; + sha1 = "3104ed6b82c6234eb6187481243f1b3890a1d506"; }; } { - name = "remark_lint_no_table_indentation___remark_lint_no_table_indentation_3.0.0.tgz"; + name = "remark_lint_no_table_indentation___remark_lint_no_table_indentation_4.0.1.tgz"; path = fetchurl { - name = "remark_lint_no_table_indentation___remark_lint_no_table_indentation_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-no-table-indentation/-/remark-lint-no-table-indentation-3.0.0.tgz"; - sha1 = "f3c3fc24375069ec8e510f43050600fb22436731"; + name = "remark_lint_no_table_indentation___remark_lint_no_table_indentation_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-no-table-indentation/-/remark-lint-no-table-indentation-4.0.1.tgz"; + sha1 = "13a41252021b245ca60bfbe5a578755421316e65"; }; } { - name = "remark_lint_ordered_list_marker_style___remark_lint_ordered_list_marker_style_2.0.1.tgz"; + name = "remark_lint_ordered_list_marker_style___remark_lint_ordered_list_marker_style_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_ordered_list_marker_style___remark_lint_ordered_list_marker_style_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-ordered-list-marker-style/-/remark-lint-ordered-list-marker-style-2.0.1.tgz"; - sha1 = "183c31967e6f2ae8ef00effad03633f7fd00ffaa"; + name = "remark_lint_ordered_list_marker_style___remark_lint_ordered_list_marker_style_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-ordered-list-marker-style/-/remark-lint-ordered-list-marker-style-3.0.1.tgz"; + sha1 = "56f6a94d88dd8c74b8e444cd970bb3be6a575606"; }; } { - name = "remark_lint_ordered_list_marker_value___remark_lint_ordered_list_marker_value_2.0.1.tgz"; + name = "remark_lint_ordered_list_marker_value___remark_lint_ordered_list_marker_value_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_ordered_list_marker_value___remark_lint_ordered_list_marker_value_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-ordered-list-marker-value/-/remark-lint-ordered-list-marker-value-2.0.1.tgz"; - sha1 = "0de343de2efb41f01eae9f0f7e7d30fe43db5595"; + name = "remark_lint_ordered_list_marker_value___remark_lint_ordered_list_marker_value_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-ordered-list-marker-value/-/remark-lint-ordered-list-marker-value-3.0.1.tgz"; + sha1 = "1296c0a758df6ea2e918769f013bff10ff5bd0d9"; }; } { - name = "remark_lint_rule_style___remark_lint_rule_style_2.0.1.tgz"; + name = "remark_lint_rule_style___remark_lint_rule_style_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_rule_style___remark_lint_rule_style_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-rule-style/-/remark-lint-rule-style-2.0.1.tgz"; - sha1 = "f59bd82e75d3eaabd0eee1c8c0f5513372eb553c"; + name = "remark_lint_rule_style___remark_lint_rule_style_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-rule-style/-/remark-lint-rule-style-3.0.1.tgz"; + sha1 = "2473b4d8d866e6f27ef968d7071d2ed719ce999c"; }; } { - name = "remark_lint_strong_marker___remark_lint_strong_marker_2.0.1.tgz"; + name = "remark_lint_strong_marker___remark_lint_strong_marker_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_strong_marker___remark_lint_strong_marker_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-strong-marker/-/remark-lint-strong-marker-2.0.1.tgz"; - sha1 = "1ad8f190c6ac0f8138b638965ccf3bcd18f6d4e4"; + name = "remark_lint_strong_marker___remark_lint_strong_marker_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-strong-marker/-/remark-lint-strong-marker-3.0.1.tgz"; + sha1 = "54119b529d152ea7294ac761e866a3a6244c4405"; }; } { - name = "remark_lint_table_cell_padding___remark_lint_table_cell_padding_3.0.0.tgz"; + name = "remark_lint_table_cell_padding___remark_lint_table_cell_padding_4.0.1.tgz"; path = fetchurl { - name = "remark_lint_table_cell_padding___remark_lint_table_cell_padding_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-table-cell-padding/-/remark-lint-table-cell-padding-3.0.0.tgz"; - sha1 = "a769ba1999984ff5f90294fb6ccb8aead7e8a12f"; + name = "remark_lint_table_cell_padding___remark_lint_table_cell_padding_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-table-cell-padding/-/remark-lint-table-cell-padding-4.0.1.tgz"; + sha1 = "0cfc515af12f4c2f123e8b5895a9ae635142f7e3"; }; } { - name = "remark_lint_table_pipe_alignment___remark_lint_table_pipe_alignment_2.0.1.tgz"; + name = "remark_lint_table_pipe_alignment___remark_lint_table_pipe_alignment_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_table_pipe_alignment___remark_lint_table_pipe_alignment_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-table-pipe-alignment/-/remark-lint-table-pipe-alignment-2.0.1.tgz"; - sha1 = "12b7e4c54473d69c9866cb33439c718d09cffcc5"; + name = "remark_lint_table_pipe_alignment___remark_lint_table_pipe_alignment_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-table-pipe-alignment/-/remark-lint-table-pipe-alignment-3.0.1.tgz"; + sha1 = "70517c20ca24e4da830f71e09c39aabab1e5382e"; }; } { - name = "remark_lint_table_pipes___remark_lint_table_pipes_3.0.0.tgz"; + name = "remark_lint_table_pipes___remark_lint_table_pipes_4.0.1.tgz"; path = fetchurl { - name = "remark_lint_table_pipes___remark_lint_table_pipes_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-table-pipes/-/remark-lint-table-pipes-3.0.0.tgz"; - sha1 = "b30b055d594cae782667eec91c6c5b35928ab259"; + name = "remark_lint_table_pipes___remark_lint_table_pipes_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-table-pipes/-/remark-lint-table-pipes-4.0.1.tgz"; + sha1 = "529d6d5569eed1129b912df3c748005cc2f82046"; }; } { - name = "remark_lint_unordered_list_marker_style___remark_lint_unordered_list_marker_style_2.0.1.tgz"; + name = "remark_lint_unordered_list_marker_style___remark_lint_unordered_list_marker_style_3.0.1.tgz"; path = fetchurl { - name = "remark_lint_unordered_list_marker_style___remark_lint_unordered_list_marker_style_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-lint-unordered-list-marker-style/-/remark-lint-unordered-list-marker-style-2.0.1.tgz"; - sha1 = "e64692aa9594dbe7e945ae76ab2218949cd92477"; + name = "remark_lint_unordered_list_marker_style___remark_lint_unordered_list_marker_style_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint-unordered-list-marker-style/-/remark-lint-unordered-list-marker-style-3.0.1.tgz"; + sha1 = "f50b3359444d32363541bd26e30e091eb9b4d866"; }; } { - name = "remark_lint___remark_lint_8.0.0.tgz"; + name = "remark_lint___remark_lint_9.0.1.tgz"; path = fetchurl { - name = "remark_lint___remark_lint_8.0.0.tgz"; - url = "https://registry.yarnpkg.com/remark-lint/-/remark-lint-8.0.0.tgz"; - sha1 = "6e40894f4a39eaea31fc4dd45abfaba948bf9a09"; + name = "remark_lint___remark_lint_9.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-lint/-/remark-lint-9.0.1.tgz"; + sha1 = "85ede987d24b7def9a6cea4a4d40c2035723eaec"; }; } { - name = "remark_message_control___remark_message_control_6.0.0.tgz"; + name = "remark_message_control___remark_message_control_7.0.0.tgz"; path = fetchurl { - name = "remark_message_control___remark_message_control_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/remark-message-control/-/remark-message-control-6.0.0.tgz"; - sha1 = "955b054b38c197c9f2e35b1d88a4912949db7fc5"; + name = "remark_message_control___remark_message_control_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/remark-message-control/-/remark-message-control-7.0.0.tgz"; + sha1 = "ba83d212fbde3e5e2adabd30697bf80b0b709ef7"; }; } { - name = "remark_parse___remark_parse_9.0.0.tgz"; + name = "remark_parse___remark_parse_10.0.0.tgz"; path = fetchurl { - name = "remark_parse___remark_parse_9.0.0.tgz"; - url = "https://registry.yarnpkg.com/remark-parse/-/remark-parse-9.0.0.tgz"; - sha1 = "4d20a299665880e4f4af5d90b7c7b8a935853640"; + name = "remark_parse___remark_parse_10.0.0.tgz"; + url = "https://registry.yarnpkg.com/remark-parse/-/remark-parse-10.0.0.tgz"; + sha1 = "65e2b2b34d8581d36b97f12a2926bb2126961cb4"; }; } { - name = "remark_preset_lint_markdown_style_guide___remark_preset_lint_markdown_style_guide_4.0.0.tgz"; + name = "remark_preset_lint_markdown_style_guide___remark_preset_lint_markdown_style_guide_5.0.1.tgz"; path = fetchurl { - name = "remark_preset_lint_markdown_style_guide___remark_preset_lint_markdown_style_guide_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/remark-preset-lint-markdown-style-guide/-/remark-preset-lint-markdown-style-guide-4.0.0.tgz"; - sha1 = "976b6ffd7f37aa90868e081a69241fcde3a297d4"; + name = "remark_preset_lint_markdown_style_guide___remark_preset_lint_markdown_style_guide_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark-preset-lint-markdown-style-guide/-/remark-preset-lint-markdown-style-guide-5.0.1.tgz"; + sha1 = "a53018e4e44f4417b911968ee1ecc49aa3cff6a7"; }; } { - name = "remark_stringify___remark_stringify_9.0.1.tgz"; + name = "remark_stringify___remark_stringify_10.0.0.tgz"; path = fetchurl { - name = "remark_stringify___remark_stringify_9.0.1.tgz"; - url = "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-9.0.1.tgz"; - sha1 = "576d06e910548b0a7191a71f27b33f1218862894"; + name = "remark_stringify___remark_stringify_10.0.0.tgz"; + url = "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-10.0.0.tgz"; + sha1 = "7f23659d92b2d5da489e3c858656d7bbe045f161"; }; } { - name = "remark___remark_13.0.0.tgz"; + name = "remark___remark_14.0.1.tgz"; path = fetchurl { - name = "remark___remark_13.0.0.tgz"; - url = "https://registry.yarnpkg.com/remark/-/remark-13.0.0.tgz"; - sha1 = "d15d9bf71a402f40287ebe36067b66d54868e425"; + name = "remark___remark_14.0.1.tgz"; + url = "https://registry.yarnpkg.com/remark/-/remark-14.0.1.tgz"; + sha1 = "a97280d4f2a3010a7d81e6c292a310dcd5554d80"; }; } { @@ -10074,11 +10138,11 @@ }; } { - name = "renderkid___renderkid_2.0.5.tgz"; + name = "renderkid___renderkid_2.0.7.tgz"; path = fetchurl { - name = "renderkid___renderkid_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.5.tgz"; - sha1 = "483b1ac59c6601ab30a7a596a5965cabccfdd0a5"; + name = "renderkid___renderkid_2.0.7.tgz"; + url = "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.7.tgz"; + sha1 = "464f276a6bdcee606f4a15993f9b29fc74ca8609"; }; } { @@ -10138,14 +10202,6 @@ }; } { - name = "resolve_from___resolve_from_3.0.0.tgz"; - path = fetchurl { - name = "resolve_from___resolve_from_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz"; - sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; - }; - } - { name = "resolve_from___resolve_from_4.0.0.tgz"; path = fetchurl { name = "resolve_from___resolve_from_4.0.0.tgz"; @@ -10210,22 +10266,6 @@ }; } { - name = "rgb_regex___rgb_regex_1.0.1.tgz"; - path = fetchurl { - name = "rgb_regex___rgb_regex_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz"; - sha1 = "c0e0d6882df0e23be254a475e8edd41915feaeb1"; - }; - } - { - name = "rgba_regex___rgba_regex_1.0.0.tgz"; - path = fetchurl { - name = "rgba_regex___rgba_regex_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz"; - sha1 = "43374e2e2ca0968b0ef1523460b7d730ff22eeb3"; - }; - } - { name = "rimraf___rimraf_2.7.1.tgz"; path = fetchurl { name = "rimraf___rimraf_2.7.1.tgz"; @@ -10274,14 +10314,6 @@ }; } { - name = "safe_buffer___safe_buffer_5.2.1.tgz"; - path = fetchurl { - name = "safe_buffer___safe_buffer_5.2.1.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; - }; - } - { name = "safe_buffer___safe_buffer_5.1.2.tgz"; path = fetchurl { name = "safe_buffer___safe_buffer_5.1.2.tgz"; @@ -10290,11 +10322,11 @@ }; } { - name = "safe_buffer___safe_buffer_5.2.0.tgz"; + name = "safe_buffer___safe_buffer_5.2.1.tgz"; path = fetchurl { - name = "safe_buffer___safe_buffer_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz"; - sha1 = "b74daec49b1148f88c64b68d49b1e815c1f2f519"; + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; }; } { @@ -10346,19 +10378,11 @@ }; } { - name = "schema_utils___schema_utils_3.0.0.tgz"; - path = fetchurl { - name = "schema_utils___schema_utils_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz"; - sha1 = "67502f6aa2b66a2d4032b4279a2944978a0913ef"; - }; - } - { - name = "script_loader___script_loader_0.7.2.tgz"; + name = "schema_utils___schema_utils_3.1.1.tgz"; path = fetchurl { - name = "script_loader___script_loader_0.7.2.tgz"; - url = "https://registry.yarnpkg.com/script-loader/-/script-loader-0.7.2.tgz"; - sha1 = "2016db6f86f25f5cf56da38915d83378bb166ba7"; + name = "schema_utils___schema_utils_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz"; + sha1 = "bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"; }; } { @@ -10378,14 +10402,6 @@ }; } { - name = "select___select_1.1.2.tgz"; - path = fetchurl { - name = "select___select_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz"; - sha1 = "0e7350acdec80b1108528786ec1d4418d11b396d"; - }; - } - { name = "semver_compare___semver_compare_1.0.0.tgz"; path = fetchurl { name = "semver_compare___semver_compare_1.0.0.tgz"; @@ -10458,11 +10474,11 @@ }; } { - name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; + name = "serialize_javascript___serialize_javascript_6.0.0.tgz"; path = fetchurl { - name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; - sha1 = "7886ec848049a462467a97d3d918ebb2aaf934f4"; + name = "serialize_javascript___serialize_javascript_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz"; + sha1 = "efae5d88f45d7924141da8b5c3a7a7e663fefeb8"; }; } { @@ -10474,6 +10490,14 @@ }; } { + name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; + path = fetchurl { + name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; + sha1 = "7886ec848049a462467a97d3d918ebb2aaf934f4"; + }; + } + { name = "serve_static___serve_static_1.14.1.tgz"; path = fetchurl { name = "serve_static___serve_static_1.14.1.tgz"; @@ -10610,14 +10634,6 @@ }; } { - name = "sliced___sliced_1.0.1.tgz"; - path = fetchurl { - name = "sliced___sliced_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/sliced/-/sliced-1.0.1.tgz"; - sha1 = "0b3a662b5d04c3177b1926bea82b03f837a2ef41"; - }; - } - { name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; path = fetchurl { name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; @@ -10698,6 +10714,14 @@ }; } { + name = "source_map_js___source_map_js_0.6.2.tgz"; + path = fetchurl { + name = "source_map_js___source_map_js_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz"; + sha1 = "0bb5de631b41cfbda6cfba8bd05a80efdfd2385e"; + }; + } + { name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; path = fetchurl { name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; @@ -10714,11 +10738,11 @@ }; } { - name = "source_map_support___source_map_support_0.5.19.tgz"; + name = "source_map_support___source_map_support_0.5.20.tgz"; path = fetchurl { - name = "source_map_support___source_map_support_0.5.19.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; - sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; + name = "source_map_support___source_map_support_0.5.20.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz"; + sha1 = "12166089f8f5e5e8c56926b377633392dd2cb6c9"; }; } { @@ -10754,6 +10778,14 @@ }; } { + name = "space_separated_tokens___space_separated_tokens_2.0.1.tgz"; + path = fetchurl { + name = "space_separated_tokens___space_separated_tokens_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-2.0.1.tgz"; + sha1 = "43193cec4fb858a2ce934b7f98b7f2c18107098b"; + }; + } + { name = "spdx_correct___spdx_correct_3.1.1.tgz"; path = fetchurl { name = "spdx_correct___spdx_correct_3.1.1.tgz"; @@ -10778,19 +10810,19 @@ }; } { - name = "spdx_license_ids___spdx_license_ids_3.0.7.tgz"; + name = "spdx_license_ids___spdx_license_ids_3.0.10.tgz"; path = fetchurl { - name = "spdx_license_ids___spdx_license_ids_3.0.7.tgz"; - url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz"; - sha1 = "e9c18a410e5ed7e12442a549fbd8afa767038d65"; + name = "spdx_license_ids___spdx_license_ids_3.0.10.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz"; + sha1 = "0d9becccde7003d6c658d487dd48a32f0bf3014b"; }; } { - name = "spin.js___spin.js_4.1.0.tgz"; + name = "spin.js___spin.js_4.1.1.tgz"; path = fetchurl { - name = "spin.js___spin.js_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/spin.js/-/spin.js-4.1.0.tgz"; - sha1 = "afcf12738fafd5f6aa0a385a5b4cec45c86a3555"; + name = "spin.js___spin.js_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/spin.js/-/spin.js-4.1.1.tgz"; + sha1 = "567464a08620541e523da856cb5f67af2d0f48ad"; }; } { @@ -10978,6 +11010,14 @@ }; } { + name = "string_width___string_width_5.0.1.tgz"; + path = fetchurl { + name = "string_width___string_width_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-5.0.1.tgz"; + sha1 = "0d8158335a6cfd8eb95da9b6b262ce314a036ffd"; + }; + } + { name = "string.prototype.trimend___string.prototype.trimend_1.0.4.tgz"; path = fetchurl { name = "string.prototype.trimend___string.prototype.trimend_1.0.4.tgz"; @@ -11026,6 +11066,14 @@ }; } { + name = "stringify_entities___stringify_entities_4.0.1.tgz"; + path = fetchurl { + name = "stringify_entities___stringify_entities_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-4.0.1.tgz"; + sha1 = "f483c9ca8d7e029edec9863c5a37c1f1e7702c8d"; + }; + } + { name = "strip_ansi___strip_ansi_3.0.1.tgz"; path = fetchurl { name = "strip_ansi___strip_ansi_3.0.1.tgz"; @@ -11050,6 +11098,14 @@ }; } { + name = "strip_ansi___strip_ansi_7.0.1.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz"; + sha1 = "61740a08ce36b61e50e65653f07060d000975fb2"; + }; + } + { name = "strip_ansi___strip_ansi_0.1.1.tgz"; path = fetchurl { name = "strip_ansi___strip_ansi_0.1.1.tgz"; @@ -11098,27 +11154,35 @@ }; } { - name = "strtok3___strtok3_6.0.8.tgz"; + name = "strnum___strnum_1.0.3.tgz"; + path = fetchurl { + name = "strnum___strnum_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/strnum/-/strnum-1.0.3.tgz"; + sha1 = "bbc438bcb35fbbfc9c1e82f73097665b6ec6959e"; + }; + } + { + name = "strtok3___strtok3_6.2.4.tgz"; path = fetchurl { - name = "strtok3___strtok3_6.0.8.tgz"; - url = "https://registry.yarnpkg.com/strtok3/-/strtok3-6.0.8.tgz"; - sha1 = "c839157f615c10ba0f4ae35067dad9959eeca346"; + name = "strtok3___strtok3_6.2.4.tgz"; + url = "https://registry.yarnpkg.com/strtok3/-/strtok3-6.2.4.tgz"; + sha1 = "302aea64c0fa25d12a0385069ba66253fdc38a81"; }; } { - name = "stylehacks___stylehacks_4.0.3.tgz"; + name = "stylehacks___stylehacks_5.0.1.tgz"; path = fetchurl { - name = "stylehacks___stylehacks_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz"; - sha1 = "6718fcaf4d1e07d8a1318690881e8d96726a71d5"; + name = "stylehacks___stylehacks_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.1.tgz"; + sha1 = "323ec554198520986806388c7fdaebc38d2c06fb"; }; } { - name = "stylis___stylis_3.5.4.tgz"; + name = "stylis___stylis_4.0.10.tgz"; path = fetchurl { - name = "stylis___stylis_3.5.4.tgz"; - url = "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz"; - sha1 = "f665f25f5e299cf3d64654ab949a57c768b73fbe"; + name = "stylis___stylis_4.0.10.tgz"; + url = "https://registry.yarnpkg.com/stylis/-/stylis-4.0.10.tgz"; + sha1 = "446512d1097197ab3f02fb3c258358c3f7a14240"; }; } { @@ -11154,14 +11218,6 @@ }; } { - name = "supports_color___supports_color_6.1.0.tgz"; - path = fetchurl { - name = "supports_color___supports_color_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz"; - sha1 = "0764abc69c63d5ac842dd4867e8d025e880df8f3"; - }; - } - { name = "supports_color___supports_color_7.2.0.tgz"; path = fetchurl { name = "supports_color___supports_color_7.2.0.tgz"; @@ -11170,19 +11226,27 @@ }; } { - name = "svgo___svgo_1.3.2.tgz"; + name = "supports_color___supports_color_9.0.2.tgz"; path = fetchurl { - name = "svgo___svgo_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz"; - sha1 = "b6dc511c063346c9e415b81e43401145b96d4167"; + name = "supports_color___supports_color_9.0.2.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-9.0.2.tgz"; + sha1 = "50f082888e4b0a4e2ccd2d0b4f9ef4efcd332485"; }; } { - name = "table___table_6.7.0.tgz"; + name = "svgo___svgo_2.6.0.tgz"; path = fetchurl { - name = "table___table_6.7.0.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-6.7.0.tgz"; - sha1 = "26274751f0ee099c547f6cb91d3eff0d61d155b2"; + name = "svgo___svgo_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/svgo/-/svgo-2.6.0.tgz"; + sha1 = "f7d3064a91b0804ea28a9dbfc3b36ba2ed4dd8d4"; + }; + } + { + name = "table___table_6.7.1.tgz"; + path = fetchurl { + name = "table___table_6.7.1.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz"; + sha1 = "ee05592b7143831a8c94f3cee6aae4c1ccef33e2"; }; } { @@ -11194,6 +11258,14 @@ }; } { + name = "tapable___tapable_2.2.1.tgz"; + path = fetchurl { + name = "tapable___tapable_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz"; + sha1 = "1967a73ef4060a82f12ab96af86d52fdb76eeca0"; + }; + } + { name = "tar_stream___tar_stream_2.2.0.tgz"; path = fetchurl { name = "tar_stream___tar_stream_2.2.0.tgz"; @@ -11210,19 +11282,19 @@ }; } { - name = "tar___tar_4.4.13.tgz"; + name = "tar___tar_4.4.19.tgz"; path = fetchurl { - name = "tar___tar_4.4.13.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz"; - sha1 = "43b364bc52888d555298637b10d60790254ab525"; + name = "tar___tar_4.4.19.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz"; + sha1 = "2e4d7263df26f2b914dee10c825ab132123742f3"; }; } { - name = "tar___tar_6.1.0.tgz"; + name = "tar___tar_6.1.11.tgz"; path = fetchurl { - name = "tar___tar_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz"; - sha1 = "d1724e9bcc04b977b18d5c573b333a2207229a83"; + name = "tar___tar_6.1.11.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz"; + sha1 = "6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"; }; } { @@ -11234,14 +11306,6 @@ }; } { - name = "tedious___tedious_6.7.0.tgz"; - path = fetchurl { - name = "tedious___tedious_6.7.0.tgz"; - url = "https://registry.yarnpkg.com/tedious/-/tedious-6.7.0.tgz"; - sha1 = "ad02365f16f9e0416b216e13d3f83c53addd42ca"; - }; - } - { name = "terser_webpack_plugin___terser_webpack_plugin_1.4.5.tgz"; path = fetchurl { name = "terser_webpack_plugin___terser_webpack_plugin_1.4.5.tgz"; @@ -11306,14 +11370,6 @@ }; } { - name = "tiny_emitter___tiny_emitter_2.1.0.tgz"; - path = fetchurl { - name = "tiny_emitter___tiny_emitter_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz"; - sha1 = "1d1a56edfc51c43e863cbb5382a72330e3555423"; - }; - } - { name = "to_array___to_array_0.1.4.tgz"; path = fetchurl { name = "to_array___to_array_0.1.4.tgz"; @@ -11370,11 +11426,11 @@ }; } { - name = "to_vfile___to_vfile_6.1.0.tgz"; + name = "to_vfile___to_vfile_7.2.2.tgz"; path = fetchurl { - name = "to_vfile___to_vfile_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/to-vfile/-/to-vfile-6.1.0.tgz"; - sha1 = "5f7a3f65813c2c4e34ee1f7643a5646344627699"; + name = "to_vfile___to_vfile_7.2.2.tgz"; + url = "https://registry.yarnpkg.com/to-vfile/-/to-vfile-7.2.2.tgz"; + sha1 = "5976568397ef664bc8df210676d082478822afbf"; }; } { @@ -11386,11 +11442,11 @@ }; } { - name = "token_types___token_types_2.1.1.tgz"; + name = "token_types___token_types_4.1.1.tgz"; path = fetchurl { - name = "token_types___token_types_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/token-types/-/token-types-2.1.1.tgz"; - sha1 = "bd585d64902aaf720b8979d257b4b850b4d45c45"; + name = "token_types___token_types_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/token-types/-/token-types-4.1.1.tgz"; + sha1 = "ef9e8c8e2e0ded9f1b3f8dbaa46a3228b113ba1a"; }; } { @@ -11434,35 +11490,19 @@ }; } { - name = "trough___trough_1.0.5.tgz"; - path = fetchurl { - name = "trough___trough_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/trough/-/trough-1.0.5.tgz"; - sha1 = "b8b639cefad7d0bb2abd37d433ff8293efa5f406"; - }; - } - { - name = "try_catch___try_catch_2.0.1.tgz"; - path = fetchurl { - name = "try_catch___try_catch_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/try-catch/-/try-catch-2.0.1.tgz"; - sha1 = "a35d354187c422f291a0bcfd9eb77e3a4f90c1e5"; - }; - } - { - name = "try_to_catch___try_to_catch_1.1.1.tgz"; + name = "trough___trough_2.0.2.tgz"; path = fetchurl { - name = "try_to_catch___try_to_catch_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/try-to-catch/-/try-to-catch-1.1.1.tgz"; - sha1 = "770162dd13b9a0e55da04db5b7f888956072038a"; + name = "trough___trough_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/trough/-/trough-2.0.2.tgz"; + sha1 = "94a3aa9d5ce379fc561f6244905b3f36b7458d96"; }; } { - name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; + name = "tsconfig_paths___tsconfig_paths_3.11.0.tgz"; path = fetchurl { - name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; - url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz"; - sha1 = "098547a6c4448807e8fcb8eae081064ee9a3c90b"; + name = "tsconfig_paths___tsconfig_paths_3.11.0.tgz"; + url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz"; + sha1 = "954c1fe973da6339c78e06b03ce2e48810b65f36"; }; } { @@ -11474,11 +11514,11 @@ }; } { - name = "tslib___tslib_2.2.0.tgz"; + name = "tslib___tslib_2.3.1.tgz"; path = fetchurl { - name = "tslib___tslib_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz"; - sha1 = "fb2c475977e35e241311ede2693cee1ec6698f5c"; + name = "tslib___tslib_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz"; + sha1 = "e8a335add5ceae51aa261d32a490158ef042ef01"; }; } { @@ -11498,19 +11538,11 @@ }; } { - name = "tunnel___tunnel_0.0.6.tgz"; - path = fetchurl { - name = "tunnel___tunnel_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz"; - sha1 = "72f1314b34a5b192db012324df2cc587ca47f92c"; - }; - } - { - name = "turndown___turndown_7.0.0.tgz"; + name = "turndown___turndown_7.1.1.tgz"; path = fetchurl { - name = "turndown___turndown_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/turndown/-/turndown-7.0.0.tgz"; - sha1 = "19b2a6a2d1d700387a1e07665414e4af4fec5225"; + name = "turndown___turndown_7.1.1.tgz"; + url = "https://registry.yarnpkg.com/turndown/-/turndown-7.1.1.tgz"; + sha1 = "96992f2d9b40a1a03d3ea61ad31b5a5c751ef77f"; }; } { @@ -11538,19 +11570,11 @@ }; } { - name = "type_fest___type_fest_0.8.1.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.8.1.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; - sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d"; - }; - } - { - name = "type_fest___type_fest_1.1.1.tgz"; + name = "type_fest___type_fest_1.4.0.tgz"; path = fetchurl { - name = "type_fest___type_fest_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-1.1.1.tgz"; - sha1 = "210251e7f57357a1457269e6b34837fed067ac2c"; + name = "type_fest___type_fest_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz"; + sha1 = "e9fb813fe3bf1744ec359d55d1affefa76f14be1"; }; } { @@ -11562,14 +11586,6 @@ }; } { - name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; - path = fetchurl { - name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; - url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; - sha1 = "a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"; - }; - } - { name = "typedarray___typedarray_0.0.6.tgz"; path = fetchurl { name = "typedarray___typedarray_0.0.6.tgz"; @@ -11586,14 +11602,6 @@ }; } { - name = "uglify_js___uglify_js_3.13.6.tgz"; - path = fetchurl { - name = "uglify_js___uglify_js_3.13.6.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.6.tgz"; - sha1 = "6815ac7fdd155d03c83e2362bb717e5b39b74013"; - }; - } - { name = "uid_safe___uid_safe_2.1.5.tgz"; path = fetchurl { name = "uid_safe___uid_safe_2.1.5.tgz"; @@ -11602,11 +11610,11 @@ }; } { - name = "uid2___uid2_0.0.3.tgz"; + name = "uid2___uid2_0.0.4.tgz"; path = fetchurl { - name = "uid2___uid2_0.0.3.tgz"; - url = "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz"; - sha1 = "483126e11774df2f71b8b639dcd799c376162b82"; + name = "uid2___uid2_0.0.4.tgz"; + url = "https://registry.yarnpkg.com/uid2/-/uid2-0.0.4.tgz"; + sha1 = "033f3b1d5d32505f5ce5f888b9f3b667123c0a44"; }; } { @@ -11650,51 +11658,43 @@ }; } { - name = "underscore___underscore_1.8.3.tgz"; - path = fetchurl { - name = "underscore___underscore_1.8.3.tgz"; - url = "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz"; - sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; - }; - } - { - name = "unified_args___unified_args_8.1.0.tgz"; + name = "unified_args___unified_args_9.0.2.tgz"; path = fetchurl { - name = "unified_args___unified_args_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/unified-args/-/unified-args-8.1.0.tgz"; - sha1 = "a27dbe996a49fbbf3d9f5c6a98008ab9b0ee6ae5"; + name = "unified_args___unified_args_9.0.2.tgz"; + url = "https://registry.yarnpkg.com/unified-args/-/unified-args-9.0.2.tgz"; + sha1 = "0c14f555e73ee29c23f9a567942e29069f56e5a2"; }; } { - name = "unified_engine___unified_engine_8.1.0.tgz"; + name = "unified_engine___unified_engine_9.0.4.tgz"; path = fetchurl { - name = "unified_engine___unified_engine_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/unified-engine/-/unified-engine-8.1.0.tgz"; - sha1 = "a846e11705fb8589d1250cd27500b56021d8a3e2"; + name = "unified_engine___unified_engine_9.0.4.tgz"; + url = "https://registry.yarnpkg.com/unified-engine/-/unified-engine-9.0.4.tgz"; + sha1 = "ee02b6a7f11e69a56f79cb8595065b8c3f02bda8"; }; } { - name = "unified_lint_rule___unified_lint_rule_1.0.6.tgz"; + name = "unified_lint_rule___unified_lint_rule_2.0.1.tgz"; path = fetchurl { - name = "unified_lint_rule___unified_lint_rule_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/unified-lint-rule/-/unified-lint-rule-1.0.6.tgz"; - sha1 = "b4ab801ff93c251faa917a8d1c10241af030de84"; + name = "unified_lint_rule___unified_lint_rule_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/unified-lint-rule/-/unified-lint-rule-2.0.1.tgz"; + sha1 = "85276c0d443dce7b76d65e4b8bcdc987323ec9e4"; }; } { - name = "unified_message_control___unified_message_control_3.0.3.tgz"; + name = "unified_message_control___unified_message_control_4.0.0.tgz"; path = fetchurl { - name = "unified_message_control___unified_message_control_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/unified-message-control/-/unified-message-control-3.0.3.tgz"; - sha1 = "d08c4564092a507668de71451a33c0d80e734bbd"; + name = "unified_message_control___unified_message_control_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/unified-message-control/-/unified-message-control-4.0.0.tgz"; + sha1 = "7cd313df526fc660f218b19a56377bb6957019a8"; }; } { - name = "unified___unified_9.2.1.tgz"; + name = "unified___unified_10.1.0.tgz"; path = fetchurl { - name = "unified___unified_9.2.1.tgz"; - url = "https://registry.yarnpkg.com/unified/-/unified-9.2.1.tgz"; - sha1 = "ae18d5674c114021bfdbdf73865ca60f410215a3"; + name = "unified___unified_10.1.0.tgz"; + url = "https://registry.yarnpkg.com/unified/-/unified-10.1.0.tgz"; + sha1 = "4e65eb38fc2448b1c5ee573a472340f52b9346fe"; }; } { @@ -11706,14 +11706,6 @@ }; } { - name = "uniq___uniq_1.0.1.tgz"; - path = fetchurl { - name = "uniq___uniq_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz"; - sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; - }; - } - { name = "uniqs___uniqs_2.0.0.tgz"; path = fetchurl { name = "uniqs___uniqs_2.0.0.tgz"; @@ -11738,75 +11730,83 @@ }; } { - name = "unist_util_generated___unist_util_generated_1.1.6.tgz"; + name = "unist_util_generated___unist_util_generated_2.0.0.tgz"; path = fetchurl { - name = "unist_util_generated___unist_util_generated_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.6.tgz"; - sha1 = "5ab51f689e2992a472beb1b35f2ce7ff2f324d4b"; + name = "unist_util_generated___unist_util_generated_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-2.0.0.tgz"; + sha1 = "86fafb77eb6ce9bfa6b663c3f5ad4f8e56a60113"; }; } { - name = "unist_util_inspect___unist_util_inspect_5.0.1.tgz"; + name = "unist_util_inspect___unist_util_inspect_7.0.0.tgz"; path = fetchurl { - name = "unist_util_inspect___unist_util_inspect_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/unist-util-inspect/-/unist-util-inspect-5.0.1.tgz"; - sha1 = "168c8770a99902318ca268f8c391e294bcf44540"; + name = "unist_util_inspect___unist_util_inspect_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/unist-util-inspect/-/unist-util-inspect-7.0.0.tgz"; + sha1 = "98426f0219e24d011a27e32539be0693d9eb973e"; }; } { - name = "unist_util_is___unist_util_is_4.1.0.tgz"; + name = "unist_util_is___unist_util_is_5.1.1.tgz"; path = fetchurl { - name = "unist_util_is___unist_util_is_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.1.0.tgz"; - sha1 = "976e5f462a7a5de73d94b706bac1b90671b57797"; + name = "unist_util_is___unist_util_is_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-5.1.1.tgz"; + sha1 = "e8aece0b102fa9bc097b0fef8f870c496d4a6236"; }; } { - name = "unist_util_position___unist_util_position_3.1.0.tgz"; + name = "unist_util_position___unist_util_position_4.0.1.tgz"; path = fetchurl { - name = "unist_util_position___unist_util_position_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-3.1.0.tgz"; - sha1 = "1c42ee6301f8d52f47d14f62bbdb796571fa2d47"; + name = "unist_util_position___unist_util_position_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-4.0.1.tgz"; + sha1 = "f8484b2da19a897a0180556d160c28633070dbb9"; }; } { - name = "unist_util_stringify_position___unist_util_stringify_position_2.0.3.tgz"; + name = "unist_util_stringify_position___unist_util_stringify_position_3.0.0.tgz"; path = fetchurl { - name = "unist_util_stringify_position___unist_util_stringify_position_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz"; - sha1 = "cce3bfa1cdf85ba7375d1d5b17bdc4cada9bd9da"; + name = "unist_util_stringify_position___unist_util_stringify_position_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-3.0.0.tgz"; + sha1 = "d517d2883d74d0daa0b565adc3d10a02b4a8cde9"; }; } { - name = "unist_util_visit_parents___unist_util_visit_parents_3.1.1.tgz"; + name = "unist_util_visit_parents___unist_util_visit_parents_4.1.1.tgz"; path = fetchurl { - name = "unist_util_visit_parents___unist_util_visit_parents_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz"; - sha1 = "65a6ce698f78a6b0f56aa0e88f13801886cdaef6"; + name = "unist_util_visit_parents___unist_util_visit_parents_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-4.1.1.tgz"; + sha1 = "e83559a4ad7e6048a46b1bdb22614f2f3f4724f2"; }; } { - name = "unist_util_visit___unist_util_visit_2.0.3.tgz"; + name = "unist_util_visit_parents___unist_util_visit_parents_5.0.0.tgz"; path = fetchurl { - name = "unist_util_visit___unist_util_visit_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-2.0.3.tgz"; - sha1 = "c3703893146df47203bb8a9795af47d7b971208c"; + name = "unist_util_visit_parents___unist_util_visit_parents_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-5.0.0.tgz"; + sha1 = "5ae2440f8710a0c18a2b4ba0c4471d18e1090494"; }; } { - name = "unpipe___unpipe_1.0.0.tgz"; + name = "unist_util_visit___unist_util_visit_3.1.0.tgz"; path = fetchurl { - name = "unpipe___unpipe_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz"; - sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + name = "unist_util_visit___unist_util_visit_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-3.1.0.tgz"; + sha1 = "9420d285e1aee938c7d9acbafc8e160186dbaf7b"; }; } { - name = "unquote___unquote_1.1.1.tgz"; + name = "unist_util_visit___unist_util_visit_4.0.0.tgz"; path = fetchurl { - name = "unquote___unquote_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz"; - sha1 = "8fded7324ec6e88a0ff8b905e7c098cdc086d544"; + name = "unist_util_visit___unist_util_visit_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-4.0.0.tgz"; + sha1 = "6e1f7e8e163921d20281354c38bfd3244b64580a"; + }; + } + { + name = "unpipe___unpipe_1.0.0.tgz"; + path = fetchurl { + name = "unpipe___unpipe_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; }; } { @@ -11826,14 +11826,6 @@ }; } { - name = "upper_case___upper_case_1.1.3.tgz"; - path = fetchurl { - name = "upper_case___upper_case_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz"; - sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598"; - }; - } - { name = "uri_js___uri_js_4.4.1.tgz"; path = fetchurl { name = "uri_js___uri_js_4.4.1.tgz"; @@ -11914,14 +11906,6 @@ }; } { - name = "util.promisify___util.promisify_1.0.1.tgz"; - path = fetchurl { - name = "util.promisify___util.promisify_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz"; - sha1 = "6baf7774b80eeb0f7520d8b81d07982a59abbaee"; - }; - } - { name = "util___util_0.10.3.tgz"; path = fetchurl { name = "util___util_0.10.3.tgz"; @@ -11938,6 +11922,14 @@ }; } { + name = "util___util_0.12.4.tgz"; + path = fetchurl { + name = "util___util_0.12.4.tgz"; + url = "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz"; + sha1 = "66121a31420df8f01ca0c464be15dfa1d1850253"; + }; + } + { name = "utila___utila_0.4.0.tgz"; path = fetchurl { name = "utila___utila_0.4.0.tgz"; @@ -12066,51 +12058,51 @@ }; } { - name = "vfile_location___vfile_location_3.2.0.tgz"; + name = "vfile_location___vfile_location_4.0.1.tgz"; path = fetchurl { - name = "vfile_location___vfile_location_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/vfile-location/-/vfile-location-3.2.0.tgz"; - sha1 = "d8e41fbcbd406063669ebf6c33d56ae8721d0f3c"; + name = "vfile_location___vfile_location_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/vfile-location/-/vfile-location-4.0.1.tgz"; + sha1 = "06f2b9244a3565bef91f099359486a08b10d3a95"; }; } { - name = "vfile_message___vfile_message_2.0.4.tgz"; + name = "vfile_message___vfile_message_3.0.2.tgz"; path = fetchurl { - name = "vfile_message___vfile_message_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/vfile-message/-/vfile-message-2.0.4.tgz"; - sha1 = "5b43b88171d409eae58477d13f23dd41d52c371a"; + name = "vfile_message___vfile_message_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/vfile-message/-/vfile-message-3.0.2.tgz"; + sha1 = "db7eaebe7fecb853010f2ef1664427f52baf8f74"; }; } { - name = "vfile_reporter___vfile_reporter_6.0.2.tgz"; + name = "vfile_reporter___vfile_reporter_7.0.2.tgz"; path = fetchurl { - name = "vfile_reporter___vfile_reporter_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-6.0.2.tgz"; - sha1 = "cbddaea2eec560f27574ce7b7b269822c191a676"; + name = "vfile_reporter___vfile_reporter_7.0.2.tgz"; + url = "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-7.0.2.tgz"; + sha1 = "2b3bfafb428581e72073c4337acdf82912385356"; }; } { - name = "vfile_sort___vfile_sort_2.2.2.tgz"; + name = "vfile_sort___vfile_sort_3.0.0.tgz"; path = fetchurl { - name = "vfile_sort___vfile_sort_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/vfile-sort/-/vfile-sort-2.2.2.tgz"; - sha1 = "720fe067ce156aba0b411a01bb0dc65596aa1190"; + name = "vfile_sort___vfile_sort_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/vfile-sort/-/vfile-sort-3.0.0.tgz"; + sha1 = "ee13d3eaac0446200a2047a3b45d78fad6b106e6"; }; } { - name = "vfile_statistics___vfile_statistics_1.1.4.tgz"; + name = "vfile_statistics___vfile_statistics_2.0.0.tgz"; path = fetchurl { - name = "vfile_statistics___vfile_statistics_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/vfile-statistics/-/vfile-statistics-1.1.4.tgz"; - sha1 = "b99fd15ecf0f44ba088cc973425d666cb7a9f245"; + name = "vfile_statistics___vfile_statistics_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/vfile-statistics/-/vfile-statistics-2.0.0.tgz"; + sha1 = "f04ee3e3c666809a3c10c06021becd41ea9c8037"; }; } { - name = "vfile___vfile_4.2.1.tgz"; + name = "vfile___vfile_5.1.0.tgz"; path = fetchurl { - name = "vfile___vfile_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/vfile/-/vfile-4.2.1.tgz"; - sha1 = "03f1dce28fc625c625bc6514350fbdb00fa9e624"; + name = "vfile___vfile_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/vfile/-/vfile-5.1.0.tgz"; + sha1 = "18e78016f0f71e98d737d40f0fca921dc264a600"; }; } { @@ -12154,6 +12146,22 @@ }; } { + name = "web_encoding___web_encoding_1.1.5.tgz"; + path = fetchurl { + name = "web_encoding___web_encoding_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/web-encoding/-/web-encoding-1.1.5.tgz"; + sha1 = "fc810cf7667364a6335c939913f5051d3e0c4864"; + }; + } + { + name = "web_namespaces___web_namespaces_2.0.0.tgz"; + path = fetchurl { + name = "web_namespaces___web_namespaces_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-2.0.0.tgz"; + sha1 = "1f6a2d7b5823329abaedeb6bdf09ef2fed35db13"; + }; + } + { name = "webfontloader___webfontloader_1.6.28.tgz"; path = fetchurl { name = "webfontloader___webfontloader_1.6.28.tgz"; @@ -12162,19 +12170,19 @@ }; } { - name = "webpack_cli___webpack_cli_4.7.0.tgz"; + name = "webpack_cli___webpack_cli_4.8.0.tgz"; path = fetchurl { - name = "webpack_cli___webpack_cli_4.7.0.tgz"; - url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.7.0.tgz"; - sha1 = "3195a777f1f802ecda732f6c95d24c0004bc5a35"; + name = "webpack_cli___webpack_cli_4.8.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.8.0.tgz"; + sha1 = "5fc3c8b9401d3c8a43e2afceacfa8261962338d1"; }; } { - name = "webpack_merge___webpack_merge_5.7.3.tgz"; + name = "webpack_merge___webpack_merge_5.8.0.tgz"; path = fetchurl { - name = "webpack_merge___webpack_merge_5.7.3.tgz"; - url = "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz"; - sha1 = "2a0754e1877a25a8bbab3d2475ca70a052708213"; + name = "webpack_merge___webpack_merge_5.8.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz"; + sha1 = "2b39dbf22af87776ad744c390223731d30a68f61"; }; } { @@ -12186,11 +12194,11 @@ }; } { - name = "webpack_sources___webpack_sources_2.2.0.tgz"; + name = "webpack_sources___webpack_sources_2.3.1.tgz"; path = fetchurl { - name = "webpack_sources___webpack_sources_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.2.0.tgz"; - sha1 = "058926f39e3d443193b6c31547229806ffd02bac"; + name = "webpack_sources___webpack_sources_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.1.tgz"; + sha1 = "570de0af163949fe272233c2cefe1b56f74511fd"; }; } { @@ -12218,11 +12226,11 @@ }; } { - name = "which_typed_array___which_typed_array_1.1.4.tgz"; + name = "which_typed_array___which_typed_array_1.1.7.tgz"; path = fetchurl { - name = "which_typed_array___which_typed_array_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.4.tgz"; - sha1 = "8fcb7d3ee5adf2d771066fba7cf37e32fe8711ff"; + name = "which_typed_array___which_typed_array_1.1.7.tgz"; + url = "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.7.tgz"; + sha1 = "2761799b9a22d4b8660b3c1b40abaa7739691793"; }; } { @@ -12290,14 +12298,6 @@ }; } { - name = "wordwrap___wordwrap_1.0.0.tgz"; - path = fetchurl { - name = "wordwrap___wordwrap_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz"; - sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; - }; - } - { name = "worker_farm___worker_farm_1.7.0.tgz"; path = fetchurl { name = "worker_farm___worker_farm_1.7.0.tgz"; @@ -12306,11 +12306,11 @@ }; } { - name = "workerpool___workerpool_6.1.0.tgz"; + name = "workerpool___workerpool_6.1.5.tgz"; path = fetchurl { - name = "workerpool___workerpool_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.0.tgz"; - sha1 = "a8e038b4c94569596852de7a8ea4228eefdeb37b"; + name = "workerpool___workerpool_6.1.5.tgz"; + url = "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.5.tgz"; + sha1 = "0f7cf076b6215fd7e1da903ff6f22ddd1886b581"; }; } { @@ -12322,14 +12322,6 @@ }; } { - name = "wrapped___wrapped_1.0.1.tgz"; - path = fetchurl { - name = "wrapped___wrapped_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/wrapped/-/wrapped-1.0.1.tgz"; - sha1 = "c783d9d807b273e9b01e851680a938c87c907242"; - }; - } - { name = "wrappy___wrappy_1.0.2.tgz"; path = fetchurl { name = "wrappy___wrappy_1.0.2.tgz"; @@ -12338,11 +12330,11 @@ }; } { - name = "ws___ws_7.4.5.tgz"; + name = "ws___ws_7.4.6.tgz"; path = fetchurl { - name = "ws___ws_7.4.5.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz"; - sha1 = "a484dd851e9beb6fdb420027e3885e8ce48986c1"; + name = "ws___ws_7.4.6.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz"; + sha1 = "5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"; }; } { @@ -12354,19 +12346,19 @@ }; } { - name = "xml_crypto___xml_crypto_2.1.2.tgz"; + name = "xml_crypto___xml_crypto_2.1.3.tgz"; path = fetchurl { - name = "xml_crypto___xml_crypto_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-2.1.2.tgz"; - sha1 = "501506d42e466f6cd908c5a03182217231b4e4b8"; + name = "xml_crypto___xml_crypto_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-2.1.3.tgz"; + sha1 = "6a7272b610ea3e4ea7f13e9e4876f1b20cbc32c8"; }; } { - name = "xml_encryption___xml_encryption_1.2.4.tgz"; + name = "xml_encryption___xml_encryption_1.3.0.tgz"; path = fetchurl { - name = "xml_encryption___xml_encryption_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.2.4.tgz"; - sha1 = "767d13f9ff2f979ff5657b93bd72aa729d34b66c"; + name = "xml_encryption___xml_encryption_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.3.0.tgz"; + sha1 = "4cad44a59bf8bdec76d7865ce0b89e13c09962f4"; }; } { @@ -12434,27 +12426,11 @@ }; } { - name = "xmldom___xmldom_0.5.0.tgz"; - path = fetchurl { - name = "xmldom___xmldom_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz"; - sha1 = "193cb96b84aa3486127ea6272c4596354cb4962e"; - }; - } - { - name = "xmldom___xmldom_0.6.0.tgz"; + name = "xmlhttprequest_ssl___xmlhttprequest_ssl_1.6.3.tgz"; path = fetchurl { - name = "xmldom___xmldom_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz"; - sha1 = "43a96ecb8beece991cef382c08397d82d4d0c46f"; - }; - } - { - name = "xmlhttprequest_ssl___xmlhttprequest_ssl_1.6.2.tgz"; - path = fetchurl { - name = "xmlhttprequest_ssl___xmlhttprequest_ssl_1.6.2.tgz"; - url = "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.2.tgz"; - sha1 = "dd6899bfbcf684b554e393c30b13b9f3b001a7ee"; + name = "xmlhttprequest_ssl___xmlhttprequest_ssl_1.6.3.tgz"; + url = "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz"; + sha1 = "03b713873b01659dfa2c1c5d056065b27ddc2de6"; }; } { @@ -12466,14 +12442,6 @@ }; } { - name = "xpath.js___xpath.js_1.1.0.tgz"; - path = fetchurl { - name = "xpath.js___xpath.js_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/xpath.js/-/xpath.js-1.1.0.tgz"; - sha1 = "3816a44ed4bb352091083d002a383dd5104a5ff1"; - }; - } - { name = "xpath___xpath_0.0.32.tgz"; path = fetchurl { name = "xpath___xpath_0.0.32.tgz"; @@ -12546,6 +12514,14 @@ }; } { + name = "yaml___yaml_1.10.2.tgz"; + path = fetchurl { + name = "yaml___yaml_1.10.2.tgz"; + url = "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz"; + sha1 = "2301c5ffbf12b467de8da2333a459e29e7920e4b"; + }; + } + { name = "yargs_parser___yargs_parser_20.2.4.tgz"; path = fetchurl { name = "yargs_parser___yargs_parser_20.2.4.tgz"; @@ -12554,11 +12530,11 @@ }; } { - name = "yargs_parser___yargs_parser_20.2.7.tgz"; + name = "yargs_parser___yargs_parser_20.2.9.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_20.2.7.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.7.tgz"; - sha1 = "61df85c113edfb5a7a4e36eb8aa60ef423cbc90a"; + name = "yargs_parser___yargs_parser_20.2.9.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz"; + sha1 = "2eb7dc3b0289718fc295f362753845c41a0c94ee"; }; } { @@ -12602,11 +12578,11 @@ }; } { - name = "zwitch___zwitch_1.0.5.tgz"; + name = "zwitch___zwitch_2.0.2.tgz"; path = fetchurl { - name = "zwitch___zwitch_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz"; - sha1 = "d11d7381ffed16b742f6af7b3f223d5cd9fe9920"; + name = "zwitch___zwitch_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.2.tgz"; + sha1 = "91f8d0e901ffa3d66599756dde7f57b17c95dce1"; }; } ]; diff --git a/nixpkgs/pkgs/servers/web-apps/jitsi-meet/default.nix b/nixpkgs/pkgs/servers/web-apps/jitsi-meet/default.nix index 70d91dba5c9e..5752d94d6a5c 100644 --- a/nixpkgs/pkgs/servers/web-apps/jitsi-meet/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/jitsi-meet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jitsi-meet"; - version = "1.0.5056"; + version = "1.0.5307"; src = fetchurl { url = "https://download.jitsi.org/jitsi-meet/src/jitsi-meet-${version}.tar.bz2"; - sha256 = "0vmxy22zpgmvmg84y6rf9s8y3ann1xzhpaipz7fk9z4ykmkj5knw"; + sha256 = "epdVQnuL5dJ7DmoqyjfiLEfZxr4IQwkFEla/Y034sgg="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/servers/web-apps/lemmy/package.json b/nixpkgs/pkgs/servers/web-apps/lemmy/package.json new file mode 100644 index 000000000000..3d1206826942 --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/lemmy/package.json @@ -0,0 +1,113 @@ +{ + "name": "lemmy-ui", + "version": "0.12.2", + "description": "An isomorphic UI for lemmy", + "author": "Dessalines <tyhou13@gmx.com>", + "license": "AGPL-3.0", + "scripts": { + "build:dev": "webpack --mode=development", + "build:prod": "webpack --mode=production", + "clean": "yarn run rimraf dist", + "dev": "yarn start", + "lint": "node generate_translations.js && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx src", + "prebuild:dev": "yarn clean && node generate_translations.js", + "prebuild:prod": "yarn clean && node generate_translations.js", + "start": "yarn build:dev --watch" + }, + "repository": "https://github.com/LemmyNet/lemmy-ui", + "dependencies": { + "@typescript-eslint/parser": "^4.28.3", + "autosize": "^5.0.1", + "choices.js": "^9.0.1", + "emoji-short-name": "^1.0.0", + "express": "~4.17.1", + "i18next": "^20.3.3", + "inferno": "^7.4.9", + "inferno-create-element": "^7.4.9", + "inferno-helmet": "^5.2.1", + "inferno-hydrate": "^7.4.9", + "inferno-i18next": "github:nimbusec-oss/inferno-i18next#semver:^7.4.2", + "inferno-router": "^7.4.9", + "inferno-server": "^7.4.9", + "isomorphic-cookie": "^1.2.4", + "jwt-decode": "^3.1.2", + "markdown-it": "^12.1.0", + "markdown-it-container": "^3.0.0", + "markdown-it-sub": "^1.0.0", + "markdown-it-sup": "^1.0.0", + "moment": "^2.29.1", + "reconnecting-websocket": "^4.4.0", + "register-service-worker": "^1.7.2", + "rxjs": "^7.2.0", + "serialize-javascript": "^6.0.0", + "tippy.js": "^6.3.1", + "toastify-js": "^1.11.1", + "tributejs": "^5.1.3", + "ws": "^8.2.0" + }, + "devDependencies": { + "@babel/core": "^7.14.6", + "@babel/plugin-transform-runtime": "^7.14.5", + "@babel/plugin-transform-typescript": "^7.14.6", + "@babel/preset-env": "7.15.0", + "@babel/preset-typescript": "^7.14.5", + "@babel/runtime": "^7.14.6", + "@types/autosize": "^4.0.0", + "@types/express": "^4.17.13", + "@types/node": "^16.7.1", + "@types/node-fetch": "^2.5.11", + "@types/serialize-javascript": "^5.0.1", + "@typescript-eslint/eslint-plugin": "^4.28.3", + "babel-loader": "^8.2.2", + "babel-plugin-inferno": "^6.3.0", + "bootstrap": "^5.0.2", + "bootswatch": "^5.0.2", + "clean-webpack-plugin": "^4.0.0-alpha.0", + "copy-webpack-plugin": "^9.0.1", + "css-loader": "^6.0.0", + "eslint": "^7.30.0", + "eslint-plugin-prettier": "^3.4.1", + "husky": "^7.0.1", + "import-sort-style-module": "^6.0.0", + "iso-639-1": "^2.1.9", + "lemmy-js-client": "0.12.0", + "lint-staged": "^11.0.1", + "mini-css-extract-plugin": "^2.1.0", + "node-fetch": "^2.6.1", + "node-sass": "^6.0.1", + "prettier": "^2.3.2", + "prettier-plugin-import-sort": "^0.0.7", + "prettier-plugin-organize-imports": "^2.2.0", + "prettier-plugin-packagejson": "^2.2.11", + "rimraf": "^3.0.2", + "run-node-webpack-plugin": "^1.3.0", + "sass-loader": "^12.1.0", + "sortpack": "^2.2.0", + "style-loader": "^3.1.0", + "terser": "^5.7.1", + "typescript": "^4.3.5", + "webpack": "5.51.1", + "webpack-cli": "^4.7.2", + "webpack-dev-server": "4.0.0", + "webpack-node-externals": "^3.0.0" + }, + "engines": { + "node": ">=8.9.0" + }, + "engineStrict": true, + "lint-staged": { + "*.{ts,tsx,js}": [ + "prettier --write", + "eslint --fix" + ], + "package.json": [ + "sortpack" + ] + }, + "importSort": { + ".js, .jsx, .ts, .tsx": { + "style": "module", + "parser": "typescript" + } + } +} diff --git a/nixpkgs/pkgs/servers/web-apps/lemmy/default.nix b/nixpkgs/pkgs/servers/web-apps/lemmy/server.nix index c07865688f99..0f4e8ebc0c5f 100644 --- a/nixpkgs/pkgs/servers/web-apps/lemmy/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/lemmy/server.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "lemmy-server"; - version = "0.11.3"; + version = "0.12.2"; src = fetchFromGitHub { owner = "LemmyNet"; repo = "lemmy"; rev = version; - sha256 = "sha256-AFVipxzKwNiillVmMA+Q7nMKajN9mzw37mBpqzf+XpM="; + sha256 = "sha256-jhUpQ2f+b0BEXVfQOIujxam2PQA44wluUraJVJxL6LU="; }; - cargoSha256 = "sha256-nxuynzQRUqne1KZIvP152afWbG2Zb9zyCqy7Bx4PeJ8="; + cargoSha256 = "sha256-2i8zCwd33LtUKxOChx/SLP9sWMRmxGkKK8xzaJImMHM="; buildInputs = [ postgresql ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/nixpkgs/pkgs/servers/web-apps/lemmy/ui.nix b/nixpkgs/pkgs/servers/web-apps/lemmy/ui.nix new file mode 100644 index 000000000000..0d2deda53871 --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/lemmy/ui.nix @@ -0,0 +1,74 @@ +{ lib +, mkYarnPackage +, libsass +, nodejs +, python3 +, pkg-config +, writeShellScriptBin +, fetchFromGitHub +}: + +let + pkgConfig = { + node-sass = { + nativeBuildInputs = [ ]; + buildInputs = [ libsass pkg-config python3 ]; + postInstall = '' + LIBSASS_EXT=auto yarn --offline run build + rm build/config.gypi + ''; + }; + }; + + name = "lemmy-ui"; + version = "0.12.2"; + unwrapped = mkYarnPackage { + + src = fetchFromGitHub { + owner = "LemmyNet"; + repo = name; + rev = version; + fetchSubmodules = true; + sha256 = "sha256-iFLJqUnz4m9/JTSaJSUugzY5KkiKtH0sMYY4ALm2Ebk="; + }; + + inherit pkgConfig name version; + + extraBuildInputs = [ libsass ]; + + yarnNix = ./yarn.nix; + + # Fails mysteriously on source/package.json + # Upstream package.json is missing a newline at the end + packageJSON = ./package.json; + + yarnPreBuild = '' + export npm_config_nodedir=${nodejs} + ''; + + buildPhase = '' + # Yarn writes cache directories etc to $HOME. + export HOME=$PWD/yarn_home + + ln -sf $PWD/node_modules $PWD/deps/lemmy-ui/ + + yarn --offline build:prod + ''; + + distPhase = "true"; + + meta = with lib; { + description = "Building a federated alternative to reddit in rust"; + homepage = "https://join-lemmy.org/"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ happysalada billewanick ]; + platforms = platforms.linux; + }; + }; +in +(writeShellScriptBin "lemmy-ui" '' + ${nodejs}/bin/node ${unwrapped}/libexec/lemmy-ui/node_modules/lemmy-ui/dist/js/server.js +'').overrideAttrs (oldAttrs: { + passthru = { inherit unwrapped; }; +}) + diff --git a/nixpkgs/pkgs/servers/web-apps/lemmy/yarn.nix b/nixpkgs/pkgs/servers/web-apps/lemmy/yarn.nix new file mode 100644 index 000000000000..c5830dc7ab97 --- /dev/null +++ b/nixpkgs/pkgs/servers/web-apps/lemmy/yarn.nix @@ -0,0 +1,9221 @@ +{ fetchurl, fetchgit, linkFarm, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "_babel_code_frame___code_frame_7.12.11.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.12.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz"; + sha1 = "f4ad435aa263db935b8f10f2c552d23fb716a63f"; + }; + } + { + name = "_babel_code_frame___code_frame_7.14.5.tgz"; + path = fetchurl { + name = "_babel_code_frame___code_frame_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz"; + sha1 = "23b08d740e83f49c5e59945fbf1b43e80bbf4edb"; + }; + } + { + name = "_babel_compat_data___compat_data_7.15.0.tgz"; + path = fetchurl { + name = "_babel_compat_data___compat_data_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz"; + sha1 = "2dbaf8b85334796cafbb0f5793a90a2fc010b176"; + }; + } + { + name = "_babel_core___core_7.15.0.tgz"; + path = fetchurl { + name = "_babel_core___core_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.15.0.tgz"; + sha1 = "749e57c68778b73ad8082775561f67f5196aafa8"; + }; + } + { + name = "_babel_generator___generator_7.15.0.tgz"; + path = fetchurl { + name = "_babel_generator___generator_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.0.tgz"; + sha1 = "a7d0c172e0d814974bad5aa77ace543b97917f15"; + }; + } + { + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz"; + sha1 = "7bf478ec3b71726d56a8ca5775b046fc29879e61"; + }; + } + { + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz"; + sha1 = "b939b43f8c37765443a19ae74ad8b15978e0a191"; + }; + } + { + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.15.0.tgz"; + path = fetchurl { + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz"; + sha1 = "973df8cbd025515f3ff25db0c05efc704fa79818"; + }; + } + { + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.15.0.tgz"; + path = fetchurl { + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.0.tgz"; + sha1 = "c9a137a4d137b2d0e2c649acf536d7ba1a76c0f7"; + }; + } + { + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz"; + sha1 = "c7d5ac5e9cf621c26057722fb7a8a4c5889358c4"; + }; + } + { + name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.2.3.tgz"; + path = fetchurl { + name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz"; + sha1 = "0525edec5094653a282688d34d846e4c75e9c0b6"; + }; + } + { + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz"; + sha1 = "8aa72e708205c7bb643e45c73b4386cdf2a1f645"; + }; + } + { + name = "_babel_helper_function_name___helper_function_name_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_function_name___helper_function_name_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz"; + sha1 = "89e2c474972f15d8e233b52ee8c480e2cfcd50c4"; + }; + } + { + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz"; + sha1 = "25fbfa579b0937eee1f3b805ece4ce398c431815"; + }; + } + { + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz"; + sha1 = "e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d"; + }; + } + { + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.15.0.tgz"; + path = fetchurl { + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz"; + sha1 = "0ddaf5299c8179f27f37327936553e9bba60990b"; + }; + } + { + name = "_babel_helper_module_imports___helper_module_imports_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_module_imports___helper_module_imports_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz"; + sha1 = "6d1a44df6a38c957aa7c312da076429f11b422f3"; + }; + } + { + name = "_babel_helper_module_transforms___helper_module_transforms_7.15.0.tgz"; + path = fetchurl { + name = "_babel_helper_module_transforms___helper_module_transforms_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz"; + sha1 = "679275581ea056373eddbe360e1419ef23783b08"; + }; + } + { + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz"; + sha1 = "f27395a8619e0665b3f0364cddb41c25d71b499c"; + }; + } + { + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz"; + sha1 = "5ac822ce97eec46741ab70a517971e443a70c5a9"; + }; + } + { + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz"; + sha1 = "51439c913612958f54a987a4ffc9ee587a2045d6"; + }; + } + { + name = "_babel_helper_replace_supers___helper_replace_supers_7.15.0.tgz"; + path = fetchurl { + name = "_babel_helper_replace_supers___helper_replace_supers_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz"; + sha1 = "ace07708f5bf746bf2e6ba99572cce79b5d4e7f4"; + }; + } + { + name = "_babel_helper_simple_access___helper_simple_access_7.14.8.tgz"; + path = fetchurl { + name = "_babel_helper_simple_access___helper_simple_access_7.14.8.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz"; + sha1 = "82e1fec0644a7e775c74d305f212c39f8fe73924"; + }; + } + { + name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz"; + sha1 = "96f486ac050ca9f44b009fbe5b7d394cab3a0ee4"; + }; + } + { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz"; + sha1 = "22b23a54ef51c2b7605d851930c1976dd0bc693a"; + }; + } + { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.9.tgz"; + path = fetchurl { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.9.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz"; + sha1 = "6654d171b2024f6d8ee151bf2509699919131d48"; + }; + } + { + name = "_babel_helper_validator_option___helper_validator_option_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_validator_option___helper_validator_option_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz"; + sha1 = "6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"; + }; + } + { + name = "_babel_helper_wrap_function___helper_wrap_function_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_wrap_function___helper_wrap_function_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz"; + sha1 = "5919d115bf0fe328b8a5d63bcb610f51601f2bff"; + }; + } + { + name = "_babel_helpers___helpers_7.15.3.tgz"; + path = fetchurl { + name = "_babel_helpers___helpers_7.15.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.3.tgz"; + sha1 = "c96838b752b95dcd525b4e741ed40bb1dc2a1357"; + }; + } + { + name = "_babel_highlight___highlight_7.14.5.tgz"; + path = fetchurl { + name = "_babel_highlight___highlight_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz"; + sha1 = "6861a52f03966405001f6aa534a01a24d99e8cd9"; + }; + } + { + name = "_babel_parser___parser_7.15.3.tgz"; + path = fetchurl { + name = "_babel_parser___parser_7.15.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.3.tgz"; + sha1 = "3416d9bea748052cfcb63dbcc27368105b1ed862"; + }; + } + { + name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz"; + sha1 = "4b467302e1548ed3b1be43beae2cc9cf45e0bb7e"; + }; + } + { + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.14.9.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.14.9.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz"; + sha1 = "7028dc4fa21dc199bbacf98b39bab1267d0eaf9a"; + }; + } + { + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz"; + sha1 = "40d1ee140c5b1e31a350f4f5eed945096559b42e"; + }; + } + { + name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz"; + sha1 = "158e9e10d449c3849ef3ecde94a03d9f1841b681"; + }; + } + { + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz"; + sha1 = "0c6617df461c0c1f8fff3b47cd59772360101d2c"; + }; + } + { + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz"; + sha1 = "dbad244310ce6ccd083072167d8cea83a52faf76"; + }; + } + { + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz"; + sha1 = "38de60db362e83a3d8c944ac858ddf9f0c2239eb"; + }; + } + { + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz"; + sha1 = "6e6229c2a99b02ab2915f82571e0cc646a40c738"; + }; + } + { + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz"; + sha1 = "ee38589ce00e2cc59b299ec3ea406fcd3a0fdaf6"; + }; + } + { + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz"; + sha1 = "83631bf33d9a51df184c2102a069ac0c58c05f18"; + }; + } + { + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.14.7.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.14.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz"; + sha1 = "5920a2b3df7f7901df0205974c0641b13fd9d363"; + }; + } + { + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz"; + sha1 = "939dd6eddeff3a67fdf7b3f044b5347262598c3c"; + }; + } + { + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz"; + sha1 = "fa83651e60a360e3f13797eef00b8d519695b603"; + }; + } + { + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz"; + sha1 = "37446495996b2945f30f5be5b60d5e2aa4f5792d"; + }; + } + { + name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz"; + sha1 = "9f65a4d0493a940b4c01f8aa9d3f1894a587f636"; + }; + } + { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz"; + sha1 = "0f95ee0e757a5d647f378daa0eca7e93faa8bbe8"; + }; + } + { + name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; + sha1 = "a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"; + }; + } + { + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.13.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.13.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"; + sha1 = "b5c987274c4a3a82b89714796931a6b53544ae10"; + }; + } + { + name = "_babel_plugin_syntax_class_static_block___plugin_syntax_class_static_block_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_class_static_block___plugin_syntax_class_static_block_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz"; + sha1 = "195df89b146b4b78b3bf897fd7a257c84659d406"; + }; + } + { + name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"; + sha1 = "62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"; + }; + } + { + name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"; + sha1 = "028964a9ba80dbc094c915c487ad7c4e7a66465a"; + }; + } + { + name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; + sha1 = "01ca21b668cd8218c9e640cb6dd88c5412b2c96a"; + }; + } + { + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz"; + sha1 = "000e2e25d8673cce49300517a3eda44c263e4201"; + }; + } + { + name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"; + sha1 = "ca91ef46303530448b906652bac2e9fe9941f699"; + }; + } + { + name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"; + sha1 = "167ed70368886081f74b5c36c65a88c03b66d1a9"; + }; + } + { + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"; + sha1 = "b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"; + }; + } + { + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; + sha1 = "60e225edcbd98a640332a2e72dd3e66f1af55871"; + }; + } + { + name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; + sha1 = "6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"; + }; + } + { + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"; + sha1 = "4f69c2ab95167e0180cd5336613f8c5788f7d48a"; + }; + } + { + name = "_babel_plugin_syntax_private_property_in_object___plugin_syntax_private_property_in_object_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_private_property_in_object___plugin_syntax_private_property_in_object_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz"; + sha1 = "0dc6671ec0ea22b6e94a1114f857970cd39de1ad"; + }; + } + { + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"; + sha1 = "c1cfdadc35a646240001f06138247b741c34d94c"; + }; + } + { + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz"; + sha1 = "b82c6ce471b165b5ce420cf92914d6fb46225716"; + }; + } + { + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz"; + sha1 = "f7187d9588a768dd080bf4c9ffe117ea62f7862a"; + }; + } + { + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz"; + sha1 = "72c789084d8f2094acb945633943ef8443d39e67"; + }; + } + { + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz"; + sha1 = "e48641d999d4bc157a67ef336aeb54bc44fd3ad4"; + }; + } + { + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.15.3.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.15.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz"; + sha1 = "94c81a6e2fc230bcce6ef537ac96a1e4d2b3afaf"; + }; + } + { + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.14.9.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.14.9.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz"; + sha1 = "2a391ffb1e5292710b00f2e2c210e1435e7d449f"; + }; + } + { + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz"; + sha1 = "1b9d78987420d11223d41195461cc43b974b204f"; + }; + } + { + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.14.7.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.14.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz"; + sha1 = "0ad58ed37e23e22084d109f185260835e5557576"; + }; + } + { + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz"; + sha1 = "2f6bf76e46bdf8043b4e7e16cf24532629ba0c7a"; + }; + } + { + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz"; + sha1 = "365a4844881bdf1501e3a9f0270e7f0f91177954"; + }; + } + { + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz"; + sha1 = "5154b8dd6a3dfe6d90923d61724bd3deeb90b493"; + }; + } + { + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz"; + sha1 = "dae384613de8f77c196a8869cbf602a44f7fc0eb"; + }; + } + { + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz"; + sha1 = "e81c65ecb900746d7f31802f6bed1f52d915d6f2"; + }; + } + { + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz"; + sha1 = "41d06c7ff5d4d09e3cf4587bd3ecf3930c730f78"; + }; + } + { + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz"; + sha1 = "b39cd5212a2bf235a617d320ec2b48bcc091b8a7"; + }; + } + { + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz"; + sha1 = "4fd9ce7e3411cb8b83848480b7041d83004858f7"; + }; + } + { + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.15.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz"; + sha1 = "3305896e5835f953b5cdb363acd9e8c2219a5281"; + }; + } + { + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz"; + sha1 = "c75342ef8b30dcde4295d3401aae24e65638ed29"; + }; + } + { + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz"; + sha1 = "fb662dfee697cce274a7cda525190a79096aa6e0"; + }; + } + { + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.14.9.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.14.9.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz"; + sha1 = "c68f5c5d12d2ebaba3762e57c2c4f6347a46e7b2"; + }; + } + { + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz"; + sha1 = "31bdae8b925dc84076ebfcd2a9940143aed7dbf8"; + }; + } + { + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz"; + sha1 = "d0b5faeac9e98597a161a9cf78c527ed934cdc45"; + }; + } + { + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz"; + sha1 = "49662e86a1f3ddccac6363a7dfb1ff0a158afeb3"; + }; + } + { + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz"; + sha1 = "0ddbaa1f83db3606f1cdf4846fa1dfb473458b34"; + }; + } + { + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz"; + sha1 = "9676fd5707ed28f522727c5b3c0aa8544440b04f"; + }; + } + { + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz"; + sha1 = "c44589b661cfdbef8d4300dcc7469dffa92f8304"; + }; + } + { + name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.15.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz"; + sha1 = "d3aa650d11678ca76ce294071fda53d7804183b3"; + }; + } + { + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz"; + sha1 = "97f13855f1409338d8cadcbaca670ad79e091a58"; + }; + } + { + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.14.6.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.14.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz"; + sha1 = "6bd40e57fe7de94aa904851963b5616652f73144"; + }; + } + { + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz"; + sha1 = "5b617542675e8b7761294381f3c28c633f40aeb9"; + }; + } + { + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz"; + sha1 = "a5f2bc233937d8453885dc736bdd8d9ffabf3d93"; + }; + } + { + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz"; + sha1 = "39af2739e989a2bd291bf6b53f16981423d457d4"; + }; + } + { + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.15.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.15.0.tgz"; + sha1 = "553f230b9d5385018716586fc48db10dd228eb7e"; + }; + } + { + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz"; + sha1 = "9d4bd2a681e3c5d7acf4f57fa9e51175d91d0c6b"; + }; + } + { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.14.5.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz"; + sha1 = "4cd09b6c8425dd81255c7ceb3fb1836e7414382e"; + }; + } + { + name = "_babel_preset_env___preset_env_7.15.0.tgz"; + path = fetchurl { + name = "_babel_preset_env___preset_env_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.0.tgz"; + sha1 = "e2165bf16594c9c05e52517a194bf6187d6fe464"; + }; + } + { + name = "_babel_preset_modules___preset_modules_0.1.4.tgz"; + path = fetchurl { + name = "_babel_preset_modules___preset_modules_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz"; + sha1 = "362f2b68c662842970fdb5e254ffc8fc1c2e415e"; + }; + } + { + name = "_babel_preset_typescript___preset_typescript_7.15.0.tgz"; + path = fetchurl { + name = "_babel_preset_typescript___preset_typescript_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.15.0.tgz"; + sha1 = "e8fca638a1a0f64f14e1119f7fe4500277840945"; + }; + } + { + name = "_babel_runtime___runtime_7.15.3.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.15.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz"; + sha1 = "2e1c2880ca118e5b2f9988322bd8a7656a32502b"; + }; + } + { + name = "_babel_template___template_7.14.5.tgz"; + path = fetchurl { + name = "_babel_template___template_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz"; + sha1 = "a9bc9d8b33354ff6e55a9c60d1109200a68974f4"; + }; + } + { + name = "_babel_traverse___traverse_7.15.0.tgz"; + path = fetchurl { + name = "_babel_traverse___traverse_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz"; + sha1 = "4cca838fd1b2a03283c1f38e141f639d60b3fc98"; + }; + } + { + name = "_babel_types___types_7.15.0.tgz"; + path = fetchurl { + name = "_babel_types___types_7.15.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.15.0.tgz"; + sha1 = "61af11f2286c4e9c69ca8deb5f4375a73c72dcbd"; + }; + } + { + name = "_discoveryjs_json_ext___json_ext_0.5.3.tgz"; + path = fetchurl { + name = "_discoveryjs_json_ext___json_ext_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz"; + sha1 = "90420f9f9c6d3987f176a19a7d8e764271a2f55d"; + }; + } + { + name = "_eslint_eslintrc___eslintrc_0.4.3.tgz"; + path = fetchurl { + name = "_eslint_eslintrc___eslintrc_0.4.3.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz"; + sha1 = "9e42981ef035beb3dd49add17acb96e8ff6f394c"; + }; + } + { + name = "_humanwhocodes_config_array___config_array_0.5.0.tgz"; + path = fetchurl { + name = "_humanwhocodes_config_array___config_array_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz"; + sha1 = "1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"; + }; + } + { + name = "_humanwhocodes_object_schema___object_schema_1.2.0.tgz"; + path = fetchurl { + name = "_humanwhocodes_object_schema___object_schema_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz"; + sha1 = "87de7af9c231826fdd68ac7258f77c429e0e5fcf"; + }; + } + { + name = "_iarna_cli___cli_1.2.0.tgz"; + path = fetchurl { + name = "_iarna_cli___cli_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@iarna/cli/-/cli-1.2.0.tgz"; + sha1 = "0f7af5e851afe895104583c4ca07377a8094d641"; + }; + } + { + name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; + path = fetchurl { + name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; + sha1 = "7619c2eb21b25483f6d167548b4cfd5a7488c3d5"; + }; + } + { + name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; + path = fetchurl { + name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; + sha1 = "5bd262af94e9d25bd1e71b05deed44876a222e8b"; + }; + } + { + name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; + path = fetchurl { + name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; + url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; + sha1 = "e95737e8bb6746ddedf69c556953494f196fe69a"; + }; + } + { + name = "_popperjs_core___core_2.9.3.tgz"; + path = fetchurl { + name = "_popperjs_core___core_2.9.3.tgz"; + url = "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.3.tgz"; + sha1 = "8b68da1ebd7fc603999cf6ebee34a4899a14b88e"; + }; + } + { + name = "_types_autosize___autosize_4.0.0.tgz"; + path = fetchurl { + name = "_types_autosize___autosize_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/autosize/-/autosize-4.0.0.tgz"; + sha1 = "36a7659d99c7672957b2d1064c75f7c460efd074"; + }; + } + { + name = "_types_body_parser___body_parser_1.19.1.tgz"; + path = fetchurl { + name = "_types_body_parser___body_parser_1.19.1.tgz"; + url = "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.1.tgz"; + sha1 = "0c0174c42a7d017b818303d4b5d969cb0b75929c"; + }; + } + { + name = "_types_connect___connect_3.4.35.tgz"; + path = fetchurl { + name = "_types_connect___connect_3.4.35.tgz"; + url = "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz"; + sha1 = "5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"; + }; + } + { + name = "_types_eslint_scope___eslint_scope_3.7.1.tgz"; + path = fetchurl { + name = "_types_eslint_scope___eslint_scope_3.7.1.tgz"; + url = "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.1.tgz"; + sha1 = "8dc390a7b4f9dd9f1284629efce982e41612116e"; + }; + } + { + name = "_types_eslint___eslint_7.28.0.tgz"; + path = fetchurl { + name = "_types_eslint___eslint_7.28.0.tgz"; + url = "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.0.tgz"; + sha1 = "7e41f2481d301c68e14f483fe10b017753ce8d5a"; + }; + } + { + name = "_types_estree___estree_0.0.50.tgz"; + path = fetchurl { + name = "_types_estree___estree_0.0.50.tgz"; + url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz"; + sha1 = "1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"; + }; + } + { + name = "_types_express_serve_static_core___express_serve_static_core_4.17.24.tgz"; + path = fetchurl { + name = "_types_express_serve_static_core___express_serve_static_core_4.17.24.tgz"; + url = "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz"; + sha1 = "ea41f93bf7e0d59cd5a76665068ed6aab6815c07"; + }; + } + { + name = "_types_express___express_4.17.13.tgz"; + path = fetchurl { + name = "_types_express___express_4.17.13.tgz"; + url = "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz"; + sha1 = "a76e2995728999bab51a33fabce1d705a3709034"; + }; + } + { + name = "_types_glob___glob_7.1.4.tgz"; + path = fetchurl { + name = "_types_glob___glob_7.1.4.tgz"; + url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.4.tgz"; + sha1 = "ea59e21d2ee5c517914cb4bc8e4153b99e566672"; + }; + } + { + name = "_types_http_proxy___http_proxy_1.17.7.tgz"; + path = fetchurl { + name = "_types_http_proxy___http_proxy_1.17.7.tgz"; + url = "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.7.tgz"; + sha1 = "30ea85cc2c868368352a37f0d0d3581e24834c6f"; + }; + } + { + name = "_types_json_schema___json_schema_7.0.9.tgz"; + path = fetchurl { + name = "_types_json_schema___json_schema_7.0.9.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz"; + sha1 = "97edc9037ea0c38585320b28964dde3b39e4660d"; + }; + } + { + name = "_types_mime___mime_1.3.2.tgz"; + path = fetchurl { + name = "_types_mime___mime_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz"; + sha1 = "93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"; + }; + } + { + name = "_types_minimatch___minimatch_3.0.5.tgz"; + path = fetchurl { + name = "_types_minimatch___minimatch_3.0.5.tgz"; + url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz"; + sha1 = "1001cc5e6a3704b83c236027e77f2f58ea010f40"; + }; + } + { + name = "_types_minimist___minimist_1.2.2.tgz"; + path = fetchurl { + name = "_types_minimist___minimist_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz"; + sha1 = "ee771e2ba4b3dc5b372935d549fd9617bf345b8c"; + }; + } + { + name = "_types_node_fetch___node_fetch_2.5.12.tgz"; + path = fetchurl { + name = "_types_node_fetch___node_fetch_2.5.12.tgz"; + url = "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.12.tgz"; + sha1 = "8a6f779b1d4e60b7a57fb6fd48d84fb545b9cc66"; + }; + } + { + name = "_types_node___node_16.6.2.tgz"; + path = fetchurl { + name = "_types_node___node_16.6.2.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.6.2.tgz"; + sha1 = "331b7b9f8621c638284787c5559423822fdffc50"; + }; + } + { + name = "_types_node___node_16.7.1.tgz"; + path = fetchurl { + name = "_types_node___node_16.7.1.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.7.1.tgz"; + sha1 = "c6b9198178da504dfca1fd0be9b2e1002f1586f0"; + }; + } + { + name = "_types_normalize_package_data___normalize_package_data_2.4.1.tgz"; + path = fetchurl { + name = "_types_normalize_package_data___normalize_package_data_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz"; + sha1 = "d3357479a0fdfdd5907fe67e17e0a85c906e1301"; + }; + } + { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + path = fetchurl { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "2f8bb441434d163b35fb8ffdccd7138927ffb8c0"; + }; + } + { + name = "_types_qs___qs_6.9.7.tgz"; + path = fetchurl { + name = "_types_qs___qs_6.9.7.tgz"; + url = "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz"; + sha1 = "63bb7d067db107cc1e457c303bc25d511febf6cb"; + }; + } + { + name = "_types_range_parser___range_parser_1.2.4.tgz"; + path = fetchurl { + name = "_types_range_parser___range_parser_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz"; + sha1 = "cd667bcfdd025213aafb7ca5915a932590acdcdc"; + }; + } + { + name = "_types_retry___retry_0.12.1.tgz"; + path = fetchurl { + name = "_types_retry___retry_0.12.1.tgz"; + url = "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz"; + sha1 = "d8f1c0d0dc23afad6dc16a9e993a0865774b4065"; + }; + } + { + name = "_types_serialize_javascript___serialize_javascript_5.0.1.tgz"; + path = fetchurl { + name = "_types_serialize_javascript___serialize_javascript_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/@types/serialize-javascript/-/serialize-javascript-5.0.1.tgz"; + sha1 = "2c32e0626734a02a83b94cb924699c4bdcb6fd94"; + }; + } + { + name = "_types_serve_static___serve_static_1.13.10.tgz"; + path = fetchurl { + name = "_types_serve_static___serve_static_1.13.10.tgz"; + url = "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz"; + sha1 = "f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"; + }; + } + { + name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.29.2.tgz"; + path = fetchurl { + name = "_typescript_eslint_eslint_plugin___eslint_plugin_4.29.2.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.2.tgz"; + sha1 = "f54dc0a32b8f61c6024ab8755da05363b733838d"; + }; + } + { + name = "_typescript_eslint_experimental_utils___experimental_utils_4.29.2.tgz"; + path = fetchurl { + name = "_typescript_eslint_experimental_utils___experimental_utils_4.29.2.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.2.tgz"; + sha1 = "5f67fb5c5757ef2cb3be64817468ba35c9d4e3b7"; + }; + } + { + name = "_typescript_eslint_parser___parser_4.29.2.tgz"; + path = fetchurl { + name = "_typescript_eslint_parser___parser_4.29.2.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.29.2.tgz"; + sha1 = "1c7744f4c27aeb74610c955d3dce9250e95c370a"; + }; + } + { + name = "_typescript_eslint_scope_manager___scope_manager_4.29.2.tgz"; + path = fetchurl { + name = "_typescript_eslint_scope_manager___scope_manager_4.29.2.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.2.tgz"; + sha1 = "442b0f029d981fa402942715b1718ac7fcd5aa1b"; + }; + } + { + name = "_typescript_eslint_types___types_4.29.2.tgz"; + path = fetchurl { + name = "_typescript_eslint_types___types_4.29.2.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.2.tgz"; + sha1 = "fc0489c6b89773f99109fb0aa0aaddff21f52fcd"; + }; + } + { + name = "_typescript_eslint_typescript_estree___typescript_estree_4.29.2.tgz"; + path = fetchurl { + name = "_typescript_eslint_typescript_estree___typescript_estree_4.29.2.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.2.tgz"; + sha1 = "a0ea8b98b274adbb2577100ba545ddf8bf7dc219"; + }; + } + { + name = "_typescript_eslint_visitor_keys___visitor_keys_4.29.2.tgz"; + path = fetchurl { + name = "_typescript_eslint_visitor_keys___visitor_keys_4.29.2.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.2.tgz"; + sha1 = "d2da7341f3519486f50655159f4e5ecdcb2cd1df"; + }; + } + { + name = "_webassemblyjs_ast___ast_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_ast___ast_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz"; + sha1 = "2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"; + }; + } + { + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_floating_point_hex_parser___floating_point_hex_parser_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz"; + sha1 = "f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f"; + }; + } + { + name = "_webassemblyjs_helper_api_error___helper_api_error_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_api_error___helper_api_error_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz"; + sha1 = "1a63192d8788e5c012800ba6a7a46c705288fd16"; + }; + } + { + name = "_webassemblyjs_helper_buffer___helper_buffer_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_buffer___helper_buffer_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz"; + sha1 = "832a900eb444884cde9a7cad467f81500f5e5ab5"; + }; + } + { + name = "_webassemblyjs_helper_numbers___helper_numbers_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_numbers___helper_numbers_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz"; + sha1 = "64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae"; + }; + } + { + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_wasm_bytecode___helper_wasm_bytecode_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz"; + sha1 = "f328241e41e7b199d0b20c18e88429c4433295e1"; + }; + } + { + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_helper_wasm_section___helper_wasm_section_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz"; + sha1 = "21ee065a7b635f319e738f0dd73bfbda281c097a"; + }; + } + { + name = "_webassemblyjs_ieee754___ieee754_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_ieee754___ieee754_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz"; + sha1 = "963929e9bbd05709e7e12243a099180812992614"; + }; + } + { + name = "_webassemblyjs_leb128___leb128_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_leb128___leb128_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz"; + sha1 = "ce814b45574e93d76bae1fb2644ab9cdd9527aa5"; + }; + } + { + name = "_webassemblyjs_utf8___utf8_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_utf8___utf8_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz"; + sha1 = "d1f8b764369e7c6e6bae350e854dec9a59f0a3ff"; + }; + } + { + name = "_webassemblyjs_wasm_edit___wasm_edit_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_edit___wasm_edit_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz"; + sha1 = "ad206ebf4bf95a058ce9880a8c092c5dec8193d6"; + }; + } + { + name = "_webassemblyjs_wasm_gen___wasm_gen_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_gen___wasm_gen_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz"; + sha1 = "86c5ea304849759b7d88c47a32f4f039ae3c8f76"; + }; + } + { + name = "_webassemblyjs_wasm_opt___wasm_opt_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_opt___wasm_opt_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz"; + sha1 = "657b4c2202f4cf3b345f8a4c6461c8c2418985f2"; + }; + } + { + name = "_webassemblyjs_wasm_parser___wasm_parser_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wasm_parser___wasm_parser_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz"; + sha1 = "86ca734534f417e9bd3c67c7a1c75d8be41fb199"; + }; + } + { + name = "_webassemblyjs_wast_printer___wast_printer_1.11.1.tgz"; + path = fetchurl { + name = "_webassemblyjs_wast_printer___wast_printer_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz"; + sha1 = "d0c73beda8eec5426f10ae8ef55cee5e7084c2f0"; + }; + } + { + name = "_webpack_cli_configtest___configtest_1.0.4.tgz"; + path = fetchurl { + name = "_webpack_cli_configtest___configtest_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.4.tgz"; + sha1 = "f03ce6311c0883a83d04569e2c03c6238316d2aa"; + }; + } + { + name = "_webpack_cli_info___info_1.3.0.tgz"; + path = fetchurl { + name = "_webpack_cli_info___info_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.3.0.tgz"; + sha1 = "9d78a31101a960997a4acd41ffd9b9300627fe2b"; + }; + } + { + name = "_webpack_cli_serve___serve_1.5.2.tgz"; + path = fetchurl { + name = "_webpack_cli_serve___serve_1.5.2.tgz"; + url = "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.5.2.tgz"; + sha1 = "ea584b637ff63c5a477f6f21604b5a205b72c9ec"; + }; + } + { + name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; + path = fetchurl { + name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz"; + sha1 = "eef014a3145ae477a1cbc00cd1e552336dceb790"; + }; + } + { + name = "_xtuc_long___long_4.2.2.tgz"; + path = fetchurl { + name = "_xtuc_long___long_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz"; + sha1 = "d291c6a4e97989b5c61d9acf396ae4fe133a718d"; + }; + } + { + name = "JSONStream___JSONStream_1.3.5.tgz"; + path = fetchurl { + name = "JSONStream___JSONStream_1.3.5.tgz"; + url = "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz"; + sha1 = "3208c1f08d3a4d99261ab64f92302bc15e111ca0"; + }; + } + { + name = "abbrev___abbrev_1.1.1.tgz"; + path = fetchurl { + name = "abbrev___abbrev_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz"; + sha1 = "f8f2c887ad10bf67f634f005b6987fed3179aac8"; + }; + } + { + name = "accepts___accepts_1.3.7.tgz"; + path = fetchurl { + name = "accepts___accepts_1.3.7.tgz"; + url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz"; + sha1 = "531bc726517a3b2b41f850021c6cc15eaab507cd"; + }; + } + { + name = "acorn_import_assertions___acorn_import_assertions_1.7.6.tgz"; + path = fetchurl { + name = "acorn_import_assertions___acorn_import_assertions_1.7.6.tgz"; + url = "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz"; + sha1 = "580e3ffcae6770eebeec76c3b9723201e9d01f78"; + }; + } + { + name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; + path = fetchurl { + name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; + sha1 = "7ed5bb55908b3b2f1bc55c6af1653bada7f07937"; + }; + } + { + name = "acorn___acorn_7.4.1.tgz"; + path = fetchurl { + name = "acorn___acorn_7.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; + sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa"; + }; + } + { + name = "acorn___acorn_8.4.1.tgz"; + path = fetchurl { + name = "acorn___acorn_8.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz"; + sha1 = "56c36251fc7cabc7096adc18f05afe814321a28c"; + }; + } + { + name = "agent_base___agent_base_4.3.0.tgz"; + path = fetchurl { + name = "agent_base___agent_base_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz"; + sha1 = "8165f01c436009bccad0b1d122f05ed770efc6ee"; + }; + } + { + name = "agent_base___agent_base_4.2.1.tgz"; + path = fetchurl { + name = "agent_base___agent_base_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz"; + sha1 = "d89e5999f797875674c07d87f260fc41e83e8ca9"; + }; + } + { + name = "agentkeepalive___agentkeepalive_3.5.2.tgz"; + path = fetchurl { + name = "agentkeepalive___agentkeepalive_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz"; + sha1 = "a113924dd3fa24a0bc3b78108c450c2abee00f67"; + }; + } + { + name = "aggregate_error___aggregate_error_3.1.0.tgz"; + path = fetchurl { + name = "aggregate_error___aggregate_error_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz"; + sha1 = "92670ff50f5359bdb7a3e0d40d0ec30c5737687a"; + }; + } + { + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + path = fetchurl { + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; + sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d"; + }; + } + { + name = "ajv___ajv_6.12.6.tgz"; + path = fetchurl { + name = "ajv___ajv_6.12.6.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; + sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; + }; + } + { + name = "ajv___ajv_8.6.2.tgz"; + path = fetchurl { + name = "ajv___ajv_8.6.2.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.6.2.tgz"; + sha1 = "2fb45e0e5fcbc0813326c1c3da535d1881bb0571"; + }; + } + { + name = "amdefine___amdefine_1.0.1.tgz"; + path = fetchurl { + name = "amdefine___amdefine_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz"; + sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; + }; + } + { + name = "ansi_align___ansi_align_2.0.0.tgz"; + path = fetchurl { + name = "ansi_align___ansi_align_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz"; + sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; + }; + } + { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + path = fetchurl { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz"; + sha1 = "cbb9ae256bf750af1eab344f229aa27fe94ba348"; + }; + } + { + name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; + path = fetchurl { + name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz"; + sha1 = "6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"; + }; + } + { + name = "ansi_html___ansi_html_0.0.7.tgz"; + path = fetchurl { + name = "ansi_html___ansi_html_0.0.7.tgz"; + url = "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz"; + sha1 = "813584021962a9e9e6fd039f940d12f56ca7859e"; + }; + } + { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + } + { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; + sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + }; + } + { + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz"; + sha1 = "8b9f8f08cf1acb843756a839ca8c7e3168c51997"; + }; + } + { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha1 = "388539f55179bf39339c81af30a654d69f87cb75"; + }; + } + { + name = "ansi_regex___ansi_regex_6.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.0.tgz"; + sha1 = "ecc7f5933cbe5ac7b33e209a5ff409ab1669c6b2"; + }; + } + { + name = "ansi_styles___ansi_styles_2.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + } + { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; + sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; + }; + } + { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha1 = "edd803628ae71c04c85ae7a0906edad34b648937"; + }; + } + { + name = "ansicolors___ansicolors_0.3.2.tgz"; + path = fetchurl { + name = "ansicolors___ansicolors_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/ansicolors/-/ansicolors-0.3.2.tgz"; + sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"; + }; + } + { + name = "ansistyles___ansistyles_0.1.3.tgz"; + path = fetchurl { + name = "ansistyles___ansistyles_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/ansistyles/-/ansistyles-0.1.3.tgz"; + sha1 = "5de60415bda071bb37127854c864f41b23254539"; + }; + } + { + name = "anymatch___anymatch_3.1.2.tgz"; + path = fetchurl { + name = "anymatch___anymatch_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz"; + sha1 = "c0557c096af32f106198f4f4e2a383537e378716"; + }; + } + { + name = "aproba___aproba_1.2.0.tgz"; + path = fetchurl { + name = "aproba___aproba_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz"; + sha1 = "6802e6264efd18c790a1b0d517f0f2627bf2c94a"; + }; + } + { + name = "aproba___aproba_2.0.0.tgz"; + path = fetchurl { + name = "aproba___aproba_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz"; + sha1 = "52520b8ae5b569215b354efc0caa3fe1e45a8adc"; + }; + } + { + name = "archy___archy_1.0.0.tgz"; + path = fetchurl { + name = "archy___archy_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz"; + sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; + }; + } + { + name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + path = fetchurl { + name = "are_we_there_yet___are_we_there_yet_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; + sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21"; + }; + } + { + name = "argparse___argparse_1.0.10.tgz"; + path = fetchurl { + name = "argparse___argparse_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; + sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; + }; + } + { + name = "argparse___argparse_2.0.1.tgz"; + path = fetchurl { + name = "argparse___argparse_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz"; + sha1 = "246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"; + }; + } + { + name = "array_flatten___array_flatten_1.1.1.tgz"; + path = fetchurl { + name = "array_flatten___array_flatten_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz"; + sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + }; + } + { + name = "array_flatten___array_flatten_2.1.2.tgz"; + path = fetchurl { + name = "array_flatten___array_flatten_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz"; + sha1 = "24ef80a28c1a893617e2149b0c6d0d788293b099"; + }; + } + { + name = "array_union___array_union_1.0.2.tgz"; + path = fetchurl { + name = "array_union___array_union_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz"; + sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; + }; + } + { + name = "array_union___array_union_2.1.0.tgz"; + path = fetchurl { + name = "array_union___array_union_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz"; + sha1 = "b798420adbeb1de828d84acd8a2e23d3efe85e8d"; + }; + } + { + name = "array_uniq___array_uniq_1.0.3.tgz"; + path = fetchurl { + name = "array_uniq___array_uniq_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz"; + sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; + }; + } + { + name = "arrify___arrify_1.0.1.tgz"; + path = fetchurl { + name = "arrify___arrify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz"; + sha1 = "898508da2226f380df904728456849c1501a4b0d"; + }; + } + { + name = "asap___asap_2.0.6.tgz"; + path = fetchurl { + name = "asap___asap_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz"; + sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; + }; + } + { + name = "asn1___asn1_0.2.4.tgz"; + path = fetchurl { + name = "asn1___asn1_0.2.4.tgz"; + url = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz"; + sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136"; + }; + } + { + name = "assert_plus___assert_plus_1.0.0.tgz"; + path = fetchurl { + name = "assert_plus___assert_plus_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + } + { + name = "astral_regex___astral_regex_2.0.0.tgz"; + path = fetchurl { + name = "astral_regex___astral_regex_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; + sha1 = "483143c567aeed4785759c0865786dc77d7d2e31"; + }; + } + { + name = "async_foreach___async_foreach_0.1.3.tgz"; + path = fetchurl { + name = "async_foreach___async_foreach_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz"; + sha1 = "36121f845c0578172de419a97dbeb1d16ec34542"; + }; + } + { + name = "async___async_2.6.3.tgz"; + path = fetchurl { + name = "async___async_2.6.3.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz"; + sha1 = "d72625e2344a3656e3a3ad4fa749fa83299d82ff"; + }; + } + { + name = "asynckit___asynckit_0.4.0.tgz"; + path = fetchurl { + name = "asynckit___asynckit_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + } + { + name = "autosize___autosize_5.0.1.tgz"; + path = fetchurl { + name = "autosize___autosize_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/autosize/-/autosize-5.0.1.tgz"; + sha1 = "ed269b0fa9b7eb47627048a1bb3299e99e003a0f"; + }; + } + { + name = "aws_sign2___aws_sign2_0.7.0.tgz"; + path = fetchurl { + name = "aws_sign2___aws_sign2_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz"; + sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + }; + } + { + name = "aws4___aws4_1.11.0.tgz"; + path = fetchurl { + name = "aws4___aws4_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz"; + sha1 = "d61f46d83b2519250e2784daf5b09479a8b41c59"; + }; + } + { + name = "babel_loader___babel_loader_8.2.2.tgz"; + path = fetchurl { + name = "babel_loader___babel_loader_8.2.2.tgz"; + url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz"; + sha1 = "9363ce84c10c9a40e6c753748e1441b60c8a0b81"; + }; + } + { + name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz"; + path = fetchurl { + name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; + sha1 = "84fda19c976ec5c6defef57f9427b3def66e17a3"; + }; + } + { + name = "babel_plugin_inferno___babel_plugin_inferno_6.3.0.tgz"; + path = fetchurl { + name = "babel_plugin_inferno___babel_plugin_inferno_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-inferno/-/babel-plugin-inferno-6.3.0.tgz"; + sha1 = "4eb227149791f84b69fb5a728d159778dde08870"; + }; + } + { + name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.2.2.tgz"; + path = fetchurl { + name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz"; + sha1 = "e9124785e6fd94f94b618a7954e5693053bf5327"; + }; + } + { + name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.2.4.tgz"; + path = fetchurl { + name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.2.4.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz"; + sha1 = "68cb81316b0e8d9d721a92e0009ec6ecd4cd2ca9"; + }; + } + { + name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.2.2.tgz"; + path = fetchurl { + name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz"; + sha1 = "b310c8d642acada348c1fa3b3e6ce0e851bee077"; + }; + } + { + name = "balanced_match___balanced_match_1.0.2.tgz"; + path = fetchurl { + name = "balanced_match___balanced_match_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; + sha1 = "e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"; + }; + } + { + name = "batch___batch_0.6.1.tgz"; + path = fetchurl { + name = "batch___batch_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz"; + sha1 = "dc34314f4e679318093fc760272525f94bf25c16"; + }; + } + { + name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; + path = fetchurl { + name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; + sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + }; + } + { + name = "big.js___big.js_5.2.2.tgz"; + path = fetchurl { + name = "big.js___big.js_5.2.2.tgz"; + url = "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz"; + sha1 = "65f0af382f578bcdc742bd9c281e9cb2d7768328"; + }; + } + { + name = "bin_links___bin_links_1.1.8.tgz"; + path = fetchurl { + name = "bin_links___bin_links_1.1.8.tgz"; + url = "https://registry.yarnpkg.com/bin-links/-/bin-links-1.1.8.tgz"; + sha1 = "bd39aadab5dc4bdac222a07df5baf1af745b2228"; + }; + } + { + name = "binary_extensions___binary_extensions_2.2.0.tgz"; + path = fetchurl { + name = "binary_extensions___binary_extensions_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz"; + sha1 = "75f502eeaf9ffde42fc98829645be4ea76bd9e2d"; + }; + } + { + name = "block_stream___block_stream_0.0.9.tgz"; + path = fetchurl { + name = "block_stream___block_stream_0.0.9.tgz"; + url = "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz"; + sha1 = "13ebfe778a03205cfe03751481ebb4b3300c126a"; + }; + } + { + name = "bluebird___bluebird_3.7.2.tgz"; + path = fetchurl { + name = "bluebird___bluebird_3.7.2.tgz"; + url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; + sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f"; + }; + } + { + name = "bluebird___bluebird_3.5.5.tgz"; + path = fetchurl { + name = "bluebird___bluebird_3.5.5.tgz"; + url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz"; + sha1 = "a8d0afd73251effbbd5fe384a77d73003c17a71f"; + }; + } + { + name = "body_parser___body_parser_1.19.0.tgz"; + path = fetchurl { + name = "body_parser___body_parser_1.19.0.tgz"; + url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz"; + sha1 = "96b2709e57c9c4e09a6fd66a8fd979844f69f08a"; + }; + } + { + name = "bonjour___bonjour_3.5.0.tgz"; + path = fetchurl { + name = "bonjour___bonjour_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz"; + sha1 = "8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"; + }; + } + { + name = "bootstrap___bootstrap_5.1.0.tgz"; + path = fetchurl { + name = "bootstrap___bootstrap_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.1.0.tgz"; + sha1 = "543ef8f44f4b9af67b0230f19508542fec38ef55"; + }; + } + { + name = "bootswatch___bootswatch_5.1.0.tgz"; + path = fetchurl { + name = "bootswatch___bootswatch_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/bootswatch/-/bootswatch-5.1.0.tgz"; + sha1 = "a9c521226aef55bba96b2854ef6fe39737b24f1a"; + }; + } + { + name = "boxen___boxen_1.3.0.tgz"; + path = fetchurl { + name = "boxen___boxen_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz"; + sha1 = "55c6c39a8ba58d9c61ad22cd877532deb665a20b"; + }; + } + { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_1.1.11.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha1 = "3c7fcbf529d87226f3d2f52b966ff5271eb441dd"; + }; + } + { + name = "braces___braces_3.0.2.tgz"; + path = fetchurl { + name = "braces___braces_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; + sha1 = "3454e1a462ee8d599e236df336cd9ea4f8afe107"; + }; + } + { + name = "browserslist___browserslist_4.16.8.tgz"; + path = fetchurl { + name = "browserslist___browserslist_4.16.8.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.8.tgz"; + sha1 = "cb868b0b554f137ba6e33de0ecff2eda403c4fb0"; + }; + } + { + name = "buffer_from___buffer_from_1.1.2.tgz"; + path = fetchurl { + name = "buffer_from___buffer_from_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz"; + sha1 = "2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"; + }; + } + { + name = "buffer_indexof___buffer_indexof_1.1.1.tgz"; + path = fetchurl { + name = "buffer_indexof___buffer_indexof_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz"; + sha1 = "52fabcc6a606d1a00302802648ef68f639da268c"; + }; + } + { + name = "builtin_modules___builtin_modules_1.1.1.tgz"; + path = fetchurl { + name = "builtin_modules___builtin_modules_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz"; + sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; + }; + } + { + name = "builtin_modules___builtin_modules_3.2.0.tgz"; + path = fetchurl { + name = "builtin_modules___builtin_modules_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz"; + sha1 = "45d5db99e7ee5e6bc4f362e008bf917ab5049887"; + }; + } + { + name = "builtins___builtins_1.0.3.tgz"; + path = fetchurl { + name = "builtins___builtins_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz"; + sha1 = "cb94faeb61c8696451db36534e1422f94f0aee88"; + }; + } + { + name = "byline___byline_5.0.0.tgz"; + path = fetchurl { + name = "byline___byline_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz"; + sha1 = "741c5216468eadc457b03410118ad77de8c1ddb1"; + }; + } + { + name = "byte_size___byte_size_4.0.4.tgz"; + path = fetchurl { + name = "byte_size___byte_size_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/byte-size/-/byte-size-4.0.4.tgz"; + sha1 = "29d381709f41aae0d89c631f1c81aec88cd40b23"; + }; + } + { + name = "bytes___bytes_3.0.0.tgz"; + path = fetchurl { + name = "bytes___bytes_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz"; + sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; + }; + } + { + name = "bytes___bytes_3.1.0.tgz"; + path = fetchurl { + name = "bytes___bytes_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz"; + sha1 = "f6cf7933a360e0588fa9fde85651cdc7f805d1f6"; + }; + } + { + name = "cacache___cacache_10.0.4.tgz"; + path = fetchurl { + name = "cacache___cacache_10.0.4.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz"; + sha1 = "6452367999eff9d4188aefd9a14e9d7c6a263460"; + }; + } + { + name = "cacache___cacache_11.3.3.tgz"; + path = fetchurl { + name = "cacache___cacache_11.3.3.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-11.3.3.tgz"; + sha1 = "8bd29df8c6a718a6ebd2d010da4d7972ae3bbadc"; + }; + } + { + name = "call_bind___call_bind_1.0.2.tgz"; + path = fetchurl { + name = "call_bind___call_bind_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz"; + sha1 = "b1d4e89e688119c3c9a903ad30abb2f6a919be3c"; + }; + } + { + name = "call_limit___call_limit_1.1.1.tgz"; + path = fetchurl { + name = "call_limit___call_limit_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/call-limit/-/call-limit-1.1.1.tgz"; + sha1 = "ef15f2670db3f1992557e2d965abc459e6e358d4"; + }; + } + { + name = "caller_callsite___caller_callsite_2.0.0.tgz"; + path = fetchurl { + name = "caller_callsite___caller_callsite_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz"; + sha1 = "847e0fce0a223750a9a027c54b33731ad3154134"; + }; + } + { + name = "caller_path___caller_path_2.0.0.tgz"; + path = fetchurl { + name = "caller_path___caller_path_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz"; + sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; + }; + } + { + name = "callsites___callsites_2.0.0.tgz"; + path = fetchurl { + name = "callsites___callsites_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz"; + sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; + }; + } + { + name = "callsites___callsites_3.1.0.tgz"; + path = fetchurl { + name = "callsites___callsites_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; + sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73"; + }; + } + { + name = "camelcase_keys___camelcase_keys_6.2.2.tgz"; + path = fetchurl { + name = "camelcase_keys___camelcase_keys_6.2.2.tgz"; + url = "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz"; + sha1 = "5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"; + }; + } + { + name = "camelcase___camelcase_4.1.0.tgz"; + path = fetchurl { + name = "camelcase___camelcase_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz"; + sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; + }; + } + { + name = "camelcase___camelcase_5.3.1.tgz"; + path = fetchurl { + name = "camelcase___camelcase_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz"; + sha1 = "e3c9b31569e106811df242f715725a1f4c494320"; + }; + } + { + name = "caniuse_lite___caniuse_lite_1.0.30001251.tgz"; + path = fetchurl { + name = "caniuse_lite___caniuse_lite_1.0.30001251.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001251.tgz"; + sha1 = "6853a606ec50893115db660f82c094d18f096d85"; + }; + } + { + name = "capture_stack_trace___capture_stack_trace_1.0.1.tgz"; + path = fetchurl { + name = "capture_stack_trace___capture_stack_trace_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz"; + sha1 = "a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"; + }; + } + { + name = "caseless___caseless_0.12.0.tgz"; + path = fetchurl { + name = "caseless___caseless_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz"; + sha1 = "1b681c21ff84033c826543090689420d187151dc"; + }; + } + { + name = "chalk___chalk_1.1.3.tgz"; + path = fetchurl { + name = "chalk___chalk_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + } + { + name = "chalk___chalk_2.4.2.tgz"; + path = fetchurl { + name = "chalk___chalk_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; + sha1 = "cd42541677a54333cf541a49108c1432b44c9424"; + }; + } + { + name = "chalk___chalk_4.1.2.tgz"; + path = fetchurl { + name = "chalk___chalk_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz"; + sha1 = "aac4e2b7734a740867aeb16bf02aad556a1e7a01"; + }; + } + { + name = "choices.js___choices.js_9.0.1.tgz"; + path = fetchurl { + name = "choices.js___choices.js_9.0.1.tgz"; + url = "https://registry.yarnpkg.com/choices.js/-/choices.js-9.0.1.tgz"; + sha1 = "745fb29af8670428fdc0bf1cc9dfaa404e9d0510"; + }; + } + { + name = "chokidar___chokidar_3.5.2.tgz"; + path = fetchurl { + name = "chokidar___chokidar_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz"; + sha1 = "dba3976fcadb016f66fd365021d91600d01c1e75"; + }; + } + { + name = "chownr___chownr_1.1.4.tgz"; + path = fetchurl { + name = "chownr___chownr_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz"; + sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b"; + }; + } + { + name = "chownr___chownr_2.0.0.tgz"; + path = fetchurl { + name = "chownr___chownr_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz"; + sha1 = "15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"; + }; + } + { + name = "chownr___chownr_1.0.1.tgz"; + path = fetchurl { + name = "chownr___chownr_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz"; + sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181"; + }; + } + { + name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; + path = fetchurl { + name = "chrome_trace_event___chrome_trace_event_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"; + sha1 = "1015eced4741e15d06664a957dbbf50d041e26ac"; + }; + } + { + name = "ci_info___ci_info_1.6.0.tgz"; + path = fetchurl { + name = "ci_info___ci_info_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz"; + sha1 = "2ca20dbb9ceb32d4524a683303313f0304b1e497"; + }; + } + { + name = "cidr_regex___cidr_regex_1.0.6.tgz"; + path = fetchurl { + name = "cidr_regex___cidr_regex_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/cidr-regex/-/cidr-regex-1.0.6.tgz"; + sha1 = "74abfd619df370b9d54ab14475568e97dd64c0c1"; + }; + } + { + name = "clean_stack___clean_stack_2.2.0.tgz"; + path = fetchurl { + name = "clean_stack___clean_stack_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz"; + sha1 = "ee8472dbb129e727b31e8a10a427dee9dfe4008b"; + }; + } + { + name = "clean_webpack_plugin___clean_webpack_plugin_4.0.0_alpha.0.tgz"; + path = fetchurl { + name = "clean_webpack_plugin___clean_webpack_plugin_4.0.0_alpha.0.tgz"; + url = "https://registry.yarnpkg.com/clean-webpack-plugin/-/clean-webpack-plugin-4.0.0-alpha.0.tgz"; + sha1 = "2aef48dfe7565360d128f5caa0904097d969d053"; + }; + } + { + name = "cli_boxes___cli_boxes_1.0.0.tgz"; + path = fetchurl { + name = "cli_boxes___cli_boxes_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz"; + sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; + }; + } + { + name = "cli_columns___cli_columns_3.1.2.tgz"; + path = fetchurl { + name = "cli_columns___cli_columns_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/cli-columns/-/cli-columns-3.1.2.tgz"; + sha1 = "6732d972979efc2ae444a1f08e08fa139c96a18e"; + }; + } + { + name = "cli_cursor___cli_cursor_3.1.0.tgz"; + path = fetchurl { + name = "cli_cursor___cli_cursor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz"; + sha1 = "264305a7ae490d1d03bf0c9ba7c925d1753af307"; + }; + } + { + name = "cli_table2___cli_table2_0.2.0.tgz"; + path = fetchurl { + name = "cli_table2___cli_table2_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/cli-table2/-/cli-table2-0.2.0.tgz"; + sha1 = "2d1ef7f218a0e786e214540562d4bd177fe32d97"; + }; + } + { + name = "cli_table3___cli_table3_0.5.1.tgz"; + path = fetchurl { + name = "cli_table3___cli_table3_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.5.1.tgz"; + sha1 = "0252372d94dfc40dbd8df06005f48f31f656f202"; + }; + } + { + name = "cli_truncate___cli_truncate_2.1.0.tgz"; + path = fetchurl { + name = "cli_truncate___cli_truncate_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz"; + sha1 = "c39e28bf05edcde5be3b98992a22deed5a2b93c7"; + }; + } + { + name = "cliui___cliui_3.2.0.tgz"; + path = fetchurl { + name = "cliui___cliui_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz"; + sha1 = "120601537a916d29940f934da3b48d585a39213d"; + }; + } + { + name = "cliui___cliui_5.0.0.tgz"; + path = fetchurl { + name = "cliui___cliui_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz"; + sha1 = "deefcfdb2e800784aa34f46fa08e06851c7bbbc5"; + }; + } + { + name = "clone_deep___clone_deep_4.0.1.tgz"; + path = fetchurl { + name = "clone_deep___clone_deep_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz"; + sha1 = "c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"; + }; + } + { + name = "clone___clone_1.0.4.tgz"; + path = fetchurl { + name = "clone___clone_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz"; + sha1 = "da309cc263df15994c688ca902179ca3c7cd7c7e"; + }; + } + { + name = "cmd_shim___cmd_shim_3.0.3.tgz"; + path = fetchurl { + name = "cmd_shim___cmd_shim_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-3.0.3.tgz"; + sha1 = "2c35238d3df37d98ecdd7d5f6b8dc6b21cadc7cb"; + }; + } + { + name = "cmd_shim___cmd_shim_2.0.2.tgz"; + path = fetchurl { + name = "cmd_shim___cmd_shim_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz"; + sha1 = "6fcbda99483a8fd15d7d30a196ca69d688a2efdb"; + }; + } + { + name = "code_point_at___code_point_at_1.1.0.tgz"; + path = fetchurl { + name = "code_point_at___code_point_at_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + } + { + name = "color_convert___color_convert_1.9.3.tgz"; + path = fetchurl { + name = "color_convert___color_convert_1.9.3.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; + sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; + }; + } + { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + }; + } + { + name = "color_name___color_name_1.1.3.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + }; + } + { + name = "color_name___color_name_1.1.4.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; + sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; + }; + } + { + name = "colorette___colorette_1.3.0.tgz"; + path = fetchurl { + name = "colorette___colorette_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz"; + sha1 = "ff45d2f0edb244069d3b772adeb04fed38d0a0af"; + }; + } + { + name = "colors___colors_1.4.0.tgz"; + path = fetchurl { + name = "colors___colors_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz"; + sha1 = "c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"; + }; + } + { + name = "columnify___columnify_1.5.4.tgz"; + path = fetchurl { + name = "columnify___columnify_1.5.4.tgz"; + url = "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz"; + sha1 = "4737ddf1c7b69a8a7c340570782e947eec8e78bb"; + }; + } + { + name = "combined_stream___combined_stream_1.0.8.tgz"; + path = fetchurl { + name = "combined_stream___combined_stream_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; + sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; + }; + } + { + name = "commander___commander_2.20.3.tgz"; + path = fetchurl { + name = "commander___commander_2.20.3.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; + sha1 = "fd485e84c03eb4881c20722ba48035e8531aeb33"; + }; + } + { + name = "commander___commander_7.2.0.tgz"; + path = fetchurl { + name = "commander___commander_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz"; + sha1 = "a36cb57d0b501ce108e4d20559a150a391d97ab7"; + }; + } + { + name = "commondir___commondir_1.0.1.tgz"; + path = fetchurl { + name = "commondir___commondir_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz"; + sha1 = "ddd800da0c66127393cca5950ea968a3aaf1253b"; + }; + } + { + name = "compressible___compressible_2.0.18.tgz"; + path = fetchurl { + name = "compressible___compressible_2.0.18.tgz"; + url = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz"; + sha1 = "af53cca6b070d4c3c0750fbd77286a6d7cc46fba"; + }; + } + { + name = "compression___compression_1.7.4.tgz"; + path = fetchurl { + name = "compression___compression_1.7.4.tgz"; + url = "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz"; + sha1 = "95523eff170ca57c29a0ca41e6fe131f41e5bb8f"; + }; + } + { + name = "concat_map___concat_map_0.0.1.tgz"; + path = fetchurl { + name = "concat_map___concat_map_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + } + { + name = "concat_stream___concat_stream_1.6.2.tgz"; + path = fetchurl { + name = "concat_stream___concat_stream_1.6.2.tgz"; + url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; + sha1 = "904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"; + }; + } + { + name = "config_chain___config_chain_1.1.13.tgz"; + path = fetchurl { + name = "config_chain___config_chain_1.1.13.tgz"; + url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz"; + sha1 = "fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"; + }; + } + { + name = "configstore___configstore_3.1.5.tgz"; + path = fetchurl { + name = "configstore___configstore_3.1.5.tgz"; + url = "https://registry.yarnpkg.com/configstore/-/configstore-3.1.5.tgz"; + sha1 = "e9af331fadc14dabd544d3e7e76dc446a09a530f"; + }; + } + { + name = "connect_history_api_fallback___connect_history_api_fallback_1.6.0.tgz"; + path = fetchurl { + name = "connect_history_api_fallback___connect_history_api_fallback_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"; + sha1 = "8b32089359308d111115d81cad3fceab888f97bc"; + }; + } + { + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + path = fetchurl { + name = "console_control_strings___console_control_strings_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + }; + } + { + name = "content_disposition___content_disposition_0.5.3.tgz"; + path = fetchurl { + name = "content_disposition___content_disposition_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz"; + sha1 = "e130caf7e7279087c5616c2007d0485698984fbd"; + }; + } + { + name = "content_type___content_type_1.0.4.tgz"; + path = fetchurl { + name = "content_type___content_type_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz"; + sha1 = "e138cc75e040c727b1966fe5e5f8c9aee256fe3b"; + }; + } + { + name = "convert_source_map___convert_source_map_1.8.0.tgz"; + path = fetchurl { + name = "convert_source_map___convert_source_map_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz"; + sha1 = "f3373c32d21b4d780dd8004514684fb791ca4369"; + }; + } + { + name = "cookie_signature___cookie_signature_1.0.6.tgz"; + path = fetchurl { + name = "cookie_signature___cookie_signature_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + } + { + name = "cookie___cookie_0.4.0.tgz"; + path = fetchurl { + name = "cookie___cookie_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz"; + sha1 = "beb437e7022b3b6d49019d088665303ebe9c14ba"; + }; + } + { + name = "cookie___cookie_0.1.5.tgz"; + path = fetchurl { + name = "cookie___cookie_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/cookie/-/cookie-0.1.5.tgz"; + sha1 = "6ab9948a4b1ae21952cd2588530a4722d4044d7c"; + }; + } + { + name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; + path = fetchurl { + name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz"; + sha1 = "92297398cae34937fcafd6ec8139c18051f0b5e0"; + }; + } + { + name = "copy_webpack_plugin___copy_webpack_plugin_9.0.1.tgz"; + path = fetchurl { + name = "copy_webpack_plugin___copy_webpack_plugin_9.0.1.tgz"; + url = "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-9.0.1.tgz"; + sha1 = "b71d21991599f61a4ee00ba79087b8ba279bbb59"; + }; + } + { + name = "core_js_compat___core_js_compat_3.16.2.tgz"; + path = fetchurl { + name = "core_js_compat___core_js_compat_3.16.2.tgz"; + url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.16.2.tgz"; + sha1 = "442ef1d933ca6fc80859bd5a1db7a3ba716aaf56"; + }; + } + { + name = "core_util_is___core_util_is_1.0.2.tgz"; + path = fetchurl { + name = "core_util_is___core_util_is_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + } + { + name = "cosmiconfig___cosmiconfig_5.2.1.tgz"; + path = fetchurl { + name = "cosmiconfig___cosmiconfig_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz"; + sha1 = "040f726809c591e77a17c0a3626ca45b4f168b1a"; + }; + } + { + name = "cosmiconfig___cosmiconfig_7.0.0.tgz"; + path = fetchurl { + name = "cosmiconfig___cosmiconfig_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz"; + sha1 = "ef9b44d773959cae63ddecd122de23853b60f8d3"; + }; + } + { + name = "create_error_class___create_error_class_3.0.2.tgz"; + path = fetchurl { + name = "create_error_class___create_error_class_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz"; + sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; + }; + } + { + name = "cross_spawn___cross_spawn_5.1.0.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz"; + sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; + }; + } + { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; + }; + } + { + name = "crypto_random_string___crypto_random_string_1.0.0.tgz"; + path = fetchurl { + name = "crypto_random_string___crypto_random_string_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz"; + sha1 = "a230f64f568310e1498009940790ec99545bca7e"; + }; + } + { + name = "css_loader___css_loader_6.2.0.tgz"; + path = fetchurl { + name = "css_loader___css_loader_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/css-loader/-/css-loader-6.2.0.tgz"; + sha1 = "9663d9443841de957a3cb9bcea2eda65b3377071"; + }; + } + { + name = "cssesc___cssesc_3.0.0.tgz"; + path = fetchurl { + name = "cssesc___cssesc_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz"; + sha1 = "37741919903b868565e1c09ea747445cd18983ee"; + }; + } + { + name = "cyclist___cyclist_1.0.1.tgz"; + path = fetchurl { + name = "cyclist___cyclist_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz"; + sha1 = "596e9698fd0c80e12038c2b82d6eb1b35b6224d9"; + }; + } + { + name = "dashdash___dashdash_1.14.1.tgz"; + path = fetchurl { + name = "dashdash___dashdash_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz"; + sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + }; + } + { + name = "debug___debug_2.6.9.tgz"; + path = fetchurl { + name = "debug___debug_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; + sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; + }; + } + { + name = "debug___debug_3.1.0.tgz"; + path = fetchurl { + name = "debug___debug_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz"; + sha1 = "5bb5a0672628b64149566ba16819e61518c67261"; + }; + } + { + name = "debug___debug_3.2.7.tgz"; + path = fetchurl { + name = "debug___debug_3.2.7.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz"; + sha1 = "72580b7e9145fb39b6676f9c5e5fb100b934179a"; + }; + } + { + name = "debug___debug_4.3.2.tgz"; + path = fetchurl { + name = "debug___debug_4.3.2.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; + sha1 = "f0a49c18ac8779e31d4a0c6029dfb76873c7428b"; + }; + } + { + name = "debuglog___debuglog_1.0.1.tgz"; + path = fetchurl { + name = "debuglog___debuglog_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz"; + sha1 = "aa24ffb9ac3df9a2351837cfb2d279360cd78492"; + }; + } + { + name = "decamelize_keys___decamelize_keys_1.1.0.tgz"; + path = fetchurl { + name = "decamelize_keys___decamelize_keys_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz"; + sha1 = "d171a87933252807eb3cb61dc1c1445d078df2d9"; + }; + } + { + name = "decamelize___decamelize_1.2.0.tgz"; + path = fetchurl { + name = "decamelize___decamelize_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + } + { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + path = fetchurl { + name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; + sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + }; + } + { + name = "deep_equal___deep_equal_1.1.1.tgz"; + path = fetchurl { + name = "deep_equal___deep_equal_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz"; + sha1 = "b5c98c942ceffaf7cb051e24e1434a25a2e6076a"; + }; + } + { + name = "deep_extend___deep_extend_0.6.0.tgz"; + path = fetchurl { + name = "deep_extend___deep_extend_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; + sha1 = "c4fa7c95404a17a9c3e8ca7e1537312b736330ac"; + }; + } + { + name = "deep_is___deep_is_0.1.3.tgz"; + path = fetchurl { + name = "deep_is___deep_is_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + } + { + name = "deepmerge___deepmerge_4.2.2.tgz"; + path = fetchurl { + name = "deepmerge___deepmerge_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz"; + sha1 = "44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"; + }; + } + { + name = "default_gateway___default_gateway_6.0.3.tgz"; + path = fetchurl { + name = "default_gateway___default_gateway_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz"; + sha1 = "819494c888053bdb743edbf343d6cdf7f2943a71"; + }; + } + { + name = "defaults___defaults_1.0.3.tgz"; + path = fetchurl { + name = "defaults___defaults_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz"; + sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; + }; + } + { + name = "define_lazy_prop___define_lazy_prop_2.0.0.tgz"; + path = fetchurl { + name = "define_lazy_prop___define_lazy_prop_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz"; + sha1 = "3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"; + }; + } + { + name = "define_properties___define_properties_1.1.3.tgz"; + path = fetchurl { + name = "define_properties___define_properties_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz"; + sha1 = "cf88da6cbee26fe6db7094f61d870cbd84cee9f1"; + }; + } + { + name = "del___del_4.1.1.tgz"; + path = fetchurl { + name = "del___del_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz"; + sha1 = "9e8f117222ea44a31ff3a156c049b99052a9f0b4"; + }; + } + { + name = "del___del_6.0.0.tgz"; + path = fetchurl { + name = "del___del_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/del/-/del-6.0.0.tgz"; + sha1 = "0b40d0332cea743f1614f818be4feb717714c952"; + }; + } + { + name = "delayed_stream___delayed_stream_1.0.0.tgz"; + path = fetchurl { + name = "delayed_stream___delayed_stream_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + } + { + name = "delegates___delegates_1.0.0.tgz"; + path = fetchurl { + name = "delegates___delegates_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + } + { + name = "depd___depd_1.1.2.tgz"; + path = fetchurl { + name = "depd___depd_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + } + { + name = "destroy___destroy_1.0.4.tgz"; + path = fetchurl { + name = "destroy___destroy_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + } + { + name = "detect_indent___detect_indent_6.1.0.tgz"; + path = fetchurl { + name = "detect_indent___detect_indent_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz"; + sha1 = "592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"; + }; + } + { + name = "detect_indent___detect_indent_5.0.0.tgz"; + path = fetchurl { + name = "detect_indent___detect_indent_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz"; + sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"; + }; + } + { + name = "detect_newline___detect_newline_3.1.0.tgz"; + path = fetchurl { + name = "detect_newline___detect_newline_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz"; + sha1 = "576f5dfc63ae1a192ff192d8ad3af6308991b651"; + }; + } + { + name = "detect_newline___detect_newline_2.1.0.tgz"; + path = fetchurl { + name = "detect_newline___detect_newline_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz"; + sha1 = "f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"; + }; + } + { + name = "detect_node___detect_node_2.1.0.tgz"; + path = fetchurl { + name = "detect_node___detect_node_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz"; + sha1 = "c9c70775a49c3d03bc2c06d9a73be550f978f8b1"; + }; + } + { + name = "dezalgo___dezalgo_1.0.3.tgz"; + path = fetchurl { + name = "dezalgo___dezalgo_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz"; + sha1 = "7f742de066fc748bc8db820569dddce49bf0d456"; + }; + } + { + name = "dir_glob___dir_glob_3.0.1.tgz"; + path = fetchurl { + name = "dir_glob___dir_glob_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz"; + sha1 = "56dbf73d992a4a93ba1584f4534063fd2e41717f"; + }; + } + { + name = "dns_equal___dns_equal_1.0.0.tgz"; + path = fetchurl { + name = "dns_equal___dns_equal_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz"; + sha1 = "b39e7f1da6eb0a75ba9c17324b34753c47e0654d"; + }; + } + { + name = "dns_packet___dns_packet_1.3.4.tgz"; + path = fetchurl { + name = "dns_packet___dns_packet_1.3.4.tgz"; + url = "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz"; + sha1 = "e3455065824a2507ba886c55a89963bb107dec6f"; + }; + } + { + name = "dns_txt___dns_txt_2.0.2.tgz"; + path = fetchurl { + name = "dns_txt___dns_txt_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz"; + sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; + }; + } + { + name = "doctrine___doctrine_3.0.0.tgz"; + path = fetchurl { + name = "doctrine___doctrine_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz"; + sha1 = "addebead72a6574db783639dc87a121773973961"; + }; + } + { + name = "dot_prop___dot_prop_4.2.1.tgz"; + path = fetchurl { + name = "dot_prop___dot_prop_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.1.tgz"; + sha1 = "45884194a71fc2cda71cbb4bceb3a4dd2f433ba4"; + }; + } + { + name = "dotenv___dotenv_5.0.1.tgz"; + path = fetchurl { + name = "dotenv___dotenv_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/dotenv/-/dotenv-5.0.1.tgz"; + sha1 = "a5317459bd3d79ab88cff6e44057a6a3fbb1fcef"; + }; + } + { + name = "duplexer3___duplexer3_0.1.4.tgz"; + path = fetchurl { + name = "duplexer3___duplexer3_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + }; + } + { + name = "duplexify___duplexify_3.7.1.tgz"; + path = fetchurl { + name = "duplexify___duplexify_3.7.1.tgz"; + url = "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz"; + sha1 = "2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"; + }; + } + { + name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; + path = fetchurl { + name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; + sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + }; + } + { + name = "editor___editor_1.0.0.tgz"; + path = fetchurl { + name = "editor___editor_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/editor/-/editor-1.0.0.tgz"; + sha1 = "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742"; + }; + } + { + name = "ee_first___ee_first_1.1.1.tgz"; + path = fetchurl { + name = "ee_first___ee_first_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + } + { + name = "electron_to_chromium___electron_to_chromium_1.3.813.tgz"; + path = fetchurl { + name = "electron_to_chromium___electron_to_chromium_1.3.813.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.813.tgz"; + sha1 = "751a007d71c00faed8b5e9edaf3634c14b9c5a1f"; + }; + } + { + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz"; + sha1 = "933a04052860c85e83c122479c4748a8e4c72156"; + }; + } + { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + }; + } + { + name = "emoji_short_name___emoji_short_name_1.0.0.tgz"; + path = fetchurl { + name = "emoji_short_name___emoji_short_name_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-short-name/-/emoji-short-name-1.0.0.tgz"; + sha1 = "82e6f543b6c68984d69bdc80eac735104fdd4af8"; + }; + } + { + name = "emojis_list___emojis_list_3.0.0.tgz"; + path = fetchurl { + name = "emojis_list___emojis_list_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz"; + sha1 = "5570662046ad29e2e916e71aae260abdff4f6a78"; + }; + } + { + name = "encodeurl___encodeurl_1.0.2.tgz"; + path = fetchurl { + name = "encodeurl___encodeurl_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + } + { + name = "encoding___encoding_0.1.13.tgz"; + path = fetchurl { + name = "encoding___encoding_0.1.13.tgz"; + url = "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz"; + sha1 = "56574afdd791f54a8e9b2785c0582a2d26210fa9"; + }; + } + { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + path = fetchurl { + name = "end_of_stream___end_of_stream_1.4.4.tgz"; + url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; + }; + } + { + name = "enhanced_resolve___enhanced_resolve_5.8.2.tgz"; + path = fetchurl { + name = "enhanced_resolve___enhanced_resolve_5.8.2.tgz"; + url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz"; + sha1 = "15ddc779345cbb73e97c611cd00c01c1e7bf4d8b"; + }; + } + { + name = "enquirer___enquirer_2.3.6.tgz"; + path = fetchurl { + name = "enquirer___enquirer_2.3.6.tgz"; + url = "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz"; + sha1 = "2a7fe5dd634a1e4125a975ec994ff5456dc3734d"; + }; + } + { + name = "entities___entities_2.1.0.tgz"; + path = fetchurl { + name = "entities___entities_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz"; + sha1 = "992d3129cf7df6870b96c57858c249a120f8b8b5"; + }; + } + { + name = "env_paths___env_paths_2.2.1.tgz"; + path = fetchurl { + name = "env_paths___env_paths_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz"; + sha1 = "420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"; + }; + } + { + name = "envinfo___envinfo_7.8.1.tgz"; + path = fetchurl { + name = "envinfo___envinfo_7.8.1.tgz"; + url = "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz"; + sha1 = "06377e3e5f4d379fea7ac592d5ad8927e0c4d475"; + }; + } + { + name = "err_code___err_code_1.1.2.tgz"; + path = fetchurl { + name = "err_code___err_code_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz"; + sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960"; + }; + } + { + name = "errno___errno_0.1.8.tgz"; + path = fetchurl { + name = "errno___errno_0.1.8.tgz"; + url = "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz"; + sha1 = "8bb3e9c7d463be4976ff888f76b4809ebc2e811f"; + }; + } + { + name = "error_ex___error_ex_1.3.2.tgz"; + path = fetchurl { + name = "error_ex___error_ex_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; + sha1 = "b4ac40648107fdcdcfae242f428bea8a14d4f1bf"; + }; + } + { + name = "es_abstract___es_abstract_1.18.5.tgz"; + path = fetchurl { + name = "es_abstract___es_abstract_1.18.5.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.5.tgz"; + sha1 = "9b10de7d4c206a3581fd5b2124233e04db49ae19"; + }; + } + { + name = "es_module_lexer___es_module_lexer_0.7.1.tgz"; + path = fetchurl { + name = "es_module_lexer___es_module_lexer_0.7.1.tgz"; + url = "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.7.1.tgz"; + sha1 = "c2c8e0f46f2df06274cdaf0dd3f3b33e0a0b267d"; + }; + } + { + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + path = fetchurl { + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; + }; + } + { + name = "es6_promise___es6_promise_4.2.8.tgz"; + path = fetchurl { + name = "es6_promise___es6_promise_4.2.8.tgz"; + url = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz"; + sha1 = "4eb21594c972bc40553d276e510539143db53e0a"; + }; + } + { + name = "es6_promisify___es6_promisify_5.0.0.tgz"; + path = fetchurl { + name = "es6_promisify___es6_promisify_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz"; + sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203"; + }; + } + { + name = "escalade___escalade_3.1.1.tgz"; + path = fetchurl { + name = "escalade___escalade_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; + sha1 = "d8cfdc7000965c5a0174b4a82eaa5c0552742e40"; + }; + } + { + name = "escape_html___escape_html_1.0.3.tgz"; + path = fetchurl { + name = "escape_html___escape_html_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + } + { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34"; + }; + } + { + name = "eslint_plugin_prettier___eslint_plugin_prettier_3.4.1.tgz"; + path = fetchurl { + name = "eslint_plugin_prettier___eslint_plugin_prettier_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz"; + sha1 = "e9ddb200efb6f3d05ffe83b1665a716af4a387e5"; + }; + } + { + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + path = fetchurl { + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha1 = "e786e59a66cb92b3f6c1fb0d508aab174848f48c"; + }; + } + { + name = "eslint_utils___eslint_utils_2.1.0.tgz"; + path = fetchurl { + name = "eslint_utils___eslint_utils_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz"; + sha1 = "d2de5e03424e707dc10c74068ddedae708741b27"; + }; + } + { + name = "eslint_utils___eslint_utils_3.0.0.tgz"; + path = fetchurl { + name = "eslint_utils___eslint_utils_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz"; + sha1 = "8aebaface7345bb33559db0a1f13a1d2d48c3672"; + }; + } + { + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; + path = fetchurl { + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; + sha1 = "30ebd1ef7c2fdff01c3a4f151044af25fab0523e"; + }; + } + { + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; + path = fetchurl { + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; + sha1 = "f65328259305927392c938ed44eb0a5c9b2bd303"; + }; + } + { + name = "eslint___eslint_7.32.0.tgz"; + path = fetchurl { + name = "eslint___eslint_7.32.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz"; + sha1 = "c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"; + }; + } + { + name = "espree___espree_7.3.1.tgz"; + path = fetchurl { + name = "espree___espree_7.3.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz"; + sha1 = "f2df330b752c6f55019f8bd89b7660039c1bbbb6"; + }; + } + { + name = "esprima___esprima_4.0.1.tgz"; + path = fetchurl { + name = "esprima___esprima_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; + sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; + }; + } + { + name = "esquery___esquery_1.4.0.tgz"; + path = fetchurl { + name = "esquery___esquery_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz"; + sha1 = "2148ffc38b82e8c7057dfed48425b3e61f0f24a5"; + }; + } + { + name = "esrecurse___esrecurse_4.3.0.tgz"; + path = fetchurl { + name = "esrecurse___esrecurse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; + sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921"; + }; + } + { + name = "estraverse___estraverse_4.3.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; + sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; + }; + } + { + name = "estraverse___estraverse_5.2.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; + sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880"; + }; + } + { + name = "esutils___esutils_2.0.3.tgz"; + path = fetchurl { + name = "esutils___esutils_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; + sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; + }; + } + { + name = "etag___etag_1.8.1.tgz"; + path = fetchurl { + name = "etag___etag_1.8.1.tgz"; + url = "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + } + { + name = "eventemitter3___eventemitter3_4.0.7.tgz"; + path = fetchurl { + name = "eventemitter3___eventemitter3_4.0.7.tgz"; + url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz"; + sha1 = "2de9b68f6528d5644ef5c59526a1b4a07306169f"; + }; + } + { + name = "events___events_3.3.0.tgz"; + path = fetchurl { + name = "events___events_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz"; + sha1 = "31a95ad0a924e2d2c419a813aeb2c4e878ea7400"; + }; + } + { + name = "execa___execa_0.7.0.tgz"; + path = fetchurl { + name = "execa___execa_0.7.0.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz"; + sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; + }; + } + { + name = "execa___execa_5.1.1.tgz"; + path = fetchurl { + name = "execa___execa_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz"; + sha1 = "f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"; + }; + } + { + name = "exenv___exenv_1.2.2.tgz"; + path = fetchurl { + name = "exenv___exenv_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/exenv/-/exenv-1.2.2.tgz"; + sha1 = "2ae78e85d9894158670b03d47bec1f03bd91bb9d"; + }; + } + { + name = "express___express_4.17.1.tgz"; + path = fetchurl { + name = "express___express_4.17.1.tgz"; + url = "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz"; + sha1 = "4491fc38605cf51f8629d39c2b5d026f98a4c134"; + }; + } + { + name = "extend___extend_3.0.2.tgz"; + path = fetchurl { + name = "extend___extend_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; + sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; + }; + } + { + name = "extsprintf___extsprintf_1.3.0.tgz"; + path = fetchurl { + name = "extsprintf___extsprintf_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz"; + sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + }; + } + { + name = "extsprintf___extsprintf_1.4.0.tgz"; + path = fetchurl { + name = "extsprintf___extsprintf_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz"; + sha1 = "e2689f8f356fad62cca65a3a91c5df5f9551692f"; + }; + } + { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + path = fetchurl { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; + }; + } + { + name = "fast_diff___fast_diff_1.2.0.tgz"; + path = fetchurl { + name = "fast_diff___fast_diff_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz"; + sha1 = "73ee11982d86caaf7959828d519cfe927fac5f03"; + }; + } + { + name = "fast_glob___fast_glob_3.2.7.tgz"; + path = fetchurl { + name = "fast_glob___fast_glob_3.2.7.tgz"; + url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz"; + sha1 = "fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"; + }; + } + { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + path = fetchurl { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; + }; + } + { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + path = fetchurl { + name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + }; + } + { + name = "fastest_levenshtein___fastest_levenshtein_1.0.12.tgz"; + path = fetchurl { + name = "fastest_levenshtein___fastest_levenshtein_1.0.12.tgz"; + url = "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz"; + sha1 = "9990f7d3a88cc5a9ffd1f1745745251700d497e2"; + }; + } + { + name = "fastq___fastq_1.12.0.tgz"; + path = fetchurl { + name = "fastq___fastq_1.12.0.tgz"; + url = "https://registry.yarnpkg.com/fastq/-/fastq-1.12.0.tgz"; + sha1 = "ed7b6ab5d62393fb2cc591c853652a5c318bf794"; + }; + } + { + name = "faye_websocket___faye_websocket_0.11.4.tgz"; + path = fetchurl { + name = "faye_websocket___faye_websocket_0.11.4.tgz"; + url = "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz"; + sha1 = "7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da"; + }; + } + { + name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; + path = fetchurl { + name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz"; + sha1 = "b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"; + }; + } + { + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; + path = fetchurl { + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; + sha1 = "211b2dd9659cb0394b073e7323ac3c933d522027"; + }; + } + { + name = "fill_range___fill_range_7.0.1.tgz"; + path = fetchurl { + name = "fill_range___fill_range_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz"; + sha1 = "1919a6a7c75fe38b2c7c77e5198535da9acdda40"; + }; + } + { + name = "filter_obj___filter_obj_1.1.0.tgz"; + path = fetchurl { + name = "filter_obj___filter_obj_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/filter-obj/-/filter-obj-1.1.0.tgz"; + sha1 = "9b311112bc6c6127a16e016c6c5d7f19e0805c5b"; + }; + } + { + name = "finalhandler___finalhandler_1.1.2.tgz"; + path = fetchurl { + name = "finalhandler___finalhandler_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz"; + sha1 = "b7e7d000ffd11938d0fdb053506f6ebabe9f587d"; + }; + } + { + name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; + path = fetchurl { + name = "find_cache_dir___find_cache_dir_3.3.1.tgz"; + url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz"; + sha1 = "89b33fad4a4670daa94f855f7fbe31d6d84fe880"; + }; + } + { + name = "find_line_column___find_line_column_0.5.2.tgz"; + path = fetchurl { + name = "find_line_column___find_line_column_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/find-line-column/-/find-line-column-0.5.2.tgz"; + sha1 = "db00238ff868551a182e74a103416d295a98c8ca"; + }; + } + { + name = "find_npm_prefix___find_npm_prefix_1.0.2.tgz"; + path = fetchurl { + name = "find_npm_prefix___find_npm_prefix_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/find-npm-prefix/-/find-npm-prefix-1.0.2.tgz"; + sha1 = "8d8ce2c78b3b4b9e66c8acc6a37c231eb841cfdf"; + }; + } + { + name = "find_root___find_root_1.1.0.tgz"; + path = fetchurl { + name = "find_root___find_root_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz"; + sha1 = "abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"; + }; + } + { + name = "find_up___find_up_2.1.0.tgz"; + path = fetchurl { + name = "find_up___find_up_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz"; + sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; + }; + } + { + name = "find_up___find_up_3.0.0.tgz"; + path = fetchurl { + name = "find_up___find_up_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz"; + sha1 = "49169f1d7993430646da61ecc5ae355c21c97b73"; + }; + } + { + name = "find_up___find_up_4.1.0.tgz"; + path = fetchurl { + name = "find_up___find_up_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; + sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; + }; + } + { + name = "flat_cache___flat_cache_3.0.4.tgz"; + path = fetchurl { + name = "flat_cache___flat_cache_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz"; + sha1 = "61b0338302b2fe9f957dcc32fc2a87f1c3048b11"; + }; + } + { + name = "flatted___flatted_3.2.2.tgz"; + path = fetchurl { + name = "flatted___flatted_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz"; + sha1 = "64bfed5cb68fe3ca78b3eb214ad97b63bedce561"; + }; + } + { + name = "flush_write_stream___flush_write_stream_1.1.1.tgz"; + path = fetchurl { + name = "flush_write_stream___flush_write_stream_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz"; + sha1 = "8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"; + }; + } + { + name = "follow_redirects___follow_redirects_1.14.2.tgz"; + path = fetchurl { + name = "follow_redirects___follow_redirects_1.14.2.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.2.tgz"; + sha1 = "cecb825047c00f5e66b142f90fed4f515dec789b"; + }; + } + { + name = "forever_agent___forever_agent_0.6.1.tgz"; + path = fetchurl { + name = "forever_agent___forever_agent_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + } + { + name = "form_data___form_data_3.0.1.tgz"; + path = fetchurl { + name = "form_data___form_data_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz"; + sha1 = "ebd53791b78356a99af9a300d4282c4d5eb9755f"; + }; + } + { + name = "form_data___form_data_2.3.3.tgz"; + path = fetchurl { + name = "form_data___form_data_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz"; + sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6"; + }; + } + { + name = "forwarded___forwarded_0.2.0.tgz"; + path = fetchurl { + name = "forwarded___forwarded_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz"; + sha1 = "2269936428aad4c15c7ebe9779a84bf0b2a81811"; + }; + } + { + name = "fresh___fresh_0.5.2.tgz"; + path = fetchurl { + name = "fresh___fresh_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + } + { + name = "from2___from2_1.3.0.tgz"; + path = fetchurl { + name = "from2___from2_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/from2/-/from2-1.3.0.tgz"; + sha1 = "88413baaa5f9a597cfde9221d86986cd3c061dfd"; + }; + } + { + name = "from2___from2_2.3.0.tgz"; + path = fetchurl { + name = "from2___from2_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz"; + sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + }; + } + { + name = "fs_minipass___fs_minipass_1.2.7.tgz"; + path = fetchurl { + name = "fs_minipass___fs_minipass_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz"; + sha1 = "ccff8570841e7fe4265693da88936c55aed7f7c7"; + }; + } + { + name = "fs_minipass___fs_minipass_2.1.0.tgz"; + path = fetchurl { + name = "fs_minipass___fs_minipass_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz"; + sha1 = "7f5036fdbf12c63c169190cbe4199c852271f9fb"; + }; + } + { + name = "fs_monkey___fs_monkey_1.0.3.tgz"; + path = fetchurl { + name = "fs_monkey___fs_monkey_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz"; + sha1 = "ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3"; + }; + } + { + name = "fs_vacuum___fs_vacuum_1.2.10.tgz"; + path = fetchurl { + name = "fs_vacuum___fs_vacuum_1.2.10.tgz"; + url = "https://registry.yarnpkg.com/fs-vacuum/-/fs-vacuum-1.2.10.tgz"; + sha1 = "b7629bec07a4031a2548fdf99f5ecf1cc8b31e36"; + }; + } + { + name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; + path = fetchurl { + name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"; + sha1 = "b47df53493ef911df75731e70a9ded0189db40c9"; + }; + } + { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + path = fetchurl { + name = "fs.realpath___fs.realpath_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + } + { + name = "fsevents___fsevents_2.3.2.tgz"; + path = fetchurl { + name = "fsevents___fsevents_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz"; + sha1 = "8a526f78b8fdf4623b709e0b975c52c24c02fd1a"; + }; + } + { + name = "fstream___fstream_1.0.12.tgz"; + path = fetchurl { + name = "fstream___fstream_1.0.12.tgz"; + url = "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz"; + sha1 = "4e8ba8ee2d48be4f7d0de505455548eae5932045"; + }; + } + { + name = "function_bind___function_bind_1.1.1.tgz"; + path = fetchurl { + name = "function_bind___function_bind_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; + sha1 = "a56899d3ea3c9bab874bb9773b7c5ede92f4895d"; + }; + } + { + name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + path = fetchurl { + name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + }; + } + { + name = "fuse.js___fuse.js_3.6.1.tgz"; + path = fetchurl { + name = "fuse.js___fuse.js_3.6.1.tgz"; + url = "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.6.1.tgz"; + sha1 = "7de85fdd6e1b3377c23ce010892656385fd9b10c"; + }; + } + { + name = "gauge___gauge_2.7.4.tgz"; + path = fetchurl { + name = "gauge___gauge_2.7.4.tgz"; + url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + }; + } + { + name = "gaze___gaze_1.1.3.tgz"; + path = fetchurl { + name = "gaze___gaze_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz"; + sha1 = "c441733e13b927ac8c0ff0b4c3b033f28812924a"; + }; + } + { + name = "genfun___genfun_5.0.0.tgz"; + path = fetchurl { + name = "genfun___genfun_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz"; + sha1 = "9dd9710a06900a5c4a5bf57aca5da4e52fe76537"; + }; + } + { + name = "gensync___gensync_1.0.0_beta.2.tgz"; + path = fetchurl { + name = "gensync___gensync_1.0.0_beta.2.tgz"; + url = "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz"; + sha1 = "32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"; + }; + } + { + name = "gentle_fs___gentle_fs_2.3.1.tgz"; + path = fetchurl { + name = "gentle_fs___gentle_fs_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/gentle-fs/-/gentle-fs-2.3.1.tgz"; + sha1 = "11201bf66c18f930ddca72cf69460bdfa05727b1"; + }; + } + { + name = "get_caller_file___get_caller_file_1.0.3.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz"; + sha1 = "f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"; + }; + } + { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + path = fetchurl { + name = "get_caller_file___get_caller_file_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; + sha1 = "4f94412a82db32f36e3b0b9741f8a97feb031f7e"; + }; + } + { + name = "get_intrinsic___get_intrinsic_1.1.1.tgz"; + path = fetchurl { + name = "get_intrinsic___get_intrinsic_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; + sha1 = "15f59f376f855c446963948f0d24cd3637b4abc6"; + }; + } + { + name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; + path = fetchurl { + name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"; + sha1 = "b5fde77f22cbe35f390b4e089922c50bce6ef664"; + }; + } + { + name = "get_stdin___get_stdin_4.0.1.tgz"; + path = fetchurl { + name = "get_stdin___get_stdin_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz"; + sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; + }; + } + { + name = "get_stream___get_stream_3.0.0.tgz"; + path = fetchurl { + name = "get_stream___get_stream_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz"; + sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; + }; + } + { + name = "get_stream___get_stream_6.0.1.tgz"; + path = fetchurl { + name = "get_stream___get_stream_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz"; + sha1 = "a262d8eef67aced57c2852ad6167526a43cbf7b7"; + }; + } + { + name = "getpass___getpass_0.1.7.tgz"; + path = fetchurl { + name = "getpass___getpass_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz"; + sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + }; + } + { + name = "git_hooks_list___git_hooks_list_1.0.3.tgz"; + path = fetchurl { + name = "git_hooks_list___git_hooks_list_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/git-hooks-list/-/git-hooks-list-1.0.3.tgz"; + sha1 = "be5baaf78203ce342f2f844a9d2b03dba1b45156"; + }; + } + { + name = "glob_parent___glob_parent_5.1.2.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz"; + sha1 = "869832c58034fe68a4093c17dc15e8340d8401c4"; + }; + } + { + name = "glob_parent___glob_parent_6.0.1.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.1.tgz"; + sha1 = "42054f685eb6a44e7a7d189a96efa40a54971aa7"; + }; + } + { + name = "glob_to_regexp___glob_to_regexp_0.4.1.tgz"; + path = fetchurl { + name = "glob_to_regexp___glob_to_regexp_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"; + sha1 = "c75297087c851b9a578bd217dd59a92f59fe546e"; + }; + } + { + name = "glob___glob_7.1.7.tgz"; + path = fetchurl { + name = "glob___glob_7.1.7.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz"; + sha1 = "3b193e9233f01d42d0b3f78294bbeeb418f94a90"; + }; + } + { + name = "global_dirs___global_dirs_0.1.1.tgz"; + path = fetchurl { + name = "global_dirs___global_dirs_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz"; + sha1 = "b319c0dd4607f353f3be9cca4c72fc148c49f445"; + }; + } + { + name = "globals___globals_11.12.0.tgz"; + path = fetchurl { + name = "globals___globals_11.12.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz"; + sha1 = "ab8795338868a0babd8525758018c2a7eb95c42e"; + }; + } + { + name = "globals___globals_13.11.0.tgz"; + path = fetchurl { + name = "globals___globals_13.11.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz"; + sha1 = "40ef678da117fe7bd2e28f1fab24951bd0255be7"; + }; + } + { + name = "globby___globby_10.0.0.tgz"; + path = fetchurl { + name = "globby___globby_10.0.0.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-10.0.0.tgz"; + sha1 = "abfcd0630037ae174a88590132c2f6804e291072"; + }; + } + { + name = "globby___globby_11.0.4.tgz"; + path = fetchurl { + name = "globby___globby_11.0.4.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz"; + sha1 = "2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"; + }; + } + { + name = "globby___globby_6.1.0.tgz"; + path = fetchurl { + name = "globby___globby_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz"; + sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; + }; + } + { + name = "globule___globule_1.3.3.tgz"; + path = fetchurl { + name = "globule___globule_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/globule/-/globule-1.3.3.tgz"; + sha1 = "811919eeac1ab7344e905f2e3be80a13447973c2"; + }; + } + { + name = "got___got_6.7.1.tgz"; + path = fetchurl { + name = "got___got_6.7.1.tgz"; + url = "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz"; + sha1 = "240cd05785a9a18e561dc1b44b41c763ef1e8db0"; + }; + } + { + name = "graceful_fs___graceful_fs_4.2.8.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_4.2.8.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha1 = "e412b8d33f5e006593cbd3cee6df9f2cebbe802a"; + }; + } + { + name = "graceful_fs___graceful_fs_4.1.15.tgz"; + path = fetchurl { + name = "graceful_fs___graceful_fs_4.1.15.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz"; + sha1 = "ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"; + }; + } + { + name = "handle_thing___handle_thing_2.0.1.tgz"; + path = fetchurl { + name = "handle_thing___handle_thing_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz"; + sha1 = "857f79ce359580c340d43081cc648970d0bb234e"; + }; + } + { + name = "har_schema___har_schema_2.0.0.tgz"; + path = fetchurl { + name = "har_schema___har_schema_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz"; + sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + }; + } + { + name = "har_validator___har_validator_5.1.5.tgz"; + path = fetchurl { + name = "har_validator___har_validator_5.1.5.tgz"; + url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz"; + sha1 = "1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"; + }; + } + { + name = "hard_rejection___hard_rejection_2.1.0.tgz"; + path = fetchurl { + name = "hard_rejection___hard_rejection_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz"; + sha1 = "1c6eda5c1685c63942766d79bb40ae773cecd883"; + }; + } + { + name = "has_ansi___has_ansi_2.0.0.tgz"; + path = fetchurl { + name = "has_ansi___has_ansi_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + } + { + name = "has_bigints___has_bigints_1.0.1.tgz"; + path = fetchurl { + name = "has_bigints___has_bigints_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz"; + sha1 = "64fe6acb020673e3b78db035a5af69aa9d07b113"; + }; + } + { + name = "has_flag___has_flag_3.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + }; + } + { + name = "has_flag___has_flag_4.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; + sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + }; + } + { + name = "has_symbols___has_symbols_1.0.2.tgz"; + path = fetchurl { + name = "has_symbols___has_symbols_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz"; + sha1 = "165d3070c00309752a1236a479331e3ac56f1423"; + }; + } + { + name = "has_tostringtag___has_tostringtag_1.0.0.tgz"; + path = fetchurl { + name = "has_tostringtag___has_tostringtag_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; + sha1 = "7e133818a7d394734f941e73c3d3f9291e658b25"; + }; + } + { + name = "has_unicode___has_unicode_2.0.1.tgz"; + path = fetchurl { + name = "has_unicode___has_unicode_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + } + { + name = "has___has_1.0.3.tgz"; + path = fetchurl { + name = "has___has_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; + sha1 = "722d7cbfc1f6aa8241f16dd814e011e1f41e8796"; + }; + } + { + name = "history___history_4.10.1.tgz"; + path = fetchurl { + name = "history___history_4.10.1.tgz"; + url = "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz"; + sha1 = "33371a65e3a83b267434e2b3f3b1b4c58aad4cf3"; + }; + } + { + name = "hoist_non_inferno_statics___hoist_non_inferno_statics_1.1.3.tgz"; + path = fetchurl { + name = "hoist_non_inferno_statics___hoist_non_inferno_statics_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/hoist-non-inferno-statics/-/hoist-non-inferno-statics-1.1.3.tgz"; + sha1 = "7d870f4160bfb6a59269b45c343c027f0e30ab35"; + }; + } + { + name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; + path = fetchurl { + name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; + sha1 = "dffc0bf9a21c02209090f2aa69429e1414daf3f9"; + }; + } + { + name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; + path = fetchurl { + name = "hosted_git_info___hosted_git_info_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz"; + sha1 = "5e425507eede4fea846b7262f0838456c4209961"; + }; + } + { + name = "hpack.js___hpack.js_2.1.6.tgz"; + path = fetchurl { + name = "hpack.js___hpack.js_2.1.6.tgz"; + url = "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz"; + sha1 = "87774c0949e513f42e84575b3c45681fade2a0b2"; + }; + } + { + name = "html_entities___html_entities_2.3.2.tgz"; + path = fetchurl { + name = "html_entities___html_entities_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.2.tgz"; + sha1 = "760b404685cb1d794e4f4b744332e3b00dcfe488"; + }; + } + { + name = "html_parse_stringify2___html_parse_stringify2_2.0.1.tgz"; + path = fetchurl { + name = "html_parse_stringify2___html_parse_stringify2_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/html-parse-stringify2/-/html-parse-stringify2-2.0.1.tgz"; + sha1 = "dc5670b7292ca158b7bc916c9a6735ac8872834a"; + }; + } + { + name = "http_cache_semantics___http_cache_semantics_3.8.1.tgz"; + path = fetchurl { + name = "http_cache_semantics___http_cache_semantics_3.8.1.tgz"; + url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz"; + sha1 = "39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"; + }; + } + { + name = "http_deceiver___http_deceiver_1.2.7.tgz"; + path = fetchurl { + name = "http_deceiver___http_deceiver_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz"; + sha1 = "fa7168944ab9a519d337cb0bec7284dc3e723d87"; + }; + } + { + name = "http_errors___http_errors_1.7.2.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz"; + sha1 = "4f5029cf13239f31036e5b2e55292bcfbcc85c8f"; + }; + } + { + name = "http_errors___http_errors_1.6.3.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.6.3.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz"; + sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; + }; + } + { + name = "http_errors___http_errors_1.7.3.tgz"; + path = fetchurl { + name = "http_errors___http_errors_1.7.3.tgz"; + url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz"; + sha1 = "6c619e4f9c60308c38519498c14fbb10aacebb06"; + }; + } + { + name = "http_parser_js___http_parser_js_0.5.3.tgz"; + path = fetchurl { + name = "http_parser_js___http_parser_js_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz"; + sha1 = "01d2709c79d41698bb01d4decc5e9da4e4a033d9"; + }; + } + { + name = "http_proxy_agent___http_proxy_agent_2.1.0.tgz"; + path = fetchurl { + name = "http_proxy_agent___http_proxy_agent_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz"; + sha1 = "e4821beef5b2142a2026bd73926fe537631c5405"; + }; + } + { + name = "http_proxy_middleware___http_proxy_middleware_2.0.1.tgz"; + path = fetchurl { + name = "http_proxy_middleware___http_proxy_middleware_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.1.tgz"; + sha1 = "7ef3417a479fb7666a571e09966c66a39bd2c15f"; + }; + } + { + name = "http_proxy___http_proxy_1.18.1.tgz"; + path = fetchurl { + name = "http_proxy___http_proxy_1.18.1.tgz"; + url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz"; + sha1 = "401541f0534884bbf95260334e72f88ee3976549"; + }; + } + { + name = "http_signature___http_signature_1.2.0.tgz"; + path = fetchurl { + name = "http_signature___http_signature_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz"; + sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + }; + } + { + name = "https_proxy_agent___https_proxy_agent_2.2.4.tgz"; + path = fetchurl { + name = "https_proxy_agent___https_proxy_agent_2.2.4.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz"; + sha1 = "4ee7a737abd92678a293d9b34a1af4d0d08c787b"; + }; + } + { + name = "human_signals___human_signals_2.1.0.tgz"; + path = fetchurl { + name = "human_signals___human_signals_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz"; + sha1 = "dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"; + }; + } + { + name = "humanize_ms___humanize_ms_1.2.1.tgz"; + path = fetchurl { + name = "humanize_ms___humanize_ms_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz"; + sha1 = "c46e3159a293f6b896da29316d8b6fe8bb79bbed"; + }; + } + { + name = "husky___husky_7.0.1.tgz"; + path = fetchurl { + name = "husky___husky_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/husky/-/husky-7.0.1.tgz"; + sha1 = "579f4180b5da4520263e8713cc832942b48e1f1c"; + }; + } + { + name = "i18next___i18next_20.4.0.tgz"; + path = fetchurl { + name = "i18next___i18next_20.4.0.tgz"; + url = "https://registry.yarnpkg.com/i18next/-/i18next-20.4.0.tgz"; + sha1 = "6897229a7898e23f3c4885f10315c978b594d3b9"; + }; + } + { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.4.24.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; + }; + } + { + name = "iconv_lite___iconv_lite_0.6.3.tgz"; + path = fetchurl { + name = "iconv_lite___iconv_lite_0.6.3.tgz"; + url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz"; + sha1 = "a52f80bf38da1952eb5c681790719871a1a72501"; + }; + } + { + name = "icss_utils___icss_utils_5.1.0.tgz"; + path = fetchurl { + name = "icss_utils___icss_utils_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz"; + sha1 = "c6be6858abd013d768e98366ae47e25d5887b1ae"; + }; + } + { + name = "iferr___iferr_0.1.5.tgz"; + path = fetchurl { + name = "iferr___iferr_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz"; + sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; + }; + } + { + name = "ignore_walk___ignore_walk_3.0.4.tgz"; + path = fetchurl { + name = "ignore_walk___ignore_walk_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz"; + sha1 = "c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335"; + }; + } + { + name = "ignore___ignore_4.0.6.tgz"; + path = fetchurl { + name = "ignore___ignore_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz"; + sha1 = "750e3db5862087b4737ebac8207ffd1ef27b25fc"; + }; + } + { + name = "ignore___ignore_5.1.8.tgz"; + path = fetchurl { + name = "ignore___ignore_5.1.8.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz"; + sha1 = "f150a8b50a34289b33e22f5889abd4d8016f0e57"; + }; + } + { + name = "import_fresh___import_fresh_2.0.0.tgz"; + path = fetchurl { + name = "import_fresh___import_fresh_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz"; + sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; + }; + } + { + name = "import_fresh___import_fresh_3.3.0.tgz"; + path = fetchurl { + name = "import_fresh___import_fresh_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz"; + sha1 = "37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"; + }; + } + { + name = "import_lazy___import_lazy_2.1.0.tgz"; + path = fetchurl { + name = "import_lazy___import_lazy_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz"; + sha1 = "05698e3d45c88e8d7e9d92cb0584e77f096f3e43"; + }; + } + { + name = "import_local___import_local_3.0.2.tgz"; + path = fetchurl { + name = "import_local___import_local_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz"; + sha1 = "a8cfd0431d1de4a2199703d003e3e62364fa6db6"; + }; + } + { + name = "import_sort_config___import_sort_config_6.0.0.tgz"; + path = fetchurl { + name = "import_sort_config___import_sort_config_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/import-sort-config/-/import-sort-config-6.0.0.tgz"; + sha1 = "7313775b761eb479ab2d383945ecb15c008763b8"; + }; + } + { + name = "import_sort_parser_babylon___import_sort_parser_babylon_6.0.0.tgz"; + path = fetchurl { + name = "import_sort_parser_babylon___import_sort_parser_babylon_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/import-sort-parser-babylon/-/import-sort-parser-babylon-6.0.0.tgz"; + sha1 = "e1a4c28e0794ad7d9ff36cd045559d8ca8c38be7"; + }; + } + { + name = "import_sort_parser_typescript___import_sort_parser_typescript_6.0.0.tgz"; + path = fetchurl { + name = "import_sort_parser_typescript___import_sort_parser_typescript_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/import-sort-parser-typescript/-/import-sort-parser-typescript-6.0.0.tgz"; + sha1 = "98e73cef9e077d073e798722ed59e215b51c17e2"; + }; + } + { + name = "import_sort_parser___import_sort_parser_6.0.0.tgz"; + path = fetchurl { + name = "import_sort_parser___import_sort_parser_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/import-sort-parser/-/import-sort-parser-6.0.0.tgz"; + sha1 = "0d901f264d98ed7caaae71f66128a686f828f2f4"; + }; + } + { + name = "import_sort_style_module___import_sort_style_module_6.0.0.tgz"; + path = fetchurl { + name = "import_sort_style_module___import_sort_style_module_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/import-sort-style-module/-/import-sort-style-module-6.0.0.tgz"; + sha1 = "3149df4785bae804ed32630634ed49e405fa7cad"; + }; + } + { + name = "import_sort_style___import_sort_style_6.0.0.tgz"; + path = fetchurl { + name = "import_sort_style___import_sort_style_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/import-sort-style/-/import-sort-style-6.0.0.tgz"; + sha1 = "088523f056e5064c34a6426f4733674d81b42e6a"; + }; + } + { + name = "import_sort___import_sort_6.0.0.tgz"; + path = fetchurl { + name = "import_sort___import_sort_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/import-sort/-/import-sort-6.0.0.tgz"; + sha1 = "48ba2a7b53f2566ca1dd004327ea271321ad64ff"; + }; + } + { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + path = fetchurl { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + }; + } + { + name = "indent_string___indent_string_4.0.0.tgz"; + path = fetchurl { + name = "indent_string___indent_string_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz"; + sha1 = "624f8f4497d619b2d9768531d58f4122854d7251"; + }; + } + { + name = "infer_owner___infer_owner_1.0.4.tgz"; + path = fetchurl { + name = "infer_owner___infer_owner_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz"; + sha1 = "c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"; + }; + } + { + name = "inferno_clone_vnode___inferno_clone_vnode_7.4.8.tgz"; + path = fetchurl { + name = "inferno_clone_vnode___inferno_clone_vnode_7.4.8.tgz"; + url = "https://registry.yarnpkg.com/inferno-clone-vnode/-/inferno-clone-vnode-7.4.8.tgz"; + sha1 = "fafdb21f86e566f662da7e58ff9be1fc76baff08"; + }; + } + { + name = "inferno_create_element___inferno_create_element_7.4.8.tgz"; + path = fetchurl { + name = "inferno_create_element___inferno_create_element_7.4.8.tgz"; + url = "https://registry.yarnpkg.com/inferno-create-element/-/inferno-create-element-7.4.8.tgz"; + sha1 = "77bbf24288645c359cf65b4821a3938c6537eb5e"; + }; + } + { + name = "inferno_create_element___inferno_create_element_7.4.9.tgz"; + path = fetchurl { + name = "inferno_create_element___inferno_create_element_7.4.9.tgz"; + url = "https://registry.yarnpkg.com/inferno-create-element/-/inferno-create-element-7.4.9.tgz"; + sha1 = "0538b100442163e1c361f2a78664ee3dd5e6f2bb"; + }; + } + { + name = "inferno_helmet___inferno_helmet_5.2.1.tgz"; + path = fetchurl { + name = "inferno_helmet___inferno_helmet_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/inferno-helmet/-/inferno-helmet-5.2.1.tgz"; + sha1 = "3717f325760aa14abeae82a78af7213f9055a3dc"; + }; + } + { + name = "inferno_hydrate___inferno_hydrate_7.4.9.tgz"; + path = fetchurl { + name = "inferno_hydrate___inferno_hydrate_7.4.9.tgz"; + url = "https://registry.yarnpkg.com/inferno-hydrate/-/inferno-hydrate-7.4.9.tgz"; + sha1 = "ba355f2e17cc273d7adfd957bb19fce4447d8b29"; + }; + } + { + name = "54b9be591ccd62c53799ad23e35f17144a62f909"; + path = fetchurl { + name = "54b9be591ccd62c53799ad23e35f17144a62f909"; + url = "https://codeload.github.com/nimbusec-oss/inferno-i18next/tar.gz/54b9be591ccd62c53799ad23e35f17144a62f909"; + sha1 = "5df92fe206d32f63da97805ae04aff6f09248bff"; + }; + } + { + name = "inferno_router___inferno_router_7.4.9.tgz"; + path = fetchurl { + name = "inferno_router___inferno_router_7.4.9.tgz"; + url = "https://registry.yarnpkg.com/inferno-router/-/inferno-router-7.4.9.tgz"; + sha1 = "6f3d708f8e01d47f982b41ae18c9312a4c51220b"; + }; + } + { + name = "inferno_server___inferno_server_7.4.9.tgz"; + path = fetchurl { + name = "inferno_server___inferno_server_7.4.9.tgz"; + url = "https://registry.yarnpkg.com/inferno-server/-/inferno-server-7.4.9.tgz"; + sha1 = "05e73aa14512f492d9eec30698c55f30c39493bb"; + }; + } + { + name = "inferno_shared___inferno_shared_7.4.8.tgz"; + path = fetchurl { + name = "inferno_shared___inferno_shared_7.4.8.tgz"; + url = "https://registry.yarnpkg.com/inferno-shared/-/inferno-shared-7.4.8.tgz"; + sha1 = "2b554a36683b770339008749096d9704846dd337"; + }; + } + { + name = "inferno_shared___inferno_shared_7.4.9.tgz"; + path = fetchurl { + name = "inferno_shared___inferno_shared_7.4.9.tgz"; + url = "https://registry.yarnpkg.com/inferno-shared/-/inferno-shared-7.4.9.tgz"; + sha1 = "f3cc5e85adadd7471a5e1c72da7df93a0bb98340"; + }; + } + { + name = "inferno_side_effect___inferno_side_effect_1.1.5.tgz"; + path = fetchurl { + name = "inferno_side_effect___inferno_side_effect_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/inferno-side-effect/-/inferno-side-effect-1.1.5.tgz"; + sha1 = "a874c80dbc73602aafc1e0f3f3f1ec216a916271"; + }; + } + { + name = "inferno_vnode_flags___inferno_vnode_flags_7.4.8.tgz"; + path = fetchurl { + name = "inferno_vnode_flags___inferno_vnode_flags_7.4.8.tgz"; + url = "https://registry.yarnpkg.com/inferno-vnode-flags/-/inferno-vnode-flags-7.4.8.tgz"; + sha1 = "275d70e3c8b2b3f4eb56041cc9b8c832ce1fb26d"; + }; + } + { + name = "inferno_vnode_flags___inferno_vnode_flags_7.4.9.tgz"; + path = fetchurl { + name = "inferno_vnode_flags___inferno_vnode_flags_7.4.9.tgz"; + url = "https://registry.yarnpkg.com/inferno-vnode-flags/-/inferno-vnode-flags-7.4.9.tgz"; + sha1 = "26fe1a40f00de2ebc05b9e7543c8577c674c074b"; + }; + } + { + name = "inferno___inferno_7.4.8.tgz"; + path = fetchurl { + name = "inferno___inferno_7.4.8.tgz"; + url = "https://registry.yarnpkg.com/inferno/-/inferno-7.4.8.tgz"; + sha1 = "0d5504753e79903b0e4bbeff76fc11fd0b9ffe92"; + }; + } + { + name = "inferno___inferno_7.4.9.tgz"; + path = fetchurl { + name = "inferno___inferno_7.4.9.tgz"; + url = "https://registry.yarnpkg.com/inferno/-/inferno-7.4.9.tgz"; + sha1 = "3722319b53b7e902ab194ad26fa6e80332d85c47"; + }; + } + { + name = "inflight___inflight_1.0.6.tgz"; + path = fetchurl { + name = "inflight___inflight_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + } + { + name = "inherits___inherits_2.0.4.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; + sha1 = "0fa2c64f932917c3433a0ded55363aae37416b7c"; + }; + } + { + name = "inherits___inherits_2.0.3.tgz"; + path = fetchurl { + name = "inherits___inherits_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + } + { + name = "ini___ini_1.3.8.tgz"; + path = fetchurl { + name = "ini___ini_1.3.8.tgz"; + url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; + sha1 = "a29da425b48806f34767a4efce397269af28432c"; + }; + } + { + name = "init_package_json___init_package_json_1.10.3.tgz"; + path = fetchurl { + name = "init_package_json___init_package_json_1.10.3.tgz"; + url = "https://registry.yarnpkg.com/init-package-json/-/init-package-json-1.10.3.tgz"; + sha1 = "45ffe2f610a8ca134f2bd1db5637b235070f6cbe"; + }; + } + { + name = "internal_ip___internal_ip_6.2.0.tgz"; + path = fetchurl { + name = "internal_ip___internal_ip_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/internal-ip/-/internal-ip-6.2.0.tgz"; + sha1 = "d5541e79716e406b74ac6b07b856ef18dc1621c1"; + }; + } + { + name = "internal_slot___internal_slot_1.0.3.tgz"; + path = fetchurl { + name = "internal_slot___internal_slot_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz"; + sha1 = "7347e307deeea2faac2ac6205d4bc7d34967f59c"; + }; + } + { + name = "interpret___interpret_2.2.0.tgz"; + path = fetchurl { + name = "interpret___interpret_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz"; + sha1 = "1a78a0b5965c40a5416d007ad6f50ad27c417df9"; + }; + } + { + name = "invert_kv___invert_kv_1.0.0.tgz"; + path = fetchurl { + name = "invert_kv___invert_kv_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz"; + sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; + }; + } + { + name = "ip_regex___ip_regex_4.3.0.tgz"; + path = fetchurl { + name = "ip_regex___ip_regex_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/ip-regex/-/ip-regex-4.3.0.tgz"; + sha1 = "687275ab0f57fa76978ff8f4dddc8a23d5990db5"; + }; + } + { + name = "ip___ip_1.1.5.tgz"; + path = fetchurl { + name = "ip___ip_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz"; + sha1 = "bdded70114290828c0a039e72ef25f5aaec4354a"; + }; + } + { + name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; + path = fetchurl { + name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; + sha1 = "bff38543eeb8984825079ff3a2a8e6cbd46781b3"; + }; + } + { + name = "ipaddr.js___ipaddr.js_2.0.1.tgz"; + path = fetchurl { + name = "ipaddr.js___ipaddr.js_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz"; + sha1 = "eca256a7a877e917aeb368b0a7497ddf42ef81c0"; + }; + } + { + name = "is_arguments___is_arguments_1.1.1.tgz"; + path = fetchurl { + name = "is_arguments___is_arguments_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz"; + sha1 = "15b3f88fda01f2a97fec84ca761a560f123efa9b"; + }; + } + { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + path = fetchurl { + name = "is_arrayish___is_arrayish_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + } + { + name = "is_bigint___is_bigint_1.0.4.tgz"; + path = fetchurl { + name = "is_bigint___is_bigint_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz"; + sha1 = "08147a1875bc2b32005d41ccd8291dffc6691df3"; + }; + } + { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + path = fetchurl { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha1 = "ea1f7f3b80f064236e83470f86c09c254fb45b09"; + }; + } + { + name = "is_boolean_object___is_boolean_object_1.1.2.tgz"; + path = fetchurl { + name = "is_boolean_object___is_boolean_object_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz"; + sha1 = "5c6dc200246dd9321ae4b885a114bb1f75f63719"; + }; + } + { + name = "is_builtin_module___is_builtin_module_1.0.0.tgz"; + path = fetchurl { + name = "is_builtin_module___is_builtin_module_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; + sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; + }; + } + { + name = "is_builtin_module___is_builtin_module_3.1.0.tgz"; + path = fetchurl { + name = "is_builtin_module___is_builtin_module_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.1.0.tgz"; + sha1 = "6fdb24313b1c03b75f8b9711c0feb8c30b903b00"; + }; + } + { + name = "is_callable___is_callable_1.2.4.tgz"; + path = fetchurl { + name = "is_callable___is_callable_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz"; + sha1 = "47301d58dd0259407865547853df6d61fe471945"; + }; + } + { + name = "is_ci___is_ci_1.2.1.tgz"; + path = fetchurl { + name = "is_ci___is_ci_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz"; + sha1 = "e3779c8ee17fccf428488f6e281187f2e632841c"; + }; + } + { + name = "is_cidr___is_cidr_1.0.0.tgz"; + path = fetchurl { + name = "is_cidr___is_cidr_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-cidr/-/is-cidr-1.0.0.tgz"; + sha1 = "fb5aacf659255310359da32cae03e40c6a1c2afc"; + }; + } + { + name = "is_core_module___is_core_module_2.6.0.tgz"; + path = fetchurl { + name = "is_core_module___is_core_module_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz"; + sha1 = "d7553b2526fe59b92ba3e40c8df757ec8a709e19"; + }; + } + { + name = "is_date_object___is_date_object_1.0.5.tgz"; + path = fetchurl { + name = "is_date_object___is_date_object_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz"; + sha1 = "0841d5536e724c25597bf6ea62e1bd38298df31f"; + }; + } + { + name = "is_directory___is_directory_0.3.1.tgz"; + path = fetchurl { + name = "is_directory___is_directory_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz"; + sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; + }; + } + { + name = "is_docker___is_docker_2.2.1.tgz"; + path = fetchurl { + name = "is_docker___is_docker_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz"; + sha1 = "33eeabe23cfe86f14bde4408a02c0cfb853acdaa"; + }; + } + { + name = "is_extglob___is_extglob_2.1.1.tgz"; + path = fetchurl { + name = "is_extglob___is_extglob_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; + sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + }; + } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + }; + } + { + name = "is_glob___is_glob_4.0.1.tgz"; + path = fetchurl { + name = "is_glob___is_glob_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"; + sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"; + }; + } + { + name = "is_installed_globally___is_installed_globally_0.1.0.tgz"; + path = fetchurl { + name = "is_installed_globally___is_installed_globally_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz"; + sha1 = "0dfd98f5a9111716dd535dda6492f67bf3d25a80"; + }; + } + { + name = "is_ip___is_ip_3.1.0.tgz"; + path = fetchurl { + name = "is_ip___is_ip_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-ip/-/is-ip-3.1.0.tgz"; + sha1 = "2ae5ddfafaf05cb8008a62093cf29734f657c5d8"; + }; + } + { + name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; + path = fetchurl { + name = "is_negative_zero___is_negative_zero_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; + sha1 = "3de746c18dda2319241a53675908d8f766f11c24"; + }; + } + { + name = "is_npm___is_npm_1.0.0.tgz"; + path = fetchurl { + name = "is_npm___is_npm_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz"; + sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; + }; + } + { + name = "is_number_object___is_number_object_1.0.6.tgz"; + path = fetchurl { + name = "is_number_object___is_number_object_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz"; + sha1 = "6a7aaf838c7f0686a50b4553f7e54a96494e89f0"; + }; + } + { + name = "is_number___is_number_7.0.0.tgz"; + path = fetchurl { + name = "is_number___is_number_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz"; + sha1 = "7535345b896734d5f80c4d06c50955527a14f12b"; + }; + } + { + name = "is_obj___is_obj_1.0.1.tgz"; + path = fetchurl { + name = "is_obj___is_obj_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz"; + sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; + }; + } + { + name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; + path = fetchurl { + name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; + sha1 = "67d43b82664a7b5191fd9119127eb300048a9fdb"; + }; + } + { + name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz"; + path = fetchurl { + name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz"; + sha1 = "bfe2dca26c69f397265a4009963602935a053acb"; + }; + } + { + name = "is_path_inside___is_path_inside_1.0.1.tgz"; + path = fetchurl { + name = "is_path_inside___is_path_inside_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz"; + sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"; + }; + } + { + name = "is_path_inside___is_path_inside_2.1.0.tgz"; + path = fetchurl { + name = "is_path_inside___is_path_inside_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz"; + sha1 = "7c9810587d659a40d27bcdb4d5616eab059494b2"; + }; + } + { + name = "is_path_inside___is_path_inside_3.0.3.tgz"; + path = fetchurl { + name = "is_path_inside___is_path_inside_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz"; + sha1 = "d231362e53a07ff2b0e0ea7fed049161ffd16283"; + }; + } + { + name = "is_plain_obj___is_plain_obj_2.1.0.tgz"; + path = fetchurl { + name = "is_plain_obj___is_plain_obj_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz"; + sha1 = "45e42e37fccf1f40da8e5f76ee21515840c09287"; + }; + } + { + name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; + path = fetchurl { + name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; + sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; + }; + } + { + name = "is_plain_obj___is_plain_obj_3.0.0.tgz"; + path = fetchurl { + name = "is_plain_obj___is_plain_obj_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz"; + sha1 = "af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7"; + }; + } + { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + path = fetchurl { + name = "is_plain_object___is_plain_object_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz"; + sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677"; + }; + } + { + name = "is_redirect___is_redirect_1.0.0.tgz"; + path = fetchurl { + name = "is_redirect___is_redirect_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz"; + sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"; + }; + } + { + name = "is_regex___is_regex_1.1.4.tgz"; + path = fetchurl { + name = "is_regex___is_regex_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz"; + sha1 = "eef5663cd59fa4c0ae339505323df6854bb15958"; + }; + } + { + name = "is_regexp___is_regexp_1.0.0.tgz"; + path = fetchurl { + name = "is_regexp___is_regexp_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz"; + sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069"; + }; + } + { + name = "is_retry_allowed___is_retry_allowed_1.2.0.tgz"; + path = fetchurl { + name = "is_retry_allowed___is_retry_allowed_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz"; + sha1 = "d778488bd0a4666a3be8a1482b9f2baafedea8b4"; + }; + } + { + name = "is_stream___is_stream_1.1.0.tgz"; + path = fetchurl { + name = "is_stream___is_stream_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz"; + sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + }; + } + { + name = "is_stream___is_stream_2.0.1.tgz"; + path = fetchurl { + name = "is_stream___is_stream_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz"; + sha1 = "fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"; + }; + } + { + name = "is_string___is_string_1.0.7.tgz"; + path = fetchurl { + name = "is_string___is_string_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz"; + sha1 = "0dd12bf2006f255bb58f695110eff7491eebc0fd"; + }; + } + { + name = "is_symbol___is_symbol_1.0.4.tgz"; + path = fetchurl { + name = "is_symbol___is_symbol_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz"; + sha1 = "a6dac93b635b063ca6872236de88910a57af139c"; + }; + } + { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + path = fetchurl { + name = "is_typedarray___is_typedarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + } + { + name = "is_unicode_supported___is_unicode_supported_0.1.0.tgz"; + path = fetchurl { + name = "is_unicode_supported___is_unicode_supported_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"; + sha1 = "3f26c76a809593b52bfa2ecb5710ed2779b522a7"; + }; + } + { + name = "is_wsl___is_wsl_2.2.0.tgz"; + path = fetchurl { + name = "is_wsl___is_wsl_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz"; + sha1 = "74a4c76e77ca9fd3f932f290c17ea326cd157271"; + }; + } + { + name = "isarray___isarray_0.0.1.tgz"; + path = fetchurl { + name = "isarray___isarray_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + } + { + name = "isarray___isarray_1.0.0.tgz"; + path = fetchurl { + name = "isarray___isarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + } + { + name = "isexe___isexe_2.0.0.tgz"; + path = fetchurl { + name = "isexe___isexe_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + } + { + name = "iso_639_1___iso_639_1_2.1.9.tgz"; + path = fetchurl { + name = "iso_639_1___iso_639_1_2.1.9.tgz"; + url = "https://registry.yarnpkg.com/iso-639-1/-/iso-639-1-2.1.9.tgz"; + sha1 = "e41b11d4f1808e5316d0252c3fa16eeb9b37bb58"; + }; + } + { + name = "isobject___isobject_3.0.1.tgz"; + path = fetchurl { + name = "isobject___isobject_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"; + sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + }; + } + { + name = "isomorphic_cookie___isomorphic_cookie_1.2.4.tgz"; + path = fetchurl { + name = "isomorphic_cookie___isomorphic_cookie_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/isomorphic-cookie/-/isomorphic-cookie-1.2.4.tgz"; + sha1 = "b23cc170b4430be1af7cef659bcb77776c8cc351"; + }; + } + { + name = "isstream___isstream_0.1.2.tgz"; + path = fetchurl { + name = "isstream___isstream_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + } + { + name = "jest_worker___jest_worker_27.0.6.tgz"; + path = fetchurl { + name = "jest_worker___jest_worker_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.6.tgz"; + sha1 = "a5fdb1e14ad34eb228cfe162d9f729cdbfa28aed"; + }; + } + { + name = "js_base64___js_base64_2.6.4.tgz"; + path = fetchurl { + name = "js_base64___js_base64_2.6.4.tgz"; + url = "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz"; + sha1 = "f4e686c5de1ea1f867dbcad3d46d969428df98c4"; + }; + } + { + name = "js_tokens___js_tokens_4.0.0.tgz"; + path = fetchurl { + name = "js_tokens___js_tokens_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; + sha1 = "19203fb59991df98e3a287050d4647cdeaf32499"; + }; + } + { + name = "js_yaml___js_yaml_3.14.1.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_3.14.1.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz"; + sha1 = "dae812fdb3825fa306609a8717383c50c36a0537"; + }; + } + { + name = "jsbn___jsbn_0.1.1.tgz"; + path = fetchurl { + name = "jsbn___jsbn_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + }; + } + { + name = "jsesc___jsesc_2.5.2.tgz"; + path = fetchurl { + name = "jsesc___jsesc_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz"; + sha1 = "80564d2e483dacf6e8ef209650a67df3f0c283a4"; + }; + } + { + name = "jsesc___jsesc_0.5.0.tgz"; + path = fetchurl { + name = "jsesc___jsesc_0.5.0.tgz"; + url = "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz"; + sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; + }; + } + { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + path = fetchurl { + name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; + sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9"; + }; + } + { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + path = fetchurl { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha1 = "7c47805a94319928e05777405dc12e1f7a4ee02d"; + }; + } + { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + }; + } + { + name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; + sha1 = "ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"; + }; + } + { + name = "json_schema___json_schema_0.2.3.tgz"; + path = fetchurl { + name = "json_schema___json_schema_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + } + { + name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; + path = fetchurl { + name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + }; + } + { + name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; + path = fetchurl { + name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + } + { + name = "json5___json5_1.0.1.tgz"; + path = fetchurl { + name = "json5___json5_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz"; + sha1 = "779fb0018604fa854eacbf6252180d83543e3dbe"; + }; + } + { + name = "json5___json5_2.2.0.tgz"; + path = fetchurl { + name = "json5___json5_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz"; + sha1 = "2dfefe720c6ba525d9ebd909950f0515316c89a3"; + }; + } + { + name = "jsonparse___jsonparse_1.3.1.tgz"; + path = fetchurl { + name = "jsonparse___jsonparse_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz"; + sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; + }; + } + { + name = "jsprim___jsprim_1.4.1.tgz"; + path = fetchurl { + name = "jsprim___jsprim_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz"; + sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + }; + } + { + name = "jwt_decode___jwt_decode_3.1.2.tgz"; + path = fetchurl { + name = "jwt_decode___jwt_decode_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-3.1.2.tgz"; + sha1 = "3fb319f3675a2df0c2895c8f5e9fa4b67b04ed59"; + }; + } + { + name = "kind_of___kind_of_6.0.3.tgz"; + path = fetchurl { + name = "kind_of___kind_of_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; + sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd"; + }; + } + { + name = "klona___klona_2.0.4.tgz"; + path = fetchurl { + name = "klona___klona_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz"; + sha1 = "7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"; + }; + } + { + name = "latest_version___latest_version_3.1.0.tgz"; + path = fetchurl { + name = "latest_version___latest_version_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/latest-version/-/latest-version-3.1.0.tgz"; + sha1 = "a205383fea322b33b5ae3b18abee0dc2f356ee15"; + }; + } + { + name = "lazy_property___lazy_property_1.0.0.tgz"; + path = fetchurl { + name = "lazy_property___lazy_property_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/lazy-property/-/lazy-property-1.0.0.tgz"; + sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147"; + }; + } + { + name = "lcid___lcid_1.0.0.tgz"; + path = fetchurl { + name = "lcid___lcid_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz"; + sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; + }; + } + { + name = "lemmy_js_client___lemmy_js_client_0.12.0.tgz"; + path = fetchurl { + name = "lemmy_js_client___lemmy_js_client_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.12.0.tgz"; + sha1 = "2337aca9d8b38d92908d7f7a9479f0066a9eaeae"; + }; + } + { + name = "levn___levn_0.4.1.tgz"; + path = fetchurl { + name = "levn___levn_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz"; + sha1 = "ae4562c007473b932a6200d403268dd2fffc6ade"; + }; + } + { + name = "libcipm___libcipm_1.6.3.tgz"; + path = fetchurl { + name = "libcipm___libcipm_1.6.3.tgz"; + url = "https://registry.yarnpkg.com/libcipm/-/libcipm-1.6.3.tgz"; + sha1 = "dc4052d710941547782d85bbdb3c77eedec733ff"; + }; + } + { + name = "libnpx___libnpx_10.2.4.tgz"; + path = fetchurl { + name = "libnpx___libnpx_10.2.4.tgz"; + url = "https://registry.yarnpkg.com/libnpx/-/libnpx-10.2.4.tgz"; + sha1 = "ef0e3258e29aef2ec7ee3276115e20e67f67d4ee"; + }; + } + { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + path = fetchurl { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; + sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + }; + } + { + name = "linkify_it___linkify_it_3.0.2.tgz"; + path = fetchurl { + name = "linkify_it___linkify_it_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.2.tgz"; + sha1 = "f55eeb8bc1d3ae754049e124ab3bb56d97797fb8"; + }; + } + { + name = "lint_staged___lint_staged_11.1.2.tgz"; + path = fetchurl { + name = "lint_staged___lint_staged_11.1.2.tgz"; + url = "https://registry.yarnpkg.com/lint-staged/-/lint-staged-11.1.2.tgz"; + sha1 = "4dd78782ae43ee6ebf2969cad9af67a46b33cd90"; + }; + } + { + name = "listr2___listr2_3.11.0.tgz"; + path = fetchurl { + name = "listr2___listr2_3.11.0.tgz"; + url = "https://registry.yarnpkg.com/listr2/-/listr2-3.11.0.tgz"; + sha1 = "9771b02407875aa78e73d6e0ff6541bbec0aaee9"; + }; + } + { + name = "load_json_file___load_json_file_2.0.0.tgz"; + path = fetchurl { + name = "load_json_file___load_json_file_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz"; + sha1 = "7947e42149af80d696cbf797bcaabcfe1fe29ca8"; + }; + } + { + name = "loader_runner___loader_runner_4.2.0.tgz"; + path = fetchurl { + name = "loader_runner___loader_runner_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz"; + sha1 = "d7022380d66d14c5fb1d496b89864ebcfd478384"; + }; + } + { + name = "loader_utils___loader_utils_1.4.0.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz"; + sha1 = "c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"; + }; + } + { + name = "locate_path___locate_path_2.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz"; + sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; + }; + } + { + name = "locate_path___locate_path_3.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz"; + sha1 = "dbec3b3ab759758071b58fe59fc41871af21400e"; + }; + } + { + name = "locate_path___locate_path_5.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; + sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + }; + } + { + name = "lock_verify___lock_verify_2.2.1.tgz"; + path = fetchurl { + name = "lock_verify___lock_verify_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/lock-verify/-/lock-verify-2.2.1.tgz"; + sha1 = "81107948c51ed16f97b96ff8b60675affb243fc1"; + }; + } + { + name = "lockfile___lockfile_1.0.4.tgz"; + path = fetchurl { + name = "lockfile___lockfile_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.4.tgz"; + sha1 = "07f819d25ae48f87e538e6578b6964a4981a5609"; + }; + } + { + name = "lodash._baseuniq___lodash._baseuniq_4.6.0.tgz"; + path = fetchurl { + name = "lodash._baseuniq___lodash._baseuniq_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz"; + sha1 = "0ebb44e456814af7905c6212fa2c9b2d51b841e8"; + }; + } + { + name = "lodash._createset___lodash._createset_4.0.3.tgz"; + path = fetchurl { + name = "lodash._createset___lodash._createset_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz"; + sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26"; + }; + } + { + name = "lodash._root___lodash._root_3.0.1.tgz"; + path = fetchurl { + name = "lodash._root___lodash._root_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz"; + sha1 = "fba1c4524c19ee9a5f8136b4609f017cf4ded692"; + }; + } + { + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + path = fetchurl { + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; + }; + } + { + name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; + path = fetchurl { + name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; + url = "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; + sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; + }; + } + { + name = "lodash.merge___lodash.merge_4.6.2.tgz"; + path = fetchurl { + name = "lodash.merge___lodash.merge_4.6.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha1 = "558aa53b43b661e1925a0afdfa36a9a1085fe57a"; + }; + } + { + name = "lodash.pick___lodash.pick_4.4.0.tgz"; + path = fetchurl { + name = "lodash.pick___lodash.pick_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz"; + sha1 = "52f05610fff9ded422611441ed1fc123a03001b3"; + }; + } + { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + path = fetchurl { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; + sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; + }; + } + { + name = "lodash.union___lodash.union_4.6.0.tgz"; + path = fetchurl { + name = "lodash.union___lodash.union_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz"; + sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88"; + }; + } + { + name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; + path = fetchurl { + name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; + }; + } + { + name = "lodash.without___lodash.without_4.4.0.tgz"; + path = fetchurl { + name = "lodash.without___lodash.without_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz"; + sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; + }; + } + { + name = "lodash___lodash_3.10.1.tgz"; + path = fetchurl { + name = "lodash___lodash_3.10.1.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz"; + sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; + }; + } + { + name = "lodash___lodash_4.17.21.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; + }; + } + { + name = "log_symbols___log_symbols_4.1.0.tgz"; + path = fetchurl { + name = "log_symbols___log_symbols_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz"; + sha1 = "3fbdbb95b4683ac9fc785111e792e558d4abd503"; + }; + } + { + name = "log_update___log_update_4.0.0.tgz"; + path = fetchurl { + name = "log_update___log_update_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz"; + sha1 = "589ecd352471f2a1c0c570287543a64dfd20e0a1"; + }; + } + { + name = "loose_envify___loose_envify_1.4.0.tgz"; + path = fetchurl { + name = "loose_envify___loose_envify_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz"; + sha1 = "71ee51fa7be4caec1a63839f7e682d8132d30caf"; + }; + } + { + name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; + path = fetchurl { + name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; + sha1 = "6f9e30b47084d971a7c820ff15a6c5167b74c26f"; + }; + } + { + name = "lru_cache___lru_cache_4.1.5.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_4.1.5.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz"; + sha1 = "8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"; + }; + } + { + name = "lru_cache___lru_cache_5.1.1.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz"; + sha1 = "1da27e6710271947695daf6848e847f01d84b920"; + }; + } + { + name = "lru_cache___lru_cache_6.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; + sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; + }; + } + { + name = "make_dir___make_dir_1.3.0.tgz"; + path = fetchurl { + name = "make_dir___make_dir_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz"; + sha1 = "79c1033b80515bd6d24ec9933e860ca75ee27f0c"; + }; + } + { + name = "make_dir___make_dir_3.1.0.tgz"; + path = fetchurl { + name = "make_dir___make_dir_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; + sha1 = "415e967046b3a7f1d185277d84aa58203726a13f"; + }; + } + { + name = "make_fetch_happen___make_fetch_happen_4.0.2.tgz"; + path = fetchurl { + name = "make_fetch_happen___make_fetch_happen_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-4.0.2.tgz"; + sha1 = "2d156b11696fb32bffbafe1ac1bc085dd6c78a79"; + }; + } + { + name = "make_fetch_happen___make_fetch_happen_2.6.0.tgz"; + path = fetchurl { + name = "make_fetch_happen___make_fetch_happen_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-2.6.0.tgz"; + sha1 = "8474aa52198f6b1ae4f3094c04e8370d35ea8a38"; + }; + } + { + name = "make_fetch_happen___make_fetch_happen_3.0.0.tgz"; + path = fetchurl { + name = "make_fetch_happen___make_fetch_happen_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-3.0.0.tgz"; + sha1 = "7b661d2372fc4710ab5cc8e1fa3c290eea69a961"; + }; + } + { + name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz"; + path = fetchurl { + name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"; + sha1 = "7d583a7306434c055fe474b0f45078e6e1b4b92a"; + }; + } + { + name = "map_obj___map_obj_1.0.1.tgz"; + path = fetchurl { + name = "map_obj___map_obj_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz"; + sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + }; + } + { + name = "map_obj___map_obj_4.2.1.tgz"; + path = fetchurl { + name = "map_obj___map_obj_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/map-obj/-/map-obj-4.2.1.tgz"; + sha1 = "e4ea399dbc979ae735c83c863dd31bdf364277b7"; + }; + } + { + name = "markdown_it_container___markdown_it_container_3.0.0.tgz"; + path = fetchurl { + name = "markdown_it_container___markdown_it_container_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/markdown-it-container/-/markdown-it-container-3.0.0.tgz"; + sha1 = "1d19b06040a020f9a827577bb7dbf67aa5de9a5b"; + }; + } + { + name = "markdown_it_sub___markdown_it_sub_1.0.0.tgz"; + path = fetchurl { + name = "markdown_it_sub___markdown_it_sub_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/markdown-it-sub/-/markdown-it-sub-1.0.0.tgz"; + sha1 = "375fd6026eae7ddcb012497f6411195ea1e3afe8"; + }; + } + { + name = "markdown_it_sup___markdown_it_sup_1.0.0.tgz"; + path = fetchurl { + name = "markdown_it_sup___markdown_it_sup_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/markdown-it-sup/-/markdown-it-sup-1.0.0.tgz"; + sha1 = "cb9c9ff91a5255ac08f3fd3d63286e15df0a1fc3"; + }; + } + { + name = "markdown_it___markdown_it_12.2.0.tgz"; + path = fetchurl { + name = "markdown_it___markdown_it_12.2.0.tgz"; + url = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.2.0.tgz"; + sha1 = "091f720fd5db206f80de7a8d1f1a7035fd0d38db"; + }; + } + { + name = "mdurl___mdurl_1.0.1.tgz"; + path = fetchurl { + name = "mdurl___mdurl_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz"; + sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e"; + }; + } + { + name = "meant___meant_1.0.3.tgz"; + path = fetchurl { + name = "meant___meant_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/meant/-/meant-1.0.3.tgz"; + sha1 = "67769af9de1d158773e928ae82c456114903554c"; + }; + } + { + name = "media_typer___media_typer_0.3.0.tgz"; + path = fetchurl { + name = "media_typer___media_typer_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + } + { + name = "mem___mem_1.1.0.tgz"; + path = fetchurl { + name = "mem___mem_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz"; + sha1 = "5edd52b485ca1d900fe64895505399a0dfa45f76"; + }; + } + { + name = "mem___mem_8.1.1.tgz"; + path = fetchurl { + name = "mem___mem_8.1.1.tgz"; + url = "https://registry.yarnpkg.com/mem/-/mem-8.1.1.tgz"; + sha1 = "cf118b357c65ab7b7e0817bdf00c8062297c0122"; + }; + } + { + name = "memfs___memfs_3.2.2.tgz"; + path = fetchurl { + name = "memfs___memfs_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/memfs/-/memfs-3.2.2.tgz"; + sha1 = "5de461389d596e3f23d48bb7c2afb6161f4df40e"; + }; + } + { + name = "meow___meow_9.0.0.tgz"; + path = fetchurl { + name = "meow___meow_9.0.0.tgz"; + url = "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz"; + sha1 = "cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364"; + }; + } + { + name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; + path = fetchurl { + name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; + sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + }; + } + { + name = "merge_stream___merge_stream_2.0.0.tgz"; + path = fetchurl { + name = "merge_stream___merge_stream_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz"; + sha1 = "52823629a14dd00c9770fb6ad47dc6310f2c1f60"; + }; + } + { + name = "merge2___merge2_1.4.1.tgz"; + path = fetchurl { + name = "merge2___merge2_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz"; + sha1 = "4368892f885e907455a6fd7dc55c0c9d404990ae"; + }; + } + { + name = "methods___methods_1.1.2.tgz"; + path = fetchurl { + name = "methods___methods_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + } + { + name = "micromatch___micromatch_4.0.4.tgz"; + path = fetchurl { + name = "micromatch___micromatch_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz"; + sha1 = "896d519dfe9db25fce94ceb7a500919bf881ebf9"; + }; + } + { + name = "mime_db___mime_db_1.49.0.tgz"; + path = fetchurl { + name = "mime_db___mime_db_1.49.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz"; + sha1 = "f3dfde60c99e9cf3bc9701d687778f537001cbed"; + }; + } + { + name = "mime_types___mime_types_2.1.32.tgz"; + path = fetchurl { + name = "mime_types___mime_types_2.1.32.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz"; + sha1 = "1d00e89e7de7fe02008db61001d9e02852670fd5"; + }; + } + { + name = "mime___mime_1.6.0.tgz"; + path = fetchurl { + name = "mime___mime_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz"; + sha1 = "32cd9e5c64553bd58d19a568af452acff04981b1"; + }; + } + { + name = "mimic_fn___mimic_fn_1.2.0.tgz"; + path = fetchurl { + name = "mimic_fn___mimic_fn_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz"; + sha1 = "820c86a39334640e99516928bd03fca88057d022"; + }; + } + { + name = "mimic_fn___mimic_fn_2.1.0.tgz"; + path = fetchurl { + name = "mimic_fn___mimic_fn_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz"; + sha1 = "7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"; + }; + } + { + name = "mimic_fn___mimic_fn_3.1.0.tgz"; + path = fetchurl { + name = "mimic_fn___mimic_fn_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz"; + sha1 = "65755145bbf3e36954b949c16450427451d5ca74"; + }; + } + { + name = "min_indent___min_indent_1.0.1.tgz"; + path = fetchurl { + name = "min_indent___min_indent_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz"; + sha1 = "a63f681673b30571fbe8bc25686ae746eefa9869"; + }; + } + { + name = "mini_css_extract_plugin___mini_css_extract_plugin_2.2.0.tgz"; + path = fetchurl { + name = "mini_css_extract_plugin___mini_css_extract_plugin_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.2.0.tgz"; + sha1 = "48cb6d2bea8fa9eb36709856e003662eebb3eb92"; + }; + } + { + name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; + path = fetchurl { + name = "minimalistic_assert___minimalistic_assert_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; + sha1 = "2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"; + }; + } + { + name = "minimatch___minimatch_3.0.4.tgz"; + path = fetchurl { + name = "minimatch___minimatch_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; + sha1 = "5166e286457f03306064be5497e8dbb0c3d32083"; + }; + } + { + name = "minimist_options___minimist_options_4.1.0.tgz"; + path = fetchurl { + name = "minimist_options___minimist_options_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz"; + sha1 = "c0655713c53a8a2ebd77ffa247d342c40f010619"; + }; + } + { + name = "minimist___minimist_1.2.5.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.5.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; + sha1 = "67d66014b66a6a8aaa0c083c5fd58df4e4e97602"; + }; + } + { + name = "minipass___minipass_2.9.0.tgz"; + path = fetchurl { + name = "minipass___minipass_2.9.0.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz"; + sha1 = "e713762e7d3e32fed803115cf93e04bca9fcc9a6"; + }; + } + { + name = "minipass___minipass_3.1.3.tgz"; + path = fetchurl { + name = "minipass___minipass_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz"; + sha1 = "7d42ff1f39635482e15f9cdb53184deebd5815fd"; + }; + } + { + name = "minizlib___minizlib_1.3.3.tgz"; + path = fetchurl { + name = "minizlib___minizlib_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz"; + sha1 = "2290de96818a34c29551c8a8d301216bd65a861d"; + }; + } + { + name = "minizlib___minizlib_2.1.2.tgz"; + path = fetchurl { + name = "minizlib___minizlib_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz"; + sha1 = "e90d3466ba209b932451508a11ce3d3632145931"; + }; + } + { + name = "mississippi___mississippi_1.3.1.tgz"; + path = fetchurl { + name = "mississippi___mississippi_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/mississippi/-/mississippi-1.3.1.tgz"; + sha1 = "2a8bb465e86550ac8b36a7b6f45599171d78671e"; + }; + } + { + name = "mississippi___mississippi_2.0.0.tgz"; + path = fetchurl { + name = "mississippi___mississippi_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz"; + sha1 = "3442a508fafc28500486feea99409676e4ee5a6f"; + }; + } + { + name = "mississippi___mississippi_3.0.0.tgz"; + path = fetchurl { + name = "mississippi___mississippi_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz"; + sha1 = "ea0a3291f97e0b5e8776b363d5f0a12d94c67022"; + }; + } + { + name = "mkdirp___mkdirp_0.5.5.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } + { + name = "mkdirp___mkdirp_1.0.4.tgz"; + path = fetchurl { + name = "mkdirp___mkdirp_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz"; + sha1 = "3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"; + }; + } + { + name = "moment___moment_2.29.1.tgz"; + path = fetchurl { + name = "moment___moment_2.29.1.tgz"; + url = "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz"; + sha1 = "b2be769fa31940be9eeea6469c075e35006fa3d3"; + }; + } + { + name = "move_concurrently___move_concurrently_1.0.1.tgz"; + path = fetchurl { + name = "move_concurrently___move_concurrently_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz"; + sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; + }; + } + { + name = "ms___ms_2.0.0.tgz"; + path = fetchurl { + name = "ms___ms_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + } + { + name = "ms___ms_2.1.1.tgz"; + path = fetchurl { + name = "ms___ms_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz"; + sha1 = "30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"; + }; + } + { + name = "ms___ms_2.1.2.tgz"; + path = fetchurl { + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + }; + } + { + name = "ms___ms_2.1.3.tgz"; + path = fetchurl { + name = "ms___ms_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"; + sha1 = "574c8138ce1d2b5861f0b44579dbadd60c6615b2"; + }; + } + { + name = "multicast_dns_service_types___multicast_dns_service_types_1.1.0.tgz"; + path = fetchurl { + name = "multicast_dns_service_types___multicast_dns_service_types_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz"; + sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901"; + }; + } + { + name = "multicast_dns___multicast_dns_6.2.3.tgz"; + path = fetchurl { + name = "multicast_dns___multicast_dns_6.2.3.tgz"; + url = "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz"; + sha1 = "a0ec7bd9055c4282f790c3c82f4e28db3b31b229"; + }; + } + { + name = "mute_stream___mute_stream_0.0.8.tgz"; + path = fetchurl { + name = "mute_stream___mute_stream_0.0.8.tgz"; + url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz"; + sha1 = "1630c42b2251ff81e2a283de96a5497ea92e5e0d"; + }; + } + { + name = "nan___nan_2.15.0.tgz"; + path = fetchurl { + name = "nan___nan_2.15.0.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz"; + sha1 = "3f34a473ff18e15c1b5626b62903b5ad6e665fee"; + }; + } + { + name = "nanoid___nanoid_3.1.25.tgz"; + path = fetchurl { + name = "nanoid___nanoid_3.1.25.tgz"; + url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz"; + sha1 = "09ca32747c0e543f0e1814b7d3793477f9c8e152"; + }; + } + { + name = "natural_compare___natural_compare_1.4.0.tgz"; + path = fetchurl { + name = "natural_compare___natural_compare_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + }; + } + { + name = "negotiator___negotiator_0.6.2.tgz"; + path = fetchurl { + name = "negotiator___negotiator_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz"; + sha1 = "feacf7ccf525a77ae9634436a64883ffeca346fb"; + }; + } + { + name = "neo_async___neo_async_2.6.2.tgz"; + path = fetchurl { + name = "neo_async___neo_async_2.6.2.tgz"; + url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz"; + sha1 = "b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"; + }; + } + { + name = "node_fetch_npm___node_fetch_npm_2.0.4.tgz"; + path = fetchurl { + name = "node_fetch_npm___node_fetch_npm_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.4.tgz"; + sha1 = "6507d0e17a9ec0be3bec516958a497cec54bf5a4"; + }; + } + { + name = "node_fetch___node_fetch_2.6.1.tgz"; + path = fetchurl { + name = "node_fetch___node_fetch_2.6.1.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz"; + sha1 = "045bd323631f76ed2e2b55573394416b639a0052"; + }; + } + { + name = "node_forge___node_forge_0.10.0.tgz"; + path = fetchurl { + name = "node_forge___node_forge_0.10.0.tgz"; + url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz"; + sha1 = "32dea2afb3e9926f02ee5ce8794902691a676bf3"; + }; + } + { + name = "node_gyp___node_gyp_3.8.0.tgz"; + path = fetchurl { + name = "node_gyp___node_gyp_3.8.0.tgz"; + url = "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz"; + sha1 = "540304261c330e80d0d5edce253a68cb3964218c"; + }; + } + { + name = "node_gyp___node_gyp_4.0.0.tgz"; + path = fetchurl { + name = "node_gyp___node_gyp_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/node-gyp/-/node-gyp-4.0.0.tgz"; + sha1 = "972654af4e5dd0cd2a19081b4b46fe0442ba6f45"; + }; + } + { + name = "node_gyp___node_gyp_7.1.2.tgz"; + path = fetchurl { + name = "node_gyp___node_gyp_7.1.2.tgz"; + url = "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz"; + sha1 = "21a810aebb187120251c3bcec979af1587b188ae"; + }; + } + { + name = "node_releases___node_releases_1.1.75.tgz"; + path = fetchurl { + name = "node_releases___node_releases_1.1.75.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz"; + sha1 = "6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe"; + }; + } + { + name = "node_sass___node_sass_6.0.1.tgz"; + path = fetchurl { + name = "node_sass___node_sass_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/node-sass/-/node-sass-6.0.1.tgz"; + sha1 = "cad1ccd0ce63e35c7181f545d8b986f3a9a887fe"; + }; + } + { + name = "nopt___nopt_3.0.6.tgz"; + path = fetchurl { + name = "nopt___nopt_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz"; + sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; + }; + } + { + name = "nopt___nopt_5.0.0.tgz"; + path = fetchurl { + name = "nopt___nopt_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz"; + sha1 = "530942bb58a512fccafe53fe210f13a25355dc88"; + }; + } + { + name = "nopt___nopt_4.0.3.tgz"; + path = fetchurl { + name = "nopt___nopt_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz"; + sha1 = "a375cad9d02fd921278d954c2254d5aa57e15e48"; + }; + } + { + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + path = fetchurl { + name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; + sha1 = "e66db1838b200c1dfc233225d12cb36520e234a8"; + }; + } + { + name = "normalize_package_data___normalize_package_data_3.0.3.tgz"; + path = fetchurl { + name = "normalize_package_data___normalize_package_data_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz"; + sha1 = "dbcc3e2da59509a0983422884cd172eefdfa525e"; + }; + } + { + name = "normalize_package_data___normalize_package_data_2.4.2.tgz"; + path = fetchurl { + name = "normalize_package_data___normalize_package_data_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.2.tgz"; + sha1 = "6b2abd85774e51f7936f1395e45acb905dc849b2"; + }; + } + { + name = "normalize_path___normalize_path_3.0.0.tgz"; + path = fetchurl { + name = "normalize_path___normalize_path_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz"; + sha1 = "0dcd69ff23a1c9b11fd0978316644a0388216a65"; + }; + } + { + name = "npm_audit_report___npm_audit_report_1.3.3.tgz"; + path = fetchurl { + name = "npm_audit_report___npm_audit_report_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/npm-audit-report/-/npm-audit-report-1.3.3.tgz"; + sha1 = "8226deeb253b55176ed147592a3995442f2179ed"; + }; + } + { + name = "npm_bundled___npm_bundled_1.1.2.tgz"; + path = fetchurl { + name = "npm_bundled___npm_bundled_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz"; + sha1 = "944c78789bd739035b70baa2ca5cc32b8d860bc1"; + }; + } + { + name = "npm_cache_filename___npm_cache_filename_1.0.2.tgz"; + path = fetchurl { + name = "npm_cache_filename___npm_cache_filename_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz"; + sha1 = "ded306c5b0bfc870a9e9faf823bc5f283e05ae11"; + }; + } + { + name = "npm_install_checks___npm_install_checks_3.0.2.tgz"; + path = fetchurl { + name = "npm_install_checks___npm_install_checks_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-3.0.2.tgz"; + sha1 = "ab2e32ad27baa46720706908e5b14c1852de44d9"; + }; + } + { + name = "npm_lifecycle___npm_lifecycle_2.1.1.tgz"; + path = fetchurl { + name = "npm_lifecycle___npm_lifecycle_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/npm-lifecycle/-/npm-lifecycle-2.1.1.tgz"; + sha1 = "0027c09646f0fd346c5c93377bdaba59c6748fdf"; + }; + } + { + name = "npm_logical_tree___npm_logical_tree_1.2.1.tgz"; + path = fetchurl { + name = "npm_logical_tree___npm_logical_tree_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/npm-logical-tree/-/npm-logical-tree-1.2.1.tgz"; + sha1 = "44610141ca24664cad35d1e607176193fd8f5b88"; + }; + } + { + name = "npm_normalize_package_bin___npm_normalize_package_bin_1.0.1.tgz"; + path = fetchurl { + name = "npm_normalize_package_bin___npm_normalize_package_bin_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz"; + sha1 = "6e79a41f23fd235c0623218228da7d9c23b8f6e2"; + }; + } + { + name = "npm_package_arg___npm_package_arg_6.1.1.tgz"; + path = fetchurl { + name = "npm_package_arg___npm_package_arg_6.1.1.tgz"; + url = "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz"; + sha1 = "02168cb0a49a2b75bf988a28698de7b529df5cb7"; + }; + } + { + name = "npm_packlist___npm_packlist_1.4.8.tgz"; + path = fetchurl { + name = "npm_packlist___npm_packlist_1.4.8.tgz"; + url = "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz"; + sha1 = "56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"; + }; + } + { + name = "npm_packlist___npm_packlist_1.1.12.tgz"; + path = fetchurl { + name = "npm_packlist___npm_packlist_1.1.12.tgz"; + url = "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.12.tgz"; + sha1 = "22bde2ebc12e72ca482abd67afc51eb49377243a"; + }; + } + { + name = "npm_pick_manifest___npm_pick_manifest_2.2.3.tgz"; + path = fetchurl { + name = "npm_pick_manifest___npm_pick_manifest_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz"; + sha1 = "32111d2a9562638bb2c8f2bf27f7f3092c8fae40"; + }; + } + { + name = "npm_profile___npm_profile_3.0.2.tgz"; + path = fetchurl { + name = "npm_profile___npm_profile_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/npm-profile/-/npm-profile-3.0.2.tgz"; + sha1 = "58d568f1b56ef769602fd0aed8c43fa0e0de0f57"; + }; + } + { + name = "npm_registry_client___npm_registry_client_8.6.0.tgz"; + path = fetchurl { + name = "npm_registry_client___npm_registry_client_8.6.0.tgz"; + url = "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-8.6.0.tgz"; + sha1 = "7f1529f91450732e89f8518e0f21459deea3e4c4"; + }; + } + { + name = "npm_registry_fetch___npm_registry_fetch_1.1.1.tgz"; + path = fetchurl { + name = "npm_registry_fetch___npm_registry_fetch_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-1.1.1.tgz"; + sha1 = "710bc5947d9ee2c549375072dab6d5d17baf2eb2"; + }; + } + { + name = "npm_run_path___npm_run_path_2.0.2.tgz"; + path = fetchurl { + name = "npm_run_path___npm_run_path_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz"; + sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + }; + } + { + name = "npm_run_path___npm_run_path_4.0.1.tgz"; + path = fetchurl { + name = "npm_run_path___npm_run_path_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz"; + sha1 = "b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"; + }; + } + { + name = "npm_user_validate___npm_user_validate_1.0.1.tgz"; + path = fetchurl { + name = "npm_user_validate___npm_user_validate_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz"; + sha1 = "31428fc5475fe8416023f178c0ab47935ad8c561"; + }; + } + { + name = "npm___npm_5.10.0.tgz"; + path = fetchurl { + name = "npm___npm_5.10.0.tgz"; + url = "https://registry.yarnpkg.com/npm/-/npm-5.10.0.tgz"; + sha1 = "3bec62312c94a9b0f48f208e00b98bf0304b40db"; + }; + } + { + name = "npmlog___npmlog_4.1.2.tgz"; + path = fetchurl { + name = "npmlog___npmlog_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; + sha1 = "08a7f2a8bf734604779a9efa4ad5cc717abb954b"; + }; + } + { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + path = fetchurl { + name = "number_is_nan___number_is_nan_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + } + { + name = "oauth_sign___oauth_sign_0.9.0.tgz"; + path = fetchurl { + name = "oauth_sign___oauth_sign_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz"; + sha1 = "47a7b016baa68b5fa0ecf3dee08a85c679ac6455"; + }; + } + { + name = "object_assign___object_assign_4.1.1.tgz"; + path = fetchurl { + name = "object_assign___object_assign_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + } + { + name = "object_inspect___object_inspect_1.11.0.tgz"; + path = fetchurl { + name = "object_inspect___object_inspect_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz"; + sha1 = "9dceb146cedd4148a0d9e51ab88d34cf509922b1"; + }; + } + { + name = "object_is___object_is_1.1.5.tgz"; + path = fetchurl { + name = "object_is___object_is_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz"; + sha1 = "b9deeaa5fc7f1846a0faecdceec138e5778f53ac"; + }; + } + { + name = "object_keys___object_keys_1.1.1.tgz"; + path = fetchurl { + name = "object_keys___object_keys_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; + sha1 = "1c47f272df277f3b1daf061677d9c82e2322c60e"; + }; + } + { + name = "object.assign___object.assign_4.1.2.tgz"; + path = fetchurl { + name = "object.assign___object.assign_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz"; + sha1 = "0ed54a342eceb37b38ff76eb831a0e788cb63940"; + }; + } + { + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.2.tgz"; + path = fetchurl { + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz"; + sha1 = "1bd63aeacf0d5d2d2f31b5e393b03a7c601a23f7"; + }; + } + { + name = "obuf___obuf_1.1.2.tgz"; + path = fetchurl { + name = "obuf___obuf_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz"; + sha1 = "09bea3343d41859ebd446292d11c9d4db619084e"; + }; + } + { + name = "on_finished___on_finished_2.3.0.tgz"; + path = fetchurl { + name = "on_finished___on_finished_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + } + { + name = "on_headers___on_headers_1.0.2.tgz"; + path = fetchurl { + name = "on_headers___on_headers_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz"; + sha1 = "772b0ae6aaa525c399e489adfad90c403eb3c28f"; + }; + } + { + name = "once___once_1.4.0.tgz"; + path = fetchurl { + name = "once___once_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + } + { + name = "onetime___onetime_5.1.2.tgz"; + path = fetchurl { + name = "onetime___onetime_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz"; + sha1 = "d0e96ebb56b07476df1dd9c4806e5237985ca45e"; + }; + } + { + name = "open___open_8.2.1.tgz"; + path = fetchurl { + name = "open___open_8.2.1.tgz"; + url = "https://registry.yarnpkg.com/open/-/open-8.2.1.tgz"; + sha1 = "82de42da0ccbf429bc12d099dad2e0975e14e8af"; + }; + } + { + name = "opencollective_postinstall___opencollective_postinstall_2.0.3.tgz"; + path = fetchurl { + name = "opencollective_postinstall___opencollective_postinstall_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz"; + sha1 = "7a0fff978f6dbfa4d006238fbac98ed4198c3259"; + }; + } + { + name = "opener___opener_1.4.3.tgz"; + path = fetchurl { + name = "opener___opener_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/opener/-/opener-1.4.3.tgz"; + sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"; + }; + } + { + name = "optionator___optionator_0.9.1.tgz"; + path = fetchurl { + name = "optionator___optionator_0.9.1.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz"; + sha1 = "4f236a6373dae0566a6d43e1326674f50c291499"; + }; + } + { + name = "os_homedir___os_homedir_1.0.2.tgz"; + path = fetchurl { + name = "os_homedir___os_homedir_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + } + { + name = "os_locale___os_locale_2.1.0.tgz"; + path = fetchurl { + name = "os_locale___os_locale_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz"; + sha1 = "42bc2900a6b5b8bd17376c8e882b65afccf24bf2"; + }; + } + { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + path = fetchurl { + name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + } + { + name = "osenv___osenv_0.1.5.tgz"; + path = fetchurl { + name = "osenv___osenv_0.1.5.tgz"; + url = "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz"; + sha1 = "85cdfafaeb28e8677f416e287592b5f3f49ea410"; + }; + } + { + name = "p_defer___p_defer_1.0.0.tgz"; + path = fetchurl { + name = "p_defer___p_defer_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz"; + sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; + }; + } + { + name = "p_event___p_event_4.2.0.tgz"; + path = fetchurl { + name = "p_event___p_event_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-event/-/p-event-4.2.0.tgz"; + sha1 = "af4b049c8acd91ae81083ebd1e6f5cae2044c1b5"; + }; + } + { + name = "p_finally___p_finally_1.0.0.tgz"; + path = fetchurl { + name = "p_finally___p_finally_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz"; + sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + }; + } + { + name = "p_limit___p_limit_1.3.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz"; + sha1 = "b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"; + }; + } + { + name = "p_limit___p_limit_2.3.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; + sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; + }; + } + { + name = "p_limit___p_limit_3.1.0.tgz"; + path = fetchurl { + name = "p_limit___p_limit_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz"; + sha1 = "e1daccbe78d0d1388ca18c64fea38e3e57e3706b"; + }; + } + { + name = "p_locate___p_locate_2.0.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz"; + sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; + }; + } + { + name = "p_locate___p_locate_3.0.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz"; + sha1 = "322d69a05c0264b25997d9f40cd8a891ab0064a4"; + }; + } + { + name = "p_locate___p_locate_4.1.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; + sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + }; + } + { + name = "p_map___p_map_2.1.0.tgz"; + path = fetchurl { + name = "p_map___p_map_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz"; + sha1 = "310928feef9c9ecc65b68b17693018a665cea175"; + }; + } + { + name = "p_map___p_map_4.0.0.tgz"; + path = fetchurl { + name = "p_map___p_map_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz"; + sha1 = "bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"; + }; + } + { + name = "p_retry___p_retry_4.6.1.tgz"; + path = fetchurl { + name = "p_retry___p_retry_4.6.1.tgz"; + url = "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.1.tgz"; + sha1 = "8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c"; + }; + } + { + name = "p_timeout___p_timeout_3.2.0.tgz"; + path = fetchurl { + name = "p_timeout___p_timeout_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz"; + sha1 = "c7e17abc971d2a7962ef83626b35d635acf23dfe"; + }; + } + { + name = "p_try___p_try_1.0.0.tgz"; + path = fetchurl { + name = "p_try___p_try_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz"; + sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + }; + } + { + name = "p_try___p_try_2.2.0.tgz"; + path = fetchurl { + name = "p_try___p_try_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; + sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; + }; + } + { + name = "package_json___package_json_4.0.1.tgz"; + path = fetchurl { + name = "package_json___package_json_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/package-json/-/package-json-4.0.1.tgz"; + sha1 = "8869a0401253661c4c4ca3da6c2121ed555f5eed"; + }; + } + { + name = "pacote___pacote_7.6.1.tgz"; + path = fetchurl { + name = "pacote___pacote_7.6.1.tgz"; + url = "https://registry.yarnpkg.com/pacote/-/pacote-7.6.1.tgz"; + sha1 = "d44621c89a5a61f173989b60236757728387c094"; + }; + } + { + name = "pacote___pacote_8.1.6.tgz"; + path = fetchurl { + name = "pacote___pacote_8.1.6.tgz"; + url = "https://registry.yarnpkg.com/pacote/-/pacote-8.1.6.tgz"; + sha1 = "8e647564d38156367e7a9dc47a79ca1ab278d46e"; + }; + } + { + name = "parallel_transform___parallel_transform_1.2.0.tgz"; + path = fetchurl { + name = "parallel_transform___parallel_transform_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz"; + sha1 = "9049ca37d6cb2182c3b1d2c720be94d14a5814fc"; + }; + } + { + name = "parent_module___parent_module_1.0.1.tgz"; + path = fetchurl { + name = "parent_module___parent_module_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; + sha1 = "691d2709e78c79fae3a156622452d00762caaaa2"; + }; + } + { + name = "parse_json___parse_json_2.2.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz"; + sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + }; + } + { + name = "parse_json___parse_json_4.0.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; + }; + } + { + name = "parse_json___parse_json_5.2.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz"; + sha1 = "c76fc66dee54231c962b22bcc8a72cf2f99753cd"; + }; + } + { + name = "parseurl___parseurl_1.3.3.tgz"; + path = fetchurl { + name = "parseurl___parseurl_1.3.3.tgz"; + url = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz"; + sha1 = "9da19e7bee8d12dff0513ed5b76957793bc2e8d4"; + }; + } + { + name = "path_exists___path_exists_3.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz"; + sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + }; + } + { + name = "path_exists___path_exists_4.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; + sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + }; + } + { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + path = fetchurl { + name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + } + { + name = "path_is_inside___path_is_inside_1.0.2.tgz"; + path = fetchurl { + name = "path_is_inside___path_is_inside_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz"; + sha1 = "365417dede44430d1c11af61027facf074bdfc53"; + }; + } + { + name = "path_key___path_key_2.0.1.tgz"; + path = fetchurl { + name = "path_key___path_key_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz"; + sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + }; + } + { + name = "path_key___path_key_3.1.1.tgz"; + path = fetchurl { + name = "path_key___path_key_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; + sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; + }; + } + { + name = "path_parse___path_parse_1.0.7.tgz"; + path = fetchurl { + name = "path_parse___path_parse_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz"; + sha1 = "fbc114b60ca42b30d9daf5858e4bd68bbedb6735"; + }; + } + { + name = "path_to_regexp_es6___path_to_regexp_es6_1.7.0.tgz"; + path = fetchurl { + name = "path_to_regexp_es6___path_to_regexp_es6_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/path-to-regexp-es6/-/path-to-regexp-es6-1.7.0.tgz"; + sha1 = "965657c9f8ea8f660e103ccb839abf038cba4caf"; + }; + } + { + name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; + path = fetchurl { + name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; + sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + }; + } + { + name = "path_to_regexp___path_to_regexp_1.7.0.tgz"; + path = fetchurl { + name = "path_to_regexp___path_to_regexp_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz"; + sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; + }; + } + { + name = "path_type___path_type_2.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz"; + sha1 = "f012ccb8415b7096fc2daa1054c3d72389594c73"; + }; + } + { + name = "path_type___path_type_4.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; + sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b"; + }; + } + { + name = "performance_now___performance_now_2.1.0.tgz"; + path = fetchurl { + name = "performance_now___performance_now_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz"; + sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + }; + } + { + name = "picomatch___picomatch_2.3.0.tgz"; + path = fetchurl { + name = "picomatch___picomatch_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz"; + sha1 = "f1f061de8f6a4bf022892e2d128234fb98302972"; + }; + } + { + name = "pify___pify_2.3.0.tgz"; + path = fetchurl { + name = "pify___pify_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + } + { + name = "pify___pify_3.0.0.tgz"; + path = fetchurl { + name = "pify___pify_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz"; + sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + }; + } + { + name = "pify___pify_4.0.1.tgz"; + path = fetchurl { + name = "pify___pify_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz"; + sha1 = "4b2cd25c50d598735c50292224fd8c6df41e3231"; + }; + } + { + name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; + path = fetchurl { + name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + } + { + name = "pinkie___pinkie_2.0.4.tgz"; + path = fetchurl { + name = "pinkie___pinkie_2.0.4.tgz"; + url = "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + } + { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; + sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + }; + } + { + name = "please_upgrade_node___please_upgrade_node_3.2.0.tgz"; + path = fetchurl { + name = "please_upgrade_node___please_upgrade_node_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz"; + sha1 = "aeddd3f994c933e4ad98b99d9a556efa0e2fe942"; + }; + } + { + name = "portfinder___portfinder_1.0.28.tgz"; + path = fetchurl { + name = "portfinder___portfinder_1.0.28.tgz"; + url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz"; + sha1 = "67c4622852bd5374dd1dd900f779f53462fac778"; + }; + } + { + name = "postcss_modules_extract_imports___postcss_modules_extract_imports_3.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_extract_imports___postcss_modules_extract_imports_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"; + sha1 = "cda1f047c0ae80c97dbe28c3e76a43b88025741d"; + }; + } + { + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_4.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz"; + sha1 = "ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"; + }; + } + { + name = "postcss_modules_scope___postcss_modules_scope_3.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_scope___postcss_modules_scope_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"; + sha1 = "9ef3151456d3bbfa120ca44898dfca6f2fa01f06"; + }; + } + { + name = "postcss_modules_values___postcss_modules_values_4.0.0.tgz"; + path = fetchurl { + name = "postcss_modules_values___postcss_modules_values_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"; + sha1 = "d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"; + }; + } + { + name = "postcss_selector_parser___postcss_selector_parser_6.0.6.tgz"; + path = fetchurl { + name = "postcss_selector_parser___postcss_selector_parser_6.0.6.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz"; + sha1 = "2c5bba8174ac2f6981ab631a42ab0ee54af332ea"; + }; + } + { + name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; + path = fetchurl { + name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; + sha1 = "443f6a20ced6481a2bda4fa8532a6e55d789a2cb"; + }; + } + { + name = "postcss___postcss_8.3.6.tgz"; + path = fetchurl { + name = "postcss___postcss_8.3.6.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-8.3.6.tgz"; + sha1 = "2730dd76a97969f37f53b9a6096197be311cc4ea"; + }; + } + { + name = "prelude_ls___prelude_ls_1.2.1.tgz"; + path = fetchurl { + name = "prelude_ls___prelude_ls_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz"; + sha1 = "debc6489d7a6e6b0e7611888cec880337d316396"; + }; + } + { + name = "prepend_http___prepend_http_1.0.4.tgz"; + path = fetchurl { + name = "prepend_http___prepend_http_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz"; + sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; + }; + } + { + name = "prettier_linter_helpers___prettier_linter_helpers_1.0.0.tgz"; + path = fetchurl { + name = "prettier_linter_helpers___prettier_linter_helpers_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz"; + sha1 = "d23d41fe1375646de2d0104d3454a3008802cf7b"; + }; + } + { + name = "prettier_plugin_import_sort___prettier_plugin_import_sort_0.0.7.tgz"; + path = fetchurl { + name = "prettier_plugin_import_sort___prettier_plugin_import_sort_0.0.7.tgz"; + url = "https://registry.yarnpkg.com/prettier-plugin-import-sort/-/prettier-plugin-import-sort-0.0.7.tgz"; + sha1 = "b13dcc4de98940b99066a9e34606a955d109b546"; + }; + } + { + name = "prettier_plugin_organize_imports___prettier_plugin_organize_imports_2.3.3.tgz"; + path = fetchurl { + name = "prettier_plugin_organize_imports___prettier_plugin_organize_imports_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/prettier-plugin-organize-imports/-/prettier-plugin-organize-imports-2.3.3.tgz"; + sha1 = "6877bcf8ca02569198d8f419c954a0d90a95de15"; + }; + } + { + name = "prettier_plugin_packagejson___prettier_plugin_packagejson_2.2.11.tgz"; + path = fetchurl { + name = "prettier_plugin_packagejson___prettier_plugin_packagejson_2.2.11.tgz"; + url = "https://registry.yarnpkg.com/prettier-plugin-packagejson/-/prettier-plugin-packagejson-2.2.11.tgz"; + sha1 = "640b6301da3a58c489889b3d315255e18153daf0"; + }; + } + { + name = "prettier___prettier_2.3.2.tgz"; + path = fetchurl { + name = "prettier___prettier_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-2.3.2.tgz"; + sha1 = "ef280a05ec253712e486233db5c6f23441e7342d"; + }; + } + { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + path = fetchurl { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + }; + } + { + name = "progress___progress_2.0.3.tgz"; + path = fetchurl { + name = "progress___progress_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; + sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"; + }; + } + { + name = "promise_inflight___promise_inflight_1.0.1.tgz"; + path = fetchurl { + name = "promise_inflight___promise_inflight_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz"; + sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; + }; + } + { + name = "promise_retry___promise_retry_1.1.1.tgz"; + path = fetchurl { + name = "promise_retry___promise_retry_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz"; + sha1 = "6739e968e3051da20ce6497fb2b50f6911df3d6d"; + }; + } + { + name = "promzard___promzard_0.3.0.tgz"; + path = fetchurl { + name = "promzard___promzard_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/promzard/-/promzard-0.3.0.tgz"; + sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee"; + }; + } + { + name = "proto_list___proto_list_1.2.4.tgz"; + path = fetchurl { + name = "proto_list___proto_list_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz"; + sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; + }; + } + { + name = "protoduck___protoduck_5.0.1.tgz"; + path = fetchurl { + name = "protoduck___protoduck_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz"; + sha1 = "03c3659ca18007b69a50fd82a7ebcc516261151f"; + }; + } + { + name = "proxy_addr___proxy_addr_2.0.7.tgz"; + path = fetchurl { + name = "proxy_addr___proxy_addr_2.0.7.tgz"; + url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz"; + sha1 = "f19fe69ceab311eeb94b42e70e8c2070f9ba1025"; + }; + } + { + name = "prr___prr_1.0.1.tgz"; + path = fetchurl { + name = "prr___prr_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz"; + sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; + }; + } + { + name = "pseudomap___pseudomap_1.0.2.tgz"; + path = fetchurl { + name = "pseudomap___pseudomap_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + } + { + name = "psl___psl_1.8.0.tgz"; + path = fetchurl { + name = "psl___psl_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz"; + sha1 = "9326f8bcfb013adcc005fdff056acce020e51c24"; + }; + } + { + name = "pump___pump_1.0.3.tgz"; + path = fetchurl { + name = "pump___pump_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/pump/-/pump-1.0.3.tgz"; + sha1 = "5dfe8311c33bbf6fc18261f9f34702c47c08a954"; + }; + } + { + name = "pump___pump_2.0.1.tgz"; + path = fetchurl { + name = "pump___pump_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz"; + sha1 = "12399add6e4cf7526d973cbc8b5ce2e2908b3909"; + }; + } + { + name = "pump___pump_3.0.0.tgz"; + path = fetchurl { + name = "pump___pump_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; + sha1 = "b4a2116815bde2f4e1ea602354e8c75565107a64"; + }; + } + { + name = "pumpify___pumpify_1.5.1.tgz"; + path = fetchurl { + name = "pumpify___pumpify_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz"; + sha1 = "36513be246ab27570b1a374a5ce278bfd74370ce"; + }; + } + { + name = "punycode___punycode_1.3.2.tgz"; + path = fetchurl { + name = "punycode___punycode_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + }; + } + { + name = "punycode___punycode_2.1.1.tgz"; + path = fetchurl { + name = "punycode___punycode_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; + sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + }; + } + { + name = "qrcode_terminal___qrcode_terminal_0.12.0.tgz"; + path = fetchurl { + name = "qrcode_terminal___qrcode_terminal_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz"; + sha1 = "bb5b699ef7f9f0505092a3748be4464fe71b5819"; + }; + } + { + name = "qs___qs_6.7.0.tgz"; + path = fetchurl { + name = "qs___qs_6.7.0.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz"; + sha1 = "41dc1a015e3d581f1621776be31afb2876a9b1bc"; + }; + } + { + name = "qs___qs_6.5.2.tgz"; + path = fetchurl { + name = "qs___qs_6.5.2.tgz"; + url = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz"; + sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; + }; + } + { + name = "query_string___query_string_6.14.1.tgz"; + path = fetchurl { + name = "query_string___query_string_6.14.1.tgz"; + url = "https://registry.yarnpkg.com/query-string/-/query-string-6.14.1.tgz"; + sha1 = "7ac2dca46da7f309449ba0f86b1fd28255b0c86a"; + }; + } + { + name = "querystring___querystring_0.2.0.tgz"; + path = fetchurl { + name = "querystring___querystring_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz"; + sha1 = "b209849203bb25df820da756e747005878521620"; + }; + } + { + name = "queue_microtask___queue_microtask_1.2.3.tgz"; + path = fetchurl { + name = "queue_microtask___queue_microtask_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz"; + sha1 = "4929228bbc724dfac43e0efb058caf7b6cfb6243"; + }; + } + { + name = "quick_lru___quick_lru_4.0.1.tgz"; + path = fetchurl { + name = "quick_lru___quick_lru_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz"; + sha1 = "5b8878f113a58217848c6482026c73e1ba57727f"; + }; + } + { + name = "qw___qw_1.0.1.tgz"; + path = fetchurl { + name = "qw___qw_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/qw/-/qw-1.0.1.tgz"; + sha1 = "efbfdc740f9ad054304426acb183412cc8b996d4"; + }; + } + { + name = "randombytes___randombytes_2.1.0.tgz"; + path = fetchurl { + name = "randombytes___randombytes_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz"; + sha1 = "df6f84372f0270dc65cdf6291349ab7a473d4f2a"; + }; + } + { + name = "range_parser___range_parser_1.2.1.tgz"; + path = fetchurl { + name = "range_parser___range_parser_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz"; + sha1 = "3cf37023d199e1c24d1a55b84800c2f3e6468031"; + }; + } + { + name = "raw_body___raw_body_2.4.0.tgz"; + path = fetchurl { + name = "raw_body___raw_body_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz"; + sha1 = "a1ce6fb9c9bc356ca52e89256ab59059e13d0332"; + }; + } + { + name = "rc___rc_1.2.8.tgz"; + path = fetchurl { + name = "rc___rc_1.2.8.tgz"; + url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz"; + sha1 = "cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"; + }; + } + { + name = "read_cmd_shim___read_cmd_shim_1.0.5.tgz"; + path = fetchurl { + name = "read_cmd_shim___read_cmd_shim_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz"; + sha1 = "87e43eba50098ba5a32d0ceb583ab8e43b961c16"; + }; + } + { + name = "read_installed___read_installed_4.0.3.tgz"; + path = fetchurl { + name = "read_installed___read_installed_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/read-installed/-/read-installed-4.0.3.tgz"; + sha1 = "ff9b8b67f187d1e4c29b9feb31f6b223acd19067"; + }; + } + { + name = "read_package_json___read_package_json_2.1.2.tgz"; + path = fetchurl { + name = "read_package_json___read_package_json_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.1.2.tgz"; + sha1 = "6992b2b66c7177259feb8eaac73c3acd28b9222a"; + }; + } + { + name = "read_package_tree___read_package_tree_5.3.1.tgz"; + path = fetchurl { + name = "read_package_tree___read_package_tree_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/read-package-tree/-/read-package-tree-5.3.1.tgz"; + sha1 = "a32cb64c7f31eb8a6f31ef06f9cedf74068fe636"; + }; + } + { + name = "read_pkg_up___read_pkg_up_2.0.0.tgz"; + path = fetchurl { + name = "read_pkg_up___read_pkg_up_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz"; + sha1 = "6b72a8048984e0c41e79510fd5e9fa99b3b549be"; + }; + } + { + name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; + path = fetchurl { + name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz"; + sha1 = "f3a6135758459733ae2b95638056e1854e7ef507"; + }; + } + { + name = "read_pkg___read_pkg_2.0.0.tgz"; + path = fetchurl { + name = "read_pkg___read_pkg_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz"; + sha1 = "8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"; + }; + } + { + name = "read_pkg___read_pkg_5.2.0.tgz"; + path = fetchurl { + name = "read_pkg___read_pkg_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz"; + sha1 = "7bf295438ca5a33e56cd30e053b34ee7250c93cc"; + }; + } + { + name = "read___read_1.0.7.tgz"; + path = fetchurl { + name = "read___read_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/read/-/read-1.0.7.tgz"; + sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; + }; + } + { + name = "readable_stream___readable_stream_2.3.7.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.7.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; + sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + }; + } + { + name = "readable_stream___readable_stream_3.6.0.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; + sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; + }; + } + { + name = "readable_stream___readable_stream_1.1.14.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_1.1.14.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + } + { + name = "readdir_scoped_modules___readdir_scoped_modules_1.1.0.tgz"; + path = fetchurl { + name = "readdir_scoped_modules___readdir_scoped_modules_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz"; + sha1 = "8d45407b4f870a0dcaebc0e28670d18e74514309"; + }; + } + { + name = "readdirp___readdirp_3.6.0.tgz"; + path = fetchurl { + name = "readdirp___readdirp_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz"; + sha1 = "74a370bd857116e245b29cc97340cd431a02a6c7"; + }; + } + { + name = "rechoir___rechoir_0.7.1.tgz"; + path = fetchurl { + name = "rechoir___rechoir_0.7.1.tgz"; + url = "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz"; + sha1 = "9478a96a1ca135b5e88fc027f03ee92d6c645686"; + }; + } + { + name = "reconnecting_websocket___reconnecting_websocket_4.4.0.tgz"; + path = fetchurl { + name = "reconnecting_websocket___reconnecting_websocket_4.4.0.tgz"; + url = "https://registry.yarnpkg.com/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz"; + sha1 = "3b0e5b96ef119e78a03135865b8bb0af1b948783"; + }; + } + { + name = "redent___redent_3.0.0.tgz"; + path = fetchurl { + name = "redent___redent_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz"; + sha1 = "e557b7998316bb53c9f1f56fa626352c6963059f"; + }; + } + { + name = "redux___redux_4.1.1.tgz"; + path = fetchurl { + name = "redux___redux_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/redux/-/redux-4.1.1.tgz"; + sha1 = "76f1c439bb42043f985fbd9bf21990e60bd67f47"; + }; + } + { + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; + path = fetchurl { + name = "regenerate_unicode_properties___regenerate_unicode_properties_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"; + sha1 = "e5de7111d655e7ba60c057dbe9ff37c87e65cdec"; + }; + } + { + name = "regenerate___regenerate_1.4.2.tgz"; + path = fetchurl { + name = "regenerate___regenerate_1.4.2.tgz"; + url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz"; + sha1 = "b9346d8827e8f5a32f7ba29637d398b69014848a"; + }; + } + { + name = "regenerator_runtime___regenerator_runtime_0.13.9.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.13.9.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; + sha1 = "8925742a98ffd90814988d7566ad30ca3b263b52"; + }; + } + { + name = "regenerator_transform___regenerator_transform_0.14.5.tgz"; + path = fetchurl { + name = "regenerator_transform___regenerator_transform_0.14.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz"; + sha1 = "c98da154683671c9c4dcb16ece736517e1b7feb4"; + }; + } + { + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.1.tgz"; + path = fetchurl { + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz"; + sha1 = "7ef352ae8d159e758c0eadca6f8fcb4eef07be26"; + }; + } + { + name = "regexpp___regexpp_3.2.0.tgz"; + path = fetchurl { + name = "regexpp___regexpp_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz"; + sha1 = "0425a2768d8f23bad70ca4b90461fa2f1213e1b2"; + }; + } + { + name = "regexpu_core___regexpu_core_4.7.1.tgz"; + path = fetchurl { + name = "regexpu_core___regexpu_core_4.7.1.tgz"; + url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz"; + sha1 = "2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"; + }; + } + { + name = "register_service_worker___register_service_worker_1.7.2.tgz"; + path = fetchurl { + name = "register_service_worker___register_service_worker_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/register-service-worker/-/register-service-worker-1.7.2.tgz"; + sha1 = "6516983e1ef790a98c4225af1216bc80941a4bd2"; + }; + } + { + name = "registry_auth_token___registry_auth_token_3.4.0.tgz"; + path = fetchurl { + name = "registry_auth_token___registry_auth_token_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.4.0.tgz"; + sha1 = "d7446815433f5d5ed6431cd5dca21048f66b397e"; + }; + } + { + name = "registry_url___registry_url_3.1.0.tgz"; + path = fetchurl { + name = "registry_url___registry_url_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/registry-url/-/registry-url-3.1.0.tgz"; + sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; + }; + } + { + name = "regjsgen___regjsgen_0.5.2.tgz"; + path = fetchurl { + name = "regjsgen___regjsgen_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz"; + sha1 = "92ff295fb1deecbf6ecdab2543d207e91aa33733"; + }; + } + { + name = "regjsparser___regjsparser_0.6.9.tgz"; + path = fetchurl { + name = "regjsparser___regjsparser_0.6.9.tgz"; + url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz"; + sha1 = "b489eef7c9a2ce43727627011429cf833a7183e6"; + }; + } + { + name = "request___request_2.88.2.tgz"; + path = fetchurl { + name = "request___request_2.88.2.tgz"; + url = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz"; + sha1 = "d73c918731cb5a87da047e207234146f664d12b3"; + }; + } + { + name = "require_directory___require_directory_2.1.1.tgz"; + path = fetchurl { + name = "require_directory___require_directory_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; + sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + }; + } + { + name = "require_from_string___require_from_string_2.0.2.tgz"; + path = fetchurl { + name = "require_from_string___require_from_string_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz"; + sha1 = "89a7fdd938261267318eafe14f9c32e598c36909"; + }; + } + { + name = "require_main_filename___require_main_filename_1.0.1.tgz"; + path = fetchurl { + name = "require_main_filename___require_main_filename_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz"; + sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + }; + } + { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + path = fetchurl { + name = "require_main_filename___require_main_filename_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz"; + sha1 = "d0b329ecc7cc0f61649f62215be69af54aa8989b"; + }; + } + { + name = "requires_port___requires_port_1.0.0.tgz"; + path = fetchurl { + name = "requires_port___requires_port_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz"; + sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; + }; + } + { + name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; + path = fetchurl { + name = "resolve_cwd___resolve_cwd_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz"; + sha1 = "0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"; + }; + } + { + name = "resolve_from___resolve_from_3.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz"; + sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; + }; + } + { + name = "resolve_from___resolve_from_4.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; + sha1 = "4abcd852ad32dd7baabfe9b40e00a36db5f392e6"; + }; + } + { + name = "resolve_from___resolve_from_5.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz"; + sha1 = "c35225843df8f776df21c57557bc087e9dfdfc69"; + }; + } + { + name = "resolve_pathname___resolve_pathname_3.0.0.tgz"; + path = fetchurl { + name = "resolve_pathname___resolve_pathname_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz"; + sha1 = "99d02224d3cf263689becbb393bc560313025dcd"; + }; + } + { + name = "resolve___resolve_1.20.0.tgz"; + path = fetchurl { + name = "resolve___resolve_1.20.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz"; + sha1 = "629a013fb3f70755d6f0b7935cc1c2c5378b1975"; + }; + } + { + name = "restore_cursor___restore_cursor_3.1.0.tgz"; + path = fetchurl { + name = "restore_cursor___restore_cursor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz"; + sha1 = "39f67c54b3a7a58cea5236d95cf0034239631f7e"; + }; + } + { + name = "retry___retry_0.10.1.tgz"; + path = fetchurl { + name = "retry___retry_0.10.1.tgz"; + url = "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz"; + sha1 = "e76388d217992c252750241d3d3956fed98d8ff4"; + }; + } + { + name = "retry___retry_0.12.0.tgz"; + path = fetchurl { + name = "retry___retry_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz"; + sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + }; + } + { + name = "retry___retry_0.13.1.tgz"; + path = fetchurl { + name = "retry___retry_0.13.1.tgz"; + url = "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz"; + sha1 = "185b1587acf67919d63b357349e03537b2484658"; + }; + } + { + name = "reusify___reusify_1.0.4.tgz"; + path = fetchurl { + name = "reusify___reusify_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz"; + sha1 = "90da382b1e126efc02146e90845a88db12925d76"; + }; + } + { + name = "rimraf___rimraf_2.7.1.tgz"; + path = fetchurl { + name = "rimraf___rimraf_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; + sha1 = "35797f13a7fdadc566142c29d4f07ccad483e3ec"; + }; + } + { + name = "rimraf___rimraf_3.0.2.tgz"; + path = fetchurl { + name = "rimraf___rimraf_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; + sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + }; + } + { + name = "rimraf___rimraf_2.6.3.tgz"; + path = fetchurl { + name = "rimraf___rimraf_2.6.3.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz"; + sha1 = "b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"; + }; + } + { + name = "run_node_webpack_plugin___run_node_webpack_plugin_1.3.0.tgz"; + path = fetchurl { + name = "run_node_webpack_plugin___run_node_webpack_plugin_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/run-node-webpack-plugin/-/run-node-webpack-plugin-1.3.0.tgz"; + sha1 = "c019294c59116e26d5e5f017f5318a65e4479524"; + }; + } + { + name = "run_parallel___run_parallel_1.2.0.tgz"; + path = fetchurl { + name = "run_parallel___run_parallel_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz"; + sha1 = "66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"; + }; + } + { + name = "run_queue___run_queue_1.0.3.tgz"; + path = fetchurl { + name = "run_queue___run_queue_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz"; + sha1 = "e848396f057d223f24386924618e25694161ec47"; + }; + } + { + name = "rxjs___rxjs_6.6.7.tgz"; + path = fetchurl { + name = "rxjs___rxjs_6.6.7.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz"; + sha1 = "90ac018acabf491bf65044235d5863c4dab804c9"; + }; + } + { + name = "rxjs___rxjs_7.3.0.tgz"; + path = fetchurl { + name = "rxjs___rxjs_7.3.0.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-7.3.0.tgz"; + sha1 = "39fe4f3461dc1e50be1475b2b85a0a88c1e938c6"; + }; + } + { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; + }; + } + { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; + }; + } + { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + path = fetchurl { + name = "safer_buffer___safer_buffer_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha1 = "44fa161b0187b9549dd84bb91802f9bd8385cd6a"; + }; + } + { + name = "sass_graph___sass_graph_2.2.5.tgz"; + path = fetchurl { + name = "sass_graph___sass_graph_2.2.5.tgz"; + url = "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.5.tgz"; + sha1 = "a981c87446b8319d96dce0671e487879bd24c2e8"; + }; + } + { + name = "sass_loader___sass_loader_12.1.0.tgz"; + path = fetchurl { + name = "sass_loader___sass_loader_12.1.0.tgz"; + url = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-12.1.0.tgz"; + sha1 = "b73324622231009da6fba61ab76013256380d201"; + }; + } + { + name = "schema_utils___schema_utils_2.7.1.tgz"; + path = fetchurl { + name = "schema_utils___schema_utils_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz"; + sha1 = "1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"; + }; + } + { + name = "schema_utils___schema_utils_3.1.1.tgz"; + path = fetchurl { + name = "schema_utils___schema_utils_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz"; + sha1 = "bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"; + }; + } + { + name = "scss_tokenizer___scss_tokenizer_0.2.3.tgz"; + path = fetchurl { + name = "scss_tokenizer___scss_tokenizer_0.2.3.tgz"; + url = "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz"; + sha1 = "8eb06db9a9723333824d3f5530641149847ce5d1"; + }; + } + { + name = "select_hose___select_hose_2.0.0.tgz"; + path = fetchurl { + name = "select_hose___select_hose_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz"; + sha1 = "625d8658f865af43ec962bfc376a37359a4994ca"; + }; + } + { + name = "selfsigned___selfsigned_1.10.11.tgz"; + path = fetchurl { + name = "selfsigned___selfsigned_1.10.11.tgz"; + url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz"; + sha1 = "24929cd906fe0f44b6d01fb23999a739537acbe9"; + }; + } + { + name = "semver_compare___semver_compare_1.0.0.tgz"; + path = fetchurl { + name = "semver_compare___semver_compare_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz"; + sha1 = "0dee216a1c941ab37e9efb1788f6afc5ff5537fc"; + }; + } + { + name = "semver_diff___semver_diff_2.1.0.tgz"; + path = fetchurl { + name = "semver_diff___semver_diff_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz"; + sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"; + }; + } + { + name = "semver___semver_5.7.1.tgz"; + path = fetchurl { + name = "semver___semver_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; + sha1 = "a954f931aeba508d307bbf069eff0c01c96116f7"; + }; + } + { + name = "semver___semver_7.0.0.tgz"; + path = fetchurl { + name = "semver___semver_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz"; + sha1 = "5f3ca35761e47e05b206c6daff2cf814f0316b8e"; + }; + } + { + name = "semver___semver_6.3.0.tgz"; + path = fetchurl { + name = "semver___semver_6.3.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; + sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; + }; + } + { + name = "semver___semver_7.3.5.tgz"; + path = fetchurl { + name = "semver___semver_7.3.5.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; + sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; + }; + } + { + name = "semver___semver_5.3.0.tgz"; + path = fetchurl { + name = "semver___semver_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz"; + sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; + }; + } + { + name = "send___send_0.17.1.tgz"; + path = fetchurl { + name = "send___send_0.17.1.tgz"; + url = "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz"; + sha1 = "c1d8b059f7900f7466dd4938bdc44e11ddb376c8"; + }; + } + { + name = "serialize_javascript___serialize_javascript_6.0.0.tgz"; + path = fetchurl { + name = "serialize_javascript___serialize_javascript_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz"; + sha1 = "efae5d88f45d7924141da8b5c3a7a7e663fefeb8"; + }; + } + { + name = "serve_index___serve_index_1.9.1.tgz"; + path = fetchurl { + name = "serve_index___serve_index_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz"; + sha1 = "d3768d69b1e7d82e5ce050fff5b453bea12a9239"; + }; + } + { + name = "serve_static___serve_static_1.14.1.tgz"; + path = fetchurl { + name = "serve_static___serve_static_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz"; + sha1 = "666e636dc4f010f7ef29970a88a674320898b2f9"; + }; + } + { + name = "set_blocking___set_blocking_2.0.0.tgz"; + path = fetchurl { + name = "set_blocking___set_blocking_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + } + { + name = "setprototypeof___setprototypeof_1.1.0.tgz"; + path = fetchurl { + name = "setprototypeof___setprototypeof_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz"; + sha1 = "d0bd85536887b6fe7c0d818cb962d9d91c54e656"; + }; + } + { + name = "setprototypeof___setprototypeof_1.1.1.tgz"; + path = fetchurl { + name = "setprototypeof___setprototypeof_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha1 = "7e95acb24aa92f5885e0abef5ba131330d4ae683"; + }; + } + { + name = "sha___sha_2.0.1.tgz"; + path = fetchurl { + name = "sha___sha_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/sha/-/sha-2.0.1.tgz"; + sha1 = "6030822fbd2c9823949f8f72ed6411ee5cf25aae"; + }; + } + { + name = "shallow_clone___shallow_clone_3.0.1.tgz"; + path = fetchurl { + name = "shallow_clone___shallow_clone_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz"; + sha1 = "8f2981ad92531f55035b01fb230769a40e02efa3"; + }; + } + { + name = "shallowequal___shallowequal_1.1.0.tgz"; + path = fetchurl { + name = "shallowequal___shallowequal_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz"; + sha1 = "188d521de95b9087404fd4dcb68b13df0ae4e7f8"; + }; + } + { + name = "shebang_command___shebang_command_1.2.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz"; + sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + }; + } + { + name = "shebang_command___shebang_command_2.0.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; + sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; + }; + } + { + name = "shebang_regex___shebang_regex_1.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz"; + sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + }; + } + { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; + }; + } + { + name = "side_channel___side_channel_1.0.4.tgz"; + path = fetchurl { + name = "side_channel___side_channel_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz"; + sha1 = "efce5c8fdc104ee751b25c58d4290011fa5ea2cf"; + }; + } + { + name = "signal_exit___signal_exit_3.0.3.tgz"; + path = fetchurl { + name = "signal_exit___signal_exit_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; + sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; + }; + } + { + name = "slash___slash_3.0.0.tgz"; + path = fetchurl { + name = "slash___slash_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz"; + sha1 = "6539be870c165adbd5240220dbe361f1bc4d4634"; + }; + } + { + name = "slice_ansi___slice_ansi_3.0.0.tgz"; + path = fetchurl { + name = "slice_ansi___slice_ansi_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz"; + sha1 = "31ddc10930a1b7e0b67b08c96c2f49b77a789787"; + }; + } + { + name = "slice_ansi___slice_ansi_4.0.0.tgz"; + path = fetchurl { + name = "slice_ansi___slice_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz"; + sha1 = "500e8dd0fd55b05815086255b3195adf2a45fe6b"; + }; + } + { + name = "slide___slide_1.1.6.tgz"; + path = fetchurl { + name = "slide___slide_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz"; + sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; + }; + } + { + name = "smart_buffer___smart_buffer_1.1.15.tgz"; + path = fetchurl { + name = "smart_buffer___smart_buffer_1.1.15.tgz"; + url = "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-1.1.15.tgz"; + sha1 = "7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"; + }; + } + { + name = "smart_buffer___smart_buffer_4.2.0.tgz"; + path = fetchurl { + name = "smart_buffer___smart_buffer_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz"; + sha1 = "6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"; + }; + } + { + name = "sockjs___sockjs_0.3.21.tgz"; + path = fetchurl { + name = "sockjs___sockjs_0.3.21.tgz"; + url = "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.21.tgz"; + sha1 = "b34ffb98e796930b60a0cfa11904d6a339a7d417"; + }; + } + { + name = "socks_proxy_agent___socks_proxy_agent_3.0.1.tgz"; + path = fetchurl { + name = "socks_proxy_agent___socks_proxy_agent_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz"; + sha1 = "2eae7cf8e2a82d34565761539a7f9718c5617659"; + }; + } + { + name = "socks_proxy_agent___socks_proxy_agent_4.0.2.tgz"; + path = fetchurl { + name = "socks_proxy_agent___socks_proxy_agent_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz"; + sha1 = "3c8991f3145b2799e70e11bd5fbc8b1963116386"; + }; + } + { + name = "socks___socks_1.1.10.tgz"; + path = fetchurl { + name = "socks___socks_1.1.10.tgz"; + url = "https://registry.yarnpkg.com/socks/-/socks-1.1.10.tgz"; + sha1 = "5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a"; + }; + } + { + name = "socks___socks_2.3.3.tgz"; + path = fetchurl { + name = "socks___socks_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/socks/-/socks-2.3.3.tgz"; + sha1 = "01129f0a5d534d2b897712ed8aceab7ee65d78e3"; + }; + } + { + name = "sort_object_keys___sort_object_keys_1.1.3.tgz"; + path = fetchurl { + name = "sort_object_keys___sort_object_keys_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz"; + sha1 = "bff833fe85cab147b34742e45863453c1e190b45"; + }; + } + { + name = "sort_package_json___sort_package_json_1.50.0.tgz"; + path = fetchurl { + name = "sort_package_json___sort_package_json_1.50.0.tgz"; + url = "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.50.0.tgz"; + sha1 = "19fc109fe23bd157bd03c8e572fa3251a52467d8"; + }; + } + { + name = "sorted_object___sorted_object_2.0.1.tgz"; + path = fetchurl { + name = "sorted_object___sorted_object_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/sorted-object/-/sorted-object-2.0.1.tgz"; + sha1 = "7d631f4bd3a798a24af1dffcfbfe83337a5df5fc"; + }; + } + { + name = "sorted_union_stream___sorted_union_stream_2.1.3.tgz"; + path = fetchurl { + name = "sorted_union_stream___sorted_union_stream_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/sorted-union-stream/-/sorted-union-stream-2.1.3.tgz"; + sha1 = "c7794c7e077880052ff71a8d4a2dbb4a9a638ac7"; + }; + } + { + name = "sortpack___sortpack_2.2.0.tgz"; + path = fetchurl { + name = "sortpack___sortpack_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/sortpack/-/sortpack-2.2.0.tgz"; + sha1 = "8f5ffc34a62305201186dae05658ef36723cc50d"; + }; + } + { + name = "source_map_js___source_map_js_0.6.2.tgz"; + path = fetchurl { + name = "source_map_js___source_map_js_0.6.2.tgz"; + url = "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz"; + sha1 = "0bb5de631b41cfbda6cfba8bd05a80efdfd2385e"; + }; + } + { + name = "source_map_support___source_map_support_0.5.19.tgz"; + path = fetchurl { + name = "source_map_support___source_map_support_0.5.19.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; + sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; + }; + } + { + name = "source_map___source_map_0.4.4.tgz"; + path = fetchurl { + name = "source_map___source_map_0.4.4.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz"; + sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b"; + }; + } + { + name = "source_map___source_map_0.5.7.tgz"; + path = fetchurl { + name = "source_map___source_map_0.5.7.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + } + { + name = "source_map___source_map_0.6.1.tgz"; + path = fetchurl { + name = "source_map___source_map_0.6.1.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; + sha1 = "74722af32e9614e9c287a8d0bbde48b5e2f1a263"; + }; + } + { + name = "source_map___source_map_0.7.3.tgz"; + path = fetchurl { + name = "source_map___source_map_0.7.3.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz"; + sha1 = "5302f8169031735226544092e64981f751750383"; + }; + } + { + name = "spdx_correct___spdx_correct_3.1.1.tgz"; + path = fetchurl { + name = "spdx_correct___spdx_correct_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz"; + sha1 = "dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"; + }; + } + { + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + path = fetchurl { + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha1 = "3f28ce1a77a00372683eade4a433183527a2163d"; + }; + } + { + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + path = fetchurl { + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha1 = "cf70f50482eefdc98e3ce0a6833e4a53ceeba679"; + }; + } + { + name = "spdx_license_ids___spdx_license_ids_3.0.10.tgz"; + path = fetchurl { + name = "spdx_license_ids___spdx_license_ids_3.0.10.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz"; + sha1 = "0d9becccde7003d6c658d487dd48a32f0bf3014b"; + }; + } + { + name = "spdy_transport___spdy_transport_3.0.0.tgz"; + path = fetchurl { + name = "spdy_transport___spdy_transport_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz"; + sha1 = "00d4863a6400ad75df93361a1608605e5dcdcf31"; + }; + } + { + name = "spdy___spdy_4.0.2.tgz"; + path = fetchurl { + name = "spdy___spdy_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz"; + sha1 = "b74f466203a3eda452c02492b91fb9e84a27677b"; + }; + } + { + name = "split_on_first___split_on_first_1.1.0.tgz"; + path = fetchurl { + name = "split_on_first___split_on_first_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/split-on-first/-/split-on-first-1.1.0.tgz"; + sha1 = "f610afeee3b12bce1d0c30425e76398b78249a5f"; + }; + } + { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + } + { + name = "sshpk___sshpk_1.16.1.tgz"; + path = fetchurl { + name = "sshpk___sshpk_1.16.1.tgz"; + url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz"; + sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877"; + }; + } + { + name = "ssri___ssri_5.3.0.tgz"; + path = fetchurl { + name = "ssri___ssri_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz"; + sha1 = "ba3872c9c6d33a0704a7d71ff045e5ec48999d06"; + }; + } + { + name = "ssri___ssri_6.0.2.tgz"; + path = fetchurl { + name = "ssri___ssri_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz"; + sha1 = "157939134f20464e7301ddba3e90ffa8f7728ac5"; + }; + } + { + name = "statuses___statuses_1.5.0.tgz"; + path = fetchurl { + name = "statuses___statuses_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz"; + sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + }; + } + { + name = "stdout_stream___stdout_stream_1.4.1.tgz"; + path = fetchurl { + name = "stdout_stream___stdout_stream_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz"; + sha1 = "5ac174cdd5cd726104aa0c0b2bd83815d8d535de"; + }; + } + { + name = "stream_each___stream_each_1.2.3.tgz"; + path = fetchurl { + name = "stream_each___stream_each_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz"; + sha1 = "ebe27a0c389b04fbcc233642952e10731afa9bae"; + }; + } + { + name = "stream_iterate___stream_iterate_1.2.0.tgz"; + path = fetchurl { + name = "stream_iterate___stream_iterate_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/stream-iterate/-/stream-iterate-1.2.0.tgz"; + sha1 = "2bd7c77296c1702a46488b8ad41f79865eecd4e1"; + }; + } + { + name = "stream_shift___stream_shift_1.0.1.tgz"; + path = fetchurl { + name = "stream_shift___stream_shift_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz"; + sha1 = "d7088281559ab2778424279b0877da3c392d5a3d"; + }; + } + { + name = "strict_uri_encode___strict_uri_encode_2.0.0.tgz"; + path = fetchurl { + name = "strict_uri_encode___strict_uri_encode_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz"; + sha1 = "b9c7330c7042862f6b142dc274bbcc5866ce3546"; + }; + } + { + name = "string_argv___string_argv_0.3.1.tgz"; + path = fetchurl { + name = "string_argv___string_argv_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz"; + sha1 = "95e2fbec0427ae19184935f816d74aaa4c5c19da"; + }; + } + { + name = "string_width___string_width_1.0.2.tgz"; + path = fetchurl { + name = "string_width___string_width_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + } + { + name = "string_width___string_width_2.1.1.tgz"; + path = fetchurl { + name = "string_width___string_width_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; + sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; + }; + } + { + name = "string_width___string_width_3.1.0.tgz"; + path = fetchurl { + name = "string_width___string_width_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz"; + sha1 = "22767be21b62af1081574306f69ac51b62203961"; + }; + } + { + name = "string_width___string_width_4.2.2.tgz"; + path = fetchurl { + name = "string_width___string_width_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz"; + sha1 = "dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"; + }; + } + { + name = "string.prototype.trimend___string.prototype.trimend_1.0.4.tgz"; + path = fetchurl { + name = "string.prototype.trimend___string.prototype.trimend_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz"; + sha1 = "e75ae90c2942c63504686c18b287b4a0b1a45f80"; + }; + } + { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.4.tgz"; + path = fetchurl { + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz"; + sha1 = "b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"; + }; + } + { + name = "string_decoder___string_decoder_1.3.0.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; + sha1 = "42f114594a46cf1a8e30b0a84f56c78c3edac21e"; + }; + } + { + name = "string_decoder___string_decoder_0.10.31.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_0.10.31.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + } + { + name = "string_decoder___string_decoder_1.1.1.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; + sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + }; + } + { + name = "stringify_object___stringify_object_3.3.0.tgz"; + path = fetchurl { + name = "stringify_object___stringify_object_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz"; + sha1 = "703065aefca19300d3ce88af4f5b3956d7556629"; + }; + } + { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + } + { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; + sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + }; + } + { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz"; + sha1 = "8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"; + }; + } + { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; + }; + } + { + name = "strip_ansi___strip_ansi_7.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.0.tgz"; + sha1 = "1dc49b980c3a4100366617adac59327eefdefcb0"; + }; + } + { + name = "strip_bom___strip_bom_3.0.0.tgz"; + path = fetchurl { + name = "strip_bom___strip_bom_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz"; + sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + }; + } + { + name = "strip_eof___strip_eof_1.0.0.tgz"; + path = fetchurl { + name = "strip_eof___strip_eof_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz"; + sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + }; + } + { + name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; + path = fetchurl { + name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; + sha1 = "89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"; + }; + } + { + name = "strip_indent___strip_indent_3.0.0.tgz"; + path = fetchurl { + name = "strip_indent___strip_indent_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz"; + sha1 = "c32e1cee940b6b3432c771bc2c54bcce73cd3001"; + }; + } + { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha1 = "31f1281b3832630434831c310c01cccda8cbe006"; + }; + } + { + name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + } + { + name = "style_loader___style_loader_3.2.1.tgz"; + path = fetchurl { + name = "style_loader___style_loader_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/style-loader/-/style-loader-3.2.1.tgz"; + sha1 = "63cb920ec145c8669e9a50e92961452a1ef5dcde"; + }; + } + { + name = "supports_color___supports_color_2.0.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + } + { + name = "supports_color___supports_color_5.5.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_5.5.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; + sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; + }; + } + { + name = "supports_color___supports_color_7.2.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; + sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; + }; + } + { + name = "supports_color___supports_color_8.1.1.tgz"; + path = fetchurl { + name = "supports_color___supports_color_8.1.1.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz"; + sha1 = "cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"; + }; + } + { + name = "table___table_6.7.1.tgz"; + path = fetchurl { + name = "table___table_6.7.1.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz"; + sha1 = "ee05592b7143831a8c94f3cee6aae4c1ccef33e2"; + }; + } + { + name = "tapable___tapable_2.2.0.tgz"; + path = fetchurl { + name = "tapable___tapable_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz"; + sha1 = "5c373d281d9c672848213d0e037d1c4165ab426b"; + }; + } + { + name = "tar___tar_2.2.2.tgz"; + path = fetchurl { + name = "tar___tar_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz"; + sha1 = "0ca8848562c7299b8b446ff6a4d60cdbb23edc40"; + }; + } + { + name = "tar___tar_4.4.19.tgz"; + path = fetchurl { + name = "tar___tar_4.4.19.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz"; + sha1 = "2e4d7263df26f2b914dee10c825ab132123742f3"; + }; + } + { + name = "tar___tar_6.1.10.tgz"; + path = fetchurl { + name = "tar___tar_6.1.10.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.1.10.tgz"; + sha1 = "8a320a74475fba54398fa136cd9883aa8ad11175"; + }; + } + { + name = "term_size___term_size_1.2.0.tgz"; + path = fetchurl { + name = "term_size___term_size_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz"; + sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; + }; + } + { + name = "terser_webpack_plugin___terser_webpack_plugin_5.1.4.tgz"; + path = fetchurl { + name = "terser_webpack_plugin___terser_webpack_plugin_5.1.4.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.1.4.tgz"; + sha1 = "c369cf8a47aa9922bd0d8a94fe3d3da11a7678a1"; + }; + } + { + name = "terser___terser_5.7.1.tgz"; + path = fetchurl { + name = "terser___terser_5.7.1.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-5.7.1.tgz"; + sha1 = "2dc7a61009b66bb638305cb2a824763b116bf784"; + }; + } + { + name = "text_table___text_table_0.2.0.tgz"; + path = fetchurl { + name = "text_table___text_table_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + }; + } + { + name = "through2___through2_2.0.5.tgz"; + path = fetchurl { + name = "through2___through2_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz"; + sha1 = "01c1e39eb31d07cb7d03a96a70823260b23132cd"; + }; + } + { + name = "through___through_2.3.8.tgz"; + path = fetchurl { + name = "through___through_2.3.8.tgz"; + url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + } + { + name = "thunky___thunky_1.1.0.tgz"; + path = fetchurl { + name = "thunky___thunky_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz"; + sha1 = "5abaf714a9405db0504732bbccd2cedd9ef9537d"; + }; + } + { + name = "timed_out___timed_out_4.0.1.tgz"; + path = fetchurl { + name = "timed_out___timed_out_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz"; + sha1 = "f32eacac5a175bea25d7fab565ab3ed8741ef56f"; + }; + } + { + name = "tiny_invariant___tiny_invariant_1.1.0.tgz"; + path = fetchurl { + name = "tiny_invariant___tiny_invariant_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz"; + sha1 = "634c5f8efdc27714b7f386c35e6760991d230875"; + }; + } + { + name = "tiny_relative_date___tiny_relative_date_1.3.0.tgz"; + path = fetchurl { + name = "tiny_relative_date___tiny_relative_date_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz"; + sha1 = "fa08aad501ed730f31cc043181d995c39a935e07"; + }; + } + { + name = "tiny_warning___tiny_warning_1.0.3.tgz"; + path = fetchurl { + name = "tiny_warning___tiny_warning_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz"; + sha1 = "94a30db453df4c643d0fd566060d60a875d84754"; + }; + } + { + name = "tippy.js___tippy.js_6.3.1.tgz"; + path = fetchurl { + name = "tippy.js___tippy.js_6.3.1.tgz"; + url = "https://registry.yarnpkg.com/tippy.js/-/tippy.js-6.3.1.tgz"; + sha1 = "3788a007be7015eee0fd589a66b98fb3f8f10181"; + }; + } + { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + path = fetchurl { + name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + }; + } + { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + path = fetchurl { + name = "to_regex_range___to_regex_range_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha1 = "1648c44aae7c8d988a326018ed72f5b4dd0392e4"; + }; + } + { + name = "toastify_js___toastify_js_1.11.1.tgz"; + path = fetchurl { + name = "toastify_js___toastify_js_1.11.1.tgz"; + url = "https://registry.yarnpkg.com/toastify-js/-/toastify-js-1.11.1.tgz"; + sha1 = "023a4ce64ecdead1d6d170072b62bd345088c427"; + }; + } + { + name = "toidentifier___toidentifier_1.0.0.tgz"; + path = fetchurl { + name = "toidentifier___toidentifier_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz"; + sha1 = "7e1be3470f1e77948bc43d94a3c8f4d7752ba553"; + }; + } + { + name = "tough_cookie___tough_cookie_2.5.0.tgz"; + path = fetchurl { + name = "tough_cookie___tough_cookie_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz"; + sha1 = "cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"; + }; + } + { + name = "tributejs___tributejs_5.1.3.tgz"; + path = fetchurl { + name = "tributejs___tributejs_5.1.3.tgz"; + url = "https://registry.yarnpkg.com/tributejs/-/tributejs-5.1.3.tgz"; + sha1 = "980600fc72865be5868893078b4bfde721129eae"; + }; + } + { + name = "trim_newlines___trim_newlines_3.0.1.tgz"; + path = fetchurl { + name = "trim_newlines___trim_newlines_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz"; + sha1 = "260a5d962d8b752425b32f3a7db0dcacd176c144"; + }; + } + { + name = "true_case_path___true_case_path_1.0.3.tgz"; + path = fetchurl { + name = "true_case_path___true_case_path_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz"; + sha1 = "f813b5a8c86b40da59606722b144e3225799f47d"; + }; + } + { + name = "tslib___tslib_1.14.1.tgz"; + path = fetchurl { + name = "tslib___tslib_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz"; + sha1 = "cf2d38bdc34a134bcaf1091c41f6619e2f672d00"; + }; + } + { + name = "tslib___tslib_2.1.0.tgz"; + path = fetchurl { + name = "tslib___tslib_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz"; + sha1 = "da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"; + }; + } + { + name = "tsutils___tsutils_3.21.0.tgz"; + path = fetchurl { + name = "tsutils___tsutils_3.21.0.tgz"; + url = "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz"; + sha1 = "b48717d394cea6c1e096983eed58e9d61715b623"; + }; + } + { + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + path = fetchurl { + name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; + sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + }; + } + { + name = "tweetnacl___tweetnacl_0.14.5.tgz"; + path = fetchurl { + name = "tweetnacl___tweetnacl_0.14.5.tgz"; + url = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz"; + sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + }; + } + { + name = "type_check___type_check_0.4.0.tgz"; + path = fetchurl { + name = "type_check___type_check_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz"; + sha1 = "07b8203bfa7056c0657050e3ccd2c37730bab8f1"; + }; + } + { + name = "type_fest___type_fest_0.18.1.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.18.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz"; + sha1 = "db4bc151a4a2cf4eebf9add5db75508db6cc841f"; + }; + } + { + name = "type_fest___type_fest_0.20.2.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.20.2.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; + sha1 = "1bf207f4b28f91583666cb5fbd327887301cd5f4"; + }; + } + { + name = "type_fest___type_fest_0.21.3.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.21.3.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz"; + sha1 = "d260a24b0198436e133fa26a524a6d65fa3b2e37"; + }; + } + { + name = "type_fest___type_fest_0.6.0.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz"; + sha1 = "8d2a2370d3df886eb5c90ada1c5bf6188acf838b"; + }; + } + { + name = "type_fest___type_fest_0.8.1.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.8.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; + sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d"; + }; + } + { + name = "type_is___type_is_1.6.18.tgz"; + path = fetchurl { + name = "type_is___type_is_1.6.18.tgz"; + url = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz"; + sha1 = "4e552cd05df09467dcbc4ef739de89f2cf37c131"; + }; + } + { + name = "typedarray___typedarray_0.0.6.tgz"; + path = fetchurl { + name = "typedarray___typedarray_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + } + { + name = "typescript___typescript_3.9.10.tgz"; + path = fetchurl { + name = "typescript___typescript_3.9.10.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz"; + sha1 = "70f3910ac7a51ed6bef79da7800690b19bf778b8"; + }; + } + { + name = "typescript___typescript_4.3.5.tgz"; + path = fetchurl { + name = "typescript___typescript_4.3.5.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz"; + sha1 = "4d1c37cc16e893973c45a06886b7113234f119f4"; + }; + } + { + name = "uc.micro___uc.micro_1.0.6.tgz"; + path = fetchurl { + name = "uc.micro___uc.micro_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz"; + sha1 = "9c411a802a409a91fc6cf74081baba34b24499ac"; + }; + } + { + name = "uid_number___uid_number_0.0.6.tgz"; + path = fetchurl { + name = "uid_number___uid_number_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz"; + sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81"; + }; + } + { + name = "umask___umask_1.1.0.tgz"; + path = fetchurl { + name = "umask___umask_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz"; + sha1 = "f29cebf01df517912bb58ff9c4e50fde8e33320d"; + }; + } + { + name = "unbox_primitive___unbox_primitive_1.0.1.tgz"; + path = fetchurl { + name = "unbox_primitive___unbox_primitive_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz"; + sha1 = "085e215625ec3162574dc8859abee78a59b14471"; + }; + } + { + name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; + path = fetchurl { + name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"; + sha1 = "2619800c4c825800efdd8343af7dd9933cbe2818"; + }; + } + { + name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz"; + path = fetchurl { + name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"; + sha1 = "8ed2a32569961bce9227d09cd3ffbb8fed5f020c"; + }; + } + { + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; + path = fetchurl { + name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"; + sha1 = "0d91f600eeeb3096aa962b1d6fc88876e64ea531"; + }; + } + { + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; + path = fetchurl { + name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"; + sha1 = "dd57a99f6207bedff4628abefb94c50db941c8f4"; + }; + } + { + name = "unique_filename___unique_filename_1.1.1.tgz"; + path = fetchurl { + name = "unique_filename___unique_filename_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz"; + sha1 = "1d69769369ada0583103a1e6ae87681b56573230"; + }; + } + { + name = "unique_slug___unique_slug_2.0.2.tgz"; + path = fetchurl { + name = "unique_slug___unique_slug_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz"; + sha1 = "baabce91083fc64e945b0f3ad613e264f7cd4e6c"; + }; + } + { + name = "unique_string___unique_string_1.0.0.tgz"; + path = fetchurl { + name = "unique_string___unique_string_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz"; + sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; + }; + } + { + name = "unpipe___unpipe_1.0.0.tgz"; + path = fetchurl { + name = "unpipe___unpipe_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + } + { + name = "unzip_response___unzip_response_2.0.1.tgz"; + path = fetchurl { + name = "unzip_response___unzip_response_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz"; + sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; + }; + } + { + name = "update_notifier___update_notifier_2.5.0.tgz"; + path = fetchurl { + name = "update_notifier___update_notifier_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz"; + sha1 = "d0744593e13f161e406acb1d9408b72cad08aff6"; + }; + } + { + name = "uri_js___uri_js_4.4.1.tgz"; + path = fetchurl { + name = "uri_js___uri_js_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; + sha1 = "9b1a52595225859e55f669d928f88c6c57f2a77e"; + }; + } + { + name = "url_parse_lax___url_parse_lax_1.0.0.tgz"; + path = fetchurl { + name = "url_parse_lax___url_parse_lax_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; + sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; + }; + } + { + name = "url___url_0.11.0.tgz"; + path = fetchurl { + name = "url___url_0.11.0.tgz"; + url = "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz"; + sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; + }; + } + { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + path = fetchurl { + name = "util_deprecate___util_deprecate_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + } + { + name = "util_extend___util_extend_1.0.3.tgz"; + path = fetchurl { + name = "util_extend___util_extend_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz"; + sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f"; + }; + } + { + name = "util_promisify___util_promisify_2.1.0.tgz"; + path = fetchurl { + name = "util_promisify___util_promisify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/util-promisify/-/util-promisify-2.1.0.tgz"; + sha1 = "3c2236476c4d32c5ff3c47002add7c13b9a82a53"; + }; + } + { + name = "utils_merge___utils_merge_1.0.1.tgz"; + path = fetchurl { + name = "utils_merge___utils_merge_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + } + { + name = "uuid___uuid_3.4.0.tgz"; + path = fetchurl { + name = "uuid___uuid_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; + sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee"; + }; + } + { + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + path = fetchurl { + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha1 = "2de19618c66dc247dcfb6f99338035d8245a2cee"; + }; + } + { + name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; + path = fetchurl { + name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; + sha1 = "fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"; + }; + } + { + name = "validate_npm_package_name___validate_npm_package_name_3.0.0.tgz"; + path = fetchurl { + name = "validate_npm_package_name___validate_npm_package_name_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz"; + sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e"; + }; + } + { + name = "value_equal___value_equal_1.0.1.tgz"; + path = fetchurl { + name = "value_equal___value_equal_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz"; + sha1 = "1e0b794c734c5c0cade179c437d356d931a34d6c"; + }; + } + { + name = "vary___vary_1.1.2.tgz"; + path = fetchurl { + name = "vary___vary_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + } + { + name = "verror___verror_1.10.0.tgz"; + path = fetchurl { + name = "verror___verror_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz"; + sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + }; + } + { + name = "void_elements___void_elements_2.0.1.tgz"; + path = fetchurl { + name = "void_elements___void_elements_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz"; + sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; + }; + } + { + name = "watchpack___watchpack_2.2.0.tgz"; + path = fetchurl { + name = "watchpack___watchpack_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/watchpack/-/watchpack-2.2.0.tgz"; + sha1 = "47d78f5415fe550ecd740f99fe2882323a58b1ce"; + }; + } + { + name = "wbuf___wbuf_1.7.3.tgz"; + path = fetchurl { + name = "wbuf___wbuf_1.7.3.tgz"; + url = "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz"; + sha1 = "c1d8d149316d3ea852848895cb6a0bfe887b87df"; + }; + } + { + name = "wcwidth___wcwidth_1.0.1.tgz"; + path = fetchurl { + name = "wcwidth___wcwidth_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz"; + sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; + }; + } + { + name = "webpack_cli___webpack_cli_4.8.0.tgz"; + path = fetchurl { + name = "webpack_cli___webpack_cli_4.8.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.8.0.tgz"; + sha1 = "5fc3c8b9401d3c8a43e2afceacfa8261962338d1"; + }; + } + { + name = "webpack_dev_middleware___webpack_dev_middleware_5.0.0.tgz"; + path = fetchurl { + name = "webpack_dev_middleware___webpack_dev_middleware_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.0.0.tgz"; + sha1 = "0abe825275720e0a339978aea5f0b03b140c1584"; + }; + } + { + name = "webpack_dev_server___webpack_dev_server_4.0.0.tgz"; + path = fetchurl { + name = "webpack_dev_server___webpack_dev_server_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.0.0.tgz"; + sha1 = "fb4906e91182154bba54a66e6e06f84c1e3c0a80"; + }; + } + { + name = "webpack_merge___webpack_merge_5.8.0.tgz"; + path = fetchurl { + name = "webpack_merge___webpack_merge_5.8.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz"; + sha1 = "2b39dbf22af87776ad744c390223731d30a68f61"; + }; + } + { + name = "webpack_node_externals___webpack_node_externals_3.0.0.tgz"; + path = fetchurl { + name = "webpack_node_externals___webpack_node_externals_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-3.0.0.tgz"; + sha1 = "1a3407c158d547a9feb4229a9e3385b7b60c9917"; + }; + } + { + name = "webpack_sources___webpack_sources_3.2.0.tgz"; + path = fetchurl { + name = "webpack_sources___webpack_sources_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.0.tgz"; + sha1 = "b16973bcf844ebcdb3afde32eda1c04d0b90f89d"; + }; + } + { + name = "webpack___webpack_5.51.1.tgz"; + path = fetchurl { + name = "webpack___webpack_5.51.1.tgz"; + url = "https://registry.yarnpkg.com/webpack/-/webpack-5.51.1.tgz"; + sha1 = "41bebf38dccab9a89487b16dbe95c22e147aac57"; + }; + } + { + name = "websocket_driver___websocket_driver_0.7.4.tgz"; + path = fetchurl { + name = "websocket_driver___websocket_driver_0.7.4.tgz"; + url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz"; + sha1 = "89ad5295bbf64b480abcba31e4953aca706f5760"; + }; + } + { + name = "websocket_extensions___websocket_extensions_0.1.4.tgz"; + path = fetchurl { + name = "websocket_extensions___websocket_extensions_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz"; + sha1 = "7f8473bc839dfd87608adb95d7eb075211578a42"; + }; + } + { + name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; + path = fetchurl { + name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; + sha1 = "13757bc89b209b049fe5d86430e21cf40a89a8e6"; + }; + } + { + name = "which_module___which_module_2.0.0.tgz"; + path = fetchurl { + name = "which_module___which_module_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz"; + sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + }; + } + { + name = "which___which_1.3.1.tgz"; + path = fetchurl { + name = "which___which_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; + sha1 = "a45043d54f5805316da8d62f9f50918d3da70b0a"; + }; + } + { + name = "which___which_2.0.2.tgz"; + path = fetchurl { + name = "which___which_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; + sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; + }; + } + { + name = "wide_align___wide_align_1.1.3.tgz"; + path = fetchurl { + name = "wide_align___wide_align_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz"; + sha1 = "ae074e6bdc0c14a431e804e624549c633b000457"; + }; + } + { + name = "widest_line___widest_line_2.0.1.tgz"; + path = fetchurl { + name = "widest_line___widest_line_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz"; + sha1 = "7438764730ec7ef4381ce4df82fb98a53142a3fc"; + }; + } + { + name = "wildcard___wildcard_2.0.0.tgz"; + path = fetchurl { + name = "wildcard___wildcard_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz"; + sha1 = "a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"; + }; + } + { + name = "word_wrap___word_wrap_1.2.3.tgz"; + path = fetchurl { + name = "word_wrap___word_wrap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; + sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; + }; + } + { + name = "worker_farm___worker_farm_1.7.0.tgz"; + path = fetchurl { + name = "worker_farm___worker_farm_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz"; + sha1 = "26a94c5391bbca926152002f69b84a4bf772e5a8"; + }; + } + { + name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; + sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; + }; + } + { + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; + sha1 = "1fd1f67235d5b6d0fee781056001bfb694c03b09"; + }; + } + { + name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; + sha1 = "e9393ba07102e6c91a3b221478f0257cd2856e53"; + }; + } + { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + path = fetchurl { + name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha1 = "67e145cff510a6a6984bdf1152911d69d2eb9e43"; + }; + } + { + name = "wrappy___wrappy_1.0.2.tgz"; + path = fetchurl { + name = "wrappy___wrappy_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + } + { + name = "write_file_atomic___write_file_atomic_2.4.3.tgz"; + path = fetchurl { + name = "write_file_atomic___write_file_atomic_2.4.3.tgz"; + url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.3.tgz"; + sha1 = "1fd2e9ae1df3e75b8d8c367443c692d4ca81f481"; + }; + } + { + name = "ws___ws_8.2.0.tgz"; + path = fetchurl { + name = "ws___ws_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-8.2.0.tgz"; + sha1 = "0b738cd484bfc9303421914b11bb4011e07615bb"; + }; + } + { + name = "xdg_basedir___xdg_basedir_3.0.0.tgz"; + path = fetchurl { + name = "xdg_basedir___xdg_basedir_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz"; + sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4"; + }; + } + { + name = "xtend___xtend_4.0.2.tgz"; + path = fetchurl { + name = "xtend___xtend_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz"; + sha1 = "bb72779f5fa465186b1f438f674fa347fdb5db54"; + }; + } + { + name = "y18n___y18n_3.2.2.tgz"; + path = fetchurl { + name = "y18n___y18n_3.2.2.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz"; + sha1 = "85c901bd6470ce71fc4bb723ad209b70f7f28696"; + }; + } + { + name = "y18n___y18n_4.0.3.tgz"; + path = fetchurl { + name = "y18n___y18n_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz"; + sha1 = "b5f259c82cd6e336921efd7bfd8bf560de9eeedf"; + }; + } + { + name = "yallist___yallist_2.1.2.tgz"; + path = fetchurl { + name = "yallist___yallist_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz"; + sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + }; + } + { + name = "yallist___yallist_3.1.1.tgz"; + path = fetchurl { + name = "yallist___yallist_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz"; + sha1 = "dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"; + }; + } + { + name = "yallist___yallist_4.0.0.tgz"; + path = fetchurl { + name = "yallist___yallist_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; + sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + }; + } + { + name = "yaml___yaml_1.10.2.tgz"; + path = fetchurl { + name = "yaml___yaml_1.10.2.tgz"; + url = "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz"; + sha1 = "2301c5ffbf12b467de8da2333a459e29e7920e4b"; + }; + } + { + name = "yargs_parser___yargs_parser_13.1.2.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_13.1.2.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz"; + sha1 = "130f09702ebaeef2650d54ce6e3e5706f7a4fb38"; + }; + } + { + name = "yargs_parser___yargs_parser_15.0.3.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_15.0.3.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.3.tgz"; + sha1 = "316e263d5febe8b38eef61ac092b33dfcc9b1115"; + }; + } + { + name = "yargs_parser___yargs_parser_20.2.9.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_20.2.9.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz"; + sha1 = "2eb7dc3b0289718fc295f362753845c41a0c94ee"; + }; + } + { + name = "yargs_parser___yargs_parser_7.0.0.tgz"; + path = fetchurl { + name = "yargs_parser___yargs_parser_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz"; + sha1 = "8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"; + }; + } + { + name = "yargs___yargs_13.3.2.tgz"; + path = fetchurl { + name = "yargs___yargs_13.3.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz"; + sha1 = "ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"; + }; + } + { + name = "yargs___yargs_14.2.3.tgz"; + path = fetchurl { + name = "yargs___yargs_14.2.3.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-14.2.3.tgz"; + sha1 = "1a1c3edced1afb2a2fea33604bc6d1d8d688a414"; + }; + } + { + name = "yargs___yargs_8.0.2.tgz"; + path = fetchurl { + name = "yargs___yargs_8.0.2.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-8.0.2.tgz"; + sha1 = "6299a9055b1cefc969ff7e79c1d918dceb22c360"; + }; + } + { + name = "yocto_queue___yocto_queue_0.1.0.tgz"; + path = fetchurl { + name = "yocto_queue___yocto_queue_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz"; + sha1 = "0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"; + }; + } + ]; +} diff --git a/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix b/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix index 41eb08ae75bf..a06fdd4d4e98 100644 --- a/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix +++ b/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.8"; + version = "5.8.1"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-0pgTq1U2Exj1GfKo+mYxEmoKj5GsMPYstgAsEIV36H8="; + sha256 = "sha256-kMqQxK+jfa3IpHQ7XLERsgzaX5g84HPCwL69zmT6gio="; }; installPhase = '' diff --git a/nixpkgs/pkgs/servers/wsdd/default.nix b/nixpkgs/pkgs/servers/wsdd/default.nix index f1a385c6809d..07c26872f3fb 100644 --- a/nixpkgs/pkgs/servers/wsdd/default.nix +++ b/nixpkgs/pkgs/servers/wsdd/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, nixosTests, python3, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, nixosTests, python3 }: stdenv.mkDerivation rec { pname = "wsdd"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "christgau"; repo = pname; rev = "v${version}"; - sha256 = "0444xh1r5wd0zfch1hg1f9s4cw68srrm87hqx16qvlgx6jmz5j0p"; + sha256 = "0lfvpbk1lkri597ac4gz5x4csfyik8axz4b41i03xsqv9bci2vh6"; }; nativeBuildInputs = [ makeWrapper ]; @@ -16,12 +16,9 @@ stdenv.mkDerivation rec { buildInputs = [ python3 ]; patches = [ - (fetchpatch { - # https://github.com/christgau/wsdd/issues/72 - name = "fix_send_messages_using_correct_socket.patch"; - url = "https://github.com/christgau/wsdd/commit/1ed74fe73a9fe2e2720859e2822116d65e4ffa5b.patch"; - sha256 = "1n9bqvh20nhnvnc5pxvzf9kk8nky6rmbmfryg65lfmr1hmg676zg"; - }) + # Increase timeout to socket urlopen + # See https://github.com/christgau/wsdd/issues/80#issuecomment-76848906 + ./increase_timeout.patch ]; installPhase = '' diff --git a/nixpkgs/pkgs/servers/wsdd/increase_timeout.patch b/nixpkgs/pkgs/servers/wsdd/increase_timeout.patch new file mode 100644 index 000000000000..ac619f705d8e --- /dev/null +++ b/nixpkgs/pkgs/servers/wsdd/increase_timeout.patch @@ -0,0 +1,13 @@ +diff --git a/src/wsdd.py b/src/wsdd.py +index 88a7a2a..360e4f7 100755 +--- a/src/wsdd.py ++++ b/src/wsdd.py +@@ -699,7 +699,7 @@ class WSDClient(WSDUDPMessageHandler): + request.add_header('Host', host) + + try: +- with urllib.request.urlopen(request, None, 2.0) as stream: ++ with urllib.request.urlopen(request, None, 5.0) as stream: + self.handle_metadata(stream.read(), endpoint, xaddr) + except urllib.error.URLError as e: + logger.warning('could not fetch metadata from: {} {}'.format(url, e)) diff --git a/nixpkgs/pkgs/servers/x11/xorg/default.nix b/nixpkgs/pkgs/servers/x11/xorg/default.nix index 81f813aae9c7..1223b0a50739 100644 --- a/nixpkgs/pkgs/servers/x11/xorg/default.nix +++ b/nixpkgs/pkgs/servers/x11/xorg/default.nix @@ -1002,11 +1002,11 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXfont2 = callPackage ({ stdenv, pkg-config, fetchurl, libfontenc, xorgproto, freetype, xtrans, zlib }: stdenv.mkDerivation { pname = "libXfont2"; - version = "2.0.4"; + version = "2.0.5"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXfont2-2.0.4.tar.bz2"; - sha256 = "1rk9pjxcm01lbr1dxhnvk4f2qrn6zp068qjbvvz5w0z5d0rin5bd"; + url = "mirror://xorg/individual/lib/libXfont2-2.0.5.tar.bz2"; + sha256 = "0gmm20p3qq23pd2bhc5rsxil60wqvj9xi7l1nh55q8gp3hhnyz5a"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; @@ -1017,11 +1017,11 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! libXft = callPackage ({ stdenv, pkg-config, fetchurl, fontconfig, freetype, libX11, xorgproto, libXrender }: stdenv.mkDerivation { pname = "libXft"; - version = "2.3.3"; + version = "2.3.4"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2"; - sha256 = "05lja9s54090xwh31r0bqms4v3pimng5xr09g2rdnafx2vk6hp12"; + url = "mirror://xorg/individual/lib/libXft-2.3.4.tar.bz2"; + sha256 = "1pdbr6gzfvixc791pjf42i9gg8wvfq6cpq6sdca04h4i42mxmpjp"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; @@ -3057,11 +3057,11 @@ lib.makeScope newScope (self: with self; { # THIS IS A GENERATED FILE. DO NOT EDIT! xorgcffiles = callPackage ({ stdenv, pkg-config, fetchurl }: stdenv.mkDerivation { pname = "xorg-cf-files"; - version = "1.0.6"; + version = "1.0.7"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2"; - sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd"; + url = "mirror://xorg/individual/util/xorg-cf-files-1.0.7.tar.bz2"; + sha256 = "0233jyjxjkhlar03vp8l5sm3iq6354izm3crk41h5291pgap39vl"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/servers/x11/xorg/imake.patch b/nixpkgs/pkgs/servers/x11/xorg/imake.patch index 1d0ec88761d4..e8ce66cdee00 100644 --- a/nixpkgs/pkgs/servers/x11/xorg/imake.patch +++ b/nixpkgs/pkgs/servers/x11/xorg/imake.patch @@ -1,31 +1,35 @@ -diff -Naur imake-1.0.7-orig/imake.c imake-1.0.7/imake.c ---- imake-1.0.7-orig/imake.c 2013-08-17 10:11:50.000000000 +0000 -+++ imake-1.0.7/imake.c 2015-02-04 09:41:59.000000000 +0000 -@@ -1045,6 +1045,7 @@ - static void - get_distrib(FILE *inFile) - { -+#if 0 - struct stat sb; +Disable imake autodetection for: +- LinuxDistribution to avoid injection of /usr paths +- gcc to avoid use uf /usr/bin/gcc + +https://github.com/NixOS/nixpkgs/issues/135337 +--- a/imake.c ++++ b/imake.c +@@ -1065,6 +1065,7 @@ get_distrib(FILE *inFile) + fprintf (inFile, "%s\n", "#define LinuxWare 11"); + fprintf (inFile, "%s\n", "#define LinuxYggdrasil 12"); - static const char* suse = "/etc/SuSE-release"; -@@ -1090,6 +1091,7 @@ ++#if 0 /* disable system autodetection. Fall through to LinuxUnknown. */ + # ifdef CROSSCOMPILE + if (CrossCompiling) { + fprintf (inFile, "%s\n", +@@ -1090,6 +1091,7 @@ get_distrib(FILE *inFile) * at the content of /etc/debian_version */ return; } -+#endif ++#endif /* what's the definitive way to tell what any particular distribution is? */ fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown"); -@@ -1337,6 +1339,7 @@ +@@ -1337,6 +1339,7 @@ get_gcc_version(FILE *inFile, char *name) static boolean get_gcc(char *cmd) { -+#if 0 ++#if 0 /* disable gcc autodetection. Fall through to explicitly set. */ struct stat sb; static const char* gcc_path[] = { #if defined(linux) || \ -@@ -1385,6 +1388,9 @@ +@@ -1385,6 +1388,9 @@ get_gcc(char *cmd) } } return FALSE; diff --git a/nixpkgs/pkgs/servers/x11/xorg/overrides.nix b/nixpkgs/pkgs/servers/x11/xorg/overrides.nix index ec43ae9d59d4..9b119aa71013 100644 --- a/nixpkgs/pkgs/servers/x11/xorg/overrides.nix +++ b/nixpkgs/pkgs/servers/x11/xorg/overrides.nix @@ -200,11 +200,19 @@ self: super: ++ malloc0ReturnsNullCrossFlag; patches = [ - # Adds color emoji rendering support. + # The following three patches add color emoji rendering support. # https://gitlab.freedesktop.org/xorg/lib/libxft/merge_requests/1 (fetchpatch { - url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/fe41537b5714a2301808eed2d76b2e7631176573.patch"; - sha256 = "045lp1q50i2wlwvpsq6ycxdc6p3asm2r3bk2nbad1dwkqw2xf9jc"; + url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/723092ece088559f1af299236305911f4ee4d450.patch"; + sha256 = "1y5s6x5b7n2rqxapdx65zlcz35s7i7075qxkfnj859hx7k5ybx53"; + }) + (fetchpatch { + url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/e0fc4ce7e87ab9c4b47e5c8e693f070dfd0d2f7b.patch"; + sha256 = "1x7cbhdrprrmngyy3l3b45bz6717dzp881687h5hxa4g2bg5c764"; + }) + (fetchpatch { + url = "https://gitlab.freedesktop.org/xorg/lib/libxft/commit/d385aa3e5320d18918413df0e8aef3a713a47e0b.patch"; + sha256 = "1acnks2g88hari2708x93ywa9m2f4lm60yhn9va45151ma2qb5n0"; }) ]; @@ -367,35 +375,35 @@ self: super: xf86inputevdev = super.xf86inputevdev.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; # to get rid of xorgserver.dev; man is tiny preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c"; - installFlags = [ - "sdkdir=${placeholder "out"}/include/xorg" + configureFlags = [ + "--with-sdkdir=${placeholder "dev"}/include/xorg" ]; }); xf86inputmouse = super.xf86inputmouse.overrideAttrs (attrs: { - installFlags = [ - "sdkdir=${placeholder "out"}/include/xorg" + configureFlags = [ + "--with-sdkdir=${placeholder "out"}/include/xorg" ]; }); xf86inputjoystick = super.xf86inputjoystick.overrideAttrs (attrs: { - installFlags = [ - "sdkdir=${placeholder "out"}/include/xorg" + configureFlags = [ + "--with-sdkdir=${placeholder "out"}/include/xorg" ]; }); xf86inputlibinput = super.xf86inputlibinput.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; - installFlags = [ - "sdkdir=${placeholder "dev"}/include/xorg" + configureFlags = [ + "--with-sdkdir=${placeholder "dev"}/include/xorg" ]; }); xf86inputsynaptics = super.xf86inputsynaptics.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; # *.pc pulls xorgserver.dev - installFlags = [ - "sdkdir=${placeholder "out"}/include/xorg" - "configdir=${placeholder "out"}/share/X11/xorg.conf.d" + configureFlags = [ + "--with-sdkdir=${placeholder "dev"}/include/xorg" + "--with-xorg-conf-dir=${placeholder "out"}/share/X11/xorg.conf.d" ]; }); diff --git a/nixpkgs/pkgs/servers/x11/xorg/tarballs.list b/nixpkgs/pkgs/servers/x11/xorg/tarballs.list index 0f6ab40ed906..b24dc504288e 100644 --- a/nixpkgs/pkgs/servers/x11/xorg/tarballs.list +++ b/nixpkgs/pkgs/servers/x11/xorg/tarballs.list @@ -187,8 +187,8 @@ mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2 mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2 mirror://xorg/individual/lib/libXfixes-6.0.0.tar.bz2 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2 -mirror://xorg/individual/lib/libXfont2-2.0.4.tar.bz2 -mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2 +mirror://xorg/individual/lib/libXfont2-2.0.5.tar.bz2 +mirror://xorg/individual/lib/libXft-2.3.4.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2 mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2 @@ -217,5 +217,5 @@ mirror://xorg/individual/util/imake-1.0.8.tar.bz2 mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2 mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2 -mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2 +mirror://xorg/individual/util/xorg-cf-files-1.0.7.tar.bz2 mirror://xorg/individual/xserver/xorg-server-1.20.13.tar.xz diff --git a/nixpkgs/pkgs/servers/xandikos/default.nix b/nixpkgs/pkgs/servers/xandikos/default.nix index acf96d008f7a..4c8ad7f89b7e 100644 --- a/nixpkgs/pkgs/servers/xandikos/default.nix +++ b/nixpkgs/pkgs/servers/xandikos/default.nix @@ -27,6 +27,14 @@ python3Packages.buildPythonApplication rec { passthru.tests.xandikos = nixosTests.xandikos; + checkInputs = with python3Packages; [ pytestCheckHook ]; + disabledTests = [ + # these tests are failing due to the following error: + # TypeError: expected str, bytes or os.PathLike object, not int + "test_iter_with_etag" + "test_iter_with_etag_missing_uid" + ]; + meta = with lib; { description = "Lightweight CalDAV/CardDAV server"; homepage = "https://github.com/jelmer/xandikos"; diff --git a/nixpkgs/pkgs/shells/dash/0001-fix-dirent64-et-al-on-darwin.patch b/nixpkgs/pkgs/shells/dash/0001-fix-dirent64-et-al-on-darwin.patch deleted file mode 100644 index f2e0802f7981..000000000000 --- a/nixpkgs/pkgs/shells/dash/0001-fix-dirent64-et-al-on-darwin.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7e75779eaeacdbb46a387a59d9aaf1481a1da3e5 Mon Sep 17 00:00:00 2001 -From: Adrian Gierakowski <agierakowski@gmail.com> -Date: Sun, 19 Jul 2020 08:38:05 +0100 -Subject: [PATCH] fix dirent64 et al on darwin - ---- - configure.ac | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/configure.ac b/configure.ac -index b8faca9..cee1e4d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -139,6 +139,7 @@ if test "$ac_cv_func_signal" != yes; then - [klibc has bsd_signal instead of signal])]) - fi - -+dnl TODO: stat64 is deprecated since macOS 10.6 - dnl Check for stat64 (dietlibc/klibc). - AC_CHECK_FUNC(stat64,, [ - AC_DEFINE(fstat64, fstat, [64-bit operations are the same as 32-bit]) -@@ -155,6 +156,16 @@ AC_CHECK_FUNC(open64,, [ - AC_DEFINE(open64, open, [64-bit operations are the same as 32-bit]) - ]) - -+dnl OS X apparently has stat64 but not readdir64. -+AC_CHECK_FUNC(readdir64,, [ -+ AC_DEFINE(readdir64, readdir, [64-bit operations are the same as 32-bit]) -+]) -+ -+dnl OS X apparently has stat64 but not dirent64. -+AC_CHECK_TYPE(struct dirent64,, [ -+ AC_DEFINE(dirent64, dirent, [64-bit operations are the same as 32-bit]) -+],[#include <dirent.h>]) -+ - dnl Check if struct stat has st_mtim. - AC_MSG_CHECKING(for stat::st_mtim) - AC_COMPILE_IFELSE( --- -2.15.1 - diff --git a/nixpkgs/pkgs/shells/dash/default.nix b/nixpkgs/pkgs/shells/dash/default.nix index f044c41b73d6..2a0d73145607 100644 --- a/nixpkgs/pkgs/shells/dash/default.nix +++ b/nixpkgs/pkgs/shells/dash/default.nix @@ -1,30 +1,42 @@ -{ lib, stdenv, buildPackages, autoreconfHook, fetchurl, libedit }: +{ lib +, stdenv +, buildPackages +, autoreconfHook +, fetchurl +, fetchpatch +, libedit +}: stdenv.mkDerivation rec { pname = "dash"; - version = "0.5.11.2"; + version = "0.5.11.4"; src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/${pname}-${version}.tar.gz"; - sha256 = "0pvdpm1cgfbc25ramn4305a0158yq031q1ain4dc972rnxl7vyq0"; + sha256 = "13g06zqfy4n7jkrbb5l1vw0xcnjvq76i16al8fjc5g33afxbf5af"; }; hardeningDisable = [ "format" ]; patches = [ - (fetchurl { + (fetchpatch { # Dash executes code when noexec ("-n") is specified # https://www.openwall.com/lists/oss-security/2020/11/11/3 url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=29d6f2148f10213de4e904d515e792d2cf8c968e"; - sha256 = "08q90bx36ixwlcj331dh7420qyj8i0qh1cc1gljrhd83fhl9w0y5"; + sha256 = "0aadb7aaaan6jxmi6icv4p5gqx7k510yszaqsa29b5giyxz5l9i1"; + }) + + # aarch64-darwin fix from upstream; remove on next release + (fetchpatch { + url = "https://git.kernel.org/pub/scm/utils/dash/dash.git/patch/?id=6f6d1f2da03468c0e131fdcbdcfa9771ffca2614"; + sha256 = "16iz2ylkyhpxqq411ns8pjk8rizh6afhavvsf052wvzsnmmlvfbw"; }) - ] ++ lib.optionals stdenv.isDarwin [ - # Temporary fix until a proper one is accepted upstream - ./0001-fix-dirent64-et-al-on-darwin.patch ]; + # configure.ac patched; remove on next release + nativeBuildInputs = [ autoreconfHook ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = lib.optional stdenv.isDarwin autoreconfHook; buildInputs = [ libedit ]; configureFlags = [ "--with-libedit" ]; diff --git a/nixpkgs/pkgs/shells/nushell/default.nix b/nixpkgs/pkgs/shells/nushell/default.nix index eaddb0f56dcd..3ebdc4c8e5a6 100644 --- a/nixpkgs/pkgs/shells/nushell/default.nix +++ b/nixpkgs/pkgs/shells/nushell/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-5vBt0Q7f3ydo74cmY4WpIHqMlNYc0Tl35d0DnWUQZbU="; + sha256 = "sha256-Qdol0ohg2Oo3rC59jPvqHZJtQOQ5W+aZVxTxsxrG51E="; }; - cargoSha256 = "sha256-F3niVkZbg84cFEY0eGgmMAMEJ+eBHwDS2+3EFRR2fLY="; + cargoSha256 = "sha256-EP4DzfufQ9y0x2rI4MGBLu48VKoUY9ETKPlUt9Abum8="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ]; diff --git a/nixpkgs/pkgs/shells/oil/default.nix b/nixpkgs/pkgs/shells/oil/default.nix index 38ff6a76818a..48bd2fcd8382 100644 --- a/nixpkgs/pkgs/shells/oil/default.nix +++ b/nixpkgs/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.9.0"; + version = "0.9.2"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "sha256-xk4io2ZXVupU6mCqmD94k1AaE8Kk0cf3PIx28X6gNjY="; + sha256 = "sha256-msPRus7J/qMfFFaayQfrjFFqhSvPuwpr6EaobOCBaUE="; }; postPatch = '' diff --git a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index 63840a3b8ed8..bff4ee38df82 100644 --- a/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/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-09-09"; + version = "2021-09-22"; pname = "oh-my-zsh"; - rev = "358ac6a141010b19175d0eb5a6f28ff544aa75d3"; + rev = "5b3d2b2f0c02ef059fcbcbdb619b22318b8cc13a"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "n4x61WeKTba7hRU/01iaU6OYT3741VbCNzLaui69r/Q="; + sha256 = "SSvPU/YWFcGN8oyOyQXZhNOuOS7Z8a6Vel94z9EoyAU="; }; installPhase = '' diff --git a/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix b/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix index d5ed2641d536..0e176d0505f5 100644 --- a/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix +++ b/nixpkgs/pkgs/shells/zsh/pure-prompt/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "pure-prompt"; - version = "1.17.1"; + version = "1.17.3"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; rev = "v${version}"; - sha256 = "sha256-bWp04xT+/Xhgxj1Rm0FgTkRtLH9nuSFtqBsO3B7Exvo="; + sha256 = "sha256-WNixw2vVn1mBEDSeIFrWZHHUcX4TNgr+motBemBQfr0="; }; installPhase = '' diff --git a/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix b/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix index 618a35c2f6ad..f1dcb9ead9c9 100644 --- a/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "spaceship-prompt"; - version = "3.14.0"; + version = "3.14.1"; src = fetchFromGitHub { owner = "denysdovhan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K9dNQAMW/Ms6rlAmfgQCqMiA7S4gLh9ZhvUoQiLoHOY="; + sha256 = "sha256-/Q2vsCIDsHUSBavJoHX3L0NQ7REoQmaiRgHVGiLtNPE="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/stdenv/adapters.nix b/nixpkgs/pkgs/stdenv/adapters.nix index 719f67998266..971be95e935d 100644 --- a/nixpkgs/pkgs/stdenv/adapters.nix +++ b/nixpkgs/pkgs/stdenv/adapters.nix @@ -90,6 +90,38 @@ rec { }); }); + # Best effort static binaries. Will still be linked to libSystem, + # but more portable than Nix store binaries. + makeStaticDarwin = stdenv: stdenv.override (old: { + # extraBuildInputs are dropped in cross.nix, but darwin still needs them + extraBuildInputs = [ pkgs.buildPackages.darwin.CF ]; + mkDerivationFromStdenv = extendMkDerivationArgs old (args: { + NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + + lib.optionalString (stdenv.cc.isGNU or false) " -static-libgcc"; + nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ + (pkgs.buildPackages.makeSetupHook { + substitutions = { + libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib"; + }; + } ./darwin/portable-libsystem.sh) + ]; + }); + }); + + # Puts all the other ones together + makeStatic = stdenv: lib.foldl (lib.flip lib.id) stdenv ( + lib.optional stdenv.hostPlatform.isDarwin makeStaticDarwin + + ++ [ makeStaticLibraries propagateBuildInputs ] + + # Apple does not provide a static version of libSystem or crt0.o + # So we can’t build static binaries without extensive hacks. + ++ lib.optional (!stdenv.hostPlatform.isDarwin) makeStaticBinaries + + # Glibc doesn’t come with static runtimes by default. + # ++ lib.optional (stdenv.hostPlatform.libc == "glibc") ((lib.flip overrideInStdenv) [ self.stdenv.glibc.static ]) + ); + /* Modify a stdenv so that all buildInputs are implicitly propagated to consuming derivations diff --git a/nixpkgs/pkgs/stdenv/cross/default.nix b/nixpkgs/pkgs/stdenv/cross/default.nix index 18a6e2a47372..613b8d5304c0 100644 --- a/nixpkgs/pkgs/stdenv/cross/default.nix +++ b/nixpkgs/pkgs/stdenv/cross/default.nix @@ -35,12 +35,16 @@ in lib.init bootStages ++ [ }) # Run Packages - (buildPackages: { + (buildPackages: let + adaptStdenv = + if crossSystem.isStatic + then buildPackages.stdenvAdapters.makeStatic + else lib.id; + in { inherit config; - overlays = overlays ++ crossOverlays - ++ (if (with crossSystem; isWasm || isRedox) then [(import ../../top-level/static.nix)] else []); + overlays = overlays ++ crossOverlays; selfBuild = false; - stdenv = buildPackages.stdenv.override (old: rec { + stdenv = adaptStdenv (buildPackages.stdenv.override (old: rec { buildPlatform = localSystem; hostPlatform = crossSystem; targetPlatform = crossSystem; @@ -83,7 +87,7 @@ in lib.init bootStages ++ [ # to recognize 64-bit DLLs ++ lib.optional (hostPlatform.config == "x86_64-w64-mingw32") buildPackages.file ; - }); + })); }) ] diff --git a/nixpkgs/pkgs/stdenv/darwin/default.nix b/nixpkgs/pkgs/stdenv/darwin/default.nix index b5a9f0cc5cb9..81313fb390ec 100644 --- a/nixpkgs/pkgs/stdenv/darwin/default.nix +++ b/nixpkgs/pkgs/stdenv/darwin/default.nix @@ -268,6 +268,12 @@ rec { ${bootstrapTools}/bin/codesign > $out/bin/codesign chmod a+x $out/bin/codesign ''; + # on next bootstrap tools update, use the following: + # installPhase = '' + # mkdir -p $out/bin + # ln -s ${bootstrapTools}/bin/sigtool $out/bin + # ln -s ${bootstrapTools}/bin/codesign $out/bin + # ''; }; print-reexports = stdenv.mkDerivation { diff --git a/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix index c62e72f6047c..434eadb38bf0 100644 --- a/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -206,7 +206,7 @@ in rec { done for i in $out/bin/*; do - if test -x "$i" -a ! -L "$i" -a "$(basename $i)" != codesign; then + if test -x "$i" -a ! -L "$i"; then echo "Adding @executable_path to rpath in $i" ${stdenv.cc.targetPrefix}install_name_tool -add_rpath '@executable_path/../lib' $i fi diff --git a/nixpkgs/pkgs/stdenv/generic/builder.sh b/nixpkgs/pkgs/stdenv/generic/builder.sh index 79bf21ab4730..2d8d784982a8 100644 --- a/nixpkgs/pkgs/stdenv/generic/builder.sh +++ b/nixpkgs/pkgs/stdenv/generic/builder.sh @@ -6,12 +6,14 @@ done mkdir $out -echo "export SHELL=$shell" > $out/setup -echo "initialPath=\"$initialPath\"" >> $out/setup -echo "defaultNativeBuildInputs=\"$defaultNativeBuildInputs\"" >> $out/setup -echo "defaultBuildInputs=\"$defaultBuildInputs\"" >> $out/setup -echo "$preHook" >> $out/setup -cat "$setup" >> $out/setup +{ + echo "export SHELL=$shell" + echo "initialPath=\"$initialPath\"" + echo "defaultNativeBuildInputs=\"$defaultNativeBuildInputs\"" + echo "defaultBuildInputs=\"$defaultBuildInputs\"" + echo "$preHook" + cat "$setup" +} > "$out/setup" # Allow the user to install stdenv using nix-env and get the packages # in stdenv. diff --git a/nixpkgs/pkgs/stdenv/generic/setup.sh b/nixpkgs/pkgs/stdenv/generic/setup.sh index ec5a5e6dcb9d..f90d9020f89f 100644 --- a/nixpkgs/pkgs/stdenv/generic/setup.sh +++ b/nixpkgs/pkgs/stdenv/generic/setup.sh @@ -1,7 +1,7 @@ set -eu set -o pipefail -if [ -n "${BASH_VERSINFO-}" ] && [ "${BASH_VERSINFO-}" -lt 4 ]; then +if [[ -n "${BASH_VERSINFO-}" && "${BASH_VERSINFO-}" -lt 4 ]]; then echo "Detected Bash version that isn't supported by Nixpkgs (${BASH_VERSION})" echo "Please install Bash 4 or greater to continue." exit 1 @@ -121,14 +121,12 @@ exitHandler() { set +e if [ -n "${showBuildStats:-}" ]; then - times > "$NIX_BUILD_TOP/.times" - local -a times=($(cat "$NIX_BUILD_TOP/.times")) - # Print the following statistics: - # - user time for the shell - # - system time for the shell - # - user time for all child processes - # - system time for all child processes - echo "build time elapsed: " "${times[@]}" + read -r -d '' -a buildTimes < <(times) + echo "build times:" + echo "user time for the shell ${buildTimes[0]}" + echo "system time for the shell ${buildTimes[1]}" + echo "user time for all child processes ${buildTimes[2]}" + echo "system time for all child processes ${buildTimes[3]}" fi if (( "$exitCode" != 0 )); then @@ -199,6 +197,34 @@ isELF() { if [ "$magic" = $'\177ELF' ]; then return 0; else return 1; fi } +# Return success if the specified file is a Mach-O object. +isMachO() { + local fn="$1" + local fd + local magic + exec {fd}< "$fn" + read -r -n 4 -u "$fd" magic + exec {fd}<&- + + # nix uses 'declare -F' in get-env.sh to retrieve the loaded functions. + # If we use the $'string' syntax instead of 'echo -ne' then 'declare' will print the raw characters and break nix. + # See https://github.com/NixOS/nixpkgs/pull/138334 and https://github.com/NixOS/nix/issues/5262. + + # https://opensource.apple.com/source/lldb/lldb-310.2.36/examples/python/mach_o.py.auto.html + if [[ "$magic" = $(echo -ne "\xfe\xed\xfa\xcf") || "$magic" = $(echo -ne "\xcf\xfa\xed\xfe") ]]; then + # MH_MAGIC_64 || MH_CIGAM_64 + return 0; + elif [[ "$magic" = $(echo -ne "\xfe\xed\xfa\xce") || "$magic" = $(echo -ne "\xce\xfa\xed\xfe") ]]; then + # MH_MAGIC || MH_CIGAM + return 0; + elif [[ "$magic" = $(echo -ne "\xca\xfe\xba\xbe") || "$magic" = $(echo -ne "\xbe\xba\xfe\xca") ]]; then + # FAT_MAGIC || FAT_CIGAM + return 0; + else + return 1; + fi +} + # Return success if the specified file is a script (i.e. starts with # "#!"). isScript() { @@ -306,6 +332,10 @@ declare -a pkgTargetHookVars=(envTargetTargetHook) declare -a pkgHookVarVars=(pkgBuildHookVars pkgHostHookVars pkgTargetHookVars) +# those variables are declared here, since where and if they are used varies +# shellcheck disable=SC2034 +declare -a preFixupHooks fixupOutputHooks preConfigureHooks postFixupHooks postUnpackHooks unpackCmdHooks + # Add env hooks for all sorts of deps with the specified host offset. addEnvHooks() { local depHostOffset="$1" @@ -347,14 +377,14 @@ declare -a allPlatOffsets=(-1 0 1) # implements. findInputs() { local -r pkg="$1" - local -ri hostOffset="$2" - local -ri targetOffset="$3" + local -r hostOffset="$2" + local -r targetOffset="$3" # Sanity check - (( "$hostOffset" <= "$targetOffset" )) || exit -1 + (( hostOffset <= targetOffset )) || exit -1 - local varVar="${pkgAccumVarVars[$hostOffset + 1]}" - local varRef="$varVar[\$targetOffset - \$hostOffset]" + local varVar="${pkgAccumVarVars[hostOffset + 1]}" + local varRef="$varVar[$((targetOffset - hostOffset))]" local var="${!varRef}" unset -v varVar varRef @@ -381,21 +411,21 @@ findInputs() { # offsets to current offset local -i mapOffsetResult function mapOffset() { - local -ri inputOffset="$1" - if (( "$inputOffset" <= 0 )); then - local -ri outputOffset="$inputOffset + $hostOffset" + local -r inputOffset="$1" + if (( inputOffset <= 0 )); then + local -r outputOffset=$((inputOffset + hostOffset)) else - local -ri outputOffset="$inputOffset - 1 + $targetOffset" + local -r outputOffset=$((inputOffset - 1 + targetOffset)) fi mapOffsetResult="$outputOffset" } # Host offset relative to that of the package whose immediate # dependencies we are currently exploring. - local -i relHostOffset + local relHostOffset for relHostOffset in "${allPlatOffsets[@]}"; do # `+ 1` so we start at 0 for valid index - local files="${propagatedDepFilesVars[$relHostOffset + 1]}" + local files="${propagatedDepFilesVars[relHostOffset + 1]}" # Host offset relative to the package currently being # built---as absolute an offset as will be used. @@ -473,11 +503,11 @@ done # Add package to the future PATH and run setup hooks activatePackage() { local pkg="$1" - local -ri hostOffset="$2" - local -ri targetOffset="$3" + local -r hostOffset="$2" + local -r targetOffset="$3" # Sanity check - (( "$hostOffset" <= "$targetOffset" )) || exit -1 + (( hostOffset <= targetOffset )) || exit -1 if [ -f "$pkg" ]; then source "$pkg" @@ -494,7 +524,7 @@ activatePackage() { addToSearchPath _PATH "$pkg/bin" fi - if [[ "$hostOffset" -le -1 ]]; then + if (( hostOffset <= -1 )); then addToSearchPath _XDG_DATA_DIRS "$pkg/share" fi @@ -508,13 +538,13 @@ activatePackage() { } _activatePkgs() { - local -i hostOffset targetOffset + local hostOffset targetOffset local pkg for hostOffset in "${allPlatOffsets[@]}"; do - local pkgsVar="${pkgAccumVarVars[$hostOffset + 1]}" + local pkgsVar="${pkgAccumVarVars[hostOffset + 1]}" for targetOffset in "${allPlatOffsets[@]}"; do - (( "$hostOffset" <= "$targetOffset" )) || continue + (( hostOffset <= targetOffset )) || continue local pkgsRef="${pkgsVar}[$targetOffset - $hostOffset]" local pkgsSlice="${!pkgsRef}[@]" for pkg in ${!pkgsSlice+"${!pkgsSlice}"}; do @@ -536,14 +566,14 @@ _activatePkgs # with this information to the relevant env hook array, but bash # doesn't have closures, so it's easier to just pass this in. _addToEnv() { - local -i depHostOffset depTargetOffset + local depHostOffset depTargetOffset local pkg for depHostOffset in "${allPlatOffsets[@]}"; do - local hookVar="${pkgHookVarVars[$depHostOffset + 1]}" - local pkgsVar="${pkgAccumVarVars[$depHostOffset + 1]}" + local hookVar="${pkgHookVarVars[depHostOffset + 1]}" + local pkgsVar="${pkgAccumVarVars[depHostOffset + 1]}" for depTargetOffset in "${allPlatOffsets[@]}"; do - (( "$depHostOffset" <= "$depTargetOffset" )) || continue + (( depHostOffset <= depTargetOffset )) || continue local hookRef="${hookVar}[$depTargetOffset - $depHostOffset]" if [[ -z "${strictDeps-}" ]]; then @@ -555,12 +585,12 @@ _addToEnv() { # # TODO(@Ericson2314): Don't special-case native compilation for pkg in \ - ${pkgsBuildBuild+"${pkgsBuildBuild[@]}"} \ - ${pkgsBuildHost+"${pkgsBuildHost[@]}"} \ - ${pkgsBuildTarget+"${pkgsBuildTarget[@]}"} \ - ${pkgsHostHost+"${pkgsHostHost[@]}"} \ - ${pkgsHostTarget+"${pkgsHostTarget[@]}"} \ - ${pkgsTargetTarget+"${pkgsTargetTarget[@]}"} + "${pkgsBuildBuild[@]}" \ + "${pkgsBuildHost[@]}" \ + "${pkgsBuildTarget[@]}" \ + "${pkgsHostHost[@]}" \ + "${pkgsHostTarget[@]}" \ + "${pkgsTargetTarget[@]}" do if [[ "$visitedPkgs" = *"$pkg"* ]]; then continue @@ -633,26 +663,21 @@ export NIX_INDENT_MAKE=1 # means that we're supposed to try and auto-detect the number of # available CPU cores at run-time. -if [ -z "${NIX_BUILD_CORES:-}" ]; then - NIX_BUILD_CORES="1" -elif [ "$NIX_BUILD_CORES" -le 0 ]; then - NIX_BUILD_CORES=$(nproc 2>/dev/null || true) - if expr >/dev/null 2>&1 "$NIX_BUILD_CORES" : "^[0-9][0-9]*$"; then - : - else - NIX_BUILD_CORES="1" - fi +NIX_BUILD_CORES="${NIX_BUILD_CORES:-1}" +if ((NIX_BUILD_CORES <= 0)); then + guess=$(nproc 2>/dev/null || true) + ((NIX_BUILD_CORES = guess <= 0 ? 1 : guess)) fi export NIX_BUILD_CORES # Prevent SSL libraries from using certificates in /etc/ssl, unless set explicitly. # Leave it in impure shells for convenience. -if [ -z "${NIX_SSL_CERT_FILE:-}" ] && [ "${IN_NIX_SHELL:-}" != "impure" ]; then +if [[ -z "${NIX_SSL_CERT_FILE:-}" && "${IN_NIX_SHELL:-}" != "impure" ]]; then export NIX_SSL_CERT_FILE=/no-cert-file.crt fi # Another variant left for compatibility. -if [ -z "${SSL_CERT_FILE:-}" ] && [ "${IN_NIX_SHELL:-}" != "impure" ]; then +if [[ -z "${SSL_CERT_FILE:-}" && "${IN_NIX_SHELL:-}" != "impure" ]]; then export SSL_CERT_FILE=/no-cert-file.crt fi @@ -716,9 +741,11 @@ substituteStream() { printf "%s" "${!var}" } +# put the content of a file in a variable +# fail loudly if provided with a binary (containing null bytes) consumeEntire() { # read returns non-0 on EOF, so we want read to fail - if IFS='' read -r -N 0 $1; then + if IFS='' read -r -d '' $1 ; then echo "consumeEntire(): ERROR: Input null bytes, won't process" >&2 return 1 fi @@ -987,17 +1014,19 @@ configurePhase() { configureFlags="${prefixKey:---prefix=}$prefix $configureFlags" fi - # Add --disable-dependency-tracking to speed up some builds. - if [ -z "${dontAddDisableDepTrack:-}" ]; then - if [ -f "$configureScript" ] && grep -q dependency-tracking "$configureScript"; then - configureFlags="--disable-dependency-tracking $configureFlags" + if [[ -f "$configureScript" ]]; then + # Add --disable-dependency-tracking to speed up some builds. + if [ -z "${dontAddDisableDepTrack:-}" ]; then + if grep -q dependency-tracking "$configureScript"; then + configureFlags="--disable-dependency-tracking $configureFlags" + fi fi - fi - # By default, disable static builds. - if [ -z "${dontDisableStatic:-}" ]; then - if [ -f "$configureScript" ] && grep -q enable-static "$configureScript"; then - configureFlags="--disable-static $configureFlags" + # By default, disable static builds. + if [ -z "${dontDisableStatic:-}" ]; then + if grep -q enable-static "$configureScript"; then + configureFlags="--disable-static $configureFlags" + fi fi fi @@ -1005,7 +1034,7 @@ configurePhase() { # Old bash empty array hack # shellcheck disable=SC2086 local flagsArray=( - $configureFlags ${configureFlagsArray+"${configureFlagsArray[@]}"} + $configureFlags "${configureFlagsArray[@]}" ) echoCmd 'configure flags' "${flagsArray[@]}" # shellcheck disable=SC2086 @@ -1035,8 +1064,8 @@ buildPhase() { local flagsArray=( ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} SHELL=$SHELL - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - $buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"} + $makeFlags "${makeFlagsArray[@]}" + $buildFlags "${buildFlagsArray[@]}" ) echoCmd 'build flags' "${flagsArray[@]}" @@ -1074,8 +1103,8 @@ checkPhase() { local flagsArray=( ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} SHELL=$SHELL - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"} + $makeFlags "${makeFlagsArray[@]}" + ${checkFlags:-VERBOSE=y} "${checkFlagsArray[@]}" ${checkTarget} ) @@ -1100,8 +1129,8 @@ installPhase() { # shellcheck disable=SC2086 local flagsArray=( SHELL=$SHELL - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - $installFlags ${installFlagsArray+"${installFlagsArray[@]}"} + $makeFlags "${makeFlagsArray[@]}" + $installFlags "${installFlagsArray[@]}" ${installTargets:-install} ) @@ -1208,8 +1237,8 @@ installCheckPhase() { local flagsArray=( ${enableParallelChecking:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} SHELL=$SHELL - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - $installCheckFlags ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"} + $makeFlags "${makeFlagsArray[@]}" + $installCheckFlags "${installCheckFlagsArray[@]}" ${installCheckTarget:-installcheck} ) @@ -1228,7 +1257,7 @@ distPhase() { # Old bash empty array hack # shellcheck disable=SC2086 local flagsArray=( - $distFlags ${distFlagsArray+"${distFlagsArray[@]}"} ${distTarget:-dist} + $distFlags "${distFlagsArray[@]}" ${distTarget:-dist} ) echo 'dist flags: %q' "${flagsArray[@]}" diff --git a/nixpkgs/pkgs/test/cuda/cuda-library-samples/default.nix b/nixpkgs/pkgs/test/cuda/cuda-library-samples/default.nix index 91095fbd3ac4..ff256028cdf0 100644 --- a/nixpkgs/pkgs/test/cuda/cuda-library-samples/default.nix +++ b/nixpkgs/pkgs/test/cuda/cuda-library-samples/default.nix @@ -1,8 +1,8 @@ { callPackage , cudatoolkit_10_1, cudatoolkit_10_2 -, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 +, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2, cudatoolkit_11_3, cudatoolkit_11_4 , cutensor_cudatoolkit_10_1, cutensor_cudatoolkit_10_2 -, cutensor_cudatoolkit_11_0, cutensor_cudatoolkit_11_1, cutensor_cudatoolkit_11_2 +, cutensor_cudatoolkit_11_0, cutensor_cudatoolkit_11_1, cutensor_cudatoolkit_11_2, cutensor_cudatoolkit_11_3, cutensor_cudatoolkit_11_4 }: rec { @@ -37,6 +37,16 @@ rec { cutensor_cudatoolkit = cutensor_cudatoolkit_11_2; }; + cuda-library-samples_cudatoolkit_11_3 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_11_3; + cutensor_cudatoolkit = cutensor_cudatoolkit_11_3; + }; + + cuda-library-samples_cudatoolkit_11_4 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_11_4; + cutensor_cudatoolkit = cutensor_cudatoolkit_11_4; + }; + cuda-library-samples_cudatoolkit_11 = - cuda-library-samples_cudatoolkit_11_2; + cuda-library-samples_cudatoolkit_11_4; } diff --git a/nixpkgs/pkgs/test/cuda/cuda-samples/default.nix b/nixpkgs/pkgs/test/cuda/cuda-samples/default.nix index 1a361c57214c..5b46a0651eba 100644 --- a/nixpkgs/pkgs/test/cuda/cuda-samples/default.nix +++ b/nixpkgs/pkgs/test/cuda/cuda-samples/default.nix @@ -1,6 +1,6 @@ { callPackage , cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2 -, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2 +, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2, cudatoolkit_11_3, cudatoolkit_11_4 }: rec { @@ -40,5 +40,15 @@ rec { sha256 = "1p1qjvfbm28l933mmnln02rqrf0cy9kbpsyb488d1haiqzvrazl1"; }; - cuda-samples_cudatoolkit_11 = cuda-samples_cudatoolkit_11_2; + cuda-samples_cudatoolkit_11_3 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_11_3; + sha256 = "0kbibb6pgz8j5iq6284axcnmycaha9bw8qlmdp6yfwmnahq1v0yz"; + }; + + cuda-samples_cudatoolkit_11_4 = callPackage ./generic.nix { + cudatoolkit = cudatoolkit_11_4; + sha256 = "082dkk5y34wyvjgj2p5j1d00rk8xaxb9z0mhvz16bd469r1bw2qk"; + }; + + cuda-samples_cudatoolkit_11 = cuda-samples_cudatoolkit_11_4; } diff --git a/nixpkgs/pkgs/test/cuda/cuda-samples/generic.nix b/nixpkgs/pkgs/test/cuda/cuda-samples/generic.nix index 2e3dcc8891f4..c5a9e24abd43 100644 --- a/nixpkgs/pkgs/test/cuda/cuda-samples/generic.nix +++ b/nixpkgs/pkgs/test/cuda/cuda-samples/generic.nix @@ -1,6 +1,11 @@ -{ lib, stdenv, fetchFromGitHub -, pkg-config, addOpenGLRunpath -, sha256, cudatoolkit +{ addOpenGLRunpath +, cudatoolkit +, fetchFromGitHub +, fetchpatch +, lib +, pkg-config +, sha256 +, stdenv }: let @@ -22,6 +27,14 @@ stdenv.mkDerivation { buildInputs = [ cudatoolkit ]; + # See https://github.com/NVIDIA/cuda-samples/issues/75. + patches = lib.optionals (version == "11.3") [ + (fetchpatch { + url = "https://github.com/NVIDIA/cuda-samples/commit/5c3ec60faeb7a3c4ad9372c99114d7bb922fda8d.patch"; + sha256 = "sha256:15bydf59scmfnldz5yawbjacdxafi50ahgpzq93zlc5xsac5sz6i"; + }) + ]; + enableParallelBuilding = true; preConfigure = '' diff --git a/nixpkgs/pkgs/test/cuda/default.nix b/nixpkgs/pkgs/test/cuda/default.nix index aac52e6a4f5d..7989e4e2b7d2 100644 --- a/nixpkgs/pkgs/test/cuda/default.nix +++ b/nixpkgs/pkgs/test/cuda/default.nix @@ -10,7 +10,9 @@ rec { cuda-samples_cudatoolkit_11 cuda-samples_cudatoolkit_11_0 cuda-samples_cudatoolkit_11_1 - cuda-samples_cudatoolkit_11_2; + cuda-samples_cudatoolkit_11_2 + cuda-samples_cudatoolkit_11_3 + cuda-samples_cudatoolkit_11_4; cuda-library-samplesPackages = callPackage ./cuda-library-samples { }; inherit (cuda-library-samplesPackages) @@ -20,5 +22,7 @@ rec { cuda-library-samples_cudatoolkit_11 cuda-library-samples_cudatoolkit_11_0 cuda-library-samples_cudatoolkit_11_1 - cuda-library-samples_cudatoolkit_11_2; + cuda-library-samples_cudatoolkit_11_2 + cuda-library-samples_cudatoolkit_11_3 + cuda-library-samples_cudatoolkit_11_4; } diff --git a/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix b/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix index 2d1ce4a4e33f..5bffa1077647 100644 --- a/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix +++ b/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix @@ -23,18 +23,18 @@ stdenv.mkDerivation rec { pname = "OpenTabletDriver"; - version = "0.5.3.2"; + version = "0.5.3.3"; src = fetchFromGitHub { owner = "InfinityGhost"; repo = "OpenTabletDriver"; rev = "v${version}"; - sha256 = "qRc/9Edp3x7/XVEWgBbPush76MSQz4biYSk+E9Gt68w="; + sha256 = "k4SoOMKAwHeYSQ80M8Af1DiiDSZIi3gS7lGr2ZrXrEI="; }; debPkg = fetchurl { url = "https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${version}/OpenTabletDriver.deb"; - sha256 = "14k06iyc642x42yadyfmmf8ky84y8rc6kgd63b4ipskkcxyl1gvl"; + sha256 = "0v03qiiz28k1yzgxf5qc1mdg2n7kjx6h8vpx9dxz342wwbgqg6ic"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/X11/xvkbd/default.nix b/nixpkgs/pkgs/tools/X11/xvkbd/default.nix index 05936d1d1f3d..d751cb8f087a 100644 --- a/nixpkgs/pkgs/tools/X11/xvkbd/default.nix +++ b/nixpkgs/pkgs/tools/X11/xvkbd/default.nix @@ -13,9 +13,11 @@ stdenv.mkDerivation { buildInputs = [ libXt libXaw libXtst xorgproto libXi Xaw3d libXpm ]; installTargets = [ "install" "install.man" ]; makeFlags = [ - "BINDIR=$(out)/bin" - "XAPPLOADDIR=$(out)/etc/X11/app-defaults" - "MANPATH=$(out)/man" + "BINDIR=${placeholder "out"}/bin" + "CONFDIR=${placeholder "out"}/etc/X11" + "LIBDIR=${placeholder "out"}/lib/X11" + "XAPPLOADDIR=${placeholder "out"}/etc/X11/app-defaults" + "MANPATH=${placeholder "out"}/man" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/admin/awscli/default.nix b/nixpkgs/pkgs/tools/admin/awscli/default.nix index 0d0d2ec80ffe..cf87652ab39e 100644 --- a/nixpkgs/pkgs/tools/admin/awscli/default.nix +++ b/nixpkgs/pkgs/tools/admin/awscli/default.nix @@ -21,11 +21,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.97"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.20.31"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-kecuyQMk4GWH9G0/f4Gi/hWtW4Zme9Q4i7XclcZTlNc="; + sha256 = "sha256-qDKnxh4M+LOXYp1xCvW0S0IE5NnwvFpYelUCCjA18zQ="; }; # https://github.com/aws/aws-cli/issues/4837 diff --git a/nixpkgs/pkgs/tools/admin/awscli2/default.nix b/nixpkgs/pkgs/tools/admin/awscli2/default.nix index 0c5d08fd25c5..4206136ec6d6 100644 --- a/nixpkgs/pkgs/tools/admin/awscli2/default.nix +++ b/nixpkgs/pkgs/tools/admin/awscli2/default.nix @@ -2,13 +2,21 @@ let py = python3.override { packageOverrides = self: super: { + awscrt = super.awscrt.overridePythonAttrs (oldAttrs: rec { + version = "0.11.24"; + src = self.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "sha256-uKpovKQEvwCFvgVw7/W1QtAffo48D5sIWav+XgcBYv8="; + }; + }); botocore = super.botocore.overridePythonAttrs (oldAttrs: rec { - version = "2.0.0dev138"; + version = "2.0.0dev147"; src = fetchFromGitHub { owner = "boto"; repo = "botocore"; - rev = "5f1971d2d9d2cf7090a8b71650ab40712319bca3"; - sha256 = "sha256-onptN++MDJrit3sIEXCX9oRJ0qQ5xzmI6J2iABiK7RA"; + rev = "afa015418df6b3aeef0f5645e8704de64adea3d7"; + sha256 = "sha256-ypqDhCQXPqG8JCsLWt1V/4s95Hm+lClz+eOA2GnIhYg="; }; propagatedBuildInputs = super.botocore.propagatedBuildInputs ++ [py.pkgs.awscrt]; }); @@ -25,13 +33,13 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.2.30"; # N.B: if you change this, change botocore to a matching version too + version = "2.2.39"; # N.B: if you change this, change botocore to a matching version too src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "sha256-OPxo5RjdDCTPntiJInUtgcU43Nn5JEUbwRJXeBl/yYQ"; + sha256 = "sha256-3GYj6+08J05Lu17jjydmzlypI5TUuV+5HA398oExkiU="; }; patches = [ @@ -43,12 +51,13 @@ with py.pkgs; buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace "awscrt==0.11.24" "awscrt" \ --replace "colorama>=0.2.5,<0.4.4" "colorama" \ --replace "cryptography>=3.3.2,<3.4.0" "cryptography" \ --replace "docutils>=0.10,<0.16" "docutils" \ --replace "ruamel.yaml>=0.15.0,<0.16.0" "ruamel.yaml" \ - --replace "wcwidth<0.2.0" "wcwidth" + --replace "s3transfer>=0.4.2,<0.5.0" "s3transfer" \ + --replace "wcwidth<0.2.0" "wcwidth" \ + --replace "distro>=1.5.0,<1.6.0" "distro" ''; checkInputs = [ jsonschema mock nose ]; diff --git a/nixpkgs/pkgs/tools/admin/azure-cli/default.nix b/nixpkgs/pkgs/tools/admin/azure-cli/default.nix index b93ab0e867b3..f2fec6fe6be7 100644 --- a/nixpkgs/pkgs/tools/admin/azure-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/azure-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, python3, fetchFromGitHub, installShellFiles }: let - version = "2.26.1"; + version = "2.28.0"; srcName = "azure-cli-${version}-src"; src = fetchFromGitHub { @@ -9,7 +9,7 @@ let owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "sha256-AwchP0o3I2T37dLPNw51wldwYUmcRuWptyzrhOocEaQ="; + sha256 = "sha256-fTt6tIcc96f8t3NUaR0RG0JQ+LPgqSHuJSmVx4a6X7M="; }; # put packages that needs to be overriden in the py package scope @@ -28,6 +28,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { substituteInPlace setup.py \ --replace "javaproperties==0.5.1" "javaproperties" \ --replace "pytz==2019.1" "pytz" \ + --replace "scp~=0.13.2" "scp" \ --replace "jsondiff==1.2.0" "jsondiff~=1.2" \ --replace "antlr4-python3-runtime~=4.7.2" "antlr4-python3-runtime~=4.7" \ --replace "mock~=4.0" "mock" @@ -125,9 +126,11 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-storage-blob azure-synapse-accesscontrol azure-synapse-artifacts + azure-synapse-managedprivateendpoints azure-synapse-spark colorama cryptography + distro Fabric jsmin knack diff --git a/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix b/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix index 2cde5a1da579..b50543dbe3d2 100644 --- a/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix @@ -87,18 +87,19 @@ let postPatch = '' substituteInPlace setup.py \ --replace "azure-mgmt-core>=1.2.0,<1.3.0" "azure-mgmt-core~=1.2" \ + --replace "requests[socks]~=2.25.1" "requests[socks]~=2.25" \ --replace "cryptography>=3.2,<3.4" "cryptography" ''; doCheck = stdenv.isLinux; - # ignore tests that does network call + # ignore tests that does network call, or assume powershell checkPhase = '' rm azure/{,cli/}__init__.py python -c 'import azure.common; print(azure.common)' PYTHONPATH=$PWD:$PYTHONPATH HOME=$TMPDIR pytest \ --ignore=azure/cli/core/tests/test_profile.py \ --ignore=azure/cli/core/tests/test_generic_update.py \ - -k 'not metadata_url' + -k 'not metadata_url and not test_send_raw_requests and not test_format_styled_text_legacy_powershell' ''; pythonImportsCheck = [ @@ -135,14 +136,17 @@ let azure-appconfiguration = overrideAzureMgmtPackage super.azure-appconfiguration "1.1.1" "zip" "sha256-uDzSy2PZMiXehOJ6u/wFkhL43id2b0xY3Tq7g53/C+Q="; - azure-batch = overrideAzureMgmtPackage super.azure-batch "10.0.0" "zip" - "83d7a2b0be42ca456ac2b56fa3dc6ce704c130e888d37d924072c1d3718f32d0"; + azure-batch = overrideAzureMgmtPackage super.azure-batch "11.0.0" "zip" + "83d7a2b0be42ca456ac2b56fa3dc6ce704c130e888d37d924072c1d3718f32da"; azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "0.2.0" "zip" "0whx3s8ri9939r3pdvjf8iqcslas1xy6cnccidmp10r5ng0023vr"; - azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "15.0.0" "zip" - "9b793bb31a0d4dc8c29186db61db24d83795851a75846aadb187cf95bf853ccb"; + azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "16.0.0" "zip" + "1b3cecd6f16813879c6ac1a1bb01f9a6f2752cd1f9157eb04d5e41e4a89f3c34"; + + azure-mgmt-batchai = overrideAzureMgmtPackage super.azure-mgmt-batchai "7.0.0b1" "zip" + "sha256-mT6vvjWbq0RWQidugR229E8JeVEiobPD3XA/nDM3I6Y="; azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "6.0.0" "zip" "d4f5c5a4188a456fe1eb32b6c45f55ca2069c74be41eb76921840b39f2f5c07f"; @@ -150,20 +154,20 @@ let azure-mgmt-botservice = overrideAzureMgmtPackage super.azure-mgmt-botservice "0.3.0" "zip" "f8318878a66a0685a01bf27b7d1409c44eb90eb72b0a616c1a2455c72330f2f1"; - azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.5.0" "zip" - "1wxh7mgrknnhqyafdd7sbwx8plx0zga2af21vs6yhxy48lw9w8pd"; + azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "1.0.0" "zip" + "75103fb4541aeae30bb687dee1fedd9ca65530e6b97b2d9ea87f74816905202a"; - azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "8.1.0b4" "zip" - "sha256-39msNYlZeZdn8cJ4LjZw9oxzy0YrNSPVEIN21wnkMKs="; + azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "9.1.0b1" "zip" + "sha256-O/6dE6lUnowYTWwQLWt3u1dwV4jBof+Jok0PUhFEEs0="; - azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "1.0.0" "zip" - "0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rza"; + azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "2.0.0" "zip" + "sha256-p9MTfVxGD1CsLUQGHWCnC08nedTKhEt3QZtXJeZeCb4="; - azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.12.0" "zip" - "sha256-mrw1Gs3LMOPFiL5mSSrm+g1/dxihplA6ItYHbwljJbM="; + azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.14.0" "zip" + "sha256-sXGUQEO6tba3m1l+0Iir/eptTt+XRXyTr8FxbDzr6I0="; - azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "18.0.0" "zip" - "551036e592f409ef477d30937ea7cc4dda5126576965d9c816fdb8401bbd774c"; + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "19.0.0" "zip" + "bbb60bb9419633c2339569d4e097908638c7944e782b5aef0f5d9535085a9100"; azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "2.0.0" "zip" "b58bbe82a7429ba589292024896b58d96fe9fa732c578569cac349928dc2ca5f"; @@ -171,23 +175,23 @@ let azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "12.0.0" "zip" "73054bd19866577e7e327518afc8f47e1639a11aea29a7466354b81804f4a676"; - azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "21.0.0" "zip" - "sha256-kifDdVpwvDd9cONeH8bx+rEJ3YiXT9LHEphnzKoQ+BM="; + azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "22.1.0" "zip" + "sha256-Kq1BSEOu4PVEJ/iH91NsxRVdaFJyjUTf7vYzrFITX9w="; azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs"; - azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "1.4.0" "zip" - "1qw6228bia5pimcijr755npli2l33jyfka1s2bzgl1w4h3prsji7"; + azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "8.0.0" "zip" + "7aeb380af71fc35a71d6752fa25eb5b95fdb2a0027fa32e6f50bce87e2622916"; - azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "16.0.0" "zip" - "d6aa95951d32fe2cb390b3d8ae4f6459746de51bbaad94b5d1842dd35c4d0c11"; + azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "16.1.0" "zip" + "sha256-NlTIrOK4ho0OqcTHjHT1HobiMzDH2KY20TIlN0fm8/Q="; azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "6.4.0" "zip" "fb6b8ab80ab97214b94ae9e462ba1c459b68a3af296ffc26317ebd3ff500e00b"; - azure-mgmt-databoxedge = overrideAzureMgmtPackage super.azure-mgmt-databoxedge "0.2.0" "zip" - "sha256-g8BtUpIGOse8Jrws48gQ/o7sgymlgX0XIxl1ThHS3XA="; + azure-mgmt-databoxedge = overrideAzureMgmtPackage super.azure-mgmt-databoxedge "1.0.0" "zip" + "04090062bc1e8f00c2f45315a3bceb0fb3b3479ec1474d71b88342e13499b087"; azure-mgmt-deploymentmanager = overrideAzureMgmtPackage super.azure-mgmt-deploymentmanager "0.2.0" "zip" "0c6pyr36n9snx879vas5r6l25db6nlp2z96xn759mz4kg4i45qs6"; @@ -198,11 +202,14 @@ let azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "0.4.0" "zip" "0cqpjnkpid6a34ifd4vk4fn1h57pa1bg3r756wv082xl2szr34jc"; - azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.0.0" "zip" - "653a765f0beb6af0c9ecbd290b4101e1b5e0f6450405faf28ab8234c15d8b38b"; + azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "2.1.0" "zip" + "2724f48cadb1be7ee96fc26c7bfa178f82cea5d325e785e91d9f26965fa8e46f"; + + azure-mgmt-iothubprovisioningservices = overrideAzureMgmtPackage super.azure-mgmt-iothubprovisioningservices "0.3.0" "zip" + "sha256-0Bt3JfP2jFpv8CGEqb3ajHdYiK9mN43YMUkD0KRuMrk="; - azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "4.1.0" "zip" - "e6d4810f454c0d63a5e816eaa7e54a073a3f70b2256162ff1c234cfe91783ae6"; + azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "9.0.0b1" "zip" + "sha256-WEF5HuiaUTnka/2w0cVX/VwRt8/GD0+5fqGkn1BVx4I="; azure-mgmt-kusto = overrideAzureMgmtPackage super.azure-mgmt-kusto "0.3.0" "zip" "1pmcdgimd66h964a3d5m2j2fbydshcwhrk87wblhwhfl3xwbgf4y"; @@ -216,14 +223,14 @@ let azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "8.0.0" "zip" "407c2dacb33513ffbe9ca4be5addb5e9d4bae0cb7efa613c3f7d531ef7bf8de8"; - azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "8.0.0" "zip" - "3e7a93186594c328a6f34f0e0d9209a05021228baa85aa4c1c4ffdbf8005a45f"; + azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "11.0.0" "zip" + "41671fc6e95180fb6147cb40567410c34b85fb69bb0a9b3e09feae1ff370ee9d"; azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "19.0.0" "zip" "5e39a26ae81fa58c13c02029700f8c7b22c3fd832a294c543e3156a91b9459e8"; - azure-mgmt-maps = overrideAzureMgmtPackage super.azure-mgmt-maps "0.1.0" "zip" - "sha256-wSDiELthdo2ineJNKLgvjUKuJOUjlutlabSZcJ4i8AY="; + azure-mgmt-maps = overrideAzureMgmtPackage super.azure-mgmt-maps "2.0.0" "zip" + "384e17f76a68b700a4f988478945c3a9721711c0400725afdfcb63cf84e85f0e"; azure-mgmt-managedservices = overrideAzureMgmtPackage super.azure-mgmt-managedservices "1.0.0" "zip" "sha256-/tg5n8Z3Oq2jfB0ElqRvWUENd8lJTQyllnxTHDN2rRk="; @@ -234,8 +241,8 @@ let azure-mgmt-marketplaceordering = overrideAzureMgmtPackage super.azure-mgmt-marketplaceordering "1.1.0" "zip" "68b381f52a4df4435dacad5a97e1c59ac4c981f667dcca8f9d04453417d60ad8"; - azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "3.0.0" "zip" - "sha256-iUR3VyXFJTYU0ldXbYQe5or6NPVwsFwJJKf3Px2yiiQ="; + azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "7.0.0" "zip" + "sha256-tF6CpZTtkc1ap6XNXQHwOLesPPEiM+e6K+qqNHeQDo4="; azure-mgmt-msi = overrideAzureMgmtPackage super.azure-mgmt-msi "0.2.0" "zip" "0rvik03njz940x2hvqg6iiq8k0d88gyygsr86w8s0sa12sdbq8l6"; @@ -246,11 +253,11 @@ let azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "2.0.0" "zip" "0040e1c9c795f7bebe43647ff30b62cb0db7175175df5cbfa1e554a6a277b81e"; - azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "0.1.0" "zip" - "1g65lbia1i1jw6qkyjz2ldyl3p90rbr78l8kfryg70sj7z3gnnjn"; + azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "1.0.0" "zip" + "94cd41f1ebd82e40620fd3e6d88f666b5c19ac7cf8b4e8edadb9721bd7c80980"; - azure-mgmt-redis = overrideAzureMgmtPackage super.azure-mgmt-redis "7.0.0rc1" "zip" - "086wk31wsl8dx14qpd0g1bly8i9a8fix007djlj9cybva2f2bk6k"; + azure-mgmt-redis = overrideAzureMgmtPackage super.azure-mgmt-redis "13.0.0" "zip" + "283f776afe329472c20490b1f2c21c66895058cb06fb941eccda42cc247217f1"; azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "0.6.0" "zip" "16ycni3cjl9c0mv419gy5rgbrlg8zp0vnr6aj8z8p2ypdw6sgac3"; @@ -258,23 +265,23 @@ let azure-mgmt-search = overrideAzureMgmtPackage super.azure-mgmt-search "8.0.0" "zip" "a96d50c88507233a293e757202deead980c67808f432b8e897c4df1ca088da7e"; - azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.6.0" "zip" - "9f37d0151d730801222af111f0830905634795dbfd59ad1b89c35197421e74d3"; + azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "1.0.0" "zip" + "ae1cff598dfe80e93406e524c55c3f2cbffced9f9b7a5577e3375008a4c3bcad"; azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "1.0.0b2" "zip" "sha256-FTxY8qoihHG4OZuKT3sRRlKfORbIoqDqug9Ko+6S9dw="; - azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.29.0" "zip" - "sha256-a8epWPoGI4SA01DkjToaHmTx8lSPgwMB7dutI/zaoAA="; + azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "3.0.1" "zip" + "129042cc011225e27aee6ef2697d585fa5722e5d1aeb0038af6ad2451a285457"; - azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "0.5.0" "zip" - "1b9am8raa17hxnz7d5pk2ix0309wsnhnchq1mi22icd728sl5adm"; + azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "1.0.0b1" "zip" + "sha256-SrFTvU+67U3CpMLPZMawXuRdSIbTsfav2jFZIsZWPmw="; azure-mgmt-synapse = overrideAzureMgmtPackage super.azure-mgmt-synapse "2.0.0" "zip" "bec6bdfaeb55b4fdd159f2055e8875bf50a720bb0fce80a816e92a2359b898c8"; - azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "4.1.0" "zip" - "c33d1deb0ee173a15c8ec21a1e714ba544fe5f4895d3b1d8b0581f3c1b2e8ce4"; + azure-mgmt-datamigration = overrideAzureMgmtPackage super.azure-mgmt-datamigration "9.0.0" "zip" + "sha256-cDc9vrNad2ikc0G7O1cMVZGXvBujb8j4vxUTnkyLrXA="; azure-mgmt-relay = overrideAzureMgmtPackage super.azure-mgmt-relay "0.1.0" "zip" "1jss6qhvif8l5s0lblqw3qzijjf0h88agciiydaa7f4q577qgyfr"; @@ -282,14 +289,14 @@ let azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "4.1.0" "zip" "186g70slb259ybrr69zr2ibbmqgplnpncwxzg0nxp6rd7pml7d85"; - azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "9.0.0" "zip" - "2890c489289b8a0bf833852014f2f494eb96873834896910ddfa58cfa97b90da"; + azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "9.1.0" "zip" + "sha256-zTXoHEo8+BKt5L3PH3zPS1t4qAHvlnNAASpqyf5h3tI="; azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "11.0.0" "zip" "28e7070001e7208cdb6c2ad253ec78851abdd73be482230d2c0874eed5bc0907"; - azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "8.0.0" "zip" - "480eb5d1bb910da4e87a5d7047e2f3e426083b14911ac64c48badd0218e9e756"; + azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "8.1.0" "zip" + "62efbb03275d920894d79879ad0ed59605163abd32177dcf24e90c1862ebccbd"; azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "2.0.0" "zip" "e7f7943fe8f0efe98b3b1996cdec47c709765257a6e09e7940f7838a0f829e82"; @@ -309,8 +316,8 @@ let azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "6.0.0" "zip" "f6c64ed97d22d0c03c4ca5fc7594bd0f3d4147659c10110160009b93f541298e"; - azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.5.0" "zip" - "0x6wxb9zrvcayg3yw0nm99p10vvgc0x3zwk9amzs5m682r2z4wap"; + azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "1.0.0" "zip" + "de35e117912832c1a9e93109a8d24cab94f55703a9087b2eb1c5b0655b3b1913"; azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "8.0.0" "zip" "2c43f1a62e5b83304392b0ad7cfdaeef2ef2f47cb3fdfa2577b703b6ea126000"; @@ -367,6 +374,16 @@ let }; }); + azure-synapse-managedprivateendpoints = super.azure-synapse-managedprivateendpoints.overrideAttrs(oldAttrs: rec { + version = "0.3.0"; + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "sha256-fN1IuZ9fjxgRZv6qh9gg6v6KYpnKlXfnoLqfZCDXoRY="; + extension = "zip"; + }; + }); + azure-synapse-spark = super.azure-synapse-spark.overrideAttrs(oldAttrs: rec { version = "0.2.0"; src = super.fetchPypi { diff --git a/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/nixpkgs/pkgs/tools/admin/eksctl/default.nix index d152ef128392..9dcdfef17e78 100644 --- a/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.62.0"; + version = "0.66.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-1WIkUXqcDagrAivozgLjXsiIUsVQ7mOp2ODivHEfNkQ="; + sha256 = "sha256-taKLOL3bdKFdLc6WbF7Q1vCqkRvv/X1NTvSSaYRYHyU="; }; - vendorSha256 = "sha256-AWNTjqEeSEoXO9wcpEXM3y1AeqQYlbswjr0kXvXqGjk="; + vendorSha256 = "sha256-AHkMFuL1zWnv6Z4kCnKsZdqZZaYsQ8AIDmMOLQ+HvkI="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix b/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix index 544ffcaf1ab3..f217408c28d0 100644 --- a/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.40.2"; + version = "1.42.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-J5Wid/Xq3wYY+2/RoFgdY5ZDdNQu8TkTF9W6YLvnwvM="; + sha256 = "sha256-t6/w998mTsFl/V/zcbVxokJk4VZWDoOXsjr93GW7Zh4="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix b/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix new file mode 100644 index 000000000000..c96c6c0ad090 --- /dev/null +++ b/nixpkgs/pkgs/tools/admin/fits-cloudctl/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "fits-cloudctl"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "fi-ts"; + repo = "cloudctl"; + rev = "v${version}"; + sha256 = "09v5fgqf4c2d6k2z638g29mcsmdisg3zfq1g7330wsd7yaxv9m23"; + }; + + vendorSha256 = "1rdqih04mlp33m69y9zxm4llx8cafwqhjhfxw873s8b35j0xz2m5"; + + meta = with lib; { + description = "Command-line client for FI-TS Finance Cloud Native services"; + homepage = "https://github.com/fi-ts/cloudctl"; + license = licenses.mit; + maintainers = with maintainers; [ j0xaf ]; + mainProgram = "cloudctl"; + }; +} diff --git a/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/Gemfile b/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/Gemfile new file mode 100644 index 000000000000..cc5420979ff5 --- /dev/null +++ b/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' + +gem 'bolt' diff --git a/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/Gemfile.lock b/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/Gemfile.lock new file mode 100644 index 000000000000..4d5554b1173a --- /dev/null +++ b/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/Gemfile.lock @@ -0,0 +1,176 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (2.3.6) + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) + aws-eventstream (1.1.1) + aws-partitions (1.493.0) + aws-sdk-core (3.119.1) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.239.0) + aws-sigv4 (~> 1.1) + jmespath (~> 1.0) + aws-sdk-ec2 (1.260.0) + aws-sdk-core (~> 3, >= 3.119.0) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.2.4) + aws-eventstream (~> 1, >= 1.0.2) + bindata (2.4.10) + bolt (3.17.0) + CFPropertyList (~> 2.2) + addressable (~> 2.5) + aws-sdk-ec2 (~> 1) + concurrent-ruby (~> 1.0) + ffi (>= 1.9.25, < 2.0.0) + hiera-eyaml (~> 3) + jwt (~> 2.2) + logging (~> 2.2) + minitar (~> 0.6) + net-scp (~> 1.2) + net-ssh (>= 4.0) + net-ssh-krb (~> 0.5) + orchestrator_client (~> 0.5) + puppet (>= 6.18.0) + puppet-resource_api (>= 1.8.1) + puppet-strings (~> 2.3) + puppetfile-resolver (~> 0.5) + r10k (~> 3.1) + ruby_smb (~> 1.0) + terminal-table (~> 1.8) + winrm (~> 2.0) + winrm-fs (~> 1.3) + builder (3.2.4) + colored2 (3.1.2) + concurrent-ruby (1.1.9) + connection_pool (2.2.5) + cri (2.15.10) + deep_merge (1.2.1) + erubi (1.10.0) + facter (4.2.3) + hocon (~> 1.3) + thor (>= 1.0.1, < 2.0) + faraday (0.17.4) + multipart-post (>= 1.2, < 3) + faraday_middleware (0.14.0) + faraday (>= 0.7.4, < 1.0) + fast_gettext (1.1.2) + ffi (1.15.3) + gettext (3.2.9) + locale (>= 2.0.5) + text (>= 1.3.0) + gettext-setup (0.34) + fast_gettext (~> 1.1.0) + gettext (>= 3.0.2, < 3.3.0) + locale + gssapi (1.3.1) + ffi (>= 1.0.1) + gyoku (1.3.1) + builder (>= 2.1.2) + hiera (3.7.0) + hiera-eyaml (3.2.2) + highline + optimist + highline (2.0.3) + hocon (1.3.1) + httpclient (2.8.3) + jmespath (1.4.0) + jwt (2.2.3) + little-plugger (1.1.4) + locale (2.1.3) + log4r (1.1.10) + logging (2.3.0) + little-plugger (~> 1.1) + multi_json (~> 1.14) + minitar (0.9) + molinillo (0.8.0) + multi_json (1.15.0) + multipart-post (2.1.1) + net-http-persistent (4.0.1) + connection_pool (~> 2.2) + net-scp (1.2.1) + net-ssh (>= 2.6.5) + net-ssh (6.1.0) + net-ssh-krb (0.5.1) + gssapi (~> 1.3.0) + net-ssh (>= 2.0) + nori (2.6.0) + optimist (3.0.1) + orchestrator_client (0.5.2) + faraday + net-http-persistent + public_suffix (4.0.6) + puppet (7.10.0) + concurrent-ruby (~> 1.0) + deep_merge (~> 1.0) + facter (> 2.0.1, < 5) + fast_gettext (~> 1.1) + hiera (>= 3.2.1, < 4) + locale (~> 2.1) + multi_json (~> 1.10) + puppet-resource_api (~> 1.5) + scanf (~> 1.0) + semantic_puppet (~> 1.0) + puppet-resource_api (1.8.14) + hocon (>= 1.0) + puppet-strings (2.8.0) + rgen + yard (~> 0.9.5) + puppet_forge (2.3.4) + faraday (>= 0.9.0, < 0.18.0, != 0.13.1) + faraday_middleware (>= 0.9.0, < 0.15.0) + gettext-setup (~> 0.11) + minitar + semantic_puppet (~> 1.0) + puppetfile-resolver (0.5.0) + molinillo (~> 0.6) + semantic_puppet (~> 1.0) + r10k (3.11.0) + colored2 (= 3.1.2) + cri (= 2.15.10) + fast_gettext (~> 1.1.0) + gettext (>= 3.0.2, < 3.3.0) + gettext-setup (~> 0.24) + jwt (~> 2.2.3) + log4r (= 1.1.10) + multi_json (~> 1.10) + puppet_forge (~> 2.3.0) + rgen (0.8.2) + ruby_smb (1.1.0) + bindata + rubyntlm + windows_error + rubyntlm (0.6.3) + rubyzip (2.3.2) + scanf (1.0.0) + semantic_puppet (1.0.4) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + text (1.3.1) + thor (1.1.0) + unicode-display_width (1.7.0) + windows_error (0.1.2) + winrm (2.3.6) + builder (>= 2.1.2) + erubi (~> 1.8) + gssapi (~> 1.2) + gyoku (~> 1.0) + httpclient (~> 2.2, >= 2.2.0.2) + logging (>= 1.6.1, < 3.0) + nori (~> 2.0) + rubyntlm (~> 0.6.0, >= 0.6.3) + winrm-fs (1.3.5) + erubi (~> 1.8) + logging (>= 1.6.1, < 3.0) + rubyzip (~> 2.0) + winrm (~> 2.0) + yard (0.9.26) + +PLATFORMS + ruby + +DEPENDENCIES + bolt + +BUNDLED WITH + 2.1.4 diff --git a/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/default.nix b/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/default.nix new file mode 100644 index 000000000000..0ad9dc5ec87d --- /dev/null +++ b/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/default.nix @@ -0,0 +1,13 @@ +{ bundlerApp, makeWrapper }: + +bundlerApp { + pname = "bolt"; + gemdir = ./.; + exes = [ "bolt" ]; + buildInputs = [ makeWrapper ]; + + postBuild = '' + # Set BOLT_GEM=1 to remove warning + wrapProgram $out/bin/bolt --set BOLT_GEM 1 + ''; +} diff --git a/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/gemset.nix b/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/gemset.nix new file mode 100644 index 000000000000..9ea6423f29d9 --- /dev/null +++ b/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/gemset.nix @@ -0,0 +1,710 @@ +{ + addressable = { + dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "022r3m9wdxljpbya69y2i3h9g3dhhfaqzidf95m6qjzms792jvgp"; + type = "gem"; + }; + version = "2.8.0"; + }; + 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 = "1qq2fsccafv3lag6c86xai9nbiszfhzfdj9hla9iphjpa1wlfqcp"; + type = "gem"; + }; + version = "1.493.0"; + }; + aws-sdk-core = { + dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l09wjfa3y38jc5njqcxmj4f6gra79adhxzmsym2cvcrazcv272w"; + type = "gem"; + }; + version = "3.119.1"; + }; + aws-sdk-ec2 = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07l9nsd9fk42qbc727s73qylrrbag6l1qig5xgcfqjh2m2qjb9b4"; + type = "gem"; + }; + version = "1.260.0"; + }; + aws-sigv4 = { + dependencies = ["aws-eventstream"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cb9hsg0x9v4yk6sxif8968sg646qphmsjaqy9z8p7y3my5bkrf0"; + type = "gem"; + }; + version = "1.2.4"; + }; + bindata = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06lqi4svq5qls9f7nnvd2zmjdqmi2sf82sq78ci5d78fq0z5x2vr"; + type = "gem"; + }; + version = "2.4.10"; + }; + bolt = { + dependencies = ["CFPropertyList" "addressable" "aws-sdk-ec2" "concurrent-ruby" "ffi" "hiera-eyaml" "jwt" "logging" "minitar" "net-scp" "net-ssh" "net-ssh-krb" "orchestrator_client" "puppet" "puppet-resource_api" "puppet-strings" "puppetfile-resolver" "r10k" "ruby_smb" "terminal-table" "winrm" "winrm-fs"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zszklla2j1dh4w9drz03zn20ls5im4vji5wsvn6zbyaj2ivkdiq"; + type = "gem"; + }; + version = "3.17.0"; + }; + builder = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + type = "gem"; + }; + version = "3.2.4"; + }; + CFPropertyList = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hadm41xr1fq3qp74jd9l5q8l0j9083rgklgzsilllwaav7qrrid"; + type = "gem"; + }; + version = "2.3.6"; + }; + colored2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i"; + type = "gem"; + }; + version = "3.1.2"; + }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + type = "gem"; + }; + version = "1.1.9"; + }; + connection_pool = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ffdxhgirgc86qb42yvmfj6v1v0x4lvi0pxn9zhghkff44wzra0k"; + type = "gem"; + }; + version = "2.2.5"; + }; + cri = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h45kw2s4bjwgbfsrncs30av0j4zjync3wmcc6lpdnzbcxs7yms2"; + type = "gem"; + }; + version = "2.15.10"; + }; + deep_merge = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q3picw7zx1xdkybmrnhmk2hycxzaa0jv4gqrby1s90dy5n7fmsb"; + type = "gem"; + }; + version = "1.2.1"; + }; + erubi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l"; + type = "gem"; + }; + version = "1.10.0"; + }; + facter = { + dependencies = ["hocon" "thor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08n13ygl2fripg9a8wxf2p6qpv48dkmq079cbcpw3g351pq38gzk"; + type = "gem"; + }; + version = "4.2.3"; + }; + faraday = { + dependencies = ["multipart-post"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "172dirvq89zk57rv42n00rhbc2qwv1w20w4zjm6zvfqz4rdpnrqi"; + type = "gem"; + }; + version = "0.17.4"; + }; + faraday_middleware = { + dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x7jgvpzl1nm7hqcnc8carq6yj1lijq74jv8pph4sb3bcpfpvcsc"; + type = "gem"; + }; + version = "0.14.0"; + }; + fast_gettext = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ci71w9jb979c379c7vzm88nc3k6lf68kbrsgw9nlx5g4hng0s78"; + type = "gem"; + }; + version = "1.1.2"; + }; + ffi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wgvaclp4h9y8zkrgz8p2hqkrgr4j7kz0366mik0970w532cbmcq"; + type = "gem"; + }; + version = "1.15.3"; + }; + gettext = { + dependencies = ["locale" "text"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0764vj7gacn0aypm2bf6m46dzjzwzrjlmbyx6qwwwzbmi94r40wr"; + type = "gem"; + }; + version = "3.2.9"; + }; + gettext-setup = { + dependencies = ["fast_gettext" "gettext" "locale"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vfnayz20xd8q0sz27816kvgia9z2dpj9fy7z15da239wmmnz7ga"; + type = "gem"; + }; + version = "0.34"; + }; + gssapi = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qdfhj12aq8v0y961v4xv96a1y2z80h3xhvzrs9vsfgf884g6765"; + type = "gem"; + }; + version = "1.3.1"; + }; + gyoku = { + dependencies = ["builder"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wn0sl14396g5lyvp8sjmcb1hw9rbyi89gxng91r7w4df4jwiidh"; + type = "gem"; + }; + version = "1.3.1"; + }; + hiera = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g1bagbb4lvs334gpqyylvcrs7h6q2kn1h162dnvhzqa4rzxap8a"; + type = "gem"; + }; + version = "3.7.0"; + }; + hiera-eyaml = { + dependencies = ["highline" "optimist"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fqn73wdh0ar63f863bda3wj1ii5p8gc3vqzv39l2cwkax6vcqgj"; + type = "gem"; + }; + version = "3.2.2"; + }; + highline = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d"; + type = "gem"; + }; + version = "2.0.3"; + }; + hocon = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mifv4vfvppfdpkd0cwgy634sj0aplz6ys84sp8s11qrnm6vlnmn"; + type = "gem"; + }; + version = "1.3.1"; + }; + httpclient = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + type = "gem"; + }; + version = "2.8.3"; + }; + jmespath = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; + type = "gem"; + }; + version = "1.4.0"; + }; + jwt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "036i5fc09275ms49mw43mh4i9pwaap778ra2pmx06ipzyyjl6bfs"; + type = "gem"; + }; + version = "2.2.3"; + }; + little-plugger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; + type = "gem"; + }; + version = "1.1.4"; + }; + locale = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0997465kxvpxm92fiwc2b16l49mngk7b68g5k35ify0m3q0yxpdn"; + type = "gem"; + }; + version = "2.1.3"; + }; + log4r = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ri90q0frfmigkirqv5ihyrj59xm8pq5zcmf156cbdv4r4l2jicv"; + type = "gem"; + }; + version = "1.1.10"; + }; + logging = { + dependencies = ["little-plugger" "multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pkmhcxi8lp74bq5gz9lxrvaiv5w0745kk7s4bw2b1x07qqri0n9"; + type = "gem"; + }; + version = "2.3.0"; + }; + minitar = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "126mq86x67d1p63acrfka4zx0cx2r0vc93884jggxnrmmnzbxh13"; + type = "gem"; + }; + version = "0.9"; + }; + molinillo = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0p846facmh1j5xmbrpgzadflspvk7bzs3sykrh5s7qi4cdqz5gzg"; + type = "gem"; + }; + version = "0.8.0"; + }; + multi_json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + type = "gem"; + }; + version = "1.15.0"; + }; + multipart-post = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + type = "gem"; + }; + version = "2.1.1"; + }; + net-http-persistent = { + dependencies = ["connection_pool"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yfypmfg1maf20yfd22zzng8k955iylz7iip0mgc9lazw36g8li7"; + type = "gem"; + }; + version = "4.0.1"; + }; + net-scp = { + dependencies = ["net-ssh"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j"; + type = "gem"; + }; + version = "1.2.1"; + }; + net-ssh = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jp3jgcn8cij407xx9ldb5h9c6jv13jc4cf6kk2idclz43ww21c9"; + type = "gem"; + }; + version = "6.1.0"; + }; + net-ssh-krb = { + dependencies = ["gssapi" "net-ssh"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "120mns6drrapn8i63cbgxngjql4cyclv6asyrkgc87bv5prlh50c"; + type = "gem"; + }; + version = "0.5.1"; + }; + nori = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn"; + type = "gem"; + }; + version = "2.6.0"; + }; + optimist = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk"; + type = "gem"; + }; + version = "3.0.1"; + }; + orchestrator_client = { + dependencies = ["faraday" "net-http-persistent"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a0yd89bflsgn7apai7ar76h39jbk56pbhd86x68wnwfbib32nmc"; + type = "gem"; + }; + version = "0.5.2"; + }; + public_suffix = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + type = "gem"; + }; + version = "4.0.6"; + }; + puppet = { + dependencies = ["concurrent-ruby" "deep_merge" "facter" "fast_gettext" "hiera" "locale" "multi_json" "puppet-resource_api" "scanf" "semantic_puppet"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bfqwz6jyx746sf06bh14blf1g2xh7lv5bqpradzpfkxgxcy9j2b"; + type = "gem"; + }; + version = "7.10.0"; + }; + puppet-resource_api = { + dependencies = ["hocon"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dchnnrrx0wd0pcrry5aaqwnbbgvp81g6f3brqhgvkc397kly3lj"; + type = "gem"; + }; + version = "1.8.14"; + }; + puppet-strings = { + dependencies = ["rgen" "yard"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pfxccfyl7i565x95kbaz574scrd5vrrlhx3x5kbcpalps9b06b1"; + type = "gem"; + }; + version = "2.8.0"; + }; + puppet_forge = { + dependencies = ["faraday" "faraday_middleware" "gettext-setup" "minitar" "semantic_puppet"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jp9jczc11vxr6y57lxhxxd59vqa763h4qbsbjh1j0yhfagcv877"; + type = "gem"; + }; + version = "2.3.4"; + }; + puppetfile-resolver = { + dependencies = ["molinillo" "semantic_puppet"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1npaafsafvi2mhcz76gycnshxwrrqq33fl2493v7grq6jw0bsann"; + type = "gem"; + }; + version = "0.5.0"; + }; + r10k = { + dependencies = ["colored2" "cri" "fast_gettext" "gettext" "gettext-setup" "jwt" "log4r" "multi_json" "puppet_forge"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "004z9nhgc3w33snrcyjikhrw53nk5nprysq9l3dkssv79ygfw5dg"; + type = "gem"; + }; + version = "3.11.0"; + }; + rgen = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "077kbdnn4cp6jks0w4xsybpiw2cc8y2c7hw7zx5dpf9cwzl7mq0p"; + type = "gem"; + }; + version = "0.8.2"; + }; + ruby_smb = { + dependencies = ["bindata" "rubyntlm" "windows_error"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "125pimmaskp13nkk5j138nfk1kd8n91sfdlx4dhj2j9zk342wsf4"; + type = "gem"; + }; + version = "1.1.0"; + }; + rubyntlm = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b8hczk8hysv53ncsqzx4q6kma5gy5lqc7s5yx8h64x3vdb18cjv"; + type = "gem"; + }; + version = "0.6.3"; + }; + rubyzip = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + type = "gem"; + }; + version = "2.3.2"; + }; + scanf = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "000vxsci3zq8m1wl7mmppj7sarznrqlm6v2x2hdfmbxcwpvvfgak"; + type = "gem"; + }; + version = "1.0.0"; + }; + semantic_puppet = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gg1bizlgb8wswxwy3irgppqvd6mlr27qsp0fzpm459wffzq10sx"; + type = "gem"; + }; + version = "1.0.4"; + }; + terminal-table = { + dependencies = ["unicode-display_width"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; + type = "gem"; + }; + version = "1.8.0"; + }; + text = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x6kkmsr49y3rnrin91rv8mpc3dhrf3ql08kbccw8yffq61brfrg"; + type = "gem"; + }; + version = "1.3.1"; + }; + thor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; + type = "gem"; + }; + version = "1.1.0"; + }; + unicode-display_width = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna"; + type = "gem"; + }; + version = "1.7.0"; + }; + windows_error = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kbcv9j5sc7pvjzf1dkp6h69i6lmj205zyy2arxcfgqg11bsz2kp"; + type = "gem"; + }; + version = "0.1.2"; + }; + winrm = { + dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nxf6a47d1xf1nvi7rbfbzjyyjhz0iakrnrsr2hj6y24a381sd8i"; + type = "gem"; + }; + version = "2.3.6"; + }; + winrm-fs = { + dependencies = ["erubi" "logging" "rubyzip" "winrm"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gb91k6s1yjqw387x4w1nkpnxblq3pjdqckayl0qvz5n3ygdsb0d"; + type = "gem"; + }; + version = "1.3.5"; + }; + yard = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qzr5j1a1cafv81ib3i51qyl8jnmwdxlqi3kbiraldzpbjh4ln9h"; + type = "gem"; + }; + version = "0.9.26"; + }; +} diff --git a/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix b/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix index d812cd4b294f..549b60c6dbeb 100644 --- a/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.7.0"; + version = "1.7.3"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CO+2BpMIUSaOhdia75zDGR4RZQSaxY05Z6TOKxBlKIw="; + sha256 = "sha256-Hlh2nfqQD+HMoJ2n1vfffn5ieEKSMtXpdoM0ydFQqrc="; }; - vendorSha256 = "sha256-LOSHoEP0YRjfHav3MXSYPPrrjX6/ItxeVMOihRx0DTQ="; + vendorSha256 = "sha256-DTNwgerJ7qZxH4imdrST7TaR20oevDluEDgAlubg5hw="; subPackages = [ "cmd/stripe" diff --git a/nixpkgs/pkgs/tools/archivers/cpio/default.nix b/nixpkgs/pkgs/tools/archivers/cpio/default.nix index 5b88e10b1c37..5b57dc20e3bf 100644 --- a/nixpkgs/pkgs/tools/archivers/cpio/default.nix +++ b/nixpkgs/pkgs/tools/archivers/cpio/default.nix @@ -1,19 +1,32 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, fetchpatch }: -let +stdenv.mkDerivation rec { + pname = "cpio"; version = "2.13"; - name = "cpio-${version}"; -in stdenv.mkDerivation { - inherit name; src = fetchurl { - url = "mirror://gnu/cpio/${name}.tar.bz2"; + url = "mirror://gnu/cpio/cpio-${version}.tar.bz2"; sha256 = "0vbgnhkawdllgnkdn6zn1f56fczwk0518krakz2qbwhxmv2vvdga"; }; - preConfigure = if stdenv.isCygwin then '' + patches = let + fp = suffix: rev: sha256: fetchpatch { + name = "CVE-2021-38185-${suffix}.patch"; + url = "https://git.savannah.gnu.org/cgit/cpio.git/patch/?id=${rev}"; + inherit sha256; + }; + in [ + (fp "1" "dd96882877721703e19272fe25034560b794061b" + "0vmr0qjwj2ldnzsvccl105ckwgx3ssvn9mp3f27ss0kiyigrzz32") + (fp "2" "dfc801c44a93bed7b3951905b188823d6a0432c8" + "1qkrhi3lbxk6hflp6w3h4sgssc0wblv8r0qgxqzbjrm36pqwxiwh") + (fp "3" "236684f6deb3178043fe72a8e2faca538fa2aae1" + "0pidkbxalpj5yz4fr95x8h0rizgjij0xgvjgirfkjk460giawwg6") + ]; + + preConfigure = lib.optionalString stdenv.isCygwin '' sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,' - '' else null; + ''; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/tools/archivers/sharutils/default.nix b/nixpkgs/pkgs/tools/archivers/sharutils/default.nix index c785211e682f..ec0f096915f1 100644 --- a/nixpkgs/pkgs/tools/archivers/sharutils/default.nix +++ b/nixpkgs/pkgs/tools/archivers/sharutils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gettext, coreutils }: stdenv.mkDerivation rec { - name = "sharutils-4.15.2"; + pname = "sharutils"; + version = "4.15.2"; src = fetchurl { - url = "mirror://gnu/sharutils/${name}.tar.xz"; + url = "mirror://gnu/sharutils/sharutils-${version}.tar.xz"; sha256 = "16isapn8f39lnffc3dp4dan05b7x6mnc76v6q5nn8ysxvvvwy19b"; }; diff --git a/nixpkgs/pkgs/tools/archivers/unzip/default.nix b/nixpkgs/pkgs/tools/archivers/unzip/default.nix index e74637ca25ec..584f981aff70 100644 --- a/nixpkgs/pkgs/tools/archivers/unzip/default.nix +++ b/nixpkgs/pkgs/tools/archivers/unzip/default.nix @@ -3,11 +3,12 @@ , enableNLS ? false, libnatspec }: -stdenv.mkDerivation { - name = "unzip-6.0"; +stdenv.mkDerivation rec { + pname = "unzip"; + version = "6.0"; src = fetchurl { - url = "mirror://sourceforge/infozip/unzip60.tar.gz"; + url = "mirror://sourceforge/infozip/unzip${lib.replaceStrings ["."] [""] version}.tar.gz"; sha256 = "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83"; }; diff --git a/nixpkgs/pkgs/tools/archivers/zip/default.nix b/nixpkgs/pkgs/tools/archivers/zip/default.nix index 58c748fe4e8a..ab91cfc64834 100644 --- a/nixpkgs/pkgs/tools/archivers/zip/default.nix +++ b/nixpkgs/pkgs/tools/archivers/zip/default.nix @@ -2,12 +2,13 @@ assert enableNLS -> libnatspec != null; -stdenv.mkDerivation { - name = "zip-3.0"; +stdenv.mkDerivation rec { + pname = "zip"; + version = "3.0"; src = fetchurl { urls = [ - "ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz" + "ftp://ftp.info-zip.org/pub/infozip/src/zip${lib.replaceStrings ["."] [""] version}.tgz" "https://src.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz" ]; sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"; diff --git a/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/nixpkgs/pkgs/tools/audio/abcmidi/default.nix index 16c6e0fc8a07..073d61a3d4c0 100644 --- a/nixpkgs/pkgs/tools/audio/abcmidi/default.nix +++ b/nixpkgs/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2021.06.27"; + version = "2021.09.15"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "sha256-tLKxs1p1CIU/2XV1fMgWrwdtePeXOBZUMjz46kgp9C0="; + sha256 = "sha256-BrEgvrAHNfJpFTlI8tec+9w3G+5YR15lbzh/RKKpQ1c="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/audio/dir2opus/default.nix b/nixpkgs/pkgs/tools/audio/dir2opus/default.nix index d23c334ad62f..c9729fa43d87 100644 --- a/nixpkgs/pkgs/tools/audio/dir2opus/default.nix +++ b/nixpkgs/pkgs/tools/audio/dir2opus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python, mutagen, wrapPython, opusTools, mpg123 }: +{ lib, stdenv, fetchFromGitHub, python, mutagen, wrapPython, opusTools, mpg123 }: let version = "0.12.2"; in stdenv.mkDerivation rec { @@ -9,10 +9,11 @@ stdenv.mkDerivation rec { buildInputs = [ wrapPython ]; propagatedBuildInputs = [ opusTools mpg123 ]; - src = fetchurl { - url = "https://github.com/ehmry/dir2opus/archive/${version}.tar.gz"; - name = "${pname}-${version}.tar.gz"; - sha256 = "0bl8fa9zhccihnj1v3lpz5jb737frf9za06xb7j5rsjws6xky80d"; + src = fetchFromGitHub { + owner = "ehmry"; + repo = "dir2opus"; + rev = version; + hash = "sha256-ZEsXwqxikWxFOz99wTI3rEK/rEYA+BSWGrCwW4q+FFc="; }; postPatch = "sed -i -e 's|#!/usr/bin/python|#!${python}/bin/python|' dir2opus"; diff --git a/nixpkgs/pkgs/tools/audio/kaldi/default.nix b/nixpkgs/pkgs/tools/audio/kaldi/default.nix index 2d61a984a00d..ef725408b13e 100644 --- a/nixpkgs/pkgs/tools/audio/kaldi/default.nix +++ b/nixpkgs/pkgs/tools/audio/kaldi/default.nix @@ -54,6 +54,9 @@ stdenv.mkDerivation { # fix up this call: # https://github.com/kaldi-asr/kaldi/blob/c9d8b9ad3fef89237ba5517617d977b7d70a7ed5/cmake/VersionHelper.cmake#L8 echo 0 + elif [[ "$1" == "rev-parse" ]]; then + echo ${openfst.rev} + echo 0 fi true EOF diff --git a/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix b/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix index b90ab80befdc..71d823244fae 100644 --- a/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix +++ b/nixpkgs/pkgs/tools/audio/mpd-mpris/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mpd-mpris"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "natsukagami"; repo = pname; rev = "v${version}"; - sha256 = "1kzjbv04b2garb99l64wdq8yksnm4pbhkgyzh89j5j3gb9k55zal"; + sha256 = "sha256-eI7/E5rhNCZfURwGkfa0f+Yie1EU8zR9r+1eAqrlmVY="; }; - vendorSha256 = "1ggrqwd3h602rav1dc3amsf4wxsq8mdq4ijkdsg759sqhpzl6rqs"; + vendorSha256 = "sha256-GmdD/4VYp3KeblNGgltFWHdOnK5qsBa2ygIYOBrH+b0="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/audio/playerctl/default.nix b/nixpkgs/pkgs/tools/audio/playerctl/default.nix index 15ebb93e4e80..d9f408bf9eda 100644 --- a/nixpkgs/pkgs/tools/audio/playerctl/default.nix +++ b/nixpkgs/pkgs/tools/audio/playerctl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "playerctl"; - version = "2.3.1"; + version = "2.4.1"; src = fetchFromGitHub { owner = "acrisci"; repo = "playerctl"; rev = "v${version}"; - sha256 = "00z5c6amlxd3q42l7x8i0ngl627dxglgg5vikbbhjp9ms34xbxdn"; + sha256 = "sha256-OiGKUnsKX0ihDRceZoNkcZcEAnz17h2j2QUOSVcxQEY="; }; nativeBuildInputs = [ meson ninja pkg-config gtk-doc docbook_xsl gobject-introspection ]; diff --git a/nixpkgs/pkgs/tools/audio/tts/default.nix b/nixpkgs/pkgs/tools/audio/tts/default.nix index 2f8a9ac82a67..d15a03bc83ee 100644 --- a/nixpkgs/pkgs/tools/audio/tts/default.nix +++ b/nixpkgs/pkgs/tools/audio/tts/default.nix @@ -16,13 +16,13 @@ python3.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.2.2"; + version = "0.3.1"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "v${version}"; - sha256 = "sha256-hhL6/hBs2umR8/VEumr2LzuCAOkroK8vBfDuNVY0ygw="; + sha256 = "sha256-/CeetLm3jgS5Q69zTVkLm+Wh4nD7D4c6j9MTujMc3fU="; }; postPatch = '' @@ -69,7 +69,7 @@ python3.pkgs.buildPythonApplication rec { cp -r TTS/server/templates/ $out/${python3.sitePackages}/TTS/server # cython modules are not installed for some reasons ( - cd TTS/tts/layers/glow_tts/monotonic_align + cd TTS/tts/utils/monotonic_align ${python3.interpreter} setup.py install --prefix=$out ) ''; diff --git a/nixpkgs/pkgs/tools/backup/automysqlbackup/default.nix b/nixpkgs/pkgs/tools/backup/automysqlbackup/default.nix index 5ecdcc4e7edb..f103149a83d7 100644 --- a/nixpkgs/pkgs/tools/backup/automysqlbackup/default.nix +++ b/nixpkgs/pkgs/tools/backup/automysqlbackup/default.nix @@ -1,16 +1,16 @@ -{ lib, stdenv, fetchurl, makeWrapper, mariadb, mailutils, pbzip2, pigz, bzip2, gzip }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, mariadb, mailutils, pbzip2, pigz, bzip2, gzip }: stdenv.mkDerivation rec { pname = "automysqlbackup"; - version = "3.0_rc6"; + version = "3.0.7"; - src = fetchurl { - url = "mirror://sourceforge/automysqlbackup/AutoMySQLBackup/AutoMySQLBackup%20VER%203.0/automysqlbackup-v${version}.tar.gz"; - sha256 = "1h1wq86q6my1a682nr8pjagjhai4lxz967m17lhpw1vb116hd7l8"; + src = fetchFromGitHub { + owner = "sixhop"; + repo = pname; + rev = version; + sha256 = "sha256-C0p1AY4yIxybQ6a/HsE3ZTHumtvQw5kKM51Ap+Se0ZI="; }; - sourceRoot = "."; - nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A script to run daily, weekly and monthly backups for your MySQL database"; - homepage = "https://sourceforge.net/projects/automysqlbackup/"; + homepage = "https://github.com/sixhop/AutoMySQLBackup"; platforms = platforms.linux; maintainers = [ maintainers.aanderse ]; license = licenses.gpl2Plus; diff --git a/nixpkgs/pkgs/tools/backup/autorestic/default.nix b/nixpkgs/pkgs/tools/backup/autorestic/default.nix new file mode 100644 index 000000000000..ab299db1c675 --- /dev/null +++ b/nixpkgs/pkgs/tools/backup/autorestic/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitHub, installShellFiles, buildGoModule }: + +buildGoModule rec { + pname = "autorestic"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "cupcakearmy"; + repo = pname; + rev = "v${version}"; + sha256 = "yQgSJ0SQNWPMyrYn8rep+1b549HP8sOERh+kOiAK3+c="; + }; + + vendorSha256 = "7648gAguqeqLKFS9xRcx20wpSLb+ykZ7rOqR5PKe71o="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd autorestic \ + --bash <($out/bin/autorestic completion bash) \ + --fish <($out/bin/autorestic completion fish) \ + --zsh <($out/bin/autorestic completion zsh) + ''; + + meta = with lib; { + description = "High level CLI utility for restic"; + homepage = "https://github.com/cupcakearmy/autorestic"; + license = licenses.asl20; + maintainers = with maintainers; [ renesat ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/nixpkgs/pkgs/tools/backup/borgmatic/default.nix b/nixpkgs/pkgs/tools/backup/borgmatic/default.nix index b27ee0508e19..2fe7d0866745 100644 --- a/nixpkgs/pkgs/tools/backup/borgmatic/default.nix +++ b/nixpkgs/pkgs/tools/backup/borgmatic/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "1.5.13"; + version = "1.5.18"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "12390ffdg30ncc5k92pvagwbvnsh42xl35a3nagbskznyfd23mw3"; + sha256 = "sha256-dX1U1zza8zMhDiTLE+DgtN6RLRciLks4NDOukpKH/po="; }; checkInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ]; @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ borgbackup colorama - pykwalify + jsonschema ruamel_yaml requests setuptools diff --git a/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/deps.nix index f861a9cfdfb0..7b34bccecb5c 100644 --- a/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/deps.nix +++ b/nixpkgs/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -3,7 +3,7 @@ (fetchNuGet { name = "Gress"; version = "1.2.0"; sha256 = "0aidc9whi0718gh896j7xkyndki9x7rifd8n1n681afb2zbxw4bn"; }) (fetchNuGet { name = "JsonExtensions"; version = "1.1.0"; sha256 = "1fqxb2jdbvjgg135wmy890qf63r056dq16jy7wgzkgp21m3j0lgy"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Ref"; version = "3.1.10"; sha256 = "0xn4zh7shvijqlr03fqsmps6gz856isd9bg9rk4z2c4599ggal77"; }) - (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.14"; sha256 = "11rqnascx9asfyxgxzwgxgr9gxxndm552k4dn4p1s57ciz7vkg9h"; }) + (fetchNuGet { name = "Microsoft.NETCore.App.Host.linux-x64"; version = "3.1.19"; sha256 = "10fs93kg8vhhm1l05815m8yqz796i6gk824pk1bps239mshmkybr"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Ref"; version = "3.1.0"; sha256 = "08svsiilx9spvjamcnjswv0dlpdrgryhr3asdz7cvnl914gjzq4y"; }) (fetchNuGet { name = "MiniRazor.CodeGen"; version = "2.1.4"; sha256 = "1856hfw2wl3ilxmpg4jmwpigmq0rm50i9pmy3sq8f1xc8j44kzl2"; }) (fetchNuGet { name = "MiniRazor.Runtime"; version = "2.1.4"; sha256 = "1pc3kjbnz810a8bb94k6355rflmayigfmpfmc4jzzx6l6iavnnc4"; }) diff --git a/nixpkgs/pkgs/tools/backup/rdedup/default.nix b/nixpkgs/pkgs/tools/backup/rdedup/default.nix index 482d1aec8da6..8f3cc71de1bc 100644 --- a/nixpkgs/pkgs/tools/backup/rdedup/default.nix +++ b/nixpkgs/pkgs/tools/backup/rdedup/default.nix @@ -4,20 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "rdedup"; - version = "3.1.1"; + version = "3.2.1"; src = fetchFromGitHub { owner = "dpc"; repo = "rdedup"; - rev = "rdedup-v${version}"; - sha256 = "0y34a3mpghdmcb2rx4z62q0s351bfmy1287d75mm07ryfgglgsd7"; + rev = "v${version}"; + sha256 = "sha256-GEYP18CaCQShvCg8T7YTvlybH1LNO34KBxgmsTv2Lzs="; }; - cargoSha256 = "1k0pl9i7zf1ki5ch2zxc1fqsf94bxjlvjrkh0500cycwqcdys296"; - - cargoPatches = [ - ./v3.1.1-fix-Cargo.lock.patch - ]; + cargoSha256 = "sha256-I6d3IyPBcUsrvlzF7W0hFM4hcXi4wWro9bCeP4eArHI="; nativeBuildInputs = [ pkg-config llvmPackages.libclang clang ]; buildInputs = [ openssl libsodium xz ] diff --git a/nixpkgs/pkgs/tools/backup/rdedup/v3.1.1-fix-Cargo.lock.patch b/nixpkgs/pkgs/tools/backup/rdedup/v3.1.1-fix-Cargo.lock.patch deleted file mode 100644 index 7dafc7765b7d..000000000000 --- a/nixpkgs/pkgs/tools/backup/rdedup/v3.1.1-fix-Cargo.lock.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 96be83a..fe07471 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -880,12 +880,12 @@ dependencies = [ - - [[package]] - name = "rdedup" --version = "3.1.0" -+version = "3.1.1" - dependencies = [ - "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", - "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -- "rdedup-lib 3.0.0", -+ "rdedup-lib 3.1.0", - "rpassword 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "slog 2.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "slog-async 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -900,7 +900,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] - name = "rdedup-lib" --version = "3.0.0" -+version = "3.1.0" - dependencies = [ - "backblaze-b2 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "base64 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/nixpkgs/pkgs/tools/backup/rsnapshot/default.nix b/nixpkgs/pkgs/tools/backup/rsnapshot/default.nix index 3ded8c6b8482..7a903288c671 100644 --- a/nixpkgs/pkgs/tools/backup/rsnapshot/default.nix +++ b/nixpkgs/pkgs/tools/backup/rsnapshot/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rsnapshot"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { url = "https://rsnapshot.org/downloads/rsnapshot-${version}.tar.gz"; - sha256 = "1lavqmmsf53pim0nvming7fkng6p0nk2a51k2c2jdq0l7snpl31b"; + sha256 = "sha256-wct8t0jFqWVsOGNivfbCZ5WXN3JKu1Bfv56UCp2YhXk="; }; propagatedBuildInputs = [perl openssh rsync logger]; diff --git a/nixpkgs/pkgs/tools/backup/wal-e/default.nix b/nixpkgs/pkgs/tools/backup/wal-e/default.nix index 8e54b58e2017..544f61918de9 100644 --- a/nixpkgs/pkgs/tools/backup/wal-e/default.nix +++ b/nixpkgs/pkgs/tools/backup/wal-e/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, python3Packages, lzop, postgresql, pv }: +{ lib, fetchFromGitHub, python3Packages, lzop, postgresql, pv }: python3Packages.buildPythonApplication rec { pname = "wal-e"; @@ -6,9 +6,11 @@ python3Packages.buildPythonApplication rec { namePrefix = ""; - src = fetchurl { - url = "https://github.com/wal-e/wal-e/archive/v${version}.tar.gz"; - sha256 = "5TTd7NTO73+MCJf3dHIcNojjHdoaKJ1T051iW7Kt9Ow="; + src = fetchFromGitHub { + owner = "wal-e"; + repo = "wal-e"; + rev = "v${version}"; + hash = "sha256-I6suHkAYzDtlNFNPH4SziY93Ryp+NTHkCBuojDvv+U4="; }; # needs tox @@ -27,7 +29,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A Postgres WAL-shipping disaster recovery and replication toolkit"; homepage = "https://github.com/wal-e/wal-e"; - maintainers = []; + maintainers = [ ]; license = lib.licenses.bsd3; platforms = lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/backup/zbackup/default.nix b/nixpkgs/pkgs/tools/backup/zbackup/default.nix index 12913ed62225..795a45f8864d 100644 --- a/nixpkgs/pkgs/tools/backup/zbackup/default.nix +++ b/nixpkgs/pkgs/tools/backup/zbackup/default.nix @@ -1,13 +1,18 @@ -{ lib, stdenv, fetchurl, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind } : -stdenv.mkDerivation { +{ lib, stdenv, fetchFromGitHub, cmake, zlib, openssl, protobuf, protobufc, lzo, libunwind }: +stdenv.mkDerivation rec { pname = "zbackup"; version = "1.4.4"; - src = fetchurl { - url = "https://github.com/zbackup/zbackup/archive/1.4.4.tar.gz"; - sha256 = "11csla7n44lg7x6yqg9frb21vnkr8cvnh6ardibr3nj5l39crk7g"; + + src = fetchFromGitHub { + owner = "zbackup"; + repo = "zbackup"; + rev = version; + hash = "sha256-9Fk4EhEeQ2J4Kirc7oad4CzmW70Mmza6uozd87qfgZI="; }; + buildInputs = [ zlib openssl protobuf lzo libunwind ]; nativeBuildInputs = [ cmake protobufc ]; + meta = { description = "A versatile deduplicating backup tool"; homepage = "http://zbackup.org/"; diff --git a/nixpkgs/pkgs/tools/bootloaders/refind/default.nix b/nixpkgs/pkgs/tools/bootloaders/refind/default.nix index 600967e996c0..c8dc645d69b4 100644 --- a/nixpkgs/pkgs/tools/bootloaders/refind/default.nix +++ b/nixpkgs/pkgs/tools/bootloaders/refind/default.nix @@ -14,11 +14,11 @@ in stdenv.mkDerivation rec { pname = "refind"; - version = "0.13.1"; + version = "0.13.2"; src = fetchurl { url = "mirror://sourceforge/project/refind/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "1yjni0mr3rqrrk4ynwb8i0whpqhd56cck4mxd97qmxn7wbr826i9"; + sha256 = "0w6990ggns4xsdmgj3aq527q15frrxfmxwa3m6igabd4ai498n6x"; }; patches = [ diff --git a/nixpkgs/pkgs/tools/compression/upx/default.nix b/nixpkgs/pkgs/tools/compression/upx/default.nix index 10e02626c017..aff00402ed97 100644 --- a/nixpkgs/pkgs/tools/compression/upx/default.nix +++ b/nixpkgs/pkgs/tools/compression/upx/default.nix @@ -8,15 +8,19 @@ stdenv.mkDerivation rec { sha256 = "051pk5jk8fcfg5mpgzj43z5p4cn7jy5jbyshyn78dwjqr7slsxs7"; }; - CXXFLAGS = "-Wno-unused-command-line-argument"; - buildInputs = [ ucl zlib perl ]; preConfigure = '' export UPX_UCLDIR=${ucl} ''; - makeFlags = [ "-C" "src" "CHECK_WHITESPACE=true" ]; + makeFlags = [ + "-C" "src" + "CHECK_WHITESPACE=true" + + # Disable blanket -Werror. Triggers failues on minor gcc-11 warnings. + "CXXFLAGS_WERROR=" + ]; installPhase = '' mkdir -p $out/bin diff --git a/nixpkgs/pkgs/tools/compression/xz/default.nix b/nixpkgs/pkgs/tools/compression/xz/default.nix index cc021a1ef051..8304c34af897 100644 --- a/nixpkgs/pkgs/tools/compression/xz/default.nix +++ b/nixpkgs/pkgs/tools/compression/xz/default.nix @@ -8,10 +8,11 @@ # files. stdenv.mkDerivation rec { - name = "xz-5.2.5"; + pname = "xz"; + version = "5.2.5"; src = fetchurl { - url = "https://tukaani.org/xz/${name}.tar.bz2"; + url = "https://tukaani.org/xz/xz-${version}.tar.bz2"; sha256 = "1ps2i8i212n0f4xpq6clp7h13q7m1y8slqvxha9i8d0bj0qgj5si"; }; diff --git a/nixpkgs/pkgs/tools/compression/zstd/default.nix b/nixpkgs/pkgs/tools/compression/zstd/default.nix index f87a144f7cc9..1f9b4a505ac4 100644 --- a/nixpkgs/pkgs/tools/compression/zstd/default.nix +++ b/nixpkgs/pkgs/tools/compression/zstd/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, bash, gnugrep , fixDarwinDylibNames , file +, fetchpatch , legacySupport ? false , static ? stdenv.hostPlatform.isStatic # these need to be ran on the host, thus disable when cross-compiling @@ -27,6 +28,12 @@ stdenv.mkDerivation rec { # This patches makes sure we do not attempt to use the MD5 implementation # of the host platform when running the tests ./playtests-darwin.patch + + # Fixes linking for static builds + (fetchpatch { + url = "https://github.com/facebook/zstd/pull/2724/commits/e1f85dbca3a0ed5ef06c8396912a0914db8dea6a.patch"; + sha256 = "sha256-PuYAqnJWAE+L9bsroOnnBGJhERW8LHrGSLtIEkKU9vg="; + }) ]; postPatch = lib.optionalString (!static) '' diff --git a/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix b/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix index ba6cb79fbd57..f6dfdd84d8c4 100644 --- a/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/bcache-tools/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv, fetchurl, pkg-config, util-linux, bash }: +{ lib, stdenv, fetchFromGitHub, pkg-config, util-linux, bash }: stdenv.mkDerivation rec { pname = "bcache-tools"; version = "1.0.7"; - src = fetchurl { - name = "${pname}-${version}.tar.gz"; - url = "https://github.com/g2p/bcache-tools/archive/v${version}.tar.gz"; - sha256 = "1gbsh2qw0a7kgck6w0apydiy37nnz5xvdgipa0yqrfmghl86vmv4"; + src = fetchFromGitHub { + owner = "g2p"; + repo = "bcache-tools"; + rev = "v${version}"; + hash = "sha256-Ors2xXRrVTf8Cq3BYnSVSfJy/nyGjT5BGLSNpxOcHR4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix b/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix index 158c7d593992..bdd26041d33a 100644 --- a/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.13"; + version = "5.14.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-Tikh0iA9Jl4qlBu9brB37dXjmBHi1p6MEbLwPc9eWEM="; + sha256 = "sha256-1UqTRlRcpG3xKOPMt31gwJfZDJO34xSZAjbijPr4xVs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/filesystems/catcli/default.nix b/nixpkgs/pkgs/tools/filesystems/catcli/default.nix index 2deeeb2fc09e..b945198e01aa 100644 --- a/nixpkgs/pkgs/tools/filesystems/catcli/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/catcli/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "catcli"; - version = "0.7.0"; + version = "0.7.2"; src = fetchFromGitHub { owner = "deadc0de6"; repo = pname; rev = "v${version}"; - sha256 = "1r30345wzpg8yk542fmgh3khdb91s4sr9hnqxh1s71ifjsrgmpph"; + sha256 = "12928pvwd6jr4x81nxi5691axianm4vz5gql1jazlij0ahc2f905"; }; propagatedBuildInputs = [ docopt anytree ]; diff --git a/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix b/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix index 59b65d4e72ed..8cb9d58bc4ea 100644 --- a/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix @@ -2,6 +2,8 @@ , stdenv , buildGoModule , fetchFromGitHub +, fuse +, makeWrapper , openssl , pandoc , pkg-config @@ -22,6 +24,7 @@ buildGoModule rec { vendorSha256 = "sha256-Q/oBT5xdLpgQCIk7KES6c8+BaCQVUIwCwVufl4oTFRs="; nativeBuildInputs = [ + makeWrapper pkg-config pandoc ]; @@ -48,6 +51,12 @@ buildGoModule rec { popd ''; + postInstall = '' + wrapProgram $out/bin/gocryptfs \ + --prefix PATH : ${lib.makeBinPath [ fuse ]} + ln -s $out/bin/gocryptfs $out/bin/mount.fuse.gocryptfs + ''; + meta = with lib; { description = "Encrypted overlay filesystem written in Go"; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix b/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix index dc1d77bfa7ed..898ba9ed3c15 100644 --- a/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/moosefs/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "moosefs"; - version = "3.0.115"; + version = "3.0.116"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0dap9dqwwx8adma6arxg015riqc86cmjv2m44hk0kz7s24h79ipq"; + sha256 = "sha256-/+l4BURvL1R6te6tlXRJx7YBDyYuMrGnzzhMc9XeXKc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix b/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix index f833d562972a..cef1af964b02 100644 --- a/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "reiser4progs"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { url = "mirror://sourceforge/reiser4/reiser4-utils/${pname}-${version}.tar.gz"; - sha256 = "sha256-WmIkISnRp5BngSfPEKY95HVEt5TBtPKu+RMBwlLsnuA="; + sha256 = "sha256-DBR2C5h6ue4aqHmDG50jCLXe13DSWAYwfibrzTM+7Sw="; }; buildInputs = [libaal]; diff --git a/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix b/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix index b196b2948395..35d0b7af0736 100644 --- a/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/s3backer/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { pname = "s3backer"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { - sha256 = "sha256-67sVT72i8tOMdGH/+Oh1N7Vh/2/qD56ImGWI+tprMOM="; + sha256 = "sha256-b64EEES7gO9s24hk3sZMd9guEhJNfc3DV4/NnBIcJYw="; rev = version; repo = "s3backer"; owner = "archiecobbs"; diff --git a/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix b/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix index 238223c4981e..017fda14cc65 100644 --- a/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/sasquatch/default.nix @@ -43,6 +43,9 @@ stdenv.mkDerivation rec { patchFlags = [ "-p0" ]; postPatch = '' + # Drop blanket -Werror to avoid build failure on fresh toolchains + # like gcc-11. + substituteInPlace squashfs-tools/Makefile --replace ' -Werror' ' ' cd squashfs-tools ''; diff --git a/nixpkgs/pkgs/tools/filesystems/supertag/cargo-lock-update-lexical-core.patch b/nixpkgs/pkgs/tools/filesystems/supertag/cargo-lock-update-lexical-core.patch new file mode 100644 index 000000000000..70c941ddd125 --- /dev/null +++ b/nixpkgs/pkgs/tools/filesystems/supertag/cargo-lock-update-lexical-core.patch @@ -0,0 +1,27 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,5 +1,7 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. ++version = 3 ++ + [[package]] + name = "adler32" + version = "1.2.0" +@@ -530,13 +532,13 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + + [[package]] + name = "lexical-core" +-version = "0.7.4" ++version = "0.7.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616" ++checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" + dependencies = [ + "arrayvec", + "bitflags 1.2.1", +- "cfg-if 0.1.10", ++ "cfg-if 1.0.0", + "ryu", + "static_assertions", + ] diff --git a/nixpkgs/pkgs/tools/filesystems/supertag/default.nix b/nixpkgs/pkgs/tools/filesystems/supertag/default.nix index a9a16582c115..4e7cb8beae57 100644 --- a/nixpkgs/pkgs/tools/filesystems/supertag/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/supertag/default.nix @@ -14,7 +14,11 @@ rustPlatform.buildRustPackage rec { sha256 = "0jzm7pn38hlr96n0z8gqfsfdbw48y0nnbsgjdq7hpgwmcgvgqdam"; }; - cargoSha256 = "093vrpp4in8854hb0h1lxrp8v6i9vfja0l69dnnp7z15qkpbir4f"; + # lexical-core is outdated and incompatible with newer versions of rust + # patches Cargo.lock to include a more up-to-date version of lexical-core + cargoPatches = [ ./cargo-lock-update-lexical-core.patch ]; + + cargoSha256 = "sha256-W5Emkbe1jI9Z+irMckD/3gJO47rACa9E5k5dqAFC1yQ="; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; diff --git a/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix b/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix index cd042f701d3a..41a47566eec5 100644 --- a/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/tar2ext4/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tar2ext4"; - version = "0.8.21"; + version = "0.8.22"; src = fetchFromGitHub { owner = "microsoft"; repo = "hcsshim"; rev = "v${version}"; - sha256 = "sha256-oYCL6agif/BklMY5/ub6PExS6D/ZlTxi1QaabMOsEfw="; + sha256 = "sha256-z8w/xzNEebnQJTO4H5PlU5W+69MY1wQwmuz5inXBl1k="; }; sourceRoot = "source/cmd/tar2ext4"; diff --git a/nixpkgs/pkgs/tools/games/ajour/default.nix b/nixpkgs/pkgs/tools/games/ajour/default.nix index fad140d7456a..ed75e347db0b 100644 --- a/nixpkgs/pkgs/tools/games/ajour/default.nix +++ b/nixpkgs/pkgs/tools/games/ajour/default.nix @@ -34,16 +34,16 @@ let in rustPlatform.buildRustPackage rec { pname = "Ajour"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "casperstorm"; repo = "ajour"; rev = version; - sha256 = "sha256-nz54KPvPmrFGXB52Jn6LKl1aSYgLngARcfC7YIAaC70="; + sha256 = "sha256-tUm5d2JTvYyNFnKgId8mivWTB+v4TURZX293fMd11pk="; }; - cargoSha256 = "sha256-nsuo8PdQpdVJcDY8VDCLISnOz5+Z+MqG/OJC3FYCfEo="; + cargoSha256 = "sha256-SPmfXJLIA4OGEm/S2mi5xmIE9ng7hY3aHm/PCT7pg0E="; nativeBuildInputs = [ autoPatchelfHook diff --git a/nixpkgs/pkgs/tools/games/steam-acf/default.nix b/nixpkgs/pkgs/tools/games/steam-acf/default.nix new file mode 100644 index 000000000000..ea6572216104 --- /dev/null +++ b/nixpkgs/pkgs/tools/games/steam-acf/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "steam-acf"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "chisui"; + repo = "acf"; + rev = "v${version}"; + sha256 = "16q3md7cvdz37pqm1sda81rkjf249xbsrlpdl639r06p7f4nqlc2"; + }; + + cargoSha256 = "0fzlvn0sl7613hpsb7ncykmcl53dgl8rzsg317nwkj2w679q4xq6"; + + meta = with lib; { + description = "Tool to convert Steam .acf files to JSON"; + homepage = "https://github.com/chisui/acf"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ chisui ]; + mainProgram = "acf"; + }; +} diff --git a/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix b/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix index a4117790a148..ceca22eca35d 100644 --- a/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix +++ b/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix @@ -4,24 +4,22 @@ stdenv.mkDerivation rec { pname = "argyllcms"; - version = "2.2.0"; + version = "2.2.1"; src = fetchzip { # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a # while on me. It might be good to find a mirror url = "https://www.argyllcms.com/Argyll_V${version}_src.zip"; - sha256 = "sha256-EcVwYJfJbWWXl58O3ulsrWgUYTgR4uWdMgb0Z140Pu4="; + sha256 = "sha256-umY3wQfG26Okqnw+MCUnlwWTAyJ6MR/FHe5oe61KBh0="; }; - patches = [ ./gcc5.patch ]; - # The contents of this file comes from the Jamtop file from the # root of the ArgyllCMS distribution, rewritten to pick up Nixpkgs # library paths. When ArgyllCMS is updated, make sure that changes # in that file is reflected here. jamTop = writeText "argyllcms_jamtop" '' DESTDIR = "/" ; - REFSUBDIR = "ref" ; + REFSUBDIR = "share/argyllcms" ; # Keep this DESTDIR anchored to Jamtop. PREFIX is used literally ANCHORED_PATH_VARS = DESTDIR ; @@ -41,11 +39,21 @@ stdenv.mkDerivation rec { # enable dummy Demo Instrument (only if code is available) USE_DEMOINST = true ; + # enable Video Test Patch Generator and 3DLUT device support + # (V2.0.0 and above) + USE_VTPGLUT = false ; + + # enable Printer device support + USE_PRINTER = false ; + + # enable CMF Measurement device and accessory support (if present) + USE_CMFM = false ; + # Use ArgyllCMS version of libusb (deprecated - don't use) USE_LIBUSB = false ; - # For testing CCast - DEFINES += CCTEST_PATTERN ; + # Compile in graph plotting code (Not fully implemented) + USE_PLOT = true ; # [true] JPEGLIB = ; JPEGINC = ; @@ -97,16 +105,11 @@ stdenv.mkDerivation rec { # Install udev rules, but remove lines that set up the udev-acl # stuff, since that is handled by udev's own rules (70-udev-acl.rules) - # - # Move ref to a better place (there must be a way to make the install target - # do that for us) postInstall = '' rm -v $out/bin/License.txt mkdir -p $out/etc/udev/rules.d sed -i '/udev-acl/d' usb/55-Argyll.rules cp -v usb/55-Argyll.rules $out/etc/udev/rules.d/ - mkdir -p $out/share/ - mv $out/ref $out/share/argyllcms ''; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/graphics/argyllcms/gcc5.patch b/nixpkgs/pkgs/tools/graphics/argyllcms/gcc5.patch deleted file mode 100644 index 28067455c33e..000000000000 --- a/nixpkgs/pkgs/tools/graphics/argyllcms/gcc5.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Fix FTBFS with GCC 5 -Author: James Cowgill <james410@cowgill.org.uk> -Bug-Debian: https://bugs.debian.org/777779 -Forwarded: no ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/icc/icc.h -+++ b/icc/icc.h -@@ -100,7 +100,11 @@ - #define CF64PREC "LL" /* Constant precision specifier */ - - #ifndef ATTRIBUTE_NORETURN -+#ifdef _MSC_VER - # define ATTRIBUTE_NORETURN __declspec(noreturn) -+#else -+# define ATTRIBUTE_NORETURN __attribute__((noreturn)) -+#endif - #endif - - #else /* !__STDC_VERSION__ */ diff --git a/nixpkgs/pkgs/tools/graphics/jbig2enc/default.nix b/nixpkgs/pkgs/tools/graphics/jbig2enc/default.nix index c04862610b69..ea5008dcf5cb 100644 --- a/nixpkgs/pkgs/tools/graphics/jbig2enc/default.nix +++ b/nixpkgs/pkgs/tools/graphics/jbig2enc/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: +{ lib, stdenv, fetchFromGitHub, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: stdenv.mkDerivation rec { pname = "jbig2enc"; version = "0.28"; - src = fetchurl { - url = "https://github.com/agl/jbig2enc/archive/${version}-dist.tar.gz"; - sha256 = "1wc0lmqz4jag3rhhk1xczlqpfv2qqp3fz7wzic2lba3vsbi1rrw3"; + src = fetchFromGitHub { + owner = "agl"; + repo = "jbig2enc"; + rev = "${version}-dist"; + hash = "sha256-Y3IVTjvO5tqn/O076y/llnTyenKpbx1WyT/JFZ/s0VY="; }; propagatedBuildInputs = [ leptonica zlib libwebp giflib libjpeg libpng libtiff ]; diff --git a/nixpkgs/pkgs/tools/graphics/resvg/default.nix b/nixpkgs/pkgs/tools/graphics/resvg/default.nix index ce03561badf8..54f3152ebec0 100644 --- a/nixpkgs/pkgs/tools/graphics/resvg/default.nix +++ b/nixpkgs/pkgs/tools/graphics/resvg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.16.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A54KTToi69l0/Nrz4K8EqFpCodbomYUI/zTP++Y4FF0="; + sha256 = "sha256-/r1rTU+te8pKKiPGCHJTTBkg9RZ/N1yFTlaDAhWWxjs="; }; - cargoSha256 = "sha256-RbgLZvNZSNjYImVm8Ax5cAL3R0XqlVz5ApPYKj93GEE="; + cargoSha256 = "sha256-pHZRKXZo5fyyXjgNTDBZjRiMDOaoCfFUSl53yE2t210="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/nixpkgs/pkgs/tools/graphics/sic-image-cli/default.nix b/nixpkgs/pkgs/tools/graphics/sic-image-cli/default.nix new file mode 100644 index 000000000000..1c3eb7c18cde --- /dev/null +++ b/nixpkgs/pkgs/tools/graphics/sic-image-cli/default.nix @@ -0,0 +1,35 @@ +{ lib, rustPlatform, fetchFromGitHub, installShellFiles, nasm }: + +rustPlatform.buildRustPackage rec { + pname = "sic-image-cli"; + version = "0.19.0"; + + src = fetchFromGitHub { + owner = "foresterre"; + repo = "sic"; + rev = "v${version}"; + sha256 = "11km8ngndmzp6sxyfnbll80nigi790s353v7j31jvqcgyn9gjdq9"; + }; + + cargoSha256 = "sha256-mHfQ36Xo37VRRq0y0xvUYy0MAlrfnOfMy1t3IZFdrE8="; + + nativeBuildInputs = [ installShellFiles nasm ]; + + postBuild = '' + cargo run --example gen_completions + ''; + + postInstall = '' + installShellCompletion sic.{bash,fish} + installShellCompletion --zsh _sic + ''; + + meta = with lib; { + description = "Accessible image processing and conversion from the terminal"; + homepage = "https://github.com/foresterre/sic-image-cli"; + changelog = "https://github.com/foresterre/sic/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "sic"; + }; +} diff --git a/nixpkgs/pkgs/tools/graphics/svgbob/default.nix b/nixpkgs/pkgs/tools/graphics/svgbob/default.nix index 389f6415e9be..2e3740dabb7c 100644 --- a/nixpkgs/pkgs/tools/graphics/svgbob/default.nix +++ b/nixpkgs/pkgs/tools/graphics/svgbob/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "svgbob"; - version = "0.5.4"; + version = "0.6.2"; src = fetchCrate { inherit version; crateName = "svgbob_cli"; - sha256 = "0qq7hkg32bqyw3vz3ibip7yrjg5m2ch9kdnwqrzaqqy9wb8d7154"; + sha256 = "sha256-9JASoUN/VzZS8ihepTQL2SXZitxKBMSJEv+13vzQd3w="; }; - cargoSha256 = "0p37qkgh1xpqmkr2p88njwhifpyqfh27qcwmmhwxdqcpzmmmkjhr"; + cargoSha256 = "sha256-pkdiow+9gsQ9rrSHwukd17r5CfsaJgYj6KA4wYKbtA0="; meta = with lib; { description = "Convert your ascii diagram scribbles into happy little SVG"; diff --git a/nixpkgs/pkgs/tools/graphics/xcolor/default.nix b/nixpkgs/pkgs/tools/graphics/xcolor/default.nix index 95f21efe1ad9..707e9a95a127 100644 --- a/nixpkgs/pkgs/tools/graphics/xcolor/default.nix +++ b/nixpkgs/pkgs/tools/graphics/xcolor/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "xcolor"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "Soft"; repo = pname; rev = version; - sha256 = "0i04jwvjasrypnsfwdnvsvcygp8ckf1a5sxvjxaivy73cdvy34vk"; + sha256 = "sha256-NfmoBZek4hsga6RflE5EKkWarhCFIcTwEXhg2fpkxNE="; }; - cargoSha256 = "1r2s4iy5ls0svw5ww51m37jhrbvnj690ig6n9c60hzw1hl4krk30"; + cargoSha256 = "sha256-Zh73+FJ63SkusSavCqSCLbHVnU++4ZFSMFUIM7TnOj0="; nativeBuildInputs = [ pkg-config python3 installShellFiles copyDesktopItems ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/kime/default.nix b/nixpkgs/pkgs/tools/inputmethods/kime/default.nix index 8566143f6807..6cac37da7db2 100644 --- a/nixpkgs/pkgs/tools/inputmethods/kime/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/kime/default.nix @@ -16,18 +16,18 @@ let in stdenv.mkDerivation rec { pname = "kime"; - version = "2.5.3"; + version = "2.5.5"; src = fetchFromGitHub { owner = "Riey"; repo = pname; rev = "v${version}"; - sha256 = "1kjw22hy2x90dc7xfm252v1pdr9x13mpm92rcgfy8zbkiqq242bl"; + sha256 = "sha256-u2CmehJipXSH1dey5oIyQf8CsRveeae5cSjpY8vWYRs="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - sha256 = "05kb9vnifaw01qw5cmdh4wzcf50szb0y00085wx41m8h4f28hfbk"; + sha256 = "sha256-ROzEEfIPeWoWDi5McNwub5E/UCAeJpOx5nZS9r/q4K4="; }; # Replace autostart path diff --git a/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix b/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix index d2bd7a14663b..69d05ceaed1e 100644 --- a/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/touchegg/default.nix @@ -1,26 +1,67 @@ -{ lib, stdenv, fetchurl, xorg, xorgserver, qt4, libGLU, libGL, geis, qmake4Hook }: +{ stdenv, lib +, fetchFromGitHub +, fetchpatch +, systemd +, libinput +, pugixml +, cairo +, xorg +, gtk3-x11 +, pcre +, pkg-config +, cmake +, pantheon +, withPantheon ? false +}: stdenv.mkDerivation rec { pname = "touchegg"; - version = "1.1.1"; - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/touchegg/${pname}-${version}.tar.gz"; - sha256 = "95734815c7219d9a71282f3144b3526f2542b4fa270a8e69d644722d024b4038"; + version = "2.0.11"; + src = fetchFromGitHub { + owner = "JoseExposito"; + repo = pname; + rev = version; + sha256 = "1zfiqs5vqlb6drnqx9nsmhgy8qc6svzr8zyjkqvwkpbgrc6ifap9"; }; - buildInputs = [ xorgserver libGLU libGL xorg.libX11 xorg.libXtst xorg.libXext qt4 geis ]; + PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system"; - nativeBuildInputs = [ qmake4Hook ]; + buildInputs = [ + systemd + libinput + pugixml + cairo + gtk3-x11 + pcre + ] ++ (with xorg; [ + libX11 + libXtst + libXrandr + libXi + libXdmcp + libpthreadstubs + libxcb + ]); - preConfigure = '' - sed -e "s@/usr/@$out/@g" -i $(find . -name touchegg.pro) - sed -e "s@/usr/@$out/@g" -i $(find ./src/touchegg/config/ -name Config.cpp) - ''; + nativeBuildInputs = [ + pkg-config + cmake + ]; - meta = { + patches = lib.optionals withPantheon [ + # Disable per-application gesture by default to make sure the default + # config does not conflict with Pantheon switchboard settings. + (fetchpatch { + url = "https://github.com/elementary/os-patches/commit/ada4e726540a2bb57b606c98e2531cfaaea57211.patch"; + sha256 = "0is9acwvgiqdhbiw11i3nq0rp0zldcza779fbj8k78cp329rbqb4"; + }) + ]; + + meta = with lib; { homepage = "https://github.com/JoseExposito/touchegg"; - description = "Macro binding for touch surfaces"; - license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + description = "Linux multi-touch gesture recognizer"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = teams.pantheon.members; }; } diff --git a/nixpkgs/pkgs/tools/misc/apparix/default.nix b/nixpkgs/pkgs/tools/misc/apparix/default.nix index 8e682aefcc39..1c78a7854256 100644 --- a/nixpkgs/pkgs/tools/misc/apparix/default.nix +++ b/nixpkgs/pkgs/tools/misc/apparix/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "apparix-11-062"; + pname = "apparix"; + version = "11-062"; src = fetchurl { - url = "https://micans.org/apparix/src/${name}.tar.gz"; + url = "https://micans.org/apparix/src/apparix-${version}.tar.gz"; sha256 = "211bb5f67b32ba7c3e044a13e4e79eb998ca017538e9f4b06bc92d5953615235"; }; diff --git a/nixpkgs/pkgs/tools/misc/apt-offline/default.nix b/nixpkgs/pkgs/tools/misc/apt-offline/default.nix index 3dc3fa1bbe24..d59134a033b7 100644 --- a/nixpkgs/pkgs/tools/misc/apt-offline/default.nix +++ b/nixpkgs/pkgs/tools/misc/apt-offline/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "apt-offline"; - version = "unstable-2021-04-11"; + version = "unstable-2021-07-25"; src = fetchFromGitHub { owner = "rickysarraf"; repo = pname; - rev = "4e4b3281d004d1ece4833b7680e2b5b091402a03"; - sha256 = "1lk4186h2wc8fphd592rhq7yj4kgc7jjawx4pjrs6pg4n0q32pl6"; + rev = "7cfa5fc2736be2c832d0ddfa9255175a1f33158d"; + sha256 = "xX2wcvqoPdgqBAWvQmSd//YWMC4pPmrq0vQjhDUKwEA="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/misc/arch-install-scripts/default.nix b/nixpkgs/pkgs/tools/misc/arch-install-scripts/default.nix index 0b6984526e4b..0df8ae1e7337 100644 --- a/nixpkgs/pkgs/tools/misc/arch-install-scripts/default.nix +++ b/nixpkgs/pkgs/tools/misc/arch-install-scripts/default.nix @@ -52,6 +52,18 @@ resholvePackage rec { # packages resholve should resolve executables from inputs = [ coreutils gawk util-linux ]; + + # TODO: no good way to resolve mount/umount in Nix builds for now + # see https://github.com/abathur/resholve/issues/29 + fake = { + external = [ "mount" "umount" ]; + }; + + # TODO: remove the execer lore override below after + # https://github.com/abathur/binlore/issues/1 + execer = [ + "cannot:${util-linux}/bin/unshare" + ]; }; }; diff --git a/nixpkgs/pkgs/tools/misc/aws-mturk-clt/default.nix b/nixpkgs/pkgs/tools/misc/aws-mturk-clt/default.nix index 7e60d4988424..9b03e2dd1bdb 100644 --- a/nixpkgs/pkgs/tools/misc/aws-mturk-clt/default.nix +++ b/nixpkgs/pkgs/tools/misc/aws-mturk-clt/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, jre }: stdenv.mkDerivation rec { - name = "aws-mturk-clt-1.3.0"; + pname = "aws-mturk-clt"; + version = "1.3.0"; src = fetchurl { - url = "https://mturk.s3.amazonaws.com/CLTSource/${name}.tar.gz"; + url = "https://mturk.s3.amazonaws.com/CLTSource/aws-mturk-clt-${version}.tar.gz"; sha256 = "00yyc7k3iygg83cknv9i2dsaxwpwzdkc8a2l9j56lg999hw3mqm3"; }; diff --git a/nixpkgs/pkgs/tools/misc/bfr/default.nix b/nixpkgs/pkgs/tools/misc/bfr/default.nix index 80ec398ef8c7..7bda1d92afbe 100644 --- a/nixpkgs/pkgs/tools/misc/bfr/default.nix +++ b/nixpkgs/pkgs/tools/misc/bfr/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "bfr-1.6"; + pname = "bfr"; version = "1.6"; src = fetchurl { diff --git a/nixpkgs/pkgs/tools/misc/bogofilter/default.nix b/nixpkgs/pkgs/tools/misc/bogofilter/default.nix index 30a17bf188a6..0446a58efbc4 100644 --- a/nixpkgs/pkgs/tools/misc/bogofilter/default.nix +++ b/nixpkgs/pkgs/tools/misc/bogofilter/default.nix @@ -1,9 +1,11 @@ {fetchurl, lib, stdenv, flex, db}: stdenv.mkDerivation rec { - name = "bogofilter-1.2.4"; + pname = "bogofilter"; + version = "1.2.4"; + src = fetchurl { - url = "mirror://sourceforge/bogofilter/${name}.tar.bz2"; + url = "mirror://sourceforge/bogofilter/bogofilter-${version}.tar.bz2"; sha256 = "1d56n2m9inm8gnzm88aa27xl2a7sp7aff3484vmflpqkinjqf0p1"; }; diff --git a/nixpkgs/pkgs/tools/misc/calamares/default.nix b/nixpkgs/pkgs/tools/misc/calamares/default.nix index fd08f09b9607..094b9453358a 100644 --- a/nixpkgs/pkgs/tools/misc/calamares/default.nix +++ b/nixpkgs/pkgs/tools/misc/calamares/default.nix @@ -6,12 +6,12 @@ mkDerivation rec { pname = "calamares"; - version = "3.2.42"; + version = "3.2.43"; # release including submodule src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-NbtgtbhauEo7EGvNUNltUQRBpLlzBjAR0GLL9CadgsQ="; + sha256 = "sha256-68mt+bkdEBUODvyf3hh09snL+ecMfmSqNlVleOOJ2K8="; }; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/nixpkgs/pkgs/tools/misc/ccze/default.nix b/nixpkgs/pkgs/tools/misc/ccze/default.nix index af37d7a33c1a..348cbb1f529c 100644 --- a/nixpkgs/pkgs/tools/misc/ccze/default.nix +++ b/nixpkgs/pkgs/tools/misc/ccze/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, autoconf, ncurses, pcre }: stdenv.mkDerivation rec { - name = "ccze-0.2.1-2"; + pname = "ccze"; + version = "0.2.1-2"; src = fetchurl { - url = "https://github.com/madhouse/ccze/archive/${name}.tar.gz"; + url = "https://github.com/madhouse/ccze/archive/ccze-${version}.tar.gz"; sha256 = "1amavfvyls4v0gnikk43n2rpciaspxifgrmvi99qj6imv3mfg66n"; }; diff --git a/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix b/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix index 249e814fd303..a3f5c7b076c2 100644 --- a/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix +++ b/nixpkgs/pkgs/tools/misc/cicero-tui/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "cicero-tui"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "eyeplum"; repo = "cicero-tui"; rev = "v${version}"; - sha256 = "sha256-j/AIuNE5WBNdUeXuKvvc4NqsVVk252tm4KR3w0e6bT8="; + sha256 = "sha256-5/yH5ZK/JgMsRUcJ0qQEShEqxrtKJa+P6pcHAn5Jx0c="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { freetype ]; - cargoSha256 = "sha256-yup6hluGF2x+0XDwK+JETyNu4TFNPmqD4Y0Wthxrbcc="; + cargoSha256 = "sha256-AraisWGTPEj+tHcLonEwfevBu+mMTPkq3O9zNYgI9X8="; meta = with lib; { description = "Unicode tool with a terminal user interface"; diff --git a/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix b/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix index 6f5a6ec25fbb..f1f7d1bf2392 100644 --- a/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -1,27 +1,24 @@ -{ lib, buildGoPackage, fetchgit }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "cloud-sql-proxy"; - version = "1.13"; + version = "1.25.0"; - goPackagePath = "github.com/GoogleCloudPlatform/cloudsql-proxy"; - - subPackages = [ "cmd/cloud_sql_proxy" ]; - - src = fetchgit { - rev = version; - url = "https://${goPackagePath}"; - sha256 = "07n2hfhqa9hinabmx79aqqwxzzkky76x3jvpd89kch14fijbh532"; + src = fetchFromGitHub { + owner = "GoogleCloudPlatform"; + repo = "cloudsql-proxy"; + rev = "v${version}"; + sha256 = "0vz5fm1bgh2g7b320hchpfb4iql1src1rpm7324sqcd26p7w3mnl"; }; - goDeps = ./deps.nix; + subPackages = [ "cmd/cloud_sql_proxy" ]; - ldflags = [ "-X main.versionString=${version}" ]; + vendorSha256 = "04y6zx3jdyj07d68a4vk4p5rzvvjnvdwk9kkipmlmqg1xqwlb84m"; meta = with lib; { description = "An authenticating proxy for Second Generation Google Cloud SQL databases"; - homepage = "https://${goPackagePath}"; + homepage = "https://github.com/GoogleCloudPlatform/cloudsql-proxy"; license = licenses.asl20; - maintainers = [ maintainers.nicknovitski ]; + maintainers = with maintainers; [ nicknovitski ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/deps.nix b/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/deps.nix deleted file mode 100644 index 6898833b6f12..000000000000 --- a/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/deps.nix +++ /dev/null @@ -1,48 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "bazil.org/fuse"; - fetch = { - type = "git"; - url = "https://github.com/bazil/fuse"; - rev = "65cc252bf6691cb3c7014bcb2c8dc29de91e3a7e"; - sha256 = "0qjm9yrhc5h632wwhklqzhalid4lxcm9iwsqs3jahp303rm27vpk"; - }; - } - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "dba8c2c195294739180b3e6865f8893eb808676e"; - sha256 = "1l6aj26sd7byjcgi2b4k452fcg949v28lff2fkw5nq2qr2fjnqxy"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "9b4f9f5ad5197c79fd623a3638e70d8b26cef344"; - sha256 = "06hvxy113h76f31gv1mq6vdr6xja1zv0fdig686l2b4y2b6swych"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "9dcd33a902f40452422c2367fefcb95b54f9f8f8"; - sha256 = "15lfa780h2ff50qvcdl7sfs9f9j13fa5kfj6fb292rk3fwxhnx4i"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "39567f0042a03aeb2691599961ed4454e43d5063"; - sha256 = "0c5gx156v1pk0gqvl9w43l06z0rh9g2sackpl9ghds0asnyqx04d"; - }; - } -] diff --git a/nixpkgs/pkgs/tools/misc/convbin/default.nix b/nixpkgs/pkgs/tools/misc/convbin/default.nix index 7405535edd43..e350092a0e36 100644 --- a/nixpkgs/pkgs/tools/misc/convbin/default.nix +++ b/nixpkgs/pkgs/tools/misc/convbin/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "convbin"; - version = "3.4"; + version = "3.7"; src = fetchFromGitHub { owner = "mateoconlechuga"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JM9ixxOI3NnK3h54byFycTCJ/A+JTcNHKR71zxRed/s="; + sha256 = "sha256-zCRM62xwaPaN8+cg+CeaqK/9hKpZmSBBeUOQqAvQGYw="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; diff --git a/nixpkgs/pkgs/tools/misc/convmv/default.nix b/nixpkgs/pkgs/tools/misc/convmv/default.nix index b9b775a1bff9..6ed8c78361ec 100644 --- a/nixpkgs/pkgs/tools/misc/convmv/default.nix +++ b/nixpkgs/pkgs/tools/misc/convmv/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - name = "convmv-2.05"; + pname = "convmv"; + version = "2.05"; src = fetchurl { - url = "https://www.j3e.de/linux/convmv/${name}.tar.gz"; + url = "https://www.j3e.de/linux/convmv/convmv-${version}.tar.gz"; sha256 = "19hwv197p7c23f43vvav5bs19z9b72jzca2npkjsxgprwj5ardjk"; }; diff --git a/nixpkgs/pkgs/development/python-modules/csvs-to-sqlite/default.nix b/nixpkgs/pkgs/tools/misc/csvs-to-sqlite/default.nix index ea32471f09c5..b351b6e4efb6 100644 --- a/nixpkgs/pkgs/development/python-modules/csvs-to-sqlite/default.nix +++ b/nixpkgs/pkgs/tools/misc/csvs-to-sqlite/default.nix @@ -1,16 +1,16 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, isPy3k -, click -, dateparser -, pandas -, py-lru-cache -, six -, pytestCheckHook -}: +{ lib, python3, fetchFromGitHub }: -buildPythonPackage rec { +let + # csvs-to-sqlite is currently not compatible with Click 8. See the following + # https://github.com/simonw/csvs-to-sqlite/issues/80 + # + # Workaround the issue by providing click 7 explicitly. + python = python3.override { + packageOverrides = self: super: { + click = self.callPackage ../../../development/python-modules/click/7.nix { }; + }; + }; +in with python.pkgs; buildPythonApplication rec { pname = "csvs-to-sqlite"; version = "1.2"; disabled = !isPy3k; diff --git a/nixpkgs/pkgs/tools/misc/dbacl/default.nix b/nixpkgs/pkgs/tools/misc/dbacl/default.nix index d8510975915b..eb2b445d069d 100644 --- a/nixpkgs/pkgs/tools/misc/dbacl/default.nix +++ b/nixpkgs/pkgs/tools/misc/dbacl/default.nix @@ -1,9 +1,11 @@ {fetchurl, lib, stdenv}: stdenv.mkDerivation rec { - name = "dbacl-1.14"; + pname = "dbacl"; + version = "1.14"; + src = fetchurl { - url = "https://www.lbreyer.com/gpl/${name}.tar.gz"; + url = "https://www.lbreyer.com/gpl/dbacl-${version}.tar.gz"; sha256 = "0224g6x71hyvy7jikfxmgcwww1r5lvk0jx36cva319cb9nmrbrq7"; }; diff --git a/nixpkgs/pkgs/tools/misc/detox/default.nix b/nixpkgs/pkgs/tools/misc/detox/default.nix index 6aa66b349dc7..774ba885b4b1 100644 --- a/nixpkgs/pkgs/tools/misc/detox/default.nix +++ b/nixpkgs/pkgs/tools/misc/detox/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, flex}: -stdenv.mkDerivation { - name = "detox-1.2.0"; +stdenv.mkDerivation rec { + pname = "detox"; + version = "1.2.0"; src = fetchurl { - url = "mirror://sourceforge/detox/1.2.0/detox-1.2.0.tar.gz"; + url = "mirror://sourceforge/detox/${version}/detox-${version}.tar.gz"; sha256 = "02cfkf3yhw64xg8mksln8w24gdwgm2x9g3vps7gn6jbjbfd8mh45"; }; diff --git a/nixpkgs/pkgs/tools/misc/dmg2img/default.nix b/nixpkgs/pkgs/tools/misc/dmg2img/default.nix index a3f023e2ad5c..7f9c41cda32c 100644 --- a/nixpkgs/pkgs/tools/misc/dmg2img/default.nix +++ b/nixpkgs/pkgs/tools/misc/dmg2img/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, zlib, bzip2, openssl, fetchpatch }: stdenv.mkDerivation rec { - name = "dmg2img-1.6.7"; + pname = "dmg2img"; + version = "1.6.7"; src = fetchurl { - url = "http://vu1tur.eu.org/tools/${name}.tar.gz"; + url = "http://vu1tur.eu.org/tools/dmg2img-${version}.tar.gz"; sha256 = "066hqhg7k90xcw5aq86pgr4l7apzvnb4559vj5s010avbk8adbh2"; }; diff --git a/nixpkgs/pkgs/tools/misc/dua/default.nix b/nixpkgs/pkgs/tools/misc/dua/default.nix index 56880b6448df..719bb90b43dd 100644 --- a/nixpkgs/pkgs/tools/misc/dua/default.nix +++ b/nixpkgs/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.14.4"; + version = "2.14.7"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-0L5IiB/J4RO/KGSk/zZKLPpAneNGPDvhmPsNiZxImac="; + sha256 = "sha256-HkNWFWdyjpnJJANfnRDhmnhYbZIhrM9aIVN/Ov3/hK0="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-Mb59ZkIQVAZ01e3njdIR+0pM+PKQgEDaUP4saMGYn/8="; + cargoSha256 = "sha256-nfQGAjekd6cegvKPDxyOfcIhgagH61MT+2YVB2WppvQ="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/dust/default.nix b/nixpkgs/pkgs/tools/misc/dust/default.nix index 01c0ff4315e1..f5ce9db11027 100644 --- a/nixpkgs/pkgs/tools/misc/dust/default.nix +++ b/nixpkgs/pkgs/tools/misc/dust/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "du-dust"; - version = "0.6.2"; + version = "0.7.5"; src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "sha256-5GhoL3by4sXhFJrNZi/UlERBa+s2oqDVVJODY0kdfxI="; + sha256 = "sha256-0r0cDzW18uF7DHvzkUCHHHN+2M21xdi2ffPwDGMtyw8="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-cgH3jrZPGUHiBDeJ9qj80dU+Vbz+wHMOsCaGAvJY6mg="; + cargoSha256 = "sha256-LAow4DVqON5vrYBU8v8wzg/HcHxm1GqS9DMre3y12Jo="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/dvtm/default.nix b/nixpkgs/pkgs/tools/misc/dvtm/default.nix index 695187b3e840..ea5a051c62b1 100644 --- a/nixpkgs/pkgs/tools/misc/dvtm/default.nix +++ b/nixpkgs/pkgs/tools/misc/dvtm/default.nix @@ -1,9 +1,10 @@ {callPackage, fetchurl}: callPackage ./dvtm.nix rec { - name = "dvtm-0.15"; + pname = "dvtm"; + version = "0.15"; src = fetchurl { - url = "http://www.brain-dump.org/projects/dvtm/${name}.tar.gz"; + url = "https://www.brain-dump.org/projects/dvtm/dvtm-${version}.tar.gz"; sha256 = "0475w514b7i3gxk6khy8pfj2gx9l7lv2pwacmq92zn1abv01a84g"; }; diff --git a/nixpkgs/pkgs/tools/misc/dvtm/dvtm.nix b/nixpkgs/pkgs/tools/misc/dvtm/dvtm.nix index 9a42655b7378..feb9c7a92f82 100644 --- a/nixpkgs/pkgs/tools/misc/dvtm/dvtm.nix +++ b/nixpkgs/pkgs/tools/misc/dvtm/dvtm.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, ncurses, customConfig ? null, name, src, patches ? [] }: +{ lib, stdenv, ncurses, customConfig ? null, pname, version, src, patches ? [] }: stdenv.mkDerivation { - inherit name src patches; + inherit pname version src patches; CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; diff --git a/nixpkgs/pkgs/tools/misc/dvtm/unstable.nix b/nixpkgs/pkgs/tools/misc/dvtm/unstable.nix index 6ee2a465c69a..65e62be07497 100644 --- a/nixpkgs/pkgs/tools/misc/dvtm/unstable.nix +++ b/nixpkgs/pkgs/tools/misc/dvtm/unstable.nix @@ -1,6 +1,7 @@ {callPackage, fetchFromGitHub, fetchpatch}: callPackage ./dvtm.nix { - name = "dvtm-unstable-2018-03-31"; + pname = "dvtm-unstable"; + version = "2018-03-31"; src = fetchFromGitHub { owner = "martanne"; diff --git a/nixpkgs/pkgs/tools/misc/ent/default.nix b/nixpkgs/pkgs/tools/misc/ent/default.nix index b0dc4f1e3df9..de2f2cc8a865 100644 --- a/nixpkgs/pkgs/tools/misc/ent/default.nix +++ b/nixpkgs/pkgs/tools/misc/ent/default.nix @@ -1,7 +1,8 @@ {lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "ent-1.1"; + pname = "ent"; + version = "1.1"; src = fetchurl { url = "https://www.fourmilab.ch/random/random.zip"; diff --git a/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix b/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix index 777415de5800..cc2123c9d33b 100644 --- a/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix +++ b/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix @@ -4,11 +4,11 @@ with python3.pkgs; buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20210728.0"; + version = "20210908.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OmlMrPLFMIV0Nu3aEKFotFXCZ2RKH9wYaev0SKvMBfQ="; + sha256 = "sha256-Oz/87FFP9AEK7vVTjgqIA6hSSQJLKet759S2t5Ci1oA="; }; # no tests diff --git a/nixpkgs/pkgs/tools/misc/esphome/default.nix b/nixpkgs/pkgs/tools/misc/esphome/default.nix index 4c58632e0df6..a4678e357008 100644 --- a/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -16,13 +16,13 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2021.8.2"; + version = "2021.9.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-R+5eefPUZc6y/B8cZbxsLVrVwvBbVISZQAb1KwiYdFg="; + sha256 = "sha256-JWUGOvY34wZSBTZdpuApPjEfBtgPSFKiVk89TUK441I="; }; patches = [ @@ -48,6 +48,7 @@ with python.pkgs; buildPythonApplication rec { # - validate_cryptography_installed # - validate_pillow_installed propagatedBuildInputs = [ + aioesphomeapi click colorama cryptography diff --git a/nixpkgs/pkgs/tools/misc/fasd/default.nix b/nixpkgs/pkgs/tools/misc/fasd/default.nix index a3cdc388cdf7..7e50c3e75513 100644 --- a/nixpkgs/pkgs/tools/misc/fasd/default.nix +++ b/nixpkgs/pkgs/tools/misc/fasd/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "fasd"; - name = "${pname}-unstable-2016-08-11"; + version = "unstable-2016-08-11"; src = fetchFromGitHub { owner = "clvv"; diff --git a/nixpkgs/pkgs/tools/misc/fclones/default.nix b/nixpkgs/pkgs/tools/misc/fclones/default.nix index 1072bbcc5da3..14ade9ce32be 100644 --- a/nixpkgs/pkgs/tools/misc/fclones/default.nix +++ b/nixpkgs/pkgs/tools/misc/fclones/default.nix @@ -1,29 +1,35 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, udev }: +{ lib, stdenv +, fetchFromGitHub +, libiconv +, rustPlatform +, AppKit +}: rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - sha256 = "1ni5amy903cy822yhw070bcrrixrw2m1vr66q1h32bc98pyv4w05"; + sha256 = "sha256-8NUneKJpnBjC4OcAABEpI9p+saBqAk+l43FS8/tIYjc="; }; - cargoSha256 = "1gcb46k7bwdfsf6hyvmi6dna1nf6myzy63bhjfp0wy7c8g4m2mg8"; + cargoSha256 = "sha256-5qX45FJFaiE1vTXjllM9U1w57MX18GgKEFOEBMc64Jk="; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ udev ]; + buildInputs = lib.optionals stdenv.isDarwin [ + AppKit + libiconv + ]; - # tests in dedupe.rs fail due to - # "creation time is not available for the filesystem" - doCheck = false; + # device::test_physical_device_name test fails on Darwin + doCheck = !stdenv.isDarwin; meta = with lib; { description = "Efficient Duplicate File Finder and Remover"; homepage = "https://github.com/pkolaczk/fclones"; license = licenses.mit; - maintainers = with maintainers; [ cyounkins ]; + maintainers = with maintainers; [ cyounkins msfjarvis ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/figlet/default.nix b/nixpkgs/pkgs/tools/misc/figlet/default.nix index 01ff40b2b743..b16b6821e318 100644 --- a/nixpkgs/pkgs/tools/misc/figlet/default.nix +++ b/nixpkgs/pkgs/tools/misc/figlet/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, fetchpatch }: -stdenv.mkDerivation { - name = "figlet-2.2.5"; +stdenv.mkDerivation rec { + pname = "figlet"; + version = "2.2.5"; # some tools can be found here ftp://ftp.figlet.org/pub/figlet/util/ src = fetchurl { - url = "ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.tar.gz"; + url = "ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-${version}.tar.gz"; sha256 = "0za1ax15x7myjl8jz271ybly8ln9kb9zhm1gf6rdlxzhs07w925z"; }; diff --git a/nixpkgs/pkgs/tools/misc/file/default.nix b/nixpkgs/pkgs/tools/misc/file/default.nix index 108cc5b82fd6..2c1e634023b6 100644 --- a/nixpkgs/pkgs/tools/misc/file/default.nix +++ b/nixpkgs/pkgs/tools/misc/file/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, file, zlib, libgnurx }: +{ lib, stdenv, fetchurl, file, zlib, libgnurx, fetchpatch }: stdenv.mkDerivation rec { pname = "file"; @@ -16,6 +16,14 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ] ++ lib.optional stdenv.hostPlatform.isWindows libgnurx; + patches = [ + # Fix the mime type detection of xz file. Is merged in master. + (fetchpatch { + url = "https://github.com/file/file/commit/9b0459afab309a82aa4e46f73a4e50dd641f3d39.patch"; + sha256 = "sha256-6vjyIn5gVbgmhUlfXJKFRVltm8YKATKmh0/X6+2lLnM="; + }) + ]; + doCheck = true; makeFlags = lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file"; diff --git a/nixpkgs/pkgs/tools/misc/fileschanged/default.nix b/nixpkgs/pkgs/tools/misc/fileschanged/default.nix index 2c64c4c1edca..f44011a98a71 100644 --- a/nixpkgs/pkgs/tools/misc/fileschanged/default.nix +++ b/nixpkgs/pkgs/tools/misc/fileschanged/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, gamin }: stdenv.mkDerivation rec { - name = "fileschanged-0.6.9"; + pname = "fileschanged"; + version = "0.6.9"; src = fetchurl { - url = "mirror://savannah/fileschanged/${name}.tar.gz"; + url = "mirror://savannah/fileschanged/fileschanged-${version}.tar.gz"; sha256 = "0ajc9h023vzpnlqqjli4wbvs0q36nr5p9msc3wzbic8rk687qcxc"; }; diff --git a/nixpkgs/pkgs/tools/misc/fontforge/default.nix b/nixpkgs/pkgs/tools/misc/fontforge/default.nix index 0f66fa55acad..6bb728af99ca 100644 --- a/nixpkgs/pkgs/tools/misc/fontforge/default.nix +++ b/nixpkgs/pkgs/tools/misc/fontforge/default.nix @@ -30,6 +30,12 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/fonts-team/fontforge/raw/76bffe6ccf8ab20a0c81476a80a87ad245e2fd1c/debian/patches/0001-add-extra-cmake-install-rules.patch"; sha256 = "u3D9od2xLECNEHhZ+8dkuv9818tPkdP6y/Tvd9CADJg="; }) + # Fix segmentation fault with some fonts. + # This is merged and should be present in the next release. + (fetchpatch { + url = "https://github.com/fontforge/fontforge/commit/69e263b2aff29ad22f97f13935cfa97a1eabf207.patch"; + sha256 = "06yyf90605aq6ppfiz83mqkdmnaq5418axp9jgsjyjq78b00xb29"; + }) ]; # use $SOURCE_DATE_EPOCH instead of non-deterministic timestamps diff --git a/nixpkgs/pkgs/tools/misc/git-fire/default.nix b/nixpkgs/pkgs/tools/misc/git-fire/default.nix index 15dc34cd5267..32d7a169d72e 100644 --- a/nixpkgs/pkgs/tools/misc/git-fire/default.nix +++ b/nixpkgs/pkgs/tools/misc/git-fire/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - name = "git-fire-unstable-2017-08-27"; + pname = "git-fire"; + version = "unstable-2017-08-27"; src = fetchFromGitHub { owner = "qw3rtman"; diff --git a/nixpkgs/pkgs/tools/misc/github-backup/default.nix b/nixpkgs/pkgs/tools/misc/github-backup/default.nix index 1fcaf3a47119..3ab7f10909e3 100644 --- a/nixpkgs/pkgs/tools/misc/github-backup/default.nix +++ b/nixpkgs/pkgs/tools/misc/github-backup/default.nix @@ -6,11 +6,11 @@ python3.pkgs.buildPythonApplication rec { pname = "github-backup"; - version = "0.39.0"; + version = "0.40.1"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "71829df4bdbe5bd55c324a97008405a6b4c6113edb1a2a6a8b73a7059fe64a47"; + sha256 = "sha256-Qrj0+4WXlW0UgG2xV/P8e0QgUG3VurY4HIAiiUF3LW8="; }; makeWrapperArgs = [ diff --git a/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/nixpkgs/pkgs/tools/misc/goreleaser/default.nix index e26509dd11dd..13b9f661a640 100644 --- a/nixpkgs/pkgs/tools/misc/goreleaser/default.nix +++ b/nixpkgs/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.176.0"; + version = "0.179.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7xqzt/QJOkZLVY3MbBf7QYBrEgO500ft6ahvngaw9rs="; + sha256 = "sha256-E8a1S6CPPd8xsdt/tu1VmWxQCMUp8dEPB5H2IL4jj1k="; }; - vendorSha256 = "sha256-xdK98JWfxvufewcXiMjo6hslFrCbmWrgTAwJM7f00n4="; + vendorSha256 = "sha256-qF7mULIQrFs/SAMm/dUcYPs1urLKKg6w7hgkuJ2AivQ="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/tools/misc/grex/default.nix b/nixpkgs/pkgs/tools/misc/grex/default.nix index 4d391b099437..62c216adcbef 100644 --- a/nixpkgs/pkgs/tools/misc/grex/default.nix +++ b/nixpkgs/pkgs/tools/misc/grex/default.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage rec { pname = "grex"; - version = "1.2.0"; + version = "1.3.0"; - cargoSha256 = "sha256-aEwMJ9f08SJhrL8kLaTp54yP1hYGb3Ob5KNzZ5r752s="; + cargoSha256 = "sha256-zNwTk4RcTv2dGbKWelOPSvasBmj7tnjLhQ0DZhZ9hxk="; src = fetchFromGitHub { owner = "pemistahl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3M6wQB7+1MKPcxSvjDTNs33TrFjCEeFlbh1akwJHLLU="; + sha256 = "sha256-NMz35jgd7XPemVdA8nol2H6cgWD3yEPh0FEMPw8kgKQ="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/nixpkgs/pkgs/tools/misc/grub/default.nix b/nixpkgs/pkgs/tools/misc/grub/default.nix index 2371bdb0e055..bf66a467620d 100644 --- a/nixpkgs/pkgs/tools/misc/grub/default.nix +++ b/nixpkgs/pkgs/tools/misc/grub/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook, texinfo, buggyBiosCDSupport ? true }: -stdenv.mkDerivation { - name = "grub-0.97-73"; +stdenv.mkDerivation rec { + pname = "grub"; + version = "0.97-73"; src = fetchurl { - url = "https://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz"; + url = "https://alpha.gnu.org/gnu/grub/grub-${lib.versions.majorMinor version}.tar.gz"; sha256 = "02r6b52r0nsp6ryqfiqchnl7r1d9smm80sqx24494gmx5p8ia7af"; }; diff --git a/nixpkgs/pkgs/tools/misc/hashit/default.nix b/nixpkgs/pkgs/tools/misc/hashit/default.nix index edda48bdc924..e26a0abbde3a 100644 --- a/nixpkgs/pkgs/tools/misc/hashit/default.nix +++ b/nixpkgs/pkgs/tools/misc/hashit/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { description = "A simple app for checking usual checksums - Designed for elementary OS"; homepage = "https://github.com/artemanufrij/hashit"; license = licenses.gpl2Plus; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/misc/hdf5/default.nix b/nixpkgs/pkgs/tools/misc/hdf5/default.nix index 248351272d89..c5485a5b3fb1 100644 --- a/nixpkgs/pkgs/tools/misc/hdf5/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdf5/default.nix @@ -34,10 +34,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ removeReferencesTo ]; + nativeBuildInputs = [ removeReferencesTo ] + ++ optional (gfortran != null) gfortran; buildInputs = [] - ++ optional (gfortran != null) gfortran ++ optional (szip != null) szip ++ optional javaSupport jdk; diff --git a/nixpkgs/pkgs/tools/misc/ipxe/default.nix b/nixpkgs/pkgs/tools/misc/ipxe/default.nix index 4be0b3d417e4..70b1ae48ae9c 100644 --- a/nixpkgs/pkgs/tools/misc/ipxe/default.nix +++ b/nixpkgs/pkgs/tools/misc/ipxe/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { configurePhase = '' runHook preConfigure - for opt in $enabledOptions; do echo "#define $opt" >> src/config/general.h; done + for opt in ${lib.escapeShellArgs enabledOptions}; do echo "#define $opt" >> src/config/general.h; done sed -i '/cp \''${ISOLINUX_BIN}/s/$/ --no-preserve=mode/' src/util/geniso substituteInPlace src/Makefile.housekeeping --replace '/bin/echo' echo runHook postConfigure diff --git a/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix b/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix index abd8398601cd..22b16c7f9b34 100644 --- a/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix +++ b/nixpkgs/pkgs/tools/misc/jdiskreport/default.nix @@ -10,11 +10,12 @@ let type = "Application"; }; in -stdenv.mkDerivation { - name = "jdiskreport-1.4.1"; +stdenv.mkDerivation rec { + pname = "jdiskreport"; + version = "1.4.1"; src = fetchurl { - url = "http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_1.zip"; + url = "https://www.jgoodies.com/download/jdiskreport/jdiskreport-${lib.replaceStrings ["."] ["_"] version}.zip"; sha256 = "0d5mzkwsbh9s9b1vyvpaawqc09b0q41l2a7pmwf7386b1fsx6d58"; }; diff --git a/nixpkgs/pkgs/tools/misc/kalker/default.nix b/nixpkgs/pkgs/tools/misc/kalker/default.nix index 503edb910f0c..230e5c629fbe 100644 --- a/nixpkgs/pkgs/tools/misc/kalker/default.nix +++ b/nixpkgs/pkgs/tools/misc/kalker/default.nix @@ -1,6 +1,7 @@ { lib , fetchFromGitHub -, m4 +, gcc +, gmp, mpfr, libmpc , rustPlatform }: rustPlatform.buildRustPackage rec { @@ -16,7 +17,9 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-fBWnMlOLgwrOBPS2GIfOUDHQHcMMaU5r9JZVMbA+W58="; - nativeBuildInputs = [ m4 ]; + # https://gitlab.com/tspiteri/gmp-mpfr-sys/-/issues/20 + nativeBuildInputs = [ gcc ]; + buildInputs = [ gmp mpfr libmpc ]; outputs = [ "out" "lib" ]; @@ -24,6 +27,8 @@ rustPlatform.buildRustPackage rec { moveToOutput "lib" "$lib" ''; + CARGO_FEATURE_USE_SYSTEM_LIBS = "1"; + meta = with lib; { homepage = "https://kalker.strct.net"; changelog = "https://github.com/PaddiM8/kalker/releases/tag/v${version}"; diff --git a/nixpkgs/pkgs/tools/misc/kermit/default.nix b/nixpkgs/pkgs/tools/misc/kermit/default.nix index 8af0674f54bf..33644e911c63 100644 --- a/nixpkgs/pkgs/tools/misc/kermit/default.nix +++ b/nixpkgs/pkgs/tools/misc/kermit/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, ncurses, glibc }: stdenv.mkDerivation { - name = "kermit-9.0.302"; + pname = "kermit"; + version = "9.0.302"; src = fetchurl { url = "ftp://ftp.kermitproject.org/kermit/archives/cku302.tar.gz"; diff --git a/nixpkgs/pkgs/tools/misc/kisslicer/default.nix b/nixpkgs/pkgs/tools/misc/kisslicer/default.nix index 73d86e7dfc65..31bc0b2b6a12 100644 --- a/nixpkgs/pkgs/tools/misc/kisslicer/default.nix +++ b/nixpkgs/pkgs/tools/misc/kisslicer/default.nix @@ -17,11 +17,12 @@ let in -stdenv.mkDerivation { - name = "kisslicer-1.6.3"; +stdenv.mkDerivation rec { + pname = "kisslicer"; + version = "1.6.3"; src = fetchzip { - url = "http://www.kisslicer.com/uploads/1/5/3/8/15381852/kisslicer_linux64_1.6.3_release.zip"; + url = "https://www.kisslicer.com/uploads/1/5/3/8/15381852/kisslicer_linux64_${version}_release.zip"; sha256 = "1xmywj5jrcsqv1d5x3mphhvafs4mfm9l12npkhk7l03qxbwg9j82"; stripRoot = false; }; diff --git a/nixpkgs/pkgs/tools/misc/ksnip/default.nix b/nixpkgs/pkgs/tools/misc/ksnip/default.nix new file mode 100644 index 000000000000..d78b45d9b7ac --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/ksnip/default.nix @@ -0,0 +1,77 @@ +{ stdenv +, lib +, cmake +, extra-cmake-modules +, fetchFromGitHub +, kcolorpicker +, kimageannotator +, qtsvg +, qttranslations +, qtx11extras +}: + +stdenv.mkDerivation rec { + pname = "ksnip"; + version = "1.9.1"; + + src = fetchFromGitHub { + owner = "ksnip"; + repo = "ksnip"; + rev = "v${version}"; + sha256 = "1izsk586n9fbm0di0hj6pxs7r0a6w554gpad1ghf247icr0pfc1l"; + }; + + dontWrapQtApps = true; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kcolorpicker + kimageannotator + qtsvg + qttranslations + qtx11extras + ]; + + meta = with lib; { + homepage = "https://github.com/ksnip/ksnip"; + description = "Cross-platform screenshot tool wihth many annotation features"; + longDescription = '' + Features: + + - Supports Linux (X11, Plasma Wayland, GNOME Wayland and xdg-desktop-portal Wayland), Windows and macOS. + - Screenshot of a custom rectangular area that can be drawn with mouse cursor. + - Screenshot of last selected rectangular area without selecting again. + - Screenshot of the screen/monitor where the mouse cursor is currently located. + - Screenshot of full-screen, including all screens/monitors. + - Screenshot of window that currently has focus. + - Screenshot of window under mouse cursor. + - Screenshot with or without mouse cursor. + - Capture mouse cursor as annotation item that can be moved and deleted. + - Customizable capture delay for all capture options. + - Upload screenshots directly to imgur.com in anonymous or user mode. + - Upload screenshots via custom user defined scripts. + - Command-line support, for capturing screenshots and saving to default location, filename and format. + - Filename wildcards for Year ($Y), Month ($M), Day ($D), Time ($T) and Counter (multiple # characters for number with zero-leading padding). + - Print screenshot or save it to PDF/PS. + - Annotate screenshots with pen, marker, rectangles, ellipses, texts and other tools. + - Annotate screenshots with stickers and add custom stickers. + - Obfuscate image regions with blur and pixelate. + - Add effects to image (Drop Shadow, Grayscale, invert color or Border). + - Add watermarks to captured images. + - Global hotkeys for capturing screenshots (currently only for Windows and X11). + - Tabs for screenshots and images. + - Open existing images via dialog, drag-and-drop or paste from clipboard. + - Run as single instance application (secondary instances send cli parameter to primary instance). + - Pin screenshots in frameless windows that stay atop other windows. + - User-defined actions for taking screenshot and post-processing. + - Many configuration options. + ''; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ x3ro ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/logtop/default.nix b/nixpkgs/pkgs/tools/misc/logtop/default.nix index 2113da9976fb..0aa99fd18aa7 100644 --- a/nixpkgs/pkgs/tools/misc/logtop/default.nix +++ b/nixpkgs/pkgs/tools/misc/logtop/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchFromGitHub, ncurses, uthash, pkg-config }: -stdenv.mkDerivation { - name = "logtop-0.7"; +stdenv.mkDerivation rec { + pname = "logtop"; + version = "0.7"; src = fetchFromGitHub { - rev = "a0935ab2e7056feb3e8a90f5129990c9b335a587"; + rev = "logtop-${version}"; owner = "JulienPalard"; repo ="logtop"; sha256 = "1f8vk9gybldxvc0kwz38jxmwvzwangsvlfslpsx8zf04nvbkqi12"; diff --git a/nixpkgs/pkgs/tools/misc/lrzsz/default.nix b/nixpkgs/pkgs/tools/misc/lrzsz/default.nix index 09e90ca07940..e4b5e71a2560 100644 --- a/nixpkgs/pkgs/tools/misc/lrzsz/default.nix +++ b/nixpkgs/pkgs/tools/misc/lrzsz/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, gettext, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - name = "lrzsz-0.12.20"; + pname = "lrzsz"; + version = "0.12.20"; src = fetchurl { - url = "https://ohse.de/uwe/releases/${name}.tar.gz"; + url = "https://ohse.de/uwe/releases/lrzsz-${version}.tar.gz"; sha256 = "1wcgfa9fsigf1gri74gq0pa7pyajk12m4z69x7ci9c6x9fqkd2y2"; }; diff --git a/nixpkgs/pkgs/tools/misc/macchina/default.nix b/nixpkgs/pkgs/tools/misc/macchina/default.nix index 91f23e1bc1d5..042902d080c1 100644 --- a/nixpkgs/pkgs/tools/misc/macchina/default.nix +++ b/nixpkgs/pkgs/tools/misc/macchina/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "macchina"; - version = "1.1.3"; + version = "1.1.6"; src = fetchFromGitHub { owner = "Macchina-CLI"; repo = pname; rev = "v${version}"; - sha256 = "sha256:0afsv8n12z98z3dxdb4nflc6z8ss6n2prfqmjzy655ly9rrhkcrw"; + sha256 = "sha256-JiyJU+5bKXHUgaRyUKdgINbMxkv2XXAkuoouQv9SEow="; }; - cargoSha256 = "sha256:0jc2030217xz5v5h3ry2pb7rkakn9zmrcap55bv2r8p7hi5gvh60"; + cargoSha256 = "sha256-pychP3OHXMv23TtZbaMOPBbEoJh4R03ySzEdwADTmFI="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; diff --git a/nixpkgs/pkgs/tools/misc/makebootfat/default.nix b/nixpkgs/pkgs/tools/misc/makebootfat/default.nix index 1f512d04a225..d55b5727d00c 100644 --- a/nixpkgs/pkgs/tools/misc/makebootfat/default.nix +++ b/nixpkgs/pkgs/tools/misc/makebootfat/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "makebootfat-1.4"; + pname = "makebootfat"; + version = "1.4"; src = fetchurl { - url = "mirror://sourceforge/advancemame/${name}.tar.gz"; + url = "mirror://sourceforge/advancemame/makebootfat-${version}.tar.gz"; sha256 = "0v0g1xax0y6hmw2x10nfhchp9n7vqyvgc33gcxqax8jdq2pxm1q2"; }; diff --git a/nixpkgs/pkgs/tools/misc/man-db/default.nix b/nixpkgs/pkgs/tools/misc/man-db/default.nix index 9c8adc1d8d41..f1739cbd50dd 100644 --- a/nixpkgs/pkgs/tools/misc/man-db/default.nix +++ b/nixpkgs/pkgs/tools/misc/man-db/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libpipeline, db, groff, libiconv, makeWrapper, buildPackages }: stdenv.mkDerivation rec { - name = "man-db-2.9.4"; + pname = "man-db"; + version = "2.9.4"; src = fetchurl { - url = "mirror://savannah/man-db/${name}.tar.xz"; + url = "mirror://savannah/man-db/man-db-${version}.tar.xz"; sha256 = "sha256-tmyZ7frRatkoyIn4fPdjgCY8FgkyPCgLOp5pY/2xZ1Y="; }; diff --git a/nixpkgs/pkgs/tools/misc/mcfly/default.nix b/nixpkgs/pkgs/tools/misc/mcfly/default.nix index 0d55da7fdfa4..e613e4bb3ea1 100644 --- a/nixpkgs/pkgs/tools/misc/mcfly/default.nix +++ b/nixpkgs/pkgs/tools/misc/mcfly/default.nix @@ -11,6 +11,12 @@ rustPlatform.buildRustPackage rec { sha256 = "0i3qjgq1b8h3bzc7rxa60kq1yc2im9m6dgzrvial086a1zk8s81r"; }; + postPatch = '' + substituteInPlace mcfly.bash --replace '$(which mcfly)' '${placeholder "out"}/bin/mcfly' + substituteInPlace mcfly.zsh --replace '$(which mcfly)' '${placeholder "out"}/bin/mcfly' + substituteInPlace mcfly.fish --replace '(which mcfly)' '${placeholder "out"}/bin/mcfly' + ''; + cargoSha256 = "084v4fsdi25ahz068ssq29z7d5d3k3jh3s8b07irwybdsy18c629"; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/misc/miniserve/default.nix b/nixpkgs/pkgs/tools/misc/miniserve/default.nix index 64fdb40f52a8..b6d0bc9ede23 100644 --- a/nixpkgs/pkgs/tools/misc/miniserve/default.nix +++ b/nixpkgs/pkgs/tools/misc/miniserve/default.nix @@ -11,21 +11,24 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.15.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "sha256-hcGpd23CM5r8tq7Wyf4/aJwTCVJ9POmZJHZvIdcF4Qg="; + sha256 = "sha256-DqH/6Uu4L0fWbnGX8s3jCGwBgPE2PLIkS/dZIj+BA9Q="; }; - cargoSha256 = "sha256-TnafvDbCZhIDnjGJThgYnwFs6O6/RvKFsll3gUh2mjQ="; + cargoSha256 = "sha256-LgdVO41e56DIRkky1aF0X80ixs7ZH93Qk9Yx67vkO9E="; nativeBuildInputs = [ installShellFiles pkg-config zlib ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; - checkFlags = [ "--skip=cant_navigate_up_the_root" ]; + checkFlags = [ + "--skip=bind_ipv4_ipv6::case_2" + "--skip=cant_navigate_up_the_root" + ]; postInstall = '' installShellCompletion --cmd miniserve \ diff --git a/nixpkgs/pkgs/tools/misc/mmv-go/default.nix b/nixpkgs/pkgs/tools/misc/mmv-go/default.nix index 640b0d611e47..efca64bdc44a 100644 --- a/nixpkgs/pkgs/tools/misc/mmv-go/default.nix +++ b/nixpkgs/pkgs/tools/misc/mmv-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mmv-go"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "itchyny"; repo = "mmv"; rev = "v${version}"; - sha256 = "12k5zzyr0lhjadc9kza04v0zgb20v7m4syaqwc7qvn3kfvv1mz8s"; + sha256 = "sha256-n7yW+0cabJGDgppt6Qcj7ID3sD85094NDOPk2o9xDwY="; }; - vendorSha256 = "0xnrai15ww9lfk02bc9p5ssycwnqkyjj5ch1srh7yvnbw3fakx68"; + vendorSha256 = "sha256-3Xk8S2Em28r5R7894Ubo2OOlGhrKplV/gY4ftCjPvMo="; ldflags = [ "-s" "-w" "-X main.revision=${src.rev}" ]; diff --git a/nixpkgs/pkgs/tools/misc/mysql2pgsql/default.nix b/nixpkgs/pkgs/tools/misc/mysql2pgsql/default.nix index f0556b69f23e..680e37387683 100644 --- a/nixpkgs/pkgs/tools/misc/mysql2pgsql/default.nix +++ b/nixpkgs/pkgs/tools/misc/mysql2pgsql/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, perl }: # The homepage says this script is mature.. -stdenv.mkDerivation { - name = "mysql2pgsql-0.0.1a"; +stdenv.mkDerivation rec { + pname = "mysql2pgsql"; + version = "0.0.1a"; src = fetchurl { - url = "http://ftp.plusline.de/ftp.postgresql.org/projects/gborg/mysql2psql/devel/mysql2psql-0.0.1a.tgz"; + url = "http://ftp.plusline.de/ftp.postgresql.org/projects/gborg/mysql2psql/devel/mysql2psql-${version}.tgz"; sha256 = "0dpbxf3kdvpihz9cisx6wi3zzd0cnifaqvjxavrbwm4k4sz1qamp"; }; diff --git a/nixpkgs/pkgs/tools/misc/nomino/default.nix b/nixpkgs/pkgs/tools/misc/nomino/default.nix new file mode 100644 index 000000000000..d30d40527e10 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/nomino/default.nix @@ -0,0 +1,22 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "nomino"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "yaa110"; + repo = pname; + rev = version; + sha256 = "1nnyz4gkwrc2zccw0ir5kvmiyyv3r0vxys9r7j4cf0ymngal5kwp"; + }; + + cargoSha256 = "0501w3124vkipb1rnksjaizkghw3jf3nmmmmf3zprmcaim1b4szg"; + + meta = with lib; { + description = "Batch rename utility for developers"; + homepage = "https://github.com/yaa110/nomino"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/odroid-xu3-bootloader/default.nix b/nixpkgs/pkgs/tools/misc/odroid-xu3-bootloader/default.nix index 052c46cef8cb..2dbffe3384ce 100644 --- a/nixpkgs/pkgs/tools/misc/odroid-xu3-bootloader/default.nix +++ b/nixpkgs/pkgs/tools/misc/odroid-xu3-bootloader/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, fetchFromGitHub, coreutils, ubootOdroidXU3, runtimeShell }: stdenv.mkDerivation { - name = "odroid-xu3-bootloader-2015-12-04"; + pname = "odroid-xu3-bootloader"; + version = "unstable-2015-12-04"; src = fetchFromGitHub { owner = "hardkernel"; diff --git a/nixpkgs/pkgs/tools/misc/opentsdb/default.nix b/nixpkgs/pkgs/tools/misc/opentsdb/default.nix index 678c2607b614..bc7baa55fecd 100644 --- a/nixpkgs/pkgs/tools/misc/opentsdb/default.nix +++ b/nixpkgs/pkgs/tools/misc/opentsdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoconf, automake, curl, fetchurl, jdk8, makeWrapper, nettools +{ lib, stdenv, autoconf, automake, curl, fetchurl, fetchpatch, jdk8, makeWrapper, nettools , python, git }: @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { sha256 = "0b0hilqmgz6n1q7irp17h48v8fjpxhjapgw1py8kyav1d51s7mm2"; }; + patches = [ + (fetchpatch { + name = "CVE-2020-35476.patch"; + url = "https://github.com/OpenTSDB/opentsdb/commit/b89fded4ee326dc064b9d7e471e9f29f7d1dede9.patch"; + sha256 = "1vb9m0a4fsjqcjagiypvkngzgsw4dil8jrlhn5xbz7rwx8x96wvb"; + }) + ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ autoconf automake curl jdk nettools python git ]; @@ -33,8 +41,5 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; platforms = lib.platforms.linux; maintainers = [ ]; - knownVulnerabilities = [ - "CVE-2020-35476" # https://github.com/OpenTSDB/opentsdb/issues/2051 - ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/pal/default.nix b/nixpkgs/pkgs/tools/misc/pal/default.nix index 635c6e0b5245..c37325170ace 100644 --- a/nixpkgs/pkgs/tools/misc/pal/default.nix +++ b/nixpkgs/pkgs/tools/misc/pal/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, glib, gettext, readline, pkg-config }: stdenv.mkDerivation rec { - name = "pal-0.4.3"; + pname = "pal"; + version = "0.4.3"; src = fetchurl { - url = "mirror://sourceforge/palcal/${name}.tgz"; + url = "mirror://sourceforge/palcal/pal-${version}.tgz"; sha256 = "072mahxvd7lcvrayl32y589w4v3vh7bmlcnhiksjylknpsvhqiyf"; }; diff --git a/nixpkgs/pkgs/tools/misc/parted/default.nix b/nixpkgs/pkgs/tools/misc/parted/default.nix index e954bfbe5e4d..e4ac6b624ce4 100644 --- a/nixpkgs/pkgs/tools/misc/parted/default.nix +++ b/nixpkgs/pkgs/tools/misc/parted/default.nix @@ -15,10 +15,11 @@ }: stdenv.mkDerivation rec { - name = "parted-3.4"; + pname = "parted"; + version = "3.4"; src = fetchurl { - url = "mirror://gnu/parted/${name}.tar.xz"; + url = "mirror://gnu/parted/parted-${version}.tar.xz"; sha256 = "sha256-4SmAIkctpVibfyvh1e48G2bsPZbfutA9xkKv0AnaU0I="; }; diff --git a/nixpkgs/pkgs/tools/misc/pg_top/default.nix b/nixpkgs/pkgs/tools/misc/pg_top/default.nix index f5d42431e4f2..9521136977f3 100644 --- a/nixpkgs/pkgs/tools/misc/pg_top/default.nix +++ b/nixpkgs/pkgs/tools/misc/pg_top/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, ncurses, postgresql }: stdenv.mkDerivation rec { - name = "pg_top-3.7.0"; + pname = "pg_top"; + version = "3.7.0"; src = fetchurl { - url = "http://pgfoundry.org/frs/download.php/1781/${name}.tar.gz"; + url = "https://pgfoundry.org/frs/download.php/1781/pg_top-${version}.tar.gz"; sha256 = "17xrv0l58rv3an06gkajzw0gg6v810xx6vl137an1iykmhvfh7h2"; }; diff --git a/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix b/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix index 971f924faaac..f0f20d4b3a7b 100644 --- a/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -13,10 +13,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which gnused makeWrapper ]; installPhase = '' + runHook preInstall + ./install-sh $out wrapProgram $out/bin/phoronix-test-suite \ --set PHP_BIN ${php}/bin/php \ --prefix PATH : ${lib.makeBinPath [ gnumake gcc ]} + + runHook postInstall ''; passthru.tests = { diff --git a/nixpkgs/pkgs/tools/misc/pipe-rename/default.nix b/nixpkgs/pkgs/tools/misc/pipe-rename/default.nix new file mode 100644 index 000000000000..15468773e422 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/pipe-rename/default.nix @@ -0,0 +1,27 @@ +{ lib, rustPlatform, fetchCrate, python3 }: + +rustPlatform.buildRustPackage rec { + pname = "pipe-rename"; + version = "1.4.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-AMBdDsn3jS2dXUnEDKZILUlLHS9FIECZhc3EjxLoOZU="; + }; + + cargoSha256 = "sha256-ulNyTRRFtHQ7+sRaKczLiDPIKG2TIcbbsD9x1di2ypw="; + + checkInputs = [ python3 ]; + + preCheck = '' + patchShebangs tests/editors/env-editor.py + ''; + + meta = with lib; { + description = "Rename your files using your favorite text editor"; + homepage = "https://github.com/marcusbuffet/pipe-rename"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "renamer"; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix b/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix index 009d841bf557..b6678f52d748 100644 --- a/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix +++ b/nixpkgs/pkgs/tools/misc/pk2cmd/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, libusb-compat-0_1, makeWrapper}: -stdenv.mkDerivation { - name = "pk2cmd-1.20"; +stdenv.mkDerivation rec { + pname = "pk2cmd"; + version = "1.20"; src = fetchurl { - url = "https://ww1.microchip.com/downloads/en/DeviceDoc/pk2cmdv1.20LinuxMacSource.tar.gz"; + url = "https://ww1.microchip.com/downloads/en/DeviceDoc/pk2cmdv${version}LinuxMacSource.tar.gz"; sha256 = "1yjpi2qshnqfpan4w3ggakkr3znfrx5cxkny92ka7v9na3g2fc4h"; }; diff --git a/nixpkgs/pkgs/tools/misc/profetch/default.nix b/nixpkgs/pkgs/tools/misc/profetch/default.nix new file mode 100644 index 000000000000..c113f48fd13d --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/profetch/default.nix @@ -0,0 +1,37 @@ +{ stdenv, lib, fetchFromGitHub, gprolog }: + +stdenv.mkDerivation rec { + pname = "profetch"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "RustemB"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-JsjpPUXMN0jytRS4yzSjrseqHiEQ+YinklG+tIIy+Zo="; + }; + + nativeBuildInputs = [ gprolog ]; + + buildPhase = '' + runHook preBuild + gplc profetch.pl --no-top-level --no-debugger \ + --no-fd-lib --no-fd-lib-warn \ + --min-size -o profetch + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm755 -t $out/bin profetch + runHook postInstall + ''; + + meta = with lib; { + description = "System Information Fetcher Written in GNU/Prolog"; + homepage = "https://github.com/RustemB/profetch"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = [ maintainers.vel ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/proxytunnel/default.nix b/nixpkgs/pkgs/tools/misc/proxytunnel/default.nix index 7743793143a2..1319a6bfabe9 100644 --- a/nixpkgs/pkgs/tools/misc/proxytunnel/default.nix +++ b/nixpkgs/pkgs/tools/misc/proxytunnel/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, openssl }: -stdenv.mkDerivation { - name = "proxytunnel-1.9.0"; +stdenv.mkDerivation rec { + pname = "proxytunnel"; + version = "1.9.0"; src = fetchurl { - url = "mirror://sourceforge/proxytunnel/proxytunnel-1.9.0.tgz"; + url = "mirror://sourceforge/proxytunnel/proxytunnel-${version}.tgz"; sha256 = "1fd644kldsg14czkqjybqh3wrzwsp3dcargqf4fjkpqxv3wbpx9f"; }; diff --git a/nixpkgs/pkgs/tools/misc/pspg/default.nix b/nixpkgs/pkgs/tools/misc/pspg/default.nix index 4ac9d972a9a7..26427d38039d 100644 --- a/nixpkgs/pkgs/tools/misc/pspg/default.nix +++ b/nixpkgs/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "5.3.4"; + version = "5.3.5"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-wju69kC6koYy2yABjx7/rWsuJXV1vjwSBztNlu13TJs="; + sha256 = "sha256-xJ7kgEvIsTufAZa5x3YpElTc74nEs9C+baVjbheHySM="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/misc/pv/default.nix b/nixpkgs/pkgs/tools/misc/pv/default.nix index 013ddb8e3dab..6bc92b147689 100644 --- a/nixpkgs/pkgs/tools/misc/pv/default.nix +++ b/nixpkgs/pkgs/tools/misc/pv/default.nix @@ -1,13 +1,27 @@ -{ lib, stdenv, fetchurl } : +{ lib +, stdenv +, fetchurl +, fetchpatch +}: stdenv.mkDerivation rec { - name = "pv-1.6.6"; + pname = "pv"; + version = "1.6.20"; + name = "pv-1.6.20"; src = fetchurl { - url = "https://www.ivarch.com/programs/sources/${name}.tar.bz2"; - sha256 = "1wbk14xh9rfypiwyy68ssl8dliyji30ly70qki1y2xx3ywszk3k0"; + url = "https://www.ivarch.com/programs/sources/pv-${version}.tar.bz2"; + sha256 = "00y6zla8h653sn4axgqz7rr0x79vfwl62a7gn6lzn607zwg9acg8"; }; + patches = [ + # Fix build on aarch64-darwin using patch from Homebrew + (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/homebrew-core/0780f1df9fdbd8914ff50ac24eb0ec0d3561c1b7/Formula/pv.rb"; + sha256 = "001xayskfprri4s2gd3bqwajw6nz6nv0ggb0835par7q7bsd0dzr"; + }) + ]; + meta = { homepage = "http://www.ivarch.com/programs/pv"; description = "Tool for monitoring the progress of data through a pipeline"; diff --git a/nixpkgs/pkgs/tools/misc/qjoypad/default.nix b/nixpkgs/pkgs/tools/misc/qjoypad/default.nix index 7fc578ec8579..0c3b4a9ed2f8 100644 --- a/nixpkgs/pkgs/tools/misc/qjoypad/default.nix +++ b/nixpkgs/pkgs/tools/misc/qjoypad/default.nix @@ -1,8 +1,9 @@ { lib, stdenv, fetchurl, pkg-config, libX11, libXtst, qt4 }: stdenv.mkDerivation rec { - name = "qjoypad-4.1.0"; + pname = "qjoypad"; + version = "4.1.0"; src = fetchurl { - url = "mirror://sourceforge/qjoypad/${name}.tar.gz"; + url = "mirror://sourceforge/qjoypad/qjoypad-${version}.tar.gz"; sha256 = "1jlm7i26nfp185xrl41kz5z6fgvyj51bjpz48cg27xx64y40iamm"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/misc/qt5ct/default.nix b/nixpkgs/pkgs/tools/misc/qt5ct/default.nix index 00d46de8f96d..133a1a87d661 100644 --- a/nixpkgs/pkgs/tools/misc/qt5ct/default.nix +++ b/nixpkgs/pkgs/tools/misc/qt5ct/default.nix @@ -4,11 +4,11 @@ let inherit (lib) getDev; in mkDerivation rec { pname = "qt5ct"; - version = "1.1"; + version = "1.3"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1lnx4wqk87lbr6lqc64w5g5ppjjv75kq2r0q0bz9gfpryzdw8xxg"; + sha256 = "sha256-3UQ7FOWQr/dqFuExbVbmiIguMkjEcN9PcbyVJWnzw7w="; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/nixpkgs/pkgs/tools/misc/renameutils/default.nix b/nixpkgs/pkgs/tools/misc/renameutils/default.nix index e730b583d7c8..2dff399cc9a4 100644 --- a/nixpkgs/pkgs/tools/misc/renameutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/renameutils/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, readline}: -stdenv.mkDerivation { - name = "renameutils-0.12.0"; +stdenv.mkDerivation rec { + pname = "renameutils"; + version = "0.12.0"; src = fetchurl { - url = "mirror://savannah/renameutils/renameutils-0.12.0.tar.gz"; + url = "mirror://savannah/renameutils/renameutils-${version}.tar.gz"; sha256 = "18xlkr56jdyajjihcmfqlyyanzyiqqlzbhrm6695mkvw081g1lnb"; }; diff --git a/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix b/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix index c60dd9f7c7a0..bce293d7cf8d 100644 --- a/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix +++ b/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file , protobufc }: stdenv.mkDerivation rec { - name = "riemann-c-client-1.10.4"; + pname = "riemann-c-client"; + version = "1.10.4"; src = fetchFromGitHub { owner = "algernon"; repo = "riemann-c-client"; - rev = name; + rev = "riemann-c-client-${version}"; sha256 = "01gzqxqm1xvki2vd78c7my2kgp4fyhkcf5j5fmy8z0l93lgj82rr"; }; diff --git a/nixpkgs/pkgs/tools/misc/ristate/default.nix b/nixpkgs/pkgs/tools/misc/ristate/default.nix new file mode 100644 index 000000000000..7c8dbb52181d --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/ristate/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchFromGitLab }: + +rustPlatform.buildRustPackage rec { + pname = "ristate"; + version = "unstable-2021-09-10"; + + src = fetchFromGitLab { + owner = "snakedye"; + repo = pname; + rev = "34dfd0a0bab5b36df118d8da3956fd938c625b15"; + sha256 = "sha256-CH9DZ/7Bhbe6qKg1Nbj1rA9SzIsqVlBJg51XxAh0XnY="; + }; + + cargoSha256 = "sha256-HTfRWvE3m7XZhZDj5bEkrQI3pD6GNiKd2gJtMjRQ8Rw="; + + meta = with lib; { + description = "A river-status client written in Rust"; + homepage = "https://gitlab.com/snakedye/ristate"; + license = licenses.mit; + maintainers = with maintainers; [ kranzes ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/rkflashtool/default.nix b/nixpkgs/pkgs/tools/misc/rkflashtool/default.nix index b96d9be8a4dd..fa37c98966eb 100644 --- a/nixpkgs/pkgs/tools/misc/rkflashtool/default.nix +++ b/nixpkgs/pkgs/tools/misc/rkflashtool/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libusb1 }: stdenv.mkDerivation rec { - name = "rkflashtool-5.1"; + pname = "rkflashtool"; + version = "5.1"; src = fetchurl { - url = "mirror://sourceforge/rkflashtool/${name}-src.tar.bz2"; + url = "mirror://sourceforge/rkflashtool/rkflashtool-${version}-src.tar.bz2"; sha256 = "0dbp1crw7pjav9gffrnskhkf0gxlj4xgp65clqhvfmv32460xb9c"; }; diff --git a/nixpkgs/pkgs/tools/misc/rrdtool/default.nix b/nixpkgs/pkgs/tools/misc/rrdtool/default.nix index 2f8b9092eeaa..b03cd4a9a7e6 100644 --- a/nixpkgs/pkgs/tools/misc/rrdtool/default.nix +++ b/nixpkgs/pkgs/tools/misc/rrdtool/default.nix @@ -2,10 +2,11 @@ , tcl-8_5, darwin }: perl.pkgs.toPerlModule (stdenv.mkDerivation rec { - name = "rrdtool-1.7.2"; + pname = "rrdtool"; + version = "1.7.2"; src = fetchurl { - url = "https://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz"; + url = "https://oss.oetiker.ch/rrdtool/pub/rrdtool-${version}.tar.gz"; sha256 = "1nsqra0g2nja19akmf9x5y9hhgc35ml3w9dcdz2ayz7zgvmzm6d1"; }; diff --git a/nixpkgs/pkgs/tools/misc/scfbuild/default.nix b/nixpkgs/pkgs/tools/misc/scfbuild/default.nix index d604f1a68fe2..78434414b1a4 100644 --- a/nixpkgs/pkgs/tools/misc/scfbuild/default.nix +++ b/nixpkgs/pkgs/tools/misc/scfbuild/default.nix @@ -2,23 +2,17 @@ buildPythonApplication { pname = "scfbuild"; - version = "1.0.3"; + version = "2.0.0"; format = "other"; src = fetchFromGitHub { owner = "13rac1"; repo = "scfbuild"; - rev = "9acc7fc5fedbf48683d8932dd5bd7583bf922bae"; - sha256 = "1zlqsxkpg7zvmhdjgbqwwc9qgac2b8amzq8c5kwyh5cv95zcp6qn"; + rev = "6d84339512a892972185d894704efa67dd82e87a"; + sha256 = "0wkyzkhshlax9rvdmn441gv87n9abfr0qqmgs8bkg9kbcjb4bhad"; }; - patches = [ - # Convert to Python 3 - # https://github.com/13rac1/scfbuild/pull/19 - ./python-3.patch - ]; - propagatedBuildInputs = [ pyyaml fonttools fontforge ]; installPhase = '' diff --git a/nixpkgs/pkgs/tools/misc/scfbuild/python-3.patch b/nixpkgs/pkgs/tools/misc/scfbuild/python-3.patch deleted file mode 100644 index 5a0178ad8c8e..000000000000 --- a/nixpkgs/pkgs/tools/misc/scfbuild/python-3.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/bin/scfbuild -+++ b/bin/scfbuild -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2 -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - - from __future__ import (absolute_import, division, print_function, ---- a/scfbuild/builder.py -+++ b/scfbuild/builder.py -@@ -287,8 +287,8 @@ def _add_name_record(self, text, name_id, platform_id, plat_enc_id, lang_id): - # TODO: The installed version of fontTools doesn't have - # table__n_a_m_e.setName(). - record = NameRecord() -- # PyYAML creates strings, force to Unicode -- record.string = unicode(text) -+ # PyYAML creates strings, which are unicode as of Python3 -+ record.string = text - record.nameID = name_id - record.platformID = platform_id - record.platEncID = plat_enc_id ---- a/scfbuild/fforge.py -+++ b/scfbuild/fforge.py -@@ -84,7 +84,7 @@ def add_glyphs(font, svg_filepaths, conf): - u_ids = [int(u_id, 16) for u_id in filename.split("-")] - # Example: (0x1f441, 0x1f5e8) - -- u_str = ''.join(map(unichr, u_ids)) -+ u_str = ''.join(map(chr, u_ids)) - # Example: "U\0001f441U\0001f5e8" - - # Replace sequences with correct ZWJ/VS16 versions as needed ---- a/scfbuild/main.py -+++ b/scfbuild/main.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python2 -+#!/usr/bin/env python3 - # -*- coding: utf-8 -*- - - # SCFBuild is released under the GNU General Public License v3. -index 0000000..99418b5 ---- /dev/null -+++ b/scfbuild/requirements.txt -@@ -0,0 +1,2 @@ -+fonttools>=3.41.2 -+PyYAML>=5.1 diff --git a/nixpkgs/pkgs/tools/misc/sixpair/default.nix b/nixpkgs/pkgs/tools/misc/sixpair/default.nix index 52c61d917b12..71a0af158246 100644 --- a/nixpkgs/pkgs/tools/misc/sixpair/default.nix +++ b/nixpkgs/pkgs/tools/misc/sixpair/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, libusb-compat-0_1 }: stdenv.mkDerivation { - name = "sixpair-2007-04-18"; + pname = "sixpair"; + version = "unstable-2007-04-18"; src = fetchurl { url = "http://www.pabr.org/sixlinux/sixpair.c"; diff --git a/nixpkgs/pkgs/tools/misc/slop/default.nix b/nixpkgs/pkgs/tools/misc/slop/default.nix index a73dd8d3cbe7..69fa8d694541 100644 --- a/nixpkgs/pkgs/tools/misc/slop/default.nix +++ b/nixpkgs/pkgs/tools/misc/slop/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "slop"; - version = "7.5"; + version = "7.6"; src = fetchFromGitHub { owner = "naelstrof"; repo = "slop"; rev = "v${version}"; - sha256 = "1k8xxb4rj2fylr4vj16yvsf73cyywliz9cy78pl4ibmi03jhg837"; + sha256 = "sha256-LdBQxw8K8WWSfm4E2QpK4GYTuYvI+FX5gLOouVFSU/U="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/tools/misc/slsnif/default.nix b/nixpkgs/pkgs/tools/misc/slsnif/default.nix index 7f6f9fa40c2b..fd2b4c53d60a 100644 --- a/nixpkgs/pkgs/tools/misc/slsnif/default.nix +++ b/nixpkgs/pkgs/tools/misc/slsnif/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "slsnif-0.4.4"; +stdenv.mkDerivation rec { + pname = "slsnif"; + version = "0.4.4"; src = fetchurl { - url = "mirror://sourceforge/slsnif/slsnif-0.4.4.tar.gz"; + url = "mirror://sourceforge/slsnif/slsnif-${version}.tar.gz"; sha256 = "0gn8c5hj8m3sywpwdgn6w5xl4rzsvg0z7d2w8dxi6p152j5b0pii"; }; diff --git a/nixpkgs/pkgs/tools/misc/smc/default.nix b/nixpkgs/pkgs/tools/misc/smc/default.nix index 5b0342621e80..4c1156a83663 100644 --- a/nixpkgs/pkgs/tools/misc/smc/default.nix +++ b/nixpkgs/pkgs/tools/misc/smc/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, jre, runtimeShell }: -stdenv.mkDerivation { - name = "smc-6.6.3"; +stdenv.mkDerivation rec { + pname = "smc"; + version = "6.6.3"; src = fetchurl { - url = "mirror://sourceforge/project/smc/smc/6_6_3/smc_6_6_3.tgz"; + url = "mirror://sourceforge/project/smc/smc/${lib.replaceStrings ["."] ["_"] version}/smc_${lib.replaceStrings ["."] ["_"] version}.tgz"; sha256 = "1gv0hrgdl4wp562virpf9sib6pdhapwv4zvwbl0d5f5xyx04il11"; }; diff --git a/nixpkgs/pkgs/tools/misc/starship/default.nix b/nixpkgs/pkgs/tools/misc/starship/default.nix index 7ad62ab9d2e0..5202527b8c0d 100644 --- a/nixpkgs/pkgs/tools/misc/starship/default.nix +++ b/nixpkgs/pkgs/tools/misc/starship/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.57.0"; + version = "0.58.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cxTBK6eZTlqEaVfWYARQk6BjNuANy39eaXC6qFs/+6k="; + sha256 = "sha256-s84fIpCyTF7FrJZGATjIJHt/+aknlhlz1V9s+c4f+Ig="; }; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "sha256-TFHRDgIxqJCkcSwpdbcx8vguKU1QuTyslmAsRznxt2s="; + cargoSha256 = "sha256-5YOF0nXn4rdp3uxatzdvaqdAbLlHK6nq5H4+ZX/7joM="; preCheck = '' HOME=$TMPDIR diff --git a/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix b/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix index 37462910dcfe..360e16b1fc18 100644 --- a/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix +++ b/nixpkgs/pkgs/tools/misc/svtplay-dl/default.nix @@ -9,13 +9,13 @@ let in stdenv.mkDerivation rec { pname = "svtplay-dl"; - version = "4.3"; + version = "4.5"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "04gmiqg6mq96fw4v1v6947i216fsf0vcnjp3ya8bbii5na91y1aa"; + sha256 = "sha256-TiJWy5WU1VsseodfgfemAsUc5/hDwSlM03ITRYTvJbg="; }; pythonPaths = [ cryptography pyyaml requests ]; diff --git a/nixpkgs/pkgs/tools/misc/sysz/default.nix b/nixpkgs/pkgs/tools/misc/sysz/default.nix new file mode 100644 index 000000000000..4f5f90d04b0e --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/sysz/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper, fzf, gawk }: + +stdenvNoCC.mkDerivation rec { + pname = "sysz"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "joehillen"; + repo = pname; + rev = version; + sha256 = "HNwsYE1Cv90IDi3A5PmRv3uHANR3ya+VOGBQ3+zkBLM="; + }; + + nativeBuildInputs = [ makeWrapper ]; + dontBuild = true; + + installPhase = '' + runHook preInstall + install -Dm755 sysz $out/libexec/sysz + makeWrapper $out/libexec/sysz $out/bin/sysz \ + --prefix PATH : ${lib.makeBinPath [ fzf gawk ]} + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/joehillen/sysz"; + description = "A fzf terminal UI for systemctl"; + license = licenses.unlicense; + maintainers = with maintainers; [ hleboulanger ]; + platforms = platforms.unix; + changelog = "https://github.com/joehillen/sysz/blob/${version}/CHANGELOG.md"; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/t1utils/default.nix b/nixpkgs/pkgs/tools/misc/t1utils/default.nix index d581b71d16e2..8e91013521fb 100644 --- a/nixpkgs/pkgs/tools/misc/t1utils/default.nix +++ b/nixpkgs/pkgs/tools/misc/t1utils/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.lcdf.org/type/t1utils-${version}.tar.gz"; - sha256 = "sha256-YYd5NbGYcETd/0u5CgUgDKcWRnijVeFwv18aVVbMnyk="; + sha256 = "YYd5NbGYcETd/0u5CgUgDKcWRnijVeFwv18aVVbMnyk="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/misc/taoup/cachefile.patch b/nixpkgs/pkgs/tools/misc/taoup/cachefile.patch new file mode 100644 index 000000000000..7c92b2180c67 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/taoup/cachefile.patch @@ -0,0 +1,35 @@ +--- a/taoup-fortune 2021-09-05 12:16:23.408295791 +0800 ++++ b/taoup-fortune 2021-09-05 13:02:52.286440200 +0800 +@@ -5,31 +5,9 @@ + # - https://github.com/matheuss/parrotsay + # - https://github.com/busyloop/lolcat + # - https://github.com/sckott/cowsay (enhanced version) +-dir=`dirname "${BASH_SOURCE[0]}"` +- +-# USER ALERT!!! @ronjouch complained about execution speed at https://github.com/globalcitizen/taoup/issues/11 +-# ... therefore we add caching ... therefore first ensure we have an up to date cache via one of ... +-# md5sum +-if [ `which md5sum 2>/dev/null` ]; then +- MD5SUM=`md5sum ${dir}/taoup | cut -d ' ' -f1` +-# md5 +-elif [ `which md5 2>/dev/null` ]; then +- MD5SUM=`md5 -q ${dir}/taoup | cut -d ' ' -f1` +-# openssl +-elif [ `which openssl 2>/dev/null` ]; then +- MD5SUM=`cat ${dir}/taoup | openssl md5 | grep -o '[[:xdigit:]][[:xdigit:]]*$' |cut -d '=' -f2- |cut -c 2-` +-# ruby +-elif [ `which ruby 2>/dev/null` ]; then +- MD5SUM=`ruby -rdigest/md5 -e"puts Digest::MD5.file'${dir}/taoup'"` +-fi + + # determine cachefile name +-cachefile=${dir}/.taoup-fortune.cache.${MD5SUM} +- +-# create if necessary +-if [ ! -r $cachefile ]; then +- ${dir}/taoup $@ >${cachefile} +-fi ++cachefile=@out@/lib/taoup/cache + + # handle all classes of society + if [ `which cowsay 2>/dev/null` ]; then diff --git a/nixpkgs/pkgs/tools/misc/taoup/default.nix b/nixpkgs/pkgs/tools/misc/taoup/default.nix new file mode 100644 index 000000000000..969df132be82 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/taoup/default.nix @@ -0,0 +1,62 @@ +{ lib, stdenv, fetchFromGitHub, ruby, bash, ncurses }: +let + rubyEnv = ruby.withPackages (ps: with ps; [ ansi ]); +in +stdenv.mkDerivation rec { + pname = "taoup"; + version = "1.1.14"; + + src = fetchFromGitHub { + owner = "globalcitizen"; + repo = pname; + rev = "v${version}"; + sha256 = "1gs6f66fg1l504riw481nvyw7cchbr3qjks4mkj2qb3s9147ad8j"; + }; + + buildInputs = [ rubyEnv bash ncurses ]; + + patches = [ + # Pre-create a cache within this derivation + ./cachefile.patch + # Remove the need to test for `tput`, depend on ncurses directly + ./tput.patch + # Fix the script name in `taoup --help` output + ./help.patch + ]; + + postPatch = '' + substituteInPlace taoup \ + --subst-var-by ncurses ${ncurses} \ + --subst-var-by pname ${pname} + substituteInPlace taoup-fortune \ + --subst-var-by out $out \ + --replace "/bin/bash" "${bash}/bin/bash" + ''; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + mkdir -p $out/{bin,lib/taoup} + + cp taoup $out/lib/taoup + cat > $out/bin/taoup <<EOF + #!${bash}/bin/bash + exec ${rubyEnv}/bin/ruby "$out/lib/taoup/taoup" "\$@" + EOF + chmod +x $out/bin/taoup + + # Populate the cache created by cachedir.patch above + $out/bin/taoup > $out/lib/taoup/cache + + cp taoup-fortune $out/bin + chmod +x $out/bin/taoup-fortune + ''; + + meta = { + description = "The Tao of Unix Programming (Ruby-powered ANSI colored fortunes)"; + homepage = "https://github.com/globalcitizen/taoup"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.zakame ]; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/taoup/help.patch b/nixpkgs/pkgs/tools/misc/taoup/help.patch new file mode 100644 index 000000000000..e8b5f91f3c8a --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/taoup/help.patch @@ -0,0 +1,21 @@ +--- a/taoup 2021-09-07 16:45:00.000000000 +0800 ++++ b/taoup 2021-09-07 16:46:00.000000000 +0800 +@@ -7,12 +7,12 @@ + + # show help if requested + if ARGV[0] == '--help' or ARGV[0] == '-h' then +- puts "usage: " + $0 + " [arguments]" +- puts " " + $0 + " Display all fortunes and sections." +- puts " " + $0 + " < --help | -h > This help." +- puts " " + $0 + " --whitetrash Convert ANSI colors for light/white terminals." +- puts " " + $0 + " --machine Remove ANSI colors." +- puts " " + $0 + " --fortune Convert output to fortune format (and lose colors)." ++ puts "usage: " + "@pname@" + " [arguments]" ++ puts " " + "@pname@" + " Display all fortunes and sections." ++ puts " " + "@pname@" + " < --help | -h > This help." ++ puts " " + "@pname@" + " --whitetrash Convert ANSI colors for light/white terminals." ++ puts " " + "@pname@" + " --machine Remove ANSI colors." ++ puts " " + "@pname@" + " --fortune Convert output to fortune format (and lose colors)." + exit(0) + end + # ... but optionally make sure ANSI escape sequences are filtered out diff --git a/nixpkgs/pkgs/tools/misc/taoup/tput.patch b/nixpkgs/pkgs/tools/misc/taoup/tput.patch new file mode 100644 index 000000000000..5c82024885bf --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/taoup/tput.patch @@ -0,0 +1,17 @@ +--- a/taoup 2021-09-05 12:43:48.334615538 +0800 ++++ b/taoup 2021-09-05 12:55:07.631617799 +0800 +@@ -26,11 +26,9 @@ + zero_colors = true + fortunify = true + else +- if `which tput` then +- colors = `tput colors` +- if colors.chop == "-1" then +- zero_colors = true +- end ++ colors = `@ncurses@/bin/tput colors` ++ if colors.chop == "-1" then ++ zero_colors = true + end + end + if ARGV[0] == '--whitetrash' then diff --git a/nixpkgs/pkgs/tools/misc/timidity/default.nix b/nixpkgs/pkgs/tools/misc/timidity/default.nix index 760284140b11..368efcf9de30 100644 --- a/nixpkgs/pkgs/tools/misc/timidity/default.nix +++ b/nixpkgs/pkgs/tools/misc/timidity/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, alsa-lib, libjack2, ncurses, pkg-config }: -stdenv.mkDerivation { - name = "timidity-2.15.0"; +stdenv.mkDerivation rec { + pname = "timidity"; + version = "2.15.0"; src = fetchurl { - url = "mirror://sourceforge/timidity/TiMidity++-2.15.0.tar.bz2"; + url = "mirror://sourceforge/timidity/TiMidity++-${version}.tar.bz2"; sha256 = "1xf8n6dqzvi6nr2asags12ijbj1lwk1hgl3s27vm2szib8ww07qn"; }; diff --git a/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix b/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix index 1ef486fa8556..7389e0c4c593 100644 --- a/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix +++ b/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, psmisc }: -stdenv.mkDerivation { - name = "tmpwatch-2.11"; +stdenv.mkDerivation rec { + pname = "tmpwatch"; + version = "2.11"; src = fetchurl { - url = "https://fedorahosted.org/releases/t/m/tmpwatch/tmpwatch-2.11.tar.bz2"; + url = "https://fedorahosted.org/releases/t/m/tmpwatch/tmpwatch-${version}.tar.bz2"; sha256 = "1m5859ngwx61l1i4s6fja2avf1hyv6w170by273w8nsin89825lk"; }; diff --git a/nixpkgs/pkgs/tools/misc/tmux-cssh/default.nix b/nixpkgs/pkgs/tools/misc/tmux-cssh/default.nix index 830c365fa403..c69853635e90 100644 --- a/nixpkgs/pkgs/tools/misc/tmux-cssh/default.nix +++ b/nixpkgs/pkgs/tools/misc/tmux-cssh/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, tmux }: stdenv.mkDerivation { - name = "tmux-cssh-20151015"; + pname = "tmux-cssh"; + version = "unstable-2015-10-15"; src = fetchFromGitHub { owner = "dennishafemann"; diff --git a/nixpkgs/pkgs/tools/misc/toybox/default.nix b/nixpkgs/pkgs/tools/misc/toybox/default.nix index 9e3b1ecc6b5a..0f41f15d9fdb 100644 --- a/nixpkgs/pkgs/tools/misc/toybox/default.nix +++ b/nixpkgs/pkgs/tools/misc/toybox/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { }; depsBuildBuild = [ buildPackages.stdenv.cc ]; # needed for cross - buildInputs = lib.optionals enableStatic [ stdenv.cc.libc stdenv.cc.libc.static ]; + buildInputs = lib.optionals (enableStatic && stdenv.cc.libc ? static) + [ stdenv.cc.libc stdenv.cc.libc.static ]; postPatch = "patchShebangs ."; diff --git a/nixpkgs/pkgs/tools/misc/ttf2pt1/default.nix b/nixpkgs/pkgs/tools/misc/ttf2pt1/default.nix index fcab21eb92b3..7e0c12535bb6 100644 --- a/nixpkgs/pkgs/tools/misc/ttf2pt1/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttf2pt1/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perl, freetype }: -stdenv.mkDerivation { - name = "ttf2pt1-3.4.4"; +stdenv.mkDerivation rec { + pname = "ttf2pt1"; + version = "3.4.4"; src = fetchurl { - url = "mirror://sourceforge/ttf2pt1/ttf2pt1-3.4.4.tgz"; + url = "mirror://sourceforge/ttf2pt1/ttf2pt1-${version}.tgz"; sha256 = "1l718n4k4widx49xz7qrj4mybzb8q67kp2jw7f47604ips4654mf"; }; diff --git a/nixpkgs/pkgs/tools/misc/ttmkfdir/default.nix b/nixpkgs/pkgs/tools/misc/ttmkfdir/default.nix index bc1279a7dec7..77bc9f172c6f 100644 --- a/nixpkgs/pkgs/tools/misc/ttmkfdir/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttmkfdir/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, freetype, fontconfig, libunwind, libtool, flex, bison }: stdenv.mkDerivation { - name = "ttf-mkfontdir-3.0.9-6"; + pname = "ttf-mkfontdir"; + version = "3.0.9-6"; src = fetchurl { url = "http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz"; diff --git a/nixpkgs/pkgs/tools/misc/unclutter-xfixes/default.nix b/nixpkgs/pkgs/tools/misc/unclutter-xfixes/default.nix index d59b759503f8..9e95cddda32d 100644 --- a/nixpkgs/pkgs/tools/misc/unclutter-xfixes/default.nix +++ b/nixpkgs/pkgs/tools/misc/unclutter-xfixes/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "unclutter-xfixes"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "Airblader"; repo = "unclutter-xfixes"; rev = "v${version}"; - sha256 = "148m4wx8v57s3l2wb69y9imb00y8ca2li27hsxibwnl1wrkb7z4b"; + sha256 = "sha256-suKmaoJq0PBHZc7NzBQ60JGwJkAtWmvzPtTHWOPJEdc="; }; nativeBuildInputs = [ pkg-config asciidoc libxslt docbook_xsl ]; diff --git a/nixpkgs/pkgs/tools/misc/unclutter/default.nix b/nixpkgs/pkgs/tools/misc/unclutter/default.nix index 66344c9fdeef..74fc46563c7e 100644 --- a/nixpkgs/pkgs/tools/misc/unclutter/default.nix +++ b/nixpkgs/pkgs/tools/misc/unclutter/default.nix @@ -1,9 +1,10 @@ {lib, stdenv, fetchurl, xlibsWrapper}: -stdenv.mkDerivation { - name = "unclutter-8"; +stdenv.mkDerivation rec { + pname = "unclutter"; + version = "8"; src = fetchurl { - url = "https://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.tar.gz"; + url = "https://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-${version}.tar.gz"; sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6"; }; diff --git a/nixpkgs/pkgs/tools/misc/uucp/default.nix b/nixpkgs/pkgs/tools/misc/uucp/default.nix index 42084fa6296e..443c4b10457e 100644 --- a/nixpkgs/pkgs/tools/misc/uucp/default.nix +++ b/nixpkgs/pkgs/tools/misc/uucp/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "uucp-1.07"; + pname = "uucp"; + version = "1.07"; src = fetchurl { - url = "mirror://gnu/uucp/${name}.tar.gz"; + url = "mirror://gnu/uucp/uucp-${version}.tar.gz"; sha256 = "0b5nhl9vvif1w3wdipjsk8ckw49jj1w85xw1mmqi3zbcpazia306"; }; diff --git a/nixpkgs/pkgs/tools/misc/uudeview/default.nix b/nixpkgs/pkgs/tools/misc/uudeview/default.nix index 47bc916ceb50..6875e6f12343 100644 --- a/nixpkgs/pkgs/tools/misc/uudeview/default.nix +++ b/nixpkgs/pkgs/tools/misc/uudeview/default.nix @@ -1,18 +1,35 @@ -{ lib, stdenv, fetchurl, tcl, tk }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, tcl +, tk +}: stdenv.mkDerivation rec { - name = "uudeview-0.5.20"; + pname = "uudeview"; + version = "0.5.20"; + src = fetchurl { - url = "http://www.fpx.de/fp/Software/UUDeview/download/${name}.tar.gz"; + url = "http://www.fpx.de/fp/Software/UUDeview/download/${pname}-${version}.tar.gz"; sha256 = "0dg4v888fxhmf51vxq1z1gd57fslsidn15jf42pj4817vw6m36p4"; }; buildInputs = [ tcl tk ]; - hardeningDisable = [ "format" ]; + configureFlags = [ "--enable-tk=${tk.dev}" "--enable-tcl=${tcl}" ]; - # https://wiki.tcl.tk/3577 - patches = [ ./matherr.patch ]; + patches = [ + # https://wiki.tcl.tk/3577 + ./matherr.patch + # format hardening + (fetchpatch { + url = "https://raw.githubusercontent.com/OpenMandrivaAssociation/uudeview/master/uudeview-0.5.20-fix-str-fmt.patch"; + sha256 = "1biipck60mhpd0j6jwizaisvqa8alisw1dpfqm6zf7ic5b93hmfw"; + extraPrefix = ""; + }) + ]; + postPatch = '' substituteInPlace tcl/xdeview --replace "exec uuwish" "exec $out/bin/uuwish" ''; @@ -20,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "The Nice and Friendly Decoder"; homepage = "http://www.fpx.de/fp/Software/UUDeview/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ woffs ]; platforms = lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/misc/vector/default.nix b/nixpkgs/pkgs/tools/misc/vector/default.nix index 6c559ada9632..cf76462eb612 100644 --- a/nixpkgs/pkgs/tools/misc/vector/default.nix +++ b/nixpkgs/pkgs/tools/misc/vector/default.nix @@ -55,13 +55,15 @@ rustPlatform.buildRustPackage rec { doCheck = !stdenv.isDarwin; # healthcheck_grafana_cloud is trying to make a network access # test_stream_errors is flaky on linux-aarch64 + # tcp_with_tls_intermediate_ca is flaky on linux-x86_64 checkPhase = '' TZDIR=${tzdata}/share/zoneinfo cargo test \ --no-default-features \ --features ${lib.concatStringsSep "," features} \ -- --test-threads 1 \ --skip=sinks::loki::tests::healthcheck_grafana_cloud \ - --skip=kubernetes::api_watcher::tests::test_stream_errors + --skip=kubernetes::api_watcher::tests::test_stream_errors \ + --skip=sources::socket::test::tcp_with_tls_intermediate_ca ''; # recent overhauls of DNS support in 0.9 mean that we try to resolve diff --git a/nixpkgs/pkgs/tools/misc/vimpager/build.nix b/nixpkgs/pkgs/tools/misc/vimpager/build.nix index ec1766d7af31..a610a461656c 100644 --- a/nixpkgs/pkgs/tools/misc/vimpager/build.nix +++ b/nixpkgs/pkgs/tools/misc/vimpager/build.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation { rev = version; }; - buildInputs = [ coreutils sharutils ]; # for uuencode + nativeBuildInputs = [ sharutils ]; # for uuencode + buildInputs = [ coreutils ]; makeFlags = [ "PREFIX=$(out)" diff --git a/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix b/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix index 7aebfeab2cee..b0b4e5e34e12 100644 --- a/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix +++ b/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libogg, libvorbis }: stdenv.mkDerivation rec { - name = "vorbisgain-0.37"; + pname = "vorbisgain"; + version = "0.37"; src = fetchurl { - url = "https://sjeng.org/ftp/vorbis/${name}.tar.gz"; + url = "https://sjeng.org/ftp/vorbis/vorbisgain-${version}.tar.gz"; sha256 = "1v1h6mhnckmvvn7345hzi9abn5z282g4lyyl4nnbqwnrr98v0vfx"; }; diff --git a/nixpkgs/pkgs/tools/misc/wv2/default.nix b/nixpkgs/pkgs/tools/misc/wv2/default.nix index c0f85b4b8de7..105a1f734dc9 100644 --- a/nixpkgs/pkgs/tools/misc/wv2/default.nix +++ b/nixpkgs/pkgs/tools/misc/wv2/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, pkg-config, cmake, libgsf, glib, libxml2 }: stdenv.mkDerivation rec { - name = "wv2-0.4.2"; + pname = "wv2"; + version = "0.4.2"; src = fetchurl { - url = "mirror://sourceforge/wvware/${name}.tar.bz2"; + url = "mirror://sourceforge/wvware/wv2-${version}.tar.bz2"; sha256 = "1p1qxr8z5bsiq8pvlina3c8c1vjcb5d96bs3zz4jj3nb20wnsawz"; }; diff --git a/nixpkgs/pkgs/tools/misc/xdxf2slob/default.nix b/nixpkgs/pkgs/tools/misc/xdxf2slob/default.nix index 28c952400f17..4a89db07c45c 100644 --- a/nixpkgs/pkgs/tools/misc/xdxf2slob/default.nix +++ b/nixpkgs/pkgs/tools/misc/xdxf2slob/default.nix @@ -1,7 +1,8 @@ { lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication { - name = "xdxf2slob-unstable-2015-06-30"; + pname = "xdxf2slob"; + version = "unstable-2015-06-30"; src = fetchFromGitHub { owner = "itkach"; diff --git a/nixpkgs/pkgs/tools/misc/xflux/default.nix b/nixpkgs/pkgs/tools/misc/xflux/default.nix index 92c00d7e44d1..54a339f1d775 100644 --- a/nixpkgs/pkgs/tools/misc/xflux/default.nix +++ b/nixpkgs/pkgs/tools/misc/xflux/default.nix @@ -1,6 +1,7 @@ {lib, stdenv, fetchurl, libXxf86vm, libXext, libX11, libXrandr, gcc}: stdenv.mkDerivation { - name = "xflux-2013-09-01"; + pname = "xflux"; + version = "unstable-2013-09-01"; src = fetchurl { url = "https://justgetflux.com/linux/xflux64.tgz"; sha256 = "cc50158fabaeee58c331f006cc1c08fd2940a126e99d37b76c8e878ef20c2021"; diff --git a/nixpkgs/pkgs/tools/misc/xfstests/default.nix b/nixpkgs/pkgs/tools/misc/xfstests/default.nix index 769e23c389c7..a35b57626110 100644 --- a/nixpkgs/pkgs/tools/misc/xfstests/default.nix +++ b/nixpkgs/pkgs/tools/misc/xfstests/default.nix @@ -4,7 +4,8 @@ , time, util-linux, which, writeScript, xfsprogs, runtimeShell }: stdenv.mkDerivation { - name = "xfstests-2019-09-08"; + pname = "xfstests"; + version = "unstable-2019-09-08"; src = fetchgit { url = "git://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git"; diff --git a/nixpkgs/pkgs/tools/misc/xtitle/default.nix b/nixpkgs/pkgs/tools/misc/xtitle/default.nix index 5199977e587f..2820958443ed 100644 --- a/nixpkgs/pkgs/tools/misc/xtitle/default.nix +++ b/nixpkgs/pkgs/tools/misc/xtitle/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }: -stdenv.mkDerivation { - name = "xtitle-0.4.4"; +stdenv.mkDerivation rec { + pname = "xtitle"; + version = "0.4.4"; src = fetchurl { - url = "https://github.com/baskerville/xtitle/archive/0.4.4.tar.gz"; + url = "https://github.com/baskerville/xtitle/archive/${version}.tar.gz"; sha256 = "0w490a6ki90si1ri48jzhma473a598l1b12j8dp4ckici41z9yy2"; }; diff --git a/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix b/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix index 9cb2d1dea0da..581e36ecd741 100644 --- a/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix +++ b/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix @@ -12,6 +12,7 @@ , rtmpSupport ? true , phantomjsSupport ? false , hlsEncryptedSupport ? true +, withAlias ? false # Provides bin/youtube-dl for backcompat }: buildPythonPackage rec { @@ -19,20 +20,14 @@ buildPythonPackage rec { # The websites yt-dlp 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.9.2"; + version = "2021.9.25"; src = fetchPypi { inherit pname; version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "sha256-yn53zbBVuiaD31sIB6qxweEgy+AsjzXZ0yk9lNva6mM="; + sha256 = "e7b8dd0ee9498abbd80eb38d9753696d6ca3d02f64980322ab3bf39ba1bc31ee"; }; - # build_lazy_extractors assumes this directory exists but it is not present in - # the PyPI package - postPatch = '' - mkdir -p ytdlp_plugins/extractor - ''; - propagatedBuildInputs = [ websockets mutagen ] ++ lib.optional hlsEncryptedSupport pycryptodome; @@ -56,6 +51,10 @@ buildPythonPackage rec { # Requires network doCheck = false; + postInstall = lib.optionalString withAlias '' + ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl" + ''; + meta = with lib; { homepage = "https://github.com/yt-dlp/yt-dlp/"; description = "Command-line tool to download videos from YouTube.com and other sites (youtube-dl fork)"; diff --git a/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix b/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix index 827eaec048ff..6d80cd2400d2 100644 --- a/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -3,10 +3,11 @@ }: stdenv.mkDerivation rec { - name = "yubico-piv-tool-2.0.0"; + pname = "yubico-piv-tool"; + version = "2.0.0"; src = fetchurl { - url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz"; + url = "https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-${version}.tar.gz"; sha256 = "124lhlim05gw32ydjh1yawqbnx6wdllz1ir9j00j09wji3m11rfs"; }; diff --git a/nixpkgs/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-personalization-gui/default.nix index af6843e38202..7e311b6ea23f 100644 --- a/nixpkgs/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -2,10 +2,11 @@ , libyubikey, yubikey-personalization }: mkDerivation rec { - name = "yubikey-personalization-gui-3.1.25"; + pname = "yubikey-personalization-gui"; + version = "3.1.25"; src = fetchurl { - url = "https://developers.yubico.com/yubikey-personalization-gui/Releases/${name}.tar.gz"; + url = "https://developers.yubico.com/yubikey-personalization-gui/Releases/yubikey-personalization-gui-${version}.tar.gz"; sha256 = "1knyv5yss8lhzaff6jpfqv12fjf1b8b21mfxzx3qi0hw4nl8n2v8"; }; diff --git a/nixpkgs/pkgs/tools/misc/zellij/default.nix b/nixpkgs/pkgs/tools/misc/zellij/default.nix index 2d07c45e61db..81400bcd38fd 100644 --- a/nixpkgs/pkgs/tools/misc/zellij/default.nix +++ b/nixpkgs/pkgs/tools/misc/zellij/default.nix @@ -6,21 +6,20 @@ , pkg-config , libiconv , openssl -, expect }: rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-2DYNgPURQzHaR8wHKEzuXSzubrxsQHpl3H3ko4okY7M="; + sha256 = "sha256-ZV908Zrvx075TTbrYsw0JdQD+66XRfd7EW48lNZLNik="; }; - cargoSha256 = "sha256-AxtXWBfOzdLCpRchaQJbBBs+6rIyF+2ralOflRvkY4k="; + cargoSha256 = "sha256-Wpg75RU1ANEnxgx28oy1kp4xt3HwIThNjHwmN8CRkjA="; nativeBuildInputs = [ installShellFiles pkg-config ]; @@ -32,9 +31,9 @@ rustPlatform.buildRustPackage rec { postInstall = '' installShellCompletion --cmd $pname \ - --bash <(${expect}/bin/unbuffer $out/bin/zellij setup --generate-completion bash) \ - --fish <(${expect}/bin/unbuffer $out/bin/zellij setup --generate-completion fish) \ - --zsh <(${expect}/bin/unbuffer $out/bin/zellij setup --generate-completion zsh) + --bash <($out/bin/zellij setup --generate-completion bash) \ + --fish <($out/bin/zellij setup --generate-completion fish) \ + --zsh <($out/bin/zellij setup --generate-completion zsh) ''; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/misc/zoxide/default.nix b/nixpkgs/pkgs/tools/misc/zoxide/default.nix index 7a66c7f92c58..c2eba8c01b46 100644 --- a/nixpkgs/pkgs/tools/misc/zoxide/default.nix +++ b/nixpkgs/pkgs/tools/misc/zoxide/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.7.3"; + version = "0.7.5"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "sha256-vw/3pWqb1Qtat+17tzhBvpS+Z2DRe69HGmgzhMQPUw8="; + sha256 = "sha256-DcfWNp9fELRzLfNAU2qGXfLDkSbWGrsfW/Wy0t2ISXU="; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoSha256 = "sha256-xybP9A2QfhuSSjsBVsJgSfDC/1/OahtF5xfsXAlmpjs="; + cargoSha256 = "sha256-O2IPmb9LH0ct0O2kR581Hfxl1sdb8himfq5U733JwGk="; postInstall = '' installManPage man/* diff --git a/nixpkgs/pkgs/tools/networking/atftp/default.nix b/nixpkgs/pkgs/tools/networking/atftp/default.nix index 0e76cb94346b..ca06afe7bdbf 100644 --- a/nixpkgs/pkgs/tools/networking/atftp/default.nix +++ b/nixpkgs/pkgs/tools/networking/atftp/default.nix @@ -1,21 +1,27 @@ -{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc }: +{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc, ps }: stdenv.mkDerivation rec { pname = "atftp"; - version = "0.7.4"; + version = "0.7.5"; src = fetchurl { url = "mirror://sourceforge/atftp/${pname}-${version}.tar.gz"; - sha256 = "sha256-08nNDZcd/Hhtel9AVcNdTmaq/IECrANHPvIlvfftsmo="; + sha256 = "12h3sgkd25j4nfagil2jqyj1n8yxvaawj0cf01742642n57pmj4k"; }; + # fix test script + postPatch = '' + patchShebangs . + ''; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ readline tcp_wrappers pcre gcc ]; # Expects pre-GCC5 inline semantics NIX_CFLAGS_COMPILE = "-std=gnu89"; - doCheck = false; # fails + doCheck = true; + checkInputs = [ ps ]; meta = { description = "Advanced tftp tools"; diff --git a/nixpkgs/pkgs/tools/networking/bitmask-vpn/default.nix b/nixpkgs/pkgs/tools/networking/bitmask-vpn/default.nix new file mode 100644 index 000000000000..35f2e801f531 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/bitmask-vpn/default.nix @@ -0,0 +1,168 @@ +{ lib +, stdenv +, fetchFromGitLab +, mkDerivation +, buildGoModule +, wrapQtAppsHook +, python3Packages +, pkg-config +, openvpn +, cmake +, qmake +, which +, iproute2 +, iptables +, procps +, qmltermwidget +, qtbase +, qtdeclarative +, qtinstaller +, qtquickcontrols +, qtquickcontrols2 +, qttools +, CoreFoundation +, Security +, provider ? "riseup" +}: +let + version = "0.21.6"; + + src = fetchFromGitLab { + domain = "0xacab.org"; + owner = "leap"; + repo = "bitmask-vpn"; + rev = version; + sha256 = "sha256-LMz+ZgQVFGujoLA8rlyZ3VnW/NSlPipD5KwCe+cFtnY="; + }; + + # bitmask-root is only used on GNU/Linux + # and may one day be replaced by pkg/helper + bitmask-root = mkDerivation { + inherit src version; + sourceRoot = "source/helpers"; + pname = "bitmask-root"; + nativeBuildInputs = [ python3Packages.wrapPython ]; + postPatch = '' + substituteInPlace bitmask-root \ + --replace 'swhich("ip")' '"${iproute2}/bin/ip"' \ + --replace 'swhich("iptables")' '"${iptables}/bin/iptables"' \ + --replace 'swhich("ip6tables")' '"${iptables}/bin/ip6tables"' \ + --replace 'swhich("sysctl")' '"${procps}/bin/sysctl"' \ + --replace /usr/sbin/openvpn ${openvpn}/bin/openvpn + substituteInPlace se.leap.bitmask.policy \ + --replace /usr/sbin/bitmask-root $out/bin/bitmask-root + ''; + installPhase = '' + runHook preInstall + + install -m 755 -D -t $out/bin bitmask-root + install -m 444 -D -t $out/share/polkit-1/actions se.leap.bitmask.policy + wrapPythonPrograms + + runHook postInstall + ''; + }; +in + +buildGoModule rec { + inherit src version; + pname = "${provider}-vpn"; + vendorSha256 = null; + + postPatch = '' + substituteInPlace pkg/pickle/helpers.go \ + --replace /usr/share $out/share + + # Using $PROVIDER is not working, + # thus replacing directly into the vendor.conf + substituteInPlace providers/vendor.conf \ + --replace "provider = riseup" "provider = ${provider}" + + patchShebangs gui/build.sh + wrapPythonProgramsIn branding/scripts + '' + lib.optionalString stdenv.isLinux '' + substituteInPlace pkg/helper/linux.go \ + --replace /usr/sbin/openvpn ${openvpn}/bin/openvpn + substituteInPlace pkg/vpn/launcher_linux.go \ + --replace /usr/sbin/openvpn ${openvpn}/bin/openvpn \ + --replace /usr/sbin/bitmask-root ${bitmask-root}/bin/bitmask-root \ + --replace /usr/bin/lxpolkit /run/wrappers/bin/polkit-agent-helper-1 \ + --replace '"polkit-gnome-authentication-agent-1",' '"polkit-gnome-authentication-agent-1","polkitd",' + ''; + + nativeBuildInputs = [ + cmake + pkg-config + python3Packages.wrapPython + qmake + qtquickcontrols + qtquickcontrols2 + qttools + which + wrapQtAppsHook + ] ++ lib.optional (!stdenv.isLinux) qtinstaller; + + buildInputs = [ + qtbase + qmltermwidget + qtdeclarative + ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; + # FIXME: building on Darwin currently fails + # due to missing debug symbols for Qt, + # this should be fixable once darwin.apple_sdk >= 10.13 + # See https://bugreports.qt.io/browse/QTBUG-76777 + + # Not using buildGoModule's buildPhase: + # gui/build.sh will build Go modules into lib/libgoshim.a + buildPhase = '' + runHook preBuild + + make gen_providers_json + make generate + # Remove timestamps in comments + sed -i -e '/^\/\//d' pkg/config/version/version.go + + # Not using -j$NIX_BUILD_CORES because the Makefile's rules + # are not thread-safe: lib/libgoshim.h is used before being built. + make build + + runHook postBuild + ''; + + postInstall = '' + install -m 755 -D -t $out/bin build/qt/release/${provider}-vpn + + VERSION=${version} VENDOR_PATH=providers branding/scripts/generate-debian branding/templates/debian/data.json + (cd branding/templates/debian && ${python3Packages.python}/bin/python3 generate.py) + install -m 444 -D branding/templates/debian/app.desktop $out/share/applications/${provider}-vpn.desktop + '' + lib.optionalString stdenv.isLinux '' + install -m 444 -D -t $out/share/polkit-1/actions ${bitmask-root}/share/polkit-1/actions/se.leap.bitmask.policy + ''; + + # Some tests need access to the Internet: + # Post "https://api.black.riseup.net/3/cert": dial tcp: lookup api.black.riseup.net on [::1]:53: read udp [::1]:56553->[::1]:53: read: connection refused + doCheck = false; + + passthru = { inherit bitmask-root; }; + + meta = { + description = "Generic VPN client by LEAP"; + longDescription = '' + Bitmask, by LEAP (LEAP Encryption Access Project), + is an application to provide easy and secure encrypted communication + with a VPN (Virtual Private Network). It allows you to select from + a variety of trusted service provider all from one app. + Current providers include Riseup Networks + and The Calyx Institute, where the former is default. + The <literal>${provider}-vpn</literal> executable should appear + in your desktop manager's XDG menu or could be launch in a terminal + to get an execution log. A new icon should then appear in your systray + to control the VPN and configure some options. + ''; + homepage = "https://bitmask.net"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ julm ]; + # darwin requires apple_sdk >= 10.13 + platforms = lib.platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/boundary/default.nix b/nixpkgs/pkgs/tools/networking/boundary/default.nix index 02dc1cd9c487..c55eeff8c101 100644 --- a/nixpkgs/pkgs/tools/networking/boundary/default.nix +++ b/nixpkgs/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.6.0"; + version = "0.6.1"; src = let @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { x86_64-darwin = "darwin_amd64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-9xgvSnfMh5kX/RtC/B+tkbSNcB82U6SYzCs5V04VzW0="; - aarch64-linux = "sha256-ARSZygm1OayiOxF7I+/5ebwtaO0z/lYztuwNSD4Zu+0="; - x86_64-darwin = "sha256-GFLLpOt3BEJI14xKjnjK6nd4h/0+/aSLOagZphOKErE="; + x86_64-linux = "sha256-E+AQhm2ddaDU8G0KuK0dC4wUU4YFELwO/q+8d2kpnV8="; + aarch64-linux = "sha256-RG4hazKsuUCYYBfDJ9OWghHlBNLEaxVOz5YGHP+ySbA="; + x86_64-darwin = "sha256-h0EjoEU+U3HQhmnPBKGijFJrkg9yPPP7zyWNbrn2e5Q="; }; in fetchzip { diff --git a/nixpkgs/pkgs/tools/networking/curl/default.nix b/nixpkgs/pkgs/tools/networking/curl/default.nix index 984a6ecaaef8..b3572e01c96d 100644 --- a/nixpkgs/pkgs/tools/networking/curl/default.nix +++ b/nixpkgs/pkgs/tools/networking/curl/default.nix @@ -7,8 +7,9 @@ , gnutlsSupport ? false, gnutls ? null , wolfsslSupport ? false, wolfssl ? null , scpSupport ? zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin, libssh2 ? null -, gssSupport ? with stdenv.hostPlatform; !( +, gssSupport ? with stdenv.hostPlatform; ( !isWindows && + # disable gss becuase of: undefined reference to `k5_bcmp' # a very sad story re static: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=439039 !isStatic && # the "mig" tool does not configure its compiler correctly. This could be @@ -63,6 +64,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + strictDeps = true; + nativeBuildInputs = [ pkg-config perl ]; # Zlib and OpenSSL must be propagated because `libcurl.la' contains @@ -93,15 +96,15 @@ stdenv.mkDerivation rec { "--without-ca-bundle" "--without-ca-path" # The build fails when using wolfssl with --with-ca-fallback - ( if wolfsslSupport then "--without-ca-fallback" else "--with-ca-fallback") + (lib.withFeature (!wolfsslSupport) "ca-fallback") "--disable-manual" - ( if sslSupport then "--with-ssl=${openssl.dev}" else "--without-ssl" ) - ( if gnutlsSupport then "--with-gnutls=${gnutls.dev}" else "--without-gnutls" ) - ( if scpSupport then "--with-libssh2=${libssh2.dev}" else "--without-libssh2" ) - ( if ldapSupport then "--enable-ldap" else "--disable-ldap" ) - ( if ldapSupport then "--enable-ldaps" else "--disable-ldaps" ) - ( if idnSupport then "--with-libidn=${libidn.dev}" else "--without-libidn" ) - ( if brotliSupport then "--with-brotli" else "--without-brotli" ) + (lib.withFeatureAs sslSupport "ssl" openssl.dev) + (lib.withFeatureAs gnutlsSupport "gnutls" gnutls.dev) + (lib.withFeatureAs scpSupport "libssh2" libssh2.dev) + (lib.enableFeature ldapSupport "ldap") + (lib.enableFeature ldapSupport "ldaps") + (lib.withFeatureAs idnSupport "libidn" libidn.dev) + (lib.withFeature brotliSupport "brotli") ] ++ lib.optional wolfsslSupport "--with-wolfssl=${wolfssl.dev}" ++ lib.optional c-aresSupport "--enable-ares=${c-ares}" @@ -142,5 +145,7 @@ stdenv.mkDerivation rec { license = licenses.curl; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; + # Fails to link against static brotli or gss + broken = stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport); }; } diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/README.md b/nixpkgs/pkgs/tools/networking/dd-agent/README.md deleted file mode 100644 index 8cff23b9574c..000000000000 --- a/nixpkgs/pkgs/tools/networking/dd-agent/README.md +++ /dev/null @@ -1,17 +0,0 @@ -To update datadog-agent v6 (v5 is deprecated and should be removed): - -1. Bump `version`, `rev`, `sha256` and `payloadVersion` in `datadog-agent.nix` -2. `git clone https://github.com/DataDog/datadog-agent.git && cd datadog-agent` -3. `git checkout <tag>` -4. `nix-env -i -f https://github.com/nixcloud/dep2nix/archive/master.tar.gz` -5. `dep2nix` -6. `cp deps.nix $NIXPKGS/pkgs/tools/networking/dd-agent/datadog-agent-deps.nix` - -To update datadog-process-agent: - -1. Bump `version`, `rev` and `sha256` in `datadog-process-agent.nix` -2. `git clone https://github.com/DataDog/datadog-process-agent.git && cd datadog-process-agent` -3. `git checkout <tag>` -4. `nix-env -i -f https://github.com/nixcloud/dep2nix/archive/master.tar.gz` -5. `dep2nix` -6. `cp deps.nix $NIXPKGS/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix` diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent-deps.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent-deps.nix deleted file mode 100644 index fb6f66b5a4e4..000000000000 --- a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent-deps.nix +++ /dev/null @@ -1,1353 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "bitbucket.org/ww/goautoneg"; - fetch = { - type = "git"; - url = "https://github.com/adjust/goautoneg"; - rev = "d788f35a0315672bc90f50a6145d1252a230ee0d"; - sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; - }; - } - { - goPackagePath = "github.com/DataDog/agent-payload"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/agent-payload"; - rev = "c76e9d5be7457cafb7b3e056c6e8ae127b1f0431"; - sha256 = "0wva55yz5gs5gw23icz1z23hwhjw5vmijx4aa3fp3bq6pi63s873"; - }; - } - { - goPackagePath = "github.com/DataDog/datadog-go"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/datadog-go"; - rev = "e67964b4021ad3a334e748e8811eb3cd6becbc6e"; - sha256 = "1b2dzyk9c9icdwcyfiwh3djzh8gb5z4hmhp796ns7hh72cdnnys1"; - }; - } - { - goPackagePath = "github.com/DataDog/gohai"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/gohai"; - rev = "43b075bb9705588cd89c71363d6d72937e3020c7"; - sha256 = "195z5g8gdxcx4cq51p2xqha3j8m7mk5d5lr6i3hbaxp948hgc8dh"; - }; - } - { - goPackagePath = "github.com/DataDog/mmh3"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/mmh3"; - rev = "2cfb68475274527a10701355c739f31dd404718c"; - sha256 = "09jgzxi08pkxllxk3f5qwipz96jxrw5v035fj2bkid1d4akn8y0b"; - }; - } - { - goPackagePath = "github.com/DataDog/viper"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/viper"; - rev = "v1.5.0"; - sha256 = "1sv0xvmfaif7zpfwk0j6qf11hxnfdsb2zfj63b9zx7l0zzhjzh06"; - }; - } - { - goPackagePath = "github.com/DataDog/zstd"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/zstd"; - rev = "aebefd9fcb99f22cd691ef778a12ed68f0e6a1ab"; - sha256 = "06wphl43ji23c0cmmm6fd3wszbwq36mdp1jarak2a6hmxl6yf0b8"; - }; - } - { - goPackagePath = "github.com/Microsoft/go-winio"; - fetch = { - type = "git"; - url = "https://github.com/Microsoft/go-winio"; - rev = "67921128fb397dd80339870d2193d6b1e6856fd4"; - sha256 = "1m3ajjwpdmbzhn5iclhzgyknfncw06fnd5n91yxlf75qsq235rz3"; - }; - } - { - goPackagePath = "github.com/Microsoft/hcsshim"; - fetch = { - type = "git"; - url = "https://github.com/Microsoft/hcsshim"; - rev = "0acf63599bff447edf6bbfb8bbb38cb5fb33aa1e"; - sha256 = "009jx133302pj0jf1bxsj4r5zy7j0lxmr7l53czi7930516b0rh3"; - }; - } - { - goPackagePath = "github.com/NYTimes/gziphandler"; - fetch = { - type = "git"; - url = "https://github.com/NYTimes/gziphandler"; - rev = "2600fb119af974220d3916a5916d6e31176aac1b"; - sha256 = "0bh6qqz2iyrnxhhj02s8mqayqwqxy182ldxh97q1vg7phlbm52xx"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/purell"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/purell"; - rev = "0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4"; - sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/urlesc"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/urlesc"; - rev = "de5bf2ad457846296e2031421a34e2568e304e35"; - sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; - }; - } - { - goPackagePath = "github.com/StackExchange/wmi"; - fetch = { - type = "git"; - url = "https://github.com/StackExchange/wmi"; - rev = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338"; - sha256 = "1slw6v1fl8i0hz4db9lph55pbhnrxhqyndq6vm27dgvpj22k29fk"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "bff41fb23b7550368282029f6478819d6a99ae0f"; - sha256 = "1hcd8f3m2cq02mj9i8c1ynbh3j0iyw14l1wszm0qgs18nsj1rzgn"; - }; - } - { - goPackagePath = "github.com/beevik/ntp"; - fetch = { - type = "git"; - url = "https://github.com/beevik/ntp"; - rev = "cb3dae3a7588ae35829eb5724df611cd75152fba"; - sha256 = "0nc6f7d0xw23y18z9qxrmm8kvnywihassyk706mn9v4makmhalnz"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; - }; - } - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "2ea60e5f094469f9e65adb9cd103795b73ae743e"; - sha256 = "0k4899ifpir6kmfxli8a2xfj5zdh0xb2jd0fq2r38wzd4pk25ipr"; - }; - } - { - goPackagePath = "github.com/cihub/seelog"; - fetch = { - type = "git"; - url = "https://github.com/cihub/seelog"; - rev = "d2c6e5aa9fbfdd1c624e140287063c7730654115"; - sha256 = "0ab9kyrh51x1x71z37pwjsla0qv11a1qv697xafyc4r5nq5hds6p"; - }; - } - { - goPackagePath = "github.com/clbanning/mxj"; - fetch = { - type = "git"; - url = "https://github.com/clbanning/mxj"; - rev = "1f00e0bf9bacd7ea9c93d27594d1d1f5a41bac36"; - sha256 = "1cb7kib79xrzr8n91p6kskmn30ayqrhbqql2ppyf879967wbm8qy"; - }; - } - { - goPackagePath = "github.com/containerd/cgroups"; - fetch = { - type = "git"; - url = "https://github.com/containerd/cgroups"; - rev = "3024bc7cc0c88af4b32d38a14444f38e65ab169f"; - sha256 = "09jmzwl0zjzwhyd77pp8x3xwihcjxlxa9wamkx22rvd1pqlgszw7"; - }; - } - { - goPackagePath = "github.com/containerd/containerd"; - fetch = { - type = "git"; - url = "https://github.com/containerd/containerd"; - rev = "9754871865f7fe2f4e74d43e2fc7ccd237edcbce"; - sha256 = "065snv0s3v3z0ghadlii4w78qnhchcbx2kfdrvm8fk8gb4pkx1ya"; - }; - } - { - goPackagePath = "github.com/containerd/continuity"; - fetch = { - type = "git"; - url = "https://github.com/containerd/continuity"; - rev = "c7c5070e6f6e090ab93b0a61eb921f2196fc3383"; - sha256 = "0xyf9w4xn501jspl4r6ml84am90bfgljnjlbd4i1pxkm372qzvzf"; - }; - } - { - goPackagePath = "github.com/containerd/cri"; - fetch = { - type = "git"; - url = "https://github.com/containerd/cri"; - rev = "f3687c59470b76ee57c90d4b3dd92888dec58c2b"; - sha256 = "00lasx5yylmgsj1f9znl3xyxm2bngj4xfj69vcwb4qzdy0vclc7w"; - }; - } - { - goPackagePath = "github.com/containerd/fifo"; - fetch = { - type = "git"; - url = "https://github.com/containerd/fifo"; - rev = "3d5202aec260678c48179c56f40e6f38a095738c"; - sha256 = "11jp12vgfj0xg9m2w5cfay72fwrxb6w8za7rkcqw8yy8hypiqqxq"; - }; - } - { - goPackagePath = "github.com/containerd/typeurl"; - fetch = { - type = "git"; - url = "https://github.com/containerd/typeurl"; - rev = "a93fcdb778cd272c6e9b3028b2f42d813e785d40"; - sha256 = "0aqnf5rzc5pldln0czhxlr0fqaf5553ab7wzsq85p90lg1ryqnd6"; - }; - } - { - goPackagePath = "github.com/coreos/etcd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/etcd"; - rev = "c9504f61fc7f29b0ad30bf8bab02d9e1b600e962"; - sha256 = "1ap8zhfz6pcn2ipn27s84ihpyrvpjrb48mpy4n5pr6khrni83p1a"; - }; - } - { - goPackagePath = "github.com/coreos/go-semver"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-semver"; - rev = "8ab6407b697782a06568d4b7f1db25550ec2e4c6"; - sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; - }; - } - { - goPackagePath = "github.com/coreos/go-systemd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-systemd"; - rev = "40e2722dffead74698ca12a750f64ef313ddce05"; - sha256 = "0kq7aa0pbn8gv9ny2a1gfx3ybsqyryfwz9gv7fck6zfc8xxbl1fa"; - }; - } - { - goPackagePath = "github.com/coreos/pkg"; - fetch = { - type = "git"; - url = "https://github.com/coreos/pkg"; - rev = "97fdf19511ea361ae1c100dd393cc47f8dcfa1e1"; - sha256 = "1srn87wih25l09f75483hnxsr8fc6rq3bk7w1x8125ym39p6mg21"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/docker/distribution"; - fetch = { - type = "git"; - url = "https://github.com/docker/distribution"; - rev = "83389a148052d74ac602f5f1d62f86ff2f3c4aa5"; - sha256 = "0ypps7340k1g1njcdbn83c9233hrki0mxyj66av1i55ji378ayyn"; - }; - } - { - goPackagePath = "github.com/docker/docker"; - fetch = { - type = "git"; - url = "https://github.com/docker/docker"; - rev = "092cba3727bb9b4a2f0e922cd6c0f93ea270e363"; - sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar"; - }; - } - { - goPackagePath = "github.com/docker/go-connections"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-connections"; - rev = "3ede32e2033de7505e6500d6c868c2b9ed9f169d"; - sha256 = "0v1pkr8apwmhyzbjfriwdrs1ihlk6pw7izm57r24mf9jdmg3fyb0"; - }; - } - { - goPackagePath = "github.com/docker/go-events"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-events"; - rev = "9461782956ad83b30282bf90e31fa6a70c255ba9"; - sha256 = "0vn0kd0w253jwdk86gv1h6s8p6bzxiyif74xdzlb39zr6fdrr145"; - }; - } - { - goPackagePath = "github.com/docker/go-units"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-units"; - rev = "47565b4f722fb6ceae66b95f853feed578a4a51c"; - sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93"; - }; - } - { - goPackagePath = "github.com/docker/spdystream"; - fetch = { - type = "git"; - url = "https://github.com/docker/spdystream"; - rev = "bc6354cbbc295e925e4c611ffe90c1f287ee54db"; - sha256 = "08746a15snvmax6cnzn2qy7cvsspxbsx97vdbjpdadir3pypjxya"; - }; - } - { - goPackagePath = "github.com/dsnet/compress"; - fetch = { - type = "git"; - url = "https://github.com/dsnet/compress"; - rev = "cc9eb1d7ad760af14e8f918698f745e80377af4f"; - sha256 = "159liclywmyb6zx88ga5gn42hfl4cpk1660zss87fkx31hdq9fgx"; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e"; - sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; - }; - } - { - goPackagePath = "github.com/elazarl/go-bindata-assetfs"; - fetch = { - type = "git"; - url = "https://github.com/elazarl/go-bindata-assetfs"; - rev = "30f82fa23fd844bd5bb1e5f216db87fd77b5eb43"; - sha256 = "1swfb37g6sga3awvcmxf49ngbpvjv7ih5an9f8ixjqcfcwnb7nzp"; - }; - } - { - goPackagePath = "github.com/emicklei/go-restful"; - fetch = { - type = "git"; - url = "https://github.com/emicklei/go-restful"; - rev = "3658237ded108b4134956c1b3050349d93e7b895"; - sha256 = "07sm3b5dlrqld4r8r1w79s37y41fk4zmw4afhi2ragjy1iarqck3"; - }; - } - { - goPackagePath = "github.com/emicklei/go-restful-swagger12"; - fetch = { - type = "git"; - url = "https://github.com/emicklei/go-restful-swagger12"; - rev = "dcef7f55730566d41eae5db10e7d6981829720f6"; - sha256 = "0zz1f6n1qfbyrp592mgyrkyfhki3r0ksic6ja9lxisg8br1ibrvq"; - }; - } - { - goPackagePath = "github.com/evanphx/json-patch"; - fetch = { - type = "git"; - url = "https://github.com/evanphx/json-patch"; - rev = "afac545df32f2287a079e2dfb7ba2745a643747e"; - sha256 = "1d90prf8wfvndqjn6nr0k405ykia5vb70sjw4ywd49s9p3wcdyn8"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; - sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; - }; - } - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "06f5f3d67269ccec1fe5fe4134ba6e982984f7f5"; - sha256 = "0fx123601aiqqn0yr9vj6qp1bh8gp240w4qdm76irs73q8dxlk7a"; - }; - } - { - goPackagePath = "github.com/go-ole/go-ole"; - fetch = { - type = "git"; - url = "https://github.com/go-ole/go-ole"; - rev = "a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506"; - sha256 = "114h8x7dh4jp7w7k678fm98lr9icavsf74v6jfipyq7q35bsfr1p"; - }; - } - { - goPackagePath = "github.com/go-openapi/jsonpointer"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/jsonpointer"; - rev = "3a0015ad55fa9873f41605d3e8f28cd279c32ab2"; - sha256 = "02an755ashhckqwxyq2avgn8mm4qq3hxda2jsj1a3bix2gkb45v7"; - }; - } - { - goPackagePath = "github.com/go-openapi/jsonreference"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/jsonreference"; - rev = "3fb327e6747da3043567ee86abd02bb6376b6be2"; - sha256 = "0zwsrmqqcihm0lj2pc18cpm7wnn1dzwr4kvrlyrxf0lnn7dsdsbm"; - }; - } - { - goPackagePath = "github.com/go-openapi/spec"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/spec"; - rev = "bcff419492eeeb01f76e77d2ebc714dc97b607f5"; - sha256 = "00z8sv766kjdrdvpyzm9c5x3d45gssbwsm77qihmkflric6a3d3l"; - }; - } - { - goPackagePath = "github.com/go-openapi/swag"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/swag"; - rev = "811b1089cde9dad18d4d0c2d09fbdbf28dbd27a5"; - sha256 = "0hkbrq4jq9s4nrz7xpx03z1zljss1zdylm3zb76hhjpp0s7hz418"; - }; - } - { - goPackagePath = "github.com/godbus/dbus"; - fetch = { - type = "git"; - url = "https://github.com/godbus/dbus"; - rev = "a389bdde4dd695d414e47b755e95e72b7826432c"; - sha256 = "1ckvg15zdsgmbn4mi36cazkb407ixc9mmyf7vwj8b8wi3d00rgn9"; - }; - } - { - goPackagePath = "github.com/gogo/googleapis"; - fetch = { - type = "git"; - url = "https://github.com/gogo/googleapis"; - rev = "08a7655d27152912db7aaf4f983275eaf8d128ef"; - sha256 = "0mzjclx31hkdgad0xjdihz23qphrsljkvzx5gnwn96m7agx6vkvr"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "1adfc126b41513cc696b209667c8656ea7aac67c"; - sha256 = "1j7azzlnihcvnd1apw5zr0bz30h7n0gyimqqkgc76vzb1n5dpi7m"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/groupcache"; - fetch = { - type = "git"; - url = "https://github.com/golang/groupcache"; - rev = "24b0969c4cb722950103eed87108c8d291a8df00"; - sha256 = "0rj588dxg4ncanj8vcsixi00161xq54nz7siv47d5ijmzgxs82zf"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; - sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "2e65f85255dbc3072edf28d6b5b8efc472979f5a"; - sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf"; - }; - } - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "4030bb1f1f0c35b30ca7009e9ebd06849dd45306"; - sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; - }; - } - { - goPackagePath = "github.com/google/gofuzz"; - fetch = { - type = "git"; - url = "https://github.com/google/gofuzz"; - rev = "24818f796faf91cd76ec7bddd72458fbced7a6c1"; - sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; - }; - } - { - goPackagePath = "github.com/googleapis/gnostic"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gnostic"; - rev = "7c663266750e7d82587642f65e60bc4083f1f84e"; - sha256 = "0yh3ckd7m0r9h50wmxxvba837d0wb1k5yd439zq4p1kpp4390z12"; - }; - } - { - goPackagePath = "github.com/gorilla/context"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/context"; - rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"; - sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf"; - sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; - }; - } - { - goPackagePath = "github.com/gregjones/httpcache"; - fetch = { - type = "git"; - url = "https://github.com/gregjones/httpcache"; - rev = "9cad4c3443a7200dd6400aef47183728de563a38"; - sha256 = "0wjdwcwqqcx2d5y68qvhg6qyj977il5ijmnn9h9cd6wjbdy0ay6s"; - }; - } - { - goPackagePath = "github.com/hashicorp/consul"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/consul"; - rev = "fb848fc48818f58690db09d14640513aa6bf3c02"; - sha256 = "0ra38xrh6ghcnix8w6gjs33yr2ra1n5jvf8lww4csr4dgw5bh5b1"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-cleanhttp"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-cleanhttp"; - rev = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d"; - sha256 = "1m20y90syky4xr81sm3980jpil81nnpzmi6kv0vjr6p584gl1hn8"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-rootcerts"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-rootcerts"; - rev = "6bb64b370b90e7ef1fa532be9e591a81c3493e00"; - sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "0fb14efe8c47ae851c0034ed7a448854d3d34cf3"; - sha256 = "0vg4yn3088ym4sj1d34kr13lp4v5gya7r2nxshp2bz70n46fsqn2"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"; - sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr"; - }; - } - { - goPackagePath = "github.com/hashicorp/serf"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/serf"; - rev = "d6574a5bb1226678d7010325fb6c985db20ee458"; - sha256 = "1arakjvhyasrk52vhxas2ghlrby3i3wj59r7sjrkbpln2cdbqnlx"; - }; - } - { - goPackagePath = "github.com/hectane/go-acl"; - fetch = { - type = "git"; - url = "https://github.com/hectane/go-acl"; - rev = "7f56832555fc229dad908c67d65ed3ce6156b70c"; - sha256 = "17crpqmn51fqcz0j1vi4grwwiaqpvc3zhl102hn5sy7s2lmdf630"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "9316a62528ac99aaecb4e47eadd6dc8aa6533d58"; - sha256 = "1mvgn89vp39gcpvhiq4n7nw5ipj7fk6h03jgc6fjwgvwvss213pb"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "0b12d6b5"; - sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "1624edc4454b8682399def8740d46db5e4362ba4"; - sha256 = "11wn4hpmrs8bmpvd93wqk49jfbbgylakhi35f9k5qd7jd479ci4s"; - }; - } - { - goPackagePath = "github.com/kardianos/osext"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; - sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; - }; - } - { - goPackagePath = "github.com/kubernetes-incubator/custom-metrics-apiserver"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes-incubator/custom-metrics-apiserver"; - rev = "85ebc283a57287a8fcb3ad4b488d633cd63ef7d8"; - sha256 = "06m3xa9j46035bagv9r2ghsmdx6pr0r3lcj4hz1cx943dllj0n6v"; - }; - } - { - goPackagePath = "github.com/lxn/walk"; - fetch = { - type = "git"; - url = "https://github.com/lxn/walk"; - rev = "02935bac0ab8448d5f9bf72ebeeb7ca0d5553f9b"; - sha256 = "0m0dva6nyv6vxc188c9003g5ylxb6clmlcvqjgaibbcrxkxjw1d5"; - }; - } - { - goPackagePath = "github.com/lxn/win"; - fetch = { - type = "git"; - url = "https://github.com/lxn/win"; - rev = "7e1250ba2e7749fb9eb865da9ee93fb5a2fe73f1"; - sha256 = "1n5ksvy3va3zd0iqpl64advjscm2w9n8kxn45ahahvbrbi7zy1zw"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "c2353362d570a7bfa228149c62842019201cfb71"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - { - goPackagePath = "github.com/mailru/easyjson"; - fetch = { - type = "git"; - url = "https://github.com/mailru/easyjson"; - rev = "3fdea8d05856a0c8df22ed4bc71b3219245e4485"; - sha256 = "0g3crph77yhv4ipdnwqc32z4cp87ahi4ikad5kyy6q4znnxliz74"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"; - sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/mholt/archiver"; - fetch = { - type = "git"; - url = "https://github.com/mholt/archiver"; - rev = "26cf5bb32d07aa4e8d0de15f56ce516f4641d7df"; - sha256 = "1r2gcxh8gkyn1l0h7sshachg2fxz6542lbqcar9zym6n2dni30mm"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "3864e76763d94a6df2f9960b16a20a33da9f9a66"; - sha256 = "1n8vya16l60i5jms43yb8fzdgwvqa2q926p5wkg3lbrk8pxy1nv0"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b"; - sha256 = "1aqk9qr46bwgdc5j7n7als61xvssvyjf4qzfsvhacl4izpygqnw7"; - }; - } - { - goPackagePath = "github.com/mitchellh/reflectwalk"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/reflectwalk"; - rev = "63d60e9d0dbc60cf9164e6510889b0db6683d98c"; - sha256 = "1hpq6sjr6l1h25x68mz13q7sd52dv1mjfxbl5p7m3j7cv85khnvc"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd"; - sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49"; - }; - } - { - goPackagePath = "github.com/nwaples/rardecode"; - fetch = { - type = "git"; - url = "https://github.com/nwaples/rardecode"; - rev = "e06696f847aeda6f39a8f0b7cdff193b7690aef6"; - sha256 = "1aj7l8ii7hxnn3q4wzxlx3f92b1aspck6ncyqgb4h2g228phcibw"; - }; - } - { - goPackagePath = "github.com/opencontainers/go-digest"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/go-digest"; - rev = "279bed98673dd5bef374d3b6e4b09e2af76183bf"; - sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9"; - }; - } - { - goPackagePath = "github.com/opencontainers/image-spec"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/image-spec"; - rev = "d60099175f88c47cd379c4738d158884749ed235"; - sha256 = "03dvbj3dln8c55v9gp79mgmz2yi2ws3r08iyz2fk41y3i22iaw1q"; - }; - } - { - goPackagePath = "github.com/opencontainers/runc"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/runc"; - rev = "baf6536d6259209c3edfa2b22237af82942d3dfa"; - sha256 = "09fm7f1k4lvx8v3crqb0cli1x2brlz8ka7f7qa8d2sb6ln58h7w7"; - }; - } - { - goPackagePath = "github.com/opencontainers/runtime-spec"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/runtime-spec"; - rev = "d810dbc60d8c5aeeb3d054bd1132fab2121968ce"; - sha256 = "0yqya0wslhv87nlidsmrw2720y3r3jpvqc2sh28y79ciyypxbk38"; - }; - } - { - goPackagePath = "github.com/openshift/api"; - fetch = { - type = "git"; - url = "https://github.com/openshift/api"; - rev = "0d921e363e951d89f583292c60d013c318df64dc"; - sha256 = "171xac4hr665q08mp17fld2zfpp95h9mjws2wikcr0brwq878p3s"; - }; - } - { - goPackagePath = "github.com/patrickmn/go-cache"; - fetch = { - type = "git"; - url = "https://github.com/patrickmn/go-cache"; - rev = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0"; - sha256 = "10020inkzrm931r4bixf8wqr9n39wcrb78vfyxmbvjavvw4zybgs"; - }; - } - { - goPackagePath = "github.com/pborman/uuid"; - fetch = { - type = "git"; - url = "https://github.com/pborman/uuid"; - rev = "e790cca94e6cc75c7064b1332e63811d4aae1a53"; - sha256 = "0y1crv4wkly2naki2f68ln9sc8l9skswkc696vr8vc43p4p67wam"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "c01d1270ff3e442a8a57cddc1c92dc1138598194"; - sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; - }; - } - { - goPackagePath = "github.com/petar/GoLLRB"; - fetch = { - type = "git"; - url = "https://github.com/petar/GoLLRB"; - rev = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4"; - sha256 = "01xp3lcamqkvl91jg6ly202gdsgf64j39rkrcqxi6v4pbrcv7hz0"; - }; - } - { - goPackagePath = "github.com/peterbourgon/diskv"; - fetch = { - type = "git"; - url = "https://github.com/peterbourgon/diskv"; - rev = "5f041e8faa004a95c88a202771f4cc3e991971e6"; - sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b"; - }; - } - { - goPackagePath = "github.com/philhofer/fwd"; - fetch = { - type = "git"; - url = "https://github.com/philhofer/fwd"; - rev = "bb6d471dc95d4fe11e432687f8b70ff496cf3136"; - sha256 = "1pg84khadh79v42y8sjsdgfb54vw2kzv7hpapxkifgj0yvcp30g2"; - }; - } - { - goPackagePath = "github.com/pierrec/lz4"; - fetch = { - type = "git"; - url = "https://github.com/pierrec/lz4"; - rev = "1958fd8fff7f115e79725b1288e0b878b3e06b00"; - sha256 = "1c4xi40bvcp91a3lw9nw1hylvdmb51hviwrqv5f6zj1sswkv24ps"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "c5b7fccd204277076155f10851dad72b76a49317"; - sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c"; - sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "89d80287644767070914e30199b4d959e491bd3d"; - sha256 = "0nvbjr8nhkyakgjariskl3bvyb18723dzjmmxph6ppf4khi50j0w"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "7d6f385de8bea29190f15ba9931442a0eaef9af7"; - sha256 = "18cish8yas5r6xhgp8p8n7lg4wh3d4szzirszxra8m7rwy3swxxq"; - }; - } - { - goPackagePath = "github.com/samuel/go-zookeeper"; - fetch = { - type = "git"; - url = "https://github.com/samuel/go-zookeeper"; - rev = "c4fab1ac1bec58281ad0667dc3f0907a9476ac47"; - sha256 = "0i7mxg9hz8ymglq2xcwwswy1pvcr53qd57lzcdlf3d5bjki73a4w"; - }; - } - { - goPackagePath = "github.com/sbinet/go-python"; - fetch = { - type = "git"; - url = "https://github.com/sbinet/go-python"; - rev = "f976f61134dc6f5b4920941eb1b0e7cec7e4ef4c"; - sha256 = "15l7wip7kr1z6v3315m9y0070wmwq447q7gwz6490xwnclrq85kl"; - }; - } - { - goPackagePath = "github.com/shirou/gopsutil"; - fetch = { - type = "git"; - url = "https://github.com/shirou/gopsutil"; - rev = "ccc1c1016bc5d10e803189ee43417c50cdde7f1b"; - sha256 = "0dk7644fc86n0974a00m2w5nbhzcgs1jjnillic90044w7rycg66"; - }; - } - { - goPackagePath = "github.com/shirou/w32"; - fetch = { - type = "git"; - url = "https://github.com/shirou/w32"; - rev = "bb4de0191aa41b5507caa14b0650cdbddcd9280b"; - sha256 = "0xh5vqblhr2c3mlaswawx6nipi4rc2x73rbdvlkakmgi0nnl50m4"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "3e01752db0189b9157070a0e1668a620f9a85da2"; - sha256 = "029irw2lsbqi944gdrbkwdw0m2794sqni4g21gsnmz142hbzds8c"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "787d034dfe70e44075ccc060d346146ef53270ad"; - sha256 = "0138rjiacl71h7kvhzinviwvy6qa2m6rflpv9lgqv15hnjvhwvg1"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/cast"; - rev = "1ee8c8bd14a3d768a7ff681617ed56bc6c204940"; - sha256 = "0sgqmhicy672250cxgqd8zlni3qlj57r8liyiaq15g9spyhflhl0"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "ef82de70bb3f60c65fb8eebacbb2d122ef517385"; - sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"; - sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; - sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "477a77ecc69700c7cdeb1fa9e129548e1c1c393c"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "github.com/syndtr/gocapability"; - fetch = { - type = "git"; - url = "https://github.com/syndtr/gocapability"; - rev = "33e07d32887e1e06b7c025f27ce52f62c7990bc0"; - sha256 = "1x88c0b320b13w7samicf19dqx9rr4dnrh3yglk3cba21nwsp57i"; - }; - } - { - goPackagePath = "github.com/tinylib/msgp"; - fetch = { - type = "git"; - url = "https://github.com/tinylib/msgp"; - rev = "af6442a0fcf6e2a1b824f70dd0c734f01e817751"; - sha256 = "08ha23sn14071ywrgxlyj7r523vzdwx1i83dcp1mqa830glgqaff"; - }; - } - { - goPackagePath = "github.com/ugorji/go"; - fetch = { - type = "git"; - url = "https://github.com/ugorji/go"; - rev = "8c0409fcbb70099c748d71f714529204975f6c3f"; - sha256 = "0z61j0cniq3n5af0q57dbpyfmidihzimrwnysfphfzwyd0ic4rcv"; - }; - } - { - goPackagePath = "github.com/ulikunitz/xz"; - fetch = { - type = "git"; - url = "https://github.com/ulikunitz/xz"; - rev = "0c6b41e72360850ca4f98dc341fd999726ea007f"; - sha256 = "0a6l7sp67ipxim093qh6fvw8knbxj24l7bj5lykcddi5gwfi78n3"; - }; - } - { - goPackagePath = "github.com/urfave/negroni"; - fetch = { - type = "git"; - url = "https://github.com/urfave/negroni"; - rev = "5dbbc83f748fc3ad38585842b0aedab546d0ea1e"; - sha256 = "10w4ygc78hgsryxwmjmz8w51d84bjh7jm8j0xfv4vnpz5gscc8dj"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"; - sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44"; - }; - } - { - goPackagePath = "golang.org/x/mobile"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mobile"; - rev = "bceb7ef27cc623473a5b664d2a3450576dddff0f"; - sha256 = "0xky2417wm61j2p5ki3k4237fxyz8f5ds19nak0lm741s3xs2rqx"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "97aa3a539ec716117a9d15a4659a911f50d13c3c"; - sha256 = "1738bi8l50f0iq0il6h4qy1cgy39yh3q4gh1lwp5y5j7jyy33ccd"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca"; - sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "7138fd3d9dc8335c567ca206f4333fb75eb05d56"; - sha256 = "09xgxk0d9b88m18sriy4f2l6qavicznxkgsbvjyv56x24r4kmiq0"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "fbb02b2291d28baffd63558aa44b4b56f178d650"; - sha256 = "0jjqcv6rzihlgg4i797q80g1f6ch5diz2kxqh6488gwkb6nds4h4"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "ff3583edef7de132f219f0efc00e097cabcc0ec0"; - sha256 = "0bpzxk85fgvznmdf9356nzh8riqhwzcil9r2a955rbfn27lh4lmy"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8"; - sha256 = "0d8vj372ri55mrqfc0rhjl3albp5ykwfjhda1s5cgm5n40v70pr3"; - }; - } - { - goPackagePath = "gopkg.in/Knetic/govaluate.v3"; - fetch = { - type = "git"; - url = "https://github.com/Knetic/govaluate"; - rev = "d216395917cc49052c7c7094cf57f09657ca08a8"; - sha256 = "1b0sy89hy5d1720i43ikqfcxr4v6p9g9c7rnbif8s6256a7c2rsq"; - }; - } - { - goPackagePath = "gopkg.in/inf.v0"; - fetch = { - type = "git"; - url = "https://github.com/go-inf/inf"; - rev = "d2d2541c53f18d2a059457998ce2876cc8e67cbf"; - sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; - }; - } - { - goPackagePath = "gopkg.in/natefinch/lumberjack.v2"; - fetch = { - type = "git"; - url = "https://github.com/natefinch/lumberjack"; - rev = "a96e63847dc3c67d17befa69c303767e2f84e54f"; - sha256 = "1l3vlv72b7rfkpy1164kwd3qzrqmmjnb67akzxqp2mlvc66k6p3d"; - }; - } - { - goPackagePath = "gopkg.in/square/go-jose.v2"; - fetch = { - type = "git"; - url = "https://github.com/square/go-jose"; - rev = "ef984e69dd356202fd4e4910d4d9c24468bdf0b8"; - sha256 = "0pxyrygc9mh6yn169rm6i3shax7zmmzps22px6mq3kl87zkk9b8h"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4"; - sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0"; - }; - } - { - goPackagePath = "gopkg.in/zorkian/go-datadog-api.v2"; - fetch = { - type = "git"; - url = "https://github.com/zorkian/go-datadog-api"; - rev = "d7b8b10db6a7eb1c1c2424b10a795a1662e80c9a"; - sha256 = "069psfvgal6pkwc1s09gdy4mjn4ki4d1zvqnnzn7y15i5llb97kk"; - }; - } - { - goPackagePath = "k8s.io/api"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/api"; - rev = "4e7be11eab3ffcfc1876898b8272df53785a9504"; - sha256 = "0klwmkvsnim66y8mvcmkqql12fbr5cja4qgjzp36197i6i335b62"; - }; - } - { - goPackagePath = "k8s.io/apiextensions-apiserver"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apiextensions-apiserver"; - rev = "b499623aa7a31f7c85b37017e068b21206a68e25"; - sha256 = "1c0z71f0wqkwkc5x730l9gmzibkqk6af4mg5l6ks9lk69cbpxk0a"; - }; - } - { - goPackagePath = "k8s.io/apimachinery"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apimachinery"; - rev = "def12e63c512da17043b4f0293f52d1006603d9f"; - sha256 = "0dghch5avwcy3zx5k005hi71i9bl3603pk927xdjr5jlajzwm9xd"; - }; - } - { - goPackagePath = "k8s.io/apiserver"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apiserver"; - rev = "d296c96c12b7d15d7fb5fea7a05fb165f8fd4014"; - sha256 = "0a413zpkm8afhh0jab8zrwvd61kvackll85kcdb6gyinw7f6qv7x"; - }; - } - { - goPackagePath = "k8s.io/client-go"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/client-go"; - rev = "f2f85107cac6fe04c30435ca0ac0c3318fd1b94c"; - sha256 = "153a3q172kmpbp6cq5005dgasdw0x36pg9xz1mfgv966k8rwws74"; - }; - } - { - goPackagePath = "k8s.io/kube-openapi"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/kube-openapi"; - rev = "b742be413d0a6f781c123bed504c8fb39264c57d"; - sha256 = "13ik6dri0f9fzs8p6987h6n3y2aqjz5cj957826xwkpv4fj2zgq8"; - }; - } - { - goPackagePath = "k8s.io/kubernetes"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/kubernetes"; - rev = "bb9ffb1654d4a729bb4cec18ff088eacc153c239"; - sha256 = "0c5xpxg7ns5irrr0ydk8n394yp3922i0m61l26qyc183phr32wxi"; - }; - } - { - goPackagePath = "k8s.io/metrics"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/metrics"; - rev = "972ef826b8401c180b89cefc7457daa2d116daa9"; - sha256 = "0ba9mfy253d4pcqdvialh2shs4d43l0q84pn3569wiib8cisbc68"; - }; - } - { - goPackagePath = "k8s.io/utils"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/utils"; - rev = "cd34563cd63c2bd7c6fe88a73c4dcf34ed8a67cb"; - sha256 = "1wpqijsvf8s4iqjrrzgbxi3gay6vaglscyq14vxma4iacg8fx1jk"; - }; - } -] diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix index ad37245d57ca..7f500b2c09fc 100644 --- a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -1,22 +1,25 @@ -{ lib, fetchFromGitHub, buildGoPackage, makeWrapper, pythonPackages, pkg-config, systemd, hostname, extraTags ? [] }: +{ lib, buildGoModule, makeWrapper, fetchFromGitHub, pythonPackages, pkg-config, systemd, hostname, extraTags ? [] }: let # keep this in sync with github.com/DataDog/agent-payload dependency - payloadVersion = "4.7.1"; + payloadVersion = "4.78.0"; python = pythonPackages.python; - -in buildGoPackage rec { - pname = "datadog-agent"; - version = "6.11.2"; owner = "DataDog"; repo = "datadog-agent"; + goPackagePath = "github.com/${owner}/${repo}"; + +in buildGoModule rec { + pname = "datadog-agent"; + version = "7.30.2"; src = fetchFromGitHub { inherit owner repo; - rev = version; - sha256 = "1dwdiaf357l9c6b2cps5mdyfma3c1mp96zzxg1826fvz3x8ix68z"; + rev = version; + sha256 = "17ahrxhb87sj7f04wg44xv4k9wrlvf04j92ac5936a6maygp01rd"; }; + vendorSha256 = "06ryy501vibc6n14qwg94394c76l060525y6qg261qb748mbi8qi"; + subPackages = [ "cmd/agent" "cmd/cluster-agent" @@ -24,15 +27,12 @@ in buildGoPackage rec { "cmd/py-launcher" "cmd/trace-agent" ]; - goDeps = ./datadog-agent-deps.nix; - goPackagePath = "github.com/${owner}/${repo}"; nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ systemd ]; PKG_CONFIG_PATH = "${python}/lib/pkgconfig"; - preBuild = let ldFlags = lib.concatStringsSep " " [ "-X ${goPackagePath}/pkg/version.Commit=${src.rev}" @@ -43,6 +43,8 @@ in buildGoPackage rec { ]; in '' buildFlagsArray=( "-tags" "ec2 systemd cpython process log secrets ${lib.concatStringsSep " " extraTags}" "-ldflags" "${ldFlags}") + # Keep directories to generate in sync with tasks/go.py + go generate ./pkg/status ./cmd/agent/gui ''; # DataDog use paths relative to the agent binary, so fix these. @@ -61,7 +63,7 @@ in buildGoPackage rec { cp -R $src/cmd/agent/dist/conf.d $out/share/datadog-agent cp -R $src/cmd/agent/dist/{checks,utils,config.py} $out/${python.sitePackages} - cp -R $src/pkg/status/dist/templates $out/share/datadog-agent + cp -R $src/pkg/status/templates $out/share/datadog-agent wrapProgram "$out/bin/agent" \ --set PYTHONPATH "$out/${python.sitePackages}" \ diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix deleted file mode 100644 index 4533b31dd231..000000000000 --- a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent-deps.nix +++ /dev/null @@ -1,669 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "bitbucket.org/ww/goautoneg"; - fetch = { - type = "git"; - url = "https://github.com/adjust/goautoneg"; - rev = "d788f35a0315672bc90f50a6145d1252a230ee0d"; - sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; - }; - } - { - goPackagePath = "github.com/DataDog/agent-payload"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/agent-payload"; - rev = "f0521943f60221829c6bb5de1c7f788cd4411372"; - sha256 = "19m3kiwi0g2a0rysjabrb2nkkz7yx632g7s05mylv1x2ixparhrg"; - }; - } - { - goPackagePath = "github.com/DataDog/datadog-agent"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/datadog-agent"; - rev = "d7712d570b91f4f97af9f155ad1c676921d8325d"; - sha256 = "1gi921z79la4hjhm8xhl4jz167200qljvhhsy4blj4vinkgfpm8w"; - }; - } - { - goPackagePath = "github.com/DataDog/datadog-go"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/datadog-go"; - rev = "a9c7a9896c1847c9cc2b068a2ae68e9d74540a5d"; - sha256 = "1m1vpi2s22dqcq0fqhfp3skzkmsbmhzyiw2kh2dw6ii7qimy8zki"; - }; - } - { - goPackagePath = "github.com/DataDog/gopsutil"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/gopsutil"; - rev = "233cd0cf42c26d835ed6f0e46f2103432a88b526"; - sha256 = "0rvxs1jjzv3j834dns28zr25bznarjmpgdy0z6gpimnq5nyicys5"; - }; - } - { - goPackagePath = "github.com/DataDog/viper"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/viper"; - rev = "v1.5.0"; - sha256 = "1sv0xvmfaif7zpfwk0j6qf11hxnfdsb2zfj63b9zx7l0zzhjzh06"; - }; - } - { - goPackagePath = "github.com/DataDog/zstd"; - fetch = { - type = "git"; - url = "https://github.com/DataDog/zstd"; - rev = "2b373cbe6ac0c8e6960bbd18026ceb269eef89f5"; - sha256 = "157kh7w173igxbypknmr8hc8934ykmnb02pkb76k1jwq4sphn8qj"; - }; - } - { - goPackagePath = "github.com/Microsoft/go-winio"; - fetch = { - type = "git"; - url = "https://github.com/Microsoft/go-winio"; - rev = "97e4973ce50b2ff5f09635a57e2b88a037aae829"; - sha256 = "14y1gryr3pb3zy09v2g8dh89m363rfd9sch0wgbabh531hfx72vn"; - }; - } - { - goPackagePath = "github.com/StackExchange/wmi"; - fetch = { - type = "git"; - url = "https://github.com/StackExchange/wmi"; - rev = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338"; - sha256 = "1slw6v1fl8i0hz4db9lph55pbhnrxhqyndq6vm27dgvpj22k29fk"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "bff41fb23b7550368282029f6478819d6a99ae0f"; - sha256 = "1hcd8f3m2cq02mj9i8c1ynbh3j0iyw14l1wszm0qgs18nsj1rzgn"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3ac7bf7a47d159a033b107610db8a1b6575507a4"; - sha256 = "1qc3l4r818xpvrhshh1sisc5lvl9479qspcfcdbivdyh0apah83r"; - }; - } - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "b7325b0f3f1097c6546ea5e83c4a23267e58ad71"; - sha256 = "0vx4ggryxd9w111mf1bi2g51559r8sh99gdqah72k4dfj3vrv19d"; - }; - } - { - goPackagePath = "github.com/cihub/seelog"; - fetch = { - type = "git"; - url = "https://github.com/cihub/seelog"; - rev = "d2c6e5aa9fbfdd1c624e140287063c7730654115"; - sha256 = "0ab9kyrh51x1x71z37pwjsla0qv11a1qv697xafyc4r5nq5hds6p"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "8991bc29aa16c548c550c7ff78260e27b9ab7c73"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/docker/distribution"; - fetch = { - type = "git"; - url = "https://github.com/docker/distribution"; - rev = "48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89"; - sha256 = "0nj4xd72mik4pj8g065cqb0yjmgpj5ppsqf2k5ibz9f68c39c00b"; - }; - } - { - goPackagePath = "github.com/docker/docker"; - fetch = { - type = "git"; - url = "https://github.com/docker/docker"; - rev = "092cba3727bb9b4a2f0e922cd6c0f93ea270e363"; - sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar"; - }; - } - { - goPackagePath = "github.com/docker/go-connections"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-connections"; - rev = "97c2040d34dfae1d1b1275fa3a78dbdd2f41cf7e"; - sha256 = "11szydahzjz7zia3hr8kplnlxsg9papbvc2mgr1vlwrahxpdx7l7"; - }; - } - { - goPackagePath = "github.com/docker/go-units"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-units"; - rev = "47565b4f722fb6ceae66b95f853feed578a4a51c"; - sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93"; - }; - } - { - goPackagePath = "github.com/emicklei/go-restful"; - fetch = { - type = "git"; - url = "https://github.com/emicklei/go-restful"; - rev = "68c9750c36bb8cb433f1b88c807b4b30df4acc40"; - sha256 = "0bc0wd5nipz1x078vpq82acyc7ip0qv1sddl451d7f7bvfms6h67"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "ccc981bf80385c528a65fbfdd49bf2d8da22aa23"; - sha256 = "0hcrfmiyx27izac3v0ii0qq2kfjvhr9ma1i79hrl6a6y2ayagzz7"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "73d445a93680fa1a78ae23a5839bad48f32ba1ee"; - sha256 = "0pg53ky4sy3sp9j4n7vgf1p3gw4nbckwqfldcmmi9rf13kjh0mr7"; - }; - } - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "d3de07a94d22b4a0972deb4b96d790c2c0ce8333"; - sha256 = "1lpwqhcfhaa6aighd2lpjfswbb6aw5d5bsmyr0vqaqg6g5kz0ikg"; - }; - } - { - goPackagePath = "github.com/go-ole/go-ole"; - fetch = { - type = "git"; - url = "https://github.com/go-ole/go-ole"; - rev = "7a0fa49edf48165190530c675167e2f319a05268"; - sha256 = "00v6fixm35pj8jyqbj0z3kyv7bhrqa2dr2fgmlc9xqwbf0nayssy"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "d76fbc1373015ced59b43ac267f28d546b955683"; - sha256 = "051a3imx2m7gpns8cjm1gckif9z6i4ik0svc1i8j7h86800c5rg0"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "44145f04b68cf362d9c4df2182967c2275eaefed"; - sha256 = "1k7sf6qmpgm0iw81gx2dwggf9di6lgw0n54mni7862hihwfrb5rq"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; - sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; - }; - } - { - goPackagePath = "github.com/google/gofuzz"; - fetch = { - type = "git"; - url = "https://github.com/google/gofuzz"; - rev = "44d81051d367757e1c7c6a5a86423ece9afcf63c"; - sha256 = "0ivq2sl2fv8x0xxrcys27c42s8yq7irgl7lp6l0im9i7ky63nk0i"; - }; - } - { - goPackagePath = "github.com/googleapis/gnostic"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gnostic"; - rev = "0c5108395e2debce0d731cf0287ddf7242066aba"; - sha256 = "0jf3cp5clli88gpjf24r6wxbkvngnc1kf59d4cgjczsn2wasvsfc"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4"; - sha256 = "1z3h4aca31l3qs0inqr5l49vrlycpjm7vq1l9nh1mp0mb2ij0kmp"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "65a6292f0157eff210d03ed1bf6c59b190b8b906"; - sha256 = "00qgmygfa4vgf9v3lpz4vp1ca1hcfcxnjqjrvp6z4jjklc8x4mqf"; - }; - } - { - goPackagePath = "github.com/hectane/go-acl"; - fetch = { - type = "git"; - url = "https://github.com/hectane/go-acl"; - rev = "7f56832555fc229dad908c67d65ed3ce6156b70c"; - sha256 = "17crpqmn51fqcz0j1vi4grwwiaqpvc3zhl102hn5sy7s2lmdf630"; - }; - } - { - goPackagePath = "github.com/howeyc/gopass"; - fetch = { - type = "git"; - url = "https://github.com/howeyc/gopass"; - rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"; - sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "6633656539c1639d9d78127b7d47c622b5d7b6dc"; - sha256 = "1fffbq1l17i0gynmvcxypl7d9h4v81g5vlimiph5bfgf4sp4db7g"; - }; - } - { - goPackagePath = "github.com/iovisor/gobpf"; - fetch = { - type = "git"; - url = "https://github.com/iovisor/gobpf"; - rev = "98ebf56442afb10e1b43145127de3c1777ed7e95"; - sha256 = "0m2aah77b1k2yf31za975mcix5n0jijqkqmhgakip00klihx383k"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "0b12d6b5"; - sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "f2b4162afba35581b6d4a50d3b8f34e33c144682"; - sha256 = "0siqfghsm2lkdwinvg8x5gls3p76rq3cdm59c1r4x0b2mdfhnvcd"; - }; - } - { - goPackagePath = "github.com/kardianos/osext"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; - sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; - }; - } - { - goPackagePath = "github.com/kubernetes-incubator/custom-metrics-apiserver"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes-incubator/custom-metrics-apiserver"; - rev = "bb8bae16c5550f2aeef3151259a1b36078a0e544"; - sha256 = "1f1n4dh9w2qfs704yw8nhbv50n6f9fxy8ndir96l37lnwd2dvj8p"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "c2353362d570a7bfa228149c62842019201cfb71"; - sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; - }; - } - { - goPackagePath = "github.com/mailru/easyjson"; - fetch = { - type = "git"; - url = "https://github.com/mailru/easyjson"; - rev = "60711f1a8329503b04e1c88535f419d0bb440bff"; - sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; - sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "fa473d140ef3c6adf42d6b391fe76707f1f243c8"; - sha256 = "0f06q4fpzg0c370cvmpsl0iq2apl5nkbz5cd3nba5x5ysmshv1lm"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd"; - sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49"; - }; - } - { - goPackagePath = "github.com/patrickmn/go-cache"; - fetch = { - type = "git"; - url = "https://github.com/patrickmn/go-cache"; - rev = "a3647f8e31d79543b2d0f0ae2fe5c379d72cedc0"; - sha256 = "10020inkzrm931r4bixf8wqr9n39wcrb78vfyxmbvjavvw4zybgs"; - }; - } - { - goPackagePath = "github.com/pborman/uuid"; - fetch = { - type = "git"; - url = "https://github.com/pborman/uuid"; - rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4"; - sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "c2dbbc24a97911339e01bda0b8cabdbd8f13b602"; - sha256 = "0v1dsqnk5zmn6ir8jgxijx14s47jvijlqfz3aq435snfrgybd5rz"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "816c9085562cd7ee03e7f8188a1cfd942858cded"; - sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "e7e903064f5e9eb5da98208bae10b475d4db0f8c"; - sha256 = "0mn6x6za7br81vc9s8d58ivylpx5j4xdq72n7kz3aybniif49r3i"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207"; - sha256 = "0i6mpcnsawi7f00rfmjfjq8llaplyzq4xrkrawlcgfd762p5hnp8"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "65c1f6f8f0fc1e2185eb9863a3bc751496404259"; - sha256 = "0jfzmr8642hr04naim1maa3wklxvcxklykri2z7k4ayizc974lkq"; - }; - } - { - goPackagePath = "github.com/shirou/gopsutil"; - fetch = { - type = "git"; - url = "https://github.com/shirou/gopsutil"; - rev = "071446942108a03a13cf0717275ad3bdbcb691b4"; - sha256 = "0ai246kqsfm3xlnp4pp4d197djh6jrbjja832f355zhg3l9fqwfp"; - }; - } - { - goPackagePath = "github.com/shirou/w32"; - fetch = { - type = "git"; - url = "https://github.com/shirou/w32"; - rev = "bb4de0191aa41b5507caa14b0650cdbddcd9280b"; - sha256 = "0xh5vqblhr2c3mlaswawx6nipi4rc2x73rbdvlkakmgi0nnl50m4"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "d40851caa0d747393da1ffb28f7f9d8b4eeffebd"; - sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "8965335b8c7107321228e3e3702cab9832751bac"; - sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "4a4406e478ca629068e7768fc33f3f044173c0a6"; - sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "583c0c0531f06d5278b7d917446061adc344b5cd"; - sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "c10c31b5e94b6f7a0283272dc2bb27163dcea24b"; - sha256 = "1a4k61xrwmr99fib2m1rcavbaxihnsmy1bgqhff5hkcv4n7bpsl2"; - }; - } - { - goPackagePath = "golang.org/x/mobile"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mobile"; - rev = "0ff817254b04da935cce10d2d1270ccf047fbbd7"; - sha256 = "0hzsis106xh3hcydjribcar75va3ghp4hwbj9982h2msi27v54x4"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "1c05540f6879653db88113bc4a2b70aec4bd491f"; - sha256 = "0h8yqb0vcqgllgydrf9d3rzp83w8wlr8f0nm6r1rwf2qg30pq1pd"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "a9d3bda3a223baa6bba6ef412cb273f0fd163c05"; - sha256 = "1w45zc13xrjzl19s1sx74r5mg3lf2z2nm13wygcdq5r5pyjlhdz9"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "b19bf474d317b857955b12035d2c5acb57ce8b01"; - sha256 = "0wc8csaafp0ps9jb2hdk8d6xpyw1axhk1np73h0z17x09zk3ylcr"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "a4bde12657593d5e90d0533a3e4fd95e635124cb"; - sha256 = "07r227rrqgwkchm63dzmdyv5yplbla1vnwkn6qrr940l4psy15aw"; - }; - } - { - goPackagePath = "gopkg.in/inf.v0"; - fetch = { - type = "git"; - url = "https://github.com/go-inf/inf"; - rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"; - sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4"; - sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0"; - }; - } - { - goPackagePath = "gopkg.in/zorkian/go-datadog-api.v2"; - fetch = { - type = "git"; - url = "https://github.com/zorkian/go-datadog-api"; - rev = "d7b8b10db6a7eb1c1c2424b10a795a1662e80c9a"; - sha256 = "069psfvgal6pkwc1s09gdy4mjn4ki4d1zvqnnzn7y15i5llb97kk"; - }; - } - { - goPackagePath = "k8s.io/api"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/api"; - rev = "9e5ffd1f1320950b238cfce291b926411f0af722"; - sha256 = "03992x9n9b8w9rlf70wizn7iqk8cbyksxg0sdc1mm5jyzyvgksgf"; - }; - } - { - goPackagePath = "k8s.io/apimachinery"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apimachinery"; - rev = "e386b2658ed20923da8cc9250e552f082899a1ee"; - sha256 = "0lgwpsvx0gpnrdnkqc9m96xwkifdq50l7cj9rvh03njws4rbd8jz"; - }; - } - { - goPackagePath = "k8s.io/apiserver"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apiserver"; - rev = "2cf66d2375dce045e1e02e1d7b74a0d1e34fedb3"; - sha256 = "0x0am99n25njpbd1x20bhyadpv9w6qqjmspp1ahzpmdwjzrnsagg"; - }; - } - { - goPackagePath = "k8s.io/client-go"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/client-go"; - rev = "23781f4d6632d88e869066eaebb743857aa1ef9b"; - sha256 = "0cazbcv7j7fgjs00arx3a8f0z0ikybmv16ccy0yg0wp0nbc05r6v"; - }; - } - { - goPackagePath = "k8s.io/metrics"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/metrics"; - rev = "0d9ea2ac660031c8f2726a735dda29441f396f99"; - sha256 = "0bcsb7s4wlmrja35zvz4s10cf3w7dfn2ckjv6apxd1ykdjxnsk71"; - }; - } -] diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix index e2c497dad405..1dbedea50232 100644 --- a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix +++ b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix @@ -1,24 +1,11 @@ -{ lib, fetchFromGitHub, buildGoPackage }: - -buildGoPackage rec { +{ lib, datadog-agent }: +datadog-agent.overrideAttrs (attrs: { pname = "datadog-process-agent"; - version = "6.11.1"; - owner = "DataDog"; - repo = "datadog-process-agent"; - - src = fetchFromGitHub { - inherit owner repo; - rev = version; - sha256 = "0fc2flm0pa44mjxvn4fan0mkvg9yyg27w68xdgrnpdifj99kxxjf"; - }; - - goDeps = ./datadog-process-agent-deps.nix; - goPackagePath = "github.com/${owner}/${repo}"; - - meta = with lib; { - description = "Live process collector for the DataDog Agent v6"; - homepage = "https://www.datadoghq.com"; - license = licenses.bsd3; - maintainers = with maintainers; [ domenkozar rvl ]; - }; -} + meta = with lib; + attrs.meta // { + description = "Live process collector for the DataDog Agent v7"; + maintainers = with maintainers; [ domenkozar rvl ]; + }; + subPackages = [ "cmd/process-agent" ]; + postInstall = null; +}) diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/integrations-core.nix b/nixpkgs/pkgs/tools/networking/dd-agent/integrations-core.nix index 16b0b1ea09d6..d7dbb65b4f58 100644 --- a/nixpkgs/pkgs/tools/networking/dd-agent/integrations-core.nix +++ b/nixpkgs/pkgs/tools/networking/dd-agent/integrations-core.nix @@ -41,10 +41,10 @@ let src = pkgs.fetchFromGitHub { owner = "DataDog"; repo = "integrations-core"; - rev = "7e9bebbb5b79ac30c16814ecefdc8f5c63cb4ea4"; - sha256 = "0yi7dlbd0rkzzl8cag713r86f40vl87aqrj97ral58csnnj7vfzb"; + rev = version; + sha256 = "0424zsnf747s10kfzv5y0m0ac9sgczip78yvghhrc2i089i5z2h4"; }; - version = "git-2018-09-18"; + version = "7.30.1"; # Build helper to build a single datadog integration package. buildIntegration = { pname, ... }@args: python.pkgs.buildPythonPackage (args // { @@ -65,7 +65,7 @@ let pname = "checks-base"; sourceRoot = "datadog_checks_base"; propagatedBuildInputs = with python.pkgs; [ - requests protobuf prometheus-client uuid simplejson uptime + requests protobuf prometheus-client simplejson uptime ]; }; @@ -76,6 +76,7 @@ let network = (ps: [ ps.psutil ]); nginx = (ps: []); postgres = (ps: with ps; [ pg8000 psycopg2 ]); + process = (ps: []); }; # All integrations (default + extra): diff --git a/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix index 77f1bf694459..b7b75037ebb0 100644 --- a/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.39.4"; + version = "0.39.7"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dF3xyyOqWzjHW8cFdGlb3BCCGVy+eWW5OesKEK7pEjw="; + sha256 = "sha256-jU5O+t8muaIM7JhuNhqfWh1pWezaFvdg+oRPYAQpIkk="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/tools/networking/flannel/plugin.nix b/nixpkgs/pkgs/tools/networking/flannel/plugin.nix index 657be79b61bf..40d0fa9ecc55 100644 --- a/nixpkgs/pkgs/tools/networking/flannel/plugin.nix +++ b/nixpkgs/pkgs/tools/networking/flannel/plugin.nix @@ -1,14 +1,14 @@ { lib, buildGoModule, fetchFromGitHub }: -buildGoModule { +buildGoModule rec { pname = "cni-plugin-flannel"; - version = "unstable-2021-09-10"; + version = "1.0"; src = fetchFromGitHub { owner = "flannel-io"; repo = "cni-plugin"; - rev = "8ce83510da59681da905dccb8364af9472cac341"; - sha256 = "sha256-x6F8n+IJ1pZdbDwniWWmoGKgQm235ax3mbOcbYqWLCs="; + rev = "v${version}"; + sha256 = "sha256-s2gibebXTqM/12nDHwc89geWxA6gZi9/if5VnUFoTDE="; }; vendorSha256 = "sha256-TLAwE3pTnJYOi1AsOQfsG6t3xLKOah/7DvYjsqyltKs="; diff --git a/nixpkgs/pkgs/tools/networking/gobgp/default.nix b/nixpkgs/pkgs/tools/networking/gobgp/default.nix index 6ba0752222ac..9c39b6783b3c 100644 --- a/nixpkgs/pkgs/tools/networking/gobgp/default.nix +++ b/nixpkgs/pkgs/tools/networking/gobgp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gobgp"; - version = "2.29.0"; + version = "2.31.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-DhSIf8fAG2Zf0mwJ/iMgQU5sugHK2jJ6WJPbFbA/mhM="; + sha256 = "sha256-Q55BA5iMZP5D8lLfJn82fsxQ0SP5e4OdXtGly4j3dXU="; }; - vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY="; + vendorSha256 = "sha256-+dX/XByFW5/zvfXvyWePAv9X71dJEKaQf6xNXAXoMxw="; postConfigure = '' export CGO_ENABLED=0 diff --git a/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/nixpkgs/pkgs/tools/networking/haproxy/default.nix index 32fa2af818bf..529339e34650 100644 --- a/nixpkgs/pkgs/tools/networking/haproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.3.13"; + version = "2.3.14"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "0mz2vga8wwhqa8n4psphbqfd5q33n4m8ar7ac9chhn0i397s8lf6"; + sha256 = "0ah6xsxlk1a7jsxdg0pbdhzhssz9ysrfxd3bs5hm1shql1jmqzh4"; }; buildInputs = [ openssl zlib ] diff --git a/nixpkgs/pkgs/tools/networking/hurl/default.nix b/nixpkgs/pkgs/tools/networking/hurl/default.nix index de3b08bee2ad..7caabc9d37cc 100644 --- a/nixpkgs/pkgs/tools/networking/hurl/default.nix +++ b/nixpkgs/pkgs/tools/networking/hurl/default.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "hurl"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "Orange-OpenSource"; repo = pname; rev = version; - sha256 = "sha256-bAUuNKaS0BQ31GxTd8C2EVZiD8ryevFBOfxLCq6Ccz4="; + sha256 = "sha256-BmBqFJ64Nolq+eGZ5D3LQU3Ek2Gs+HpH/bptCQScbIg="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { # Tests require network access to a test server doCheck = false; - cargoSha256 = "sha256-dc1hu5vv2y4S1sskO7YN7bm+l2j5Jp5xOLMvXzX8Ago="; + cargoSha256 = "sha256-tAg3xwmh7SjJsm9r5TnhXHIDLpUQpz3YDS6gWxFgps4="; meta = with lib; { description = "Command line tool that performs HTTP requests defined in a simple plain text format."; diff --git a/nixpkgs/pkgs/tools/networking/i2p/default.nix b/nixpkgs/pkgs/tools/networking/i2p/default.nix index a3b52d19e2dc..fc1280be6c78 100644 --- a/nixpkgs/pkgs/tools/networking/i2p/default.nix +++ b/nixpkgs/pkgs/tools/networking/i2p/default.nix @@ -1,42 +1,12 @@ -{ lib, stdenv, ps, coreutils, fetchurl, jdk, jre, ant, gettext, which }: - -let wrapper = stdenv.mkDerivation rec { - pname = "wrapper"; - version = "3.5.44"; - - src = fetchurl { - url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; - sha256 = "1iq4j7srzy5p8q3nci9316bnwx4g71jyvzd1i5hp3s8v1k61910g"; - }; - - buildInputs = [ jdk ]; - - buildPhase = '' - export ANT_HOME=${ant} - export JAVA_HOME=${jdk}/lib/openjdk/jre/ - export JAVA_TOOL_OPTIONS=-Djava.home=$JAVA_HOME - export CLASSPATH=${jdk}/lib/openjdk/lib/tools.jar - sed 's/ testsuite$//' -i src/c/Makefile-linux-x86-64.make - ${if stdenv.isi686 then "./build32.sh" else "./build64.sh"} - ''; - - installPhase = '' - mkdir -p $out/{bin,lib} - cp bin/wrapper $out/bin/wrapper - cp lib/wrapper.jar $out/lib/wrapper.jar - cp lib/libwrapper.so $out/lib/libwrapper.so - ''; -}; - -in +{ lib, stdenv, ps, coreutils, fetchurl, jdk, jre, ant, gettext, which, java-service-wrapper }: stdenv.mkDerivation rec { pname = "i2p"; - version = "0.9.48"; + version = "1.5.0"; src = fetchurl { url = "https://download.i2p2.de/releases/${version}/i2psource_${version}.tar.bz2"; - sha256 = "0cnm4bwl1gqcx89i96j2qlq6adphy4l72h5whamqwv86n8bmpig8"; + sha256 = "sha256-JuX02VsaB2aHD5ezDlfJqOmGkCecO/CRmOMO/6vsxFA="; }; buildInputs = [ jdk ant gettext which ]; @@ -52,9 +22,9 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,share} cp -r pkg-temp/* $out - cp ${wrapper}/bin/wrapper $out/i2psvc - cp ${wrapper}/lib/wrapper.jar $out/lib - cp ${wrapper}/lib/libwrapper.so $out/lib + cp ${java-service-wrapper}/bin/wrapper $out/i2psvc + cp ${java-service-wrapper}/lib/wrapper.jar $out/lib + cp ${java-service-wrapper}/lib/libwrapper.so $out/lib sed -i $out/i2prouter -i $out/runplain.sh \ -e "s#uname#${coreutils}/bin/uname#" \ diff --git a/nixpkgs/pkgs/tools/networking/i2pd/default.nix b/nixpkgs/pkgs/tools/networking/i2pd/default.nix index 48ebf33c41bf..a4534d1fc8bb 100644 --- a/nixpkgs/pkgs/tools/networking/i2pd/default.nix +++ b/nixpkgs/pkgs/tools/networking/i2pd/default.nix @@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.38.0"; + version = "2.39.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "sha256-8wy6Zdnw0JgnHFLa1U3qlzjpDIqi2gykbkkV7lh+Zag="; + sha256 = "sha256-j8kHuX5Ca90ODjmF94HpGvjSpocDSuSxfVmvbIYRAKo="; }; buildInputs = with lib; [ boost zlib openssl ] diff --git a/nixpkgs/pkgs/tools/networking/innernet/default.nix b/nixpkgs/pkgs/tools/networking/innernet/default.nix index a00164670e1a..cf63342fbb65 100644 --- a/nixpkgs/pkgs/tools/networking/innernet/default.nix +++ b/nixpkgs/pkgs/tools/networking/innernet/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "innernet"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "tonarino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ss3BtwRnRAUPfM6yjl14rQrYZ7PHAT3s/MEHnbV7IEU="; + sha256 = "sha256-9oL91jacfUADaPvdTTvvXhpwzr9OnNnVLwy1okORss4="; }; - cargoSha256 = "sha256-hhsRLm8wsmvnu3wRK9s4Fjdy0bKLboAKw6qS2XQ1nsI="; + cargoSha256 = "sha256-jHWt7Jqv4B7u6Mvo3q69Omcn8kdnXGJSyzod1lDzvKE="; nativeBuildInputs = with llvmPackages; [ llvm diff --git a/nixpkgs/pkgs/tools/networking/jwhois/default.nix b/nixpkgs/pkgs/tools/networking/jwhois/default.nix index 5a79a09281c3..025169a9fd35 100644 --- a/nixpkgs/pkgs/tools/networking/jwhois/default.nix +++ b/nixpkgs/pkgs/tools/networking/jwhois/default.nix @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; + # Work around error from <stdio.h> on aarch64-darwin: + # error: 'TARGET_OS_IPHONE' is not defined, evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_] + # TODO: this should probably be fixed at a lower level than this? + NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin "-Wno-undef-prefix"; + meta = { description = "A client for the WHOIS protocol allowing you to query the owner of a domain name"; homepage = "https://www.gnu.org/software/jwhois/"; diff --git a/nixpkgs/pkgs/tools/networking/kapp/default.nix b/nixpkgs/pkgs/tools/networking/kapp/default.nix index 437089cc3967..cb568d4182ab 100644 --- a/nixpkgs/pkgs/tools/networking/kapp/default.nix +++ b/nixpkgs/pkgs/tools/networking/kapp/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "kapp"; - version = "0.38.0"; + version = "0.40.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-kapp"; rev = "v${version}"; - sha256 = "sha256-sUP+C4ynqeODAKkjUWhL1yqlzXkXydd1ENgHQw4enA4="; + sha256 = "sha256-9nvYxLE35IwmVB1Dzw7t3DZw4/kSiMPIqzl2PUKODtU="; }; vendorSha256 = null; diff --git a/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/nixpkgs/pkgs/tools/networking/minio-client/default.nix index 893537e167ad..e36390f85271 100644 --- a/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2021-07-27T06-46-19Z"; + version = "2021-09-02T09-21-27Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "1h0r8c22v94w2hhbc0hv9rc9jyr5ar7gpa76lhr9l8ra0k3qra43"; + sha256 = "sha256-6G0MyeDYc8Y6eib2T+2VB5mDjyO13FdBsufy57osIEk="; }; - vendorSha256 = "1s1bq166dlhqll0r5lcdjpd2446cwi1slbi895582jgs38zpkzvw"; + vendorSha256 = "sha256-J1khnNTiHkTPRjNlU2yQu8b+bwKP/KBF1KxTIvGLs+U="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/tools/networking/modem-manager/default.nix b/nixpkgs/pkgs/tools/networking/modemmanager/default.nix index 9d8f13a40709..e352e67d3fe5 100644 --- a/nixpkgs/pkgs/tools/networking/modem-manager/default.nix +++ b/nixpkgs/pkgs/tools/networking/modemmanager/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - pname = "modem-manager"; - version = "1.16.8"; + pname = "modemmanager"; + version = "1.16.10"; src = fetchurl { url = "https://www.freedesktop.org/software/ModemManager/ModemManager-${version}.tar.xz"; - sha256 = "sha256-If36+UFxJhrZ2ZdxiU9a3kvDnvPR/x1CEFTRRxPpeIA="; + sha256 = "sha256-LM8fcWwtEh6OZwm8+K8p7oaXGpCtrMoujWKIswJ4hi4="; }; nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ]; diff --git a/nixpkgs/pkgs/tools/networking/mosh/default.nix b/nixpkgs/pkgs/tools/networking/mosh/default.nix index 92c241967ae0..00746a7afbd2 100644 --- a/nixpkgs/pkgs/tools/networking/mosh/default.nix +++ b/nixpkgs/pkgs/tools/networking/mosh/default.nix @@ -31,6 +31,14 @@ stdenv.mkDerivation rec { ./bash_completion_datadir.patch ]; postPatch = '' + # Fix build with Xcode 12.5 toolchain/case-insensitive filesystems + # Backport of https://github.com/mobile-shell/mosh/commit/12199114fe4234f791ef4c306163901643b40538; + # remove on next upstream release. + patch -p0 < ${fetchpatch { + url = "https://raw.githubusercontent.com/macports/macports-ports/70ca3f65e622c17582fd938602d800157ed951c3/net/mosh/files/patch-version-subdir.diff"; + sha256 = "1yyh6d07y9zbdx4fb0r56zkq9nd9knwzj22v4dfi55k4k42qxapd"; + }} + substituteInPlace scripts/mosh.pl \ --subst-var-by ssh "${openssh}/bin/ssh" substituteInPlace scripts/mosh.pl \ diff --git a/nixpkgs/pkgs/tools/networking/networkmanager/default.nix b/nixpkgs/pkgs/tools/networking/networkmanager/default.nix index 63c52a337103..8a1a6dd8fa1b 100644 --- a/nixpkgs/pkgs/tools/networking/networkmanager/default.nix +++ b/nixpkgs/pkgs/tools/networking/networkmanager/default.nix @@ -54,11 +54,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.32.6"; + version = "1.32.10"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-PSdGBR87MylArCk1TgFpEVnUZ4PXL9IyvTbpgijOWgk="; + sha256 = "sha256-PlzMZoBWWePxGnGOOlmflya3mgHW/xSBS+ati8Xai7g="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; diff --git a/nixpkgs/pkgs/tools/networking/ntttcp/default.nix b/nixpkgs/pkgs/tools/networking/ntttcp/default.nix new file mode 100644 index 000000000000..662e4d32fb72 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/ntttcp/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "ntttcp"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "ntttcp-for-linux"; + rev = version; + sha256 = "sha256-6O7qSrR6EFr7k9lHQHGs/scZxJJ5DBNDxlSL5hzlRf4="; + }; + + preBuild = "cd src"; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp ntttcp $out/bin + runHook postInstall + ''; + + meta = with lib; { + description = "A Linux network throughput multiple-thread benchmark tool"; + homepage = "https://github.com/microsoft/ntttcp-for-linux"; + license = licenses.mit; + maintainers = with maintainers; [ delroth ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/oneshot/default.nix b/nixpkgs/pkgs/tools/networking/oneshot/default.nix index 2e809eb2d1bd..9c0f4469982b 100644 --- a/nixpkgs/pkgs/tools/networking/oneshot/default.nix +++ b/nixpkgs/pkgs/tools/networking/oneshot/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oneshot"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "raphaelreyna"; repo = "oneshot"; rev = "v${version}"; - sha256 = "sha256-LxLMETZzoeu7qEHpUFmo/h+7sdly+R5ZWsNhyttcbpA="; + sha256 = "sha256-5NCGKgmioTOHGJEWMIEsZlA+072XXL9L8KbEH6+caHc="; }; vendorSha256 = "sha256-rL/NWIIggvngTrdTDm1g1uH3vC55JF3cWllPc6Yb5jc="; diff --git a/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix b/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix index 606b3b4ee9e6..e3491460e0ae 100644 --- a/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/nixpkgs/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: let this = stdenv.mkDerivation rec { - version = "5.2.0"; + version = "5.2.1"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ let this = stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "sha256-mZYGCIR7XOvONnNFDM86qSM7iug48noNgBcHdik81vk="; + sha256 = "sha256-stRtSZCvPUQuTiKOHmJ7k8o3Gtly9Up+gicrDOeWjIs="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix b/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix index d7359ea0e70c..31057a8f5271 100644 --- a/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix +++ b/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix @@ -5,6 +5,8 @@ , libnetfilter_queue , libnfnetlink , lib +, coreutils +, iptables }: buildGoModule rec { @@ -32,6 +34,12 @@ buildGoModule rec { postBuild = '' mv $GOPATH/bin/daemon $GOPATH/bin/opensnitchd + mkdir -p $out/lib/systemd/system + substitute opensnitchd.service $out/lib/systemd/system/opensnitchd.service \ + --replace "/usr/local/bin/opensnitchd" "$out/bin/opensnitchd" \ + --replace "/etc/opensnitchd/rules" "/var/lib/opensnitch/rules" \ + --replace "/bin/mkdir" "${coreutils}/bin/mkdir" + sed -i '/\[Service\]/a Environment=PATH=${iptables}/bin' $out/lib/systemd/system/opensnitchd.service ''; vendorSha256 = "sha256-LMwQBFkHg1sWIUITLOX2FZi5QUfOivvrkcl9ELO3Trk="; diff --git a/nixpkgs/pkgs/tools/networking/openssh/common.nix b/nixpkgs/pkgs/tools/networking/openssh/common.nix index 40011a14c893..eaa42039dbaa 100644 --- a/nixpkgs/pkgs/tools/networking/openssh/common.nix +++ b/nixpkgs/pkgs/tools/networking/openssh/common.nix @@ -123,5 +123,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.unix ++ platforms.windows; maintainers = with maintainers; [ eelco aneeshusa ]; + mainProgram = "ssh"; } // extraMeta; } diff --git a/nixpkgs/pkgs/tools/networking/openssh/default.nix b/nixpkgs/pkgs/tools/networking/openssh/default.nix index 4cc943fc75f5..b57633b750f8 100644 --- a/nixpkgs/pkgs/tools/networking/openssh/default.nix +++ b/nixpkgs/pkgs/tools/networking/openssh/default.nix @@ -1,15 +1,16 @@ -{ callPackage, fetchurl, fetchpatch, autoreconfHook }: +{ callPackage, fetchurl, fetchpatch, fetchFromGitHub, autoreconfHook }: let - common = opts: callPackage (import ./common.nix opts) {}; -in { + common = opts: callPackage (import ./common.nix opts) { }; +in +{ openssh = common rec { pname = "openssh"; - version = "8.6p1"; + version = "8.7p1"; src = fetchurl { url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz"; - sha256 = "1bnpivgk98h2f9afpp88jv6g9ps83vnpxd031n2jqxi12vdf9rn3"; + sha256 = "090yxpi03pxxzb4ppx8g8hdpw7c4nf8p0avr6c7ybsaana5lp8vw"; }; extraPatches = [ ./ssh-keysign-8.5.patch ]; @@ -20,9 +21,11 @@ in { version = "8.4p1"; extraDesc = " with high performance networking patches"; - src = fetchurl { - url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-${builtins.replaceStrings [ "." "p" ] [ "_" "_P" ] version}.tar.gz"; - sha256 = "1x2afjy1isslbg7qlvhhs4zhj2c8q2h1ljz0fc5b4h9pqcm9j540"; + src = fetchFromGitHub { + owner = "rapier1"; + repo = "openssh-portable"; + rev = "hpn-KitchenSink-${builtins.replaceStrings [ "." "p" ] [ "_" "_P" ] version}"; + hash = "sha256-SYQPDGxZR41m4g603RaZaOYm4vCr9uZnFnZoKhruueY="; }; extraPatches = [ diff --git a/nixpkgs/pkgs/tools/networking/proxychains-ng/default.nix b/nixpkgs/pkgs/tools/networking/proxychains-ng/default.nix new file mode 100644 index 000000000000..cc1cc9daf656 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/proxychains-ng/default.nix @@ -0,0 +1,24 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "proxychains-ng"; + version = "4.15"; + + src = fetchFromGitHub { + owner = "rofl0r"; + repo = pname; + rev = "v${version}"; + sha256 = "128d502y8pn7q2ls6glx9bvibwzfh321sah5r5li6b6iywh2zqlc"; + }; + + meta = with lib; { + description = "A preloader which hooks calls to sockets in dynamically linked programs and redirects it through one or more socks/http proxies"; + homepage = "https://github.com/rofl0r/proxychains-ng"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ zenithal ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/sipsak/default.nix b/nixpkgs/pkgs/tools/networking/sipsak/default.nix index 556204972860..a55a32c21a9a 100644 --- a/nixpkgs/pkgs/tools/networking/sipsak/default.nix +++ b/nixpkgs/pkgs/tools/networking/sipsak/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, c-ares, openssl ? null }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, c-ares, openssl ? null }: stdenv.mkDerivation rec { pname = "sipsak"; @@ -12,9 +12,11 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "--std=gnu89"; - src = fetchurl { - url = "https://github.com/sipwise/sipsak/archive/mr${version}.tar.gz"; - sha256 = "769fe59966b1962b67aa35aad7beb9a2110ebdface36558072a05c6405fb5374"; + src = fetchFromGitHub { + owner = "sipwise"; + repo = "sipsak"; + rev = "mr${version}"; + hash = "sha256-y9P6t3xjazRNT6lDZAx+CttdyXruC6Q14b8XF9loeU4="; }; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/networking/sish/default.nix b/nixpkgs/pkgs/tools/networking/sish/default.nix index 769b0c57698c..45d1479e86fe 100644 --- a/nixpkgs/pkgs/tools/networking/sish/default.nix +++ b/nixpkgs/pkgs/tools/networking/sish/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "sish"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "antoniomika"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tljJp6Yoc19kkG7F3g1XhSDK2Y/D/2oRHiDkkOP3nn0="; + sha256 = "sha256-v/7DhakTVlcbnhujZOoVx5mpeyMwVI4CfYV12QqR7I4="; }; - vendorSha256 = "sha256-AHCa6ErxXzDPUFuq4ATD08e2Wz0tNibV2lLXoD7Sygk="; + vendorSha256 = "sha256-eMqHPxewQ9mvBpcBb+13HmaLDabCGt6C+qfbgaW8/YE="; meta = with lib; { description = "HTTP(S)/WS(S)/TCP Tunnels to localhost"; diff --git a/nixpkgs/pkgs/tools/networking/smartdns/default.nix b/nixpkgs/pkgs/tools/networking/smartdns/default.nix index 91fcc0e982eb..8ac1e137ca43 100644 --- a/nixpkgs/pkgs/tools/networking/smartdns/default.nix +++ b/nixpkgs/pkgs/tools/networking/smartdns/default.nix @@ -2,17 +2,25 @@ stdenv.mkDerivation rec { pname = "smartdns"; - version = "33"; + version = "35"; src = fetchFromGitHub { owner = "pymumu"; repo = pname; rev = "Release${version}"; - sha256 = "0cmzpm4y1yi96mg2cz2byqw6vl62dgnikldy08q43vi7jl3y0749"; + sha256 = "sha256-5822qe3mdn4wPO8fHW5AsgMA7xbJnMjZn9DbiMU3GX0="; }; buildInputs = [ openssl ]; + # Force the systemd service file to be regenerated from it's template. This + # file is erroneously added in version 35 and it has already been deleted from + # upstream's git repository. So this "postPatch" phase can be deleted in next + # release. + postPatch = '' + rm -f systemd/smartdns.service + ''; + makeFlags = [ "PREFIX=${placeholder "out"}" "SYSTEMDSYSTEMUNITDIR=${placeholder "out"}/lib/systemd/system" diff --git a/nixpkgs/pkgs/tools/networking/sniffglue/default.nix b/nixpkgs/pkgs/tools/networking/sniffglue/default.nix index 5800df6950ba..502ab323e8e2 100644 --- a/nixpkgs/pkgs/tools/networking/sniffglue/default.nix +++ b/nixpkgs/pkgs/tools/networking/sniffglue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sniffglue"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UZLVkTkuJPzju9fl4N6Lgdn3gNBpKruNFxDcoTwdtYc="; + sha256 = "sha256-P8ubw523sw1O6Gpruy1Wa/Y0I3qJgvMdT53wBBoEGhE="; }; - cargoSha256 = "sha256-bHwp0U83uvhFOi9oaeVwNrqHkxK2IQs/bvxqUl/rpjI="; + cargoSha256 = "sha256-+Wh+/C9LvYppCghv11e8NKNhiMy0SV4S3nEWA6b1hQk="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/networking/tcptraceroute/default.nix b/nixpkgs/pkgs/tools/networking/tcptraceroute/default.nix index 1eacd685463e..379caedaaf1b 100644 --- a/nixpkgs/pkgs/tools/networking/tcptraceroute/default.nix +++ b/nixpkgs/pkgs/tools/networking/tcptraceroute/default.nix @@ -1,28 +1,34 @@ -{ lib, stdenv , fetchurl, libpcap, libnet +{ lib +, stdenv +, fetchFromGitHub +, libpcap +, libnet }: stdenv.mkDerivation rec { - pkgname = "tcptraceroute"; - name = "${pkgname}-${version}"; - version = "1.5beta7"; + pname = "tcptraceroute"; + version = "1.5beta7"; - src = fetchurl { - url = "https://github.com/mct/${pkgname}/archive/${name}.tar.gz"; - sha256 = "1rz8bgc6r1isb40awv1siirpr2i1paa2jc1cd3l5pg1m9522xzap"; - }; + src = fetchFromGitHub { + owner = "mct"; + repo = "tcptraceroute"; + rev = "${pname}-${version}"; + hash = "sha256-KU4MLWtOFzzNr+I99fRbhBokhS1JUNL+OgVltkOGav4="; + }; - # for reasons unknown --disable-static configure flag doesn't disable static - # linking.. we instead override CFLAGS with -static omitted - preBuild = '' - makeFlagsArray=(CFLAGS=" -g -O2 -Wall") - ''; - buildInputs = [ libpcap libnet ]; + # for reasons unknown --disable-static configure flag doesn't disable static + # linking.. we instead override CFLAGS with -static omitted + preBuild = '' + makeFlagsArray=(CFLAGS=" -g -O2 -Wall") + ''; - meta = { - description = "A traceroute implementation using TCP packets"; - homepage = "https://github.com/mct/tcptraceroute"; - license = lib.licenses.gpl2; - maintainers = [ ]; - }; + buildInputs = [ libpcap libnet ]; + + meta = { + description = "A traceroute implementation using TCP packets"; + homepage = "https://github.com/mct/tcptraceroute"; + license = lib.licenses.gpl2; + maintainers = [ ]; + }; } diff --git a/nixpkgs/pkgs/tools/networking/tendermint/default.nix b/nixpkgs/pkgs/tools/networking/tendermint/default.nix index 5afd8aec348e..1f363ae3f9f1 100644 --- a/nixpkgs/pkgs/tools/networking/tendermint/default.nix +++ b/nixpkgs/pkgs/tools/networking/tendermint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tendermint"; - version = "0.34.12"; + version = "0.34.13"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CBE0ErHIafJ9OYC8DR3KriYX1aiqKUJk2UoBkIdO1QY="; + sha256 = "sha256-z3rbDdk68PTvJ/LPnAx8kOjCGXMfxQA0LK9GLYgaiUY="; }; - vendorSha256 = "sha256-cW3YKdF1dAfeewQ/0mhoillIpIMuC2KDsW1XWc7WRoI="; + vendorSha256 = "sha256-bwDyis/dHKSqBFw5jFWSZip5YjBe1bq/ieg6Jg0P/TM="; subPackages = [ "cmd/tendermint" ]; diff --git a/nixpkgs/pkgs/tools/networking/termshark/default.nix b/nixpkgs/pkgs/tools/networking/termshark/default.nix index d35e70ad52e4..932d46269bc9 100644 --- a/nixpkgs/pkgs/tools/networking/termshark/default.nix +++ b/nixpkgs/pkgs/tools/networking/termshark/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "termshark"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "gcla"; repo = "termshark"; rev = "v${version}"; - sha256 = "sha256-vS6j8Mcri3SI/6HqtFX/EzVl8S0lx8fWU+0ddjzJz8g="; + sha256 = "sha256-ekIxKBnqGTIXncvSTItBL43WN5mdX5dxROWHXUtH3o8="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ wireshark-cli ]; - vendorSha256 = "sha256-md9HHiYOsBimCBjD1FyjTqnskCZksQiEggWd5UW0RPM="; + vendorSha256 = "sha256-16JPVgo3heJMjOHNOP13kyhRveQjF9h9kRznhSZM+ik="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/networking/tracebox/default.nix b/nixpkgs/pkgs/tools/networking/tracebox/default.nix index 3d50b11f8e1a..79efc95036d9 100644 --- a/nixpkgs/pkgs/tools/networking/tracebox/default.nix +++ b/nixpkgs/pkgs/tools/networking/tracebox/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchzip, autoreconfHook, libcrafter, libpcap, lua }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libcrafter, libpcap, lua }: stdenv.mkDerivation rec { pname = "tracebox"; version = "0.2"; - src = fetchzip { - url = "https://github.com/tracebox/tracebox/archive/v${version}.zip"; - sha256 = "0gxdapm6b5a41gymi1f0nr2kyz70vllnk10085yz3pq527gp9gns"; + src = fetchFromGitHub { + owner = "tracebox"; + repo = "tracebox"; + rev = "v${version}"; + hash = "sha256-2r503xEF3/F9QQCEaSnd4Hw/RbbAhVj9C0SVZepVrT8="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/tools/networking/tunnelto/default.nix b/nixpkgs/pkgs/tools/networking/tunnelto/default.nix index e750327e4bab..924d2c3afa0f 100644 --- a/nixpkgs/pkgs/tools/networking/tunnelto/default.nix +++ b/nixpkgs/pkgs/tools/networking/tunnelto/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "tunnelto"; - version = "0.1.12"; + version = "0.1.18"; src = fetchFromGitHub { owner = "agrinman"; repo = pname; rev = version; - sha256 = "1vvb619cq3n88y2s8lncwcyrhb5s4gpjfiyia91pilcpnfdb04y2"; + sha256 = "sha256-dCHl5EXjUagOKeHxqb3GlAoSDw0u3tQ4GKEtbFF8OSs="; }; - cargoSha256 = "1pjd62yz7pavcinc96g2x0f5giadl9aqvz1i5vhfanh6mj6mrbl1"; + cargoSha256 = "sha256-6HU1w69cJj+tE1IUUNoxh0cHEwlRKF5qWx7FiOHeUNk="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [ ] diff --git a/nixpkgs/pkgs/tools/networking/unbound/default.nix b/nixpkgs/pkgs/tools/networking/unbound/default.nix index 249376abbb06..a24ac1f38888 100644 --- a/nixpkgs/pkgs/tools/networking/unbound/default.nix +++ b/nixpkgs/pkgs/tools/networking/unbound/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "unbound"; - version = "1.13.1"; + version = "1.13.2"; src = fetchurl { url = "https://nlnetlabs.nl/downloads/unbound/unbound-${version}.tar.gz"; - sha256 = "sha256-hQTZe4/FvYlzRcldEW4O4N34yP+ZWQqytL0TJ4yfULg="; + sha256 = "sha256-ChO1R/O5KgJrXr0EI/VMmR5XGAN/2fckRYF/agQOGoM="; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB diff --git a/nixpkgs/pkgs/tools/networking/wavemon/default.nix b/nixpkgs/pkgs/tools/networking/wavemon/default.nix index c54c4f8691ad..e7589862e511 100644 --- a/nixpkgs/pkgs/tools/networking/wavemon/default.nix +++ b/nixpkgs/pkgs/tools/networking/wavemon/default.nix @@ -1,24 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, libnl, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, libnl +, ncurses +, pkg-config +}: stdenv.mkDerivation rec { pname = "wavemon"; - version = "0.9.3"; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ncurses libnl ]; + version = "0.9.4"; src = fetchFromGitHub { owner = "uoaerg"; repo = "wavemon"; rev = "v${version}"; - sha256 = "0m9n5asjxs1ir5rqprigqcrm976mgjvh4yql1jhfnbszwbf95193"; + sha256 = "0s3yz15vzx90fxyb8bgryksn0cr2gpz9inbcx4qjrgs7zfbm4pgh"; }; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libnl + ncurses + ]; + meta = with lib; { description = "Ncurses-based monitoring application for wireless network devices"; homepage = "https://github.com/uoaerg/wavemon"; license = licenses.gpl3Plus; maintainers = with maintainers; [ raskin fpletz ]; - platforms = lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/networking/wget/default.nix b/nixpkgs/pkgs/tools/networking/wget/default.nix index efdd16e630bc..423363b56c28 100644 --- a/nixpkgs/pkgs/tools/networking/wget/default.nix +++ b/nixpkgs/pkgs/tools/networking/wget/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "wget"; - version = "1.21.1"; + version = "1.21.2"; src = fetchurl { url = "mirror://gnu/wget/${pname}-${version}.tar.lz"; - sha256 = "sha256-25u+U0fm+qBvx4gF7rgIsmiXlFXq2QA6YIVpydT8kK0="; + sha256 = "sha256-FyejMKhqyss+V2Fc4mj18pl4v3rexKvmow03Age8kbM="; }; patches = [ diff --git a/nixpkgs/pkgs/tools/networking/wifite2/default.nix b/nixpkgs/pkgs/tools/networking/wifite2/default.nix index 2482c1749959..8a4b5f2e0514 100644 --- a/nixpkgs/pkgs/tools/networking/wifite2/default.nix +++ b/nixpkgs/pkgs/tools/networking/wifite2/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, fetchpatch, python3, wirelesstools , aircrack-ng, wireshark-cli, reaverwps-t6x, cowpatty, hashcat, hcxtools -, hcxdumptool, pyrit, which, bully }: +, hcxdumptool, pyrit, which, bully, pixiewps }: python3.pkgs.buildPythonApplication rec { version = "2.5.7"; @@ -36,6 +36,7 @@ python3.pkgs.buildPythonApplication rec { pyrit which bully + pixiewps ]; postFixup = let diff --git a/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix b/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix index e237850b12ae..5df98954ae16 100644 --- a/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix +++ b/nixpkgs/pkgs/tools/networking/wireguard-tools/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "wireguard-tools"; - version = "1.0.20210424"; + version = "1.0.20210914"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz"; - sha256 = "sha256-0aGaE4EBb4wb5g32Wugakt7w41sb97Hqqkac7qE641M="; + sha256 = "sha256-eGGkTVdPPTWK6iEyowW11F4ywRhd+0IXJTZCqY3OZws="; }; outputs = [ "out" "man" ]; diff --git a/nixpkgs/pkgs/tools/networking/xh/default.nix b/nixpkgs/pkgs/tools/networking/xh/default.nix index 90f99120cd49..75eaa8774df2 100644 --- a/nixpkgs/pkgs/tools/networking/xh/default.nix +++ b/nixpkgs/pkgs/tools/networking/xh/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "xh"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - sha256 = "sha256-icJBQdFWdiHCYrZ7U90g6CdXdAkv3Y/WJu0IfZAdGv0="; + sha256 = "sha256-fTd4VSUUj9Im+kCEuFgDsA7eofM1xQfrRzigr1vyJ3I="; }; - cargoSha256 = "sha256-htv5OQnat4Qi6A6lmVonuz+8/DWz8fOGYPbnCnlizBo="; + cargoSha256 = "sha256-yZdGw/6iVg8PaUyjTrxj6h/2yhBtqEqvMhdRHhMwDZc="; nativeBuildInputs = [ installShellFiles pkg-config ]; diff --git a/nixpkgs/pkgs/tools/networking/zerotierone/default.nix b/nixpkgs/pkgs/tools/networking/zerotierone/default.nix index 4a44843e947b..f2afb6d3baeb 100644 --- a/nixpkgs/pkgs/tools/networking/zerotierone/default.nix +++ b/nixpkgs/pkgs/tools/networking/zerotierone/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zerotierone"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "0dlnrb59vnxa3pjkgfqd5jil9kl6axh23v0bffi4kx8jwzpdwas8"; + sha256 = "0pi22252c21gxmjcgwmagkrnp5y1hhqrm9jkjj9pg1nlzzrlyrnm"; }; preConfigure = '' diff --git a/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix b/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix index a9c83305df3e..a94ae45ccea5 100644 --- a/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix +++ b/nixpkgs/pkgs/tools/nix/nix-output-monitor/default.nix @@ -5,11 +5,11 @@ }: mkDerivation rec { pname = "nix-output-monitor"; - version = "1.0.3.1"; + version = "1.0.3.3"; src = fetchFromGitHub { owner = "maralorn"; repo = "nix-output-monitor"; - sha256 = "1kkf6cqq8aba8vmfcww30ah9j44bwakanyfdb6595vmaq5hrsq92"; + sha256 = "1x26s9gzcygn96600g0r1a1sxqav6c38iq981rhmc808mqlyxmp8"; rev = "v${version}"; }; isLibrary = true; diff --git a/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix b/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix index 82c52419c67c..b871b4a53b21 100644 --- a/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix +++ b/nixpkgs/pkgs/tools/package-management/cargo-audit/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-audit"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "RustSec"; repo = "rustsec"; rev = "cargo-audit%2Fv${version}"; - sha256 = "1rmhizgld35996kzp3fal2zl20aqpnmkzx0clc80n30p814isdrw"; + sha256 = "1j5ijrjhzqimamhj51qhpbaxx485hcxhaj64lknkn0xrda3apkx8"; }; - cargoSha256 = "10li9w3m4xxb8943802y74dgb1wsgjkn74hwn2x47c0w0yjiig7p"; + cargoSha256 = "1qvrzaila3wbjmc7ri5asa3di2nzln78ys9innzd84fr36c90kkc"; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/tools/package-management/libdnf/default.nix b/nixpkgs/pkgs/tools/package-management/libdnf/default.nix index 5e1562fa431b..47ce3dad62d6 100644 --- a/nixpkgs/pkgs/tools/package-management/libdnf/default.nix +++ b/nixpkgs/pkgs/tools/package-management/libdnf/default.nix @@ -1,7 +1,7 @@ -{ gcc9Stdenv, lib, stdenv, fetchFromGitHub, cmake, gettext, pkg-config, gpgme, libsolv, openssl, check +{ lib, stdenv, fetchFromGitHub, cmake, gettext, pkg-config, gpgme, libsolv, openssl, check , json_c, libmodulemd, libsmartcols, sqlite, librepo, libyaml, rpm, zchunk }: -gcc9Stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "libdnf"; version = "0.63.1"; diff --git a/nixpkgs/pkgs/tools/package-management/nix-index/default.nix b/nixpkgs/pkgs/tools/package-management/nix-index/default.nix index a8a2c2242fd5..10449a331f93 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-index/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-index/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, makeWrapper, openssl, curl -, nix, Security +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, curl +, Security }: rustPlatform.buildRustPackage rec { @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "161lz96a52s53rhhkxxhcg41bsmh8w6rv6nl8gwqmg3biszy7hah"; - nativeBuildInputs = [ pkg-config makeWrapper ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl curl ] ++ lib.optional stdenv.isDarwin Security; @@ -26,14 +26,12 @@ rustPlatform.buildRustPackage rec { cp ./command-not-found.sh $out/etc/profile.d/command-not-found.sh substituteInPlace $out/etc/profile.d/command-not-found.sh \ --replace "@out@" "$out" - wrapProgram $out/bin/nix-index \ - --prefix PATH : "${lib.makeBinPath [ nix ]}" ''; meta = with lib; { description = "A files database for nixpkgs"; homepage = "https://github.com/bennofs/nix-index"; license = with licenses; [ bsd3 ]; - maintainers = [ maintainers.bennofs ]; + maintainers = with maintainers; [ bennofs ncfavier ]; }; } diff --git a/nixpkgs/pkgs/tools/package-management/nix-index/wrapper.nix b/nixpkgs/pkgs/tools/package-management/nix-index/wrapper.nix new file mode 100644 index 000000000000..94611e74c2a5 --- /dev/null +++ b/nixpkgs/pkgs/tools/package-management/nix-index/wrapper.nix @@ -0,0 +1,14 @@ +{ lib, symlinkJoin, nix-index-unwrapped, makeWrapper, nix }: + +symlinkJoin { + inherit (nix-index-unwrapped) name meta; + + paths = [ nix-index-unwrapped ]; + + nativeBuildInputs = [ makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/nix-index \ + --prefix PATH : ${lib.makeBinPath [ nix ]} + ''; +} diff --git a/nixpkgs/pkgs/tools/package-management/nix/default.nix b/nixpkgs/pkgs/tools/package-management/nix/default.nix index 61c6ab3efb51..fd85cd2e72ae 100644 --- a/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -234,13 +234,13 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { pname = "nix"; version = "2.4${suffix}"; - suffix = "pre20210908_${lib.substring 0 7 src.rev}"; + suffix = "pre20210922_${lib.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "3c56f62093601143838af923195f630d8ffae2d4"; - sha256 = "sha256-pjdzLOEt8i1NQe4drLpp8+LrRd2MgsISSQEsMebz2kc="; + rev = "bcd73ebf60bb9ba6cb09f8df4366d5474c16e4a4"; + sha256 = "sha256-wRbz8c22tlRn2/va/yOoLJijdJn+JJqLRDPRlifaEEA="; }; boehmgc = boehmgc_nixUnstable; diff --git a/nixpkgs/pkgs/tools/package-management/rpm/default.nix b/nixpkgs/pkgs/tools/package-management/rpm/default.nix index f942efe6dd7b..910b86e13184 100644 --- a/nixpkgs/pkgs/tools/package-management/rpm/default.nix +++ b/nixpkgs/pkgs/tools/package-management/rpm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchpatch +{ stdenv, lib , pkg-config, autoreconfHook , fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages , sqlite, zstd @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "rpm"; - version = "4.16.1.3"; + version = "4.17.0"; src = fetchurl { url = "http://ftp.rpm.org/releases/rpm-${lib.versions.majorMinor version}.x/rpm-${version}.tar.bz2"; - sha256 = "07g2g0adgjm29wqy94iqhpp5dk0hacfw1yf7kzycrrxnfbwwfgai"; + sha256 = "2e0d220b24749b17810ed181ac1ed005a56bbb6bc8ac429c21f314068dc65e6a"; }; outputs = [ "out" "dev" "man" ]; @@ -36,16 +36,6 @@ stdenv.mkDerivation rec { "--sharedstatedir=/com" ]; - # Small fixes for ndb on darwin - # https://github.com/rpm-software-management/rpm/pull/1465 - patches = [ - (fetchpatch { - name = "darwin-support.patch"; - url = "https://github.com/rpm-software-management/rpm/commit/2d20e371d5e38f4171235e5c64068cad30bda557.patch"; - sha256 = "0p3j5q5a4hl357maf7018k3826jhcpqg6wfrnccrkv30g0ayk171"; - }) - ]; - postPatch = '' substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' "" ''; diff --git a/nixpkgs/pkgs/tools/security/agebox/default.nix b/nixpkgs/pkgs/tools/security/agebox/default.nix index 29199870c7f7..060961f3a367 100644 --- a/nixpkgs/pkgs/tools/security/agebox/default.nix +++ b/nixpkgs/pkgs/tools/security/agebox/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "agebox"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "slok"; repo = pname; rev = "v${version}"; - sha256 = "0zn7jibhw5jd9wp1alx9ahj4szaig4a54ci3676kk5zqxr2hjz0c"; + sha256 = "1mg16xxvsbm5jxlkdjyi3nsvzj37858d9ksh1wsa9ycxj2qipgw2"; }; - vendorSha256 = "0bc2pwz3yhzwqi0bcwqkkkrglg473qxhmz5s5955fvgajvjk7drn"; + vendorSha256 = "1gw83bd14ig18y8si3f94iivx2ir1vw4b5b95fp6r7qhfp0rgbih"; ldflags = [ "-s" "-w" diff --git a/nixpkgs/pkgs/tools/security/amber/default.nix b/nixpkgs/pkgs/tools/security/amber/default.nix new file mode 100644 index 000000000000..76b0c1fa9824 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/amber/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }: + +rustPlatform.buildRustPackage rec { + # Renaming it to amber-secret because another package named amber exists + pname = "amber-secret"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "fpco"; + repo = "amber"; + rev = "v${version}"; + sha256 = "1l5c7vdi885z56nqqbm4sw9hvqk3rfzm0mgcwk5cbwjlrz7yjq4m"; + }; + + cargoSha256 = "0dmhlyrw6yd7p80v7anz5nrd28bcrhq27vzy605dinddvncjn13q"; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + meta = with lib; { + description = "Manage secret values in-repo via public key cryptography"; + homepage = "https://github.com/fpco/amber"; + license = licenses.mit; + maintainers = with maintainers; [ psibi ]; + mainProgram = "amber"; + }; +} diff --git a/nixpkgs/pkgs/tools/security/cosign/default.nix b/nixpkgs/pkgs/tools/security/cosign/default.nix index 0f81fb4a3d18..64e64e3854bf 100644 --- a/nixpkgs/pkgs/tools/security/cosign/default.nix +++ b/nixpkgs/pkgs/tools/security/cosign/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cosign"; - version = "1.1.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FG6LAaz6n2l77Wr7SYmwzL10G5gyHPCPG05hQlsOQBI="; + sha256 = "sha256-peR/TPydR4O6kGkRUpOgUCJ7xGRLbl9pYB1lAehjVK4="; }; buildInputs = @@ -17,13 +17,13 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - vendorSha256 = "sha256-OKQVgF/pg4cigMkckX/dclieHCoD39ltR+DegaUfSDk="; + vendorSha256 = "sha256-DyRMQ43BJOkDtWEqmAzqICyaSyQJ9H4i69VJ4dCGF44="; - excludedPackages = "\\(copasetic\\)"; + excludedPackages = "\\(copasetic\\|sample\\|webhook\\)"; tags = lib.optionals pivKeySupport [ "pivkey" ]; - ldflags = [ "-s" "-w" "-X github.com/sigstore/cosign/cmd/cosign/cli.gitVersion=v${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/sigstore/cosign/cmd/cosign/cli.GitVersion=v${version}" ]; meta = with lib; { homepage = "https://github.com/sigstore/cosign"; diff --git a/nixpkgs/pkgs/tools/security/expliot/default.nix b/nixpkgs/pkgs/tools/security/expliot/default.nix index 02a9ea5ee74f..2a3c1df0e8f7 100644 --- a/nixpkgs/pkgs/tools/security/expliot/default.nix +++ b/nixpkgs/pkgs/tools/security/expliot/default.nix @@ -1,29 +1,28 @@ { lib -, aiocoap -, awsiotpythonsdk -, bluepy -, buildPythonApplication -, can -, cmd2 -, cryptography , fetchFromGitLab -, paho-mqtt -, pyi2cflash -, pymodbus -, pynetdicom -, pyparsing -, pyserial -, pyspiflash -, pythonOlder -, upnpy -, xmltodict -, zeroconf +, python3 }: +let + py = python3.override { + packageOverrides = self: super: { + + cmd2 = super.cmd2.overridePythonAttrs (oldAttrs: rec { + version = "1.5.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0qiax309my534drk81lihq9ghngr96qnm40kbmgc9ay4fncqq6kh"; + }; + }); + }; + }; +in +with py.pkgs; buildPythonApplication rec { pname = "expliot"; version = "0.9.8"; - disabled = pythonOlder "3.7"; + + disabled = python3.pythonOlder "3.7"; src = fetchFromGitLab { owner = "expliot_framework"; @@ -53,6 +52,7 @@ buildPythonApplication rec { # Project has no tests doCheck = false; + pythonImportsCheck = [ "expliot" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/nixpkgs/pkgs/tools/security/exploitdb/default.nix index 911592736801..c2aafacee4f9 100644 --- a/nixpkgs/pkgs/tools/security/exploitdb/default.nix +++ b/nixpkgs/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-09-10"; + version = "2021-09-25"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-OU9IchkouABYw0k4O4WBLu1aklLCH/S90IPMPLOZWY0="; + sha256 = "sha256-KjeldF3oBX4QLba7pTmvRwymxZ+x8HPfIKT7IevrOlU="; }; installPhase = '' @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { description = "Archive of public exploits and corresponding vulnerable software"; license = with licenses; [ gpl2Plus gpl3Plus mit ]; maintainers = with maintainers; [ applePrincess ]; + mainProgram = "searchsploit"; }; } diff --git a/nixpkgs/pkgs/tools/security/faraday-cli/default.nix b/nixpkgs/pkgs/tools/security/faraday-cli/default.nix new file mode 100644 index 000000000000..c220fe4ded0f --- /dev/null +++ b/nixpkgs/pkgs/tools/security/faraday-cli/default.nix @@ -0,0 +1,46 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "faraday-cli"; + version = "2.0.2"; + + disabled = python3.pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "infobyte"; + repo = pname; + rev = "v${version}"; + sha256 = "1jq8sim0b6k830lv1qzbrd1mx0nc2x1jq24fbama76gzqlb2axi7"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + click + colorama + faraday-plugins + jsonschema + pyyaml + simple-rest-client + tabulate + validators + spinners + termcolor + cmd2 + log-symbols + arrow + ]; + + # Tests requires credentials + doCheck = false; + + pythonImportsCheck = [ "faraday_cli" ]; + + meta = with lib; { + description = "Command Line Interface for Faraday"; + homepage = "https://github.com/infobyte/faraday-cli"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/gpg-tui/default.nix b/nixpkgs/pkgs/tools/security/gpg-tui/default.nix index 2f23d218c456..fb9bbcab212b 100644 --- a/nixpkgs/pkgs/tools/security/gpg-tui/default.nix +++ b/nixpkgs/pkgs/tools/security/gpg-tui/default.nix @@ -5,6 +5,7 @@ , gpgme , libgpgerror , libxcb +, libxkbcommon , python3 , AppKit , Foundation @@ -15,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "gpg-tui"; - version = "0.7.4"; + version = "0.8.0"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - sha256 = "sha256-PJLiP8o4HMkaHMrsnObpUdGtKLxIuXZhxva34U26i40="; + sha256 = "sha256-UUfZd6wTBoOyBdkidzxa3Fyc3GjeGdCT0n7jKmhdNa0="; }; - cargoSha256 = "sha256-6fHMchoJO5Tss6kFTulDmI4aXS3YF5k6RqEWQbh5mNc="; + cargoSha256 = "sha256-yX/g/An06nx95IaxjfYVUofvDDS2ZjiNAZf3ivi6ZF0="; nativeBuildInputs = [ gpgme # for gpgme-config @@ -36,6 +37,7 @@ rustPlatform.buildRustPackage rec { gpgme libgpgerror libxcb + libxkbcommon ] ++ lib.optionals stdenv.isDarwin [ AppKit Foundation diff --git a/nixpkgs/pkgs/tools/security/grype/default.nix b/nixpkgs/pkgs/tools/security/grype/default.nix index 4dc119980a5d..dde9da346efc 100644 --- a/nixpkgs/pkgs/tools/security/grype/default.nix +++ b/nixpkgs/pkgs/tools/security/grype/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "grype"; - version = "0.17.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-410mCfYzbqgj3hb3dgVOGPWPCIYrB41soLA8dXK23NE="; + sha256 = "sha256-xSjmwD0V4+LKfLwknQU8PAFOG3zpJ87ghHdA2c+nYQM="; }; - vendorSha256 = "sha256-KkS/1VSObniAykAwv7uW+RCrdvb5BM6DbHzDWZ6kPoQ="; + vendorSha256 = "sha256-mlsKB/WOiQ2Ud9C19rsQhVtJfblh0CGd8tDs+3SSfcg="; propagatedBuildInputs = [ docker ]; diff --git a/nixpkgs/pkgs/tools/security/hcxtools/default.nix b/nixpkgs/pkgs/tools/security/hcxtools/default.nix index d0fa57820795..2a08ce6a1c8f 100644 --- a/nixpkgs/pkgs/tools/security/hcxtools/default.nix +++ b/nixpkgs/pkgs/tools/security/hcxtools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxtools"; - version = "6.2.0"; + version = "6.2.4"; src = fetchFromGitHub { owner = "ZerBea"; repo = pname; rev = version; - sha256 = "sha256-4/kqy0oIe2FdKWtVj11PAUbdWPcKmZ1aIxLx/Zw1E2w="; + sha256 = "sha256-C6nAZkkdtBSv4WDxoXPsHzcGglB8PEX3ioFaTydiHsU="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/security/hologram/default.nix b/nixpkgs/pkgs/tools/security/hologram/default.nix index c4e90bd94bb2..ebb884378267 100644 --- a/nixpkgs/pkgs/tools/security/hologram/default.nix +++ b/nixpkgs/pkgs/tools/security/hologram/default.nix @@ -2,13 +2,12 @@ buildGoPackage rec { pname = "hologram"; - version = "2018-03-19"; - rev = "a7bab58642b530edb75b9cf6c1d834c85822ceac"; + version = "unstable-2018-03-19"; src = fetchFromGitHub { owner = "AdRoll"; repo = "hologram"; - inherit rev; + rev = "a7bab58642b530edb75b9cf6c1d834c85822ceac"; sha256 = "00scryz8js6gbw8lp2y23qikbazz2dd992r97rqh0l1q4baa0ckn"; }; diff --git a/nixpkgs/pkgs/tools/security/kerbrute/default.nix b/nixpkgs/pkgs/tools/security/kerbrute/default.nix new file mode 100644 index 000000000000..997f3b63437e --- /dev/null +++ b/nixpkgs/pkgs/tools/security/kerbrute/default.nix @@ -0,0 +1,29 @@ +{ lib, python3 }: + +python3.pkgs.buildPythonApplication rec { + pname = "kerbrute"; + version = "0.0.2"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "sha256-ok/yttRSkCaEdV4aM2670qERjgDBll6Oi3L5TV5YEEA="; + }; + + # This package does not have any tests + doCheck = false; + + propagatedBuildInputs = with python3.pkgs; [ + impacket + ]; + + installChechPhase = '' + $out/bin/kerbrute --version + ''; + + meta = { + homepage = "https://github.com/TarlogicSecurity/kerbrute"; + description = "Kerberos bruteforce utility"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ applePrincess ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/kubescape/default.nix b/nixpkgs/pkgs/tools/security/kubescape/default.nix index d3113af0cd08..2bf6bb8cad66 100644 --- a/nixpkgs/pkgs/tools/security/kubescape/default.nix +++ b/nixpkgs/pkgs/tools/security/kubescape/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "kubescape"; - version = "1.0.64"; + version = "1.0.85"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - sha256 = "0vc673w40cgjw6jxlwg9ggwzb7yvmsqshihms6ahspc3qiwz56ah"; + sha256 = "19r7dgr0y1k9qa4llxbgaf69j88vs9h2gx29bwbh6dq17q58sfdl"; }; vendorSha256 = "18mvv70g65pq1c7nn752j26d0vasx6cl2rqp5g1hg3cb61hjbn0n"; diff --git a/nixpkgs/pkgs/tools/security/kubesec/default.nix b/nixpkgs/pkgs/tools/security/kubesec/default.nix index 5d634630128d..d15fab720f96 100644 --- a/nixpkgs/pkgs/tools/security/kubesec/default.nix +++ b/nixpkgs/pkgs/tools/security/kubesec/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "kubesec"; - version = "2.11.2"; + version = "2.11.4"; src = fetchFromGitHub { owner = "controlplaneio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W9c3L8lYjF1W0kwSODhMldlqX1h+2mZIRtElZ20skn4="; + sha256 = "sha256-z1v+xm0ZWs8F5KtltBSDx9W+xNqRsfvAgQUKgrZa+28="; }; - vendorSha256 = "sha256-zfQu1EdwvR+LGmsbE8RA4pcOGgsukG1TMTCgPyNoVsc="; + vendorSha256 = "sha256-/2u92KvfzbJxJjh1cy9+4AuM5Qw1tK9Hu0xjRs0nhBE="; # Tests wants to download the kubernetes schema for use with kubeval doCheck = false; diff --git a/nixpkgs/pkgs/tools/security/libtpms/default.nix b/nixpkgs/pkgs/tools/security/libtpms/default.nix index baca0ed8b771..64bb10cb8bf2 100644 --- a/nixpkgs/pkgs/tools/security/libtpms/default.nix +++ b/nixpkgs/pkgs/tools/security/libtpms/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libtpms"; - version = "0.8.4"; + version = "0.8.6"; src = fetchFromGitHub { owner = "stefanberger"; repo = "libtpms"; rev = "v${version}"; - sha256 = "sha256-9e7O9SE7e8D6ULXhICabNCrL+QTH55jQm0AI7DVteE0="; + sha256 = "sha256-XvugcpoFQhdCBBg7hOgsUzSn4ad7RUuAEkvyiPLg4Lw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/security/mbox/default.nix b/nixpkgs/pkgs/tools/security/mbox/default.nix index d7a303a3672f..a39d226aac57 100644 --- a/nixpkgs/pkgs/tools/security/mbox/default.nix +++ b/nixpkgs/pkgs/tools/security/mbox/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "mbox"; - version = "20140526"; + version = "unstable-2014-05-26"; src = fetchFromGitHub { owner = "tsgates"; @@ -28,13 +28,12 @@ stdenv.mkDerivation { ./testall.sh ''; - meta = with lib; - { description = "Lightweight sandboxing mechanism that any user can use without special privileges"; - homepage = "http://pdos.csail.mit.edu/mbox/"; - maintainers = with maintainers; [ ehmry ]; - license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; - broken = true; - }; - + meta = with lib; { + description = "Lightweight sandboxing mechanism that any user can use without special privileges"; + homepage = "http://pdos.csail.mit.edu/mbox/"; + maintainers = with maintainers; [ ehmry ]; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + broken = true; + }; } diff --git a/nixpkgs/pkgs/tools/security/meo/default.nix b/nixpkgs/pkgs/tools/security/meo/default.nix index 4b96f2b42c23..491bef3e0543 100644 --- a/nixpkgs/pkgs/tools/security/meo/default.nix +++ b/nixpkgs/pkgs/tools/security/meo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "meo"; - version = "20121113"; + version = "unstable-2012-11-13"; src = fetchhg { url = "http://oss.stamfest.net/hg/meo"; @@ -25,12 +25,12 @@ stdenv.mkDerivation { cp meo-gui/meo-gui $out/bin ''; - meta = { + meta = with lib; { homepage = "http://oss.stamfest.net/wordpress/meo-multiple-eyepairs-only"; description = "Tools to use cryptography for things like four-eyes principles"; - license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; linux; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ viric ]; + platforms = platforms.linux; broken = true; }; } diff --git a/nixpkgs/pkgs/tools/security/metabigor/default.nix b/nixpkgs/pkgs/tools/security/metabigor/default.nix index b511690192c6..4e03e11f4985 100644 --- a/nixpkgs/pkgs/tools/security/metabigor/default.nix +++ b/nixpkgs/pkgs/tools/security/metabigor/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "metabigor"; - version = "1.9"; + version = "1.10"; src = fetchFromGitHub { owner = "j3ssie"; repo = pname; rev = "v${version}"; - sha256 = "0gjqjz35m9hj4dpch9akkjs895qrp8fwhcsn474lz6z2q6sb65pr"; + sha256 = "sha256-ADpnSsGZQbXaSGidPmxwkQOl+P8ZupqRaDUh7t+XoDw="; }; - vendorSha256 = "071s3vlz0maz1597l8y899758g24vh58s4kam4q2mxkzfynzs0cr"; + vendorSha256 = "sha256-la7bgeimycltFB7l6vNBYdlBIv4kD+HX7f2mo+eZhXM="; # Disabled for now as there are some failures ("undefined:") doCheck = false; diff --git a/nixpkgs/pkgs/tools/security/nuclei/default.nix b/nixpkgs/pkgs/tools/security/nuclei/default.nix index d02ac5503afd..4d8107902e6e 100644 --- a/nixpkgs/pkgs/tools/security/nuclei/default.nix +++ b/nixpkgs/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SdN8M3Mr3bywpBUwIVOIctYdkueq/0no4wlI7Ft8Uws="; + sha256 = "1rn4qys3af41f40zr4gi23zy9gawbbjddssm95v5a4zyd5xjfr6b"; }; - vendorSha256 = "sha256-Tz96AXGMyHNHG/3JrmZvisOEty/tDhoK1ZUngDSXOcc="; + vendorSha256 = "04q9japkv41127kl0x2268n6j13y22qg1icd783cl40584ajk2am"; modRoot = "./v2"; subPackages = [ diff --git a/nixpkgs/pkgs/tools/security/pass/extensions/tomb.nix b/nixpkgs/pkgs/tools/security/pass/extensions/tomb.nix index 74f8694f224c..58630c4ec9f3 100644 --- a/nixpkgs/pkgs/tools/security/pass/extensions/tomb.nix +++ b/nixpkgs/pkgs/tools/security/pass/extensions/tomb.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pass-tomb"; - version = "1.1"; + version = "1.3"; src = fetchFromGitHub { owner = "roddhjav"; repo = "pass-tomb"; rev = "v${version}"; - sha256 = "0wxa673yyzasjlkpd5f3yl5zf7bhsw7h1jbhf6sdjz65bypr2596"; + sha256 = "sha256-kbbMHmYmeyt7HM8YiNhknePm1vUaXWWXPWePKGpbU+o="; }; buildInputs = [ tomb ]; diff --git a/nixpkgs/pkgs/tools/security/proxmark3/proxmark3-rrg.nix b/nixpkgs/pkgs/tools/security/proxmark3/proxmark3-rrg.nix index 085610f17994..34352f74b55f 100644 --- a/nixpkgs/pkgs/tools/security/proxmark3/proxmark3-rrg.nix +++ b/nixpkgs/pkgs/tools/security/proxmark3/proxmark3-rrg.nix @@ -7,13 +7,13 @@ mkDerivation rec { pname = "proxmark3-rrg"; - version = "4.13441"; + version = "4.14434"; src = fetchFromGitHub { owner = "RfidResearchGroup"; repo = "proxmark3"; rev = "v${version}"; - sha256 = "1ffchqnm8023zcm4ywncf1j6076s78226h72m9dfmi0zbj3pbj4m"; + sha256 = "sha256-QscV/RxycpU8ypP1Pv6eKtQrOVC+oikass4tvxUszMI="; }; nativeBuildInputs = [ pkg-config gcc-arm-embedded ]; diff --git a/nixpkgs/pkgs/tools/security/prs/default.nix b/nixpkgs/pkgs/tools/security/prs/default.nix index 30e12467f830..5a020dde9cc4 100644 --- a/nixpkgs/pkgs/tools/security/prs/default.nix +++ b/nixpkgs/pkgs/tools/security/prs/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "prs"; - version = "0.2.13"; + version = "0.3.2"; src = fetchFromGitLab { owner = "timvisee"; repo = "prs"; rev = "v${version}"; - sha256 = "sha256-UZm147oNBbgagGKgJcaT5354Tl+MXkK+/bB+tuncH5o="; + sha256 = "sha256-90Ed/mafACSJvH+DjCbdXs3eeyT+pGflRzDD9l3b0/s="; }; - cargoSha256 = "sha256-u31xzgZVlXbraq2lTRJCKZVoHqRg8iH2kE3tkq5NwLk="; + cargoSha256 = "sha256-5teiF8s11Ml8UtbVn6fXur2OQzE52JZnsgyDihbEFTQ="; postPatch = '' # The GPGME backend is recommended diff --git a/nixpkgs/pkgs/tools/security/ssh-to-age/default.nix b/nixpkgs/pkgs/tools/security/ssh-to-age/default.nix new file mode 100644 index 000000000000..7342c34ee367 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/ssh-to-age/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "ssh-to-age"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "Mic92"; + repo = "ssh-to-age"; + rev = version; + sha256 = "sha256-ccwCHu6RlWqMnt5nBy54bVEzfE9/3PEL4C5LnYTtnwU="; + }; + + vendorSha256 = "sha256-jiFPcdWnAk54RJv4mHB3A+5tqKzqitfsiRXYZLa3Gu0="; + + checkPhase = '' + runHook preCheck + go test ./... + runHook postCheck + ''; + + doCheck = true; + + meta = with lib; { + description = "Convert ssh private keys in ed25519 format to age keys"; + homepage = "https://github.com/Mic92/ssh-to-age"; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/security/swtpm/default.nix b/nixpkgs/pkgs/tools/security/swtpm/default.nix index 2bd0326d4d92..daceff1486e3 100644 --- a/nixpkgs/pkgs/tools/security/swtpm/default.nix +++ b/nixpkgs/pkgs/tools/security/swtpm/default.nix @@ -1,68 +1,49 @@ { lib , stdenv -, fetchFromGitHub +, fetchFromGitHub, fetchpatch , autoreconfHook , pkg-config -, libtasn1, openssl, fuse, glib, libseccomp +, libtasn1, openssl, fuse, glib, libseccomp, json-glib , libtpms , unixtools, expect, socat , gnutls , perl -, python3, python3Packages }: stdenv.mkDerivation rec { pname = "swtpm"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "stefanberger"; repo = "swtpm"; rev = "v${version}"; - sha256 = "sha256-KY5V4z/8I15ePjorgZueNahlD/xvFa3tDarA0tuRxFk="; + sha256 = "sha256-7YzdwGAGECj7PhaCOf/dLSILPXqtbylCkN79vuFBw5Y="; }; - pythonPath = with python3Packages; requiredPythonModules [ - setuptools - cryptography - ]; - patches = [ - # upstream looks for /usr directory in $prefix to check - # whether or not to proceed with installation of python - # tools (swtpm_setup utility). - ./python-installation.patch + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/stefanberger/swtpm/pull/527.patch"; + sha256 = "sha256-cpKHP15a27ifmmswSgHoNzGPO6TY/ZuJIfM5xLOlqlU="; + }) ]; - prePatch = '' - patchShebangs src/swtpm_setup/setup.py - patchShebangs samples/setup.py - ''; - nativeBuildInputs = [ pkg-config unixtools.netstat expect socat perl # for pod2man autoreconfHook - python3 ]; buildInputs = [ libtpms openssl libtasn1 libseccomp - fuse glib + fuse glib json-glib gnutls - python3.pkgs.wrapPython ]; - propagatedBuildInputs = pythonPath; configureFlags = [ "--with-cuse" ]; - postInstall = '' - wrapPythonProgramsIn $out/bin "$out $pythonPath" - wrapPythonProgramsIn $out/share/swtpm "$out $pythonPath" - ''; - enableParallelBuilding = true; outputs = [ "out" "man" ]; diff --git a/nixpkgs/pkgs/tools/security/swtpm/python-installation.patch b/nixpkgs/pkgs/tools/security/swtpm/python-installation.patch deleted file mode 100644 index d2689f051c5b..000000000000 --- a/nixpkgs/pkgs/tools/security/swtpm/python-installation.patch +++ /dev/null @@ -1,60 +0,0 @@ -commit 353794feb596d95e3f8893e39b174c5a89d1013e -Author: Arthur Gautier <baloo@superbaloo.net> -Date: Wed Feb 17 02:27:40 2021 +0000 - - python-install - - Signed-off-by: Arthur Gautier <baloo@superbaloo.net> - -diff --git a/samples/Makefile.am b/samples/Makefile.am -index 7d69bf8..1803bb9 100644 ---- a/samples/Makefile.am -+++ b/samples/Makefile.am -@@ -39,19 +39,9 @@ python-uninstall: - $(PIP3) uninstall -y $(PY_PACKAGE_NAME) - - if PYTHON_INSTALLATION --install-exec-local: $(PY_PACKAGE) -- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \ -- echo "Warning: Not installing python package to $(DESTDIR)$(bindir)"; \ -- else \ -- $(MAKE) python-install; \ -- fi -+install-exec-local: python-install - --uninstall-local: -- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \ -- echo "Cleanup for distcheck build not implemented" ; \ -- else \ -- $(MAKE) python-uninstall; \ -- fi -+uninstall-local: python-uninstall - endif - - -diff --git a/src/swtpm_setup/Makefile.am b/src/swtpm_setup/Makefile.am -index 529eefe..533b1b3 100644 ---- a/src/swtpm_setup/Makefile.am -+++ b/src/swtpm_setup/Makefile.am -@@ -29,19 +29,9 @@ python-uninstall: - $(PIP3) uninstall -y $(PY_PACKAGE_NAME) - - if PYTHON_INSTALLATION --install-exec-local: $(PY_PACKAGE) -- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \ -- echo "Warning: Not installing python package to $(DESTDIR)$(bindir)"; \ -- else \ -- $(MAKE) python-install; \ -- fi -+install-exec-local: python-install - --uninstall-local: -- @if ! test $(findstring /usr, "$(DESTDIR)$(bindir)"); then \ -- echo "Cleanup for distcheck build not implemented" ; \ -- else \ -- $(MAKE) python-uninstall; \ -- fi -+uninstall-local: python-uninstall - endif - - # for out-of-tree builds we need to clean up diff --git a/nixpkgs/pkgs/tools/security/vaultwarden/default.nix b/nixpkgs/pkgs/tools/security/vaultwarden/default.nix index 4342c8f3ac95..eb4de54c303e 100644 --- a/nixpkgs/pkgs/tools/security/vaultwarden/default.nix +++ b/nixpkgs/pkgs/tools/security/vaultwarden/default.nix @@ -8,16 +8,16 @@ let in rustPlatform.buildRustPackage rec { pname = "vaultwarden"; - version = "1.22.1"; + version = "1.22.2"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "sha256-aXbnNO3mTAgE1yNx7YVDo1vPpO8ACZpBGHQ633fNZ3k="; + sha256 = "sha256-37+Gor3xyo0yb3I4rrleJoPnqTA7G3WmeMSTltthi2E="; }; - cargoSha256 = "sha256-SFzq3OU0a0s3zlEzUkqGdZb/knYafqDamLy4ghH4i8I="; + cargoSha256 = "sha256-+zu5OfvXj8DMglf5Xv5ZcaUlbE03cwyD8TN7YftgWO0="; nativeBuildInputs = [ pkg-config ]; buildInputs = with lib; [ openssl ] diff --git a/nixpkgs/pkgs/tools/security/wapiti/default.nix b/nixpkgs/pkgs/tools/security/wapiti/default.nix index cd89d4039e5f..38ba47a51223 100644 --- a/nixpkgs/pkgs/tools/security/wapiti/default.nix +++ b/nixpkgs/pkgs/tools/security/wapiti/default.nix @@ -104,6 +104,8 @@ python3.pkgs.buildPythonApplication rec { # Requires a PHP installation "test_timesql" "test_cookies" + # E TypeError: Expected bytes or bytes-like object got: <class 'str'> + "test_persister_upload" ]; pythonImportsCheck = [ "wapitiCore" ]; diff --git a/nixpkgs/pkgs/tools/security/yubikey-touch-detector/default.nix b/nixpkgs/pkgs/tools/security/yubikey-touch-detector/default.nix new file mode 100644 index 000000000000..93531d3a2b67 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/yubikey-touch-detector/default.nix @@ -0,0 +1,26 @@ +{ lib, libnotify, buildGoModule, fetchFromGitHub, pkg-config }: + +buildGoModule rec { + pname = "yubikey-touch-detector"; + version = "1.9.1"; + + src = fetchFromGitHub { + owner = "maximbaz"; + repo = "yubikey-touch-detector"; + rev = version; + sha256 = "sha256-I9dRCQhbXd8K1zp291z9XVwHI9DcxgvrzYaHICZH5v0="; + }; + vendorSha256 = "sha256-UeDLGwYrXwLOtQt/8fEmficc/1j0x+zr/JLa6lLF5cs="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libnotify ]; + + meta = with lib; { + description = "A tool to detect when your YubiKey is waiting for a touch (to send notification or display a visual indicator on the screen)."; + homepage = "https://github.com/maximbaz/yubikey-touch-detector"; + maintainers = with maintainers; [ sumnerevans ]; + license = licenses.isc; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/system/auto-cpufreq/default.nix b/nixpkgs/pkgs/tools/system/auto-cpufreq/default.nix index 28d771f07b20..427fe12267ec 100644 --- a/nixpkgs/pkgs/tools/system/auto-cpufreq/default.nix +++ b/nixpkgs/pkgs/tools/system/auto-cpufreq/default.nix @@ -1,14 +1,14 @@ -{ lib, python3Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub, substituteAll }: python3Packages.buildPythonPackage rec { pname = "auto-cpufreq"; - version = "1.6.4"; + version = "1.6.9"; src = fetchFromGitHub { owner = "AdnanHodzic"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9WYuAWcJGosYEsnnkqvZLXXvqF+1nBEozh6F84Kit6w="; + sha256 = "1pri182cgbrhr0adq2784gpv6q8c8kjr0jsh8wpvd1wvfsbqywrm"; }; propagatedBuildInputs = with python3Packages; [ click distro psutil ]; @@ -16,8 +16,16 @@ python3Packages.buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "auto_cpufreq" ]; - # patch to prevent script copying and to disable install - patches = [ ./prevent-install-and-copy.patch ]; + patches = [ + # hardcodes version output + (substituteAll { + src = ./fix-version-output.patch; + inherit version; + }) + + # patch to prevent script copying and to disable install + ./prevent-install-and-copy.patch + ]; postInstall = '' # copy script manually diff --git a/nixpkgs/pkgs/tools/system/auto-cpufreq/fix-version-output.patch b/nixpkgs/pkgs/tools/system/auto-cpufreq/fix-version-output.patch new file mode 100644 index 000000000000..69293a4c3dc2 --- /dev/null +++ b/nixpkgs/pkgs/tools/system/auto-cpufreq/fix-version-output.patch @@ -0,0 +1,37 @@ +--- a/auto_cpufreq/core.py ++++ b/auto_cpufreq/core.py +@@ -68,32 +68,8 @@ dist_name = distro.id() + + # display running version of auto-cpufreq + def app_version(): +- +- print("auto-cpufreq version:") +- +- # snap package +- if os.getenv("PKG_MARKER") == "SNAP": +- print(getoutput("echo Snap: $SNAP_VERSION")) +- # aur package +- elif dist_name in ["arch", "manjaro", "garuda"]: +- aur_pkg_check = call("pacman -Qs auto-cpufreq > /dev/null", shell=True) +- if aur_pkg_check == 1: +- print( +- "Git commit:", +- check_output(["git", "describe", "--always"]).strip().decode(), +- ) +- else: +- print(getoutput("pacman -Qi auto-cpufreq | grep Version")) +- else: +- # source code (auto-cpufreq-installer) +- try: +- print( +- "Git commit:", +- check_output(["git", "describe", "--always"]).strip().decode(), +- ) +- except Exception as e: +- print(repr(e)) +- pass ++ print("auto-cpufreq version: @version@") ++ print("Git commit: v@version@") + + + def app_res_use(): diff --git a/nixpkgs/pkgs/tools/system/bottom/default.nix b/nixpkgs/pkgs/tools/system/bottom/default.nix index 1401f2a78a90..ad049784c3c8 100644 --- a/nixpkgs/pkgs/tools/system/bottom/default.nix +++ b/nixpkgs/pkgs/tools/system/bottom/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - sha256 = "sha256-hXEaQL4jTd/MfEUVKUTs7oTRAffau1YA/IUUtD+V9KI="; + sha256 = "sha256-4L8TUfpEfhjfE1E8GjpRnXPf8kfXdJ02FEusXB/dZWo="; }; prePatch = '' @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { libiconv ]; - cargoSha256 = "sha256-aeR6fcIWkY4AWZy8tVotUAVRVSiO/0S0DU/A9/ATrF4="; + cargoSha256 = "sha256-pfDj3lbJpoqnUnzGL64Azcj2HU/UhRe1k55Unh85C/k="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/system/btop/default.nix b/nixpkgs/pkgs/tools/system/btop/default.nix new file mode 100644 index 000000000000..5425b6e5f5b7 --- /dev/null +++ b/nixpkgs/pkgs/tools/system/btop/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchFromGitHub +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "btop"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "aristocratos"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-pa9i65ndx8LMTMRXyL2GXCauM6Q8gAb16zGOylQFwL0="; + }; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "A monitor of resources"; + homepage = "https://github.com/aristocratos/btop"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ rmcgibbo ]; + }; +} diff --git a/nixpkgs/pkgs/tools/system/fakeroot/default.nix b/nixpkgs/pkgs/tools/system/fakeroot/default.nix index bf42e987c4d3..c4d3845df803 100644 --- a/nixpkgs/pkgs/tools/system/fakeroot/default.nix +++ b/nixpkgs/pkgs/tools/system/fakeroot/default.nix @@ -14,15 +14,15 @@ stdenv.mkDerivation rec { # glibc 2.33 patches from ArchLinux (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-1.patch"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b01cf37ff64c487f7440df4e09b090cd93b58f/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-1.patch"; sha256 = "sha256-F6BcxYInSLu7Fxg6OmMZDhTWoLqsc//yYPlTZqQQl68="; }) (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-2.patch"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b01cf37ff64c487f7440df4e09b090cd93b58f/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-2.patch"; sha256 = "sha256-ifpJxhk6MyQpFolC1hIAAUjcHmOHVU1D25tRwpu2S/k="; }) (fetchpatch { - url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-3.patch"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/15b01cf37ff64c487f7440df4e09b090cd93b58f/fakeroot/trunk/fakeroot-1.25.3-glibc-2.33-fix-3.patch"; sha256 = "sha256-o2Xm4C64Ny9TL8fjsZltjO1CdJ4VGwqZ+LnufVL5Sq8="; }) ] diff --git a/nixpkgs/pkgs/tools/system/fio/default.nix b/nixpkgs/pkgs/tools/system/fio/default.nix index b108c9dd3d16..dedcbc6f1e4c 100644 --- a/nixpkgs/pkgs/tools/system/fio/default.nix +++ b/nixpkgs/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fio"; - version = "3.27"; + version = "3.28"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "sha256-/VzqmDbCTOOwFBMDj9nYuAW7ZJNM8B2LQ3QxReWG+iw="; + sha256 = "sha256-8F31tyZ4/Qk14uwkg0DRPMdSaZGRVnI1dUDOITWhYAA="; }; buildInputs = [ python3 zlib ] diff --git a/nixpkgs/pkgs/tools/system/foreman/Gemfile.lock b/nixpkgs/pkgs/tools/system/foreman/Gemfile.lock index 1bafc658cbc0..dac60786a63f 100644 --- a/nixpkgs/pkgs/tools/system/foreman/Gemfile.lock +++ b/nixpkgs/pkgs/tools/system/foreman/Gemfile.lock @@ -4,6 +4,10 @@ GEM foreman (0.87.2) PLATFORMS + aarch64-darwin + aarch64-linux + ruby + x86_64-darwin x86_64-linux DEPENDENCIES diff --git a/nixpkgs/pkgs/tools/system/gdu/default.nix b/nixpkgs/pkgs/tools/system/gdu/default.nix index 630cc66da0ef..8c70910a9925 100644 --- a/nixpkgs/pkgs/tools/system/gdu/default.nix +++ b/nixpkgs/pkgs/tools/system/gdu/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gdu"; - version = "5.7.0"; + version = "5.8.1"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zotCn8J6zQtHd/YDT87l6Vh4Xh51tOJENBCdxZ5rqWU="; + sha256 = "1410mmijzjvcylrynyq4p2fayi1wjy61sibd3kws96k3k7ylb14n"; }; - vendorSha256 = "sha256-TBWhF2YmlJPNFr3sKSFhuzoBD0Hp1tnYAMJDUwO/QFM="; + vendorSha256 = "0ls0pw1m6hy203cdkmp9847h2fmvc4hjkv5x2v6r7516cqbs25ac"; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/system/htop/default.nix b/nixpkgs/pkgs/tools/system/htop/default.nix index 9c254ab33d81..350c20ae101d 100644 --- a/nixpkgs/pkgs/tools/system/htop/default.nix +++ b/nixpkgs/pkgs/tools/system/htop/default.nix @@ -11,13 +11,13 @@ assert systemdSupport -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "htop"; - version = "3.0.5"; + version = "3.1.0"; src = fetchFromGitHub { owner = "htop-dev"; repo = pname; rev = version; - sha256 = "sha256-9zecDd3oZ24RyOLnKdJmR29Chx6S24Kvuf/F7RYzl4I="; + sha256 = "sha256-/48Ca7JPzhPS4eYsPbwbSVcx9aS1f0LHcqsbNVWL+9k="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/tools/system/hwinfo/default.nix b/nixpkgs/pkgs/tools/system/hwinfo/default.nix index 9ee77bfc6d3d..bf9e5cd9438b 100644 --- a/nixpkgs/pkgs/tools/system/hwinfo/default.nix +++ b/nixpkgs/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "21.75"; + version = "21.76"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "sha256-w2Lb+4FvPXw2uFqwsmzVdKIXY8IXV/TAb8FHFPl/K40="; + sha256 = "sha256-C0aYEgJC+ITxWcYBLPehNz9J1Y25gS1+UDVc3+7nIKQ="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/system/illum/default.nix b/nixpkgs/pkgs/tools/system/illum/default.nix index 42aae9d81a28..ffa016cabfee 100644 --- a/nixpkgs/pkgs/tools/system/illum/default.nix +++ b/nixpkgs/pkgs/tools/system/illum/default.nix @@ -1,18 +1,19 @@ -{ lib, stdenv, fetchgit, pkg-config, ninja, libevdev, libev }: +{ lib, stdenv, fetchFromGitHub, pkg-config, ninja, libevdev, libev, udev }: -stdenv.mkDerivation { - version = "0.4"; +stdenv.mkDerivation rec { pname = "illum"; + version = "0.5"; - src = fetchgit { - url = "https://github.com/jmesmon/illum.git"; + src = fetchFromGitHub { + owner = "jmesmon"; + repo = "illum"; + rev = "v${version}"; + sha256 = "S4lUBeRnZlRUpIxFdN/bh979xvdS7roF6/6Dk0ZUrnM="; fetchSubmodules = true; - rev = "48ce8631346b1c88a901a8e4fa5fa7e8ffe8e418"; - sha256 = "05v3hz7n6b1mlhc6zqijblh1vpl0ja1y8y0lafw7mjdz03wxhfdb"; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ninja libevdev libev ]; + buildInputs = [ ninja libevdev libev udev ]; configurePhase = '' bash ./configure diff --git a/nixpkgs/pkgs/tools/system/ipmitool/default.nix b/nixpkgs/pkgs/tools/system/ipmitool/default.nix index 416fab94ddc9..2ad0d11f95f0 100644 --- a/nixpkgs/pkgs/tools/system/ipmitool/default.nix +++ b/nixpkgs/pkgs/tools/system/ipmitool/default.nix @@ -1,11 +1,8 @@ { stdenv, lib, fetchurl, openssl, fetchpatch, static ? stdenv.hostPlatform.isStatic }: -let +stdenv.mkDerivation rec { pname = "ipmitool"; version = "1.8.18"; -in -stdenv.mkDerivation { - inherit pname version; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; diff --git a/nixpkgs/pkgs/tools/system/java-service-wrapper/default.nix b/nixpkgs/pkgs/tools/system/java-service-wrapper/default.nix index 4d1417b4b831..5d4df37a2b66 100644 --- a/nixpkgs/pkgs/tools/system/java-service-wrapper/default.nix +++ b/nixpkgs/pkgs/tools/system/java-service-wrapper/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "java-service-wrapper"; - version = "3.5.45"; + version = "3.5.46"; src = fetchurl { url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz"; - sha256 = "sha256-rnlloa0DicWT1RlP2szDvBINvT5/RZ17GOarUzvX1AI="; + sha256 = "sha256-guHQyFSI0TidAuOr4zWaf3WRGeNW4+Or1sbWdhWuWtg="; }; buildInputs = [ jdk ]; diff --git a/nixpkgs/pkgs/tools/system/loadwatch/default.nix b/nixpkgs/pkgs/tools/system/loadwatch/default.nix index 722e5a9afde1..27e33a22d4b9 100644 --- a/nixpkgs/pkgs/tools/system/loadwatch/default.nix +++ b/nixpkgs/pkgs/tools/system/loadwatch/default.nix @@ -1,17 +1,20 @@ -{ lib, stdenv, fetchgit, ... }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation { pname = "loadwatch"; version = "1.1-1-g6d2544c"; + src = fetchgit { url = "git://woffs.de/git/fd/loadwatch.git"; sha256 = "1bhw5ywvhyb6snidsnllfpdi1migy73wg2gchhsfbcpm8aaz9c9b"; rev = "6d2544c0caaa8a64bbafc3f851e06b8056c30e6e"; }; + installPhase = '' mkdir -p $out/bin install loadwatch lw-ctl $out/bin ''; + meta = with lib; { description = "Run a program using only idle cycles"; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/tools/system/localtime/default.nix b/nixpkgs/pkgs/tools/system/localtime/default.nix index 4c12c9eb27da..0ad17c6c6595 100644 --- a/nixpkgs/pkgs/tools/system/localtime/default.nix +++ b/nixpkgs/pkgs/tools/system/localtime/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "localtime"; - version = "2017-11-07"; + version = "unstable-2017-11-07"; src = fetchFromGitHub { owner = "Stebalien"; @@ -32,6 +32,7 @@ buildGoPackage rec { meta = with lib; { description = "A daemon for keeping the system timezone up-to-date based on the current location"; homepage = "https://github.com/Stebalien/localtime"; + maintainers = with maintainers; [ ]; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/nixpkgs/pkgs/tools/system/netdata/default.nix b/nixpkgs/pkgs/tools/system/netdata/default.nix index 25d0366ef715..3c025247377d 100644 --- a/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -87,7 +87,10 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/netdata-claim.sh --prefix PATH : ${lib.makeBinPath [ openssl ]} ''; - passthru.tests.netdata = nixosTests.netdata; + passthru = { + inherit withIpmi; + tests.netdata = nixosTests.netdata; + }; meta = { description = "Real-time performance monitoring tool"; diff --git a/nixpkgs/pkgs/tools/system/opencl-info/default.nix b/nixpkgs/pkgs/tools/system/opencl-info/default.nix index 173de5f607fe..124b53512d72 100644 --- a/nixpkgs/pkgs/tools/system/opencl-info/default.nix +++ b/nixpkgs/pkgs/tools/system/opencl-info/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "opencl-info"; - version = "2014-02-21"; + version = "unstable-2014-02-21"; src = fetchFromGitHub { owner = "marchv"; diff --git a/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix b/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix index 685697f861ff..993bfdaf834a 100644 --- a/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix +++ b/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "rowhammer-test"; - version = "20150811"; + version = "unstable-2015-08-11"; src = fetchFromGitHub { owner = "google"; repo = "rowhammer-test"; - rev = "c1d2bd9f629281402c10bb10e52bc1f1faf59cc4"; # 2015-08-11 + rev = "c1d2bd9f629281402c10bb10e52bc1f1faf59cc4"; sha256 = "1fbfcnm5gjish47wdvikcsgzlb5vnlfqlzzm6mwiw2j5qkq0914i"; }; diff --git a/nixpkgs/pkgs/tools/system/rsyslog/default.nix b/nixpkgs/pkgs/tools/system/rsyslog/default.nix index 6ff5c07721f4..8e1e51469dd1 100644 --- a/nixpkgs/pkgs/tools/system/rsyslog/default.nix +++ b/nixpkgs/pkgs/tools/system/rsyslog/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "rsyslog"; - version = "8.2102.0"; + version = "8.2108.0"; src = fetchurl { url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz"; - sha256 = "sha256-lO4NAxLC7epzdmVZTL5KlHXk47WT4StbiuOnQ6yccqc="; + sha256 = "sha256-SCbCttCBqclfRp+wEVvj+VEgZSl9PeAOxRN1jNswsdk="; }; #patches = [ ./fix-gnutls-detection.patch ]; diff --git a/nixpkgs/pkgs/tools/system/sleuthkit/default.nix b/nixpkgs/pkgs/tools/system/sleuthkit/default.nix index 6dc84da1e14e..175c34020307 100644 --- a/nixpkgs/pkgs/tools/system/sleuthkit/default.nix +++ b/nixpkgs/pkgs/tools/system/sleuthkit/default.nix @@ -1,33 +1,89 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib, openjdk, perl, ant }: stdenv.mkDerivation rec { version = "4.11.0"; pname = "sleuthkit"; - src = fetchFromGitHub { + sleuthsrc = fetchFromGitHub { owner = "sleuthkit"; repo = "sleuthkit"; rev = "${pname}-${version}"; - sha256 = "sha256-cY55zK6N3tyCLBJtZn4LhK9kLkikJjg640Pm/NA0ALY="; + sha256 = "1dh06k8grrj3wcx3h9m490p69bw41dz6cv8j5j1drpldmv67k3ki"; }; + # Fetch libraries using a fixed output derivation + rdeps = stdenv.mkDerivation rec { + + version = "1.0"; + pname = "sleuthkit-deps"; + nativeBuildInputs = [ openjdk ant ]; + + src = sleuthsrc; + + # unpack, build, install + dontConfigure = true; + + buildPhase = '' + export IVY_HOME=$NIX_BUILD_TOP/.ant + pushd bindings/java + ant retrieve-deps + popd + pushd case-uco/java + ant get-ivy-dependencies + popd + ''; + + installPhase = '' + export IVY_HOME=$NIX_BUILD_TOP/.ant + mkdir -m 755 -p $out/bindings/java + cp -r bindings/java/lib $out/bindings/java + mkdir -m 755 -p $out/case-uco/java + cp -r case-uco/java/lib $out/case-uco/java + cp -r $IVY_HOME/lib $out + chmod -R 755 $out/lib + ''; + + outputHashMode = "recursive"; + outputHash = "0fq7v6zlgybg4v6k9wqjlk4gaqgjrpihbnr182vaqriihflav2s8"; + outputHashAlgo = "sha256"; + }; + + src = sleuthsrc; + postPatch = '' substituteInPlace tsk/img/ewf.cpp --replace libewf_handle_read_random libewf_handle_read_buffer_at_offset ''; enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook openjdk perl ant rdeps ]; buildInputs = [ libewf afflib openssl zlib ]; - # Hack to fix the RPATH. - preFixup = "rm -rf */.libs"; + # Hack to fix the RPATH + preFixup = '' + rm -rf */.libs + ''; + + postUnpack = '' + export IVY_HOME="$NIX_BUILD_TOP/.ant" + export JAVA_HOME="${openjdk}" + export ant_args="-Doffline=true -Ddefault-jar-location=$IVY_HOME/lib" + + # pre-positioning these jar files allows -Doffline=true to work + mkdir -p source/{bindings,case-uco}/java $IVY_HOME + cp -r ${rdeps}/bindings/java/lib source/bindings/java + chmod -R 755 source/bindings/java + cp -r ${rdeps}/case-uco/java/lib source/case-uco/java + chmod -R 755 source/case-uco/java + cp -r ${rdeps}/lib $IVY_HOME + chmod -R 755 $IVY_HOME + ''; - meta = { + meta = with lib; { description = "A forensic/data recovery tool"; homepage = "https://www.sleuthkit.org/"; - maintainers = [ lib.maintainers.raskin ]; - platforms = lib.platforms.linux; - license = lib.licenses.ipl10; + maintainers = with maintainers; [ raskin gfrascadorio ]; + platforms = platforms.linux; + license = licenses.ipl10; }; } diff --git a/nixpkgs/pkgs/tools/system/stress-ng/default.nix b/nixpkgs/pkgs/tools/system/stress-ng/default.nix index 0b11f1d91890..6d748749a0c2 100644 --- a/nixpkgs/pkgs/tools/system/stress-ng/default.nix +++ b/nixpkgs/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.13.00"; + version = "0.13.01"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-HO/kowV8FSKxRuYvYbgM5uLpnaLYXr4lvAP8RSKOWM0="; + sha256 = "sha256-839znk0VNDNgpHmAtn3Isqa/PU0+9yfVXi3Zmgtk+eo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/system/which/default.nix b/nixpkgs/pkgs/tools/system/which/default.nix index f4c871d5af08..de823f98596a 100644 --- a/nixpkgs/pkgs/tools/system/which/default.nix +++ b/nixpkgs/pkgs/tools/system/which/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "which-2.21"; + pname = "which"; + version = "2.21"; src = fetchurl { - url = "mirror://gnu/which/${name}.tar.gz"; + url = "mirror://gnu/which/which-${version}.tar.gz"; sha256 = "1bgafvy3ypbhhfznwjv1lxmd6mci3x1byilnnkc7gcr486wlb8pl"; }; diff --git a/nixpkgs/pkgs/tools/text/align/default.nix b/nixpkgs/pkgs/tools/text/align/default.nix new file mode 100644 index 000000000000..4f67d747da4c --- /dev/null +++ b/nixpkgs/pkgs/tools/text/align/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "align"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "Guitarbum722"; + repo = pname; + rev = "v${version}"; + sha256 = "17gs3417633z71kc6l5zqg4b3rjhpn2v8qs8rnfrk4nbwzz4nrq3"; + }; + + vendorSha256 = null; + + meta = with lib; { + homepage = "https://github.com/Guitarbum722/align"; + description = "A general purpose application and library for aligning text"; + maintainers = with maintainers; [ hrhino ]; + license = licenses.mit; + }; +} diff --git a/nixpkgs/pkgs/tools/text/catdocx/default.nix b/nixpkgs/pkgs/tools/text/catdocx/default.nix index adf78397fcb3..c762e15c80e2 100644 --- a/nixpkgs/pkgs/tools/text/catdocx/default.nix +++ b/nixpkgs/pkgs/tools/text/catdocx/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, unzip, catdoc }: stdenv.mkDerivation { - name = "catdocx-20170102"; + pname = "catdocx"; + version = "unstable-2017-01-02"; src = fetchFromGitHub { owner = "jncraton"; diff --git a/nixpkgs/pkgs/tools/text/convertlit/default.nix b/nixpkgs/pkgs/tools/text/convertlit/default.nix index 18dc01c01d02..4225934d2d4e 100644 --- a/nixpkgs/pkgs/tools/text/convertlit/default.nix +++ b/nixpkgs/pkgs/tools/text/convertlit/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchzip, libtommath}: -stdenv.mkDerivation { - name = "convertlit-1.8"; +stdenv.mkDerivation rec { + pname = "convertlit"; + version = "1.8"; src = fetchzip { - url = "http://www.convertlit.com/convertlit18src.zip"; + url = "http://www.convertlit.com/convertlit${lib.replaceStrings ["."] [""] version}src.zip"; sha256 = "182nsin7qscgbw2h92m0zadh3h8q410h5cza6v486yjfvla3dxjx"; stripRoot = false; }; diff --git a/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix b/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix index 10353227b70a..f5c489681e93 100644 --- a/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix +++ b/nixpkgs/pkgs/tools/text/crowdin-cli/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "crowdin-cli"; - version = "3.6.5"; + version = "3.7.0"; src = fetchurl { url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - sha256 = "sha256-9bw85dFazlcbZhx/bUoxW4iIsw+RdE3d+O5Cj3Obb7A="; + sha256 = "sha256-2TQL5k2ndckFjOOXNz7clVpwPUMStR4xgd1P+qUhNC8="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; diff --git a/nixpkgs/pkgs/tools/text/diffstat/default.nix b/nixpkgs/pkgs/tools/text/diffstat/default.nix index c8ff1e973a50..3e156cf3132d 100644 --- a/nixpkgs/pkgs/tools/text/diffstat/default.nix +++ b/nixpkgs/pkgs/tools/text/diffstat/default.nix @@ -1,12 +1,13 @@ { fetchurl, lib, stdenv }: stdenv.mkDerivation rec { - name = "diffstat-1.64"; + pname = "diffstat"; + version = "1.64"; src = fetchurl { urls = [ - "ftp://ftp.invisible-island.net/diffstat/${name}.tgz" - "https://invisible-mirror.net/archives/diffstat/${name}.tgz" + "ftp://ftp.invisible-island.net/diffstat/diffstat-${version}.tgz" + "https://invisible-mirror.net/archives/diffstat/diffstat-${version}.tgz" ]; sha256 = "sha256-uK7jjZ0uHQWSbmtVgQqdLC3UB/JNaiZzh1Y6RDbj9/w="; }; diff --git a/nixpkgs/pkgs/tools/text/difftastic/default.nix b/nixpkgs/pkgs/tools/text/difftastic/default.nix index bfe430957484..06bd7d0376b2 100644 --- a/nixpkgs/pkgs/tools/text/difftastic/default.nix +++ b/nixpkgs/pkgs/tools/text/difftastic/default.nix @@ -1,23 +1,34 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform, tree-sitter }: rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "0103py4v4v7xqv85yiczhd9w9h1aa54svhhdibvbl6x4b35y2mk5"; + sha256 = "sha256-spncRJjROytGnIig6ujqHu0e/XBTN4dsJ3og4aIu+l8="; }; - cargoSha256 = "1k0d7yadicfzfc2m1aqs4c4a2k3srb54fpwarc3kwn26v3vfjai1"; + cargoSha256 = "sha256-2xGwS4wjLQ7zmfZ2gMdlUAkjPDF6SmUaiX2j1KYy0vo="; + + postPatch = '' + pushd vendor + for grammar in */; do + if [ -d "${tree-sitter.grammars}/$grammar" ]; then + rm -r "$grammar" + ln -s "${tree-sitter.grammars}/$grammar" + fi + done + popd + ''; meta = with lib; { description = "A syntax-aware diff"; homepage = "https://github.com/Wilfred/difftastic"; changelog = "https://github.com/Wilfred/difftastic/raw/${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ ethancedwards8 ]; + maintainers = with maintainers; [ ethancedwards8 figsoda ]; }; } diff --git a/nixpkgs/pkgs/tools/text/diffutils/default.nix b/nixpkgs/pkgs/tools/text/diffutils/default.nix index d95e7ae399db..d5f27747cf1c 100644 --- a/nixpkgs/pkgs/tools/text/diffutils/default.nix +++ b/nixpkgs/pkgs/tools/text/diffutils/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "diffutils"; - version = "3.7"; + version = "3.8"; src = fetchurl { url = "mirror://gnu/diffutils/diffutils-${version}.tar.xz"; - sha256 = "09isrg0isjinv8c535nxsi1s86wfdfzml80dbw41dj9x3hiad9xk"; + sha256 = "sha256-pr3X0bMSZtEcT03mwbdI1GB6sCMa9RiPwlM9CuJDj+w="; }; outputs = [ "out" "info" ]; diff --git a/nixpkgs/pkgs/tools/text/ebook-tools/default.nix b/nixpkgs/pkgs/tools/text/ebook-tools/default.nix index bb93b217ea24..1a46110e2a42 100644 --- a/nixpkgs/pkgs/tools/text/ebook-tools/default.nix +++ b/nixpkgs/pkgs/tools/text/ebook-tools/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, cmake, pkg-config, libxml2, libzip }: stdenv.mkDerivation rec { - name = "ebook-tools-0.2.2"; + pname = "ebook-tools"; + version = "0.2.2"; src = fetchurl { - url = "mirror://sourceforge/ebook-tools/${name}.tar.gz"; + url = "mirror://sourceforge/ebook-tools/ebook-tools-${version}.tar.gz"; sha256 = "1bi7wsz3p5slb43kj7lgb3r6lb91lvb6ldi556k4y50ix6b5khyb"; }; diff --git a/nixpkgs/pkgs/tools/text/fst/0001-cargo-lockfile.patch b/nixpkgs/pkgs/tools/text/fst/0001-cargo-lockfile.patch index c8c56ffdb622..eb5ec5748553 100644 --- a/nixpkgs/pkgs/tools/text/fst/0001-cargo-lockfile.patch +++ b/nixpkgs/pkgs/tools/text/fst/0001-cargo-lockfile.patch @@ -1,26 +1,26 @@ -From 84797e8fb8ead8822ebfd251b47c72433555860e Mon Sep 17 00:00:00 2001 +From 99bfed6f7278ae9b5edfc42644e57eb0ae7669e1 Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" <rmcgibbo@gmail.com> -Date: Fri, 5 Mar 2021 16:59:41 -0500 -Subject: [PATCH 1/1] Create cargo lock file for 0.4.5 +Date: Wed, 22 Sep 2021 16:00:13 -0400 +Subject: [PATCH 1/1] Create cargo lock file for 0.4.7 --- - Cargo.lock | 916 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 916 insertions(+) + Cargo.lock | 881 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 881 insertions(+) create mode 100644 Cargo.lock diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 0000000..136677d +index 0000000..37e9c5f --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,916 @@ +@@ -0,0 +1,881 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "anyhow" -+version = "1.0.38" ++version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1" ++checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" + +[[package]] +name = "atty" @@ -56,15 +56,15 @@ index 0000000..136677d + +[[package]] +name = "bitflags" -+version = "1.2.1" ++version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bstr" -+version = "0.2.15" ++version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d" ++checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +dependencies = [ + "lazy_static", + "memchr", @@ -74,21 +74,15 @@ index 0000000..136677d + +[[package]] +name = "bumpalo" -+version = "3.6.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" -+ -+[[package]] -+name = "byteorder" -+version = "1.4.2" ++version = "3.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b" ++checksum = "d9df67f7bf9ef8498769f994239c45613ef0c5899415fb58e9add412d2c1a538" + +[[package]] +name = "cast" -+version = "0.2.3" ++version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0" ++checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a" +dependencies = [ + "rustc_version", +] @@ -118,16 +112,16 @@ index 0000000..136677d + +[[package]] +name = "criterion" -+version = "0.3.4" ++version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23" ++checksum = "1604dafd25fba2fe2d5895a9da139f8dc9b319a5fe5354ca137cbbce4e178d10" +dependencies = [ + "atty", + "cast", + "clap", + "criterion-plot", + "csv", -+ "itertools 0.10.0", ++ "itertools", + "lazy_static", + "num-traits", + "oorandom", @@ -144,12 +138,12 @@ index 0000000..136677d + +[[package]] +name = "criterion-plot" -+version = "0.4.3" ++version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d" ++checksum = "d00996de9f2f7559f7f4dc286073197f83e92256a59ed395f9aac01fe717da57" +dependencies = [ + "cast", -+ "itertools 0.9.0", ++ "itertools", +] + +[[package]] @@ -164,33 +158,33 @@ index 0000000..136677d + +[[package]] +name = "crossbeam-channel" -+version = "0.5.0" ++version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" ++checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +dependencies = [ + "cfg-if 1.0.0", -+ "crossbeam-utils 0.8.3", ++ "crossbeam-utils 0.8.5", +] + +[[package]] +name = "crossbeam-deque" -+version = "0.8.0" ++version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" ++checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-epoch", -+ "crossbeam-utils 0.8.3", ++ "crossbeam-utils 0.8.5", +] + +[[package]] +name = "crossbeam-epoch" -+version = "0.9.3" ++version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12" ++checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" +dependencies = [ + "cfg-if 1.0.0", -+ "crossbeam-utils 0.8.3", ++ "crossbeam-utils 0.8.5", + "lazy_static", + "memoffset", + "scopeguard", @@ -209,20 +203,19 @@ index 0000000..136677d + +[[package]] +name = "crossbeam-utils" -+version = "0.8.3" ++version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" ++checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +dependencies = [ -+ "autocfg", + "cfg-if 1.0.0", + "lazy_static", +] + +[[package]] +name = "csv" -+version = "1.1.5" ++version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f9d58633299b24b515ac72a3f869f8b91306a3cec616a602843a383acd6f9e97" ++checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +dependencies = [ + "bstr", + "csv-core", @@ -260,7 +253,7 @@ index 0000000..136677d + +[[package]] +name = "fst" -+version = "0.4.5" ++version = "0.4.7" +dependencies = [ + "doc-comment", + "fnv", @@ -271,21 +264,12 @@ index 0000000..136677d +] + +[[package]] -+name = "fst" -+version = "0.4.5" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d79238883cf0307100b90aba4a755d8051a3182305dfe7f649a1e9dc0517006f" -+dependencies = [ -+ "utf8-ranges", -+] -+ -+[[package]] +name = "fst-bench" +version = "0.0.1" +dependencies = [ + "criterion", + "fnv", -+ "fst 0.4.5", ++ "fst", +] + +[[package]] @@ -298,7 +282,7 @@ index 0000000..136677d + "clap", + "crossbeam-channel 0.4.4", + "csv", -+ "fst 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fst", + "memmap", + "num_cpus", + "regex-automata", @@ -319,9 +303,9 @@ index 0000000..136677d + +[[package]] +name = "getrandom" -+version = "0.2.2" ++version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" ++checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +dependencies = [ + "cfg-if 1.0.0", + "libc", @@ -336,42 +320,33 @@ index 0000000..136677d + +[[package]] +name = "hermit-abi" -+version = "0.1.18" ++version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" ++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "itertools" -+version = "0.9.0" ++version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -+dependencies = [ -+ "either", -+] -+ -+[[package]] -+name = "itertools" -+version = "0.10.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319" ++checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" -+version = "0.4.7" ++version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" ++checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "js-sys" -+version = "0.3.48" ++version = "0.3.55" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dc9f84f9b115ce7843d60706df1422a916680bfdfcbdb0447c5614ff9d7e4d78" ++checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" +dependencies = [ + "wasm-bindgen", +] @@ -384,9 +359,9 @@ index 0000000..136677d + +[[package]] +name = "libc" -+version = "0.2.88" ++version = "0.2.102" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "03b07a082330a35e43f63177cc01689da34fbffa0105e1246cf0311472cac73a" ++checksum = "a2a5ac8f984bfcf3a823267e5fde638acc3325f6496633a5da6bb6eb2171e103" + +[[package]] +name = "log" @@ -405,9 +380,9 @@ index 0000000..136677d + +[[package]] +name = "memchr" -+version = "2.3.4" ++version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" ++checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" + +[[package]] +name = "memmap" @@ -421,9 +396,9 @@ index 0000000..136677d + +[[package]] +name = "memoffset" -+version = "0.6.1" ++version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87" ++checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +dependencies = [ + "autocfg", +] @@ -455,9 +430,9 @@ index 0000000..136677d + +[[package]] +name = "plotters" -+version = "0.3.0" ++version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "45ca0ae5f169d0917a7c7f5a9c1a3d3d9598f18f529dd2b8373ed988efea307a" ++checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a" +dependencies = [ + "num-traits", + "plotters-backend", @@ -468,15 +443,15 @@ index 0000000..136677d + +[[package]] +name = "plotters-backend" -+version = "0.3.0" ++version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b07fffcddc1cb3a1de753caa4e4df03b79922ba43cf882acc1bdd7e8df9f4590" ++checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c" + +[[package]] +name = "plotters-svg" -+version = "0.3.0" ++version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b38a02e23bd9604b842a812063aec4ef702b57989c37b655254bb61c471ad211" ++checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9" +dependencies = [ + "plotters-backend", +] @@ -489,9 +464,9 @@ index 0000000..136677d + +[[package]] +name = "proc-macro2" -+version = "1.0.24" ++version = "1.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" ++checksum = "b9f5105d4fdaab20335ca9565e106a5d9b82b6219b5ba735731124ac6711d23d" +dependencies = [ + "unicode-xid", +] @@ -530,14 +505,14 @@ index 0000000..136677d + +[[package]] +name = "rand" -+version = "0.8.3" ++version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" ++checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +dependencies = [ + "libc", -+ "rand_chacha 0.3.0", -+ "rand_core 0.6.2", -+ "rand_hc 0.3.0", ++ "rand_chacha 0.3.1", ++ "rand_core 0.6.3", ++ "rand_hc 0.3.1", +] + +[[package]] @@ -552,12 +527,12 @@ index 0000000..136677d + +[[package]] +name = "rand_chacha" -+version = "0.3.0" ++version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" ++checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", -+ "rand_core 0.6.2", ++ "rand_core 0.6.3", +] + +[[package]] @@ -571,11 +546,11 @@ index 0000000..136677d + +[[package]] +name = "rand_core" -+version = "0.6.2" ++version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" ++checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +dependencies = [ -+ "getrandom 0.2.2", ++ "getrandom 0.2.3", +] + +[[package]] @@ -589,18 +564,18 @@ index 0000000..136677d + +[[package]] +name = "rand_hc" -+version = "0.3.0" ++version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" ++checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" +dependencies = [ -+ "rand_core 0.6.2", ++ "rand_core 0.6.3", +] + +[[package]] +name = "rayon" -+version = "1.5.0" ++version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" ++checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +dependencies = [ + "autocfg", + "crossbeam-deque", @@ -610,51 +585,50 @@ index 0000000..136677d + +[[package]] +name = "rayon-core" -+version = "1.9.0" ++version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" ++checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +dependencies = [ -+ "crossbeam-channel 0.5.0", ++ "crossbeam-channel 0.5.1", + "crossbeam-deque", -+ "crossbeam-utils 0.8.3", ++ "crossbeam-utils 0.8.5", + "lazy_static", + "num_cpus", +] + +[[package]] +name = "redox_syscall" -+version = "0.2.5" ++version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" ++checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex" -+version = "1.4.3" ++version = "1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a" ++checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" +dependencies = [ + "regex-syntax", +] + +[[package]] +name = "regex-automata" -+version = "0.1.9" ++version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4" ++checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ -+ "byteorder", -+ "fst 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "fst", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" -+version = "0.6.22" ++version = "0.6.25" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" ++checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" + +[[package]] +name = "remove_dir_all" @@ -667,9 +641,9 @@ index 0000000..136677d + +[[package]] +name = "rustc_version" -+version = "0.2.3" ++version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] @@ -697,33 +671,24 @@ index 0000000..136677d + +[[package]] +name = "semver" -+version = "0.9.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -+dependencies = [ -+ "semver-parser", -+] -+ -+[[package]] -+name = "semver-parser" -+version = "0.7.0" ++version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" + +[[package]] +name = "serde" -+version = "1.0.123" ++version = "1.0.130" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" ++checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_cbor" -+version = "0.11.1" ++version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622" ++checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half", + "serde", @@ -731,9 +696,9 @@ index 0000000..136677d + +[[package]] +name = "serde_derive" -+version = "1.0.123" ++version = "1.0.130" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" ++checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" +dependencies = [ + "proc-macro2", + "quote", @@ -742,9 +707,9 @@ index 0000000..136677d + +[[package]] +name = "serde_json" -+version = "1.0.64" ++version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" ++checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8" +dependencies = [ + "itoa", + "ryu", @@ -753,9 +718,9 @@ index 0000000..136677d + +[[package]] +name = "syn" -+version = "1.0.61" ++version = "1.0.76" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ed22b90a0e734a23a7610f4283ac9e5acfb96cbb30dfefa540d66f866f1c09c5" ++checksum = "c6f107db402c2c2055242dbf4d2af0e69197202e9faacbef9571bbe47f5a1b84" +dependencies = [ + "proc-macro2", + "quote", @@ -770,7 +735,7 @@ index 0000000..136677d +dependencies = [ + "cfg-if 1.0.0", + "libc", -+ "rand 0.8.3", ++ "rand 0.8.4", + "redox_syscall", + "remove_dir_all", + "winapi", @@ -797,15 +762,15 @@ index 0000000..136677d + +[[package]] +name = "unicode-width" -+version = "0.1.8" ++version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" ++checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" + +[[package]] +name = "unicode-xid" -+version = "0.2.1" ++version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ++checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "utf8-ranges" @@ -815,9 +780,9 @@ index 0000000..136677d + +[[package]] +name = "walkdir" -+version = "2.3.1" ++version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" ++checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", @@ -838,9 +803,9 @@ index 0000000..136677d + +[[package]] +name = "wasm-bindgen" -+version = "0.2.71" ++version = "0.2.78" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7ee1280240b7c461d6a0071313e08f34a60b0365f14260362e5a2b17d1d31aa7" ++checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", @@ -848,9 +813,9 @@ index 0000000..136677d + +[[package]] +name = "wasm-bindgen-backend" -+version = "0.2.71" ++version = "0.2.78" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5b7d8b6942b8bb3a9b0e73fc79b98095a27de6fa247615e59d096754a3bc2aa8" ++checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" +dependencies = [ + "bumpalo", + "lazy_static", @@ -863,9 +828,9 @@ index 0000000..136677d + +[[package]] +name = "wasm-bindgen-macro" -+version = "0.2.71" ++version = "0.2.78" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e5ac38da8ef716661f0f36c0d8320b89028efe10c7c0afde65baffb496ce0d3b" ++checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", @@ -873,9 +838,9 @@ index 0000000..136677d + +[[package]] +name = "wasm-bindgen-macro-support" -+version = "0.2.71" ++version = "0.2.78" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "cc053ec74d454df287b9374ee8abb36ffd5acb95ba87da3ba5b7d3fe20eb401e" ++checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" +dependencies = [ + "proc-macro2", + "quote", @@ -886,15 +851,15 @@ index 0000000..136677d + +[[package]] +name = "wasm-bindgen-shared" -+version = "0.2.71" ++version = "0.2.78" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7d6f8ec44822dd71f5f221a5847fb34acd9060535c1211b70a05844c0f6383b1" ++checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" + +[[package]] +name = "web-sys" -+version = "0.3.48" ++version = "0.3.55" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ec600b26223b2948cedfde2a0aa6756dcf1fef616f43d7b3097aaf53a6c4d92b" ++checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" +dependencies = [ + "js-sys", + "wasm-bindgen", @@ -931,5 +896,5 @@ index 0000000..136677d +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -- -2.29.2 +2.29.3 diff --git a/nixpkgs/pkgs/tools/text/fst/default.nix b/nixpkgs/pkgs/tools/text/fst/default.nix index 99c904005220..1e3759c6a578 100644 --- a/nixpkgs/pkgs/tools/text/fst/default.nix +++ b/nixpkgs/pkgs/tools/text/fst/default.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "fst"; - version = "0.4.5"; + version = "0.4.7"; src = fetchFromGitHub { owner = "BurntSushi"; repo = pname; rev = version; - sha256 = "01qdj7zzgwb1zqcznfmnks3dnl6hnf8ib0sm0sgimsbcvajmhab3"; + sha256 = "sha256-fXbX6idoGBtQiKM37C0z89OH/5H2PkZdwYLksXbbakE="; }; cargoPatches = [ @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { ]; cargoBuildFlags = [ "--workspace" ]; - cargoSha256 = "0440p0hb3nlq9wwk3zac9dldanslrddvqn4gib0vl7aikxkcvh4l"; + cargoSha256 = "sha256-2gy4i4CwZP6LB5ea1LBSfeAV6bNnsvDbxw0Unur0Hm4="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/nixpkgs/pkgs/tools/text/gawk/default.nix b/nixpkgs/pkgs/tools/text/gawk/default.nix index fd746ca117e8..3eb9ed3000c2 100644 --- a/nixpkgs/pkgs/tools/text/gawk/default.nix +++ b/nixpkgs/pkgs/tools/text/gawk/default.nix @@ -15,9 +15,6 @@ assert (doCheck && stdenv.isLinux) -> glibcLocales != null; -let - inherit (lib) optional; -in stdenv.mkDerivation rec { pname = "gawk"; version = "5.1.0"; @@ -28,14 +25,14 @@ stdenv.mkDerivation rec { }; # When we do build separate interactive version, it makes sense to always include man. - outputs = [ "out" "info" ] ++ optional (!interactive) "man"; + outputs = [ "out" "info" ] + ++ lib.optional (!interactive) "man"; - nativeBuildInputs = optional (doCheck && stdenv.isLinux) glibcLocales; + nativeBuildInputs = lib.optional (doCheck && stdenv.isLinux) glibcLocales; - buildInputs = - optional withSigsegv libsigsegv - ++ optional interactive readline - ++ optional stdenv.isDarwin locale; + buildInputs = lib.optional withSigsegv libsigsegv + ++ lib.optional interactive readline + ++ lib.optional stdenv.isDarwin locale; configureFlags = [ (if withSigsegv then "--with-libsigsegv-prefix=${libsigsegv}" else "--without-libsigsegv") @@ -60,7 +57,6 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.gnu.org/software/gawk/"; description = "GNU implementation of the Awk programming language"; - longDescription = '' Many computer users need to manipulate text files: extract and then operate on data from parts of certain lines while discarding the rest, @@ -74,11 +70,8 @@ stdenv.mkDerivation rec { makes it possible to handle many data-reformatting jobs with just a few lines of code. ''; - license = licenses.gpl3Plus; - platforms = platforms.unix ++ platforms.windows; - maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/tools/text/gnugrep/default.nix b/nixpkgs/pkgs/tools/text/gnugrep/default.nix index 42a9d913dd20..c5a661af1153 100644 --- a/nixpkgs/pkgs/tools/text/gnugrep/default.nix +++ b/nixpkgs/pkgs/tools/text/gnugrep/default.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation { maintainers = [ maintainers.eelco ]; platforms = platforms.all; + mainProgram = "grep"; }; passthru = {inherit pcre;}; diff --git a/nixpkgs/pkgs/tools/text/hck/default.nix b/nixpkgs/pkgs/tools/text/hck/default.nix index 271e4d9b7168..c17488bf67ac 100644 --- a/nixpkgs/pkgs/tools/text/hck/default.nix +++ b/nixpkgs/pkgs/tools/text/hck/default.nix @@ -1,7 +1,7 @@ -{ cmake -, fetchFromGitHub -, lib +{ lib , rustPlatform +, fetchFromGitHub +, cmake , stdenv , libiconv , CoreFoundation @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "hck"; - version = "0.6.3"; + version = "0.6.5"; src = fetchFromGitHub { owner = "sstadick"; repo = pname; rev = "v${version}"; - sha256 = "02yvpgvzdprysg0spa0abn7d3vjj5spzc3528rwbpl4cw2yx8j6w"; + sha256 = "sha256-+gBxZCBJmwe92DhfVorkfXsjpjkgm7JO/p/SHta9ly8="; }; - cargoSha256 = "0n6wywb1xyaxkbr0fs39992dfv55wzvp05i1vk9mxgnsim9s7aw8"; + cargoSha256 = "sha256-lAKMaUrXjplh5YhMZuLhTNDQBzDPHCfFrELHicwgi6U="; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/tools/text/hottext/default.nix b/nixpkgs/pkgs/tools/text/hottext/default.nix index ca0cbf9d1a09..6fe7a686c100 100644 --- a/nixpkgs/pkgs/tools/text/hottext/default.nix +++ b/nixpkgs/pkgs/tools/text/hottext/default.nix @@ -1,81 +1,30 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, nim, gentium, SDL2, makeDesktopItem }: +{ lib, nimPackages, fetchurl, gentium, makeDesktopItem }: -let - treeformLibs = lib.attrsets.mapAttrsToList (repo: args: - fetchFromGitHub ({ - inherit repo; - owner = "treeform"; - } // args)) { - bumpy = { - rev = "1.0.3"; - sha256 = "sha256-mDmDlhOGoYYjKgF5j808oT2NqRlfcOdLSDE3WtdJFQ0="; - }; - chroma = { - rev = "0.2.5"; - sha256 = "sha256-6lNHpO2aMorgkaPfo6kRcOs9r5R6T/kislVmkeoulw8="; - }; - flatty = { - rev = "0.2.1"; - sha256 = "sha256-TqNnRh2+i6n98ktLRVQxt9CVw17FGLNYq29rJoMus/0="; - }; - pixie = { - rev = "1.1.3"; - sha256 = "sha256-xKIejVxOd19mblL1ZwpJH91dgKQS5g8U08EL8lGGelA="; - }; - typography = { - rev = "0.7.9"; - sha256 = "sha256-IYjw3PCp5XzVed2fGGCt9Hb60cxFeF0BUZ7L5PedTLU="; - }; - vmath = { - rev = "1.0.3"; - sha256 = "sha256-zzSKXjuTZ46HTFUs0N47mxEKTKIdS3dwr+60sQYSdn0="; - }; - }; - - nimLibs = treeformLibs ++ [ - (fetchFromGitHub { - owner = "nim-lang"; - repo = "sdl2"; - rev = "v2.0.2"; - sha256 = "sha256-Ivx/gxDa2HVDjCVrJVu23i4d0pDzzv+ThmwqNjtkjsA="; - }) - (fetchFromGitHub { - owner = "guzba"; - repo = "nimsimd"; - rev = "1.0.0"; - sha256 = "sha256-kp61fylAJ6MSN9hLYLi7CU2lxVR/lbrNCvZTe0LJLGo="; - }) - (fetchFromGitHub { - owner = "guzba"; - repo = "zippy"; - rev = "0.5.6"; - sha256 = "sha256-axp4t9+8TFSpvnATlRKZyuOGLA0e/XKfvrVSwreXpC4="; - }) - ]; - -in stdenv.mkDerivation rec { +nimPackages.buildNimPackage rec { pname = "hottext"; version = "1.4"; + nimBinOnly = true; + src = fetchurl { url = "https://git.sr.ht/~ehmry/hottext/archive/v${version}.tar.gz"; sha256 = "sha256-hIUofi81zowSMbt1lUsxCnVzfJGN3FEiTtN8CEFpwzY="; }; - nativeBuildInputs = [ nim ]; - buildInputs = [ SDL2 ]; - - nimFlags = [ "-d:release" ] ++ map (lib: "--path:${lib}/src") nimLibs; + buildInputs = with nimPackages; [ + bumpy + chroma + flatty + nimsimd + pixie + sdl2 + typography + vmath + zippy + ]; HOTTEXT_FONT_PATH = "${gentium}/share/fonts/truetype/GentiumPlus-Regular.ttf"; - buildPhase = '' - runHook preBuild - HOME=$TMPDIR - nim $nimFlags compile src/$pname - runHook postBuild - ''; - desktopItem = makeDesktopItem { categories = "Utility;"; comment = meta.description; @@ -84,11 +33,8 @@ in stdenv.mkDerivation rec { name = pname; }; - installPhase = '' - runHook preInstall - install -Dt $out/bin src/$pname + postInstall = '' cp -r $desktopItem/* $out - runHook postInstall ''; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/text/html2text/default.nix b/nixpkgs/pkgs/tools/text/html2text/default.nix index ae92f3ba9d9a..fff3e44baf69 100644 --- a/nixpkgs/pkgs/tools/text/html2text/default.nix +++ b/nixpkgs/pkgs/tools/text/html2text/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "html2text-1.3.2a"; +stdenv.mkDerivation rec { + pname = "html2text"; + version = "1.3.2a"; src = fetchurl { - url = "http://www.mbayer.de/html2text/downloads/html2text-1.3.2a.tar.gz"; + url = "http://www.mbayer.de/html2text/downloads/html2text-${version}.tar.gz"; sha256 = "000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392"; }; diff --git a/nixpkgs/pkgs/tools/text/hyx/default.nix b/nixpkgs/pkgs/tools/text/hyx/default.nix index c2b055be7df9..c287b37dd1b5 100644 --- a/nixpkgs/pkgs/tools/text/hyx/default.nix +++ b/nixpkgs/pkgs/tools/text/hyx/default.nix @@ -1,11 +1,5 @@ -{ lib, stdenv, fetchurl }: -let - # memstream — POSIX memory streams for BSD - memstream = fetchurl { - url = "https://piumarta.com/software/memstream/memstream-0.1.tar.gz"; - sha256 = "0kvdb897g7nyviaz72arbqijk2g2wa61cmi3l5yh48rzr49r3a3a"; - }; -in +{ lib, stdenv, fetchurl, memstreamHook }: + stdenv.mkDerivation rec { pname = "hyx"; version = "2020-06-09"; @@ -15,11 +9,12 @@ stdenv.mkDerivation rec { sha256 = "1x8dmll93hrnj24kn5knpwj36y6r1v2ygwynpjwrg2hwd4c1a8hi"; }; - postUnpack = lib.optionalString stdenv.isDarwin '' - tar --strip=1 -C $sourceRoot -xf ${memstream} --wildcards "memstream-0.1/memstream.[hc]" + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace "-Wl,-z,relro,-z,now -fpic -pie" "" ''; - patches = lib.optional stdenv.isDarwin ./memstream.patch; + buildInputs = lib.optional (stdenv.system == "x86_64-darwin") memstreamHook; installPhase = '' install -vD hyx $out/bin/hyx diff --git a/nixpkgs/pkgs/tools/text/hyx/memstream.patch b/nixpkgs/pkgs/tools/text/hyx/memstream.patch deleted file mode 100644 index a02509ced762..000000000000 --- a/nixpkgs/pkgs/tools/text/hyx/memstream.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Naur hyx-2020.06.09.org/Makefile hyx-2020.06.09/Makefile ---- hyx-2020.06.09.org/Makefile 2020-06-09 15:19:50.000000000 +0300 -+++ hyx-2020.06.09/Makefile 2020-07-22 11:46:40.000000000 +0300 -@@ -1,6 +1,6 @@ - - all: CFLAGS ?= -O2 -Wl,-s \ -- -Wl,-z,relro,-z,now -fpic -pie -D_FORTIFY_SOURCE=2 -fstack-protector-all -+ -D_FORTIFY_SOURCE=2 -fstack-protector-all - all: CFLAGS += -std=c99 -pedantic -Wall -Wextra -DNDEBUG - all: hyx - -@@ -13,7 +13,7 @@ - hyx: *.h *.c - $(CC) \ - $(CFLAGS) \ -- hyx.c common.c blob.c history.c view.c input.c \ -+ hyx.c common.c blob.c history.c view.c input.c memstream.c \ - -o hyx - - clean: -diff -Naur hyx-2020.06.09.org/view.c hyx-2020.06.09/view.c ---- hyx-2020.06.09.org/view.c 2020-06-09 15:19:50.000000000 +0300 -+++ hyx-2020.06.09/view.c 2020-07-22 11:49:09.000000000 +0300 -@@ -4,6 +4,7 @@ - #include "view.h" - #include "input.h" - #include "ansi.h" -+#include "memstream.h" - - #include <stdlib.h> - #include <stdio.h> diff --git a/nixpkgs/pkgs/tools/text/kakasi/default.nix b/nixpkgs/pkgs/tools/text/kakasi/default.nix index 609b8aff9b56..d2cf1f701ee9 100644 --- a/nixpkgs/pkgs/tools/text/kakasi/default.nix +++ b/nixpkgs/pkgs/tools/text/kakasi/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { - name = "kakasi-2.3.6"; + pname = "kakasi"; + version = "2.3.6"; buildInputs = lib.optional stdenv.isDarwin [ libiconv ]; @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "http://kakasi.namazu.org/stable/${name}.tar.xz"; + url = "http://kakasi.namazu.org/stable/kakasi-${version}.tar.xz"; sha256 = "1qry3xqb83pjgxp3my8b1sy77z4f0893h73ldrvdaky70cdppr9f"; }; diff --git a/nixpkgs/pkgs/tools/text/mairix/default.nix b/nixpkgs/pkgs/tools/text/mairix/default.nix index 57e05bf19f6e..aa58ecdd35a9 100644 --- a/nixpkgs/pkgs/tools/text/mairix/default.nix +++ b/nixpkgs/pkgs/tools/text/mairix/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, zlib, bzip2, bison, flex }: stdenv.mkDerivation rec { - name = "mairix-0.24"; + pname = "mairix"; + version = "0.24"; src = fetchurl { - url = "mirror://sourceforge/mairix/${name}.tar.gz"; + url = "mirror://sourceforge/mairix/mairix-${version}.tar.gz"; sha256 = "0msaxz5c5hf7k1ci16i67m4ynrbrpsxbqzk84nz6z2vnkh3jww50"; }; diff --git a/nixpkgs/pkgs/tools/text/mark/default.nix b/nixpkgs/pkgs/tools/text/mark/default.nix index 653af8b79692..b7a4537addaf 100644 --- a/nixpkgs/pkgs/tools/text/mark/default.nix +++ b/nixpkgs/pkgs/tools/text/mark/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mark"; - version = "6.2"; + version = "6.3"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = version; - sha256 = "sha256-Nk7DbZdz8BbsZO/Sx36ALNXRtSUju3X6S8M0yFs+Yz0="; + sha256 = "sha256-HKP8ZYhYDJizZ91q4MRwS00YIMvgB6EJ3au5rMg02hg="; }; vendorSha256 = "sha256-y3Q8UebNbLy1jmxUC37mv+2l8dCU3b/Fk8XHn5u57p0="; diff --git a/nixpkgs/pkgs/tools/text/mawk/default.nix b/nixpkgs/pkgs/tools/text/mawk/default.nix index d5f228d78730..62a23318ca2f 100644 --- a/nixpkgs/pkgs/tools/text/mawk/default.nix +++ b/nixpkgs/pkgs/tools/text/mawk/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mawk-1.3.4-20200120"; + pname = "mawk"; + version = "1.3.4-20200120"; src = fetchurl { urls = [ - "ftp://ftp.invisible-island.net/mawk/${name}.tgz" - "https://invisible-mirror.net/archives/mawk/${name}.tgz" + "ftp://ftp.invisible-island.net/mawk/mawk-${version}.tgz" + "https://invisible-mirror.net/archives/mawk/mawk-${version}.tgz" ]; sha256 = "0dw2icf8bnqd9y0clfd9pkcxz4b2phdihwci13z914mf3wgcvm3z"; }; diff --git a/nixpkgs/pkgs/tools/text/mpage/default.nix b/nixpkgs/pkgs/tools/text/mpage/default.nix index 99cfec97a70b..b48f89d66180 100644 --- a/nixpkgs/pkgs/tools/text/mpage/default.nix +++ b/nixpkgs/pkgs/tools/text/mpage/default.nix @@ -1,9 +1,11 @@ { fetchurl, lib, stdenv }: stdenv.mkDerivation rec { - name = "mpage-2.5.7"; + pname = "mpage"; + version = "2.5.7"; + src = fetchurl { - url = "http://www.mesa.nl/pub/mpage/${name}.tgz"; + url = "https://www.mesa.nl/pub/mpage/mpage-${version}.tgz"; sha256 = "1zn37r5xrvjgjbw2bdkc0r7s6q8b1krmcryzj0yf0dyxbx79rasi"; }; diff --git a/nixpkgs/pkgs/tools/text/multitran/data/default.nix b/nixpkgs/pkgs/tools/text/multitran/data/default.nix index a94f5bc96887..bfc148df782b 100644 --- a/nixpkgs/pkgs/tools/text/multitran/data/default.nix +++ b/nixpkgs/pkgs/tools/text/multitran/data/default.nix @@ -6,7 +6,9 @@ # The store file mentioned is in "${glibc.out}/lib/locale/locale-archive" stdenv.mkDerivation { - name = "multitran-data-0.3"; + pname = "multitran-data"; + version = "0.3"; + src = fetchurl { url = "mirror://sourceforge/multitran/multitran-data.tar.bz2"; sha256 = "9c2ff5027c2fe72b0cdf056311cd7543f447feb02b455982f20d4a3966b7828c"; diff --git a/nixpkgs/pkgs/tools/text/multitran/libbtree/default.nix b/nixpkgs/pkgs/tools/text/multitran/libbtree/default.nix index 893c1e1d9316..91c4bb0ea7f8 100644 --- a/nixpkgs/pkgs/tools/text/multitran/libbtree/default.nix +++ b/nixpkgs/pkgs/tools/text/multitran/libbtree/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl} : -stdenv.mkDerivation { - name = "libbtree-0.0.1alpha2"; +stdenv.mkDerivation rec { + pname = "libbtree"; + version = "0.0.1alpha2"; + src = fetchurl { - url = "mirror://sourceforge/multitran/libbtree-0.0.1alpha2.tar.bz2"; + url = "mirror://sourceforge/multitran/libbtree-${version}.tar.bz2"; sha256 = "34a584e45058950337ff9342693b6739b52c3ce17e66440526c4bd6f9575802c"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/tools/text/multitran/libfacet/default.nix b/nixpkgs/pkgs/tools/text/multitran/libfacet/default.nix index 3895f3a922c2..0e6dd0d6e652 100644 --- a/nixpkgs/pkgs/tools/text/multitran/libfacet/default.nix +++ b/nixpkgs/pkgs/tools/text/multitran/libfacet/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, libmtsupport }: -stdenv.mkDerivation { - name = "libfacet-0.0.1alpha2"; +stdenv.mkDerivation rec { + pname = "libfacet"; + version = "0.0.1alpha2"; src = fetchurl { - url = "mirror://sourceforge/multitran/libfacet-0.0.1alpha2.tar.bz2"; + url = "mirror://sourceforge/multitran/libfacet-${version}.tar.bz2"; sha256 = "dc53351c4035a3c27dc6c1d0410e808346fbc107e7e7c112ec65c59d0df7a144"; }; diff --git a/nixpkgs/pkgs/tools/text/multitran/libmtquery/default.nix b/nixpkgs/pkgs/tools/text/multitran/libmtquery/default.nix index 3b7dd681e8ae..5cc8e724e71f 100644 --- a/nixpkgs/pkgs/tools/text/multitran/libmtquery/default.nix +++ b/nixpkgs/pkgs/tools/text/multitran/libmtquery/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl, libmtsupport, libfacet, libbtree, multitrandata } : -stdenv.mkDerivation { - name = "libmtquery-0.0.1alpha3"; +stdenv.mkDerivation rec { + pname = "libmtquery"; + version = "0.0.1alpha3"; + src = fetchurl { - url = "mirror://sourceforge/multitran/libmtquery-0.0.1alpha3.tar.bz2"; + url = "mirror://sourceforge/multitran/libmtquery-${version}.tar.bz2"; sha256 = "e24c7c15772445f1b14871928d84dd03cf93bd88f9d2b2ed1bf0257c2cf2b15e"; }; diff --git a/nixpkgs/pkgs/tools/text/multitran/libmtsupport/default.nix b/nixpkgs/pkgs/tools/text/multitran/libmtsupport/default.nix index eebc88189f25..454709b8eb79 100644 --- a/nixpkgs/pkgs/tools/text/multitran/libmtsupport/default.nix +++ b/nixpkgs/pkgs/tools/text/multitran/libmtsupport/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl} : -stdenv.mkDerivation { - name = "libmtsupport-0.0.1alpha2"; +stdenv.mkDerivation rec { + pname = "libmtsupport"; + version = "0.0.1alpha2"; + src = fetchurl { - url = "mirror://sourceforge/multitran/libmtsupport-0.0.1alpha2.tar.bz2"; + url = "mirror://sourceforge/multitran/libmtsupport-${version}.tar.bz2"; sha256 = "481f0f1ec15d7274f1e4eb93e7d060df10a181efd037eeff5e8056d283a9298b"; }; patchPhase = '' diff --git a/nixpkgs/pkgs/tools/text/multitran/mtutils/default.nix b/nixpkgs/pkgs/tools/text/multitran/mtutils/default.nix index 00325276fdb1..2428caada5b8 100644 --- a/nixpkgs/pkgs/tools/text/multitran/mtutils/default.nix +++ b/nixpkgs/pkgs/tools/text/multitran/mtutils/default.nix @@ -1,9 +1,11 @@ {lib, stdenv, fetchurl, libmtsupport, libfacet, libbtree, libmtquery, help2man} : -stdenv.mkDerivation { - name = "mt-utils-0.0.1alpha3"; +stdenv.mkDerivation rec { + pname = "mt-utils"; + version = "0.0.1alpha3"; + src = fetchurl { - url = "mirror://sourceforge/multitran/mt-utils-0.0.1alpha3.tar.bz2"; + url = "mirror://sourceforge/multitran/mt-utils-${version}.tar.bz2"; sha256 = "e407702c90c5272882386914e1eeca5f6c5039393af9a44538536b94867b0a0e"; }; diff --git a/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix b/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix deleted file mode 100644 index 0dff6d76fffe..000000000000 --- a/nixpkgs/pkgs/tools/text/ocrmypdf/default.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ fetchFromGitHub -, ghostscript -, img2pdf -, jbig2enc -, leptonica -, pngquant -, python3 -, python3Packages -, qpdf -, lib -, stdenv -, tesseract4 -, unpaper -, substituteAll -}: -let - inherit (python3Packages) buildPythonApplication; - - runtimeDeps = with python3Packages; [ - ghostscript - jbig2enc - leptonica - pngquant - qpdf - tesseract4 - unpaper - pillow - ]; - -in -buildPythonApplication rec { - pname = "ocrmypdf"; - version = "12.3.0"; - - src = fetchFromGitHub { - owner = "jbarlow83"; - repo = "OCRmyPDF"; - rev = "v${version}"; - sha256 = "122yv3p0v4fbx30zgppcznwnm7svg97gv0sa103xb6zcld68ggn2"; - }; - - nativeBuildInputs = with python3Packages; [ - setuptools - setuptools-scm-git-archive - setuptools-scm - ]; - - propagatedBuildInputs = with python3Packages; [ - cffi - chardet - coloredlogs - img2pdf - pdfminer - pluggy - pikepdf - pillow - reportlab - setuptools - tqdm - ]; - - checkInputs = with python3Packages; [ - pypdf2 - pytest - pytest-helpers-namespace - pytest-xdist - pytest-cov - python-xmp-toolkit - pytestCheckHook - ] ++ runtimeDeps; - - patches = [ - (substituteAll { - src = ./liblept.patch; - liblept = "${lib.getLib leptonica}/lib/liblept${stdenv.hostPlatform.extensions.sharedLibrary}"; - }) - ]; - - makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ghostscript jbig2enc pngquant qpdf tesseract4 unpaper ]}" ]; - - meta = with lib; { - homepage = "https://github.com/jbarlow83/OCRmyPDF"; - description = "Adds an OCR text layer to scanned PDF files, allowing them to be searched"; - license = with licenses; [ mpl20 mit ]; - platforms = platforms.linux; - maintainers = [ maintainers.kiwi ]; - changelog = "https://github.com/jbarlow83/OCRmyPDF/blob/v${version}/docs/release_notes.rst"; - }; -} diff --git a/nixpkgs/pkgs/tools/text/ocrmypdf/liblept.patch b/nixpkgs/pkgs/tools/text/ocrmypdf/liblept.patch deleted file mode 100644 index ed413a8b37bd..000000000000 --- a/nixpkgs/pkgs/tools/text/ocrmypdf/liblept.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/ocrmypdf/leptonica.py b/src/ocrmypdf/leptonica.py -index 328b063..b993cc9 100644 ---- a/src/ocrmypdf/leptonica.py -+++ b/src/ocrmypdf/leptonica.py -@@ -46,7 +46,7 @@ if os.name == 'nt': - os.environ['PATH'] = shim_paths_with_program_files() - else: - libname = 'lept' --_libpath = find_library(libname) -+_libpath = '@liblept@' - if not _libpath: - raise MissingDependencyError( - """ diff --git a/nixpkgs/pkgs/tools/text/peco/default.nix b/nixpkgs/pkgs/tools/text/peco/default.nix index 2928d5322072..36951be7edbc 100644 --- a/nixpkgs/pkgs/tools/text/peco/default.nix +++ b/nixpkgs/pkgs/tools/text/peco/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "peco"; - version = "0.5.8"; + version = "0.5.10"; subPackages = [ "cmd/peco" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "peco"; repo = "peco"; rev = "v${version}"; - sha256 = "12xbqisk7bcy38fmjxcs069a0600gncbqzscqw6x37lgw6hlw52x"; + sha256 = "sha256-Iu2MclUbUYX1FuMnE65Qdk0S+5+K3HW86WIdQrNUyY8="; }; - vendorSha256 = "1p8pc50ql2vqnn0crx0y558i3m0d6vcdaj3995h3f0908pnk6x7q"; + vendorSha256 = "sha256-+HQz7UUgATdgSWlI1dg2DdQRUSke9MyAtXgLikFhF90="; meta = with lib; { description = "Simplistic interactive filtering tool"; diff --git a/nixpkgs/pkgs/tools/text/proselint/default.nix b/nixpkgs/pkgs/tools/text/proselint/default.nix index 143c43f660d1..d00b71977a22 100644 --- a/nixpkgs/pkgs/tools/text/proselint/default.nix +++ b/nixpkgs/pkgs/tools/text/proselint/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "proselint"; - version = "0.10.2"; + version = "0.12.0"; doCheck = false; # fails to pass because it tries to run in home directory src = fetchurl { url = "mirror://pypi/p/proselint/${pname}-${version}.tar.gz"; - sha256 = "017risn0j1bjy9ygzfgphjnyjl4gk7wbrr4qv1vvrlan60wyp1rs"; + sha256 = "2a98d9c14382d94ed9122a6c0b0657a814cd5c892c77d9477309fc99f86592e6"; }; propagatedBuildInputs = [ click future six ]; diff --git a/nixpkgs/pkgs/tools/text/qprint/default.nix b/nixpkgs/pkgs/tools/text/qprint/default.nix index e2621ab18766..19f2d7b1cbd6 100644 --- a/nixpkgs/pkgs/tools/text/qprint/default.nix +++ b/nixpkgs/pkgs/tools/text/qprint/default.nix @@ -1,10 +1,11 @@ { fetchurl, lib, stdenv }: stdenv.mkDerivation rec { - name = "qprint-1.1"; + pname = "qprint"; + version = "1.1"; src = fetchurl { - url = "https://www.fourmilab.ch/webtools/qprint/${name}.tar.gz"; + url = "https://www.fourmilab.ch/webtools/qprint/qprint-${version}.tar.gz"; sha256 = "1701cnb1nl84rmcpxzq11w4cyj4385jh3gx4aqxznwf8a4fwmagz"; }; diff --git a/nixpkgs/pkgs/tools/text/rust-petname/default.nix b/nixpkgs/pkgs/tools/text/rust-petname/default.nix new file mode 100644 index 000000000000..4a3c0f596cfb --- /dev/null +++ b/nixpkgs/pkgs/tools/text/rust-petname/default.nix @@ -0,0 +1,22 @@ +{ lib, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "rust-petname"; + version = "1.1.1"; + + src = fetchCrate { + inherit version; + crateName = "petname"; + sha256 = "sha256-X1p9W+N0Nhh7CSh776ofzHmG0ayi5COLJjBncxmL8CM="; + }; + + cargoSha256 = "sha256-jxN2EKLjf9yKkhZ4wsH72sNdk6UYAcCUrg4+qx75bWs="; + + meta = with lib; { + description = "Generate human readable random names"; + homepage = "https://github.com/allenap/rust-petname"; + license = licenses.asl20; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "petname"; + }; +} diff --git a/nixpkgs/pkgs/tools/text/sgml/openjade/default.nix b/nixpkgs/pkgs/tools/text/sgml/openjade/default.nix index 785ef3205967..f87bd5d7b1a1 100644 --- a/nixpkgs/pkgs/tools/text/sgml/openjade/default.nix +++ b/nixpkgs/pkgs/tools/text/sgml/openjade/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, opensp, perl }: stdenv.mkDerivation rec { - name = "openjade-1.3.2"; + pname = "openjade"; + version = "1.3.2"; src = fetchurl { - url = "mirror://sourceforge/openjade/${name}.tar.gz"; + url = "mirror://sourceforge/openjade/openjade-${version}.tar.gz"; sha256 = "1l92sfvx1f0wmkbvzv1385y1gb3hh010xksi1iyviyclrjb7jb8x"; }; diff --git a/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix b/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix index 1c9131d29dc5..6924c8953eef 100644 --- a/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix +++ b/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412 , libxslt, docbook_xsl, autoconf, automake, gettext, libiconv, libtool}: -stdenv.mkDerivation { - name = "opensp-1.5.2"; +stdenv.mkDerivation rec { + pname = "opensp"; + version = "1.5.2"; src = fetchurl { - url = "mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz"; + url = "mirror://sourceforge/openjade/OpenSP-${version}.tar.gz"; sha256 = "1khpasr6l0a8nfz6kcf3s81vgdab8fm2dj291n5r2s53k228kx2p"; }; diff --git a/nixpkgs/pkgs/tools/text/snippetpixie/default.nix b/nixpkgs/pkgs/tools/text/snippetpixie/default.nix index 301831d1a830..e66a5404f439 100644 --- a/nixpkgs/pkgs/tools/text/snippetpixie/default.nix +++ b/nixpkgs/pkgs/tools/text/snippetpixie/default.nix @@ -86,9 +86,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.snippetpixie.com"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ - ianmjones - ] ++ pantheon.maintainers; + maintainers = with maintainers; [ ianmjones ] ++ teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/text/source-highlight/default.nix b/nixpkgs/pkgs/tools/text/source-highlight/default.nix index 6e1a7b24b594..8817b7a09fda 100644 --- a/nixpkgs/pkgs/tools/text/source-highlight/default.nix +++ b/nixpkgs/pkgs/tools/text/source-highlight/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, boost }: +{ lib, stdenv, fetchpatch, fetchurl, boost }: stdenv.mkDerivation rec { pname = "source-highlight"; @@ -9,10 +9,19 @@ stdenv.mkDerivation rec { sha256 = "148w47k3zswbxvhg83z38ifi85f9dqcpg7icvvw1cm6bg21x4zrs"; }; + patches = [ + # gcc-11 compat upstream patch + (fetchpatch { + url = "http://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=904949c9026cb772dc93fbe0947a252ef47127f4"; + sha256 = "1wnj0jmkmrwjww7qk9dvfxh8h06jdn7mi8v2fvwh95b6x87z5l47"; + excludes = [ "ChangeLog" ]; + }) + ]; + # source-highlight uses it's own binary to generate documentation. # During cross-compilation, that binary was built for the target # platform architecture, so it can't run on the build host. - patchPhase = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' substituteInPlace Makefile.in --replace "src doc tests" "src tests" ''; @@ -21,7 +30,12 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-boost=${boost.out}" ]; - enableParallelBuilding = false; + doCheck = !stdenv.cc.isClang; + + enableParallelBuilding = true; + # Upstream uses the same intermediate files in multiple tests, running + # them in parallel by make will eventually break one or more tests. + enableParallelChecking = false; outputs = [ "out" "doc" "dev" ]; diff --git a/nixpkgs/pkgs/tools/text/tv/default.nix b/nixpkgs/pkgs/tools/text/tv/default.nix index 1f0e4078f3f1..686433ff4290 100644 --- a/nixpkgs/pkgs/tools/text/tv/default.nix +++ b/nixpkgs/pkgs/tools/text/tv/default.nix @@ -2,20 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "tv"; - version = "0.5.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "uzimaru0000"; repo = pname; rev = "v${version}"; - sha256 = "07gcs64j468213jxcjjv9vywzvfair7gbaiqzqm9wwsdgjyw0wwc"; + sha256 = "sha256-qODv45smZ6jHCJBaa6EEvFLG+7g+FWrRf6BiHRFLzqM="; }; - cargoSha256 = "00fi7wimr0rihf6qx20r77w85w2i55kn823gp283lsszbw1z8as9"; + cargoSha256 = "sha256-nI4n4KMPLaIF978b5VvW3mb02vKW+r39nllrhukJilI="; meta = with lib; { description = "Format json into table view"; homepage = "https://github.com/uzimaru0000/tv"; + changelog = "https://github.com/uzimaru0000/tv/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/nixpkgs/pkgs/tools/text/uni2ascii/default.nix b/nixpkgs/pkgs/tools/text/uni2ascii/default.nix index e2bda04d13f1..d83e9393f941 100644 --- a/nixpkgs/pkgs/tools/text/uni2ascii/default.nix +++ b/nixpkgs/pkgs/tools/text/uni2ascii/default.nix @@ -1,9 +1,11 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "uni2ascii-4.18"; + pname = "uni2ascii"; + version = "4.18"; + src = fetchurl { - url = "https://billposer.org/Software/Downloads/${name}.tar.gz"; + url = "https://billposer.org/Software/Downloads/uni2ascii-${version}.tar.gz"; sha256 = "03lklnzr6ngs4wqiqa7rifd246f441gfvardbsaa5l6fn9pbn94y"; }; diff --git a/nixpkgs/pkgs/tools/text/vale/default.nix b/nixpkgs/pkgs/tools/text/vale/default.nix index d5c64aa9f7b2..25a98d299a75 100644 --- a/nixpkgs/pkgs/tools/text/vale/default.nix +++ b/nixpkgs/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.10.5"; + version = "2.10.6"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "sha256-SxNM63MCtsBmjzFbO/leCQwWWew5nN8wTUdmzHkx7dQ="; + sha256 = "sha256-exBrs/MQhfqCxAJrnxECdKnxvsK9LvXIqpnYkR5h7uA="; }; vendorSha256 = "sha256-3rCrRA9OKG2/wUlVvkG9lynJZOYFVqMkUZpGpW89KZc="; diff --git a/nixpkgs/pkgs/tools/text/xml/basex/default.nix b/nixpkgs/pkgs/tools/text/xml/basex/default.nix index 30482196322f..0e2c8b824f5e 100644 --- a/nixpkgs/pkgs/tools/text/xml/basex/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/basex/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { desktopItem = makeDesktopItem { name = "basex"; exec = "basexgui %f"; - icon = ./basex.svg; # icon copied from Ubuntu basex package + icon = "${./basex.svg}"; # icon copied from Ubuntu basex package comment = "Visually query and analyse your XML data"; desktopName = "BaseX XML Database"; genericName = "XML database tool"; diff --git a/nixpkgs/pkgs/tools/text/xml/xml2/default.nix b/nixpkgs/pkgs/tools/text/xml/xml2/default.nix index 4c312250bf65..265ab10e5ac8 100644 --- a/nixpkgs/pkgs/tools/text/xml/xml2/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/xml2/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libxml2 }: -stdenv.mkDerivation { - name = "xml2-0.5"; +stdenv.mkDerivation rec { + pname = "xml2"; + version = "0.5"; src = fetchurl { - url = "https://web.archive.org/web/20160427221603/http://download.ofb.net/gale/xml2-0.5.tar.gz"; + url = "https://web.archive.org/web/20160427221603/http://download.ofb.net/gale/xml2-${version}.tar.gz"; sha256 = "01cps980m99y99cnmvydihga9zh3pvdsqag2fi1n6k2x7rfkl873"; }; diff --git a/nixpkgs/pkgs/tools/text/xml/xmlstarlet/default.nix b/nixpkgs/pkgs/tools/text/xml/xmlstarlet/default.nix index e179c3153e10..39d53088babf 100644 --- a/nixpkgs/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, libxml2, libxslt }: stdenv.mkDerivation rec { - name = "xmlstarlet-1.6.1"; + pname = "xmlstarlet"; + version = "1.6.1"; src = fetchurl { - url = "mirror://sourceforge/xmlstar/${name}.tar.gz"; + url = "mirror://sourceforge/xmlstar/xmlstarlet-${version}.tar.gz"; sha256 = "1jp737nvfcf6wyb54fla868yrr39kcbijijmjpyk4lrpyg23in0m"; }; diff --git a/nixpkgs/pkgs/tools/text/xml/xpf/default.nix b/nixpkgs/pkgs/tools/text/xml/xpf/default.nix index 29170394d1e6..ce0813c2ef4a 100644 --- a/nixpkgs/pkgs/tools/text/xml/xpf/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/xpf/default.nix @@ -2,11 +2,12 @@ assert libxml2.pythonSupport == true; -stdenv.mkDerivation { - name = "xpf-0.2"; +stdenv.mkDerivation rec { + pname = "xpf"; + version = "0.2"; src = fetchurl { - url = "http://tarballs.nixos.org/xpf-0.2.tar.gz"; + url = "http://tarballs.nixos.org/xpf-${version}.tar.gz"; sha256 = "0ljx91w68rnh4871c0xlq2whlmhqz8dr39wcdczfjjpniqz1fmpz"; }; diff --git a/nixpkgs/pkgs/tools/text/yaml-merge/default.nix b/nixpkgs/pkgs/tools/text/yaml-merge/default.nix index 7c4ecc49df5d..e5794b439a53 100644 --- a/nixpkgs/pkgs/tools/text/yaml-merge/default.nix +++ b/nixpkgs/pkgs/tools/text/yaml-merge/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchFromGitHub, pythonPackages }: stdenv.mkDerivation { - name= "yaml-merge-2016-02-16"; + pname = "yaml-merge"; + version = "unstable-2016-02-16"; src = fetchFromGitHub { owner = "abbradar"; diff --git a/nixpkgs/pkgs/tools/typesetting/docbook2odf/default.nix b/nixpkgs/pkgs/tools/typesetting/docbook2odf/default.nix index cd10ac9117c8..0b7b67f69b59 100644 --- a/nixpkgs/pkgs/tools/typesetting/docbook2odf/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/docbook2odf/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perlPackages, makeWrapper, zip, libxslt }: stdenv.mkDerivation rec { - name = "docbook2odf-0.244"; + pname = "docbook2odf"; + version = "0.244"; src = fetchurl { - url = "http://open.comsultia.com/docbook2odf/dwn/${name}.tar.gz"; + url = "http://open.comsultia.com/docbook2odf/dwn/docbook2odf-${version}.tar.gz"; sha256 = "10k44g0qqa37k30pfj8vz95j6zdzz0nmnqjq1lyahfs2h4glzgwb"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/docbook2x/default.nix b/nixpkgs/pkgs/tools/typesetting/docbook2x/default.nix index 4b9e571c0ad3..aac992552d31 100644 --- a/nixpkgs/pkgs/tools/typesetting/docbook2x/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/docbook2x/default.nix @@ -4,10 +4,11 @@ , makeWrapper }: stdenv.mkDerivation rec { - name = "docbook2X-0.8.8"; + pname = "docbook2X"; + version = "0.8.8"; src = fetchurl { - url = "mirror://sourceforge/docbook2x/${name}.tar.gz"; + url = "mirror://sourceforge/docbook2x/docbook2X-${version}.tar.gz"; sha256 = "0ifwzk99rzjws0ixzimbvs83x6cxqk1xzmg84wa1p7bs6rypaxs0"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/halibut/default.nix b/nixpkgs/pkgs/tools/typesetting/halibut/default.nix index d077ef823ffc..ec5598e4d689 100644 --- a/nixpkgs/pkgs/tools/typesetting/halibut/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/halibut/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, perl}: stdenv.mkDerivation rec { - name = "halibut-1.2"; + pname = "halibut"; + version = "1.2"; src = fetchurl { - url = "http://ww.chiark.greenend.org.uk/~sgtatham/halibut/${name}/${name}.tar.gz"; + url = "http://ww.chiark.greenend.org.uk/~sgtatham/halibut/halibut-${version}/halibut-${version}.tar.gz"; sha256 = "0gqnhfqf555rfpk5xj1imbdxnbkkrv4wl3rrdb1r0wgj81igpv8s"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/hevea/default.nix b/nixpkgs/pkgs/tools/typesetting/hevea/default.nix index ad6427e56224..8253d73e3dbb 100644 --- a/nixpkgs/pkgs/tools/typesetting/hevea/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/hevea/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, ocamlPackages }: stdenv.mkDerivation rec { - name = "hevea-2.35"; + pname = "hevea"; + version = "2.35"; src = fetchurl { - url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz"; + url = "https://pauillac.inria.fr/~maranget/hevea/distri/hevea-${version}.tar.gz"; sha256 = "sha256-8Ym62l0+WzWFXf39tbJwyZT8eiNmsBJQ12E1mtZsnss="; }; diff --git a/nixpkgs/pkgs/tools/typesetting/lout/default.nix b/nixpkgs/pkgs/tools/typesetting/lout/default.nix index 4737c5d74097..f5bf22c0f338 100644 --- a/nixpkgs/pkgs/tools/typesetting/lout/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/lout/default.nix @@ -1,13 +1,14 @@ {lib, stdenv, fetchurl, ghostscript}: stdenv.mkDerivation rec { - name = "lout-3.40"; + pname = "lout"; + version = "3.40"; src = fetchurl { urls = [ - "ftp://ftp.cs.usyd.edu.au/jeff/lout/${name}.tar.gz" - "mirror://savannah/lout/${name}.tar.gz" # new! - "mirror://sourceforge/lout/${name}.tar.gz" # to be phased out + "ftp://ftp.cs.usyd.edu.au/jeff/lout/${pname}-${version}.tar.gz" + "mirror://savannah/lout/${pname}-${version}.tar.gz" # new! + "mirror://sourceforge/lout/${pname}-${version}.tar.gz" # to be phased out # XXX: We could add the CTAN mirrors # (see https://www.ctan.org/tex-archive/support/lout/). ]; diff --git a/nixpkgs/pkgs/tools/typesetting/psutils/default.nix b/nixpkgs/pkgs/tools/typesetting/psutils/default.nix index fe3223ae6c90..c7f68f2bd52b 100644 --- a/nixpkgs/pkgs/tools/typesetting/psutils/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/psutils/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perl }: -stdenv.mkDerivation { - name = "psutils-17"; +stdenv.mkDerivation rec { + pname = "psutils"; + version = "17"; src = fetchurl { - url = "ftp://ftp.knackered.org/pub/psutils/psutils-p17.tar.gz"; + url = "ftp://ftp.knackered.org/pub/psutils/psutils-p${version}.tar.gz"; sha256 = "1r4ab1fvgganm02kmm70b2r1azwzbav2am41gbigpa2bb1wynlrq"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/sile/default.nix b/nixpkgs/pkgs/tools/typesetting/sile/default.nix index 049938581b67..27c8aada14c9 100644 --- a/nixpkgs/pkgs/tools/typesetting/sile/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/sile/default.nix @@ -38,11 +38,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.11.1"; + version = "0.12.0"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "06bx94zx6skhizk2bbrid82sldwgxfycvjh6zx1zy1xz8gajgrm3"; + sha256 = "1rkdzf4khyvsn5qg455mdhnlacxlqgi9vchy369a66qp5nrs50y9"; }; configureFlags = [ diff --git a/nixpkgs/pkgs/tools/typesetting/tex/lkproof/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/lkproof/default.nix index 4f896ef32baf..6b866b43d1b9 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/lkproof/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/lkproof/default.nix @@ -1,7 +1,8 @@ {lib, stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "lkproof-3.1"; + pname = "lkproof"; + version = "3.1"; src = fetchurl { url = "http://mirror.ctan.org/macros/latex/contrib/lkproof.zip"; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/pgfplots/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/pgfplots/default.nix index fe928615eb42..0a2667f284e9 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/pgfplots/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/pgfplots/default.nix @@ -1,10 +1,11 @@ {lib, stdenv, fetchurl, unzip}: -stdenv.mkDerivation { - name = "pgfplots-1.5.1"; +stdenv.mkDerivation rec { + pname = "pgfplots"; + version = "1.5.1"; src = fetchurl { - url = "mirror://sourceforge/pgfplots/pgfplots_1.5.1.tds.zip"; + url = "mirror://sourceforge/pgfplots/pgfplots_${version}.tds.zip"; sha256 = "1xajrmq35i0qlsfwydy5zzg6f1jg88hqqh5b3xsmglzrarnllbdi"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/tetex/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/tetex/default.nix index 0f6bf5d0d55c..d15386417218 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/tetex/default.nix @@ -1,15 +1,16 @@ { lib, stdenv, fetchurl, flex, bison, zlib, libpng, ncurses, ed, automake }: -stdenv.mkDerivation { - name = "tetex-3.0"; +stdenv.mkDerivation rec { + pname = "tetex"; + version = "3.0"; src = fetchurl { - url = "http://mirrors.ctan.org/obsolete/systems/unix/teTeX/3.0/distrib/tetex-src-3.0.tar.gz"; + url = "http://mirrors.ctan.org/obsolete/systems/unix/teTeX/${version}/distrib/tetex-src-${version}.tar.gz"; sha256 = "16v44465ipd9yyqri9rgxp6rbgs194k4sh1kckvccvdsnnp7w3ww"; }; texmf = fetchurl { - url = "http://mirrors.ctan.org/obsolete/systems/unix/teTeX/3.0/distrib/tetex-texmf-3.0.tar.gz"; + url = "http://mirrors.ctan.org/obsolete/systems/unix/teTeX/${version}/distrib/tetex-texmf-${version}.tar.gz"; sha256 = "1hj06qvm02a2hx1a67igp45kxlbkczjlg20gr8lbp73l36k8yfvc"; }; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix index 05c1644c8c7d..9aa2cde0f3c9 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -103,7 +103,9 @@ core = stdenv.mkDerivation rec { installTargets = [ "install" "texlinks" ]; # TODO: perhaps improve texmf.cnf search locations - postInstall = /* a few texmf-dist files are useful; take the rest from pkgs */ '' + postInstall = /* links format -> engine will be regenerated in texlive.combine */ '' + PATH="$out/bin:$PATH" ${texlinks} --cnffile "$out/share/texmf-dist/web2c/fmtutil.cnf" --unlink "$out/bin" + '' + /* a few texmf-dist files are useful; take the rest from pkgs */ '' mv "$out/share/texmf-dist/web2c/texmf.cnf" . rm -r "$out/share/texmf-dist" mkdir -p "$out"/share/texmf-dist/{web2c,scripts/texlive/TeXLive} diff --git a/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix b/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix index e5f98df3f010..eef08eec0a1f 100644 --- a/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix @@ -11,24 +11,26 @@ }: let + sha256 = "08j7j9fpxh08vkczjqahb8r55bwks8p3ykrv6a2kfi309629nm96"; # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. - specVersion = "4.102.0"; + specVersion = "4.104.0"; + specSha256 = "0lbky0djqsndp33067q6yir5525m3zcgkpvf1z16mkspkixzadqs"; spec = fetchurl { url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; - sha256 = "16njk21gdk8r8a9v607ndw2rs0q6za9ylkgdxmix4j0zvrbrw0qv"; + sha256 = specSha256; }; in buildPythonApplication rec { pname = "linode-cli"; - version = "5.8.2"; + version = "5.9.0"; src = fetchFromGitHub { owner = "linode"; repo = pname; rev = version; - sha256 = "sha256-JlWbhElgRDeFMjtPPy7Sk69SMlpQYfnZ3AjAfl2SRyI="; + inherit sha256; }; # remove need for git history @@ -60,6 +62,8 @@ buildPythonApplication rec { installShellCompletion --cmd linode-cli --bash <($out/bin/linode-cli --skip-config completion bash) ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "The Linode Command Line Interface"; homepage = "https://github.com/linode/linode-cli"; diff --git a/nixpkgs/pkgs/tools/virtualization/linode-cli/update.sh b/nixpkgs/pkgs/tools/virtualization/linode-cli/update.sh new file mode 100755 index 000000000000..281d0e1df970 --- /dev/null +++ b/nixpkgs/pkgs/tools/virtualization/linode-cli/update.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnugrep gnused jq yq-go + +set -eu -o pipefail + +cd $(dirname "${BASH_SOURCE[0]}") + +SPEC_VERSION=$(curl -s https://www.linode.com/docs/api/openapi.yaml | yq eval '.info.version' -) + +SPEC_SHA256=$(nix-prefetch-url --quiet https://raw.githubusercontent.com/linode/linode-api-docs/v${SPEC_VERSION}/openapi.yaml) + +VERSION=$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/linode/linode-cli/tags" \ + | jq 'map(.name)' \ + | grep '"' \ + | sed 's/[ ",(^v)]//g' \ + | grep -v -e rc -e list \ + | cut -d '"' -f4 | sort -rV | head -n 1) + +SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/linode/linode-cli/archive/refs/tags/${VERSION}.tar.gz) + +setKV () { + sed -i "s/$1 = \".*\"/$1 = \"$2\"/" default.nix +} + +setKV specVersion ${SPEC_VERSION} +setKV specSha256 ${SPEC_SHA256} +setKV version ${VERSION} +setKV sha256 ${SHA256} diff --git a/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix b/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix index 7fe09aa6b426..6994cc25b384 100644 --- a/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "shipyard"; - version = "0.3.27"; + version = "0.3.30"; src = fetchFromGitHub { rev = "v${version}"; owner = "shipyard-run"; repo = pname; - sha256 = "sha256-VbcOoIMhY4FpfQbC2ESFaPoV9AS5DpGvid8jcQxLuEE="; + sha256 = "sha256-NaCG0oG9j1yoXOsfnQXFd+PdZfJTOdvYndFIftIAnxE="; }; vendorSha256 = "sha256-YClNdtnakJJOEytTbopTXeZy218N4vHP3tQLavLgPbg="; diff --git a/nixpkgs/pkgs/tools/wayland/cliphist/default.nix b/nixpkgs/pkgs/tools/wayland/cliphist/default.nix new file mode 100644 index 000000000000..44a870db387c --- /dev/null +++ b/nixpkgs/pkgs/tools/wayland/cliphist/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "cliphist"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "sentriz"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-CZW7dhOd7E74VNjnvhxvSSUZQtbkGi4uRUM9YQCuJZw="; + }; + + vendorSha256 = "sha256-UrKSDvskGwHjwkb/fjvaJZ8xXFD98BFeSJxwJpc8A+M="; + + meta = with lib; { + description = "Wayland clipboard manager"; + homepage = "https://github.com/sentriz/cliphist"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/nixpkgs/pkgs/tools/wayland/swaycwd/default.nix b/nixpkgs/pkgs/tools/wayland/swaycwd/default.nix index 36e223f8d4ca..401144f74d2a 100644 --- a/nixpkgs/pkgs/tools/wayland/swaycwd/default.nix +++ b/nixpkgs/pkgs/tools/wayland/swaycwd/default.nix @@ -1,8 +1,8 @@ -{ lib, nim, stdenv, fetchFromGitLab +{ lib, nimPackages, fetchFromGitLab , enableShells ? [ "bash" "zsh" "fish" "sh" "posh" ] }: -stdenv.mkDerivation { +nimPackages.buildNimPackage { name = "swaycwd"; version = "0.0.1"; @@ -13,27 +13,18 @@ stdenv.mkDerivation { hash = "sha256-MkyY3wWByQo0l0J28xKDfGtxfazVPRyZHCObl9Fszh4="; }; - configurePhase = '' - runHook preConfigure + preConfigure = '' { echo 'let enabledShells: seq[string] = @${builtins.toJSON enableShells}' echo 'export enabledShells' } > shells.nim - runHook postConfigure + cat << EOF > swaycwd.nimble + srcDir = "." + bin = "swaycwd" + EOF ''; - nativeBuildInputs = [ nim ]; - - buildPhase = '' - export HOME=$TMPDIR - nim c --opt:speed -d:release swaycwd.nim - ''; - - installPhase = '' - runHook preInstall - install -D -m555 -t $out/bin swaycwd - runHook postInstall - ''; + nimFlags = [ "--opt:speed" ]; meta = with lib; { homepage = "https://gitlab.com/cab404/swaycwd"; diff --git a/nixpkgs/pkgs/top-level/aliases.nix b/nixpkgs/pkgs/top-level/aliases.nix index 887137a4b83b..97182cb241dd 100644 --- a/nixpkgs/pkgs/top-level/aliases.nix +++ b/nixpkgs/pkgs/top-level/aliases.nix @@ -66,6 +66,8 @@ mapAliases ({ badtouch = authoscope; # Project was renamed, added 20210626 bar-xft = lemonbar-xft; # added 2015-01-16 bashCompletion = bash-completion; # Added 2016-09-28 + bash_5 = bash; # added 2021-08-20 + bashInteractive_5 = bashInteractive; # added 2021-08-20 batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 bazaar = throw "bazaar has been deprecated by breezy."; # added 2020-04-19 bazaarTools = throw "bazaar has been deprecated by breezy."; # added 2020-04-19 @@ -446,8 +448,41 @@ mapAliases ({ libwnck3 = libwnck; lilypond-unstable = lilypond; # added 2021-03-11 links = links2; # added 2016-01-31 - linux_rpi0 = linux_rpi1; - linuxPackages_rpi0 = linuxPackages_rpi1; + linux_rpi0 = linuxKernel.kernels.linux_rpi1; + linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; + linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4; + linuxPackages_rt_5_10 = linuxKernel.packages.linux_rt_5_10; + linuxPackages_rt_5_11 = linuxKernel.packages.linux_rt_5_11; + linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1; + linuxPackages_rpi2 = linuxKernel.packages.linux_rpi2; + linuxPackages_rpi3 = linuxKernel.packages.linux_rpi3; + linuxPackages_rpi4 = linuxKernel.packages.linux_rpi4; + linuxPackages_4_4 = linuxKernel.packages.linux_4_4; + linuxPackages_4_9 = linuxKernel.packages.linux_4_9; + linuxPackages_4_14 = linuxKernel.packages.linux_4_14; + linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14; + linuxPackages_4_19 = linuxKernel.packages.linux_4_19; + linuxPackages_5_4 = linuxKernel.packages.linux_5_4; + linuxPackages_5_10 = linuxKernel.packages.linux_5_10; + linuxPackages_5_13 = linuxKernel.packages.linux_5_13; + linuxPackages_5_14 = linuxKernel.packages.linux_5_14; + + linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95; + linux_rpi1 = linuxKernel.kernels.linux_rpi1; + linux_rpi2 = linuxKernel.kernels.linux_rpi2; + linux_rpi3 = linuxKernel.kernels.linux_rpi3; + linux_rpi4 = linuxKernel.kernels.linux_rpi4; + linux_4_4 = linuxKernel.kernels.linux_4_4; + linux_4_9 = linuxKernel.kernels.linux_4_9; + linux_4_14 = linuxKernel.kernels.linux_4_14; + linux_4_19 = linuxKernel.kernels.linux_4_19; + linux_5_4 = linuxKernel.kernels.linux_5_4; + linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4; + linux_5_10 = linuxKernel.kernels.linux_5_10; + linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10; + linux-rt_5_11 = linuxKernel.kernels.linux_rt_5_11; + linux_5_13 = linuxKernel.kernels.linux_5_13; + linux_5_14 = linuxKernel.kernels.linux_5_14; # added 2020-04-04 linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index c56550b68150..1e91561d1e0c 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -141,6 +141,8 @@ with pkgs; autoconf = autoconf269; }; + autorestic = callPackage ../tools/backup/autorestic { }; + autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; } ../build-support/setup-hooks/auto-patchelf.sh; @@ -165,6 +167,8 @@ with pkgs; alda = callPackage ../development/interpreters/alda { }; + align = callPackage ../tools/text/align { }; + althttpd = callPackage ../servers/althttpd { }; among-sus = callPackage ../games/among-sus { }; @@ -242,6 +246,8 @@ with pkgs; clj-kondo = callPackage ../development/tools/clj-kondo { }; + cloak = callPackage ../applications/misc/cloak { }; + cmark = callPackage ../development/libraries/cmark { }; cmark-gfm = callPackage ../development/libraries/cmark-gfm { }; @@ -447,10 +453,12 @@ with pkgs; fetchfossil = callPackage ../build-support/fetchfossil { }; - fetchgit = callPackage ../build-support/fetchgit { + fetchgit = (callPackage ../build-support/fetchgit { git = buildPackages.gitMinimal; cacert = buildPackages.cacert; git-lfs = buildPackages.git-lfs; + }) // { # fetchgit is a function, so we use // instead of passthru. + tests = callPackages ../build-support/fetchgit/tests.nix {}; }; fetchgitLocal = callPackage ../build-support/fetchgitlocal { }; @@ -502,7 +510,10 @@ with pkgs; fetchhg = callPackage ../build-support/fetchhg { }; - fetchFirefoxAddon = callPackage ../build-support/fetchfirefoxaddon {}; + fetchFirefoxAddon = callPackage ../build-support/fetchfirefoxaddon { } + // { + tests = callPackages ../build-support/fetchfirefoxaddon/tests.nix { }; + }; # `fetchurl' downloads a file from the network. fetchurl = if stdenv.buildPlatform != stdenv.hostPlatform @@ -600,6 +611,15 @@ with pkgs; installShellFiles = callPackage ../build-support/install-shell-files {}; + # See doc/builders/special/invalidateFetcherByDrvHash.section.md or + # https://nixos.org/manual/nixpkgs/unstable/#sec-pkgs-invalidateFetcherByDrvHash + invalidateFetcherByDrvHash = f: args: + let + drvPath = (f args).drvPath; + # It's safe to discard the context, because we don't access the path. + salt = builtins.unsafeDiscardStringContext (lib.substring 0 12 (baseNameOf drvPath)); + in f (args // { name = "${args.name or "source"}-salted-${salt}"; }); + lazydocker = callPackage ../tools/misc/lazydocker { }; ld-is-cc-hook = makeSetupHook { name = "ld-is-cc-hook"; } @@ -893,12 +913,16 @@ with pkgs; weidu = callPackage ../tools/games/weidu { }; + weylus = callPackage ../applications/graphics/weylus { }; + gfshare = callPackage ../tools/security/gfshare { }; gobgp = callPackage ../tools/networking/gobgp { }; gofu = callPackage ../applications/misc/gofu { }; + ksnip = libsForQt5.callPackage ../tools/misc/ksnip { }; + linux-router = callPackage ../tools/networking/linux-router { }; linux-router-without-wifi = linux-router.override { useWifiDependencies = false; }; @@ -960,6 +984,8 @@ with pkgs; inherit (lxqt) qtermwidget; }; + darktile = callPackage ../applications/terminal-emulators/darktile { }; + eterm = callPackage ../applications/terminal-emulators/eterm { }; evilvte = callPackage ../applications/terminal-emulators/evilvte (config.evilvte or {}); @@ -1096,6 +1122,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + amber-secret = callPackage ../tools/security/amber { + inherit (darwin.apple_sdk.frameworks) Security; + }; + inherit (callPackages ../development/tools/ammonite {}) ammonite_2_12 ammonite_2_13; @@ -2371,6 +2401,8 @@ with pkgs; chntpw = callPackage ../tools/security/chntpw { }; + cliphist = callPackage ../tools/wayland/cliphist { }; + clipman = callPackage ../tools/wayland/clipman { }; kanshi = callPackage ../tools/wayland/kanshi { }; @@ -2470,7 +2502,7 @@ with pkgs; csv2latex = callPackage ../tools/misc/csv2latex { }; - csvs-to-sqlite = with python3Packages; toPythonApplication csvs-to-sqlite; + csvs-to-sqlite = callPackage ../tools/misc/csvs-to-sqlite { }; cucumber = callPackage ../development/tools/cucumber {}; @@ -2771,6 +2803,8 @@ with pkgs; firestarter = callPackage ../applications/misc/firestarter { }; + fits-cloudctl = callPackage ../tools/admin/fits-cloudctl { }; + frangipanni = callPackage ../tools/text/frangipanni { }; fselect = callPackage ../tools/misc/fselect { }; @@ -2987,6 +3021,8 @@ with pkgs; inklecate = callPackage ../development/compilers/inklecate {}; + intensity-normalization = with python3Packages; toPythonApplication intensity-normalization; + interactsh = callPackage ../tools/misc/interactsh { }; interlock = callPackage ../servers/interlock {}; @@ -3222,7 +3258,7 @@ with pkgs; oci-cli = callPackage ../tools/admin/oci-cli { }; - ocrmypdf = callPackage ../tools/text/ocrmypdf { }; + ocrmypdf = with python3.pkgs; toPythonApplication ocrmypdf; ocrfeeder = callPackage ../applications/graphics/ocrfeeder { }; @@ -3303,6 +3339,8 @@ with pkgs; inherit (darwin) libiconv; }; + profetch = callPackage ../tools/misc/profetch { }; + psrecord = python3Packages.callPackage ../tools/misc/psrecord {}; reg = callPackage ../tools/virtualization/reg { }; @@ -3601,6 +3639,8 @@ with pkgs; biblatex-check = callPackage ../tools/typesetting/biblatex-check { }; + binlore = callPackage ../development/tools/analysis/binlore { }; + birdfont = callPackage ../tools/misc/birdfont { }; xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { stdenv = gccStdenv; }; @@ -3624,7 +3664,7 @@ with pkgs; bud = callPackage ../tools/networking/bud { }; - bump2version = python37Packages.callPackage ../applications/version-management/git-and-tools/bump2version { }; + bump2version = python3Packages.callPackage ../applications/version-management/git-and-tools/bump2version { }; bumpver = callPackage ../applications/version-management/bumpver { }; @@ -3972,6 +4012,11 @@ with pkgs; bluetooth_battery = python3Packages.callPackage ../applications/misc/bluetooth_battery { }; + calyx-vpn = libsForQt5.callPackage ../tools/networking/bitmask-vpn { + provider = "calyx"; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; + code-browser-qt = libsForQt5.callPackage ../applications/editors/code-browser { withQt = true; }; code-browser-gtk = callPackage ../applications/editors/code-browser { withGtk = true; @@ -4097,7 +4142,9 @@ with pkgs; cudatoolkit_11 cudatoolkit_11_0 cudatoolkit_11_1 - cudatoolkit_11_2; + cudatoolkit_11_2 + cudatoolkit_11_3 + cudatoolkit_11_4; cudatoolkit = cudatoolkit_10; @@ -4122,7 +4169,9 @@ with pkgs; cutensor_cudatoolkit_11 cutensor_cudatoolkit_11_0 cutensor_cudatoolkit_11_1 - cutensor_cudatoolkit_11_2; + cutensor_cudatoolkit_11_2 + cutensor_cudatoolkit_11_3 + cutensor_cudatoolkit_11_4; cutensor = cutensor_cudatoolkit_10; @@ -4132,11 +4181,12 @@ with pkgs; ldapSupport = true; }; - curl = curlMinimal.override { + curl = curlMinimal.override ({ idnSupport = true; + } // lib.optionalAttrs (!stdenv.hostPlatform.isStatic) { gssSupport = true; brotliSupport = true; - }; + }); curlMinimal = callPackage ../tools/networking/curl { }; @@ -4342,7 +4392,9 @@ with pkgs; dleyna-server = callPackage ../development/libraries/dleyna-server { }; - dmd = callPackage ../development/compilers/dmd { }; + dmd = callPackage ../development/compilers/dmd { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; dmg2img = callPackage ../tools/misc/dmg2img { }; @@ -4709,6 +4761,8 @@ with pkgs; endlessh = callPackage ../servers/endlessh { }; + ericw-tools = callPackage ../applications/misc/ericw-tools { }; + cryfs = callPackage ../tools/filesystems/cryfs { }; encfs = callPackage ../tools/filesystems/encfs { @@ -4779,7 +4833,7 @@ with pkgs; expect = callPackage ../tools/misc/expect { }; - expliot = python3Packages.callPackage ../tools/security/expliot { }; + expliot = callPackage ../tools/security/expliot { }; f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; @@ -4973,6 +5027,8 @@ with pkgs; fabric-installer = callPackage ../tools/games/minecraft/fabric-installer { }; + faraday-cli = callPackage ../tools/security/faraday-cli { }; + fastlane = callPackage ../tools/admin/fastlane { }; fatresize = callPackage ../tools/filesystems/fatresize {}; @@ -5485,6 +5541,8 @@ with pkgs; glab = callPackage ../applications/version-management/git-and-tools/glab { }; + glitter = callPackage ../applications/version-management/git-and-tools/glitter { }; + glusterfs = callPackage ../tools/filesystems/glusterfs { }; glmark2 = callPackage ../tools/graphics/glmark2 { }; @@ -6689,6 +6747,7 @@ with pkgs; meilisearch = callPackage ../servers/search/meilisearch { inherit (darwin.apple_sdk.frameworks) Security; + inherit pkgs; }; memtester = callPackage ../tools/system/memtester { }; @@ -7047,6 +7106,8 @@ with pkgs; ltris = callPackage ../games/ltris { }; + lunatic = callPackage ../development/interpreters/lunatic { }; + lv = callPackage ../tools/text/lv { }; lxc = callPackage ../os-specific/linux/lxc { @@ -7291,7 +7352,7 @@ with pkgs; mmixware = callPackage ../development/tools/mmixware { }; - modemmanager = callPackage ../tools/networking/modem-manager {}; + modemmanager = callPackage ../tools/networking/modemmanager {}; modem-manager-gui = callPackage ../applications/networking/modem-manager-gui {}; @@ -7564,6 +7625,8 @@ with pkgs; nomad-driver-podman = callPackage ../applications/networking/cluster/nomad-driver-podman { }; + nomino = callPackage ../tools/misc/nomino { }; + notable = callPackage ../applications/misc/notable { }; ntlmrecon = callPackage ../tools/security/ntlmrecon { }; @@ -7630,6 +7693,8 @@ with pkgs; npapi_sdk = callPackage ../development/libraries/npapi-sdk {}; + npiet = callPackage ../development/interpreters/npiet { }; + npth = callPackage ../development/libraries/npth {}; nmap = callPackage ../tools/security/nmap { }; @@ -7691,6 +7756,8 @@ with pkgs; nttcp = callPackage ../tools/networking/nttcp { }; + ntttcp = callPackage ../tools/networking/ntttcp { }; + nuttcp = callPackage ../tools/networking/nuttcp { }; nssmdns = callPackage ../tools/networking/nss-mdns { }; @@ -7906,6 +7973,8 @@ with pkgs; operator-sdk = callPackage ../development/tools/operator-sdk { }; + owncast = callPackage ../servers/owncast { }; + update-dotdee = with python3Packages; toPythonApplication update-dotdee; update-nix-fetchgit = haskell.lib.justStaticExecutables haskellPackages.update-nix-fetchgit; @@ -7969,7 +8038,7 @@ with pkgs; ovito = libsForQt5.callPackage ../applications/graphics/ovito { }; - owncloud-client = libsForQt514.callPackage ../applications/networking/owncloud-client { }; + owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { }; oxefmsynth = callPackage ../applications/audio/oxefmsynth { }; @@ -8007,6 +8076,8 @@ with pkgs; pamtester = callPackage ../tools/security/pamtester { }; + pantheon-tweaks = callPackage ../applications/system/pantheon-tweaks { }; + paperless-ng = callPackage ../applications/office/paperless-ng { }; paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { }; @@ -8057,6 +8128,8 @@ with pkgs; pick = callPackage ../tools/misc/pick { }; + pipe-rename = callPackage ../tools/misc/pipe-rename { }; + pitivi = callPackage ../applications/video/pitivi { }; prism = callPackage ../applications/video/prism { }; @@ -8343,6 +8416,8 @@ with pkgs; proxychains = callPackage ../tools/networking/proxychains { }; + proxychains-ng = callPackage ../tools/networking/proxychains-ng { }; + proxify = callPackage ../tools/networking/proxify { }; proxytunnel = callPackage ../tools/misc/proxytunnel { @@ -8445,6 +8520,11 @@ with pkgs; stdenv = gccStdenv; }; + riseup-vpn = libsForQt5.callPackage ../tools/networking/bitmask-vpn { + provider = "riseup"; + inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; + }; + rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; rtaudio = callPackage ../development/libraries/audio/rtaudio { @@ -8738,6 +8818,7 @@ with pkgs; rpm = callPackage ../tools/package-management/rpm { python = python3; + lua = lua5_4; }; rpm-ostree = callPackage ../tools/misc/rpm-ostree { @@ -8786,6 +8867,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + rust-code-analysis = callPackage ../development/tools/rust-code-analysis { }; + + rust-petname = callPackage ../tools/text/rust-petname { }; + rustscan = callPackage ../tools/security/rustscan { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -9053,7 +9138,7 @@ with pkgs; skippy-xd = callPackage ../tools/X11/skippy-xd {}; - sks = callPackage ../servers/sks { inherit (ocaml-ng.ocamlPackages_4_02) ocaml camlp4; }; + sks = callPackage ../servers/sks { }; skydns = callPackage ../servers/skydns { }; @@ -9143,6 +9228,8 @@ with pkgs; ssh-chat = callPackage ../applications/networking/instant-messengers/ssh-chat { }; + ssh-to-age = callPackage ../tools/security/ssh-to-age { }; + ssh-to-pgp = callPackage ../tools/security/ssh-to-pgp { }; suricata = callPackage ../applications/networking/ids/suricata { @@ -9708,6 +9795,10 @@ with pkgs; trebleshot = libsForQt5.callPackage ../applications/networking/trebleshot { }; + trenchbroom = libsForQt5.callPackage ../applications/misc/trenchbroom { + inherit (xorg) libXxf86vm; + }; + trickle = callPackage ../tools/networking/trickle {}; inherit (nodePackages) triton; @@ -10512,6 +10603,8 @@ with pkgs; yajsv = callPackage ../tools/misc/yajsv { }; + yallback = callPackage ../development/tools/analysis/yallback { }; + yapf = with python3Packages; toPythonApplication yapf; yarn = callPackage ../development/tools/yarn { }; @@ -10670,24 +10763,24 @@ with pkgs; any-nix-shell = callPackage ../shells/any-nix-shell { }; - bash = lowPrio (callPackage ../shells/bash/4.4.nix { + bash_4 = lowPrio (callPackage ../shells/bash/4.4.nix { binutils = stdenv.cc.bintools; }); - bash_5 = lowPrio (callPackage ../shells/bash/5.1.nix { + bash = lowPrio (callPackage ../shells/bash/5.1.nix { binutils = stdenv.cc.bintools; }); - bashInteractive_5 = lowPrio (callPackage ../shells/bash/5.1.nix { + # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed + bashInteractive = callPackage ../shells/bash/5.1.nix { binutils = stdenv.cc.bintools; interactive = true; withDocs = true; - }); + }; - # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed - bashInteractive = callPackage ../shells/bash/4.4.nix { + bashInteractive_4 = lowPrio (callPackage ../shells/bash/4.4.nix { binutils = stdenv.cc.bintools; interactive = true; withDocs = true; - }; + }); bash-completion = callPackage ../shells/bash/bash-completion { }; @@ -12150,6 +12243,7 @@ with pkgs; inherit (callPackages ../development/compilers/nim { }) nim-unwrapped nimble-unwrapped nim; + nimPackages = recurseIntoAttrs nim.pkgs; nrpl = callPackage ../development/tools/nrpl { }; @@ -12287,19 +12381,19 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; llvm_10 = llvmPackages_10.libllvm; }; - rust_1_53 = callPackage ../development/compilers/rust/1_53.nix { + rust_1_55 = callPackage ../development/compilers/rust/1_55.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; llvm_12 = llvmPackages_12.libllvm; }; - rust = rust_1_53; + rust = rust_1_55; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { }; rustPackages_1_45 = rust_1_45.packages.stable; - rustPackages_1_53 = rust_1_53.packages.stable; - rustPackages = rustPackages_1_53; + rustPackages_1_55 = rust_1_55.packages.stable; + rustPackages = rustPackages_1_55; inherit (rustPackages) cargo clippy rustc rustPlatform; @@ -12323,6 +12417,7 @@ with pkgs; defaultCrateOverrides = callPackage ../build-support/rust/default-crate-overrides.nix { }; cargo-about = callPackage ../tools/package-management/cargo-about { }; + cargo-all-features = callPackage ../development/tools/rust/cargo-all-features { }; cargo-audit = callPackage ../tools/package-management/cargo-audit { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -12334,6 +12429,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; cargo-criterion = callPackage ../development/tools/rust/cargo-criterion { }; + cargo-deadlinks = callPackage ../development/tools/rust/cargo-deadlinks { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-deb = callPackage ../tools/package-management/cargo-deb { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -12345,6 +12443,7 @@ with pkgs; cargo-kcov = callPackage ../tools/package-management/cargo-kcov { }; cargo-graph = callPackage ../tools/package-management/cargo-graph { }; cargo-license = callPackage ../tools/package-management/cargo-license { }; + cargo-llvm-lines = callPackage ../development/tools/rust/cargo-llvm-lines { }; cargo-outdated = callPackage ../tools/package-management/cargo-outdated {}; cargo-release = callPackage ../tools/package-management/cargo-release { inherit (darwin.apple_sdk.frameworks) Security; @@ -12372,6 +12471,10 @@ with pkgs; cargo-deny = callPackage ../development/tools/rust/cargo-deny { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-dephell = callPackage ../development/tools/rust/cargo-dephell { + inherit (darwin.apple_sdk.frameworks) Security; + }; + cargo-diet = callPackage ../development/tools/rust/cargo-diet { }; cargo-embed = callPackage ../development/tools/rust/cargo-embed { inherit (darwin.apple_sdk.frameworks) AppKit; }; @@ -12406,8 +12509,15 @@ with pkgs; }; cargo-readme = callPackage ../development/tools/rust/cargo-readme {}; cargo-sort = callPackage ../development/tools/rust/cargo-sort { }; + cargo-spellcheck = callPackage ../development/tools/rust/cargo-spellcheck { }; + cargo-supply-chain = callPackage ../development/tools/rust/cargo-supply-chain { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; cargo-sync-readme = callPackage ../development/tools/rust/cargo-sync-readme {}; + cargo-tally = callPackage ../development/tools/rust/cargo-tally { + inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit; + }; cargo-udeps = callPackage ../development/tools/rust/cargo-udeps { inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; @@ -12434,7 +12544,11 @@ with pkgs; maturin = callPackage ../development/tools/rust/maturin { inherit (darwin.apple_sdk.frameworks) Security; }; + panamax = callPackage ../development/tools/rust/panamax { + inherit (darwin.apple_sdk.frameworks) Security; + }; + rhack = callPackage ../development/tools/rust/rhack { }; inherit (rustPackages) rls; rustfmt = rustPackages.rustfmt; rustracer = callPackage ../development/tools/rust/racer { @@ -12451,6 +12565,7 @@ with pkgs; rust-cbindgen = callPackage ../development/tools/rust/cbindgen { inherit (darwin.apple_sdk.frameworks) Security; }; + rust-script = callPackage ../development/tools/rust/rust-script { }; rustup = callPackage ../development/tools/rust/rustup { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; @@ -13043,7 +13158,7 @@ with pkgs; pipewire = callPackage ../development/libraries/pipewire {}; pipewire_0_2 = callPackage ../development/libraries/pipewire/0.2.nix {}; - pyradio = callPackage ../applications/radio/pyradio {}; + pyradio = callPackage ../applications/audio/pyradio {}; pyrex = pyrex095; @@ -13151,7 +13266,10 @@ with pkgs; self = pkgsi686Linux.callPackage ../development/interpreters/self { }; - spark = callPackage ../applications/networking/cluster/spark { }; + inherit (callPackages ../applications/networking/cluster/spark { hadoop = hadoop_3_1; }) + spark3 + spark2; + spark = spark3; sparkleshare = callPackage ../applications/version-management/sparkleshare { }; @@ -13311,6 +13429,8 @@ with pkgs; abi-dumper = callPackage ../development/tools/misc/abi-dumper { }; + abuild = callPackage ../development/tools/abuild { }; + adtool = callPackage ../tools/admin/adtool { }; inherit (callPackage ../development/tools/alloy { @@ -13725,10 +13845,15 @@ with pkgs; cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { }; - cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { }; + cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { + inherit (darwin.apple_sdk.frameworks) SystemConfiguration; + }; cmakeMinimal = libsForQt5.callPackage ../development/tools/build-managers/cmake { isBootstrap = true; + # There is no SystemConfiguration in bootstrapTools, so this version gets + # patched to remove that dependency. + SystemConfiguration = null; }; cmakeCurses = cmake.override { useNcurses = true; }; @@ -13778,6 +13903,8 @@ with pkgs; css-html-js-minify = with python3Packages; toPythonApplication css-html-js-minify; + cvehound = callPackage ../development/tools/analysis/cvehound { }; + cvise = python3Packages.callPackage ../development/tools/misc/cvise { inherit (llvmPackages_11) llvm libclang; }; @@ -13984,6 +14111,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) IOKit; }; + fundoc = callPackage ../development/tools/fundoc { }; + funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; gede = libsForQt5.callPackage ../development/tools/misc/gede { }; @@ -14496,6 +14625,8 @@ with pkgs; pup = callPackage ../development/tools/pup { }; + puppet-bolt = callPackage ../tools/admin/puppet/puppet-bolt { }; + puppet-lint = callPackage ../development/tools/puppet/puppet-lint { }; puppeteer-cli = callPackage ../tools/graphics/puppeteer-cli {}; @@ -14752,12 +14883,16 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + taoup = callPackage ../tools/misc/taoup { }; + tcptrack = callPackage ../development/tools/misc/tcptrack { }; teensyduino = arduino-core.override { withGui = true; withTeensyduino = true; }; teensy-loader-cli = callPackage ../development/embedded/teensy-loader-cli { }; + tytools = libsForQt5.callPackage ../development/embedded/tytools { }; + terracognita = callPackage ../development/tools/misc/terracognita { }; terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; @@ -14772,6 +14907,7 @@ with pkgs; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; texinfo6_5 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; # needed for allegro texinfo6 = callPackage ../development/tools/misc/texinfo/6.7.nix { }; + texinfo6_8 = callPackage ../development/tools/misc/texinfo/6.8.nix { }; texinfo = texinfo6; texinfoInteractive = appendToName "interactive" ( texinfo.override { interactive = true; } @@ -14862,9 +14998,7 @@ with pkgs; vultr-cli = callPackage ../development/tools/vultr-cli { }; - vulnix = callPackage ../tools/security/vulnix { - python3Packages = python37Packages; - }; + vulnix = callPackage ../tools/security/vulnix { }; vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { }; @@ -15124,20 +15258,23 @@ with pkgs; boolstuff = callPackage ../development/libraries/boolstuff { }; - boost155 = callPackage ../development/libraries/boost/1.55.nix { }; - boost159 = callPackage ../development/libraries/boost/1.59.nix { }; + inherit (callPackage ../development/libraries/boost { inherit (buildPackages) boost-build; }) + boost155 + boost159 + boost160 + boost165 + boost166 + boost168 + boost169 + boost170 + boost172 + boost173 + boost174 + boost175 + ; + boost15x = boost159; - boost160 = callPackage ../development/libraries/boost/1.60.nix { }; - boost165 = callPackage ../development/libraries/boost/1.65.nix { }; - boost166 = callPackage ../development/libraries/boost/1.66.nix { }; - boost168 = callPackage ../development/libraries/boost/1.68.nix { }; - boost169 = callPackage ../development/libraries/boost/1.69.nix { }; boost16x = boost169; - boost170 = callPackage ../development/libraries/boost/1.70.nix { }; - boost172 = callPackage ../development/libraries/boost/1.72.nix { }; - boost173 = callPackage ../development/libraries/boost/1.73.nix { }; - boost174 = callPackage ../development/libraries/boost/1.74.nix { }; - boost175 = callPackage ../development/libraries/boost/1.75.nix { }; boost17x = boost175; boost = boost16x; @@ -17006,7 +17143,7 @@ with pkgs; libf2c = callPackage ../development/libraries/libf2c {}; - libfabric = callPackage ../os-specific/linux/libfabric {}; + libfabric = callPackage ../development/libraries/libfabric {}; libfive = libsForQt5.callPackage ../development/libraries/libfive { }; @@ -17121,7 +17258,9 @@ with pkgs; libliftoff = callPackage ../development/libraries/libliftoff { }; - liblqr1 = callPackage ../development/libraries/liblqr-1 { }; + liblqr1 = callPackage ../development/libraries/liblqr-1 { + inherit (darwin.apple_sdk.frameworks) Carbon; + }; liblockfile = callPackage ../development/libraries/liblockfile { }; @@ -17546,6 +17685,8 @@ with pkgs; libssh = callPackage ../development/libraries/libssh { }; libssh2 = callPackage ../development/libraries/libssh2 { }; + #FIXME: temporary attribute + libssh2_1_10 = callPackage ../development/libraries/libssh2/1_10.nix { }; libstartup_notification = callPackage ../development/libraries/startup-notification { }; @@ -17907,6 +18048,16 @@ with pkgs; mediastreamer-openh264 = callPackage ../development/libraries/mediastreamer/msopenh264.nix { }; + memorymapping = callPackage ../development/libraries/memorymapping { }; + memorymappingHook = makeSetupHook { + deps = [ memorymapping ]; + } ../development/libraries/memorymapping/setup-hook.sh; + + memstream = callPackage ../development/libraries/memstream { }; + memstreamHook = makeSetupHook { + deps = [ memstream ]; + } ../development/libraries/memstream/setup-hook.sh; + menu-cache = callPackage ../development/libraries/menu-cache { }; mergerfs = callPackage ../tools/filesystems/mergerfs { }; @@ -18438,8 +18589,9 @@ with pkgs; python = python37; }; - protobuf = protobuf3_17; + protobuf = protobuf3_18; + protobuf3_18 = callPackage ../development/libraries/protobuf/3.18.nix { }; protobuf3_17 = callPackage ../development/libraries/protobuf/3.17.nix { }; protobuf3_16 = callPackage ../development/libraries/protobuf/3.16.nix { }; protobuf3_15 = callPackage ../development/libraries/protobuf/3.15.nix { }; @@ -18981,9 +19133,7 @@ with pkgs; srt = callPackage ../development/libraries/srt { }; - srtp = callPackage ../development/libraries/srtp { - libpcap = if stdenv.isLinux then libpcap else null; - }; + srtp = callPackage ../development/libraries/srtp { }; stb = callPackage ../development/libraries/stb { }; @@ -19513,6 +19663,8 @@ with pkgs; yubikey-agent = callPackage ../tools/security/yubikey-agent { }; + yubikey-touch-detector = callPackage ../tools/security/yubikey-touch-detector { }; + zchunk = callPackage ../development/libraries/zchunk { }; zeitgeist = callPackage ../development/libraries/zeitgeist { }; @@ -19572,6 +19724,10 @@ with pkgs; }; agda = agdaPackages.agda; + ### DEVELOPMENT / LIBRARIES / BASH + + bash-preexec = callPackage ../development/libraries/bash/bash-preexec { }; + ### DEVELOPMENT / LIBRARIES / JAVA commonsBcel = callPackage ../development/libraries/java/commons/bcel { }; @@ -19869,11 +20025,11 @@ with pkgs; cassandra = cassandra_3_11; apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix { - java = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + java = jre; }; apache-jena-fuseki = callPackage ../servers/nosql/apache-jena/fuseki-binary.nix { - java = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + java = jre; }; apcupsd = callPackage ../servers/apcupsd { }; @@ -20131,10 +20287,12 @@ with pkgs; leafnode = callPackage ../servers/news/leafnode { }; - lemmy = callPackage ../servers/web-apps/lemmy { + lemmy-server = callPackage ../servers/web-apps/lemmy/server.nix { inherit (darwin.apple_sdk.frameworks) Security; }; + lemmy-ui = callPackage ../servers/web-apps/lemmy/ui.nix { }; + lighttpd = callPackage ../servers/http/lighttpd { }; livepeer = callPackage ../servers/livepeer { }; @@ -20422,10 +20580,12 @@ with pkgs; rpcsvc-proto = callPackage ../tools/misc/rpcsvc-proto { }; - libmysqlclient = libmysqlclient_3_1; + libmysqlclient = libmysqlclient_3_2; libmysqlclient_3_1 = mariadb-connector-c_3_1; - mariadb-connector-c = mariadb-connector-c_3_1; + libmysqlclient_3_2 = mariadb-connector-c_3_2; + mariadb-connector-c = mariadb-connector-c_3_2; mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { }; + mariadb-connector-c_3_2 = callPackage ../servers/sql/mariadb/connector-c/3_2.nix { }; mariadb-galera = callPackage ../servers/sql/mariadb/galera { asio = asio_1_10; @@ -21095,6 +21255,10 @@ with pkgs; cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; + cpupower-gui = python3Packages.callPackage ../os-specific/linux/cpupower-gui { + inherit (pkgs) meson; + }; + cpuset = callPackage ../os-specific/linux/cpuset { pythonPackages = python3Packages; }; @@ -21237,6 +21401,10 @@ with pkgs; inherit (darwin) IOKit; }; + btop = callPackage ../tools/system/btop { + stdenv = gcc11Stdenv; + }; + nmon = callPackage ../os-specific/linux/nmon { }; hwdata = callPackage ../os-specific/linux/hwdata { }; @@ -21353,463 +21521,31 @@ with pkgs; tgt = callPackage ../tools/networking/tgt { }; - # -- Linux kernel expressions ------------------------------------------------ - lkl = callPackage ../applications/virtualization/lkl { }; inherit (callPackages ../os-specific/linux/kernel-headers { }) linuxHeaders makeLinuxHeaders; - kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; - klibc = callPackage ../os-specific/linux/klibc { }; klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { }); - linux_mptcp = linux_mptcp_95; - - linux_mptcp_95 = callPackage ../os-specific/linux/kernel/linux-mptcp-95.nix { - kernelPatches = linux_4_19.kernelPatches; - }; - - linux_rpi1 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { - kernelPatches = with kernelPatches; [ - bridge_stp_helper - request_key_helper - ]; - rpiVersion = 1; - }; - - linux_rpi2 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { - kernelPatches = with kernelPatches; [ - bridge_stp_helper - request_key_helper - ]; - rpiVersion = 2; - }; - - linux_rpi3 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { - kernelPatches = with kernelPatches; [ - bridge_stp_helper - request_key_helper - ]; - rpiVersion = 3; - }; - - linux_rpi4 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { - kernelPatches = with kernelPatches; [ - bridge_stp_helper - request_key_helper - ]; - rpiVersion = 4; - }; - - linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper_updated - kernelPatches.cpu-cgroup-v2."4.4" - kernelPatches.modinst_arg_list_too_long - ]; - }; - - linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper_updated - kernelPatches.cpu-cgroup-v2."4.9" - kernelPatches.modinst_arg_list_too_long - ]; - }; - - linux_4_14 = callPackage ../os-specific/linux/kernel/linux-4.14.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md - # when adding a new linux version - kernelPatches.cpu-cgroup-v2."4.11" - kernelPatches.modinst_arg_list_too_long - ]; - }; - - linux_4_19 = callPackage ../os-specific/linux/kernel/linux-4.19.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.modinst_arg_list_too_long - ]; - }; - - linux_5_4 = callPackage ../os-specific/linux/kernel/linux-5.4.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.rtl8761b_support - ]; - }; - - linux-rt_5_4 = callPackage ../os-specific/linux/kernel/linux-rt-5.4.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - linux_5_10 = callPackage ../os-specific/linux/kernel/linux-5.10.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - linux_5_13 = callPackage ../os-specific/linux/kernel/linux-5.13.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - linux_5_14 = callPackage ../os-specific/linux/kernel/linux-5.14.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - linux-rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.export-rt-sched-migrate - ]; - }; - - linux-rt_5_11 = callPackage ../os-specific/linux/kernel/linux-rt-5.11.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.export-rt-sched-migrate - ]; - }; - - linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec { - kernel = linux_5_13; - kernelPatches = kernel.kernelPatches; - }; - - linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - kernelPatches.modinst_arg_list_too_long - ]; - }; - - linux_zen = callPackage ../os-specific/linux/kernel/linux-zen.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - linux_lqx = callPackage ../os-specific/linux/kernel/linux-lqx.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - linux_xanmod = callPackage ../os-specific/linux/kernel/linux-xanmod.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - - /* Linux kernel modules are inherently tied to a specific kernel. So - rather than provide specific instances of those packages for a - specific kernel, we have a function that builds those packages - for a specific kernel. This function can then be called for - whatever kernel you're using. */ - - linuxPackagesFor = kernel_: lib.makeExtensible (self: with self; { - callPackage = newScope self; - - kernel = kernel_; - inherit (kernel) stdenv; # in particular, use the same compiler by default + linuxKernel = recurseIntoAttrs (callPackage ./linux-kernels.nix { }); - # to help determine module compatibility - inherit (kernel) isZen isHardened isLibre; - inherit (kernel) kernelOlder kernelAtLeast; + inherit (linuxKernel) buildLinux linuxConfig kernelPatches; - # Obsolete aliases (these packages do not depend on the kernel). - inherit (pkgs) odp-dpdk pktgen; # added 2018-05 + linuxPackagesFor = linuxKernel.packagesFor; - acpi_call = callPackage ../os-specific/linux/acpi-call {}; + hardenedLinuxPackagesFor = linuxKernel.hardenedPackagesFor; - akvcam = callPackage ../os-specific/linux/akvcam { }; + linuxManualConfig = linuxKernel.manualConfig; - amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { }; - - anbox = callPackage ../os-specific/linux/anbox/kmod.nix { }; - - apfs = callPackage ../os-specific/linux/apfs { }; - - batman_adv = callPackage ../os-specific/linux/batman-adv {}; - - bcc = callPackage ../os-specific/linux/bcc { - python = python3; - }; - - bpftrace = callPackage ../os-specific/linux/bpftrace { }; - - bbswitch = callPackage ../os-specific/linux/bbswitch {}; - - chipsec = callPackage ../tools/security/chipsec { - inherit kernel; - withDriver = true; - }; - - cryptodev = callPackage ../os-specific/linux/cryptodev { }; - - cpupower = callPackage ../os-specific/linux/cpupower { }; - - ddcci-driver = callPackage ../os-specific/linux/ddcci { }; - - digimend = callPackage ../os-specific/linux/digimend { }; - - dpdk-kmods = callPackage ../os-specific/linux/dpdk-kmods { }; - - exfat-nofuse = callPackage ../os-specific/linux/exfat { }; - - evdi = callPackage ../os-specific/linux/evdi { }; - - fwts-efi-runtime = callPackage ../os-specific/linux/fwts/module.nix { }; - - gcadapter-oc-kmod = callPackage ../os-specific/linux/gcadapter-oc-kmod { }; - - hid-nintendo = callPackage ../os-specific/linux/hid-nintendo { }; - - hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { }; - - e1000e = if lib.versionOlder kernel.version "4.10" then callPackage ../os-specific/linux/e1000e {} else null; - - intel-speed-select = if lib.versionAtLeast kernel.version "5.3" then callPackage ../os-specific/linux/intel-speed-select { } else null; - - ixgbevf = callPackage ../os-specific/linux/ixgbevf {}; - - it87 = callPackage ../os-specific/linux/it87 {}; - - asus-wmi-sensors = callPackage ../os-specific/linux/asus-wmi-sensors {}; - - ena = callPackage ../os-specific/linux/ena {}; - - v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { }; - - lttng-modules = callPackage ../os-specific/linux/lttng-modules { }; - - broadcom_sta = callPackage ../os-specific/linux/broadcom-sta { }; - - tbs = callPackage ../os-specific/linux/tbs { }; - - mbp2018-bridge-drv = callPackage ../os-specific/linux/mbp-modules/mbp2018-bridge-drv { }; - - nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; - - nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { }); - - nvidia_x11_legacy340 = nvidiaPackages.legacy_340; - nvidia_x11_legacy390 = nvidiaPackages.legacy_390; - nvidia_x11_beta = nvidiaPackages.beta; - nvidia_x11_vulkan_beta = nvidiaPackages.vulkan_beta; - nvidia_x11 = nvidiaPackages.stable; - - openrazer = callPackage ../os-specific/linux/openrazer/driver.nix { }; - - ply = callPackage ../os-specific/linux/ply { }; - - r8125 = callPackage ../os-specific/linux/r8125 { }; - - r8168 = callPackage ../os-specific/linux/r8168 { }; - - rtl8188eus-aircrack = callPackage ../os-specific/linux/rtl8188eus-aircrack { }; - - rtl8192eu = callPackage ../os-specific/linux/rtl8192eu { }; - - rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { }; - - rtl8812au = callPackage ../os-specific/linux/rtl8812au { }; - - rtl8814au = callPackage ../os-specific/linux/rtl8814au { }; - - rtl88xxau-aircrack = callPackage ../os-specific/linux/rtl88xxau-aircrack { }; - - rtl8821au = callPackage ../os-specific/linux/rtl8821au { }; - - rtl8821ce = callPackage ../os-specific/linux/rtl8821ce { }; - - rtl88x2bu = callPackage ../os-specific/linux/rtl88x2bu { }; - - rtl8821cu = callPackage ../os-specific/linux/rtl8821cu { }; - - rtw88 = callPackage ../os-specific/linux/rtw88 { }; - rtlwifi_new = rtw88; - - rtw89 = callPackage ../os-specific/linux/rtw89 { }; - - openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { }; - openafs_1_9 = callPackage ../servers/openafs/1.9/module.nix { }; - # Current stable release; don't backport release updates! - openafs = openafs_1_8; - - facetimehd = callPackage ../os-specific/linux/facetimehd { }; - - tuxedo-keyboard = if lib.versionAtLeast kernel.version "4.14" then callPackage ../os-specific/linux/tuxedo-keyboard { } else null; - - jool = callPackage ../os-specific/linux/jool { }; - - kvmfr = callPackage ../os-specific/linux/kvmfr { }; - - mba6x_bl = callPackage ../os-specific/linux/mba6x_bl { }; - - mwprocapture = callPackage ../os-specific/linux/mwprocapture { }; - - mxu11x0 = callPackage ../os-specific/linux/mxu11x0 { }; - - # compiles but has to be integrated into the kernel somehow - # Let's have it uncommented and finish it.. - ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { }; - - netatop = callPackage ../os-specific/linux/netatop { }; - - oci-seccomp-bpf-hook = if lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/oci-seccomp-bpf-hook { } else null; - - perf = if lib.versionAtLeast kernel.version "3.12" then callPackage ../os-specific/linux/kernel/perf.nix { } else null; - - phc-intel = if lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; - - # Disable for kernels 4.15 and above due to compatibility issues - prl-tools = if lib.versionOlder kernel.version "4.15" then callPackage ../os-specific/linux/prl-tools { } else null; - - 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 { }; - - system76 = callPackage ../os-specific/linux/system76 { }; - - system76-acpi = callPackage ../os-specific/linux/system76-acpi { }; - - system76-power = callPackage ../os-specific/linux/system76-power { }; - - system76-io = callPackage ../os-specific/linux/system76-io { }; - - tmon = callPackage ../os-specific/linux/tmon { }; - - tp_smapi = callPackage ../os-specific/linux/tp_smapi { }; - - turbostat = callPackage ../os-specific/linux/turbostat { }; - - usbip = callPackage ../os-specific/linux/usbip { }; - - v86d = callPackage ../os-specific/linux/v86d { }; - - veikk-linux-driver = callPackage ../os-specific/linux/veikk-linux-driver { }; - - vendor-reset = callPackage ../os-specific/linux/vendor-reset { }; - - vhba = callPackage ../misc/emulators/cdemu/vhba.nix { }; - - virtualbox = callPackage ../os-specific/linux/virtualbox { - virtualbox = pkgs.virtualboxHardened; - }; - - virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { - virtualbox = pkgs.virtualboxHardened; - }; - - wireguard = if lib.versionOlder kernel.version "5.6" then callPackage ../os-specific/linux/wireguard { } else null; - - x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { }; - - xmm7360-pci = callPackage ../os-specific/linux/xmm7360-pci { }; - - xpadneo = callPackage ../os-specific/linux/xpadneo { }; - - zenpower = callPackage ../os-specific/linux/zenpower { }; - - inherit (callPackages ../os-specific/linux/zfs { - configFile = "kernel"; - inherit kernel; - }) zfsStable zfsUnstable; - zfs = zfsStable; - - can-isotp = callPackage ../os-specific/linux/can-isotp { }; - } // lib.optionalAttrs (config.allowAliases or false) { - # aliases or removed packages - ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18 - }); - - # The current default kernel / kernel modules. - linuxPackages = linuxPackages_5_10; - linux = linuxPackages.kernel; - - # Update this when adding the newest kernel major version! - # And update linux_latest_for_hardened below if the patches are already available - linuxPackages_latest = linuxPackages_5_14; - linux_latest = linuxPackages_latest.kernel; - - # Realtime kernel packages. - linuxPackages-rt_5_4 = linuxPackagesFor pkgs.linux-rt_5_4; - linuxPackages-rt_5_10 = linuxPackagesFor pkgs.linux-rt_5_10; - linuxPackages-rt_5_11 = linuxPackagesFor pkgs.linux-rt_5_11; - linuxPackages-rt = linuxPackages-rt_5_4; - linuxPackages-rt_latest = linuxPackages-rt_5_11; - linux-rt = linuxPackages-rt.kernel; - linux-rt_latest = linuxPackages-rt_latest.kernel; - - linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; - linuxPackages_rpi1 = linuxPackagesFor pkgs.linux_rpi1; - linuxPackages_rpi2 = linuxPackagesFor pkgs.linux_rpi2; - linuxPackages_rpi3 = linuxPackagesFor pkgs.linux_rpi3; - linuxPackages_rpi4 = linuxPackagesFor pkgs.linux_rpi4; - # Build kernel modules for some of the kernels. - linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); - linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); - linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); - linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); - linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); - linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10); - linuxPackages_5_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_13); - linuxPackages_5_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_14); - - # When adding to the list above: - # - Update linuxPackages_latest to the latest version - # - Update the rev in ../os-specific/linux/kernel/linux-libre.nix to the latest one. - - # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. - linuxPackages_testing = linuxPackagesFor pkgs.linux_testing; - - linuxPackages_custom = { version, src, configfile, allowImportFromDerivation ? true }: - recurseIntoAttrs (linuxPackagesFor (pkgs.linuxManualConfig { - inherit version src configfile lib stdenv allowImportFromDerivation; - })); + linuxPackages_custom = linuxKernel.customPackage; # This serves as a test for linuxPackages_custom linuxPackages_custom_tinyconfig_kernel = let base = pkgs.linuxPackages.kernel; - tinyLinuxPackages = pkgs.linuxPackages_custom { + tinyLinuxPackages = linuxKernel.customPackage { inherit (base) version src; allowImportFromDerivation = false; configfile = pkgs.linuxConfig { @@ -21819,92 +21555,64 @@ with pkgs; }; in tinyLinuxPackages.kernel; - # Build a kernel with bcachefs module - linuxPackages_testing_bcachefs = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing_bcachefs); - - # Hardened Linux - hardenedLinuxPackagesFor = kernel: overrides: - linuxPackagesFor (kernel.override { - structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { - inherit lib; - inherit (kernel) version; - }; - kernelPatches = kernel.kernelPatches ++ [ - kernelPatches.hardened.${kernel.meta.branch} - ]; - modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra; - isHardened = true; - }); + # The current default kernel / kernel modules. + linuxPackages = linuxKernel.packageAliases.linux_default; + linux = linuxPackages.kernel; - linuxPackages_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux { }); - linux_hardened = linuxPackages_hardened.kernel; + linuxPackages_latest = linuxKernel.packageAliases.linux_latest; + linux_latest = linuxPackages_latest.kernel; - linuxPackages_4_14_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_4_14 { }); - linux_4_14_hardened = linuxPackages_4_14_hardened.kernel; + # Testing (rc) kernel + linuxPackages_testing = linuxKernel.packages.linux_testing; + linux_testing = linuxKernel.kernels.linux_testing; - linuxPackages_4_19_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_4_19 { }); - linux_4_19_hardened = linuxPackages_4_19_hardened.kernel; + linuxPackages_testing_bcachefs = linuxKernel.packages.linux_testing_bcachefs; + linux_testing_bcachefs = linuxKernel.kernels.linux_testing_bcachefs; - linuxPackages_5_4_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_5_4 { }); - linux_5_4_hardened = linuxPackages_5_4_hardened.kernel; + # kernel with mtcp support + linuxPackages_mptcp = linuxKernel.packageAliases.linux_mptcp; + linux_mptcp = linuxPackages_mptcp.kernel; - linuxPackages_5_10_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_5_10 { }); - linux_5_10_hardened = linuxPackages_5_10_hardened.kernel; + # Realtime kernel + linuxPackages-rt = linuxKernel.packageAliases.linux_rt_default; + linuxPackages-rt_latest = linuxKernel.packageAliases.linux_rt_latest; + linux-rt = linuxPackages-rt.kernel; + linux-rt_latest = linuxPackages-rt_latest.kernel; - linuxPackages_5_13_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_5_13 { }); - linux_5_13_hardened = linuxPackages_5_13_hardened.kernel; + # hardened kernels + linuxPackages_hardened = linuxKernel.packages.linux_hardened; + linux_hardened = linuxPackages_hardened.kernel; + linuxPackages_4_14_hardened = linuxKernel.packages.linux_4_14_hardened; + linux_4_14_hardened = linuxPackages_4_14_hardened.kernel; + linuxPackages_4_19_hardened = linuxKernel.packages.linux_4_19_hardened; + linux_4_19_hardened = linuxPackages_4_19_hardened.kernel; + linuxPackages_5_4_hardened = linuxKernel.packages.linux_5_4_hardened; + linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened; + linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened; + linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened; + linuxPackages_5_13_hardened = linuxKernel.packages.linux_5_13_hardened; + linux_5_13_hardened = linuxKernel.kernels.linux_5_13_hardened; + linuxPackages_5_14_hardened = linuxKernel.packages.linux_5_14_hardened; + linux_5_14_hardened = linuxKernel.kernels.linux_5_14_hardened; # Hardkernel (Odroid) kernels. - linuxPackages_hardkernel_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_hardkernel_4_14); - linuxPackages_hardkernel_latest = linuxPackages_hardkernel_4_14; + linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest; linux_hardkernel_latest = linuxPackages_hardkernel_latest.kernel; # GNU Linux-libre kernels - linuxPackages-libre = recurseIntoAttrs (linuxPackagesFor linux-libre); - linux-libre = callPackage ../os-specific/linux/kernel/linux-libre.nix {}; - linuxPackages_latest-libre = recurseIntoAttrs (linuxPackagesFor linux_latest-libre); - linux_latest-libre = linux-libre.override { linux = linux_latest; }; + linuxPackages-libre = linuxKernel.packages.linux_libre; + linux-libre = linuxPackages-libre.kernel; + linuxPackages_latest-libre = linuxKernel.packages.linux_latest_libre; + linux_latest-libre = linuxPackages_latest-libre.kernel; # zen-kernel - linuxPackages_zen = recurseIntoAttrs (linuxPackagesFor pkgs.linux_zen); - linuxPackages_lqx = recurseIntoAttrs (linuxPackagesFor pkgs.linux_lqx); + linuxPackages_zen = linuxKernel.packages.linux_zen; + linuxPackages_lqx = linuxKernel.packages.linux_lqx; # XanMod kernel - linuxPackages_xanmod = recurseIntoAttrs (linuxPackagesFor pkgs.linux_xanmod); - - # A function to build a manually-configured kernel - linuxManualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); - - # Derive one of the default .config files - linuxConfig = { - src, - version ? (builtins.parseDrvName src.name).version, - makeTarget ? "defconfig", - name ? "kernel.config", - }: stdenvNoCC.mkDerivation { - inherit name src; - depsBuildBuild = [ buildPackages.stdenv.cc ] - ++ lib.optionals (lib.versionAtLeast version "4.16") [ buildPackages.bison buildPackages.flex ]; - postPatch = '' - patchShebangs scripts/ - ''; - buildPhase = '' - ( - set -x - make \ - ARCH=${stdenv.hostPlatform.linuxArch} \ - HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc \ - ${makeTarget} - ) - ''; - installPhase = '' - cp .config $out - ''; - }; + linuxPackages_xanmod = linuxKernel.packages.linux_xanmod; - buildLinux = attrs: callPackage ../os-specific/linux/kernel/generic.nix attrs; - - cryptodev = linuxPackages_4_9.cryptodev; + cryptodev = linuxKernel.packages.linux_4_9.cryptodev; dpdk = callPackage ../os-specific/linux/dpdk { kernel = null; # dpdk modules are in linuxPackages.dpdk.kmod @@ -22246,6 +21954,8 @@ with pkgs; firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { }; + qmk-udev-rules = callPackage ../os-specific/linux/qmk-udev-rules { }; + radeontools = callPackage ../os-specific/linux/radeontools { }; radeontop = callPackage ../os-specific/linux/radeontop { }; @@ -22263,6 +21973,8 @@ with pkgs; riscv-pk = callPackage ../misc/riscv-pk { }; + ristate = callPackage ../tools/misc/ristate { }; + roccat-tools = callPackage ../os-specific/linux/roccat-tools { }; rtsp-simple-server = callPackage ../servers/rtsp-simple-server { }; @@ -22366,9 +22078,11 @@ with pkgs; withCryptsetup = false; withDocumentation = false; withEfi = false; + withFido2 = false; withHostnamed = false; withHwdb = false; withImportd = false; + withLibBPF = false; withLocaled = false; withLogind = false; withMachined = false; @@ -22382,6 +22096,7 @@ with pkgs; withShellCompletions = false; withTimedated = false; withTimesyncd = false; + withTpm2Tss = false; withUserDb = false; glib = null; libgcrypt = null; @@ -22651,6 +22366,8 @@ with pkgs; cherry = callPackage ../data/fonts/cherry { inherit (xorg) fonttosfnt mkfontdir; }; + chonburi-font = callPackage ../data/fonts/chonburi { }; + cldr-emoji-annotation = callPackage ../data/misc/cldr-emoji-annotation { }; clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { }; @@ -23113,6 +22830,10 @@ with pkgs; open-sans = callPackage ../data/fonts/open-sans { }; + openmoji-color = callPackage ../data/fonts/openmoji { variant = "color"; }; + + openmoji-black = callPackage ../data/fonts/openmoji { variant = "black"; }; + openzone-cursors = callPackage ../data/themes/openzone { }; oranchelo-icon-theme = callPackage ../data/icons/oranchelo-icon-theme { }; @@ -23216,6 +22937,8 @@ with pkgs; seshat = callPackage ../data/fonts/seshat { }; + session-desktop-appimage = callPackage ../applications/networking/instant-messengers/session-desktop-appimage { }; + shaderc = callPackage ../development/compilers/shaderc { }; shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { }; @@ -23963,6 +23686,8 @@ with pkgs; cipher = callPackage ../applications/misc/cipher { }; + clapper = callPackage ../applications/video/clapper { }; + claws-mail-gtk2 = callPackage ../applications/networking/mailreaders/claws-mail { inherit (xorg) libSM; useGtk3 = false; @@ -24132,7 +23857,7 @@ with pkgs; }; datadog-process-agent = callPackage ../tools/networking/dd-agent/datadog-process-agent.nix { }; datadog-integrations-core = extras: callPackage ../tools/networking/dd-agent/integrations-core.nix { - python = python27; + python = python3; extraIntegrations = extras; }; @@ -24464,6 +24189,8 @@ with pkgs; keepass-otpkeyprov = callPackage ../applications/misc/keepass-plugins/otpkeyprov { }; + kerbrute = callPackage ../tools/security/kerbrute { }; + exrdisplay = callPackage ../applications/graphics/exrdisplay { }; exrtools = callPackage ../applications/graphics/exrtools { }; @@ -24776,7 +24503,9 @@ with pkgs; fbida = callPackage ../applications/graphics/fbida { }; - fclones = callPackage ../tools/misc/fclones { }; + fclones = callPackage ../tools/misc/fclones { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; fcp = callPackage ../tools/misc/fcp { }; @@ -24813,6 +24542,7 @@ with pkgs; firefox-beta-unwrapped = firefoxPackages.firefox-beta; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { + inherit (gnome) adwaita-icon-theme; channel = "release"; generated = import ../applications/networking/browsers/firefox-bin/release_sources.nix; }; @@ -24824,6 +24554,7 @@ with pkgs; }; firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override { + inherit (gnome) adwaita-icon-theme; channel = "beta"; generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; }; @@ -24835,6 +24566,7 @@ with pkgs; }; firefox-devedition-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { + inherit (gnome) adwaita-icon-theme; channel = "devedition"; generated = import ../applications/networking/browsers/firefox-bin/devedition_sources.nix; }; @@ -25018,7 +24750,7 @@ with pkgs; gitolite = callPackage ../applications/version-management/gitolite { }; gitoxide = callPackage ../applications/version-management/gitoxide { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; inherit (gnome) gitg; @@ -25029,6 +24761,8 @@ with pkgs; goffice = callPackage ../development/libraries/goffice { }; + gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; }; + hydrus = python3Packages.callPackage ../applications/graphics/hydrus { inherit miniupnpc_2 swftools; inherit (qt5) wrapQtAppsHook; @@ -25291,6 +25025,10 @@ with pkgs; gtk = gtk3; }; + hors = callPackage ../development/tools/hors { + inherit (darwin.apple_sdk.frameworks) Security; + }; + hover = callPackage ../development/tools/hover { }; hovercraft = python3Packages.callPackage ../applications/misc/hovercraft { }; @@ -25744,6 +25482,8 @@ with pkgs; kapow = libsForQt5.callPackage ../applications/misc/kapow { }; + kappanhang = callPackage ../applications/radio/kappanhang { }; + okteta = libsForQt5.callPackage ../applications/editors/okteta { }; k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; @@ -25899,11 +25639,7 @@ with pkgs; kubetail = callPackage ../applications/networking/cluster/kubetail { } ; - kupfer = callPackage ../applications/misc/kupfer { - # using python36 as there appears to be a waf issue with python37 - # see https://github.com/NixOS/nixpkgs/issues/60498 - python3Packages = python36Packages; - }; + kupfer = callPackage ../applications/misc/kupfer { }; kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { }; @@ -26602,6 +26338,8 @@ with pkgs; piper = callPackage ../os-specific/linux/piper { }; + pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer {}; + plank = callPackage ../applications/misc/plank { }; playonlinux = callPackage ../applications/misc/playonlinux @@ -26636,6 +26374,8 @@ with pkgs; prevo-data = callPackage ../applications/misc/prevo/data.nix { }; prevo-tools = callPackage ../applications/misc/prevo/tools.nix { }; + psi-notify = callPackage ../applications/misc/psi-notify { }; + ptex = callPackage ../development/libraries/ptex {}; pyright = nodePackages.pyright; @@ -27480,7 +27220,7 @@ with pkgs; rsclock = callPackage ../applications/misc/rsclock { }; - rstudio = libsForQt514.callPackage ../applications/editors/rstudio { + rstudio = libsForQt5.callPackage ../applications/editors/rstudio { boost = boost166; llvmPackages = llvmPackages_7; jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -27567,6 +27307,8 @@ with pkgs; shutter = callPackage ../applications/graphics/shutter { }; + sic-image-cli = callPackage ../tools/graphics/sic-image-cli { }; + simple-scan = gnome.simple-scan; siproxd = callPackage ../applications/networking/siproxd { }; @@ -27715,6 +27457,8 @@ with pkgs; super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }; + super-slicer-staging = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }).staging; + robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; skrooge = libsForQt5.callPackage ../applications/office/skrooge {}; @@ -29600,6 +29344,11 @@ with pkgs; fish-fillets-ng = callPackage ../games/fish-fillets-ng {}; + fishfight = callPackage ../games/fishfight { + inherit (xorg) libX11 libXi; + inherit (darwin.apple_sdk.frameworks) AudioToolbox Cocoa CoreAudio CoreFoundation IOKit OpenGL; + }; + flightgear = libsForQt5.callPackage ../games/flightgear { }; flock = callPackage ../development/tools/flock { }; @@ -30134,6 +29883,8 @@ with pkgs; steamcmd = steamPackages.steamcmd; + steam-acf = callPackage ../tools/games/steam-acf { }; + protontricks = python3Packages.callPackage ../tools/package-management/protontricks { winetricks = winetricks.override { # Remove default build of wine to reduce closure size. @@ -30842,6 +30593,8 @@ with pkgs; nota = haskellPackages.callPackage ../applications/science/math/nota { }; + notus-scanner = with python3Packages; toPythonApplication notus-scanner; + openblas = callPackage ../development/libraries/science/math/openblas { }; # A version of OpenBLAS using 32-bit integers on all platforms for compatibility with @@ -32092,9 +31845,10 @@ with pkgs; nix-info = callPackage ../tools/nix/info { }; nix-info-tested = nix-info.override { doCheck = true; }; - nix-index = callPackage ../tools/package-management/nix-index { + nix-index-unwrapped = callPackage ../tools/package-management/nix-index { inherit (darwin.apple_sdk.frameworks) Security; }; + nix-index = callPackage ../tools/package-management/nix-index/wrapper.nix { }; nix-linter = haskell.lib.justStaticExecutables (haskellPackages.nix-linter); @@ -32469,6 +32223,8 @@ with pkgs; sumneko-lua-language-server = callPackage ../development/tools/sumneko-lua-language-server { }; + sysz = callPackage ../tools/misc/sysz { }; + go-swag = callPackage ../development/tools/go-swag { }; go-swagger = callPackage ../development/tools/go-swagger { }; diff --git a/nixpkgs/pkgs/top-level/coq-packages.nix b/nixpkgs/pkgs/top-level/coq-packages.nix index 2b707d3d3efd..c785d6c16cf5 100644 --- a/nixpkgs/pkgs/top-level/coq-packages.nix +++ b/nixpkgs/pkgs/top-level/coq-packages.nix @@ -20,6 +20,7 @@ let then callPackage ../development/coq-modules/bignums {} else null; category-theory = callPackage ../development/coq-modules/category-theory { }; + ceres = callPackage ../development/coq-modules/ceres {}; Cheerios = callPackage ../development/coq-modules/Cheerios {}; CoLoR = callPackage ../development/coq-modules/CoLoR {}; compcert = callPackage ../development/coq-modules/compcert { @@ -75,6 +76,7 @@ let odd-order = callPackage ../development/coq-modules/odd-order { }; paco = callPackage ../development/coq-modules/paco {}; paramcoq = callPackage ../development/coq-modules/paramcoq {}; + parsec = callPackage ../development/coq-modules/parsec {}; pocklington = callPackage ../development/coq-modules/pocklington {}; QuickChick = callPackage ../development/coq-modules/QuickChick {}; reglang = callPackage ../development/coq-modules/reglang {}; diff --git a/nixpkgs/pkgs/top-level/dhall-packages.nix b/nixpkgs/pkgs/top-level/dhall-packages.nix index 5a3fb04748d0..173c37f49214 100644 --- a/nixpkgs/pkgs/top-level/dhall-packages.nix +++ b/nixpkgs/pkgs/top-level/dhall-packages.nix @@ -30,9 +30,6 @@ let dhall-kubernetes = callPackage ../development/dhall-modules/dhall-kubernetes.nix { }; - dhall-packages = - callPackage ../development/dhall-modules/dhall-packages.nix { }; - Prelude = callPackage ../development/dhall-modules/Prelude.nix { }; }; diff --git a/nixpkgs/pkgs/top-level/haskell-packages.nix b/nixpkgs/pkgs/top-level/haskell-packages.nix index 1490aeda6558..159e846fc3af 100644 --- a/nixpkgs/pkgs/top-level/haskell-packages.nix +++ b/nixpkgs/pkgs/top-level/haskell-packages.nix @@ -8,6 +8,8 @@ let "ghc8102BinaryMinimal" "ghc8107Binary" "ghc8107BinaryMinimal" + "ghcjs" + "ghcjs810" "integer-simple" "native-bignum" "ghcHEAD" @@ -139,6 +141,13 @@ in { libffi = pkgs.libffi; }; + ghcjs = compiler.ghcjs810; + ghcjs810 = callPackage ../development/compilers/ghcjs/8.10 { + bootPkgs = packages.ghc8107; + ghcjsSrcJson = ../development/compilers/ghcjs/8.10/git.json; + stage0 = ../development/compilers/ghcjs/8.10/stage0.nix; + }; + # The integer-simple attribute set contains all the GHC compilers # build with integer-simple instead of integer-gmp. integer-simple = let @@ -222,6 +231,14 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; + ghcjs = packages.ghcjs810; + ghcjs810 = callPackage ../development/haskell-modules rec { + buildHaskellPackages = ghc.bootPkgs; + ghc = bh.compiler.ghcjs810; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; + packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { }; + }; + # The integer-simple attribute set contains package sets for all the GHC compilers # using integer-simple instead of integer-gmp. integer-simple = let diff --git a/nixpkgs/pkgs/top-level/linux-kernels.nix b/nixpkgs/pkgs/top-level/linux-kernels.nix new file mode 100644 index 000000000000..82ad3ed0ff0b --- /dev/null +++ b/nixpkgs/pkgs/top-level/linux-kernels.nix @@ -0,0 +1,550 @@ +{ pkgs +, linuxKernel +, config +, buildPackages +, callPackage +, makeOverridable +, recurseIntoAttrs +, dontRecurseIntoAttrs +, stdenv +, stdenvNoCC +, newScope +, lib +}: + +# When adding a kernel: + # - Update packageAliases.linux_latest to the latest version + # - Update the rev in ../os-specific/linux/kernel/linux-libre.nix to the latest one. + # - Update linux_latest_hardened when the patches become available + +with linuxKernel; + +let + deblobKernel = kernel: callPackage ../os-specific/linux/kernel/linux-libre.nix { + linux = kernel; + }; + + # Hardened Linux + hardenedKernelFor = kernel': overrides: + let kernel = kernel'.override overrides; + in kernel.override { + structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { + inherit lib; + inherit (kernel) version; + }; + kernelPatches = kernel.kernelPatches ++ [ + kernelPatches.hardened.${kernel.meta.branch} + ]; + modDirVersionArg = kernel.modDirVersion + (kernelPatches.hardened.${kernel.meta.branch}).extra; + isHardened = true; + }; +in { + kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; + + kernels = recurseIntoAttrs (lib.makeExtensible (self: with self; + let callPackage = newScope self; in { + + linux_mptcp_95 = callPackage ../os-specific/linux/kernel/linux-mptcp-95.nix { + kernelPatches = linux_4_19.kernelPatches; + }; + + linux_rpi1 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { + kernelPatches = with kernelPatches; [ + bridge_stp_helper + request_key_helper + ]; + rpiVersion = 1; + }; + + linux_rpi2 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { + kernelPatches = with kernelPatches; [ + bridge_stp_helper + request_key_helper + ]; + rpiVersion = 2; + }; + + linux_rpi3 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { + kernelPatches = with kernelPatches; [ + bridge_stp_helper + request_key_helper + ]; + rpiVersion = 3; + }; + + linux_rpi4 = callPackage ../os-specific/linux/kernel/linux-rpi.nix { + kernelPatches = with kernelPatches; [ + bridge_stp_helper + request_key_helper + ]; + rpiVersion = 4; + }; + + linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper_updated + kernelPatches.cpu-cgroup-v2."4.4" + kernelPatches.modinst_arg_list_too_long + ]; + }; + + linux_4_9 = callPackage ../os-specific/linux/kernel/linux-4.9.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper_updated + kernelPatches.cpu-cgroup-v2."4.9" + kernelPatches.modinst_arg_list_too_long + ]; + }; + + linux_4_14 = callPackage ../os-specific/linux/kernel/linux-4.14.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md + # when adding a new linux version + kernelPatches.cpu-cgroup-v2."4.11" + kernelPatches.modinst_arg_list_too_long + ]; + }; + + linux_4_19 = callPackage ../os-specific/linux/kernel/linux-4.19.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.modinst_arg_list_too_long + ]; + }; + + linux_5_4 = callPackage ../os-specific/linux/kernel/linux-5.4.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.rtl8761b_support + ]; + }; + + linux_rt_5_4 = callPackage ../os-specific/linux/kernel/linux-rt-5.4.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + + linux_5_10 = callPackage ../os-specific/linux/kernel/linux-5.10.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + + linux_rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export-rt-sched-migrate + ]; + }; + + linux_rt_5_11 = callPackage ../os-specific/linux/kernel/linux-rt-5.11.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export-rt-sched-migrate + ]; + }; + + linux_5_13 = callPackage ../os-specific/linux/kernel/linux-5.13.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + + linux_5_14 = callPackage ../os-specific/linux/kernel/linux-5.14.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + + linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec { + kernel = linux_5_13; + kernelPatches = kernel.kernelPatches; + }; + + linux_hardkernel_4_14 = callPackage ../os-specific/linux/kernel/linux-hardkernel-4.14.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.modinst_arg_list_too_long + ]; + }; + + linux_zen = callPackage ../os-specific/linux/kernel/linux-zen.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + + linux_lqx = callPackage ../os-specific/linux/kernel/linux-lqx.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + + linux_xanmod = callPackage ../os-specific/linux/kernel/linux-xanmod.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + + linux_libre = deblobKernel packageAliases.linux_default.kernel; + + linux_latest_libre = deblobKernel packageAliases.linux_latest.kernel; + + linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { }; + + linux_4_14_hardened = hardenedKernelFor kernels.linux_4_14 { }; + linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { }; + linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { }; + linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { }; + linux_5_13_hardened = hardenedKernelFor kernels.linux_5_13 { }; + linux_5_14_hardened = hardenedKernelFor kernels.linux_5_14 { }; + + })); + /* Linux kernel modules are inherently tied to a specific kernel. So + rather than provide specific instances of those packages for a + specific kernel, we have a function that builds those packages + for a specific kernel. This function can then be called for + whatever kernel you're using. */ + + packagesFor = kernel_: lib.makeExtensible (self: with self; + let callPackage = newScope self; in { + inherit callPackage; + kernel = kernel_; + inherit (kernel) stdenv; # in particular, use the same compiler by default + + # to help determine module compatibility + inherit (kernel) isZen isHardened isLibre; + inherit (kernel) kernelOlder kernelAtLeast; + # Obsolete aliases (these packages do not depend on the kernel). + inherit (pkgs) odp-dpdk pktgen; # added 2018-05 + + acpi_call = callPackage ../os-specific/linux/acpi-call {}; + + akvcam = callPackage ../os-specific/linux/akvcam { }; + + amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { }; + + anbox = callPackage ../os-specific/linux/anbox/kmod.nix { }; + + apfs = callPackage ../os-specific/linux/apfs { }; + + batman_adv = callPackage ../os-specific/linux/batman-adv {}; + + bcc = callPackage ../os-specific/linux/bcc { + python = pkgs.python3; + }; + + bpftrace = callPackage ../os-specific/linux/bpftrace { }; + + bbswitch = callPackage ../os-specific/linux/bbswitch {}; + + chipsec = callPackage ../tools/security/chipsec { + inherit kernel; + withDriver = true; + }; + + cryptodev = callPackage ../os-specific/linux/cryptodev { }; + + cpupower = callPackage ../os-specific/linux/cpupower { }; + + ddcci-driver = callPackage ../os-specific/linux/ddcci { }; + + digimend = callPackage ../os-specific/linux/digimend { }; + + dpdk-kmods = callPackage ../os-specific/linux/dpdk-kmods { }; + + exfat-nofuse = callPackage ../os-specific/linux/exfat { }; + + evdi = callPackage ../os-specific/linux/evdi { }; + + fwts-efi-runtime = callPackage ../os-specific/linux/fwts/module.nix { }; + + gcadapter-oc-kmod = callPackage ../os-specific/linux/gcadapter-oc-kmod { }; + hid-nintendo = callPackage ../os-specific/linux/hid-nintendo { }; + + hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { }; + + e1000e = if lib.versionOlder kernel.version "4.10" then callPackage ../os-specific/linux/e1000e {} else null; + + intel-speed-select = if lib.versionAtLeast kernel.version "5.3" then callPackage ../os-specific/linux/intel-speed-select { } else null; + + ixgbevf = callPackage ../os-specific/linux/ixgbevf {}; + + it87 = callPackage ../os-specific/linux/it87 {}; + + asus-wmi-sensors = callPackage ../os-specific/linux/asus-wmi-sensors {}; + + ena = callPackage ../os-specific/linux/ena {}; + + v4l2loopback = callPackage ../os-specific/linux/v4l2loopback { }; + + lttng-modules = callPackage ../os-specific/linux/lttng-modules { }; + + broadcom_sta = callPackage ../os-specific/linux/broadcom-sta { }; + + tbs = callPackage ../os-specific/linux/tbs { }; + + mbp2018-bridge-drv = callPackage ../os-specific/linux/mbp-modules/mbp2018-bridge-drv { }; + + nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; + + nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { }); + + nvidia_x11_legacy340 = nvidiaPackages.legacy_340; + nvidia_x11_legacy390 = nvidiaPackages.legacy_390; + nvidia_x11_beta = nvidiaPackages.beta; + nvidia_x11_vulkan_beta = nvidiaPackages.vulkan_beta; + nvidia_x11 = nvidiaPackages.stable; + + openrazer = callPackage ../os-specific/linux/openrazer/driver.nix { }; + + ply = callPackage ../os-specific/linux/ply { }; + + r8125 = callPackage ../os-specific/linux/r8125 { }; + + r8168 = callPackage ../os-specific/linux/r8168 { }; + + rtl8188eus-aircrack = callPackage ../os-specific/linux/rtl8188eus-aircrack { }; + + rtl8192eu = callPackage ../os-specific/linux/rtl8192eu { }; + + rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { }; + + rtl8812au = callPackage ../os-specific/linux/rtl8812au { }; + + rtl8814au = callPackage ../os-specific/linux/rtl8814au { }; + + rtl88xxau-aircrack = callPackage ../os-specific/linux/rtl88xxau-aircrack {}; + + rtl8821au = callPackage ../os-specific/linux/rtl8821au { }; + + rtl8821ce = callPackage ../os-specific/linux/rtl8821ce { }; + + rtl88x2bu = callPackage ../os-specific/linux/rtl88x2bu { }; + + rtl8821cu = callPackage ../os-specific/linux/rtl8821cu { }; + + rtw88 = callPackage ../os-specific/linux/rtw88 { }; + rtlwifi_new = rtw88; + + rtw89 = callPackage ../os-specific/linux/rtw89 { }; + + openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { }; + openafs_1_9 = callPackage ../servers/openafs/1.9/module.nix { }; + # Current stable release; don't backport release updates! + openafs = openafs_1_8; + + facetimehd = callPackage ../os-specific/linux/facetimehd { }; + + tuxedo-keyboard = if lib.versionAtLeast kernel.version "4.14" then callPackage ../os-specific/linux/tuxedo-keyboard { } else null; + + jool = callPackage ../os-specific/linux/jool { }; + + kvmfr = callPackage ../os-specific/linux/kvmfr { }; + + mba6x_bl = callPackage ../os-specific/linux/mba6x_bl { }; + + mwprocapture = callPackage ../os-specific/linux/mwprocapture { }; + + mxu11x0 = callPackage ../os-specific/linux/mxu11x0 { }; + + # compiles but has to be integrated into the kernel somehow + # Let's have it uncommented and finish it.. + ndiswrapper = callPackage ../os-specific/linux/ndiswrapper { }; + + netatop = callPackage ../os-specific/linux/netatop { }; + + oci-seccomp-bpf-hook = if lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/oci-seccomp-bpf-hook { } else null; + + perf = if lib.versionAtLeast kernel.version "3.12" then callPackage ../os-specific/linux/kernel/perf.nix { } else null; + + phc-intel = if lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; + + # Disable for kernels 4.15 and above due to compatibility issues + prl-tools = if lib.versionOlder kernel.version "4.15" then callPackage ../os-specific/linux/prl-tools { } else null; + + 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 { }; + + system76 = callPackage ../os-specific/linux/system76 { }; + + system76-acpi = callPackage ../os-specific/linux/system76-acpi { }; + + system76-power = callPackage ../os-specific/linux/system76-power { }; + + system76-io = callPackage ../os-specific/linux/system76-io { }; + + tmon = callPackage ../os-specific/linux/tmon { }; + + tp_smapi = callPackage ../os-specific/linux/tp_smapi { }; + + turbostat = callPackage ../os-specific/linux/turbostat { }; + + usbip = callPackage ../os-specific/linux/usbip { }; + + v86d = callPackage ../os-specific/linux/v86d { }; + + veikk-linux-driver = callPackage ../os-specific/linux/veikk-linux-driver { }; + vendor-reset = callPackage ../os-specific/linux/vendor-reset { }; + + vhba = callPackage ../misc/emulators/cdemu/vhba.nix { }; + + virtualbox = callPackage ../os-specific/linux/virtualbox { + virtualbox = pkgs.virtualboxHardened; + }; + + virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { + virtualbox = pkgs.virtualboxHardened; + }; + + wireguard = if lib.versionOlder kernel.version "5.6" then callPackage ../os-specific/linux/wireguard { } else null; + + x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { }; + + xmm7360-pci = callPackage ../os-specific/linux/xmm7360-pci { }; + + xpadneo = callPackage ../os-specific/linux/xpadneo { }; + + zenpower = callPackage ../os-specific/linux/zenpower { }; + + inherit (callPackage ../os-specific/linux/zfs { + configFile = "kernel"; + inherit pkgs kernel; + }) zfsStable zfsUnstable; + zfs = zfsStable; + + can-isotp = callPackage ../os-specific/linux/can-isotp { }; + + } // lib.optionalAttrs (config.allowAliases or false) { + ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18; + }); + + hardenedPackagesFor = kernel: overrides: packagesFor (hardenedKernelFor kernel overrides); + + vanillaPackages = { + # recurse to build modules for the kernels + linux_4_4 = recurseIntoAttrs (packagesFor kernels.linux_4_4); + linux_4_9 = recurseIntoAttrs (packagesFor kernels.linux_4_9); + linux_4_14 = recurseIntoAttrs (packagesFor kernels.linux_4_14); + linux_4_19 = recurseIntoAttrs (packagesFor kernels.linux_4_19); + linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4); + linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10); + linux_5_13 = recurseIntoAttrs (packagesFor kernels.linux_5_13); + linux_5_14 = recurseIntoAttrs (packagesFor kernels.linux_5_14); + }; + + rtPackages = { + # realtime kernel packages + linux_rt_5_4 = packagesFor kernels.linux_rt_5_4; + linux_rt_5_10 = packagesFor kernels.linux_rt_5_10; + linux_rt_5_11 = packagesFor kernels.linux_rt_5_11; + }; + + rpiPackages = { + linux_rpi1 = packagesFor kernels.linux_rpi1; + linux_rpi2 = packagesFor kernels.linux_rpi2; + linux_rpi3 = packagesFor kernels.linux_rpi3; + linux_rpi4 = packagesFor kernels.linux_rpi4; + }; + + packages = recurseIntoAttrs (vanillaPackages // rtPackages // rpiPackages // { + linux_mptcp_95 = packagesFor kernels.linux_mptcp_95; + + # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. + linux_testing = packagesFor kernels.linux_testing; + linux_testing_bcachefs = recurseIntoAttrs (packagesFor kernels.linux_testing_bcachefs); + + linux_hardened = recurseIntoAttrs (hardenedPackagesFor packageAliases.linux_default.kernel { }); + + linux_4_14_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_4_14 { }); + linux_4_19_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_4_19 { }); + linux_5_4_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_4 { }); + linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { }); + linux_5_13_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_13 { }); + linux_5_14_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_14 { }); + + linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); + linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); + linux_xanmod = recurseIntoAttrs (packagesFor kernels.linux_xanmod); + + hardkernel_4_14 = recurseIntoAttrs (packagesFor kernels.linux_hardkernel_4_14); + + linux_libre = recurseIntoAttrs (packagesFor kernels.linux_libre); + + linux_latest_libre = recurseIntoAttrs (packagesFor kernels.linux_latest_libre); + }); + + packageAliases = { + linux_default = packages.linux_5_10; + # Update this when adding the newest kernel major version! + linux_latest = packages.linux_5_14; + linux_mptcp = packages.linux_mptcp_95; + linux_rt_default = packages.linux_rt_5_4; + linux_rt_latest = packages.linux_rt_5_11; + linux_hardkernel_latest = packages.hardkernel_4_14; + }; + + manualConfig = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); + + customPackage = { version, src, configfile, allowImportFromDerivation ? true }: + recurseIntoAttrs (packagesFor (manualConfig { + inherit version src configfile lib stdenv allowImportFromDerivation; + })); + + # Derive one of the default .config files + linuxConfig = { + src, + version ? (builtins.parseDrvName src.name).version, + makeTarget ? "defconfig", + name ? "kernel.config", + }: stdenvNoCC.mkDerivation { + inherit name src; + depsBuildBuild = [ buildPackages.stdenv.cc ] + ++ lib.optionals (lib.versionAtLeast version "4.16") [ buildPackages.bison buildPackages.flex ]; + postPatch = '' + patchShebangs scripts/ + ''; + buildPhase = '' + set -x + make \ + ARCH=${stdenv.hostPlatform.linuxArch} \ + HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc \ + ${makeTarget} + ''; + installPhase = '' + cp .config $out + ''; + }; + + buildLinux = attrs: callPackage ../os-specific/linux/kernel/generic.nix attrs; + +} diff --git a/nixpkgs/pkgs/top-level/nim-packages.nix b/nixpkgs/pkgs/top-level/nim-packages.nix new file mode 100644 index 000000000000..5d45b0c5eca9 --- /dev/null +++ b/nixpkgs/pkgs/top-level/nim-packages.nix @@ -0,0 +1,75 @@ +{ lib, pkgs, stdenv, newScope, nim, fetchFromGitHub }: + +lib.makeScope newScope (self: + let callPackage = self.callPackage; + in { + inherit nim; + nim_builder = callPackage ../development/nim-packages/nim_builder { }; + buildNimPackage = + callPackage ../development/nim-packages/build-nim-package { }; + fetchNimble = callPackage ../development/nim-packages/fetch-nimble { }; + + astpatternmatching = + callPackage ../development/nim-packages/astpatternmatching { }; + + bumpy = callPackage ../development/nim-packages/bumpy { }; + + chroma = callPackage ../development/nim-packages/chroma { }; + + c2nim = callPackage ../development/nim-packages/c2nim { }; + + docopt = callPackage ../development/nim-packages/docopt { }; + + flatty = callPackage ../development/nim-packages/flatty { }; + + frosty = callPackage ../development/nim-packages/frosty { }; + + hts-nim = callPackage ../development/nim-packages/hts-nim { }; + + jester = callPackage ../development/nim-packages/jester { }; + + jsonschema = callPackage ../development/nim-packages/jsonschema { }; + + karax = callPackage ../development/nim-packages/karax { }; + + lscolors = callPackage ../development/nim-packages/lscolors { }; + + markdown = callPackage ../development/nim-packages/markdown { }; + + nimcrypto = callPackage ../development/nim-packages/nimcrypto { }; + + nimbox = callPackage ../development/nim-packages/nimbox { }; + + nimsimd = callPackage ../development/nim-packages/nimsimd { }; + + noise = callPackage ../development/nim-packages/noise { }; + + packedjson = callPackage ../development/nim-packages/packedjson { }; + + pixie = callPackage ../development/nim-packages/pixie { }; + + redis = callPackage ../development/nim-packages/redis { }; + + redpool = callPackage ../development/nim-packages/redpool { }; + + regex = callPackage ../development/nim-packages/regex { }; + + sass = callPackage ../development/nim-packages/sass { }; + + sdl2 = callPackage ../development/nim-packages/sdl2 { }; + + segmentation = callPackage ../development/nim-packages/segmentation { }; + + supersnappy = callPackage ../development/nim-packages/supersnappy { }; + + typography = callPackage ../development/nim-packages/typography { }; + + unicodedb = callPackage ../development/nim-packages/unicodedb { }; + + unicodeplus = callPackage ../development/nim-packages/unicodeplus { }; + + vmath = callPackage ../development/nim-packages/vmath { }; + + zippy = callPackage ../development/nim-packages/zippy { }; + + }) diff --git a/nixpkgs/pkgs/top-level/ocaml-packages.nix b/nixpkgs/pkgs/top-level/ocaml-packages.nix index f2f9c912ffcd..058a1166d667 100644 --- a/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -1601,7 +1601,7 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_4_13 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.13.nix { }); - ocamlPackages_latest = ocamlPackages_4_12; + ocamlPackages_latest = ocamlPackages_4_13; ocamlPackages = ocamlPackages_4_12; } diff --git a/nixpkgs/pkgs/top-level/perl-packages.nix b/nixpkgs/pkgs/top-level/perl-packages.nix index da27b2e2bf7e..6ed89f479893 100644 --- a/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/nixpkgs/pkgs/top-level/perl-packages.nix @@ -3709,10 +3709,10 @@ let ConvertASN1 = buildPerlPackage { pname = "Convert-ASN1"; - version = "0.27"; + version = "0.33"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GB/GBARR/Convert-ASN1-0.27.tar.gz"; - sha256 = "12nmsca6hzgxq57sx7dp8yq6zxqhl41z5a6018877sf5w25ag93l"; + url = "mirror://cpan/authors/id/T/TI/TIMLEGGE/Convert-ASN1-0.33.tar.gz"; + sha256 = "0xk0s2rnwjb7ydhwfinpjcbw25im54b8cs7r9hj3m7n7412h1pqz"; }; }; @@ -8147,7 +8147,7 @@ let }; propagatedBuildInputs = [ TextGlob ]; meta = { - license = lib.licenses.free; # Same as Perl + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8161,7 +8161,7 @@ let meta = { maintainers = teams.deshaw.members; description = "simple filename and pathname matching"; - license = lib.licenses.free; # Same as Perl + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -8377,7 +8377,7 @@ let })]; propagatedBuildInputs = [ ClassAccessor ]; meta = { - license = lib.licenses.free; # Same as Perl + license = with lib.licenses; [ artistic1 gpl1Plus ]; description = "Pid File Manipulation"; maintainers = teams.deshaw.members; }; @@ -12390,6 +12390,20 @@ let }; }; + LWPUserAgentCached = buildPerlPackage { + pname = "LWP-UserAgent-Cached"; + version = "0.08"; + src = fetchurl { + url = "mirror://cpan/authors/id/O/OL/OLEG/LWP-UserAgent-Cached-0.08.tar.gz"; + hash = "sha256-Pc5atMeAQWVs54Vk92Az5b0ew4b1TS57MHQK5I7nh8M="; + }; + propagatedBuildInputs = [ LWP ]; + meta = { + description = "LWP::UserAgent with simple caching mechanism"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + LWPUserAgentDNSHosts = buildPerlModule { pname = "LWP-UserAgent-DNS-Hosts"; version = "0.14"; @@ -22538,6 +22552,19 @@ let }; }; + TextParsewords = buildPerlPackage { + pname = "Text-Parsewords"; + version = "3.30"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CH/CHORNY/Text-ParseWords-3.30.tar.gz"; + hash = "sha256-heAjgXndQ5l+WMZr1RYRGCvH1TNQUCmi2w0yMu2v9eg="; + }; + meta = { + description = "Parse text into an array of tokens or array of arrays"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TextPasswordPronounceable = buildPerlPackage { pname = "Text-Password-Pronounceable"; version = "0.30"; diff --git a/nixpkgs/pkgs/top-level/python-packages.nix b/nixpkgs/pkgs/top-level/python-packages.nix index a58dcfbd8211..e9a9c3e0cffb 100644 --- a/nixpkgs/pkgs/top-level/python-packages.nix +++ b/nixpkgs/pkgs/top-level/python-packages.nix @@ -58,7 +58,7 @@ let # See build-setupcfg/default.nix for documentation. buildSetupcfg = import ../build-support/build-setupcfg self; - fetchPypi = callPackage ../development/interpreters/python/fetchpypi.nix {}; + fetchPypi = callPackage ../development/interpreters/python/fetchpypi.nix { }; # Check whether a derivation provides a Python module. hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python; @@ -211,6 +211,8 @@ in { adguardhome = callPackage ../development/python-modules/adguardhome { }; + adjusttext = callPackage ../development/python-modules/adjusttext { }; + advantage-air = callPackage ../development/python-modules/advantage-air { }; aemet-opendata = callPackage ../development/python-modules/aemet-opendata { }; @@ -245,6 +247,8 @@ in { aioambient = callPackage ../development/python-modules/aioambient { }; + aioapns = callPackage ../development/python-modules/aioapns { }; + ailment = callPackage ../development/python-modules/ailment { }; aioamqp = callPackage ../development/python-modules/aioamqp { }; @@ -283,6 +287,8 @@ in { aioguardian = callPackage ../development/python-modules/aioguardian { }; + aiogithubapi = callPackage ../development/python-modules/aiogithubapi { }; + aioh2 = callPackage ../development/python-modules/aioh2 { }; aioharmony = callPackage ../development/python-modules/aioharmony { }; @@ -347,6 +353,8 @@ in { aiopulse = callPackage ../development/python-modules/aiopulse { }; + aiopvapi = callPackage ../development/python-modules/aiopvapi { }; + aiopvpc = callPackage ../development/python-modules/aiopvpc { }; aiopylgtv = callPackage ../development/python-modules/aiopylgtv { }; @@ -383,6 +391,8 @@ in { aiounittest = callPackage ../development/python-modules/aiounittest { }; + aiowatttime = callPackage ../development/python-modules/aiowatttime { }; + aiowinreg = callPackage ../development/python-modules/aiowinreg { }; aioymaps = callPackage ../development/python-modules/aioymaps { }; @@ -517,6 +527,8 @@ in { apsw = callPackage ../development/python-modules/apsw { }; + apycula = callPackage ../development/python-modules/apycula { }; + aqualogic = callPackage ../development/python-modules/aqualogic { }; arabic-reshaper = callPackage ../development/python-modules/arabic-reshaper { }; @@ -569,6 +581,8 @@ in { asgiref = callPackage ../development/python-modules/asgiref { }; + asn1 = callPackage ../development/python-modules/asn1 { }; + asn1ate = callPackage ../development/python-modules/asn1ate { }; asn1crypto = callPackage ../development/python-modules/asn1crypto { }; @@ -607,6 +621,8 @@ in { async-lru = callPackage ../development/python-modules/async-lru { }; + asynccmd = callPackage ../development/python-modules/asynccmd { }; + asyncio-dgram = callPackage ../development/python-modules/asyncio-dgram { }; asyncio-mqtt = callPackage ../development/python-modules/asyncio_mqtt { }; @@ -627,9 +643,7 @@ in { async-timeout = callPackage ../development/python-modules/async_timeout { }; - async-upnp-client = callPackage ../development/python-modules/async-upnp-client { - pytestCheckHook = self.pytestCheckHook_6_1; - }; + async-upnp-client = callPackage ../development/python-modules/async-upnp-client { }; asyncwhois = callPackage ../development/python-modules/asyncwhois { }; @@ -689,6 +703,8 @@ in { automat = callPackage ../development/python-modules/automat { }; + autopage = callPackage ../development/python-modules/autopage { }; + autopep8 = callPackage ../development/python-modules/autopep8 { }; avahi = toPythonModule (pkgs.avahi.override { @@ -963,6 +979,8 @@ in { azure-synapse-artifacts = callPackage ../development/python-modules/azure-synapse-artifacts { }; + azure-synapse-managedprivateendpoints = callPackage ../development/python-modules/azure-synapse-managedprivateendpoints { }; + azure-synapse-spark = callPackage ../development/python-modules/azure-synapse-spark { }; b2sdk = callPackage ../development/python-modules/b2sdk { }; @@ -1427,6 +1445,8 @@ in { chardet = callPackage ../development/python-modules/chardet { }; + charset-normalizer = callPackage ../development/python-modules/charset-normalizer { }; + chart-studio = callPackage ../development/python-modules/chart-studio { }; check-manifest = callPackage ../development/python-modules/check-manifest { }; @@ -1473,7 +1493,7 @@ in { class-registry = callPackage ../development/python-modules/class-registry { }; - claripy = callPackage ../development/python-modules/claripy { }; + claripy = callPackage ../development/python-modules/claripy { }; cld2-cffi = callPackage ../development/python-modules/cld2-cffi { }; @@ -1515,11 +1535,11 @@ in { click-threading = callPackage ../development/python-modules/click-threading { }; - clickhouse-cityhash = callPackage ../development/python-modules/clickhouse-cityhash {}; + clickhouse-cityhash = callPackage ../development/python-modules/clickhouse-cityhash { }; clickhouse-cli = callPackage ../development/python-modules/clickhouse-cli { }; - clickhouse-driver = callPackage ../development/python-modules/clickhouse-driver {}; + clickhouse-driver = callPackage ../development/python-modules/clickhouse-driver { }; cliff = callPackage ../development/python-modules/cliff { }; @@ -1745,8 +1765,6 @@ in { cssutils = callPackage ../development/python-modules/cssutils { }; - csvs-to-sqlite = callPackage ../development/python-modules/csvs-to-sqlite { }; - csvw = callPackage ../development/python-modules/csvw { }; cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { }; @@ -1862,6 +1880,8 @@ in { dateparser = callPackage ../development/python-modules/dateparser { }; + dateutils = callPackage ../development/python-modules/dateutils { }; + datrie = callPackage ../development/python-modules/datrie { }; dawg-python = callPackage ../development/python-modules/dawg-python { }; @@ -2306,6 +2326,8 @@ in { eggdeps = callPackage ../development/python-modules/eggdeps { }; + einops = callPackage ../development/python-modules/einops { }; + elgato = callPackage ../development/python-modules/elgato { }; elasticsearch = callPackage ../development/python-modules/elasticsearch { }; @@ -2366,7 +2388,7 @@ in { env-canada = callPackage ../development/python-modules/env-canada { }; - environmental-override = callPackage ../development/python-modules/environmental-override {}; + environmental-override = callPackage ../development/python-modules/environmental-override { }; envisage = callPackage ../development/python-modules/envisage { }; @@ -2398,6 +2420,8 @@ in { etebase-server = callPackage ../servers/etebase { }; + eternalegypt = callPackage ../development/python-modules/eternalegypt { }; + etesync = callPackage ../development/python-modules/etesync { }; eth-hash = callPackage ../development/python-modules/eth-hash { }; @@ -2498,8 +2522,12 @@ in { falcon = callPackage ../development/python-modules/falcon { }; + faraday-plugins = callPackage ../development/python-modules/faraday-plugins { }; + fastapi = callPackage ../development/python-modules/fastapi { }; + fastavro = callPackage ../development/python-modules/fastavro { }; + fastcache = callPackage ../development/python-modules/fastcache { }; fastdiff = callPackage ../development/python-modules/fastdiff { }; @@ -2514,6 +2542,11 @@ in { fastimport = callPackage ../development/python-modules/fastimport { }; + fastjet = toPythonModule (pkgs.fastjet.override { + withPython = true; + inherit python; + }); + fastjsonschema = callPackage ../development/python-modules/fastjsonschema { }; fastnlo_toolkit = toPythonModule (pkgs.fastnlo_toolkit.override { @@ -2708,6 +2741,8 @@ in { flickrapi = callPackage ../development/python-modules/flickrapi { }; + flipr-api = callPackage ../development/python-modules/flipr-api { }; + flit = callPackage ../development/python-modules/flit { }; flit-core = callPackage ../development/python-modules/flit-core { }; @@ -3255,9 +3290,9 @@ in { guzzle_sphinx_theme = callPackage ../development/python-modules/guzzle_sphinx_theme { }; - gvm-tools = callPackage ../development/python-modules/gvm-tools {}; + gvm-tools = callPackage ../development/python-modules/gvm-tools { }; - gviz-api = callPackage ../development/python-modules/gviz-api {}; + gviz-api = callPackage ../development/python-modules/gviz-api { }; gym = callPackage ../development/python-modules/gym { }; @@ -3599,6 +3634,8 @@ in { imutils = callPackage ../development/python-modules/imutils { }; + in-place = callPackage ../development/python-modules/in-place { }; + incomfort-client = callPackage ../development/python-modules/incomfort-client { }; incremental = callPackage ../development/python-modules/incremental { }; @@ -3633,10 +3670,14 @@ in { intake = callPackage ../development/python-modules/intake { }; + intake-parquet = callPackage ../development/python-modules/intake-parquet { }; + intbitset = callPackage ../development/python-modules/intbitset { }; intelhex = callPackage ../development/python-modules/intelhex { }; + intensity-normalization = callPackage ../development/python-modules/intensity-normalization { }; + internetarchive = callPackage ../development/python-modules/internetarchive { }; interruptingcow = callPackage ../development/python-modules/interruptingcow { }; @@ -3649,6 +3690,8 @@ in { iocapture = callPackage ../development/python-modules/iocapture { }; + iotawattpy = callPackage ../development/python-modules/iotawattpy { }; + iowait = callPackage ../development/python-modules/iowait { }; ipaddress = callPackage ../development/python-modules/ipaddress { }; @@ -4125,7 +4168,6 @@ in { libgpuarray = callPackage ../development/python-modules/libgpuarray { clblas = pkgs.clblas.override { boost = self.boost; }; cudaSupport = pkgs.config.cudaSupport or false; - inherit (pkgs.linuxPackages) nvidia_x11; }; libiio = (toPythonModule (pkgs.libiio.override { inherit python; })).python; @@ -4284,8 +4326,9 @@ in { }; llvmlite = callPackage ../development/python-modules/llvmlite { - llvm = pkgs.llvm_9; - }; # llvmlite always requires a specific version of llvm. + # llvmlite always requires a specific version of llvm. + llvm = pkgs.llvm_11; + }; lmdb = callPackage ../development/python-modules/lmdb { inherit (pkgs) lmdb; @@ -4397,6 +4440,8 @@ in { makefun = callPackage ../development/python-modules/makefun { }; + mailsuite = callPackage ../development/python-modules/mailsuite { }; + Mako = callPackage ../development/python-modules/Mako { }; malduck= callPackage ../development/python-modules/malduck { }; @@ -4435,6 +4480,8 @@ in { marshmallow = callPackage ../development/python-modules/marshmallow { }; + marshmallow-dataclass = callPackage ../development/python-modules/marshmallow-dataclass { }; + marshmallow-enum = callPackage ../development/python-modules/marshmallow-enum { }; marshmallow-oneofschema = callPackage ../development/python-modules/marshmallow-oneofschema { }; @@ -4472,6 +4519,8 @@ in { mautrix-appservice = self.mautrix; # alias 2019-12-28 + maxcube-api = callPackage ../development/python-modules/maxcube-api { }; + maxminddb = callPackage ../development/python-modules/maxminddb { }; maya = callPackage ../development/python-modules/maya { }; @@ -4554,6 +4603,8 @@ in { mido = callPackage ../development/python-modules/mido { }; + migen = callPackage ../development/python-modules/migen { }; + milc = callPackage ../development/python-modules/milc { }; milksnake = callPackage ../development/python-modules/milksnake { }; @@ -4890,6 +4941,8 @@ in { nilearn = callPackage ../development/python-modules/nilearn { }; + niluclient = callPackage ../development/python-modules/niluclient { }; + nimfa = callPackage ../development/python-modules/nimfa { }; nine = callPackage ../development/python-modules/nine { }; @@ -4982,6 +5035,8 @@ in { nototools = callPackage ../data/fonts/noto-fonts/tools.nix { }; + notus-scanner = callPackage ../development/python-modules/notus-scanner { }; + nplusone = callPackage ../development/python-modules/nplusone { }; npyscreen = callPackage ../development/python-modules/npyscreen { }; @@ -5043,6 +5098,8 @@ in { oci = callPackage ../development/python-modules/oci { }; + ocrmypdf = callPackage ../development/python-modules/ocrmypdf { }; + od = callPackage ../development/python-modules/od { }; odfpy = callPackage ../development/python-modules/odfpy { }; @@ -5146,6 +5203,8 @@ in { orderedset = callPackage ../development/python-modules/orderedset { }; + orjson = callPackage ../development/python-modules/orjson { }; + orm = callPackage ../development/python-modules/orm { }; ortools = (toPythonModule (pkgs.or-tools.override { inherit (self) python; })).python; @@ -5184,6 +5243,8 @@ in { oslotest = callPackage ../development/python-modules/oslotest { }; + ospd = callPackage ../development/python-modules/ospd { }; + osqp = callPackage ../development/python-modules/osqp { }; outcome = callPackage ../development/python-modules/outcome { }; @@ -5196,6 +5257,8 @@ in { oyaml = callPackage ../development/python-modules/oyaml { }; + p1monitor = callPackage ../development/python-modules/p1monitor { }; + packageurl-python = callPackage ../development/python-modules/packageurl-python { }; packaging = callPackage ../development/python-modules/packaging { }; @@ -5249,10 +5312,14 @@ in { parfive = callPackage ../development/python-modules/parfive { }; + parquet = callPackage ../development/python-modules/parquet { }; + parse = callPackage ../development/python-modules/parse { }; parsedatetime = callPackage ../development/python-modules/parsedatetime { }; + parsedmarc = callPackage ../development/python-modules/parsedmarc { }; + parsel = callPackage ../development/python-modules/parsel { }; parse-type = callPackage ../development/python-modules/parse-type { }; @@ -5540,8 +5607,14 @@ in { python-ecobee-api = callPackage ../development/python-modules/python-ecobee-api { }; + python-glanceclient = callPackage ../development/python-modules/python-glanceclient { }; + + python-heatclient = callPackage ../development/python-modules/python-heatclient { }; + python-ipmi = callPackage ../development/python-modules/python-ipmi { }; + python-ironicclient = callPackage ../development/python-modules/python-ironicclient { }; + python-izone = callPackage ../development/python-modules/python-izone { }; python-juicenet = callPackage ../development/python-modules/python-juicenet { }; @@ -5602,6 +5675,8 @@ in { ply = callPackage ../development/python-modules/ply { }; + plyer = callPackage ../development/python-modules/plyer { }; + plyfile = callPackage ../development/python-modules/plyfile { }; plyplus = callPackage ../development/python-modules/plyplus { }; @@ -6507,6 +6582,10 @@ in { pyomo = callPackage ../development/python-modules/pyomo { }; + pyp = callPackage ../development/python-modules/pyp { + inherit (pkgs) jq; + }; + phonemizer = callPackage ../development/python-modules/phonemizer { }; pyopencl = callPackage ../development/python-modules/pyopencl { @@ -6748,6 +6827,8 @@ in { pyscss = callPackage ../development/python-modules/pyscss { }; + pysdcp = callPackage ../development/python-modules/pysdcp { }; + pysdl2 = callPackage ../development/python-modules/pysdl2 { }; pysendfile = callPackage ../development/python-modules/pysendfile { }; @@ -6834,6 +6915,8 @@ in { pysparse = callPackage ../development/python-modules/pysparse { }; + pyspcwebgw = callPackage ../development/python-modules/pyspcwebgw { }; + pyspf = callPackage ../development/python-modules/pyspf { }; pyspice = callPackage ../development/python-modules/pyspice { }; @@ -6932,6 +7015,11 @@ in { inherit version; sha256 = "c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e"; }; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "pluggy>=0.12,<1.0" "pluggy>=0.12,<2.0" + ''; }); pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; @@ -7085,6 +7173,8 @@ in { pytest-shutil = callPackage ../development/python-modules/pytest-shutil { }; + python-status = callPackage ../development/python-modules/python-status { }; + python-string-utils = callPackage ../development/python-modules/python-string-utils { }; pytest-socket = callPackage ../development/python-modules/pytest-socket { }; @@ -7123,6 +7213,12 @@ in { pytest-xvfb = callPackage ../development/python-modules/pytest-xvfb { }; + python3-application = callPackage ../development/python-modules/python3-application { }; + + python3-eventlib = callPackage ../development/python-modules/python3-eventlib { }; + + python3-gnutls = callPackage ../development/python-modules/python3-gnutls { }; + python3-openid = callPackage ../development/python-modules/python3-openid { }; python-awair = callPackage ../development/python-modules/python-awair { }; @@ -7243,6 +7339,8 @@ in { python_magic = callPackage ../development/python-modules/python-magic { }; + python-manilaclient = callPackage ../development/python-modules/python-manilaclient { }; + python-mapnik = let boost = pkgs.boost.override { enablePython = true; @@ -7299,6 +7397,8 @@ in { python_openzwave = callPackage ../development/python-modules/python_openzwave { }; + python-osc = callPackage ../development/python-modules/python-osc { }; + python-packer = callPackage ../development/python-modules/python-packer { }; python-pam = callPackage ../development/python-modules/python-pam { @@ -7385,7 +7485,9 @@ in { python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; - pythran = callPackage ../development/python-modules/pythran { }; + pythran = callPackage ../development/python-modules/pythran { + inherit (pkgs.llvmPackages) openmp; + }; pyeverlights = callPackage ../development/python-modules/pyeverlights { }; @@ -7627,7 +7729,7 @@ in { queuelib = callPackage ../development/python-modules/queuelib { }; - qmk-dotty-dict = callPackage ../development/python-modules/qmk-dotty-dict {}; + qmk-dotty-dict = callPackage ../development/python-modules/qmk-dotty-dict { }; r2pipe = callPackage ../development/python-modules/r2pipe { }; @@ -7723,6 +7825,8 @@ in { remarshal = callPackage ../development/python-modules/remarshal { }; + renault-api = callPackage ../development/python-modules/renault-api { }; + rencode = callPackage ../development/python-modules/rencode { }; reparser = callPackage ../development/python-modules/reparser { }; @@ -8028,6 +8132,8 @@ in { inherit (pkgs) gfortran glibcLocales; }; + scikit-learn-extra = callPackage ../development/python-modules/scikit-learn-extra { }; + scikit-optimize = callPackage ../development/python-modules/scikit-optimize { }; scikits-odes = callPackage ../development/python-modules/scikits-odes { }; @@ -8203,6 +8309,8 @@ in { simplekml = callPackage ../development/python-modules/simplekml { }; + simple-rest-client = callPackage ../development/python-modules/simple-rest-client { }; + simple-salesforce = callPackage ../development/python-modules/simple-salesforce { }; simple-websocket-server = callPackage ../development/python-modules/simple-websocket-server { }; @@ -8567,6 +8675,8 @@ in { stdiomask = callPackage ../development/python-modules/stdiomask { }; + stdlib-list = callPackage ../development/python-modules/stdlib-list { }; + stem = callPackage ../development/python-modules/stem { }; stestr = callPackage ../development/python-modules/stestr { }; @@ -8585,6 +8695,8 @@ in { streaming-form-data = callPackage ../development/python-modules/streaming-form-data { }; + streamlabswater = callPackage ../development/python-modules/streamlabswater { }; + streamz = callPackage ../development/python-modules/streamz { }; strict-rfc3339 = callPackage ../development/python-modules/strict-rfc3339 { }; @@ -8729,6 +8841,8 @@ in { telfhash = callPackage ../development/python-modules/telfhash { }; + tempest = callPackage ../development/python-modules/tempest { }; + tempita = callPackage ../development/python-modules/tempita { }; tempora = callPackage ../development/python-modules/tempora { }; @@ -8739,7 +8853,7 @@ in { tensorboard-plugin-profile = callPackage ../development/python-modules/tensorboard-plugin-profile { }; - tensorboard-plugin-wit = callPackage ../development/python-modules/tensorboard-plugin-wit {}; + tensorboard-plugin-wit = callPackage ../development/python-modules/tensorboard-plugin-wit { }; tensorboardx = callPackage ../development/python-modules/tensorboardx { }; @@ -8845,7 +8959,6 @@ in { Theano = callPackage ../development/python-modules/Theano rec { cudaSupport = pkgs.config.cudaSupport or false; cudnnSupport = cudaSupport; - inherit (pkgs.linuxPackages) nvidia_x11; }; TheanoWithCuda = self.Theano.override { @@ -8870,6 +8983,8 @@ in { thrift = callPackage ../development/python-modules/thrift { }; + thriftpy2 = callPackage ../development/python-modules/thriftpy2 { }; + thumborPexif = callPackage ../development/python-modules/thumborpexif { }; tkinter = let @@ -9016,9 +9131,7 @@ in { trimesh = callPackage ../development/python-modules/trimesh { }; - trio = callPackage ../development/python-modules/trio { - pytestCheckHook = self.pytestCheckHook_6_1; - }; + trio = callPackage ../development/python-modules/trio { }; trueskill = callPackage ../development/python-modules/trueskill { }; @@ -9108,6 +9221,10 @@ in { types-decorator = callPackage ../development/python-modules/types-decorator { }; + types-futures = callPackage ../development/python-modules/types-futures { }; + + types-protobuf = callPackage ../development/python-modules/types-protobuf { }; + types-pytz = callPackage ../development/python-modules/types-pytz { }; types-requests = callPackage ../development/python-modules/types-requests { }; @@ -9238,9 +9355,7 @@ in { urlgrabber = callPackage ../development/python-modules/urlgrabber { }; - urllib3 = callPackage ../development/python-modules/urllib3 { - pytestCheckHook = self.pytestCheckHook_6_1; - }; + urllib3 = callPackage ../development/python-modules/urllib3 { }; urlpy = callPackage ../development/python-modules/urlpy { }; @@ -9298,6 +9413,8 @@ in { venusian = callPackage ../development/python-modules/venusian { }; + velbus-aio = callPackage ../development/python-modules/velbus-aio { }; + verboselogs = callPackage ../development/python-modules/verboselogs { }; versioneer = callPackage ../development/python-modules/versioneer { }; @@ -9397,7 +9514,8 @@ in { wasm = callPackage ../development/python-modules/wasm { }; - wasmer = callPackage ../development/python-modules/wasmer { }; + wasmerPackages = pkgs.recurseIntoAttrs (callPackage ../development/python-modules/wasmer { }); + inherit (self.wasmerPackages) wasmer wasmer-compiler-cranelift wasmer-compiler-llvm wasmer-compiler-singlepass; watchdog = callPackage ../development/python-modules/watchdog { inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; @@ -9457,9 +9575,7 @@ in { webthing = callPackage ../development/python-modules/webthing { }; - werkzeug = callPackage ../development/python-modules/werkzeug { - pytestCheckHook = self.pytestCheckHook_6_1; - }; + werkzeug = callPackage ../development/python-modules/werkzeug { }; west = callPackage ../development/python-modules/west { }; @@ -9513,6 +9629,8 @@ in { wsgi-intercept = callPackage ../development/python-modules/wsgi-intercept { }; + wsgiprox = callPackage ../development/python-modules/wsgiprox { }; + wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { }; wsgitools = callPackage ../development/python-modules/wsgitools { }; diff --git a/nixpkgs/pkgs/top-level/python2-packages.nix b/nixpkgs/pkgs/top-level/python2-packages.nix index caa44e5947e1..07773c29e801 100644 --- a/nixpkgs/pkgs/top-level/python2-packages.nix +++ b/nixpkgs/pkgs/top-level/python2-packages.nix @@ -36,6 +36,10 @@ with self; with super; { box2d = callPackage ../development/python-modules/box2d { }; + boto3 = callPackage ../development/python-modules/boto3/1_17.nix {}; + + botocore = callPackage ../development/python-modules/botocore/1_20.nix {}; + browsermob-proxy = callPackage ../development/python-modules/browsermob-proxy { }; cairocffi = callPackage ../development/python-modules/cairocffi/0_9.nix { }; @@ -70,6 +74,8 @@ with self; with super; { construct = callPackage ../development/python-modules/construct/2.10.54.nix { }; + contextlib2 = callPackage ../development/python-modules/contextlib2/0.nix { }; + convertdate = callPackage ../development/python-modules/convertdate/2.2.x.nix { }; cryptography = callPackage ../development/python-modules/cryptography/3.3.nix { }; @@ -80,6 +86,8 @@ with self; with super; { dateparser = callPackage ../development/python-modules/dateparser/0.x.nix { }; + decorator = callPackage ../development/python-modules/decorator/4.nix { }; + deskcon = callPackage ../development/python-modules/deskcon { }; django_evolution = callPackage ../development/python-modules/django_evolution { }; @@ -393,6 +401,8 @@ with self; with super; { pip = callPackage ../development/python-modules/pip/20.nix { }; + pluggy = callPackage ../development/python-modules/pluggy/0.nix { }; + postorius = disabled super.postorius; praw = callPackage ../development/python-modules/praw/6.3.nix { }; @@ -538,6 +548,8 @@ with self; with super; { rsa = callPackage ../development/python-modules/rsa/4_0.nix { }; + s3transfer = callPackage ../development/python-modules/s3transfer/0_4.nix { }; + sandboxlib = callPackage ../development/python-modules/sandboxlib { }; scandir = callPackage ../development/python-modules/scandir { }; diff --git a/nixpkgs/pkgs/top-level/release-haskell.nix b/nixpkgs/pkgs/top-level/release-haskell.nix index 367bf95b3d83..8801fc5246c2 100644 --- a/nixpkgs/pkgs/top-level/release-haskell.nix +++ b/nixpkgs/pkgs/top-level/release-haskell.nix @@ -252,6 +252,9 @@ let # remove integer-simple because it appears to be broken with # musl and non-static-linking. integer-simple = {}; + + ghcjs = {}; + ghcjs810 = {}; }; # Get some cache going for MUSL-enabled GHC. @@ -300,12 +303,10 @@ let # package sets (like Cabal, jailbreak-cabal) are # working as expected. cabal-install = all; - Cabal_3_6_0_0 = with compilerNames; [ ghc884 ghc8107 ]; + Cabal_3_6_1_0 = with compilerNames; [ ghc884 ghc8107 ghc901 ghc921 ]; cabal2nix-unstable = all; funcmp = all; - # Doesn't currently work on ghc-9.0: - # https://github.com/haskell/haskell-language-server/issues/297 - haskell-language-server = with compilerNames; [ ghc884 ghc8107 ]; + haskell-language-server = all; hoogle = all; hsdns = all; jailbreak-cabal = all; diff --git a/nixpkgs/pkgs/top-level/ruby-packages.nix b/nixpkgs/pkgs/top-level/ruby-packages.nix index 3ced3d8e4c37..e37c9e277afb 100644 --- a/nixpkgs/pkgs/top-level/ruby-packages.nix +++ b/nixpkgs/pkgs/top-level/ruby-packages.nix @@ -130,6 +130,16 @@ }; version = "2.4.0"; }; + ansi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14ims9zfal4gs2wpx2m5rd8zsrl2k794d359shkrsgg3fhr2a22l"; + type = "gem"; + }; + version = "1.5.0"; + }; ast = { groups = ["default"]; platforms = []; diff --git a/nixpkgs/pkgs/top-level/stage.nix b/nixpkgs/pkgs/top-level/stage.nix index 84c4d8fc4059..a990c5ed70cb 100644 --- a/nixpkgs/pkgs/top-level/stage.nix +++ b/nixpkgs/pkgs/top-level/stage.nix @@ -235,7 +235,6 @@ let overlays = [ (self': super': { pkgsStatic = super'; })] ++ overlays; - crossOverlays = [ (import ./static.nix) ]; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { crossSystem = { isStatic = true; diff --git a/nixpkgs/pkgs/top-level/static.nix b/nixpkgs/pkgs/top-level/static.nix deleted file mode 100644 index 449f825be0b6..000000000000 --- a/nixpkgs/pkgs/top-level/static.nix +++ /dev/null @@ -1,117 +0,0 @@ -# Overlay that builds static packages. - -# Not all packages will build but support is done on a -# best effort basic. -# -# Note on Darwin/macOS: Apple does not provide a static libc -# so any attempts at static binaries are going to be very -# unsupported. -# -# Basic things like pkgsStatic.hello should work out of the box. More -# complicated things will need to be fixed with overrides. - -self: super: let - inherit (super.stdenvAdapters) makeStaticBinaries - makeStaticLibraries - propagateBuildInputs; - inherit (super.lib) foldl optional flip id composeExtensions optionalAttrs optionalString; - inherit (super) makeSetupHook; - - # Best effort static binaries. Will still be linked to libSystem, - # but more portable than Nix store binaries. - makeStaticDarwin = stdenv_: let stdenv = stdenv_.override { - # extraBuildInputs are dropped in cross.nix, but darwin still needs them - extraBuildInputs = [ self.buildPackages.darwin.CF ]; - }; in stdenv // { - mkDerivation = args: stdenv.mkDerivation (args // { - NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") - + optionalString (stdenv_.cc.isGNU or false) " -static-libgcc"; - nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ (makeSetupHook { - substitutions = { - libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib"; - }; - } ../stdenv/darwin/portable-libsystem.sh) ]; - }); - }; - - staticAdapters = - optional super.stdenv.hostPlatform.isDarwin makeStaticDarwin - - ++ [ makeStaticLibraries propagateBuildInputs ] - - # Apple does not provide a static version of libSystem or crt0.o - # So we can’t build static binaries without extensive hacks. - ++ optional (!super.stdenv.hostPlatform.isDarwin) makeStaticBinaries - - # Glibc doesn’t come with static runtimes by default. - # ++ optional (super.stdenv.hostPlatform.libc == "glibc") ((flip overrideInStdenv) [ self.stdenv.glibc.static ]) - ; - - ocamlFixPackage = b: - b.overrideAttrs (o: { - configurePlatforms = [ ]; - dontAddStaticConfigureFlags = true; - buildInputs = o.buildInputs ++ o.nativeBuildInputs or [ ]; - propagatedNativeBuildInputs = o.propagatedBuildInputs or [ ]; - }); - - ocamlStaticAdapter = _: super: - self.lib.mapAttrs - (_: p: if p ? overrideAttrs then ocamlFixPackage p else p) - super - // { - lablgtk = null; # Currently xlibs cause infinite recursion - ocaml = ((super.ocaml.override { useX11 = false; }).overrideAttrs (o: { - configurePlatforms = [ ]; - dontUpdateAutotoolsGnuConfigScripts = true; - })).overrideDerivation (o: { - preConfigure = '' - configureFlagsArray+=("-cc" "$CC" "-as" "$AS" "-partialld" "$LD -r") - ''; - dontAddStaticConfigureFlags = true; - configureFlags = [ - "--no-shared-libs" - "-host ${o.stdenv.hostPlatform.config}" - "-target ${o.stdenv.targetPlatform.config}" - ]; - }); - }; - -in { - stdenv = foldl (flip id) super.stdenv staticAdapters; - - 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; - }; - - liblinear = super.liblinear.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; - - perl = super.perl.override { - # Don’t use new stdenv zlib because - # it doesn’t like the --disable-shared flag - stdenv = super.stdenv; - }; - - zlib = super.zlib.override { - # Don’t use new stdenv zlib because - # it doesn’t like the --disable-shared flag - stdenv = super.stdenv; - }; -} |