diff options
646 files changed, 8165 insertions, 5064 deletions
diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index adc8fa1e3ea..341656d9392 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -11,7 +11,7 @@ name: "Periodic Merges (24h)" on: schedule: # * is a special character in YAML so you have to quote this string - # Merge every 6 hours + # Merge every 24 hours - cron: '0 0 * * *' jobs: diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index 348f66d4279..934e6cdca12 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -241,7 +241,7 @@ let git # replace with beam.packages.erlang.elixir_1_11 if you need beam.packages.erlang.elixir - nodejs-15_x + nodejs postgresql_13 # only used for frontend dependencies # you are free to use yarn2nix as well diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 54face47d1e..847a41cf23c 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -439,7 +439,7 @@ The following example shows which arguments are given to `buildPythonPackage` in order to build [`datashape`](https://github.com/blaze/datashape). ```nix -{ lib, buildPythonPackage, fetchPypi, numpy, multipledispatch, dateutil, pytest }: +{ lib, buildPythonPackage, fetchPypi, numpy, multipledispatch, python-dateutil, pytest }: buildPythonPackage rec { pname = "datashape"; @@ -451,7 +451,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ numpy multipledispatch dateutil ]; + propagatedBuildInputs = [ numpy multipledispatch python-dateutil ]; meta = with lib; { homepage = "https://github.com/ContinuumIO/datashape"; @@ -463,7 +463,7 @@ buildPythonPackage rec { ``` We can see several runtime dependencies, `numpy`, `multipledispatch`, and -`dateutil`. Furthermore, we have one `checkInputs`, i.e. `pytest`. `pytest` is a +`python-dateutil`. Furthermore, we have one `checkInputs`, i.e. `pytest`. `pytest` is a test runner and is only used during the `checkPhase` and is therefore not added to `propagatedBuildInputs`. diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 7219b5e80f7..e3e7b4c850b 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -1125,9 +1125,13 @@ There are flags available to harden packages at compile or link-time. These can Both parameters take a list of flags as strings. The special `"all"` flag can be passed to `hardeningDisable` to turn off all hardening. These flags can also be used as environment variables for testing or development purposes. +For more in-depth information on these hardening flags and hardening in general, refer to the [Debian Wiki](https://wiki.debian.org/Hardening), [Ubuntu Wiki](https://wiki.ubuntu.com/Security/Features), [Gentoo Wiki](https://wiki.gentoo.org/wiki/Project:Hardened), and the [Arch Wiki](https://wiki.archlinux.org/title/Security). + +### Hardening flags enabled by default {#sec-hardening-flags-enabled-by-default} + The following flags are enabled by default and might require disabling with `hardeningDisable` if the program to package is incompatible. -### `format` {#format} +#### `format` {#format} Adds the `-Wformat -Wformat-security -Werror=format-security` compiler options. At present, this warns about calls to `printf` and `scanf` functions where the format string is not a string literal and there are no format arguments, as in `printf(foo);`. This may be a security hole if the format string came from untrusted input and contains `%n`. @@ -1140,7 +1144,7 @@ This needs to be turned off or fixed for errors similar to: cc1plus: some warnings being treated as errors ``` -### `stackprotector` {#stackprotector} +#### `stackprotector` {#stackprotector} Adds the `-fstack-protector-strong --param ssp-buffer-size=4` compiler options. This adds safety checks against stack overwrites rendering many potential code injection attacks into aborting situations. In the best case this turns code injection vulnerabilities into denial of service or into non-issues (depending on the application). @@ -1151,7 +1155,7 @@ bin/blib.a(bios_console.o): In function `bios_handle_cup': /tmp/nix-build-ipxe-20141124-5cbdc41.drv-0/ipxe-5cbdc41/src/arch/i386/firmware/pcbios/bios_console.c:86: undefined reference to `__stack_chk_fail' ``` -### `fortify` {#fortify} +#### `fortify` {#fortify} Adds the `-O2 -D_FORTIFY_SOURCE=2` compiler options. During code generation the compiler knows a great deal of information about buffer sizes (where possible), and attempts to replace insecure unlimited length buffer function calls with length-limited ones. This is especially useful for old, crufty code. Additionally, format strings in writable memory that contain `%n` are blocked. If an application depends on such a format string, it will need to be worked around. @@ -1172,7 +1176,7 @@ installwatch.c:3751:5: error: conflicting types for '__open_2' fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute error: open with O_CREAT or O_TMPFILE in second argument needs 3 arguments ``` -### `pic` {#pic} +#### `pic` {#pic} Adds the `-fPIC` compiler options. This options adds support for position independent code in shared libraries and thus making ASLR possible. @@ -1185,19 +1189,19 @@ ccbLfRgg.s: Assembler messages: ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_len@GOTOFF' ``` -### `strictoverflow` {#strictoverflow} +#### `strictoverflow` {#strictoverflow} Signed integer overflow is undefined behaviour according to the C standard. If it happens, it is an error in the program as it should check for overflow before it can happen, not afterwards. GCC provides built-in functions to perform arithmetic with overflow checking, which are correct and faster than any custom implementation. As a workaround, the option `-fno-strict-overflow` makes gcc behave as if signed integer overflows were defined. This flag should not trigger any build or runtime errors. -### `relro` {#relro} +#### `relro` {#relro} Adds the `-z relro` linker option. During program load, several ELF memory sections need to be written to by the linker, but can be turned read-only before turning over control to the program. This prevents some GOT (and .dtors) overwrite attacks, but at least the part of the GOT used by the dynamic linker (.got.plt) is still vulnerable. This flag can break dynamic shared object loading. For instance, the module systems of Xorg and OpenCV are incompatible with this flag. In almost all cases the `bindnow` flag must also be disabled and incompatible programs typically fail with similar errors at runtime. -### `bindnow` {#bindnow} +#### `bindnow` {#bindnow} Adds the `-z bindnow` linker option. During program load, all dynamic symbols are resolved, allowing for the complete GOT to be marked read-only (due to `relro`). This prevents GOT overwrite attacks. For very large applications, this can incur some performance loss during initial load while symbols are resolved, but this shouldn’t be an issue for daemons. @@ -1207,13 +1211,18 @@ This flag can break dynamic shared object loading. For instance, the module syst intel_drv.so: undefined symbol: vgaHWFreeHWRec ``` +### Hardening flags disabled by default {#sec-hardening-flags-disabled-by-default} + The following flags are disabled by default and should be enabled with `hardeningEnable` for packages that take untrusted input like network services. -### `pie` {#pie} +#### `pie` {#pie} + +This flag is disabled by default for normal `glibc` based NixOS package builds, but enabled by default for `musl` based package builds. Adds the `-fPIE` compiler and `-pie` linker options. Position Independent Executables are needed to take advantage of Address Space Layout Randomization, supported by modern kernel versions. While ASLR can already be enforced for data areas in the stack and heap (brk and mmap), the code areas must be compiled as position-independent. Shared libraries already do this with the `pic` flag, so they gain ASLR automatically, but binary .text regions need to be build with `pie` to gain ASLR. When this happens, ROP attacks are much harder since there are no static locations to bounce off of during a memory corruption attack. -For more in-depth information on these hardening flags and hardening in general, refer to the [Debian Wiki](https://wiki.debian.org/Hardening), [Ubuntu Wiki](https://wiki.ubuntu.com/Security/Features), [Gentoo Wiki](https://wiki.gentoo.org/wiki/Project:Hardened), and the [Arch Wiki](https://wiki.archlinux.org/index.php/DeveloperWiki:Security). +Static libraries need to be compiled with `-fPIE` so that executables can link them in with the `-pie` linker option. +If the libraries lack `-fPIE`, you will get the error `recompile with -fPIE`. [^footnote-stdenv-ignored-build-platform]: The build platform is ignored because it is a mere implementation detail of the package satisfying the dependency: As a general programming principle, dependencies are always *specified* as interfaces, not concrete implementation. [^footnote-stdenv-native-dependencies-in-path]: Currently, this means for native builds all dependencies are put on the `PATH`. But in the future that may not be the case for sake of matching cross: the platforms would be assumed to be unique for native and cross builds alike, so only the `depsBuild*` and `nativeBuildInputs` would be added to the `PATH`. diff --git a/lib/strings.nix b/lib/strings.nix index 49fa0196a0b..86c92bdaa15 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -95,7 +95,7 @@ rec { result with the specified separator interspersed between elements. - Type: concatMapStringsSep :: string -> (string -> string) -> [string] -> string + Type: concatMapStringsSep :: string -> (a -> string) -> [a] -> string Example: concatMapStringsSep "-" (x: toUpper x) ["foo" "bar" "baz"] @@ -112,7 +112,7 @@ rec { /* Same as `concatMapStringsSep`, but the mapping function additionally receives the position of its argument. - Type: concatIMapStringsSep :: string -> (int -> string -> string) -> [string] -> string + Type: concatIMapStringsSep :: string -> (int -> a -> string) -> [a] -> string Example: concatImapStringsSep "-" (pos: x: toString (x / pos)) [ 6 6 6 ] diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5cff742efe9..9aaa726485d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1915,6 +1915,16 @@ githubId = 3956062; name = "Simon Lackerbauer"; }; + citadelcore = { + email = "alex@arctarus.co.uk"; + github = "citadelcore"; + githubId = 5567402; + name = "Alex Zero"; + keys = [{ + longkeyid = "rsa4096/0xA51550EDB450302C"; + fingerprint = "A0AA 4646 B8F6 9D45 4553 5A88 A515 50ED B450 302C"; + }]; + }; cizra = { email = "todurov+nix@gmail.com"; github = "cizra"; @@ -4061,6 +4071,12 @@ github = "gytis-ivaskevicius"; githubId = 23264966; }; + hagl = { + email = "harald@glie.be"; + github = "hagl"; + githubId = 1162118; + name = "Harald Gliebe"; + }; hakuch = { email = "hakuch@gmail.com"; github = "hakuch"; @@ -5422,6 +5438,16 @@ githubId = 788813; name = "Bryan Gardiner"; }; + khushraj = { + email = "khushraj.rathod@gmail.com"; + github = "KhushrajRathod"; + githubId = 44947946; + name = "Khushraj Rathod"; + keys = [{ + longkeyid = "rsa2048/0xB77B2A40E7702F19"; + fingerprint = "1988 3FD8 EA2E B4EC 0A93 1E22 B77B 2A40 E770 2F19"; + }]; + }; KibaFox = { email = "kiba.fox@foxypossibilities.com"; github = "KibaFox"; @@ -8192,6 +8218,12 @@ githubId = 1179566; name = "Nicolas B. Pierron"; }; + pimeys = { + email = "julius@nauk.io"; + github = "pimeys"; + githubId = 34967; + name = "Julius de Bruijn"; + }; pingiun = { email = "nixos@pingiun.com"; github = "pingiun"; @@ -10638,6 +10670,12 @@ github = "totoroot"; githubId = 39650930; }; + ToxicFrog = { + email = "toxicfrog@ancilla.ca"; + github = "ToxicFrog"; + githubId = 90456; + name = "Rebecca (Bex) Kelly"; + }; travisbhartwell = { email = "nafai@travishartwell.net"; github = "travisbhartwell"; diff --git a/nixos/doc/manual/administration/boot-problems.section.md b/nixos/doc/manual/administration/boot-problems.section.md index eb9209602a3..dee83e7ec22 100644 --- a/nixos/doc/manual/administration/boot-problems.section.md +++ b/nixos/doc/manual/administration/boot-problems.section.md @@ -30,6 +30,12 @@ If NixOS fails to boot, there are a number of kernel command line parameters tha : Make systemd very verbose and send log messages to the console instead of the journal. For more parameters recognised by systemd, see systemd(1). +In addition, these arguments are recognised by the live image only: + +`live.nixos.passwd=password` + +: Set the password for the `nixos` live user. This can be used for SSH access if there are issues using the terminal. + Notice that for `boot.shell_on_fail`, `boot.debug1`, `boot.debug1devices`, and `boot.debug1mounts`, if you did **not** select "start the new shell as pid 1", and you `exit` from the new shell, boot will proceed normally from the point where it failed, as if you'd chosen "ignore the error and continue". If no login prompts or X11 login screens appear (e.g. due to hanging dependencies), you can press Alt+ArrowUp. If you’re lucky, this will start rescue mode (described above). (Also note that since most units have a 90-second timeout before systemd gives up on them, the `agetty` login prompts should appear eventually unless something is very wrong.) diff --git a/nixos/doc/manual/from_md/administration/boot-problems.section.xml b/nixos/doc/manual/from_md/administration/boot-problems.section.xml index b484d075818..4ea01e78f32 100644 --- a/nixos/doc/manual/from_md/administration/boot-problems.section.xml +++ b/nixos/doc/manual/from_md/administration/boot-problems.section.xml @@ -107,6 +107,23 @@ </varlistentry> </variablelist> <para> + In addition, these arguments are recognised by the live image only: + </para> + <variablelist> + <varlistentry> + <term> + <literal>live.nixos.passwd=password</literal> + </term> + <listitem> + <para> + Set the password for the <literal>nixos</literal> live user. + This can be used for SSH access if there are issues using the + terminal. + </para> + </listitem> + </varlistentry> + </variablelist> + <para> Notice that for <literal>boot.shell_on_fail</literal>, <literal>boot.debug1</literal>, <literal>boot.debug1devices</literal>, and diff --git a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml index e043bee7761..f4155d6f8ce 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2105.section.xml @@ -101,16 +101,18 @@ <listitem> <para> <link xlink:href="https://www.gnuradio.org/">GNURadio</link> - 3.8 was + 3.8 and 3.9 were <link xlink:href="https://github.com/NixOS/nixpkgs/issues/82263">finally</link> packaged, along with a rewrite to the Nix expressions, allowing users to override the features upstream supports selecting to compile or not to. Additionally, the attribute - <literal>gnuradio</literal> and <literal>gnuradio3_7</literal> - now point to an externally wrapped by default derivations, - that allow you to also add `extraPythonPackages` to the Python - interpreter used by GNURadio. Missing environmental variables - needed for operational GUI were also added + <literal>gnuradio</literal> (3.9), + <literal>gnuradio3_8</literal> and + <literal>gnuradio3_7</literal> now point to an externally + wrapped by default derivations, that allow you to also add + `extraPythonPackages` to the Python interpreter used by + GNURadio. Missing environmental variables needed for + operational GUI were also added (<link xlink:href="https://github.com/NixOS/nixpkgs/issues/75478">#75478</link>). </para> </listitem> @@ -1026,7 +1028,7 @@ self: super: <para> <link xlink:href="https://kodi.tv/">Kodi</link> has been updated to version 19.1 "Matrix". See the - <link xlink:href="https://kodi.tv/article/kodi-190-matrix-release">announcement</link> + <link xlink:href="https://kodi.tv/article/kodi-19-0-matrix-release">announcement</link> for further details. </para> </listitem> diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index abd10a6f9a7..a95b1dd66b9 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -27,6 +27,15 @@ <itemizedlist> <listitem> <para> + <link xlink:href="https://digint.ch/btrbk/index.html">btrbk</link>, + 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 + <link xlink:href="options.html#opt-services.brtbk.instances">services.btrbk</link>. + </para> + </listitem> + <listitem> + <para> <link xlink:href="https://github.com/maxmind/geoipupdate">geoipupdate</link>, a GeoIP database updater from MaxMind. Available as <link xlink:href="options.html#opt-services.geoipupdate.enable">services.geoipupdate</link>. @@ -64,7 +73,7 @@ <listitem> <para> The <literal>staticjinja</literal> package has been upgraded - from 1.0.4 to 2.0.0 + from 1.0.4 to 3.0.1 </para> </listitem> <listitem> @@ -339,6 +348,126 @@ release instead of the old 2.31.0 version. </para> </listitem> + <listitem> + <para> + The <literal>bitwarden_rs</literal> packages and modules were + renamed to <literal>vaultwarden</literal> + <link xlink:href="https://github.com/dani-garcia/vaultwarden/discussions/1642">following + upstream</link>. More specifically, + </para> + <itemizedlist> + <listitem> + <para> + <literal>pkgs.bitwarden_rs</literal>, + <literal>pkgs.bitwarden_rs-sqlite</literal>, + <literal>pkgs.bitwarden_rs-mysql</literal> and + <literal>pkgs.bitwarden_rs-postgresql</literal> were + renamed to <literal>pkgs.vaultwarden</literal>, + <literal>pkgs.vaultwarden-sqlite</literal>, + <literal>pkgs.vaultwarden-mysql</literal> and + <literal>pkgs.vaultwarden-postgresql</literal>, + respectively. + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + Old names are preserved as aliases for backwards + compatibility, but may be removed in the future. + </para> + </listitem> + <listitem> + <para> + The <literal>bitwarden_rs</literal> executable was + also renamed to <literal>vaultwarden</literal> in all + packages. + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + <literal>pkgs.bitwarden_rs-vault</literal> was renamed to + <literal>pkgs.vaultwarden-vault</literal>. + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + <literal>pkgs.bitwarden_rs-vault</literal> is + preserved as an alias for backwards compatibility, but + may be removed in the future. + </para> + </listitem> + <listitem> + <para> + The static files were moved from + <literal>/usr/share/bitwarden_rs</literal> to + <literal>/usr/share/vaultwarden</literal>. + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + The <literal>services.bitwarden_rs</literal> config module + was renamed to <literal>services.vaultwarden</literal>. + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + <literal>services.bitwarden_rs</literal> is preserved + as an alias for backwards compatibility, but may be + removed in the future. + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + <literal>systemd.services.bitwarden_rs</literal>, + <literal>systemd.services.backup-bitwarden_rs</literal> + and <literal>systemd.timers.backup-bitwarden_rs</literal> + were renamed to + <literal>systemd.services.vaultwarden</literal>, + <literal>systemd.services.backup-vaultwarden</literal> and + <literal>systemd.timers.backup-vaultwarden</literal>, + respectively. + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + Old names are preserved as aliases for backwards + compatibility, but may be removed in the future. + </para> + </listitem> + </itemizedlist> + </listitem> + <listitem> + <para> + <literal>users.users.bitwarden_rs</literal> and + <literal>users.groups.bitwarden_rs</literal> were renamed + to <literal>users.users.vaultwarden</literal> and + <literal>users.groups.vaultwarden</literal>, respectively. + </para> + </listitem> + <listitem> + <para> + The data directory remains located at + <literal>/var/lib/bitwarden_rs</literal>, for backwards + compatibility. + </para> + </listitem> + </itemizedlist> + </listitem> + </itemizedlist> + <itemizedlist spacing="compact"> + <listitem> + <para> + <literal>yggdrasil</literal> was upgraded to a new major + release with breaking changes, see + <link xlink:href="https://github.com/yggdrasil-network/yggdrasil-go/releases/tag/v0.4.0">upstream + changelog</link>. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-21.11-notable-changes"> diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index f03b9443d23..d019bb31809 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -446,8 +446,8 @@ password for the <literal>root</literal> user, e.g. <screen> setting root password... -Enter new UNIX password: *** -Retype new UNIX password: ***</screen> +New password: *** +Retype new password: ***</screen> <note> <para> For unattended installations, it is possible to use diff --git a/nixos/doc/manual/preface.xml b/nixos/doc/manual/preface.xml index 0f7db6ef1a8..ded6bdc87de 100644 --- a/nixos/doc/manual/preface.xml +++ b/nixos/doc/manual/preface.xml @@ -20,8 +20,8 @@ <literal xlink:href="https://discourse.nixos.org">Discourse</literal> or on the <link - xlink:href="irc://irc.freenode.net/#nixos"> - <literal>#nixos</literal> channel on Freenode</link>, or + xlink:href="irc://irc.libera.chat/#nixos"> + <literal>#nixos</literal> channel on Libera.Chat</link>, or consider <link xlink:href="#chap-contributing"> diff --git a/nixos/doc/manual/release-notes/rl-2105.section.md b/nixos/doc/manual/release-notes/rl-2105.section.md index e4565b8ca60..49b97c203fe 100644 --- a/nixos/doc/manual/release-notes/rl-2105.section.md +++ b/nixos/doc/manual/release-notes/rl-2105.section.md @@ -36,7 +36,7 @@ In addition to numerous new and upgraded packages, this release has the followin The following new services were added since the last release: -- [GNURadio](https://www.gnuradio.org/) 3.8 was [finally](https://github.com/NixOS/nixpkgs/issues/82263) packaged, along with a rewrite to the Nix expressions, allowing users to override the features upstream supports selecting to compile or not to. Additionally, the attribute `gnuradio` and `gnuradio3_7` now point to an externally wrapped by default derivations, that allow you to also add \`extraPythonPackages\` to the Python interpreter used by GNURadio. Missing environmental variables needed for operational GUI were also added ([\#75478](https://github.com/NixOS/nixpkgs/issues/75478)). +- [GNURadio](https://www.gnuradio.org/) 3.8 and 3.9 were [finally](https://github.com/NixOS/nixpkgs/issues/82263) packaged, along with a rewrite to the Nix expressions, allowing users to override the features upstream supports selecting to compile or not to. Additionally, the attribute `gnuradio` (3.9), `gnuradio3_8` and `gnuradio3_7` now point to an externally wrapped by default derivations, that allow you to also add \`extraPythonPackages\` to the Python interpreter used by GNURadio. Missing environmental variables needed for operational GUI were also added ([\#75478](https://github.com/NixOS/nixpkgs/issues/75478)). - [Keycloak](https://www.keycloak.org/), an open source identity and access management server with support for [OpenID Connect](https://openid.net/connect/), [OAUTH 2.0](https://oauth.net/2/) and [SAML 2.0](https://en.wikipedia.org/wiki/SAML_2.0). @@ -300,7 +300,7 @@ When upgrading from a previous release, please be aware of the following incompa Regarding the NixOS module, new options for HTTPS inspection have been added and `services.privoxy.extraConfig` has been replaced by the new [services.privoxy.settings](options.html#opt-services.privoxy.settings) (See [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) for the motivation). -- [Kodi](https://kodi.tv/) has been updated to version 19.1 \"Matrix\". See the [announcement](https://kodi.tv/article/kodi-190-matrix-release) for further details. +- [Kodi](https://kodi.tv/) has been updated to version 19.1 \"Matrix\". See the [announcement](https://kodi.tv/article/kodi-19-0-matrix-release) for further details. - The `services.packagekit.backend` option has been removed as it only supported a single setting which would always be the default. Instead new [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) compliant [services.packagekit.settings](options.html#opt-services.packagekit.settings) and [services.packagekit.vendorSettings](options.html#opt-services.packagekit.vendorSettings) options have been introduced. diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 1b7250a1815..be46591dfa1 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -10,6 +10,8 @@ In addition to numerous new and upgraded packages, this release has the followin ## 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). + - [geoipupdate](https://github.com/maxmind/geoipupdate), a GeoIP database updater from MaxMind. Available as [services.geoipupdate](options.html#opt-services.geoipupdate.enable). - [sourcehut](https://sr.ht), a collection of tools useful for software development. Available as [services.sourcehut](options.html#opt-services.sourcehut.enable). @@ -20,7 +22,7 @@ In addition to numerous new and upgraded packages, this release has the followin ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} -- The `staticjinja` package has been upgraded from 1.0.4 to 2.0.0 +- The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1 - `services.geoip-updater` was broken and has been replaced by [services.geoipupdate](options.html#opt-services.geoipupdate.enable). @@ -85,6 +87,34 @@ In addition to numerous new and upgraded packages, this release has the followin * The `libwnck` package now defaults to the 3.x release instead of the old 2.31.0 version. +* 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-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`. + + * 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 + `users.groups.vaultwarden`, respectively. + + * 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). + ## Other Notable Changes {#sec-release-21.11-notable-changes} - 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. diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 6c7ea293e8a..aecb65b8c57 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -30,5 +30,16 @@ with lib; # Add Memtest86+ to the CD. boot.loader.grub.memtest86.enable = true; + boot.postBootCommands = '' + for o in $(</proc/cmdline); do + case "$o" in + live.nixos.passwd=*) + set -- $(IFS==; echo $o) + echo "nixos:$2" | ${pkgs.shadow}/bin/chpasswd + ;; + esac + done + ''; + system.stateVersion = mkDefault "18.03"; } diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2d0f5d37f9e..980e7027c98 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -260,6 +260,7 @@ ./services/backup/bacula.nix ./services/backup/borgbackup.nix ./services/backup/borgmatic.nix + ./services/backup/btrbk.nix ./services/backup/duplicati.nix ./services/backup/duplicity.nix ./services/backup/mysql-backup.nix @@ -874,7 +875,6 @@ ./services/search/hound.nix ./services/search/kibana.nix ./services/search/solr.nix - ./services/security/bitwarden_rs/default.nix ./services/security/certmgr.nix ./services/security/cfssl.nix ./services/security/clamav.nix @@ -900,6 +900,7 @@ ./services/security/torsocks.nix ./services/security/usbguard.nix ./services/security/vault.nix + ./services/security/vaultwarden/default.nix ./services/security/yubikey-agent.nix ./services/system/cloud-init.nix ./services/system/dbus.nix diff --git a/nixos/modules/programs/hamster.nix b/nixos/modules/programs/hamster.nix index b2f4a82b260..0bb56ad7ff3 100644 --- a/nixos/modules/programs/hamster.nix +++ b/nixos/modules/programs/hamster.nix @@ -6,7 +6,7 @@ with lib; meta.maintainers = pkgs.hamster.meta.maintainers; options.programs.hamster.enable = - mkEnableOption "Whether to enable hamster time tracking."; + mkEnableOption "hamster, a time tracking program"; config = lib.mkIf config.programs.hamster.enable { environment.systemPackages = [ pkgs.hamster ]; diff --git a/nixos/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix index 8039763facc..8b500f0383f 100644 --- a/nixos/modules/programs/ssmtp.nix +++ b/nixos/modules/programs/ssmtp.nix @@ -124,7 +124,8 @@ in example = "/run/keys/ssmtp-authpass"; description = '' Path to a file that contains the password used for SMTP auth. The file - should not contain a trailing newline, if the password does not contain one. + should not contain a trailing newline, if the password does not contain one + (e.g. use <command>echo -n "password" > file</command>). This file should be readable by the users that need to execute ssmtp. ''; }; diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix index 646708e01c4..fc8a1bc3c23 100644 --- a/nixos/modules/services/amqp/rabbitmq.nix +++ b/nixos/modules/services/amqp/rabbitmq.nix @@ -57,7 +57,7 @@ in { description = '' Port on which RabbitMQ will listen for AMQP connections. ''; - type = types.int; + type = types.port; }; dataDir = mkOption { diff --git a/nixos/modules/services/backup/btrbk.nix b/nixos/modules/services/backup/btrbk.nix new file mode 100644 index 00000000000..a8ff71f609a --- /dev/null +++ b/nixos/modules/services/backup/btrbk.nix @@ -0,0 +1,220 @@ +{ config, pkgs, lib, ... }: +let + cfg = config.services.btrbk; + sshEnabled = cfg.sshAccess != [ ]; + serviceEnabled = cfg.instances != { }; + attr2Lines = attr: + let + pairs = lib.attrsets.mapAttrsToList (name: value: { inherit name value; }) attr; + isSubsection = value: + if builtins.isAttrs value then true + else if builtins.isString value then false + else throw "invalid type in btrbk config ${builtins.typeOf value}"; + sortedPairs = lib.lists.partition (x: isSubsection x.value) pairs; + in + lib.flatten ( + # non subsections go first + ( + map (pair: [ "${pair.name} ${pair.value}" ]) sortedPairs.wrong + ) + ++ # subsections go last + ( + map + ( + pair: + lib.mapAttrsToList + ( + childname: value: + [ "${pair.name} ${childname}" ] ++ (map (x: " " + x) (attr2Lines value)) + ) + pair.value + ) + sortedPairs.right + ) + ) + ; + addDefaults = settings: { backend = "btrfs-progs-sudo"; } // settings; + mkConfigFile = settings: lib.concatStringsSep "\n" (attr2Lines (addDefaults settings)); + mkTestedConfigFile = name: settings: + let + configFile = pkgs.writeText "btrbk-${name}.conf" (mkConfigFile settings); + in + pkgs.runCommand "btrbk-${name}-tested.conf" { } '' + mkdir foo + cp ${configFile} $out + if (set +o pipefail; ${pkgs.btrbk}/bin/btrbk -c $out ls foo 2>&1 | grep $out); + then + echo btrbk configuration is invalid + cat $out + exit 1 + fi; + ''; +in +{ + options = { + services.btrbk = { + extraPackages = lib.mkOption { + description = "Extra packages for btrbk, like compression utilities for <literal>stream_compress</literal>"; + type = lib.types.listOf lib.types.package; + default = [ ]; + example = lib.literalExample "[ pkgs.xz ]"; + }; + niceness = lib.mkOption { + description = "Niceness for local instances of btrbk. Also applies to remote ones connecting via ssh when positive."; + type = lib.types.ints.between (-20) 19; + default = 10; + }; + ioSchedulingClass = lib.mkOption { + description = "IO scheduling class for btrbk (see ionice(1) for a quick description). Applies to local instances, and remote ones connecting by ssh if set to idle."; + type = lib.types.enum [ "idle" "best-effort" "realtime" ]; + default = "best-effort"; + }; + instances = lib.mkOption { + description = "Set of btrbk instances. The instance named <literal>btrbk</literal> is the default one."; + type = with lib.types; + attrsOf ( + submodule { + options = { + onCalendar = lib.mkOption { + type = lib.types.str; + default = "daily"; + description = "How often this btrbk instance is started. See systemd.time(7) for more information about the format."; + }; + settings = lib.mkOption { + type = let t = lib.types.attrsOf (lib.types.either lib.types.str (t // { description = "instances of this type recursively"; })); in t; + default = { }; + example = { + snapshot_preserve_min = "2d"; + snapshot_preserve = "14d"; + volume = { + "/mnt/btr_pool" = { + target = "/mnt/btr_backup/mylaptop"; + subvolume = { + "rootfs" = { }; + "home" = { snapshot_create = "always"; }; + }; + }; + }; + }; + description = "configuration options for btrbk. Nested attrsets translate to subsections."; + }; + }; + } + ); + default = { }; + }; + sshAccess = lib.mkOption { + description = "SSH keys that should be able to make or push snapshots on this system remotely with btrbk"; + type = with lib.types; listOf ( + submodule { + options = { + key = lib.mkOption { + type = str; + description = "SSH public key allowed to login as user <literal>btrbk</literal> to run remote backups."; + }; + roles = lib.mkOption { + type = listOf (enum [ "info" "source" "target" "delete" "snapshot" "send" "receive" ]); + example = [ "source" "info" "send" ]; + description = "What actions can be performed with this SSH key. See ssh_filter_btrbk(1) for details"; + }; + }; + } + ); + default = [ ]; + }; + }; + + }; + config = lib.mkIf (sshEnabled || serviceEnabled) { + environment.systemPackages = [ pkgs.btrbk ] ++ cfg.extraPackages; + security.sudo.extraRules = [ + { + users = [ "btrbk" ]; + commands = [ + { command = "${pkgs.btrfs-progs}/bin/btrfs"; options = [ "NOPASSWD" ]; } + { command = "${pkgs.coreutils}/bin/mkdir"; options = [ "NOPASSWD" ]; } + { command = "${pkgs.coreutils}/bin/readlink"; options = [ "NOPASSWD" ]; } + # for ssh, they are not the same than the one hard coded in ${pkgs.btrbk} + { command = "/run/current-system/bin/btrfs"; options = [ "NOPASSWD" ]; } + { command = "/run/current-system/sw/bin/mkdir"; options = [ "NOPASSWD" ]; } + { command = "/run/current-system/sw/bin/readlink"; options = [ "NOPASSWD" ]; } + ]; + } + ]; + users.users.btrbk = { + isSystemUser = true; + # ssh needs a home directory + home = "/var/lib/btrbk"; + createHome = true; + shell = "${pkgs.bash}/bin/bash"; + group = "btrbk"; + openssh.authorizedKeys.keys = map + ( + v: + let + options = lib.concatMapStringsSep " " (x: "--" + x) v.roles; + ioniceClass = { + "idle" = 3; + "best-effort" = 2; + "realtime" = 1; + }.${cfg.ioSchedulingClass}; + in + ''command="${pkgs.util-linux}/bin/ionice -t -c ${toString ioniceClass} ${lib.optionalString (cfg.niceness >= 1) "${pkgs.coreutils}/bin/nice -n ${toString cfg.niceness}"} ${pkgs.btrbk}/share/btrbk/scripts/ssh_filter_btrbk.sh --sudo ${options}" ${v.key}'' + ) + cfg.sshAccess; + }; + users.groups.btrbk = { }; + systemd.tmpfiles.rules = [ + "d /var/lib/btrbk 0750 btrbk btrbk" + "d /var/lib/btrbk/.ssh 0700 btrbk btrbk" + "f /var/lib/btrbk/.ssh/config 0700 btrbk btrbk - StrictHostKeyChecking=accept-new" + ]; + environment.etc = lib.mapAttrs' + ( + name: instance: { + name = "btrbk/${name}.conf"; + value.source = mkTestedConfigFile name instance.settings; + } + ) + cfg.instances; + systemd.services = lib.mapAttrs' + ( + name: _: { + name = "btrbk-${name}"; + value = { + description = "Takes BTRFS snapshots and maintains retention policies."; + unitConfig.Documentation = "man:btrbk(1)"; + path = [ "/run/wrappers" ] ++ cfg.extraPackages; + serviceConfig = { + User = "btrbk"; + Group = "btrbk"; + Type = "oneshot"; + ExecStart = "${pkgs.btrbk}/bin/btrbk -c /etc/btrbk/${name}.conf run"; + Nice = cfg.niceness; + IOSchedulingClass = cfg.ioSchedulingClass; + StateDirectory = "btrbk"; + }; + }; + } + ) + cfg.instances; + + systemd.timers = lib.mapAttrs' + ( + name: instance: { + name = "btrbk-${name}"; + value = { + description = "Timer to take BTRFS snapshots and maintain retention policies."; + wantedBy = [ "timers.target" ]; + timerConfig = { + OnCalendar = instance.onCalendar; + AccuracySec = "10min"; + Persistent = true; + }; + }; + } + ) + cfg.instances; + }; + +} diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 2d8d613ed88..b801b5cce63 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -48,7 +48,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 3306; description = "Port of MySQL."; }; diff --git a/nixos/modules/services/editors/infinoted.nix b/nixos/modules/services/editors/infinoted.nix index 10d868b7f16..3eb0753194d 100644 --- a/nixos/modules/services/editors/infinoted.nix +++ b/nixos/modules/services/editors/infinoted.nix @@ -51,7 +51,7 @@ in { }; port = mkOption { - type = types.int; + type = types.port; default = 6523; description = '' Port to listen on diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix index 1c2e2cc5359..e212f581c28 100644 --- a/nixos/modules/services/misc/docker-registry.nix +++ b/nixos/modules/services/misc/docker-registry.nix @@ -58,7 +58,7 @@ in { port = mkOption { description = "Docker registry port to bind to."; default = 5000; - type = types.int; + type = types.port; }; storagePath = mkOption { diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 95369ff7ee4..b6c1ca3e61a 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -82,7 +82,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = (if !usePostgresql then 3306 else pg.port); description = "Database host port."; }; diff --git a/nixos/modules/services/misc/gpsd.nix b/nixos/modules/services/misc/gpsd.nix index f954249942a..fafea10daba 100644 --- a/nixos/modules/services/misc/gpsd.nix +++ b/nixos/modules/services/misc/gpsd.nix @@ -62,7 +62,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 2947; description = '' The port where to listen for TCP connections. diff --git a/nixos/modules/services/misc/leaps.nix b/nixos/modules/services/misc/leaps.nix index ef89d3e64d0..f797218522c 100644 --- a/nixos/modules/services/misc/leaps.nix +++ b/nixos/modules/services/misc/leaps.nix @@ -11,7 +11,7 @@ in services.leaps = { enable = mkEnableOption "leaps"; port = mkOption { - type = types.int; + type = types.port; default = 8080; description = "A port where leaps listens for incoming http requests"; }; diff --git a/nixos/modules/services/misc/mwlib.nix b/nixos/modules/services/misc/mwlib.nix index 6b41b552a86..8dd17c06c0b 100644 --- a/nixos/modules/services/misc/mwlib.nix +++ b/nixos/modules/services/misc/mwlib.nix @@ -34,7 +34,7 @@ in port = mkOption { default = 8899; - type = types.int; + type = types.port; description = "Specify port to listen on."; }; # nserve.port @@ -68,7 +68,7 @@ in port = mkOption { default = 14311; - type = types.int; + type = types.port; description = "Specify port to listen on."; }; # qserve.port @@ -137,7 +137,7 @@ in port = mkOption { default = 8898; - type = types.int; + type = types.port; description = "Port to listen to when serving files from cache."; }; # nslave.http.port diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index 5a64946f9f6..c926d889b37 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -40,7 +40,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 5000; description = '' Port to bind OctoPrint to. diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index bfaf760fb83..43730b80eb2 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -67,7 +67,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 28981; description = "Server port to listen on."; }; diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index e0055576d6f..66c8e558fb0 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -71,7 +71,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 3000; description = "Port on which Redmine is ran."; }; diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix index 152917d345c..e17a98a5e1d 100644 --- a/nixos/modules/services/misc/subsonic.nix +++ b/nixos/modules/services/misc/subsonic.nix @@ -28,7 +28,7 @@ let cfg = config.services.subsonic; in { }; port = mkOption { - type = types.int; + type = types.port; default = 4040; description = '' The port on which Subsonic will listen for @@ -37,7 +37,7 @@ let cfg = config.services.subsonic; in { }; httpsPort = mkOption { - type = types.int; + type = types.port; default = 0; description = '' The port on which Subsonic will listen for diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index c3e1f72945b..e0b2624b6ca 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -292,7 +292,7 @@ in { port = mkOption { description = "Listening port."; default = 3000; - type = types.int; + type = types.port; }; socket = mkOption { diff --git a/nixos/modules/services/networking/coturn.nix b/nixos/modules/services/networking/coturn.nix index 1bfbc307c59..5f7d2893ae2 100644 --- a/nixos/modules/services/networking/coturn.nix +++ b/nixos/modules/services/networking/coturn.nix @@ -16,6 +16,7 @@ ${lib.optionalString cfg.lt-cred-mech "lt-cred-mech"} ${lib.optionalString cfg.no-auth "no-auth"} ${lib.optionalString cfg.use-auth-secret "use-auth-secret"} ${lib.optionalString (cfg.static-auth-secret != null) ("static-auth-secret=${cfg.static-auth-secret}")} +${lib.optionalString (cfg.static-auth-secret-file != null) ("static-auth-secret=#static-auth-secret#")} realm=${cfg.realm} ${lib.optionalString cfg.no-udp "no-udp"} ${lib.optionalString cfg.no-tcp "no-tcp"} @@ -182,6 +183,13 @@ in { by a separate program, so this is why that other mode is 'dynamic'. ''; }; + static-auth-secret-file = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Path to the file containing the static authentication secret. + ''; + }; realm = mkOption { type = types.str; default = config.networking.hostName; @@ -293,42 +301,63 @@ in { }; }; - config = mkIf cfg.enable { - users.users.turnserver = - { uid = config.ids.uids.turnserver; - description = "coturn TURN server user"; - }; - users.groups.turnserver = - { gid = config.ids.gids.turnserver; - members = [ "turnserver" ]; - }; + config = mkIf cfg.enable (mkMerge ([ + { assertions = [ + { assertion = cfg.static-auth-secret != null -> cfg.static-auth-secret-file == null ; + message = "static-auth-secret and static-auth-secret-file cannot be set at the same time"; + } + ];} - systemd.services.coturn = { - description = "coturn TURN server"; - after = [ "network-online.target" ]; - wants = [ "network-online.target" ]; - wantedBy = [ "multi-user.target" ]; + { + users.users.turnserver = + { uid = config.ids.uids.turnserver; + description = "coturn TURN server user"; + }; + users.groups.turnserver = + { gid = config.ids.gids.turnserver; + members = [ "turnserver" ]; + }; - unitConfig = { - Documentation = "man:coturn(1) man:turnadmin(1) man:turnserver(1)"; - }; + systemd.services.coturn = let + runConfig = "/run/coturn/turnserver.cfg"; + in { + description = "coturn TURN server"; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; - serviceConfig = { - Type = "simple"; - ExecStart = "${pkgs.coturn}/bin/turnserver -c ${configFile}"; - RuntimeDirectory = "turnserver"; - User = "turnserver"; - Group = "turnserver"; - AmbientCapabilities = - mkIf ( - cfg.listening-port < 1024 || - cfg.alt-listening-port < 1024 || - cfg.tls-listening-port < 1024 || - cfg.alt-tls-listening-port < 1024 || - cfg.min-port < 1024 - ) "cap_net_bind_service"; - Restart = "on-abort"; - }; - }; - }; + unitConfig = { + Documentation = "man:coturn(1) man:turnadmin(1) man:turnserver(1)"; + }; + + preStart = '' + cat ${configFile} > ${runConfig} + ${optionalString (cfg.static-auth-secret-file != null) '' + STATIC_AUTH_SECRET="$(head -n1 ${cfg.static-auth-secret-file} || :)" + sed -e "s,#static-auth-secret#,$STATIC_AUTH_SECRET,g" \ + -i ${runConfig} + '' } + chmod 640 ${runConfig} + ''; + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.coturn}/bin/turnserver -c ${runConfig}"; + RuntimeDirectory = "turnserver"; + User = "turnserver"; + Group = "turnserver"; + AmbientCapabilities = + mkIf ( + cfg.listening-port < 1024 || + cfg.alt-listening-port < 1024 || + cfg.tls-listening-port < 1024 || + cfg.alt-tls-listening-port < 1024 || + cfg.min-port < 1024 + ) "cap_net_bind_service"; + Restart = "on-abort"; + }; + }; + systemd.tmpfiles.rules = [ + "d /run/coturn 0700 turnserver turnserver - -" + ]; + }])); } diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index b03630208df..f8bb878ec65 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -98,7 +98,7 @@ in }; port = mkOption { - type = types.int; + type = types.port; default = 64738; description = "Ports to bind to (UDP and TCP)."; }; diff --git a/nixos/modules/services/networking/namecoind.nix b/nixos/modules/services/networking/namecoind.nix index 4966ed2cac8..8f7a5123f7e 100644 --- a/nixos/modules/services/networking/namecoind.nix +++ b/nixos/modules/services/networking/namecoind.nix @@ -105,7 +105,7 @@ in }; rpc.port = mkOption { - type = types.int; + type = types.port; default = 8332; description = '' Port the RPC server will bind to. diff --git a/nixos/modules/services/networking/nar-serve.nix b/nixos/modules/services/networking/nar-serve.nix index ddd42fa0107..745138186a2 100644 --- a/nixos/modules/services/networking/nar-serve.nix +++ b/nixos/modules/services/networking/nar-serve.nix @@ -13,7 +13,7 @@ in enable = mkEnableOption "Serve NAR file contents via HTTP"; port = mkOption { - type = types.int; + type = types.port; default = 8383; description = '' Port number where nar-serve will listen on. diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix index 347d87b3f38..b17f35c769b 100644 --- a/nixos/modules/services/networking/nix-serve.nix +++ b/nixos/modules/services/networking/nix-serve.nix @@ -11,7 +11,7 @@ in enable = mkEnableOption "nix-serve, the standalone Nix binary cache server"; port = mkOption { - type = types.int; + type = types.port; default = 5000; description = '' Port number where nix-serve will listen on. diff --git a/nixos/modules/services/security/bitwarden_rs/backup.sh b/nixos/modules/services/security/vaultwarden/backup.sh index 264a7da9cbb..2a3de0ab1de 100644 --- a/nixos/modules/services/security/bitwarden_rs/backup.sh +++ b/nixos/modules/services/security/vaultwarden/backup.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Based on: https://github.com/dani-garcia/bitwarden_rs/wiki/Backing-up-your-vault +# Based on: https://github.com/dani-garcia/vaultwarden/wiki/Backing-up-your-vault if ! mkdir -p "$BACKUP_FOLDER"; then echo "Could not create backup folder '$BACKUP_FOLDER'" >&2 exit 1 diff --git a/nixos/modules/services/security/bitwarden_rs/default.nix b/nixos/modules/services/security/vaultwarden/default.nix index bed59dbf821..940ac7832da 100644 --- a/nixos/modules/services/security/bitwarden_rs/default.nix +++ b/nixos/modules/services/security/vaultwarden/default.nix @@ -3,9 +3,9 @@ with lib; let - cfg = config.services.bitwarden_rs; - user = config.users.users.bitwarden_rs.name; - group = config.users.groups.bitwarden_rs.name; + cfg = config.services.vaultwarden; + user = config.users.users.vaultwarden.name; + group = config.users.groups.vaultwarden.name; # Convert name from camel case (e.g. disable2FARemember) to upper case snake case (e.g. DISABLE_2FA_REMEMBER). nameToEnvVar = name: @@ -26,22 +26,26 @@ let if value != null then [ (nameValuePair (nameToEnvVar name) (if isBool value then boolToString value else toString value)) ] else [] ) cfg.config)); in { DATA_FOLDER = "/var/lib/bitwarden_rs"; } // optionalAttrs (!(configEnv ? WEB_VAULT_ENABLED) || configEnv.WEB_VAULT_ENABLED == "true") { - WEB_VAULT_FOLDER = "${pkgs.bitwarden_rs-vault}/share/bitwarden_rs/vault"; + WEB_VAULT_FOLDER = "${pkgs.vaultwarden-vault}/share/vaultwarden/vault"; } // configEnv; - configFile = pkgs.writeText "bitwarden_rs.env" (concatStrings (mapAttrsToList (name: value: "${name}=${value}\n") configEnv)); + configFile = pkgs.writeText "vaultwarden.env" (concatStrings (mapAttrsToList (name: value: "${name}=${value}\n") configEnv)); - bitwarden_rs = pkgs.bitwarden_rs.override { inherit (cfg) dbBackend; }; + vaultwarden = pkgs.vaultwarden.override { inherit (cfg) dbBackend; }; in { - options.services.bitwarden_rs = with types; { - enable = mkEnableOption "bitwarden_rs"; + imports = [ + (mkRenamedOptionModule [ "services" "bitwarden_rs" ] [ "services" "vaultwarden" ]) + ]; + + options.services.vaultwarden = with types; { + enable = mkEnableOption "vaultwarden"; dbBackend = mkOption { type = enum [ "sqlite" "mysql" "postgresql" ]; default = "sqlite"; description = '' - Which database backend bitwarden_rs will be using. + Which database backend vaultwarden will be using. ''; }; @@ -49,7 +53,7 @@ in { type = nullOr str; default = null; description = '' - The directory under which bitwarden_rs will backup its persistent data. + The directory under which vaultwarden will backup its persistent data. ''; }; @@ -65,7 +69,7 @@ in { } ''; description = '' - The configuration of bitwarden_rs is done through environment variables, + The configuration of vaultwarden is done through environment variables, therefore the names are converted from camel case (e.g. disable2FARemember) to upper case snake case (e.g. DISABLE_2FA_REMEMBER). In this conversion digits (0-9) are handled just like upper case characters, @@ -75,17 +79,17 @@ in { This allows working around any potential future conflicting naming conventions. Based on the attributes passed to this config option an environment file will be generated - that is passed to bitwarden_rs's systemd service. + that is passed to vaultwarden's systemd service. The available configuration options can be found in - <link xlink:href="https://github.com/dani-garcia/bitwarden_rs/blob/${bitwarden_rs.version}/.env.template">the environment template file</link>. + <link xlink:href="https://github.com/dani-garcia/vaultwarden/blob/${vaultwarden.version}/.env.template">the environment template file</link>. ''; }; environmentFile = mkOption { type = with types; nullOr path; default = null; - example = "/root/bitwarden_rs.env"; + example = "/root/vaultwarden.env"; description = '' Additional environment file as defined in <citerefentry> <refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum> @@ -95,7 +99,7 @@ in { may be passed to the service without adding them to the world-readable Nix store. Note that this file needs to be available on the host on which - <literal>bitwarden_rs</literal> is running. + <literal>vaultwarden</literal> is running. ''; }; }; @@ -106,20 +110,21 @@ in { message = "Backups for database backends other than sqlite will need customization"; } ]; - users.users.bitwarden_rs = { + users.users.vaultwarden = { inherit group; isSystemUser = true; }; - users.groups.bitwarden_rs = { }; + users.groups.vaultwarden = { }; - systemd.services.bitwarden_rs = { + systemd.services.vaultwarden = { + aliases = [ "bitwarden_rs" ]; after = [ "network.target" ]; path = with pkgs; [ openssl ]; serviceConfig = { User = user; Group = group; EnvironmentFile = [ configFile ] ++ optional (cfg.environmentFile != null) cfg.environmentFile; - ExecStart = "${bitwarden_rs}/bin/bitwarden_rs"; + ExecStart = "${vaultwarden}/bin/vaultwarden"; LimitNOFILE = "1048576"; PrivateTmp = "true"; PrivateDevices = "true"; @@ -131,15 +136,16 @@ in { wantedBy = [ "multi-user.target" ]; }; - systemd.services.backup-bitwarden_rs = mkIf (cfg.backupDir != null) { - description = "Backup bitwarden_rs"; + systemd.services.backup-vaultwarden = mkIf (cfg.backupDir != null) { + aliases = [ "backup-bitwarden_rs" ]; + description = "Backup vaultwarden"; environment = { DATA_FOLDER = "/var/lib/bitwarden_rs"; BACKUP_FOLDER = cfg.backupDir; }; path = with pkgs; [ sqlite ]; serviceConfig = { - SyslogIdentifier = "backup-bitwarden_rs"; + SyslogIdentifier = "backup-vaultwarden"; Type = "oneshot"; User = mkDefault user; Group = mkDefault group; @@ -148,12 +154,13 @@ in { wantedBy = [ "multi-user.target" ]; }; - systemd.timers.backup-bitwarden_rs = mkIf (cfg.backupDir != null) { - description = "Backup bitwarden_rs on time"; + systemd.timers.backup-vaultwarden = mkIf (cfg.backupDir != null) { + aliases = [ "backup-bitwarden_rs" ]; + description = "Backup vaultwarden on time"; timerConfig = { OnCalendar = mkDefault "23:00"; Persistent = "true"; - Unit = "backup-bitwarden_rs.service"; + Unit = "backup-vaultwarden.service"; }; wantedBy = [ "multi-user.target" ]; }; diff --git a/nixos/modules/services/web-servers/ttyd.nix b/nixos/modules/services/web-servers/ttyd.nix index 01a01d97a23..68d55ee6ffd 100644 --- a/nixos/modules/services/web-servers/ttyd.nix +++ b/nixos/modules/services/web-servers/ttyd.nix @@ -33,7 +33,7 @@ in enable = mkEnableOption "ttyd daemon"; port = mkOption { - type = types.int; + type = types.port; default = 7681; description = "Port to listen on (use 0 for random port)"; }; diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 6751ca3f2ee..4e2f25cd27f 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -13,7 +13,7 @@ let # !!! fix this children = mapAttrs (childName: childConfig: (import ../../../lib/eval-config.nix { - inherit baseModules specialArgs; + inherit lib baseModules specialArgs; system = config.nixpkgs.initialSystem; modules = (optionals childConfig.inheritParentConfig modules) diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 8c82b4bcf5d..f87d3b07a36 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -621,6 +621,8 @@ in Whether to allow TRIM requests to the underlying device. This option has security implications; please read the LUKS documentation before activating it. + This option is incompatible with authenticated encryption (dm-crypt + stacked over dm-integrity). ''; }; diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix index ad436ed3014..65b63cebc79 100644 --- a/nixos/modules/virtualisation/oci-containers.nix +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -262,9 +262,6 @@ let postStop = "${cfg.backend} rm -f ${name} || true"; serviceConfig = { - StandardOutput = "null"; - StandardError = "null"; - ### There is no generalized way of supporting `reload` for docker ### containers. Some containers may respond well to SIGHUP sent to their ### init process, but it is not guaranteed; some apps have other reload diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b5126be8af7..74160673214 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -42,12 +42,12 @@ in bind = handleTest ./bind.nix {}; bitcoind = handleTest ./bitcoind.nix {}; bittorrent = handleTest ./bittorrent.nix {}; - bitwarden = handleTest ./bitwarden.nix {}; blockbook-frontend = handleTest ./blockbook-frontend.nix {}; boot = handleTestOn ["x86_64-linux"] ./boot.nix {}; # syslinux is unsupported on aarch64 boot-stage1 = handleTest ./boot-stage1.nix {}; borgbackup = handleTest ./borgbackup.nix {}; botamusique = handleTest ./botamusique.nix {}; + btrbk = handleTest ./btrbk.nix {}; buildbot = handleTest ./buildbot.nix {}; buildkite-agents = handleTest ./buildkite-agents.nix {}; caddy = handleTest ./caddy.nix {}; @@ -88,6 +88,7 @@ in containers-tmpfs = handleTest ./containers-tmpfs.nix {}; convos = handleTest ./convos.nix {}; corerad = handleTest ./corerad.nix {}; + coturn = handleTest ./coturn.nix {}; couchdb = handleTest ./couchdb.nix {}; cri-o = handleTestOn ["x86_64-linux"] ./cri-o.nix {}; custom-ca = handleTest ./custom-ca.nix {}; @@ -446,6 +447,7 @@ in v2ray = handleTest ./v2ray.nix {}; vault = handleTest ./vault.nix {}; vault-postgresql = handleTest ./vault-postgresql.nix {}; + vaultwarden = handleTest ./vaultwarden.nix {}; vector = handleTest ./vector.nix {}; victoriametrics = handleTest ./victoriametrics.nix {}; virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {}; diff --git a/nixos/tests/btrbk.nix b/nixos/tests/btrbk.nix new file mode 100644 index 00000000000..2689bb66c63 --- /dev/null +++ b/nixos/tests/btrbk.nix @@ -0,0 +1,110 @@ +import ./make-test-python.nix ({ pkgs, ... }: + + let + privateKey = '' + -----BEGIN OPENSSH PRIVATE KEY----- + b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW + QyNTUxOQAAACBx8UB04Q6Q/fwDFjakHq904PYFzG9pU2TJ9KXpaPMcrwAAAJB+cF5HfnBe + RwAAAAtzc2gtZWQyNTUxOQAAACBx8UB04Q6Q/fwDFjakHq904PYFzG9pU2TJ9KXpaPMcrw + AAAEBN75NsJZSpt63faCuaD75Unko0JjlSDxMhYHAPJk2/xXHxQHThDpD9/AMWNqQer3Tg + 9gXMb2lTZMn0pelo8xyvAAAADXJzY2h1ZXR6QGt1cnQ= + -----END OPENSSH PRIVATE KEY----- + ''; + publicKey = '' + ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHHxQHThDpD9/AMWNqQer3Tg9gXMb2lTZMn0pelo8xyv + ''; + in + { + name = "btrbk"; + meta = with pkgs.lib; { + maintainers = with maintainers; [ symphorien ]; + }; + + nodes = { + archive = { ... }: { + environment.systemPackages = with pkgs; [ btrfs-progs ]; + # note: this makes the privateKey world readable. + # don't do it with real ssh keys. + environment.etc."btrbk_key".text = privateKey; + services.btrbk = { + extraPackages = [ pkgs.lz4 ]; + instances = { + remote = { + onCalendar = "minutely"; + settings = { + ssh_identity = "/etc/btrbk_key"; + ssh_user = "btrbk"; + stream_compress = "lz4"; + volume = { + "ssh://main/mnt" = { + target = "/mnt"; + snapshot_dir = "btrbk/remote"; + subvolume = "to_backup"; + }; + }; + }; + }; + }; + }; + }; + + main = { ... }: { + environment.systemPackages = with pkgs; [ btrfs-progs ]; + services.openssh = { + enable = true; + passwordAuthentication = false; + challengeResponseAuthentication = false; + }; + services.btrbk = { + extraPackages = [ pkgs.lz4 ]; + sshAccess = [ + { + key = publicKey; + roles = [ "source" "send" "info" "delete" ]; + } + ]; + instances = { + local = { + onCalendar = "minutely"; + settings = { + volume = { + "/mnt" = { + snapshot_dir = "btrbk/local"; + subvolume = "to_backup"; + }; + }; + }; + }; + }; + }; + }; + }; + + testScript = '' + start_all() + + # create btrfs partition at /mnt + for machine in (archive, main): + machine.succeed("dd if=/dev/zero of=/data_fs bs=120M count=1") + machine.succeed("mkfs.btrfs /data_fs") + machine.succeed("mkdir /mnt") + machine.succeed("mount /data_fs /mnt") + + # what to backup and where + main.succeed("btrfs subvolume create /mnt/to_backup") + main.succeed("mkdir -p /mnt/btrbk/{local,remote}") + + # check that local snapshots work + with subtest("local"): + main.succeed("echo foo > /mnt/to_backup/bar") + main.wait_until_succeeds("cat /mnt/btrbk/local/*/bar | grep foo") + main.succeed("echo bar > /mnt/to_backup/bar") + main.succeed("cat /mnt/btrbk/local/*/bar | grep foo") + + # check that btrfs send/receive works and ssh access works + with subtest("remote"): + archive.wait_until_succeeds("cat /mnt/*/bar | grep bar") + main.succeed("echo baz > /mnt/to_backup/bar") + archive.succeed("cat /mnt/*/bar | grep bar") + ''; + }) diff --git a/nixos/tests/coturn.nix b/nixos/tests/coturn.nix new file mode 100644 index 00000000000..dff832281c7 --- /dev/null +++ b/nixos/tests/coturn.nix @@ -0,0 +1,29 @@ +import ./make-test-python.nix ({ ... }: { + name = "coturn"; + nodes = { + default = { + services.coturn.enable = true; + }; + secretsfile = { + boot.postBootCommands = '' + echo "some-very-secret-string" > /run/coturn-secret + ''; + services.coturn = { + enable = true; + static-auth-secret-file = "/run/coturn-secret"; + }; + }; + }; + + testScript = + '' + start_all() + + with subtest("by default works without configuration"): + default.wait_for_unit("coturn.service") + + with subtest("works with static-auth-secret-file"): + secretsfile.wait_for_unit("coturn.service") + secretsfile.succeed("grep 'some-very-secret-string' /run/coturn/turnserver.cfg") + ''; +}) diff --git a/nixos/tests/mysql/mysql.nix b/nixos/tests/mysql/mysql.nix index c21136416d4..2ec9c3d50a3 100644 --- a/nixos/tests/mysql/mysql.nix +++ b/nixos/tests/mysql/mysql.nix @@ -98,7 +98,7 @@ import ./../make-test-python.nix ({ pkgs, ...} : { }]; services.mysql.settings = { mysqld = { - plugin-load-add = [ "ha_rocksdb.so" ]; + plugin-load-add = [ "ha_mroonga.so" "ha_rocksdb.so" ]; }; }; services.mysql.package = pkgs.mariadb; @@ -172,6 +172,20 @@ import ./../make-test-python.nix ({ pkgs, ...} : { "echo 'use testdb; select test_id from tests;' | sudo -u testuser mysql -u testuser -N | grep 42" ) + # Check if Mroonga plugin works + mariadb.succeed( + "echo 'use testdb; create table mroongadb (test_id INT, PRIMARY KEY (test_id)) ENGINE = Mroonga;' | sudo -u testuser mysql -u testuser" + ) + mariadb.succeed( + "echo 'use testdb; insert into mroongadb values (25);' | sudo -u testuser mysql -u testuser" + ) + mariadb.succeed( + "echo 'use testdb; select test_id from mroongadb;' | sudo -u testuser mysql -u testuser -N | grep 25" + ) + mariadb.succeed( + "echo 'use testdb; drop table mroongadb;' | sudo -u testuser mysql -u testuser" + ) + # Check if RocksDB plugin works mariadb.succeed( "echo 'use testdb; create table rocksdb (test_id INT, PRIMARY KEY (test_id)) ENGINE = RocksDB;' | sudo -u testuser mysql -u testuser" diff --git a/nixos/tests/trafficserver.nix b/nixos/tests/trafficserver.nix index 3979a1b4a48..983ded4f172 100644 --- a/nixos/tests/trafficserver.nix +++ b/nixos/tests/trafficserver.nix @@ -104,6 +104,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { ats.wait_for_open_port(80) httpbin.wait_for_unit("httpbin") httpbin.wait_for_open_port(80) + client.wait_for_unit("network-online.target") with subtest("Traffic Server is running"): out = ats.succeed("traffic_ctl server status") diff --git a/nixos/tests/bitwarden.nix b/nixos/tests/vaultwarden.nix index f64cf171f01..b5343f5cad2 100644 --- a/nixos/tests/bitwarden.nix +++ b/nixos/tests/vaultwarden.nix @@ -4,7 +4,7 @@ }: # These tests will: -# * Set up a bitwarden-rs server +# * Set up a vaultwarden server # * Have Firefox use the web vault to create an account, log in, and save a password to the valut # * Have the bw cli log in and read that password from the vault # @@ -24,8 +24,8 @@ let storedPassword = "seeeecret"; - makeBitwardenTest = backend: makeTest { - name = "bitwarden_rs-${backend}"; + makeVaultwardenTest = backend: makeTest { + name = "vaultwarden-${backend}"; meta = { maintainers = with pkgs.lib.maintainers; [ jjjollyjim ]; }; @@ -45,9 +45,9 @@ let package = pkgs.mariadb; }; - services.bitwarden_rs.config.databaseUrl = "mysql://bitwardenuser:${dbPassword}@localhost/bitwarden"; + services.vaultwarden.config.databaseUrl = "mysql://bitwardenuser:${dbPassword}@localhost/bitwarden"; - systemd.services.bitwarden_rs.after = [ "mysql.service" ]; + systemd.services.vaultwarden.after = [ "mysql.service" ]; }; postgresql = { @@ -60,9 +60,9 @@ let ''; }; - services.bitwarden_rs.config.databaseUrl = "postgresql://bitwardenuser:${dbPassword}@localhost/bitwarden"; + services.vaultwarden.config.databaseUrl = "postgresql://bitwardenuser:${dbPassword}@localhost/bitwarden"; - systemd.services.bitwarden_rs.after = [ "postgresql.service" ]; + systemd.services.vaultwarden.after = [ "postgresql.service" ]; }; sqlite = { }; @@ -71,7 +71,7 @@ let mkMerge [ backendConfig.${backend} { - services.bitwarden_rs = { + services.vaultwarden = { enable = true; dbBackend = backend; config.rocketPort = 80; @@ -152,7 +152,7 @@ let testScript = '' start_all() - server.wait_for_unit("bitwarden_rs.service") + server.wait_for_unit("vaultwarden.service") server.wait_for_open_port(80) with subtest("configure the cli"): @@ -184,6 +184,6 @@ let in builtins.listToAttrs ( map - (backend: { name = backend; value = makeBitwardenTest backend; }) + (backend: { name = backend; value = makeVaultwardenTest backend; }) backends ) diff --git a/nixos/tests/yggdrasil.nix b/nixos/tests/yggdrasil.nix index 0e75ed54db2..b409d9ed785 100644 --- a/nixos/tests/yggdrasil.nix +++ b/nixos/tests/yggdrasil.nix @@ -1,23 +1,19 @@ let - aliceIp6 = "200:3b91:b2d8:e708:fbf3:f06:fdd5:90d0"; + aliceIp6 = "202:b70:9b0b:cf34:f93c:8f18:bbfd:7034"; aliceKeys = { - EncryptionPublicKey = "13e23986fe76bc3966b42453f479bc563348b7ff76633b7efcb76e185ec7652f"; - EncryptionPrivateKey = "9f86947b15e86f9badac095517a1982e39a2db37ca726357f95987b898d82208"; - SigningPublicKey = "e2c43349083bc1e998e4ec4535b4c6a8f44ca9a5a8e07336561267253b2be5f4"; - SigningPrivateKey = "fe3add8da35316c05f6d90d3ca79bd2801e6ccab6d37e5339fef4152589398abe2c43349083bc1e998e4ec4535b4c6a8f44ca9a5a8e07336561267253b2be5f4"; + PublicKey = "3e91ec9e861960d86e1ce88051f97c435bdf2859640ab681dfa906eb45ad5182"; + PrivateKey = "a867f9e078e4ce58d310cf5acd4622d759e2a21df07e1d6fc380a2a26489480d3e91ec9e861960d86e1ce88051f97c435bdf2859640ab681dfa906eb45ad5182"; }; - bobIp6 = "201:ebbd:bde9:f138:c302:4afa:1fb6:a19a"; - bobPrefix = "301:ebbd:bde9:f138"; + bobIp6 = "202:a483:73a4:9f2d:a559:4a19:bc9:8458"; + bobPrefix = "302:a483:73a4:9f2d"; bobConfig = { InterfacePeers = { eth1 = [ "tcp://192.168.1.200:12345" ]; }; MulticastInterfaces = [ "eth1" ]; LinkLocalTCPPort = 54321; - EncryptionPublicKey = "c99d6830111e12d1b004c52fe9e5a2eef0f6aefca167aca14589a370b7373279"; - EncryptionPrivateKey = "2e698a53d3fdce5962d2ff37de0fe77742a5c8b56cd8259f5da6aa792f6e8ba3"; - SigningPublicKey = "de111da0ec781e45bf6c63ecb45a78c24d7d4655abfaeea83b26c36eb5c0fd5b"; - SigningPrivateKey = "2a6c21550f3fca0331df50668ffab66b6dce8237bcd5728e571e8033b363e247de111da0ec781e45bf6c63ecb45a78c24d7d4655abfaeea83b26c36eb5c0fd5b"; + PublicKey = "2b6f918b6c1a4b54d6bcde86cf74e074fb32ead4ee439b7930df2aa60c825186"; + PrivateKey = "0c4a24acd3402722ce9277ed179f4a04b895b49586493c25fbaed60653d857d62b6f918b6c1a4b54d6bcde86cf74e074fb32ead4ee439b7930df2aa60c825186"; }; danIp6 = bobPrefix + "::2"; diff --git a/nixos/tests/zsh-history.nix b/nixos/tests/zsh-history.nix index 3109c3f6508..35568779840 100644 --- a/nixos/tests/zsh-history.nix +++ b/nixos/tests/zsh-history.nix @@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { # Login default.wait_until_tty_matches(1, "login: ") default.send_chars("root\n") - default.wait_until_tty_matches(1, "root@default>") + default.wait_until_tty_matches(1, r"\nroot@default\b") # Generate some history default.send_chars("echo foobar\n") diff --git a/pkgs/applications/audio/mousai/default.nix b/pkgs/applications/audio/mousai/default.nix index 2f45a3fea92..9044d201c45 100644 --- a/pkgs/applications/audio/mousai/default.nix +++ b/pkgs/applications/audio/mousai/default.nix @@ -1,7 +1,6 @@ { lib , python3 , fetchFromGitHub -, fetchpatch , appstream-glib , desktop-file-utils , gettext @@ -19,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "mousai"; - version = "0.4.1"; + version = "0.4.2"; format = "other"; @@ -27,17 +26,9 @@ python3.pkgs.buildPythonApplication rec { owner = "SeaDve"; repo = "Mousai"; rev = "v${version}"; - sha256 = "sha256-AfR5n1dIm9X5OoPiikQEhHBFQq0rmQH4h7cCJ2yXoXI="; + sha256 = "sha256-zH++GGFIz3oxkKOYB4zhY6yL3vENEXxtrv8mZZ+41kU="; }; - patches = [ - (fetchpatch { - name = "fix-ABI-breakage-from-libadwaita.patch"; - url = "https://github.com/SeaDve/Mousai/commit/e3db2d9d1949300f49399209b56d667746e539df.patch"; - sha256 = "078kvmyhw4jd1m2npai0yl00lwh47jys2n03pkgxp6jf873y83vs"; - }) - ]; - postPatch = '' patchShebangs build-aux/meson ''; diff --git a/pkgs/applications/audio/pianoteq/default.nix b/pkgs/applications/audio/pianoteq/default.nix new file mode 100644 index 00000000000..842c43fc55b --- /dev/null +++ b/pkgs/applications/audio/pianoteq/default.nix @@ -0,0 +1,200 @@ +{ lib, stdenv, curl, gnugrep, jq, xorg, alsa-lib, freetype, p7zip, autoPatchelfHook, writeShellScript, zlib, libjack2, makeWrapper }: +let + versionForFile = v: builtins.replaceStrings ["."] [""] v; + + mkPianoteq = { name, src, version, archdir, ... }: + stdenv.mkDerivation rec { + inherit src version; + + pname = "pianoteq-${name}"; + + unpackPhase = '' + ${p7zip}/bin/7z x $src + ''; + + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + ]; + + buildInputs = [ + stdenv.cc.cc.lib + xorg.libX11 # libX11.so.6 + xorg.libXext # libXext.so.6 + alsa-lib # libasound.so.2 + freetype # libfreetype.so.6 + ]; + + installPhase = '' + mkdir -p $out/bin + mv -t $out/bin Pianoteq*/${archdir}/* + for f in $out/bin/Pianoteq*; do + if [ -x "$f" ] && [ -f "$f" ]; then + wrapProgram "$f" --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath (buildInputs ++ [ + xorg.libXcursor + xorg.libXinerama + xorg.libXrandr + libjack2 + zlib + ]) + } + fi + done + ''; + + meta = with lib; { + homepage = "https://www.modartt.com/pianoteq"; + description = "Software synthesizer that features real-time MIDI-control of digital physically modeled pianos and related instruments"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; # TODO extract binary according to each platform? + maintainers = [ maintainers.mausch ]; + }; + }; + + fetchWithCurlScript = { name, sha256, script, impureEnvVars ? [] }: + stdenv.mkDerivation { + inherit name; + builder = writeShellScript "builder.sh" '' + source $stdenv/setup + + curlVersion=$(${curl}/bin/curl -V | head -1 | cut -d' ' -f2) + + # Curl flags to handle redirects, not use EPSV, handle cookies for + # servers to need them during redirects, and work on SSL without a + # certificate (this isn't a security problem because we check the + # cryptographic hash of the output anyway). + curl=( + ${curl}/bin/curl + --location + --max-redirs 20 + --retry 3 + --disable-epsv + --cookie-jar cookies + --insecure + --user-agent "curl/$curlVersion Nixpkgs/${lib.trivial.release}" + $NIX_CURL_FLAGS + ) + + ${script} + + ''; + nativeBuildInputs = [ curl ]; + outputHashAlgo = "sha256"; + outputHash = sha256; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ impureEnvVars ++ [ + # This variable allows the user to pass additional options to curl + "NIX_CURL_FLAGS" + ]; + }; + + fetchPianoteqTrial = { name, sha256 }: + fetchWithCurlScript { + inherit name sha256; + script = '' + "''${curl[@]}" --silent --request POST \ + --cookie cookies \ + --header "modartt-json: request" \ + --header "origin: https://www.modartt.com" \ + --header "content-type: application/json; charset=UTF-8" \ + --header "accept: application/json, text/javascript, */*" \ + --data-raw '{"file": "${name}", "get": "url"}' \ + https://www.modartt.com/json/download -o /dev/null + json=$( + "''${curl[@]}" --silent --request POST \ + --cookie cookies \ + --header "modartt-json: request" \ + --header "origin: https://www.modartt.com" \ + --header "content-type: application/json; charset=UTF-8" \ + --header "accept: application/json, text/javascript, */*" \ + --data-raw '{"file": "${name}", "get": "url"}' \ + https://www.modartt.com/json/download + ) + url=$(echo $json | ${jq}/bin/jq -r .url) + "''${curl[@]}" --progress-bar --cookie cookies -o $out "$url" + ''; + }; + + fetchPianoteqWithLogin = { name, sha256 }: + fetchWithCurlScript { + inherit name sha256; + + impureEnvVars = [ "NIX_MODARTT_USERNAME" "NIX_MODARTT_PASSWORD" ]; + + script = '' + if [ -z "''${NIX_MODARTT_USERNAME}" -o -z "''${NIX_MODARTT_PASSWORD}" ]; then + echo "Error: Downloading a personal Pianoteq instance requires the nix building process (nix-daemon in multi user mode) to have the NIX_MODARTT_USERNAME and NIX_MODARTT_PASSWORD env vars set." >&2 + exit 1 + fi + + "''${curl[@]}" -s -o /dev/null "https://www.modartt.com/user_area" + + ${jq}/bin/jq -n "{connect: 1, login: \"''${NIX_MODARTT_USERNAME}\", password: \"''${NIX_MODARTT_PASSWORD}\"}" > login.json + + "''${curl[@]}" --silent --request POST \ + --cookie cookies \ + --referer "https://www.modartt.com/user_area" \ + --header "modartt-json: request" \ + --header "origin: https://www.modartt.com" \ + --header "content-type: application/json; charset=UTF-8" \ + --header "accept: application/json, text/javascript, */*" \ + --data @login.json \ + https://www.modartt.com/json/session + + json=$( + "''${curl[@]}" --silent --request POST \ + --cookie cookies \ + --header "modartt-json: request" \ + --header "origin: https://www.modartt.com" \ + --header "content-type: application/json; charset=UTF-8" \ + --header "accept: application/json, text/javascript, */*" \ + --data-raw '{"file": "${name}", "get": "url"}' \ + https://www.modartt.com/json/download + ) + url=$(echo $json | ${jq}/bin/jq -r .url) + + "''${curl[@]}" --progress-bar --cookie cookies -o $out "$url" + ''; + }; + +in { + # TODO currently can't install more than one because `lame` clashes + stage-trial = mkPianoteq rec { + name = "stage-trial"; + version = "7.3.0"; + archdir = "x86-64bit"; + src = fetchPianoteqTrial { + name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z"; + sha256 = "12zbr54ng7cb4ngl1qrf5h0gs8c42d6d3j08492xr14m9x9y132k"; + }; + }; + standard-trial = mkPianoteq rec { + name = "standard-trial"; + version = "7.3.0"; + archdir = "x86-64bit"; + src = fetchPianoteqTrial { + name = "pianoteq_linux_trial_v${versionForFile version}.7z"; + sha256 = "04sh45hm3y3y6kfj3p32fi6p95r9fc6xf4r5i74laylms4f6gr6d"; + }; + }; + stage-6 = mkPianoteq rec { + name = "stage-6"; + version = "6.7.3"; + archdir = "amd64"; + src = fetchPianoteqWithLogin { + name = "pianoteq_stage_linux_v${versionForFile version}.7z"; + sha256 = "0jy0hkdynhwv0zhrqkby0hdphgmcc09wxmy74rhg9afm1pzl91jy"; + }; + }; + stage-7 = mkPianoteq rec { + name = "stage-7"; + version = "7.3.0"; + archdir = "x86-64bit"; + src = fetchPianoteqWithLogin { + name = "pianoteq_stage_linux_v${versionForFile version}.7z"; + sha256 = "05w7sv9v38r6ljz9xai816w5z2qqwx88hcfjm241fvgbs54125hx"; + }; + }; + # TODO other paid binaries, I don't own that so I don't know their hash. +} diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 49aa0ba4714..dc030cc708b 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -40,7 +40,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ chromaprint - dateutil + python-dateutil discid fasteners mutagen diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index a7289cc35c8..9921c1b7e88 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,13 +2,13 @@ let pname = "plexamp"; - version = "3.4.7"; + version = "3.5.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "+jmx4X9KiK1Tv2Cjb/445MY9G2b7pLdKxFtBFMaQwRhqTItA33MfHqKBwmytmbEhxhy0LDTU2woJvEMPQCmnvg=="; + sha512 = "NjhrtGQsIbNDmGPEDmEbaHSfvUTFb1e7yPorF/BzWTfwVoFZEJiNzP/1k+zTJ4Yfd4mG0W0GYx0jh8m/micWIg=="; }; 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/29"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/30"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 239b62a4026..66a14fa05b2 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -1,30 +1,34 @@ -{ lib, stdenv, fetchurl, alsa-lib, gtk2, pkg-config }: +{ lib, stdenv, fetchFromGitHub, pkg-config, wrapGAppsHook, alsa-lib, gtk3, libpulseaudio }: stdenv.mkDerivation rec { pname = "praat"; - version = "6.0.43"; + version = "6.1.50"; - src = fetchurl { - url = "https://github.com/praat/praat/archive/v${version}.tar.gz"; - sha256 = "1l13bvnl7sv8v6s5z63201bhzavnj6bnqcj446akippsam13z4sf"; + src = fetchFromGitHub { + owner = "praat"; + repo = "praat"; + rev = "v${version}"; + sha256 = "11cw4292pml71hdnfy8y91blwyh45dyam1ywr09355zk44c5njpq"; }; configurePhase = '' - cp makefiles/makefile.defs.linux.alsa makefile.defs + cp makefiles/makefile.defs.linux.pulse makefile.defs ''; installPhase = '' - mkdir -p $out/bin - cp praat $out/bin + install -Dt $out/bin praat ''; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsa-lib gtk2 ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + buildInputs = [ alsa-lib gtk3 libpulseaudio ]; - meta = { + enableParallelBuilding = true; + + meta = with lib; { description = "Doing phonetics by computer"; homepage = "https://www.fon.hum.uva.nl/praat/"; - license = lib.licenses.gpl2Plus; # Has some 3rd-party code in it though - platforms = lib.platforms.linux; + license = licenses.gpl2Plus; # Has some 3rd-party code in it though + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/shortwave/default.nix b/pkgs/applications/audio/shortwave/default.nix index 36ee6c12eef..0f4ffa14228 100644 --- a/pkgs/applications/audio/shortwave/default.nix +++ b/pkgs/applications/audio/shortwave/default.nix @@ -8,8 +8,8 @@ , gitMinimal , glib , gst_all_1 -, gtk3 -, libhandy_0 +, gtk4 +, libadwaita , meson , ninja , openssl @@ -22,20 +22,20 @@ stdenv.mkDerivation rec { pname = "shortwave"; - version = "1.1.1"; + version = "2.0.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Shortwave"; rev = version; - sha256 = "1vlhp2ss06j41simjrrjg38alp85jddhqyvccy6bhfzm0gzynwld"; + sha256 = "sha256-25qPb7qlqCwYJzl4qZxAZYx5asxSlXBlc/0dGyBdk1o="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-0+KEbjTLecL0u/3S9FWf2r2h9ZrgcRTY163kS3NKJqA="; + hash = "sha256-00dQXcSNmdZb2nSLG3q7jm4sugF9XR4LbH0OmcuHVxA="; }; nativeBuildInputs = [ @@ -57,8 +57,8 @@ stdenv.mkDerivation rec { dbus gdk-pixbuf glib - gtk3 - libhandy_0 + gtk4 + libadwaita openssl sqlite ] ++ (with gst_all_1; [ diff --git a/pkgs/applications/audio/tonelib-jam/default.nix b/pkgs/applications/audio/tonelib-jam/default.nix new file mode 100644 index 00000000000..c58023d6a4b --- /dev/null +++ b/pkgs/applications/audio/tonelib-jam/default.nix @@ -0,0 +1,60 @@ +{ stdenv +, dpkg +, lib +, autoPatchelfHook +, fetchurl +, gtk3 +, glib +, desktop-file-utils +, alsa-lib +, libjack2 +, harfbuzz +, fribidi +, pango +, freetype +}: + +stdenv.mkDerivation rec { + pname = "tonelib-jam"; + version = "4.6.6"; + + src = fetchurl { + url = "https://www.tonelib.net/download/0509/ToneLib-Jam-amd64.deb"; + sha256 = "sha256-cizIQgO35CQSLme/LKQqP+WzB/jCTk+fS5Z+EtF7wnQ="; + }; + + buildInputs = [ + dpkg + gtk3 + glib + desktop-file-utils + alsa-lib + libjack2 + harfbuzz + fribidi + pango + freetype + ]; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + unpackPhase = '' + mkdir -p $TMP/ $out/ + dpkg -x $src $TMP + ''; + + installPhase = '' + cp -R $TMP/usr/* $out/ + mv $out/bin/ToneLib-Jam $out/bin/tonelib-jam + ''; + + meta = with lib; { + description = "ToneLib Jam – the learning and practice software for guitar players"; + homepage = "https://tonelib.net/"; + license = licenses.unfree; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/tonelib-zoom/default.nix b/pkgs/applications/audio/tonelib-zoom/default.nix new file mode 100644 index 00000000000..94ef3037a7c --- /dev/null +++ b/pkgs/applications/audio/tonelib-zoom/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, dpkg +, lib +, autoPatchelfHook +, fetchurl +, webkitgtk +, libjack2 +, alsa-lib +}: + +stdenv.mkDerivation rec { + pname = "tonelib-zoom"; + version = "4.3.1"; + + src = fetchurl { + url = "https://www.tonelib.net/download/0129/ToneLib-Zoom-amd64.deb"; + sha256 = "sha256-4q2vM0/q7o/FracnO2xxnr27opqfVQoN7fsqTD9Tr/c="; + }; + + buildInputs = [ + dpkg + webkitgtk + libjack2 + alsa-lib + ]; + + nativeBuildInputs = [ + autoPatchelfHook + ]; + + unpackPhase = '' + mkdir -p $TMP/ $out/ + dpkg -x $src $TMP + ''; + + installPhase = '' + cp -R $TMP/usr/* $out/ + mv $out/bin/ToneLib-Zoom $out/bin/tonelib-zoom + ''; + + meta = with lib; { + description = "ToneLib Zoom – change and save all the settings in your Zoom(r) guitar pedal"; + homepage = "https://tonelib.net/"; + license = licenses.unfree; + maintainers = with maintainers; [ dan4ik605743 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 7b85a242eff..9bcc2ee3b46 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -16,8 +16,6 @@ python3Packages.buildPythonApplication rec { }; patches = [ - # tweak version requirements to what's available in Nixpkgs - ./dependencies.patch # Allow later websockets release, https://github.com/Chia-Network/chia-blockchain/pull/6304 (fetchpatch { name = "later-websockets.patch"; @@ -66,6 +64,16 @@ python3Packages.buildPythonApplication rec { "test_spend_zero_coin" ]; + 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_rs==0.1.7" "clvm_rs>=0.1.7" \ + --replace "clvm==0.9.6" "clvm>=0.9.6" \ + ''; + preCheck = '' export HOME=`mktemp -d` ''; diff --git a/pkgs/applications/blockchains/chia/dependencies.patch b/pkgs/applications/blockchains/chia/dependencies.patch deleted file mode 100644 index d9575d1d392..00000000000 --- a/pkgs/applications/blockchains/chia/dependencies.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index c5cf95db..b783a9e6 100644 ---- a/setup.py -+++ b/setup.py -@@ -8,7 +8,7 @@ dependencies = [ - "clvm==0.9.6", - "clvm_rs==0.1.7", - "clvm_tools==0.4.3", -- "aiohttp==3.7.4", # HTTP server for full node rpc -+ "aiohttp==3.7.4.post0", # HTTP server for full node rpc - "aiosqlite==0.17.0", # asyncio wrapper for sqlite, to store blocks - "bitstring==3.1.7", # Binary data management library - "colorlog==5.0.1", # Adds color to logs diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index dcbaa136795..2e244364dc7 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -38,7 +38,7 @@ with stdenv; lib.makeOverridable mkDerivation rec { nativeBuildInputs = [ makeWrapper patchelf unzip ]; - patchPhase = lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.isDarwin) '' get_file_size() { local fname="$1" echo $(ls -l $fname | cut -d ' ' -f5) @@ -64,6 +64,8 @@ with stdenv; lib.makeOverridable mkDerivation rec { ''; installPhase = '' + runHook preInstall + mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}} cp -a . $out/$name ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${mainProgram}.png @@ -86,6 +88,8 @@ with stdenv; lib.makeOverridable mkDerivation rec { --set ${hiName}_VM_OPTIONS ${vmoptsFile} ln -s "$item/share/applications" $out/share + + runHook postInstall ''; } // lib.optionalAttrs (!(meta.license.free or true)) { diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 38ea3054a60..4370e9af3eb 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -193,7 +193,7 @@ let platforms = platforms.linux; }; }).overrideAttrs (attrs: { - patchPhase = lib.optionalString (!stdenv.isDarwin) (attrs.patchPhase + '' + postPatch = lib.optionalString (!stdenv.isDarwin) (attrs.postPatch + '' rm -rf lib/ReSharperHost/linux-x64/dotnet mkdir -p lib/ReSharperHost/linux-x64/dotnet/ ln -s ${dotnet-sdk_5}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet @@ -229,7 +229,7 @@ let platforms = platforms.linux; }; }).overrideAttrs (attrs: { - patchPhase = (attrs.patchPhase or "") + optionalString (stdenv.isLinux) '' + postPatch = (attrs.postPatch or "") + optionalString (stdenv.isLinux) '' # Webstorm tries to use bundled jre if available. # Lets prevent this for the moment rm -r jbr @@ -255,12 +255,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.1.3"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "1znb4m7sv7xqi1mq3yw0m51m06wfwmhhxmvck0xkv8s0cfg18qim"; /* updated by script */ + sha256 = "0lhi3vwhwb359va4sa17y071i03l4mfwqpsp7haqxjf900dcld7d"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -268,12 +268,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.1.3"; /* updated by script */ description = "Up and Coming Go IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0g20r7yn4r2h08wv3i8bnnma8x4jljixsbmfml8kixk0pzfhv4px"; /* updated by script */ + sha256 = "0xy9k90v3kcm9sj48l809qn0vws4ygsxxyqwsg6y9a3r1raqgqxd"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -281,12 +281,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.1.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "03i5f6p0abr9yfs9fg90fg7hb1a7zar9q4d4iiag30cmndwpslg2"; /* updated by script */ + sha256 = "1phpfa9i3k7g92ankmibp53c1469ifnb12g6s8gklln7v7xxakmi"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -294,12 +294,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.1.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "0mw4acaik1bkr7gqbwgs3i8f8px8zw95hm1zxgd5gd5kh88n17x5"; /* updated by script */ + sha256 = "13c7a96zbw05w1gy4ds4wzac853hdlnbflww2xaz60jnr1k24gnp"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -320,12 +320,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2021.1.3"; /* updated by script */ + version = "2021.1.4"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "05hjv1nz1b82bkakadjvsy23v0qv8fyni6h31lcg9198h1890f7v"; /* updated by script */ + sha256 = "0p9a8l2bpjm25x4af1hlqhmw5xsirsfajznd6y723yqmjy8hs46l"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -333,12 +333,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.1.3"; /* updated by script */ description = "PyCharm Community Edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0sp7w1xrl0y36dai08kqfd0jk06yr7jdbaf1a9f3fgxp5pmspxp1"; /* updated by script */ + sha256 = "0c03grsrjydb6jcnbq1qi4158c14vni3znr7vysnbvldi8al6w8m"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -346,12 +346,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.1.3"; /* updated by script */ description = "PyCharm Professional Edition"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0ny7rbl8g5azpqnlcq8l6bwh6hrp8rgp06lf4a8gdr9rpvw9xsqb"; /* updated by script */ + sha256 = "01nwc9nprlyrwyij98px915w66g6vxbznsmmmg56rv3rvjvjp7yl"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; diff --git a/pkgs/applications/editors/jetbrains/update.pl b/pkgs/applications/editors/jetbrains/update.pl index cd3d2193a28..7656581a8b4 100755 --- a/pkgs/applications/editors/jetbrains/update.pl +++ b/pkgs/applications/editors/jetbrains/update.pl @@ -6,6 +6,8 @@ use List::Util qw(reduce); use File::Slurp; use LWP::Simple; +my $only_free = grep { $_ eq "--only-free" } @ARGV; + sub semantic_less { my ($a, $b) = @_; $a =~ s/\b(\d+)\b/sprintf("%010s", $1)/eg; @@ -14,7 +16,7 @@ sub semantic_less { } sub get_latest_versions { - my @channels = get("http://www.jetbrains.com/updates/updates.xml") =~ /(<channel .+?<\/channel>)/gs; + my @channels = get("https://www.jetbrains.com/updates/updates.xml") =~ /(<channel .+?<\/channel>)/gs; my %h = {}; for my $ch (@channels) { my ($id) = $ch =~ /^<channel id="[^"]+" name="([^"]+)"/; @@ -55,13 +57,15 @@ sub update_nix_block { die "no version in $block" unless $version; if ($version eq $latest_versions{$channel}) { print("$channel is up to date at $version\n"); + } elsif ($only_free && $block =~ /licenses\.unfree/) { + print("$channel is unfree, skipping\n"); } else { print("updating $channel: $version -> $latest_versions{$channel}\n"); my ($url) = $block =~ /url\s*=\s*"([^"]+)"/; # try to interpret some nix my ($name) = $block =~ /name\s*=\s*"([^"]+)"/; $name =~ s/\$\{version\}/$latest_versions{$channel}/; - # Some url paattern contain variables more than once + # Some url pattern contain variables more than once $url =~ s/\$\{name\}/$name/g; $url =~ s/\$\{version\}/$latest_versions{$channel}/g; die "$url still has some interpolation" if $url =~ /\$/; diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index 96a543f3cb5..773b1f278e0 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -1,99 +1,9 @@ -{ buildFHSUserEnv, makeDesktopItem, writeScript, stdenv, lib, requireFile, unstick, - supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] }: +{ stdenv, lib, buildFHSUserEnv, callPackage, makeDesktopItem, writeScript +, supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] +, unwrapped ? callPackage ./quartus.nix { inherit supportedDevices; } +}: let - deviceIds = { - "Arria II" = "arria_lite"; - "Cyclone V" = "cyclonev"; - "Cyclone IV" = "cyclone"; - "Cyclone 10 LP" = "cyclone10lp"; - "MAX II/V" = "max"; - "MAX 10 FPGA" = "max10"; - }; - - supportedDeviceIds = - assert lib.assertMsg (lib.all (name: lib.hasAttr name deviceIds) supportedDevices) - "Supported devices are: ${lib.concatStringsSep ", " (lib.attrNames deviceIds)}"; - lib.listToAttrs (map (name: { - inherit name; - value = deviceIds.${name}; - }) supportedDevices); - - unsupportedDeviceIds = lib.filterAttrs (name: value: - !(lib.hasAttr name supportedDeviceIds) - ) deviceIds; - - quartus = stdenv.mkDerivation rec { - version = "20.1.0.711"; - pname = "quartus-prime-lite-unwrapped"; - - src = let - require = {name, sha256}: requireFile { - inherit name sha256; - url = "${meta.homepage}/${lib.versions.majorMinor version}/?edition=lite&platform=linux"; - }; - - hashes = { - "arria_lite" = "09g2knq23h3vj0s5y7hsdnqbbkr3pnv53dzpqcw2lq9mb5zfs9r0"; - "cyclonev" = "05hrpysasyfb7xhxg68spdffxyvxcx0iagibd5jz643b7n6aalpa"; - "cyclone" = "1x3rnwsvzrb5kwdz35sbcabxmcvj8xxpnjlpcjwfc69ybiyr6sgz"; - "cyclone10lp" = "1x6d4hm697mjgzaxixrw5va8anr6ihhx96x2524r6axpwqf6wcja"; - "max" = "060b7v0xh86kkjyiix7akfkzhx2kl1b3q117kp7xibnz6yrzwmy3"; - "max10" = "05840l9pmqa4i1b3ajfaxkqz1hppls556vbq16a42acz2qs2g578"; - }; - - devicePackages = map (id: { - name = "${id}-${version}.qdz"; - sha256 = lib.getAttr id hashes; - }) (lib.attrValues supportedDeviceIds); - in map require ([{ - name = "QuartusLiteSetup-${version}-linux.run"; - sha256 = "07ssrv8p8kacal6xd80n4h7l5xz13aw1m1gfqqaxig0ivsj971z5"; - } { - name = "ModelSimSetup-${version}-linux.run"; - sha256 = "0smxasrmr1c8k6hy378knskpjmz4cgpgb35v5jclns0kx68y3c42"; - }] ++ devicePackages); - - nativeBuildInputs = [ unstick ]; - - buildCommand = let - installers = lib.sublist 0 2 src; - components = lib.sublist 2 ((lib.length src) - 2) src; - copyInstaller = installer: '' - # `$(cat $NIX_CC/nix-support/dynamic-linker) $src[0]` often segfaults, so cp + patchelf - cp ${installer} $TEMP/${installer.name} - chmod u+w,+x $TEMP/${installer.name} - patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $TEMP/${installer.name} - ''; - copyComponent = component: "cp ${component} $TEMP/${component.name}"; - # leaves enabled: quartus, modelsim_ase, devinfo - disabledComponents = [ - "quartus_help" - "quartus_update" - # not modelsim_ase - "modelsim_ae" - ] ++ (lib.attrValues unsupportedDeviceIds); - in '' - ${lib.concatMapStringsSep "\n" copyInstaller installers} - ${lib.concatMapStringsSep "\n" copyComponent components} - - unstick $TEMP/${(builtins.head installers).name} \ - --disable-components ${lib.concatStringsSep "," disabledComponents} \ - --mode unattended --installdir $out --accept_eula 1 - - rm -r $out/uninstall $out/logs - ''; - - meta = { - homepage = "https://fpgasoftware.intel.com"; - description = "FPGA design and simulation software"; - license = lib.licenses.unfree; - platforms = lib.platforms.linux; - hydraPlatforms = [ ]; # requireFile srcs cannot be fetched by hydra, ignore - maintainers = with lib.maintainers; [ kwohlfahrt ]; - }; - }; - desktopItem = makeDesktopItem { name = "quartus-prime-lite"; exec = "quartus"; @@ -102,7 +12,6 @@ let genericName = "Quartus Prime"; categories = "Development;"; }; - # I think modelsim_ase/linux/vlm checksums itself, so use FHSUserEnv instead of `patchelf` in buildFHSUserEnv rec { name = "quartus-prime-lite"; # wrapped @@ -136,9 +45,7 @@ in buildFHSUserEnv rec { xorg.libXrender ]; - passthru = { - unwrapped = quartus; - }; + passthru = { inherit unwrapped; }; extraInstallCommands = let quartusExecutables = (map (c: "quartus/bin/quartus_${c}") [ @@ -156,14 +63,14 @@ in buildFHSUserEnv rec { in '' mkdir -p $out/share/applications $out/share/icons/128x128 ln -s ${desktopItem}/share/applications/* $out/share/applications - ln -s ${quartus}/licenses/images/dc_quartus_panel_logo.png $out/share/icons/128x128/quartus.png + ln -s ${unwrapped}/licenses/images/dc_quartus_panel_logo.png $out/share/icons/128x128/quartus.png mkdir -p $out/quartus/bin $out/quartus/sopc_builder/bin $out/modelsim_ase/bin WRAPPER=$out/bin/${name} EXECUTABLES="${lib.concatStringsSep " " (quartusExecutables ++ qsysExecutables ++ modelsimExecutables)}" for executable in $EXECUTABLES; do echo "#!${stdenv.shell}" >> $out/$executable - echo "$WRAPPER ${quartus}/$executable \$@" >> $out/$executable + echo "$WRAPPER ${unwrapped}/$executable \$@" >> $out/$executable done cd $out diff --git a/pkgs/applications/editors/quartus-prime/quartus.nix b/pkgs/applications/editors/quartus-prime/quartus.nix new file mode 100644 index 00000000000..9475f441703 --- /dev/null +++ b/pkgs/applications/editors/quartus-prime/quartus.nix @@ -0,0 +1,97 @@ +{ stdenv, lib, unstick, requireFile +, supportedDevices ? [ "Arria II" "Cyclone V" "Cyclone IV" "Cyclone 10 LP" "MAX II/V" "MAX 10 FPGA" ] +}: + +let + deviceIds = { + "Arria II" = "arria_lite"; + "Cyclone V" = "cyclonev"; + "Cyclone IV" = "cyclone"; + "Cyclone 10 LP" = "cyclone10lp"; + "MAX II/V" = "max"; + "MAX 10 FPGA" = "max10"; + }; + + supportedDeviceIds = + assert lib.assertMsg (lib.all (name: lib.hasAttr name deviceIds) supportedDevices) + "Supported devices are: ${lib.concatStringsSep ", " (lib.attrNames deviceIds)}"; + lib.listToAttrs (map (name: { + inherit name; + value = deviceIds.${name}; + }) supportedDevices); + + unsupportedDeviceIds = lib.filterAttrs (name: value: + !(lib.hasAttr name supportedDeviceIds) + ) deviceIds; + + componentHashes = { + "arria_lite" = "140jqnb97vrxx6398cpgpw35zrrx3z5kv1x5gr9is1xdbnf4fqhy"; + "cyclone" = "116kf69ryqcmlc2k8ra0v32jy7nrk7w4s5z3yll7h3c3r68xcsfr"; + "cyclone10lp" = "07wpgx9bap6rlr5bcmr9lpsxi3cy4yar4n3pxfghazclzqfi2cyl"; + "cyclonev" = "11baa9zpmmfkmyv33w1r57ipf490gnd3dpi2daripf38wld8lgak"; + "max" = "1zy2d42dqmn97fwmv4x6pmihh4m23jypv3nd830m1mj7jkjx9kcq"; + "max10" = "1hvi9cpcjgbih3l6nh8x1vsp0lky5ax85jb2yqmzla80n7dl9ahs"; + }; + + version = "20.1.1.720"; + homepage = "https://fpgasoftware.intel.com"; + + require = {name, sha256}: requireFile { + inherit name sha256; + url = "${homepage}/${lib.versions.majorMinor version}/?edition=lite&platform=linux"; + }; + +in stdenv.mkDerivation rec { + inherit version; + pname = "quartus-prime-lite-unwrapped"; + + src = map require ([{ + name = "QuartusLiteSetup-${version}-linux.run"; + sha256 = "0mjp1rg312dipr7q95pb4nf4b8fwvxgflnd1vafi3g9cshbb1c3k"; + } { + name = "ModelSimSetup-${version}-linux.run"; + sha256 = "1cqgv8x6vqga8s4v19yhmgrr886rb6p7sbx80528df5n4rpr2k4i"; + }] ++ (map (id: { + name = "${id}-${version}.qdz"; + sha256 = lib.getAttr id componentHashes; + }) (lib.attrValues supportedDeviceIds))); + + nativeBuildInputs = [ unstick ]; + + buildCommand = let + installers = lib.sublist 0 2 src; + components = lib.sublist 2 ((lib.length src) - 2) src; + copyInstaller = installer: '' + # `$(cat $NIX_CC/nix-support/dynamic-linker) $src[0]` often segfaults, so cp + patchelf + cp ${installer} $TEMP/${installer.name} + chmod u+w,+x $TEMP/${installer.name} + patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $TEMP/${installer.name} + ''; + copyComponent = component: "cp ${component} $TEMP/${component.name}"; + # leaves enabled: quartus, modelsim_ase, devinfo + disabledComponents = [ + "quartus_help" + "quartus_update" + # not modelsim_ase + "modelsim_ae" + ] ++ (lib.attrValues unsupportedDeviceIds); + in '' + ${lib.concatMapStringsSep "\n" copyInstaller installers} + ${lib.concatMapStringsSep "\n" copyComponent components} + + unstick $TEMP/${(builtins.head installers).name} \ + --disable-components ${lib.concatStringsSep "," disabledComponents} \ + --mode unattended --installdir $out --accept_eula 1 + + rm -r $out/uninstall $out/logs + ''; + + meta = with lib; { + inherit homepage; + description = "FPGA design and simulation software"; + license = licenses.unfree; + platforms = platforms.linux; + hydraPlatforms = [ ]; # requireFile srcs cannot be fetched by hydra, ignore + maintainers = with maintainers; [ kwohlfahrt ]; + }; +} diff --git a/pkgs/applications/editors/spacevim/default.nix b/pkgs/applications/editors/spacevim/default.nix index 661bec463a7..9f6f895efac 100644 --- a/pkgs/applications/editors/spacevim/default.nix +++ b/pkgs/applications/editors/spacevim/default.nix @@ -1,8 +1,19 @@ -{ ripgrep, git, fzf, makeWrapper, vim_configurable, vimPlugins, fetchFromGitHub -, lib, stdenv, formats, runCommand, spacevim_config ? import ./init.nix }: +{ ripgrep +, git +, fzf +, makeWrapper +, vim_configurable +, vimPlugins +, fetchFromGitHub +, lib +, stdenv +, formats +, runCommand +, spacevim_config ? import ./init.nix +}: let - format = formats.toml {}; + format = formats.toml { }; vim-customized = vim_configurable.customize { name = "vim"; # Not clear at the moment how to import plugins such that @@ -14,17 +25,18 @@ let mkdir -p $out cp ${format.generate "init.toml" spacevim_config} $out/init.toml ''; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "spacevim"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; rev = "v${version}"; - sha256 = "sha256-QQdtjEdbuzmf0Rw+u2ZltLihnJt8LqkfTrLDWLAnCLE="; + sha256 = "sha256-TmfPeaGkH1Wq2b5lB29PUYDVddJVN3mBuPAmu9EtiGY="; }; - nativeBuildInputs = [ makeWrapper vim-customized]; + nativeBuildInputs = [ makeWrapper vim-customized ]; buildInputs = [ vim-customized ]; buildPhase = '' diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index ef7458d7394..09c1fddbda2 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj readline ffmpeg_3 makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas libLAS proj-datumgrid ] - ++ (with python2Packages; [ python dateutil wxPython30 numpy ]); + ++ (with python2Packages; [ python python-dateutil wxPython30 numpy ]); # On Darwin the installer tries to symlink the help files into a system # directory diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 2ebe0ac253f..3ed11aa8b70 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -12,7 +12,7 @@ let numpy psycopg2 chardet - dateutil + python-dateutil pyyaml pytz requests diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index 5fea254ce08..4ac4af48aab 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre -, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265 +, lcms2, openexr, libpng, liblqr1, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265 , ApplicationServices, Foundation }: @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { [ "--with-frozenpaths" ] ++ (if arch != null then [ "--with-gcc-arch=${arch}" ] else [ "--without-gcc-arch" ]) ++ lib.optional (librsvg != null) "--with-rsvg" + ++ lib.optional (liblqr1 != null) "--with-lqr" ++ lib.optionals (ghostscript != null) [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" "--with-gslib" @@ -46,7 +47,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib fontconfig freetype ghostscript - libpng libtiff libxml2 libheif libde265 djvulibre + liblqr1 libpng libtiff libxml2 libheif libde265 djvulibre ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ openexr librsvg openjpeg ] diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index e2fdb19127d..0fd76235f52 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre -, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif +, lcms2, openexr, libpng, liblqr1, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif , ApplicationServices , Foundation , testVersion, imagemagick @@ -18,13 +18,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-0"; + version = "7.1.0-2"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "sha256-TmyJMzj5tHMrVm6xRguZmXIg7c6mHmqusMMdJAHNqNg="; + sha256 = "sha256-0nTz9UBspROrNj72amyZmFYK/y9Xg4+qNt4raZiK3AI="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { [ "--with-frozenpaths" ] ++ (if arch != null then [ "--with-gcc-arch=${arch}" ] else [ "--without-gcc-arch" ]) ++ lib.optional (librsvg != null) "--with-rsvg" + ++ lib.optional (liblqr1 != null) "--with-lqr" ++ lib.optionals (ghostscript != null) [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" "--with-gslib" @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib fontconfig freetype ghostscript - libpng libtiff libxml2 libheif djvulibre + liblqr1 libpng libtiff libxml2 libheif djvulibre ] ++ lib.optionals (!stdenv.hostPlatform.isMinGW) [ openexr librsvg openjpeg ] @@ -84,7 +85,7 @@ stdenv.mkDerivation rec { homepage = "http://www.imagemagick.org/"; description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ erictapen ]; + maintainers = with maintainers; [ erictapen dotlambda ]; license = licenses.asl20; mainProgram = "magick"; }; diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 469437c6c95..cc15b96b4b6 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "3.4.1"; + version = "3.6.0"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "sha256-f8P4UdqbzXxQU+zQnyGqPrYQO+mKbFj1IBC28iF0lB4="; + sha256 = "sha256:0f8aqwkgw4gs97b5i4ygiqk5zilwq7ax7zwdd31r72zk98cd1g46"; }; nativeBuildInputs = [ cmake ninja llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 05e94bb164c..5bb94baf76f 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { homepage = "https://about.draw.io/"; license = licenses.asl20; changelog = "https://github.com/jgraph/drawio-desktop/releases/tag/v${version}"; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index 9fd629ca8e9..f9120ca0ee4 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -55,7 +55,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { psutil pyxdg arrow - dateutil + python-dateutil easygui colour pymediainfo diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 436e4d7831f..b4b55fa264d 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { description = "Multi-platform password manager"; homepage = "https://1password.com/"; license = licenses.unfree; - maintainers = with maintainers; [ danieldk timstott savannidgerinel ]; + maintainers = with maintainers; [ timstott savannidgerinel ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0ee374ac695..d27c9c9af65 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -77,7 +77,7 @@ mkDerivation rec { cchardet css-parser cssselect - dateutil + python-dateutil dnspython feedparser html2text diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index a33cb7b2ce6..32b9085b3de 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -3,20 +3,20 @@ mkDerivation rec { pname = "cura"; - version = "4.9.0"; + version = "4.10.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "1q515qwrzla3ikbsjmk91y0nrbwih11jycgmd50lkrmnkh7qj0r2"; + sha256 = "0v65xg31rw4kc7f98k8zz0kmhrp9m55k8ahblha9r1vr4krcf30z"; }; materials = fetchFromGitHub { owner = "Ultimaker"; repo = "fdm_materials"; rev = version; - sha256 = "0hi9w1fsnazlr0vvxdr3alsdb8m1vjjfp5zhmlz4kyyxhsy3bc33"; + sha256 = "0ykf14j4yx4cf12qw0d4bff9ixrx96m6wxqvi83sn721y7dsd2rs"; }; buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 05f63c54803..d0dfde5b382 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "curaengine"; - version = "4.9.1"; + version = "4.10.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "sha256-1hCjtnI1EnfyQ0QfU8qZoSLIjE5pyDYpu8H4J91cWYM="; + sha256 = "sha256-t5i6s0KKcaoMqzDxZ6JL1NyKP33uxWdmyziK3xh8q88="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index b48640c1d2a..a15157a9370 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.1.1"; # When updating also update fetchedMavenDeps.sha256 + version = "21.1.2"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-enUwX+BxgPy4c1Vwo1+vN3lFYz4LgofgKvZOYuz/050="; + sha256 = "sha256-3q5LTllyqw7s8unJHTuasBCM4iaJ9lLpwgbXwBGUtIw="; }; fetchedMavenDeps = stdenv.mkDerivation { @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-vNC+LmGEepZCepPodY3c783moReppqNw32d7AUuvBZc="; + outputHash = "sha256-QPDnIXP3yB1Dn0LBbBBLvRDbCyguWvG9Zzb1Vjh72UA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix index feadf159092..2dd70acb9a7 100644 --- a/pkgs/applications/misc/free42/default.nix +++ b/pkgs/applications/misc/free42/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "free42"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitHub { owner = "thomasokken"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZoW5gBAUp/5U8Is3Nhx+SHY4d0F3PGOS1/WOokKRnCU="; + sha256 = "sha256-ytRPIBE8KcuM+pyfdKt/b+Vi03x8nowdgZjSt8EddSc="; }; nativeBuildInputs = [ copyDesktopItems pkg-config ]; diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index 392e2c312f7..23e42539d79 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -20,7 +20,7 @@ buildPythonApplication rec { ''; propagatedBuildInputs = [ - dateutil gflags httplib2 parsedatetime six vobject + python-dateutil gflags httplib2 parsedatetime six vobject google-api-python-client oauth2client uritemplate libnotify ]; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 0eca08907e9..a2280e8bb01 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "9.1"; + version = "9.2"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-szq1i2/NEtMK4paSkxtkKXc8yY8qGj2U/p6CzNIecAY="; + sha256 = "sha256-pU02Eaq6tB7X6EPOo8YAyryJRbSV3KebQv8VELxXaBw="; }; patches = (substituteAll { diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index c2e55be1134..42683318840 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hugo"; - version = "0.84.3"; + version = "0.84.4"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3SbF4JsanNup0JmtEoZlyu3SvMn01r+nhnPgIi/W8pA="; + sha256 = "sha256-nD2UBDSDG6OFfUvDBXCfhOCiJyFMP2pDXSlIESaEfqE="; }; vendorSha256 = "sha256-ImXTOtN6kQL7Q8IBlmK7+i47cWtyZT0xcnQdCw3NvWM="; diff --git a/pkgs/applications/misc/kanjidraw/default.nix b/pkgs/applications/misc/kanjidraw/default.nix new file mode 100644 index 00000000000..53c752651d2 --- /dev/null +++ b/pkgs/applications/misc/kanjidraw/default.nix @@ -0,0 +1,47 @@ +{ lib +, fetchFromGitHub +, python3 +, bash +}: + +python3.pkgs.buildPythonApplication rec { + pname = "kanjidraw"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "obfusk"; + repo = "kanjidraw"; + rev = "v${version}"; + sha256 = "03ag8vkbf85qww857ii8hcnn8bh5qa7rsmhka0v9vfxk272ifbyq"; + }; + + propagatedBuildInputs = with python3.pkgs; [ tkinter ]; + + postPatch = '' + substituteInPlace Makefile --replace /bin/bash ${bash}/bin/bash + ''; + + checkPhase = '' + make test + ''; + + meta = with lib; { + description = "Handwritten kanji recognition"; + longDescription = '' + kanjidraw is a simple Python library + GUI for matching (the strokes of a) + handwritten kanji against its database. + + You can use the GUI to draw and subsequently select a kanji from the list of + probable matches, which will then be copied to the clipboard. + + The database is based on KanjiVG and the algorithms are based on the + Kanji draw Android app. + ''; + homepage = "https://github.com/obfusk/kanjidraw"; + license = with licenses; [ + agpl3Plus # code + cc-by-sa-30 # data.json + ]; + maintainers = [ maintainers.obfusk ]; + }; +} diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 5c6b505dd68..c7c184febe1 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -9,16 +9,12 @@ with python3.pkgs; buildPythonApplication rec { sha256 = "sha256-L92PwU/ll+Wn1unGPHho2WC07QIbVjxoSnHwcJDtpDI="; }; - patches = [ - ./skip-broken-test.patch - ]; - propagatedBuildInputs = [ atomicwrites click click-log configobj - dateutil + python-dateutil icalendar lxml pkgs.vdirsyncer @@ -31,16 +27,12 @@ with python3.pkgs; buildPythonApplication rec { freezegun ]; nativeBuildInputs = [ setuptools-scm sphinx sphinxcontrib_newsfeed ]; - checkInputs = [ pytest glibcLocales ]; + checkInputs = [ + glibcLocales + pytestCheckHook + ]; LC_ALL = "en_US.UTF-8"; - postPatch = '' - sed -i \ - -e "s/Invalid value for \"ics\"/Invalid value for \\\'ics\\\'/" \ - -e "s/Invalid value for \"\[ICS\]\"/Invalid value for \\\'\[ICS\]\\\'/" \ - tests/cli_test.py - ''; - postInstall = '' # zsh completion install -D misc/__khal $out/share/zsh/site-functions/__khal @@ -56,11 +48,13 @@ with python3.pkgs; buildPythonApplication rec { doCheck = !stdenv.isAarch64; - checkPhase = '' - py.test -k "not test_vertical_month_abbr_fr and not test_vertical_month_unicode_weekdeays_gr \ - and not test_event_different_timezones and not test_default_calendar and not test_birthdays \ - and not test_birthdays_no_year" - ''; + disabledTests = [ + # This test is failing due to https://github.com/pimutils/khal/issues/1065 + "test_print_ics_command" + + # Mocking breaks in this testcase + "test_import_from_stdin" + ]; meta = with lib; { homepage = "http://lostpackets.de/khal/"; diff --git a/pkgs/applications/misc/khal/skip-broken-test.patch b/pkgs/applications/misc/khal/skip-broken-test.patch deleted file mode 100644 index fc37f6acc86..00000000000 --- a/pkgs/applications/misc/khal/skip-broken-test.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/tests/cli_test.py b/tests/cli_test.py -index 5e354a5..d8fbcd5 100644 ---- a/tests/cli_test.py -+++ b/tests/cli_test.py -@@ -493,6 +493,7 @@ def test_import_invalid_choice_and_prefix(runner): - assert result.output == '09.04.-09.04. An Event\n' - - -+@pytest.mark.skip(reason="Mocking breaks in this testcase") - def test_import_from_stdin(runner, monkeypatch): - ics_data = 'This is some really fake icalendar data' - -diff --git a/tests/ui/test_editor.py b/tests/ui/test_editor.py -index 27b7fa5..5978d72 100644 ---- a/tests/ui/test_editor.py -+++ b/tests/ui/test_editor.py -@@ -1,5 +1,7 @@ - import datetime as dt - -+import pytest -+ - import icalendar - from khal.ui.editor import RecurrenceEditor, StartEndEditor - -@@ -19,7 +21,7 @@ palette = { - 'edit': 'blue', - } - -- -+@pytest.mark.skip(reason="Mocking breaks in this testcase") - def test_popup(monkeypatch): - """making sure the popup calendar gets callend with the right inital value - diff --git a/pkgs/applications/misc/kile-wl/default.nix b/pkgs/applications/misc/kile-wl/default.nix index a9e44964d45..9146f38df36 100644 --- a/pkgs/applications/misc/kile-wl/default.nix +++ b/pkgs/applications/misc/kile-wl/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "kile-wl"; - version = "unstable-2021-06-01"; + version = "unstable-2021-06-24"; src = fetchFromGitLab { owner = "snakedye"; repo = "kile"; - rev = "28235f85ece148e7010c5d6ac088688100a18e04"; - sha256 = "sha256-UTfYYywOwa728zLkLWQaz6wN0TM/4OzbHQGedjdHGSI="; + rev = "6a306b0b5af0f250135eb88e0e72a5038fccd6a8"; + sha256 = "sha256-DznIDzI5rNrlKJdXjpOpsLL8IO6tuIvW0pNdRN8N6Go="; }; passthru.updateScript = unstableGitUpdater { url = "https://gitlab.com/snakedye/kile.git"; }; - cargoSha256 = "sha256-dzOkiZYHQu5AuwkbWEtIJAyZ1TNIGYkfz+S3q6K384w="; + cargoSha256 = "sha256-LFRqhgvziQ7a8OWRzXqNIfziP6bRHTe2oF55N09rFy8="; nativeBuildInputs = [ scdoc ]; diff --git a/pkgs/applications/misc/kiln/default.nix b/pkgs/applications/misc/kiln/default.nix new file mode 100644 index 00000000000..dfa114f446a --- /dev/null +++ b/pkgs/applications/misc/kiln/default.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromSourcehut, scdoc }: + +buildGoModule rec { + pname = "kiln"; + version = "0.2.1"; + + src = fetchFromSourcehut { + owner = "~adnano"; + repo = pname; + rev = version; + hash = "sha256-c6ed62Nn++qw+U/DCiYeGwF77YsBxexWKZ7UQ3LE4fI="; + }; + + nativeBuildInputs = [ scdoc ]; + + vendorSha256 = "sha256-bMpzebwbVHAbBtw0uuGyWd4wnM9z6tlsEQN4S/iucgk="; + + installPhase = '' + runHook preInstall + make PREFIX=$out install + runHook postInstall + ''; + + meta = with lib; { + description = "A simple static site generator for Gemini"; + homepage = "https://git.sr.ht/~adnano/kiln"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/applications/misc/kjv/default.nix b/pkgs/applications/misc/kjv/default.nix index 5247207d149..08a1b5a71af 100644 --- a/pkgs/applications/misc/kjv/default.nix +++ b/pkgs/applications/misc/kjv/default.nix @@ -1,43 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, readline }: let + patchPrefix = "https://github.com/samuelgrf/kjv/commit/"; -patch-base = "https://github.com/LukeSmithxyz/kjv/commit/"; - -add-apocrypha = fetchpatch { - url = patch-base + "b92b7622285d10464f9274f11e740bef90705bbc.patch"; - sha256 = "0n4sj8p9m10fcair4msc129jxkkx5whqzhjbr5k4lfgp6nb1zk8k"; -}; - -add-install-target = fetchpatch { - url = patch-base + "f4ad73539eb73f1890f4b791d8d38dd95900a4a4.patch"; - sha256 = "1yzj72i5fkzn2i4wl09q6jx7nwn2h4jwm49fc23nxfwchzar9m1q"; -}; + add-apocrypha = fetchpatch { + url = patchPrefix + "0856fa0d37b45de0d6b47d163b5ea9a0b7f2c061.patch"; + sha256 = "1jkajdg4wvpbbwc5mn37i4c8nfis4z0pv5rl7gqs0laj0gpj7jn8"; + }; + add-install-target = fetchpatch { + url = patchPrefix + "50a83256ee45430fb06b7aea1945dd91c6813bc3.patch"; + sha256 = "0bv9yma67jdj496a6vn6y007c9gwjpg3rzld1i9m9y9xmlzq4yzv"; + }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "kjv"; - version = "unstable-2018-12-25"; + version = "unstable-2021-03-11"; src = fetchFromGitHub { owner = "bontibon"; - repo = pname; - rev = "fda81a610e4be0e7c5cf242de655868762dda1d4"; - sha256 = "1favfcjvd3pzz1ywwv3pbbxdg7v37s8vplgsz8ag016xqf5ykqqf"; + repo = "kjv"; + rev = "108595dcbb9bb12d40e0309f029b6fb3ccd81309"; + hash = "sha256-Z6myd9Xn23pYizG+IZVDrP988pYU06QIcpqXtWTcPiw="; }; patches = [ add-apocrypha add-install-target ]; - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; + buildInputs = [ readline ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { description = "The Bible, King James Version"; homepage = "https://github.com/bontibon/kjv"; - license = licenses.publicDomain; - maintainers = [ maintainers.jtobin ]; + license = licenses.unlicense; + maintainers = with maintainers; [ jtobin samuelgrf ]; + mainProgram = "kjv"; }; } - diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index d294271ca25..2d70daa94ec 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -1,6 +1,8 @@ -{ buildPythonApplication, lib, fetchFromGitHub +{ buildPythonApplication +, lib +, fetchFromGitHub -# build inputs + # build inputs , atk , gdk-pixbuf , glib-networking @@ -13,7 +15,7 @@ , webkitgtk , wrapGAppsHook -# python dependencies + # python dependencies , dbus-python , distro , evdev @@ -25,7 +27,7 @@ , keyring , python_magic -# commands that lutris needs + # commands that lutris needs , xrandr , pciutils , psmisc @@ -71,15 +73,16 @@ let gstreamer ]; -in buildPythonApplication rec { +in +buildPythonApplication rec { pname = "lutris-original"; - version = "0.5.8.3"; + version = "0.5.8.4"; src = fetchFromGitHub { owner = "lutris"; repo = "lutris"; rev = "v${version}"; - sha256 = "sha256-NnWIP9oEndk/hDo5Z33pkmZ61pxT/ScmZ4YpS2ajK/8="; + sha256 = "sha256-5ivXIgDyM9PRvuUhPFPgziXDvggcL+p65kI2yOaiS1M="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index e60e110087f..353fe661483 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { sha256 = "07cq7q71bv3fwddkp2863ylry2ivds00f8sjy8npjpdbkailxm21"; }; - patchPhase = "patchShebangs test"; + patches = [ ./tests-use-better-shell.patch ]; + postPatch = "patchShebangs test"; doCheck = true; checkTarget = "test"; @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://megastep.org/makeself"; + homepage = "https://makeself.io"; description = "Utility to create self-extracting packages"; license = licenses.gpl2; maintainers = [ maintainers.wmertens ]; diff --git a/pkgs/applications/misc/makeself/tests-use-better-shell.patch b/pkgs/applications/misc/makeself/tests-use-better-shell.patch new file mode 100644 index 00000000000..159a93622ad --- /dev/null +++ b/pkgs/applications/misc/makeself/tests-use-better-shell.patch @@ -0,0 +1,10 @@ +Use full bash's sh in tests instead of /bin/sh, as that would be +too minimalist in the build sandbox. See issue: +https://github.com/NixOS/nixpkgs/issues/110149#issuecomment-874258128 +diff --git a/test/extracttest b/test/extracttest +--- a/test/extracttest ++++ b/test/extracttest +@@ -9,2 +9,3 @@ setupTests() { + $SUT $* archive makeself-test.run "Test $*" echo Testing ++ sed "1s|/bin|$(dirname "$SHELL")|" -i ./makeself-test.run + } diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 2fd217e3cd6..72028478e6e 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://code-industry.net/free-pdf-editor/"; license = licenses.unfreeRedistributable; platforms = with platforms; [ "x86_64-linux" ]; - maintainers = with maintainers; [ cmcdragonkai flokli ]; + broken = true; + maintainers = with maintainers; [ cmcdragonkai ]; }; } diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index d5f2a4b2462..46da03b8a88 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "1.0.6"; + version = "1.0.7"; format = "other"; @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = "metadata-cleaner"; rev = "v${version}"; - sha256 = "0k9qnycaqxnmsjsyxqgip6xr5w9affzxjc4zyb38ajbq4arfq5wv"; + sha256 = "sha256-HlP/QahVFCAct06pKanjozFqeyTdHoHanIemq5ID2CQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix new file mode 100644 index 00000000000..b15eb1a78b4 --- /dev/null +++ b/pkgs/applications/misc/otpclient/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, gtk3 +, wrapGAppsHook +, jansson +, libgcrypt +, libzip +, libpng +, libcotp +, zbar +}: + +stdenv.mkDerivation rec { + pname = "otpclient"; + version = "2.4.4"; + + src = fetchFromGitHub { + owner = "paolostivanin"; + repo = pname; + rev = "v${version}"; + sha256 = "0zjvhcx9q8nsf97zikddxriky0kghi4j4i7312s94pl8c7kb4abr"; + }; + + buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; + + meta = with lib; { + description = "Highly secure and easy to use OTP client written in C/GTK that supports both TOTP and HOTP"; + homepage = "https://github.com/paolostivanin/OTPClient"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ alexbakker ]; + }; +} diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix index 235d14b4cda..5657c7f7e1a 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/applications/misc/pdfarranger/default.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { pikepdf img2pdf setuptools - dateutil + python-dateutil ]; # incompatible with wrapGAppsHook diff --git a/pkgs/applications/misc/sfm/default.nix b/pkgs/applications/misc/sfm/default.nix index 4f17fa87950..1d9dc3811aa 100644 --- a/pkgs/applications/misc/sfm/default.nix +++ b/pkgs/applications/misc/sfm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, conf ? null }: +{ lib, stdenv, fetchFromGitHub, writeText, conf ? null }: stdenv.mkDerivation rec { pname = "sfm"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hash = "sha256-DwXKrSqcebNI5N9REXyMV16W2kr72IH9+sKSVehc5zw="; }; - configFile = lib.optionalString (conf!=null) (lib.writeText "config.def.h" conf); + configFile = lib.optionalString (conf!=null) (writeText "config.def.h" conf); postPatch = lib.optionalString (conf!=null) "cp ${configFile} config.def.h"; diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 7420267aa7d..d5a7d6f0fd6 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -5,13 +5,13 @@ }: let - version = "5.0.1"; + version = "5.0.2"; subsurfaceSrc = (fetchFromGitHub { owner = "Subsurface"; repo = "subsurface"; rev = "v${version}"; - sha256 = "01r836ckvrmgprjf4cqxn2n3w5w4pa2fjrhspjndsspic8nwlrwg"; + sha256 = "1yay06m8p9qp2ghrg8dxavdq55y09apcgdnb7rihgs3hq86k539n"; fetchSubmodules = true; }); diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix index 562a0f0bdcb..f28bd665a5e 100644 --- a/pkgs/applications/misc/termdown/default.nix +++ b/pkgs/applications/misc/termdown/default.nix @@ -3,7 +3,7 @@ , buildPythonApplication , click , pyfiglet -, dateutil +, python-dateutil , setuptools }: @@ -18,7 +18,7 @@ buildPythonApplication rec { owner = "trehn"; }; - propagatedBuildInputs = [ dateutil click pyfiglet setuptools ]; + propagatedBuildInputs = [ python-dateutil click pyfiglet setuptools ]; meta = with lib; { description = "Starts a countdown to or from TIMESPEC"; diff --git a/pkgs/applications/misc/usb-reset/default.nix b/pkgs/applications/misc/usb-reset/default.nix new file mode 100644 index 00000000000..db05eda0d41 --- /dev/null +++ b/pkgs/applications/misc/usb-reset/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, libusb1 +}: + +stdenv.mkDerivation rec { + pname = "usb-reset"; + # not tagged, but changelog has this with the date of the e9a9d6c commit + # and no significant change occured between bumping the version in the Makefile and that + # and the changes since then (up to ff822d8) seem snap related + version = "0.3"; + + src = fetchFromGitHub { + owner = "ralight"; + repo = pname; + rev = "e9a9d6c4a533430e763e111a349efbba69e7a5bb"; + sha256 = "0k9qmhqi206gcnv3z4vwya82g5nm225972ylf67zjiikk8pn8m0s"; + }; + + buildInputs = [ libusb1 ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace /usr/include/libusb-1.0 ${libusb1.dev}/include/libusb-1.0 + ''; + + makeFlags = [ + "DESTDIR=${placeholder "out"}" + "prefix=" + ]; + + meta = with lib; { + description = "Perform a bus reset on a USB device using its vendor and product ID"; + homepage = "https://github.com/ralight/usb-reset"; + changelog = "https://github.com/ralight/usb-reset/blob/master/ChangeLog.txt"; + license = licenses.mit; + maintainers = [ maintainers.evils ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 9663d09304f..7851000a7a0 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -2,7 +2,7 @@ , lib , buildPythonApplication , fetchFromGitHub -, dateutil +, python-dateutil , pandas , requests , lxml @@ -36,7 +36,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ # from visidata/requirements.txt # packages not (yet) present in nixpkgs are commented - dateutil + python-dateutil pandas requests lxml diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/applications/misc/yokadi/default.nix index 20defe41988..10d519efa45 100644 --- a/pkgs/applications/misc/yokadi/default.nix +++ b/pkgs/applications/misc/yokadi/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonApplication, dateutil, +{ lib, fetchurl, buildPythonApplication, python-dateutil, sqlalchemy, setproctitle, icalendar }: buildPythonApplication rec { @@ -11,7 +11,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ - dateutil + python-dateutil sqlalchemy setproctitle icalendar diff --git a/pkgs/applications/networking/3proxy/default.nix b/pkgs/applications/networking/3proxy/default.nix index f9221d06d02..b83f93b3b68 100644 --- a/pkgs/applications/networking/3proxy/default.nix +++ b/pkgs/applications/networking/3proxy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "3proxy"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "z3APA3A"; repo = pname; rev = version; - sha256 = "9aopwyz0U2bYTvx5YWLJo9EE8Xfb51IOguHRJodjpm8="; + sha256 = "sha256-4bLlQ/ULvpjs6fr19yBBln5mRRc+yj+zVLiTs1e/Ypc="; }; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 7d5b437b0ac..7b2acbd6b3d 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.26.67"; + version = "1.26.74"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "Kg6ExXZYdSkyBoivu9h4blytHN9hOc4bUSuFR+1YZOY="; + sha256 = "ULmoUXyPWHCewK4FPP7SX1Ena6n0aM/EWR7ZnMN1ztY="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index cc443764447..602e2e6a829 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -62,7 +62,7 @@ mkChromiumDerivation (base: rec { -e '/\[Desktop Entry\]/a\' \ -e 'StartupWMClass=chromium-browser' \ $out/share/applications/chromium-browser.desktop - '' + lib.optionalString (channel == "dev") '' + '' + lib.optionalString (channel != "stable") '' cp -v "$buildPath/crashpad_handler" "$libExecPath/" ''; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 14ee3290c71..535b87a87fd 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -149,9 +149,11 @@ in stdenv.mkDerivation { + "chromium${suffix}-${version}"; inherit version; - buildInputs = [ + nativeBuildInputs = [ makeWrapper ed + ]; + buildInputs = [ # needed for GSETTINGS_SCHEMAS_PATH gsettings-desktop-schemas glib gtk3 diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 725205c5c20..d16c625e2db 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -203,6 +203,7 @@ stdenv.mkDerivation { url = "http://www.mozilla.org/en-US/foundation/trademarks/policy/"; }; platforms = builtins.attrNames mozillaPlatforms; + timeout = 86400; # 24 hours (increased from the Hydra default of 10h, c.f. #129115) maintainers = with maintainers; [ taku0 lovesegfault ]; }; } diff --git a/pkgs/applications/networking/browsers/vieb/default.nix b/pkgs/applications/networking/browsers/vieb/default.nix index 0eeb5231159..f97e8d8250e 100644 --- a/pkgs/applications/networking/browsers/vieb/default.nix +++ b/pkgs/applications/networking/browsers/vieb/default.nix @@ -2,13 +2,13 @@ mkYarnPackage rec { pname = "vieb"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "Jelmerro"; repo = pname; rev = version; - sha256 = "sha256-wLaOqjDxgjfv4+TJeLE0dkrhfdnNSjiDqtFcHTm8uG4="; + sha256 = "sha256-NKWqSnUO8SScEodHYSptRHwVNOa5C4M61ac85d+wYK0="; }; packageJSON = ./package.json; diff --git a/pkgs/applications/networking/browsers/vieb/package.json b/pkgs/applications/networking/browsers/vieb/package.json index e12d86356c2..1836efdb8ad 100644 --- a/pkgs/applications/networking/browsers/vieb/package.json +++ b/pkgs/applications/networking/browsers/vieb/package.json @@ -1,7 +1,7 @@ { "name": "vieb", "productName": "Vieb", - "version": "5.2.0", + "version": "5.3.0", "description": "Vim Inspired Electron Browser", "main": "app/index.js", "scripts": { @@ -29,18 +29,18 @@ "license": "GPL-3.0-or-later", "devDependencies": { "archiver": "5.3.0", - "electron": "13.1.2", + "electron": "13.1.4", "electron-builder": "22.11.7", "eslint": "7.29.0", "eslint-plugin-compat": "3.9.0", "eslint-plugin-sort-keys-fix": "1.1.1", - "jest-environment-jsdom": "27.0.3", - "jest": "27.0.4" + "jest": "27.0.6", + "jest-environment-jsdom": "27.0.6" }, "dependencies": { "7zip-bin": "5.1.1", - "@cliqz/adblocker-electron": "1.22.1", - "@cliqz/adblocker-electron-preload": "1.22.1", + "@cliqz/adblocker-electron": "1.22.2", + "@cliqz/adblocker-electron-preload": "1.22.2", "is-svg": "4.3.1", "rimraf": "3.0.2" }, diff --git a/pkgs/applications/networking/browsers/vieb/yarn.lock b/pkgs/applications/networking/browsers/vieb/yarn.lock index af42526610d..33e9604c06d 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.lock +++ b/pkgs/applications/networking/browsers/vieb/yarn.lock @@ -22,9 +22,9 @@ "@babel/highlight" "^7.14.5" "@babel/compat-data@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.5.tgz#8ef4c18e58e801c5c95d3c1c0f2874a2680fadea" - integrity sha512-kixrYn4JwfAVPa0f2yfzc2AWti6WRRyO3XjWW5PJAvtE11qhSayrrcrEnee05KAtNaPC+EwehE8Qt1UedEVB8w== + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz#7b047d7a3a89a67d2258dc61f604f098f1bc7e08" + integrity sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw== "@babel/core@^7.1.0", "@babel/core@^7.7.2", "@babel/core@^7.7.5": version "7.14.6" @@ -90,9 +90,9 @@ "@babel/types" "^7.14.5" "@babel/helper-member-expression-to-functions@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.5.tgz#d5c70e4ad13b402c95156c7a53568f504e2fb7b8" - integrity sha512-UxUeEYPrqH1Q/k0yRku1JE7dyfyehNwT6SVkMHvYvPDv4+uu627VXBckVj891BO8ruKBkiDoGnZf4qPDD8abDQ== + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz#97e56244beb94211fe277bd818e3a329c66f7970" + integrity sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA== dependencies: "@babel/types" "^7.14.5" @@ -181,10 +181,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.5", "@babel/parser@^7.14.6", "@babel/parser@^7.7.2": - version "7.14.6" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.6.tgz#d85cc68ca3cac84eae384c06f032921f5227f4b2" - integrity sha512-oG0ej7efjEXxb4UgE+klVx+3j4MVo+A2vCzm7OUN4CLo6WhQ+vSOD2yJ8m7B+DghObxtLxt3EfgMWpq+AsWehQ== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.5", "@babel/parser@^7.14.6", "@babel/parser@^7.14.7", "@babel/parser@^7.7.2": + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.7.tgz#6099720c8839ca865a2637e6c85852ead0bdb595" + integrity sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -287,16 +287,16 @@ "@babel/types" "^7.14.5" "@babel/traverse@^7.1.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.7.2": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.5.tgz#c111b0f58afab4fea3d3385a406f692748c59870" - integrity sha512-G3BiS15vevepdmFqmUc9X+64y0viZYygubAMO8SvBmKARuF6CPSZtH4Ng9vi/lrWlZFGe3FWdXNy835akH8Glg== + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.7.tgz#64007c9774cfdc3abd23b0780bc18a3ce3631753" + integrity sha512-9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ== dependencies: "@babel/code-frame" "^7.14.5" "@babel/generator" "^7.14.5" "@babel/helper-function-name" "^7.14.5" "@babel/helper-hoist-variables" "^7.14.5" "@babel/helper-split-export-declaration" "^7.14.5" - "@babel/parser" "^7.14.5" + "@babel/parser" "^7.14.7" "@babel/types" "^7.14.5" debug "^4.1.0" globals "^11.1.0" @@ -314,34 +314,27 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cliqz/adblocker-content@^1.22.1", "@cliqz/adblocker-content@^1.22.2": +"@cliqz/adblocker-content@^1.22.2": version "1.22.2" resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.22.2.tgz#643849d5f08c167eb84a2e7e3f1f9fbc41a3889b" integrity sha512-EsV00IdW8sGujGnylOGR8dm401FdIfPRAjuevsRlZjgDE+hQKj6n5wwrZaylPIh994hWesg6bxWTmXpJ2Sy2QQ== dependencies: "@cliqz/adblocker-extended-selectors" "^1.22.2" -"@cliqz/adblocker-electron-preload@1.22.1": - version "1.22.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.1.tgz#8ce8c18d0ce5f7afa7c1dfe1f4cba30ada86f4af" - integrity sha512-etkb6LNUaCViZ2Bg7Z0fwpKsdsrmHF6Qjqs5u7FcfS4fSZ2TgDv7Ir5PunUWd6MOUW7mapx5CdPIupnlVkiTLA== - dependencies: - "@cliqz/adblocker-content" "^1.22.1" - -"@cliqz/adblocker-electron-preload@^1.22.1": +"@cliqz/adblocker-electron-preload@1.22.2", "@cliqz/adblocker-electron-preload@^1.22.2": version "1.22.2" resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.2.tgz#eea674767a60abe4e5f9ccb46188d33656f551d0" integrity sha512-4JSqNNYo4hXMoZjnyBVTd3z2yV2n5qeoNPk+WaeOFEF9uJXhqPR+Sz7scNB6nMYnRuSQfraeogtdaA4s0JkJWQ== dependencies: "@cliqz/adblocker-content" "^1.22.2" -"@cliqz/adblocker-electron@1.22.1": - version "1.22.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.22.1.tgz#13fe6de4be0c3beb2851634b27ea1223d10ca92b" - integrity sha512-RZUog6ogMZnOx9Rz1LWIHE5MOWdDStfzkbfLpelka6PerRSKKltUvV4qwqM455eUMqHqPd27ZMM183+MQ85WpQ== +"@cliqz/adblocker-electron@1.22.2": + version "1.22.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.22.2.tgz#85af3b49f7f653e6fb0d008b6523e3b3ba0dd41e" + integrity sha512-uSQjbcv9/csjQOO0AgqK8AnqdpKseebPkwXozglU1uFVVnuSOTs/4RohL3yac9uMkJtfyAIhT3mnbw9Cf4o+gQ== dependencies: - "@cliqz/adblocker" "^1.22.1" - "@cliqz/adblocker-electron-preload" "^1.22.1" + "@cliqz/adblocker" "^1.22.2" + "@cliqz/adblocker-electron-preload" "^1.22.2" tldts-experimental "^5.6.21" "@cliqz/adblocker-extended-selectors@^1.22.2": @@ -349,7 +342,7 @@ resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.22.2.tgz#1cad3c1569b765d9e7f8672c85b2a7b1e8e9ee90" integrity sha512-/u4SmQ1wr7d80iGP705fZrfHjJUTf/1MyRXz5Wltt7i3OHvOCQEoST2mqNlfx0W/9gIWzxA7cFRLY0/aITmzTw== -"@cliqz/adblocker@^1.22.1": +"@cliqz/adblocker@^1.22.2": version "1.22.2" resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.22.2.tgz#99a14d56327734d3083a077d96fe7b91c236bf7a" integrity sha512-P+a8gYbRbQy38mYsr7932h2cnK/7AEuQrmCEfLTO1+abCr2v5RM2Qb+cCn/JVnQSeqnysebAIXoV+PUzrjfpiQ== @@ -429,94 +422,94 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== -"@jest/console@^27.0.2": - version "27.0.2" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.0.2.tgz#b8eeff8f21ac51d224c851e1729d2630c18631e6" - integrity sha512-/zYigssuHLImGeMAACkjI4VLAiiJznHgAl3xnFT19iWyct2LhrH3KXOjHRmxBGTkiPLZKKAJAgaPpiU9EZ9K+w== +"@jest/console@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.0.6.tgz#3eb72ea80897495c3d73dd97aab7f26770e2260f" + integrity sha512-fMlIBocSHPZ3JxgWiDNW/KPj6s+YRd0hicb33IrmelCcjXo/pXPwvuiKFmZz+XuqI/1u7nbUK10zSsWL/1aegg== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" "@types/node" "*" chalk "^4.0.0" - jest-message-util "^27.0.2" - jest-util "^27.0.2" + jest-message-util "^27.0.6" + jest-util "^27.0.6" slash "^3.0.0" -"@jest/core@^27.0.4": - version "27.0.4" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.0.4.tgz#679bf9ac07900da2ddbb9667bb1afa8029038f53" - integrity sha512-+dsmV8VUs1h/Szb+rEWk8xBM1fp1I///uFy9nk3wXGvRsF2lBp8EVPmtWc+QFRb3MY2b7u2HbkGF1fzoDzQTLA== +"@jest/core@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.0.6.tgz#c5f642727a0b3bf0f37c4b46c675372d0978d4a1" + integrity sha512-SsYBm3yhqOn5ZLJCtccaBcvD/ccTLCeuDv8U41WJH/V1MW5eKUkeMHT9U+Pw/v1m1AIWlnIW/eM2XzQr0rEmow== dependencies: - "@jest/console" "^27.0.2" - "@jest/reporters" "^27.0.4" - "@jest/test-result" "^27.0.2" - "@jest/transform" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/console" "^27.0.6" + "@jest/reporters" "^27.0.6" + "@jest/test-result" "^27.0.6" + "@jest/transform" "^27.0.6" + "@jest/types" "^27.0.6" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" emittery "^0.8.1" exit "^0.1.2" graceful-fs "^4.2.4" - jest-changed-files "^27.0.2" - jest-config "^27.0.4" - jest-haste-map "^27.0.2" - jest-message-util "^27.0.2" - jest-regex-util "^27.0.1" - jest-resolve "^27.0.4" - jest-resolve-dependencies "^27.0.4" - jest-runner "^27.0.4" - jest-runtime "^27.0.4" - jest-snapshot "^27.0.4" - jest-util "^27.0.2" - jest-validate "^27.0.2" - jest-watcher "^27.0.2" + jest-changed-files "^27.0.6" + jest-config "^27.0.6" + jest-haste-map "^27.0.6" + jest-message-util "^27.0.6" + jest-regex-util "^27.0.6" + jest-resolve "^27.0.6" + jest-resolve-dependencies "^27.0.6" + jest-runner "^27.0.6" + jest-runtime "^27.0.6" + jest-snapshot "^27.0.6" + jest-util "^27.0.6" + jest-validate "^27.0.6" + jest-watcher "^27.0.6" micromatch "^4.0.4" p-each-series "^2.1.0" rimraf "^3.0.0" slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^27.0.3": - version "27.0.3" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.3.tgz#68769b1dfdd213e3456169d64fbe9bd63a5fda92" - integrity sha512-pN9m7fbKsop5vc3FOfH8NF7CKKdRbEZzcxfIo1n2TT6ucKWLFq0P6gCJH0GpnQp036++yY9utHOxpeT1WnkWTA== +"@jest/environment@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.6.tgz#ee293fe996db01d7d663b8108fa0e1ff436219d2" + integrity sha512-4XywtdhwZwCpPJ/qfAkqExRsERW+UaoSRStSHCCiQTUpoYdLukj+YJbQSFrZjhlUDRZeNiU9SFH0u7iNimdiIg== dependencies: - "@jest/fake-timers" "^27.0.3" - "@jest/types" "^27.0.2" + "@jest/fake-timers" "^27.0.6" + "@jest/types" "^27.0.6" "@types/node" "*" - jest-mock "^27.0.3" + jest-mock "^27.0.6" -"@jest/fake-timers@^27.0.3": - version "27.0.3" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.3.tgz#9899ba6304cc636734c74478df502e18136461dd" - integrity sha512-fQ+UCKRIYKvTCEOyKPnaPnomLATIhMnHC/xPZ7yT1Uldp7yMgMxoYIFidDbpSTgB79+/U+FgfoD30c6wg3IUjA== +"@jest/fake-timers@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.6.tgz#cbad52f3fe6abe30e7acb8cd5fa3466b9588e3df" + integrity sha512-sqd+xTWtZ94l3yWDKnRTdvTeZ+A/V7SSKrxsrOKSqdyddb9CeNRF8fbhAU0D7ZJBpTTW2nbp6MftmKJDZfW2LQ== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" "@sinonjs/fake-timers" "^7.0.2" "@types/node" "*" - jest-message-util "^27.0.2" - jest-mock "^27.0.3" - jest-util "^27.0.2" + jest-message-util "^27.0.6" + jest-mock "^27.0.6" + jest-util "^27.0.6" -"@jest/globals@^27.0.3": - version "27.0.3" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.3.tgz#1cf8933b7791bba0b99305cbf39fd4d2e3fe4060" - integrity sha512-OzsIuf7uf+QalqAGbjClyezzEcLQkdZ+7PejUrZgDs+okdAK8GwRCGcYCirHvhMBBQh60Jr3NlIGbn/KBPQLEQ== +"@jest/globals@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.6.tgz#48e3903f99a4650673d8657334d13c9caf0e8f82" + integrity sha512-DdTGCP606rh9bjkdQ7VvChV18iS7q0IMJVP1piwTWyWskol4iqcVwthZmoJEf7obE1nc34OpIyoVGPeqLC+ryw== dependencies: - "@jest/environment" "^27.0.3" - "@jest/types" "^27.0.2" - expect "^27.0.2" + "@jest/environment" "^27.0.6" + "@jest/types" "^27.0.6" + expect "^27.0.6" -"@jest/reporters@^27.0.4": - version "27.0.4" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.4.tgz#95609b1be97afb80d55d8aa3d7c3179c15810e65" - integrity sha512-Xa90Nm3JnV0xCe4M6A10M9WuN9krb+WFKxV1A98Y4ePCw40n++r7uxFUNU7DT1i9Behj7fjrAIju9oU0t1QtCg== +"@jest/reporters@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.6.tgz#91e7f2d98c002ad5df94d5b5167c1eb0b9fd5b00" + integrity sha512-TIkBt09Cb2gptji3yJXb3EE+eVltW6BjO7frO7NEfjI9vSIYoISi5R3aI3KpEDXlB1xwB+97NXIqz84qYeYsfA== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^27.0.2" - "@jest/test-result" "^27.0.2" - "@jest/transform" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/console" "^27.0.6" + "@jest/test-result" "^27.0.6" + "@jest/transform" "^27.0.6" + "@jest/types" "^27.0.6" chalk "^4.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" @@ -527,70 +520,70 @@ istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" istanbul-reports "^3.0.2" - jest-haste-map "^27.0.2" - jest-resolve "^27.0.4" - jest-util "^27.0.2" - jest-worker "^27.0.2" + jest-haste-map "^27.0.6" + jest-resolve "^27.0.6" + jest-util "^27.0.6" + jest-worker "^27.0.6" slash "^3.0.0" source-map "^0.6.0" string-length "^4.0.1" terminal-link "^2.0.0" - v8-to-istanbul "^7.0.0" + v8-to-istanbul "^8.0.0" -"@jest/source-map@^27.0.1": - version "27.0.1" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.0.1.tgz#2afbf73ddbaddcb920a8e62d0238a0a9e0a8d3e4" - integrity sha512-yMgkF0f+6WJtDMdDYNavmqvbHtiSpwRN2U/W+6uztgfqgkq/PXdKPqjBTUF1RD/feth4rH5N3NW0T5+wIuln1A== +"@jest/source-map@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.0.6.tgz#be9e9b93565d49b0548b86e232092491fb60551f" + integrity sha512-Fek4mi5KQrqmlY07T23JRi0e7Z9bXTOOD86V/uS0EIW4PClvPDqZOyFlLpNJheS6QI0FNX1CgmPjtJ4EA/2M+g== dependencies: callsites "^3.0.0" graceful-fs "^4.2.4" source-map "^0.6.0" -"@jest/test-result@^27.0.2": - version "27.0.2" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.0.2.tgz#0451049e32ceb609b636004ccc27c8fa22263f10" - integrity sha512-gcdWwL3yP5VaIadzwQtbZyZMgpmes8ryBAJp70tuxghiA8qL4imJyZex+i+USQH2H4jeLVVszhwntgdQ97fccA== +"@jest/test-result@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.0.6.tgz#3fa42015a14e4fdede6acd042ce98c7f36627051" + integrity sha512-ja/pBOMTufjX4JLEauLxE3LQBPaI2YjGFtXexRAjt1I/MbfNlMx0sytSX3tn5hSLzQsR3Qy2rd0hc1BWojtj9w== dependencies: - "@jest/console" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/console" "^27.0.6" + "@jest/types" "^27.0.6" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^27.0.4": - version "27.0.4" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.4.tgz#976493b277594d81e589896f0ed21f198308928a" - integrity sha512-6UFEVwdmxYdyNffBxVVZxmXEdBE4riSddXYSnFNH0ELFQFk/bvagizim8WfgJTqF4EKd+j1yFxvhb8BMHfOjSQ== +"@jest/test-sequencer@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.6.tgz#80a913ed7a1130545b1cd777ff2735dd3af5d34b" + integrity sha512-bISzNIApazYOlTHDum9PwW22NOyDa6VI31n6JucpjTVM0jD6JDgqEZ9+yn575nDdPF0+4csYDxNNW13NvFQGZA== dependencies: - "@jest/test-result" "^27.0.2" + "@jest/test-result" "^27.0.6" graceful-fs "^4.2.4" - jest-haste-map "^27.0.2" - jest-runtime "^27.0.4" + jest-haste-map "^27.0.6" + jest-runtime "^27.0.6" -"@jest/transform@^27.0.2": - version "27.0.2" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.2.tgz#b073b7c589e3f4b842102468875def2bb722d6b5" - integrity sha512-H8sqKlgtDfVog/s9I4GG2XMbi4Ar7RBxjsKQDUhn2XHAi3NG+GoQwWMER+YfantzExbjNqQvqBHzo/G2pfTiPw== +"@jest/transform@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.6.tgz#189ad7107413208f7600f4719f81dd2f7278cc95" + integrity sha512-rj5Dw+mtIcntAUnMlW/Vju5mr73u8yg+irnHwzgtgoeI6cCPOvUwQ0D1uQtc/APmWgvRweEb1g05pkUpxH3iCA== dependencies: "@babel/core" "^7.1.0" - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" babel-plugin-istanbul "^6.0.0" chalk "^4.0.0" convert-source-map "^1.4.0" fast-json-stable-stringify "^2.0.0" graceful-fs "^4.2.4" - jest-haste-map "^27.0.2" - jest-regex-util "^27.0.1" - jest-util "^27.0.2" + jest-haste-map "^27.0.6" + jest-regex-util "^27.0.6" + jest-util "^27.0.6" micromatch "^4.0.4" pirates "^4.0.1" slash "^3.0.0" source-map "^0.6.1" write-file-atomic "^3.0.0" -"@jest/types@^27.0.2": - version "27.0.2" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.0.2.tgz#e153d6c46bda0f2589f0702b071f9898c7bbd37e" - integrity sha512-XpjCtJ/99HB4PmyJ2vgmN7vT+JLP7RW1FBT9RgnMFS4Dt7cvIyBee8O3/j98aUZ34ZpenPZFqmaaObWSeL65dg== +"@jest/types@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.0.6.tgz#9a992bc517e0c49f035938b8549719c2de40706b" + integrity sha512-aSquT1qa9Pik26JK5/3rvnYb4bGtm1VFNesHKmNTwmPIgOrixvhL2ghIvFRNEpzy3gU+rUgjIF/KodbkFAl++g== dependencies: "@types/istanbul-lib-coverage" "^2.0.0" "@types/istanbul-reports" "^3.0.0" @@ -715,9 +708,9 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": - version "7.11.1" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.1.tgz#654f6c4f67568e24c23b367e947098c6206fa639" - integrity sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw== + version "7.14.0" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.0.tgz#a34277cf8acbd3185ea74129e1f100491eb1da7f" + integrity sha512-IilJZ1hJBUZwMOVDNTdflOOLzJB/ZtljYVa7k3gEZN/jqIJIPkWHC6dvbX+DD2CwZDHB9wAKzZPzzqMIkW37/w== dependencies: "@babel/types" "^7.3.0" @@ -735,9 +728,9 @@ integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ== "@types/filesystem@*": - version "0.0.30" - resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.30.tgz#a7373a2edf34d13e298baf7ee1101f738b2efb7e" - integrity sha512-NCoRgmGmLpTT9VFL6Bb6z0jQuqI3d0E5FGl7M0JOv/J5RQYo9s5aOItPYnpckx9MbYQk1APLXcF8f20Vqnf2yA== + version "0.0.31" + resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.31.tgz#121a1ded274a2dc731d5e0d90163a920ad6a9ef1" + integrity sha512-9Dj1Gb7ZhknhJ8J1H/lTQrEorwIHWZlO9Tfi0WMrvyO1+2GUIUF8Sg4zrID77hj0ywArzQRJ1MwlT9H7c9QmEQ== dependencies: "@types/filewriter" "*" @@ -803,14 +796,14 @@ integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== "@types/node@*": - version "15.12.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.4.tgz#e1cf817d70a1e118e81922c4ff6683ce9d422e26" - integrity sha512-zrNj1+yqYF4WskCMOHwN+w9iuD12+dGm0rQ35HLl9/Ouuq52cEtd0CH9qMgrdNmi5ejC1/V7vKEXYubB+65DkA== + version "15.12.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.5.tgz#9a78318a45d75c9523d2396131bd3cca54b2d185" + integrity sha512-se3yX7UHv5Bscf8f1ERKvQOD6sTyycH3hdaoozvaLxgUiY5lIGEeH37AD0G0Qi9kPqihPn0HOfd2yaIEN9VwEg== "@types/node@^14.6.2": - version "14.17.3" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.3.tgz#6d327abaa4be34a74e421ed6409a0ae2f47f4c3d" - integrity sha512-e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw== + version "14.17.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.4.tgz#218712242446fc868d0e007af29a4408c7765bc0" + integrity sha512-8kQ3+wKGRNN0ghtEn7EGps/B8CzuBz1nXZEIGGLP2GnwbqYn4dbTs7k+VKLTq1HvZLRCIDtN3Snx1Ege8B7L5A== "@types/plist@^3.0.1": version "3.0.2" @@ -876,9 +869,9 @@ acorn@^7.1.1, acorn@^7.4.0: integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.2.4: - version "8.4.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.0.tgz#af53266e698d7cffa416714b503066a82221be60" - integrity sha512-ULr0LDaEqQrMFGyQ3bhJkLsbtrQ8QibAseGZeaSUiT/6zb9IvIkomWHJIvgvwad+hinRAgsI51JcWk2yvwyL+w== + version "8.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c" + integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA== agent-base@6: version "6.0.2" @@ -1100,16 +1093,16 @@ at-least-node@^1.0.0: resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -babel-jest@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.2.tgz#7dc18adb01322acce62c2af76ea2c7cd186ade37" - integrity sha512-9OThPl3/IQbo4Yul2vMz4FYwILPQak8XelX4YGowygfHaOl5R5gfjm4iVx4d8aUugkW683t8aq0A74E7b5DU1Q== +babel-jest@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.6.tgz#e99c6e0577da2655118e3608b68761a5a69bd0d8" + integrity sha512-iTJyYLNc4wRofASmofpOc5NK9QunwMk+TLFgGXsTFS8uEqmd8wdI7sga0FPe2oVH3b5Agt/EAK1QjPEuKL8VfA== dependencies: - "@jest/transform" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/transform" "^27.0.6" + "@jest/types" "^27.0.6" "@types/babel__core" "^7.1.14" babel-plugin-istanbul "^6.0.0" - babel-preset-jest "^27.0.1" + babel-preset-jest "^27.0.6" chalk "^4.0.0" graceful-fs "^4.2.4" slash "^3.0.0" @@ -1125,10 +1118,10 @@ babel-plugin-istanbul@^6.0.0: istanbul-lib-instrument "^4.0.0" test-exclude "^6.0.0" -babel-plugin-jest-hoist@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.0.1.tgz#a6d10e484c93abff0f4e95f437dad26e5736ea11" - integrity sha512-sqBF0owAcCDBVEDtxqfYr2F36eSHdx7lAVGyYuOBRnKdD6gzcy0I0XrAYCZgOA3CRrLhmR+Uae9nogPzmAtOfQ== +babel-plugin-jest-hoist@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.0.6.tgz#f7c6b3d764af21cb4a2a1ab6870117dbde15b456" + integrity sha512-CewFeM9Vv2gM7Yr9n5eyyLVPRSiBnk6lKZRjgwYnGKSl9M14TMn2vkN02wTF04OGuSDLEzlWiMzvjXuW9mB6Gw== dependencies: "@babel/template" "^7.3.3" "@babel/types" "^7.3.3" @@ -1153,12 +1146,12 @@ babel-preset-current-node-syntax@^1.0.0: "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-syntax-top-level-await" "^7.8.3" -babel-preset-jest@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.0.1.tgz#7a50c75d16647c23a2cf5158d5bb9eb206b10e20" - integrity sha512-nIBIqCEpuiyhvjQs2mVNwTxQQa2xk70p9Dd/0obQGBf8FBzbnI8QhQKzLsWMN2i6q+5B0OcWDtrboBX5gmOLyA== +babel-preset-jest@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.0.6.tgz#909ef08e9f24a4679768be2f60a3df0856843f9d" + integrity sha512-WObA0/Biw2LrVVwZkF/2GqbOdzhKD6Fkdwhoy9ASIrOWr/zodcSpQh72JOkEn6NWyjmnPDjNSqaGN4KnpKzhXw== dependencies: - babel-plugin-jest-hoist "^27.0.1" + babel-plugin-jest-hoist "^27.0.6" babel-preset-current-node-syntax "^1.0.0" balanced-match@^1.0.0: @@ -1337,9 +1330,9 @@ camelcase@^6.2.0: integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== caniuse-lite@^1.0.30001166, caniuse-lite@^1.0.30001219: - version "1.0.30001239" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001239.tgz#66e8669985bb2cb84ccb10f68c25ce6dd3e4d2b8" - integrity sha512-cyBkXJDMeI4wthy8xJ2FvDU6+0dtcZSJW3voUF8+e9f1bBeuvyZfc3PNbkOETyhbR+dGCPzn9E7MA3iwzusOhQ== + version "1.0.30001241" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001241.tgz#cd3fae47eb3d7691692b406568d7a3e5b23c7598" + integrity sha512-1uoSZ1Pq1VpH0WerIMqwptXHNNGfdl7d1cJUFs80CwQ/lVzdhTvsFZCeNFslze7AjsQnb4C85tzclPa1VShbeQ== chalk@^2.0.0, chalk@^2.4.2: version "2.4.2" @@ -1528,9 +1521,9 @@ convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: safe-buffer "~5.1.1" core-js@^3.6.5: - version "3.15.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.0.tgz#db9554ebce0b6fd90dc9b1f2465c841d2d055044" - integrity sha512-GUbtPllXMYRzIgHNZ4dTYTcUemls2cni83Q4Q/TrFONHfhcg9oEGOtaGHfb0cpzec60P96UKPvMkjX1jET8rUw== + version "3.15.2" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz#740660d2ff55ef34ce664d7e2455119c5bdd3d61" + integrity sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -1622,9 +1615,9 @@ debug@^4.3.2: ms "2.1.2" decimal.js@^10.2.1: - version "10.2.1" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3" - integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw== + version "10.3.1" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" + integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== decompress-response@^3.3.0: version "3.3.0" @@ -1680,10 +1673,10 @@ detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -diff-sequences@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.0.1.tgz#9c9801d52ed5f576ff0a20e3022a13ee6e297e7c" - integrity sha512-XPLijkfJUh/PIBnfkcSHgvD6tlYixmcMAn3osTk6jt+H0v/mgURto1XUiD9DKuGX5NDoVS6dSlA23gd9FUaCFg== +diff-sequences@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.0.6.tgz#3305cb2e55a033924054695cc66019fd7f8e5723" + integrity sha512-ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ== dir-compare@^2.4.0: version "2.4.0" @@ -1799,14 +1792,14 @@ electron-publish@22.11.7: mime "^2.5.2" electron-to-chromium@^1.3.723: - version "1.3.752" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz#0728587f1b9b970ec9ffad932496429aef750d09" - integrity sha512-2Tg+7jSl3oPxgsBsWKh5H83QazTkmWG/cnNwJplmyZc7KcN61+I10oUgaXSVk/NwfvN3BdkKDR4FYuRBQQ2v0A== + version "1.3.763" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.763.tgz#93f6f02506d099941f557b9db9ba50b30215bf15" + integrity sha512-UyvEPae0wvzsyNJhVfGeFSOlUkHEze8xSIiExO5tZQ8QTr7obFiJWGk3U4e7afFOJMQJDszqU/3Pk5jtKiaSEg== -electron@13.1.2: - version "13.1.2" - resolved "https://registry.yarnpkg.com/electron/-/electron-13.1.2.tgz#8c9abf9015766c9cbc16f10c99282d00d6ae1b90" - integrity sha512-aNT9t+LgdQaZ7FgN36pN7MjSEoj+EWc2T9yuOqBApbmR4HavGRadSz7u9N2Erw2ojdIXtei2RVIAvVm8mbDZ0g== +electron@13.1.4: + version "13.1.4" + resolved "https://registry.yarnpkg.com/electron/-/electron-13.1.4.tgz#6d20d932a0651c3cba9f09a3d08cbaf5b69aa84b" + integrity sha512-4qhRZbRvGqHmMWsCG/kRVF4X8VIq9Nujgm+gXZLBSpiR6uUtMHy7ViBTQZl1PGf6O9Ppxhpr9Yz+k6Um9WoP3Q== dependencies: "@electron/get" "^1.0.1" "@types/node" "^14.6.2" @@ -2052,17 +2045,17 @@ exit@^0.1.2: resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= -expect@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/expect/-/expect-27.0.2.tgz#e66ca3a4c9592f1c019fa1d46459a9d2084f3422" - integrity sha512-YJFNJe2+P2DqH+ZrXy+ydRQYO87oxRUonZImpDodR1G7qo3NYd3pL+NQ9Keqpez3cehczYwZDBC3A7xk3n7M/w== +expect@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/expect/-/expect-27.0.6.tgz#a4d74fbe27222c718fff68ef49d78e26a8fd4c05" + integrity sha512-psNLt8j2kwg42jGBDSfAlU49CEZxejN1f1PlANWDZqIhBOVU/c2Pm888FcjWJzFewhIsNWfZJeLjUjtKGiPuSw== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" ansi-styles "^5.0.0" - jest-get-type "^27.0.1" - jest-matcher-utils "^27.0.2" - jest-message-util "^27.0.2" - jest-regex-util "^27.0.1" + jest-get-type "^27.0.6" + jest-matcher-utils "^27.0.6" + jest-message-util "^27.0.6" + jest-regex-util "^27.0.6" extend@3.0.2: version "3.0.2" @@ -2669,226 +2662,226 @@ jake@^10.6.1: filelist "^1.0.1" minimatch "^3.0.4" -jest-changed-files@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.0.2.tgz#997253042b4a032950fc5f56abf3c5d1f8560801" - integrity sha512-eMeb1Pn7w7x3wue5/vF73LPCJ7DKQuC9wQUR5ebP9hDPpk5hzcT/3Hmz3Q5BOFpR3tgbmaWhJcMTVgC8Z1NuMw== +jest-changed-files@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.0.6.tgz#bed6183fcdea8a285482e3b50a9a7712d49a7a8b" + integrity sha512-BuL/ZDauaq5dumYh5y20sn4IISnf1P9A0TDswTxUi84ORGtVa86ApuBHqICL0vepqAnZiY6a7xeSPWv2/yy4eA== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" execa "^5.0.0" throat "^6.0.1" -jest-circus@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.4.tgz#3b261514ee3b3da33def736a6352c98ff56bb6e6" - integrity sha512-QD+eblDiRphta630WRKewuASLs/oY1Zki2G4bccntRvrTHQ63ljwFR5TLduuK4Zg0ZPzW0+8o6AP7KRd1yKOjw== +jest-circus@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.6.tgz#dd4df17c4697db6a2c232aaad4e9cec666926668" + integrity sha512-OJlsz6BBeX9qR+7O9lXefWoc2m9ZqcZ5Ohlzz0pTEAG4xMiZUJoacY8f4YDHxgk0oKYxj277AfOk9w6hZYvi1Q== dependencies: - "@jest/environment" "^27.0.3" - "@jest/test-result" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/environment" "^27.0.6" + "@jest/test-result" "^27.0.6" + "@jest/types" "^27.0.6" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" dedent "^0.7.0" - expect "^27.0.2" + expect "^27.0.6" is-generator-fn "^2.0.0" - jest-each "^27.0.2" - jest-matcher-utils "^27.0.2" - jest-message-util "^27.0.2" - jest-runtime "^27.0.4" - jest-snapshot "^27.0.4" - jest-util "^27.0.2" - pretty-format "^27.0.2" + jest-each "^27.0.6" + jest-matcher-utils "^27.0.6" + jest-message-util "^27.0.6" + jest-runtime "^27.0.6" + jest-snapshot "^27.0.6" + jest-util "^27.0.6" + pretty-format "^27.0.6" slash "^3.0.0" stack-utils "^2.0.3" throat "^6.0.1" -jest-cli@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.4.tgz#491b12c754c0d7c6873b13a66f26b3a80a852910" - integrity sha512-E0T+/i2lxsWAzV7LKYd0SB7HUAvePqaeIh5vX43/G5jXLhv1VzjYzJAGEkTfvxV774ll9cyE2ljcL73PVMEOXQ== +jest-cli@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.6.tgz#d021e5f4d86d6a212450d4c7b86cb219f1e6864f" + integrity sha512-qUUVlGb9fdKir3RDE+B10ULI+LQrz+MCflEH2UJyoUjoHHCbxDrMxSzjQAPUMsic4SncI62ofYCcAvW6+6rhhg== dependencies: - "@jest/core" "^27.0.4" - "@jest/test-result" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/core" "^27.0.6" + "@jest/test-result" "^27.0.6" + "@jest/types" "^27.0.6" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.4" import-local "^3.0.2" - jest-config "^27.0.4" - jest-util "^27.0.2" - jest-validate "^27.0.2" + jest-config "^27.0.6" + jest-util "^27.0.6" + jest-validate "^27.0.6" prompts "^2.0.1" yargs "^16.0.3" -jest-config@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.4.tgz#c4f41378acf40ca77860fb4e213b12109d87b8cf" - integrity sha512-VkQFAHWnPQefdvHU9A+G3H/Z3NrrTKqWpvxgQz3nkUdkDTWeKJE6e//BL+R7z79dXOMVksYgM/z6ndtN0hfChg== +jest-config@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.6.tgz#119fb10f149ba63d9c50621baa4f1f179500277f" + integrity sha512-JZRR3I1Plr2YxPBhgqRspDE2S5zprbga3swYNrvY3HfQGu7p/GjyLOqwrYad97tX3U3mzT53TPHVmozacfP/3w== dependencies: "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^27.0.4" - "@jest/types" "^27.0.2" - babel-jest "^27.0.2" + "@jest/test-sequencer" "^27.0.6" + "@jest/types" "^27.0.6" + babel-jest "^27.0.6" chalk "^4.0.0" deepmerge "^4.2.2" glob "^7.1.1" graceful-fs "^4.2.4" is-ci "^3.0.0" - jest-circus "^27.0.4" - jest-environment-jsdom "^27.0.3" - jest-environment-node "^27.0.3" - jest-get-type "^27.0.1" - jest-jasmine2 "^27.0.4" - jest-regex-util "^27.0.1" - jest-resolve "^27.0.4" - jest-runner "^27.0.4" - jest-util "^27.0.2" - jest-validate "^27.0.2" + jest-circus "^27.0.6" + jest-environment-jsdom "^27.0.6" + jest-environment-node "^27.0.6" + jest-get-type "^27.0.6" + jest-jasmine2 "^27.0.6" + jest-regex-util "^27.0.6" + jest-resolve "^27.0.6" + jest-runner "^27.0.6" + jest-util "^27.0.6" + jest-validate "^27.0.6" micromatch "^4.0.4" - pretty-format "^27.0.2" + pretty-format "^27.0.6" -jest-diff@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.2.tgz#f315b87cee5dc134cf42c2708ab27375cc3f5a7e" - integrity sha512-BFIdRb0LqfV1hBt8crQmw6gGQHVDhM87SpMIZ45FPYKReZYG5er1+5pIn2zKqvrJp6WNox0ylR8571Iwk2Dmgw== +jest-diff@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.6.tgz#4a7a19ee6f04ad70e0e3388f35829394a44c7b5e" + integrity sha512-Z1mqgkTCSYaFgwTlP/NUiRzdqgxmmhzHY1Tq17zL94morOHfHu3K4bgSgl+CR4GLhpV8VxkuOYuIWnQ9LnFqmg== dependencies: chalk "^4.0.0" - diff-sequences "^27.0.1" - jest-get-type "^27.0.1" - pretty-format "^27.0.2" + diff-sequences "^27.0.6" + jest-get-type "^27.0.6" + pretty-format "^27.0.6" -jest-docblock@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.0.1.tgz#bd9752819b49fa4fab1a50b73eb58c653b962e8b" - integrity sha512-TA4+21s3oebURc7VgFV4r7ltdIJ5rtBH1E3Tbovcg7AV+oLfD5DcJ2V2vJ5zFA9sL5CFd/d2D6IpsAeSheEdrA== +jest-docblock@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.0.6.tgz#cc78266acf7fe693ca462cbbda0ea4e639e4e5f3" + integrity sha512-Fid6dPcjwepTFraz0YxIMCi7dejjJ/KL9FBjPYhBp4Sv1Y9PdhImlKZqYU555BlN4TQKaTc+F2Av1z+anVyGkA== dependencies: detect-newline "^3.0.0" -jest-each@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.0.2.tgz#865ddb4367476ced752167926b656fa0dcecd8c7" - integrity sha512-OLMBZBZ6JkoXgUenDtseFRWA43wVl2BwmZYIWQws7eS7pqsIvePqj/jJmEnfq91ALk3LNphgwNK/PRFBYi7ITQ== +jest-each@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.0.6.tgz#cee117071b04060158dc8d9a66dc50ad40ef453b" + integrity sha512-m6yKcV3bkSWrUIjxkE9OC0mhBZZdhovIW5ergBYirqnkLXkyEn3oUUF/QZgyecA1cF1QFyTE8bRRl8Tfg1pfLA== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" chalk "^4.0.0" - jest-get-type "^27.0.1" - jest-util "^27.0.2" - pretty-format "^27.0.2" - -jest-environment-jsdom@27.0.3, jest-environment-jsdom@^27.0.3: - version "27.0.3" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.3.tgz#ed73e913ddc03864eb9f934b5cbabf1b63504e2e" - integrity sha512-5KLmgv1bhiimpSA8oGTnZYk6g4fsNyZiA/6gI2tAZUgrufd7heRUSVh4gRokzZVEj8zlwAQYT0Zs6tuJSW/ECA== - dependencies: - "@jest/environment" "^27.0.3" - "@jest/fake-timers" "^27.0.3" - "@jest/types" "^27.0.2" + jest-get-type "^27.0.6" + jest-util "^27.0.6" + pretty-format "^27.0.6" + +jest-environment-jsdom@27.0.6, jest-environment-jsdom@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.6.tgz#f66426c4c9950807d0a9f209c590ce544f73291f" + integrity sha512-FvetXg7lnXL9+78H+xUAsra3IeZRTiegA3An01cWeXBspKXUhAwMM9ycIJ4yBaR0L7HkoMPaZsozCLHh4T8fuw== + dependencies: + "@jest/environment" "^27.0.6" + "@jest/fake-timers" "^27.0.6" + "@jest/types" "^27.0.6" "@types/node" "*" - jest-mock "^27.0.3" - jest-util "^27.0.2" + jest-mock "^27.0.6" + jest-util "^27.0.6" jsdom "^16.6.0" -jest-environment-node@^27.0.3: - version "27.0.3" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.3.tgz#b4acb3679d2552a4215732cab8b0ca7ec4398ee0" - integrity sha512-co2/IVnIFL3cItpFULCvXFg9us4gvWXgs7mutAMPCbFhcqh56QAOdKhNzC2+RycsC/k4mbMj1VF+9F/NzA0ROg== +jest-environment-node@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.6.tgz#a6699b7ceb52e8d68138b9808b0c404e505f3e07" + integrity sha512-+Vi6yLrPg/qC81jfXx3IBlVnDTI6kmRr08iVa2hFCWmJt4zha0XW7ucQltCAPhSR0FEKEoJ3i+W4E6T0s9is0w== dependencies: - "@jest/environment" "^27.0.3" - "@jest/fake-timers" "^27.0.3" - "@jest/types" "^27.0.2" + "@jest/environment" "^27.0.6" + "@jest/fake-timers" "^27.0.6" + "@jest/types" "^27.0.6" "@types/node" "*" - jest-mock "^27.0.3" - jest-util "^27.0.2" + jest-mock "^27.0.6" + jest-util "^27.0.6" -jest-get-type@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.0.1.tgz#34951e2b08c8801eb28559d7eb732b04bbcf7815" - integrity sha512-9Tggo9zZbu0sHKebiAijyt1NM77Z0uO4tuWOxUCujAiSeXv30Vb5D4xVF4UR4YWNapcftj+PbByU54lKD7/xMg== +jest-get-type@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.0.6.tgz#0eb5c7f755854279ce9b68a9f1a4122f69047cfe" + integrity sha512-XTkK5exIeUbbveehcSR8w0bhH+c0yloW/Wpl+9vZrjzztCPWrxhHwkIFpZzCt71oRBsgxmuUfxEqOYoZI2macg== -jest-haste-map@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.2.tgz#3f1819400c671237e48b4d4b76a80a0dbed7577f" - integrity sha512-37gYfrYjjhEfk37C4bCMWAC0oPBxDpG0qpl8lYg8BT//wf353YT/fzgA7+Dq0EtM7rPFS3JEcMsxdtDwNMi2cA== +jest-haste-map@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.6.tgz#4683a4e68f6ecaa74231679dca237279562c8dc7" + integrity sha512-4ldjPXX9h8doB2JlRzg9oAZ2p6/GpQUNAeiYXqcpmrKbP0Qev0wdZlxSMOmz8mPOEnt4h6qIzXFLDi8RScX/1w== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" "@types/graceful-fs" "^4.1.2" "@types/node" "*" anymatch "^3.0.3" fb-watchman "^2.0.0" graceful-fs "^4.2.4" - jest-regex-util "^27.0.1" - jest-serializer "^27.0.1" - jest-util "^27.0.2" - jest-worker "^27.0.2" + jest-regex-util "^27.0.6" + jest-serializer "^27.0.6" + jest-util "^27.0.6" + jest-worker "^27.0.6" micromatch "^4.0.4" walker "^1.0.7" optionalDependencies: fsevents "^2.3.2" -jest-jasmine2@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.4.tgz#c669519ccf4904a485338555e1e66cad36bb0670" - integrity sha512-yj3WrjjquZwkJw+eA4c9yucHw4/+EHndHWSqgHbHGQfT94ihaaQsa009j1a0puU8CNxPDk0c1oAPeOpdJUElwA== +jest-jasmine2@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.6.tgz#fd509a9ed3d92bd6edb68a779f4738b100655b37" + integrity sha512-cjpH2sBy+t6dvCeKBsHpW41mjHzXgsavaFMp+VWRf0eR4EW8xASk1acqmljFtK2DgyIECMv2yCdY41r2l1+4iA== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^27.0.3" - "@jest/source-map" "^27.0.1" - "@jest/test-result" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/environment" "^27.0.6" + "@jest/source-map" "^27.0.6" + "@jest/test-result" "^27.0.6" + "@jest/types" "^27.0.6" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" - expect "^27.0.2" + expect "^27.0.6" is-generator-fn "^2.0.0" - jest-each "^27.0.2" - jest-matcher-utils "^27.0.2" - jest-message-util "^27.0.2" - jest-runtime "^27.0.4" - jest-snapshot "^27.0.4" - jest-util "^27.0.2" - pretty-format "^27.0.2" + jest-each "^27.0.6" + jest-matcher-utils "^27.0.6" + jest-message-util "^27.0.6" + jest-runtime "^27.0.6" + jest-snapshot "^27.0.6" + jest-util "^27.0.6" + pretty-format "^27.0.6" throat "^6.0.1" -jest-leak-detector@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.0.2.tgz#ce19aa9dbcf7a72a9d58907a970427506f624e69" - integrity sha512-TZA3DmCOfe8YZFIMD1GxFqXUkQnIoOGQyy4hFCA2mlHtnAaf+FeOMxi0fZmfB41ZL+QbFG6BVaZF5IeFIVy53Q== +jest-leak-detector@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.0.6.tgz#545854275f85450d4ef4b8fe305ca2a26450450f" + integrity sha512-2/d6n2wlH5zEcdctX4zdbgX8oM61tb67PQt4Xh8JFAIy6LRKUnX528HulkaG6nD5qDl5vRV1NXejCe1XRCH5gQ== dependencies: - jest-get-type "^27.0.1" - pretty-format "^27.0.2" + jest-get-type "^27.0.6" + pretty-format "^27.0.6" -jest-matcher-utils@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.0.2.tgz#f14c060605a95a466cdc759acc546c6f4cbfc4f0" - integrity sha512-Qczi5xnTNjkhcIB0Yy75Txt+Ez51xdhOxsukN7awzq2auZQGPHcQrJ623PZj0ECDEMOk2soxWx05EXdXGd1CbA== +jest-matcher-utils@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.0.6.tgz#2a8da1e86c620b39459f4352eaa255f0d43e39a9" + integrity sha512-OFgF2VCQx9vdPSYTHWJ9MzFCehs20TsyFi6bIHbk5V1u52zJOnvF0Y/65z3GLZHKRuTgVPY4Z6LVePNahaQ+tA== dependencies: chalk "^4.0.0" - jest-diff "^27.0.2" - jest-get-type "^27.0.1" - pretty-format "^27.0.2" + jest-diff "^27.0.6" + jest-get-type "^27.0.6" + pretty-format "^27.0.6" -jest-message-util@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.0.2.tgz#181c9b67dff504d8f4ad15cba10d8b80f272048c" - integrity sha512-rTqWUX42ec2LdMkoUPOzrEd1Tcm+R1KfLOmFK+OVNo4MnLsEaxO5zPDb2BbdSmthdM/IfXxOZU60P/WbWF8BTw== +jest-message-util@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.0.6.tgz#158bcdf4785706492d164a39abca6a14da5ab8b5" + integrity sha512-rBxIs2XK7rGy+zGxgi+UJKP6WqQ+KrBbD1YMj517HYN3v2BG66t3Xan3FWqYHKZwjdB700KiAJ+iES9a0M+ixw== dependencies: "@babel/code-frame" "^7.12.13" - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" "@types/stack-utils" "^2.0.0" chalk "^4.0.0" graceful-fs "^4.2.4" micromatch "^4.0.4" - pretty-format "^27.0.2" + pretty-format "^27.0.6" slash "^3.0.0" stack-utils "^2.0.3" -jest-mock@^27.0.3: - version "27.0.3" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.0.3.tgz#5591844f9192b3335c0dca38e8e45ed297d4d23d" - integrity sha512-O5FZn5XDzEp+Xg28mUz4ovVcdwBBPfAhW9+zJLO0Efn2qNbYcDaJvSlRiQ6BCZUCVOJjALicuJQI9mRFjv1o9Q== +jest-mock@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.0.6.tgz#0efdd40851398307ba16778728f6d34d583e3467" + integrity sha512-lzBETUoK8cSxts2NYXSBWT+EJNzmUVtVVwS1sU9GwE1DLCfGsngg+ZVSIe0yd0ZSm+y791esiuo+WSwpXJQ5Bw== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" "@types/node" "*" jest-pnp-resolver@^1.2.2: @@ -2896,76 +2889,76 @@ jest-pnp-resolver@^1.2.2: resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== -jest-regex-util@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.1.tgz#69d4b1bf5b690faa3490113c47486ed85dd45b68" - integrity sha512-6nY6QVcpTgEKQy1L41P4pr3aOddneK17kn3HJw6SdwGiKfgCGTvH02hVXL0GU8GEKtPH83eD2DIDgxHXOxVohQ== +jest-regex-util@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.6.tgz#02e112082935ae949ce5d13b2675db3d8c87d9c5" + integrity sha512-SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ== -jest-resolve-dependencies@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.4.tgz#a07a242d70d668afd3fcf7f4270755eebb1fe579" - integrity sha512-F33UPfw1YGWCV2uxJl7wD6TvcQn5IC0LtguwY3r4L7R6H4twpLkp5Q2ZfzRx9A2I3G8feiy0O0sqcn/Qoym71A== +jest-resolve-dependencies@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.6.tgz#3e619e0ef391c3ecfcf6ef4056207a3d2be3269f" + integrity sha512-mg9x9DS3BPAREWKCAoyg3QucCr0n6S8HEEsqRCKSPjPcu9HzRILzhdzY3imsLoZWeosEbJZz6TKasveczzpJZA== dependencies: - "@jest/types" "^27.0.2" - jest-regex-util "^27.0.1" - jest-snapshot "^27.0.4" + "@jest/types" "^27.0.6" + jest-regex-util "^27.0.6" + jest-snapshot "^27.0.6" -jest-resolve@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.4.tgz#8a27bc3f2f00c8ea28f3bc99bbf6f468300a703d" - integrity sha512-BcfyK2i3cG79PDb/6gB6zFeFQlcqLsQjGBqznFCpA0L/3l1L/oOsltdUjs5eISAWA9HS9qtj8v2PSZr/yWxONQ== +jest-resolve@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.6.tgz#e90f436dd4f8fbf53f58a91c42344864f8e55bff" + integrity sha512-yKmIgw2LgTh7uAJtzv8UFHGF7Dm7XfvOe/LQ3Txv101fLM8cx2h1QVwtSJ51Q/SCxpIiKfVn6G2jYYMDNHZteA== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" chalk "^4.0.0" escalade "^3.1.1" graceful-fs "^4.2.4" jest-pnp-resolver "^1.2.2" - jest-util "^27.0.2" - jest-validate "^27.0.2" + jest-util "^27.0.6" + jest-validate "^27.0.6" resolve "^1.20.0" slash "^3.0.0" -jest-runner@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.4.tgz#2787170a9509b792ae129794f6944d27d5d12a4f" - integrity sha512-NfmvSYLCsCJk2AG8Ar2NAh4PhsJJpO+/r+g4bKR5L/5jFzx/indUpnVBdrfDvuqhGLLAvrKJ9FM/Nt8o1dsqxg== +jest-runner@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.6.tgz#1325f45055539222bbc7256a6976e993ad2f9520" + integrity sha512-W3Bz5qAgaSChuivLn+nKOgjqNxM7O/9JOJoKDCqThPIg2sH/d4A/lzyiaFgnb9V1/w29Le11NpzTJSzga1vyYQ== dependencies: - "@jest/console" "^27.0.2" - "@jest/environment" "^27.0.3" - "@jest/test-result" "^27.0.2" - "@jest/transform" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/console" "^27.0.6" + "@jest/environment" "^27.0.6" + "@jest/test-result" "^27.0.6" + "@jest/transform" "^27.0.6" + "@jest/types" "^27.0.6" "@types/node" "*" chalk "^4.0.0" emittery "^0.8.1" exit "^0.1.2" graceful-fs "^4.2.4" - jest-docblock "^27.0.1" - jest-environment-jsdom "^27.0.3" - jest-environment-node "^27.0.3" - jest-haste-map "^27.0.2" - jest-leak-detector "^27.0.2" - jest-message-util "^27.0.2" - jest-resolve "^27.0.4" - jest-runtime "^27.0.4" - jest-util "^27.0.2" - jest-worker "^27.0.2" + jest-docblock "^27.0.6" + jest-environment-jsdom "^27.0.6" + jest-environment-node "^27.0.6" + jest-haste-map "^27.0.6" + jest-leak-detector "^27.0.6" + jest-message-util "^27.0.6" + jest-resolve "^27.0.6" + jest-runtime "^27.0.6" + jest-util "^27.0.6" + jest-worker "^27.0.6" source-map-support "^0.5.6" throat "^6.0.1" -jest-runtime@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.4.tgz#2e4a6aa77cac32ac612dfe12768387a8aa15c2f0" - integrity sha512-voJB4xbAjS/qYPboV+e+gmg3jfvHJJY4CagFWBOM9dQKtlaiTjcpD2tWwla84Z7PtXSQPeIpXY0qksA9Dum29A== - dependencies: - "@jest/console" "^27.0.2" - "@jest/environment" "^27.0.3" - "@jest/fake-timers" "^27.0.3" - "@jest/globals" "^27.0.3" - "@jest/source-map" "^27.0.1" - "@jest/test-result" "^27.0.2" - "@jest/transform" "^27.0.2" - "@jest/types" "^27.0.2" +jest-runtime@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.6.tgz#45877cfcd386afdd4f317def551fc369794c27c9" + integrity sha512-BhvHLRVfKibYyqqEFkybsznKwhrsu7AWx2F3y9G9L95VSIN3/ZZ9vBpm/XCS2bS+BWz3sSeNGLzI3TVQ0uL85Q== + dependencies: + "@jest/console" "^27.0.6" + "@jest/environment" "^27.0.6" + "@jest/fake-timers" "^27.0.6" + "@jest/globals" "^27.0.6" + "@jest/source-map" "^27.0.6" + "@jest/test-result" "^27.0.6" + "@jest/transform" "^27.0.6" + "@jest/types" "^27.0.6" "@types/yargs" "^16.0.0" chalk "^4.0.0" cjs-module-lexer "^1.0.0" @@ -2973,30 +2966,30 @@ jest-runtime@^27.0.4: exit "^0.1.2" glob "^7.1.3" graceful-fs "^4.2.4" - jest-haste-map "^27.0.2" - jest-message-util "^27.0.2" - jest-mock "^27.0.3" - jest-regex-util "^27.0.1" - jest-resolve "^27.0.4" - jest-snapshot "^27.0.4" - jest-util "^27.0.2" - jest-validate "^27.0.2" + jest-haste-map "^27.0.6" + jest-message-util "^27.0.6" + jest-mock "^27.0.6" + jest-regex-util "^27.0.6" + jest-resolve "^27.0.6" + jest-snapshot "^27.0.6" + jest-util "^27.0.6" + jest-validate "^27.0.6" slash "^3.0.0" strip-bom "^4.0.0" yargs "^16.0.3" -jest-serializer@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.0.1.tgz#2464d04dcc33fb71dc80b7c82e3c5e8a08cb1020" - integrity sha512-svy//5IH6bfQvAbkAEg1s7xhhgHTtXu0li0I2fdKHDsLP2P2MOiscPQIENQep8oU2g2B3jqLyxKKzotZOz4CwQ== +jest-serializer@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.0.6.tgz#93a6c74e0132b81a2d54623251c46c498bb5bec1" + integrity sha512-PtGdVK9EGC7dsaziskfqaAPib6wTViY3G8E5wz9tLVPhHyiDNTZn/xjZ4khAw+09QkoOVpn7vF5nPSN6dtBexA== dependencies: "@types/node" "*" graceful-fs "^4.2.4" -jest-snapshot@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.4.tgz#2b96e22ca90382b3e93bd0aae2ce4c78bf51fb5b" - integrity sha512-hnjrvpKGdSMvKfbHyaG5Kul7pDJGZvjVy0CKpzhu28MmAssDXS6GpynhXzgst1wBQoKD8c9b2VS2a5yhDLQRCA== +jest-snapshot@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.6.tgz#f4e6b208bd2e92e888344d78f0f650bcff05a4bf" + integrity sha512-NTHaz8He+ATUagUgE7C/UtFcRoHqR2Gc+KDfhQIyx+VFgwbeEMjeP+ILpUTLosZn/ZtbNdCF5LkVnN/l+V751A== dependencies: "@babel/core" "^7.7.2" "@babel/generator" "^7.7.2" @@ -3004,79 +2997,79 @@ jest-snapshot@^27.0.4: "@babel/plugin-syntax-typescript" "^7.7.2" "@babel/traverse" "^7.7.2" "@babel/types" "^7.0.0" - "@jest/transform" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/transform" "^27.0.6" + "@jest/types" "^27.0.6" "@types/babel__traverse" "^7.0.4" "@types/prettier" "^2.1.5" babel-preset-current-node-syntax "^1.0.0" chalk "^4.0.0" - expect "^27.0.2" + expect "^27.0.6" graceful-fs "^4.2.4" - jest-diff "^27.0.2" - jest-get-type "^27.0.1" - jest-haste-map "^27.0.2" - jest-matcher-utils "^27.0.2" - jest-message-util "^27.0.2" - jest-resolve "^27.0.4" - jest-util "^27.0.2" + jest-diff "^27.0.6" + jest-get-type "^27.0.6" + jest-haste-map "^27.0.6" + jest-matcher-utils "^27.0.6" + jest-message-util "^27.0.6" + jest-resolve "^27.0.6" + jest-util "^27.0.6" natural-compare "^1.4.0" - pretty-format "^27.0.2" + pretty-format "^27.0.6" semver "^7.3.2" -jest-util@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.2.tgz#fc2c7ace3c75ae561cf1e5fdb643bf685a5be7c7" - integrity sha512-1d9uH3a00OFGGWSibpNYr+jojZ6AckOMCXV2Z4K3YXDnzpkAaXQyIpY14FOJPiUmil7CD+A6Qs+lnnh6ctRbIA== +jest-util@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.6.tgz#e8e04eec159de2f4d5f57f795df9cdc091e50297" + integrity sha512-1JjlaIh+C65H/F7D11GNkGDDZtDfMEM8EBXsvd+l/cxtgQ6QhxuloOaiayt89DxUvDarbVhqI98HhgrM1yliFQ== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" "@types/node" "*" chalk "^4.0.0" graceful-fs "^4.2.4" is-ci "^3.0.0" picomatch "^2.2.3" -jest-validate@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.0.2.tgz#7fe2c100089449cd5cbb47a5b0b6cb7cda5beee5" - integrity sha512-UgBF6/oVu1ofd1XbaSotXKihi8nZhg0Prm8twQ9uCuAfo59vlxCXMPI/RKmrZEVgi3Nd9dS0I8A0wzWU48pOvg== +jest-validate@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.0.6.tgz#930a527c7a951927df269f43b2dc23262457e2a6" + integrity sha512-yhZZOaMH3Zg6DC83n60pLmdU1DQE46DW+KLozPiPbSbPhlXXaiUTDlhHQhHFpaqIFRrInko1FHXjTRpjWRuWfA== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" camelcase "^6.2.0" chalk "^4.0.0" - jest-get-type "^27.0.1" + jest-get-type "^27.0.6" leven "^3.1.0" - pretty-format "^27.0.2" + pretty-format "^27.0.6" -jest-watcher@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.0.2.tgz#dab5f9443e2d7f52597186480731a8c6335c5deb" - integrity sha512-8nuf0PGuTxWj/Ytfw5fyvNn/R80iXY8QhIT0ofyImUvdnoaBdT6kob0GmhXR+wO+ALYVnh8bQxN4Tjfez0JgkA== +jest-watcher@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.0.6.tgz#89526f7f9edf1eac4e4be989bcb6dec6b8878d9c" + integrity sha512-/jIoKBhAP00/iMGnTwUBLgvxkn7vsOweDrOTSPzc7X9uOyUtJIDthQBTI1EXz90bdkrxorUZVhJwiB69gcHtYQ== dependencies: - "@jest/test-result" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/test-result" "^27.0.6" + "@jest/types" "^27.0.6" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" - jest-util "^27.0.2" + jest-util "^27.0.6" string-length "^4.0.1" -jest-worker@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.2.tgz#4ebeb56cef48b3e7514552f80d0d80c0129f0b05" - integrity sha512-EoBdilOTTyOgmHXtw/cPc+ZrCA0KJMrkXzkrPGNwLmnvvlN1nj7MPrxpT7m+otSv2e1TLaVffzDnE/LB14zJMg== +jest-worker@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.6.tgz#a5fdb1e14ad34eb228cfe162d9f729cdbfa28aed" + integrity sha512-qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA== dependencies: "@types/node" "*" merge-stream "^2.0.0" supports-color "^8.0.0" -jest@27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest/-/jest-27.0.4.tgz#91d4d564b36bcf93b98dac1ab19f07089e670f53" - integrity sha512-Px1iKFooXgGSkk1H8dJxxBIrM3tsc5SIuI4kfKYK2J+4rvCvPGr/cXktxh0e9zIPQ5g09kOMNfHQEmusBUf/ZA== +jest@27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest/-/jest-27.0.6.tgz#10517b2a628f0409087fbf473db44777d7a04505" + integrity sha512-EjV8aETrsD0wHl7CKMibKwQNQc3gIRBXlTikBmmHUeVMKaPFxdcUIBfoDqTSXDoGJIivAYGqCWVlzCSaVjPQsA== dependencies: - "@jest/core" "^27.0.4" + "@jest/core" "^27.0.6" import-local "^3.0.2" - jest-cli "^27.0.4" + jest-cli "^27.0.6" js-tokens@^4.0.0: version "4.0.0" @@ -3622,12 +3615,12 @@ prepend-http@^2.0.0: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= -pretty-format@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.2.tgz#9283ff8c4f581b186b2d4da461617143dca478a4" - integrity sha512-mXKbbBPnYTG7Yra9qFBtqj+IXcsvxsvOBco3QHxtxTl+hHKq6QdzMZ+q0CtL4ORHZgwGImRr2XZUX2EWzORxig== +pretty-format@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.6.tgz#ab770c47b2c6f893a21aefc57b75da63ef49a11f" + integrity sha512-8tGD7gBIENgzqA+UBzObyWqQ5B778VIFZA/S66cclyd5YkFLYs2Js7gxDKf0MXtTc9zcS7t1xhdfcElJ3YIvkQ== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" ansi-regex "^5.0.0" ansi-styles "^5.0.0" react-is "^17.0.1" @@ -4364,10 +4357,10 @@ v8-compile-cache@^2.0.3: resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== -v8-to-istanbul@^7.0.0: - version "7.1.2" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz#30898d1a7fa0c84d225a2c1434fb958f290883c1" - integrity sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow== +v8-to-istanbul@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.0.0.tgz#4229f2a99e367f3f018fa1d5c2b8ec684667c69c" + integrity sha512-LkmXi8UUNxnCC+JlH7/fsfsKr5AU110l+SYGJimWNkWhxbN5EyeOtm1MJ0hhvqMMOhGwBj1Fp70Yv9i+hX0QAg== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" @@ -4426,9 +4419,9 @@ whatwg-mimetype@^2.3.0: integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== whatwg-url@^8.0.0, whatwg-url@^8.5.0: - version "8.6.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.6.0.tgz#27c0205a4902084b872aecb97cf0f2a7a3011f4c" - integrity sha512-os0KkeeqUOl7ccdDT1qqUcS4KH4tcBTSKK5Nl5WKb2lyxInIZ/CpjkqKa1Ss12mjfdcRX9mHmPPs7/SxG1Hbdw== + version "8.7.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77" + integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg== dependencies: lodash "^4.7.0" tr46 "^2.1.0" @@ -4478,9 +4471,9 @@ write-file-atomic@^3.0.0: typedarray-to-buffer "^3.1.5" ws@^7.4.5: - version "7.5.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.0.tgz#0033bafea031fb9df041b2026fc72a571ca44691" - integrity sha512-6ezXvzOZupqKj4jUqbQ9tXuJNo+BR2gU8fFRk3XCP3e0G6WT414u5ELe6Y0vtp7kmSJ3F7YWObSNr1ESsgi4vw== + version "7.5.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.1.tgz#44fc000d87edb1d9c53e51fbc69a0ac1f6871d66" + integrity sha512-2c6faOUH/nhoQN6abwMloF7Iyl0ZS2E9HGtsiLrWn0zOOMWlhtDmdf/uihDt6jnuCxgtwGBNy6Onsoy2s2O2Ow== xdg-basedir@^4.0.0: version "4.0.0" diff --git a/pkgs/applications/networking/browsers/vieb/yarn.nix b/pkgs/applications/networking/browsers/vieb/yarn.nix index 14e1b9902cc..a92d6defef9 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.nix +++ b/pkgs/applications/networking/browsers/vieb/yarn.nix @@ -26,11 +26,11 @@ }; } { - name = "_babel_compat_data___compat_data_7.14.5.tgz"; + name = "_babel_compat_data___compat_data_7.14.7.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.5.tgz"; - sha1 = "8ef4c18e58e801c5c95d3c1c0f2874a2680fadea"; + name = "_babel_compat_data___compat_data_7.14.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz"; + sha1 = "7b047d7a3a89a67d2258dc61f604f098f1bc7e08"; }; } { @@ -82,11 +82,11 @@ }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.14.5.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.14.7.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.5.tgz"; - sha1 = "d5c70e4ad13b402c95156c7a53568f504e2fb7b8"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.14.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz"; + sha1 = "97e56244beb94211fe277bd818e3a329c66f7970"; }; } { @@ -178,11 +178,11 @@ }; } { - name = "_babel_parser___parser_7.14.6.tgz"; + name = "_babel_parser___parser_7.14.7.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.14.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.6.tgz"; - sha1 = "d85cc68ca3cac84eae384c06f032921f5227f4b2"; + name = "_babel_parser___parser_7.14.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.7.tgz"; + sha1 = "6099720c8839ca865a2637e6c85852ead0bdb595"; }; } { @@ -298,11 +298,11 @@ }; } { - name = "_babel_traverse___traverse_7.14.5.tgz"; + name = "_babel_traverse___traverse_7.14.7.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.5.tgz"; - sha1 = "c111b0f58afab4fea3d3385a406f692748c59870"; + name = "_babel_traverse___traverse_7.14.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.7.tgz"; + sha1 = "64007c9774cfdc3abd23b0780bc18a3ce3631753"; }; } { @@ -330,14 +330,6 @@ }; } { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.22.1.tgz"; - path = fetchurl { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.22.1.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.1.tgz"; - sha1 = "8ce8c18d0ce5f7afa7c1dfe1f4cba30ada86f4af"; - }; - } - { name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.22.2.tgz"; path = fetchurl { name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.22.2.tgz"; @@ -346,11 +338,11 @@ }; } { - name = "_cliqz_adblocker_electron___adblocker_electron_1.22.1.tgz"; + name = "_cliqz_adblocker_electron___adblocker_electron_1.22.2.tgz"; path = fetchurl { - name = "_cliqz_adblocker_electron___adblocker_electron_1.22.1.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.22.1.tgz"; - sha1 = "13fe6de4be0c3beb2851634b27ea1223d10ca92b"; + name = "_cliqz_adblocker_electron___adblocker_electron_1.22.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.22.2.tgz"; + sha1 = "85af3b49f7f653e6fb0d008b6523e3b3ba0dd41e"; }; } { @@ -418,91 +410,91 @@ }; } { - name = "_jest_console___console_27.0.2.tgz"; + name = "_jest_console___console_27.0.6.tgz"; path = fetchurl { - name = "_jest_console___console_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/@jest/console/-/console-27.0.2.tgz"; - sha1 = "b8eeff8f21ac51d224c851e1729d2630c18631e6"; + name = "_jest_console___console_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/console/-/console-27.0.6.tgz"; + sha1 = "3eb72ea80897495c3d73dd97aab7f26770e2260f"; }; } { - name = "_jest_core___core_27.0.4.tgz"; + name = "_jest_core___core_27.0.6.tgz"; path = fetchurl { - name = "_jest_core___core_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/@jest/core/-/core-27.0.4.tgz"; - sha1 = "679bf9ac07900da2ddbb9667bb1afa8029038f53"; + name = "_jest_core___core_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/core/-/core-27.0.6.tgz"; + sha1 = "c5f642727a0b3bf0f37c4b46c675372d0978d4a1"; }; } { - name = "_jest_environment___environment_27.0.3.tgz"; + name = "_jest_environment___environment_27.0.6.tgz"; path = fetchurl { - name = "_jest_environment___environment_27.0.3.tgz"; - url = "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.3.tgz"; - sha1 = "68769b1dfdd213e3456169d64fbe9bd63a5fda92"; + name = "_jest_environment___environment_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.6.tgz"; + sha1 = "ee293fe996db01d7d663b8108fa0e1ff436219d2"; }; } { - name = "_jest_fake_timers___fake_timers_27.0.3.tgz"; + name = "_jest_fake_timers___fake_timers_27.0.6.tgz"; path = fetchurl { - name = "_jest_fake_timers___fake_timers_27.0.3.tgz"; - url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.3.tgz"; - sha1 = "9899ba6304cc636734c74478df502e18136461dd"; + name = "_jest_fake_timers___fake_timers_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.6.tgz"; + sha1 = "cbad52f3fe6abe30e7acb8cd5fa3466b9588e3df"; }; } { - name = "_jest_globals___globals_27.0.3.tgz"; + name = "_jest_globals___globals_27.0.6.tgz"; path = fetchurl { - name = "_jest_globals___globals_27.0.3.tgz"; - url = "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.3.tgz"; - sha1 = "1cf8933b7791bba0b99305cbf39fd4d2e3fe4060"; + name = "_jest_globals___globals_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.6.tgz"; + sha1 = "48e3903f99a4650673d8657334d13c9caf0e8f82"; }; } { - name = "_jest_reporters___reporters_27.0.4.tgz"; + name = "_jest_reporters___reporters_27.0.6.tgz"; path = fetchurl { - name = "_jest_reporters___reporters_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.4.tgz"; - sha1 = "95609b1be97afb80d55d8aa3d7c3179c15810e65"; + name = "_jest_reporters___reporters_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.6.tgz"; + sha1 = "91e7f2d98c002ad5df94d5b5167c1eb0b9fd5b00"; }; } { - name = "_jest_source_map___source_map_27.0.1.tgz"; + name = "_jest_source_map___source_map_27.0.6.tgz"; path = fetchurl { - name = "_jest_source_map___source_map_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.0.1.tgz"; - sha1 = "2afbf73ddbaddcb920a8e62d0238a0a9e0a8d3e4"; + name = "_jest_source_map___source_map_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.0.6.tgz"; + sha1 = "be9e9b93565d49b0548b86e232092491fb60551f"; }; } { - name = "_jest_test_result___test_result_27.0.2.tgz"; + name = "_jest_test_result___test_result_27.0.6.tgz"; path = fetchurl { - name = "_jest_test_result___test_result_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.0.2.tgz"; - sha1 = "0451049e32ceb609b636004ccc27c8fa22263f10"; + name = "_jest_test_result___test_result_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.0.6.tgz"; + sha1 = "3fa42015a14e4fdede6acd042ce98c7f36627051"; }; } { - name = "_jest_test_sequencer___test_sequencer_27.0.4.tgz"; + name = "_jest_test_sequencer___test_sequencer_27.0.6.tgz"; path = fetchurl { - name = "_jest_test_sequencer___test_sequencer_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.4.tgz"; - sha1 = "976493b277594d81e589896f0ed21f198308928a"; + name = "_jest_test_sequencer___test_sequencer_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.6.tgz"; + sha1 = "80a913ed7a1130545b1cd777ff2735dd3af5d34b"; }; } { - name = "_jest_transform___transform_27.0.2.tgz"; + name = "_jest_transform___transform_27.0.6.tgz"; path = fetchurl { - name = "_jest_transform___transform_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.2.tgz"; - sha1 = "b073b7c589e3f4b842102468875def2bb722d6b5"; + name = "_jest_transform___transform_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.6.tgz"; + sha1 = "189ad7107413208f7600f4719f81dd2f7278cc95"; }; } { - name = "_jest_types___types_27.0.2.tgz"; + name = "_jest_types___types_27.0.6.tgz"; path = fetchurl { - name = "_jest_types___types_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/@jest/types/-/types-27.0.2.tgz"; - sha1 = "e153d6c46bda0f2589f0702b071f9898c7bbd37e"; + name = "_jest_types___types_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/types/-/types-27.0.6.tgz"; + sha1 = "9a992bc517e0c49f035938b8549719c2de40706b"; }; } { @@ -642,11 +634,11 @@ }; } { - name = "_types_babel__traverse___babel__traverse_7.11.1.tgz"; + name = "_types_babel__traverse___babel__traverse_7.14.0.tgz"; path = fetchurl { - name = "_types_babel__traverse___babel__traverse_7.11.1.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.1.tgz"; - sha1 = "654f6c4f67568e24c23b367e947098c6206fa639"; + name = "_types_babel__traverse___babel__traverse_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.0.tgz"; + sha1 = "a34277cf8acbd3185ea74129e1f100491eb1da7f"; }; } { @@ -666,11 +658,11 @@ }; } { - name = "_types_filesystem___filesystem_0.0.30.tgz"; + name = "_types_filesystem___filesystem_0.0.31.tgz"; path = fetchurl { - name = "_types_filesystem___filesystem_0.0.30.tgz"; - url = "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.30.tgz"; - sha1 = "a7373a2edf34d13e298baf7ee1101f738b2efb7e"; + name = "_types_filesystem___filesystem_0.0.31.tgz"; + url = "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.31.tgz"; + sha1 = "121a1ded274a2dc731d5e0d90163a920ad6a9ef1"; }; } { @@ -754,19 +746,19 @@ }; } { - name = "_types_node___node_15.12.4.tgz"; + name = "_types_node___node_15.12.5.tgz"; path = fetchurl { - name = "_types_node___node_15.12.4.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-15.12.4.tgz"; - sha1 = "e1cf817d70a1e118e81922c4ff6683ce9d422e26"; + name = "_types_node___node_15.12.5.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-15.12.5.tgz"; + sha1 = "9a78318a45d75c9523d2396131bd3cca54b2d185"; }; } { - name = "_types_node___node_14.17.3.tgz"; + name = "_types_node___node_14.17.4.tgz"; path = fetchurl { - name = "_types_node___node_14.17.3.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.3.tgz"; - sha1 = "6d327abaa4be34a74e421ed6409a0ae2f47f4c3d"; + name = "_types_node___node_14.17.4.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.4.tgz"; + sha1 = "218712242446fc868d0e007af29a4408c7765bc0"; }; } { @@ -858,11 +850,11 @@ }; } { - name = "acorn___acorn_8.4.0.tgz"; + name = "acorn___acorn_8.4.1.tgz"; path = fetchurl { - name = "acorn___acorn_8.4.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.4.0.tgz"; - sha1 = "af53266e698d7cffa416714b503066a82221be60"; + name = "acorn___acorn_8.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz"; + sha1 = "56c36251fc7cabc7096adc18f05afe814321a28c"; }; } { @@ -1098,11 +1090,11 @@ }; } { - name = "babel_jest___babel_jest_27.0.2.tgz"; + name = "babel_jest___babel_jest_27.0.6.tgz"; path = fetchurl { - name = "babel_jest___babel_jest_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.2.tgz"; - sha1 = "7dc18adb01322acce62c2af76ea2c7cd186ade37"; + name = "babel_jest___babel_jest_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.6.tgz"; + sha1 = "e99c6e0577da2655118e3608b68761a5a69bd0d8"; }; } { @@ -1114,11 +1106,11 @@ }; } { - name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.0.1.tgz"; + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.0.6.tgz"; path = fetchurl { - name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.0.1.tgz"; - sha1 = "a6d10e484c93abff0f4e95f437dad26e5736ea11"; + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.0.6.tgz"; + sha1 = "f7c6b3d764af21cb4a2a1ab6870117dbde15b456"; }; } { @@ -1130,11 +1122,11 @@ }; } { - name = "babel_preset_jest___babel_preset_jest_27.0.1.tgz"; + name = "babel_preset_jest___babel_preset_jest_27.0.6.tgz"; path = fetchurl { - name = "babel_preset_jest___babel_preset_jest_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.0.1.tgz"; - sha1 = "7a50c75d16647c23a2cf5158d5bb9eb206b10e20"; + name = "babel_preset_jest___babel_preset_jest_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.0.6.tgz"; + sha1 = "909ef08e9f24a4679768be2f60a3df0856843f9d"; }; } { @@ -1322,11 +1314,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001239.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001241.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001239.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001239.tgz"; - sha1 = "66e8669985bb2cb84ccb10f68c25ce6dd3e4d2b8"; + name = "caniuse_lite___caniuse_lite_1.0.30001241.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001241.tgz"; + sha1 = "cd3fae47eb3d7691692b406568d7a3e5b23c7598"; }; } { @@ -1554,11 +1546,11 @@ }; } { - name = "core_js___core_js_3.15.0.tgz"; + name = "core_js___core_js_3.15.2.tgz"; path = fetchurl { - name = "core_js___core_js_3.15.0.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.15.0.tgz"; - sha1 = "db9554ebce0b6fd90dc9b1f2465c841d2d055044"; + name = "core_js___core_js_3.15.2.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz"; + sha1 = "740660d2ff55ef34ce664d7e2455119c5bdd3d61"; }; } { @@ -1666,11 +1658,11 @@ }; } { - name = "decimal.js___decimal.js_10.2.1.tgz"; + name = "decimal.js___decimal.js_10.3.1.tgz"; path = fetchurl { - name = "decimal.js___decimal.js_10.2.1.tgz"; - url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz"; - sha1 = "238ae7b0f0c793d3e3cea410108b35a2c01426a3"; + name = "decimal.js___decimal.js_10.3.1.tgz"; + url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz"; + sha1 = "d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"; }; } { @@ -1754,11 +1746,11 @@ }; } { - name = "diff_sequences___diff_sequences_27.0.1.tgz"; + name = "diff_sequences___diff_sequences_27.0.6.tgz"; path = fetchurl { - name = "diff_sequences___diff_sequences_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.0.1.tgz"; - sha1 = "9c9801d52ed5f576ff0a20e3022a13ee6e297e7c"; + name = "diff_sequences___diff_sequences_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.0.6.tgz"; + sha1 = "3305cb2e55a033924054695cc66019fd7f8e5723"; }; } { @@ -1858,19 +1850,19 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.752.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.763.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.752.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz"; - sha1 = "0728587f1b9b970ec9ffad932496429aef750d09"; + name = "electron_to_chromium___electron_to_chromium_1.3.763.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.763.tgz"; + sha1 = "93f6f02506d099941f557b9db9ba50b30215bf15"; }; } { - name = "electron___electron_13.1.2.tgz"; + name = "electron___electron_13.1.4.tgz"; path = fetchurl { - name = "electron___electron_13.1.2.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-13.1.2.tgz"; - sha1 = "8c9abf9015766c9cbc16f10c99282d00d6ae1b90"; + name = "electron___electron_13.1.4.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-13.1.4.tgz"; + sha1 = "6d20d932a0651c3cba9f09a3d08cbaf5b69aa84b"; }; } { @@ -2122,11 +2114,11 @@ }; } { - name = "expect___expect_27.0.2.tgz"; + name = "expect___expect_27.0.6.tgz"; path = fetchurl { - name = "expect___expect_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/expect/-/expect-27.0.2.tgz"; - sha1 = "e66ca3a4c9592f1c019fa1d46459a9d2084f3422"; + name = "expect___expect_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/expect/-/expect-27.0.6.tgz"; + sha1 = "a4d74fbe27222c718fff68ef49d78e26a8fd4c05"; }; } { @@ -2866,131 +2858,131 @@ }; } { - name = "jest_changed_files___jest_changed_files_27.0.2.tgz"; + name = "jest_changed_files___jest_changed_files_27.0.6.tgz"; path = fetchurl { - name = "jest_changed_files___jest_changed_files_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.0.2.tgz"; - sha1 = "997253042b4a032950fc5f56abf3c5d1f8560801"; + name = "jest_changed_files___jest_changed_files_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.0.6.tgz"; + sha1 = "bed6183fcdea8a285482e3b50a9a7712d49a7a8b"; }; } { - name = "jest_circus___jest_circus_27.0.4.tgz"; + name = "jest_circus___jest_circus_27.0.6.tgz"; path = fetchurl { - name = "jest_circus___jest_circus_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.4.tgz"; - sha1 = "3b261514ee3b3da33def736a6352c98ff56bb6e6"; + name = "jest_circus___jest_circus_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.6.tgz"; + sha1 = "dd4df17c4697db6a2c232aaad4e9cec666926668"; }; } { - name = "jest_cli___jest_cli_27.0.4.tgz"; + name = "jest_cli___jest_cli_27.0.6.tgz"; path = fetchurl { - name = "jest_cli___jest_cli_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.4.tgz"; - sha1 = "491b12c754c0d7c6873b13a66f26b3a80a852910"; + name = "jest_cli___jest_cli_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.6.tgz"; + sha1 = "d021e5f4d86d6a212450d4c7b86cb219f1e6864f"; }; } { - name = "jest_config___jest_config_27.0.4.tgz"; + name = "jest_config___jest_config_27.0.6.tgz"; path = fetchurl { - name = "jest_config___jest_config_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.4.tgz"; - sha1 = "c4f41378acf40ca77860fb4e213b12109d87b8cf"; + name = "jest_config___jest_config_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.6.tgz"; + sha1 = "119fb10f149ba63d9c50621baa4f1f179500277f"; }; } { - name = "jest_diff___jest_diff_27.0.2.tgz"; + name = "jest_diff___jest_diff_27.0.6.tgz"; path = fetchurl { - name = "jest_diff___jest_diff_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.2.tgz"; - sha1 = "f315b87cee5dc134cf42c2708ab27375cc3f5a7e"; + name = "jest_diff___jest_diff_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.6.tgz"; + sha1 = "4a7a19ee6f04ad70e0e3388f35829394a44c7b5e"; }; } { - name = "jest_docblock___jest_docblock_27.0.1.tgz"; + name = "jest_docblock___jest_docblock_27.0.6.tgz"; path = fetchurl { - name = "jest_docblock___jest_docblock_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.0.1.tgz"; - sha1 = "bd9752819b49fa4fab1a50b73eb58c653b962e8b"; + name = "jest_docblock___jest_docblock_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.0.6.tgz"; + sha1 = "cc78266acf7fe693ca462cbbda0ea4e639e4e5f3"; }; } { - name = "jest_each___jest_each_27.0.2.tgz"; + name = "jest_each___jest_each_27.0.6.tgz"; path = fetchurl { - name = "jest_each___jest_each_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-each/-/jest-each-27.0.2.tgz"; - sha1 = "865ddb4367476ced752167926b656fa0dcecd8c7"; + name = "jest_each___jest_each_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-each/-/jest-each-27.0.6.tgz"; + sha1 = "cee117071b04060158dc8d9a66dc50ad40ef453b"; }; } { - name = "jest_environment_jsdom___jest_environment_jsdom_27.0.3.tgz"; + name = "jest_environment_jsdom___jest_environment_jsdom_27.0.6.tgz"; path = fetchurl { - name = "jest_environment_jsdom___jest_environment_jsdom_27.0.3.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.3.tgz"; - sha1 = "ed73e913ddc03864eb9f934b5cbabf1b63504e2e"; + name = "jest_environment_jsdom___jest_environment_jsdom_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.6.tgz"; + sha1 = "f66426c4c9950807d0a9f209c590ce544f73291f"; }; } { - name = "jest_environment_node___jest_environment_node_27.0.3.tgz"; + name = "jest_environment_node___jest_environment_node_27.0.6.tgz"; path = fetchurl { - name = "jest_environment_node___jest_environment_node_27.0.3.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.3.tgz"; - sha1 = "b4acb3679d2552a4215732cab8b0ca7ec4398ee0"; + name = "jest_environment_node___jest_environment_node_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.6.tgz"; + sha1 = "a6699b7ceb52e8d68138b9808b0c404e505f3e07"; }; } { - name = "jest_get_type___jest_get_type_27.0.1.tgz"; + name = "jest_get_type___jest_get_type_27.0.6.tgz"; path = fetchurl { - name = "jest_get_type___jest_get_type_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.0.1.tgz"; - sha1 = "34951e2b08c8801eb28559d7eb732b04bbcf7815"; + name = "jest_get_type___jest_get_type_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.0.6.tgz"; + sha1 = "0eb5c7f755854279ce9b68a9f1a4122f69047cfe"; }; } { - name = "jest_haste_map___jest_haste_map_27.0.2.tgz"; + name = "jest_haste_map___jest_haste_map_27.0.6.tgz"; path = fetchurl { - name = "jest_haste_map___jest_haste_map_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.2.tgz"; - sha1 = "3f1819400c671237e48b4d4b76a80a0dbed7577f"; + name = "jest_haste_map___jest_haste_map_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.6.tgz"; + sha1 = "4683a4e68f6ecaa74231679dca237279562c8dc7"; }; } { - name = "jest_jasmine2___jest_jasmine2_27.0.4.tgz"; + name = "jest_jasmine2___jest_jasmine2_27.0.6.tgz"; path = fetchurl { - name = "jest_jasmine2___jest_jasmine2_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.4.tgz"; - sha1 = "c669519ccf4904a485338555e1e66cad36bb0670"; + name = "jest_jasmine2___jest_jasmine2_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.6.tgz"; + sha1 = "fd509a9ed3d92bd6edb68a779f4738b100655b37"; }; } { - name = "jest_leak_detector___jest_leak_detector_27.0.2.tgz"; + name = "jest_leak_detector___jest_leak_detector_27.0.6.tgz"; path = fetchurl { - name = "jest_leak_detector___jest_leak_detector_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.0.2.tgz"; - sha1 = "ce19aa9dbcf7a72a9d58907a970427506f624e69"; + name = "jest_leak_detector___jest_leak_detector_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.0.6.tgz"; + sha1 = "545854275f85450d4ef4b8fe305ca2a26450450f"; }; } { - name = "jest_matcher_utils___jest_matcher_utils_27.0.2.tgz"; + name = "jest_matcher_utils___jest_matcher_utils_27.0.6.tgz"; path = fetchurl { - name = "jest_matcher_utils___jest_matcher_utils_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.0.2.tgz"; - sha1 = "f14c060605a95a466cdc759acc546c6f4cbfc4f0"; + name = "jest_matcher_utils___jest_matcher_utils_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.0.6.tgz"; + sha1 = "2a8da1e86c620b39459f4352eaa255f0d43e39a9"; }; } { - name = "jest_message_util___jest_message_util_27.0.2.tgz"; + name = "jest_message_util___jest_message_util_27.0.6.tgz"; path = fetchurl { - name = "jest_message_util___jest_message_util_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.0.2.tgz"; - sha1 = "181c9b67dff504d8f4ad15cba10d8b80f272048c"; + name = "jest_message_util___jest_message_util_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.0.6.tgz"; + sha1 = "158bcdf4785706492d164a39abca6a14da5ab8b5"; }; } { - name = "jest_mock___jest_mock_27.0.3.tgz"; + name = "jest_mock___jest_mock_27.0.6.tgz"; path = fetchurl { - name = "jest_mock___jest_mock_27.0.3.tgz"; - url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.0.3.tgz"; - sha1 = "5591844f9192b3335c0dca38e8e45ed297d4d23d"; + name = "jest_mock___jest_mock_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.0.6.tgz"; + sha1 = "0efdd40851398307ba16778728f6d34d583e3467"; }; } { @@ -3002,99 +2994,99 @@ }; } { - name = "jest_regex_util___jest_regex_util_27.0.1.tgz"; + name = "jest_regex_util___jest_regex_util_27.0.6.tgz"; path = fetchurl { - name = "jest_regex_util___jest_regex_util_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.1.tgz"; - sha1 = "69d4b1bf5b690faa3490113c47486ed85dd45b68"; + name = "jest_regex_util___jest_regex_util_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.6.tgz"; + sha1 = "02e112082935ae949ce5d13b2675db3d8c87d9c5"; }; } { - name = "jest_resolve_dependencies___jest_resolve_dependencies_27.0.4.tgz"; + name = "jest_resolve_dependencies___jest_resolve_dependencies_27.0.6.tgz"; path = fetchurl { - name = "jest_resolve_dependencies___jest_resolve_dependencies_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.4.tgz"; - sha1 = "a07a242d70d668afd3fcf7f4270755eebb1fe579"; + name = "jest_resolve_dependencies___jest_resolve_dependencies_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.6.tgz"; + sha1 = "3e619e0ef391c3ecfcf6ef4056207a3d2be3269f"; }; } { - name = "jest_resolve___jest_resolve_27.0.4.tgz"; + name = "jest_resolve___jest_resolve_27.0.6.tgz"; path = fetchurl { - name = "jest_resolve___jest_resolve_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.4.tgz"; - sha1 = "8a27bc3f2f00c8ea28f3bc99bbf6f468300a703d"; + name = "jest_resolve___jest_resolve_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.6.tgz"; + sha1 = "e90f436dd4f8fbf53f58a91c42344864f8e55bff"; }; } { - name = "jest_runner___jest_runner_27.0.4.tgz"; + name = "jest_runner___jest_runner_27.0.6.tgz"; path = fetchurl { - name = "jest_runner___jest_runner_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.4.tgz"; - sha1 = "2787170a9509b792ae129794f6944d27d5d12a4f"; + name = "jest_runner___jest_runner_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.6.tgz"; + sha1 = "1325f45055539222bbc7256a6976e993ad2f9520"; }; } { - name = "jest_runtime___jest_runtime_27.0.4.tgz"; + name = "jest_runtime___jest_runtime_27.0.6.tgz"; path = fetchurl { - name = "jest_runtime___jest_runtime_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.4.tgz"; - sha1 = "2e4a6aa77cac32ac612dfe12768387a8aa15c2f0"; + name = "jest_runtime___jest_runtime_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.6.tgz"; + sha1 = "45877cfcd386afdd4f317def551fc369794c27c9"; }; } { - name = "jest_serializer___jest_serializer_27.0.1.tgz"; + name = "jest_serializer___jest_serializer_27.0.6.tgz"; path = fetchurl { - name = "jest_serializer___jest_serializer_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.0.1.tgz"; - sha1 = "2464d04dcc33fb71dc80b7c82e3c5e8a08cb1020"; + name = "jest_serializer___jest_serializer_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.0.6.tgz"; + sha1 = "93a6c74e0132b81a2d54623251c46c498bb5bec1"; }; } { - name = "jest_snapshot___jest_snapshot_27.0.4.tgz"; + name = "jest_snapshot___jest_snapshot_27.0.6.tgz"; path = fetchurl { - name = "jest_snapshot___jest_snapshot_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.4.tgz"; - sha1 = "2b96e22ca90382b3e93bd0aae2ce4c78bf51fb5b"; + name = "jest_snapshot___jest_snapshot_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.6.tgz"; + sha1 = "f4e6b208bd2e92e888344d78f0f650bcff05a4bf"; }; } { - name = "jest_util___jest_util_27.0.2.tgz"; + name = "jest_util___jest_util_27.0.6.tgz"; path = fetchurl { - name = "jest_util___jest_util_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.2.tgz"; - sha1 = "fc2c7ace3c75ae561cf1e5fdb643bf685a5be7c7"; + name = "jest_util___jest_util_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.6.tgz"; + sha1 = "e8e04eec159de2f4d5f57f795df9cdc091e50297"; }; } { - name = "jest_validate___jest_validate_27.0.2.tgz"; + name = "jest_validate___jest_validate_27.0.6.tgz"; path = fetchurl { - name = "jest_validate___jest_validate_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.0.2.tgz"; - sha1 = "7fe2c100089449cd5cbb47a5b0b6cb7cda5beee5"; + name = "jest_validate___jest_validate_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.0.6.tgz"; + sha1 = "930a527c7a951927df269f43b2dc23262457e2a6"; }; } { - name = "jest_watcher___jest_watcher_27.0.2.tgz"; + name = "jest_watcher___jest_watcher_27.0.6.tgz"; path = fetchurl { - name = "jest_watcher___jest_watcher_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.0.2.tgz"; - sha1 = "dab5f9443e2d7f52597186480731a8c6335c5deb"; + name = "jest_watcher___jest_watcher_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.0.6.tgz"; + sha1 = "89526f7f9edf1eac4e4be989bcb6dec6b8878d9c"; }; } { - name = "jest_worker___jest_worker_27.0.2.tgz"; + name = "jest_worker___jest_worker_27.0.6.tgz"; path = fetchurl { - name = "jest_worker___jest_worker_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.2.tgz"; - sha1 = "4ebeb56cef48b3e7514552f80d0d80c0129f0b05"; + 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 = "jest___jest_27.0.4.tgz"; + name = "jest___jest_27.0.6.tgz"; path = fetchurl { - name = "jest___jest_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest/-/jest-27.0.4.tgz"; - sha1 = "91d4d564b36bcf93b98dac1ab19f07089e670f53"; + name = "jest___jest_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest/-/jest-27.0.6.tgz"; + sha1 = "10517b2a628f0409087fbf473db44777d7a04505"; }; } { @@ -3786,11 +3778,11 @@ }; } { - name = "pretty_format___pretty_format_27.0.2.tgz"; + name = "pretty_format___pretty_format_27.0.6.tgz"; path = fetchurl { - name = "pretty_format___pretty_format_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.2.tgz"; - sha1 = "9283ff8c4f581b186b2d4da461617143dca478a4"; + name = "pretty_format___pretty_format_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.6.tgz"; + sha1 = "ab770c47b2c6f893a21aefc57b75da63ef49a11f"; }; } { @@ -4682,11 +4674,11 @@ }; } { - name = "v8_to_istanbul___v8_to_istanbul_7.1.2.tgz"; + name = "v8_to_istanbul___v8_to_istanbul_8.0.0.tgz"; path = fetchurl { - name = "v8_to_istanbul___v8_to_istanbul_7.1.2.tgz"; - url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz"; - sha1 = "30898d1a7fa0c84d225a2c1434fb958f290883c1"; + name = "v8_to_istanbul___v8_to_istanbul_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.0.0.tgz"; + sha1 = "4229f2a99e367f3f018fa1d5c2b8ec684667c69c"; }; } { @@ -4754,11 +4746,11 @@ }; } { - name = "whatwg_url___whatwg_url_8.6.0.tgz"; + name = "whatwg_url___whatwg_url_8.7.0.tgz"; path = fetchurl { - name = "whatwg_url___whatwg_url_8.6.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.6.0.tgz"; - sha1 = "27c0205a4902084b872aecb97cf0f2a7a3011f4c"; + name = "whatwg_url___whatwg_url_8.7.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz"; + sha1 = "656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"; }; } { @@ -4810,11 +4802,11 @@ }; } { - name = "ws___ws_7.5.0.tgz"; + name = "ws___ws_7.5.1.tgz"; path = fetchurl { - name = "ws___ws_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.5.0.tgz"; - sha1 = "0033bafea031fb9df041b2026fc72a571ca44691"; + name = "ws___ws_7.5.1.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.5.1.tgz"; + sha1 = "44fc000d87edb1d9c53e51fbc69a0ac1f6871d66"; }; } { diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index fadaa94995c..bba0b74172a 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.22.2"; + version = "1.23.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "sha256-qYdVplNHyD31m4IbIeL3x3nauZLl1XquslS3WrtUXBk="; + sha256 = "sha256-CJY7XjHJ6suJrjhnG+w5oM1FtVnegcbkCVGjyoBtBag="; }; - vendorSha256 = "sha256-4uSw/9lI/rdDqy78jNC9eHYW/v/sMFb+sQvwYG6GZks="; + vendorSha256 = "sha256-aC6E+PpuUqFhZKvQT5AuxpPmHfhjCwHzwFHDzk5wazw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix index 8620c43cdbe..95e16797cf4 100644 --- a/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fn"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = version; - sha256 = "sha256-50tPR+x3U4XJB6lthEiZjOy2pD8LprSE41ZpH2Px8JY="; + sha256 = "sha256-8b1VyukVMTXLAnvYcjXgTdPtMq3YxJgTpxe25Kj+Wpw="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/kubeconform/default.nix b/pkgs/applications/networking/cluster/kubeconform/default.nix index c62cbb2a67a..cc0f1e0bf64 100644 --- a/pkgs/applications/networking/cluster/kubeconform/default.nix +++ b/pkgs/applications/networking/cluster/kubeconform/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeconform"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = "yannh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ahVdKMx3u2KnJ30wi9rV8JCVg9wPmbgdrtG8IpWWlCs="; + sha256 = "sha256-XD8xGqtE7eaBxPL4Z0Kw4BEqM2fdgww7wl8wJ1U3u0U="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index 31fae0e31c2..7b5e5810581 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -64,8 +64,8 @@ in }; edge = generic { channel = "edge"; - version = "21.6.3"; - sha256 = "sha256-NgfbkeVRl0AGNkZSS2nSAHp4eZ49QNSEYMuFe1G5iBY="; - vendorSha256 = "sha256-rq/MHo5MG2EKZ3d937TIDXFCoWnLlQO3C/fo1bhRxCA="; + version = "21.7.1"; + sha256 = "sha256-VLq776A0H2IZLBeYjXpYzFixcydw/OcYsvKFxeLuewo="; + vendorSha256 = "sha256-xSOPMFHfyCmG+yTzBfKR7F5KYV0gcKRNM0UrxpGBpE4="; }; } diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index ef85494bd14..2c839e84a4e 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -9,7 +9,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "b4b1ccf086586d041d7e91e68515d495c550f30e4d179d63863fea9ccdbb78eb"; }; - propagatedBuildInputs = with python3.pkgs; [ dateutil tornado python-daemon boto3 ]; + propagatedBuildInputs = with python3.pkgs; [ python-dateutil tornado python-daemon boto3 ]; # Requires tox, hadoop, and google cloud doCheck = false; diff --git a/pkgs/applications/networking/cluster/nerdctl/default.nix b/pkgs/applications/networking/cluster/nerdctl/default.nix index 7be59ee1661..418f3259178 100644 --- a/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,23 +10,21 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.8.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mBoqyDfGho2e4RuFwkiU2R+zb38LzByWtH4pOhguueY="; + sha256 = "sha256-cqIIpdkQ6DF7DKXvwCoJBQKG0+lL8iP/Vx0q7rL8prg="; }; - vendorSha256 = "sha256-S3Gp7HkBIZNZ8rkp64XaUQUj1TggGwI9FMrVkyLCQWA="; + vendorSha256 = "sha256-0+k1e7Sn+NYGAJDVUbUm0oedc1t2blezUhsjDIuIKvA="; nativeBuildInputs = [ makeWrapper installShellFiles ]; - preBuild = let t = "github.com/containerd/nerdctl/pkg/version"; in - '' - buildFlagsArray+=("-ldflags" "-s -w -X ${t}.Version=v${version} -X ${t}.Revision=<unknown>") - ''; + ldflags = let t = "github.com/containerd/nerdctl/pkg/version"; in + [ "-s" "-w" "-X ${t}.Version=v${version}" "-X ${t}.Revision=<unknown>" ]; # Many checks require a containerd socket and running nerdctl after it's built doCheck = false; diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index c792a38001a..bf11b35d71a 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tanka"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KvQIVJZD/VvLE5RocWLRVGbb8faLY2cBeFSE/6E7x50="; + sha256 = "sha256-9UfSKMyapmDyikRqs7UiA4YYcvj/Tin9pRqC9iFLPWE="; }; vendorSha256 = "sha256-vpm2y/CxRNWkz6+AOMmmZH5AjRQWAa6WD5Fnx5lqJYw="; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index faf817d1c7f..1717d320900 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.30.7"; + version = "0.31.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zcb2bdIvUeHEto2NeY0Zwj7jIB+ipVXpnb7q97IkvmA="; + sha256 = "sha256-JRIwPOExPbwLS7ps4pJpvIRaZ9jZZjVK+POaUHAmiPI="; }; - vendorSha256 = "sha256-OgNNq1qRhCufcWemLxh50pzs432RxZpWWcyBB7xeiOs="; + vendorSha256 = "sha256-lck4nabDhFA8N0lo+cIKiJjlg2TGx3qMExbblHQwbvQ="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix index 3675aba028c..b0d0d6193e2 100644 --- a/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "waypoint"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yeD7XtcB/2ph6cCnOcv0yFQqvAMPDLXMrUWWkgmBUaA="; + sha256 = "sha256-JB/0nU/05Agh4fWFeSfrUHFtR8cQjxdXW0QHAoH0dDc="; }; deleteVendor = true; - vendorSha256 = "sha256-xZGYPh3Yp3g22GraYfMESVpp7j5fOZASUEvN4YaDd1g="; + vendorSha256 = "sha256-2YrCRdpRk+gPHN8flahgWb2sbK5dYL5ivVqeJSsiy8Y="; nativeBuildInputs = [ go-bindata installShellFiles ]; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 21c42ad786b..69f71a7479e 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.10.0"; + version = "3.10.1"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-22wYc6W4a5P9+JW7NW+s85IlQ+tfLhYzDarN6PGkFk4="; + sha256 = "sha256-fYQqH/J027XJPML/qKMpuu2Nxuvb0cyjOu2czLH8SoM="; }; - vendorSha256 = "sha256-TPvO/E/uOyVSMNRQ3zzt15+i0UK0uHvI4qM5PqmHY20="; + vendorSha256 = "sha256-225TR9jTZSGEJZz3csl/pR/v2unUK67l08x5ESQTJzA="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix index 62ffe15e618..9b173e85682 100644 --- a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix +++ b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 - dateutil + python-dateutil feedparser html5lib listparser diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 228c6b47150..61e42ce22ec 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { pynzb pyparsing PyRSS2Gen - dateutil + python-dateutil pyyaml rebulk requests diff --git a/pkgs/applications/networking/giara/default.nix b/pkgs/applications/networking/giara/default.nix index 940756855b9..1f4d2e0a2d9 100644 --- a/pkgs/applications/networking/giara/default.nix +++ b/pkgs/applications/networking/giara/default.nix @@ -48,7 +48,7 @@ python3.pkgs.buildPythonApplication rec { pythonPath = with python3.pkgs; [ pygobject3 pycairo - dateutil + python-dateutil praw pillow mistune diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index 22a7d74e14d..5d24f589abc 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -34,11 +34,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-XkZHoHyzG11tAEmXKkU3XBN96QipZKROLW0jH6OtS1I="; + sha256 = "sha256-2vE0uy18mAA16a5g96rzEzI6gJNAAJ8m5IEQzN6B9gI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index 89154ad939e..4918a4d91f8 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2021-06-14"; + version = "unstable-2021-07-04"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "25da4228768e260ea9f67d5aa10558e7cf9cf7ee"; - sha256 = "17igh34cbd0w5mzra4k779nxc5s8hk6sj25h308w079y0b21lf7w"; + rev = "5d3cddc47773b49d4a801d031c1de96c38617908"; + sha256 = "1sah27pvdkilnyj41xf4awri9ya14gxayr99qksllz92ywd9lxad"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms/default.nix new file mode 100644 index 00000000000..3bdecf504ce --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, glibmm, pidgin, pkg-config, modemmanager, fetchFromGitLab } : + +stdenv.mkDerivation rec { + pname = "purple-mm-sms"; + version = "0.1.7"; + + src = fetchFromGitLab { + domain = "source.puri.sm"; + owner = "Librem5"; + repo = pname; + rev = "v${version}"; + sha256 = "0917gjig35hmi6isqb62vhxd3lkc2nwdn13ym2gvzgcjfgjzjajr"; + }; + + makeFlags = [ + "DATA_ROOT_DIR_PURPLE=$(out)/share" + "PLUGIN_DIR_PURPLE=$(out)/lib/purple-2" + ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ glibmm pidgin modemmanager ]; + + meta = with lib; { + homepage = "https://source.puri.sm/Librem5/purple-mm-sms"; + description = "A libpurple plugin for sending and receiving SMS via Modemmanager"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ tomfitzhenry ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix index 8277028ac7b..a8e711c447d 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix @@ -55,7 +55,7 @@ in { sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml"; }; - propagatedBuildInputs = with pythonPackages; [twisted dateutil]; + propagatedBuildInputs = with pythonPackages; [twisted python-dateutil]; meta = with lib; { description = "Some (mainly XMPP-related) additions to twisted"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 76d149048a3..47aa7c7330f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchFromGitHub, callPackage , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo -, qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash -, dee, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 +, qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash +, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 , tl-expected, hunspell, glibmm, webkitgtk , libtgvoip, rnnoise, abseil-cpp, extra-cmake-modules # Transitive dependencies: @@ -23,7 +23,7 @@ let tg_owt = callPackage ./tg_owt.nix {}; in mkDerivation rec { pname = "telegram-desktop"; - version = "2.8.3"; + version = "2.8.4"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -32,12 +32,10 @@ in mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1ywxsy3a99sdibipriblbzskmkqbnxwrz3lavfdr134wq8w8rjf7"; + sha256 = "sha256-IN3GQgdNM66/GxKa5EGKB/LIkgBxS8Y4mkPBaSEphmw="; }; postPatch = '' - substituteInPlace Telegram/lib_spellcheck/spellcheck/platform/linux/linux_enchant.cpp \ - --replace '"libenchant-2.so.2"' '"${enchant2}/lib/libenchant-2.so.2"' substituteInPlace Telegram/CMakeLists.txt \ --replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"' ''; @@ -49,8 +47,8 @@ in mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook removeReferencesTo ]; buildInputs = [ - qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu enchant2 lz4 xxHash - dee ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 + qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash + ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 tl-expected hunspell glibmm webkitgtk libtgvoip rnnoise abseil-cpp extra-cmake-modules tg_owt diff --git a/pkgs/applications/networking/irc/weechat/scripts/buffer_autoset/default.nix b/pkgs/applications/networking/irc/weechat/scripts/buffer_autoset/default.nix new file mode 100644 index 00000000000..a2e9fc3265a --- /dev/null +++ b/pkgs/applications/networking/irc/weechat/scripts/buffer_autoset/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl, weechat }: + +stdenv.mkDerivation { + pname = "buffer_autoset"; + version = "1.2"; + + src = fetchurl { + url = "https://raw.githubusercontent.com/weechat/scripts/2b308b44df39ba6563d02b2bcd40c384ec2777dc/python/buffer_autoset.py"; + sha256 = "0csl3sfpijdbq1j6wabx347lvn91a24a2jfx5b5pspfxz7gixli1"; + }; + + dontUnpack = true; + + passthru.scripts = [ "buffer_autoset.py" ]; + + installPhase = '' + install -D $src $out/share/buffer_autoset.py + ''; + + meta = with lib; { + inherit (weechat.meta) platforms; + description = "buffer_autoset.py is a weechat script which auto-set buffer properties when a buffer is opened."; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ govanify ]; + }; +} diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/pkgs/applications/networking/irc/weechat/scripts/default.nix index 1a975d2229d..ea665160f60 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/default.nix @@ -22,4 +22,6 @@ weechat-otr = callPackage ./weechat-otr { }; weechat-go = callPackage ./weechat-go { }; + + buffer_autoset = callPackage ./buffer_autoset { }; } diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix new file mode 100644 index 00000000000..b4de49730fe --- /dev/null +++ b/pkgs/applications/networking/juju/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "juju"; + version = "2.8.7"; + + src = fetchFromGitHub { + owner = "juju"; + repo = "juju"; + rev = "juju-${version}"; + sha256 = "sha256-ZiG+LMeQboFxaLIBSHjRNe5tt8bEguYXQp3nhkoMpek="; + }; + + vendorSha256 = "sha256-5R3TmwOzHgdEQhS4B4Bb0InghaEhUVxDSl7oZl3aNZ4="; + + # Disable tests because it attempts to use a mongodb instance + doCheck = false; + + meta = with lib; { + description = "Open source modelling tool for operating software in the cloud"; + homepage = "https://juju.is"; + license = licenses.mit; + maintainers = with maintainers; [ citadelcore ]; + }; +} diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index e0c5b50be0f..d93fea1f702 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -63,7 +63,7 @@ let description = "Low-latency, high quality voice chat software"; homepage = "https://mumble.info"; license = licenses.bsd3; - maintainers = with maintainers; [ petabyteboy infinisil ]; + maintainers = with maintainers; [ petabyteboy infinisil felixsinger ]; platforms = platforms.linux; }; }); diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 6b73f03531d..446da4cdea3 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -1,27 +1,18 @@ -{ mkDerivation, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake, qtbase, qttools +{ mkDerivation, lib, fetchFromGitHub, pkg-config, cmake, qtbase, qttools , seafile-shared, jansson, libsearpc , withShibboleth ? true, qtwebengine }: mkDerivation rec { pname = "seafile-client"; - version = "8.0.1"; + version = "8.0.3"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; - rev = "b4b944921c7efef13a93d693c45c997943899dec"; - sha256 = "2vV+6ZXjVg81JVLfWeD0UK+RdmpBxBU2Ozx790WFSyw="; + rev = "v${version}"; + sha256 = "cG3OSqRhYnxlzfauQia6pM/1gu+iE5mtHTGk3kGMFH0="; }; - patches = [ - # Fix compilation failure with "error: template with C linkage", fixes #122505 - (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_build_with_glib2.diff?h=seafile-client&id=7be253aaa2bdb6771721f45aa08bc875c8001c5a"; - name = "fix_build_with_glib2.diff"; - sha256 = "0hl7rcqfr8k62c1pr133bp3j63b905izaaggmgvr1af4jibal05v"; - }) - ]; - nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ qtbase qttools seafile-shared jansson libsearpc ] ++ lib.optional withShibboleth qtwebengine; diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix index 519242b887c..f630cb4071a 100644 --- a/pkgs/applications/networking/sync/acd_cli/default.nix +++ b/pkgs/applications/networking/sync/acd_cli/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildPythonApplication, fuse -, appdirs, colorama, dateutil, requests, requests_toolbelt +, appdirs, colorama, python-dateutil, requests, requests_toolbelt , fusepy, sqlalchemy, setuptools }: buildPythonApplication rec { @@ -15,7 +15,7 @@ buildPythonApplication rec { sha256 = "0a0fr632l24a3jmgla3b1vcm50ayfa9hdbp677ch1chwj5dq4zfp"; }; - propagatedBuildInputs = [ appdirs colorama dateutil fusepy requests + propagatedBuildInputs = [ appdirs colorama python-dateutil fusepy requests requests_toolbelt setuptools sqlalchemy ]; makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${fuse}/lib/libfuse.so" ]; diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index 158999f86fe..caa46942ca9 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall , gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook -, gnome, buildPythonApplication, dateutil, pyinotify, pygobject3 +, gnome, buildPythonApplication, python-dateutil, pyinotify, pygobject3 , bcrypt, gobject-introspection, gsettings-desktop-schemas , pango, gdk-pixbuf, atk }: @@ -30,7 +30,7 @@ buildPythonApplication rec { ]; propagatedBuildInputs = [ - dateutil pyinotify pygobject3 bcrypt + python-dateutil pyinotify pygobject3 bcrypt ]; patches = [ diff --git a/pkgs/applications/office/paperless/default.nix b/pkgs/applications/office/paperless/default.nix index c2578696c68..68032ebe849 100644 --- a/pkgs/applications/office/paperless/default.nix +++ b/pkgs/applications/office/paperless/default.nix @@ -122,7 +122,7 @@ let runtimePackages = with python.pkgs; [ dateparser - dateutil + python-dateutil django django-cors-headers django-crispy-forms diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 8f1278d9926..16ee7733ed2 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -122,7 +122,7 @@ python3Packages.buildPythonApplication rec { openpaperwork-core pypillowfight pyxdg - dateutil + python-dateutil setuptools ]; diff --git a/pkgs/applications/office/pyspread/default.nix b/pkgs/applications/office/pyspread/default.nix index 54d3b8f5c3e..3c68c19aa97 100644 --- a/pkgs/applications/office/pyspread/default.nix +++ b/pkgs/applications/office/pyspread/default.nix @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python3.pkgs; [ - dateutil + python-dateutil markdown2 matplotlib numpy diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix index 56a951919e3..3c139e1eead 100644 --- a/pkgs/applications/office/softmaker/generic.nix +++ b/pkgs/applications/office/softmaker/generic.nix @@ -123,7 +123,7 @@ in stdenv.mkDerivation { description = "An office suite with a word processor, spreadsheet and presentation program"; homepage = "https://www.softmaker.com/"; license = licenses.unfree; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index 7793db2138c..7cb9a9b7e99 100644 --- a/pkgs/applications/office/super-productivity/default.nix +++ b/pkgs/applications/office/super-productivity/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { pname = "super-productivity"; - version = "6.5.2"; + version = "7.2.1"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "1ivl7chsv9axgk6nqkf580pav651hchi3di0mrp0pylpsqgk6f1f"; + sha256 = "93eeb56fe923c48a9384cde0633e98a9d9dc5c0869fce63b9724ff74bb400049"; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index b3a5ae44c93..ff4835411ef 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ - dateutil + python-dateutil pygobject3 goocalendar pycairo diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index ca80262eb76..43007cb1f0f 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -35,10 +35,10 @@ in stdenv.mkDerivation rec { pname = "gwyddion"; - version = "2.58"; + version = "2.59"; src = fetchurl { url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz"; - sha256 = "sha256-0xNnzYkuW3nEsO2o+0WEA+Z71XWoq6FYXm342OWO9Sw="; + sha256 = "sha256-APMOJeZt/zp8JvXghKZ5lQFRKWO/4TVDORok8qAgEBk="; }; nativeBuildInputs = [ pkg-config file ]; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 92606f3f909..5d2158843ed 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.42"; + version = "14.31.44"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-q81dUSxrKT3nzX0bFclolsyguQxXKlsiX9GCwEvOpAw="; + sha256 = "sha256-MHfqoQzUEL7nje7Y/hbaA8iktxfN7464TJXum5B6OCc="; }; patchPhase = '' diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index d20be86daf0..a49262e7cb6 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -7,16 +7,16 @@ in rustPlatform.buildRustPackage rec { pname = "elan"; - version = "1.0.2"; + version = "1.0.6"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - sha256 = "sha256-nK4wvxK5Ne1+4kaMts6pIr5FvXBgXJsGdn68gGEZUdk="; + sha256 = "sha256-Ns8vSS/PDlfopigW4Nz3fdR9PCMG8gDoL36+/s0Qkeo="; }; - cargoSha256 = "sha256-ptSbpq1ePNWmdBGfKtqFGfkdimDjU0YEo4F8VPtQMt4="; + cargoSha256 = "sha256-NDtldiVo4SyE88f6ntKn1WJDFdvwN5Ps4DxQH15iNZE="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index defe218b119..ef2d97ef6bf 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -1,5 +1,5 @@ { lib, fetchzip, makeWrapper, makeDesktopItem, stdenv -, gtk3, libXtst, glib, zlib +, gtk3, libXtst, glib, zlib, wrapGAppsHook }: let @@ -25,7 +25,11 @@ in stdenv.mkDerivation rec { sha256 = "02a2y2mkfab5cczw8g604m61h4xr0apir49zbd1aq6mmgcgngw80"; }; - nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ gtk3 ]; + + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + + dontWrapGApps = true; phases = [ "installPhase" ]; @@ -36,6 +40,9 @@ in stdenv.mkDerivation rec { cp -r "$src" "$out/toolbox" chmod -R +w "$out/toolbox" + fixupPhase + gappsWrapperArgsHook + patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/toolbox/toolbox" @@ -52,7 +59,8 @@ in stdenv.mkDerivation rec { makeWrapper $out/toolbox/toolbox $out/bin/tla-toolbox \ --run "set -x; cd $out/toolbox" \ --add-flags "-data ~/.tla-toolbox" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3 libXtst glib zlib ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3 libXtst glib zlib ]}" \ + "''${gappsWrapperArgs[@]}" echo -e "\nCreating TLA Toolbox icons..." pushd "$src" diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 565c6a17672..08bf84be7c8 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { let pp = python.pkgs; in ([ pp.numpy pp.scipy pp.scikitimage pp.h5py pp.matplotlib pp.ipython pp.networkx pp.nose - pp.pandas pp.dateutil pp.protobuf pp.gflags + pp.pandas pp.python-dateutil pp.protobuf pp.gflags pp.pyyaml pp.pillow pp.six ] ++ lib.optional leveldbSupport pp.leveldb) ); diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 208bb95f930..58b2a617bd6 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -1,7 +1,12 @@ -{ lib, stdenv, fetchurl, ocamlPackages, libGLU, libGL, freeglut, giflib -, libmysqlclient, mpfr, gmp, libtiff, libjpeg, libpng +{ lib, stdenv, fetchurl, ocamlPackages, makeWrapper +, libGLU, libGL, freeglut, mpfr, gmp +, pkgsHostTarget }: +let + inherit (pkgsHostTarget.targetPackages.stdenv) cc; +in + stdenv.mkDerivation { name = "glsurf-3.3.1"; @@ -10,17 +15,32 @@ stdenv.mkDerivation { sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; - buildInputs = [ freeglut libGLU libGL libmysqlclient mpfr giflib gmp - libtiff libjpeg libpng ] - ++ (with ocamlPackages; [ - ocaml findlib ocaml_mysql lablgl camlimages_4_1_2 mlgmpidl + nativeBuildInputs = [ + makeWrapper + ] ++ (with ocamlPackages; [ + ocaml findlib + ]); + + buildInputs = [ + freeglut libGL libGLU mpfr gmp + ] ++ (with ocamlPackages; [ + camlp4 lablgl camlimages_4_2_4 ]); + postPatch = '' + for f in callbacks*/Makefile src/Makefile; do + substituteInPlace "$f" --replace "+camlp4" \ + "${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4" + done + ''; + installPhase = '' mkdir -p $out/bin $out/share/doc/glsurf cp ./src/glsurf.opt $out/bin/glsurf cp ./doc/doc.pdf $out/share/doc/glsurf cp -r ./examples $out/share/doc/glsurf + + wrapProgram "$out/bin/glsurf" --set CC "${cc}/bin/${cc.targetPrefix}cc" ''; meta = { diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 56b6df94e8f..7807ae613e8 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.18.0"; + version = "3.19.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "sha256-hE0di7B6dCnMmMBLgFkb6vPS4hS/7zD6BbviIucrn1I="; + sha256 = "1nrx7gp6f1yalbdda1gb97azhbr4xclq2xf08vvbvsk8jfd6fd2v"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 1ed174ebd46..218ab920a87 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -126,6 +126,15 @@ stdenv.mkDerivation rec { rev = "bc84af8c795b7da433d2000afc3626ee65ba28b8"; sha256 = "sha256-5Kvs9jarC8xRIU1rdmvIWxQLC25ehiTLJpg5skh8WNM="; }) + + # eclib 20210625 update + # https://trac.sagemath.org/ticket/31443 + (fetchSageDiff { + base = "9.4.beta3"; + name = "eclib-20210625.patch"; + rev = "789550ca04c94acfb1e803251538996a34962038"; + sha256 = "sha256-VlyEn5hg3joG8t/GwiRfq9TzJ54AoHxLolsNQ3shc2c="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index c142ba12bc2..0fc85cea05c 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.1.7"; + version = "3.2.0"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "sha256-82ZD32dqRYGbGM/uyaJ5VqVZbhDZthiEcTihkV43JOU="; + sha256 = "126xpx8i85giy3hkhqh0qcln9i1qj5bfciaqh9486rkl54xm8zsr"; }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): @@ -48,7 +48,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://nicolargo.github.io/glances/"; description = "Cross-platform curses-based monitoring tool"; - changelog = "https://github.com/nicolargo/glances/releases/tag/v${version}"; + changelog = "https://github.com/nicolargo/glances/blob/v${version}/NEWS.rst"; license = licenses.lgpl3Only; maintainers = with maintainers; [ jonringer primeos koral ]; }; diff --git a/pkgs/applications/system/qjournalctl/default.nix b/pkgs/applications/system/qjournalctl/default.nix new file mode 100644 index 00000000000..31c256f46c8 --- /dev/null +++ b/pkgs/applications/system/qjournalctl/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, qtbase +, qmake +, pkg-config +, libssh +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "qjournalctl"; + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "pentix"; + repo = pname; + rev = "v${version}"; + sha256 = "0j27cmfq29mwrbjfrrwi6m1grcamhbfhk47xzlfsx5wr2q9m6qkz"; + }; + + postPatch = '' + substituteInPlace qjournalctl.pro --replace /usr/ $out/ + ''; + + nativeBuildInputs = [ + qmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + libssh + qtbase + ]; + + meta = with lib; { + description = "Qt-based graphical user interface for systemd's journalctl command"; + homepage = "https://github.com/pentix/qjournalctl"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = with maintainers; [ dtzWill srgom romildo ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/bit/default.nix b/pkgs/applications/version-management/git-and-tools/bit/default.nix index cce37df357b..c3524417829 100644 --- a/pkgs/applications/version-management/git-and-tools/bit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bit/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "bit"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "chriswalz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-85GEx9y8r9Fjgfcwh1Bi8WDqBm6KF7uidutlF77my60="; + sha256 = "sha256-18R0JGbG5QBDghF4SyhXaKe9UY5UzF7Ap0Y061Z1SZ8="; }; vendorSha256 = "sha256-3Y/B14xX5jaoL44rq9+Nn4niGViLPPXBa8WcJgTvYTA="; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 87b5273853a..bdc83b8e30b 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "14.0.1", - "repo_hash": "185jzzlnghws958y15q7mzc7y42sxxq26p5i7j92bky9nkc1sa81", + "version": "14.0.2", + "repo_hash": "1wnlkbjy7hm5lq6qc12dncmz321nhcnm8wvaz0ni1v5xpp3hv286", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.0.1-ee", + "rev": "v14.0.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.0.1", + "GITALY_SERVER_VERSION": "14.0.2", "GITLAB_PAGES_VERSION": "1.40.0", "GITLAB_SHELL_VERSION": "13.19.0", - "GITLAB_WORKHORSE_VERSION": "14.0.1" + "GITLAB_WORKHORSE_VERSION": "14.0.2" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 4928fae80d9..5aff7a34365 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -21,14 +21,14 @@ let }; }; in buildGoModule rec { - version = "14.0.1"; + version = "14.0.2"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-x9QTuEPLtiPJqk1UVwrlYvULIQ93TERSfslO2LB55cY="; + sha256 = "sha256-0mLGtvRHgMN3TtH/g4XLDubwZvtB0xr2U30fufj//KY="; }; vendorSha256 = "sha256-U962bMmXNnenCYkSdk0Uy7Bz+b9JGU5rJHfblZoyC/I="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index e9058778cee..94c14a739d3 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.0.1"; + version = "14.0.2"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index c7ae514f637..03b275e11d2 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -157,7 +157,7 @@ gem 'github-markup', '~> 1.7.0', require: 'github/markup' gem 'commonmarker', '~> 0.21' gem 'kramdown', '~> 2.3.1' gem 'RedCloth', '~> 4.3.2' -gem 'rdoc', '~> 6.1.2' +gem 'gitlab-rdoc', '~> 6.3.2', require: 'rdoc' # We need this fork until rdoc releases a new version. See https://gitlab.com/gitlab-org/gitlab/-/issues/334695 gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' @@ -168,7 +168,7 @@ gem 'asciidoctor-kroki', '~> 0.4.0', require: false gem 'rouge', '~> 3.26.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' -gem 'nokogiri', '~> 1.11.1' +gem 'nokogiri', '~> 1.11.4' gem 'escape_utils', '~> 1.1' # Calendar rendering diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index bbdd48e437e..55839138c3a 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -493,6 +493,7 @@ GEM openid_connect (~> 1.2) gitlab-pg_query (2.0.4) google-protobuf (>= 3.17.1) + gitlab-rdoc (6.3.2) gitlab-sidekiq-fetcher (0.5.6) sidekiq (~> 5) gitlab-styles (6.2.0) @@ -792,7 +793,7 @@ GEM netrc (0.11.0) nio4r (2.5.4) no_proxy_fix (0.1.2) - nokogiri (1.11.3) + nokogiri (1.11.4) mini_portile2 (~> 2.5.0) racc (~> 1.4) nokogumbo (2.0.2) @@ -1017,7 +1018,6 @@ GEM msgpack (>= 0.4.3) optimist (>= 3.0.0) rchardet (1.8.0) - rdoc (6.1.2) re2 (1.2.0) recaptcha (4.13.1) json @@ -1490,6 +1490,7 @@ DEPENDENCIES gitlab-net-dns (~> 0.9.1) gitlab-omniauth-openid-connect (~> 0.4.0) gitlab-pg_query (~> 2.0.4) + gitlab-rdoc (~> 6.3.2) gitlab-sidekiq-fetcher (= 0.5.6) gitlab-styles (~> 6.2.0) gitlab_chronic_duration (~> 0.10.6.2) @@ -1549,7 +1550,7 @@ DEPENDENCIES net-ldap (~> 0.16.3) net-ntp net-ssh (~> 6.0) - nokogiri (~> 1.11.1) + nokogiri (~> 1.11.4) oauth2 (~> 1.4) octokit (~> 4.15) ohai (~> 16.10) @@ -1597,7 +1598,6 @@ DEPENDENCIES rainbow (~> 3.0) rblineprof (~> 0.3.6) rbtrace (~> 0.4) - rdoc (~> 6.1.2) re2 (~> 1.2.0) recaptcha (~> 4.11) redis (~> 4.0) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 4814a6f2a1f..215f1467fed 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -2095,6 +2095,16 @@ }; version = "2.0.4"; }; + gitlab-rdoc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04vdirkdj42as3rgj6qlgz5ly5vg45i9k184bmf5z556i3b1fyf9"; + type = "gem"; + }; + version = "6.3.2"; + }; gitlab-sidekiq-fetcher = { dependencies = ["sidekiq"]; groups = ["default"]; @@ -3396,10 +3406,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19d78mdg2lbz9jb4ph6nk783c9jbsdm8rnllwhga6pd53xffp6x0"; + sha256 = "05rfzi8wksps5pgaavq1n1vkngsrjhqz8rcd1qdb52hnpg9q9p9b"; type = "gem"; }; - version = "1.11.3"; + version = "1.11.4"; }; nokogumbo = { dependencies = ["nokogiri"]; @@ -4306,16 +4316,6 @@ }; version = "1.8.0"; }; - rdoc = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0zh39dpsqlhhi4aba1sbrk504d88p38djk8cansjq0fwndq7w4zb"; - type = "gem"; - }; - version = "6.1.2"; - }; re2 = { groups = ["default"]; platforms = []; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index df58b2162fc..3394d44a4be 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,95 +1,158 @@ -{ lib, stdenv, fetchurl, fetchpatch, python3Packages, makeWrapper, gettext +{ lib, stdenv, fetchurl, fetchpatch, python3Packages, makeWrapper, gettext, installShellFiles , re2Support ? true , rustSupport ? stdenv.hostPlatform.isLinux, rustPlatform -, guiSupport ? false, tk ? null +, fullBuild ? false +, gitSupport ? fullBuild +, guiSupport ? fullBuild, tk +, highlightSupport ? fullBuild , ApplicationServices }: let - inherit (python3Packages) docutils python fb-re2; + inherit (python3Packages) docutils python fb-re2 pygit2 pygments; -in python3Packages.buildPythonApplication rec { - pname = "mercurial"; - version = "5.8"; + self = python3Packages.buildPythonApplication rec { + pname = "mercurial"; + version = "5.8"; - src = fetchurl { - url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "17rhlmmkqz5ll3k68jfzpcifg3nndbcbc2nx7kw8xn3qcj7nlpgw"; - }; + src = fetchurl { + url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; + sha256 = "17rhlmmkqz5ll3k68jfzpcifg3nndbcbc2nx7kw8xn3qcj7nlpgw"; + }; + + patches = [ + # https://phab.mercurial-scm.org/D10638, needed for below patch to apply + (fetchpatch { + url = "https://www.mercurial-scm.org/repo/hg/raw-rev/c365850b611490a5fdb235eb1cea310a542c2f84"; + sha256 = "1gn3xvahbjdhbglffqpmj559w1bkqqsk70wqcanwv7nh972aqy9g"; + }) + # https://phab.mercurial-scm.org/D10639, fixes https://bz.mercurial-scm.org/show_bug.cgi?id=6514 + (fetchpatch { + url = "https://www.mercurial-scm.org/repo/hg/raw-rev/c8f62920f07a40af3403ba9aefa1dac8a97d53ea"; + sha256 = "1kw0xjg2c4jby0ncarjvpa5qafsyl1wzbk6jxls4hnxlxdl53nmn"; + }) + ]; + + format = "other"; + + passthru = { inherit python; }; # pass it so that the same version can be used in hg2git + + cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "1kc2giqvfwsdl5fb0qmz96ws1gdrs3skfdzvpiif2i8f7r4nqlhd"; + sourceRoot = "${pname}-${version}/rust"; + } else null; + cargoRoot = if rustSupport then "rust" else null; + + propagatedBuildInputs = lib.optional re2Support fb-re2 + ++ lib.optional gitSupport pygit2 + ++ lib.optional highlightSupport pygments; + nativeBuildInputs = [ makeWrapper gettext installShellFiles ] + ++ lib.optionals rustSupport (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + buildInputs = [ docutils ] + ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; - patches = [ - # https://phab.mercurial-scm.org/D10638, needed for below patch to apply - (fetchpatch { - url = "https://phab.mercurial-scm.org/file/data/l7p2r4zcctcr3pzlybv2/PHID-FILE-bwjzxlz6sbegk3s4irik/D10638.diff"; - sha256 = "0mfi324is02l7cnd3j0gbmg5rpyyqn3afg3f73flnfwmz5njqa5f"; - }) - # https://phab.mercurial-scm.org/D10639, fixes https://bz.mercurial-scm.org/show_bug.cgi?id=6514 - (fetchpatch { - url = "https://phab.mercurial-scm.org/file/data/v53nhburhtkhpccyecei/PHID-FILE-6v34oll6r2gkqo4ng5nt/D10639.diff"; - sha256 = "0h5ilrd2x1789fr6sf4k1mcvxdh0xdyr94yawdacw87v3x12c8cb"; - }) - ]; - - format = "other"; - - passthru = { inherit python; }; # pass it so that the same version can be used in hg2git - - cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - sha256 = "1kc2giqvfwsdl5fb0qmz96ws1gdrs3skfdzvpiif2i8f7r4nqlhd"; - sourceRoot = "${pname}-${version}/rust"; - } else null; - cargoRoot = if rustSupport then "rust" else null; - - propagatedBuildInputs = lib.optional re2Support fb-re2; - nativeBuildInputs = [ makeWrapper gettext ] - ++ lib.optionals rustSupport (with rustPlatform; [ - cargoSetupHook - rust.cargo - rust.rustc - ]); - buildInputs = [ docutils ] - ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; - - makeFlags = [ "PREFIX=$(out)" ] - ++ lib.optional rustSupport "PURE=--rust"; - - postInstall = (lib.optionalString guiSupport '' - mkdir -p $out/etc/mercurial - cp contrib/hgk $out/bin - cat >> $out/etc/mercurial/hgrc << EOF - [extensions] - hgk=$out/lib/${python.libPrefix}/site-packages/hgext/hgk.py - EOF - # setting HG so that hgk can be run itself as well (not only hg view) - WRAP_TK=" --set TK_LIBRARY ${tk}/lib/${tk.libPrefix} - --set HG $out/bin/hg - --prefix PATH : ${tk}/bin " - '') + '' - for i in $(cd $out/bin && ls); do - wrapProgram $out/bin/$i \ - $WRAP_TK - done - - # copy hgweb.cgi to allow use in apache - mkdir -p $out/share/cgi-bin - cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin - chmod u+x $out/share/cgi-bin/hgweb.cgi - - # install bash/zsh completions - install -v -m644 -D contrib/bash_completion $out/share/bash-completion/completions/_hg - install -v -m644 -D contrib/zsh_completion $out/share/zsh/site-functions/_hg - ''; - - meta = with lib; { - inherit version; - description = "A fast, lightweight SCM system for very large distributed projects"; - homepage = "https://www.mercurial-scm.org"; - downloadPage = "https://www.mercurial-scm.org/release/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ eelco lukegb ]; - updateWalker = true; - platforms = platforms.unix; + makeFlags = [ "PREFIX=$(out)" ] + ++ lib.optional rustSupport "PURE=--rust"; + + postInstall = (lib.optionalString guiSupport '' + mkdir -p $out/etc/mercurial + cp contrib/hgk $out/bin + cat >> $out/etc/mercurial/hgrc << EOF + [extensions] + hgk=$out/lib/${python.libPrefix}/site-packages/hgext/hgk.py + EOF + # setting HG so that hgk can be run itself as well (not only hg view) + WRAP_TK=" --set TK_LIBRARY ${tk}/lib/${tk.libPrefix} + --set HG $out/bin/hg + --prefix PATH : ${tk}/bin " + '') + '' + for i in $(cd $out/bin && ls); do + wrapProgram $out/bin/$i \ + $WRAP_TK + done + + # copy hgweb.cgi to allow use in apache + mkdir -p $out/share/cgi-bin + cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin + chmod u+x $out/share/cgi-bin/hgweb.cgi + + installShellCompletion --cmd hg \ + --bash contrib/bash_completion \ + --zsh contrib/zsh_completion + ''; + + passthru.tests = {}; + + meta = with lib; { + inherit version; + description = "A fast, lightweight SCM system for very large distributed projects"; + homepage = "https://www.mercurial-scm.org"; + downloadPage = "https://www.mercurial-scm.org/release/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ eelco lukegb ]; + updateWalker = true; + platforms = platforms.unix; + }; }; -} +in + self.overridePythonAttrs (origAttrs: { + passthru = origAttrs.passthru // rec { + # withExtensions takes a function which takes the python packages set and + # returns a list of extensions to install. + # + # for instance: mercurial.withExtension (pm: [ pm.hg-evolve ]) + withExtensions = f: let + python = self.python; + mercurialHighPrio = ps: (ps.toPythonModule self).overrideAttrs (oldAttrs: { + meta = oldAttrs.meta // { + priority = 50; + }; + }); + plugins = (f python.pkgs) ++ [ (mercurialHighPrio python.pkgs) ]; + env = python.withPackages (ps: plugins); + in stdenv.mkDerivation { + pname = "${self.pname}-with-extensions"; + + inherit (self) src version meta; + + buildInputs = self.buildInputs ++ self.propagatedBuildInputs; + nativeBuildInputs = self.nativeBuildInputs; + + phases = [ "installPhase" "installCheckPhase" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + + for bindir in ${lib.concatStringsSep " " (map (d: "${lib.getBin d}/bin") plugins)}; do + for bin in $bindir/*; do + ln -s ${env}/bin/$(basename $bin) $out/bin/ + done + done + + ln -s ${self}/share $out/share + + runHook postInstall + ''; + + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/hg help >/dev/null || exit 1 + + runHook postInstallCheck + ''; + }; + + tests = origAttrs.passthru.tests // { + withExtensions = withExtensions (pm: [ pm.hg-evolve ]); + }; + }; + }) diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index a51e8c199bc..d7aa8c8f068 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.48"; + version = "1.0.0-alpha.50"; src = fetchCrate { inherit version pname; - sha256 = "09sz5665nwj2jppx2695hbwdqr3ws6z6rg7mmc4ldb7hkp4yilig"; + sha256 = "1hinnpbk83470sdif11v1wy1269jm7cpl0ycj2m89cxwk5g54cxg"; }; - cargoSha256 = "1v5w5za7l3hy9anz136x0vgdmgg090f5sawzgrg5ylgxy2l9s2gn"; + cargoSha256 = "0bc116nyykq8ddy7lnhxibx6hphn344d0fs7fbl2paax9ahbh2g0"; cargoBuildFlags = lib.optional gitImportSupport "--features=git"; diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index a0fa9318a13..17cde4c8a54 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -1,25 +1,16 @@ { lib, fetchurl, python3Packages , mercurial, qt5 -}@args: +}: let tortoisehgSrc = fetchurl rec { meta.name = "tortoisehg-${meta.version}"; - meta.version = "5.6"; + meta.version = "5.8"; url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${meta.version}.tar.gz"; - sha256 = "031bafj88wggpvw0lgvl0djhlbhs9nls9vzwvni8yn0m0bgzc9gr"; + sha256 = "154q7kyrdk045wx7rsblzx41k3wbvp2f40kzkxmiiaa5n35srsm3"; }; - tortoiseMercurial = (mercurial.override { - rustSupport = false; - re2Support = lib.versionAtLeast tortoisehgSrc.meta.version "5.8"; - }).overridePythonAttrs (old: rec { - inherit (tortoisehgSrc.meta) version; - src = fetchurl { - url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "1hk2y30zzdnlv8f71kabvh0xi9c7qhp28ksh20vpd0r712sv79yz"; - }; - patches = []; - }); + # Extension point for when thg's mercurial is lagging behind mainline. + tortoiseMercurial = mercurial; in python3Packages.buildPythonApplication { inherit (tortoisehgSrc.meta) name version; @@ -49,7 +40,7 @@ in python3Packages.buildPythonApplication { meta = { description = "Qt based graphical tool for working with Mercurial"; homepage = "https://tortoisehg.bitbucket.io/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ danbst ]; }; diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index da18a8d7abe..9ab35b92a86 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -72,6 +72,6 @@ in mkDerivation { license = licenses.unfree; homepage = "http://makemkv.com"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ danieldk titanous ]; + maintainers = with maintainers; [ titanous ]; }; } diff --git a/pkgs/applications/video/pyca/default.nix b/pkgs/applications/video/pyca/default.nix index df42bbec156..d7e1e03733c 100644 --- a/pkgs/applications/video/pyca/default.nix +++ b/pkgs/applications/video/pyca/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, pycurl, dateutil, configobj, sqlalchemy, sdnotify, flask }: +{ lib, buildPythonApplication, fetchFromGitHub, pycurl, python-dateutil, configobj, sqlalchemy, sdnotify, flask }: buildPythonApplication rec { pname = "pyca"; @@ -13,7 +13,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pycurl - dateutil + python-dateutil configobj sqlalchemy sdnotify diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index ba7228f5b96..08b3a9834b6 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -39,7 +39,7 @@ python37Packages.buildPythonApplication rec { cairocffi-xcffib setuptools setuptools-scm - dateutil + python-dateutil dbus-python mpd2 psutil diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index acfbb1ad36b..8c1ae0b3592 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, scdoc +, meson, ninja, pkg-config, scdoc, wayland-scanner , wayland, wayland-protocols, systemd }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --replace "version: '1.5'" "version: '${version}'" ''; - nativeBuildInputs = [ meson ninja pkg-config scdoc ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ wayland wayland-protocols systemd ]; mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=enabled" ]; diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index 9b1523421ee..6dccedad827 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, scdoc +, meson, ninja, pkg-config, scdoc, wayland-scanner , wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --replace "version: '1.4'" "version: '${version}'" ''; - nativeBuildInputs = [ meson ninja pkg-config scdoc ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; mesonFlags = [ diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 9369e7d3158..ffe5d69ec90 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -117,7 +117,8 @@ rec { --tmpdir=$TMPDIR \ --override-os ${os} \ --override-arch ${arch} \ - copy "$sourceURL" "docker-archive://$out:$destNameTag" + copy "$sourceURL" "docker-archive://$out:$destNameTag" \ + | cat # pipe through cat to force-disable progress bar ''; # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash. diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 219f808403c..6f51ba512c1 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -116,7 +116,7 @@ rec { , checkPhase ? "" # syntax checks, e.g. for scripts }: runCommand name - { inherit text executable; + { inherit text executable checkPhase; passAsFile = [ "text" ]; # Pointless to do this on a remote machine. preferLocalBuild = true; @@ -132,7 +132,7 @@ rec { echo -n "$text" > "$n" fi - ${checkPhase} + eval "$checkPhase" (test -n "$executable" && chmod +x "$n") || true ''; diff --git a/pkgs/build-support/trivial-builders/test-overriding.nix b/pkgs/build-support/trivial-builders/test-overriding.nix new file mode 100644 index 00000000000..ddd5dc05075 --- /dev/null +++ b/pkgs/build-support/trivial-builders/test-overriding.nix @@ -0,0 +1,119 @@ +# Check that overriding works for trivial-builders like +# `writeShellScript` via `overrideAttrs`. This is useful +# to override the `checkPhase`, e. g. when you want +# to enable extglob in `writeShellScript`. +# +# Run using `nix-build -A tests.trivial-overriding`. +{ lib +, runtimeShell +, runCommand +, callPackage +, writeShellScript +, writeTextFile +, writeShellScriptBin +}: + +let + extglobScript = '' + shopt -s extglob + touch success + echo @(success|failure) + rm success + ''; + + # Reuse the old `checkPhase` of `writeShellScript`, but enable extglob. + allowExtglob = old: { + checkPhase = '' + # make sure we don't change the settings for + # the rest of the derivation's build + ( + export BASHOPTS + shopt -s extglob + ${old.checkPhase} + ) + ''; + }; + + # Run old checkPhase, but only succeed if it fails. + # This HACK is required because we can't introspect build failures + # in nix: With `assertFail` we want to make sure that the default + # `checkPhase` would fail if extglob was used in the script. + assertFail = old: { + # write old checkPhase into a shell script, so we can check for + # the phase to fail even though we have `set -e`. + checkPhase = '' + if source ${writeShellScript "old-check-phase" old.checkPhase} 2>/dev/null; then + exit 1 + fi + ''; + }; + + simpleCase = case: + writeShellScript "test-trivial-overriding-${case}" extglobScript; + + callPackageCase = case: callPackage ( + { writeShellScript }: + writeShellScript "test-trivial-callpackage-overriding-${case}" extglobScript + ) { }; + + binCase = case: + writeShellScriptBin "test-trivial-overriding-bin-${case}" extglobScript; + + # building this derivation would fail without overriding + textFileCase = writeTextFile { + name = "test-trivial-overriding-text-file"; + checkPhase = "false"; + text = '' + #!${runtimeShell} + echo success + ''; + executable = true; + }; + + mkCase = f: type: isBin: + let + drv = (f type).overrideAttrs + (if type == "succ" then allowExtglob else assertFail); + in if isBin then "${drv}/bin/${drv.name}" else drv; + + writeTextOverrides = { + # Enabling globbing in checkPhase + simpleSucc = mkCase simpleCase "succ" false; + # Ensure it's possible to fail; in this case globbing is not enabled. + simpleFail = mkCase simpleCase "fail" false; + # Do the same checks after wrapping with callPackage + # to make sure callPackage doesn't mess with the override + callpSucc = mkCase callPackageCase "succ" false; + callpFail = mkCase callPackageCase "fail" false; + # Do the same check using `writeShellScriptBin` + binSucc = mkCase binCase "succ" true; + binFail = mkCase binCase "fail" true; + # Check that we can also override plain writeTextFile + textFileSuccess = textFileCase.overrideAttrs (_: { + checkPhase = "true"; + }); + }; + + # `runTest` forces nix to build the script of our test case and + # run its `checkPhase` which is our main interest. Additionally + # it executes the script and thus makes sure that extglob also + # works at run time. + runTest = script: + let + name = script.name or (builtins.baseNameOf script); + in writeShellScript "run-${name}" '' + if [ "$(${script})" != "success" ]; then + echo "Failed in ${script}" + exit 1 + fi + ''; +in + +runCommand "test-writeShellScript-overriding" { + passthru = { inherit writeTextOverrides; }; +} '' + ${lib.concatMapStrings (test: '' + ${runTest test} + '') (lib.attrValues writeTextOverrides)} + touch "$out" +'' diff --git a/pkgs/data/fonts/charis-sil/default.nix b/pkgs/data/fonts/charis-sil/default.nix index 44b40c72b58..6639cb57d8b 100644 --- a/pkgs/data/fonts/charis-sil/default.nix +++ b/pkgs/data/fonts/charis-sil/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "5.000"; + version = "6.000"; in fetchzip rec { name = "charis-sil-${version}"; @@ -14,7 +14,7 @@ in unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - sha256 = "1a220s8n0flvcdkazqf5g10v6r55s2an308slvvarynpj6l7x27n"; + sha256 = "sha256-eMmC893rI42qzZVCI17i9XSAbQzXCK2fHVe5Pf1/VnM="; meta = with lib; { homepage = "https://software.sil.org/charis"; diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix index 9d0daf7182d..ac8839f075b 100644 --- a/pkgs/data/fonts/gentium/default.nix +++ b/pkgs/data/fonts/gentium/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "6.000"; + version = "6.001"; in fetchzip rec { name = "gentium-${version}"; @@ -23,7 +23,7 @@ in fetchzip rec { -d $out/share/doc/${name}/documentation ''; - sha256 = "zhSpAYK3Lfzsx6Z1IA6aRFNNXdDGq/jWxsQ20c2HcxI="; + sha256 = "sha256-DeoMTJ2nhTBtNQYG55lIMvnulqpk/KTeIqgpb5eiTIA="; meta = with lib; { homepage = "https://software.sil.org/gentium/"; diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index 9fce696b6e8..5bc691e7244 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -1,12 +1,12 @@ { lib, fetchurl, libarchive }: let - version = "0.12.11"; + version = "0.32.9"; in fetchurl { name = "sarasa-gothic-${version}"; url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; - sha256 = "0vcp8583by7pfqinq8p2jx2bn4dqq816x4bxgv05k0kb9ziwj7aj"; + sha256 = "0mwaj9dq26f36ddywjm7m0is1jml2kpmqm46b16c8avvr97c65z5"; recursiveHash = true; downloadToTemp = true; diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index 322dcfd68c9..bc8396a7a21 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip }: let - version = "0.55.1"; + version = "0.55.2"; in fetchzip { name = "sudo-font-${version}"; url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - sha256 = "17vmcdz73mvy5m5zblgm2fi98v520hsl4lglww8gkhzl5zc6wb9y"; + sha256 = "0r7w58r80yblyzlh6qb57pmafxb3frg1iny644bfr3p64j4cbzzb"; postFetch = '' mkdir -p $out/share/fonts/ diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix index f9d25a0128e..1a65798891f 100644 --- a/pkgs/data/fonts/terminus-font-ttf/default.nix +++ b/pkgs/data/fonts/terminus-font-ttf/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "4.47.0"; + version = "4.49.1"; in fetchzip { name = "terminus-font-ttf-${version}"; @@ -18,7 +18,7 @@ in fetchzip { install -Dm 644 COPYING "$out/share/doc/terminus-font-ttf/COPYING" ''; - sha256 = "1mnx3vlnl0r15yzsa4zb9qqab4hpi603gdwhlbw960wg03i3xn8z"; + sha256 = "sha256-UaTnCamIRN/3xZsYt5nYzvykXQ3ri94a047sWOJ2RfU="; meta = with lib; { description = "A clean fixed width TTF font"; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index e7543aff666..adc2c5fb197 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20210601"; + version = "20210701"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-AX51udzIv/DO0n8ba2Gm6Leikep6x4tgUuRUdPX/Cds="; + sha256 = "sha256-eqSZBcypwnNX92SGG17MWlnsVzk0jOTdjtEaWMbQsMs="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/misc/fedora-backgrounds/generic.nix b/pkgs/data/misc/fedora-backgrounds/generic.nix index 3e2e0928c3b..5ebc6ff367e 100644 --- a/pkgs/data/misc/fedora-backgrounds/generic.nix +++ b/pkgs/data/misc/fedora-backgrounds/generic.nix @@ -38,6 +38,6 @@ stdenvNoCC.mkDerivation { description = "A set of default and supplemental wallpapers for Fedora"; license = licenses.cc-by-sa-40; platforms = platforms.unix; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/data/misc/rime-data/default.nix b/pkgs/data/misc/rime-data/default.nix new file mode 100644 index 00000000000..371a07d3ec1 --- /dev/null +++ b/pkgs/data/misc/rime-data/default.nix @@ -0,0 +1,66 @@ +{ lib, stdenv, fetchFromGitHub, librime }: + +stdenv.mkDerivation { + pname = "rime-data"; + version = "0.38.20210628"; + + src = fetchFromGitHub { + owner = "rime"; + repo = "plum"; + rev = "0b835e347cad9c2d7038cfe82df5b5d1fe1c0327"; + sha256 = "0mja4wyazxdc6fr7pzij5ah4rzwxv4s12s64vfn5ikx1ias1f8ib"; + }; + + buildInputs = [ librime ]; + + buildFlags = [ "all" ]; + makeFlags = [ "PREFIX=$(out)" ]; + + preBuild = import ./fetchSchema.nix fetchFromGitHub; + + postPatch = '' + # Disable git operations. + sed -i /fetch_or_update_package$/d scripts/install-packages.sh + ''; + + meta = with lib; { + description = "Schema data of Rime Input Method Engine"; + longDescription = '' + Rime-data provides schema data for Rime Input Method Engine. + ''; + homepage = "https://rime.im"; + license = with licenses; [ + # rime-array + # rime-combo-pinyin + # rime-double-pinyin + # rime-middle-chinese + # rime-scj + # rime-soutzoe + # rime-stenotype + # rime-wugniu + gpl3Only + + # plum + # rime-bopomofo + # rime-cangjie + # rime-emoji + # rime-essay + # rime-ipa + # rime-jyutping + # rime-luna-pinyin + # rime-prelude + # rime-quick + # rime-stroke + # rime-terra-pinyin + # rime-wubi + lgpl3Only + + # rime-pinyin-simp + asl20 + + # rime-cantonese + cc-by-40 + ]; + maintainers = [ maintainers.pengmeiyu ]; + }; +} diff --git a/pkgs/data/misc/rime-data/fetchSchema.nix b/pkgs/data/misc/rime-data/fetchSchema.nix new file mode 100644 index 00000000000..7bf7d8477c5 --- /dev/null +++ b/pkgs/data/misc/rime-data/fetchSchema.nix @@ -0,0 +1,137 @@ +# Generated using generateFetchSchema.sh +fetchFromGitHub: +'' +mkdir -p package/rime +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-array"; + rev = "8514193da939bc8888ad6a744f5e5921d4baebc7"; + sha256 = "1fy7pcq7d8m0wzkkhklmv6p370ms9lqc1zpndyy2xjamzrbb9l83"; +}} package/rime/array +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-bopomofo"; + rev = "c7618f4f5728e1634417e9d02ea50d82b71956ab"; + sha256 = "0g77nv0jrwqnbqqna0ib0kqcy6l5zl62kh49ny67d6bjwnwz9186"; +}} package/rime/bopomofo +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-cangjie"; + rev = "8dfad9e537f18821b71ba28773315d9c670ae245"; + sha256 = "029kw9nx6x0acg4f0m8wj1ziqffffhy9yyj51nlx17cnia0qcrby"; +}} package/rime/cangjie +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-cantonese"; + rev = "b6f800c74eb639816d56d0d5601aaa96c8963178"; + sha256 = "1a4ksacbz8l30y3y5c017d0hzwik8knplglb3yswy7l4hsvaanyh"; +}} package/rime/cantonese +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-combo-pinyin"; + rev = "a84065a86b272c76215215bd6f03c506b6e7097c"; + sha256 = "1f0b4kakw0x26gmx7xi4f94nbjlb8lvi9bks4f92jswa045vnd87"; +}} package/rime/combo-pinyin +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-double-pinyin"; + rev = "69bf85d4dfe8bac139c36abbd68d530b8b6622ea"; + sha256 = "093wif5avvvw45fqbwj5wkbxrychy4pagl4mwsmbrayc8jkp69ak"; +}} package/rime/double-pinyin +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-emoji"; + rev = "4c8c51f4a3bc7298c99376eda9bbd86070fc4fa1"; + sha256 = "0175jqh210fncafqckr9zzaw55qpswmqjrykwms1apmc68l43122"; +}} package/rime/emoji +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-essay"; + rev = "9db2e77305e75798baf3ec8dcf1f82785b5e1be9"; + sha256 = "03ypkkaadd5qmyg26n24a66cll90xvcimgbmiyv4d33jradiqg22"; +}} package/rime/essay +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-ipa"; + rev = "22b71710e029bcb412e9197192a638ab11bc2abf"; + sha256 = "0zdk4f9qkfj3q5hmjnairj1lv6f6y27mic12k886n6sxywwbwr2k"; +}} package/rime/ipa +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-jyutping"; + rev = "1e24baa6998815c716c581effe8ec65ee87c4e8c"; + sha256 = "0s2rckpwlrm3n7w1csnqyi5p9mkpp3z87s7mrm2vc9sv06rpv7zl"; +}} package/rime/jyutping +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-luna-pinyin"; + rev = "623adb022b094d540218b287c2e601509eee3347"; + sha256 = "06pcwp09l5wkqv7792gbsl31xnlb3gr9q6bgbp94vvq6m2ycahqz"; +}} package/rime/luna-pinyin +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-middle-chinese"; + rev = "9fad7a7c0c26167d5e6e85db8df48a15c7f7d4f0"; + sha256 = "0a0bqrlzg0k692xblqnh1rh1fwwqqb205xwxlihgji85n8ibcgph"; +}} package/rime/middle-chinese +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-pinyin-simp"; + rev = "b0e84cda02c613ebdedc127a26131b3800f45a8e"; + sha256 = "05v804qr3a9xvjzp9yid7231fi2l2yrl47ybbvql61z9k36ab094"; +}} package/rime/pinyin-simp +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-prelude"; + rev = "3de303ffaa731dba07b0462ce59f4767e1219ad2"; + sha256 = "0g7a0bla58rh1v3md59k6adk185pilb4z8i2i0pqdl4nwqp40n2p"; +}} package/rime/prelude +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-quick"; + rev = "3fe5911ba608cb2df1b6301b76ad1573bd482a76"; + sha256 = "08bh87ym5qvw55lyw20l3m7jd4c2z5rvil8h5q8790r7z6j6ijy9"; +}} package/rime/quick +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-scj"; + rev = "cab5a0858765eff0553dd685a2d61d5536e9149c"; + sha256 = "0ard2bjp4896a8dimmcwyjwgmp9kl4rz92yc92jnd3y4rgwl6fvk"; +}} package/rime/scj +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-soutzoe"; + rev = "beeaeca72d8e17dfd1e9af58680439e9012987dc"; + sha256 = "0jyqx0q9s0qxn168l5n8zav8jcl2g5ppr7pa8jm1vwrllf20slcc"; +}} package/rime/soutzoe +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-stenotype"; + rev = "f3e9189d5ce33c55d3936cc58e39d0c88b3f0c88"; + sha256 = "0dl6px7lrh3xa87knjzwzdcwjj1k1dg4l72q7lb48an4s9f1cy5d"; +}} package/rime/stenotype +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-stroke"; + rev = "ea8576d1accd6fda339e96b415caadb56e2a07d1"; + sha256 = "07h6nq9867hjrd2v3h1pnr940sdrw4mqrzj43siz1rzjxz3s904r"; +}} package/rime/stroke +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-terra-pinyin"; + rev = "ce7b9249612f575d2f43d51fcacd31d1b4e0ef1b"; + sha256 = "0vm303f4lrdmdmif5klrp6w29vn9z2vzw33cw0y83pcnz39wiads"; +}} package/rime/terra-pinyin +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-wubi"; + rev = "f1876f08f1d4a9696395be0070c0e8e4353c44cb"; + sha256 = "1d9y9rqssacria9d0hla96czsqv2wkfm6z926m1x269ryv96zxvk"; +}} package/rime/wubi +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-wugniu"; + rev = "abd1ee98efbf170258fcf43875c21a4259e00b61"; + sha256 = "0qn54d3cclny106ixdw08r5n6wn52ffs1hgrma3k0j4pv0kr9nlq"; +}} package/rime/wugniu +'' diff --git a/pkgs/data/misc/rime-data/generateFetchSchema.sh b/pkgs/data/misc/rime-data/generateFetchSchema.sh new file mode 100755 index 00000000000..e7c05c41028 --- /dev/null +++ b/pkgs/data/misc/rime-data/generateFetchSchema.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-prefetch-git -p jq + +imlist=( + array + bopomofo + cangjie + cantonese + combo-pinyin + double-pinyin + emoji + essay + ipa + jyutping + luna-pinyin + middle-chinese + pinyin-simp + prelude + quick + scj + soutzoe + stenotype + stroke + terra-pinyin + wubi + wugniu +) + +echo "# Generated using generateFetchSchema.sh" +echo "fetchFromGitHub:" +echo \'\' +echo "mkdir -p package/rime" +for im in ${imlist[@]}; do + tempFile=$(mktemp) + echo "ln -sv \${fetchFromGitHub {" + echo " owner = \"rime\";" + echo " repo = \"rime-$im\";" + nix-prefetch-git --quiet https://github.com/rime/rime-$im \ + | jq '{ rev: .rev, sha256: .sha256 }' \ + | jq -r 'to_entries | map(" \(.key) = \"\(.value)\";") | .[]' + echo "}} package/rime/$im" +done +echo \'\' diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix index 16d4e1400e3..511cb6a1c09 100644 --- a/pkgs/desktops/cinnamon/bulky/default.nix +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "bulky"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = "bulky"; rev = version; - sha256 = "sha256-cO6AhQ0g1N43du74fljfI1M68jb9N04FKUyzjbzC3K0="; + sha256 = "sha256-+3OoeuGuyiHWlUrxm5A7CmNR+ijxdlmecmvqk+i+h08="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 41d2fac5e61..c1bd10ce2ea 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -66,13 +66,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "40.1"; + version = "40.2"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-9j4r7Zm9iVjPMT2F9EoBjVn4UqBbqfKap8t0S+xvprc="; + sha256 = "sha256-Tp2CmwOfoK3TO7ZYP8e04Cjtjc/3r4pXfgnMZpiMKBw="; }; patches = [ diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index b529a65026d..ae2255acb91 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -339,8 +339,6 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) gnome-user-docs; # added 2019-11-20 - inherit (pkgs) gegl_0_4; # added 2019-10-31 - inherit (pkgs) gjs; # added 2019-01-05 inherit (pkgs) yelp-tools; # added 2019-11-20 diff --git a/pkgs/development/beam-modules/rebar3-nix/default.nix b/pkgs/development/beam-modules/rebar3-nix/default.nix index ff248700d78..50bd2965835 100644 --- a/pkgs/development/beam-modules/rebar3-nix/default.nix +++ b/pkgs/development/beam-modules/rebar3-nix/default.nix @@ -1,12 +1,12 @@ { lib, buildRebar3, fetchFromGitHub }: buildRebar3 rec { name = "rebar3_nix"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "erlang-nix"; repo = name; rev = "v${version}"; - sha256 = "17w8m4aqqgvhpx3xyc7x2qzsrd3ybzc83ay50zs1gyd1b8csh2wf"; + sha256 = "10ijc06qvv5hqv0qy3w7mbv9pshdb8bvy0f3phr1vd5hksbk731y"; }; meta = { diff --git a/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/pkgs/development/compilers/adoptopenjdk-bin/sources.json index 22a893c7242..b4a8ff4892e 100644 --- a/pkgs/development/compilers/adoptopenjdk-bin/sources.json +++ b/pkgs/development/compilers/adoptopenjdk-bin/sources.json @@ -5,45 +5,45 @@ "hotspot": { "aarch64": { "build": "9", - "sha256": "420c5d1e5dc66b2ed7dedd30a7bdf94bfaed10d5e1b07dc579722bf60a8114a9", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.10_9.tar.gz", - "version": "11.0.10" + "sha256": "4966b0df9406b7041e14316e04c9579806832fafa02c5d3bd1842163b7f2353a", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz", + "version": "11.0.11" }, "armv6l": { "build": "9", - "sha256": "34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz", - "version": "11.0.10" + "sha256": "2d7aba0b9ea287145ad437d4b3035fc84f7508e78c6fec99be4ff59fe1b6fc0d", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz", + "version": "11.0.11" }, "armv7l": { "build": "9", - "sha256": "34908da9c200f5ef71b8766398b79fd166f8be44d87f97510667698b456c8d44", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.10_9.tar.gz", - "version": "11.0.10" + "sha256": "2d7aba0b9ea287145ad437d4b3035fc84f7508e78c6fec99be4ff59fe1b6fc0d", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_arm_linux_hotspot_11.0.11_9.tar.gz", + "version": "11.0.11" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "ae78aa45f84642545c01e8ef786dfd700d2226f8b12881c844d6a1f71789cb99", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.10_9.tar.gz", - "version": "11.0.10" + "sha256": "e99b98f851541202ab64401594901e583b764e368814320eba442095251e78cb", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz", + "version": "11.0.11" } }, "openj9": { "aarch64": { "build": "9", - "sha256": "0ce9a8c38d154540610dfe03e59389734deb91c5cb9258408404c5026d4afa41", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz", - "version": "11.0.10-ea" + "sha256": "31242e10bb826679aae3ed303be17ad3ef3c2551afbbd19f031ada87dd73258f", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz", + "version": "11.0.11-ea" }, "packageType": "jdk", "vmType": "openj9", "x86_64": { "build": "9", - "sha256": "941d5df125d2ad426391340f539408b13d61d00ed31dd79142ff1ac84864a79f", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz", - "version": "11.0.10" + "sha256": "a605ab06f76533d44ce0828bd96836cc9c0e71ec3df3f8672052ea98dcbcca22", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz", + "version": "11.0.11" } } }, @@ -51,45 +51,45 @@ "hotspot": { "aarch64": { "build": "9", - "sha256": "5f9a894bd694f598f2befa4a605169685ac8bcb8ec68d25e587e8db4d2307b74", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.10_9.tar.gz", - "version": "11.0.10" + "sha256": "fde6b29df23b6e7ed6e16a237a0f44273fb9e267fdfbd0b3de5add98e55649f6", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.11_9.tar.gz", + "version": "11.0.11" }, "armv6l": { "build": "9", - "sha256": "2f2da2149c089c84f00b0eda63c31b77c8b51a1c080e18a70ecb5a78ba40d8c6", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.10_9.tar.gz", - "version": "11.0.10" + "sha256": "ad02656f800fd64c2b090b23ad24a099d9cd1054948ecb0e9851bc39c51c8be8", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.11_9.tar.gz", + "version": "11.0.11" }, "armv7l": { "build": "9", - "sha256": "2f2da2149c089c84f00b0eda63c31b77c8b51a1c080e18a70ecb5a78ba40d8c6", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.10_9.tar.gz", - "version": "11.0.10" + "sha256": "ad02656f800fd64c2b090b23ad24a099d9cd1054948ecb0e9851bc39c51c8be8", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_arm_linux_hotspot_11.0.11_9.tar.gz", + "version": "11.0.11" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "25fdcf9427095ac27c8bdfc82096ad2e615693a3f6ea06c700fca7ffb271131a", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.10_9.tar.gz", - "version": "11.0.10" + "sha256": "144f2c6bcf64faa32016f2474b6c01031be75d25325e9c3097aed6589bc5d548", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_linux_hotspot_11.0.11_9.tar.gz", + "version": "11.0.11" } }, "openj9": { "aarch64": { "build": "9", - "sha256": "c48d2b19bf7040c74dfdcac9e395ba7b8f937522ee756c820465f2e8e3dffec2", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz", - "version": "11.0.10-ea" + "sha256": "434219d233bdb8f1bee024b1ca5accfc3f1f832320b5221ded715eed101e705f", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz", + "version": "11.0.11-ea" }, "packageType": "jre", "vmType": "openj9", "x86_64": { "build": "9", - "sha256": "7e5f97071f8b86c22c36ddfd7f821c3e8ec531c1128e2e6c931b2e64118a517a", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_linux_openj9_11.0.10_9_openj9-0.24.0.tar.gz", - "version": "11.0.10" + "sha256": "152bf992d965ed018e9e1c3c2eb2c1771f92e0b6485b9a1f2c6d84d282117715", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz", + "version": "11.0.11" } } } @@ -101,9 +101,9 @@ "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "ee7c98c9d79689aca6e717965747b8bf4eec5413e89d5444cc2bd6dbd59e3811", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.10_9.tar.gz", - "version": "11.0.10" + "sha256": "d851a220e77473a4b483d8bd6b6570e04fd83fdd48d6584b58b041f5997186c2", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_mac_hotspot_11.0.11_9.tar.gz", + "version": "11.0.11" } }, "openj9": { @@ -111,9 +111,9 @@ "vmType": "openj9", "x86_64": { "build": "9", - "sha256": "58f931dc30160b04da2d94af32e0dfa384f4b2cf92b7217c0937fd057e668d54", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.10_9_openj9-0.24.0.tar.gz", - "version": "11.0.10" + "sha256": "797cee6b9f6e18bcc026ee9dcebbce81d62ca897038402d247630b25d41efe15", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.11_9_openj9-0.26.0.tar.gz", + "version": "11.0.11" } } }, @@ -123,9 +123,9 @@ "vmType": "hotspot", "x86_64": { "build": "9", - "sha256": "215e94323d7c74fe31e5383261e3bfc8e9ca3dc03212738c48d29868b02fe875", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.10_9.tar.gz", - "version": "11.0.10" + "sha256": "ccb38c0b73bd0ba7006d00234a51eee9504ec8108c835e1f1763191806374707", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jre_x64_mac_hotspot_11.0.11_9.tar.gz", + "version": "11.0.11" } }, "openj9": { @@ -133,9 +133,9 @@ "vmType": "openj9", "x86_64": { "build": "9", - "sha256": "6e353f0b38a7192ad3e0522009065c7c24356e0d9329899477b21e39d2a7a8da", - "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.10%2B9_openj9-0.24.0/OpenJDK11U-jre_x64_mac_openj9_11.0.10_9_openj9-0.24.0.tar.gz", - "version": "11.0.10" + "sha256": "80a0c03f0b603d6008e29c651f884878743fcaa90fc05aef15f3411749da94e7", + "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_x64_mac_openj9_11.0.11_9_openj9-0.26.0.tar.gz", + "version": "11.0.11" } } } @@ -536,92 +536,92 @@ "jdk": { "hotspot": { "aarch64": { - "build": "36", - "sha256": "7217a9f9be3b0c8dfc78538f95fd2deb493eb651152d975062920566492b2574", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_aarch64_linux_hotspot_16_36.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "3447ec27a6dbd4f3a6180a0d4371bb09aa428c16eea9983e515a7400cc9f5c85", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.1_9.tar.gz", + "version": "16.0.1" }, "armv6l": { - "build": "36", - "sha256": "f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "20fc395d8ea2659e6407cd4ec233dc4399f61b7610f3a16495deb23c1e3b81df", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_arm_linux_hotspot_16.0.1_9.tar.gz", + "version": "16.0.1" }, "armv7l": { - "build": "36", - "sha256": "f1d32ba01a40c98889f31368c0e987d6bbda65a7c50b8c088623b48e3a90104a", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_arm_linux_hotspot_16_36.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "20fc395d8ea2659e6407cd4ec233dc4399f61b7610f3a16495deb23c1e3b81df", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_arm_linux_hotspot_16.0.1_9.tar.gz", + "version": "16.0.1" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "36", - "sha256": "2e031cf37018161c9e59b45fa4b98ff2ce4ce9297b824c512989d579a70f8422", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_linux_hotspot_16_36.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "7fdda042207efcedd30cd76d6295ed56b9c2e248cb3682c50898a560d4aa1c6f", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz", + "version": "16.0.1" } }, "openj9": { "aarch64": { - "build": "36", - "sha256": "f4d4e0c0e9e0a4d0f14172878cee5e1a0ae73170058e1c183a452f8d97331ac0", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_aarch64_linux_openj9_16_36_openj9-0.25.0.tar.gz", - "version": "16.0.0-ea" + "build": "9", + "sha256": "abc56cd266b4acc96cc700b166ad016907dac97d7a593bd5c369d54efc4b4acd", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_aarch64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz", + "version": "16.0.1-ea" }, "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "36", - "sha256": "9f9b327d08cbc71b32f28004ae9d9c2c84ff9bc335cac3068c5a5737bfa4606f", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "7395aaa479a7410bbe5bd5efc43d2669718c61ba146b06657315dbd467b98bf1", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz", + "version": "16.0.1" } } }, "jre": { "hotspot": { "aarch64": { - "build": "36", - "sha256": "947b02342513b085946b2e7c376cc1f1cfe89600bc3d30455160f88d41da3509", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_aarch64_linux_hotspot_16_36.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "4e47f1cbf46190727be74cd73445ec2b693f5ba4a74542c554d6b3285811cab5", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_aarch64_linux_hotspot_16.0.1_9.tar.gz", + "version": "16.0.1" }, "armv6l": { - "build": "36", - "sha256": "4d3f351a161792779417ee2730413a976258c4cc5f323526f1fbc0cca82aca6e", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_arm_linux_hotspot_16_36.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "c1f88f3ce955cb2e9a4236a916cc6660ef55231d29c4390b1a4398ebbca358b7", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_arm_linux_hotspot_16.0.1_9.tar.gz", + "version": "16.0.1" }, "armv7l": { - "build": "36", - "sha256": "4d3f351a161792779417ee2730413a976258c4cc5f323526f1fbc0cca82aca6e", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_arm_linux_hotspot_16_36.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "c1f88f3ce955cb2e9a4236a916cc6660ef55231d29c4390b1a4398ebbca358b7", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_arm_linux_hotspot_16.0.1_9.tar.gz", + "version": "16.0.1" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "36", - "sha256": "4aa99cbe5a6838c3ed29fa7aa7bee95c39ddd41e3f7544178dcd257b15a9359e", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_linux_hotspot_16_36.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "5eca19d406c6d130e9c3a4b932b9cb0a6e9cd45932450668c3e911bded4bcf40", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_linux_hotspot_16.0.1_9.tar.gz", + "version": "16.0.1" } }, "openj9": { "aarch64": { - "build": "36", - "sha256": "13ae42f5040d4e5d97b8809e27ebfdf8f7326604771963d85b2c1385abe13742", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_aarch64_linux_openj9_16_36_openj9-0.25.0.tar.gz", - "version": "16.0.0-ea" + "build": "9", + "sha256": "01d8337d1069b8bfdcdf096b30cc24d1df42ffeede676da99fed77bef2670454", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_aarch64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz", + "version": "16.0.1-ea" }, "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "36", - "sha256": "302b8b9bba4f51d0a9ac087ed91929dbd3ae52cf5a5b6c150373563012db60d9", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_linux_openj9_16_36_openj9-0.25.0.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "fab572dd1a2ef00fd18ad4f5a4c373d0cf140045e61f9104cd5b8dbf6b3a517d", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz", + "version": "16.0.1" } } } @@ -632,20 +632,20 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "36", - "sha256": "b66761b55fd493ed2a5f4df35a32b338ec34a9e0a1244439e3156561ab27c511", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jdk_x64_mac_hotspot_16_36.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "3be78eb2b0bf0a6edef2a8f543958d6e249a70c71e4d7347f9edb831135a16b8", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_mac_hotspot_16.0.1_9.tar.gz", + "version": "16.0.1" } }, "openj9": { "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "36", - "sha256": "e6075cbe939b4de165cc8b4b91352f8885d549873f5cd419e75eba737502542e", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jdk_x64_mac_openj9_16_36_openj9-0.25.0.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "6d4241c6ede2167fb71bd57f7a770a74564ee007c06bcae98e1abc3c1de4756f", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_mac_openj9_16.0.1_9_openj9-0.26.0.tar.gz", + "version": "16.0.1" } } }, @@ -654,20 +654,20 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "36", - "sha256": "92cb07e9e9d075996d1a9e0ccfc1d35e6f97f7e188e9bb78088ee1066062a428", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36/OpenJDK16-jre_x64_mac_hotspot_16_36.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "33eeccbeea75e70b09610ba12e9591386a0e42248525b8358c9ae683bce82779", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_mac_hotspot_16.0.1_9.tar.gz", + "version": "16.0.1" } }, "openj9": { "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "36", - "sha256": "9e5c31582778ca5c08fc221e185dc0f4dbce2091cbc69966a1e2617344b722f1", - "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16%2B36_openj9-0.25.0/OpenJDK16-jre_x64_mac_openj9_16_36_openj9-0.25.0.tar.gz", - "version": "16.0.0" + "build": "9", + "sha256": "f57a6f04cf21a8470bb6f9488c57031d89db73c8b24997d74812855372f4e6b8", + "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_x64_mac_openj9_16.0.1_9_openj9-0.26.0.tar.gz", + "version": "16.0.1" } } } @@ -678,92 +678,92 @@ "jdk": { "hotspot": { "aarch64": { - "build": "8", - "sha256": "9c07cf2099bbc6c850c46fd870bd243f5fcb6635181eabb312bdffe43ffc5080", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz", - "version": "8.0.282" + "build": "10", + "sha256": "a29edaf66221f7a51353d3f28e1ecf4221268848260417bc562d797e514082a8", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz", + "version": "8.0.292" }, "armv6l": { - "build": "1", - "sha256": "e2e41a8705061dfcc766bfb6b7edd4c699e94aac68e4deeb28c8e76734a46fb7", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u275b01.tar.gz", - "version": "8.0.275" + "build": "10", + "sha256": "0de107b7df38314c1daab78571383b8b39fdc506790aaef5d870b3e70048881b", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u292b10.tar.gz", + "version": "8.0.292" }, "armv7l": { - "build": "1", - "sha256": "e2e41a8705061dfcc766bfb6b7edd4c699e94aac68e4deeb28c8e76734a46fb7", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jdk_arm_linux_hotspot_8u275b01.tar.gz", - "version": "8.0.275" + "build": "10", + "sha256": "0de107b7df38314c1daab78571383b8b39fdc506790aaef5d870b3e70048881b", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u292b10.tar.gz", + "version": "8.0.292" }, "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "e6e6e0356649b9696fa5082cfcb0663d4bef159fc22d406e3a012e71fce83a5c", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz", - "version": "8.0.282" + "build": "10", + "sha256": "0949505fcf42a1765558048451bb2a22e84b3635b1a31dd6191780eeccaa4ada", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u292b10.tar.gz", + "version": "8.0.292" } }, "openj9": { "aarch64": { - "build": "8", - "sha256": "e107d3b8092f71ee042284b0fc0f0430ef214916812ce02aa6d549aa81b6dc70", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_aarch64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz", - "version": "8.0.282-ea" + "build": "10", + "sha256": "b168245ddc18b85135c15ed6baea5cbcc06192b49af04dcfa698458373efc061", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_aarch64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz", + "version": "8.0.292-ea" }, "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "ef10c776dccdff02da6222002a3c023c1cc47d50dd1f6f81314da3d1fe28d13e", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz", - "version": "8.0.282" + "build": "10", + "sha256": "06d6c9421778575cf59d50f69b7ac6a7bb237485b3a3c2f89cfb61a056c7b2de", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz", + "version": "8.0.292" } } }, "jre": { "hotspot": { "aarch64": { - "build": "8", - "sha256": "5ffa116636b90bac486faba2882a2121aca1398a5426ef3e4ad0d913985e680d", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_aarch64_linux_hotspot_jdk8u282-b08.tar.gz", - "version": "8.0.282" + "build": "10", + "sha256": "b062ec775e6c2961532d9afeae4027fe3ac2cf4344cbc912a401be5bfb6ca221", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_aarch64_linux_hotspot_8u292b10.tar.gz", + "version": "8.0.292" }, "armv6l": { - "build": "1", - "sha256": "2e228d39d00ba8d974fd8ccdaaee0225833e79594251b64c724485c4fc94870f", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jre_arm_linux_hotspot_8u275b01.tar.gz", - "version": "8.0.275" + "build": "10", + "sha256": "7f7707a7a3998737d2221080ea65d50ea96f5dde5226961ebcebd3ec99a82a32", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_arm_linux_hotspot_8u292b10.tar.gz", + "version": "8.0.292" }, "armv7l": { - "build": "1", - "sha256": "2e228d39d00ba8d974fd8ccdaaee0225833e79594251b64c724485c4fc94870f", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u275-b01/OpenJDK8U-jre_arm_linux_hotspot_8u275b01.tar.gz", - "version": "8.0.275" + "build": "10", + "sha256": "7f7707a7a3998737d2221080ea65d50ea96f5dde5226961ebcebd3ec99a82a32", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_arm_linux_hotspot_8u292b10.tar.gz", + "version": "8.0.292" }, "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "3b2e2c6ad3ee04a58ffb8d629e3e242b0ae87b38cfd06425e4446b1f9490f521", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_linux_hotspot_8u282b08.tar.gz", - "version": "8.0.282" + "build": "10", + "sha256": "cad66f48f90167ed19030c71f8f0580702c43cce5ce5a0d76833f7a5ae7c402a", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_x64_linux_hotspot_8u292b10.tar.gz", + "version": "8.0.292" } }, "openj9": { "aarch64": { - "build": "8", - "sha256": "1ffc7ac14546ee5e16e0efd616073baaf1b80f55abf61257095f132ded9da1e5", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_aarch64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz", - "version": "8.0.282-ea" + "build": "10", + "sha256": "f87f90673e25c3ce9e868e96a6059b22665f12d05e389813f75dfbc95d970393", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_aarch64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz", + "version": "8.0.292-ea" }, "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "4fad259c32eb23ec98925c8b2cf28aaacbdb55e034db74c31a7636e75b6af08d", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_linux_openj9_8u282b08_openj9-0.24.0.tar.gz", - "version": "8.0.282" + "build": "10", + "sha256": "6d5b67979e0935febe893895b622647bf8a59df6093ae57074db11d2ac9373ea", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz", + "version": "8.0.292" } } } @@ -774,20 +774,20 @@ "packageType": "jdk", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "1766d756f6e4a5d41b539f2ecf83e5a33e9336bd75f1602e8f4b4afbb8f47aaa", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_mac_hotspot_8u282b08.tar.gz", - "version": "8.0.282" + "build": "10", + "sha256": "5646fbe9e4138c902c910bb7014d41463976598097ad03919e4848634c7e8007", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_mac_hotspot_8u292b10.tar.gz", + "version": "8.0.292" } }, "openj9": { "packageType": "jdk", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "265d4fb01b61ed7a3a9fae6a50bcf6322687b5f08de8598d8e42263cbd8b5772", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jdk_x64_mac_openj9_8u282b08_openj9-0.24.0.tar.gz", - "version": "8.0.282" + "build": "10", + "sha256": "d262bc226895e80b7e80d61905e65fe043ca0a3e3b930f7b88ddfacb8835e939", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_mac_openj9_8u292b10_openj9-0.26.0.tar.gz", + "version": "8.0.292" } } }, @@ -796,20 +796,20 @@ "packageType": "jre", "vmType": "hotspot", "x86_64": { - "build": "8", - "sha256": "9e7a40d570d5151aae23a2fb017359248f5fb82c547c3ecd860c992770228afb", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jre_x64_mac_hotspot_8u282b08.tar.gz", - "version": "8.0.282" + "build": "10", + "sha256": "bfe1cecf686b4d129594916b0f10d98b71c8d2caec1b96bbbee7f40aa053f1c8", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_x64_mac_hotspot_8u292b10.tar.gz", + "version": "8.0.292" } }, "openj9": { "packageType": "jre", "vmType": "openj9", "x86_64": { - "build": "8", - "sha256": "884aa20b3aaed504b18ee21575c8da20838f80fb96036e78e70ff6ef613a5283", - "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08_openj9-0.24.0/OpenJDK8U-jre_x64_mac_openj9_8u282b08_openj9-0.24.0.tar.gz", - "version": "8.0.282" + "build": "10", + "sha256": "50cbc5ef48d0167d649d3ba2c2b8d71553541bffb98914418f4a26e0c5f69aca", + "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_mac_openj9_8u292b10_openj9-0.26.0.tar.gz", + "version": "8.0.292" } } } diff --git a/pkgs/development/compilers/jrsonnet/default.nix b/pkgs/development/compilers/jrsonnet/default.nix index 82e15db6685..57d163706ba 100644 --- a/pkgs/development/compilers/jrsonnet/default.nix +++ b/pkgs/development/compilers/jrsonnet/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "jrsonnet"; - version = "0.3.8"; + version = "0.4.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "CertainLach"; repo = "jrsonnet"; - sha256 = "sha256-u6P/j7j6S7iPQQh00YFtp2G9Kt4xdWJGsxbuBjvHHZ4="; + sha256 = "sha256-+kvdbUw+lQ/BKJwcBzho1OWg/6y0YDRkLE+SAe8hLQQ="; }; postInstall = '' ln -s $out/bin/jrsonnet $out/bin/jsonnet ''; - cargoSha256 = "sha256-KGQ3n3BBgLCT3ITIM8p9AxNa62ek4GHymqoD0eQSVKQ="; + cargoSha256 = "sha256-0soXOxp4Kr1DdmVERl8/sqwltqYLDwkVJZHFnYeHs+c="; meta = { description = "Purely-functional configuration language that helps you define JSON data"; diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix index be03f53a76e..e85404c58b5 100644 --- a/pkgs/development/compilers/jsonnet/default.nix +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -1,8 +1,9 @@ -{ stdenv, lib, fetchFromGitHub }: +{ stdenv, lib, jekyll, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "jsonnet"; version = "0.17.0"; + outputs = ["out" "doc"]; src = fetchFromGitHub { rev = "v${version}"; @@ -11,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1ddz14699v5lqx3dh0mb7hfffr6fk5zhmzn3z8yxkqqvriqnciim"; }; + nativeBuildInputs = [ jekyll ]; + enableParallelBuilding = true; makeFlags = [ @@ -19,12 +22,19 @@ stdenv.mkDerivation rec { "libjsonnet.so" ]; + # Upstream writes documentation in html, not in markdown/rst, so no + # other output formats, sorry. + preBuild = '' + jekyll build --source ./doc --destination ./html + ''; + installPhase = '' - mkdir -p $out/bin $out/lib $out/include + mkdir -p $out/bin $out/lib $out/include $out/share/doc/jsonnet cp jsonnet $out/bin/ cp jsonnetfmt $out/bin/ cp libjsonnet*.so $out/lib/ cp -a include/*.h $out/include/ + cp -r ./html $out/share/doc/jsonnet ''; meta = { diff --git a/pkgs/development/compilers/koka/default.nix b/pkgs/development/compilers/koka/default.nix index 30e273271ae..0b88bc1ab1c 100644 --- a/pkgs/development/compilers/koka/default.nix +++ b/pkgs/development/compilers/koka/default.nix @@ -4,12 +4,12 @@ , parsec, process, regex-compat, text, time }: let - version = "2.1.4"; + version = "2.1.9"; src = fetchFromGitHub { owner = "koka-lang"; repo = "koka"; rev = "v${version}"; - sha256 = "sha256-MPMA8ZErEKv1SrkliLsy35k88GrdsPqIK6yokQreIjE="; + sha256 = "0xny4x1a2lzwgmng60bni7rxfjx5ns70qbfp703qwms54clvj5wy"; fetchSubmodules = true; }; kklib = stdenv.mkDerivation { diff --git a/pkgs/development/compilers/llvm/12/clang/default.nix b/pkgs/development/compilers/llvm/12/clang/default.nix index dbd6ea1e1ac..87cdca834ea 100644 --- a/pkgs/development/compilers/llvm/12/clang/default.nix +++ b/pkgs/development/compilers/llvm/12/clang/default.nix @@ -17,6 +17,9 @@ let mv clang-* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} + mv clang-tools-extra-* $sourceRoot/tools/extra + substituteInPlace $sourceRoot/tools/extra/clangd/quality/CompletionModel.cmake \ + --replace ' ''${CMAKE_SOURCE_DIR}/../clang-tools-extra' ' ''${CMAKE_SOURCE_DIR}/tools/extra' ''; nativeBuildInputs = [ cmake python3 ] diff --git a/pkgs/development/compilers/llvm/rocm/clang.nix b/pkgs/development/compilers/llvm/rocm/clang.nix index 6ab0f894ca9..45c0bfda192 100644 --- a/pkgs/development/compilers/llvm/rocm/clang.nix +++ b/pkgs/development/compilers/llvm/rocm/clang.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { description = "ROCm fork of the clang C/C++/Objective-C/Objective-C++ LLVM compiler frontend"; homepage = "https://llvm.org/"; license = with licenses; [ ncsa ]; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/llvm/rocm/lld/default.nix b/pkgs/development/compilers/llvm/rocm/lld/default.nix index ef60747b013..c8ca83f76c1 100644 --- a/pkgs/development/compilers/llvm/rocm/lld/default.nix +++ b/pkgs/development/compilers/llvm/rocm/lld/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "ROCm fork of the LLVM Linker"; homepage = "https://github.com/RadeonOpenCompute/llvm-project"; license = licenses.ncsa; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/llvm/rocm/llvm/default.nix b/pkgs/development/compilers/llvm/rocm/llvm/default.nix index b3e8c06195f..6d1ff664972 100644 --- a/pkgs/development/compilers/llvm/rocm/llvm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/llvm/default.nix @@ -91,7 +91,7 @@ in stdenv.mkDerivation rec { description = "ROCm fork of the LLVM compiler infrastructure"; homepage = "https://github.com/RadeonOpenCompute/llvm-project"; license = with licenses; [ ncsa ]; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/odin/default.nix b/pkgs/development/compilers/odin/default.nix new file mode 100644 index 00000000000..5845be142b6 --- /dev/null +++ b/pkgs/development/compilers/odin/default.nix @@ -0,0 +1,57 @@ +{ lib +, fetchFromGitHub +, llvmPackages +, makeWrapper +, libiconv +}: + +let + inherit (llvmPackages) stdenv; +in stdenv.mkDerivation rec { + pname = "odin"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "odin-lang"; + repo = "Odin"; + rev = "v${version}"; + sha256 = "ke2HPxVtF/Lh74Tv6XbpM9iLBuXLdH1+IE78MAacfYY="; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = lib.optional stdenv.isDarwin libiconv; + + postPatch = '' + sed -i 's/^GIT_SHA=.*$/GIT_SHA=/' Makefile + ''; + + dontConfigure = true; + + buildFlags = [ + "release" + ]; + + installPhase = '' + mkdir -p $out/bin + cp odin $out/bin/odin + cp -r core $out/bin/core + + wrapProgram $out/bin/odin --prefix PATH : ${lib.makeBinPath (with llvmPackages; [ + bintools + llvm + clang + lld + ])} + ''; + + meta = with lib; { + description = "A fast, concise, readable, pragmatic and open sourced programming language"; + homepage = "https://odin-lang.org/"; + license = licenses.bsd2; + maintainers = with maintainers; [ luc65r ]; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/development/compilers/rust/1_52.nix b/pkgs/development/compilers/rust/1_53.nix index 49176ad3fed..dda6d393190 100644 --- a/pkgs/development/compilers/rust/1_52.nix +++ b/pkgs/development/compilers/rust/1_53.nix @@ -20,8 +20,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.52.1"; - rustcSha256 = "sha256-Om8jom0Oj4erv78yxc19qgwLcdCYar78Vrml+/vQv5g="; + rustcVersion = "1.53.0"; + rustcSha256 = "1f95p259dfp5ca118bg107rj3rqwlswy65dxn3hg8sqgl4wwmxsw"; 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.51.0"; + bootstrapVersion = "1.52.1"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "de2e8ef724d89ba6f567f07ebacf5a244c7cdae30ee559f1913310eda38d9cd1"; - x86_64-unknown-linux-gnu = "9e125977aa13f012a68fdc6663629c685745091ae244f0587dd55ea4e3a3e42f"; - x86_64-unknown-linux-musl = "cb65c3a19ba0e09a94ccfd8551e648efaa1db52b0db19ae475d35a46f8750871"; - arm-unknown-linux-gnueabihf = "ab26464947ce80b4c361b08242dc215a5664f9f4ad23f66891ec27d55a0440b7"; - armv7-unknown-linux-gnueabihf = "5d381b7ee16c559efefedfac7ec4d392e838fddaf50049255844dcff2b2614dd"; - aarch64-unknown-linux-gnu = "fd31c78fffad52c03cac5a7c1ee5db3f34b2a77d7bc862707c0f71e209180a84"; - aarch64-unknown-linux-musl = "06cdaa1117dcdd392ede938b655b9bc45cf2a76bd42870ca223189e6eb29d435"; - x86_64-apple-darwin = "765212098a415996b767d1e372ce266caf94027402b269fec33291fffc085ca4"; - aarch64-apple-darwin = "95d0410bbd20b05f8b7d5adf70e8737873995bc86611a90e643d7081ca35147f"; - powerpc64le-unknown-linux-gnu = "7362f561104d7be4836507d3a53cd39444efcdf065813d559beb1f54ce9f7680"; - riscv64gc-unknown-linux-gnu = "9d0c2c4ab2397e78758de8b6b57051482bcf20b6748e0e16d9d5bd23ce73d72a"; + 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"; }; - selectRustPackage = pkgs: pkgs.rust_1_52; + selectRustPackage = pkgs: pkgs.rust_1_53; rustcPatches = [ ]; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index b8fca884edc..dae94409240 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -159,6 +159,9 @@ in stdenv.mkDerivation rec { # remove references to llvm-config in lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so # and thus a transitive dependency on ncurses find $out/lib -name "*.so" -type f -exec remove-references-to -t ${llvmShared} '{}' '+' + + # remove uninstall script that doesn't really make sense for Nix. + rm $out/lib/rustlib/uninstall.sh ''; configurePlatforms = []; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 3703225489d..69d5789bfb0 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -116,18 +116,18 @@ in rec { }; vala_0_48 = generic { - version = "0.48.17"; - sha256 = "1wlb4vd7k6hg10s09npglbhfcgjzxkywd4v0l96qhn19m9b8cszj"; + version = "0.48.18"; + sha256 = "1pbz4nyrrf9wp8rp953sczx545s4g0h5mars9ynkn788dzs2h3wy"; }; vala_0_50 = generic { - version = "0.50.4"; - sha256 = "1353j852h04d1x6b4n6lbg3ay40ph0adb9yi25dh74pligx33z2q"; + version = "0.50.9"; + sha256 = "0w5ngs90rq7vy21nqfq8drqyb33kxm17j161qvakwpsbjsidv1mn"; }; vala_0_52 = generic { - version = "0.52.2"; - sha256 = "sha256-OjxGCAO6Zh5RO+PQmEtYPgVHP2AsdfqY6RdVUDcUqXs="; + version = "0.52.4"; + sha256 = "0cfz3xshc9azxx4fn25x9gadnph6jvf1r2wzd7p5krk0a4755ppc"; }; vala = vala_0_52; diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 10beb80f2e6..968664f81c7 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -214,7 +214,7 @@ let runHook preCheck for pkg in $(getGoDirs test); do - buildGoDir test "$pkg" + buildGoDir test $checkFlags "$pkg" done runHook postCheck @@ -236,6 +236,8 @@ let passthru = passthru // { inherit go go-modules vendorSha256 ; }; + enableParallelBuilding = enableParallelBuilding; + meta = { # Add default meta information platforms = go.meta.platforms or lib.platforms.all; diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index 88d7acb42fc..0fb51b68eca 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -210,7 +210,7 @@ let runHook preCheck for pkg in $(getGoDirs test); do - buildGoDir test "$pkg" + buildGoDir test $checkFlags "$pkg" done runHook postCheck diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 5bf9f460acf..e76f5012f95 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -53,6 +53,7 @@ in , enableParallelBuilding ? true , maintainers ? null , changelog ? null +, mainProgram ? null , doCoverage ? false , doHaddock ? !(ghc.isHaLVM or false) , passthru ? {} @@ -666,6 +667,7 @@ stdenv.mkDerivation ({ // optionalAttrs (args ? hydraPlatforms) { inherit hydraPlatforms; } // optionalAttrs (args ? badPlatforms) { inherit badPlatforms; } // optionalAttrs (args ? changelog) { inherit changelog; } + // optionalAttrs (args ? mainProgram) { inherit mainProgram; } ; } diff --git a/pkgs/development/interpreters/alda/default.nix b/pkgs/development/interpreters/alda/default.nix index 85c48ee2014..96d4207dbe8 100644 --- a/pkgs/development/interpreters/alda/default.nix +++ b/pkgs/development/interpreters/alda/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alda"; - version = "1.4.4"; + version = "1.5.0"; src = fetchurl { url = "https://github.com/alda-lang/alda/releases/download/${version}/alda"; - sha256 = "sha256-zIq8coSh4B9VGrixkQfhySK7qhlFG2p7O0suvbiScKY="; + sha256 = "sha256-OHbOsgYN87ThU7EgjCgxADnOv32qIi+7XwDwcW0dmV0="; }; dontUnpack = true; diff --git a/pkgs/development/interpreters/erlang/R24.nix b/pkgs/development/interpreters/erlang/R24.nix index a4fe839bff4..7f4b49c5c32 100644 --- a/pkgs/development/interpreters/erlang/R24.nix +++ b/pkgs/development/interpreters/erlang/R24.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "24.0.2"; - sha256 = "gAiQc+AVj5xjwAnn9mF4xprjZOft1JvfEFVJMG5isxg="; + version = "24.0.3"; + sha256 = "KVMISrWNBkk+w37gB4M5TQkgm4odZ+GqLvKN4stzOUI="; } diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index c0438d1e007..35631174e26 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -11,7 +11,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-TzJbHmHIySlf3asQ02HOdehMR+s0KkPifBiaQ4FvFCg="; }; + # we don't have /usr/bin/env in the sandbox, so substitute for a proper, + # absolute path to janet + postPatch = '' + substituteInPlace jpm \ + --replace '/usr/bin/env janet' $out/bin/janet \ + --replace /usr/local/lib/janet $out/lib \ + --replace /usr/local $out + + substituteInPlace janet.1 \ + --replace /usr/local/lib/janet $out/lib + ''; + nativeBuildInputs = [ meson ninja ]; + mesonFlags = [ "-Dgit_hash=release" ]; doCheck = true; @@ -20,7 +33,7 @@ stdenv.mkDerivation rec { description = "Janet programming language"; homepage = "https://janet-lang.org/"; license = licenses.mit; + maintainers = with maintainers; [ andrewchambers peterhoeg ]; platforms = platforms.all; - maintainers = with maintainers; [ andrewchambers ]; }; } diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index d2ba451b9e6..3e36f77dab4 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -19,10 +19,6 @@ rec { patches = lib.optionals stdenv.isDarwin [ ./5.2.darwin.patch ]; - - postBuild = lib.optionalString (!stdenv.isDarwin) '' - ( cd src; make $makeFlags "''${makeFlagsArray[@]}" liblua.so ) - ''; }; lua5_3_compat = lua5_3.override({ diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index fd8c47d751b..3476b2b648b 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -7,6 +7,7 @@ , patches ? [] , postConfigure ? null , postBuild ? null +, staticOnly ? stdenv.hostPlatform.isStatic }: let luaPackages = callPackage ../../lua-modules {lua=self; overrides=packageOverrides;}; @@ -38,7 +39,7 @@ self = stdenv.mkDerivation rec { inherit patches; - postPatch = lib.optionalString (!stdenv.isDarwin) '' + postPatch = lib.optionalString (!stdenv.isDarwin && !staticOnly) '' # Add a target for a shared library to the Makefile. sed -e '1s/^/LUA_SO = liblua.so/' \ -e 's/ALL_T *= */&$(LUA_SO) /' \ @@ -56,6 +57,10 @@ self = stdenv.mkDerivation rec { "PLAT=${plat}" "CC=${stdenv.cc.targetPrefix}cc" "RANLIB=${stdenv.cc.targetPrefix}ranlib" + # Lua links with readline wich depends on ncurses. For some reason when + # building pkgsStatic.lua it fails because symbols from ncurses are not + # found. Adding ncurses here fixes the problem. + "MYLIBS=-lncurses" ]; configurePhase = '' @@ -66,7 +71,8 @@ self = stdenv.mkDerivation rec { makeFlagsArray+=(${lib.optionalString stdenv.isDarwin "CC=\"$CC\""}${lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) " 'AR=${stdenv.cc.targetPrefix}ar rcu'"}) installFlagsArray=( TO_BIN="lua luac" INSTALL_DATA='cp -d' \ - TO_LIB="${if stdenv.isDarwin then "liblua.${version}.dylib" else "liblua.a liblua.so liblua.so.${luaversion} liblua.so.${version}"}" ) + TO_LIB="${if stdenv.isDarwin then "liblua.${version}.dylib" + else ("liblua.a" + lib.optionalString (!staticOnly) " liblua.so liblua.so.${luaversion} liblua.so.${version}" )}" ) runHook postConfigure ''; diff --git a/pkgs/development/interpreters/tcl/tcl-package-hook.sh b/pkgs/development/interpreters/tcl/tcl-package-hook.sh index 747783cb1c2..41603037931 100644 --- a/pkgs/development/interpreters/tcl/tcl-package-hook.sh +++ b/pkgs/development/interpreters/tcl/tcl-package-hook.sh @@ -2,6 +2,8 @@ # * wrap any installed executables with a wrapper that configures TCLLIBPATH # * write a setup hook that extends the TCLLIBPATH of any anti-dependencies +tclWrapperArgs=( ${tclWrapperArgs-} ) + # Add a directory to TCLLIBPATH, provided that it exists _addToTclLibPath() { local tclPkg="$1" @@ -50,10 +52,12 @@ wrapTclBins() { return fi + tclWrapperArgs+=(--prefix TCLLIBPATH ' ' "$TCLLIBPATH") + find "$tclBinsDir" -type f -executable -print | while read -r someBin; do echo "Adding TCLLIBPATH wrapper for $someBin" - wrapProgram "$someBin" --prefix TCLLIBPATH ' ' "$TCLLIBPATH" + wrapProgram "$someBin" "${tclWrapperArgs[@]}" done } diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 5d5277afcd3..2ef3f3d3920 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -85,6 +85,6 @@ in stdenv.mkDerivation rec { changelog = "https://github.com/GPUOpen-Drivers/AMDVLK/releases/tag/v-${version}"; license = licenses.mit; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ danieldk Flakebi ]; + maintainers = with maintainers; [ Flakebi ]; }; } diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 9fdccfb3faa..fcc64989606 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.5.2"; + version = "10.5.3"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-Y/I87cVIpelASBblDPj4/MSSqxqtxsDO8wv8Kvzq2V8="; + sha256 = "sha256-5sUdjVKm94ucZFn2mGE1CT4O5wWmdDBxEPYXXyzV7jc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index d6e1d75437e..c0765922de5 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.86"; + version = "0.1.88"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Cz9ZUVmtGyFs1ynAUEw6X2z3gMZB9Nxj/BZPPAOCyPA="; + sha256 = "sha256-Tw1/SqoLsucl80mt97NRqVfZ+ybVVdmJWnr4FrQWcDk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 839b7e9f40b..f18a7e94f06 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -35,6 +35,13 @@ in stdenv.mkDerivation rec { url = "https://gitlab.freedesktop.org/cairo/cairo/commit/6edf572ebb27b00d3c371ba5ae267e39d27d5b6d.patch"; sha256 = "112hgrrsmcwxh1r52brhi5lksq4pvrz4xhkzcf2iqp55jl2pb7n1"; }) + + # Fix PDF output. + # https://gitlab.freedesktop.org/cairo/cairo/issues/342 + (fetchpatch { + url = "https://gitlab.freedesktop.org/cairo/cairo/commit/5e34c5a9640e49dcc29e6b954c4187cfc838dbd1.patch"; + sha256 = "yCwsDUY7efVvOZkA6a0bPS+RrVc8Yk9bfPwWHeOjq5o="; + }) ] ++ optionals stdenv.hostPlatform.isDarwin [ # Workaround https://gitlab.freedesktop.org/cairo/cairo/-/issues/121 ./skip-configure-stderr-check.patch @@ -64,14 +71,15 @@ in stdenv.mkDerivation rec { ++ optional glSupport libGL ; # TODO: maybe liblzo but what would it be for here? - configureFlags = (if stdenv.isDarwin then [ + configureFlags = [ + "--enable-tee" + ] ++ (if stdenv.isDarwin then [ "--disable-dependency-tracking" "--enable-quartz" "--enable-quartz-font" "--enable-quartz-image" "--enable-ft" - ] else ([ "--enable-tee" ] - ++ optional xcbSupport "--enable-xcb" + ] else (optional xcbSupport "--enable-xcb" ++ optional glSupport "--enable-gl" ++ optional pdfSupport "--enable-pdf" )) ++ optional (!x11Support) "--disable-xlib"; diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index 60ccf5aeeb2..e63f2c3cfd6 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.2.2"; + version = "0.2.7"; src = fetchFromGitHub { owner = "cwida"; repo = "duckdb"; rev = "v${version}"; - sha256 = "1pzz2zjzpvji5am21vd9kjxj0pnxsjmrsfqrym9h2rk2mi7p2cx8"; + sha256 = "0cnqq2n1424fqg7gfyvrwkk6nvjal2fm5n08xc8q28ynyhq4sfmj"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index 4709441a101..740b0d81ca9 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchFromGitHub +, fetchurl , autoreconfHook , pari , ntl @@ -14,16 +14,22 @@ assert withFlint -> flint != null; stdenv.mkDerivation rec { pname = "eclib"; - version = "20190909"; # upgrade might break the sage interface + version = "20210625"; # upgrade might break the sage interface # sage tests to run: # src/sage/interfaces/mwrank.py # src/sage/libs/eclib # ping @timokau for more info - src = fetchFromGitHub { - owner = "JohnCremona"; - repo = pname; - rev = "v${version}"; - sha256 = "0y1vdi4120gdw56gg2dn3wh625yr9wpyk3wpbsd25w4lv83qq5da"; + src = fetchurl { + # all releases for this project appear on its GitHub releases page + # by definition! other distros sometimes update whenever they see + # a version bump in configure.ac or a new tag (and this might show + # up on repology). however, a version bump or a new tag may not + # represent a new release, and a new release might not be tagged. + # + # see https://github.com/JohnCremona/eclib/issues/64#issuecomment-789788561 + # for upstream's explanation of the above + url = "https://github.com/JohnCremona/eclib/releases/download/${version}/eclib-${version}.tar.bz2"; + sha256 = "sha256-fA3MPz/L+Q39sA8wxAYOUowlHRcgOd8VF4tpsBGI6BA="; }; buildInputs = [ pari diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index b3654087ffd..9e7beb0a4f8 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -4,6 +4,7 @@ , pkg-config , meson , ninja +, wayland-scanner , libX11 , mesa , libGL @@ -51,10 +52,15 @@ in stdenv.mkDerivation rec { sha256 = "1n9lg8hpjgxlf7dpddkjhbslsfd0symla2wk6jjmnl9n9jv2gmzk"; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja pkg-config + wayland-scanner ]; buildInputs = [ diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index 93815308f9c..f2a4ae31346 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "enchant"; - version = "2.2.15"; + version = "2.3.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-Ow8iFVeBFfKOKmqlSbNRKGADlDBL151vKLDTs9b0bAM="; + sha256 = "sha256-32gGO2wTskX6ckaw4JigPnT3qRxtiUe8XE9CzlXi5B0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index c0846edbbfe..075c810131c 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -3,6 +3,7 @@ , substituteAll , fetchurl , pkg-config +, python3 , freetype , expat , libxslt @@ -14,67 +15,29 @@ stdenv.mkDerivation rec { pname = "fontconfig"; - version = "2.13.92"; + version = "2.13.93"; src = fetchurl { url = "http://fontconfig.org/release/${pname}-${version}.tar.xz"; - sha256 = "0kkfsvxcvcphm9zcgsh646gix3qn4spz555wa1jp5hbq70l62vjh"; + sha256 = "1850q4k80yxma5g3yxkvyv8i5a3xqzswwml8gjy3jmywx8qqd5pa"; }; patches = [ - # Fix fonts not being loaded when missing included configs that have ignore_missing="yes". - # https://bugzilla.redhat.com/show_bug.cgi?id=1744377 + # Fix build with no docbook2html. (fetchpatch { - url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/fcada522913e5e07efa6367eff87ace9f06d24c8.patch"; - sha256 = "1jbm3vw45b3qjnqrh2545v1k8vmb29c09v2wj07jnrq3lnchbvmn"; + url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/60ce9b695ee9d1ac514a61f562e210d3278ba605.patch"; + sha256 = "0hfd2jdvsgackdp29dyzf5b1277pnbacihxqh9vdn63rr932ipra"; }) - - # Register JoyPixels as an emoji font. - # https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/67 - (fetchpatch { - url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/65087ac7ce4cc5f2109967c1380b474955dcb590.patch"; - sha256 = "1dkrbqx1c1d8yfnx0igvv516wanw2ksrpm3fbpm2h9nw0hccwqvm"; - }) - - # Fix invalid DTD in reset-dirs. - # https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/78 - (fetchpatch { - url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/a4aa66a858f1ecd375c5efe5916398281f73f794.patch"; - sha256 = "1j4ky8jhpllfm1lh2if34xglh2hl79nsa0xxgzxpj9sx6h4v99j5"; - }) - - # Do not include its tags, they are external now and only cause warnings with old fontconfig clients. - # https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/97 - (fetchpatch { - url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/528b17b2837c3b102acd90cc7548d07bacaccb1f.patch"; - sha256 = "1zf4wcd2xlprh805jalfy8ja5c2qzgkh4fwd1m9d638nl9gx932m"; - }) - # https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/100 - (fetchpatch { - url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/37c7c748740bf6f2468d59e67951902710240b34.patch"; - sha256 = "1rz5zrfwhpn9g49wrzzrmdglj78pbvpnw8ksgsw6bxq8l5d84jfr"; - }) - - # Show warning instead of error when encountering unknown attribute in config. - # https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/111 - (fetchpatch { - url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/409b37c62780728755c908991c912a6b16f2389c.patch"; - sha256 = "zJFh37QErSAINPGFkFVJyhYRP27BuIN7PIgoDl/PIwI="; - }) - - # Combination of - # https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/88 - # https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/131 - ./macos-atomics.h ]; outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config nativeBuildInputs = [ + autoreconfHook gperf libxslt pkg-config - autoreconfHook + python3 ]; buildInputs = [ @@ -85,6 +48,11 @@ stdenv.mkDerivation rec { freetype ]; + postPatch = '' + # Requires networking. + sed -i '/check_PROGRAMS += test-crbug1004254/d' test/Makefile.am + ''; + configureFlags = [ "--sysconfdir=/etc" "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" diff --git a/pkgs/development/libraries/fontconfig/macos-atomics.h b/pkgs/development/libraries/fontconfig/macos-atomics.h deleted file mode 100644 index 07b0cf1d52d..00000000000 --- a/pkgs/development/libraries/fontconfig/macos-atomics.h +++ /dev/null @@ -1,39 +0,0 @@ ---- a/src/fcatomic.h 2020-11-27 13:23:44.000000000 +0900 -+++ b/src/fcatomic.h 2020-11-27 13:24:43.000000000 +0900 -@@ -70,24 +70,25 @@ - #elif !defined(FC_NO_MT) && defined(__APPLE__) - - #include <libkern/OSAtomic.h> --#ifdef __MAC_OS_X_MIN_REQUIRED - #include <AvailabilityMacros.h> --#elif defined(__IPHONE_OS_MIN_REQUIRED) --#include <Availability.h> --#endif - - typedef int fc_atomic_int_t; - #define fc_atomic_int_add(AI, V) (OSAtomicAdd32Barrier ((V), &(AI)) - (V)) - --#define fc_atomic_ptr_get(P) (OSMemoryBarrier (), (void *) *(P)) --#if (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4 || __IPHONE_VERSION_MIN_REQUIRED >= 20100) --#define fc_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwapPtrBarrier ((void *) (O), (void *) (N), (void **) (P)) --#else --#if __ppc64__ || __x86_64__ --#define fc_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwap64Barrier ((int64_t) (O), (int64_t) (N), (int64_t*) (P)) -+#if (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4 || __IPHONE_OS_VERSION_MIN_REQUIRED >= 20100) -+ -+#if SIZEOF_VOID_P == 8 -+#define fc_atomic_ptr_get(P) OSAtomicAdd64Barrier (0, (int64_t*)(P)) -+#elif SIZEOF_VOID_P == 4 -+#define fc_atomic_ptr_get(P) OSAtomicAdd32Barrier (0, (int32_t*)(P)) - #else --#define fc_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwap32Barrier ((int32_t) (O), (int32_t) (N), (int32_t*) (P)) -+#error "SIZEOF_VOID_P not 4 or 8 (assumes CHAR_BIT is 8)" - #endif -+ -+#define fc_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwapPtrBarrier ((void *) (O), (void *) (N), (void **) (P)) -+ -+#else -+#error "Your macOS / iOS targets are too old" - #endif - - #elif !defined(FC_NO_MT) && defined(HAVE_INTEL_ATOMIC_PRIMITIVES) diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index 2cf02651473..e13302319a1 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "freenect"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "OpenKinect"; repo = "libfreenect"; rev = "v${version}"; - sha256 = "0was1va167rqshmpn382h36yyprpfi9cwillb6ylppmnfdrfrhrr"; + sha256 = "sha256-/CR+r9/zMj+8gxhHeRGPCDhALeF5bLsea38KQ1lF6wo="; }; buildInputs = [ libusb1 freeglut libGLU libGL libXi libXmu ] diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 16c045cd68e..83df37f236b 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gdbm"; - version = "1.19"; + version = "1.20"; src = fetchurl { url = "mirror://gnu/gdbm/${pname}-${version}.tar.gz"; - sha256 = "sha256-N+0SIUEiuXLhig2UmVA55XdIGRk573QRWx1B2IETZLw="; + sha256 = "sha256-OurAVkizSCoQotqYa586OAoprWUL6AuYF6Q1+4EUopI="; }; doCheck = true; # not cross; diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix deleted file mode 100644 index 11f4f070c08..00000000000 --- a/pkgs/development/libraries/gegl/4.0.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, vala -, gobject-introspection -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 -, glib -, babl -, libpng -, cairo -, libjpeg -, librsvg -, lensfun -, libspiro -, maxflow -, netsurf -, pango -, poly2tri-c -, poppler -, bzip2 -, json-glib -, gettext -, meson -, ninja -, libraw -, gexiv2 -, libwebp -, luajit -, openexr -, OpenCL -, suitesparse -}: - -stdenv.mkDerivation rec { - pname = "gegl"; - version = "0.4.30"; - - outputs = [ "out" "dev" "devdoc" ]; - outputBin = "dev"; - - src = fetchurl { - url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-wRJ4LPQJaWniMhfM36vkIoTjXVQ1/wxD1A5McPrsqN0="; - }; - - nativeBuildInputs = [ - pkg-config - gettext - meson - ninja - vala - gobject-introspection - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 - ]; - - buildInputs = [ - libpng - cairo - libjpeg - librsvg - lensfun - libspiro - maxflow - netsurf.libnsgif - pango - poly2tri-c - poppler - bzip2 - libraw - libwebp - gexiv2 - luajit - openexr - suitesparse - ] ++ lib.optional stdenv.isDarwin OpenCL; - - # for gegl-4.0.pc - propagatedBuildInputs = [ - glib - json-glib - babl - ]; - - mesonFlags = [ - "-Ddocs=true" - "-Dmrg=disabled" # not sure what that is - "-Dsdl2=disabled" - "-Dpygobject=disabled" - "-Dlibav=disabled" - "-Dlibv4l=disabled" - "-Dlibv4l2=disabled" - # Disabled due to multiple vulnerabilities, see - # https://github.com/NixOS/nixpkgs/pull/73586 - "-Djasper=disabled" - ]; - - # TODO: Fix missing math symbols in gegl seamless clone. - # It only appears when we use packaged poly2tri-c instead of vendored one. - NIX_CFLAGS_COMPILE = "-lm"; - - postPatch = '' - chmod +x tests/opencl/opencl_test.sh - patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tools/xml_insert.sh - ''; - - # tests fail to connect to the com.apple.fonts daemon in sandboxed mode - doCheck = !stdenv.isDarwin; - - meta = with lib; { - description = "Graph-based image processing framework"; - homepage = "https://www.gegl.org"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index bd67f3e6b7c..11f4f070c08 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,43 +1,115 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , pkg-config +, vala +, gobject-introspection +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, glib , babl , libpng , cairo , libjpeg , librsvg +, lensfun +, libspiro +, maxflow +, netsurf , pango -, gtk2 +, poly2tri-c +, poppler , bzip2 -, intltool -, libintl -, OpenGL ? null }: +, json-glib +, gettext +, meson +, ninja +, libraw +, gexiv2 +, libwebp +, luajit +, openexr +, OpenCL +, suitesparse +}: stdenv.mkDerivation rec { pname = "gegl"; - version = "0.2.0"; + version = "0.4.30"; + + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "dev"; src = fetchurl { - url = "ftp://ftp.gtk.org/pub/gegl/0.2/${pname}-${version}.tar.bz2"; - sha256 = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426"; + url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-wRJ4LPQJaWniMhfM36vkIoTjXVQ1/wxD1A5McPrsqN0="; }; - patches = [( fetchurl { - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/" - + "gegl-0.2.0-CVE-2012-4433.patch?h=packages/gegl&id=57a60fbda5d7bbbd1cc4767cb0724baa80c5e3e9"; - sha256 = "0p8mxj3w09nn1cc6cbxrd9hx742c5y27903i608wx6ja3kdjis59"; - name = "CVE-2012-4433.patch"; - })]; + nativeBuildInputs = [ + pkg-config + gettext + meson + ninja + vala + gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + ]; + + buildInputs = [ + libpng + cairo + libjpeg + librsvg + lensfun + libspiro + maxflow + netsurf.libnsgif + pango + poly2tri-c + poppler + bzip2 + libraw + libwebp + gexiv2 + luajit + openexr + suitesparse + ] ++ lib.optional stdenv.isDarwin OpenCL; + + # for gegl-4.0.pc + propagatedBuildInputs = [ + glib + json-glib + babl + ]; - # needs fonts otherwise don't know how to pass them - configureFlags = [ "--disable-docs" ]; + mesonFlags = [ + "-Ddocs=true" + "-Dmrg=disabled" # not sure what that is + "-Dsdl2=disabled" + "-Dpygobject=disabled" + "-Dlibav=disabled" + "-Dlibv4l=disabled" + "-Dlibv4l2=disabled" + # Disabled due to multiple vulnerabilities, see + # https://github.com/NixOS/nixpkgs/pull/73586 + "-Djasper=disabled" + ]; - buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ] - ++ lib.optional stdenv.isDarwin OpenGL; + # TODO: Fix missing math symbols in gegl seamless clone. + # It only appears when we use packaged poly2tri-c instead of vendored one. + NIX_CFLAGS_COMPILE = "-lm"; - nativeBuildInputs = [ pkg-config ]; + postPatch = '' + chmod +x tests/opencl/opencl_test.sh + patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tools/xml_insert.sh + ''; - doCheck = false; # fails 3 out of 19 tests + # tests fail to connect to the com.apple.fonts daemon in sandboxed mode + doCheck = !stdenv.isDarwin; meta = with lib; { description = "Graph-based image processing framework"; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index e15f5975786..3c8fe4d569f 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.68.2"; + version = "2.68.3"; src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-7Md5ipzANOq9/X8kbm3UYc2/EXX8wumGfMfae3MJ4Ps="; + sha256 = "0f1iprj7v0b5wn9njj39dkl25g6filfs7i4ybk20jq821k1a7qg7"; }; patches = optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 0f6811815f6..2e43e58db42 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "3.24.4"; + version = "3.24.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-m+txw+kM/Pt5A5a1Hj9ecWmWZ1Hv1PPvlpcRS+O+Z0M="; + sha256 = "1ri2msp3cmzi6r65ghwb8gfavfaxv0axpwi3q60nm7v8hvg36qw5"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix index 50839568462..0a654d9518d 100644 --- a/pkgs/development/libraries/gtkmm/4.x.nix +++ b/pkgs/development/libraries/gtkmm/4.x.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "gtkmm"; - version = "4.0.1"; + version = "4.2.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-iXPZvHhI4CyyBR4F8+46S6/+L+tK9KVIfw4xMu7AOIQ="; + sha256 = "12x9j82y37r4v0ngs22rzp4wmw7k2bbb9d3bymcczzz7y8w4q328"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index 47a3ca4f9f9..00c80277ea2 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "21.2.2"; + version = "21.2.3"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "sha256-iSrr9g6C8YRcmu92sTyDCh76Cdu8wbDL3COwiVxox4Q="; + sha256 = "sha256-Id2/d6rRKiei6UQ0pywdcbNLfIQR8gEseiDgqeaT3p8="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/libbaseencode/default.nix b/pkgs/development/libraries/libbaseencode/default.nix new file mode 100644 index 00000000000..c40f9bafb47 --- /dev/null +++ b/pkgs/development/libraries/libbaseencode/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "libbaseencode"; + version = "1.0.11"; + + src = fetchFromGitHub { + owner = "paolostivanin"; + repo = pname; + rev = "v${version}"; + sha256 = "1f52yh052z8k90d1ag6nk01p1gf4i1zxp1daw8mashs8avqr2m7g"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Library written in C for encoding and decoding data using base32 or base64 (RFC-4648)"; + homepage = "https://github.com/paolostivanin/libbaseencode"; + license = licenses.asl20; + maintainers = with maintainers; [ alexbakker ]; + }; +} diff --git a/pkgs/development/libraries/libcotp/default.nix b/pkgs/development/libraries/libcotp/default.nix new file mode 100644 index 00000000000..986890102dc --- /dev/null +++ b/pkgs/development/libraries/libcotp/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, libgcrypt, libbaseencode }: + +stdenv.mkDerivation rec { + pname = "libcotp"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "paolostivanin"; + repo = pname; + rev = "v${version}"; + sha256 = "1qq4shwiz1if9vys052dnsbm4dfw1ynlj6nsb0v4zjly3ndspfsk"; + }; + + buildInputs = [ libbaseencode libgcrypt ]; + nativeBuildInputs = [ cmake pkg-config ]; + + meta = with lib; { + description = "C library that generates TOTP and HOTP"; + homepage = "https://github.com/paolostivanin/libcotp"; + license = licenses.asl20; + maintainers = with maintainers; [ alexbakker ]; + }; +} diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix index 3eb1032b2a7..8414605593d 100644 --- a/pkgs/development/libraries/libdvdnav/default.nix +++ b/pkgs/development/libraries/libdvdnav/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libdvdnav"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { url = "http://get.videolan.org/libdvdnav/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0nzf1ir27s5vs1jrisdiw9ag2sc160k3gv7nplv9ypppm5gb35zn"; + sha256 = "sha256-wZGnR1lH0yP/doDPksD7G+gjdwGIXzdlbGTQTpjRjUg="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/libraries/libliftoff/default.nix b/pkgs/development/libraries/libliftoff/default.nix new file mode 100644 index 00000000000..759549dbb28 --- /dev/null +++ b/pkgs/development/libraries/libliftoff/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub +, meson, pkg-config, ninja +, libdrm +}: + +stdenv.mkDerivation rec { + pname = "libliftoff"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "emersion"; + repo = pname; + rev = "v${version}"; + sha256 = "1s53jsll3c7272bhmh4jr6k5m1nvn8i1ld704qmzsm852ilmgrla"; + }; + + nativeBuildInputs = [ meson pkg-config ninja ]; + + buildInputs = [ libdrm ]; + + meta = with lib; { + description = "A lightweight KMS plane library"; + longDescription = '' + libliftoff eases the use of KMS planes from userspace without standing in + your way. Users create "virtual planes" called layers, set KMS properties + on them, and libliftoff will pick planes for these layers if possible. + ''; + inherit (src.meta) homepage; + changelog = "https://github.com/emersion/libliftoff/releases/tag/v${version}"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index ef13fdc9de1..43a88f9dd5f 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libmbim"; - version = "1.24.6"; + version = "1.24.8"; src = fetchurl { url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz"; - sha256 = "sha256-dgRlyqoczWmcFCkOl5HaRW1TAN0R6/TBSGFRAz6HXf0="; + sha256 = "sha256-AlkHNhY//xDlcyGR/MwbmSCWlhbdxZYToAMFKhFqPCU="; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/development/libraries/libnbd/default.nix b/pkgs/development/libraries/libnbd/default.nix index 2254c824154..635f8b8a615 100644 --- a/pkgs/development/libraries/libnbd/default.nix +++ b/pkgs/development/libraries/libnbd/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libnbd"; - version = "1.7.7"; + version = "1.9.2"; src = fetchurl { url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-development/${pname}-${version}.tar.gz"; - hash = "sha256-fNeu1qx+EbKitv2I8nJAmGMF5jxN2RZGPR/LJYnOjG8="; + hash = "sha256-UDLH5IMuKI6mAO/9VNmI8pCbxv94tCCQYRKZn2DBclg="; }; nativeBuildInputs = [ @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { pkg-config perl ]; + buildInputs = [ fuse gnutls diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 45b79571b43..9368469f26d 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.18.0"; + version = "3.19.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "sha256-cQNcKa/mEdeH1MaLhj203MOphfYDTQ5pn/GzUmSZGcE="; + sha256 = "1w44407wb552q21dz4m2nwwdi8b9hzjb2w1l3ffsikzqckc7wbyj"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index a812a2d7848..157445cfee8 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.28.4"; + version = "1.28.6"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "sha256-OxTNKrUiGnrbs5/tFu9pdTjqHHkwiCGtLRm1BeHarqA="; + sha256 = "1zg5k8f6l87iy9hmzwckdx532s845z9c5npblmpf1pp17n4r1f6b"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 960591d1a22..0cc4c8b3453 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,6 +1,24 @@ -{ stdenv, lib, fetchurl, fetchpatch, glib, libxml2, meson, ninja, pkg-config, gnome, libsysprof-capture -, gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala -, libpsl, python3, brotli +{ stdenv +, lib +, fetchurl +, glib +, libxml2 +, meson +, ninja +, pkg-config +, gnome +, libsysprof-capture +, gnomeSupport ? true +, sqlite +, glib-networking +, gobject-introspection +, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform +, vala +, withVala ? stdenv.buildPlatform == stdenv.hostPlatform +, libpsl +, python3 +, brotli +, fetchpatch }: stdenv.mkDerivation rec { @@ -35,7 +53,9 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ libsysprof-capture ]; - nativeBuildInputs = [ meson ninja pkg-config gobject-introspection vala glib ]; + nativeBuildInputs = [ meson ninja pkg-config glib ] + ++ lib.optional withIntrospection gobject-introspection + ++ lib.optional withVala vala; propagatedBuildInputs = [ glib libxml2 ]; NIX_CFLAGS_COMPILE = [ "-lpthread" ]; @@ -43,7 +63,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency "-Dgssapi=disabled" - "-Dvapi=enabled" + "-Dvapi=${if withVala then "enabled" else "disabled"}" + "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" "-Dgnome=${lib.boolToString gnomeSupport}" "-Dntlm=disabled" ] ++ lib.optionals (!stdenv.isLinux) [ diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix index c4b945bed44..1410822a1ca 100644 --- a/pkgs/development/libraries/libvmaf/default.nix +++ b/pkgs/development/libraries/libvmaf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libvmaf"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "netflix"; repo = "vmaf"; rev = "v${version}"; - sha256 = "0dynk1pmsyf23vfxljaazqkr27vfrvhj3dyjzm06zxpzsn59aif3"; + sha256 = "1jlmivmdzlhizljbmsvqqxnhjfyjh8zxyf5xv6j040vbfj4mf14f"; }; sourceRoot = "source/libvmaf"; diff --git a/pkgs/development/libraries/libvpx/1_8.nix b/pkgs/development/libraries/libvpx/1_8.nix index f1a2bf377cc..befbafd5a4e 100644 --- a/pkgs/development/libraries/libvpx/1_8.nix +++ b/pkgs/development/libraries/libvpx/1_8.nix @@ -69,7 +69,14 @@ stdenv.mkDerivation rec { # ./CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch ]; - postPatch = "patchShebangs ."; + postPatch = '' + patchShebangs --build \ + build/make/*.sh \ + build/make/*.pl \ + build/make/*.pm \ + test/*.sh \ + configure + ''; outputs = [ "bin" "dev" "out" ]; setOutputFlags = false; @@ -135,11 +142,6 @@ stdenv.mkDerivation rec { experimentalFpMbStatsSupport || experimentalEmulateHardwareSupport) "experimental") ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - #"--extra-cflags=" - #"--extra-cxxflags=" - #"--prefix=" - #"--libc=" - #"--libdir=" "--enable-external-build" # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index f1918396616..d538aa41bff 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -65,7 +65,21 @@ stdenv.mkDerivation rec { sha256 = "sha256-EZP33U10fchyqy7Jr26vHgUUfWR6xtG3fcMWUII0m9w="; }; - postPatch = "patchShebangs ."; + postPatch = '' + patchShebangs --build \ + build/make/*.sh \ + build/make/*.pl \ + build/make/*.pm \ + test/*.sh \ + configure + + # When cross-compiling (for aarch64-multiplatform), the compiler errors out on these flags. + # Since they're 'just' warnings, it's fine to just remove them. + substituteInPlace configure \ + --replace "check_add_cflags -Wparentheses-equality" "" \ + --replace "check_add_cflags -Wunreachable-code-loop-increment" "" \ + --replace "check_cflags -Wshorten-64-to-32 && add_cflags_only -Wshorten-64-to-32" "" + ''; outputs = [ "bin" "dev" "out" ]; setOutputFlags = false; @@ -131,12 +145,6 @@ stdenv.mkDerivation rec { experimentalFpMbStatsSupport || experimentalEmulateHardwareSupport) "experimental") ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - #"--extra-cflags=" - #"--extra-cxxflags=" - #"--prefix=" - #"--libc=" - #"--libdir=" - "--enable-external-build" # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14 diff --git a/pkgs/development/libraries/libxlsxwriter/default.nix b/pkgs/development/libraries/libxlsxwriter/default.nix index 4bb80cb04a4..ce9a72f00c1 100644 --- a/pkgs/development/libraries/libxlsxwriter/default.nix +++ b/pkgs/development/libraries/libxlsxwriter/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libxlsxwriter"; - version = "1.0.6"; + version = "1.0.8"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; rev = "RELEASE_${version}"; - sha256 = "03fdcbm0xnkxwv6fir4yy4x9q2p5h08j099w9xh5gc2ni7ygjlyx"; + sha256 = "1z9bkg0pfkzxbpj2rys4mx9wmcxyjjqsg0nbiaabsg455q00plki"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index bdecfe0d57a..aaa78de47f7 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/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.3"; + version = "21.1.4"; branch = versions.major version; self = stdenv.mkDerivation { @@ -45,7 +45,7 @@ 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 = "0s8yi7y63xsyqw19ihil18fykkjxr6ibcir2fvymz1vh4ql23qnb"; + sha256 = "02z9g6zpkg1p1sm8f84xdi7v2n7x534x9pn565bvcr411527y5qz"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 522c8cfa4a1..b93e517def6 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -1,5 +1,5 @@ { - stdenv, lib, fetchFromGitHub, + stdenv, lib, fetchFromGitHub, symlinkJoin, cmake, expat, libyamlcpp, ilmbase, pystring, # Base dependencies glew, freeglut, # Only required on Linux @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { sha256 = "194j9jp5c8ws0fryiz936wyinphnpzwpqnzvw9ryx6rbiwrba487"; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ expat libyamlcpp ilmbase pystring ] + nativeBuildInputs = [ cmake (symlinkJoin { name = "expat"; paths = [ expat.out expat.dev ]; }) ]; + buildInputs = [ expat.out libyamlcpp ilmbase pystring ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glew freeglut ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon GLUT Cocoa ] ++ lib.optionals pythonBindings [ python3Packages.python python3Packages.pybind11 ] diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index f4dba00d351..c75e33a0686 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -19,15 +19,19 @@ , x11Support? !stdenv.isDarwin, libXft }: +let + withDocs = stdenv.buildPlatform == stdenv.hostPlatform; +in stdenv.mkDerivation rec { pname = "pango"; - version = "1.48.4"; + version = "1.48.5"; - outputs = [ "bin" "out" "dev" "devdoc" ]; + outputs = [ "bin" "out" "dev" ] + ++ lib.optionals withDocs [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ym3cvajy2asapj8xbhfpy05rak79afrhi32hiss0w900vxi72a1"; + sha256 = "0aivpd6l5687lj5293j859zd7vq97yxpzvad0b6jvh3kc54p87jh"; }; nativeBuildInputs = [ @@ -58,9 +62,11 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=true" + "-Dgtk_doc=${lib.boolToString withDocs}" ] ++ lib.optionals (!x11Support) [ "-Dxft=disabled" # only works with x11 + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Dintrospection=disabled" ]; # Fontconfig error: Cannot load default config file @@ -70,7 +76,7 @@ stdenv.mkDerivation rec { doCheck = false; # test-font: FAIL - postInstall = '' + postInstall = lib.optionalString withDocs '' # So that devhelp can find this. # https://gitlab.gnome.org/GNOME/pango/merge_requests/293/diffs#note_1058448 mkdir -p "$devdoc/share/devhelp" diff --git a/pkgs/development/libraries/protobuf/3.17.nix b/pkgs/development/libraries/protobuf/3.17.nix new file mode 100644 index 00000000000..d869b9ce76e --- /dev/null +++ b/pkgs/development/libraries/protobuf/3.17.nix @@ -0,0 +1,6 @@ +{ callPackage, ... }: + +callPackage ./generic-v3.nix { + version = "3.17.3"; + sha256 = "08644kaxhpjs38q5q4fp01yr0wakg1ijha4g3lzp2ifg7y3c465d"; +} diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index c93ea5ba78b..cf085d50edb 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { description = "Radeon Open Compute common language runtime"; homepage = "https://github.com/ROCm-Developer-Tools/ROCclr"; license = licenses.mit; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; # rocclr seems to have some AArch64 ifdefs, but does not seem # to be supported yet by the build infrastructure. Recheck in # the future. diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index b9a34b113eb..95fe28ce9fd 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { description = "APIs for compiling and inspecting AMDGPU code objects"; homepage = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/tree/amd-stg-open/lib/comgr"; license = licenses.ncsa; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index e62d6f0076f..383d91bd08c 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Set of AMD-specific device-side language runtime libraries"; homepage = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs"; license = licenses.ncsa; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/rocm-opencl-icd/default.nix b/pkgs/development/libraries/rocm-opencl-icd/default.nix index 903c238f455..0a9d124561e 100644 --- a/pkgs/development/libraries/rocm-opencl-icd/default.nix +++ b/pkgs/development/libraries/rocm-opencl-icd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "OpenCL ICD definition for AMD GPUs using the ROCm stack"; license = licenses.mit; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index d721cfece96..40ffcae7924 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { description = "OpenCL runtime for AMD GPUs, part of the ROCm stack"; homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"; license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index c63e8249cfc..eb4ce3c19fb 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { description = "Platform runtime for ROCm"; homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime"; license = with licenses; [ ncsa ]; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index 1339e035ebf..770dd16740c 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { description = "Radeon open compute thunk interface"; homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"; license = with licenses; [ bsd2 mit ]; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 332806c495c..85a73ccd569 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "blas"; - version = "3.8.0"; + version = "3.10.0"; src = fetchurl { url = "http://www.netlib.org/blas/${pname}-${version}.tgz"; - sha256 = "1s24iry5197pskml4iygasw196bdhplj0jmbsb9jhabcjqj2mpsm"; + sha256 = "sha256-LjYNmcm9yEB6YYiMQKqFP7QhlCDruCZNtIbLiGBGirM="; }; buildInputs = [ gfortran ]; @@ -20,17 +20,17 @@ stdenv.mkDerivation rec { echo >>make.inc "NOOPT = -O0 -fPIC" echo >>make.inc "LOADER = gfortran" echo >>make.inc "LOADOPTS =" - echo >>make.inc "ARCH = gfortran" - echo >>make.inc "ARCHFLAGS = -shared -o" + echo >>make.inc "AR = gfortran" + echo >>make.inc "ARFLAGS = -shared -o" echo >>make.inc "RANLIB = echo" echo >>make.inc "BLASLIB = libblas.so.${version}" ''; buildPhase = '' make - echo >>make.inc "ARCHFLAGS = " + echo >>make.inc "ARFLAGS = " echo >>make.inc "BLASLIB = libblas.a" - echo >>make.inc "ARCH = ar rcs" + echo >>make.inc "AR = ar rcs" echo >>make.inc "RANLIB = ranlib" make ''; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 50563f2745a..66f343d4912 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -7,7 +7,7 @@ }: let inherit (lib) optional; - version = "3.9.0"; + version = "3.9.1"; in stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "Reference-LAPACK"; repo = "lapack"; rev = "v${version}"; - sha256 = "0sxnc97z67i7phdmcnq8f8lmxgw10wdwvr8ami0w3pb179cgrbpb"; + sha256 = "sha256-B7eRaEY9vaLvuKkJ7d2KWanGE7OXh43O0UbXFheUWK8="; }; nativeBuildInputs = [ gfortran cmake ]; diff --git a/pkgs/development/libraries/science/math/p4est-sc/default.nix b/pkgs/development/libraries/science/math/p4est-sc/default.nix index 222380e15b2..338101b80b5 100644 --- a/pkgs/development/libraries/science/math/p4est-sc/default.nix +++ b/pkgs/development/libraries/science/math/p4est-sc/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook, pkg-config , p4est-sc-debugEnable ? true, p4est-sc-mpiSupport ? true -, mpi, openmpi, openssh, zlib +, mpi, openssh, zlib }: let dbg = if debugEnable then "-dbg" else ""; debugEnable = p4est-sc-debugEnable; mpiSupport = p4est-sc-mpiSupport; + isOpenmpi = mpiSupport && mpi.pname == "openmpi"; in stdenv.mkDerivation { pname = "p4est-sc${dbg}"; @@ -24,7 +25,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ zlib ] ++ lib.optional mpiSupport mpi - ++ lib.optional (mpiSupport && mpi == openmpi) openssh + ++ lib.optional isOpenmpi openssh ; inherit debugEnable mpiSupport; @@ -36,15 +37,23 @@ stdenv.mkDerivation { ${if mpiSupport then "unset CC" else ""} ''; - configureFlags = lib.optional debugEnable "--enable-debug" + configureFlags = [ "--enable-pthread=-pthread" ] + ++ lib.optional debugEnable "--enable-debug" ++ lib.optional mpiSupport "--enable-mpi" ; - makeFlags = [ "V=0" ]; - dontDisableStatic = true; enableParallelBuilding = true; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + makeFlags = [ "V=0" ]; + + preCheck = '' + export OMPI_MCA_rmaps_base_oversubscribe=1 + export HYDRA_IFACE=lo + ''; + + # disallow Darwin checks due to prototype incompatibility of qsort_r + # to be fixed in a future version of the source code + doCheck = !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform; meta = { branch = "prev3-develop"; diff --git a/pkgs/development/libraries/science/math/p4est/default.nix b/pkgs/development/libraries/science/math/p4est/default.nix index 99c4b0be3f3..68c71ab59be 100644 --- a/pkgs/development/libraries/science/math/p4est/default.nix +++ b/pkgs/development/libraries/science/math/p4est/default.nix @@ -35,13 +35,12 @@ stdenv.mkDerivation { ${if mpiSupport then "unset CC" else ""} ''; - configureFlags = [ "--with-sc=${p4est-sc}" ] + configureFlags = p4est-sc.configureFlags + ++ [ "--with-sc=${p4est-sc}" ] ++ lib.optional withMetis "--with-metis" - ++ lib.optional debugEnable "--enable-debug" - ++ lib.optional mpiSupport "--enable-mpi" ; - inherit (p4est-sc) makeFlags dontDisableStatic enableParallelBuilding doCheck; + inherit (p4est-sc) makeFlags dontDisableStatic enableParallelBuilding preCheck doCheck; meta = { branch = "prev3-develop"; diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index cd737a82a29..25f4b5e1317 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, pkg-config, freetype, cmake }: +{ lib +, stdenv +, fetchurl +, pkg-config +, freetype +, cmake +, static ? stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { version = "1.3.14"; @@ -15,7 +22,22 @@ stdenv.mkDerivation rec { patches = lib.optionals stdenv.isDarwin [ ./macosx.patch ]; - doCheck = false; # fails, probably missing something + cmakeFlags = lib.optionals static [ + "-DBUILD_SHARED_LIBS=OFF" + ]; + + # Remove a test that fails to statically link (undefined reference to png and + # freetype symbols) + postConfigure = lib.optionals static '' + sed -e '/freetype freetype.c/d' -i ../tests/examples/CMakeLists.txt + ''; + + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/src/ + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/src/ + ''; + + doCheck = true; meta = with lib; { description = "An advanced font engine"; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 45c2fd228f2..9dc717c3479 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { # $out for the library and $examples for the example programs (in examples): outputs = [ "out" "examples" ]; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; buildInputs = [ diff --git a/pkgs/development/mobile/checkra1n/default.nix b/pkgs/development/mobile/checkra1n/default.nix new file mode 100644 index 00000000000..110bb187f61 --- /dev/null +++ b/pkgs/development/mobile/checkra1n/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "checkra1n"; + version = "0.12.4"; + + src = fetchurl { + url = "https://assets.checkra.in/downloads/linux/cli/x86_64/dac9968939ea6e6bfbdedeb41d7e2579c4711dc2c5083f91dced66ca397dc51d/checkra1n"; + sha256 = "07f5glwwlrpdvj8ky265q8fp3i3r4mz1vd6yvvxnnvpa764rdjfs"; + }; + + dontUnpack = true; + + installPhase = '' + install -dm755 "$out/bin" + install -m755 $src $out/bin/${pname} + ''; + + meta = with lib; { + description = "Jailbreak for iPhone 5s though iPhone X, iOS 12.0 and up"; + homepage = "https://checkra.in/"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ onny ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index ea8f2ef7a18..6b322a903f9 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -126,7 +126,7 @@ , "indium" , "insect" , "ionic" -, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v7.0.4.tar.gz"} +, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v7.2.4.tar.gz"} , "jake" , "javascript-typescript-langserver" , "joplin" @@ -182,6 +182,7 @@ , "patch-package" , "peerflix" , "peerflix-server" +, "pkg" , "pm2" , "pnpm" , "poor-mans-t-sql-formatter-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 27ca53ba6ad..ace40185565 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -49,13 +49,13 @@ let sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww=="; }; }; - "@angular-devkit/architect-0.1201.0" = { + "@angular-devkit/architect-0.1201.1" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1201.0"; + version = "0.1201.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1201.0.tgz"; - sha512 = "tqIhGccWjI32xmLs0UIr2umET18Le+r5PxCf30ueOE5pv1q7XKD06EzGx9J05B1aUgDFb3LP/ArlKel5JnD+3g=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1201.1.tgz"; + sha512 = "n7ycxrIPbtnV7q8PH5Uvs8Jd++u6hWUiB+8EUxznSfdHGA+fE7TTnJTkc27LoMlYZAImc/Axp/uyYZ6Awt72ZQ=="; }; }; "@angular-devkit/core-11.2.4" = { @@ -76,13 +76,13 @@ let sha512 = "3dA0Z6sIIxCDjZS/DucgmIKti7EZ/LgHoHgCO72Q50H5ZXbUSNBz5wGl5hVq2+gzrnFgU/0u40MIs6eptk30ZA=="; }; }; - "@angular-devkit/core-12.1.0" = { + "@angular-devkit/core-12.1.1" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.0.tgz"; - sha512 = "y6q/hn9/j6LwNgDzTBXe5pTXouU7nuc3KZFq3JwfTdo4yTIxN1Rdv9+zfzDkzEcYtyFoqLqqskQFme/DqdbEZw=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.1.tgz"; + sha512 = "z5+O3ugXbo8djKPjUtf/UfnYCmco2K1LVhQ6cWLhKi3NKRBiHeNmZh5nAycqFD8/Q+oI/+Ao40MkmkK1Tq0jsw=="; }; }; "@angular-devkit/schematics-11.2.4" = { @@ -103,13 +103,13 @@ let sha512 = "bhi2+5xtVAjtr3bsXKT8pnoBamQrArd/Y20ueA4Od7cd38YT97nzTA1wyHBFG0vWd0HMyg42ZS0aycNBuOebaA=="; }; }; - "@angular-devkit/schematics-12.1.0" = { + "@angular-devkit/schematics-12.1.1" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.0.tgz"; - sha512 = "KlE1fnvqWItt9dYCaQ89b9WoqFvOK64kemCLGGx49CllQ3con1lwXW2iauzT/29UoK1rSzvTVMvTJcDQOJ7isQ=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.1.tgz"; + sha512 = "oRsvlhJQLXkGWdJvArOby+G4j8UX2uCHwrN4EC1hXUKs84UsD+UATYOAh4h2auy+I+sdrmELUaHwdI4wdKpqnw=="; }; }; "@angular-devkit/schematics-cli-0.1102.6" = { @@ -625,6 +625,15 @@ let sha512 = "qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg=="; }; }; + "@babel/parser-7.13.13" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.13.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.13.13.tgz"; + sha512 = "OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw=="; + }; + }; "@babel/parser-7.14.7" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; @@ -1534,6 +1543,15 @@ let sha512 = "9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ=="; }; }; + "@babel/types-7.13.12" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.13.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.13.12.tgz"; + sha512 = "K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA=="; + }; + }; "@babel/types-7.14.5" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; @@ -2245,6 +2263,15 @@ let sha512 = "o8iU1VIY+QsqVRWARKiky29fh4KR1xaKSgMClXIi65qkt8EDDhjmlzL0KVDEoDA2GWukwb/1PpaVCWDg4v3cUQ=="; }; }; + "@fluentui/date-time-utilities-8.2.0" = { + name = "_at_fluentui_slash_date-time-utilities"; + packageName = "@fluentui/date-time-utilities"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-8.2.0.tgz"; + sha512 = "OunpRZ8hyDPLNWwrx8w17eUwGdNYjG4kGR9+jzvQQJjswk94KMxc6SY33mlTLVEbagjdHMHw9jR7STS+JCQNcA=="; + }; + }; "@fluentui/dom-utilities-1.1.2" = { name = "_at_fluentui_slash_dom-utilities"; packageName = "@fluentui/dom-utilities"; @@ -2254,6 +2281,33 @@ let sha512 = "XqPS7l3YoMwxdNlaYF6S2Mp0K3FmVIOIy2K3YkMc+eRxu9wFK6emr2Q/3rBhtG5u/On37NExRT7/5CTLnoi9gw=="; }; }; + "@fluentui/dom-utilities-2.1.2" = { + name = "_at_fluentui_slash_dom-utilities"; + packageName = "@fluentui/dom-utilities"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.1.2.tgz"; + sha512 = "9LxI3iLbBkyoudRyk0nPTjMdMB2+ClDfM8V3A0SM82e5cDss5qlo0fog/2T2aoaon+hwfeinpiY4e3znx+Nn0w=="; + }; + }; + "@fluentui/font-icons-mdl2-8.1.4" = { + name = "_at_fluentui_slash_font-icons-mdl2"; + packageName = "@fluentui/font-icons-mdl2"; + version = "8.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.1.4.tgz"; + sha512 = "v0NRk+W2qJQtBsH9hqYNG5Xnic8C1kfB0I+OTGasFYPvxdd0APcWw2vajrlE49ijgVjXS0AByCgF6mu8LiYlHg=="; + }; + }; + "@fluentui/foundation-legacy-8.1.4" = { + name = "_at_fluentui_slash_foundation-legacy"; + packageName = "@fluentui/foundation-legacy"; + version = "8.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.1.4.tgz"; + sha512 = "Kd+XpHsv3UEnDTwEnUm93Au+QGpYZ5x/VuQsv8K1sDM+gjb3BDohuwR6MWgzgCMJiVW0NMlbS4I2OpUZa6k5eg=="; + }; + }; "@fluentui/keyboard-key-0.2.17" = { name = "_at_fluentui_slash_keyboard-key"; packageName = "@fluentui/keyboard-key"; @@ -2263,6 +2317,24 @@ let sha512 = "iT1bU56rKrKEOfODoW6fScY11qj3iaYrZ+z11T6fo5+TDm84UGkkXjLXJTE57ZJzg0/gbccHQWYv+chY7bJN8Q=="; }; }; + "@fluentui/keyboard-key-0.3.2" = { + name = "_at_fluentui_slash_keyboard-key"; + packageName = "@fluentui/keyboard-key"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.3.2.tgz"; + sha512 = "Hjes+WUgVRqikyvmBEuyovw89inYZ1qVmdp4kKi/6BGvQlAcHgGIVfmdnlFumP4lmFpBW8uUh2K1ZmfY0xwQ6Q=="; + }; + }; + "@fluentui/merge-styles-8.1.2" = { + name = "_at_fluentui_slash_merge-styles"; + packageName = "@fluentui/merge-styles"; + version = "8.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.1.2.tgz"; + sha512 = "r0EGKfJUjZw9yJ21VMXjaqLoujvBkRIWRQVMM6CUxbY+02dhKUt6Sa9QA/8m8klsEWBENOaKZ4uX5U2vWWBlyw=="; + }; + }; "@fluentui/react-7.172.1" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; @@ -2272,6 +2344,15 @@ let sha512 = "XJhYEo0fn/30i4m+qJkT1y5kNTZ8DAwzWhdGSyTiOrxiJ7pKWOoXAdWnvhtk3iY0SPVWSD9jTn5lMT/2WkZbJw=="; }; }; + "@fluentui/react-8.22.0" = { + name = "_at_fluentui_slash_react"; + packageName = "@fluentui/react"; + version = "8.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react/-/react-8.22.0.tgz"; + sha512 = "mn/zUd7vJNFLqpXZhc3ePNpDcNx4mhYdQ5vCC6kqcFIYjMg2ve5WqBP9tpFlbD3LEBa8NyOvIWfdG0NZdKejLg=="; + }; + }; "@fluentui/react-focus-7.17.6" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; @@ -2281,6 +2362,24 @@ let sha512 = "JkLWNDe567lhvbnIhbYv9nUWYDIVN06utc3krs0UZBI+A0YZtQmftBtY0ghXo4PSjgozZocdu9sYkkgZOgyRLg=="; }; }; + "@fluentui/react-focus-8.1.5" = { + name = "_at_fluentui_slash_react-focus"; + packageName = "@fluentui/react-focus"; + version = "8.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.1.5.tgz"; + sha512 = "zvHwta+lRmw2kYRif0Zz6+skmfxUzagd15iMlUPRIVAcsj+rxOkoE7g8NlhXym7HsgMiKRAYJM0CdfMauCnkvQ=="; + }; + }; + "@fluentui/react-hooks-8.2.3" = { + name = "_at_fluentui_slash_react-hooks"; + packageName = "@fluentui/react-hooks"; + version = "8.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.2.3.tgz"; + sha512 = "JqQNLIc0WOwwMZ3rAnBkcy0oHZD83Bi1hs7qpvwGUW1OrL3QoJqEnmiKPowxWb8NUeKEP51cBfGi+/7aqbDZAg=="; + }; + }; "@fluentui/react-window-provider-1.0.2" = { name = "_at_fluentui_slash_react-window-provider"; packageName = "@fluentui/react-window-provider"; @@ -2290,6 +2389,33 @@ let sha512 = "fGSgL3Vp/+6t1Ysfz21FWZmqsU+iFVxOigvHnm5uKVyyRPwtaabv/F6kQ2y5isLMI2YmJaUd2i0cDJKu8ggrvw=="; }; }; + "@fluentui/react-window-provider-2.1.2" = { + name = "_at_fluentui_slash_react-window-provider"; + packageName = "@fluentui/react-window-provider"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.1.2.tgz"; + sha512 = "VWtesIAZR5fdlZMwYco/M5EBb3jawUkslQYOKsneNq+mq8ThkUs1Bol5bpK6jwmouROscu76HD1QfjdACAfkLQ=="; + }; + }; + "@fluentui/set-version-8.1.2" = { + name = "_at_fluentui_slash_set-version"; + packageName = "@fluentui/set-version"; + version = "8.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.1.2.tgz"; + sha512 = "uCPwdBsahBbLuN8UkbmXtp+u8Gxqtm5+fZ1UuOUBhEL7MKl86LrWmxoy4IW3JD2rcbaYpCb7KFpnMB5s0Nx0ZA=="; + }; + }; + "@fluentui/style-utilities-8.1.4" = { + name = "_at_fluentui_slash_style-utilities"; + packageName = "@fluentui/style-utilities"; + version = "8.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.1.4.tgz"; + sha512 = "tR/ntfobJvuCtLyi7jpEbsq67iTaBNq/lpq+tYuvIqI8Gl90L9a8g8344ADP4+9/i3TKsrAZgnV9vze66ybHOw=="; + }; + }; "@fluentui/theme-1.7.4" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; @@ -2299,6 +2425,24 @@ let sha512 = "o4eo7lstLxxXl1g2RR9yz18Yt8yjQO/LbQuZjsiAfv/4Bf0CRnb+3j1F7gxIdBWAchKj9gzaMpIFijfI98pvYQ=="; }; }; + "@fluentui/theme-2.1.3" = { + name = "_at_fluentui_slash_theme"; + packageName = "@fluentui/theme"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.1.3.tgz"; + sha512 = "o/So4091GtwtEkxujd6QT9M8kuLOde0Z7by/zLNQBU00wX3PeBxM4mpSLmnz2vt5CN5IT7OWhRRsiyve/7hLAg=="; + }; + }; + "@fluentui/utilities-8.2.0" = { + name = "_at_fluentui_slash_utilities"; + packageName = "@fluentui/utilities"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.2.0.tgz"; + sha512 = "kq8xyFHkWUbzzbkGLuDACEhH+K5oqM/wEU9+zRuM/qI2bIS1B6Cr0ruq7FHxVrtAnMhvXKzM8DPn0W8uf775qQ=="; + }; + }; "@google-cloud/paginator-3.0.5" = { name = "_at_google-cloud_slash_paginator"; packageName = "@google-cloud/paginator"; @@ -2524,6 +2668,15 @@ let sha512 = "AtMWwb7kY8DdtwIQh2hC4YFM1MzZ22lMA+gjbnCYDgICt14vX2tCa59bDrEjFyOI4LvORjpvT/UhHUdKvsX8og=="; }; }; + "@grpc/proto-loader-0.6.4" = { + name = "_at_grpc_slash_proto-loader"; + packageName = "@grpc/proto-loader"; + version = "0.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.4.tgz"; + sha512 = "7xvDvW/vJEcmLUltCUGOgWRPM8Oofv0eCFSVMuKqaqWJaXSzmB+m9hiyqe34QofAl4WAzIKUZZlinIF9FOHyTQ=="; + }; + }; "@gulp-sourcemaps/identity-map-1.0.2" = { name = "_at_gulp-sourcemaps_slash_identity-map"; packageName = "@gulp-sourcemaps/identity-map"; @@ -2641,13 +2794,13 @@ let sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; }; }; - "@hapi/topo-5.0.0" = { + "@hapi/topo-5.1.0" = { name = "_at_hapi_slash_topo"; packageName = "@hapi/topo"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@hapi/topo/-/topo-5.0.0.tgz"; - sha512 = "tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw=="; + url = "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz"; + sha512 = "foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg=="; }; }; "@heroku-cli/color-1.1.14" = { @@ -3802,13 +3955,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.186" = { + "@microsoft/load-themed-styles-1.10.190" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.186"; + version = "1.10.190"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.186.tgz"; - sha512 = "1EmEk1+ms0637dejhkMpSnWvAkZa+L85qUmsQClK+ClAlp4jmWbolWJIirmCpcUbTwkr1I/O6SAFiqKkVkhB5A=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.190.tgz"; + sha512 = "4Lhme3yHQgcIt05+BwgeJ0ClnY5wkmMXAFw4mGL8tO5jSkscd6lRKEtmQoGSTAy5S21FJzEUhnDJUqaK9M8P9Q=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -3883,13 +4036,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-12.11.0" = { + "@netlify/build-12.26.0" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "12.11.0"; + version = "12.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-12.11.0.tgz"; - sha512 = "kPY8qLpcAKOrjkgxil+c/C2Ivt0Vobklez+WFEQ5pQBYCPyjtw5kTAHABb8USc+CBaE4CWL1kehcvdbSJiO6Kg=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-12.26.0.tgz"; + sha512 = "wRBOxaZXJ0OCzg2YVp+SsKIE6fmLzwk68X7I8X6/jEL7np4Rq1H0BornxSGu9ewbCJseCl3zGKgd6aiBR4E8Pg=="; }; }; "@netlify/cache-utils-1.0.7" = { @@ -3901,13 +4054,13 @@ let sha512 = "yrdrnQkzg/qMovoFYwQ24UVt/OyHtP+t0KpQFd7eBl6gnuuGGgxFocaFFv6eKpMVwzHTsOwx/y9B/FcC3/6cfA=="; }; }; - "@netlify/config-9.1.0" = { + "@netlify/config-9.5.0" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "9.1.0"; + version = "9.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-9.1.0.tgz"; - sha512 = "XP3z4bm/D5KsZZB85lzgciJp6v2tF3jxJaeuq7hB7bEfVaHqGJfHesalhrqEXjB9lATD63UR6h7YmzRq2DmIpQ=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-9.5.0.tgz"; + sha512 = "Kt5xukNclUtraXVX1xnrseMwvIA1WnFjR6i4GuwgvM2MreS6zb5LIV5XGJ/vDCEpH9uxI609gj2iu9FNy543rA=="; }; }; "@netlify/esbuild-0.13.6" = { @@ -3919,22 +4072,22 @@ let sha512 = "tiKmDcHM2riSVN79c0mJY/67EBDafXQAMitHuLiCDAMdtz3kfv+NqdVG5krgf5lWR8Uf8AeZrUW5Q9RP25REvw=="; }; }; - "@netlify/framework-info-5.4.0" = { + "@netlify/framework-info-5.5.0" = { name = "_at_netlify_slash_framework-info"; packageName = "@netlify/framework-info"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.4.0.tgz"; - sha512 = "eelZCGCm0F3wUClqSfKqeYXHn/hHyHzm+QhMBr3iBVcOQI7uujfwXjq5mS1gD3quJHF3jGrJ3QgzPa9X5v5Fwg=="; + url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.5.0.tgz"; + sha512 = "kAGcUnFlJgP2lQXez1c0RKJNF1reoefLVXMzTTTCoKqt1OcfzQnWzgCT6rJbsS7wia02JoLAb7TrdMdpWDAGTg=="; }; }; - "@netlify/functions-utils-1.3.47" = { + "@netlify/functions-utils-1.4.1" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.3.47"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.47.tgz"; - sha512 = "lJoa3aIuyBiPNo7XawtGQRTDFCmO9wSpoVDhO+e6t2YoCoCFXlJxZulZdalJ+JnRphlEMKHCMA3jeaVhVjjHuQ=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.4.1.tgz"; + sha512 = "11WhjgX74b+AgROL/w0iDrZg1cjhX7+hyCUrzOagJbkC2v83qZaVff+4RFTA7damuO9zc9BHw2+LHe0wLVvEbg=="; }; }; "@netlify/git-utils-1.0.11" = { @@ -3964,22 +4117,22 @@ let sha512 = "SAsVNIxF0asduPXbsr3wbyAB7lPZQxhG90EeOu0/Fo+BLhpO4g+6eH13I60qJpWCI/ucXXqSrUw8y6Oy5wpY0g=="; }; }; - "@netlify/plugins-list-2.18.0" = { + "@netlify/plugins-list-2.18.1" = { name = "_at_netlify_slash_plugins-list"; packageName = "@netlify/plugins-list"; - version = "2.18.0"; + version = "2.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.18.0.tgz"; - sha512 = "lbI7P0CaSH23r2sF4z3DX02PqQ8ENUtRullQXEQXUareZfrXlOV6F8sl/LAWcgjE/kuh51eIAu/hWstsZFEQIQ=="; + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.18.1.tgz"; + sha512 = "UFXVAlmuwmA0s7xDpL1pF3ksyB+5UDNVQDqkwobb+HlxjKNU0hy0c+aL8G8EoBjtX9iGP7Xr+QawtytAWlIyXw=="; }; }; - "@netlify/routing-local-proxy-0.30.1" = { + "@netlify/routing-local-proxy-0.30.2" = { name = "_at_netlify_slash_routing-local-proxy"; packageName = "@netlify/routing-local-proxy"; - version = "0.30.1"; + version = "0.30.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/routing-local-proxy/-/routing-local-proxy-0.30.1.tgz"; - sha512 = "9IfNBXDJA2JLvHA5GRDTpOgPpU3dovL8ezB1+igxvtinnl4Nnl9G4D9N6leqf1ecC6aZrx9St4OATqVwY2LryQ=="; + url = "https://registry.npmjs.org/@netlify/routing-local-proxy/-/routing-local-proxy-0.30.2.tgz"; + sha512 = "rQnv383/vFF1x3iKnY/2Q2i7Z7RhugfoVfAIbEJ2bIaWFMQ2YcGMVpwj1w8rK+4MGH5uwvlNNlfE0gGYQOq+4Q=="; }; }; "@netlify/run-utils-1.0.7" = { @@ -3991,13 +4144,13 @@ let sha512 = "YFi1Sf+ktQICS3tAKu7/uiGzLXgi8RNVwH9naUkziXwXQNH2oxDhKgy0/Zv5Nw0zMDJyKWrJ3xObWEC57mJ/KA=="; }; }; - "@netlify/zip-it-and-ship-it-4.4.2" = { + "@netlify/zip-it-and-ship-it-4.8.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "4.4.2"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.4.2.tgz"; - sha512 = "627ZNqfc4mdhU5mYDpcKUbmx8RoAUu8ZQiW/RIt5s7uDhruba3bK776Ygzog5b14hYWthT41/bf+9wQ+O9NFWw=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.8.0.tgz"; + sha512 = "Dq0hBeX2LW62eny22d+isU4SvEilT/4eusjP1EFA0XYaDCgQ9rFJ50+NySXfxxu20qbfZmt34XKiby+tO7EcRA=="; }; }; "@node-red/editor-api-1.3.5" = { @@ -4351,13 +4504,13 @@ let sha512 = "SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg=="; }; }; - "@octokit/openapi-types-7.3.5" = { + "@octokit/openapi-types-8.1.4" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "7.3.5"; + version = "8.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-7.3.5.tgz"; - sha512 = "6bm5lzGDOeSnWHM5W8OZ86RD2KpchynU+/Qlm5hNEFjfLDhwfAY2lSe68YRUEYFGlxSHe0HmakyhvmtWoD3Zog=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-8.1.4.tgz"; + sha512 = "NnGr4NNDqO5wjSDJo5nxrGtzZUwoT23YasqK2H4Pav/6vSgeVTxuqCL9Aeh+cWfTxDomj1M4Os5BrXFsvl7qiQ=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4369,13 +4522,13 @@ let sha512 = "93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw=="; }; }; - "@octokit/plugin-paginate-rest-2.13.5" = { + "@octokit/plugin-paginate-rest-2.13.6" = { name = "_at_octokit_slash_plugin-paginate-rest"; packageName = "@octokit/plugin-paginate-rest"; - version = "2.13.5"; + version = "2.13.6"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.13.5.tgz"; - sha512 = "3WSAKBLa1RaR/7GG+LQR/tAZ9fp9H9waE9aPXallidyci9oZsfgsLn5M836d3LuDC6Fcym+2idRTBpssHZePVg=="; + url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.13.6.tgz"; + sha512 = "ai7TNKLi8tGkDvLM7fm0X1fbIP9u1nfXnN49ZAw2PgSoQou9yixKn5c3m0awuLacbuX2aXEvJpv1gKm3jboabg=="; }; }; "@octokit/plugin-request-log-1.0.4" = { @@ -4387,13 +4540,13 @@ let sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="; }; }; - "@octokit/plugin-rest-endpoint-methods-5.3.4" = { + "@octokit/plugin-rest-endpoint-methods-5.3.7" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "5.3.4"; + version = "5.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.3.4.tgz"; - sha512 = "2Y2q/FYCsW5tcwIqgnLOgzZXEb3I1VoSQGyHs/Zki/Ufs5H+uT0maPVHatLKw90LQbqK7ON8NpL3Y8IyzG6pNA=="; + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.3.7.tgz"; + sha512 = "LAgTLOsJ86ig2wYSpcSx+UWt7aQYYsEZ/Tf/pksAVQWKNcGuTVCDl9OUiPhQ7DZelNozYVWTO9Iyjd/soe4tug=="; }; }; "@octokit/request-5.6.0" = { @@ -4414,22 +4567,22 @@ let sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; - "@octokit/rest-18.6.3" = { + "@octokit/rest-18.6.6" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "18.6.3"; + version = "18.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.6.3.tgz"; - sha512 = "BeV2P48RR3MVPhSBq6KXXHMVHEJg5vnFBkFN1GKPXBohXTp+eb0gJq+5iYgkjbOMG6biNvkKllPDWJchpQHHiA=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.6.6.tgz"; + sha512 = "kCLvz8MSh+KToXySdqUp80caBom1ZQmsX3gbT3osfbJy6fD86QObUjzAOD3D3Awz3X7ng24+lB+imvSr5EnM7g=="; }; }; - "@octokit/types-6.16.7" = { + "@octokit/types-6.17.4" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.16.7"; + version = "6.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.16.7.tgz"; - sha512 = "OuQELiwIKeDySgNID52vm33wDRc2aaX8lKYgAw9Hmw939ITow1HspT8/AH3M3jgGFUMDmHlMNBNEmH7xV7ggXQ=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.17.4.tgz"; + sha512 = "Ghk/JC4zC/1al1GwH6p8jVX6pLdypSWmbnx6h79C/yo3DeaDd6MsNsBFlHu22KbkFh+CdcAzFqdP7UdPaPPmmA=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -5026,22 +5179,22 @@ let sha512 = "s4f489h5+EJksn4CfheLgv5PGOM0CDmK1UEBLw2t/ncWs3cW2VI7vXzndcd/WJHTv3GntJhXDcJMuL+Z2IAOgg=="; }; }; - "@redocly/ajv-6.12.4" = { + "@redocly/ajv-8.6.2" = { name = "_at_redocly_slash_ajv"; packageName = "@redocly/ajv"; - version = "6.12.4"; + version = "8.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/ajv/-/ajv-6.12.4.tgz"; - sha512 = "RB6vWO78v6c+SW/3bZh+XZMr4nGdJKAiPGsBALuUZnLuCiQ7aXCT1AuFHqnfS2gyXbEUEj+kw8p4ux8KdAfs3A=="; + url = "https://registry.npmjs.org/@redocly/ajv/-/ajv-8.6.2.tgz"; + sha512 = "tU8fQs0D76ZKhJ2cWtnfQthWqiZgGBx0gH0+5D8JvaBEBaqA8foPPBt3Nonwr3ygyv5xrw2IzKWgIY86BlGs+w=="; }; }; - "@redocly/openapi-core-1.0.0-beta.50" = { + "@redocly/openapi-core-1.0.0-beta.53" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.50"; + version = "1.0.0-beta.53"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.50.tgz"; - sha512 = "GuXn4IETxpbRd8dlAQDQPtvqOpbMvPMeC/e5mv5MOXkLIznNk4vjiQVe6QSCbZbCHzzpb2+89B6S7asebPm4Rg=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.53.tgz"; + sha512 = "n5WixBRb7oWS31v3/cdOW/eNXbr2M4N8+HjHfCA/oQX6Z4ZYqPOJCekw64sQ/fnUQMIQyT6fKqyaf+iO4tG7YA=="; }; }; "@redocly/react-dropdown-aria-2.0.12" = { @@ -5143,13 +5296,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-12.1.0" = { + "@schematics/angular-12.1.1" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.0.tgz"; - sha512 = "BUCBiW+DQsOofSs4TE26M2OhlS0g9Mdyd0xWF4FD2Ab3xwQgkV1gogZgCl9dZtNfiimYebdM9LOeHqYWmvqCdw=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.1.tgz"; + sha512 = "ukSKoAWfXt28TiHlRrEzKFW63V3jroRF3xnBKtsaL3AZ4MVJiHzOWXkzDAZBaEOLUH/l6Xhm64NMgOqMEAg1rQ=="; }; }; "@schematics/schematics-0.1102.6" = { @@ -5188,13 +5341,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.12.0" = { + "@serverless/components-3.13.2" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.12.0"; + version = "3.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.12.0.tgz"; - sha512 = "USK6QCREd/SjsDDhumrsORkyQYew9WvXGjSbh5GvoGNKbqZlMiNWnua/DXmpz1uf2qaXzJO0LZEtpsiDBPX59w=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.13.2.tgz"; + sha512 = "fIYqo9cONxQeNpyWFTTLi6+r2S1KivOU5sys6nVQSR24jRVqxSpPN2eMz6BCUB8rw7N4kf+wbQDLwlyFbIroyQ=="; }; }; "@serverless/core-1.1.2" = { @@ -5206,13 +5359,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/dashboard-plugin-5.4.2" = { + "@serverless/dashboard-plugin-5.4.3" = { name = "_at_serverless_slash_dashboard-plugin"; packageName = "@serverless/dashboard-plugin"; - version = "5.4.2"; + version = "5.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-5.4.2.tgz"; - sha512 = "yFugs3TBPjZh6Gt/8lPca8H7n2/ICin17r/zmhiOhIscYMgIJT1EOY9EyCFWIQi9AMAmZD0a3ZR8U8gSYYTT9A=="; + url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-5.4.3.tgz"; + sha512 = "lgQh7NG5B0T+jr5/CWLZUvW2EqQ5Phzf+XTybM/I+Obwc5jxtpOmPgItDs52kBgyNLDJAqzUN+YRpfE/HBGsoQ=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -5233,13 +5386,13 @@ let sha512 = "dyELLbrf/9+O+sjuIL7ymlH8zwCOsG+tf2TjeEjXooVSvNqUoZ4ZadENjxInUV841l0ddwkihwzH/54Yw+/qkg=="; }; }; - "@serverless/platform-client-china-2.1.14" = { + "@serverless/platform-client-china-2.1.17" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "2.1.14"; + version = "2.1.17"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.1.14.tgz"; - sha512 = "ciXVcYcdLlSB9ph94sX/8jmDuY85Yq0fJvwKGzndKPngjVkXs6Gw2tqj91act9nqW541Ycqb/HFh1BhgcDWP7Q=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.1.17.tgz"; + sha512 = "knJeb559PBJ72f/+RMH1iMavSiCJiXnTIWH88vdhlON+Tx7RPOTT5p48Modgbs8xONugmqbHjw9Z+fcyXZ2ajg=="; }; }; "@serverless/template-1.1.4" = { @@ -5278,13 +5431,13 @@ let sha512 = "cUt1ZYXZ/6Khe/foCucqraRpaTtejc4mICWVjQynwaPaK86/3g4Afu4pV1kEumnbet7N0PLbi+SKr8SHTf6tNQ=="; }; }; - "@serverless/utils-china-1.1.2" = { + "@serverless/utils-china-1.1.4" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "1.1.2"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.1.2.tgz"; - sha512 = "svZV9zZx2vSqR6EPstgaaLu1YHFfQ5PB2rvZAb66XuXwcPGMwAQN1c836H9L35Y/cUXLhFxv0UCpRHShJLYQSw=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.1.4.tgz"; + sha512 = "8s73M1k+mST7Z/Rp8wgmZh50tjpwX+fqsbYYRuFGgyuWTvgqAlUflDOWAeQuDx4pEndWEqjbG09ZrZNqlHuZqQ=="; }; }; "@sideway/address-4.1.2" = { @@ -5440,13 +5593,13 @@ let sha512 = "T3xfDqrEFKclHGdJx4/5+D5F7e76/99f33guE4RTlVITBhy7VVnjz4t/NDr3UYqcC0MgAmiC4bSVYHnlshuwJw=="; }; }; - "@snyk/cloud-config-parser-1.9.2" = { + "@snyk/cloud-config-parser-1.9.3" = { name = "_at_snyk_slash_cloud-config-parser"; packageName = "@snyk/cloud-config-parser"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cloud-config-parser/-/cloud-config-parser-1.9.2.tgz"; - sha512 = "m8Y2+3l4fxj96QMrTfiCEaXgCpDkCkJIX/5wv0V0RHuxpUiyh+KxC2yJ8Su4wybBj6v6hB9hB7h5/L+Gy4V4PA=="; + url = "https://registry.npmjs.org/@snyk/cloud-config-parser/-/cloud-config-parser-1.9.3.tgz"; + sha512 = "qv9NsIESPtyC2vKkqA7wEFePNuklksnQWJTWX8Cy3CQoCpZk80XwH50OVpDIU2szgnkWUm1XNSahG/IwVMSbOw=="; }; }; "@snyk/cocoapods-lockfile-parser-3.6.2" = { @@ -5476,13 +5629,13 @@ let sha512 = "wNANv235j95NFsQuODIXCiQZ9kcyg9fz92Kg1zoGvaP3kN/ma7fgCnvQL/dyml6iouQJR5aZovjhrrfEFoKtiQ=="; }; }; - "@snyk/dep-graph-1.28.0" = { + "@snyk/dep-graph-1.28.1" = { name = "_at_snyk_slash_dep-graph"; packageName = "@snyk/dep-graph"; - version = "1.28.0"; + version = "1.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.28.0.tgz"; - sha512 = "Oup9nAvb558jdNvbZah/vaBtOtCcizkdeS+OBQeBIqIffyer4mc4juSn4b1SFjCpu7AG7piio8Lj8k1B9ps6Tg=="; + url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.28.1.tgz"; + sha512 = "ti5fPYivhBGCJ7rZGznMX2UJE1M5lR811WvVyBWTRJwLYVFYkhxRXKfgZUXEB0tq8vpo3V7tm3syrBd5TLPIMA=="; }; }; "@snyk/docker-registry-v2-client-2.2.2" = { @@ -5503,13 +5656,13 @@ let sha512 = "E/Pfdze/WFfxwyuTFcfhQN1SwyUsc43yuCoW63RVBCaxTD6OzhVD2Pvc/Sy7BjiWUfmelzyKkIBpoow8zZX7Zg=="; }; }; - "@snyk/fix-1.649.0" = { + "@snyk/fix-1.650.0" = { name = "_at_snyk_slash_fix"; packageName = "@snyk/fix"; - version = "1.649.0"; + version = "1.650.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/fix/-/fix-1.649.0.tgz"; - sha512 = "yYm6f8UmRPeQglDde8mDZU6ymQTyvlKcgJfG2dWjA0nQTbIo+aSqLGB9A5JyqVcJCEbwJrylNcPbYaxE9udnFg=="; + url = "https://registry.npmjs.org/@snyk/fix/-/fix-1.650.0.tgz"; + sha512 = "qzwb0+DMrjxTsBXAcC74gb2X17925SapCBNo6DybLbOZXNJ6IFvtdN5ucd2FguEojfVyB4HVqkpbawc0bbfGtA=="; }; }; "@snyk/fix-pipenv-pipfile-0.5.4" = { @@ -6205,13 +6358,13 @@ let sha512 = "C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ=="; }; }; - "@types/debug-4.1.5" = { + "@types/debug-4.1.6" = { name = "_at_types_slash_debug"; packageName = "@types/debug"; - version = "4.1.5"; + version = "4.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.5.tgz"; - sha512 = "Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ=="; + url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.6.tgz"; + sha512 = "7fDOJFA/x8B+sO1901BmHlf5dE1cxBU8mRXj8QOEDnn16hhGJv/IHxJtZhvsabZsIMn0eLIyeOKAeqSNJJYTpA=="; }; }; "@types/decompress-4.2.3" = { @@ -6313,22 +6466,22 @@ let sha512 = "laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg=="; }; }; - "@types/estree-0.0.47" = { + "@types/estree-0.0.48" = { name = "_at_types_slash_estree"; packageName = "@types/estree"; - version = "0.0.47"; + version = "0.0.48"; src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.47.tgz"; - sha512 = "c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg=="; + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.48.tgz"; + sha512 = "LfZwXoGUDo0C3me81HXgkBg5CTQYb6xzEl+fNmbO4JdRiSKQ8A0GD1OBBvKAIsbCUgoyAty7m99GqqMQe784ew=="; }; }; - "@types/estree-0.0.48" = { + "@types/estree-0.0.49" = { name = "_at_types_slash_estree"; packageName = "@types/estree"; - version = "0.0.48"; + version = "0.0.49"; src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.48.tgz"; - sha512 = "LfZwXoGUDo0C3me81HXgkBg5CTQYb6xzEl+fNmbO4JdRiSKQ8A0GD1OBBvKAIsbCUgoyAty7m99GqqMQe784ew=="; + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.49.tgz"; + sha512 = "K1AFuMe8a+pXmfHTtnwBvqoEylNKVeaiKYkjmcEAdytMQVJ/i9Fu7sc13GxgXdO49gkE7Hy8SyJonUZUn+eVaw=="; }; }; "@types/expect-1.20.4" = { @@ -6889,6 +7042,15 @@ let sha512 = "se3yX7UHv5Bscf8f1ERKvQOD6sTyycH3hdaoozvaLxgUiY5lIGEeH37AD0G0Qi9kPqihPn0HOfd2yaIEN9VwEg=="; }; }; + "@types/node-15.14.0" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "15.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-15.14.0.tgz"; + sha512 = "um/+/ip3QZmwLfIkWZSNtQIJNVAqrJ92OkLMeuZrjZMTAJniI7fh8N8OICyDhAJ2mzgk/fmYFo72jRr5HyZ1EQ=="; + }; + }; "@types/node-15.6.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -7393,13 +7555,13 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; - "@typescript-eslint/eslint-plugin-4.28.0" = { + "@typescript-eslint/eslint-plugin-4.28.1" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.28.0"; + version = "4.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.0.tgz"; - sha512 = "KcF6p3zWhf1f8xO84tuBailV5cN92vhS+VT7UJsPzGBm9VnQqfI9AsiMUFUCYHTYPg1uCCo+HyiDnpDuvkAMfQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.1.tgz"; + sha512 = "9yfcNpDaNGQ6/LQOX/KhUFTR1sCKH+PBr234k6hI9XJ0VP5UqGxap0AnNwBnWFk1MNyWBylJH9ZkzBXC+5akZQ=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -7411,13 +7573,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.28.0" = { + "@typescript-eslint/experimental-utils-4.28.1" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.28.0"; + version = "4.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.0.tgz"; - sha512 = "9XD9s7mt3QWMk82GoyUpc/Ji03vz4T5AYlHF9DcoFNfJ/y3UAclRsfGiE2gLfXtyC+JRA3trR7cR296TEb1oiQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.1.tgz"; + sha512 = "n8/ggadrZ+uyrfrSEchx3jgODdmcx7MzVM2sI3cTpI/YlfSm0+9HEUaWw3aQn2urL2KYlWYMDgn45iLfjDYB+Q=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -7429,22 +7591,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.28.0" = { + "@typescript-eslint/parser-4.28.1" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.28.0"; + version = "4.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.0.tgz"; - sha512 = "7x4D22oPY8fDaOCvkuXtYYTQ6mTMmkivwEzS+7iml9F9VkHGbbZ3x4fHRwxAb5KeuSkLqfnYjs46tGx2Nour4A=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.1.tgz"; + sha512 = "UjrMsgnhQIIK82hXGaD+MCN8IfORS1CbMdu7VlZbYa8LCZtbZjJA26De4IPQB7XYZbL8gJ99KWNj0l6WD0guJg=="; }; }; - "@typescript-eslint/scope-manager-4.28.0" = { + "@typescript-eslint/scope-manager-4.28.1" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.28.0"; + version = "4.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.0.tgz"; - sha512 = "eCALCeScs5P/EYjwo6se9bdjtrh8ByWjtHzOkC4Tia6QQWtQr3PHovxh3TdYTuFcurkYI4rmFsRFpucADIkseg=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.1.tgz"; + sha512 = "o95bvGKfss6705x7jFGDyS7trAORTy57lwJ+VsYwil/lOUxKQ9tA7Suuq+ciMhJc/1qPwB3XE2DKh9wubW8YYA=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -7456,13 +7618,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.28.0" = { + "@typescript-eslint/types-4.28.1" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.28.0"; + version = "4.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.0.tgz"; - sha512 = "p16xMNKKoiJCVZY5PW/AfILw2xe1LfruTcfAKBj3a+wgNYP5I9ZEKNDOItoRt53p4EiPV6iRSICy8EPanG9ZVA=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.1.tgz"; + sha512 = "4z+knEihcyX7blAGi7O3Fm3O6YRCP+r56NJFMNGsmtdw+NCdpG5SgNz427LS9nQkRVTswZLhz484hakQwB8RRg=="; }; }; "@typescript-eslint/typescript-estree-3.10.1" = { @@ -7474,13 +7636,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.28.0" = { + "@typescript-eslint/typescript-estree-4.28.1" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.28.0"; + version = "4.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.0.tgz"; - sha512 = "m19UQTRtxMzKAm8QxfKpvh6OwQSXaW1CdZPoCaQuLwAq7VZMNuhJmZR4g5281s2ECt658sldnJfdpSZZaxUGMQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.1.tgz"; + sha512 = "GhKxmC4sHXxHGJv8e8egAZeTZ6HI4mLU6S7FUzvFOtsk7ZIDN1ksA9r9DyOgNqowA9yAtZXV0Uiap61bIO81FQ=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -7492,13 +7654,13 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.28.0" = { + "@typescript-eslint/visitor-keys-4.28.1" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.28.0"; + version = "4.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.0.tgz"; - sha512 = "PjJyTWwrlrvM5jazxYF5ZPs/nl0kHDZMVbuIcbpawVXaDPelp3+S9zpOz5RmVUfS/fD5l5+ZXNKnWhNYjPzCvw=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.1.tgz"; + sha512 = "K4HMrdFqr9PFquPu178SaSb92CaWe2yErXyPumc8cYWxFmhgJsNY9eSePmO05j0JhBvf2Cdhptd6E6Yv9HVHcg=="; }; }; "@uifabric/foundation-7.9.26" = { @@ -7636,31 +7798,31 @@ let sha512 = "B6PedV/H2kcGEAgnqncwjHe3E8fqUNXCLv1BsrNwkHHWQJXkDN7dFeuEB4oaucBOVbjhH7KGLJ6JAiXPE3S7xA=="; }; }; - "@vue/compiler-core-3.1.2" = { + "@vue/compiler-core-3.1.3" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.1.2.tgz"; - sha512 = "nHmq7vLjq/XM2IMbZUcKWoH5sPXa2uR/nIKZtjbK5F3TcbnYE/zKsrSUR9WZJ03unlwotNBX1OyxVt9HbWD7/Q=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.1.3.tgz"; + sha512 = "I58MDtVa8AYEIa3waLO6/89JdmgpkDAEcL3Vrmlsbnt07KZ5sIGLqaXjzGrOT57j9s8ty0WTYlLQq2rWUVYGCg=="; }; }; - "@vue/compiler-dom-3.1.2" = { + "@vue/compiler-dom-3.1.3" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.1.2.tgz"; - sha512 = "k2+SWcWH0jL6WQAX7Or2ONqu5MbtTgTO0dJrvebQYzgqaKMXNI90RNeWeCxS4BnNFMDONpHBeFgbwbnDWIkmRg=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.1.3.tgz"; + sha512 = "BunLXKP+UvY1XJ0L6M7KD/De0XP+kOlIxFg3OfXtVQZcLLgnLcTgSK3t/ylvIpYJOadGaHhb+BfCK/hdqOVAyw=="; }; }; - "@vue/shared-3.1.2" = { + "@vue/shared-3.1.3" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.1.2.tgz"; - sha512 = "EmH/poaDWBPJaPILXNI/1fvUbArJQmmTyVCwvvyDYDFnkPoTclAbHRAtyIvqfez7jybTDn077HTNILpxlsoWhg=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.1.3.tgz"; + sha512 = "uGBX4bZVFvgranxzpH3q1gGmICUjEUnNrMIBFeZRw8hBfCPhT+VnuY8+mG2l/yEyY73J9e6d36CtbFUqDXa12w=="; }; }; "@webassemblyjs/ast-1.11.0" = { @@ -10840,13 +11002,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.935.0" = { + "aws-sdk-2.938.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.935.0"; + version = "2.938.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.935.0.tgz"; - sha512 = "OeoqkZ0fXPC1xjumoFQmPccASXmGBBNBsI3l9vs/NCQk3WyBfiYh07H6RO5owtCmp0a8hAjKSZAHjnRe2JlmEA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.938.0.tgz"; + sha512 = "e+KWYRyJ4Tvlg+6kQTze9Hxmkn+4/H8m+D8AXlfgUbtzyc1OBDf7cMCcl8IvCD3xoqELsgEunPC014v2JTTfZg=="; }; }; "aws-sign2-0.6.0" = { @@ -11227,13 +11389,13 @@ let sha512 = "Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg=="; }; }; - "babel-plugin-styled-components-1.12.0" = { + "babel-plugin-styled-components-1.13.1" = { name = "babel-plugin-styled-components"; packageName = "babel-plugin-styled-components"; - version = "1.12.0"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.12.0.tgz"; - sha512 = "FEiD7l5ZABdJPpLssKXjBUJMYqzbcNzBowfXDCdJhOpbhWiewapUaY+LZGT8R4Jg2TwOjGjG4RKeyrO5p9sBkA=="; + url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.13.1.tgz"; + sha512 = "iY11g5orsdBnvWtXKCFBzDyTxZ9jvmkcYCCs5ONlvASYltDRhieCVzeDC7Do0fSW7psAL0zfVoXB3FHz2CkUSg=="; }; }; "babel-plugin-syntax-flow-6.18.0" = { @@ -12514,13 +12676,13 @@ let sha1 = "f962d687ec2c369570ae71af843256e6d0ca1129"; }; }; - "blessed-contrib-4.9.0" = { + "blessed-contrib-4.10.0" = { name = "blessed-contrib"; packageName = "blessed-contrib"; - version = "4.9.0"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.9.0.tgz"; - sha512 = "lqvb+6WeqMh7AO8zudSDnvKPGqzkmxqMAwpv83qzeL35MfmROkmjwnY3pi5dvgxfwg5i1UJnDMpj8OroCqpAPw=="; + url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.10.0.tgz"; + sha512 = "NbMkaBNPNZikQo5XBKsXTGIu/gxAywRANHPt2Zc4oFmtiXGHgAGgl6Q6mg6sr9SvG08zidPxokRDcgso+HGmzw=="; }; }; "blgr-0.1.8" = { @@ -13981,6 +14143,15 @@ let sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; }; }; + "cache-chunk-store-3.2.2" = { + name = "cache-chunk-store"; + packageName = "cache-chunk-store"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cache-chunk-store/-/cache-chunk-store-3.2.2.tgz"; + sha512 = "2lJdWbgHFFxcSth9s2wpId3CR3v1YC63KjP4T9WhpW7LWlY7Hiiei3QwwqzkWqlJTfR8lSy9F5kRQECeyj+yQA=="; + }; + }; "cache-directory-2.0.0" = { name = "cache-directory"; packageName = "cache-directory"; @@ -14278,13 +14449,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001240" = { + "caniuse-lite-1.0.30001241" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001240"; + version = "1.0.30001241"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001240.tgz"; - sha512 = "nb8mDzfMdxBDN7ZKx8chWafAdBp5DAAlpWvNyUGe5tcDWd838zpzDN3Rah9cjCqhfOKkrvx40G2SDtP0qiWX/w=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001241.tgz"; + sha512 = "1uoSZ1Pq1VpH0WerIMqwptXHNNGfdl7d1cJUFs80CwQ/lVzdhTvsFZCeNFslze7AjsQnb4C85tzclPa1VShbeQ=="; }; }; "canvas-2.8.0" = { @@ -15340,6 +15511,15 @@ let 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"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-progress-footer/-/cli-progress-footer-1.1.1.tgz"; + sha512 = "J0uW2u06pWI0tMKCbcCiMOZd8TbWj4EpuYgPo4Jiwih/FfGbd4dbLcJieO0Ior1pY1HBrnmCuHFk6GB9azE4pg=="; + }; + }; "cli-spinner-0.2.10" = { name = "cli-spinner"; packageName = "cli-spinner"; @@ -16195,15 +16375,6 @@ let sha512 = "GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw=="; }; }; - "command-exists-1.2.6" = { - name = "command-exists"; - packageName = "command-exists"; - version = "1.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/command-exists/-/command-exists-1.2.6.tgz"; - sha512 = "Qst/zUUNmS/z3WziPxyqjrcz09pm+2Knbs5mAZL4VAE0sSrNY1/w8+/YxeHcoBTsO6iojA6BW7eFf27Eg2MRuw=="; - }; - }; "command-exists-1.2.9" = { name = "command-exists"; packageName = "command-exists"; @@ -16960,13 +17131,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.92" = { + "constructs-3.3.94" = { name = "constructs"; packageName = "constructs"; - version = "3.3.92"; + version = "3.3.94"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.92.tgz"; - sha512 = "fy4mwH1yyNZe+fykEsVeBYhBI2GNYBoJoRS3St8Scl/RcoFUj1inHvxMDrcRHm78K0kZ/U1oZ5gzuMHBnQxWlQ=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.94.tgz"; + sha512 = "P2Sfaa+CHt6lVlIdSry4hj1cQsg71J7eXJm9zyPpZNi/FDeHu/vcOmon84v8effvBoF5e7ef2tfVCwwMXcu9Jw=="; }; }; "consume-http-header-1.0.0" = { @@ -17042,13 +17213,13 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "contentful-management-7.25.1" = { + "contentful-management-7.27.0" = { name = "contentful-management"; packageName = "contentful-management"; - version = "7.25.1"; + version = "7.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.25.1.tgz"; - sha512 = "V8tcSHw3MwWKWHWMW+AZB6lP31hreos+v2gtayZczWXYRcfd+owt+qVjbkLZk1pL80ewSmc8Pl1A7rM/oB2ldw=="; + url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.27.0.tgz"; + sha512 = "HGwUmR0160TI9RNiqLWjlFpPmjiXGC2VAgtzqM0mXMCJKJTzLBmsETVycQ7Nwip+2+CHdDRta5a9vQEN89UNTw=="; }; }; "contentful-sdk-core-6.8.0" = { @@ -17474,31 +17645,31 @@ let sha512 = "SaMnchL//WwU2Ot1hhkPflE8gzo7uq1FGvUJ8GKmi3TOU7rGTHIU+eir1WGf6qOtTyxdfdcp10yPdGZ59sQ3hw=="; }; }; - "core-js-3.15.1" = { + "core-js-3.15.2" = { name = "core-js"; packageName = "core-js"; - version = "3.15.1"; + version = "3.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.15.1.tgz"; - sha512 = "h8VbZYnc9pDzueiS2610IULDkpFFPunHwIpl8yRwFahAEEdSpHlTy3h3z3rKq5h11CaUdBEeRViu9AYvbxiMeg=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.15.2.tgz"; + sha512 = "tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q=="; }; }; - "core-js-compat-3.15.1" = { + "core-js-compat-3.15.2" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.15.1"; + version = "3.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.15.1.tgz"; - sha512 = "xGhzYMX6y7oEGQGAJmP2TmtBLvR4nZmRGEcFa3ubHOq5YEp51gGN9AovVa0AoujGZIq+Wm6dISiYyGNfdflYww=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.15.2.tgz"; + sha512 = "Wp+BJVvwopjI+A1EFqm2dwUmWYXrvucmtIB2LgXn/Rb+gWPKYxtmb4GKHGKG/KGF1eK9jfjzT38DITbTOCX/SQ=="; }; }; - "core-js-pure-3.15.1" = { + "core-js-pure-3.15.2" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.15.1"; + version = "3.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.15.1.tgz"; - sha512 = "OZuWHDlYcIda8sJLY4Ec6nWq2hRjlyCqCZ+jCflyleMkVt3tPedDVErvHslyS2nbO+SlBFMSBJYvtLMwxnrzjA=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.15.2.tgz"; + sha512 = "D42L7RYh1J2grW8ttxoY1+17Y4wXZeKe7uyplAI3FkNQyI5OgBIAjUfFiTPfL1rs0qLpxaabITNbjKl1Sp82tA=="; }; }; "core-util-is-1.0.2" = { @@ -21560,13 +21731,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.759" = { + "electron-to-chromium-1.3.765" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.759"; + version = "1.3.765"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.759.tgz"; - sha512 = "nM76xH0t2FBH5iMEZDVc3S/qbdKjGH7TThezxC8k1Q7w7WHvIAyJh8lAe2UamGfdRqBTjHfPDn82LJ0ksCiB9g=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.765.tgz"; + sha512 = "4NhcsfZYlr1x4FehYkK+R9CNNTOZ8vLcIu8Y1uWehxYp5r/jlCGAfBqChIubEfdtX+rBQpXx4yJuX/dzILH/nw=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -22732,6 +22903,15 @@ let sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; }; }; + "eslint-visitor-keys-3.0.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.0.0.tgz"; + sha512 = "mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q=="; + }; + }; "esmangle-1.0.1" = { name = "esmangle"; packageName = "esmangle"; @@ -22786,6 +22966,15 @@ let sha512 = "v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g=="; }; }; + "espree-8.0.0" = { + name = "espree"; + packageName = "espree"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/espree/-/espree-8.0.0.tgz"; + sha512 = "y/+i23dwTjIDJrYCcjcAMr3c3UGbPIjC6THMQKjWmhP97fW0FPiI89kmpKfmgV/5jrkIi6toQP+CMm3qBE1Hig=="; + }; + }; "esprima-1.1.1" = { name = "esprima"; packageName = "esprima"; @@ -24676,13 +24865,13 @@ let sha512 = "LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg=="; }; }; - "filesize-6.3.0" = { + "filesize-6.4.0" = { name = "filesize"; packageName = "filesize"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-6.3.0.tgz"; - sha512 = "ytx0ruGpDHKWVoiui6+BY/QMNngtDQ/pJaFwfBpQif0J63+E8DLdFyqS3NkKQn7vIruUEpoGD9JUJSg7Kp+I0g=="; + url = "https://registry.npmjs.org/filesize/-/filesize-6.4.0.tgz"; + sha512 = "mjFIpOHC4jbfcTfoh4rkWpI31mF7viw9ikj/JyLoKzqlwG/YsefKfvYlYhdYdg/9mtK2z1AzgN/0LvVQ3zdlSQ=="; }; }; "filestream-5.0.0" = { @@ -25054,13 +25243,13 @@ let sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; }; }; - "flatted-3.1.1" = { + "flatted-3.2.0" = { name = "flatted"; packageName = "flatted"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz"; - sha512 = "zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.0.tgz"; + sha512 = "XprP7lDrVT+kE2c2YlfiV+IfS9zxukiIOvNamPNsImNhXadSsQEbosItdL9bUQlCZXR13SvPk20BjWSWLA7m4A=="; }; }; "flatten-0.0.1" = { @@ -26629,13 +26818,13 @@ let sha512 = "kbuvus1dWQB2sSW4cbfTeGpCMd8ge9jx9RKnhXhuJ7tnvT+NIrTVfYZxjtflZddQYcmdOTlkAcjmx7bor+15AQ=="; }; }; - "git-url-parse-11.4.4" = { + "git-url-parse-11.5.0" = { name = "git-url-parse"; packageName = "git-url-parse"; - version = "11.4.4"; + version = "11.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.4.4.tgz"; - sha512 = "Y4o9o7vQngQDIU9IjyCmRJBin5iYjI5u9ZITnddRZpD7dcCFQj2sL2XuMNbLRE4b4B/4ENPsp2Q8P44fjAZ0Pw=="; + url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.5.0.tgz"; + sha512 = "TZYSMDeM37r71Lqg1mbnMlOqlHd7BSij9qN7XwTkRqSAYFMihGLGhfHwgqQob3GUhEneKnV4nskN9rbQw2KGxA=="; }; }; "gitconfiglocal-1.0.0" = { @@ -27161,15 +27350,6 @@ let sha1 = "2edeeb958084d0f8ea7988e5d995b1c7dfc14777"; }; }; - "goldengate-10.0.6" = { - name = "goldengate"; - packageName = "goldengate"; - version = "10.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/goldengate/-/goldengate-10.0.6.tgz"; - sha512 = "6nwFndjr71Od5XL53oVtlwf3gk8EI/zkKrcjeRAS/G6XLFzPsrOe4npeuom+mgkfgE0rRJFtoOY0wrYgDGuYSg=="; - }; - }; "goldengate-10.1.0" = { name = "goldengate"; packageName = "goldengate"; @@ -27197,13 +27377,13 @@ let sha512 = "Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ=="; }; }; - "google-auth-library-7.1.2" = { + "google-auth-library-7.2.0" = { name = "google-auth-library"; packageName = "google-auth-library"; - version = "7.1.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.1.2.tgz"; - sha512 = "FMipHgfe2u1LzWsf2n9zEB9KsJ8M3n8OYTHbHtlkzPCyo7IknXQR5X99nfvwUHGuX+iEpihUZxDuPm7+qBYeXg=="; + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.2.0.tgz"; + sha512 = "F5mnidUaIXfZZl2FzhZOhboLNR6pIgIPrmP4QAbDKMy+kkb3GOc4r7KndAV9+Kx3VijrQTi4FI/AMLg8VWG6nw=="; }; }; "google-closure-compiler-js-20170910.0.1" = { @@ -30213,6 +30393,15 @@ let sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6"; }; }; + "into-stream-6.0.0" = { + name = "into-stream"; + packageName = "into-stream"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/into-stream/-/into-stream-6.0.0.tgz"; + sha512 = "XHbaOAvP+uFKUFsOgoNPRjLkwB+I22JFPFe5OjTkQ0nwgj6+pSjb4NmB6VMxaPshLiOf+zcpOCBQuLwC1KHhZA=="; + }; + }; "invariant-2.2.4" = { name = "invariant"; packageName = "invariant"; @@ -30276,6 +30465,15 @@ let sha512 = "b1yeWevW04/jMmkzJ3Fk91d8cAd+pYYg/w0S7XCGAI4yo8jSnAD+S4oAWjfFkwNa+GV8WwCOTDuotWcI5md87A=="; }; }; + "invoices-2.0.0" = { + name = "invoices"; + packageName = "invoices"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invoices/-/invoices-2.0.0.tgz"; + sha512 = "UnU0bS3+cMA2UvYrF5RXp/Hm7v/nYiA3F0GVCOeRmDiZmXAt/eO7KdqyRzewopvhBlev7F7t7GZzRRYY1XE3xg=="; + }; + }; "iota-array-1.0.0" = { name = "iota-array"; packageName = "iota-array"; @@ -32220,13 +32418,13 @@ let sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; }; }; - "jest-worker-27.0.2" = { + "jest-worker-27.0.6" = { name = "jest-worker"; packageName = "jest-worker"; - version = "27.0.2"; + version = "27.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.2.tgz"; - sha512 = "EoBdilOTTyOgmHXtw/cPc+ZrCA0KJMrkXzkrPGNwLmnvvlN1nj7MPrxpT7m+otSv2e1TLaVffzDnE/LB14zJMg=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.6.tgz"; + sha512 = "qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA=="; }; }; "jimp-0.12.1" = { @@ -32238,13 +32436,13 @@ let sha512 = "0soPJif+yjmzmOF+4cF2hyhxUWWpXpQntsm2joJXFFoRcQiPzsG4dbLKYqYPT3Fc6PjZ8MaLtCkDqqckVSfmRw=="; }; }; - "jitdb-3.1.4" = { + "jitdb-3.1.5" = { name = "jitdb"; packageName = "jitdb"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/jitdb/-/jitdb-3.1.4.tgz"; - sha512 = "UEzC68eqFIQJPQnmPm2/KGirX2pE+GebhA2EZss3b0UZZca7eGgxpvQ7+sIPcwLKAcZr5rmkFhQHGIQJyf20bg=="; + url = "https://registry.npmjs.org/jitdb/-/jitdb-3.1.5.tgz"; + sha512 = "O3z6dmk4FY+Il3zt4CEnDwgbCWP89dsGvCK1Gx7pVOSsKML31WupDJMTICZ3PUagYi52NNUhvCZHUeJVJFdgTA=="; }; }; "jju-1.4.0" = { @@ -32688,13 +32886,13 @@ let sha512 = "ChFg5qhvxCaM2bspCqizs48yMtsm5YLHjBoNZLCkbXyc3yMM5l8pnn787B5ww5TI3+tKxKYWkbiKf356kQ1OgQ=="; }; }; - "jsii-srcmak-0.1.295" = { + "jsii-srcmak-0.1.297" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.295"; + version = "0.1.297"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.295.tgz"; - sha512 = "xqi5ItFZktdHGzc2XsgNhHsz7egFoFxMpnT0r3ZIbdS6CI1GgBChLEnwxlrE1D6L7c4O4CUImczWgA8b63adPA=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.297.tgz"; + sha512 = "CeBsxrdz22C7j7CyO0hqlz/T6MjpeR1jKy1wY5BHyKXc8mSCoTQDuCMHnmTGg9ifiuRUbOsNSbPMiHYEq2sanQ=="; }; }; "json-bigint-0.2.3" = { @@ -32994,13 +33192,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.262" = { + "json2jsii-0.1.264" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.262"; + version = "0.1.264"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.262.tgz"; - sha512 = "EuPkRDhoG5nH95KzXeDrD6ZExFQp6wwRHsz/h1+hrcRBMX5xusEx0kJoYx7R65i7WNavIw/zdJzVVPwhEl+qHw=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.264.tgz"; + sha512 = "IOe1PBV1h7feIUXO3HMRwK56TntzfEeRTMYMWwZYjRwZD6cbBS9yLsteW2fSlnhBVWkJsgZWQPP931aCulPBxw=="; }; }; "json3-3.2.6" = { @@ -33832,13 +34030,13 @@ let sha512 = "Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw=="; }; }; - "lambda-local-1.7.4" = { + "lambda-local-2.0.0" = { name = "lambda-local"; packageName = "lambda-local"; - version = "1.7.4"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lambda-local/-/lambda-local-1.7.4.tgz"; - sha512 = "uLrFPGj2//glOgJGLZn8hNTNlhU+eGx0WFRLZxIoC39nfjLRZ1fncHcPK2t5gA2GcvgtGUT2dnw60M8vJAOIkQ=="; + url = "https://registry.npmjs.org/lambda-local/-/lambda-local-2.0.0.tgz"; + sha512 = "5Z7ZEhqVYJSm3djoq7QLDkEk7Ao+jNYbARo3nk3wtjKpgCnEbzOuraxDPDWg7OlZ4JKcsRDP+wNLeORMdbF2ow=="; }; }; "last-call-webpack-plugin-3.0.0" = { @@ -34354,6 +34552,15 @@ let sha512 = "bD57EjMVMBplyEMjXDMo8MvBfPymufU81kYbixqrvaLHoqsmyTMwLzqpa4CurJ5YKAXLJw68ZReDzDb6rj90Sg=="; }; }; + "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"; @@ -34498,13 +34705,13 @@ let sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; }; }; - "ln-accounting-4.3.0" = { + "ln-accounting-4.3.1" = { name = "ln-accounting"; packageName = "ln-accounting"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-4.3.0.tgz"; - sha512 = "JfnHWP6hNmA5DCx0OHq7WKwiwPKyD1lb7GPmRqg0NFr8jj9p/PNnxayfjRD2PsmA5C3OxXO53wCy1XymG4I8+Q=="; + url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-4.3.1.tgz"; + sha512 = "EBEeBymqktoaViGAG5aVmgIOZpWc6IwDqxq93ZYYIw+Uc9Vy/86nUDPx8A/jJC0f8lwEGcqT+hnSIiBF4SyqeA=="; }; }; "ln-service-51.8.2" = { @@ -34525,6 +34732,15 @@ let sha512 = "8jTfQWtdAJJ2pipprNnUrUUpMxq6wQpT1bhN+ZwyMCdHVo72r58TrFoy0UQsutbgN9OjHMHSsBoyTd5cPmUfWA=="; }; }; + "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-sync-0.4.5" = { name = "ln-sync"; packageName = "ln-sync"; @@ -36946,13 +37162,13 @@ let sha512 = "34RwOXZT8kyuOJy25oJNJoulO8L0bTHYWXcdZBYZqFnjIy3NgjeoM3FmPXIOFQ26/lSHYMr8oc62B6adxXcb3Q=="; }; }; - "markdown-it-12.0.6" = { + "markdown-it-12.1.0" = { name = "markdown-it"; packageName = "markdown-it"; - version = "12.0.6"; + version = "12.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it/-/markdown-it-12.0.6.tgz"; - sha512 = "qv3sVLl4lMT96LLtR7xeRJX11OUFjsaD5oVat2/SNBIb21bJXwal2+SklcRbTwGwqWpWH/HRtYavOoJE+seL8w=="; + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-12.1.0.tgz"; + sha512 = "7temG6IFOOxfU0SgzhqR+vr2diuMhyO5uUIEZ3C5NbXhqC9uFUHoU41USYuDFoZRsaY7BEIEei874Z20VMLF6A=="; }; }; "markdown-it-8.4.2" = { @@ -40728,13 +40944,13 @@ let sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b"; }; }; - "node-ipc-9.1.4" = { + "node-ipc-9.2.0" = { name = "node-ipc"; packageName = "node-ipc"; - version = "9.1.4"; + version = "9.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-ipc/-/node-ipc-9.1.4.tgz"; - sha512 = "A+f0mn2KxUt1uRTSd5ktxQUsn2OEhj5evo7NUi/powBzMSZ0vocdzDjlq9QN2v3LH6CJi3e5xAenpZ1QwU5A8g=="; + url = "https://registry.npmjs.org/node-ipc/-/node-ipc-9.2.0.tgz"; + sha512 = "m4A/wueUS2PqrhM6Z8rzD1J2qvG4QG8NkKY0v3lgdntQI2NTDDL3YbfU6qkDc0RgUiA9UqZTO9CtIiDAIjrVwA=="; }; }; "node-libs-browser-2.2.1" = { @@ -41223,15 +41439,6 @@ let sha512 = "U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="; }; }; - "normalize-url-4.5.0" = { - name = "normalize-url"; - packageName = "normalize-url"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz"; - sha512 = "2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ=="; - }; - }; "normalize-url-4.5.1" = { name = "normalize-url"; packageName = "normalize-url"; @@ -42421,13 +42628,13 @@ let sha512 = "Su8jA45PhegUgJnEAT15DYt2spPJgvjyTtXqg+Lw5AtGePfcQskV6ACEzsL0XPoAXIFf09Vx6sBor9pek+tl+Q=="; }; }; - "openapi-sampler-1.0.1" = { + "openapi-sampler-1.1.0" = { name = "openapi-sampler"; packageName = "openapi-sampler"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.0.1.tgz"; - sha512 = "qBjxkSLJV183zTTs4fgxtU/iWSLUUu2aH2+5ddWkNhV7p8CSe/mnAgoLkEbMfHtel6yr9NF+vjUWqfM+iiwORQ=="; + url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.1.0.tgz"; + sha512 = "/LhZYKNBWphLEpbAG5BdpBZbIbmLgC4vTiTj8N/MV0LF9ptmKOiJ2nETVlacNjXHt7iqDgZDELJCIoZ3q5ZG6A=="; }; }; "openapi-schema-validator-3.0.3" = { @@ -42997,13 +43204,13 @@ let sha512 = "BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="; }; }; - "p-debounce-1.0.0" = { + "p-debounce-2.1.0" = { name = "p-debounce"; packageName = "p-debounce"; - version = "1.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-debounce/-/p-debounce-1.0.0.tgz"; - sha1 = "cb7f2cbeefd87a09eba861e112b67527e621e2fd"; + url = "https://registry.npmjs.org/p-debounce/-/p-debounce-2.1.0.tgz"; + sha512 = "M9bMt62TTnozdZhqFgs+V7XD2MnuKCaz+7fZdlu2/T7xruI3uIE5CicQ0vx1hV7HIUYF0jF+4/R1AgfOkl74Qw=="; }; }; "p-defer-1.0.0" = { @@ -43096,6 +43303,15 @@ let sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="; }; }; + "p-is-promise-3.0.0" = { + name = "p-is-promise"; + packageName = "p-is-promise"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-3.0.0.tgz"; + sha512 = "Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ=="; + }; + }; "p-limit-1.3.0" = { name = "p-limit"; packageName = "p-limit"; @@ -43870,13 +44086,13 @@ let sha1 = "32d4b6afde631420e5f415919a222b774b575707"; }; }; - "parse-url-5.0.6" = { + "parse-url-5.0.7" = { name = "parse-url"; packageName = "parse-url"; - version = "5.0.6"; + version = "5.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/parse-url/-/parse-url-5.0.6.tgz"; - sha512 = "nZp+U7NFVTsBXTh6oGxdwvd7ncz3hJCl74q0lC0pLc3ypXJMKFUpfUEAd4r1x8zVVF5UHFik+CBNOQKN0ayByA=="; + url = "https://registry.npmjs.org/parse-url/-/parse-url-5.0.7.tgz"; + sha512 = "CgbjyWT6aOh2oNSUS0cioYQsGysj9hQ2IdbOfeNwq5KOaKM7dOw/yTupiI0cnJhaDHJEIGybPkQz7LF9WNIhyw=="; }; }; "parse5-1.5.1" = { @@ -44095,13 +44311,13 @@ let sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee"; }; }; - "passport-oauth2-1.5.0" = { + "passport-oauth2-1.6.0" = { name = "passport-oauth2"; packageName = "passport-oauth2"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.5.0.tgz"; - sha512 = "kqBt6vR/5VlCK8iCx1/KpY42kQ+NEHZwsSyt4Y6STiNjU+wWICG1i8ucc1FapXDGO15C5O5VZz7+7vRzrDPXXQ=="; + url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.6.0.tgz"; + sha512 = "emXPLqLcVEcLFR/QvQXZcwLmfK8e9CqvMgmOFJxcNT3okSFMtUbRRKpY20x5euD+01uHsjjCa07DYboEeLXYiw=="; }; }; "passport-oauth2-client-password-0.1.2" = { @@ -44851,6 +45067,15 @@ let sha512 = "NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA=="; }; }; + "pkg-fetch-3.1.1" = { + name = "pkg-fetch"; + packageName = "pkg-fetch"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.1.1.tgz"; + sha512 = "3GfpNwbwoTxge2TrVp6Oyz/FZJOoxF1r0+1YikOhnBXa2Di/VOJKtUObFHap76BFnyFo1fwh5vARWFR9TzLKUg=="; + }; + }; "pkg-up-2.0.0" = { name = "pkg-up"; packageName = "pkg-up"; @@ -45887,6 +46112,15 @@ let sha512 = "s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg=="; }; }; + "prebuild-install-6.0.1" = { + name = "prebuild-install"; + packageName = "prebuild-install"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.0.1.tgz"; + sha512 = "7GOJrLuow8yeiyv75rmvZyeMGzl8mdEX5gY69d6a6bHWmiPevwqFw+tQavhK0EYMaSg3/KD24cWqeQv1EWsqDQ=="; + }; + }; "prebuild-install-6.1.3" = { name = "prebuild-install"; packageName = "prebuild-install"; @@ -46364,6 +46598,24 @@ 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"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/process-utils/-/process-utils-4.0.0.tgz"; + sha512 = "fMyMQbKCxX51YxR7YGCzPjLsU3yDzXFkP4oi1/Mt5Ixnk7GO/7uUTj8mrCHUwuvozWzI+V7QSJR9cZYnwNOZPg=="; + }; + }; "progress-1.1.8" = { name = "progress"; packageName = "progress"; @@ -47732,13 +47984,13 @@ let sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; }; }; - "puppeteer-10.0.0" = { + "puppeteer-10.1.0" = { name = "puppeteer"; packageName = "puppeteer"; - version = "10.0.0"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-10.0.0.tgz"; - sha512 = "AxHvCb9IWmmP3gMW+epxdj92Gglii+6Z4sb+W+zc2hTTu10HF0yg6hGXot5O74uYkVqG3lfDRLfnRpi6WOwi5A=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-10.1.0.tgz"; + sha512 = "bsyDHbFBvbofZ63xqF7hMhuKBX1h4WsqFIAoh1GuHr/Y9cewh+EFNAOdqWSkQRHLiBU/MY6M+8PUnXXjAPtuSg=="; }; }; "purgecss-2.3.0" = { @@ -47786,13 +48038,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.153" = { + "pyright-1.1.154" = { name = "pyright"; packageName = "pyright"; - version = "1.1.153"; + version = "1.1.154"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.153.tgz"; - sha512 = "t5Y9IojL2Sifm1Q04BEBJDLP86rF4RpXma28HEP/EXJRHyyNxu8css77HC+tZqJXXXZVtAjaJxJSAEwq5afGjg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.154.tgz"; + sha512 = "J2P5Iurkl7smCyB8CH5fsm8GOGeKRk7d1HWcFiro94E0vJW/5sSKXrkfjPxo7XZ+e96UiW1qyiVTCC++db3Tfg=="; }; }; "q-0.9.7" = { @@ -50432,13 +50684,13 @@ let sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; }; }; - "retry-request-4.2.0" = { + "retry-request-4.2.1" = { name = "retry-request"; packageName = "retry-request"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/retry-request/-/retry-request-4.2.0.tgz"; - sha512 = "rIwHm2pipUX7MFTpscNr9CNfOsW3gzcosqUOvS7MbuURgdDeIzNVjA/sNgs4BTt0g3L748hB7Q/Yt6StRFHD4w=="; + url = "https://registry.npmjs.org/retry-request/-/retry-request-4.2.1.tgz"; + sha512 = "afiCoZZ7D/AR2mf+9ajr75dwGFgWmPEshv3h+oKtf9P1AsHfHvcVXumdbAEq2qNy4UXFEXsEX5HpyGj4axvoaA=="; }; }; "reusify-1.0.4" = { @@ -50639,13 +50891,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.52.3" = { + "rollup-2.52.7" = { name = "rollup"; packageName = "rollup"; - version = "2.52.3"; + version = "2.52.7"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.52.3.tgz"; - sha512 = "QF3Sju8Kl2z0osI4unyOLyUudyhOMK6G0AeqJWgfiyigqLAlnNrfBcDWDx+f1cqn+JU2iIYVkDrgQ6/KtwEfrg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.52.7.tgz"; + sha512 = "55cSH4CCU6MaPr9TAOyrIC+7qFCHscL7tkNsm1MBfIJRRqRbCEY0mmeFn4Wg8FKsHtEH8r389Fz38r/o+kgXLg=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -52808,13 +53060,13 @@ let sha512 = "XYjhOTRPFA7NfDUsH6uH1fbML2OgSFsqdUPbud7x01urNP9CHXgUgAD4NhKMi3dVQK+7IdYadWt0wrFWw4y+qg=="; }; }; - "snyk-python-plugin-1.19.9" = { + "snyk-python-plugin-1.19.11" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.19.9"; + version = "1.19.11"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.9.tgz"; - sha512 = "vkqBJP+wOtrBKpqrFRP5EfAs5wZ/fGNI14Mb+EMnmu+ebP1ze9AnHxfiqMl/+ITzeYElZ2H5DX9sXXiqpJRhRg=="; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.11.tgz"; + sha512 = "zUKbSbw+wU1FCUDYt+IDjaES0pc1UKBECOqjHSJMxWm9VhstvPtI4KccetwOfne2oUcmaEJJvcEp4s9VTK04XQ=="; }; }; "snyk-resolve-1.1.0" = { @@ -54158,13 +54410,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.15" = { + "sscaff-1.2.17" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.15"; + version = "1.2.17"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.15.tgz"; - sha512 = "yGGLgLcLpd/wCs01BGWZwkT9s5qsvpUXm2+DQ0aBGCCPvA/eJbC7aNCL3eips1R3z/XJ9R7azWvi7VhCMeg/Dg=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.17.tgz"; + sha512 = "0QF6J4B6lJKXKuUdiRDm576Ix1nVO3hdiHZYwEQJujcshJriHnny8kpOch1L6VykLPifg2g3hkHKas6WuNkqsg=="; }; }; "ssh-config-1.1.6" = { @@ -54662,6 +54914,15 @@ let sha512 = "y+ChhCov2A5nDqC2aZ6HKXs3OvDlvAp0Ps3BF1P/Iv8tUZJQQsMVaSzk0WryVTVoGITKv01UYahCXMpAs7I0lQ=="; }; }; + "stream-meter-1.0.4" = { + name = "stream-meter"; + packageName = "stream-meter"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-meter/-/stream-meter-1.0.4.tgz"; + sha1 = "52af95aa5ea760a2491716704dbff90f73afdd1d"; + }; + }; "stream-parser-0.3.1" = { name = "stream-parser"; packageName = "stream-parser"; @@ -55949,13 +56210,13 @@ let sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; }; }; - "swagger-ui-dist-3.51.0" = { + "swagger-ui-dist-3.51.1" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.51.0"; + version = "3.51.1"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.51.0.tgz"; - sha512 = "DX8RuAyXBjd2J4mjCLLUaodbtZ2z6dF05l6IF3hO++erXM+CR3QVX9TqYX3374hW5BOeLrr7gujoSdY8jIvI2A=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.51.1.tgz"; + sha512 = "df2mEeVgnJp/FcXY3DRh3CsTfvHVTaO6g3FJP/kfwhxfOD1+YTXqBZrOIIsYTPtcRIFBkCAto0NFCxAV4XFRbw=="; }; }; "swagger2openapi-7.0.7" = { @@ -58533,13 +58794,13 @@ let sha512 = "7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="; }; }; - "typegram-3.3.1" = { + "typegram-3.4.0" = { name = "typegram"; packageName = "typegram"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/typegram/-/typegram-3.3.1.tgz"; - sha512 = "Y1bR17IZ9Shj1Ih8wTLtrmOOMHJ20ve0Bd5SPymmw53uO4WLp/JjNM55s2b6PEziBvMISRdCQSZ+m6JiUKEobA=="; + url = "https://registry.npmjs.org/typegram/-/typegram-3.4.0.tgz"; + sha512 = "GUE1LV3LJruTThJaUBUvTnaEpTswFhuxhEx9LaVLIA6WRw9CdPQmb87OIA0rCvoMSPBC8gZiHrrPqX9VJGDXwQ=="; }; }; "typescript-2.9.2" = { @@ -58605,13 +58866,13 @@ let sha512 = "qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw=="; }; }; - "typescript-4.3.4" = { + "typescript-4.3.5" = { name = "typescript"; packageName = "typescript"; - version = "4.3.4"; + version = "4.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.3.4.tgz"; - sha512 = "uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz"; + sha512 = "DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA=="; }; }; "typescript-eslint-parser-16.0.1" = { @@ -59109,13 +59370,13 @@ let sha512 = "JCrmN13jI4+h9UAyKEoGcDZV+i1E7BLFuG7OsaDvTXI5P0qhHX+vZO/kOhz9jn8HGENDKbwSeB0nVOg4gVStGA=="; }; }; - "unified-9.2.1" = { + "unified-9.2.2" = { name = "unified"; packageName = "unified"; - version = "9.2.1"; + version = "9.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/unified/-/unified-9.2.1.tgz"; - sha512 = "juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA=="; + url = "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz"; + sha512 = "Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ=="; }; }; "unified-diff-3.1.0" = { @@ -59136,13 +59397,13 @@ let sha512 = "iDJYH82TgcezQA4IZzhCNJQx7vBsGk4h9s4Q7Fscrb3qcPsxBqVrVNYez2W3sBVTxuU1bFAhyRpA6ba/R4j93A=="; }; }; - "unified-engine-8.1.0" = { + "unified-engine-8.2.0" = { name = "unified-engine"; packageName = "unified-engine"; - version = "8.1.0"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/unified-engine/-/unified-engine-8.1.0.tgz"; - sha512 = "ptXTWUf9HZ2L9xto7tre+hSdSN7M9S0rypUpMAcFhiDYjrXLrND4If+8AZOtPFySKI/Zhfxf7GVAR34BqixDUA=="; + url = "https://registry.npmjs.org/unified-engine/-/unified-engine-8.2.0.tgz"; + sha512 = "ZlMm62ejrf+tJHdyOjQfljszngQjRor95q2XZMGk6rpJUYi7ZIHY/EXEhOcj9PZkMKKdLIM+dqL4s0ceyk9wbA=="; }; }; "unified-message-control-3.0.3" = { @@ -60271,13 +60532,13 @@ let sha512 = "vRAKaS8WcYNgzbxyH2LdheqgL4sQLis8LXl7r/mN+O4mpWlUpoCsTtietxepLrft2q0TFA2gaIvSWN1iRkzW/w=="; }; }; - "utp-native-2.5.1" = { + "utp-native-2.5.3" = { name = "utp-native"; packageName = "utp-native"; - version = "2.5.1"; + version = "2.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-2.5.1.tgz"; - sha512 = "wbrJwR8DZx8N9s1ffTcMuBK7tMBQ9tvKpIL+mWHrDvGUYfV7ivroEGFTXUr4meqy/PVbUdMfURSoBbwuGtt/YQ=="; + url = "https://registry.npmjs.org/utp-native/-/utp-native-2.5.3.tgz"; + sha512 = "sWTrWYXPhhWJh+cS2baPzhaZc89zwlWCfwSthUjGhLkZztyPhcQllo+XVVCbNGi7dhyRlxkWxN4NKU6FbA9Y8w=="; }; }; "uuid-2.0.3" = { @@ -61324,13 +61585,13 @@ let sha512 = "QxI+qV97uD7HHOCjh3MrM1TfbdwmTXrMckri5Tus1/FQiG3baDZb2C9Y0y8QThs7PwHYBIQXcAc59ZveCRZKPA=="; }; }; - "vscode-json-languageservice-4.1.4" = { + "vscode-json-languageservice-4.1.5" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "4.1.4"; + version = "4.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.4.tgz"; - sha512 = "/UqaE58BVFdePM9l971L6xPRLlCLNk01aovf1Pp9hB/8pytmd2s9ZNEnS1JqYyQEJ1k5/fEBsWOdhQlNo4H7VA=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.5.tgz"; + sha512 = "oRVPj2UY6BQ8PQ1LIz/FigUEZQVqsB9msNCFlxRBHE9sSEIJkCbYG6aCB2n7WR17VIisYQdO3MDheuoyI48G2w=="; }; }; "vscode-jsonrpc-3.5.0" = { @@ -61810,13 +62071,13 @@ let sha512 = "8FdXi0gieEwh1IprIBafpiJWcApwrU+l2FEj8c1HtHFdNXMd0+2jUSjBVmcQYohf/E72irwAXEXLga6TQcB3FA=="; }; }; - "vue-eslint-parser-7.6.0" = { + "vue-eslint-parser-7.7.1" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; - version = "7.6.0"; + version = "7.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.6.0.tgz"; - sha512 = "QXxqH8ZevBrtiZMZK0LpwaMfevQi9UL7lY6Kcp+ogWHC88AuwUPwwCIzkOUc1LR4XsYAt/F9yHXAB/QoD17QXA=="; + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.7.1.tgz"; + sha512 = "rUGUCKH5rSGTvF9QlxYXi6MyoSATcrTbLwiCqFuFRhaSJLlDYBmsXJ08xIZoLdsUl/OfCC1ibnkj7SWHRTrStQ=="; }; }; "vue-onsenui-helper-json-1.0.2" = { @@ -62044,13 +62305,13 @@ let sha512 = "n1CfuJcJ+dynIx/fmavB6haPx37N3GZvY5HIGIselymDiSwNRC+8pAxOzoB4eVwUBJnbP3+aA8vWttrAZbgs7A=="; }; }; - "web3-utils-1.3.6" = { + "web3-utils-1.4.0" = { name = "web3-utils"; packageName = "web3-utils"; - version = "1.3.6"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.3.6.tgz"; - sha512 = "hHatFaQpkQgjGVER17gNx8u1qMyaXFZtM0y0XLGH1bzsjMPlkMPLRcYOrZ00rOPfTEuYFOdrpGOqZXVmGrMZRg=="; + url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.4.0.tgz"; + sha512 = "b8mEhwh/J928Xk+SQFjtqrR2EGPhpknWLcIt9aCpVPVRXiqjUGo/kpOHKz0azu9c6/onEJ9tWXZt0cVjmH0N5Q=="; }; }; "webassemblyjs-1.11.0" = { @@ -62134,13 +62395,13 @@ let sha512 = "1xllYVmA4dIvRjHzwELgW4KjIU1fW4PEuEnjsylz7k7H5HgPOctIq7W1jrt3sKH9yG5d72//XWzsHhfoWvsQVg=="; }; }; - "webpack-5.40.0" = { + "webpack-5.42.0" = { name = "webpack"; packageName = "webpack"; - version = "5.40.0"; + version = "5.42.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.40.0.tgz"; - sha512 = "c7f5e/WWrxXWUzQqTBg54vBs5RgcAgpvKE4F4VegVgfo4x660ZxYUF2/hpMkZUnLjgytVTitjeXaN4IPlXCGIw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.42.0.tgz"; + sha512 = "Ln8HL0F831t1x/yPB/qZEUVmZM4w9BnHZ1EQD/sAUHv8m22hthoPniWTXEzFMh/Sf84mhrahut22TX5KxWGuyQ=="; }; }; "webpack-bundle-analyzer-3.9.0" = { @@ -62332,13 +62593,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-1.0.2" = { + "webtorrent-1.1.0" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.0.2.tgz"; - sha512 = "uv9fq5md/98JyeDDyziy1H28Wc/idO80AKv+9pQ4XK0WNNjdE3FMtCKfrvU2VNS1PdAOrA6sFuUq2x0mV7k7WQ=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.1.0.tgz"; + sha512 = "v5TS7MXmNRJqTWv7+a2wE4KGGZI/RyG4XpxWb1oJ4/CwpQaO5mJ5UA6Aj9unVbgEMLpyIy4xcHgOjE82wpyeUQ=="; }; }; "well-known-symbols-2.0.0" = { @@ -63286,6 +63547,15 @@ let sha512 = "6ezXvzOZupqKj4jUqbQ9tXuJNo+BR2gU8fFRk3XCP3e0G6WT414u5ELe6Y0vtp7kmSJ3F7YWObSNr1ESsgi4vw=="; }; }; + "ws-7.5.1" = { + name = "ws"; + packageName = "ws"; + version = "7.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.5.1.tgz"; + sha512 = "2c6faOUH/nhoQN6abwMloF7Iyl0ZS2E9HGtsiLrWn0zOOMWlhtDmdf/uihDt6jnuCxgtwGBNy6Onsoy2s2O2Ow=="; + }; + }; "x-default-browser-0.3.1" = { name = "x-default-browser"; packageName = "x-default-browser"; @@ -63773,13 +64043,13 @@ let sha512 = "2t7FahYnGJys6DpHLhajusId7R0Pm2yTmuL0GV9+mV0ZlaLSnb2toBmppATfg5sWIhZQGlsTLoecSzya+l4EAQ=="; }; }; - "xstate-4.20.1" = { + "xstate-4.20.2" = { name = "xstate"; packageName = "xstate"; - version = "4.20.1"; + version = "4.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/xstate/-/xstate-4.20.1.tgz"; - sha512 = "oLqFEYKUG3Y4t3Pg5tb7ZXz2kZcrRA1inrEVfzDVf1JoBb+KGpKlNaLzxF5bE7swo0xcc8H+B/gdPb1feyO1gg=="; + url = "https://registry.npmjs.org/xstate/-/xstate-4.20.2.tgz"; + sha512 = "HvU+NCYffTOC1oiopNKve3IdLNRpuvNa3tv+fhM8mo9+TGCF35wIMQJON7bWG/2041ySBKw78PW2goV+Ug073w=="; }; }; "xstream-11.14.0" = { @@ -64436,22 +64706,22 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-12.1.0.tgz"; - sha512 = "3xvweF9oiR1X9KlXIFPGQtylctqPi9t7SjI/8M2z/qRP4GkMu2CiScNysWFMdJsNsrRvLGQdtAbJFBWfW1vmkA=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-12.1.1.tgz"; + sha512 = "rQZItn3kpYEX6tH7wquAEhJuxVpW6sYKO2tSi8Suxrm+iz1RPRnfhSwS1WIEumnwpFRtH/8P+lOrScax1ldYkg=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1201.0" - sources."@angular-devkit/core-12.1.0" - sources."@angular-devkit/schematics-12.1.0" + sources."@angular-devkit/architect-0.1201.1" + sources."@angular-devkit/core-12.1.1" + sources."@angular-devkit/schematics-12.1.1" sources."@npmcli/git-2.1.0" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.5" - sources."@schematics/angular-12.1.0" + sources."@schematics/angular-12.1.1" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -65268,7 +65538,7 @@ in sources."@types/estree-0.0.46" sources."@types/json-schema-7.0.7" sources."@types/json5-0.0.29" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" @@ -65306,7 +65576,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.1" @@ -65326,7 +65596,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -65394,7 +65664,7 @@ in sources."is-stream-2.0.0" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" - (sources."jest-worker-27.0.2" // { + (sources."jest-worker-27.0.6" // { dependencies = [ sources."supports-color-8.1.1" ]; @@ -65731,7 +66001,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/normalize-package-data-2.4.0" sources."@types/qs-6.9.6" sources."@types/range-parser-1.2.3" @@ -65746,13 +66016,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.1.2" // { + (sources."@vue/compiler-core-3.1.3" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.1.2" - sources."@vue/shared-3.1.2" + sources."@vue/compiler-dom-3.1.3" + sources."@vue/shared-3.1.3" sources."@wry/equality-0.1.11" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -65874,7 +66144,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.30001240" + sources."caniuse-lite-1.0.30001241" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -65931,12 +66201,12 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.15.1" // { + (sources."core-js-compat-3.15.2" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-js-pure-3.15.1" + sources."core-js-pure-3.15.2" sources."core-util-is-1.0.2" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -66002,7 +66272,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.759" + sources."electron-to-chromium-1.3.765" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -66325,7 +66595,7 @@ in sources."nice-try-1.0.5" sources."node-dir-0.1.17" sources."node-fetch-2.6.1" - sources."node-ipc-9.1.4" + sources."node-ipc-9.2.0" sources."node-modules-regexp-1.0.0" (sources."node-notifier-9.0.1" // { dependencies = [ @@ -66742,7 +67012,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xss-1.0.9" @@ -66968,10 +67238,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.16.2"; + version = "1.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.16.2.tgz"; - sha512 = "9/MIehoAx0KtmGIlH408LVU99ms+JycCCLY+DI1CvI8HwwRxS1d5clbKj/7JmCPm5cRYnD7798x4JDNMVNaSIA=="; + url = "https://registry.npmjs.org/alloy/-/alloy-1.16.3.tgz"; + sha512 = "Y4pSzPpJHovMA6uqpRTztraKFtchQm9rPbYd9s6UkEuqpYs45hFSY4j+ezkvGxU6Hvn2L6OLc+5dlaOr+P+QKQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -67012,18 +67282,18 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.16.6" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colorette-1.2.2" sources."colors-1.4.0" - sources."commander-7.2.0" + sources."commander-8.0.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.759" + sources."electron-to-chromium-1.3.765" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -67117,7 +67387,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -67152,14 +67422,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/yauzl-2.9.1" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.935.0" // { + (sources."aws-sdk-2.938.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -67288,7 +67558,7 @@ in sources."proxy-from-env-1.1.0" sources."pump-3.0.0" sources."punycode-1.3.2" - (sources."puppeteer-10.0.0" // { + (sources."puppeteer-10.1.0" // { dependencies = [ sources."debug-4.3.1" ]; @@ -67363,10 +67633,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "10.4.1"; + version = "10.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.4.1.tgz"; - sha512 = "IuMSykvEN1aMW0E+BvNo1CoTfcO1+EPB59D8NVKkNuoafb+dZbIvk1f9T6UfPEwzlOHdXLOsjmQ5AkBKumwo/A=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.4.3.tgz"; + sha512 = "mphALvASQBcm5CEaLP4BSo+/JFQ9L8i0Hmr7az49RnTFFqeZLuLPx+eac9cTA24sbSK3I9sRtbLYQv59dW/1VQ=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -67379,7 +67649,7 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.3.2" // { dependencies = [ - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" ]; }) sources."@grpc/proto-loader-0.6.2" @@ -67639,7 +67909,9 @@ in sources."global-dirs-3.0.0" (sources."goldengate-10.1.0" // { dependencies = [ + sources."bech32-2.0.0" sources."bn.js-5.2.0" + sources."invoices-1.2.1" sources."ln-service-51.8.2" ]; }) @@ -67701,7 +67973,7 @@ in sources."tmp-0.0.33" ]; }) - (sources."invoices-1.2.1" // { + (sources."invoices-2.0.0" // { dependencies = [ sources."bech32-2.0.0" sources."bn.js-5.2.0" @@ -67750,22 +68022,20 @@ in (sources."lightning-3.3.9" // { dependencies = [ sources."@types/node-15.6.1" + sources."bech32-2.0.0" sources."bn.js-5.2.0" + sources."invoices-1.2.1" ]; }) - (sources."ln-accounting-4.3.0" // { - dependencies = [ - sources."bn.js-5.2.0" - sources."goldengate-10.0.6" - sources."ln-service-51.8.2" - ]; - }) - (sources."ln-service-51.8.4" // { + sources."ln-accounting-4.3.1" + (sources."ln-service-51.8.5" // { dependencies = [ - sources."@types/node-15.12.4" + sources."@grpc/grpc-js-1.3.4" + sources."@grpc/proto-loader-0.6.3" + sources."@types/node-15.12.5" sources."@types/ws-7.4.5" sources."bn.js-5.2.0" - sources."lightning-3.3.11" + sources."lightning-3.3.12" sources."ws-7.5.0" ]; }) @@ -67791,7 +68061,18 @@ in sources."psbt-1.1.8" ]; }) - sources."ln-telegram-3.2.6" + (sources."ln-telegram-3.2.6" // { + dependencies = [ + sources."@types/node-15.12.4" + sources."@types/ws-7.4.5" + sources."bech32-2.0.0" + sources."bn.js-5.2.0" + sources."invoices-1.2.1" + sources."lightning-3.3.11" + sources."ln-service-51.8.4" + sources."ws-7.5.0" + ]; + }) sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.clonedeep-4.5.0" @@ -67876,7 +68157,18 @@ in sources."p-cancelable-1.1.0" sources."p-timeout-4.1.0" sources."package-json-6.5.0" - sources."paid-services-2.0.0" + (sources."paid-services-2.0.0" // { + dependencies = [ + sources."@types/node-15.12.4" + sources."@types/ws-7.4.5" + sources."bech32-2.0.0" + sources."bn.js-5.2.0" + sources."invoices-1.2.1" + sources."lightning-3.3.11" + sources."ln-service-51.8.4" + sources."ws-7.5.0" + ]; + }) sources."parseurl-1.3.3" sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" @@ -67886,13 +68178,16 @@ in sources."prettyjson-1.2.1" (sources."probing-1.3.6" // { dependencies = [ + sources."bech32-2.0.0" + sources."bn.js-5.2.0" + sources."invoices-1.2.1" sources."ln-service-51.8.2" ]; }) sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" ]; }) sources."proxy-addr-2.0.7" @@ -68003,7 +68298,7 @@ in sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."typeforce-1.18.0" - sources."typegram-3.3.1" + sources."typegram-3.4.0" sources."unique-string-2.0.0" sources."unpipe-1.0.0" (sources."update-notifier-5.1.0" // { @@ -68841,7 +69136,7 @@ in sources."lodash-4.17.21" sources."lru-cache-6.0.0" sources."map-obj-4.2.1" - (sources."markdown-it-12.0.6" // { + (sources."markdown-it-12.1.0" // { dependencies = [ sources."argparse-2.0.1" sources."entities-2.1.0" @@ -69069,7 +69364,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -69503,7 +69798,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.3.92" + sources."constructs-3.3.94" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -69576,13 +69871,13 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.295" // { + (sources."jsii-srcmak-0.1.297" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.1.262" + sources."json2jsii-0.1.264" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -69618,7 +69913,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.15" + sources."sscaff-1.2.17" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -69733,7 +70028,7 @@ in sources."commonmark-0.29.3" sources."compress-commons-4.1.1" sources."concat-map-0.0.1" - sources."constructs-3.3.92" + sources."constructs-3.3.94" sources."convert-to-spaces-1.0.2" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" @@ -69852,7 +70147,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.295" // { + (sources."jsii-srcmak-0.1.297" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -69935,7 +70230,7 @@ in sources."slice-ansi-3.0.0" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.15" + sources."sscaff-1.2.17" sources."stack-utils-2.0.3" sources."stream-buffers-3.0.2" (sources."streamroller-2.2.4" // { @@ -69974,7 +70269,7 @@ in sources."widest-line-3.1.0" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xmlbuilder-15.1.1" sources."xmldom-0.6.0" sources."y18n-5.0.8" @@ -70393,7 +70688,7 @@ in sha512 = "7SHQYzpRKPrpaLcTm1UUk1zu9VvFEJKFqxwDIuqv/CL0cBTtEvlsfpVh9DOaMHlZPu8U8Lgyf04bHV/sFS1zJw=="; }; dependencies = [ - sources."typescript-4.3.4" + sources."typescript-4.3.5" ]; buildInputs = globalBuildInputs; meta = { @@ -70481,7 +70776,7 @@ in sources."ms-2.0.0" sources."request-light-0.4.0" sources."vscode-json-languageserver-1.3.4" - (sources."vscode-json-languageservice-4.1.4" // { + (sources."vscode-json-languageservice-4.1.5" // { dependencies = [ sources."vscode-nls-5.0.0" ]; @@ -70832,7 +71127,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { @@ -70894,7 +71189,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.15.1" + sources."core-js-3.15.2" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" sources."cross-spawn-7.0.3" @@ -70930,7 +71225,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -71049,7 +71344,7 @@ in sources."fill-range-2.2.4" sources."find-up-2.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."fragment-cache-0.2.1" @@ -71729,13 +72024,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.152"; + version = "1.1.154"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.152.tgz"; - sha512 = "drJV17TbLxAqfl1oXfab66CW51TxDbbppmP9yM4+NnpDRn/ESYwY0Uf9wp2EzfkfLhoavUTbrB9o/z14FuuScw=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.154.tgz"; + sha512 = "SUaGghNwGq4dD6DFWbmsMF0eqwydbO/OKknCmjx0kvLXniIkEkQUnfS3wc3dm3MIWBNYsZ2x3fM0J7a83WhHgA=="; }; dependencies = [ - sources."pyright-1.1.153" + sources."pyright-1.1.154" ]; buildInputs = globalBuildInputs; meta = { @@ -71845,10 +72140,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.2.tgz"; - sha512 = "e+gsnzl//ilZNhfdVNkzI3lvJoMdB/aLVrMbaecimJG+gabVI/MvjmpsvrOLu9KFkBmECFjpM3T2Hxd6DuvY2Q=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.3.tgz"; + sha512 = "1vIMSDI8zKbr7J/jD4Ey9EFfYnipRaYzbaY9WZHnStEb0H2M/obIjwl5k9gRFGfJV00vB7zDpHp19FXLXVqzhQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -71941,7 +72236,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -71979,7 +72274,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -71996,7 +72291,7 @@ in sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" @@ -72184,7 +72479,7 @@ in sources."trough-1.0.5" sources."type-fest-0.18.1" sources."typedarray-to-buffer-3.1.5" - sources."unified-9.2.1" + sources."unified-9.2.2" sources."unist-util-find-all-after-3.0.2" sources."unist-util-is-4.1.0" sources."unist-util-stringify-position-2.0.3" @@ -72359,7 +72654,7 @@ in sha512 = "qkVsa46XLmOCmohpQhhz1SG9vUQN/54b/zZsDI5fnuBM49GX9f+Aya8m9ZidAzuwFKV+ostgvdWaB+GeQPPNPQ=="; }; dependencies = [ - sources."typescript-4.3.4" + sources."typescript-4.3.5" ]; buildInputs = globalBuildInputs; meta = { @@ -72454,7 +72749,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" @@ -72536,14 +72831,19 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.3.4" + sources."typescript-4.3.5" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" sources."vls-0.7.4" - (sources."vue-eslint-parser-7.6.0" // { + (sources."vue-eslint-parser-7.7.1" // { dependencies = [ + sources."acorn-8.4.1" sources."eslint-visitor-keys-1.3.0" - sources."espree-6.2.1" + (sources."espree-8.0.0" // { + dependencies = [ + sources."eslint-visitor-keys-3.0.0" + ]; + }) ]; }) sources."which-2.0.2" @@ -73441,7 +73741,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.4" sources."@types/minimist-1.2.1" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -73812,7 +74112,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -74727,7 +75027,7 @@ in sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - (sources."utp-native-2.5.1" // { + (sources."utp-native-2.5.3" // { dependencies = [ sources."node-gyp-build-4.2.3" sources."readable-stream-3.6.0" @@ -75126,7 +75426,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.1" sources."abbrev-1.1.1" @@ -75202,7 +75502,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.15.1" + sources."core-js-3.15.2" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."currently-unhandled-0.4.1" @@ -75758,7 +76058,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -75793,7 +76093,7 @@ in sources."quick-lru-4.0.1" ]; }) - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -75830,7 +76130,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -76041,7 +76341,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."yallist-4.0.0" sources."yargs-parser-18.1.3" sources."yoga-layout-prebuilt-1.10.0" @@ -76105,7 +76405,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.186" + sources."@microsoft/load-themed-styles-1.10.190" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.7" @@ -77729,7 +78029,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."y18n-3.2.2" @@ -77850,7 +78150,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" @@ -78012,7 +78312,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" @@ -78335,7 +78635,7 @@ in sources."@hapi/hoek-9.2.0" sources."@hapi/joi-17.1.1" sources."@hapi/pinpoint-2.0.0" - sources."@hapi/topo-5.0.0" + sources."@hapi/topo-5.1.0" (sources."@jest/types-25.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -78662,7 +78962,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" sources."caseless-0.12.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -78796,7 +79096,7 @@ in ]; }) sources."core-js-2.6.12" - (sources."core-js-compat-3.15.1" // { + (sources."core-js-compat-3.15.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -78930,7 +79230,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.759" + sources."electron-to-chromium-1.3.765" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -81439,11 +81739,11 @@ in sources."@google-cloud/promisify-2.0.3" (sources."@google-cloud/pubsub-2.15.1" // { dependencies = [ - sources."google-auth-library-7.1.2" + sources."google-auth-library-7.2.0" ]; }) sources."@grpc/grpc-js-1.3.4" - sources."@grpc/proto-loader-0.6.3" + sources."@grpc/proto-loader-0.6.4" sources."@jsdevtools/ono-7.1.3" (sources."@npmcli/move-file-1.1.2" // { dependencies = [ @@ -81471,7 +81771,7 @@ in sources."@types/json-schema-7.0.7" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -81758,7 +82058,7 @@ in sources."fecha-4.2.1" sources."figures-2.0.0" sources."file-uri-to-path-2.0.0" - sources."filesize-6.3.0" + sources."filesize-6.4.0" sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { dependencies = [ @@ -81825,7 +82125,7 @@ in sources."google-auth-library-6.1.6" (sources."google-gax-2.17.0" // { dependencies = [ - sources."google-auth-library-7.1.2" + sources."google-auth-library-7.2.0" ]; }) sources."google-p12-pem-3.1.0" @@ -82123,7 +82423,7 @@ in sources."responselike-1.0.2" sources."restore-cursor-2.0.0" sources."retry-0.12.0" - sources."retry-request-4.2.0" + sources."retry-request-4.2.1" sources."rimraf-3.0.2" (sources."router-1.3.5" // { dependencies = [ @@ -82320,7 +82620,7 @@ in sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xdg-basedir-4.0.0" sources."xregexp-2.0.0" sources."xtend-4.0.2" @@ -82580,7 +82880,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -82753,7 +83053,7 @@ in sources."utf8-3.0.0" sources."uuid-3.4.0" sources."verror-1.10.0" - (sources."web3-utils-1.3.6" // { + (sources."web3-utils-1.4.0" // { dependencies = [ sources."underscore-1.12.1" ]; @@ -83361,12 +83661,12 @@ in sources."@turist/fetch-7.1.7" sources."@turist/time-0.0.1" sources."@types/common-tags-1.8.0" - sources."@types/debug-4.1.5" + sources."@types/debug-4.1.6" 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-15.12.5" + sources."@types/node-15.14.0" sources."@types/node-fetch-2.5.10" sources."@types/readable-stream-2.3.10" sources."@types/unist-2.0.3" @@ -83433,7 +83733,7 @@ in sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -83483,7 +83783,7 @@ in ]; }) sources."content-type-1.0.4" - sources."contentful-management-7.25.1" + sources."contentful-management-7.27.0" sources."contentful-sdk-core-6.8.0" sources."convert-hrtime-3.0.0" (sources."convert-source-map-1.8.0" // { @@ -83529,7 +83829,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -83712,7 +84012,7 @@ in (sources."joi-17.4.0" // { dependencies = [ sources."@hapi/hoek-9.2.0" - sources."@hapi/topo-5.0.0" + sources."@hapi/topo-5.1.0" ]; }) sources."js-tokens-4.0.0" @@ -83778,7 +84078,7 @@ in sources."node-object-hash-2.3.7" sources."node-releases-1.1.73" sources."normalize-path-3.0.0" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."npm-run-path-2.0.2" sources."nth-check-2.0.0" sources."object-assign-4.1.1" @@ -83802,7 +84102,7 @@ in }) sources."parse-entities-2.0.0" sources."parse-path-4.0.3" - sources."parse-url-5.0.6" + sources."parse-url-5.0.7" sources."parseurl-1.3.3" sources."pascal-case-3.1.2" sources."path-exists-4.0.0" @@ -84007,9 +84307,9 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xdg-basedir-4.0.0" - sources."xstate-4.20.1" + sources."xstate-4.20.2" sources."xtend-4.0.2" sources."y18n-4.0.3" sources."yallist-4.0.0" @@ -84264,7 +84564,7 @@ in sources."tweetnacl-0.14.5" sources."tweetnacl-auth-0.3.1" sources."typedarray-to-buffer-4.0.0" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; @@ -84756,7 +85056,7 @@ in sources."@nodelib/fs.walk-1.2.7" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -85445,7 +85745,7 @@ in sources."ansi-term-0.0.2" sources."ansicolors-0.3.2" sources."blessed-0.1.81" - sources."blessed-contrib-4.9.0" + sources."blessed-contrib-4.10.0" sources."bresenham-0.0.3" sources."buffers-0.1.1" sources."cardinal-2.1.1" @@ -87413,7 +87713,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xregexp-2.0.0" sources."yallist-3.1.1" ]; @@ -87882,7 +88182,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.935.0" // { + (sources."aws-sdk-2.938.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -88508,7 +88808,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xml-name-validator-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -89344,7 +89644,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -90487,19 +90787,19 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-7.3.5" + sources."@octokit/openapi-types-8.1.4" sources."@octokit/plugin-enterprise-rest-6.0.1" - sources."@octokit/plugin-paginate-rest-2.13.5" + sources."@octokit/plugin-paginate-rest-2.13.6" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.3.4" + sources."@octokit/plugin-rest-endpoint-methods-5.3.7" (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.6.3" - sources."@octokit/types-6.16.7" + sources."@octokit/rest-18.6.6" + sources."@octokit/types-6.17.4" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.4" sources."@types/minimist-1.2.1" @@ -90712,7 +91012,7 @@ in ]; }) sources."git-up-4.0.2" - sources."git-url-parse-11.4.4" + sources."git-url-parse-11.5.0" sources."gitconfiglocal-1.0.0" sources."glob-7.1.7" sources."glob-parent-5.1.2" @@ -90889,7 +91189,7 @@ in sources."semver-5.7.1" ]; }) - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" (sources."npm-lifecycle-3.1.5" // { @@ -90948,7 +91248,7 @@ in sources."qs-6.10.1" ]; }) - sources."parse-url-5.0.6" + sources."parse-url-5.0.7" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" @@ -92167,13 +92467,13 @@ in sources."@types/babel__generator-7.6.2" sources."@types/babel__template-7.4.0" sources."@types/babel__traverse-7.14.0" - sources."@types/estree-0.0.48" + sources."@types/estree-0.0.49" sources."@types/graceful-fs-4.1.5" 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-schema-7.0.7" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.13" @@ -92346,7 +92646,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.30001240" + sources."caniuse-lite-1.0.30001241" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -92418,7 +92718,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.15.1" // { + (sources."core-js-compat-3.15.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -92470,7 +92770,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -93360,10 +93660,10 @@ in mastodon-bot = nodeEnv.buildNodePackage { name = "mastodon-bot"; packageName = "mastodon-bot"; - version = "1.12.1-20210625203706"; + version = "1.13.5-20210701203013"; src = fetchurl { - url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.12.1-20210625203706.tgz"; - sha512 = "WRIp5LGsTxBO0zGm2KjaxLZCVsUX1Lv15hu96W0vx2sKflGAgiHUSf3RFxQFaNhII1hdglnyuwulmOu/0/gHNA=="; + url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.13.5-20210701203013.tgz"; + sha512 = "d5HCg9yu6xhFWnUPKBFSzPoXsxXRCYrmy4AGMvjlifWqQnCf9EklbocqVZSO1j50JRymlfDELq1QO/WYKZ5TYQ=="; }; dependencies = [ sources."acorn-5.7.4" @@ -93718,7 +94018,7 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/yauzl-2.9.1" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -93812,7 +94112,7 @@ in sources."progress-2.0.1" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-10.0.0" + sources."puppeteer-10.1.0" sources."readable-stream-3.6.0" sources."rimraf-3.0.2" sources."rw-1.3.3" @@ -93843,29 +94143,30 @@ in mirakurun = nodeEnv.buildNodePackage { name = "mirakurun"; packageName = "mirakurun"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.5.0.tgz"; - sha512 = "j2ukrvANZQUreLl2grOQxPl0pbRSoJthYLqujdphZdwJyDwYjPqGOs+KrWwY26QbfqG2Toy06qFnYTaGx9txIg=="; + url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.6.0.tgz"; + sha512 = "LrJqn/26CxH9aQ9j7iPqnk9fS6ywI3gpCt7HS26UXeycC3VBfhkoONLZQW/JXW3aJGoUHUlxunsQBI0h89EJIw=="; }; dependencies = [ - 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.172.1" - sources."@fluentui/react-focus-7.17.6" - sources."@fluentui/react-window-provider-1.0.2" - sources."@fluentui/theme-1.7.4" - sources."@microsoft/load-themed-styles-1.10.186" + sources."@fluentui/date-time-utilities-8.2.0" + sources."@fluentui/dom-utilities-2.1.2" + sources."@fluentui/font-icons-mdl2-8.1.4" + sources."@fluentui/foundation-legacy-8.1.4" + sources."@fluentui/keyboard-key-0.3.2" + sources."@fluentui/merge-styles-8.1.2" + sources."@fluentui/react-8.22.0" + sources."@fluentui/react-focus-8.1.5" + sources."@fluentui/react-hooks-8.2.3" + sources."@fluentui/react-window-provider-2.1.2" + sources."@fluentui/set-version-8.1.2" + sources."@fluentui/style-utilities-8.1.4" + sources."@fluentui/theme-2.1.3" + sources."@fluentui/utilities-8.2.0" + sources."@microsoft/load-themed-styles-1.10.190" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@uifabric/foundation-7.9.26" - sources."@uifabric/icons-7.5.23" - sources."@uifabric/merge-styles-7.19.2" - sources."@uifabric/react-hooks-7.14.0" - sources."@uifabric/set-version-7.0.24" - sources."@uifabric/styling-7.19.0" - sources."@uifabric/utilities-7.33.5" + sources."@types/cors-2.8.10" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ansi-escapes-1.4.0" @@ -93907,6 +94208,7 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."core-js-2.6.12" + sources."cors-2.8.5" sources."crc-3.8.0" sources."debug-2.6.9" sources."decompress-response-3.3.0" @@ -93960,7 +94262,11 @@ in sources."is-fullwidth-code-point-2.0.0" sources."is-stream-1.1.0" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" + (sources."js-yaml-4.1.0" // { + dependencies = [ + sources."argparse-2.0.1" + ]; + }) sources."json-buffer-3.0.0" sources."json-schema-traverse-0.4.1" sources."keyv-3.1.0" @@ -93992,13 +94298,16 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.1" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.172.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-2.0.1" sources."openapi-default-setter-7.2.3" - sources."openapi-framework-7.5.0" + (sources."openapi-framework-7.5.0" // { + dependencies = [ + sources."js-yaml-3.14.1" + ]; + }) sources."openapi-jsonschema-parameters-7.2.3" sources."openapi-request-coercer-7.5.0" sources."openapi-request-validator-7.4.0" @@ -94027,7 +94336,6 @@ in sources."pinkie-promise-2.0.1" sources."prepend-http-2.0.0" sources."promise-queue-2.2.5" - sources."prop-types-15.7.2" sources."proxy-addr-2.0.7" sources."pump-3.0.0" sources."punycode-2.1.1" @@ -94035,9 +94343,8 @@ in sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" - sources."react-16.14.0" - sources."react-dom-16.14.0" - sources."react-is-16.13.1" + sources."react-17.0.2" + sources."react-dom-17.0.2" sources."readable-stream-3.6.0" sources."regenerator-runtime-0.10.5" sources."registry-auth-token-4.2.1" @@ -94048,7 +94355,7 @@ in sources."rx-4.1.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."scheduler-0.19.1" + sources."scheduler-0.20.2" sources."semver-7.3.5" (sources."send-0.17.1" // { dependencies = [ @@ -94083,14 +94390,14 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.51.0" + sources."swagger-ui-dist-3.51.1" sources."tail-2.2.3" sources."through-2.3.8" sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" sources."ts-log-2.2.3" - sources."tslib-1.14.1" + sources."tslib-2.3.0" sources."type-is-1.6.18" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -94369,10 +94676,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "3.39.0"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.39.0.tgz"; - sha512 = "XYkFp1WuWTcO7Q3LbY79ilobfCNWoL6UEYq2vhCHHKNLICSPxZtkzjDvNP628eGVzxe0L+D+Z9ce3sLdFiitMw=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-4.0.5.tgz"; + sha512 = "p1wJwMMWHM/Av5/Bsabtr0UTX4lTJVZg7Hz+G9kbA/n2wdKoWAj5P5B+shDRGRBhaFDbCiHf36baKtLJWP4SiQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -94506,11 +94813,10 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-12.11.0" // { + (sources."@netlify/build-12.26.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" - sources."dot-prop-5.3.0" sources."execa-3.4.0" sources."is-plain-obj-2.1.0" sources."locate-path-5.0.0" @@ -94527,7 +94833,7 @@ in sources."slash-3.0.0" ]; }) - (sources."@netlify/config-9.1.0" // { + (sources."@netlify/config-9.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -94539,13 +94845,13 @@ in ]; }) sources."@netlify/esbuild-0.13.6" - (sources."@netlify/framework-info-5.4.0" // { + (sources."@netlify/framework-info-5.5.0" // { dependencies = [ sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) - sources."@netlify/functions-utils-1.3.47" + sources."@netlify/functions-utils-1.4.1" (sources."@netlify/git-utils-1.0.11" // { dependencies = [ sources."braces-3.0.2" @@ -94562,14 +94868,14 @@ in sources."@types/node-14.17.4" ]; }) - sources."@netlify/plugins-list-2.18.0" - sources."@netlify/routing-local-proxy-0.30.1" + sources."@netlify/plugins-list-2.18.1" + sources."@netlify/routing-local-proxy-0.30.2" (sources."@netlify/run-utils-1.0.7" // { dependencies = [ sources."execa-3.4.0" ]; }) - (sources."@netlify/zip-it-and-ship-it-4.4.2" // { + (sources."@netlify/zip-it-and-ship-it-4.8.0" // { dependencies = [ sources."cliui-7.0.4" sources."cp-file-9.1.0" @@ -94692,18 +94998,18 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-7.3.5" - sources."@octokit/plugin-paginate-rest-2.13.5" + sources."@octokit/openapi-types-8.1.4" + sources."@octokit/plugin-paginate-rest-2.13.6" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.3.4" + sources."@octokit/plugin-rest-endpoint-methods-5.3.7" (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.6.3" - sources."@octokit/types-6.16.7" + sources."@octokit/rest-18.6.6" + sources."@octokit/types-6.17.4" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-18.1.0" // { dependencies = [ @@ -94740,7 +95046,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/keyv-3.1.1" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/node-fetch-2.5.10" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-1.17.1" @@ -94748,8 +95054,8 @@ in sources."@types/semver-7.3.6" sources."@types/yargs-13.0.11" sources."@types/yargs-parser-20.2.0" - sources."@typescript-eslint/types-4.28.0" - (sources."@typescript-eslint/typescript-estree-4.28.0" // { + sources."@typescript-eslint/types-4.28.1" + (sources."@typescript-eslint/typescript-estree-4.28.1" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" sources."array-union-2.1.0" @@ -94766,9 +95072,10 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@typescript-eslint/visitor-keys-4.28.0" + sources."@typescript-eslint/visitor-keys-4.28.1" sources."@ungap/from-entries-0.2.1" sources."accepts-1.3.7" + sources."acorn-8.4.1" sources."agent-base-6.0.2" sources."aggregate-error-3.1.0" sources."ajv-8.6.0" @@ -94828,13 +95135,6 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" - (sources."aws-sdk-2.935.0" // { - dependencies = [ - sources."buffer-4.9.2" - sources."ieee754-1.1.13" - sources."uuid-3.3.2" - ]; - }) sources."babel-plugin-dynamic-import-node-2.3.3" (sources."babel-plugin-polyfill-corejs2-0.2.2" // { dependencies = [ @@ -94904,7 +95204,7 @@ in sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" sources."cardinal-2.1.1" (sources."chalk-4.1.1" // { dependencies = [ @@ -95029,7 +95329,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."core-js-compat-3.15.1" // { + (sources."core-js-compat-3.15.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -95175,7 +95475,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -95202,7 +95502,6 @@ in sources."esutils-2.0.3" sources."etag-1.8.1" sources."eventemitter3-4.0.7" - sources."events-1.1.1" (sources."execa-5.1.1" // { dependencies = [ sources."get-stream-6.0.1" @@ -95536,7 +95835,6 @@ in ]; }) sources."jest-worker-26.6.2" - sources."jmespath-0.15.0" sources."js-string-escape-1.0.1" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" @@ -95557,10 +95855,9 @@ in sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."kuler-2.0.0" - (sources."lambda-local-1.7.4" // { + (sources."lambda-local-2.0.0" // { dependencies = [ - sources."commander-6.2.1" - sources."dotenv-8.6.0" + sources."commander-7.2.0" ]; }) sources."latest-version-5.1.0" @@ -95933,7 +96230,6 @@ in sources."pupa-2.1.1" sources."qs-6.7.0" sources."query-string-5.1.1" - sources."querystring-0.2.0" sources."queue-microtask-1.2.3" sources."random-bytes-1.0.0" sources."randombytes-2.1.0" @@ -95996,7 +96292,7 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.52.3" + sources."rollup-2.52.7" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -96017,7 +96313,6 @@ in sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sax-1.2.1" sources."seek-bzip-1.0.6" sources."semver-7.3.5" (sources."semver-diff-3.1.1" // { @@ -96224,7 +96519,7 @@ in sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.3.4" + sources."typescript-4.3.5" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -96265,11 +96560,6 @@ in }) sources."uri-js-4.4.1" sources."urix-0.1.0" - (sources."url-0.10.3" // { - dependencies = [ - sources."punycode-1.3.2" - ]; - }) sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" sources."use-3.1.1" @@ -96325,8 +96615,6 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" - sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.7" sources."xtend-4.0.2" sources."y18n-4.0.3" sources."yallist-4.0.0" @@ -97180,7 +97468,7 @@ in sources."ms-2.1.2" sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" - sources."ws-7.5.0" + sources."ws-7.5.1" ]; }) (sources."mqtt-packet-6.10.0" // { @@ -97567,10 +97855,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "2.0.7"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.7.tgz"; - sha512 = "XHzK69Awgnec9UzHr1kc8EomQh4sjTQ8oRf8TsGrSmHDx9/UmiGG9E/mM3BuTfNeFwdNBvrqQq/RHL0xIeyFOA=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.9.tgz"; + sha512 = "6O4k7C8f2HQArGpaPBOqGGddjzDLQAqCYmq3tKMeNIbz7Is/hOphMHy2dcY10sSq5wl3cqyn9Iz+Ep2j51JOLg=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -97763,7 +98051,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -98267,10 +98555,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.19.0"; + version = "7.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.19.0.tgz"; - sha512 = "bak/ZycWS8kalVFJ2m1JEo2pgvSwEDA9FMGthGnufAKciu4X4kpJMDZKe8VZKNaA/cXehd9XI7QdSZXmZauR8Q=="; + url = "https://registry.npmjs.org/npm/-/npm-7.19.1.tgz"; + sha512 = "aN3hZzGkPzKOyhjXtOhnQTGumorFhgpOU6xfuQsF1nJKh4DhsgfOMG4s/SNx56r4xHPvM5m/sk914wzDgKba3A=="; }; buildInputs = globalBuildInputs; meta = { @@ -99114,7 +99402,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -99141,7 +99429,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.15.1" // { + (sources."core-js-compat-3.15.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -99252,7 +99540,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.759" + sources."electron-to-chromium-1.3.765" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -100908,6 +101196,194 @@ in bypassCache = true; reconstructLock = true; }; + pkg = nodeEnv.buildNodePackage { + name = "pkg"; + packageName = "pkg"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg/-/pkg-5.3.0.tgz"; + sha512 = "/DGG+QcSPraMAIxaoGCNqb2A6Xkm2jBQMsj2mjb4ag236ByTY9Xhpikvj5ixwlSQV0euuJw4fphKCd5YHRPS8w=="; + }; + dependencies = [ + sources."@babel/helper-validator-identifier-7.14.5" + 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.7" + sources."agent-base-6.0.2" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + sources."array-union-2.1.0" + sources."at-least-node-1.0.0" + sources."base64-js-1.5.1" + (sources."bl-4.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."braces-3.0.2" + sources."buffer-5.7.1" + sources."chalk-4.1.1" + sources."chownr-1.1.4" + sources."cliui-7.0.4" + sources."code-point-at-1.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."debug-4.3.2" + sources."decompress-response-4.2.1" + sources."deep-extend-0.6.0" + sources."deep-is-0.1.3" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + sources."dir-glob-3.0.1" + sources."emoji-regex-8.0.0" + sources."end-of-stream-1.4.4" + sources."escalade-3.1.1" + sources."escodegen-2.0.0" + sources."esprima-4.0.1" + sources."estraverse-5.2.0" + sources."esutils-2.0.3" + sources."expand-template-2.0.3" + sources."fast-glob-3.2.6" + sources."fast-levenshtein-2.0.6" + sources."fastq-1.11.0" + sources."fill-range-7.0.1" + sources."from2-2.3.0" + sources."fs-constants-1.0.0" + sources."fs-extra-9.1.0" + sources."function-bind-1.1.1" + (sources."gauge-2.7.4" // { + 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."get-caller-file-2.0.5" + sources."github-from-package-0.0.0" + sources."glob-parent-5.1.2" + sources."globby-11.0.4" + sources."graceful-fs-4.2.6" + sources."has-1.0.3" + sources."has-flag-4.0.0" + sources."has-unicode-2.0.1" + sources."https-proxy-agent-5.0.0" + sources."ieee754-1.2.1" + sources."ignore-5.1.8" + sources."inherits-2.0.4" + sources."ini-1.3.8" + sources."into-stream-6.0.0" + sources."is-core-module-2.4.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."isarray-1.0.0" + sources."jsonfile-6.1.0" + sources."levn-0.3.0" + sources."lodash-4.17.21" + sources."lru-cache-6.0.0" + sources."merge2-1.4.1" + sources."micromatch-4.0.4" + sources."mimic-response-2.1.0" + sources."minimist-1.2.5" + sources."mkdirp-classic-0.5.3" + sources."ms-2.1.2" + (sources."multistream-4.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."napi-build-utils-1.0.2" + (sources."node-abi-2.30.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."node-fetch-2.6.1" + sources."noop-logger-0.1.1" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."optionator-0.8.3" + sources."p-is-promise-3.0.0" + sources."path-parse-1.0.7" + sources."path-type-4.0.0" + sources."picomatch-2.3.0" + sources."pkg-fetch-3.1.1" + sources."prebuild-install-6.0.1" + sources."prelude-ls-1.1.2" + sources."process-nextick-args-2.0.1" + sources."progress-2.0.3" + sources."pump-3.0.0" + sources."queue-microtask-1.2.3" + sources."rc-1.2.8" + sources."readable-stream-2.3.7" + sources."require-directory-2.1.1" + sources."resolve-1.20.0" + sources."reusify-1.0.4" + sources."run-parallel-1.2.0" + sources."safe-buffer-5.1.2" + sources."semver-7.3.5" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.3" + 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_decoder-1.1.1" + sources."strip-ansi-6.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-7.2.0" + sources."tar-fs-2.1.1" + (sources."tar-stream-2.2.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."to-fast-properties-2.0.0" + sources."to-regex-range-5.0.1" + 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."which-pm-runs-1.0.0" + (sources."wide-align-1.1.3" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) + sources."word-wrap-1.2.3" + sources."wrap-ansi-7.0.0" + sources."wrappy-1.0.2" + sources."y18n-5.0.8" + sources."yallist-4.0.0" + sources."yargs-16.2.0" + sources."yargs-parser-20.2.9" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Package your Node.js project into an executable"; + homepage = "https://github.com/vercel/pkg#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; pm2 = nodeEnv.buildNodePackage { name = "pm2"; packageName = "pm2"; @@ -101666,10 +102142,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.153"; + version = "1.1.154"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.153.tgz"; - sha512 = "t5Y9IojL2Sifm1Q04BEBJDLP86rF4RpXma28HEP/EXJRHyyNxu8css77HC+tZqJXXXZVtAjaJxJSAEwq5afGjg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.154.tgz"; + sha512 = "J2P5Iurkl7smCyB8CH5fsm8GOGeKRk7d1HWcFiro94E0vJW/5sSKXrkfjPxo7XZ+e96UiW1qyiVTCC++db3Tfg=="; }; buildInputs = globalBuildInputs; meta = { @@ -102152,7 +102628,7 @@ in sources."@types/glob-7.1.3" sources."@types/json-schema-7.0.7" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.4" sources."@webassemblyjs/ast-1.9.0" @@ -102340,7 +102816,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -102425,7 +102901,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.15.1" // { + (sources."core-js-compat-3.15.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -102569,7 +103045,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -103905,7 +104381,7 @@ in sources."whatwg-url-8.7.0" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" @@ -103955,15 +104431,15 @@ in sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.3" - sources."@redocly/ajv-6.12.4" - (sources."@redocly/openapi-core-1.0.0-beta.50" // { + sources."@redocly/ajv-8.6.2" + (sources."@redocly/openapi-core-1.0.0-beta.53" // { dependencies = [ sources."@types/node-14.17.4" ]; }) sources."@redocly/react-dropdown-aria-2.0.12" sources."@types/json-schema-7.0.7" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" @@ -103978,7 +104454,7 @@ in sources."util-0.10.3" ]; }) - sources."babel-plugin-styled-components-1.12.0" + sources."babel-plugin-styled-components-1.13.1" sources."babel-plugin-syntax-jsx-6.18.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -104055,7 +104531,6 @@ in sources."events-3.3.0" sources."evp_bytestokey-1.0.3" sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" sources."fill-range-7.0.1" sources."foreach-2.0.5" @@ -104093,7 +104568,7 @@ in sources."js-yaml-3.14.1" sources."jsesc-2.5.2" sources."json-pointer-0.6.1" - sources."json-schema-traverse-0.4.1" + sources."json-schema-traverse-1.0.0" sources."lodash-4.17.21" sources."lodash.isequal-4.5.0" sources."loose-envify-1.4.0" @@ -104128,7 +104603,7 @@ in sources."oas-schema-walker-1.1.5" sources."oas-validator-5.0.7" sources."object-assign-4.1.1" - sources."openapi-sampler-1.0.1" + sources."openapi-sampler-1.1.0" sources."os-browserify-0.3.0" sources."pako-1.0.11" sources."parse-asn1-5.1.6" @@ -104173,6 +104648,7 @@ in sources."reftools-1.1.8" sources."regenerator-runtime-0.13.8" sources."require-directory-2.1.1" + sources."require-from-string-2.0.2" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -104439,10 +104915,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.52.3"; + version = "2.52.7"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.52.3.tgz"; - sha512 = "QF3Sju8Kl2z0osI4unyOLyUudyhOMK6G0AeqJWgfiyigqLAlnNrfBcDWDx+f1cqn+JU2iIYVkDrgQ6/KtwEfrg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.52.7.tgz"; + sha512 = "55cSH4CCU6MaPr9TAOyrIC+7qFCHscL7tkNsm1MBfIJRRqRbCEY0mmeFn4Wg8FKsHtEH8r389Fz38r/o+kgXLg=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -104496,13 +104972,13 @@ in sources."@types/node-fetch-2.5.10" sources."@types/resolve-1.17.1" sources."@types/vscode-1.57.0" - sources."@typescript-eslint/eslint-plugin-4.28.0" - sources."@typescript-eslint/experimental-utils-4.28.0" - sources."@typescript-eslint/parser-4.28.0" - sources."@typescript-eslint/scope-manager-4.28.0" - sources."@typescript-eslint/types-4.28.0" - sources."@typescript-eslint/typescript-estree-4.28.0" - sources."@typescript-eslint/visitor-keys-4.28.0" + sources."@typescript-eslint/eslint-plugin-4.28.1" + sources."@typescript-eslint/experimental-utils-4.28.1" + sources."@typescript-eslint/parser-4.28.1" + sources."@typescript-eslint/scope-manager-4.28.1" + sources."@typescript-eslint/types-4.28.1" + sources."@typescript-eslint/typescript-estree-4.28.1" + sources."@typescript-eslint/visitor-keys-4.28.1" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -104627,7 +105103,7 @@ in sources."find-up-5.0.0" sources."flat-5.0.2" sources."flat-cache-3.0.4" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."form-data-3.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -104766,7 +105242,7 @@ in sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.52.3" + sources."rollup-2.52.7" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" @@ -104815,7 +105291,7 @@ in sources."type-check-0.4.0" sources."type-fest-0.20.2" sources."typed-rest-client-1.8.4" - sources."typescript-4.3.4" + sources."typescript-4.3.5" sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" sources."underscore-1.13.1" @@ -105144,10 +105620,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.48.1"; + version = "2.50.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.48.1.tgz"; - sha512 = "G61WEeJwDWsmsXW3jBzYnnNOJzw3ysqL5/3b0UHy1Zi8RhpkzzI9J7poteJHVmDchw9Ru5tczIKYq2dCfufxsA=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.50.0.tgz"; + sha512 = "9n2Afh0vEI6guDAue3Fm1Xu1B7i7zVR+LC37AHUhhmAxYRu0hH6ao1ERdrgUhHbzmV2P42yLRD0osB4alrp8gw=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -105180,7 +105656,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.12.0" // { + (sources."@serverless/components-3.13.2" // { dependencies = [ (sources."@serverless/utils-4.1.0" // { dependencies = [ @@ -105208,7 +105684,7 @@ in sources."semver-6.3.0" ]; }) - sources."@serverless/dashboard-plugin-5.4.2" + sources."@serverless/dashboard-plugin-5.4.3" sources."@serverless/event-mocks-1.1.1" (sources."@serverless/platform-client-4.2.3" // { dependencies = [ @@ -105216,7 +105692,7 @@ in sources."js-yaml-3.14.1" ]; }) - (sources."@serverless/platform-client-china-2.1.14" // { + (sources."@serverless/platform-client-china-2.1.17" // { dependencies = [ sources."dotenv-8.6.0" sources."js-yaml-3.14.1" @@ -105230,7 +105706,7 @@ in sources."write-file-atomic-3.0.3" ]; }) - sources."@serverless/utils-china-1.1.2" + sources."@serverless/utils-china-1.1.4" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tencent-sdk/capi-1.1.8" @@ -105244,12 +105720,12 @@ in sources."@tokenizer/token-0.1.1" sources."@types/cacheable-request-6.0.1" sources."@types/caseless-0.12.2" - sources."@types/debug-4.1.5" + sources."@types/debug-4.1.6" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/lodash-4.14.170" sources."@types/long-4.0.1" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/readable-stream-2.3.10" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" @@ -105311,7 +105787,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.935.0" // { + (sources."aws-sdk-2.938.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -105401,6 +105877,13 @@ 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-width-3.0.0" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" @@ -105536,7 +106019,7 @@ in sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.3.0" - sources."filesize-6.3.0" + sources."filesize-6.4.0" sources."fill-range-7.0.1" sources."find-requires-1.0.0" sources."flat-5.0.2" @@ -105794,6 +106277,7 @@ in sources."prettyoutput-1.2.0" sources."printj-1.1.2" sources."process-nextick-args-2.0.1" + sources."process-utils-4.0.0" sources."promise-queue-2.2.5" (sources."protobufjs-6.11.2" // { dependencies = [ @@ -106008,7 +106492,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmlhttprequest-ssl-1.6.3" @@ -106657,10 +107141,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.649.0"; + version = "1.653.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.649.0.tgz"; - sha512 = "KIJYCxfuxUwaZhmtSQyOxv2Ya5ZX/r7FTqXujpCWV4X/Cx354GYFSxSX1uvi0AQk8GVO6xkzKKVNn14CtpnHiw=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.653.0.tgz"; + sha512 = "AFIsk1kgE9eQ+s31X9+b967us36UyHNes3VnHhgiVPX8YCq+uAPGNDV2rIaWDY/7c0yCtfOmFLD3mI5WxpJmdA=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -106673,18 +107157,18 @@ in sources."@sindresorhus/is-4.0.1" sources."@snyk/child-process-0.3.1" sources."@snyk/cli-interface-2.11.0" - sources."@snyk/cloud-config-parser-1.9.2" + sources."@snyk/cloud-config-parser-1.9.3" sources."@snyk/cocoapods-lockfile-parser-3.6.2" sources."@snyk/code-client-3.9.0" sources."@snyk/composer-lockfile-parser-1.4.1" - (sources."@snyk/dep-graph-1.28.0" // { + (sources."@snyk/dep-graph-1.28.1" // { dependencies = [ sources."semver-7.3.5" ]; }) sources."@snyk/docker-registry-v2-client-2.2.2" sources."@snyk/fast-glob-3.2.6-patch" - (sources."@snyk/fix-1.649.0" // { + (sources."@snyk/fix-1.650.0" // { dependencies = [ sources."chalk-4.1.1" sources."strip-ansi-6.0.0" @@ -106739,7 +107223,7 @@ in }) sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" - sources."@types/debug-4.1.5" + sources."@types/debug-4.1.6" sources."@types/emscripten-1.39.4" sources."@types/flat-cache-2.0.0" sources."@types/graphlib-2.1.7" @@ -106866,7 +107350,7 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."configstore-5.0.1" - sources."core-js-3.15.1" + sources."core-js-3.15.2" sources."core-util-is-1.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ @@ -107270,7 +107754,12 @@ in sources."yallist-3.1.1" ]; }) - sources."snyk-python-plugin-1.19.9" + (sources."snyk-python-plugin-1.19.11" // { + dependencies = [ + sources."rimraf-3.0.2" + sources."tmp-0.2.1" + ]; + }) sources."snyk-resolve-1.1.0" (sources."snyk-resolve-deps-4.7.2" // { dependencies = [ @@ -107411,7 +107900,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -107973,7 +108462,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - (sources."jitdb-3.1.4" // { + (sources."jitdb-3.1.5" // { dependencies = [ sources."mkdirp-1.0.4" sources."push-stream-11.0.1" @@ -108577,7 +109066,7 @@ in sources."word-wrap-1.2.3" sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xtend-4.0.2" sources."zerr-1.0.4" ]; @@ -108677,7 +109166,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.935.0" // { + (sources."aws-sdk-2.938.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -109086,7 +109575,7 @@ in sources."parseuri-0.0.6" sources."parseurl-1.3.3" sources."passport-0.3.2" - sources."passport-oauth2-1.5.0" + sources."passport-oauth2-1.6.0" (sources."passport-saml-0.15.0" // { dependencies = [ sources."lodash-3.2.0" @@ -109515,7 +110004,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -109553,7 +110042,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -109569,7 +110058,7 @@ in sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" @@ -109755,7 +110244,7 @@ in sources."trough-1.0.5" sources."type-fest-0.18.1" sources."typedarray-to-buffer-3.1.5" - sources."unified-9.2.1" + sources."unified-9.2.2" sources."unist-util-find-all-after-3.0.2" sources."unist-util-is-4.1.0" sources."unist-util-stringify-position-2.0.3" @@ -109795,7 +110284,7 @@ in sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/pug-2.0.4" sources."@types/sass-1.16.0" sources."anymatch-3.1.2" @@ -109841,7 +110330,7 @@ in sources."svelte2tsx-0.3.0" sources."to-regex-range-5.0.1" sources."tslib-2.3.0" - sources."typescript-4.3.4" + sources."typescript-4.3.5" sources."vscode-css-languageservice-5.0.0" sources."vscode-emmet-helper-2.1.2" sources."vscode-html-languageservice-4.0.0" @@ -111023,7 +111512,7 @@ in sources."trough-1.0.5" sources."try-resolve-1.0.1" sources."type-check-0.4.0" - sources."unified-9.2.1" + sources."unified-9.2.2" sources."unique-concat-0.2.2" sources."unist-util-is-4.1.0" sources."unist-util-stringify-position-2.0.3" @@ -111465,13 +111954,13 @@ in sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."unherit-1.1.3" - (sources."unified-9.2.1" // { + (sources."unified-9.2.2" // { dependencies = [ sources."is-plain-obj-2.1.0" ]; }) sources."unified-diff-3.1.0" - (sources."unified-engine-8.1.0" // { + (sources."unified-engine-8.2.0" // { dependencies = [ sources."is-plain-obj-2.1.0" ]; @@ -111916,10 +112405,10 @@ in sources."@szmarczak/http-timer-4.0.5" sources."@tokenizer/token-0.1.1" sources."@types/cacheable-request-6.0.1" - sources."@types/debug-4.1.5" + sources."@types/debug-4.1.6" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -111995,7 +112484,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.15.1" + sources."core-js-3.15.2" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -112335,7 +112824,7 @@ in sources."wide-align-1.1.3" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.22.4" @@ -112354,10 +112843,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.129.0"; + version = "0.130.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.129.0.tgz"; - sha512 = "wiWio1yVRg2Oj6WEWsTHQo5eSzYpEwSBtPSi3OofNpvFbf26HFfb9kw4FZJNjII4qxzp0b1xLB11+tKkBGB1ZA=="; + url = "https://registry.npmjs.org/three/-/three-0.130.0.tgz"; + sha512 = "4jqvbJyvgrjTsBgqE7TrdkZral78l8CXpFCdGzqQoiJHsRhGHxe5tvwqZQVaS6eodPav7jdYO5sp1c5RmMB3ng=="; }; buildInputs = globalBuildInputs; meta = { @@ -112783,10 +113272,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "4.3.4"; + version = "4.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.3.4.tgz"; - sha512 = "uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz"; + sha512 = "DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA=="; }; buildInputs = globalBuildInputs; meta = { @@ -112801,29 +113290,74 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "0.5.1"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.5.1.tgz"; - sha512 = "60Kguhwk/R1BB4pEIb6B9C7Ix7JzLzYnsODlmorYMPjMeEV0rCBqTR6FGAj4wVw/eHrHcpwLENmmURKUd8aybA=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.5.4.tgz"; + sha512 = "MQbCaq+ZUGfibp91reQJGYPXWbEdsY8G+iAkOaKRLOs3MDIssacEYF3v1nFne8iWWYPSsYs4HvuiIzbuUAO8GA=="; }; dependencies = [ - sources."command-exists-1.2.6" - sources."commander-2.20.3" - sources."crypto-random-string-1.0.0" - sources."fs-extra-7.0.1" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" + sources."aggregate-error-3.1.0" + sources."array-union-2.1.0" + sources."balanced-match-1.0.2" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."clean-stack-2.2.0" + sources."command-exists-1.2.9" + sources."commander-7.2.0" + sources."concat-map-0.0.1" + sources."crypto-random-string-2.0.0" + sources."del-6.0.0" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.6" + sources."fastq-1.11.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-parent-5.1.2" + sources."globby-11.0.4" sources."graceful-fs-4.2.6" - sources."jsonfile-4.0.0" - sources."p-debounce-1.0.0" - sources."temp-dir-1.0.0" - sources."tempy-0.2.1" - sources."unique-string-1.0.0" - sources."universalify-0.1.2" + sources."ignore-5.1.8" + sources."indent-string-4.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."is-path-cwd-2.2.0" + sources."is-path-inside-3.0.3" + sources."is-stream-2.0.0" + sources."jsonfile-6.1.0" + sources."merge2-1.4.1" + sources."micromatch-4.0.4" + sources."minimatch-3.0.4" + sources."once-1.4.0" + sources."p-debounce-2.1.0" + sources."p-map-4.0.0" + sources."path-is-absolute-1.0.1" + sources."path-type-4.0.0" + sources."picomatch-2.3.0" + sources."queue-microtask-1.2.3" + sources."reusify-1.0.4" + sources."rimraf-3.0.2" + sources."run-parallel-1.2.0" + sources."slash-3.0.0" + sources."temp-dir-2.0.0" + sources."tempy-1.0.1" + sources."to-regex-range-5.0.1" + sources."type-fest-0.16.0" + sources."unique-string-2.0.0" + sources."universalify-2.0.0" sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-5.3.0-next.10" sources."vscode-languageserver-protocol-3.16.0" sources."vscode-languageserver-types-3.16.0" sources."vscode-textbuffer-1.0.0" sources."vscode-uri-1.0.8" + sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -113485,7 +114019,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" @@ -113567,13 +114101,18 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.3.4" + sources."typescript-4.3.5" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" - (sources."vue-eslint-parser-7.6.0" // { + (sources."vue-eslint-parser-7.7.1" // { dependencies = [ + sources."acorn-8.4.1" sources."eslint-visitor-keys-1.3.0" - sources."espree-6.2.1" + (sources."espree-8.0.0" // { + dependencies = [ + sources."eslint-visitor-keys-3.0.0" + ]; + }) ]; }) sources."which-2.0.2" @@ -113679,7 +114218,7 @@ in sources."minimatch-3.0.4" sources."ms-2.0.0" sources."request-light-0.4.0" - (sources."vscode-json-languageservice-4.1.4" // { + (sources."vscode-json-languageservice-4.1.5" // { dependencies = [ sources."vscode-nls-5.0.0" ]; @@ -113761,7 +114300,7 @@ in sources."@discoveryjs/json-ext-0.5.3" sources."@types/eslint-7.2.13" sources."@types/eslint-scope-3.7.0" - sources."@types/estree-0.0.47" + sources."@types/estree-0.0.48" sources."@types/json-schema-7.0.7" sources."@types/mocha-7.0.2" sources."@types/node-8.10.66" @@ -113809,7 +114348,7 @@ in sources."buffer-from-1.1.1" sources."call-bind-1.0.2" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" (sources."chalk-4.1.1" // { dependencies = [ sources."supports-color-7.2.0" @@ -113849,7 +114388,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -113908,7 +114447,7 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."jest-worker-27.0.2" + sources."jest-worker-27.0.6" sources."js-yaml-4.0.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" @@ -114038,7 +114577,7 @@ in sources."tslib-2.3.0" sources."tunnel-0.0.6" sources."typed-rest-client-1.8.4" - sources."typescript-4.3.4" + sources."typescript-4.3.5" sources."uc.micro-1.0.6" sources."underscore-1.13.1" sources."uri-js-4.4.1" @@ -114059,7 +114598,7 @@ in sources."vscode-debugadapter-testsupport-1.47.0" sources."vscode-debugprotocol-1.47.0" sources."watchpack-2.2.0" - sources."webpack-5.40.0" + sources."webpack-5.42.0" (sources."webpack-cli-4.7.2" // { dependencies = [ sources."commander-7.2.0" @@ -114416,7 +114955,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-15.12.5" + sources."@types/node-15.14.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -114611,12 +115150,19 @@ in }) (sources."eslint-plugin-vue-6.2.2" // { dependencies = [ - sources."acorn-7.4.1" + sources."acorn-8.4.1" sources."debug-4.3.2" sources."eslint-scope-5.1.1" - sources."espree-6.2.1" + sources."eslint-visitor-keys-3.0.0" + sources."espree-8.0.0" + sources."lru-cache-6.0.0" sources."ms-2.1.2" - sources."vue-eslint-parser-7.6.0" + (sources."vue-eslint-parser-7.7.1" // { + dependencies = [ + sources."semver-7.3.5" + ]; + }) + sources."yallist-4.0.0" ]; }) sources."eslint-scope-4.0.3" @@ -115387,7 +115933,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.15.1" + sources."core-js-pure-3.15.2" sources."core-util-is-1.0.2" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { @@ -115523,7 +116069,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" @@ -115584,7 +116130,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -115772,7 +116318,7 @@ in sources."first-chunk-stream-3.0.0" sources."flat-cache-3.0.4" sources."flatstr-1.0.12" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."fluent-syntax-0.13.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -116137,17 +116683,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.40.0"; + version = "5.42.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.40.0.tgz"; - sha512 = "c7f5e/WWrxXWUzQqTBg54vBs5RgcAgpvKE4F4VegVgfo4x660ZxYUF2/hpMkZUnLjgytVTitjeXaN4IPlXCGIw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.42.0.tgz"; + sha512 = "Ln8HL0F831t1x/yPB/qZEUVmZM4w9BnHZ1EQD/sAUHv8m22hthoPniWTXEzFMh/Sf84mhrahut22TX5KxWGuyQ=="; }; dependencies = [ sources."@types/eslint-7.2.13" sources."@types/eslint-scope-3.7.0" - sources."@types/estree-0.0.47" + sources."@types/estree-0.0.48" sources."@types/json-schema-7.0.7" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" sources."@webassemblyjs/helper-api-error-1.11.0" @@ -116170,11 +116716,11 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.16.6" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.6.0" sources."escalade-3.1.1" @@ -116191,7 +116737,7 @@ in sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.6" sources."has-flag-4.0.0" - sources."jest-worker-27.0.2" + sources."jest-worker-27.0.6" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."loader-runner-4.2.0" @@ -116312,7 +116858,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -116965,7 +117511,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.2" @@ -117015,6 +117561,7 @@ in sources."buffer-indexof-1.1.1" sources."buffer-xor-2.0.2" sources."bufferutil-4.0.3" + sources."cache-chunk-store-3.2.2" (sources."castv2-0.1.10" // { dependencies = [ sources."debug-4.3.2" @@ -117240,10 +117787,10 @@ in sources."ut_pex-3.0.1" sources."utf-8-validate-5.0.5" sources."util-deprecate-1.0.2" - sources."utp-native-2.5.1" + sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.0.2" // { + (sources."webtorrent-1.1.0" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -117254,7 +117801,7 @@ in }) sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" @@ -117338,7 +117885,7 @@ in sources."minimatch-3.0.4" sources."ms-2.0.0" sources."request-light-0.2.5" - (sources."vscode-json-languageservice-4.1.4" // { + (sources."vscode-json-languageservice-4.1.5" // { dependencies = [ sources."jsonc-parser-3.0.0" sources."vscode-nls-5.0.0" @@ -117427,7 +117974,7 @@ in sources."@tootallnate/once-1.1.2" sources."@types/expect-1.20.4" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/vinyl-2.0.4" sources."abbrev-1.1.1" (sources."agent-base-6.0.2" // { @@ -117548,7 +118095,7 @@ in sources."config-chain-1.1.13" sources."configstore-3.1.5" sources."console-control-strings-1.1.0" - sources."core-js-3.15.1" + sources."core-js-3.15.2" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -118323,7 +118870,7 @@ in sha512 = "omgqRVve+5dqbFrogFSjJXLUCUr4xHF2Gan+Njn/z4fumhIj3tMTFEA9iV+HgiobZ5Mgl5N96z4S4fwhaas4Pw=="; }; dependencies = [ - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/node-fetch-2.5.10" sources."ansi-styles-4.3.0" sources."asynckit-0.4.0" diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index 94626f3c179..abef3ef7ef4 100644 --- a/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "alcotest"; - version = "1.2.3"; + version = "1.3.0"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-mirage-${version}.tbz"; - sha256 = "1bmjcivbmd4vib15v4chycgd1gl8js9dk94vzxkdg06zxqd4hp08"; + sha256 = "sha256-efnevbyolTdNb91zr4pHDcvgaLQQSD01wEu2zMM+iaw="; }; propagatedBuildInputs = [ astring cmdliner fmt uuidm re stdlib-shims uutf ]; diff --git a/pkgs/development/ocaml-modules/alcotest/lwt.nix b/pkgs/development/ocaml-modules/alcotest/lwt.nix index 82efbe91a06..5a57dc0fcc2 100644 --- a/pkgs/development/ocaml-modules/alcotest/lwt.nix +++ b/pkgs/development/ocaml-modules/alcotest/lwt.nix @@ -1,13 +1,16 @@ -{ lib, buildDunePackage, alcotest, logs, ocaml_lwt }: +{ lib, buildDunePackage, alcotest, logs, ocaml_lwt, fmt +, re, cmdliner +}: buildDunePackage { pname = "alcotest-lwt"; inherit (alcotest) version src useDune2; - propagatedBuildInputs = [ alcotest logs ocaml_lwt ]; + propagatedBuildInputs = [ alcotest logs ocaml_lwt fmt ]; doCheck = true; + checkInputs = [ re cmdliner ]; meta = alcotest.meta // { description = "Lwt-based helpers for Alcotest"; diff --git a/pkgs/development/ocaml-modules/camlimages/4.1.2.nix b/pkgs/development/ocaml-modules/camlimages/4.1.2.nix deleted file mode 100644 index dba303afdf2..00000000000 --- a/pkgs/development/ocaml-modules/camlimages/4.1.2.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchFromGitLab, fetchpatch, omake, ocaml, findlib -, graphicsmagick, ghostscript -, freetype, giflib, libjpeg, libpng, libtiff, libXpm -}: - -stdenv.mkDerivation rec { - pname = "camlimages"; - version = "4.1.2"; - - src = fetchFromGitLab { - owner = "camlspotter"; - repo = "camlimages"; - rev = "98661d507e12ce91a51295a50f244cb8265b4439"; # no tag - sha256 = "0kpxj8wm2m17wjq217jzjpfgv1d7sp4w1yd1gi8ipn5rj4sid2j8"; - }; - - buildInputs = [ ocaml omake findlib graphicsmagick ghostscript ]; - propagatedBuildInputs = [ libtiff libjpeg libpng giflib freetype libXpm ]; - - createFindlibDestdir = true; - - buildPhase = '' - omake - ''; - - installPhase = '' - omake install - ''; - - meta = with lib; { - branch = "4.1"; - homepage = "https://gitlab.com/camlspotter/camlimages"; - description = "OCaml image processing library"; - license = licenses.lgpl2; - maintainers = [ maintainers.vbgl ]; - }; -} diff --git a/pkgs/development/ocaml-modules/camlimages/4.2.4.nix b/pkgs/development/ocaml-modules/camlimages/4.2.4.nix new file mode 100644 index 00000000000..8ed562a27e6 --- /dev/null +++ b/pkgs/development/ocaml-modules/camlimages/4.2.4.nix @@ -0,0 +1,75 @@ +{ stdenv +, lib +, fetchFromGitLab +, ocaml +, findlib +, omake +, graphicsmagick +, libpng +, libjpeg +, libexif +, libtiff +, libXpm +, freetype +, giflib +, ghostscript +}: + +assert lib.versionOlder ocaml.version "4.06"; + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-${pname}-${version}"; + pname = "camlimages"; + version = "4.2.4"; + + src = fetchFromGitLab { + owner = "camlspotter"; + repo = pname; + rev = "c4f0ec4178fd18cb85872181965c5f020c349160"; + sha256 = "17hvsql5dml7ialjcags8wphs7w6z88b2rgjir1382bg8vn62bkr"; + }; + + nativeBuildInputs = [ + omake + ocaml + findlib + graphicsmagick + ]; + + propagatedBuildInputs = [ + libpng + libjpeg + libexif + libtiff + libXpm + freetype + giflib + ghostscript + ]; + + buildPhase = '' + runHook preBuild + omake + runHook postBuild + ''; + + installPhase = '' + runHook preBuild + omake install + runHook postBuild + ''; + + createFindlibDestdir = true; + + meta = with lib; { + # 4.2.5 requires OCaml >= 4.06 + branch = "4.2.4"; + homepage = "https://gitlab.com/camlspotter/camlimages"; + description = "OCaml image processing library"; + license = licenses.lgpl2Only; + maintainers = [ + maintainers.vbgl + maintainers.sternenseemann + ]; + }; +} diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index 17a6e4d6a89..ae18ce5dc31 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -3,7 +3,7 @@ , Babel , blinker , buildPythonPackage -, dateutil +, python-dateutil , docutils , doit , fetchPypi @@ -53,7 +53,7 @@ buildPythonPackage rec { aiohttp Babel blinker - dateutil + python-dateutil docutils doit ghp-import diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index 31e0e73016c..b555188b4b5 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, requests, pyjwt, dateutil }: +, requests, pyjwt, python-dateutil }: buildPythonPackage rec { pname = "adal"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "d74f45b81317454d96e982fd1c50e6fb5c99ac2223728aea8764433a39f566f1"; }; - propagatedBuildInputs = [ requests pyjwt dateutil ]; + propagatedBuildInputs = [ requests pyjwt python-dateutil ]; meta = with lib; { description = "Library to make it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources"; diff --git a/pkgs/development/python-modules/aiolifx-effects/default.nix b/pkgs/development/python-modules/aiolifx-effects/default.nix index 0a06144c65c..201fdb32a0b 100644 --- a/pkgs/development/python-modules/aiolifx-effects/default.nix +++ b/pkgs/development/python-modules/aiolifx-effects/default.nix @@ -7,20 +7,21 @@ buildPythonPackage rec { pname = "aiolifx-effects"; - version = "0.2.1"; + version = "0.2.2"; + disabled = !isPy3k; src = fetchPypi { inherit version; pname = "aiolifx_effects"; - sha256 = "cb4ac52deeb220783fc6449251cf40833fcffa28648270be64b1b3e83e06b503"; + sha256 = "sha256-qkXJDYdJ+QyQWn/u7g6t4QJG1uSqle+a5RhTkPPsHKo="; }; + propagatedBuildInputs = [ aiolifx ]; + # tests are not implemented doCheck = false; - disabled = !isPy3k; - - propagatedBuildInputs = [ aiolifx ]; + pythonImportsCheck = [ "aiolifx_effects" ]; meta = with lib; { homepage = "https://github.com/amelchio/aiolifx_effects"; diff --git a/pkgs/development/python-modules/aiomusiccast/default.nix b/pkgs/development/python-modules/aiomusiccast/default.nix index 921bfbac646..267ca5b4a5a 100644 --- a/pkgs/development/python-modules/aiomusiccast/default.nix +++ b/pkgs/development/python-modules/aiomusiccast/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiomusiccast"; - version = "0.8.0"; + version = "0.8.2"; format = "pyproject"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vigonotion"; repo = "aiomusiccast"; rev = version; - sha256 = "1x55w2vhb5mgvlg19cs887xd7fg0cwnp6hb34vajp80q4yff9xk5"; + sha256 = "sha256-XmDE704c9KJst8hrvdyQdS52Sd6RnprQZjBCIWAaiho="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiopylgtv/default.nix b/pkgs/development/python-modules/aiopylgtv/default.nix index 200bc41b7a5..ad089ef708e 100644 --- a/pkgs/development/python-modules/aiopylgtv/default.nix +++ b/pkgs/development/python-modules/aiopylgtv/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "aiopylgtv"; - version = "0.4.0"; + version = "0.4.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bendavid"; repo = pname; rev = version; - sha256 = "0x0xcnlz42arsp53zlq5wyv9pwif1in8j2pv48gh0pkdnz9s86b6"; + sha256 = "sha256-NkWJGy5QUrhpbARoscrXy/ilCjAz01YxeVTH0I+IjNM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index c820ee81ee2..81502a470a6 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , pytest, pytestcov, mock, coverage, setuptools -, Mako, sqlalchemy, python-editor, dateutil +, Mako, sqlalchemy, python-editor, python-dateutil }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest pytestcov mock coverage ]; - propagatedBuildInputs = [ Mako sqlalchemy python-editor dateutil setuptools ]; + propagatedBuildInputs = [ Mako sqlalchemy python-editor python-dateutil setuptools ]; # no traditional test suite doCheck = false; diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index 9cc3fb82775..62db58d611e 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, dateutil +, python-dateutil , fetchPypi , isPy3k , mock @@ -17,7 +17,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - dateutil + python-dateutil ]; checkInputs = [ diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix index 9ac37cdc599..4c6a5e19078 100644 --- a/pkgs/development/python-modules/anyio/default.nix +++ b/pkgs/development/python-modules/anyio/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "anyio"; - version = "3.2.0"; + version = "3.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "agronholm"; repo = pname; rev = version; - sha256 = "sha256-zQiSAQN7cp1s+8hDTvYaMkHUXV1ccNwIsl2IOztH7J8="; + sha256 = "0fiqzsgr9c0yicsh1pwhyc6z4qyr2ng42dakyy4a81w9cff38had"; }; preBuild = '' diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 2db76ab2483..3bc1e6d4a5c 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "apispec"; - version = "4.6.0"; + version = "4.7.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a896f97394b7d046d46c65262e51e45241dd8d9d71eedebcdb2d7024b775eec4"; + sha256 = "sha256-v6G+yLWyzqZyfgIMOm/hHZYwiN0u1hbhFHXOry1naTc="; }; propagatedBuildInputs = [ @@ -32,8 +32,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pythonImportsCheck = [ "apispec" ]; + meta = with lib; { - description = "A pluggable API specification generator. Currently supports the OpenAPI Specification (f.k.a. the Swagger specification"; + description = "A pluggable API specification generator with support for the OpenAPI Specification"; homepage = "https://github.com/marshmallow-code/apispec"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index 33513b2289c..363d8900163 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -2,6 +2,8 @@ , astropy , buildPythonPackage , fetchPypi +, importlib-resources +, jmespath , jsonschema , numpy , packaging @@ -15,23 +17,26 @@ buildPythonPackage rec { pname = "asdf"; - version = "2.7.3"; + version = "2.8.1"; disabled = pythonOlder "3.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "11dyr295wn5m2pcynlwj7kgw9xr66msfvwn1m6a5vv13vzj19spp"; + sha256 = "sha256-bp3fME3FTa5vcj7qUoUEGqvuI2uwSpI13zDcFgWvbJw="; }; nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ + jmespath jsonschema numpy packaging pyyaml semantic-version + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources ]; checkInputs = [ @@ -50,6 +55,6 @@ buildPythonPackage rec { description = "Python tools to handle ASDF files"; homepage = "https://github.com/spacetelescope/asdf"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix index 86840257725..25210e4740b 100644 --- a/pkgs/development/python-modules/ase/default.nix +++ b/pkgs/development/python-modules/ase/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ase"; - version = "3.21.1"; + version = "3.22.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "78b01d88529d5f604e76bc64be102d48f058ca50faad72ac740d717545711c7b"; + sha256 = "sha256-5gJZx7UIZ7HLgXyvk4/MHtODcCQT320uGv5+oH9lrO4="; }; propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ]; @@ -29,6 +29,8 @@ buildPythonPackage rec { # tests just hang most likely due to something with subprocesses and cli doCheck = false; + pythonImportsCheck = [ "ase" ]; + meta = with lib; { description = "Atomic Simulation Environment"; homepage = "https://wiki.fysik.dtu.dk/ase/"; diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix index a55aef99ecb..dd772e007cc 100644 --- a/pkgs/development/python-modules/asteval/default.nix +++ b/pkgs/development/python-modules/asteval/default.nix @@ -3,21 +3,30 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools-scm }: buildPythonPackage rec { pname = "asteval"; - version = "0.9.23"; + version = "0.9.25"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "newville"; repo = pname; rev = version; - sha256 = "sha256-9Zxb2EzB6nxDQHdlryFiwyNW+76VvysLUB78bXKzfv0="; + sha256 = "sha256-Jy+4NifItCGI1Jj25VakwoJcrpZw0Ng4cArf2M31WGs="; }; - checkInputs = [ pytestCheckHook ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + checkInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "asteval" ]; diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index f02f5291bf1..160a90a0e6d 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -1,40 +1,40 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder , cryptography -, bcrypt, gssapi, libnacl, libsodium, nettle, pyopenssl -, openssl, openssh, pytestCheckHook }: +, bcrypt +, gssapi +, fido2 +, libnacl +, libsodium +, nettle +, python-pkcs11 +, pyopenssl +, openssl +, openssh +, pytestCheckHook +}: buildPythonPackage rec { pname = "asyncssh"; - version = "2.6.0"; - disabled = pythonOlder "3.4"; + version = "2.7.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "20f0ef553a1e64a7d38db86ba3a2f3907e72f1e81f3dfec5edb191383783c7d1"; + sha256 = "sha256-GFAT2OZ3R8PA8BtyQWuL14QX2h30jHH3baU8YH71QbY="; }; - patches = [ - # Reverts https://github.com/ronf/asyncssh/commit/4b3dec994b3aa821dba4db507030b569c3a32730 - # - # This changed the test to avoid setting the sticky bit - # because that's not allowed for plain files in FreeBSD. - # However that broke the test on NixOS, failing with - # "Operation not permitted" - ./fix-sftp-chmod-test-nixos.patch - ]; - - # Disables windows specific test (specifically the GSSAPI wrapper for Windows) - postPatch = '' - rm tests/sspi_stub.py - ''; - propagatedBuildInputs = [ bcrypt cryptography + fido2 gssapi libnacl libsodium nettle + python-pkcs11 pyopenssl ]; @@ -44,11 +44,26 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ "test_expired_root" "test_confirm" ]; + patches = [ + # Reverts https://github.com/ronf/asyncssh/commit/4b3dec994b3aa821dba4db507030b569c3a32730 + # + # This changed the test to avoid setting the sticky bit + # because that's not allowed for plain files in FreeBSD. + # However that broke the test on NixOS, failing with + # "Operation not permitted" + ./fix-sftp-chmod-test-nixos.patch + ]; + + disabledTestPaths = [ + # Disables windows specific test (specifically the GSSAPI wrapper for Windows) + "tests/sspi_stub.py" + ]; + + pythonImportsCheck = [ "asyncssh" ]; meta = with lib; { - description = "Provides an asynchronous client and server implementation of the SSHv2 protocol on top of the Python asyncio framework"; - homepage = "https://asyncssh.readthedocs.io/en/latest"; + description = "Asynchronous SSHv2 Python client and server library"; + homepage = "https://asyncssh.readthedocs.io/"; license = licenses.epl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/azure-storage/default.nix b/pkgs/development/python-modules/azure-storage/default.nix index 8afb9b751ee..3bc6a731866 100644 --- a/pkgs/development/python-modules/azure-storage/default.nix +++ b/pkgs/development/python-modules/azure-storage/default.nix @@ -5,7 +5,7 @@ , azure-common , cryptography , futures ? null -, dateutil +, python-dateutil , requests , isPy3k }: @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "0pyasfxkin6j8j00qmky7d9cvpxgis4fi9bscgclj6yrpvf14qpv"; }; - propagatedBuildInputs = [ azure-common cryptography dateutil requests ] + propagatedBuildInputs = [ azure-common cryptography python-dateutil requests ] ++ pkgs.lib.optionals (!isPy3k) [ futures ]; postPatch = '' diff --git a/pkgs/development/python-modules/bashlex/default.nix b/pkgs/development/python-modules/bashlex/default.nix index 8e29eed2acf..0ee12c41480 100644 --- a/pkgs/development/python-modules/bashlex/default.nix +++ b/pkgs/development/python-modules/bashlex/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "bashlex"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "idank"; repo = pname; rev = version; - sha256 = "070spmbf53y18miky5chgky4x5h8kp9czkp7dm173klv9pi2cn0k"; + sha256 = "sha256-kKVorAIKlyC9vUzLOlaZ/JrG1kBBRIvLwBmHNj9nx84="; }; checkInputs = [ nose ]; @@ -29,9 +29,11 @@ buildPythonPackage rec { ${python.interpreter} -m nose --with-doctest ''; + pythonImportsCheck = [ "bashlex" ]; + meta = with lib; { description = "Python parser for bash"; - license = licenses.gpl3; + license = licenses.gpl3Plus; homepage = "https://github.com/idank/bashlex"; maintainers = with maintainers; [ multun ]; }; diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index ec864e71498..31f8a24d8b7 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -5,7 +5,7 @@ , beautifulsoup4 , bottle , chardet -, dateutil +, python-dateutil , google-api-python-client , google-auth-oauthlib , lxml @@ -34,7 +34,7 @@ buildPythonPackage rec { beautifulsoup4 bottle chardet - dateutil + python-dateutil google-api-python-client google-auth-oauthlib lxml diff --git a/pkgs/development/python-modules/bitcoin-price-api/default.nix b/pkgs/development/python-modules/bitcoin-price-api/default.nix index 3e74c17f3be..c9d317a81c3 100644 --- a/pkgs/development/python-modules/bitcoin-price-api/default.nix +++ b/pkgs/development/python-modules/bitcoin-price-api/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, dateutil, requests }: +, python-dateutil, requests }: buildPythonPackage rec { pname = "bitcoin-price-api"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "bc68076f9632aaa9a8009d916d67a709c1e045dd904cfc7a3e8be33960d32029"; }; - propagatedBuildInputs = [ dateutil requests ]; + propagatedBuildInputs = [ python-dateutil requests ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index f229beb2b04..aecc904af50 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.11.0"; + version = "0.12.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1zs5lz3r17a2xn19i4na132iccyjsl9navj0d3v7gks7hlcad5kp"; + sha256 = "sha256-pNHz24YjB6FB9ZLC3LoXS+2qzhforflNXzG6OWFqCvk="; }; postPatch = '' diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 8a21eb455e0..d05c2decf49 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, dateutil +, python-dateutil , jmespath , docutils , ordereddict @@ -21,7 +21,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - dateutil + python-dateutil jmespath docutils ordereddict diff --git a/pkgs/development/python-modules/bravado-core/default.nix b/pkgs/development/python-modules/bravado-core/default.nix index 8c65cca07b2..24db42b7a74 100644 --- a/pkgs/development/python-modules/bravado-core/default.nix +++ b/pkgs/development/python-modules/bravado-core/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "bravado-core"; - version = "5.16.1"; + version = "5.17.0"; src = fetchFromGitHub { owner = "Yelp"; repo = pname; rev = "v${version}"; - sha256 = "0r9gk5vkjbc407fjydms3ik3hnzajq54znyz58d8rm6pvqcvjjpl"; + sha256 = "sha256-okQA4YJq0lyVJuDzD8mMRlOS/K3gf1qRUpw/5M0LlZE="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/bson/default.nix b/pkgs/development/python-modules/bson/default.nix new file mode 100644 index 00000000000..ca78b0806f0 --- /dev/null +++ b/pkgs/development/python-modules/bson/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python-dateutil +, six +}: + +buildPythonPackage rec { + pname = "bson"; + version = "0.5.10"; + + src = fetchPypi { + inherit pname version; + sha256 = "14355m3dchz446fl54ym78bn4wi20hddx1614f8rl4sin0m1nlfn"; + }; + + propagatedBuildInputs = [ + python-dateutil + six + ]; + + # 0.5.10 was not tagged, https://github.com/py-bson/bson/issues/108 + doCheck = false; + + pythonImportsCheck = [ "bson" ]; + + meta = with lib; { + description = "BSON codec for Python"; + homepage = "https://github.com/py-bson/bson"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/bt-proximity/default.nix b/pkgs/development/python-modules/bt-proximity/default.nix index 584b7b12605..9de6dfbdeff 100644 --- a/pkgs/development/python-modules/bt-proximity/default.nix +++ b/pkgs/development/python-modules/bt-proximity/default.nix @@ -1,19 +1,22 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, pybluez }: +{ lib +, buildPythonPackage +, fetchPypi +, pybluez +}: -buildPythonPackage { +buildPythonPackage rec { pname = "bt-proximity"; - version = "0.2"; + version = "0.2.1"; - # pypi only has a pre-compiled wheel and no sources - src = fetchFromGitHub { - owner = "FrederikBolding"; - repo = "bluetooth-proximity"; - rev = "463bade8a9080b47f09bf4a47830b31c69c5dffd"; - sha256 = "0anfh90cj3c2g7zqrjvq0d6dzpb4hjl6gk8zw0r349j2zw9i4h7y"; + src = fetchPypi { + pname = "bt_proximity"; + inherit version; + sha256 = "0xlif91vblbz065531yjf8nmlcahrl4q5pz52bc1jmzz7iv9hpgq"; }; - propagatedBuildInputs = [ pybluez ]; + propagatedBuildInputs = [ + pybluez + ]; # there are no tests doCheck = false; diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index 65cfa74777a..f23bc566bac 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "bugsnag"; - version = "4.0.3"; + version = "4.1.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0b70bc95e4e4f98b2eef7a3dadfdc50c1a40da7f50446adf43be05574a4b9f7c"; + sha256 = "sha256-3L1ZzZ7eomzJLvtlGK7YOi81b4G/1azHML/iAvsnwcE="; }; propagatedBuildInputs = [ six webob ]; diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix index c59d2196d20..a29e7458d4b 100644 --- a/pkgs/development/python-modules/bugwarrior/default.nix +++ b/pkgs/development/python-modules/bugwarrior/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools -, twiggy, requests, offtrac, bugzilla, taskw, dateutil, pytz, keyring, six +, twiggy, requests, offtrac, bugzilla, taskw, python-dateutil, pytz, keyring, six , jinja2, pycurl, dogpile_cache, lockfile, click, pyxdg, future, jira }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools - twiggy requests offtrac bugzilla taskw dateutil pytz keyring six + twiggy requests offtrac bugzilla taskw python-dateutil pytz keyring six jinja2 pycurl dogpile_cache lockfile click pyxdg future jira ]; diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 043a1cd3e13..65919542057 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k, python, twisted, jinja2, zope_interface, sqlalchemy, - sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq, + sqlalchemy_migrate, python-dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq, txrequests, pypugjs, boto3, moto, mock, python-lz4, setuptoolsTrial, isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins, parameterized, git, openssh, glibcLocales, ldap3, nixosTests }: @@ -39,7 +39,7 @@ let zope_interface sqlalchemy sqlalchemy_migrate - dateutil + python-dateutil txaio autobahn pyjwt diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix index a48e29b827b..7f51c89e3e4 100644 --- a/pkgs/development/python-modules/cattrs/default.nix +++ b/pkgs/development/python-modules/cattrs/default.nix @@ -1,27 +1,70 @@ { lib , attrs +, bson , buildPythonPackage , fetchFromGitHub , hypothesis +, immutables +, msgpack +, poetry-core , pytestCheckHook +, pyyaml +, tomlkit +, ujson }: buildPythonPackage rec { pname = "cattrs"; - version = "1.1.2"; + version = "1.7.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "Tinche"; repo = pname; rev = "v${version}"; - sha256 = "083d5mi6x7qcl26wlvwwn7gsp5chxlxkh4rp3a41w8cfwwr3h6l8"; + sha256 = "sha256-7F4S4IeApbULXhkEZ0oab3Y7sk20Ag2fCYxsyi4WbWw="; }; - propagatedBuildInputs = [ attrs ]; + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + attrs + ]; checkInputs = [ + bson hypothesis + immutables + msgpack pytestCheckHook + pyyaml + tomlkit + ujson + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "-l --benchmark-sort=fullname --benchmark-warmup=true --benchmark-warmup-iterations=5 --benchmark-group-by=fullname" "" + substituteInPlace pyproject.toml \ + --replace 'orjson = "^3.5.2"' "" + substituteInPlace tests/test_preconf.py \ + --replace "from orjson import dumps as orjson_dumps" "" \ + --replace "from orjson import loads as orjson_loads" "" + ''; + + disabledTestPaths = [ + # Don't run benchmarking tests + "bench/test_attrs_collections.py" + "bench/test_attrs_nested.py" + "bench/test_attrs_primitives.py" + "bench/test_primitives.py" + ]; + + disabledTests = [ + # orjson is not available as it requires Rust nightly features to compile its requirements + "test_orjson" ]; pythonImportsCheck = [ "cattr" ]; diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 480f7acb3d1..a48f8651298 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -12,9 +12,13 @@ buildPythonPackage rec { sha256 = "54436cd97b031bf2e08064223240e2a83d601d9414bcb1b702f94c6c33c29485"; }; + # click is only used for the repl, in most cases this shouldn't impact + # downstream packages postPatch = '' substituteInPlace requirements/test.txt \ --replace "moto==1.3.7" moto + substituteInPlace requirements/default.txt \ + --replace "click>=7.0,<8.0" click ''; propagatedBuildInputs = [ billiard click click-didyoumean click-plugins click-repl kombu pytz vine ]; diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 0f6b5fa2859..7c324e646a4 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface , dialog, gnureadline -, pytest_xdist, pytestCheckHook, dateutil +, pytest_xdist, pytestCheckHook, python-dateutil }: buildPythonPackage rec { @@ -40,7 +40,7 @@ buildPythonPackage rec { buildInputs = [ dialog gnureadline ]; checkInputs = [ - dateutil + python-dateutil pytestCheckHook pytest_xdist ]; diff --git a/pkgs/development/python-modules/certifi/python2.nix b/pkgs/development/python-modules/certifi/python2.nix new file mode 100644 index 00000000000..adc9594d69d --- /dev/null +++ b/pkgs/development/python-modules/certifi/python2.nix @@ -0,0 +1,34 @@ +{ lib +, fetchPypi +, buildPythonPackage +, python3 +}: + +let + inherit (python3.pkgs) certifi; + +in buildPythonPackage rec { + pname = "certifi"; + version = "2019.11.28"; + + src = fetchPypi { + inherit pname version; + sha256 = "25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f"; + }; + + postPatch = '' + cp ${certifi.src}/certifi/cacert.pem certifi/cacert.pem + ''; + + pythonImportsCheck = [ "certifi" ]; + + # no tests implemented + doCheck = false; + + meta = with lib; { + homepage = "https://certifi.io/"; + description = "Python package for providing Mozilla's CA Bundle"; + license = licenses.isc; + maintainers = with maintainers; [ ]; # NixOps team + }; +} diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index 1418db69a39..0088acdb832 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, dateutil +, python-dateutil , sigtools , six , attrs @@ -29,7 +29,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - dateutil + python-dateutil pygments repeated_test unittest2 diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix index 318354786b5..563ad08381c 100644 --- a/pkgs/development/python-modules/clldutils/default.nix +++ b/pkgs/development/python-modules/clldutils/default.nix @@ -5,7 +5,7 @@ , attrs , colorlog , csvw -, dateutil +, python-dateutil , tabulate , mock , postgresql @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - dateutil + python-dateutil tabulate colorlog attrs diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix index 57316ae9d6c..5c3b5f114f5 100644 --- a/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -3,7 +3,7 @@ , fetchPypi , certifi , six -, dateutil +, python-dateutil , urllib3 }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ certifi six - dateutil + python-dateutil urllib3 ]; diff --git a/pkgs/development/python-modules/clvm-rs/default.nix b/pkgs/development/python-modules/clvm-rs/default.nix index 4e5f69f8cd5..c18aab859ff 100644 --- a/pkgs/development/python-modules/clvm-rs/default.nix +++ b/pkgs/development/python-modules/clvm-rs/default.nix @@ -9,20 +9,20 @@ buildPythonPackage rec { pname = "clvm_rs"; - version = "0.1.7"; + version = "0.1.8"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "clvm_rs"; rev = version; - sha256 = "sha256-ves23q1uQ3lexwK9l1xGRss05jYObJDi/aY9Yvp4aPU="; + sha256 = "sha256-YQfcVF+/eEgSLhq0EIFjMlVUT/4w2S5C1/rbkNpKszo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-3kPzM2EX61ZvU6VKXY1OG/ic+9FU3Et4RuKp+3QYzSo="; + sha256 = "000vkyqlbq35fg6k4c05qh52iw8m4xbzyh94y038zr9p0yjlr019"; }; format = "pyproject"; diff --git a/pkgs/development/python-modules/clvm/default.nix b/pkgs/development/python-modules/clvm/default.nix index 00bc14e280f..2853bfe5318 100644 --- a/pkgs/development/python-modules/clvm/default.nix +++ b/pkgs/development/python-modules/clvm/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "clvm"; - version = "0.9.6"; + version = "0.9.7"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "clvm"; rev = version; - sha256 = "sha256-XBQEilDFhx0kT9bEMD4jX+SDk3cAC1BUCWhbtpgrLcA="; + sha256 = "sha256-kTmuiy0IbTGjDokZjxp3p8lr/0uVxG/0pRN2hETLBtA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/coloredlogs/default.nix b/pkgs/development/python-modules/coloredlogs/default.nix index 8cdd714bf10..0c14ee7b447 100644 --- a/pkgs/development/python-modules/coloredlogs/default.nix +++ b/pkgs/development/python-modules/coloredlogs/default.nix @@ -5,14 +5,14 @@ , humanfriendly , verboselogs , capturer -, pytest +, pytestCheckHook , mock , util-linux }: buildPythonPackage rec { pname = "coloredlogs"; - version = "15.0"; + version = "15.0.1"; src = fetchFromGitHub { owner = "xolox"; @@ -21,18 +21,33 @@ buildPythonPackage rec { sha256 = "sha256-C1Eo+XrrL3bwhT49KyOE6xjbAHJxn9Qy4s1RR5ERVtA="; }; + propagatedBuildInputs = [ + humanfriendly + ]; + + checkInputs = [ + pytestCheckHook + mock + util-linux + verboselogs + capturer + ]; + # capturer is broken on darwin / py38, so we skip the test until a fix for # https://github.com/xolox/python-capturer/issues/10 is released. doCheck = !stdenv.isDarwin; - checkPhase = '' - PATH=$PATH:$out/bin pytest . -k "not test_plain_text_output_format \ - and not test_auto_install" + + preCheck = '' + # Required for the CLI test + PATH=$PATH:$out/bin ''; - checkInputs = [ pytest mock util-linux verboselogs capturer ]; - pythonImportsCheck = [ "coloredlogs" ]; + disabledTests = [ + "test_plain_text_output_format" + "test_auto_install" + ]; - propagatedBuildInputs = [ humanfriendly ]; + pythonImportsCheck = [ "coloredlogs" ]; meta = with lib; { description = "Colored stream handler for Python's logging module"; diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix index 8f1c1754056..2b350be0046 100644 --- a/pkgs/development/python-modules/confuse/default.nix +++ b/pkgs/development/python-modules/confuse/default.nix @@ -1,25 +1,45 @@ { buildPythonPackage , enum34 -, fetchPypi +, fetchFromGitHub +, flit-core , isPy27 , lib , pathlib , pyyaml +, pytestCheckHook }: buildPythonPackage rec { pname = "confuse"; - version = "1.4.0"; + version = "1.5.0"; + format = "flit"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-kvwEUcbiwnMqw2PQ9Z1+pgir3b7QYt2o6Y6ajJhs5GQ="; + src = fetchFromGitHub { + owner = "beetbox"; + repo = pname; + rev = "v${version}"; + sha256 = "1kvilxhjifvz6ra64jadf9jiwphrah5rcb9ryq0v7w1dywgn4qp7"; }; - propagatedBuildInputs = [ pyyaml ] ++ lib.optionals isPy27 [ enum34 pathlib ] ; + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + pyyaml + ] ++ lib.optionals isPy27 [ + enum34 + pathlib + ] ; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "confuse" ]; meta = with lib; { - description = "Confuse is a configuration library for Python that uses YAML."; + description = "Python configuration library for Python that uses YAML"; homepage = "https://github.com/beetbox/confuse"; license = licenses.mit; maintainers = with maintainers; [ lovesegfault ]; diff --git a/pkgs/development/python-modules/crc32c/default.nix b/pkgs/development/python-modules/crc32c/default.nix index dd2c9059ed5..f4a85fba599 100644 --- a/pkgs/development/python-modules/crc32c/default.nix +++ b/pkgs/development/python-modules/crc32c/default.nix @@ -1,14 +1,14 @@ { lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { - version = "2.0.1"; + version = "2.2.post0"; pname = "crc32c"; src = fetchFromGitHub { owner = "ICRAR"; repo = pname; rev = "v${version}"; - sha256 = "0vyac7pchh083h5qdjwhhacfq77frkrq1bjzsn51qv1vwcdrpnrf"; + sha256 = "sha256-0FgNOVpgJTxRALuufZ7Dt1TwuX+zqw35yCq8kmq4RTc="; }; meta = { diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index a93f8e78ce6..3628609259c 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "croniter"; - version = "1.0.13"; + version = "1.0.15"; src = fetchPypi { inherit pname version; - sha256 = "sha256-V/Nt9PWhwxu/ULv/o1UWEsGfYVarHoji5CNCzLufm5o="; + sha256 = "06c2smrjskd9di8lcpymcxmygncxr14932qjhslc37yyaafzq3d7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/csvw/default.nix b/pkgs/development/python-modules/csvw/default.nix index 27f3f291113..67342d9eccc 100644 --- a/pkgs/development/python-modules/csvw/default.nix +++ b/pkgs/development/python-modules/csvw/default.nix @@ -4,7 +4,7 @@ , pythonOlder , attrs , isodate -, dateutil +, python-dateutil , rfc3986 , uritemplate , mock @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs isodate - dateutil + python-dateutil rfc3986 uritemplate ]; diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix index fb1eceda7f2..1a0f4e2d9fe 100644 --- a/pkgs/development/python-modules/curio/default.nix +++ b/pkgs/development/python-modules/curio/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , isPy3k , pytestCheckHook , sphinx @@ -10,31 +9,19 @@ buildPythonPackage rec { pname = "curio"; - version = "1.4"; + version = "1.5"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "57edce81c837f3c2cf42fbb346dee26e537d1659e6605269fb13bd179e068744"; + sha256 = "sha256-rwghLlkLt9qOTMOcQgEnEUlNwg1iLxYhVbopbMLjvBA="; }; - patches = [ - # Fix the flaky test due to slow moving time on Apple Silicon chips. - # Remove when https://github.com/dabeaz/curio/pull/339 is in the next release. - (fetchpatch { - url = "https://github.com/dabeaz/curio/commit/132376724bbfaa0a52d3d63d0791aa4ac1eb6f5f.patch"; - sha256 = "sha256-AxO0xRcR9l9/NKEJFwyZIoYcyZxpqOhpdNaeaYokVb4="; - }) - # Same as above - (fetchpatch { - url = "https://github.com/dabeaz/curio/commit/8ac2f12a2cdacbc750b01fc7459cee8879bc1ee3.patch"; - sha256 = "sha256-2Si3fuDLrI09QuzJd1TrE0QY02G9e9m+1eHFTB/MrWU="; - }) + checkInputs = [ + pytestCheckHook + sphinx ]; - disabled = !isPy3k; - - checkInputs = [ pytestCheckHook sphinx ]; - __darwinAllowLocalNetworking = true; disabledTests = [ @@ -46,9 +33,11 @@ buildPythonPackage rec { "test_unix_ssl_server" # socket bind error on hydra when built with other packages ]; + pythonImportsCheck = [ "curio" ]; + meta = with lib; { homepage = "https://github.com/dabeaz/curio"; - description = "Library for performing concurrent I/O with coroutines in Python 3"; + description = "Library for performing concurrent I/O with coroutines in Python"; license = licenses.bsd3; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 359ee96f60a..9068814ffd7 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.1.12"; + version = "1.1.13"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-tJnr+uT8ZF6VI2IVc//LHFtoVKG1wM4dZqippFhgWAc="; + sha256 = "012avhf0a8n9xyy4g3xcr5z8z2a3m6rnqic6gfs9fq6p9bkq3ix9"; }; propagatedBuildInputs = [ @@ -42,8 +42,10 @@ buildPythonPackage rec { ''; checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "./cvxpy" ]; - # Disable the slowest benchmarking tests, cuts test time in half + + # Disable the slowest benchmarking tests, cuts test time in half disabledTests = [ "test_tv_inpainting" "test_diffcp_sdp_example" @@ -51,6 +53,8 @@ buildPythonPackage rec { "test_ecos_bb_mi_lp_2" # https://github.com/cvxgrp/cvxpy/issues/1241#issuecomment-780912155 ]; + pythonImportsCheck = [ "cvxpy" ]; + meta = with lib; { description = "A domain-specific language for modeling convex optimization problems in Python"; homepage = "https://www.cvxpy.org/"; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index b51ac1701a2..208856490b8 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "dask"; - version = "2021.06.1"; + version = "2021.06.2"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - sha256 = "sha256-wrUqLSmlKhd0NSjWBwbow8aX53ZBTgl2n4lEmvxC3bs="; + sha256 = "sha256-qvfjdijzlqaJQrDztRAVr5PudTaVd3WOTBid2ElZQgg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index fbe3316e010..a24f726e346 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.41.0"; + version = "0.42.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PeGkO4qNX2sZ0WLsG0gtxasmNsWc9l5gWJcCMEUQpok="; + sha256 = "sha256-em+sF6fQnxiDq5pFzk/3oWqhpes8xMbN2sf4xT59Hps="; }; postPatch = '' diff --git a/pkgs/development/python-modules/datasets/default.nix b/pkgs/development/python-modules/datasets/default.nix index cc06297c4ea..0141b79f5d6 100644 --- a/pkgs/development/python-modules/datasets/default.nix +++ b/pkgs/development/python-modules/datasets/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "datasets"; - version = "1.4.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = version; - hash = "sha256-is8TS84varARWyfeDTbQH0pcYFTk0PcEyK183emB4GE="; + sha256 = "sha256-is8TS84varARWyfeDTbQH0pcYFTk0PcEyK183emB4GE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix index 6f11ae62c3e..50bde25cf44 100644 --- a/pkgs/development/python-modules/datashape/default.nix +++ b/pkgs/development/python-modules/datashape/default.nix @@ -5,7 +5,7 @@ , mock , numpy , multipledispatch -, dateutil +, python-dateutil }: let @@ -29,7 +29,7 @@ in buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ numpy multipledispatch dateutil ]; + propagatedBuildInputs = [ numpy multipledispatch python-dateutil ]; # Disable several tests # https://github.com/blaze/datashape/issues/232 diff --git a/pkgs/development/python-modules/dateparser/0.x.nix b/pkgs/development/python-modules/dateparser/0.x.nix index 49e2d1f2796..2aab262e64d 100644 --- a/pkgs/development/python-modules/dateparser/0.x.nix +++ b/pkgs/development/python-modules/dateparser/0.x.nix @@ -4,7 +4,7 @@ , mock , parameterized , pytestCheckHook -, dateutil +, python-dateutil , pytz , regex , tzlocal @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ # install_requires - dateutil pytz regex tzlocal + python-dateutil pytz regex tzlocal # extra_requires convertdate umalqurra jdatetime ruamel_yaml ]; diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 21dcffc4a84..6cbd1df32a5 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , isPy3k , fetchFromGitHub -, dateutil +, python-dateutil , pytz , regex , tzlocal @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ # install_requires - dateutil pytz regex tzlocal + python-dateutil pytz regex tzlocal # extra_requires hijri-converter convertdate ]; diff --git a/pkgs/development/python-modules/datrie/default.nix b/pkgs/development/python-modules/datrie/default.nix index d8bbc96fcc4..a74e53a939e 100644 --- a/pkgs/development/python-modules/datrie/default.nix +++ b/pkgs/development/python-modules/datrie/default.nix @@ -1,36 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch -, cython, pytest, pytestrunner, hypothesis }: +{ lib +, buildPythonPackage +, fetchPypi +, cython +, pytestCheckHook +, hypothesis +}: buildPythonPackage rec { pname = "datrie"; - version = "0.7.1"; + version = "0.8.2"; src = fetchPypi { inherit pname version; - sha256 = "08r0if7dry2q7p34gf7ffyrlnf4bdvnprxgydlfxgfnvq8f3f4bs"; + sha256 = "sha256-UlsI9jjVz2EV32zNgY5aASmM0jCy2skcj/LmSZ0Ydl0="; }; - patches = [ - # fix tests against recent hypothesis - (fetchpatch { - url = "https://github.com/pytries/datrie/commit/9b24b4c02783cdb703ac3f6c6d7d881db93166e0.diff"; - sha256 = "1ql7jcf57q3x3fcbddl26y9kmnbnj2dv6ga8mwq94l4a3213j2iy"; - }) + nativeBuildInputs = [ + cython ]; - nativeBuildInputs = [ cython ]; - buildInputs = [ pytest pytestrunner hypothesis ]; + buildInputs = [ + hypothesis + pytestCheckHook + ]; - # recompile pxd and pyx for python37 - # https://github.com/pytries/datrie/issues/52 - preBuild = '' - ./update_c.sh + postPatch = '' + substituteInPlace setup.py --replace '"pytest-runner", ' "" ''; + pythonImportsCheck = [ "datrie" ]; + meta = with lib; { description = "Super-fast, efficiently stored Trie for Python"; homepage = "https://github.com/kmike/datrie"; - license = licenses.lgpl2; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ lewo ]; }; } diff --git a/pkgs/development/python-modules/dbutils/default.nix b/pkgs/development/python-modules/dbutils/default.nix index 848e5038af8..294456cc85b 100644 --- a/pkgs/development/python-modules/dbutils/default.nix +++ b/pkgs/development/python-modules/dbutils/default.nix @@ -1,13 +1,13 @@ { lib, buildPythonPackage, fetchPypi, pytestCheckHook }: buildPythonPackage rec { - version = "2.0"; + version = "2.0.1"; pname = "dbutils"; src = fetchPypi { inherit version; pname = "DBUtils"; - sha256 = "131ifm2c2a7bipij597i8fvjka0dk2qv1xr2ghcvbc30jlkvag2g"; + sha256 = "sha256-Vw590TbBMRb+74vKGGCeP2a4ZoqcPV8hCdh0TERE2GE="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index cd24ae0fd3e..926dadd031c 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "2.2.4"; + version = "2.3.0"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "browniebroke"; repo = pname; rev = "v${version}"; - sha256 = "11gqmyf350256gbppak2qv20lg2bmszand4kmks93wphq5yp2iiy"; + sha256 = "sha256-pRYC0kJHJ5SKgDdGS1KkQEbv+DkF9oPw/A1GnB0AwfQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/devolo-home-control-api/default.nix b/pkgs/development/python-modules/devolo-home-control-api/default.nix index 44a0165d6fd..751ebaae292 100644 --- a/pkgs/development/python-modules/devolo-home-control-api/default.nix +++ b/pkgs/development/python-modules/devolo-home-control-api/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "devolo-home-control-api"; - version = "0.17.3"; + version = "0.17.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "2Fake"; repo = "devolo_home_control_api"; rev = "v${version}"; - sha256 = "1h7admqb1l28sxwhhkkhw0sfzgpn8zpczvmi3h28f68csflkv379"; + sha256 = "sha256-N/48Q2IEL194vCzrPPuy+mRNejXfkoXy2t2oe0Y6ug4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dftfit/default.nix b/pkgs/development/python-modules/dftfit/default.nix deleted file mode 100644 index 778b8c3d984..00000000000 --- a/pkgs/development/python-modules/dftfit/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, fetchPypi -, buildPythonPackage -, pymatgen -, marshmallow -, pyyaml -, pygmo -, pandas -, scipy -, numpy -, scikit-learn -, lammps-cython -, pymatgen-lammps -, pytestrunner -, isPy3k -}: - -buildPythonPackage rec { - pname = "dftfit"; - version = "0.5.1"; - disabled = (!isPy3k); - - src = fetchPypi { - inherit pname version; - sha256 = "4dcbde48948835dcf2d49d6628c9df5747a8ec505d517e374b8d6c7fe95892df"; - }; - - buildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ - pymatgen - marshmallow - pyyaml - pygmo - pandas - scipy - numpy - scikit-learn - lammps-cython - pymatgen-lammps - ]; - - # tests require git lfs download. and is quite large so skip tests - doCheck = false; - pythonImportsCheck = [ "dftfit" ]; - - meta = { - description = "Ab-Initio Molecular Dynamics Potential Development"; - homepage = "https://gitlab.com/costrouc/dftfit"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/dicom2nifti/default.nix b/pkgs/development/python-modules/dicom2nifti/default.nix index a9c2e4e8237..dd43902949a 100644 --- a/pkgs/development/python-modules/dicom2nifti/default.nix +++ b/pkgs/development/python-modules/dicom2nifti/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dicom2nifti"; - version = "2.2.12"; + version = "2.3.0"; disabled = isPy27; # no tests in PyPI dist @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "icometrix"; repo = pname; rev = version; - sha256 = "0ddzaw0yasyi2wsh7a6r73cdcmdfbb0nh0k0n4yxp9vnkw1ag5z4"; + sha256 = "sha256-QSu9CGXFjDpI25Cy6QSbrwiQ2bwsVezCUxSovRLs6AI="; }; propagatedBuildInputs = [ nibabel numpy pydicom scipy setuptools ]; diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix new file mode 100644 index 00000000000..7a9e1205979 --- /dev/null +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, chardet +, fetchPypi +, inflect +, jinja2 +, jinja2_pluralize +, pycodestyle +, pyflakes +, pygments +, pylint +, pytest-mock +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "diff-cover"; + version = "5.4.0"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + pname = "diff_cover"; + inherit version; + sha256 = "sha256-4iQ9/QcXh/lW8HE6wFZWc6Y57xhAEWu2TQnIUZJNAMs="; + }; + + propagatedBuildInputs = [ + chardet + inflect + jinja2 + jinja2_pluralize + pygments + ]; + + checkInputs = [ + pycodestyle + pyflakes + pylint + pytest-mock + pytestCheckHook + ]; + + disabledTests = [ + "added_file_pylint_console" + "file_does_not_exist" + ]; + + pythonImportsCheck = [ "diff_cover" ]; + + meta = with lib; { + description = "Automatically find diff lines that need test coverage"; + homepage = "https://github.com/Bachmann1234/diff-cover"; + license = licenses.asl20; + maintainers = with maintainers; [ dzabraev ]; + }; +} diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix deleted file mode 100644 index 7eeb378ff41..00000000000 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi -, chardet -, inflect -, jinja2 -, jinja2_pluralize -, pygments -, six -# test dependencies -, coverage -, mock -, nose -, pycodestyle -, pyflakes -, pylint -, pytest -}: - -buildPythonPackage rec { - pname = "diff_cover"; - version = "5.2.0"; - - preCheck = '' - export LC_ALL=en_US.UTF-8; - ''; - - src = fetchPypi { - inherit pname version; - sha256 = "a1cd54232d2e48bd4c1eabc96cfe4a8727a9a92fd2556b52ff8f65bb8adf8768"; - }; - - propagatedBuildInputs = [ chardet jinja2 jinja2_pluralize pygments six inflect ]; - - checkInputs = [ mock coverage pytest nose pylint pyflakes pycodestyle ]; - - # ignore tests which try to write files - checkPhase = '' - pytest -k 'not added_file_pylint_console and not file_does_not_exist' - ''; - - meta = with lib; { - description = "Automatically find diff lines that need test coverage"; - homepage = "https://github.com/Bachmann1234/diff-cover"; - license = licenses.asl20; - maintainers = with maintainers; [ dzabraev ]; - }; -} diff --git a/pkgs/development/python-modules/diofant/default.nix b/pkgs/development/python-modules/diofant/default.nix index f99e17137de..5a2e6e60b83 100644 --- a/pkgs/development/python-modules/diofant/default.nix +++ b/pkgs/development/python-modules/diofant/default.nix @@ -1,39 +1,42 @@ { lib -, isPy3k , buildPythonPackage , fetchPypi -, pytestrunner -, setuptools-scm +, gmpy2 , isort , mpmath -, strategies +, numpy +, pythonOlder +, scipy +, setuptools-scm }: buildPythonPackage rec { pname = "diofant"; - version = "0.10.0"; + version = "0.12.0"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit version; pname = "Diofant"; - sha256 = "0qjg0mmz2cqxryr610mppx3virf1gslzrsk24304502588z53v8w"; + sha256 = "sha256-G0CTSoDSduiWxlrk5XjnX5ldNZ9f7yxaJeUPO3ezJgo="; }; nativeBuildInputs = [ isort - pytestrunner setuptools-scm ]; propagatedBuildInputs = [ + gmpy2 mpmath - strategies + numpy + scipy ]; # tests take ~1h doCheck = false; - disabled = !isPy3k; + pythonImportsCheck = [ "diofant" ]; meta = with lib; { description = "A Python CAS library"; diff --git a/pkgs/development/python-modules/discogs-client/default.nix b/pkgs/development/python-modules/discogs-client/default.nix new file mode 100644 index 00000000000..e47922f9577 --- /dev/null +++ b/pkgs/development/python-modules/discogs-client/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, oauthlib +, python-dateutil +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "discogs-client"; + version = "2.3.12"; + + + src = fetchFromGitHub { + owner = "joalla"; + repo = "discogs_client"; + rev = "v${version}"; + sha256 = "0y553x8rkgmqqg980n62pwdxbp75xalkhlb6k5g0cms42ggy5fsc"; + }; + + propagatedBuildInputs = [ + requests + oauthlib + python-dateutil + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "discogs_client" ]; + + meta = with lib; { + description = "Unofficial Python API client for Discogs"; + homepage = "https://github.com/joalla/discogs_client"; + license = licenses.bsd2; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/discogs_client/default.nix b/pkgs/development/python-modules/discogs_client/default.nix deleted file mode 100644 index e522ac4b6c9..00000000000 --- a/pkgs/development/python-modules/discogs_client/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, requests, oauthlib }: - -buildPythonPackage rec { - pname = "discogs-client"; - version = "2.3.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "cc979fcbb5283f74d388c7111c8ed6bef920b01614a014d6b1c5d6fbb554bfc3"; - }; - - propagatedBuildInputs = [ requests oauthlib ]; - - meta = with lib; { - description = "Official Python API client for Discogs"; - license = licenses.bsd2; - homepage = "https://github.com/discogs/discogs_client"; - }; -} diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 605e905d4ab..ce0cf13e9a9 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -6,7 +6,6 @@ , dask , msgpack , psutil -, six , sortedcontainers , tblib , toolz @@ -20,27 +19,39 @@ buildPythonPackage rec { pname = "distributed"; - version = "2021.6.1"; + version = "2021.6.2"; disabled = pythonOlder "3.6"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "sha256-Z79h/WAio5diX2myChx8HPAWe2RB4Ajw7Ybch4XUYFc="; + sha256 = "sha256-19ESqGqwSdzvo7If0brqQhKiwD0iwkvVWtONIaf10Ug="; }; propagatedBuildInputs = [ - click cloudpickle dask msgpack psutil six - sortedcontainers tblib toolz tornado zict pyyaml mpi4py bokeh + bokeh + click + cloudpickle + dask + mpi4py + msgpack + psutil + pyyaml + sortedcontainers + tblib + toolz + tornado + zict ]; # when tested random tests would fail and not repeatably doCheck = false; + pythonImportsCheck = [ "distributed" ]; meta = with lib; { - description = "Distributed computation in Python."; - homepage = "https://distributed.readthedocs.io/en/latest/"; + description = "Distributed computation in Python"; + homepage = "https://distributed.readthedocs.io/"; license = licenses.bsd3; platforms = platforms.x86; # fails on aarch64 maintainers = with maintainers; [ teh costrouc ]; diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix index 2c678e672a3..14e66a159c1 100644 --- a/pkgs/development/python-modules/django-haystack/default.nix +++ b/pkgs/development/python-modules/django-haystack/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, setuptools, setuptools-scm, django, dateutil, whoosh, pysolr +, setuptools, setuptools-scm, django, python-dateutil, whoosh, pysolr , coverage, mock, nose, geopy, requests }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "d490f920afa85471dd1fa5000bc8eff4b704daacbe09aee1a64e75cbc426f3be"; }; - checkInputs = [ pysolr whoosh dateutil geopy coverage nose mock coverage requests ]; + checkInputs = [ pysolr whoosh python-dateutil geopy coverage nose mock coverage requests ]; propagatedBuildInputs = [ django setuptools ]; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index ae6187e207e..7ee41a962c7 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "Django"; - version = "3.2.4"; + version = "3.2.5"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "15pjwyvrx4n8gi8n51b14wp54bg4jqapr25p52597zn6ikdxijb6"; + sha256 = "1kam3301jl53vm0mhflwwsqy5d7kb5dksmjanlaj7v7xakm5z81x"; }; patches = lib.optional withGdal diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix index b1d4eaec5c9..3af74be85b2 100644 --- a/pkgs/development/python-modules/django_silk/default.nix +++ b/pkgs/development/python-modules/django_silk/default.nix @@ -7,7 +7,7 @@ , django , pygments , simplejson -, dateutil +, python-dateutil , requests , setuptools-scm , sqlparse @@ -56,7 +56,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ mock ]; propagatedBuildInputs = [ - django pygments simplejson dateutil requests + django pygments simplejson python-dateutil requests sqlparse jinja2 autopep8 pytz pillow gprof2dot ]; diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix index 613d2444d73..1bc5d380b08 100644 --- a/pkgs/development/python-modules/drms/default.nix +++ b/pkgs/development/python-modules/drms/default.nix @@ -7,16 +7,18 @@ , astropy , pytestCheckHook , pytest-doctestplus +, pythonOlder }: buildPythonPackage rec { pname = "drms"; - version = "0.6.0"; + version = "0.6.2"; format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "74efb903f42647ea536de0c5aea4f9a81efe027c95055ec4e72ef62479a04c89"; + sha256 = "sha256-Id8rPK8qq71gHn5DKnEi7Lp081GFbcFtGU+v89Vlt9o="; }; propagatedBuildInputs = [ @@ -31,10 +33,12 @@ buildPythonPackage rec { pytest-doctestplus ]; + pythonImportsCheck = [ "drms" ]; + meta = with lib; { description = "Access HMI, AIA and MDI data with Python"; homepage = "https://github.com/sunpy/drms"; - license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + license = licenses.bsd2; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index 4a4dd279a52..fd360bfbd12 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -5,7 +5,7 @@ , pandas , pybind11 , setuptools-scm -, pytestrunner +, pytest-runner , pytestCheckHook }: @@ -28,18 +28,24 @@ buildPythonPackage rec { nativeBuildInputs = [ pybind11 setuptools-scm - pytestrunner + pytest-runner ]; - propagatedBuildInputs = [ numpy pandas ]; + propagatedBuildInputs = [ + numpy + pandas + ]; + + checkInputs = [ + pytestCheckHook + ]; - checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "duckdb" ]; meta = with lib; { - description = "DuckDB is an embeddable SQL OLAP Database Management System"; - homepage = "https://pypi.python.org/pypi/duckdb"; + description = "Python binding for DuckDB"; + homepage = "https://duckdb.org/"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/dugong/default.nix b/pkgs/development/python-modules/dugong/default.nix index 09a0f25e18f..5130ea3b004 100644 --- a/pkgs/development/python-modules/dugong/default.nix +++ b/pkgs/development/python-modules/dugong/default.nix @@ -1,14 +1,32 @@ -{ buildPythonPackage, fetchPypi, pythonOlder }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +}: buildPythonPackage rec { pname = "dugong"; - version = "3.7.5"; + version = "3.8.1"; + disabled = pythonOlder "3.3"; - disabled = pythonOlder "3.3"; # Library does not support versions older than 3.3 + src = fetchFromGitHub { + owner = "python-dugong"; + repo = "python-dugong"; + rev = "release-${version}"; + sha256 = "1063c1779idc5nrjzfv5w1xqvyy3crapb2a2xll9y6xphxclnkjc"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "dugong" ]; - src = fetchPypi { - inherit pname version; - extension = "tar.bz2"; - sha256 = "10vjdp21m0gzm096lgl84z184s5l9iz69ppj6acgsc125037dl6h"; + meta = with lib; { + description = "HTTP 1.1 client designed for REST-ful APIs"; + homepage = "https://github.com/python-dugong/python-dugong/"; + license = with licenses; [ psfl asl20 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/ecos/default.nix b/pkgs/development/python-modules/ecos/default.nix index 6c07a5d485a..35470cb8b60 100644 --- a/pkgs/development/python-modules/ecos/default.nix +++ b/pkgs/development/python-modules/ecos/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ecos"; - version = "2.0.7.post1"; + version = "2.0.8"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "embotech"; repo = "ecos-python"; rev = version; - sha256 = "1wzmamz2r4xr2zxgfwnm5q283185d1q6a7zn30vip18lxpys70z0"; + sha256 = "sha256-2OJqbcOZceeD2fO5cu9fohuUVaA2LwQOQSWR4jRv3mk="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/editdistance-s/default.nix b/pkgs/development/python-modules/editdistance-s/default.nix new file mode 100644 index 00000000000..8d9be707f9b --- /dev/null +++ b/pkgs/development/python-modules/editdistance-s/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, cffi +}: + +buildPythonPackage rec { + pname = "editdistance-s"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "asottile"; + repo = pname; + rev = "v${version}"; + sha256 = "0w2qd5b6a3c3ahd0xy9ykq4wzqk0byqwdqrr26dyn8j2425j46lg"; + }; + + propagatedBuildInputs = [ cffi ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "editdistance_s" ]; + + meta = with lib; { + description = "Fast implementation of the edit distance (Levenshtein distance)"; + homepage = "https://github.com/asottile/editdistance-s"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ austinbutler ]; + }; +} diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix index 4329db98c2b..6449a3da767 100644 --- a/pkgs/development/python-modules/editorconfig/default.nix +++ b/pkgs/development/python-modules/editorconfig/default.nix @@ -6,29 +6,33 @@ buildPythonPackage rec { pname = "editorconfig"; - version = "0.12.2"; + version = "0.12.3"; # fetchgit used to ensure test submodule is available src = fetchgit { url = "https://github.com/editorconfig/editorconfig-core-py"; - rev = "596da5e06ebee05bdbdc6224203c79c4d3c6486a"; # Not tagged - sha256 = "05cbp971b0zix7kfxkk7ndxb4ax1l21frwc00d4g78mk4sdz6dig"; + rev = "1a8fb62b9941fded9e4fb83a3d0599427f5484cb"; # Not tagged + sha256 = "0vx8rl7kii72965jsi01mdsz9rfi1q9bwy13x47iaqm6rmcwc1rb"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; dontUseCmakeConfigure = true; checkPhase = '' cmake . - # utf_8_char fails with python3 + # utf_8_char fails with Python 3 ctest -E "utf_8_char" . ''; + pythonImportsCheck = [ "editorconfig" ]; + meta = with lib; { - homepage = "https://editorconfig.org"; description = "EditorConfig File Locator and Interpreter for Python"; + homepage = "https://editorconfig.org"; license = licenses.psfl; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/emailthreads/default.nix b/pkgs/development/python-modules/emailthreads/default.nix index 36553daff55..c57e58368ff 100644 --- a/pkgs/development/python-modules/emailthreads/default.nix +++ b/pkgs/development/python-modules/emailthreads/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "emailthreads"; - version = "0.1.0"; + version = "0.1.3"; disabled = !isPy3k; # pypi is missing files for tests @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "emersion"; repo = "python-emailthreads"; rev = "v${version}"; - sha256 = "17pfal8kbxhs025apkijqbkppw2lljca8x1cwcx49jv60h05c3cn"; + sha256 = "sha256-7BhYS1DQCW9QpG31asPCq5qPyJy+WW2onZpvEHhwQCs="; }; PKGVER = version; diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix index a4f2bece349..72cb9a64db0 100644 --- a/pkgs/development/python-modules/emcee/default.nix +++ b/pkgs/development/python-modules/emcee/default.nix @@ -1,20 +1,42 @@ -{ lib, buildPythonPackage, fetchPypi -, numpy }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, pytestCheckHook +, setuptools-scm +}: buildPythonPackage rec { pname = "emcee"; - version = "3.0.2"; + version = "3.1.0"; - src = fetchPypi { - inherit pname version; - sha256 = "035a44d7594fdd03efd10a522558cdfaa080e046ad75594d0bf2aec80ec35388"; + src = fetchFromGitHub { + owner = "dfm"; + repo = pname; + rev = "v${version}"; + sha256 = "1x9y4zwlv6hl7jms2knpa2qrh89ywsl847yb7d93n94gyx2s16p0"; }; - propagatedBuildInputs = [ numpy ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + numpy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "emcee" ]; meta = with lib; { description = "Kick ass affine-invariant ensemble MCMC sampling"; homepage = "https://emcee.readthedocs.io/"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index ce2beb23511..67c9c7a1abd 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -1,21 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi, nose }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: buildPythonPackage rec { pname = "emoji"; - version = "1.2.0"; + version = "1.4.0"; - src = fetchPypi { - inherit pname version; - sha256 = "18siknldyqvxvjf0nv18m0a1c26ahkg7vmhkij1qayanb0h46vs9"; + src = fetchFromGitHub { + owner = "carpedm20"; + repo = pname; + rev = "v.${version}"; + sha256 = "0xksxdld20sh3c2s6pry1fm2br9xq8ypdq5pf971fpg5pk2f4iy9"; }; - checkInputs = [ nose ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = "nosetests"; + disabledTests = [ + "test_emojize_name_only" + ]; + + pythonImportsCheck = [ "emoji" ]; meta = with lib; { description = "Emoji for Python"; - homepage = "https://pypi.python.org/pypi/emoji/"; + homepage = "https://github.com/carpedm20/emoji/"; license = licenses.bsd3; maintainers = with maintainers; [ joachifm ]; }; diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix index 8896c5c706a..8257af2e45f 100644 --- a/pkgs/development/python-modules/enaml/default.nix +++ b/pkgs/development/python-modules/enaml/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "enaml"; - version = "0.11.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "nucleic"; repo = pname; rev = version; - sha256 = "1in5qa5j96qs3gsv8yaxs1l6dbm69xhzvc0pbzg0dd9kpqxfdy1j"; + sha256 = "sha256-8ZahvFDYW7xUTSTZP1UXnQBCg9RVUywoO7EbqtTQPJI="; }; # qt bindings cannot be found during tests diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix index c0d77c29748..a859f509f34 100644 --- a/pkgs/development/python-modules/ephem/default.nix +++ b/pkgs/development/python-modules/ephem/default.nix @@ -1,26 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, glibcLocales, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, glibcLocales +, pytest +}: buildPythonPackage rec { pname = "ephem"; - version = "3.7.7.1"; + version = "4.0.0.2"; src = fetchPypi { inherit pname version; - sha256 = "36b51a8dc7cfdeb456dd6b8ab811accab8341b2d562ee3c6f4c86f6d3dbb984e"; + sha256 = "sha256-0D3nPr9qkWgdWX61tdQ7z28MZ+KSu6L5qXRzS08VdX4="; }; - patchFlags = [ "-p0" ]; - checkInputs = [ pytest glibcLocales ]; + checkInputs = [ + glibcLocales + pytest + ]; + # JPLTest uses assets not distributed in package checkPhase = '' - LC_ALL="en_US.UTF-8" py.test --pyargs ephem.tests -k "not JPLTest" + LC_ALL="en_US.UTF-8" pytest --pyargs ephem.tests -k "not JPLTest" ''; + pythonImportsCheck = [ "ephem" ]; + meta = with lib; { description = "Compute positions of the planets and stars"; - homepage = "https://pypi.python.org/pypi/ephem/"; - license = licenses.lgpl3; + homepage = "https://github.com/brandon-rhodes/pyephem"; + license = licenses.mit; maintainers = with maintainers; [ chrisrosset ]; }; } diff --git a/pkgs/development/python-modules/fabulous/default.nix b/pkgs/development/python-modules/fabulous/default.nix index 6079f22020a..b357eb0c01b 100644 --- a/pkgs/development/python-modules/fabulous/default.nix +++ b/pkgs/development/python-modules/fabulous/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "fabulous"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "jart"; repo = pname; rev = version; - sha256 = "0yxdaz6yayp1a57kdb2i8q7kwwdlwy4a3d0lr012h2ji9m89c8q7"; + sha256 = "sha256-hchlxuB5QP+VxCx+QZ2739/mR5SQmYyE+9kXLKJ2ij4="; }; patches = [ diff --git a/pkgs/development/python-modules/fake_factory/default.nix b/pkgs/development/python-modules/fake_factory/default.nix index 2e561a163ab..002df15177b 100644 --- a/pkgs/development/python-modules/fake_factory/default.nix +++ b/pkgs/development/python-modules/fake_factory/default.nix @@ -3,7 +3,7 @@ , fetchPypi , python , six -, dateutil +, python-dateutil , ipaddress , mock }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "f5bd18deb22ad8cb4402513c025877bc6b50de58902d686b6b21ba8981dce260"; }; - propagatedBuildInputs = [ six dateutil ipaddress mock ]; + propagatedBuildInputs = [ six python-dateutil ipaddress mock ]; # fake-factory is depreciated and single test will always fail doCheck = false; diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 12f30b20a42..196c7e47b39 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, dateutil +, python-dateutil , text-unidecode , freezegun , pytestCheckHook @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - dateutil + python-dateutil text-unidecode ]; diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix index c036f5cacb7..fe46405eb3f 100644 --- a/pkgs/development/python-modules/fastimport/default.nix +++ b/pkgs/development/python-modules/fastimport/default.nix @@ -1,9 +1,16 @@ -{ lib, buildPythonPackage, python, fetchPypi}: +{ lib +, pythonOlder +, buildPythonPackage +, fetchPypi +, python +}: buildPythonPackage rec { pname = "fastimport"; version = "0.9.13"; + disabled = pythonOlder "3.5"; + src = fetchPypi { inherit pname version; sha256 = "486135a39edb85808fdbbe2c8009197978800a4544fca56cc2074df32e1304f3"; @@ -13,8 +20,10 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover ''; + pythonImportsCheck = [ "fastimport" ]; + meta = with lib; { - homepage = "https://launchpad.net/python-fastimport"; + homepage = "https://github.com/jelmer/python-fastimport"; description = "VCS fastimport/fastexport parser"; maintainers = with maintainers; [ koral ]; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix index 59ca95a0338..9ca3627e74c 100644 --- a/pkgs/development/python-modules/feedgen/default.nix +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, dateutil, lxml }: +{ lib, buildPythonPackage, fetchPypi, python-dateutil, lxml }: buildPythonPackage rec { pname = "feedgen"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0jl0b87l7v6c0f1nx6k81skjhdj5i11kmchdjls00mynpvdip0cf"; }; - propagatedBuildInputs = [ dateutil lxml ]; + propagatedBuildInputs = [ python-dateutil lxml ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/fitbit/default.nix b/pkgs/development/python-modules/fitbit/default.nix index 46c6ac78a6c..b41ac0a4983 100644 --- a/pkgs/development/python-modules/fitbit/default.nix +++ b/pkgs/development/python-modules/fitbit/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , coverage -, dateutil +, python-dateutil , freezegun , mock , requests-mock @@ -15,7 +15,7 @@ buildPythonPackage rec { version = "0.3.1"; checkInputs = [ coverage freezegun mock requests-mock sphinx ]; - propagatedBuildInputs = [ dateutil requests_oauthlib ]; + propagatedBuildInputs = [ python-dateutil requests_oauthlib ]; # The source package on PyPi is missing files required for unit testing. # https://github.com/orcasgit/python-fitbit/issues/148 diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index 5d8359885bd..fff330946d1 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -11,6 +11,10 @@ buildPythonPackage rec { sha256 = "28352387efbbe772cfb307570019f81957a13ff718d994a9125fa705efb73680"; }; + postPatch = '' + sed -i -e 's/use_scm_version=.*/version="${version}",/' setup.py + ''; + propagatedBuildInputs = [ flask brotli ]; meta = with lib; { diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index d58ae431039..7057bb58750 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, dateutil, flask, pyjwt, werkzeug, pytest }: +{ lib, buildPythonPackage, fetchPypi, python-dateutil, flask, pyjwt, werkzeug, pytest }: buildPythonPackage rec { pname = "Flask-JWT-Extended"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "76461f2dbdf502261c69ddecd858eaf4164fbcfbf05aa456f3927fc2ab0315de"; }; - propagatedBuildInputs = [ dateutil flask pyjwt werkzeug ]; + propagatedBuildInputs = [ python-dateutil flask pyjwt werkzeug ]; checkInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index e1de7bf0d3b..4d0d89d0f14 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -20,16 +20,23 @@ buildPythonPackage rec { pname = "flask-restx"; - version = "0.3.0"; + version = "0.4.0"; # Tests not included in PyPI tarball src = fetchFromGitHub { owner = "python-restx"; repo = pname; rev = version; - sha256 = "0aj13nd3z71gb8c2kqiaz3f9k7jr0srlvrsx8hpz4nkpki8jiz2s"; + sha256 = "sha256-jM0QJ/klbWh3qho6ZQOH2n1qaguK9C98QIuSfqpI8xA="; }; + postPatch = '' + # https://github.com/python-restx/flask-restx/pull/341 + substituteInPlace requirements/install.pip \ + --replace "Flask>=0.8, <2.0.0" "Flask>=0.8, !=2.0.0" \ + --replace "werkzeug <2.0.0" "werkzeug !=2.0.0" + ''; + propagatedBuildInputs = [ aniso8601 jsonschema flask werkzeug pytz six ] ++ lib.optionals isPy27 [ enum34 ]; @@ -42,6 +49,8 @@ buildPythonPackage rec { "--deselect=tests/test_logging.py::LoggingTest::test_override_app_level" ]; + pythonImportCheck = [ "flask_restx" ]; + meta = with lib; { homepage = "https://flask-restx.readthedocs.io/en/${version}/"; description = "Fully featured framework for fast, easy and documented API development with Flask"; diff --git a/pkgs/development/python-modules/freezegun/0.3.nix b/pkgs/development/python-modules/freezegun/0.3.nix index a83a432d89d..c4444805009 100644 --- a/pkgs/development/python-modules/freezegun/0.3.nix +++ b/pkgs/development/python-modules/freezegun/0.3.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, dateutil +, python-dateutil , six , mock , nose @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "e2062f2c7f95cc276a834c22f1a17179467176b624cc6f936e8bc3be5535ad1b"; }; - propagatedBuildInputs = [ dateutil six ]; + propagatedBuildInputs = [ python-dateutil six ]; checkInputs = [ mock nose pytest ]; meta = with lib; { diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix index 00d03435de9..742506b6089 100644 --- a/pkgs/development/python-modules/freezegun/default.nix +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi -, dateutil +, python-dateutil , pytestCheckHook }: @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "177f9dd59861d871e27a484c3332f35a6e3f5d14626f2bf91be37891f18927f3"; }; - propagatedBuildInputs = [ dateutil ]; + propagatedBuildInputs = [ python-dateutil ]; checkInputs = [ pytestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/gdrivefs/default.nix b/pkgs/development/python-modules/gdrivefs/default.nix index 836fdee4beb..41b6a6a87f1 100644 --- a/pkgs/development/python-modules/gdrivefs/default.nix +++ b/pkgs/development/python-modules/gdrivefs/default.nix @@ -6,7 +6,7 @@ , greenlet , httplib2 , six -, dateutil +, python-dateutil , fusepy , google-api-python-client }: @@ -22,7 +22,7 @@ buildPythonPackage rec { }; buildInputs = [ gipc greenlet httplib2 six ]; - propagatedBuildInputs = [ dateutil fusepy google-api-python-client ]; + propagatedBuildInputs = [ python-dateutil fusepy google-api-python-client ]; patchPhase = '' substituteInPlace gdrivefs/resources/requirements.txt \ diff --git a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix index 3fada45d0c8..e87c766c0ca 100644 --- a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix +++ b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "georss-ign-sismologia-client"; - version = "0.3"; + version = "0.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-ign-sismologia-client"; rev = "v${version}"; - sha256 = "sha256-7Jj6uWb4HyPAh3/XtVTy0N23bk33mlIiqlt9z/PW+4Y="; + sha256 = "sha256-g7lZC5ZiJV8dNZJceLROqyBRZSuqaivGFhaQrKe4B7g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ghp-import/default.nix b/pkgs/development/python-modules/ghp-import/default.nix index 37a35febdf0..0d5506009a7 100644 --- a/pkgs/development/python-modules/ghp-import/default.nix +++ b/pkgs/development/python-modules/ghp-import/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, dateutil +, python-dateutil }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { hash = "sha256-wiqc4Qw3dT4miNFk12WnANrkuNefptsKLDEyuniBiU8="; }; - propagatedBuildInputs = [ dateutil ]; + propagatedBuildInputs = [ python-dateutil ]; # Does not include any unit tests doCheck = false; diff --git a/pkgs/development/python-modules/gibberish-detector/default.nix b/pkgs/development/python-modules/gibberish-detector/default.nix new file mode 100644 index 00000000000..df3b70c000d --- /dev/null +++ b/pkgs/development/python-modules/gibberish-detector/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "gibberish-detector"; + version = "0.1.1"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "domanchi"; + repo = pname; + rev = "v${version}"; + sha256 = "1si0fkpnk9vjkwl31sq5jkyv3rz8a5f2nh3xq7591j9wv2b6dn0b"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "gibberish_detector" ]; + + meta = with lib; { + description = "Python module to detect gibberish strings"; + homepage = "https://github.com/domanchi/gibberish-detector"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/github3_py/default.nix b/pkgs/development/python-modules/github3_py/default.nix index 8a1eea40c68..68e277d0b1a 100644 --- a/pkgs/development/python-modules/github3_py/default.nix +++ b/pkgs/development/python-modules/github3_py/default.nix @@ -9,7 +9,7 @@ , mock , requests , uritemplate -, dateutil +, python-dateutil , jwcrypto , pyopenssl , ndg-httpsclient @@ -28,7 +28,7 @@ buildPythonPackage rec { checkInputs = [ betamax pytest betamax-matchers ] ++ lib.optional (pythonOlder "3") unittest2 ++ lib.optional (pythonOlder "3.3") mock; - propagatedBuildInputs = [ requests uritemplate dateutil jwcrypto pyopenssl ndg-httpsclient pyasn1 ]; + propagatedBuildInputs = [ requests uritemplate python-dateutil jwcrypto pyopenssl ndg-httpsclient pyasn1 ]; postPatch = '' sed -i -e 's/unittest2 ==0.5.1/unittest2>=0.5.1/' setup.py diff --git a/pkgs/development/python-modules/google-apputils/default.nix b/pkgs/development/python-modules/google-apputils/default.nix index 321837f56ae..225adf348d1 100644 --- a/pkgs/development/python-modules/google-apputils/default.nix +++ b/pkgs/development/python-modules/google-apputils/default.nix @@ -4,7 +4,7 @@ , isPy3k , pytz , gflags -, dateutil +, python-dateutil , mox , python }: @@ -23,7 +23,7 @@ buildPythonPackage rec { sed -i '/ez_setup/d' setup.py ''; - propagatedBuildInputs = [ pytz gflags dateutil mox ]; + propagatedBuildInputs = [ pytz gflags python-dateutil mox ]; checkPhase = '' ${python.executable} setup.py google_test diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index 1a0e6d903a4..0a2413e9d76 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -8,7 +8,6 @@ , mock , pytestCheckHook , pytest-mock -, pytestcov }: buildPythonPackage rec { @@ -30,12 +29,20 @@ buildPythonPackage rec { }) ]; + postPatch = '' + sed -i "/--cov/d" setup.cfg + ''; + # Fontconfig error: Cannot load default config file FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; - checkInputs = [ mock pytestCheckHook pytest-mock pytestcov ]; + checkInputs = [ mock pytestCheckHook pytest-mock ]; + + preCheck = '' + export HOME=$TMPDIR + ''; meta = with lib; { description = "Simple Python interface for Graphviz"; diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index 0450dfd07e5..adb131868c7 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytestrunner -, dateutil +, python-dateutil , babelfish , rebulk }: @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = false; buildInputs = [ pytestrunner ]; propagatedBuildInputs = [ - dateutil babelfish rebulk + python-dateutil babelfish rebulk ]; meta = { diff --git a/pkgs/development/python-modules/hijri-converter/default.nix b/pkgs/development/python-modules/hijri-converter/default.nix index d7ae17ed61a..e9ce708b2cb 100644 --- a/pkgs/development/python-modules/hijri-converter/default.nix +++ b/pkgs/development/python-modules/hijri-converter/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hijri-converter"; - version = "2.1.2"; + version = "2.1.3"; src = fetchPypi { inherit pname version; - sha256 = "43b5ac566e7a7deeab364a2397e94405a65fd24ea786073eb3d4c740ebda7b9b"; + sha256 = "1cq67v0fjk7cd8kbppg2kl31a5i6jm8qrkcdqxx6vxwmx65l68ks"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index fe362fa86da..e09b957425a 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , convertdate -, dateutil +, python-dateutil , fetchPypi , hijri-converter , korean-lunar-calendar @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ convertdate - dateutil + python-dateutil hijri-converter korean-lunar-calendar six diff --git a/pkgs/development/python-modules/hypchat/default.nix b/pkgs/development/python-modules/hypchat/default.nix index 8337fd2230b..1f69dfe2106 100644 --- a/pkgs/development/python-modules/hypchat/default.nix +++ b/pkgs/development/python-modules/hypchat/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi -, requests, six, dateutil }: +, requests, six, python-dateutil }: buildPythonPackage rec { pname = "hypchat"; @@ -10,5 +10,5 @@ buildPythonPackage rec { sha256 = "1sd8f3gihagaqd848dqy6xw457fa4f9bla1bfyni7fq3h76sjdzg"; }; - propagatedBuildInputs = [ requests six dateutil ]; + propagatedBuildInputs = [ requests six python-dateutil ]; } diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 973b792f5bc..a63617ba2a2 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -38,9 +38,17 @@ buildPythonPackage rec { # Various tests try to access credential files which are not included with the source distribution disabledTests = [ - "test_iam" "test_cwd" "test_configure_service" "test_get_authenticator" - "test_read_external_sources_2" "test_files_duplicate_parts" "test_files_list" - "test_files_dict" "test_retry_config_external" "test_gzip_compression_external" + "test_configure_service" + "test_cp4d_authenticator" + "test_cwd" + "test_files_dict" + "test_files_duplicate_parts" + "test_files_list" + "test_get_authenticator" + "test_gzip_compression_external" + "test_iam" + "test_read_external_sources_2" + "test_retry_config_external" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index 7684f1a689c..3698d8b2e36 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "ibm-watson"; - version = "5.2.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "watson-developer-cloud"; repo = "python-sdk"; rev = "v${version}"; - sha256 = "1abink5mv9nw506nwm9hlvnr1lq6dkxxj2j12iwphcyd7xs63n2s"; + sha256 = "sha256-0F4BZf0D0dqGm0OkJaSgmH5RxEA8KCzOlbnhIQVsgzQ="; }; checkInputs = [ @@ -40,8 +40,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace websocket-client==0.48.0 websocket-client>=0.48.0 \ - --replace ibm_cloud_sdk_core==3.3.6 ibm_cloud_sdk_core>=3.3.6 + --replace websocket-client==1.1.0 websocket-client>=1.1.0 ''; meta = with lib; { diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index 8e75a945d10..fdf490e7cb2 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , setuptools -, dateutil +, python-dateutil , pytz }: @@ -16,7 +16,7 @@ buildPythonPackage rec { }; buildInputs = [ setuptools ]; - propagatedBuildInputs = [ dateutil pytz ]; + propagatedBuildInputs = [ python-dateutil pytz ]; meta = with lib; { description = "A parser/generator of iCalendar files"; diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index cb4d538da3d..15850707b18 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,23 +2,23 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook -, editdistance +, editdistance-s }: buildPythonPackage rec { pname = "identify"; - version = "1.6.1"; + version = "2.2.10"; src = fetchFromGitHub { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "1sqhqqjp53dwm8yq4nrgggxbvzs3szbg49z5sj2ss9xzlgmimclm"; + sha256 = "017xcwm8m42a1v3v0fs8v3m2sga97rx9a7vk0cb2g14777f4w4si"; }; checkInputs = [ - editdistance + editdistance-s pytestCheckHook ]; diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index 6b3a46ea391..3b967270183 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, dateutil +, python-dateutil , fetchFromGitHub , fetchpatch , mock @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests - dateutil + python-dateutil pytz six msgpack diff --git a/pkgs/development/python-modules/ipfshttpclient/default.nix b/pkgs/development/python-modules/ipfshttpclient/default.nix index aec8f1ec117..62fa6d93614 100644 --- a/pkgs/development/python-modules/ipfshttpclient/default.nix +++ b/pkgs/development/python-modules/ipfshttpclient/default.nix @@ -20,15 +20,15 @@ buildPythonPackage rec { pname = "ipfshttpclient"; - version = "0.7.0"; + version = "0.8.0a2"; format = "flit"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ipfs-shipyard"; repo = "py-ipfs-http-client"; rev = version; - sha256 = "sha256-0lMoZo/9kZUXkaKvD9ZAZDQdGX7eNLzJVszZdlM/3Qs="; + sha256 = "sha256-OmC67pN2BbuGwM43xNDKlsLhwVeUbpvfOazyIDvoMEA="; }; propagatedBuildInputs = [ @@ -51,11 +51,7 @@ buildPythonPackage rec { ]; postPatch = '' - # Remove when the package supports the latest IPFS version by default - substituteInPlace ipfshttpclient/client/__init__.py \ - --replace 'VERSION_MAXIMUM = "0.8.0"' \ - 'VERSION_MAXIMUM = "0.9.0"' - + # This can be removed for the 0.8.0 release # Use pytest-order instead of pytest-ordering since the latter is unmaintained and broken substituteInPlace test/run-tests.py \ --replace 'pytest_ordering' 'pytest_order' diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index 2c5692bf26a..cc5957d2973 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , nose -, dateutil +, python-dateutil , ipython_genutils , decorator , pyzmq @@ -25,7 +25,7 @@ buildPythonPackage rec { buildInputs = [ nose ]; - propagatedBuildInputs = [ dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado + propagatedBuildInputs = [ python-dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado ] ++ lib.optionals (!isPy3k) [ futures ]; # Requires access to cluster diff --git a/pkgs/development/python-modules/itunespy/default.nix b/pkgs/development/python-modules/itunespy/default.nix index 4720101d817..3bb0bb677ba 100644 --- a/pkgs/development/python-modules/itunespy/default.nix +++ b/pkgs/development/python-modules/itunespy/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, requests, pycountry, mypy }: +{ lib, buildPythonPackage, fetchFromGitHub, requests, pycountry }: buildPythonPackage rec { pname = "itunespy"; @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "0yc3az5531qs8nbcw4rhgrszwczgy4bikfwfar7xb2044360sslw"; }; - propagatedBuildInputs = [ requests pycountry mypy ]; + propagatedBuildInputs = [ requests pycountry ]; # This module has no tests doCheck = false; diff --git a/pkgs/development/python-modules/javaproperties/default.nix b/pkgs/development/python-modules/javaproperties/default.nix index dd3c027bca2..348d83e1105 100644 --- a/pkgs/development/python-modules/javaproperties/default.nix +++ b/pkgs/development/python-modules/javaproperties/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub , six , pytest -, dateutil +, python-dateutil }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ dateutil pytest ]; + checkInputs = [ python-dateutil pytest ]; checkPhase = '' rm tox.ini pytest -k 'not dumps and not time' --ignore=test/test_propclass.py diff --git a/pkgs/development/python-modules/jupyter_client/5.nix b/pkgs/development/python-modules/jupyter_client/5.nix index 201fbec02ca..e4e77cf4751 100644 --- a/pkgs/development/python-modules/jupyter_client/5.nix +++ b/pkgs/development/python-modules/jupyter_client/5.nix @@ -4,7 +4,7 @@ , traitlets , jupyter_core , pyzmq -, dateutil +, python-dateutil , isPyPy , py , tornado @@ -23,7 +23,7 @@ buildPythonPackage rec { traitlets jupyter_core pyzmq - dateutil + python-dateutil tornado ] ++ lib.optional isPyPy py; diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index 5f534557a9a..fbc37c3f581 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -4,7 +4,7 @@ , traitlets , jupyter_core , pyzmq -, dateutil +, python-dateutil , isPyPy , py , tornado @@ -23,7 +23,7 @@ buildPythonPackage rec { traitlets jupyter_core pyzmq - dateutil + python-dateutil tornado ] ++ lib.optional isPyPy py; diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 108d11853f0..904cd7df0c2 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -7,7 +7,7 @@ , alembic , async_generator , certipy -, dateutil +, python-dateutil , entrypoints , jinja2 , jupyter-telemetry @@ -115,7 +115,7 @@ buildPythonPackage rec { alembic async_generator certipy - dateutil + python-dateutil entrypoints jinja2 jupyter-telemetry diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix index 5f560be4e88..cd3b5ff62c2 100644 --- a/pkgs/development/python-modules/koji/default.nix +++ b/pkgs/development/python-modules/koji/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage, isPy3k, pycurl, six, rpm, dateutil }: +{ lib, fetchurl, buildPythonPackage, isPy3k, pycurl, six, rpm, python-dateutil }: buildPythonPackage rec { pname = "koji"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0a3kn3qvspvx15imgzzzjsbvw6bqmbk29apbliqwifa9cj7pvb40"; }; - propagatedBuildInputs = [ pycurl six rpm dateutil ]; + propagatedBuildInputs = [ pycurl six rpm python-dateutil ]; # Judging from SyntaxError disabled = isPy3k; diff --git a/pkgs/development/python-modules/lammps-cython/default.nix b/pkgs/development/python-modules/lammps-cython/default.nix deleted file mode 100644 index cf6bdc38ffa..00000000000 --- a/pkgs/development/python-modules/lammps-cython/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, fetchurl -, buildPythonPackage -, lammps-mpi -, mpi -, mpi4py -, numpy -, cython -, pymatgen -, ase -, pytestrunner -, isPy3k -}: - -buildPythonPackage rec { - pname = "lammps-cython"; - version = "0.5.7"; - disabled = (!isPy3k); - - src = fetchurl { - url = "https://gitlab.com/costrouc/${pname}/-/archive/v${version}/${pname}-v${version}.tar.gz"; - sha256 = "1wj9scmjdl00af13b5ihfccrjpikrdgkzd88ialam1nkxvxi42bl"; - }; - - buildInputs = [ cython pytestrunner ]; - propagatedBuildInputs = [ mpi4py pymatgen ase numpy ]; - - preBuild = '' - echo "Creating lammps.cfg file..." - cat << EOF > lammps.cfg - [lammps] - lammps_include_dir = ${lammps-mpi}/include - lammps_library_dir = ${lammps-mpi}/lib - lammps_library = lammps_mpi - - [mpi] - mpi_include_dir = ${mpi}/include - mpi_library_dir = ${mpi}/lib - mpi_library = mpi - EOF - ''; - - pythonImportsCheck = [ "lammps" ]; - - meta = { - description = "Pythonic Wrapper to LAMMPS using cython"; - homepage = "https://gitlab.com/costrouc/lammps-cython"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ costrouc ]; - # fails import check - broken = true; - }; -} diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index a48d70c544c..7b0b09dcb14 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "libarcus"; - version = "4.9.0"; + version = "4.10.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "0wq72nf680bwxijjajb4piw563rnvflshmw96kqln4lsny7ydjj2"; + sha256 = "1ahka8s8fjwymyr7pca7i7h51ikfr35zy4nkzfcjn946x7p0dprf"; }; disabled = pythonOlder "3.4.0"; diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index 7ecd09160ff..e82400b565f 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "libsavitar"; - version = "4.9.0"; + version = "4.10.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libSavitar"; rev = version; - sha256 = "0434cb19v9phc9xicbmgpbig18ivplcpqhnsjgca4p8n8c715k9h"; + sha256 = "1zyzsrdm5aazv12h7ga35amfryrbxdsmx3abvh27hixyh9f92fdp"; }; postPatch = '' diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index cc0ba39e64e..0d8142645e1 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libusb1"; - version = "1.9.2"; + version = "1.9.3"; src = fetchPypi { inherit pname version; - sha256 = "17hqck808m59jv6m2g4hasnay44pycy3y0im01fq9jpr3ymcdbi7"; + sha256 = "60e6ce37be064f6e51d02b25da44230ecc9c0b1fdb6f14568c71457d963c1749"; }; postPatch = '' @@ -20,9 +20,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; checkPhase = '' - # USBPollerThread is unreliable. Let's not test it. - # See: https://github.com/vpelletier/python-libusb1/issues/16 - py.test -k 'not testUSBPollerThreadExit' usb1/testUSB1.py + py.test usb1/testUSB1.py ''; meta = with lib; { diff --git a/pkgs/development/python-modules/lmnotify/default.nix b/pkgs/development/python-modules/lmnotify/default.nix index 340e8386a0e..4e5526a424d 100644 --- a/pkgs/development/python-modules/lmnotify/default.nix +++ b/pkgs/development/python-modules/lmnotify/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "lmnotify"; - version = "0.0.4"; + version = "0.0.6"; src = fetchPypi { inherit pname version; - sha256 = "1l0h4yab7ix8psf65iygc1wy5xwq3v2rwwjixvd8rwk46d2477dx"; + sha256 = "sha256-cCP7BU2f7QJe9gAI298cvkp3OGijvBv8G1RN7qfZ5PE="; }; propagatedBuildInputs = [ oauthlib requests requests_oauthlib ]; diff --git a/pkgs/development/python-modules/mailman-rss/default.nix b/pkgs/development/python-modules/mailman-rss/default.nix index e2043b0d6d4..f71b62c67fc 100644 --- a/pkgs/development/python-modules/mailman-rss/default.nix +++ b/pkgs/development/python-modules/mailman-rss/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1brrik70jyagxa9l0cfmlxvqpilwj1q655bphxnvjxyganxf4c00"; }; - propagatedBuildInputs = with python3Packages; [ dateutil future requests beautifulsoup4 ] + propagatedBuildInputs = with python3Packages; [ python-dateutil future requests beautifulsoup4 ] ++ lib.optional withTwitter python3Packages.twitter ; diff --git a/pkgs/development/python-modules/matplotlib/2.nix b/pkgs/development/python-modules/matplotlib/2.nix index a6ee1a3bade..96d33b681eb 100644 --- a/pkgs/development/python-modules/matplotlib/2.nix +++ b/pkgs/development/python-modules/matplotlib/2.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchPypi, writeText, python, buildPythonPackage, pycairo, backports_functools_lru_cache -, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver +, which, cycler, python-dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver , freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32 , fetchpatch , enableGhostscript ? false, ghostscript, gtk3 @@ -38,7 +38,7 @@ buildPythonPackage rec { ++ lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = - [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver + [ cycler python-dateutil nose numpy pyparsing tornado freetype kiwisolver libpng mock pytz ] ++ lib.optional (pythonOlder "3.3") backports_functools_lru_cache ++ lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 75f75e981ce..beddaf6810d 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchPypi, writeText, buildPythonPackage, isPy3k, pycairo -, which, cycler, dateutil, numpy, pyparsing, sphinx, tornado, kiwisolver +, which, cycler, python-dateutil, numpy, pyparsing, sphinx, tornado, kiwisolver , freetype, qhull, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection , certifi, pillow , enableGhostscript ? true, ghostscript, gtk3 @@ -36,7 +36,7 @@ buildPythonPackage rec { ++ lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = - [ cycler dateutil numpy pyparsing tornado freetype qhull + [ cycler python-dateutil numpy pyparsing tornado freetype qhull kiwisolver certifi libpng mock pytz pillow ] ++ lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] ++ lib.optionals enableTk [ tcl tk tkinter libX11 ] diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index 895485cd72c..165885c0225 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "6.1.2"; + version = "6.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Dinnerbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RSxysVIP/niQh8WRSk6Z9TSz/W97PkPYIR0NXIZfAbQ="; + sha256 = "sha256-o5JVj4Tt5+VOjDC0TDlVuVbDUQPvZGX5Zeoz0vVxPJ8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/md-toc/default.nix b/pkgs/development/python-modules/md-toc/default.nix index aaec77a9ace..e5321430dc5 100644 --- a/pkgs/development/python-modules/md-toc/default.nix +++ b/pkgs/development/python-modules/md-toc/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "md-toc"; - version = "7.2.0"; + version = "8.0.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "frnmst"; repo = pname; rev = version; - sha256 = "1v74iddfk5d6170frg89vzrkz9xrycl1f50g59imc7x7g50i6c2x"; + sha256 = "sha256-w5/oIeA9POth8bMszPH53RK1FM9PhmPdn4w9wxlqQ+g="; }; propagatedBuildInputs = [ @@ -26,10 +26,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py --replace "fpyutils>=1.2,<1.3" "fpyutils>=1.2" - ''; - pytestFlagsArray = [ "md_toc/tests/*.py" ]; pythonImportsCheck = [ "md_toc" ]; diff --git a/pkgs/development/python-modules/mdformat/default.nix b/pkgs/development/python-modules/mdformat/default.nix index 159310035b8..780cafa599d 100644 --- a/pkgs/development/python-modules/mdformat/default.nix +++ b/pkgs/development/python-modules/mdformat/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mdformat"; - version = "0.7.6"; + version = "0.7.7"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = version; - sha256 = "0mnbi3vp7zgllpcpf6vrjw9y6jas95shphn99ayr8b8wgxsaqkif"; + sha256 = "sha256-1qwluHxZnSuyNJENzeJzkuhIQN5njTOch2Wz45J0qRI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/micloud/default.nix b/pkgs/development/python-modules/micloud/default.nix new file mode 100644 index 00000000000..3b3bf448449 --- /dev/null +++ b/pkgs/development/python-modules/micloud/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, click +, requests +, tzlocal +}: + +buildPythonPackage rec { + pname = "micloud"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "Squachen"; + repo = "micloud"; + rev = "v_${version}"; + sha256 = "0267zyr79nfb5f9rwdwq3ym258yrpxx1b71xiqmszyz5s83mcixm"; + }; + + propagatedBuildInputs = [ + click + requests + tzlocal + ]; + + # tests require credentials + doCheck = false; + + pythonImportsCheck = [ "micloud" ]; + + meta = with lib; { + description = "Xiaomi cloud connect library"; + homepage = "https://github.com/Squachen/micloud"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/millheater/default.nix b/pkgs/development/python-modules/millheater/default.nix index d6815f53d77..9a329ef2651 100644 --- a/pkgs/development/python-modules/millheater/default.nix +++ b/pkgs/development/python-modules/millheater/default.nix @@ -2,25 +2,27 @@ , aiohttp , async-timeout , buildPythonPackage +, cryptography , fetchFromGitHub , pythonOlder }: buildPythonPackage rec { pname = "millheater"; - version = "0.4.2"; + version = "0.5.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "pymill"; rev = version; - sha256 = "sha256-B9/nxlPHAPZzbOMQj81CxTEjI03JQxfH8F8vy1E4HIQ="; + sha256 = "sha256-uMvCpXz+amb5mR9ebkAit21UFYpsTkjkZRXtmcvWt8k="; }; propagatedBuildInputs = [ aiohttp async-timeout + cryptography ]; # Project has no tests diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 3d72748a1e7..078c455a637 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -4,7 +4,7 @@ , isPy27 # python dependencies , click -, dateutil +, python-dateutil , etelemetry , filelock , funcsigs @@ -68,7 +68,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click - dateutil + python-dateutil etelemetry filelock funcsigs diff --git a/pkgs/development/python-modules/nmigen/default.nix b/pkgs/development/python-modules/nmigen/default.nix index d42e27a2932..8bd198713a3 100644 --- a/pkgs/development/python-modules/nmigen/default.nix +++ b/pkgs/development/python-modules/nmigen/default.nix @@ -12,9 +12,9 @@ # for tests , pytestCheckHook -, yosys , symbiyosys , yices +, yosys }: buildPythonPackage rec { @@ -31,22 +31,35 @@ buildPythonPackage rec { sha256 = "0cjs9wgmxa76xqmjhsw4fsb2mhgvd85jgs2mrjxqp6fwp8rlgnl1"; }; - nativeBuildInputs = [ setuptools-scm git ]; + SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"; + + nativeBuildInputs = [ + git + setuptools-scm + ]; propagatedBuildInputs = [ - setuptools - pyvcd jinja2 + pyvcd + setuptools ] ++ lib.optional (pythonOlder "3.9") importlib-resources ++ lib.optional (pythonOlder "3.8") importlib-metadata; - checkInputs = [ pytestCheckHook yosys symbiyosys yices ]; + checkInputs = [ + pytestCheckHook + symbiyosys + yices + yosys + ]; - preBuild = '' - export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}" + postPatch = '' + substituteInPlace setup.py \ + --replace "Jinja2~=2.11" "Jinja2>=2.11" ''; + pythonImportsCheck = [ "nmigen" ]; + meta = with lib; { description = "A refreshed Python toolbox for building complex digital hardware"; homepage = "https://nmigen.info/nmigen"; diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 41c6ffb7228..793e23d7113 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -5,7 +5,7 @@ , configparser , cryptography , pyopenssl -, dateutil +, python-dateutil , pytz }: @@ -28,7 +28,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - certifi configparser cryptography pyopenssl dateutil pytz + certifi configparser cryptography pyopenssl python-dateutil pytz ]; # Tests fail: https://github.com/oracle/oci-python-sdk/issues/164 diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index 3ccd3d916b6..ea80fade141 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, dateutil, requests, pytz, pyproj , pytest, pyyaml } : +{ lib, buildPythonPackage, fetchPypi, python-dateutil, requests, pytz, pyproj , pytest, pyyaml } : buildPythonPackage rec { pname = "OWSLib"; version = "0.24.1"; @@ -9,7 +9,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ dateutil pyproj pytz requests pyyaml ]; + propagatedBuildInputs = [ python-dateutil pyproj pytz requests pyyaml ]; # 'tests' dir not included in pypy distribution archive. doCheck = false; diff --git a/pkgs/development/python-modules/pandas/2.nix b/pkgs/development/python-modules/pandas/2.nix index 8af4094b0cf..9b29a844269 100644 --- a/pkgs/development/python-modules/pandas/2.nix +++ b/pkgs/development/python-modules/pandas/2.nix @@ -8,7 +8,7 @@ , pytest , glibcLocales , cython -, dateutil +, python-dateutil , scipy , moto , numexpr @@ -41,7 +41,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; buildInputs = lib.optional stdenv.isDarwin libcxx; propagatedBuildInputs = [ - dateutil + python-dateutil scipy numexpr pytz @@ -68,7 +68,7 @@ buildPythonPackage rec { disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) ([ - # since dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat + # since python-dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat # was supposed to be solved by https://github.com/dateutil/dateutil/issues/321, but is not the case "test_fallback_plural" "test_ambiguous_flags" diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 2d502016821..b7e237a3e3b 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -7,7 +7,7 @@ , beautifulsoup4 , bottleneck , cython -, dateutil +, python-dateutil , html5lib , jinja2 , lxml @@ -47,7 +47,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ beautifulsoup4 bottleneck - dateutil + python-dateutil html5lib numexpr lxml diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 1ae27b5ecf8..5419407d610 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 , glibcLocales, git , mock, nose, markdown, lxml, typogrify -, jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator +, jinja2, pygments, docutils, pytz, unidecode, six, python-dateutil, feedgenerator , blinker, pillow, beautifulsoup4, markupsafe, pandoc }: buildPythonPackage rec { @@ -44,7 +44,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - jinja2 pygments docutils pytz unidecode six dateutil feedgenerator + jinja2 pygments docutils pytz unidecode six python-dateutil feedgenerator blinker pillow beautifulsoup4 markupsafe lxml ]; diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index 5688090b095..d432ca271dd 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage, pythonOlder -, dateutil +, python-dateutil , importlib-metadata , poetry , poetry-core @@ -22,7 +22,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ dateutil pytzdata ] + propagatedBuildInputs = [ python-dateutil pytzdata ] ++ lib.optional (pythonOlder "3.5") typing ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/pillow-simd/default.nix b/pkgs/development/python-modules/pillow-simd/default.nix index d7b2ff8d6b3..e2ea4c71388 100644 --- a/pkgs/development/python-modules/pillow-simd/default.nix +++ b/pkgs/development/python-modules/pillow-simd/default.nix @@ -6,15 +6,16 @@ import ../pillow/generic.nix (rec { pname = "Pillow-SIMD"; - version = "8.1.2"; - + # check for release version on https://pypi.org/project/Pillow-SIMD/#history + # does not match the latest pillow release version! + version = "7.0.0.post3"; disabled = !isPy3k; src = fetchFromGitHub { owner = "uploadcare"; repo = "pillow-simd"; - rev = version; - sha256 = "1z0c1qpx7l1bhj71ww7za7kl29j5wdraqr2pdhv4dp1q74kgrr0m"; + rev = "v${version}"; + sha256 = "1h832xp1bzf951hr4dmjmxqfsv28sx9lr2cq96qdz1c72k40zj1h"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix index acee0f09b84..9844b018518 100644 --- a/pkgs/development/python-modules/prov/default.nix +++ b/pkgs/development/python-modules/prov/default.nix @@ -3,7 +3,7 @@ , fetchPypi , lxml , networkx -, dateutil +, python-dateutil , rdflib , pydot }: @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ lxml networkx - dateutil + python-dateutil rdflib ]; diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index e6ee7d4f983..e3422aff024 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -14,7 +14,7 @@ , psutil , pyelftools , pyserial -, dateutil +, python-dateutil , requests , rpyc , tox @@ -63,7 +63,7 @@ buildPythonPackage rec { psutil pyelftools pyserial - dateutil + python-dateutil requests rpyc tox diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 8df35cb39bb..e313d2b8b05 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "5.1.0"; + version = "5.2.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jabesq"; repo = "pyatmo"; rev = "v${version}"; - sha256 = "0szk3wjcrllzvpix66iq3li54pw0c1knlx8wn1z9kqhkrb8r200x"; + sha256 = "sha256-P9c9tm2RcF/4r0OYBoAQxQbMBaFAsaHg/stg9rrYHNM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index cf7fd53d165..cef64c084f2 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "postlund"; repo = pname; rev = "v${version}"; - sha256 = "1slr6l0gw0mf1zhp40bjf5bib45arw1cy4fqkg0gvdk1hx79828m"; + sha256 = "sha256-/ccmYNOYE+RkJiJbGkQgdYE8/X4xzyRT4dkMa/qSZEc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix index e8e0809c022..49dfbf03096 100644 --- a/pkgs/development/python-modules/pycollada/default.nix +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, numpy, dateutil }: +{ lib, fetchPypi, buildPythonPackage, numpy, python-dateutil }: buildPythonPackage rec { pname = "pycollada"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1rp4wlvfywgk3v6l3hnhjx61x9yqawvvivpq4dig2jj71k3mpsyj"; }; - propagatedBuildInputs = [ numpy dateutil ]; + propagatedBuildInputs = [ numpy python-dateutil ]; # Some tests fail because they refer to test data files that don't exist # (upstream packaging issue) diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix index 9b2eda85abe..5eefe5ade5e 100644 --- a/pkgs/development/python-modules/pydaikin/default.nix +++ b/pkgs/development/python-modules/pydaikin/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pydaikin"; - version = "2.4.3"; + version = "2.4.4"; disabled = pythonOlder "3.6"; src = fetchFromBitbucket { owner = "mustang51"; repo = pname; rev = "v${version}"; - sha256 = "0i013ma2fs6an3izak6zbs9lbr4l7b5x54d0xagw6gqf5n8dsclq"; + sha256 = "sha256-G7SShq2zjd9KGM7t1KsAMehqm2onB5cYdcOO3k8Sb30="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { urllib3 ]; - # while they have tests, they do not run them in their CI and they fail as of 2.4.3 + # while they have tests, they do not run them in their CI and they fail as of 2.4.4 # AttributeError: 'DaikinBRP069' object has no attribute 'last_hour_cool_energy_consumption' doCheck = false; diff --git a/pkgs/development/python-modules/pydes/default.nix b/pkgs/development/python-modules/pydes/default.nix index 78f131d4243..0bceaeceaa3 100644 --- a/pkgs/development/python-modules/pydes/default.nix +++ b/pkgs/development/python-modules/pydes/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub, python }: buildPythonPackage rec { pname = "pydes"; @@ -11,7 +11,9 @@ buildPythonPackage rec { sha256 = "0sic8wbyk5azb4d4m6zbc96lfqcw8s2pzcv9nric5yqc751613ww"; }; - checkPhase = "python test_pydes.py"; + checkPhase = '' + ${python.interpreter} test_pydes.py + ''; pythonImportsCheck = [ "pyDes" ]; diff --git a/pkgs/development/python-modules/pyflick/default.nix b/pkgs/development/python-modules/pyflick/default.nix index b1f39353c14..b6a9c2cf96d 100644 --- a/pkgs/development/python-modules/pyflick/default.nix +++ b/pkgs/development/python-modules/pyflick/default.nix @@ -3,7 +3,7 @@ , pythonOlder , fetchPypi , aiohttp -, dateutil +, python-dateutil }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - dateutil + python-dateutil ]; # no tests implemented diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index e54a9c6fa20..5d23949eba6 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, buildPythonPackage , lxml, pycryptodomex, construct -, argon2_cffi, dateutil, future +, argon2_cffi, python-dateutil, future , python }: @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ lxml pycryptodomex construct - argon2_cffi dateutil future + argon2_cffi python-dateutil future ]; checkPhase = '' diff --git a/pkgs/development/python-modules/pykwalify/default.nix b/pkgs/development/python-modules/pykwalify/default.nix index b65c0fd4670..cf42c98457c 100644 --- a/pkgs/development/python-modules/pykwalify/default.nix +++ b/pkgs/development/python-modules/pykwalify/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, dateutil +, python-dateutil , docopt , fetchPypi , pytestCheckHook @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - dateutil + python-dateutil docopt pyyaml ruamel-yaml diff --git a/pkgs/development/python-modules/pyls-black/default.nix b/pkgs/development/python-modules/pyls-black/default.nix index d10e4930ac0..128c8cbd0de 100644 --- a/pkgs/development/python-modules/pyls-black/default.nix +++ b/pkgs/development/python-modules/pyls-black/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { homepage = "https://github.com/rupert/pyls-black"; description = "Black plugin for the Python Language Server"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyls-isort/default.nix b/pkgs/development/python-modules/pyls-isort/default.nix index 9dc614035e0..35b43969e52 100644 --- a/pkgs/development/python-modules/pyls-isort/default.nix +++ b/pkgs/development/python-modules/pyls-isort/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { homepage = "https://github.com/paradoxxxzero/pyls-isort"; description = "Isort plugin for python-language-server"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyls-mypy/default.nix b/pkgs/development/python-modules/pyls-mypy/default.nix index eaf069c8ccb..f919ac21cb7 100644 --- a/pkgs/development/python-modules/pyls-mypy/default.nix +++ b/pkgs/development/python-modules/pyls-mypy/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/tomv564/pyls-mypy"; description = "Mypy plugin for the Python Language Server"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyls-spyder/default.nix b/pkgs/development/python-modules/pyls-spyder/default.nix index 4e0029783eb..61b0fa7449b 100644 --- a/pkgs/development/python-modules/pyls-spyder/default.nix +++ b/pkgs/development/python-modules/pyls-spyder/default.nix @@ -1,18 +1,29 @@ -{ lib, buildPythonPackage, fetchPypi, python-language-server }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, python-lsp-server +, pytestCheckHook +}: buildPythonPackage rec { pname = "pyls-spyder"; version = "0.4.0"; - src = fetchPypi { - inherit pname version; - sha256 = "45a321c83f64267d82907492c55199fccabda45bc872dd23bf1efd08edac1b0b"; + src = fetchFromGitHub { + owner = "spyder-ide"; + repo = pname; + rev = "v${version}"; + sha256 = "11ajbsia60d4c9s6m6rbvaqp1d69fcdbq6a98lkzkkzv2b9pdhkk"; }; - propagatedBuildInputs = [ python-language-server ]; + propagatedBuildInputs = [ + python-lsp-server + ]; + + checkInputs = [ + pytestCheckHook + ]; - # no tests - doCheck = false; pythonImportsCheck = [ "pyls_spyder" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pync/default.nix b/pkgs/development/python-modules/pync/default.nix index 9506b8bae95..0eb13c732d7 100644 --- a/pkgs/development/python-modules/pync/default.nix +++ b/pkgs/development/python-modules/pync/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, dateutil +, python-dateutil , pkgs }: @@ -17,7 +17,7 @@ buildPythonPackage rec { }; buildInputs = [ pkgs.coreutils ]; - propagatedBuildInputs = [ dateutil ]; + propagatedBuildInputs = [ python-dateutil ]; preInstall = lib.optionalString stdenv.isDarwin '' sed -i 's|^\([ ]*\)self.bin_path.*$|\1self.bin_path = "${pkgs.terminal-notifier}/bin/terminal-notifier"|' build/lib/pync/TerminalNotifier.py diff --git a/pkgs/development/python-modules/pynest2d/default.nix b/pkgs/development/python-modules/pynest2d/default.nix index f3b5b9ba685..5d6a006634e 100644 --- a/pkgs/development/python-modules/pynest2d/default.nix +++ b/pkgs/development/python-modules/pynest2d/default.nix @@ -2,7 +2,7 @@ , pythonOlder, libnest2d, sip_4, clipper }: buildPythonPackage rec { - version = "4.8.0"; + version = "4.10.0"; pname = "pynest2d"; format = "other"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "pynest2d"; rev = version; - sha256 = "18dn92vgr4gvf9scfh93yg9bwrhdjvq62di08rpi7pqjrrvq2nvp"; + sha256 = "03aj0whxj9rs9nz3idld7w4vpmnr6vr40vpwmzcf5w2pi2n4z4lk"; }; propagatedBuildInputs = [ libnest2d sip_4 clipper ]; diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index 30fcfc52cba..5de5ad3a0db 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , substituteAll , xmlsec -, cryptography, defusedxml, pyopenssl, dateutil, pytz, requests, six +, cryptography, defusedxml, pyopenssl, python-dateutil, pytz, requests, six , mock, pyasn1, pymongo, pytest, responses, xmlschema, importlib-resources }: @@ -36,7 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography - dateutil + python-dateutil defusedxml importlib-resources pyopenssl diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 34fbcff42f1..9d06569dfdc 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "2.8.0"; + version = "2.9.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f3364a8d1e813a0b3e68485db1e1881d8653b0e03b9a41f2c59544fce4930101"; + sha256 = "sha256-LFGxTN2aaAKDFaKw6IUl03YJZziPmfqlfeiQK0VGW+Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index daab437c979..3ed9b75ef91 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -84,6 +84,6 @@ buildPythonPackage rec { homepage = "https://github.com/palantir/python-language-server"; description = "An implementation of the Language Server Protocol for Python"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix b/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix new file mode 100644 index 00000000000..6938bc282f8 --- /dev/null +++ b/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, ujson +}: + +buildPythonPackage rec { + pname = "python-lsp-jsonrpc"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "python-lsp"; + repo = pname; + rev = "v${version}"; + sha256 = "0h4bs8s4axcm0p02v59amz9sq3nr4zhzdgwq7iaw6awl27v1hd0i"; + }; + + propagatedBuildInputs = [ + ujson + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ + --replace "--cov pylsp_jsonrpc --cov test" "" + ''; + + pythonImportsCheck = [ "pylsp_jsonrpc" ]; + + meta = with lib; { + description = "Python server implementation of the JSON RPC 2.0 protocol."; + homepage = "https://github.com/python-lsp/python-lsp-jsonrpc"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix new file mode 100644 index 00000000000..6a2c396ecf8 --- /dev/null +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -0,0 +1,81 @@ +{ lib +, autopep8 +, buildPythonPackage +, fetchFromGitHub +, flake8 +, flaky +, jedi +, matplotlib +, mccabe +, numpy +, pandas +, pluggy +, pycodestyle +, pydocstyle +, pyflakes +, pylint +, pyqt5 +, pytestCheckHook +, python-lsp-jsonrpc +, pythonOlder +, rope +, ujson +, yapf +}: + +buildPythonPackage rec { + pname = "python-lsp-server"; + version = "1.1.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "python-lsp"; + repo = pname; + rev = "v${version}"; + sha256 = "1akdpfnylqg2mcwpkqmdwcg6j6hab23slp5rfjfidhphig2f2yjv"; + }; + + propagatedBuildInputs = [ + autopep8 + flake8 + jedi + mccabe + pluggy + pycodestyle + pydocstyle + pyflakes + pylint + python-lsp-jsonrpc + rope + ujson + yapf + ]; + + checkInputs = [ + flaky + matplotlib + numpy + pandas + pyqt5 + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ + --replace "--cov pylsp --cov test" "" + ''; + + preCheck = '' + export HOME=$(mktemp -d); + ''; + + pythonImportsCheck = [ "pylsp" ]; + + meta = with lib; { + description = "Python implementation of the Language Server Protocol"; + homepage = "https://github.com/python-lsp/python-lsp-server"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-pidfile/default.nix b/pkgs/development/python-modules/python-pidfile/default.nix new file mode 100644 index 00000000000..7ba39341516 --- /dev/null +++ b/pkgs/development/python-modules/python-pidfile/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, psutil +}: + +buildPythonPackage rec { + pname = "python-pidfile"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-HhCX30G8dfV0WZ/++J6LIO/xvfyRkdPtJkzC2ulUKdA="; + }; + + propagatedBuildInputs = [ + psutil + ]; + + pythonImportsCheck = [ "pidfile" ]; + + # no tests on the github mirror of the source code + # see this: https://github.com/mosquito/python-pidfile/issues/7 + doCheck = false; + + meta = with lib; { + description = "Python context manager for managing pid files"; + homepage = "https://github.com/mosquito/python-pidfile"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ legendofmiracles ]; + }; +} diff --git a/pkgs/development/python-modules/python-pkcs11/default.nix b/pkgs/development/python-modules/python-pkcs11/default.nix new file mode 100644 index 00000000000..d0d4b4e98d3 --- /dev/null +++ b/pkgs/development/python-modules/python-pkcs11/default.nix @@ -0,0 +1,44 @@ +{ lib +, asn1crypto +, buildPythonPackage +, cached-property +, cython +, fetchFromGitHub +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "python-pkcs11"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "danni"; + repo = pname; + rev = "v${version}"; + sha256 = "0kncbipfpsb7m7mhv5s5b9wk604h1j08i2j26fn90pklgqll0xhv"; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + cython + setuptools-scm + ]; + + propagatedBuildInputs = [ + cached-property + asn1crypto + ]; + + # Test require additional setup + doCheck = false; + + pythonImportsCheck = [ "pkcs11" ]; + + meta = with lib; { + description = "PKCS#11/Cryptoki support for Python"; + homepage = "https://github.com/danni/python-pkcs11"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 4d223c54838..6ddc4543d3d 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "13.6"; + version = "13.7"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "37cfe8faba16fb68a8b5ab41a10e787c385f6296200c84256cc54d7c16334643"; + sha256 = "sha256-JN91RZ4zW5a6/6aZFnn4RL1CaXivWmnKQZoKxDpAYCw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix index 0d269522e1a..cf445fd9681 100644 --- a/pkgs/development/python-modules/pytile/default.nix +++ b/pkgs/development/python-modules/pytile/default.nix @@ -8,23 +8,25 @@ , pytest-aiohttp , pytest-asyncio , pytestCheckHook -, pythonAtLeast +, pythonOlder }: buildPythonPackage rec { pname = "pytile"; - version = "5.2.1"; + version = "5.2.2"; + format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "0d63xga4gjlfl9fzv3i4j605rrx2qgbzam6cl609ny96s8q8h1px"; + sha256 = "sha256-oVtTR5zucYvnaPO0i4sEBBU4nafq7GUfx3kPdSvptDo="; }; - format = "pyproject"; - - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ aiohttp @@ -38,8 +40,11 @@ buildPythonPackage rec { pytestCheckHook ]; - # Ignore the examples as they are prefixed with test_ - pytestFlagsArray = [ "--ignore examples/" ]; + disabledTestPaths = [ + # Ignore the examples as they are prefixed with test_ + "examples/" + ]; + pythonImportsCheck = [ "pytile" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/pytomlpp/default.nix b/pkgs/development/python-modules/pytomlpp/default.nix index 19edd7057eb..d2fc8470d48 100644 --- a/pkgs/development/python-modules/pytomlpp/default.nix +++ b/pkgs/development/python-modules/pytomlpp/default.nix @@ -4,7 +4,7 @@ , pythonOlder , pybind11 , pytestCheckHook -, dateutil +, python-dateutil , doxygen , python , pelican @@ -28,7 +28,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - dateutil + python-dateutil doxygen python pelican diff --git a/pkgs/development/python-modules/rainbowstream/default.nix b/pkgs/development/python-modules/rainbowstream/default.nix index e484c07f31c..02c948fd405 100644 --- a/pkgs/development/python-modules/rainbowstream/default.nix +++ b/pkgs/development/python-modules/rainbowstream/default.nix @@ -8,7 +8,7 @@ , pyfiglet , requests , arrow -, dateutil +, python-dateutil , pysocks , pocket }: @@ -42,7 +42,7 @@ buildPythonPackage rec { done ''; - buildInputs = [ pkgs.libjpeg pkgs.freetype pkgs.zlib pkgs.glibcLocales pillow twitter pyfiglet requests arrow dateutil pysocks pocket ]; + buildInputs = [ pkgs.libjpeg pkgs.freetype pkgs.zlib pkgs.glibcLocales pillow twitter pyfiglet requests arrow python-dateutil pysocks pocket ]; meta = with lib; { description = "Streaming command-line twitter client"; diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index 02ac2da9672..e19c744ba65 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -7,33 +7,37 @@ , poetry-core , pytest-aiohttp , pytest-asyncio -, pytest-cov , pytest-mock , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "regenmaschine"; - version = "3.1.2"; + version = "3.1.3"; format = "pyproject"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-lARti3Sb/jh7h8x+lFLqkM/BlL6XmELm46owsL041Cw="; + sha256 = "sha256-3Q0JQQVspzuQQAn3S46uFbOYW2zQ7c1UL4zjEOnifDY="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; - propagatedBuildInputs = [ aiohttp ]; + propagatedBuildInputs = [ + aiohttp + ]; checkInputs = [ aresponses asynctest pytest-aiohttp pytest-asyncio - pytest-cov pytest-mock pytestCheckHook ]; diff --git a/pkgs/development/python-modules/sacn/default.nix b/pkgs/development/python-modules/sacn/default.nix index 46678504cab..e4e14bc93e5 100644 --- a/pkgs/development/python-modules/sacn/default.nix +++ b/pkgs/development/python-modules/sacn/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "sacn"; - version = "1.6.4"; + version = "1.7.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1abkalzpy8bj2hpx563bxii5h0gv9v89f0yp9clc1l76amyf6dj2"; + sha256 = "136gw09av7r2y02q7aam4chhivpbwkdskwwavrl5v0zn34y0axwp"; }; # no tests diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix index e0c6769b07d..7bd42670688 100644 --- a/pkgs/development/python-modules/scp/default.nix +++ b/pkgs/development/python-modules/scp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scp"; - version = "0.13.4"; + version = "0.13.5"; src = fetchPypi { inherit pname version; - sha256 = "e60948dd3e1aa13da21aa1bf8a025fabbbc2816ed04f1a1272410247d1a86f15"; + sha256 = "sha256-CrLukXi4vlPcXJ/i8zdh4BokNQh/XJ+1tUUZhzxlDWA="; }; propagatedBuildInputs = [ @@ -25,10 +25,12 @@ buildPythonPackage rec { #The Pypi package doesn't include the test doCheck = false; + pythonImportsCheck = [ "scp" ]; + meta = with lib; { homepage = "https://github.com/jbardin/scp.py"; description = "SCP module for paramiko"; - license = licenses.lgpl3; + license = licenses.lgpl21Only; maintainers = with maintainers; [ xnaveira ]; }; } diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index 370d2548980..7a1d1439c1f 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { ''; passthru.tests = { - testing-bitwarden = nixosTests.bitwarden; + testing-vaultwarden = nixosTests.vaultwarden; }; meta = with lib; { diff --git a/pkgs/development/python-modules/simber/default.nix b/pkgs/development/python-modules/simber/default.nix index d1471286bb8..331f84252ce 100644 --- a/pkgs/development/python-modules/simber/default.nix +++ b/pkgs/development/python-modules/simber/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "simber"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "deepjyoti30"; repo = pname; rev = version; - sha256 = "0ksc2m61j5ijj0sq6kkc0hhkmfy9f51h9z3cl2sf8g6wbr9vc47h"; + sha256 = "04dp9b4s7zb166vlacsaypc6iw1p75azqas1wf0flp570qqf3rkx"; }; propagatedBuildInputs = [ colorama ]; diff --git a/pkgs/development/python-modules/sipsimple/default.nix b/pkgs/development/python-modules/sipsimple/default.nix index 838ffd47184..34b95fe781d 100644 --- a/pkgs/development/python-modules/sipsimple/default.nix +++ b/pkgs/development/python-modules/sipsimple/default.nix @@ -5,7 +5,7 @@ , pkgs , cython , dnspython -, dateutil +, python-dateutil , xcaplib , msrplib , lxml @@ -34,7 +34,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ alsa-lib ffmpeg_3 libv4l sqlite libvpx ]; - propagatedBuildInputs = [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ]; + propagatedBuildInputs = [ cython pkgs.openssl dnspython python-dateutil xcaplib msrplib lxml python-otr ]; meta = with lib; { description = "SIP SIMPLE implementation for Python"; diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index b59209f4295..dc983e20ce2 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -1,6 +1,6 @@ { lib, fetchPypi, buildPythonPackage , six, sqlalchemy -, mock, pytz, isort, flake8, jinja2, pg8000, pyodbc, pytest, pymysql, dateutil +, mock, pytz, isort, flake8, jinja2, pg8000, pyodbc, pytest, pymysql, python-dateutil , docutils, flexmock, psycopg2, pygments }: buildPythonPackage rec { @@ -30,7 +30,7 @@ buildPythonPackage rec { pyodbc pytest pymysql - dateutil + python-dateutil docutils flexmock psycopg2 diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 5b32cb8b64a..762df0ab7e3 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.5.6"; + version = "1.5.7"; src = fetchPypi { inherit pname version; - sha256 = "fc4be53bb7f64b1cc2e8058e7660059d8f5afb9857cc033084953ea615a10305"; + sha256 = "sha256-HTayAlXehm3Azmbi+ar/Vav5bPYmGu9gflzZCwWZihw="; }; postPatch = '' diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index 0681218cd0a..dc36066ec30 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "staticjinja"; - version = "2.1.0"; + version = "3.0.1"; format = "pyproject"; # No tests in pypi @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "staticjinja"; repo = pname; rev = version; - sha256 = "sha256-VKsDvWEurBdckWbPG5hQLK3dzdM7XVbrp23fR5wp1xk="; + sha256 = "sha256-W4q0vG8Kl2gCmA8UnUbdiGRtghhdnWxIJXFIIa6BogA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 987523ed42b..c8fd82043a8 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -31,12 +31,12 @@ buildPythonPackage rec { pname = "sunpy"; - version = "3.0.0"; + version = "3.0.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-N/DAvnO+S9E4tndEWpiG84P3FCFwxYNdGFxbxUVsTx8="; + sha256 = "sha256-WpqkCAwDYb6L+W4VTC/1auGVbblnNYwBxbk+tZbAiBw="; }; nativeBuildInputs = [ @@ -75,11 +75,13 @@ buildPythonPackage rec { # darwin has write permission issues doCheck = stdenv.isLinux; - # ignore documentation tests + # ignore documentation tests and ignore tests with schema issues checkPhase = '' PY_IGNORE_IMPORTMISMATCH=1 HOME=$(mktemp -d) pytest sunpy -k 'not rst' \ --deselect=sunpy/tests/tests/test_self_test.py::test_main_nonexisting_module \ - --deselect=sunpy/tests/tests/test_self_test.py::test_main_stdlib_module + --deselect=sunpy/tests/tests/test_self_test.py::test_main_stdlib_module \ + --ignore=sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/heliocentric-1.0.0.yaml \ + --ignore=sunpy/io/special/asdf/schemas/sunpy.org/sunpy/coordinates/frames/helioprojective-1.0.0.yaml ''; meta = with lib; { diff --git a/pkgs/development/python-modules/suseapi/default.nix b/pkgs/development/python-modules/suseapi/default.nix index 1c36f45090b..bcf35d1f5f7 100644 --- a/pkgs/development/python-modules/suseapi/default.nix +++ b/pkgs/development/python-modules/suseapi/default.nix @@ -7,7 +7,7 @@ , mechanize , beautifulsoup4 , pyxdg -, dateutil +, python-dateutil , requests , httpretty }: @@ -24,7 +24,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - django suds-jurko ldap mechanize beautifulsoup4 pyxdg dateutil requests + django suds-jurko ldap mechanize beautifulsoup4 pyxdg python-dateutil requests ]; buildInputs = [ httpretty ]; diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix index 523d3e303b3..80d86c3edb0 100644 --- a/pkgs/development/python-modules/taskw/default.nix +++ b/pkgs/development/python-modules/taskw/default.nix @@ -4,7 +4,7 @@ , nose , tox , six -, dateutil +, python-dateutil , kitchen , pytz , pkgs @@ -29,7 +29,7 @@ buildPythonPackage rec { doCheck = false; buildInputs = [ nose pkgs.taskwarrior tox ]; - propagatedBuildInputs = [ six dateutil kitchen pytz ]; + propagatedBuildInputs = [ six python-dateutil kitchen pytz ]; meta = with lib; { homepage = "https://github.com/ralphbean/taskw"; diff --git a/pkgs/development/python-modules/textfsm/default.nix b/pkgs/development/python-modules/textfsm/default.nix index 04bc47913d8..fed2f7c3e3f 100644 --- a/pkgs/development/python-modules/textfsm/default.nix +++ b/pkgs/development/python-modules/textfsm/default.nix @@ -9,26 +9,25 @@ buildPythonPackage rec { pname = "textfsm"; - version = "1.1.1"; + version = "1.1.2"; + format = "setuptools"; + src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "0fq2hphd89hns11nh0yifcp6brg6yy4n4hbvfk6avbjd7s40789a"; + sha256 = "1cbczg3h2841v1xk2s2xg540c69vsrkwxljm758fyr65kshrzlhm"; }; - patches = [ - (fetchpatch { - # remove pytest-runner dependency - url = "https://github.com/google/textfsm/commit/212db75fea4a79aca0f8f85a78954ffbc5667096.patch"; - sha256 = "0n6qh3sz9wy5gdpq9jjxx8firis48ypr20yacs5bqri59sziwjp0"; - }) + propagatedBuildInputs = [ + six + future ]; - propagatedBuildInputs = [ six future ]; - - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Python module for parsing semi-structured text into python tables"; diff --git a/pkgs/development/python-modules/token-bucket/default.nix b/pkgs/development/python-modules/token-bucket/default.nix index ac614d53fd5..f1e90114ac6 100644 --- a/pkgs/development/python-modules/token-bucket/default.nix +++ b/pkgs/development/python-modules/token-bucket/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "token-bucket"; - version = "0.2.0"; + version = "0.3.0"; format = "setuptools"; src = fetchFromGitHub { owner = "falconry"; repo = pname; rev = version; - sha256 = "0kv8j2ab4knvzik2di66bgjwjxdslm2i0hjy35kn9z0dazni585s"; + sha256 = "0a703y2d09kvv2l9vq7vc97l4pi2wwq1f2hq783mbw2238jymb3m"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix index c469875728c..752cd8fb4d5 100644 --- a/pkgs/development/python-modules/transitions/default.nix +++ b/pkgs/development/python-modules/transitions/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { preCheck = '' export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf + export HOME=$TMPDIR ''; meta = with lib; { diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index f0cb79b0a8b..d5ddf8f5880 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -6,7 +6,7 @@ , lxml , relatorio , genshi -, dateutil +, python-dateutil , polib , python-sql , werkzeug @@ -41,7 +41,7 @@ buildPythonApplication rec { lxml relatorio genshi - dateutil + python-dateutil polib python-sql werkzeug diff --git a/pkgs/development/python-modules/tvnamer/default.nix b/pkgs/development/python-modules/tvnamer/default.nix deleted file mode 100644 index a9439d3e887..00000000000 --- a/pkgs/development/python-modules/tvnamer/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytest -, tvdb_api -}: - -buildPythonPackage rec { - pname = "tvnamer"; - version = "3.0.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "dc2ea8188df6ac56439343630466b874c57756dd0b2538dd8e7905048f425f04"; - }; - - checkInputs = [ pytest ]; - propagatedBuildInputs = [ tvdb_api ]; - - # a ton of tests fail with: IOError: tvnamer/main.py could not be found in . or .. - doCheck = false; - - meta = with lib; { - description = "Automatic TV episode file renamer, uses data from thetvdb.com via tvdb_api."; - homepage = "https://github.com/dbr/tvnamer"; - license = licenses.unlicense; - maintainers = with maintainers; [ peterhoeg ]; - }; - -} diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index db8c8c8bd23..a8ce6713f2c 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -2,7 +2,7 @@ , pyqt5, numpy, scipy, shapely, libarcus, cryptography, doxygen, gettext, pythonOlder }: buildPythonPackage rec { - version = "4.9.0"; + version = "4.10.0"; pname = "uranium"; format = "other"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "0bqrc4g4pd7b209swlv06bm5sx7df96h9kjpqpra4mfz469km4nn"; + sha256 = "0bxbkqc4ajs52vmalmhvvqvl1aw2ss6yf7nclwx8nc2g5vchd4ng"; }; disabled = pythonOlder "3.5.0"; diff --git a/pkgs/development/python-modules/urllib3/2.nix b/pkgs/development/python-modules/urllib3/2.nix index 3fc90fe5d82..f1eea4c31d8 100644 --- a/pkgs/development/python-modules/urllib3/2.nix +++ b/pkgs/development/python-modules/urllib3/2.nix @@ -3,7 +3,7 @@ , buildPythonPackage , certifi , cryptography -, dateutil +, python-dateutil , fetchpatch , fetchPypi , idna @@ -45,7 +45,7 @@ buildPythonPackage rec { ]; checkInputs = [ - dateutil + python-dateutil mock pytest-freezegun pytest-timeout diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index eec8e284c0e..6d73357e3bc 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -2,7 +2,7 @@ , brotli , buildPythonPackage , cryptography -, dateutil +, python-dateutil , fetchPypi , idna , isPy27 @@ -36,7 +36,7 @@ buildPythonPackage rec { ]; checkInputs = [ - dateutil + python-dateutil mock pytest-freezegun pytest-timeout diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index 823d2820e1b..dc122341924 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, future, dateutil, six, pytest, mock, parameterized }: +{ lib, buildPythonPackage, fetchPypi, future, python-dateutil, six, pytest, mock, parameterized }: buildPythonPackage rec { pname = "vertica-python"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "94cff37e03f89fc4c5e4b2d4c913c7d5d7450f5a205d14f709b39e0a4202be95"; }; - propagatedBuildInputs = [ future dateutil six ]; + propagatedBuildInputs = [ future python-dateutil six ]; checkInputs = [ pytest mock parameterized ]; diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix index 1bb87d9d122..30f84150283 100644 --- a/pkgs/development/python-modules/vobject/default.nix +++ b/pkgs/development/python-modules/vobject/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPyPy, python, dateutil }: +{ lib, buildPythonPackage, fetchPypi, isPyPy, python, python-dateutil }: buildPythonPackage rec { version = "0.9.6.1"; @@ -11,7 +11,7 @@ buildPythonPackage rec { disabled = isPyPy; - propagatedBuildInputs = [ dateutil ]; + propagatedBuildInputs = [ python-dateutil ]; checkPhase = "${python.interpreter} tests.py"; diff --git a/pkgs/development/python-modules/webdavclient3/default.nix b/pkgs/development/python-modules/webdavclient3/default.nix index eb13cd6b9bb..fc63c1913d0 100644 --- a/pkgs/development/python-modules/webdavclient3/default.nix +++ b/pkgs/development/python-modules/webdavclient3/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, isPy27, lib, dateutil, lxml, requests +{ buildPythonPackage, fetchPypi, isPy27, lib, python-dateutil, lxml, requests , pytestCheckHook }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0yw3n5m70ysjn1ch48znpn4zr4a1bd0lsm7q2grqz7q5hfjzjwk0"; }; - propagatedBuildInputs = [ dateutil lxml requests ]; + propagatedBuildInputs = [ python-dateutil lxml requests ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index 3ce15a3fdce..b1afa242107 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , Babel , cssselect -, dateutil +, python-dateutil , feedparser , futures ? null , gdata @@ -52,7 +52,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ Babel cssselect - dateutil + python-dateutil feedparser gdata gnupg diff --git a/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix index 4794843a66d..fc5e6e9dc65 100644 --- a/pkgs/development/python-modules/woob/default.nix +++ b/pkgs/development/python-modules/woob/default.nix @@ -5,7 +5,7 @@ , Babel , colorama , cssselect -, dateutil +, python-dateutil , feedparser , gdata , gnupg @@ -49,7 +49,7 @@ buildPythonPackage rec { Babel colorama cssselect - dateutil + python-dateutil feedparser gdata gnupg diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 0a8da94e52e..6dd624d597f 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.18.7"; + version = "0.18.8"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "17w6a4ci4w6ggxpa99197f84awd116ygzd3fa5cvn1a7221dvdj4"; + sha256 = "sha256-Y+SHZd/E72eR7gANqHHutZt1a4G4R1oHC8uV0hpJ/J0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/youtube-search/default.nix b/pkgs/development/python-modules/youtube-search/default.nix index 41424aa56d2..439cc31c8c9 100644 --- a/pkgs/development/python-modules/youtube-search/default.nix +++ b/pkgs/development/python-modules/youtube-search/default.nix @@ -1,20 +1,19 @@ -{ lib, buildPythonPackage, fetchFromGitHub, requests }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "youtube-search"; - version = "unstable-2021-02-27"; + version = "2.1.0"; - src = fetchFromGitHub { - owner = "joetats"; - repo = "youtube_search"; - rev = "886fe1b16c829215ee0984b6859f874b4a30d875"; - sha256 = "sha256-3ECJ6iHNzx5PLgpTFraFzAYbKnyMYRf/iJ0zajU+hlo="; + src = fetchPypi { + inherit pname version; + sha256 = "1541120273996fa433698b2e57b73296dfb8e90536211f29ea997dcf161b66fe"; }; propagatedBuildInputs = [ requests ]; - # Check disabled due to relative import with no known parent package + # tests require network connection doCheck = false; + pythonImportsCheck = [ "youtube_search" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index daba39eb224..6ec5fda2ca5 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "0.17.3"; + version = "0.18.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-miScxT79ZAgDT0AamkN1JyqbM56Otk86LnE6HM0G1Vs="; + sha256 = "sha256-RH0ballPSZQvesdUEsulnBkbbzVA2YrGWhMzRFvuwW0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 34335c65e1a..37fbc87f3f7 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.57"; + version = "0.0.58"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; rev = version; - sha256 = "sha256-ajdluj6UIzjJUK30GtoM+e5lsMQRKnn3FPNEg+RS/DM="; + sha256 = "sha256-QU5ssbnT3/gioQ3vM9zvlbwxqSWyKIylsV9NuFkNe+Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index fc2733de3f0..912bace2020 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.1.4"; - source.sha256 = "12glbb1357x91fvd004jgkw7ihlkpc9dwr349pd7j83isqhls0ah"; + version = "2.2.20"; + source.sha256 = "259ba486173d72a71df43fee8e3bc8dcb868c8a65e0c4020af3a6f13c3a57ff8"; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix index 67d9e39af62..5be2fca96fb 100644 --- a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix +++ b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/TaylanUB/scheme-bytestructures"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ethancedwards8 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 25d61d2393e..a2396314387 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.5.5"; + version = "2.5.6"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-M5O2NEGIVPWYKl11yxMMVreEtDO1VqcMkiGGrjNmk3A="; + sha256 = "sha256-YBGKIfBTU7MRm1Om4Jknd5Nu77qJftCgjuohcO/9X/w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 600d0efc92e..5e7f6a3f2d5 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "2.4"; + version = "2.5"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-mGJPqOmz1/siAVkwDP5WXFvx3TtD5KT/klciqnaEoCo="; + sha256 = "sha256-s+KJpA11A4bFOXgy2eVkRMYBFwwBjU7QZgSPZ0oVKxo="; }; buildInputs = [ pcre ] ++ lib.optionals withZ3 [ z3 ]; diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 9666bf006d7..a5798c6ad56 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.29.1"; + version = "0.30.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1pkz8y3da7i4a3nm79a0640xjj4wfkx3dz6614c4hynqn5svji82"; + sha256 = "0xdn8xakywms8gcacmjvx0ivv37i3vj1d41c8sjlnf1s13q3zv7k"; }; - vendorSha256 = "0k8v49sr0jmljfl4fa5pnvzd5k3pg865h201114l6cs257sdkczk"; + vendorSha256 = "18w0wz3raysba99cxcc8pk4md9j438g4y2d2v2pk2l6qri9apscw"; doCheck = false; diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 246f42b6399..4e11d92e968 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.39.16"; + version = "0.40.7"; src = fetchFromGitHub { owner = "tfsec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5We3Nk/AU5dj37vG4pvqzvNztK01PAPadQV/CgHZe8w="; + sha256 = "1cdxpmlfh76k491ldzv2flxs2wikrryr63h0zw8f6yvhkpbqf4cc"; }; goPackagePath = "github.com/tfsec/tfsec"; diff --git a/pkgs/development/tools/apksigcopier/default.nix b/pkgs/development/tools/apksigcopier/default.nix new file mode 100644 index 00000000000..972de479ee7 --- /dev/null +++ b/pkgs/development/tools/apksigcopier/default.nix @@ -0,0 +1,61 @@ +{ lib +, fetchFromGitHub +, python3 +, installShellFiles +, bash +, pandoc +}: + +# FIXME: how to "recommend" apksigner like the Debian package? + +python3.pkgs.buildPythonApplication rec { + pname = "apksigcopier"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "obfusk"; + repo = "apksigcopier"; + rev = "v${version}"; + sha256 = "1la1ml91jvqc1zakbqfpayjbs67pi3i18bsgz3mf11rxgphd3fpk"; + }; + + nativeBuildInputs = [ installShellFiles pandoc ]; + propagatedBuildInputs = with python3.pkgs; [ click ]; + checkInputs = with python3.pkgs; [ flake8 mypy pylint ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace /bin/bash ${bash}/bin/bash \ + --replace 'apksigcopier --version' '${python3.interpreter} apksigcopier --version' + ''; + + postBuild = '' + make ${pname}.1 + ''; + + checkPhase = '' + make test + ''; + + postInstall = '' + installManPage ${pname}.1 + ''; + + meta = with lib; { + description = "Copy/extract/patch apk signatures & compare apks"; + longDescription = '' + apksigcopier is a tool for copying APK signatures from a signed APK + to an unsigned one (in order to verify reproducible builds). It can + also be used to compare two APKs with different signatures. Its + command-line tool offers four operations: + + * copy signatures directly from a signed to an unsigned APK + * extract signatures from a signed APK to a directory + * patch previously extracted signatures onto an unsigned APK + * compare two APKs with different signatures (requires apksigner) + ''; + homepage = "https://github.com/obfusk/apksigcopier"; + license = with licenses; [ gpl3Plus ]; + maintainers = [ maintainers.obfusk ]; + }; +} diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index a93de053c44..0d8ca351096 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -1,21 +1,25 @@ { lib, stdenv, fetchurl, fetchpatch -, getopt, tzdata +, getopt, tzdata, ksh +, pkgsMusl # for passthru.tests }: stdenv.mkDerivation rec { pname = "bmake"; - version = "20210420"; + version = "20210621"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - sha256 = "1ajq8v5rq3pl5y9h1hlscs83007fsyk3lhcp87z09ma370lm3ra7"; + sha256 = "0gpzv75ibzqz1j1h0hdjgx1v7hkl3i5cb5yf6q9sfcgx0bvb55xa"; }; # Make tests work with musl # * Disable deptgt-delete_on_error test (alpine does this too) + # * Disable shell-ksh test (ksh doesn't compile with musl) # * Fix test failing due to different strerror(3) output for musl and glibc postPatch = lib.optionalString (stdenv.hostPlatform.libc == "musl") '' - sed -i unit-tests/Makefile -e '/deptgt-delete_on_error/d' + sed -i unit-tests/Makefile \ + -e '/deptgt-delete_on_error/d' \ + -e '/shell-ksh/d' substituteInPlace unit-tests/opt-chdir.exp --replace "File name" "Filename" ''; @@ -28,6 +32,8 @@ stdenv.mkDerivation rec { ./fix-unexport-env-test.patch # Fix localtime tests without global /etc/zoneinfo directory ./fix-localtime-test.patch + # Always enable ksh test since it checks in a impure location /bin/ksh + ./unconditional-ksh-test.patch # decouple tests from build phase (fetchpatch { name = "separate-tests.patch"; @@ -68,7 +74,11 @@ stdenv.mkDerivation rec { ''; doCheck = true; - checkInputs = [ tzdata ]; + checkInputs = [ + tzdata + ] ++ lib.optionals (stdenv.hostPlatform.libc != "musl") [ + ksh + ]; checkPhase = '' runHook preCheck @@ -79,6 +89,10 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; + passthru.tests = { + bmakeMusl = pkgsMusl.bmake; + }; + meta = with lib; { description = "Portable version of NetBSD 'make'"; homepage = "http://www.crufty.net/help/sjg/bmake.html"; diff --git a/pkgs/development/tools/build-managers/bmake/unconditional-ksh-test.patch b/pkgs/development/tools/build-managers/bmake/unconditional-ksh-test.patch new file mode 100644 index 00000000000..117b85da16d --- /dev/null +++ b/pkgs/development/tools/build-managers/bmake/unconditional-ksh-test.patch @@ -0,0 +1,12 @@ +--- bmake/unit-tests/Makefile.orig 2021-07-04 19:13:09.068094922 +0200 ++++ bmake/unit-tests/Makefile 2021-07-04 19:13:14.630080696 +0200 +@@ -295,9 +295,7 @@ + TESTS+= sh-single-line + TESTS+= shell-csh + TESTS+= shell-custom +-.if exists(/bin/ksh) + TESTS+= shell-ksh +-.endif + TESTS+= shell-sh + TESTS+= suff-add-later + TESTS+= suff-clear-regular diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix index 68a4d5f44ea..1590906206c 100644 --- a/pkgs/development/tools/build-managers/boot/default.nix +++ b/pkgs/development/tools/build-managers/boot/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Build tooling for Clojure"; - homepage = "https://boot-clj.com/"; + homepage = "https://boot-clj.github.io/"; license = licenses.epl10; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ragge ]; diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 9c3e99e23ad..f59e74b02f4 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -39,6 +39,22 @@ let newPython = python3.override { "test_ec_verify_should_return_false_if_signature_invalid" ]; }); + # conan needs jinja2<3 + jinja2 = super.jinja2.overridePythonAttrs (oldAttrs: rec { + version = "2.11.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6"; + }; + }); + # old jinja2 needs old markupsafe + markupsafe = super.markupsafe.overridePythonAttrs (oldAttrs: rec { + version = "1.1.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"; + }; + }); }; }; @@ -56,7 +72,7 @@ in newPython.pkgs.buildPythonApplication rec { propagatedBuildInputs = with newPython.pkgs; [ bottle colorama - dateutil + python-dateutil deprecation distro fasteners @@ -92,7 +108,8 @@ in newPython.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace conans/requirements.txt \ - --replace "deprecation>=2.0, <2.1" "deprecation" + --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; { diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 0013eb4e2e0..3afe88043de 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -64,9 +64,9 @@ in rec { gradle_latest = gradle_7; gradle_7 = gradleGen (gradleSpec { - version = "7.0"; - nativeVersion = "0.22-milestone-11"; - sha256 = "01f3bjn8pbpni8kmxvx1dpwpf4zz04vj7cpm6025n0k188c8k2zb"; + version = "7.1"; + nativeVersion = "0.22-milestone-16"; + sha256 = "0yyqksq3zza7r9ls389ha81l3s768j7dfdqiwk3846qy4wcyxsrd"; }); gradle_6_8 = gradleGen (gradleSpec { diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 4fbd0365af9..4682fab41db 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.9.6"; + version = "0.9.8"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}"; - sha256 = "sha256-cAhcTmSPkV5z5ryuCNrpxy9/1iWvvminiVYul9c/DwM="; + sha256 = "sha256-vWCzjit7MPrKqEYgJfQHAkam9J9NgMObOQ/A+OQr24o="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/redo-c/Makefile b/pkgs/development/tools/build-managers/redo-c/Makefile index f2c43cc5003..5a1dd74c5b8 100644 --- a/pkgs/development/tools/build-managers/redo-c/Makefile +++ b/pkgs/development/tools/build-managers/redo-c/Makefile @@ -1,4 +1,4 @@ -CFLAGS=-Os +CFLAGS ?= -Os all: redo links diff --git a/pkgs/development/tools/build-managers/redo-c/default.nix b/pkgs/development/tools/build-managers/redo-c/default.nix index 40708b7877a..14d33cba039 100644 --- a/pkgs/development/tools/build-managers/redo-c/default.nix +++ b/pkgs/development/tools/build-managers/redo-c/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "redo-c"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "leahneukirchen"; repo = pname; rev = "v${version}"; - sha256 = "11wc2sgw1ssdm83cjdc6ndnp1bv5mzhbw7njw47mk7ri1ic1x51b"; + sha256 = "sha256-oZcaBgESIaD7/SUBE7luh7axucKTEzXPVkQAQs2NCXE="; }; postPatch = '' diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 16ea0dc2831..68cd3d449ca 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "CMake modules for common build tasks for the ROCm stack"; homepage = "https://github.com/RadeonOpenCompute/rocm-cmake"; license = licenses.mit; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index b947fc1ebfe..75fb29db882 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.1.30"; + version = "0.3.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uQj14arxDPc8/k1Cvp3T6hqjln30NFk9MzvYy8tAiJ8="; + sha256 = "sha256-rxWTh+iltD1kcntlu9sovwG/mQPmukYbw8V2FAFi1KE="; }; - vendorSha256 = "sha256-pl3dLisu4Oc77kgfuteKbsZaDzrHo1wUigZEkM4081Q="; + vendorSha256 = "sha256-mfNbcnJ62v6tdEhOtA0P9lDoD5HmLBAtNcrv1H3/mSE="; buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 415b22894cb..a128db527df 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.289.1"; + version = "2.289.2"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "1wkm1y2bj245b9i51vhns9qfxc6xm44hg60vhgmswndcy5pwrybh"; + sha256 = "0413ymfrb00ifxl8ww8nn8y4k07jhgsaxaw2h0qnfh9s6yxifpbf"; }; buildCommand = '' diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 45b5f185880..9ff5c1b01b8 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub, cmake -, qtbase, qttools, sqlite }: +, qtbase, qttools, sqlite, wrapGAppsHook }: mkDerivation rec { pname = "sqlitebrowser"; @@ -18,7 +18,7 @@ mkDerivation rec { # We *really* should get that cleaned up. buildInputs = [ qtbase sqlite ]; - nativeBuildInputs = [ cmake qttools ]; + nativeBuildInputs = [ cmake qttools wrapGAppsHook ]; meta = with lib; { description = "DB Browser for SQLite"; diff --git a/pkgs/development/tools/detect-secrets/default.nix b/pkgs/development/tools/detect-secrets/default.nix index f0dddf66ff4..5dc765ffe6f 100644 --- a/pkgs/development/tools/detect-secrets/default.nix +++ b/pkgs/development/tools/detect-secrets/default.nix @@ -1,10 +1,7 @@ { lib , buildPythonApplication -, configparser -, enum34 , fetchFromGitHub -, functools32 -, future +, gibberish-detector , isPy27 , mock , pyahocorasick @@ -17,34 +14,54 @@ buildPythonApplication rec { pname = "detect-secrets"; - version = "0.14.3"; + version = "1.1.0"; disabled = isPy27; - # PyPI tarball doesn't ship tests src = fetchFromGitHub { owner = "Yelp"; repo = pname; rev = "v${version}"; - sha256 = "0c4hxih9ljmv0d3izq5idyspk5zci26gdb6lv9klwcshwrfkvxj0"; + sha256 = "sha256-dj0lqm9s8OKhM4OmNrmGVRc32/ZV0I9+5WcW2hvLwu0="; }; propagatedBuildInputs = [ + gibberish-detector pyyaml + pyahocorasick requests ]; checkInputs = [ mock - pyahocorasick pytestCheckHook responses unidiff ]; + preCheck = '' + export HOME=$(mktemp -d); + ''; + disabledTests = [ - "TestMain" - "TestPreCommitHook" - "TestInitializeBaseline" + # Tests are failing for various reasons. Needs to be adjusted with the next update + "test_baseline_filters_out_known_secrets" + "test_basic" + "test_does_not_modify_slim_baseline" + "test_handles_each_path_separately" + "test_handles_multiple_directories" + "test_load_and_output" + "test_make_decisions" + "test_modifies_baseline" + "test_no_files_in_git_repo" + "test_outputs_baseline_if_none_supplied" + "test_saves_to_baseline" + "test_scan_all_files" + "test_should_scan_all_files_in_directory_if_flag_is_provided" + "test_should_scan_specific_non_tracked_file" + "test_should_scan_tracked_files_in_directory" + "test_start_halfway" + "test_works_from_different_directory" + "TestModifiesBaselineFromVersionChange" ]; pythonImportsCheck = [ "detect_secrets" ]; diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix new file mode 100644 index 00000000000..7ac81b236db --- /dev/null +++ b/pkgs/development/tools/dprint/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchCrate, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "dprint"; + version = "0.15.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-1DUGp+HiiY03fyZ+b8hNUBIfuQV5Z/gEcOxc/vG3YiA="; + }; + + cargoSha256 = "sha256-twFXA8A+vP1n6IFJO78fKNs+FC2ui46rj1JmJ/eq3wc="; + + # Tests fail because they expect a test WASM plugin. Tests already run for + # every commit upstream on GitHub Actions + doCheck = false; + + meta = with lib; { + description = "Code formatting platform written in Rust"; + longDescription = '' + dprint is a pluggable and configurable code formatting platform written in Rust. + It offers multiple WASM plugins to support various languages. It's written in + Rust, so it’s small, fast, and portable. + ''; + changelog = "https://github.com/dprint/dprint/releases/tag/${version}"; + homepage = "https://dprint.dev"; + license = licenses.mit; + maintainers = with maintainers; [ khushraj ]; + }; +} diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix index 608c721caf0..01146542d0c 100644 --- a/pkgs/development/tools/eclipse-mat/default.nix +++ b/pkgs/development/tools/eclipse-mat/default.nix @@ -20,7 +20,7 @@ with lib; let - pVersion = "1.11.0.20201202"; + pVersion = "1.12.0.20210602"; pVersionTriple = splitVersion pVersion; majorVersion = elemAt pVersionTriple 0; minorVersion = elemAt pVersionTriple 1; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ftp.halifax.rwth-aachen.de/eclipse//mat/${baseVersion}/rcp/MemoryAnalyzer-${version}-linux.gtk.x86_64.zip"; - sha256 = "sha256-HtIKcGfdjb2wovGGSxv16ud7y1cPQFBn77pkhiekAkI="; + sha256 = "sha256-qX4RPuZdeiEduJAEpzOi/QnbJ+kaD0PZ3WHrmGsvqHc="; }; desktopItem = makeDesktopItem { diff --git a/pkgs/development/tools/ecpdap/default.nix b/pkgs/development/tools/ecpdap/default.nix index 3bb12c40e35..38ba9d78712 100644 --- a/pkgs/development/tools/ecpdap/default.nix +++ b/pkgs/development/tools/ecpdap/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ecpdap"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "adamgreig"; repo = pname; rev = "v${version}"; - sha256 = "1va96hxm22a2lfy141x1sv5f5g8f6mp965an4jsff9qzi55kfv2g"; + sha256 = "sha256-fdvpGmEy54i48H6YJ4E1LIuogimNEL8PJS5ScoW/6DM="; }; - cargoSha256 = "1dk6x2f36c546qr415kzmqr2r4550iwdmj4chrb46p3hr64jddhd"; + cargoSha256 = "sha256-2YARNoHVDBwGr8FE/oRlNZMX/vCPIre7OnZbr04eF/M="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/elkhound/default.nix b/pkgs/development/tools/elkhound/default.nix new file mode 100644 index 00000000000..5c29b10a613 --- /dev/null +++ b/pkgs/development/tools/elkhound/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, lib +, fetchFromGitHub +, bison +, cmake +, flex +, perl +}: + +stdenv.mkDerivation rec { + pname = "elkhound"; + version = "unstable-2020-04-13"; + + src = fetchFromGitHub { + owner = "WeiDUorg"; + repo = pname; + rev = "a7eb4bb2151c00cc080613a770d37560f62a285c"; + sha256 = "sha256-Y96OFpBNrD3vrKoEZ4KdJuI1Q4RmYANsu7H3ZzfaA6g="; + }; + + postPatch = '' + patchShebangs scripts + ''; + + sourceRoot = "source/src"; + + nativeBuildInputs = [ bison cmake flex perl ]; + + installPhase = '' + runHook preInstall + + install -Dm555 -t $out/bin ast/astgen elkhound/elkhound + for d in ast elkhound smbase; do + install -Dm444 -t $out/lib $d/*.a + install -Dm444 -t $out/include/$d $src/src/$d/*.h + done + install -Dm444 -t $out/share/doc/${pname} $src/src/elkhound/*.txt + + runHook postInstall + ''; + + meta = with lib; { + description = "A parser generator which emits GLR parsers, either in OCaml or C++"; + homepage = "https://scottmcpeak.com/elkhound/"; + license = licenses.bsd3; + maintainers = with maintainers; [ peterhoeg ]; + # possibly works on Darwin + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index 58a986e813e..280e0c1e986 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-task"; - version = "3.4.3"; + version = "3.5.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-hI6x3DOB7pP+umnEFqL0sIx+6qN74sooLdkR2pC74D8="; + sha256 = "sha256-oXr98guqEvE/rpRJF5NMjQYZtzbrh1F/neXYbLaCGUg="; }; vendorSha256 = "sha256-bsVzV2M31BA7X6aq8na7v56uGYgne4OwR5kz/utmQHI="; diff --git a/pkgs/development/tools/gops/default.nix b/pkgs/development/tools/gops/default.nix index d23aa71a8ab..bc9cba9df5f 100644 --- a/pkgs/development/tools/gops/default.nix +++ b/pkgs/development/tools/gops/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gops"; - version = "0.3.18"; + version = "0.3.19"; src = fetchFromGitHub { owner = "google"; repo = "gops"; rev = "v${version}"; - sha256 = "0534jyravpsj73lgdmw6fns1qaqiw401jlfk04wa0as5sv09rfhy"; + sha256 = "sha256-9QEhc0OVCrIdIY220PDn2+CjUsCF84l6QRQS0HjDEZY="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index 489b62891b6..c2453c8ff16 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kustomize"; - version = "4.1.3"; + version = "4.2.0"; # rev is the commit of the tag, mainly for kustomize version command output rev = "9e8e7a7fe99ec9fbf801463e8607928322fc5245"; @@ -17,7 +17,7 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - sha256 = "sha256-NPWKInDHOoelWqDrUn/AlRItI4e8J6dbBxgLW078ecs="; + sha256 = "sha256-mFF0Yc+j292oajY1i9SApnWaQnVoHxvkGCIurKC0t4o="; }; # TODO: Remove once https://github.com/kubernetes-sigs/kustomize/pull/3708 got merged. @@ -26,7 +26,7 @@ buildGoModule rec { # avoid finding test and development commands sourceRoot = "source/kustomize"; - vendorSha256 = "sha256-6maEpEPEV436NrVnVlvWV1q6YywGVILXbxn8Z8Ku/hs="; + vendorSha256 = "sha256-VMvXDIrg/BkuxZVDHvpfHY/hgwQGz2kw1/hu5lhcYEE="; meta = with lib; { description = "Customization of kubernetes YAML configurations"; diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix index c0276403516..6847aff097c 100644 --- a/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/pkgs/development/tools/literate-programming/noweb/default.nix @@ -57,7 +57,7 @@ lib.fix (noweb: stdenv.mkDerivation rec { # NOTE: substituteInPlace breaks Icon binaries, so make sure the script # uses (n)awk before calling. if grep -q nawk "$f"; then - substituteInPlace "$f" --replace "nawk" "${nawk}/bin/awk" + substituteInPlace "$f" --replace "nawk" "${nawk}/bin/nawk" fi done diff --git a/pkgs/development/tools/misc/ccls/wrapper b/pkgs/development/tools/misc/ccls/wrapper index c92bc6b40d1..294b60893a3 100644 --- a/pkgs/development/tools/misc/ccls/wrapper +++ b/pkgs/development/tools/misc/ccls/wrapper @@ -4,6 +4,6 @@ printf -v extraArgs ',\"%s\"' \ $(cat @clang@/nix-support/libc-cflags \ @clang@/nix-support/libcxx-cxxflags) \ ${NIX_CFLAGS_COMPILE} -initString="--init={\"clang\":{\"extraArgs\":[${extraArgs:1}]}}" +initString="--init={\"clang\":{\"extraArgs\":[${extraArgs:1}],\"resourceDir\":\"@clang@/resource-root\"}}" exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "$@" diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 739615a841c..70ec9278ae1 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -6,11 +6,11 @@ let pygments = python3Packages.pygments; in stdenv.mkDerivation rec { pname = "global"; - version = "6.6.6"; + version = "6.6.7"; src = fetchurl { url = "mirror://gnu/global/${pname}-${version}.tar.gz"; - sha256 = "sha256-dYB4r/+Y1MBRxYeFx62j7Rl3+rt3+Il/9le3HMYtTV0="; + sha256 = "sha256-aaD3f1OCfFVoF2wdOCFm3zYedCY6BH8LMFiqLyrVijw="; }; nativeBuildInputs = [ libtool makeWrapper ]; diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index e189c563e86..030200e47a8 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,19 +2,17 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-68Hs9kwv7GTGnYtoJh61ubaggPKbxFwz7qDwYaJ74c8="; + sha256 = "sha256-d/dn77pV9qxzAm6NVOM5KhFxYi2/xEK02zMl2TTB5rA="; }; - vendorSha256 = "sha256-NgOpnCe0uGQVDVKYUIULqPTfvfkDtxIUQiCVwiE7nuc="; + vendorSha256 = "sha256-0PcMxotUEys+jGDFEEz6owbtTGAac+RwoBWEHP5ifKQ="; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X main.version=v${version} -X main.prerelease=") - ''; + ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ]; preCheck = '' # Remove tests that requires networking diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 739a562227a..6737f161754 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "open-policy-agent"; - version = "0.29.4"; + version = "0.30.0"; src = fetchFromGitHub { owner = "open-policy-agent"; @@ -10,14 +10,11 @@ buildGoModule rec { rev = "v${version}"; sha256 = "sha256-AjNr+t30ftF92+cEfvt8iHBDVD/SO52ojJRLAkYF9l4="; }; - vendorSha256 = null; subPackages = [ "." ]; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X github.com/open-policy-agent/opa/version.Version=${version}") - ''; + ldflags = [ "-s" "-w" "-X github.com/open-policy-agent/opa/version.Version=${version}" ]; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/development/tools/pgtop/default.nix b/pkgs/development/tools/pgtop/default.nix new file mode 100644 index 00000000000..03b3ef89265 --- /dev/null +++ b/pkgs/development/tools/pgtop/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, perlPackages, fetchFromGitHub, shortenPerlShebang }: + +perlPackages.buildPerlPackage rec { + pname = "pgtop"; + version = "0.11"; + + src = fetchFromGitHub { + owner = "cosimo"; + repo = "pgtop"; + rev = "v${version}"; + sha256 = "1awyl6ddfihm7dfr5y2z15r1si5cyipnlyyj3m1l19pk98s4x66l"; + }; + + outputs = [ "out" ]; + + buildInputs = with perlPackages; [ DBI DBDPg TermReadKey JSON LWPUserAgent ]; + + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/pgtop + ''; + + meta = with lib; { + description = "a PostgreSQL clone of `mytop', which in turn is a `top' clone for MySQL"; + homepage = "https://github.com/cosimo/pgtop"; + changelog = "https://github.com/cosimo/pgtop/releases/tag/v${version}"; + maintainers = [ maintainers.hagl ]; + license = [ licenses.gpl2Only ]; + }; +} diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix new file mode 100644 index 00000000000..701c22471ee --- /dev/null +++ b/pkgs/development/tools/pscale/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "pscale"; + version = "0.51.0"; + + src = fetchFromGitHub { + owner = "planetscale"; + repo = "cli"; + rev = "v${version}"; + sha256 = "sha256-ykHwDVwL30uXeCEP4EcM8TPYqZmCDDAUUpfinpYipHE="; + }; + + vendorSha256 = "sha256-3VP2fluQLZs4nWT3O6NmCFxrqKw0/j3ASNxtbXHlZEA="; + + meta = with lib; { + homepage = "https://www.planetscale.com/"; + changelog = "https://github.com/planetscale/cli/releases/tag/v${version}"; + description = "The CLI for PlanetScale Database"; + license = licenses.asl20; + maintainers = with maintainers; [ pimeys ]; + }; +} diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index 385db11d7ff..67137fb1ed9 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - pyyaml cbor2 dateutil tomlkit u-msgpack-python + pyyaml cbor2 python-dateutil tomlkit u-msgpack-python ]; meta = with lib; { diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix index c0baf9f3964..549c3d11e3a 100644 --- a/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/pkgs/development/tools/rust/cargo-bloat/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "0bqzzh8vfqm7dpnb0fv4calnhsg9p3c5j06ycvg621p4zp4fydh2"; + sha256 = "sha256-VcdZ/dKqFFQs8ItNEj407z1pWJqpHwwIsuNnsQ8KU/8="; }; - cargoSha256 = "0f7hmwrs99qdvhn4lvs8cqva68w2y04fy3ca1xlhk7ncdmclcc4g"; + cargoSha256 = "sha256-1TIGv0yVhkhThqZiQW9JrvFd0eouTlr8kgN/g7b4vDM="; meta = with lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; diff --git a/pkgs/development/tools/rust/crate2nix/default.nix b/pkgs/development/tools/rust/crate2nix/default.nix index e68eea50ff3..a86e531e7f6 100644 --- a/pkgs/development/tools/rust/crate2nix/default.nix +++ b/pkgs/development/tools/rust/crate2nix/default.nix @@ -10,18 +10,18 @@ rustPlatform.buildRustPackage rec { pname = "crate2nix"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "kolloch"; repo = pname; rev = version; - sha256 = "sha256-dB8wa3CQFw8ckD420zpBGw4TnsLrHqXf+ff/WuhPsVM="; + sha256 = "sha256-JaF9/H3m4Wrc5MtXcONkOAgKVkswLVw0yZe0dBr2e4Y="; }; sourceRoot = "source/crate2nix"; - cargoSha256 = "sha256-shWhzCaH8ZttUcq82tA7T1hwNl6F1XJy7ansA5lt+Mw="; + cargoSha256 = "sha256-PD7R1vcb3FKd4hfpViKyvfCExJ5H1Xo2HPYden5zpxQ="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index b3c75d9747e..a6381576ead 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -7,21 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2021-06-28"; - cargoSha256 = "sha256-Xpo/VK/w6BVbHUc+m/70AE0Cag8D3fT+wosOA8Lzz2A="; + version = "2021-07-05"; + cargoSha256 = "sha256-HmvvDHi33JAYXON98mbb+MfmJizOL4cdTbc3QDtPkZo="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-aWLqcCSeKRmCsETu4ri+SPQ5iB6nqaYELj0Qt3zW9/E="; + sha256 = "sha256-7pH38U+HMNPuO1BFP5kPTJoxGWTewRUoLrc9NXDdK2M="; }; - patches = [ - # We have rustc 1.52.1 in nixpkgs. - ./no-rust-1-53-features.patch - ]; - buildAndTestSubdir = "crates/rust-analyzer"; cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc"; diff --git a/pkgs/development/tools/rust/rust-analyzer/no-rust-1-53-features.patch b/pkgs/development/tools/rust/rust-analyzer/no-rust-1-53-features.patch deleted file mode 100644 index 864dc749b27..00000000000 --- a/pkgs/development/tools/rust/rust-analyzer/no-rust-1-53-features.patch +++ /dev/null @@ -1,689 +0,0 @@ -diff --git a/crates/hir/src/semantics.rs b/crates/hir/src/semantics.rs -index 43162797e..613266e07 100644 ---- a/crates/hir/src/semantics.rs -+++ b/crates/hir/src/semantics.rs -@@ -51,14 +51,12 @@ impl PathResolution { - PathResolution::Def(ModuleDef::BuiltinType(builtin)) => { - Some(TypeNs::BuiltinType((*builtin).into())) - } -- PathResolution::Def( -- ModuleDef::Const(_) -- | ModuleDef::Variant(_) -- | ModuleDef::Function(_) -- | ModuleDef::Module(_) -- | ModuleDef::Static(_) -- | ModuleDef::Trait(_), -- ) => None, -+ PathResolution::Def(ModuleDef::Const(_)) -+ | PathResolution::Def(ModuleDef::Variant(_)) -+ | PathResolution::Def(ModuleDef::Function(_)) -+ | PathResolution::Def(ModuleDef::Module(_)) -+ | PathResolution::Def(ModuleDef::Static(_)) -+ | PathResolution::Def(ModuleDef::Trait(_)) => None, - PathResolution::Def(ModuleDef::TypeAlias(alias)) => { - Some(TypeNs::TypeAliasId((*alias).into())) - } -@@ -67,7 +65,8 @@ impl PathResolution { - } - PathResolution::TypeParam(param) => Some(TypeNs::GenericParam((*param).into())), - PathResolution::SelfType(impl_def) => Some(TypeNs::SelfType((*impl_def).into())), -- PathResolution::AssocItem(AssocItem::Const(_) | AssocItem::Function(_)) => None, -+ PathResolution::AssocItem(AssocItem::Const(_)) -+ | PathResolution::AssocItem(AssocItem::Function(_)) => None, - PathResolution::AssocItem(AssocItem::TypeAlias(alias)) => { - Some(TypeNs::TypeAliasId((*alias).into())) - } -diff --git a/crates/hir_def/src/item_tree/pretty.rs b/crates/hir_def/src/item_tree/pretty.rs -index 8b12e5a67..d03c11377 100644 ---- a/crates/hir_def/src/item_tree/pretty.rs -+++ b/crates/hir_def/src/item_tree/pretty.rs -@@ -63,7 +63,7 @@ impl<'a> Printer<'a> { - fn blank(&mut self) { - let mut iter = self.buf.chars().rev().fuse(); - match (iter.next(), iter.next()) { -- (Some('\n'), Some('\n') | None) | (None, None) => {} -+ (Some('\n'), Some('\n')) | (Some('\n'), None) | (None, None) => {} - (Some('\n'), Some(_)) => { - self.buf.push('\n'); - } -@@ -77,7 +77,7 @@ impl<'a> Printer<'a> { - - fn whitespace(&mut self) { - match self.buf.chars().next_back() { -- None | Some('\n' | ' ') => {} -+ None | Some('\n') | Some(' ') => {} - _ => self.buf.push(' '), - } - } -diff --git a/crates/hir_def/src/nameres/collector.rs b/crates/hir_def/src/nameres/collector.rs -index 634e02205..250eb1c3e 100644 ---- a/crates/hir_def/src/nameres/collector.rs -+++ b/crates/hir_def/src/nameres/collector.rs -@@ -1260,7 +1260,7 @@ impl DefCollector<'_> { - for directive in &self.unresolved_imports { - if let ImportSource::Import { id: import, use_tree } = &directive.import.source { - match (directive.import.path.segments().first(), &directive.import.path.kind) { -- (Some(krate), PathKind::Plain | PathKind::Abs) => { -+ (Some(krate), PathKind::Plain) | (Some(krate), PathKind::Abs) => { - if diagnosed_extern_crates.contains(krate) { - continue; - } -diff --git a/crates/hir_def/src/resolver.rs b/crates/hir_def/src/resolver.rs -index a11439c3b..1841fe989 100644 ---- a/crates/hir_def/src/resolver.rs -+++ b/crates/hir_def/src/resolver.rs -@@ -605,7 +605,8 @@ fn to_value_ns(per_ns: PerNs) -> Option<ValueNs> { - ModuleDefId::ConstId(it) => ValueNs::ConstId(it), - ModuleDefId::StaticId(it) => ValueNs::StaticId(it), - -- ModuleDefId::AdtId(AdtId::EnumId(_) | AdtId::UnionId(_)) -+ ModuleDefId::AdtId(AdtId::EnumId(_)) -+ | ModuleDefId::AdtId(AdtId::UnionId(_)) - | ModuleDefId::TraitId(_) - | ModuleDefId::TypeAliasId(_) - | ModuleDefId::BuiltinType(_) -diff --git a/crates/hir_def/src/visibility.rs b/crates/hir_def/src/visibility.rs -index aeb1e7726..83500f54e 100644 ---- a/crates/hir_def/src/visibility.rs -+++ b/crates/hir_def/src/visibility.rs -@@ -172,8 +172,9 @@ impl Visibility { - /// visible in unrelated modules). - pub(crate) fn max(self, other: Visibility, def_map: &DefMap) -> Option<Visibility> { - match (self, other) { -- (Visibility::Module(_) | Visibility::Public, Visibility::Public) -- | (Visibility::Public, Visibility::Module(_)) => Some(Visibility::Public), -+ (Visibility::Module(_), Visibility::Public) -+ | (Visibility::Public, Visibility::Module(_)) -+ | (Visibility::Public, Visibility::Public) => Some(Visibility::Public), - (Visibility::Module(mod_a), Visibility::Module(mod_b)) => { - if mod_a.krate != mod_b.krate { - return None; -diff --git a/crates/hir_expand/src/hygiene.rs b/crates/hir_expand/src/hygiene.rs -index 848522411..05c6c3fb1 100644 ---- a/crates/hir_expand/src/hygiene.rs -+++ b/crates/hir_expand/src/hygiene.rs -@@ -146,11 +146,10 @@ impl HygieneInfo { - (&self.macro_arg.1, InFile::new(loc.kind.file_id(), arg_start)) - } - mbe::Origin::Def => match (&*self.macro_def, self.def_start) { -- ( -- TokenExpander::MacroDef { def_site_token_map, .. } -- | TokenExpander::MacroRules { def_site_token_map, .. }, -- Some(tt), -- ) => (def_site_token_map, tt), -+ (TokenExpander::MacroDef { def_site_token_map, .. }, Some(tt)) -+ | (TokenExpander::MacroRules { def_site_token_map, .. }, Some(tt)) => { -+ (def_site_token_map, tt) -+ } - _ => panic!("`Origin::Def` used with non-`macro_rules!` macro"), - }, - }; -diff --git a/crates/hir_expand/src/lib.rs b/crates/hir_expand/src/lib.rs -index c31426d7c..33107aa24 100644 ---- a/crates/hir_expand/src/lib.rs -+++ b/crates/hir_expand/src/lib.rs -@@ -368,11 +368,10 @@ impl ExpansionInfo { - let (token_map, tt) = match origin { - mbe::Origin::Call => (&self.macro_arg.1, self.arg.clone()), - mbe::Origin::Def => match (&*self.macro_def, self.def.as_ref()) { -- ( -- db::TokenExpander::MacroRules { def_site_token_map, .. } -- | db::TokenExpander::MacroDef { def_site_token_map, .. }, -- Some(tt), -- ) => (def_site_token_map, tt.as_ref().map(|tt| tt.syntax().clone())), -+ (db::TokenExpander::MacroRules { def_site_token_map, .. }, Some(tt)) -+ | (db::TokenExpander::MacroDef { def_site_token_map, .. }, Some(tt)) => { -+ (def_site_token_map, tt.as_ref().map(|tt| tt.syntax().clone())) -+ } - _ => panic!("`Origin::Def` used with non-`macro_rules!` macro"), - }, - }; -diff --git a/crates/hir_ty/src/consteval.rs b/crates/hir_ty/src/consteval.rs -index ab1afce08..6f0bf8f8c 100644 ---- a/crates/hir_ty/src/consteval.rs -+++ b/crates/hir_ty/src/consteval.rs -@@ -38,7 +38,8 @@ impl ConstExt for Const { - // FIXME: support more than just evaluating literals - pub fn eval_usize(expr: &Expr) -> Option<u64> { - match expr { -- Expr::Literal(Literal::Uint(v, None | Some(BuiltinUint::Usize))) => (*v).try_into().ok(), -+ Expr::Literal(Literal::Uint(v, None)) -+ | Expr::Literal(Literal::Uint(v, Some(BuiltinUint::Usize))) => (*v).try_into().ok(), - _ => None, - } - } -diff --git a/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs b/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs -index e3d640a79..471cd4921 100644 ---- a/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs -+++ b/crates/hir_ty/src/diagnostics/match_check/deconstruct_pat.rs -@@ -84,7 +84,10 @@ impl IntRange { - #[inline] - fn is_integral(ty: &Ty) -> bool { - match ty.kind(&Interner) { -- TyKind::Scalar(Scalar::Char | Scalar::Int(_) | Scalar::Uint(_) | Scalar::Bool) => true, -+ TyKind::Scalar(Scalar::Char) -+ | TyKind::Scalar(Scalar::Int(_)) -+ | TyKind::Scalar(Scalar::Uint(_)) -+ | TyKind::Scalar(Scalar::Bool) => true, - _ => false, - } - } -@@ -378,7 +381,7 @@ impl Constructor { - // Wildcards cover anything - (_, Wildcard) => true, - // The missing ctors are not covered by anything in the matrix except wildcards. -- (Missing | Wildcard, _) => false, -+ (Missing, _) | (Wildcard, _) => false, - - (Single, Single) => true, - (Variant(self_id), Variant(other_id)) => self_id == other_id, -@@ -520,7 +523,7 @@ impl SplitWildcard { - } - } - TyKind::Scalar(Scalar::Char) => unhandled(), -- TyKind::Scalar(Scalar::Int(..) | Scalar::Uint(..)) => unhandled(), -+ TyKind::Scalar(Scalar::Int(..)) | TyKind::Scalar(Scalar::Uint(..)) => unhandled(), - TyKind::Never if !cx.feature_exhaustive_patterns() && !pcx.is_top_level => { - smallvec![NonExhaustive] - } -diff --git a/crates/hir_ty/src/infer/coerce.rs b/crates/hir_ty/src/infer/coerce.rs -index 7be914451..4b7f31521 100644 ---- a/crates/hir_ty/src/infer/coerce.rs -+++ b/crates/hir_ty/src/infer/coerce.rs -@@ -47,7 +47,10 @@ impl<'a> InferenceContext<'a> { - // pointers to have a chance at getting a match. See - // https://github.com/rust-lang/rust/blob/7b805396bf46dce972692a6846ce2ad8481c5f85/src/librustc_typeck/check/coercion.rs#L877-L916 - let sig = match (ty1.kind(&Interner), ty2.kind(&Interner)) { -- (TyKind::FnDef(..) | TyKind::Closure(..), TyKind::FnDef(..) | TyKind::Closure(..)) => { -+ (TyKind::FnDef(..), TyKind::FnDef(..)) -+ | (TyKind::Closure(..), TyKind::FnDef(..)) -+ | (TyKind::FnDef(..), TyKind::Closure(..)) -+ | (TyKind::Closure(..), TyKind::Closure(..)) => { - // FIXME: we're ignoring safety here. To be more correct, if we have one FnDef and one Closure, - // we should be coercing the closure to a fn pointer of the safety of the FnDef - cov_mark::hit!(coerce_fn_reification); -@@ -445,7 +448,8 @@ fn safe_to_unsafe_fn_ty(fn_ty: FnPointer) -> FnPointer { - - fn coerce_mutabilities(from: Mutability, to: Mutability) -> Result<(), TypeError> { - match (from, to) { -- (Mutability::Mut, Mutability::Mut | Mutability::Not) -+ (Mutability::Mut, Mutability::Mut) -+ | (Mutability::Mut, Mutability::Not) - | (Mutability::Not, Mutability::Not) => Ok(()), - (Mutability::Not, Mutability::Mut) => Err(TypeError), - } -diff --git a/crates/hir_ty/src/infer/expr.rs b/crates/hir_ty/src/infer/expr.rs -index c3a5b979f..346e94128 100644 ---- a/crates/hir_ty/src/infer/expr.rs -+++ b/crates/hir_ty/src/infer/expr.rs -@@ -593,11 +593,11 @@ impl<'a> InferenceContext<'a> { - UnaryOp::Neg => { - match inner_ty.kind(&Interner) { - // Fast path for builtins -- TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_) | Scalar::Float(_)) -- | TyKind::InferenceVar( -- _, -- TyVariableKind::Integer | TyVariableKind::Float, -- ) => inner_ty, -+ TyKind::Scalar(Scalar::Int(_)) -+ | TyKind::Scalar(Scalar::Uint(_)) -+ | TyKind::Scalar(Scalar::Float(_)) -+ | TyKind::InferenceVar(_, TyVariableKind::Integer) -+ | TyKind::InferenceVar(_, TyVariableKind::Float) => inner_ty, - // Otherwise we resolve via the std::ops::Neg trait - _ => self - .resolve_associated_type(inner_ty, self.resolve_ops_neg_output()), -@@ -606,7 +606,9 @@ impl<'a> InferenceContext<'a> { - UnaryOp::Not => { - match inner_ty.kind(&Interner) { - // Fast path for builtins -- TyKind::Scalar(Scalar::Bool | Scalar::Int(_) | Scalar::Uint(_)) -+ TyKind::Scalar(Scalar::Bool) -+ | TyKind::Scalar(Scalar::Int(_)) -+ | TyKind::Scalar(Scalar::Uint(_)) - | TyKind::InferenceVar(_, TyVariableKind::Integer) => inner_ty, - // Otherwise we resolve via the std::ops::Not trait - _ => self -@@ -733,7 +735,7 @@ impl<'a> InferenceContext<'a> { - Expr::Array(array) => { - let elem_ty = - match expected.to_option(&mut self.table).as_ref().map(|t| t.kind(&Interner)) { -- Some(TyKind::Array(st, _) | TyKind::Slice(st)) => st.clone(), -+ Some(TyKind::Array(st, _)) | Some(TyKind::Slice(st)) => st.clone(), - _ => self.table.new_type_var(), - }; - -diff --git a/crates/hir_ty/src/infer/pat.rs b/crates/hir_ty/src/infer/pat.rs -index c79ed91ea..80ecd4ea9 100644 ---- a/crates/hir_ty/src/infer/pat.rs -+++ b/crates/hir_ty/src/infer/pat.rs -@@ -297,11 +297,10 @@ fn is_non_ref_pat(body: &hir_def::body::Body, pat: PatId) -> bool { - Expr::Literal(Literal::String(..)) => false, - _ => true, - }, -- Pat::Bind { -- mode: BindingAnnotation::Mutable | BindingAnnotation::Unannotated, -- subpat: Some(subpat), -- .. -- } => is_non_ref_pat(body, *subpat), -+ Pat::Bind { mode: BindingAnnotation::Mutable, subpat: Some(subpat), .. } -+ | Pat::Bind { mode: BindingAnnotation::Unannotated, subpat: Some(subpat), .. } => { -+ is_non_ref_pat(body, *subpat) -+ } - Pat::Wild | Pat::Bind { .. } | Pat::Ref { .. } | Pat::Box { .. } | Pat::Missing => false, - } - } -diff --git a/crates/hir_ty/src/op.rs b/crates/hir_ty/src/op.rs -index 5ef6342d5..0222de2bc 100644 ---- a/crates/hir_ty/src/op.rs -+++ b/crates/hir_ty/src/op.rs -@@ -8,15 +8,17 @@ pub(super) fn binary_op_return_ty(op: BinaryOp, lhs_ty: Ty, rhs_ty: Ty) -> Ty { - match op { - BinaryOp::LogicOp(_) | BinaryOp::CmpOp(_) => TyKind::Scalar(Scalar::Bool).intern(&Interner), - BinaryOp::Assignment { .. } => TyBuilder::unit(), -- BinaryOp::ArithOp(ArithOp::Shl | ArithOp::Shr) => { -+ BinaryOp::ArithOp(ArithOp::Shl) | BinaryOp::ArithOp(ArithOp::Shr) => { - // all integer combinations are valid here - if matches!( - lhs_ty.kind(&Interner), -- TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_)) -+ TyKind::Scalar(Scalar::Int(_)) -+ | TyKind::Scalar(Scalar::Uint(_)) - | TyKind::InferenceVar(_, TyVariableKind::Integer) - ) && matches!( - rhs_ty.kind(&Interner), -- TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_)) -+ TyKind::Scalar(Scalar::Int(_)) -+ | TyKind::Scalar(Scalar::Uint(_)) - | TyKind::InferenceVar(_, TyVariableKind::Integer) - ) { - lhs_ty -@@ -30,15 +32,15 @@ pub(super) fn binary_op_return_ty(op: BinaryOp, lhs_ty: Ty, rhs_ty: Ty) -> Ty { - | (TyKind::Scalar(Scalar::Uint(_)), TyKind::Scalar(Scalar::Uint(_))) - | (TyKind::Scalar(Scalar::Float(_)), TyKind::Scalar(Scalar::Float(_))) => rhs_ty, - // ({int}, int) | ({int}, uint) -- ( -- TyKind::InferenceVar(_, TyVariableKind::Integer), -- TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_)), -- ) => rhs_ty, -+ (TyKind::InferenceVar(_, TyVariableKind::Integer), TyKind::Scalar(Scalar::Int(_))) -+ | (TyKind::InferenceVar(_, TyVariableKind::Integer), TyKind::Scalar(Scalar::Uint(_))) => { -+ rhs_ty -+ } - // (int, {int}) | (uint, {int}) -- ( -- TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_)), -- TyKind::InferenceVar(_, TyVariableKind::Integer), -- ) => lhs_ty, -+ (TyKind::Scalar(Scalar::Int(_)), TyKind::InferenceVar(_, TyVariableKind::Integer)) -+ | (TyKind::Scalar(Scalar::Uint(_)), TyKind::InferenceVar(_, TyVariableKind::Integer)) => { -+ lhs_ty -+ } - // ({float} | float) - (TyKind::InferenceVar(_, TyVariableKind::Float), TyKind::Scalar(Scalar::Float(_))) => { - rhs_ty -@@ -67,15 +69,21 @@ pub(super) fn binary_op_rhs_expectation(op: BinaryOp, lhs_ty: Ty) -> Ty { - BinaryOp::Assignment { op: None } => lhs_ty, - BinaryOp::CmpOp(CmpOp::Eq { .. }) => match lhs_ty.kind(&Interner) { - TyKind::Scalar(_) | TyKind::Str => lhs_ty, -- TyKind::InferenceVar(_, TyVariableKind::Integer | TyVariableKind::Float) => lhs_ty, -+ TyKind::InferenceVar(_, TyVariableKind::Integer) -+ | TyKind::InferenceVar(_, TyVariableKind::Float) => lhs_ty, - _ => TyKind::Error.intern(&Interner), - }, -- BinaryOp::ArithOp(ArithOp::Shl | ArithOp::Shr) => TyKind::Error.intern(&Interner), -+ BinaryOp::ArithOp(ArithOp::Shl) | BinaryOp::ArithOp(ArithOp::Shr) => { -+ TyKind::Error.intern(&Interner) -+ } - BinaryOp::CmpOp(CmpOp::Ord { .. }) - | BinaryOp::Assignment { op: Some(_) } - | BinaryOp::ArithOp(_) => match lhs_ty.kind(&Interner) { -- TyKind::Scalar(Scalar::Int(_) | Scalar::Uint(_) | Scalar::Float(_)) => lhs_ty, -- TyKind::InferenceVar(_, TyVariableKind::Integer | TyVariableKind::Float) => lhs_ty, -+ TyKind::Scalar(Scalar::Int(_)) -+ | TyKind::Scalar(Scalar::Uint(_)) -+ | TyKind::Scalar(Scalar::Float(_)) => lhs_ty, -+ TyKind::InferenceVar(_, TyVariableKind::Integer) -+ | TyKind::InferenceVar(_, TyVariableKind::Float) => lhs_ty, - _ => TyKind::Error.intern(&Interner), - }, - } -diff --git a/crates/ide/src/join_lines.rs b/crates/ide/src/join_lines.rs -index ffa8bd182..93d3760bf 100644 ---- a/crates/ide/src/join_lines.rs -+++ b/crates/ide/src/join_lines.rs -@@ -197,7 +197,7 @@ fn join_single_use_tree(edit: &mut TextEditBuilder, token: &SyntaxToken) -> Opti - } - - fn is_trailing_comma(left: SyntaxKind, right: SyntaxKind) -> bool { -- matches!((left, right), (T![,], T![')'] | T![']'])) -+ matches!((left, right), (T![,], T![')']) | (T![,], T![']'])) - } - - fn compute_ws(left: SyntaxKind, right: SyntaxKind) -> &'static str { -diff --git a/crates/ide/src/references.rs b/crates/ide/src/references.rs -index 2d3a0f598..7a7654b6c 100644 ---- a/crates/ide/src/references.rs -+++ b/crates/ide/src/references.rs -@@ -79,7 +79,8 @@ pub(crate) fn find_all_refs( - }); - usages.references.retain(|_, it| !it.is_empty()); - } -- Definition::ModuleDef(hir::ModuleDef::Adt(_) | hir::ModuleDef::Variant(_)) => { -+ Definition::ModuleDef(hir::ModuleDef::Adt(_)) -+ | Definition::ModuleDef(hir::ModuleDef::Variant(_)) => { - refs.for_each(|it| { - it.retain(|reference| { - reference.name.as_name_ref().map_or(false, is_lit_name_ref) -diff --git a/crates/ide/src/syntax_highlighting.rs b/crates/ide/src/syntax_highlighting.rs -index 5259d86d2..365d0c4de 100644 ---- a/crates/ide/src/syntax_highlighting.rs -+++ b/crates/ide/src/syntax_highlighting.rs -@@ -295,7 +295,7 @@ fn traverse( - Some(parent) => { - // We only care Name and Name_ref - match (token.kind(), parent.kind()) { -- (IDENT, NAME | NAME_REF) => parent.into(), -+ (IDENT, NAME) | (IDENT, NAME_REF) => parent.into(), - _ => token.into(), - } - } -@@ -311,7 +311,7 @@ fn traverse( - Some(parent) => { - // We only care Name and Name_ref - match (token.kind(), parent.kind()) { -- (IDENT, NAME | NAME_REF) => parent.into(), -+ (IDENT, NAME) | (IDENT, NAME_REF) => parent.into(), - _ => token.into(), - } - } -diff --git a/crates/ide_assists/src/handlers/extract_function.rs b/crates/ide_assists/src/handlers/extract_function.rs -index 870d4f665..454de2645 100644 ---- a/crates/ide_assists/src/handlers/extract_function.rs -+++ b/crates/ide_assists/src/handlers/extract_function.rs -@@ -1398,7 +1398,7 @@ fn fix_param_usages(ctx: &AssistContext, params: &[Param], syntax: &SyntaxNode) - for (param, usages) in usages_for_param { - for usage in usages { - match usage.syntax().ancestors().skip(1).find_map(ast::Expr::cast) { -- Some(ast::Expr::MethodCallExpr(_) | ast::Expr::FieldExpr(_)) => { -+ Some(ast::Expr::MethodCallExpr(_)) | Some(ast::Expr::FieldExpr(_)) => { - // do nothing - } - Some(ast::Expr::RefExpr(node)) -diff --git a/crates/ide_assists/src/tests.rs b/crates/ide_assists/src/tests.rs -index 841537c77..d9d9124b6 100644 ---- a/crates/ide_assists/src/tests.rs -+++ b/crates/ide_assists/src/tests.rs -@@ -181,10 +181,9 @@ fn check(handler: Handler, before: &str, expected: ExpectedResult, assist_label: - "unresolved assist should not contain source changes" - ), - (Some(_), ExpectedResult::NotApplicable) => panic!("assist should not be applicable!"), -- ( -- None, -- ExpectedResult::After(_) | ExpectedResult::Target(_) | ExpectedResult::Unresolved, -- ) => { -+ (None, ExpectedResult::After(_)) -+ | (None, ExpectedResult::Target(_)) -+ | (None, ExpectedResult::Unresolved) => { - panic!("code action is not applicable") - } - (None, ExpectedResult::NotApplicable) => (), -diff --git a/crates/ide_completion/src/completions/qualified_path.rs b/crates/ide_completion/src/completions/qualified_path.rs -index 1b8997ecf..aaaef27d2 100644 ---- a/crates/ide_completion/src/completions/qualified_path.rs -+++ b/crates/ide_completion/src/completions/qualified_path.rs -@@ -65,11 +65,9 @@ pub(crate) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon - // Don't suggest attribute macros and derives. - hir::ScopeDef::MacroDef(mac) => mac.is_fn_like(), - // no values in type places -- hir::ScopeDef::ModuleDef( -- hir::ModuleDef::Function(_) -- | hir::ModuleDef::Variant(_) -- | hir::ModuleDef::Static(_), -- ) -+ hir::ScopeDef::ModuleDef(hir::ModuleDef::Function(_)) -+ | hir::ScopeDef::ModuleDef(hir::ModuleDef::Variant(_)) -+ | hir::ScopeDef::ModuleDef(hir::ModuleDef::Static(_)) - | hir::ScopeDef::Local(_) => !ctx.expects_type(), - // unless its a constant in a generic arg list position - hir::ScopeDef::ModuleDef(hir::ModuleDef::Const(_)) => { -@@ -83,13 +81,9 @@ pub(crate) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionCon - } - } - } -- hir::PathResolution::Def( -- def -- @ -- (hir::ModuleDef::Adt(_) -- | hir::ModuleDef::TypeAlias(_) -- | hir::ModuleDef::BuiltinType(_)), -- ) => { -+ hir::PathResolution::Def(def @ hir::ModuleDef::Adt(_)) -+ | hir::PathResolution::Def(def @ hir::ModuleDef::TypeAlias(_)) -+ | hir::PathResolution::Def(def @ hir::ModuleDef::BuiltinType(_)) => { - if let hir::ModuleDef::Adt(hir::Adt::Enum(e)) = def { - add_enum_variants(acc, ctx, e); - } -diff --git a/crates/ide_completion/src/completions/unqualified_path.rs b/crates/ide_completion/src/completions/unqualified_path.rs -index 5abd6ee37..5e6a2e661 100644 ---- a/crates/ide_completion/src/completions/unqualified_path.rs -+++ b/crates/ide_completion/src/completions/unqualified_path.rs -@@ -40,7 +40,7 @@ pub(crate) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionC - ctx.scope.process_all_names(&mut |name, res| { - let add_resolution = match res { - ScopeDef::MacroDef(mac) => mac.is_fn_like(), -- ScopeDef::ModuleDef(hir::ModuleDef::Trait(_) | hir::ModuleDef::Module(_)) => true, -+ ScopeDef::ModuleDef(hir::ModuleDef::Trait(_)) | ScopeDef::ModuleDef(hir::ModuleDef::Module(_)) => true, - _ => false, - }; - if add_resolution { -@@ -88,11 +88,9 @@ pub(crate) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionC - // Don't suggest attribute macros and derives. - ScopeDef::MacroDef(mac) => mac.is_fn_like(), - // no values in type places -- ScopeDef::ModuleDef( -- hir::ModuleDef::Function(_) -- | hir::ModuleDef::Variant(_) -- | hir::ModuleDef::Static(_), -- ) -+ ScopeDef::ModuleDef(hir::ModuleDef::Function(_)) -+ | ScopeDef::ModuleDef(hir::ModuleDef::Variant(_)) -+ | ScopeDef::ModuleDef(hir::ModuleDef::Static(_)) - | ScopeDef::Local(_) => !ctx.expects_type(), - // unless its a constant in a generic arg list position - ScopeDef::ModuleDef(hir::ModuleDef::Const(_)) -diff --git a/crates/ide_completion/src/context.rs b/crates/ide_completion/src/context.rs -index f0da98739..ea1e110da 100644 ---- a/crates/ide_completion/src/context.rs -+++ b/crates/ide_completion/src/context.rs -@@ -242,23 +242,24 @@ impl<'a> CompletionContext<'a> { - } - - pub(crate) fn expects_assoc_item(&self) -> bool { -- matches!(self.completion_location, Some(ImmediateLocation::Trait | ImmediateLocation::Impl)) -+ matches!( -+ self.completion_location, -+ Some(ImmediateLocation::Trait) | Some(ImmediateLocation::Impl) -+ ) - } - - pub(crate) fn has_dot_receiver(&self) -> bool { - matches!( - &self.completion_location, -- Some(ImmediateLocation::FieldAccess { receiver, .. } | ImmediateLocation::MethodCall { receiver,.. }) -+ Some(ImmediateLocation::FieldAccess { receiver, .. }) | Some(ImmediateLocation::MethodCall { receiver,.. }) - if receiver.is_some() - ) - } - - pub(crate) fn dot_receiver(&self) -> Option<&ast::Expr> { - match &self.completion_location { -- Some( -- ImmediateLocation::MethodCall { receiver, .. } -- | ImmediateLocation::FieldAccess { receiver, .. }, -- ) => receiver.as_ref(), -+ Some(ImmediateLocation::MethodCall { receiver, .. }) -+ | Some(ImmediateLocation::FieldAccess { receiver, .. }) => receiver.as_ref(), - _ => None, - } - } -@@ -282,28 +283,28 @@ impl<'a> CompletionContext<'a> { - pub(crate) fn expects_ident_pat_or_ref_expr(&self) -> bool { - matches!( - self.completion_location, -- Some(ImmediateLocation::IdentPat | ImmediateLocation::RefExpr) -+ Some(ImmediateLocation::IdentPat) | Some(ImmediateLocation::RefExpr) - ) - } - - pub(crate) fn expect_field(&self) -> bool { - matches!( - self.completion_location, -- Some(ImmediateLocation::RecordField | ImmediateLocation::TupleField) -+ Some(ImmediateLocation::RecordField) | Some(ImmediateLocation::TupleField) - ) - } - - pub(crate) fn in_use_tree(&self) -> bool { - matches!( - self.completion_location, -- Some(ImmediateLocation::Use | ImmediateLocation::UseTree) -+ Some(ImmediateLocation::Use) | Some(ImmediateLocation::UseTree) - ) - } - - pub(crate) fn has_impl_or_trait_prev_sibling(&self) -> bool { - matches!( - self.prev_sibling, -- Some(ImmediatePrevSibling::ImplDefType | ImmediatePrevSibling::TraitDefName) -+ Some(ImmediatePrevSibling::ImplDefType) | Some(ImmediatePrevSibling::TraitDefName) - ) - } - -@@ -324,16 +325,14 @@ impl<'a> CompletionContext<'a> { - || self.previous_token_is(T![unsafe]) - || matches!( - self.prev_sibling, -- Some(ImmediatePrevSibling::Attribute | ImmediatePrevSibling::Visibility) -+ Some(ImmediatePrevSibling::Attribute) | Some(ImmediatePrevSibling::Visibility) - ) - || matches!( - self.completion_location, -- Some( -- ImmediateLocation::Attribute(_) -- | ImmediateLocation::ModDeclaration(_) -- | ImmediateLocation::RecordPat(_) -- | ImmediateLocation::RecordExpr(_) -- ) -+ Some(ImmediateLocation::Attribute(_)) -+ | Some(ImmediateLocation::ModDeclaration(_)) -+ | Some(ImmediateLocation::RecordPat(_)) -+ | Some(ImmediateLocation::RecordExpr(_)) - ) - } - -@@ -707,8 +706,8 @@ fn path_or_use_tree_qualifier(path: &ast::Path) -> Option<(ast::Path, bool)> { - - fn has_ref(token: &SyntaxToken) -> bool { - let mut token = token.clone(); -- for skip in [WHITESPACE, IDENT, T![mut]] { -- if token.kind() == skip { -+ for skip in &[WHITESPACE, IDENT, T![mut]] { -+ if token.kind() == *skip { - token = match token.prev_token() { - Some(it) => it, - None => return false, -diff --git a/crates/ide_completion/src/render/builder_ext.rs b/crates/ide_completion/src/render/builder_ext.rs -index 33d3a5ee1..749dfc665 100644 ---- a/crates/ide_completion/src/render/builder_ext.rs -+++ b/crates/ide_completion/src/render/builder_ext.rs -@@ -32,7 +32,7 @@ impl Builder { - cov_mark::hit!(no_parens_in_use_item); - return false; - } -- if matches!(ctx.path_call_kind(), Some(CallKind::Expr | CallKind::Pat)) -+ if matches!(ctx.path_call_kind(), Some(CallKind::Expr) | Some(CallKind::Pat)) - | matches!( - ctx.completion_location, - Some(ImmediateLocation::MethodCall { has_parens: true, .. }) -diff --git a/crates/mbe/src/expander/matcher.rs b/crates/mbe/src/expander/matcher.rs -index 0d694b1a7..5c4680d19 100644 ---- a/crates/mbe/src/expander/matcher.rs -+++ b/crates/mbe/src/expander/matcher.rs -@@ -804,17 +804,33 @@ impl<'a> TtIter<'a> { - }; - - match (punct.char, second, third) { -- ('.', '.', Some('.' | '=')) | ('<', '<', Some('=')) | ('>', '>', Some('=')) => { -+ ('.', '.', Some('.')) -+ | ('.', '.', Some('=')) -+ | ('<', '<', Some('=')) -+ | ('>', '>', Some('=')) => { - let tt2 = self.next().unwrap().clone(); - let tt3 = self.next().unwrap().clone(); - Ok(tt::Subtree { delimiter: None, token_trees: vec![tt, tt2, tt3] }.into()) - } -- ('-' | '!' | '*' | '/' | '&' | '%' | '^' | '+' | '<' | '=' | '>' | '|', '=', _) -- | ('-' | '=' | '>', '>', _) -+ ('-', '=', _) -+ | ('-', '>', _) - | (':', ':', _) -+ | ('!', '=', _) - | ('.', '.', _) -+ | ('*', '=', _) -+ | ('/', '=', _) - | ('&', '&', _) -+ | ('&', '=', _) -+ | ('%', '=', _) -+ | ('^', '=', _) -+ | ('+', '=', _) - | ('<', '<', _) -+ | ('<', '=', _) -+ | ('=', '=', _) -+ | ('=', '>', _) -+ | ('>', '=', _) -+ | ('>', '>', _) -+ | ('|', '=', _) - | ('|', '|', _) => { - let tt2 = self.next().unwrap().clone(); - Ok(tt::Subtree { delimiter: None, token_trees: vec![tt, tt2] }.into()) -diff --git a/crates/parser/src/grammar/params.rs b/crates/parser/src/grammar/params.rs -index 5a78675fb..e0c1d3b3a 100644 ---- a/crates/parser/src/grammar/params.rs -+++ b/crates/parser/src/grammar/params.rs -@@ -184,7 +184,8 @@ fn opt_self_param(p: &mut Parser, m: Marker) -> Result<(), Marker> { - if !matches!( - (p.current(), la1, la2, la3), - (T![&], T![self], _, _) -- | (T![&], T![mut] | LIFETIME_IDENT, T![self], _) -+ | (T![&], LIFETIME_IDENT, T![self], _) -+ | (T![&], T![mut], T![self], _) - | (T![&], LIFETIME_IDENT, T![mut], T![self]) - ) { - return Err(m); -diff --git a/crates/vfs/src/vfs_path.rs b/crates/vfs/src/vfs_path.rs -index ef2d7657a..2b3d7fd84 100644 ---- a/crates/vfs/src/vfs_path.rs -+++ b/crates/vfs/src/vfs_path.rs -@@ -389,7 +389,7 @@ impl VirtualPath { - - match (file_stem, extension) { - (None, None) => None, -- (None | Some(""), Some(_)) => Some((file_name, None)), -+ (None, Some(_)) | (Some(""), Some(_)) => Some((file_name, None)), - (Some(file_stem), extension) => Some((file_stem, extension)), - } - } -diff --git a/xtask/src/install.rs b/xtask/src/install.rs -index 64ab12b42..7e2dccdfe 100644 ---- a/xtask/src/install.rs -+++ b/xtask/src/install.rs -@@ -8,7 +8,7 @@ use xshell::{cmd, pushd}; - use crate::flags; - - // Latest stable, feel free to send a PR if this lags behind. --const REQUIRED_RUST_VERSION: u32 = 53; -+const REQUIRED_RUST_VERSION: u32 = 52; - - impl flags::Install { - pub(crate) fn run(self) -> Result<()> { diff --git a/pkgs/development/tools/tapview/default.nix b/pkgs/development/tools/tapview/default.nix new file mode 100644 index 00000000000..966df4bed65 --- /dev/null +++ b/pkgs/development/tools/tapview/default.nix @@ -0,0 +1,32 @@ +{ asciidoctor +, fetchFromGitLab +, lib +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "tapview"; + version = "1.1"; + + nativeBuildInputs = [ asciidoctor ]; + + src = fetchFromGitLab { + owner = "esr"; + repo = pname; + rev = version; + sha256 = "sha256-inrxICNglZU/tup+YnHaDiVss32K2OXht/7f8lOZI4g="; + }; + + # Remove unecessary `echo` checks: `/bin/echo` fails, and `echo -n` works as expected. + patches = [ ./dont_check_echo.patch ]; + + makeFlags = [ "prefix=$(out)" ]; + + meta = with lib; { + description = "A minimalist pure consumer for TAP (Test Anything Protocol)"; + homepage = "https://gitlab.com/esr/tapview"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ pamplemousse ]; + }; +} diff --git a/pkgs/development/tools/tapview/dont_check_echo.patch b/pkgs/development/tools/tapview/dont_check_echo.patch new file mode 100644 index 00000000000..3b12adb84c5 --- /dev/null +++ b/pkgs/development/tools/tapview/dont_check_echo.patch @@ -0,0 +1,44 @@ +diff --git a/tapview b/tapview +index ad6a33a66d1..4cf9545d42f 100644 +--- a/tapview ++++ b/tapview +@@ -13,21 +13,6 @@ + # + # This is version 1.1 + # A newer version may be available at https://gitlab.com/esr/tapview +-# +-# POSIX allows but does not mandate that -n suppresses emission of a +-# trailing newline in echo. Thus, some shell builtin echos don't do +-# that. Cope gracefully. +-# shellcheck disable=SC2039 +-if [ "$(echo -n "a"; echo "b")" != "ab" ] +-then +- ECHO="echo" +-elif [ "$(/bin/echo -n "a"; /bin/echo "b")" = "ab" ] +-then +- ECHO="/bin/echo" +-else +- echo "tapview: bailing out, your echo lacks -n support." +- exit 3 +-fi + + OK="." + FAIL="F" +@@ -37,7 +22,7 @@ TODO_OK="u" + + ship_char() { + # shellcheck disable=SC2039 +- "${ECHO}" -n "$1" ++ echo -n "$1" + } + + ship_line() { +@@ -155,7 +140,7 @@ do + fi + done + +-/bin/echo "" ++echo "" + + if [ -z "$expect" ] + then diff --git a/pkgs/development/tools/vala-language-server/default.nix b/pkgs/development/tools/vala-language-server/default.nix index 7a5ab2ae419..1d211e55ad8 100644 --- a/pkgs/development/tools/vala-language-server/default.nix +++ b/pkgs/development/tools/vala-language-server/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "vala-language-server"; - version = "0.48.2"; + version = "0.48.3"; src = fetchFromGitHub { - owner = "benwaffle"; + owner = "Prince781"; repo = pname; rev = version; - sha256 = "sha256-vtb2l4su+zuwGbS9F+Sv0tDInQMH4Uw6GjT+s7fHIio="; + sha256 = "sha256-MhVwK4RtEAJcwcJe71ganCaXQHa9jzxyknzc9kJi274="; }; passthru = { @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Code Intelligence for Vala & Genie"; - homepage = "https://github.com/benwaffle/vala-language-server"; + homepage = "https://github.com/Prince781/vala-language-server"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ andreasfelix ]; platforms = platforms.linux; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 130ff9c9bcb..3c61121b035 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.227"; + version = "0.0.228"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-nql0zK2H0FDQMsnSJSNzC7YmvUZfITHH5p1efFHsj58="; + sha256 = "sha256-h8ZiAabB0IIJoeQMMvOO1lQNMdFYAoTXKcTAPmLP5Sw="; }; preBuild = '' diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 7fad6a020a8..776f84309da 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "12.22.1"; - sha256 = "12drpkffn79xx84pffg9y2cn9fiwycgaa2rjj3ix6visfzvhsrfx"; + version = "12.22.2"; + sha256 = "1p281hdw3y32pnbfr7cdc9igv2yrzqg16pn4yj3g01pi3mbhbn3z"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 27b2a4f3319..6271401a0f4 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -7,7 +7,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.17.1"; - sha256 = "0zr4b9gja8f9611rnmc9yacmh90bd76xv9ayikcyqdfzdpax5wfx"; + version = "14.17.2"; + sha256 = "0gjq61l1lm15bv47w0phil44nbh0fsq3mmqf40xxlm92gswb4psg"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v15.nix b/pkgs/development/web/nodejs/v15.nix deleted file mode 100644 index e6903098b30..00000000000 --- a/pkgs/development/web/nodejs/v15.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ callPackage, icu68, python3, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix { - icu = icu68; - python = python3; - }; -in - buildNodejs { - inherit enableNpm; - version = "15.14.0"; - sha256 = "0vm6jdazqjd1plqsgngzvjrafv2d3mdahk6il4ray02gx97dq8l1"; - } diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 8514baec8b1..305baadecac 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "16.4.0"; - sha256 = "07f8g3hs0v7nsdvzlsr1p4pzgb04qn54pnhmbdsgmmb41cp227pr"; + version = "16.4.1"; + sha256 = "1a1aygksmbafxvrs8g2jv0y1jj3cwyclk0qbqxkn5qfq5r1i943n"; } diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index d975a60c1fd..d91db073ff6 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -13,17 +13,15 @@ let tilesDeps = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf freetype ] ++ optionals stdenv.isDarwin [ Cocoa ]; - installXDGAppLauncher = '' - launcher="$out/share/applications/cataclysm-dda.desktop" - install -D -m 444 data/xdg/*cataclysm-dda.desktop -T "$launcher" - sed -i "$launcher" -e "s,\(Exec=\)\(cataclysm-tiles\),\1$out/bin/\2," - install -D -m 444 data/xdg/cataclysm-dda.svg -t $out/share/icons/hicolor/scalable/apps + patchDesktopFile = '' + substituteInPlace $out/share/applications/org.cataclysmdda.CataclysmDDA.desktop \ + --replace "Exec=cataclysm-tiles" "Exec=$out/bin/cataclysm-tiles" ''; installMacOSAppLauncher = '' app=$out/Applications/Cataclysm.app - install -D -m 444 data/osx/Info.plist -t $app/Contents - install -D -m 444 data/osx/AppIcon.icns -t $app/Contents/Resources + install -D -m 444 build-data/osx/Info.plist -t $app/Contents + install -D -m 444 build-data/osx/AppIcon.icns -t $app/Contents/Resources mkdir $app/Contents/MacOS launcher=$app/Contents/MacOS/Cataclysm.sh cat << EOF > $launcher @@ -58,22 +56,19 @@ stdenv.mkDerivation { ] ++ optionals tiles [ "TILES=1" "SOUND=1" ] ++ optionals stdenv.isDarwin [ - "NATIVE=osx" "CLANG=1" + "NATIVE=osx" + "CLANG=1" + "OSX_MIN=${stdenv.targetPlatform.darwinMinVersion}" ]; postInstall = optionalString tiles ( if !stdenv.isDarwin - then installXDGAppLauncher + then patchDesktopFile else installMacOSAppLauncher ); dontStrip = debug; - # https://hydra.nixos.org/build/65193254 - # src/weather_data.cpp:203:1: fatal error: opening dependency file obj/tiles/weather_data.d: No such file or directory - # make: *** [Makefile:687: obj/tiles/weather_data.o] Error 1 - enableParallelBuilding = false; - passthru = { isTiles = tiles; isCurses = !tiles; diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index b07689c0930..3dc0e944b5e 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -2,9 +2,9 @@ , tiles ? true, Cocoa , debug ? false , useXdgDir ? false -, version ? "2020-12-09" -, rev ? "cb02195d9fb5ba71f35a105be4104c3d8883065c" -, sha256 ? "108cs6vp99qmqqfnmczad0xjgcl82bypm5xszwnlfcswdsrfs4da" +, version ? "2021-07-03" +, rev ? "9017808252e1e149446c8f8bd7a6582ce0f95285" +, sha256 ? "0qrvkbyg098jb9hv69sg5093b1vj8f4n75p73v01jnmyxlz3ax28" }: let diff --git a/pkgs/games/cataclysm-dda/stable.nix b/pkgs/games/cataclysm-dda/stable.nix index d0452090ca6..ba475ac9601 100644 --- a/pkgs/games/cataclysm-dda/stable.nix +++ b/pkgs/games/cataclysm-dda/stable.nix @@ -10,13 +10,13 @@ let }; self = common.overrideAttrs (common: rec { - version = "0.E-3"; + version = "0.F"; src = fetchFromGitHub { owner = "CleverRaven"; repo = "Cataclysm-DDA"; rev = version; - sha256 = "qhHtsm5cM0ct/7qXev0SiLInO2jqs2odxhWndLfRDIE="; + sha256 = "1jid8lcl04y768b3psj1ifhx96lmd6fn1j2wzxhl4ic7ra66p2z3"; }; meta = common.meta // { diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index b9802bd81b5..ea154db121e 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-z+88tVsf4uyMFzNfZDKXo0cYqBCYn1ehX+A+e+aIfSg="; + sha256 = "sha256-fqV2u6vChzU8387aQGf3OKeiWX188GouYZr4ZUmXWxs="; }; buildInputs = [ gettext libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index 1dffd3864de..2457cd1cf96 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -33,14 +33,14 @@ let in env.mkDerivation rec { pname = "katago"; - version = "1.9.0"; + version = "1.9.1"; githash = "b846bddd88fbc5353e4a93fa514f6cbf45358362"; src = fetchFromGitHub { owner = "lightvector"; repo = "katago"; rev = "v${version}"; - sha256 = "sha256-6J1UY05NweXLw8D4kOXG3KkCxJRsrQ9NBYWu2Xzu9JI="; + sha256 = "sha256-sAtPOqGe6fZ9mAtLdp80fTALXVkP9WdWQU2iTFGXe24="; }; fakegit = writeShellScriptBin "git" "echo ${githash}"; diff --git a/pkgs/games/openttd/grfcodec.nix b/pkgs/games/openttd/grfcodec.nix new file mode 100644 index 00000000000..544cf4f06c4 --- /dev/null +++ b/pkgs/games/openttd/grfcodec.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, boost, cmake, git }: + +stdenv.mkDerivation rec { + pname = "openttd-grfcodec"; + version = "unstable-2021-03-10"; + + src = fetchFromGitHub { + owner = "OpenTTD"; + repo = "grfcodec"; + rev = "045774dee7cab1a618a3e0d9b39bff78a12b6efa"; + sha256 = "0b4xnnkqc01d3r834lhkq744ymar6c8iyxk51wc4c7hvz0vp9vmy"; + }; + + buildInputs = [boost]; + nativeBuildInputs = [cmake git]; + + installPhase = '' + mkdir -p $out/bin + cp -a grfcodec grfid grfstrip nforenum $out/bin/ + ''; + + meta = with lib; { + description = "Low-level (dis)assembler and linter for OpenTTD GRF files"; + homepage = "http://openttd.org/"; + license = licenses.gpl2; + maintainers = with maintainers; [ ToxicFrog ]; + }; +} diff --git a/pkgs/games/openttd/nml.nix b/pkgs/games/openttd/nml.nix new file mode 100644 index 00000000000..094330faffb --- /dev/null +++ b/pkgs/games/openttd/nml.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "openttd-nml"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "OpenTTD"; + repo = "nml"; + rev = version; + sha256 = "0kfnkshff3wrxsj1wpfbbw2mmgww2q80v63p5d2pp1f38x8j33w9"; + }; + + propagatedBuildInputs = with python3Packages; [ply pillow]; + + meta = with lib; { + description = "Compiler for OpenTTD NML files"; + homepage = "http://openttdcoop.org/"; + license = licenses.gpl2; + maintainers = with maintainers; [ ToxicFrog ]; + }; +} diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix index 2837f96357a..9d3cdeb02e9 100644 --- a/pkgs/games/scid-vs-pc/default.nix +++ b/pkgs/games/scid-vs-pc/default.nix @@ -42,6 +42,7 @@ tcl.mkTclDerivation rec { dontPatchShebangs = true; + # TODO: can this use tclWrapperArgs? postFixup = '' sed -i -e '1c#!'"$out"'/bin/tcscid' "$out/bin/scidpgn" sed -i -e '1c#!${tk}/bin/wish' "$out/bin/sc_remote" diff --git a/pkgs/games/scid/default.nix b/pkgs/games/scid/default.nix index 43794f6bc25..a1955e9cced 100644 --- a/pkgs/games/scid/default.nix +++ b/pkgs/games/scid/default.nix @@ -31,6 +31,7 @@ tcl.mkTclDerivation { dontPatchShebangs = true; + # TODO: can this use tclWrapperArgs? postFixup = '' for cmd in sc_addmove sc_eco sc_epgn scidpgn \ sc_import sc_spell sc_tree spliteco diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index b09dc523d1a..5aa2408afd1 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -1,6 +1,4 @@ -{ lib, stdenv, fetchurl }: - -with lib; +{ lib, stdenv, fetchurl, fetchFromGitHub }: let # The x86-64-modern may need to be refined further in the future @@ -12,28 +10,29 @@ let if stdenv.isi686 then "x86-32" else if stdenv.isAarch64 then "armv8" else "unknown"; - version = "13"; - nnueFile = "nn-62ef826d1a6d.nnue"; + nnueFile = "nn-3475407dc199.nnue"; nnue = fetchurl { name = nnueFile; url = "https://tests.stockfishchess.org/api/nn/${nnueFile}"; - sha256 = "0qsy9rr4zgxrpgwhwbi96z01a2560am2b00q2klbj4bd39nq5vv2"; + sha256 = "sha256-NHVAfcGZc+pERnZ4Y0zOAj1iDkGXcMERzIk3/maJ7Ic="; }; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "stockfish"; - inherit version; + version = "14"; - src = fetchurl { - url = "https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz"; - sha256 = "0qhxp2w543psanzhzn8jhfafx8aip57v9nsvafbwa5xynchlgl8m"; + src = fetchFromGitHub { + owner = "official-stockfish"; + repo = "Stockfish"; + rev = "sf_${version}"; + sha256 = "sha256-fX0Tr1yqjmNRSxmisFRKUY1E5//qF3zAfJ8innAeyxA="; }; # This addresses a linker issue with Darwin # https://github.com/NixOS/nixpkgs/issues/19098 - preBuild = optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.isDarwin '' sed -i.orig '/^\#\#\# 3.*Link Time Optimization/,/^\#\#\# 3/d' Makefile ''; @@ -48,14 +47,14 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = { + meta = with lib; { homepage = "https://stockfishchess.org/"; description = "Strong open source chess engine"; longDescription = '' Stockfish is one of the strongest chess engines in the world. It is also much stronger than the best human chess grandmasters. ''; - maintainers = with maintainers; [ luispedro peti ]; + maintainers = with maintainers; [ luispedro peti siraben ]; platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux"]; license = licenses.gpl2; }; diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index 5d240a9fe91..703578c2d4e 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { description = "A free 2D physics sandbox game"; homepage = "http://powdertoy.co.uk/"; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ abbradar siraben ]; + mainProgram = "powder"; }; } diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 7f2ad875d8c..feadcc7f8b2 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -39,11 +39,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - sha256 = "1f8a4kflslsjl8jrryhwg034h1yc9y3y1zmllgww3fqkz3aj4xik"; + sha256 = "sha256-HQlphogK2jjTXV7cQ8lFNWjHMBnpStyvT3wKYjlDQW0="; }; buildInputs = [ @@ -84,10 +84,15 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWZ_DISTRIBUTOR=NixOS" # The cmake builder automatically sets CMAKE_INSTALL_BINDIR to an absolute - # path, but this results in an error. - # By resetting it, we let the CMakeLists set it to an accepted value - # based on prefix. - "-DCMAKE_INSTALL_BINDIR=" + # path, but this results in an error: + # + # > An absolute CMAKE_INSTALL_BINDIR path cannot be used if the following + # > are not also absolute paths: WZ_DATADIR + # + # WZ_DATADIR is based on CMAKE_INSTALL_DATAROOTDIR, so we set that. + # + # Alternatively, we could have set CMAKE_INSTALL_BINDIR to "bin". + "-DCMAKE_INSTALL_DATAROOTDIR=${placeholder "out"}/share" ]; postInstall = lib.optionalString withVideos '' diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix index f6504b598cb..1f0f7ab6e91 100644 --- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix @@ -41,6 +41,7 @@ in stdenv.mkDerivation { ./patches/cnijfilter-4.00-4-ppd.patch ./patches/cnijfilter-4.00-5-abi_x86_32.patch ./patches/cnijfilter-4.00-6-headers.patch + ./patches/cnijfilter-4.00-7-sysctl.patch ]; postPatch = '' diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch b/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch new file mode 100644 index 00000000000..a28ca208492 --- /dev/null +++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch @@ -0,0 +1,10 @@ +--- a/cnijnpr/src/cnijnpr.c ++++ b/cnijnpr/src/cnijnpr.c +@@ -33,7 +33,6 @@ + #include <signal.h> + #include <sys/ioctl.h> + #include <net/if.h> +-#include <sys/sysctl.h> + #include <sys/types.h> + #include <unistd.h> + #include <config.h> diff --git a/pkgs/misc/lightspark/default.nix b/pkgs/misc/lightspark/default.nix index 0e99767a2cb..a00e784df09 100644 --- a/pkgs/misc/lightspark/default.nix +++ b/pkgs/misc/lightspark/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "lightspark"; - version = "0.8.4.1"; + version = "0.8.5"; src = fetchFromGitHub { owner = "lightspark"; repo = "lightspark"; rev = version; - sha256 = "sha256-pIiv5wEDLvTHjlYSicXUTTI6pVAsO6FC39Gie9Z/hZ4="; + sha256 = "sha256-F+zCwKTPWkp+VWYvYN5+VbBJeQAwspKy7+Uv+ZstowA="; }; postPatch = '' diff --git a/pkgs/misc/pylode/default.nix b/pkgs/misc/pylode/default.nix index fb908151765..33e78bc1523 100644 --- a/pkgs/misc/pylode/default.nix +++ b/pkgs/misc/pylode/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - dateutil + python-dateutil falcon gunicorn isodate diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 15a129246e1..cc6d0ced6d1 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "8.0.1"; + version = "8.0.3"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; - rev = "d34499a2aafa024623a4210fe7f663cef13fe9a6"; - sha256 = "VKoGr3CTDFg3Q0X+MTlwa4BbfLB+28FeTyTJRCq37RA="; + rev = "v${version}"; + sha256 = "QflLh3fj+jOq/8etr9aG8LGrvtIlB/htVkWbdO+GIbM="; }; nativeBuildInputs = [ diff --git a/pkgs/misc/vim-plugins/aliases.nix b/pkgs/misc/vim-plugins/aliases.nix index 4e08e5fe05e..67607fe4562 100644 --- a/pkgs/misc/vim-plugins/aliases.nix +++ b/pkgs/misc/vim-plugins/aliases.nix @@ -82,6 +82,7 @@ mapAliases (with prev; { hlint-refactor = hlint-refactor-vim; hoogle = vim-hoogle; Hoogle = vim-hoogle; + indent-blankline-nvim-lua = indent-blankline-nvim; # backwards compat, added 2021-07-05 ipython = vim-ipython; latex-live-preview = vim-latex-live-preview; maktaba = vim-maktaba; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index ea9aaae53ed..a6382093458 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-06-29"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "7862633d9d0e35157d54ad1487bd5a73c618fc7f"; - sha256 = "0m7hh7h4jxfw9j5fq00a11qaz8khyrxcn4ka81qn73wzg28hdv11"; + rev = "958f30c1635ffc7cd47b929b382a791a9d0db37b"; + sha256 = "1pbjqg8jn7nw3kn54mjfbm2bidwll1blay9aq70wpzcqvizn8fa0"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -413,12 +413,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-07-01"; + version = "2021-07-06"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "d66a7ec580c5e006bf44c5ffc0c17e39897b0c22"; - sha256 = "0an89qwx70gj3dzlmx9j61vmsqfzsh9p4jhqysrg1n6hx56ak7yj"; + rev = "7d1bae413ad45099d7b93592e738b47f7f50b4f2"; + sha256 = "1dyi2wxl8k875lapwgmxymhg9jyfqnilp2kiyfqs9h45dmfpmxwk"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -666,24 +666,24 @@ final: prev: compe-tabnine = buildVimPluginFrom2Nix { pname = "compe-tabnine"; - version = "2021-05-09"; + version = "2021-07-04"; src = fetchFromGitHub { owner = "tzachar"; repo = "compe-tabnine"; - rev = "755e45c97d29d73400f8fba591ff06054d37127a"; - sha256 = "0gsq2v0qpzw211fmss3c004pmqcfns9vy4fhki9a0c69zk1ggalp"; + rev = "b8326e2acf3056e674925a360dedc33510285f0c"; + sha256 = "00baf8nmldvd08nsj851bdai6jywpjhg1z1hhcxn7zagj0rl6rs0"; }; meta.homepage = "https://github.com/tzachar/compe-tabnine/"; }; compe-tmux = buildVimPluginFrom2Nix { pname = "compe-tmux"; - version = "2021-05-31"; + version = "2021-07-04"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "compe-tmux"; - rev = "b199db008d07caf7f1d488ac3f171910416528a4"; - sha256 = "1qiir95bz046ppp6pp8k6m00jrjcy2yp098s72lwfnsls6pqsgpf"; + rev = "2d891bcece6676a4485b248ec9ee05c9acc76190"; + sha256 = "11ghs6qgx8qwk4ms4f5y1n4clial0xv1q03wsfk8z20w35bm1kg8"; }; meta.homepage = "https://github.com/andersevenrud/compe-tmux/"; }; @@ -714,12 +714,12 @@ final: prev: completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2021-06-16"; + version = "2021-07-03"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "d62fff879b29fa1ce915887a75305af0fff57d32"; - sha256 = "0hfsz06djyja8phj099fmbg2sa9jj89rqxvizwhwdxadshmr1f20"; + rev = "22624f0aa5d1fdd0c84456300d2390b223c1a226"; + sha256 = "133zmiblkh145abrv9xagzq3qw504g1nvm5v1vmxhxsa7rilr376"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; @@ -1026,12 +1026,12 @@ final: prev: deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2021-06-24"; + version = "2021-07-04"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "8e535d2c19b5307196de736ff9ceadcfe2de9a96"; - sha256 = "09xfikgrj4krlqnf6j26yhaiiv7im0sm4h0q049m927sh248kxh7"; + rev = "d95fde4d1e042a99f39ddb8c67875fb10d1ed1e8"; + sha256 = "1wg1z85f816k60201hxrrdi4if9ci86cbg776k15pqdmcpzi0ibz"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1304,12 +1304,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview-nvim"; - version = "2021-06-28"; + version = "2021-07-04"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "451fdee6e4c0f32ccfde89081bc73bacf0ee05a0"; - sha256 = "0zpkqdg1cd5a9lr0cqwf50x3jx55dkkbdv0sijfighrx9fxs7ixl"; + rev = "1936824f5986c986befad5995e7bf87ba124d109"; + sha256 = "16h82yn7g9jq2chdb4wjjvz6akb0r06wjjvqpj9xkp82rx55m4ix"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -1510,12 +1510,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern-vim"; - version = "2021-05-23"; + version = "2021-07-03"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "5fe781e4a12101871bc778b977ce6b76685c1ab0"; - sha256 = "1220sclgczaqww0d2zdgr0lfpjwrrjyscjn2j40k8h4j1axah9zi"; + rev = "1b234d8ec0ffadf7fe3f4ddba13480dd4adeb7c7"; + sha256 = "1prl720r82mp89jfciw50pd2cygp97v46w7vq30b1m4v3016lh15"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -1544,6 +1544,18 @@ final: prev: meta.homepage = "https://github.com/bogado/file-line/"; }; + FixCursorHold-nvim = buildVimPluginFrom2Nix { + pname = "FixCursorHold-nvim"; + version = "2021-04-16"; + src = fetchFromGitHub { + owner = "antoinemadec"; + repo = "FixCursorHold.nvim"; + rev = "b5158c93563ee6192ce8d903bfef839393bfeccd"; + sha256 = "1y6hv7vl268zbf3bzd72l43jjgi0cq364p15z8ia9jlph1syk9zz"; + }; + meta.homepage = "https://github.com/antoinemadec/FixCursorHold.nvim/"; + }; + flake8-vim = buildVimPluginFrom2Nix { pname = "flake8-vim"; version = "2020-10-20"; @@ -1595,12 +1607,12 @@ final: prev: formatter-nvim = buildVimPluginFrom2Nix { pname = "formatter-nvim"; - version = "2021-06-07"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "fc5757d6c9099125edba64b86cb5c9afac9b833b"; - sha256 = "170lcd7qwzckxib98clld0hgydkjvrr86md3b035q7higgad386m"; + rev = "9866548f1c543ba90d7bb8a62c4fa939a5dcba46"; + sha256 = "04289wv1zw7r30x7whzf2s9gis7g3a7l8wswsxiwf55zvrqr95j7"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -1727,12 +1739,12 @@ final: prev: ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2021-05-16"; + version = "2021-07-03"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "dec6adb151cc5514f8ea99b8568e7a4c94db6318"; - sha256 = "14k0crk6lvj6qp1rpfmldmw5w9axy7336aacpvfsh7d4a93xdjzv"; + rev = "a1a83a3385e0d67c9875492aaa9cbbab2322dbdc"; + sha256 = "0agsajz53409zvzpwbw24cfny027ymlw32jrakqdizmgrl46zm45"; }; meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; @@ -1811,12 +1823,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-06-26"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "521e9357bdbd2cadf4863d5c67f2e816182bdecf"; - sha256 = "1cd11gvbw2rs5vg6n5w7g22n8c46prsfd906ycld30zq5sm85fg5"; + rev = "42c87b9ab34e0fd68fcc669137cd7b351e09a89f"; + sha256 = "11f5hpzm0xdj2b5lfp65i5p6xbalkazpfxr4kir16v5n8q93azng"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -1847,12 +1859,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow-nvim"; - version = "2021-05-29"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "npxbr"; repo = "glow.nvim"; - rev = "d7f5eb0af3f2a51c2f493fec066015dc29184a4e"; - sha256 = "1180g55d6adj9jzx9dxld3345hw80vjjj3r8n7snba1m3c8jd5xm"; + rev = "c5cf6ca75af09046ea3ff51132732271a6e2dd6c"; + sha256 = "187zm6vj8xbxs5flbqwjzzsv7vq7c6mw55phihd610bmn1wbxfnd"; }; meta.homepage = "https://github.com/npxbr/glow.nvim/"; }; @@ -1931,12 +1943,12 @@ final: prev: gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox-nvim"; - version = "2021-06-07"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "npxbr"; repo = "gruvbox.nvim"; - rev = "2dc25bb14fbd69f888dd0615c5576dd730de869a"; - sha256 = "1i87f7vfgk1szy18cg7nng2yqvcny4v1wnh4dbw74lcqmmazgi7y"; + rev = "ac0948e28203cba5d0510cf3443906228645e3eb"; + sha256 = "0g9j2gqsgx7la96xhc72l7rb535phqjpb5mva191wjfn13j0hkda"; }; meta.homepage = "https://github.com/npxbr/gruvbox.nvim/"; }; @@ -2145,26 +2157,14 @@ final: prev: meta.homepage = "https://github.com/haya14busa/incsearch.vim/"; }; - indent-blankline-nvim-lua = buildVimPluginFrom2Nix { - pname = "indent-blankline-nvim-lua"; - version = "2021-06-23"; - src = fetchFromGitHub { - owner = "lukas-reineke"; - repo = "indent-blankline.nvim"; - rev = "f314659a68f936bf65502fe318222facbeb439a5"; - sha256 = "0mzkkacdcbxdvaxjfwyiphlwa1z7f5809y03mhyl7656lan8vk90"; - }; - meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; - }; - indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline-nvim"; - version = "2021-06-10"; + version = "2021-07-03"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "5d5d2f80ec48e3f5fe7237ec17cd1587f39d3be7"; - sha256 = "005nv99jw9ricgy1xyxixl1ssyh7jai9kv7cx95g5igfvvpblz7k"; + rev = "17a83ea765831cb0cc64f768b8c3f43479b90bbe"; + sha256 = "155da638i4ff1wsy5600jgrqicykb27lxq9liag174nga6xazbn6"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2328,12 +2328,12 @@ final: prev: kotlin-vim = buildVimPluginFrom2Nix { pname = "kotlin-vim"; - version = "2021-04-20"; + version = "2021-07-03"; src = fetchFromGitHub { owner = "udalov"; repo = "kotlin-vim"; - rev = "e043f6a2ddcb0611e4afcb1871260a520e475c74"; - sha256 = "0ygvicf8gcaskz33qkfl1yg1jiv0l9cyp8fn2rrnzdsb7amsss0v"; + rev = "9122b2805499fbde06f27116f4b7a2a30d6996f5"; + sha256 = "0xq156vqzwix87ndq8nfwqmvwp251fnp553zxjlqhccbbyr70pky"; }; meta.homepage = "https://github.com/udalov/kotlin-vim/"; }; @@ -2412,12 +2412,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-06-24"; + version = "2021-07-03"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "3899965851a0b3e59998f2b42e716eeee6bcc473"; - sha256 = "1w89nlkl35yzadbnhxv0c7qcwzynhvv1kqhvwpbj5h4x2gnb9x33"; + rev = "64a941e317fb9a432d8924eb3a124627c71c0d18"; + sha256 = "10d6fr2kasm13js7k85a9mm6q7ga6b3h6z9mys6wwaphzsm7vli1"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -2556,12 +2556,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed-nvim"; - version = "2021-06-29"; + version = "2021-07-02"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "b93922421bd41e8349cf46640b5742feb5e0031a"; - sha256 = "1sb0z6nrq9nmrqlv6p6xvk1plndc347s3ydsgq6n6p8c2xgfb1ch"; + rev = "14ec41e3348d23c88235f038c7395a750e765e9d"; + sha256 = "03chwwbwq7zgj899rl7827wqfx9ynyz0i1dhyqn1sk1mrddpr4mz"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -2628,12 +2628,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature-nvim"; - version = "2021-06-29"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "ef20fad69270f4d3df356be3c01bd079739e72c4"; - sha256 = "0whmqkz6k27hrsjmbw841bsdg8xkiv8gj01sw40cg99mcdyags70"; + rev = "e2f781f8dfebf6b21929dd8b326474a828e3f08b"; + sha256 = "15p5k2kki4pp4hg8284f8hji1b406whhpxr0dws0lx5qc4vqwhwr"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -2676,12 +2676,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-06-30"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "b94accc40260be439b6bfa120402ebd10bd60577"; - sha256 = "19lz2l9dzq5a339rhp8xdzj1m0dxxnwm9w4kg4lizgxi1ck53dpq"; + rev = "8b9b689c247f236ad55153582342ecc788444f51"; + sha256 = "1v24r0kqsqzd111c6ih5s2q0ckz56whqwpsq19awk3sqkvba17w3"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -2784,12 +2784,12 @@ final: prev: mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2021-05-28"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "e129e3c7d92477563aeb068628ee0ccdd46ed36e"; - sha256 = "0q0cyigkszw0qsdvg9dxs293sf8hbmwwy6qxlknmrfiy5xyn6ik5"; + rev = "439c518cea989c875eea44ce54a36f7e7dc561d9"; + sha256 = "19b155lfiynm450cr9acm7dk58hh2ynrs3zpvrcll7slz8fgrhql"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -3096,12 +3096,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-06-27"; + version = "2021-07-03"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "3b5fa08467a77c289027bbc01ce8f8341f8d911c"; - sha256 = "1q1dz06msbw68wf7vs482y77nlmbz797hsdpqimfh65liz6bjh77"; + rev = "c91d18fa8743860d4fe547faef4a3671d428b422"; + sha256 = "16bjicmy9m10cq6gsxlzdsib5qwjj6w1k27wrr07zb01finhj658"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3144,12 +3144,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2021-07-01"; + version = "2021-07-03"; src = fetchFromGitHub { owner = "vhyrro"; repo = "neorg"; - rev = "7fe4530c9a71f81444ad9fee9d89c5e2f5bfbf8d"; - sha256 = "1zyi32x8wfz3lqb2nqggrjlp8d0j4qpnkck4pfg15fgmkycrivf7"; + rev = "d8aea4d54a0af773142c9be8a30944ae8e49b055"; + sha256 = "1x2q4lhckb8ynzm9s25y877vvi691bw9sdd6764yqgdcznpdlma1"; }; meta.homepage = "https://github.com/vhyrro/neorg/"; }; @@ -3204,12 +3204,12 @@ final: prev: neovim-fuzzy = buildVimPluginFrom2Nix { pname = "neovim-fuzzy"; - version = "2021-06-17"; + version = "2021-07-02"; src = fetchFromGitHub { owner = "cloudhead"; repo = "neovim-fuzzy"; - rev = "0a65732a4a346384cb828a42014d2833dc301b99"; - sha256 = "133l6qyzsddmcwxmphbv49a3b0ksnmrbrf6lwacyld5id663yjkj"; + rev = "0bef4e1a81c65fc05d31380dd74454bd67733837"; + sha256 = "02a8ipk341bs6y8mk7nixdkbk1c4jdddsjp1qvqgyyca0shaqsz8"; }; meta.homepage = "https://github.com/cloudhead/neovim-fuzzy/"; }; @@ -3372,12 +3372,12 @@ final: prev: nvcode-color-schemes-vim = buildVimPluginFrom2Nix { pname = "nvcode-color-schemes-vim"; - version = "2021-06-26"; + version = "2021-07-03"; src = fetchFromGitHub { owner = "ChristianChiarulli"; repo = "nvcode-color-schemes.vim"; - rev = "cb3682a8eaf25485efe0b377f0b9e8291f68ab59"; - sha256 = "0n08mkxf4m0sz07wd893s63l17v3kvvgx5aj62nf5p7paw1zv91c"; + rev = "3a0e624a67ecd2c7f990bc3c25a1044e85782b10"; + sha256 = "03ifj5a3f02k00jrcjsdiy7a8wzq5k2b28hmrc7nkzm8gd4fmczb"; }; meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; @@ -3420,24 +3420,36 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2021-06-21"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "6bfc90ca36dbe602ba0696eb6569803d44f437f9"; - sha256 = "16c976gxs7lwxb8xs9iqcizmfznlilwrsaz7v32csfn38i4j77hr"; + rev = "27641367360d64e67ea8f4d47e950a24c71a99e8"; + sha256 = "0yjmf651gdyi6ngpbb7y8bjf43snv8di54yldfm6l7xgawrwn3nn"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; + nvim-bufdel = buildVimPluginFrom2Nix { + pname = "nvim-bufdel"; + version = "2021-05-21"; + src = fetchFromGitHub { + owner = "ojroques"; + repo = "nvim-bufdel"; + rev = "9a1f0f3ed55db86f66ad87f72639269ac1374169"; + sha256 = "0f10pik2msm7rdi9lx9ll7jgh1gk9y3q8756ri6jdzk4bwd8j4is"; + }; + meta.homepage = "https://github.com/ojroques/nvim-bufdel/"; + }; + nvim-bufferline-lua = buildVimPluginFrom2Nix { pname = "nvim-bufferline-lua"; - version = "2021-06-29"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-bufferline.lua"; - rev = "165114f65c267ee912018ef3565d70cba7183fc3"; - sha256 = "07km6dn0mc60zzqbyymxmzgy2wjrw6q2a8lmzc55iqyflfhza8qn"; + rev = "d66f0e45243a46fc3fd0d84ed7d54e37882207ba"; + sha256 = "0rwihzz2lcyza86bgmmvny685g1nlz23yagz5agdqjzibqz973xf"; }; meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; }; @@ -3468,12 +3480,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-07-01"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "a46dfe7d7fc8f7af5bb84006db45ba11fb7b786c"; - sha256 = "161zrqvw5kpcphn747cpa4388x4c2flps5qwxkl5yxkn320937im"; + rev = "00ebf180d01f7f020c6c19bd8caed59f722ccc04"; + sha256 = "1qasn6qx4qna0p364b2kbyrd3bdw7zkzys0d2x9rgc5pn7jx80f0"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3492,12 +3504,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-06-25"; + version = "2021-07-04"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "e92ef2acc81b668c90b2dbf2e2a4412ea5975242"; - sha256 = "0y27kaspmygv0lgvp6msyazhya7indqlii0rsxiahmp5sdg85qap"; + rev = "6767b438023d63a42149ad5a79960504c9c67bd7"; + sha256 = "14backs66fmfznrl86dxpvq7ipcawdql2ky30k9kisllpgzccaw6"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -3540,12 +3552,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-06-29"; + version = "2021-07-04"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "20ff07b00545daad1c3e90c6484d838b43cf3660"; - sha256 = "1pb8v2yzrljqmgjhqzhv03zvdqwbqqyly6vkfdscbq7ra9afiw2j"; + rev = "b1b6ff6b78dac7c00b70404892e0eabdacb7b223"; + sha256 = "13icfnas86iki1x2xd2xcdh7ycp3if49zgnwpyx03djgi7ljkgjk"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -3576,12 +3588,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-06-29"; + version = "2021-07-02"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "018b013d5ee873dfaa9fa2d487d166c5f6dd3aee"; - sha256 = "0liwxdfalm85i2ck9hx5pj4ih58ypil8fw3ricrc6r7czfv6gfmf"; + rev = "846187eef85e39997c7b9f101e5169c5b57ec4a8"; + sha256 = "183szh75a3ix715i1hjr7pbcxw6l75l476snjda17ia68fg6zj6r"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -3600,12 +3612,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-06-30"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "161ec66bda585fd7ba402cf7434bac87c927734f"; - sha256 = "1d4qwxrkx9cbbrxddg2n9f7sszmp23jnx83g52yydsxhlxq8dj8l"; + rev = "4e8a6bb35f80e5e37c14b92b5db9abaf2dc6605f"; + sha256 = "1zz0jf3cv7v1v3ixklld6ls4fcj05d8yy7ww20s85nqvalv5l66r"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3624,24 +3636,24 @@ final: prev: nvim-nonicons = buildVimPluginFrom2Nix { pname = "nvim-nonicons"; - version = "2021-05-10"; + version = "2021-07-03"; src = fetchFromGitHub { owner = "yamatsum"; repo = "nvim-nonicons"; - rev = "5056aebb8d0ecc87b26a4f7fe9e9e520e5ea493f"; - sha256 = "0z1j18hb5n3500b6sxm1dsya9yd9jnnywhhw9z3sbndb3irn2mny"; + rev = "93450b02533516231e16ddc71f8ab1caf5005eaa"; + sha256 = "1mfvi3mzid0fwhgwrg8w4bjy0x6hz78jij60h0ivblvlfai6w0qr"; }; meta.homepage = "https://github.com/yamatsum/nvim-nonicons/"; }; nvim-peekup = buildVimPluginFrom2Nix { pname = "nvim-peekup"; - version = "2021-04-04"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "nvim-peekup"; - rev = "2f03df68bced26399b7576818b3cded3ce334ca0"; - sha256 = "1bap28b9jbaywll50mwjfp91i0h671762ylgy3fxhnayf78py00d"; + rev = "e8ad8c7160e1f8ed2a7e4e071110b8b18866b463"; + sha256 = "1kjvz2hv05a2id72xi28n1iq7cclcvy3ql74h8f0vcpn10zqvfxx"; }; meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/"; }; @@ -3672,36 +3684,36 @@ final: prev: nvim-toggleterm-lua = buildVimPluginFrom2Nix { pname = "nvim-toggleterm-lua"; - version = "2021-06-26"; + version = "2021-07-04"; src = fetchFromGitHub { owner = "akinsho"; repo = "nvim-toggleterm.lua"; - rev = "f8cf9ec7592e8b8c19a56f5985cec108e18c3101"; - sha256 = "13ayc57q7r3bns0y6qqqhsi2rr1kqi0bxzdw4qz3my4nj3npqk9h"; + rev = "fbf502a997db9bb97765cf5e69bd8749110e9139"; + sha256 = "14w9xn2ns8zpsyiydqyia34dcdgvk1lhzvbvwriprrp0bhgzmq57"; }; meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; }; nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-07-01"; + version = "2021-07-02"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "a01a33f9a8aea3eb19eb76601131c01e23d8e034"; - sha256 = "1jsf6prmf1555kd87gfjdiydkvl15qk0lk6x04dwbrx6wxfvd77a"; + rev = "589c36e26f99486e7ab5e2e6920636ffd5f3ae2a"; + sha256 = "0s5ha981igqkmp13xzxy1rj4cw687qxs5301byx9vjl2n5gkyb6j"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-07-01"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "5fa8d5741dca82a15426db659f461244975678e6"; - sha256 = "1xqq1m27w3vh1dd9g3k4kwva92hr8zf1xnlvqhy2jz1xazx4k2m1"; + rev = "53d92f65bddf6623000b81ca5beae5ee3a6a736e"; + sha256 = "18irdbpwqpp6xjmqk7bjlvd8k2mzyg77xgw5k4y2y5vcjg8jazfq"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3732,24 +3744,24 @@ final: prev: nvim-treesitter-refactor = buildVimPluginFrom2Nix { pname = "nvim-treesitter-refactor"; - version = "2021-05-03"; + version = "2021-07-04"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-refactor"; - rev = "1a377fafa30920fa974e68da230161af36bf56fb"; - sha256 = "06vww83i73f4gyp3x0007qqdk06dd2i9v1v9dk12ky9d8r0pmxl6"; + rev = "505e58a8b04596a073b326157490706ee63c3b81"; + sha256 = "0z42rpnig6iq73d3mjfgadvqa03k02f4c89j5dp9dhpnrjja8nha"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/"; }; nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2021-06-28"; + version = "2021-07-04"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "63a6d3c85d6625f90093808d15c72c378f5fc2d5"; - sha256 = "15l9624ggvbxrm4cr97p9hhsjpdli1iqkm32ffvvfhaa1kzv9lfd"; + rev = "bebb977b80d7d6253e82804e05b1105a57382d12"; + sha256 = "0ckszh3157jbzhqzyfa5gb6sixi7b66w3z3hjvl39z66dk9lf9l6"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -3900,12 +3912,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-06-28"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "78a42c3bc7b153a621b5f9d35623db88d6d0d0ee"; - sha256 = "0awmwcj3a27m81180k52i5gvvbf6r115qkbfskpxbvrsc8h5qqx5"; + rev = "5f7ce98b4c81dd8d4b727adc86f83b2339befd55"; + sha256 = "1aphdri6hb9jamwjdkjybv0r3xbdr673jd4sibzj591r2ai6kzja"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -3996,24 +4008,24 @@ final: prev: playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2021-05-28"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "1e02dece0daa4bef6a24c7a8b6edd48169885b18"; - sha256 = "182nkdzcviz3ap3vphcks4gzw99d4jsmxxlkmb42m0gzd54k1hwq"; + rev = "6e0037c974d17b2883e3f0f38bb3cb6b1daa5feb"; + sha256 = "0rsdk3ib2sxg6k4k33mcbfrqh7m612jzynzwx3kzh2rmrh1n7i31"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-06-30"; + version = "2021-07-02"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "18da6621459032aa5608b760622f0bc8fdc0535c"; - sha256 = "1z1n3jpxmz3672f8bd6s898mlqjf17pv11qqy15l2npfd9crh5sv"; + rev = "ca51b6842cd8021f58dc45c89b3e8d7994e0bf8f"; + sha256 = "071gdhrrbrhdmagai3q8c4yzc9kn794aa7kkacnknkm5kzswb8hg"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -4249,12 +4261,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers-nvim"; - version = "2021-07-01"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "fd21f094a460bb319a8f6eac18653a1a2122d41c"; - sha256 = "0y5qga2x767blzbrlbfxidz73fpby81xpsw133wmfy3hnkg8xdam"; + rev = "2208bcd4e73fd3b321ac52ce498ab679b8c959ab"; + sha256 = "0qqskn8sg9jcpg9wvch0j8d28qjkz084hcc7hl7f1lfc70ksvc7h"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -4550,12 +4562,12 @@ final: prev: snap = buildVimPluginFrom2Nix { pname = "snap"; - version = "2021-06-28"; + version = "2021-07-04"; src = fetchFromGitHub { owner = "camspiers"; repo = "snap"; - rev = "1fbd674dc53401fd643a2bb8bf07dd3e7125d430"; - sha256 = "0lwhl74yfzd34fv241i9ra6w72qhf1jxf6fkyl1h0c427sz09mmj"; + rev = "4ed8f920f437138b7da38d5ad9003a1e2ca2ddb3"; + sha256 = "15cxx8yz522kb8wdgcs95irqy7hlfniipzyxyd16hg69wycl64gx"; }; meta.homepage = "https://github.com/camspiers/snap/"; }; @@ -4984,12 +4996,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-07-01"; + version = "2021-07-03"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "5a53ec5c2fdab10ca8775d3979b1a85e63d57953"; - sha256 = "1mr98irwsc5pmj63ssxd3cdwb3x31lalbkk1pyp79bswdfjmx0nl"; + rev = "38907ce7d74f26d123bfbb8ecf55bc9616b5ece5"; + sha256 = "1dhjpcc6y6vxrlx9333hnjb6w20zmgs536s4kz6yzvn3w9mgk1kq"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5080,12 +5092,12 @@ final: prev: todo-comments-nvim = buildVimPluginFrom2Nix { pname = "todo-comments-nvim"; - version = "2021-06-28"; + version = "2021-07-04"; src = fetchFromGitHub { owner = "folke"; repo = "todo-comments.nvim"; - rev = "12758792a0d207b5a4a4fb5a11a0d321a4608108"; - sha256 = "1w4z3x1d36cf0zjlz5kshvf5d5lz126rhcl55p2qd4ibrcfw8cwg"; + rev = "d5f9bfc164c7ea306710d1a0a9d2db255387b1db"; + sha256 = "1rrfbdhkgmnyxfk3fjmkk7f5sjdq9mrcw346lrjldgfih5qbaycj"; }; meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; @@ -5837,12 +5849,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-07-01"; + version = "2021-07-06"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "4402c9292c4495916b075e27dac88ad391c47ceb"; - sha256 = "0hwap5z5727iq42zpl769m1w84qr41xgbg7rfjbk94qb3kkikb4m"; + rev = "7b4d7f9f140bbb0860b37d23a16d6bb20797c06a"; + sha256 = "04vws8szlynv0s35xs3w98li89wd48ps6hlssscmk59dmdmjg1m4"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -6197,12 +6209,12 @@ final: prev: vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2020-09-07"; + version = "2021-07-03"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "9c0dc32af9235d42715751b30cf04fa0584c1798"; - sha256 = "1xl655mnhjn1mbqzvxblsbqyg3yq50ri2a7szvqmpywq8rr0ymq9"; + rev = "ff3f5cdff71d7a9710a012f2ff11e1294f70c7a5"; + sha256 = "0hxbwwml7qsjyjc88bmsl6ikc4bhpz17xh8qql9jsi3mkna66krh"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -6377,24 +6389,24 @@ final: prev: vim-erlang-compiler = buildVimPluginFrom2Nix { pname = "vim-erlang-compiler"; - version = "2021-01-16"; + version = "2021-06-20"; src = fetchFromGitHub { owner = "vim-erlang"; repo = "vim-erlang-compiler"; - rev = "a99e75f792650c8dae86d9a44c7af2411ea2ead7"; - sha256 = "13400kjf90sxlpx1pqs379ihdn65i3gpck3dwkjnf1xiv1p9rzvz"; + rev = "b334e956026f61c0bf289ffdf37ce9b2aefe01e1"; + sha256 = "1lhy5kdq3chr1zd0f67nfzmd81jiiw4hif11rx7pkwh019wyalxx"; }; meta.homepage = "https://github.com/vim-erlang/vim-erlang-compiler/"; }; vim-erlang-omnicomplete = buildVimPluginFrom2Nix { pname = "vim-erlang-omnicomplete"; - version = "2021-01-16"; + version = "2021-07-03"; src = fetchFromGitHub { owner = "vim-erlang"; repo = "vim-erlang-omnicomplete"; - rev = "924a50ed0ad93141063d0f27c9f62b1bea991baf"; - sha256 = "0zh730wsb0n9nk1x5qdbx78zgzhamd2a6fa5gxl4milvr5ddvdy9"; + rev = "7337df845b90b51f24087716564789c70ae03dc3"; + sha256 = "00k7vr5x32qqhgp61fhbcbd2rfjs42lpig3k5jd6008hhpm2gw4j"; }; meta.homepage = "https://github.com/vim-erlang/vim-erlang-omnicomplete/"; }; @@ -6545,12 +6557,12 @@ final: prev: vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-06-26"; + version = "2021-07-03"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "cb6ea20165aeb437d1bf16ca45275748b836c1ce"; - sha256 = "1kv309fyf56vp0lglm8b93m4jk5yb8w0bm9gjr9wql4p32nlxkc1"; + rev = "729f932a31c5cfa7dd43d25d1adfcf50feee2cc2"; + sha256 = "1x4azjsc53191ylijagxpiidad0cgiaxyq7bpg1nx94yg8vcnp3y"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -6605,12 +6617,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-06-19"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "79e2bd381ad6e7f3d70ce4a8ec9f3f107b40f053"; - sha256 = "0blgivpm1zbbm1pj77c1ks1w3aa9vid77h08146npa4xi6nnyzwf"; + rev = "b498607aa79cc7099d02c30ae72812c245cc7091"; + sha256 = "1g20y3p5f99w20fkf2bfsliy9p5isml04ybxf8mmgzivcy1wpbrj"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -6653,12 +6665,12 @@ final: prev: vim-git = buildVimPluginFrom2Nix { pname = "vim-git"; - version = "2021-05-26"; + version = "2021-07-02"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-git"; - rev = "314fa6f289cec56d7d6e631f71b6d987832f0af4"; - sha256 = "0ar095jxrnfcfbg5gzwb82mz93hpwsdsclzam80424m0iapgl4li"; + rev = "71eba9bbba9c00337dbd132cbc12b1952daf0d29"; + sha256 = "161a546b7gx22j42djxbxirs34pis0kgwz71glqqj6zr32rzapfm"; }; meta.homepage = "https://github.com/tpope/vim-git/"; }; @@ -7255,12 +7267,12 @@ final: prev: vim-kitty-navigator = buildVimPluginFrom2Nix { pname = "vim-kitty-navigator"; - version = "2021-04-28"; + version = "2021-07-02"; src = fetchFromGitHub { owner = "knubie"; repo = "vim-kitty-navigator"; - rev = "50b87c4287c791addc7364dfa377605d0837d326"; - sha256 = "0z3hmgflpiv0czdrkvpc845ms7bjy9rs2a6mp7gyzlqyqrjvqzzy"; + rev = "dedbd5358a5b3b519f1f2c9c032ea6e4ff41d6b4"; + sha256 = "01jgblg1qfq9149fab5kcaa3q5fa7d8psxvgs8gkbs109nxkrjc4"; }; meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; @@ -7532,12 +7544,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-06-17"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "4cd3736a6869ab0b0a4b739dbde11f1f6129beea"; - sha256 = "1i863kl9n2cwkdidn8gajm5n2hv0mfqir4xycva54fw28mads8ds"; + rev = "05f4962c64c5dcd720b8cf5f7af777de33f2fa43"; + sha256 = "10nfiban4ihsix2zf4qp38mcdmlz3zb6n01n5wkgz9yga28y9jxm"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -8576,12 +8588,12 @@ final: prev: vim-sneak = buildVimPluginFrom2Nix { pname = "vim-sneak"; - version = "2020-09-01"; + version = "2021-07-03"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "65e5e4668371152c6ef7a6269c6a6b960cef21b4"; - sha256 = "0bfibshqqa17n9vbdd2g8kalnc78v1ag3hzws9pdacrcsxhsh0ry"; + rev = "51c21ee1ffeea132104da619c9643e61e337e427"; + sha256 = "1da9b5c15sm8cacfwkggg7kl61vxk94qsamanaaz776xlsj0b9z0"; }; meta.homepage = "https://github.com/justinmk/vim-sneak/"; }; @@ -8684,12 +8696,12 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2021-06-28"; + version = "2021-07-04"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "3b8fcc0b21fd28eaabb5feac786462926e5a5069"; - sha256 = "19aj7d24qwkpyfgk8adrr5nz30inblsrhm56vp6l3phai1c7rbn2"; + rev = "d4cc839f4a7c8fc0b7fbf8ec6a11ef1c1be846e1"; + sha256 = "05yz4cpxx7n6ggkm8n9s0q387syllbn8s8vn4fwchnml4jdqigfq"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -8816,12 +8828,12 @@ final: prev: vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2021-06-09"; + version = "2021-07-02"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "814a21db89f742c3ea492c69c5a2bfecded1aeb3"; - sha256 = "0acdq2m16mhm3g6n4saqf9fljz5qfdalw88h126z2f6mm731y6pi"; + rev = "37590260914178e04b46d1248e444e718da519c6"; + sha256 = "13cvpb2fkqsj4m8lz6b7znmgayaf1sadysn07z2x2fs7ca856hrg"; }; meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; @@ -9069,12 +9081,12 @@ final: prev: vim-ultest = buildVimPluginFrom2Nix { pname = "vim-ultest"; - version = "2021-06-27"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "rcarriga"; repo = "vim-ultest"; - rev = "8b551f7fe1f87c832a7aada741eac25d2944407c"; - sha256 = "1vfns3srdskncy2s3z58s2k35vlz8gvf8yrh5s49r7d9nzrv45rq"; + rev = "43ec7b40a83fcde104d3e5e69a2c112f9dc52325"; + sha256 = "1q2rcqllip1raay9nj2cacn6vsairrywg7yxh783zf13n9bmr5vb"; }; meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; @@ -9141,12 +9153,12 @@ final: prev: vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2021-06-22"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "929703f069c7078e0c41efb5a260421347ce083a"; - sha256 = "05ky5l3yadp3whbi2a2i38rq620m51r2xi86q80z11a99j5q6ff5"; + rev = "f994695813ebaecc9e37c7ea216c65d9cd659767"; + sha256 = "11n0g6d1yn38lrshlbzc28sfn1qghsjd2nmxzbp86vwm8dysxm5i"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -9165,12 +9177,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-07-01"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "a1d1841ecadc19eeab9efdd9fa17054cedcba6e6"; - sha256 = "0zzqxxv2jqi71p76z0fsnc25kmclazb3x6rg248npsn8pnfwwi1s"; + rev = "d9d3c2d2942b8e35aedc5c82552913b19958de77"; + sha256 = "06hv1rf3br32n6ks5fic8x9c1m32n3wx4pj4xgmy9q58gf95sn2w"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -9489,12 +9501,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-06-24"; + version = "2021-07-04"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "aa0cddc0da5b2547d20551dcffe1d9dc073b3904"; - sha256 = "0niv2aa294ay0ifksg5ymrslbj9l6sxypyi3pnmgiigqj8m61yzs"; + rev = "da39c4955c2ad0ffa28f5cba81651b568697629c"; + sha256 = "02c7kxfalp52k2ij5r6hjnvqd2azkhx9sglqr85bc53rvh1rgi7y"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -9502,12 +9514,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-06-30"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "c9b3b50427d97403e8a36b3fe2d636d0a97db0d8"; - sha256 = "1vpl02n2xy7b95mhagbsq7fiz55i0x3wpqpbmpmp16mva6r6agvr"; + rev = "3807da1c530e46fb6a633a2268f6e435b16b657b"; + sha256 = "0l05fkisvcq9p9jwbxpbb9svwi0h4gp84d7dc4zlkrin1jwnnxyd"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -9598,12 +9610,12 @@ final: prev: which-key-nvim = buildVimPluginFrom2Nix { pname = "which-key-nvim"; - version = "2021-06-26"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "folke"; repo = "which-key.nvim"; - rev = "e0dce1552ea37964ae6ac7144709867544eae7f3"; - sha256 = "16xwpds1d1dc5p2rz17yqiyr0a844kqj5gnxwnrk2l56fhrhq8xx"; + rev = "2d2954a1d05b4f074e022e64db9aa6093d439bb0"; + sha256 = "0xpf889ijhrbnpjcky575k46nfh69m5dzcfnvw29vwhdikaz33ma"; }; meta.homepage = "https://github.com/folke/which-key.nvim/"; }; @@ -9719,12 +9731,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2021-05-25"; + version = "2021-07-05"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "4df6f35f0c9f9aec21a3f567397496b5dee6acc7"; - sha256 = "1ywdxm9sy57k9wp9gkcahhsy8r75ahxsgb7xcdjpzacg4iranj99"; + rev = "c83c240e1397291bf1babcba173253d7f753a0b6"; + sha256 = "0lr2vl9rdjr2lgbs5vlbcjw3zrwv66w5bijlpk1xy45ccbrbq2nw"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 0901531a8aa..e10cf541066 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -621,7 +621,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-IKSnXNFdtykuajOxpw5CYsw2q/mkVLkRtPC49hiXsPc="; + cargoSha256 = "sha256-hcbNjp9KLJO0RANOvtopvdiK0w9ESUXk0KOTPvVcCX4="; }; in '' diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 22adf1de606..c2e7653a889 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -24,6 +24,7 @@ andweeb/presence.nvim@main andymass/vim-matchup andys8/vim-elm-syntax antoinemadec/coc-fzf +antoinemadec/FixCursorHold.nvim ap/vim-css-color arcticicestudio/nord-vim arthurxavierx/vim-unicoder @@ -344,7 +345,6 @@ LucHermitte/lh-vim-lib ludovicchabant/vim-gutentags ludovicchabant/vim-lawrencium lukas-reineke/indent-blankline.nvim -lukas-reineke/indent-blankline.nvim@lua as indent-blankline-nvim-lua lukaszkorecki/workflowish lumiliet/vim-twig luochen1990/rainbow @@ -488,6 +488,7 @@ nvim-treesitter/playground oberblastmeister/termwrapper.nvim ocaml/vim-ocaml octol/vim-cpp-enhanced-highlight +ojroques/nvim-bufdel@main ojroques/vim-oscyank@main Olical/aniseed Olical/conjure diff --git a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix b/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix index 8ccf18171c7..0fa9a4bb4be 100644 --- a/pkgs/misc/vscode-extensions/ms-vsliveshare-vsliveshare/default.nix +++ b/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.4419"; - sha256 = "1r2xp8ggcrfsf4yzxjiss3hprk4dw7nchwxy920yn2iglvkaalsh"; + version = "1.0.4498"; + sha256 = "01gg9jqkq9z05ckw0mnqfr769359j6h3z8ay6r17jj6m4mhy2m5g"; }; }).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: { nativeBuildInputs = nativeBuildInputs ++ [ diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix index bb4300d623a..b8786ec92f6 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/private-frameworks.nix @@ -15,4 +15,7 @@ SignpostMetrics = {}; PassKitCore = {}; SkyLight = {}; + + # Also expose CoreSymbolication; used by `root` package. + CoreSymbolication = {}; } diff --git a/pkgs/os-specific/linux/bpftools/default.nix b/pkgs/os-specific/linux/bpftools/default.nix index 3e20efa9f01..f2ca8d87471 100644 --- a/pkgs/os-specific/linux/bpftools/default.nix +++ b/pkgs/os-specific/linux/bpftools/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ libopcodes libbfd libelf zlib readline ]; preConfigure = '' - patchShebangs scripts/bpf_helpers_doc.py + patchShebangs scripts/bpf_doc.py cd tools/bpf substituteInPlace ./bpftool/Makefile \ diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index 650e85df517..4d2f29491fc 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "iovisor"; repo = "bpftrace"; rev = "v${version}"; - sha256 = "sha256-DZO47AH506DBVH/AuvOF3JfpRxv/D/lmzVg8WOH9Dqo="; + sha256 = "sha256-BKWBdFzj0j7rAfG30A0fwyYCpOG/5NFRPODW46EP1u0="; }; buildInputs = with llvmPackages; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 3d3ddfc3310..bd1a5397f60 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,32 +1,32 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.237-hardened1.patch", - "sha256": "0iz7q29dazp11ii1f2kcffkpi14765w0ryrn6dsb8mlqcsw639lc", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.237-hardened1/linux-hardened-4.14.237-hardened1.patch" + "name": "linux-hardened-4.14.238-hardened1.patch", + "sha256": "13wld3dm9ymwcsk5f06l64z9q49ff7rh7dqfqxxhkngdx2i1h566", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.238-hardened1/linux-hardened-4.14.238-hardened1.patch" }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.195-hardened1.patch", - "sha256": "1h8v28kscaz4y2samww3vxpq4xvkbdvsnr0hybimn0ygwphshpqq", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.195-hardened1/linux-hardened-4.19.195-hardened1.patch" + "name": "linux-hardened-4.19.196-hardened1.patch", + "sha256": "1wna5j1g1703gl4xw4x5z8dmc8gjqg879zq4xnmlyc0vryqjrxyq", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.196-hardened1/linux-hardened-4.19.196-hardened1.patch" }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.45-hardened1.patch", - "sha256": "1382dflkv31b9apf3l0b5wcq8hyi69jm03139z3m0vbxi93pk44z", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.45-hardened1/linux-hardened-5.10.45-hardened1.patch" + "name": "linux-hardened-5.10.47-hardened1.patch", + "sha256": "0qkwz3d83p2l5p7lhj3imfx8cr17smciw76xhj00zv171vc3q7xm", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.47-hardened1/linux-hardened-5.10.47-hardened1.patch" }, "5.12": { "extra": "-hardened1", - "name": "linux-hardened-5.12.12-hardened1.patch", - "sha256": "10923kjxhfphsh1wr0zjj3lk16bxkq9ana4hyy8af7cn2k30k4iw", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.12-hardened1/linux-hardened-5.12.12-hardened1.patch" + "name": "linux-hardened-5.12.14-hardened1.patch", + "sha256": "0c5zi03j5bjhr706wad1qf5kr4nv0s2bzkx4z5mr6wqgra5dg22v", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.14-hardened1/linux-hardened-5.12.14-hardened1.patch" }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.127-hardened1.patch", - "sha256": "1qsz5cnm0ny138pbd9f7j5avvz69g51db7dgr1q4farrjml3nshy", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.127-hardened1/linux-hardened-5.4.127-hardened1.patch" + "name": "linux-hardened-5.4.129-hardened1.patch", + "sha256": "0b16w4jm22mlhwfvbzbg8bw9z7hp13r1bl5g5rk42vmz07ahknga", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.129-hardened1/linux-hardened-5.4.129-hardened1.patch" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index a550008b9d5..f418afc280b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.237"; + version = "4.14.238"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0kib9p61hhwjbr8zhir9aw86qik7k6bm95503n3k09ayyachajpq"; + sha256 = "1phjgm1fhyfpm2h9b2bngcbh91v2qrxcm7vma86q7pdqrcbh1fih"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 42d98f1485e..460982b6d2f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.195"; + version = "4.19.196"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "02rdy5mdmwxli0cin5n7ab492y9fs01hhqxrjq6b4idwv5baa42m"; + sha256 = "0liapgaczv6lq7223wnq2cbwfb6w93iw14dv1xidcb3bnakm4h5f"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index d06d5133b47..9a5dcb7e1ad 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.4.273"; + version = "4.4.274"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1pd39cak0zhda3m9nvn9yxgd070wxvckaha5wl8pi7c8i6jfpclb"; + sha256 = "1n4wawk8fi5s22177994vq9hzay49cackdabl9r1x8y2i9jcqmg4"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index d614464bf2a..a4d57135e4a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,13 +1,13 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.273"; + version = "4.9.274"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0jjarv3xfkc21j1xhgch53w8wm6rq3xw1i03rjw9fv5i9k4x6qsw"; + sha256 = "0xdi33f25lbpplx36cz7chdsn7a6xdjvwxgvnmvrw7b2y0g45m95"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index e11b5db3d30..deec1b3a475 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.45"; + version = "5.10.47"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "01rmw5rnxyybr8sh0v9rgamrg71ign2nr7m0ilrq9704k6dj9dzj"; + sha256 = "1ig1kb10729xyawm2zqzx8slpdbylgwms7b5vkhw3q6iwqpjmd9h"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix index 5cc25f4a6da..93e7499c8dd 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.12.12"; + version = "5.12.14"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1a1ymbgkp8ngrkf7cfjrn56zb9qz1mm1j1pmd60g85ln7nyb4ai1"; + sha256 = "1b3xnb62n53vm6larkvv2vzd9w7cjnqh8zh6jzq9lpcg12c3pjlh"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 377a5308345..c5b4e390582 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.127"; + version = "5.4.129"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1gr89x1ymxaslp9fqcchaa7939yvhxy67z3pgskmx6z2vrd9pgd0"; + sha256 = "1ps64gx85lmbriq445hd2hcv4g4b1d1cwf4r3nd90x6i2cj4c9j4"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index 609dc494c69..eacb906f2e5 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.12.9"; - suffix = "lqx1"; + version = "5.12.14"; + suffix = "lqx2"; in buildLinux (args // { @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-qmX66nz+gVOt1RGsUT9fA3wPUT7I9Z4jhxpybP0I8Cw="; + sha256 = "sha256-pj5sSW4ggZEx2n7bVU2sfK3JOXG5n4Rsp3S66/+/wVU="; }; extraMeta = { diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index b389532c01a..fbb9bf93ed5 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,8 +1,8 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.12.13"; - suffix = "xanmod1-cacule"; + version = "5.13.0"; + suffix = "xanmod2-cacule"; in buildLinux (args // rec { inherit version; @@ -12,11 +12,10 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-eFIWlguU1hnkAgTbRxSMTStq0X7XW4IT1/9XlQSgdMQ="; + sha256 = "sha256-q+m1Ys/Gfr56cihoX8LS/w7icNcM3oefcXRtvzgx3cM="; }; structuredExtraConfig = with lib.kernel; { - # Preemptive Full Tickless Kernel at 500Hz PREEMPT_VOLUNTARY = lib.mkForce no; PREEMPT = lib.mkForce yes; @@ -47,7 +46,7 @@ buildLinux (args // rec { }; extraMeta = { - branch = "5.12-cacule"; + branch = "5.13-cacule"; maintainers = with lib.maintainers; [ fortuneteller2k ]; description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience"; broken = stdenv.isAarch64; diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 47e72a61c18..f646e380ac3 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.12.9"; + version = "5.12.14"; suffix = "zen1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-Sbe7pY/htLRRx5Qs78BpEzNCSIEsnZMj1+bkAftZdbQ="; + sha256 = "sha256-xmU2HNigSMb+xGkQ9XShBKfRxVHPHsz88JoTI2KsShQ="; }; extraMeta = { diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 48dd9b38d9b..f41cedca0f6 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -102,13 +102,4 @@ name = "mac_nvme_t2"; patch = ./mac-nvme-t2.patch; }; - - rtnetlink_fix_regression_in_bridge_vlan_configuration = rec { - name = "rtnetlink_fix_regression_in_bridge_vlan_configuration"; - patch = fetchpatch { - name = name + ".patch"; - url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=d2e381c4963663bca6f30c3b996fa4dbafe8fcb5"; - sha256 = "0ragdi13yh5ypp9x49vrdjqx8ddh7sq7i1qjp8fyrbk3n0jdaac3"; - }; - }; } diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index cc335aec4c8..b58bca352e6 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,12 +1,14 @@ { lib, stdenv, kernel, elfutils, python2, python3, perl, newt, slang, asciidoc, xmlto, makeWrapper , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkg-config, libunwind, binutils , libiberty, audit, libbfd, libopcodes, openssl, systemtap, numactl -, zlib, withGtk ? false, gtk2 ? null +, zlib +, withGtk ? false, gtk2 +, withZstd ? true, zstd +, withLibcap ? true, libcap }: with lib; -assert withGtk -> gtk2 != null; assert versionAtLeast kernel.version "3.12"; stdenv.mkDerivation { @@ -42,7 +44,9 @@ stdenv.mkDerivation { elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl libopcodes python3 perl ] ++ lib.optional withGtk gtk2 - ++ (if (versionAtLeast kernel.version "4.19") then [ python3 ] else [ python2 ]); + ++ (if (versionAtLeast kernel.version "4.19") then [ python3 ] else [ python2 ]) + ++ lib.optional withZstd zstd + ++ lib.optional withLibcap libcap; # Note: we don't add elfutils to buildInputs, since it provides a # bad `ld' and other stuff. @@ -55,8 +59,7 @@ stdenv.mkDerivation { ]; postPatch = '' - patchShebangs scripts/bpf_helpers_doc.py - patchShebangs scripts/bpf_doc.py + patchShebangs scripts ''; doCheck = false; # requires "sparse" diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 7d715cc3c09..7784aa8e03f 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -195,12 +195,12 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.13"; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.14"; # this package should point to the latest release. - version = "2.0.5"; + version = "2.1.0"; - sha256 = "0n0d8ab7ibxxa8znfsprh7jxwgighx5g291v7hi8272vfjrmk1mj"; + sha256 = "sha256-YdY4SStXZGBBdAHdM3R/unco7ztxI3s0/buPSNSeh5o="; }; zfsUnstable = common { @@ -208,9 +208,9 @@ in { kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.14"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.1.0-rc8"; + version = "2.1.0"; - sha256 = "0c53ca6xd59c30h3b2hmvyy63yqyk745x1kdfypnfqj3lnsj1pac"; + sha256 = "sha256-YdY4SStXZGBBdAHdM3R/unco7ztxI3s0/buPSNSeh5o="; isUnstable = true; }; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 843b7c34008..49beef53fe6 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "20.11.7.1"; + version = "20.11.8.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 = "0ril6k4dj96qhx5x7r4nc2ghp7n9700808731v4qn9yvcslqzg9a"; + sha256 = "0id2b01rvq81zd2p34il0gg880f94g9ip4gn1pyh20zz5bxlnbjc"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index 73b1ba01844..d076f763bf9 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -8,6 +8,7 @@ , libprom , libpromhttp , libmicrohttpd +, nixosTests }: stdenv.mkDerivation rec { @@ -34,6 +35,8 @@ stdenv.mkDerivation rec { ./pure-configure.patch ]; + passthru.tests.coturn = nixosTests.coturn; + meta = with lib; { homepage = "https://coturn.net/"; license = with licenses; [ bsd3 ]; diff --git a/pkgs/servers/http/gitlab-pages/default.nix b/pkgs/servers/http/gitlab-pages/default.nix index a26dd47e024..c62ad8b75c9 100644 --- a/pkgs/servers/http/gitlab-pages/default.nix +++ b/pkgs/servers/http/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "1.39.0"; + version = "1.40.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-eyg2o/5k7/zagYjkYJOnJrHeoszbRkmdl7UgO+rmKyc="; + sha256 = "sha256-RgWDAvuxqZeFCU+Q2s+FDIM/AroIdnfVq/D5lG4XN7U="; }; - vendorSha256 = "sha256-aedJ7vsv70aybjqBfUnSr4qhlFdY7jUUOSas3vXskpM="; + vendorSha256 = "sha256-HbMM0IHw1DMDlNN1m2EHaG9CXnj9j9xROPQiT2xTGlM="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/servers/http/trafficserver/default.nix index 4a7f9854d18..e7ce72e086e 100644 --- a/pkgs/servers/http/trafficserver/default.nix +++ b/pkgs/servers/http/trafficserver/default.nix @@ -49,11 +49,11 @@ stdenv.mkDerivation rec { pname = "trafficserver"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2"; - sha256 = "1q164pvfmbqh3gzy3bqy96lwd0fdbhz78r06pd92p7rmkqwx005z"; + sha256 = "0r05iqmnnjq259nsibncgfrfsr0l4h3hsafizvgfl9zgmrkm6izz"; }; patches = [ @@ -63,13 +63,6 @@ stdenv.mkDerivation rec { url = "https://github.com/apache/trafficserver/commit/19d3af481cf74c91fbf713fc9d2f8b138ed5fbaf.diff"; sha256 = "0z1ikgpp00rzrrcqh97931586yn9wbksgai9xlkcjd5cg8gq0150"; }) - - # Fixes a bug in tspush which pushes incorrect contents to cache - # https://github.com/apache/trafficserver/pull/7696 - (fetchpatch { - url = "https://github.com/apache/trafficserver/commit/b08215272872f452787915cd3a8e0b0ea0b88385.diff"; - sha256 = "0axk8x1xvd8wvpgcxgyqqg7kgxyxwfgwmisq3xnk1da0cqv9cx9f"; - }) ]; # NOTE: The upstream README indicates that flex is needed for some features, diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index 2e825dc9615..34bb901f671 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { six pyasn1 pyasn1-modules - dateutil + python-dateutil argcomplete libselinux ])) diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 99eae786cbf..33d31fb8e72 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, isort, coverage, mock , robot-detection, django_extensions, rjsmin, cssmin, django-mailman3 -, django-haystack, flufl_lock, networkx, dateutil, defusedxml +, django-haystack, flufl_lock, networkx, python-dateutil, defusedxml , django-paintstore, djangorestframework, django, django-q , django_compressor, beautifulsoup4, six, psycopg2, whoosh, elasticsearch }: @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeBuildInputs = [ isort ]; propagatedBuildInputs = [ robot-detection django_extensions rjsmin cssmin django-mailman3 - django-haystack flufl_lock networkx dateutil defusedxml + django-haystack flufl_lock networkx python-dateutil defusedxml django-paintstore djangorestframework django django-q django_compressor six psycopg2 isort ]; diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index 450e454374f..570b2b40c15 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgpd"; - version = "2.28.0"; + version = "2.29.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-AlAfs1wi3hS7cqAtGqfUgv5CIonu7TmXWgxL1zSBh54="; + sha256 = "sha256-DhSIf8fAG2Zf0mwJ/iMgQU5sugHK2jJ6WJPbFbA/mhM="; }; vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY="; diff --git a/pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix index f87526242b8..c5189720660 100644 --- a/pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "doitintl-bigquery-datasource"; - version = "2.0.1"; - zipHash = "sha256-tZyvER/rxL+mo2tgxFvwSIAmjFm/AnZ0RgvmD1YAE2U="; + version = "2.0.2"; + zipHash = "sha256-GE6DNuQ5WtS/2VmXbQBeRdVKDbLlLirWXW51i0RF6Cc="; meta = with lib; { description = "BigQuery DataSource for Grafana"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix index 07694688c4a..85b4c7069a9 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "grafana-polystat-panel"; - version = "1.2.3"; - zipHash = "sha256-Eu3dTPfJxAWwqqGT6l4El4MqviBbzERarU30OXU+eEM="; + version = "1.2.5"; + zipHash = "sha256-U9vNfK4ofNzwL7MVe43tGY85gI56Jt1eb7TrCkeNrOQ="; meta = with lib; { description = "Hexagonal multi-stat panel for Grafana"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/bird-exporter.nix b/pkgs/servers/monitoring/prometheus/bird-exporter.nix index 67ec88332b5..f15f7b6e005 100644 --- a/pkgs/servers/monitoring/prometheus/bird-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bird-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bird-exporter"; - version = "1.2.5"; + version = "1.2.6"; src = fetchFromGitHub { owner = "czerwonk"; repo = "bird_exporter"; rev = version; - sha256 = "06rlmmvr79db3lh54938yxi0ixcfb8fni0vgcv3nafqnlr2zbs58"; + sha256 = "sha256-zQKdO1E5VKZaQLNOfL3e/iCdugwNx3xFy7R7vun/Efs="; }; - vendorSha256 = "14bjdfqvxvb9gs1nm0nnlib52vd0dbvjll22x7d2cc721cbd0hj0"; + vendorSha256 = "sha256-o/OVWALLOw7eNH3xsQlQ5ZNFV3l9iD8lhyckBt6Qn3E="; passthru.tests = { inherit (nixosTests.prometheus-exporters) bird; }; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index ff32764fcde..9a856eedf68 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -1,19 +1,22 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "mysqld_exporter"; - version = "0.12.1"; + version = "0.13.0"; rev = "v${version}"; - goPackagePath = "github.com/prometheus/mysqld_exporter"; - src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "mysqld_exporter"; - sha256 = "0nzbfzx4dzs3cagdid1fqddrqimgr8x6r8gmmxglrss05c8srgs8"; + sha256 = "05gb6p65a0ys356qnanwc40klz1izrib37rz5yzyg2ysvamlvmys"; }; + vendorSha256 = "19785rfzlx8h0h8vmg0ghd40h3p4y6ikhgf8rd2qfj5f6qxfhrgv"; + + # skips tests with external dependencies, e.g. on mysqld + checkFlags = [ "-short" ]; + meta = with lib; { description = "Prometheus exporter for MySQL server metrics"; homepage = "https://github.com/prometheus/mysqld_exporter"; diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix index 3962ce97110..f8e3dfbc01c 100644 --- a/pkgs/servers/pinnwand/default.nix +++ b/pkgs/servers/pinnwand/default.nix @@ -21,7 +21,8 @@ with python3.pkgs; buildPythonApplication rec { substituteInPlace pyproject.toml \ --replace 'click = "^7.0"' 'click = "*"' \ --replace 'docutils = "^0.16"' 'docutils = "*"' \ - --replace 'sqlalchemy = "^1.3"' 'sqlalchemy = "*"' + --replace 'sqlalchemy = "^1.3"' 'sqlalchemy = "*"' \ + --replace 'token-bucket = "^0.2.0"' 'token-bucket = "*"' ''; nativeBuildInputs = [ diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index d7611baad14..98a1223d279 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchpatch, stdenv, lib, pkg-config, autoreconfHook +{ fetchFromGitHub, stdenv, lib, pkg-config, autoreconfHook , ncurses, gnutls, readline , openssl, perl, sqlite, libjpeg, speex, pcre, libuuid , ldns, libedit, yasm, which, libsndfile, libtiff @@ -88,21 +88,14 @@ in stdenv.mkDerivation rec { pname = "freeswitch"; - version = "1.10.5"; + version = "1.10.6"; src = fetchFromGitHub { owner = "signalwire"; repo = pname; rev = "v${version}"; - sha256 = "18dhyb19k28dcm1i8mhqvvgm2phsrmrwyjmfn79glk8pdlalvcha"; + sha256 = "1i5n06pds3kvzhhzfwvhwxnvcb2p2fcr8k52157aplm2i7prl4q2"; }; - patches = [ - # https://github.com/signalwire/freeswitch/pull/812 fix mod_spandsp, mod_gsmopen build, drop when updating from 1.10.5 - (fetchpatch { - url = "https://github.com/signalwire/freeswitch/commit/51fba83ed3ed2d9753d8e6b13e13001aca50b493.patch"; - sha256 = "0h2bmifsyyasxjka3pczbmqym1chvz91fmb589njrdbwpkjyvqh3"; - }) - ]; postPatch = '' patchShebangs libs/libvpx/build/make/rtcd.pl substituteInPlace libs/libvpx/build/make/configure.sh \ @@ -117,10 +110,11 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ pkg-config autoreconfHook ]; + strictDeps = true; + nativeBuildInputs = [ pkg-config autoreconfHook perl which yasm ]; buildInputs = [ - openssl ncurses gnutls readline perl libjpeg - sqlite pcre speex ldns libedit yasm which + openssl ncurses gnutls readline libjpeg + sqlite pcre speex ldns libedit libsndfile libtiff libuuid ] diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index db588b3abe0..64f603a4f07 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -4,7 +4,7 @@ , bzip2, lz4, lzo, snappy, xz, zlib, zstd , fixDarwinDylibNames, cctools, CoreServices, less , numactl # NUMA Support -, withStorageMroonga ? true, kytea, msgpack, zeromq +, withStorageMroonga ? true, kytea, libsodium, msgpack, zeromq , withStorageRocks ? true }: @@ -155,7 +155,7 @@ server = stdenv.mkDerivation (common // { bzip2 lz4 lzo snappy xz zstd libxml2 judy libevent cracklib ] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) numactl - ++ optionals withStorageMroonga [ kytea msgpack zeromq ] + ++ optionals withStorageMroonga [ kytea libsodium msgpack zeromq ] ++ optional stdenv.hostPlatform.isLinux linux-pam ++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv; diff --git a/pkgs/servers/sql/materialize/default.nix b/pkgs/servers/sql/materialize/default.nix index 5a2a3ad8ebf..f2c6d59bd2a 100644 --- a/pkgs/servers/sql/materialize/default.nix +++ b/pkgs/servers/sql/materialize/default.nix @@ -40,17 +40,17 @@ let in rustPlatform.buildRustPackage rec { pname = "materialize"; - version = "0.8.0"; - rev = "b2fe225f1afcfec4912976bdaa4a44caf3ca0842"; + version = "0.8.1"; + rev = "ef996c54db7c9504690b9f230a4a676ae1fb617f"; src = fetchFromGitHub { owner = "MaterializeInc"; repo = pname; - inherit rev; - hash = "sha256:09q1bfgsp6j8l8wv2abgibndwfkg2w3nm4dif4qgdkd52fdg0kc5"; + rev = "v${version}"; + sha256 = "1lrv0q191rhdqk316557qk2a6b00vrf07j1g63ri6mp8ad1g8gk3"; }; - cargoSha256 = "sha256:0y2r4980dyajf2ql9vb2jxcsn0a2q0gd3f8v932fgjqw13ysmi0s"; + cargoSha256 = "0fx7m1ci4zak7sm71kdiaj2l29rlqax15hd424i9yn4aj1bd358b"; nativeBuildInputs = [ cmake perl pkg-config ] # Provides the mig command used by the krb5-src build script @@ -76,7 +76,7 @@ rustPlatform.buildRustPackage rec { ''; MZ_DEV_BUILD_SHA = rev; - cargoBuildFlags = [ "--package materialized" ]; + cargoBuildFlags = [ "--bin materialized" ]; postInstall = '' install --mode=444 -D ./misc/dist/materialized.service $out/etc/systemd/system/materialized.service diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 81f3f4fee25..4b69aca710a 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { pname = "postgis"; - version = "3.1.2"; + version = "3.1.3"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "0ch7gry8a1i9114mlhklxryn7ja3flsz6pxj9r5p09k92xh3gp9c"; + sha256 = "1jwz6hdrym837b7dvn00qmwnbb40a7gr43va409h8fmp7dajksbi"; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 56acbf3d22a..ff2c8f9af37 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "0smc2xqbqc2p4jj1c98gzzxbr28sbx8z8625hbrng9m39vwylfxf"; + sha256 = "1s4qpz4jwar3lcqyzkgyvgm4bghzass974lq1pw4fziqlsblh0vm"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index d898cc9bcca..ad96798133b 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -11,14 +11,14 @@ in buildGoModule rec { pname = "teleport"; - version = "6.2.5"; + version = "6.2.7"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "sha256-OBo1TWN7KxI7DAUcRLwXXQjErhhgpLBrJBR55ewKiYw="; + sha256 = "0ychs2pqi3awbr0vraz0ksddwk5hihrd1d9raq8mxyw5dz5124ki"; }; vendorSha256 = null; diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index 3ba6f327042..afcded31116 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -33,7 +33,7 @@ toPythonModule (buildPythonApplication rec { propagatedBuildInputs = [ Babel certifi - dateutil + python-dateutil flask flaskbabel gevent diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 46d7ebfd85a..c16391a3c50 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -32,6 +32,7 @@ , stdenv , wayland , wayland-protocols +, wayland-scanner , xkbcomp , xkeyboard_config , xorgproto @@ -47,7 +48,16 @@ stdenv.mkDerivation rec { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; sha256 = "sha256-MfJhzlG77namyj7AKqNn/6K176K5hBLfV8zv16GQA84="; }; - nativeBuildInputs = [ pkg-config meson ninja ]; + + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + wayland-scanner + ]; buildInputs = [ egl-wayland epoxy diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 4536024c511..d6704d59111 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -110,7 +110,9 @@ in rec { ++ depsTargetTarget ++ depsTargetTargetPropagated) == 0; dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || !stdenv.hasCC; supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ]; - # Musl-based platforms will keep "pie", other platforms will not. + # Musl-based platforms will keep "pie", other platforms will not. + # If you change this, make sure to update section `{#sec-hardening-in-nixpkgs}` + # in the nixpkgs manual to inform users about the defaults. defaultHardeningFlags = if stdenv.hostPlatform.isMusl && # Except when: # - static aarch64, where compilation works, but produces segfaulting dynamically linked binaries. diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index a73474c952e..066ef6ed9eb 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1,6 +1,12 @@ set -eu set -o pipefail +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 +fi + if (( "${NIX_DEBUG:-0}" >= 6 )); then set -x fi diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 8c9e7b6f281..ebf732839ce 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -52,6 +52,7 @@ with pkgs; cuda = callPackage ./cuda { }; trivial = callPackage ../build-support/trivial-builders/test.nix {}; + trivial-overriding = callPackage ../build-support/trivial-builders/test-overriding.nix {}; writers = callPackage ../build-support/writers/test.nix {}; } diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix index d9fd55f32c9..5b61e4828ef 100644 --- a/pkgs/tools/admin/awslogs/default.nix +++ b/pkgs/tools/admin/awslogs/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - boto3 termcolor dateutil docutils setuptools jmespath + boto3 termcolor python-dateutil docutils setuptools jmespath ]; checkInputs = [ python3Packages.pytestCheckHook ]; diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index 46989bc24fb..0298ca29a7c 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clair"; - version = "4.1.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "quay"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ns02Yi0FJPOCpjr1P5c1KOkRZ8saxQzXg/Zn5vYLztU="; + sha256 = "sha256-E04G3EJ0JrOVjtTd3nBHZehzuDrvt6t4hfFdGO92uuk="; }; - vendorSha256 = "sha256-aFaeRhg+aLOmS7VFbgdxaEtZcBKn9zCVINad6ahpDCo="; + vendorSha256 = "sha256-xgP5IhB9eyKOIBlT5jKDJkUy8lz2UrWmGqqeDhqRawY="; doCheck = false; diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 32049fd11b6..9af721f02e5 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.54.0"; + version = "0.55.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-hWrSjkEdhb0F5lwFGwjkR2G6gQ8T8HommH2lxJE+0bk="; + sha256 = "sha256-5PrwOR70pSmNPHFSDHRvXNn0pksIQun5jJkcCFsYhCE="; }; - vendorSha256 = "sha256-499c3Y9IUV8lc+O9qcEeFKQDT4QDvOPmu0rmps7M47w="; + vendorSha256 = "sha256-N2jdaz0lb4Ut8P+FgNNjgyUeJ731fTQ5XSQgOF8KCQs="; doCheck = false; diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index d6b264a4aa3..7136fecf433 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.32.2"; + version = "1.34.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-Yx+GA959AB6m62hDlZKYjsuT9Y9TJbIdzUVBMM8OgTg="; + sha256 = "sha256-Gu9o1aUDlhcEZPZZsfVF0FnlzT1DvbEXMXjnOxhY8tY="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/pkgs/tools/admin/oci-cli/default.nix b/pkgs/tools/admin/oci-cli/default.nix index 8996ef5069f..729f0aa8fd9 100644 --- a/pkgs/tools/admin/oci-cli/default.nix +++ b/pkgs/tools/admin/oci-cli/default.nix @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - oci arrow certifi pinned_click configparser cryptography jmespath dateutil + oci arrow certifi pinned_click configparser cryptography jmespath python-dateutil pytz retrying six terminaltables pyopenssl pyyaml ]; diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index c619a69c111..4b4dadd4faf 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, bash, btrfs-progs, openssh, perl, perlPackages -, util-linux, asciidoc, asciidoctor, mbuffer, makeWrapper }: +, util-linux, asciidoc, asciidoctor, mbuffer, makeWrapper, nixosTests }: stdenv.mkDerivation rec { pname = "btrbk"; @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { --prefix PATH ':' "${lib.makeBinPath [ btrfs-progs bash mbuffer openssh ]}" ''; + passthru.tests.btrbk = nixosTests.btrbk; + meta = with lib; { description = "A backup tool for btrfs subvolumes"; homepage = "https://digint.ch/btrbk"; diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index 54108a0c038..06c20747157 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -1,21 +1,21 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook -, pkg-config, libuuid, e2fsprogs, nilfs-utils, ntfs3g +, pkg-config, libuuid, e2fsprogs, nilfs-utils, ntfs3g, openssl }: stdenv.mkDerivation rec { pname = "partclone"; - version = "0.3.11"; + version = "0.3.17"; src = fetchFromGitHub { owner = "Thomas-Tsai"; repo = "partclone"; rev = version; - sha256 = "0bv15i0gxym4dv48rgaavh8p94waryn1l6viis6qh5zm9cd08skg"; + sha256 = "sha256-tMdBo26JvHxbVI/Y2KDMejH+YT4IVx2H/y36u9ss0C8="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ - e2fsprogs libuuid stdenv.cc.libc nilfs-utils ntfs3g + e2fsprogs libuuid stdenv.cc.libc nilfs-utils ntfs3g openssl (lib.getOutput "static" stdenv.cc.libc) ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with lib; { description = "Utilities to save and restore used blocks on a partition"; longDescription = '' Partclone provides utilities to save and restore used blocks on a @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { ext2 partition. ''; homepage = "https://partclone.org"; - license = lib.licenses.gpl2; - maintainers = [lib.maintainers.marcweber]; - platforms = lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ marcweber ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/backup/tarsnapper/default.nix b/pkgs/tools/backup/tarsnapper/default.nix index b02ce82291a..a5ad2c3625c 100644 --- a/pkgs/tools/backup/tarsnapper/default.nix +++ b/pkgs/tools/backup/tarsnapper/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { py.test . ''; - propagatedBuildInputs = with python3Packages; [ pyyaml dateutil pexpect ]; + propagatedBuildInputs = with python3Packages; [ pyyaml python-dateutil pexpect ]; patches = [ ./remove-argparse.patch ]; diff --git a/pkgs/tools/cd-dvd/isomd5sum/default.nix b/pkgs/tools/cd-dvd/isomd5sum/default.nix index 2ca14cc4d60..9cb033e15d1 100644 --- a/pkgs/tools/cd-dvd/isomd5sum/default.nix +++ b/pkgs/tools/cd-dvd/isomd5sum/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { sha256 = "1wjnh2hlp1hjjm4a8wzdhdrm73jq41lmpmy3ls0rh715p3j7z4q9"; }; - buildInputs = [ python3 popt ] ; + strictDeps = true; + nativeBuildInputs = [ python3 ]; + buildInputs = [ popt ] ; postPatch = '' substituteInPlace Makefile --replace "#/usr/" "#" diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index a25bf744a91..0ccc96ce188 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -38,7 +38,7 @@ # Linux Only Dependencies , linuxHeaders, util-linux, libuuid, udev, keyutils, rdma-core, rabbitmq-c -, libaio ? null, libxfs ? null, zfs ? null +, libaio ? null, libxfs ? null, zfs ? null, liburing ? null , ... }: @@ -130,7 +130,9 @@ let ps.Mako ceph-common ps.cherrypy - ps.dateutil + ps.cmd2 + ps.colorama + ps.python-dateutil ps.jsonpatch ps.pecan ps.prettytable @@ -176,7 +178,7 @@ in rec { snappy lz4 oathToolkit leveldb libnl libcap_ng rdkafka cryptsetup sqlite lua icu bzip2 ] ++ lib.optionals stdenv.isLinux [ - linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs + linuxHeaders util-linux libuuid udev keyutils liburing optLibaio optLibxfs optZfs # ceph 14 rdma-core rabbitmq-c ] ++ lib.optionals hasRadosgw [ @@ -207,11 +209,12 @@ in rec { "-DMGR_PYTHON_VERSION=${ceph-python-env.python.pythonVersion}" "-DWITH_SYSTEMD=OFF" "-DWITH_TESTS=OFF" + "-DWITH_CEPHFS_SHELL=ON" # TODO breaks with sandbox, tries to download stuff with npm "-DWITH_MGR_DASHBOARD_FRONTEND=OFF" # WITH_XFS has been set default ON from Ceph 16, keeping it optional in nixpkgs for now ''-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}'' - ]; + ] ++ lib.optional stdenv.isLinux "-DWITH_SYSTEM_LIBURING=ON"; postFixup = '' wrapPythonPrograms diff --git a/pkgs/tools/games/weidu/default.nix b/pkgs/tools/games/weidu/default.nix new file mode 100644 index 00000000000..d325746dc8c --- /dev/null +++ b/pkgs/tools/games/weidu/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, lib +, fetchFromGitHub +, elkhound +, ocaml-ng +, perl +, which +}: + +let + # 1. Needs ocaml >= 4.04 and <= 4.11 + # 2. ocaml 4.10 defaults to safe (immutable) strings so we need a version with + # that disabled as weidu is strongly dependent on mutable strings + ocaml' = ocaml-ng.ocamlPackages_4_10.ocaml.overrideAttrs (old: { + configureFlags = old.configureFlags ++ [ + # https://github.com/WeiDUorg/weidu/issues/197 + "--disable-force-safe-string" + ]; + }); + +in +stdenv.mkDerivation rec { + pname = "weidu"; + version = "247.00"; + + src = fetchFromGitHub { + owner = "WeiDUorg"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-vAIIYn0urQnnL82mdfwJtahrS3uWPFferm+0F13TKcw="; + }; + + postPatch = '' + substitute sample.Configuration Configuration \ + --replace /usr/bin ${lib.makeBinPath [ ocaml' ]} \ + --replace elkhound ${elkhound}/bin/elkhound + + mkdir -p obj/{.depend,x86_LINUX} + ''; + + nativeBuildInputs = [ elkhound ocaml' perl which ]; + + buildFlags = [ "weidu" "weinstall" "tolower" ]; + + installPhase = '' + runHook preInstall + + for b in tolower weidu weinstall; do + install -Dm555 $b.asm.exe $out/bin/$b + done + + install -Dm444 -t $out/share/doc/weidu README* COPYING + + runHook postInstall + ''; + + meta = with lib; { + description = "InfinityEngine Modding Engine"; + homepage = "https://weidu.org"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ peterhoeg ]; + # should work fine on both Darwin and Windows + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/graphics/adriconf/default.nix b/pkgs/tools/graphics/adriconf/default.nix new file mode 100644 index 00000000000..74ff4f1ed66 --- /dev/null +++ b/pkgs/tools/graphics/adriconf/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, lib +, fetchFromGitLab +, cmake +, pkg-config +, libdrm +, libGL +, atkmm +, pcre +, gtkmm3 +, boost +, libxmlxx3 +, mesa +, pciutils +}: + +stdenv.mkDerivation rec { + pname = "adriconf"; + version = "2.4.1"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "mesa"; + repo = pname; + rev = "v${version}"; + sha256 = "hZy+FpKKBKuho/fALu2O+44zzK6s/M8CTbhrO00ANgo="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libdrm libGL atkmm pcre gtkmm3 boost libxmlxx3 mesa pciutils ]; + + cmakeFlags = [ "-DENABLE_UNIT_TESTS=off" ]; + + meta = with lib; { + homepage = "https://gitlab.freedesktop.org/mesa/adriconf/"; + description = "A GUI tool used to configure open source graphics drivers"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ musfay ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index c05a552f205..b200f487b23 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -7,11 +7,11 @@ with lib; stdenv.mkDerivation rec { pname = "gifsicle"; - version = "1.92"; + version = "1.93"; src = fetchurl { url = "https://www.lcdf.org/gifsicle/${pname}-${version}.tar.gz"; - sha256 = "0rffpzxcak19k6cngpxn73khvm3z1gswrqs90ycdzzb53p05ddas"; + sha256 = "sha256-kvZweXMr9MHaCH5q4JBSBYRuWsd3ulyqZtEqc6qUNEc="; }; buildInputs = optionals gifview [ xorgproto libXt libX11 ]; diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index 1a387042b2d..f225f2196cc 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -2,7 +2,7 @@ { lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, cairo, expat, flex , fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango -, bison, fetchpatch, xorg ? null, ApplicationServices }: +, bison, fetchpatch, xorg, ApplicationServices, python3 }: let inherit (lib) optional optionals optionalString; @@ -41,7 +41,7 @@ stdenv.mkDerivation { inherit sha256 rev; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config python3 ]; buildInputs = [ libpng libjpeg expat bison libtool fontconfig gd gts libdevil flex pango diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index c79fe3aaf4d..0662205d17e 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,5 +1,5 @@ import ./base.nix rec { - rev = "da4c2ec6f24ca1b6d1752c6b5bc4389e55682147"; # use rev as tags have disappeared before - version = "2.42.2"; - sha256 = "0lacl11amyvj04j78m63qifljl4c0nkyy50z4bkg8mg9j4hjdy0x"; + rev = "a11eb938514725493324d18db1686f9a99c8569f"; # use rev as tags have disappeared before + version = "2.47.2"; + sha256 = "sha256-6JFjM/2xl7KVmGhSr6RWgO23UwLDyAif3ONsBG4t/Wc="; } diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index ea82ccaf96b..44a44b3af2b 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -1,70 +1,64 @@ { lib, stdenv, fetchFromGitHub, which, ninja, pkg-config, protobuf , ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, python3Packages }: -let - japanese_usage_dictionary = fetchFromGitHub { - owner = "hiroyuki-komatsu"; - repo = "japanese-usage-dictionary"; - rev = "e5b3425575734c323e1d947009dd74709437b684"; - sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm"; - }; -in stdenv.mkDerivation rec { - name = "ibus-mozc-${version}"; - version = "2.23.4206.102"; - - meta = with lib; { - isIbusEngine = true; - description = "Japanese input method from Google"; - homepage = "https://github.com/google/mozc"; - license = licenses.free; - platforms = platforms.linux; - maintainers = with maintainers; [ gebner ericsagnes ]; - }; - - nativeBuildInputs = [ which ninja python3Packages.python python3Packages.six - python3Packages.gyp pkg-config qt5.wrapQtAppsHook ]; - buildInputs = [ protobuf ibus gtk2 zinnia qt5.qtbase libxcb ]; +stdenv.mkDerivation rec { + pname = "ibus-mozc"; + version = "2.26.4423.100"; src = fetchFromGitHub { - owner = "google"; - repo = "mozc"; - rev = "91cc1e19ef34aeb12888b697fefa52907f1a834d"; - sha256 = "1fyy9g1pnaq6s5nkf56aqmp5mgyibbmp1ylc64fqc6g1plg90zk2"; + owner = "google"; + repo = "mozc"; + rev = "7654223979067e3c5ae52ea238d43880c5508f85"; + sha256 = "aZVuhj4I9ZCsVR9dOplOd9zinYMgYw5SF5wG3IxBTO0="; fetchSubmodules = true; }; - postUnpack = '' - rm -rf $sourceRoot/src/third_party/japanese_usage_dictionary/ - ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary - '' + lib.optionalString stdenv.isLinux '' + nativeBuildInputs = [ + which ninja python3Packages.python python3Packages.six + python3Packages.gyp pkg-config qt5.wrapQtAppsHook + ]; + + buildInputs = [ protobuf ibus gtk2 zinnia qt5.qtbase libxcb ]; + + postUnpack = lib.optionalString stdenv.isLinux '' sed -i 's/-lc++/-lstdc++/g' $sourceRoot/src/gyp/common.gypi ''; configurePhase = '' + runHook preConfigure + export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 ibus_mozc_path=$out/lib/ibus-mozc/ibus-engine-mozc zinnia_model_file=${tegaki-zinnia-japanese}/share/tegaki/models/zinnia/handwriting-ja.model" cd src && python build_mozc.py gyp --gypdir=${python3Packages.gyp}/bin --server_dir=$out/lib/mozc + + runHook postConfigure ''; buildPhase = '' + runHook preBuild + PYTHONPATH="$PWD:$PYTHONPATH" python build_mozc.py build -c Release \ unix/ibus/ibus.gyp:ibus_mozc \ unix/emacs/emacs.gyp:mozc_emacs_helper \ server/server.gyp:mozc_server \ gui/gui.gyp:mozc_tool \ renderer/renderer.gyp:mozc_renderer + + runHook postBuild ''; installPhase = '' + runHook preInstall + install -d $out/share/licenses/mozc head -n 29 server/mozc_server.cc > $out/share/licenses/mozc/LICENSE - install -m 644 data/installer/*.html $out/share/licenses/mozc/ + install -m 644 data/installer/*.html $out/share/licenses/mozc/ install -D -m 755 out_linux/Release/mozc_server $out/lib/mozc/mozc_server install -m 755 out_linux/Release/mozc_tool $out/lib/mozc/mozc_tool wrapQtApp $out/lib/mozc/mozc_tool install -d $out/share/doc/mozc - install -m 644 data/installer/*.html $out/share/doc/mozc/ + install -m 644 data/installer/*.html $out/share/doc/mozc/ install -D -m 755 out_linux/Release/ibus_mozc $out/lib/ibus-mozc/ibus-engine-mozc install -D -m 644 out_linux/Release/gen/unix/ibus/mozc.xml $out/share/ibus/component/mozc.xml @@ -79,5 +73,16 @@ in stdenv.mkDerivation rec { install -m 644 data/images/unix/ui-alpha_half.png $out/share/ibus-mozc/alpha_half.png install -m 644 data/images/unix/ui-alpha_full.png $out/share/ibus-mozc/alpha_full.png install -D -m 755 out_linux/Release/mozc_renderer $out/lib/mozc/mozc_renderer + + runHook postInstall ''; + + meta = with lib; { + isIbusEngine = true; + description = "Japanese input method from Google"; + homepage = "https://github.com/google/mozc"; + license = licenses.free; + platforms = platforms.linux; + maintainers = with maintainers; [ gebner ericsagnes ]; + }; } diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix index d444d44f233..af3fcbe4e2c 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix @@ -1,36 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gdk-pixbuf, glib, ibus, libnotify -, librime, brise }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gdk-pixbuf +, glib +, ibus +, libnotify +, librime +, pkg-config +, rime-data +}: stdenv.mkDerivation rec { pname = "ibus-rime"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "rime"; repo = "ibus-rime"; rev = version; - sha256 = "0zbajz7i18vrqwdyclzywvsjg6qzaih64jhi3pkxp7mbw8jc5vhy"; + sha256 = "0gdxg6ia0i31jn3cvh1nrsjga1j31hf8a2zfgg8rzn25chrfr319"; }; - buildInputs = [ gdk-pixbuf glib ibus libnotify librime brise ]; + buildInputs = [ gdk-pixbuf glib ibus libnotify librime rime-data ]; nativeBuildInputs = [ cmake pkg-config ]; - makeFlags = [ "PREFIX=$(out)" ]; - dontUseCmakeConfigure = true; + cmakeFlags = [ "-DRIME_DATA_DIR=${rime-data}/share/rime-data" ]; prePatch = '' - substituteInPlace Makefile \ - --replace 'cmake' 'cmake -DRIME_DATA_DIR=${brise}/share/rime-data' - - substituteInPlace rime_config.h \ - --replace '/usr' $out - - substituteInPlace rime_config.h \ - --replace 'IBUS_RIME_SHARED_DATA_DIR IBUS_RIME_INSTALL_PREFIX' \ - 'IBUS_RIME_SHARED_DATA_DIR "${brise}"' - - substituteInPlace rime.xml \ - --replace '/usr' $out + substituteInPlace CMakeLists.txt \ + --replace 'DESTINATION "''${RIME_DATA_DIR}"' \ + 'DESTINATION "''${CMAKE_INSTALL_DATADIR}/rime-data"' ''; meta = with lib; { diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix index 9c952cc7c30..3dc3fa1bbe2 100644 --- a/pkgs/tools/misc/apt-offline/default.nix +++ b/pkgs/tools/misc/apt-offline/default.nix @@ -1,22 +1,39 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages, unstableGitUpdater, gnupg }: python3Packages.buildPythonApplication rec { - version = "1.8.1"; pname = "apt-offline"; + version = "unstable-2021-04-11"; src = fetchFromGitHub { owner = "rickysarraf"; repo = pname; - rev = "v${version}"; - sha256 = "0k79d1d8jiwg1s684r05njmk1dz8gsb8a9bl4agz7m31snc11j84"; + rev = "4e4b3281d004d1ece4833b7680e2b5b091402a03"; + sha256 = "1lk4186h2wc8fphd592rhq7yj4kgc7jjawx4pjrs6pg4n0q32pl6"; }; + postPatch = '' + substituteInPlace org.debian.apt.aptoffline.policy \ + --replace /usr/bin/ "$out/bin" + + substituteInPlace apt_offline_core/AptOfflineCoreLib.py \ + --replace /usr/bin/gpgv "${gnupg}/bin/gpgv" + ''; + + preFixup = '' + rm "$out/bin/apt-offline-gui" + rm "$out/bin/apt-offline-gui-pkexec" + ''; + doCheck = false; - # Requires python-qt4 (feel free to get it working). - preFixup = ''rm "$out/bin/apt-offline-gui"''; + pythonimportsCheck = [ "apt-offline" ]; + + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/rickysarraf/apt-offline.git"; + }; meta = with lib; { + homepage = "https://github.com/rickysarraf/apt-offline"; description = "Offline APT package manager"; license = licenses.gpl3; maintainers = [ ]; diff --git a/pkgs/tools/misc/barman/default.nix b/pkgs/tools/misc/barman/default.nix index da79110f9a8..ef84981a9d9 100644 --- a/pkgs/tools/misc/barman/default.nix +++ b/pkgs/tools/misc/barman/default.nix @@ -1,5 +1,5 @@ { buildPythonApplication, fetchurl, lib -, dateutil, argcomplete, argh, psycopg2, boto3 +, python-dateutil, argcomplete, argh, psycopg2, boto3 }: buildPythonApplication rec { @@ -12,7 +12,7 @@ buildPythonApplication rec { sha256 = "Ts8I6tlP2GRp90OIIKXy+cRWWvUO3Sm86zq2dtVP5YE="; }; - propagatedBuildInputs = [ dateutil argh psycopg2 boto3 argcomplete ]; + propagatedBuildInputs = [ python-dateutil argh psycopg2 boto3 argcomplete ]; # Tests are not present in tarball checkPhase = '' diff --git a/pkgs/tools/misc/beats/default.nix b/pkgs/tools/misc/beats/default.nix index 1e6f155f350..3e471c76fdf 100644 --- a/pkgs/tools/misc/beats/default.nix +++ b/pkgs/tools/misc/beats/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "beats"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "j0hax"; repo = "beats"; rev = "v${version}"; - sha256 = "0qs5cmbncqhs11m4whqmrh2gvv3p3b37qz57xh78x2ma8jbhskqz"; + sha256 = "1rdvsqrjpily74y8vwch711401585xckb4p41cfwrmj6vf44jhif"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index d1f9ca80f70..a5c456c0050 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "An interactive tree view, a fuzzy search, a balanced BFS descent and customizable commands"; homepage = "https://dystroy.org/broot/"; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; license = with licenses; [ mit ]; }; } diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 81e2061b4cc..5d9790ec2be 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.0.16"; + version = "2.1.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-0m5ya3S/aqQr0n6MdfWfTo0Q7xTS5qY+iDhexwDGdWo="; + sha256 = "sha256-TEY3oEAWnS+iuLgAgR9mp1TaEb+wzlAgN41dgLRdUs4="; }; - vendorSha256 = "sha256-k2dw8WfOxK+VpnJonm/GXm49rUdIXSA81RO0g+8ocBs="; + vendorSha256 = "sha256-pr6bMO1klq/V9zkBftLleSRTg3zjl24EuA283M88HY4="; doCheck = false; diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index 09c0e0d25c6..da87d048b70 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libintl ]; + postPatch = '' + substituteInPlace src/install.c \ + --replace \"update-desktop-database\" \"$out/bin/update-desktop-database\" + ''; + setupHook = ./setup-hook.sh; meta = { diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 03e8e260ac6..5a792c040b3 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -25,10 +25,9 @@ tcl.mkTclDerivation rec { strictDeps = true; hardeningDisable = [ "format" ]; - postInstall = lib.optionalString stdenv.isDarwin '' - for i in $out/bin/*; do - wrapProgram $i --prefix DYLD_LIBRARY_PATH : $out/lib/expect${version} - done + postInstall = '' + tclWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ tcl ]}) + ${lib.optionalString stdenv.isDarwin "tclWrapperArgs+=(--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version})"} ''; outputs = [ "out" "dev" ]; diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 6f0c90517da..051e61e7af8 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, ncurses, gettext, openssl, withGeolocation ? true, libmaxminddb }: stdenv.mkDerivation rec { - version = "1.5"; + version = "1.5.1"; pname = "goaccess"; src = fetchurl { url = "https://tar.goaccess.io/goaccess-${version}.tar.gz"; - sha256 = "sha256-liJtXfiXAyg+NBCcF+G07v4kBKWefHaitu76EPOqwWE="; + sha256 = "sha256-iEF+eOYrcN45gLdiKRHk/NcZw2YPADyIeWjnGWw5lw8="; }; configureFlags = [ diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index f5ed58f84fd..18c936befb4 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.172.0"; + version = "0.172.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QHtxrdmtmvnyMmtpvbEw5VjGz2XN1iqHu+5dHS9yiNo="; + sha256 = "sha256-xTLNAcqvk5GDs9HsNvL+4SPeT8baFMg7J0yW+E8x+Gc="; }; vendorSha256 = "sha256-Zd48I7e5zCbSXz5RVckMXQMpqvf6gAoajx5yLk2ODmU="; diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index 286bc4cbca2..abe1872c67f 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "infracost"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-3dR4NZ1PiMuHNO+xl3zxeBLPOZTLAbJ0VtYJNYpJuXI="; + sha256 = "sha256-TM+7Am5hoiRk/StAwCh5yAN1GKv3oPun38pvhArBoJg="; }; - vendorSha256 = "sha256-YHewZsIiDPsgJVYwQX/FovlD+UzJflXy/0oglk8ZkKk="; + vendorSha256 = "sha256-6sMtM7MTFTDXwH8AKr5Dxq8rPqE92xzcWqBTixcPi+8="; checkInputs = [ terraform ]; checkPhase = "make test"; diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix index 546dcb112a8..b1ece43154f 100644 --- a/pkgs/tools/misc/kepubify/default.nix +++ b/pkgs/tools/misc/kepubify/default.nix @@ -2,18 +2,21 @@ buildGoModule rec { pname = "kepubify"; - version = "3.1.6"; + version = "4.0.0"; src = fetchFromGitHub { owner = "pgaskin"; repo = pname; rev = "v${version}"; - sha256 = "129izxgvhcybipfgcwzzwsir9zhi7axxadnw822zy5rk2ky4zjpk"; + sha256 = "sha256-Mxe43U0kxkSdAzs+lSJ0x/VspbJPam59DpTpFEJVMl4="; }; - vendorSha256 = "0vwzm1c4kada7mqdkr444gj8c2vkvz7av9wkpgdpjrq0v2h0hpcc"; + vendorSha256 = "sha256-bLQH7ZY2hE8fBTcW7DNoUQxe4N3m9Mv3JjjKO4cG7DY="; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + # remove when built with >= go 1.17 + buildFlags = [ "-tags" "zip117" ]; + + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; excludedPackages = [ "kobotest" ]; diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix index 5bb4f41a5de..126d5bd4c49 100644 --- a/pkgs/tools/misc/latex2html/default.nix +++ b/pkgs/tools/misc/latex2html/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "latex2html"; - version = "2021"; + version = "2021.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-n7VbK/S9EkWxb4fbIXp3tIfX7N+9bvZ/odBylqTuzUU="; + sha256 = "sha256-WxMB70TeN53S6PNYDUVZ7lBKw7DvKnJDiHek9/GUYcA="; }; buildInputs = [ ghostscript netpbm perl ]; diff --git a/pkgs/tools/misc/mslink/default.nix b/pkgs/tools/misc/mslink/default.nix index 56354ff2527..6db1ae3275c 100644 --- a/pkgs/tools/misc/mslink/default.nix +++ b/pkgs/tools/misc/mslink/default.nix @@ -1,9 +1,9 @@ -{ stdenv +{ gccStdenv , lib , fetchurl }: -stdenv.mkDerivation rec { +gccStdenv.mkDerivation rec { pname = "mslink"; version = "1.3"; @@ -17,6 +17,9 @@ stdenv.mkDerivation rec { ''; installPhase = '' + if [[ "$(uname)" == "Darwin" ]]; then + mv mslink.exe mslink + fi install -D mslink $out/bin/mslink ''; diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 1237645ebae..66429f338ac 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ncdu"; - version = "1.15.1"; + version = "1.16"; src = fetchurl { url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz"; - sha256 = "1c1zxalm5asyhn4p1hd51h7khw17515gbqmvdz63kc8xpx6xqbdh"; + sha256 = "1m0gk09jaz114piidiw8fkg0id5l6nhz1cg5nlaf1yl3l595g49b"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index a80fdd56864..6e7484a7e40 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -1,18 +1,26 @@ -{ fetchFromGitHub, rustPlatform, lib, stdenv, fetchpatch -, CoreFoundation, libiconv, libresolv, Security }: +{ fetchFromGitHub +, rustPlatform +, lib +, stdenv +, fetchpatch +, CoreFoundation +, libiconv +, libresolv +, Security +}: rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.9.1"; + version = "2.10.2"; src = fetchFromGitHub { owner = "o2sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-owa+HmzMXpLR7H1FssW4gQiVAQGJRXhcitgJj6pxJRc="; + sha256 = "sha256-lrRp01ZeK9bGn7L7SqAxJAU9qugpHnC06CWChhVPGGQ="; }; - cargoSha256 = "sha256-Bn2FlRESuW83ouGPiBwvGkIB0uCDDG0hdhRfRBks/0Q="; + cargoSha256 = "sha256-vNa1OF1x/MCTo9B4DTDZNWyHTsOl7Za3EgjnpsL/gWg="; buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation libiconv libresolv Security ]; @@ -20,6 +28,6 @@ rustPlatform.buildRustPackage rec { description = "Git repository summary on your terminal"; homepage = "https://github.com/o2sh/onefetch"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne kloenk ]; + maintainers = with maintainers; [ Br1ght0ne kloenk SuperSandro2000 ]; }; } diff --git a/pkgs/tools/misc/pdd/default.nix b/pkgs/tools/misc/pdd/default.nix index 916f15c94c6..8403a6c2575 100644 --- a/pkgs/tools/misc/pdd/default.nix +++ b/pkgs/tools/misc/pdd/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonApplication, dateutil }: +{ lib, fetchFromGitHub, buildPythonApplication, python-dateutil }: buildPythonApplication rec { pname = "pdd"; @@ -13,7 +13,7 @@ buildPythonApplication rec { format = "other"; - propagatedBuildInputs = [ dateutil ]; + propagatedBuildInputs = [ python-dateutil ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/misc/piston-cli/default.nix b/pkgs/tools/misc/piston-cli/default.nix index ec77007804b..5e1ca0242bc 100644 --- a/pkgs/tools/misc/piston-cli/default.nix +++ b/pkgs/tools/misc/piston-cli/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "qvDGVJcaMXUajdUQWl4W1dost8k0PsS9XX/o8uQrtfY="; }; - propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments pyyaml ]; + propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments pyyaml more-itertools ]; checkPhase = '' $out/bin/piston --help > /dev/null diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/tools/misc/pubs/default.nix index 3b6df828fda..36afc1d4cbb 100644 --- a/pkgs/tools/misc/pubs/default.nix +++ b/pkgs/tools/misc/pubs/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - argcomplete dateutil configobj feedparser bibtexparser pyyaml requests six + argcomplete python-dateutil configobj feedparser bibtexparser pyyaml requests six beautifulsoup4 ]; diff --git a/pkgs/tools/misc/qmk/default.nix b/pkgs/tools/misc/qmk/default.nix index 40e5d4d23ae..3fa088d8e2b 100644 --- a/pkgs/tools/misc/qmk/default.nix +++ b/pkgs/tools/misc/qmk/default.nix @@ -3,38 +3,59 @@ , fetchpatch }: -python3.pkgs.buildPythonApplication rec { +let + inherit (python3.pkgs) buildPythonApplication fetchPypi; +in +buildPythonApplication rec { pname = "qmk"; - version = "0.0.45"; + version = "0.0.52"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; - sha256 = "43f297f36b21d68c34c5efa0ce1449dddb2e28753f80939cadf761ee7a2a0901"; + sha256 = "sha256-mNF+bRhaL6JhNbROmjYDHkKKokRIALd5FZbRt9Kg5XQ="; }; - patches = [ - # https://github.com/qmk/qmk_cli/pull/48 - (fetchpatch { - name = "remove-unused-install-requires.patch"; - url = "https://github.com/qmk/qmk_cli/commit/75b6ada1feccfa5a9bc2bb07a4cc749ef40d02dd.patch"; - sha256 = "0lwi1dz35p07vha5gwq2jxm5q49vm99ix4jyhd6g6ypqbq1qiwc8"; - }) - ]; - nativeBuildInputs = with python3.pkgs; [ + flake8 + nose2 + pep8-naming setuptools-scm + yapf ]; propagatedBuildInputs = with python3.pkgs; [ + appdirs + argcomplete + colorama + dotty-dict + hid + hjson + jsonschema milc + pygments + pyusb ]; # no tests implemented doCheck = false; meta = with lib; { - description = "A program to help users work with QMK Firmware"; homepage = "https://github.com/qmk/qmk_cli"; + description = "A program to help users work with QMK Firmware"; + longDescription = '' + qmk_cli is a companion tool to QMK firmware. With it, you can: + + - Interact with your qmk_firmware tree from any location + - Use qmk clone to pull down anyone's qmk_firmware fork + - Setup and work with your build environment: + - qmk setup + - qmk doctor + - qmk compile + - qmk console + - qmk flash + - qmk lint + - ... and many more! + ''; license = licenses.mit; maintainers = with maintainers; [ bhipple ]; }; diff --git a/pkgs/tools/misc/tvnamer/default.nix b/pkgs/tools/misc/tvnamer/default.nix new file mode 100644 index 00000000000..204914c280c --- /dev/null +++ b/pkgs/tools/misc/tvnamer/default.nix @@ -0,0 +1,47 @@ +{ lib +, python3 +}: + +let + python' = python3.override { + packageOverrides = self: super: rec { + # tvdb_api v3.1.0 has a hard requirement on requests-cache < 0.6 + requests-cache = super.requests-cache.overridePythonAttrs (super: rec { + version = "0.5.2"; + src = self.fetchPypi { + inherit (super) pname; + inherit version; + sha256 = "sha256-gTAjJpaGBF+OAeIonMHn6a5asi3dHihJqQk6s6tycOs="; + }; + + # too many changes have been made to requests-cache based on version 0.6 so + # simply disable tests + doCheck = false; + }); + }; + }; + + pypkgs = python'.pkgs; + +in +pypkgs.buildPythonApplication rec { + pname = "tvnamer"; + version = "3.0.4"; + + src = pypkgs.fetchPypi { + inherit pname version; + sha256 = "dc2ea8188df6ac56439343630466b874c57756dd0b2538dd8e7905048f425f04"; + }; + + propagatedBuildInputs = with pypkgs; [ tvdb_api ]; + + # no tests from pypi + doCheck = false; + + meta = with lib; { + description = "Automatic TV episode file renamer, uses data from thetvdb.com via tvdb_api."; + homepage = "https://github.com/dbr/tvnamer"; + license = licenses.unlicense; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/tools/misc/ytmdl/default.nix b/pkgs/tools/misc/ytmdl/default.nix index 694ee44d5fa..9fe917d49aa 100644 --- a/pkgs/tools/misc/ytmdl/default.nix +++ b/pkgs/tools/misc/ytmdl/default.nix @@ -1,9 +1,10 @@ -{ lib, fetchFromGitHub, buildPythonApplication, ffmpeg, ffmpeg-python, musicbrainzngs, rich, simber -, pydes, youtube-search, unidecode, pyxdg, downloader-cli, beautifulsoup4, itunespy, mutagen, pysocks -, youtube-dl, ytmusicapi +{ lib +, fetchFromGitHub +, python3 +, ffmpeg }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "ytmdl"; version = "2021.06.26"; @@ -20,8 +21,7 @@ buildPythonApplication rec { ''; - propagatedBuildInputs = [ - ffmpeg + propagatedBuildInputs = with python3.pkgs; [ ffmpeg-python musicbrainzngs rich @@ -39,6 +39,10 @@ buildPythonApplication rec { ytmusicapi ]; + makeWrapperArgs = [ + "--prefix" "PATH" ":" (lib.makeBinPath [ ffmpeg ]) + ]; + # This application has no tests doCheck = false; @@ -46,7 +50,6 @@ buildPythonApplication rec { homepage = "https://github.com/deepjyoti30/ytmdl"; description = "YouTube Music Downloader"; license = licenses.mit; - platforms = platforms.all; maintainers = with maintainers; [ j0hax ]; }; } diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 67dce4c2e8b..bf8a1b8e4f8 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { pname = "amass"; - version = "3.11.2"; + version = "3.13.2"; src = fetchFromGitHub { owner = "OWASP"; @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-3J4yT7GTuVzkxMb+fCD3S9u0XBHa4Y0W+BnkDJ4PhWI="; }; - vendorSha256 = "sha256-8GzzihKhrf71lLKgb2i3NnmSctvKb95V5pOGoWAgclk="; + vendorSha256 = "0nbj41ha31lkwraxwvyavdr94y9nnxl6z85jjkszxbd12a5g6v7h"; outputs = [ "out" "wordlists" ]; diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index ab26a39035e..5c9abf57892 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.3.0"; + version = "0.4.0"; src = let @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { x86_64-darwin = "darwin_amd64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-vBXNDd9p9g1joBMcwt87uI/EIAeKa+QrndCh1kTwZyM="; - aarch64-linux = "sha256-Xompe1Q8Q3gAqpQQT04CWDx/f0Yc8HbnkZQbN+faB0g="; - x86_64-darwin = "sha256-cE4YrZPNAldCR31O3gI4W/y4RgV7+64yL15obb5uRcY="; + x86_64-linux = "sha256-xHvg2Kdm7hoJ7Dwh4pLXJE+EPcl9Zta/00IN3wRnOzU="; + aarch64-linux = "sha256-Kbr7tZjVcYiejy1CB9r10mqG+0serRx+mjPXds2/TJQ="; + x86_64-darwin = "sha256-a8e3gKTTsK5QRAYrB4/DtrFFGM2In73wKEcEMcbeUTI="; }; in fetchzip { diff --git a/pkgs/tools/networking/cloud-custodian/default.nix b/pkgs/tools/networking/cloud-custodian/default.nix index a57d9f13d78..c5e1f7527da 100644 --- a/pkgs/tools/networking/cloud-custodian/default.nix +++ b/pkgs/tools/networking/cloud-custodian/default.nix @@ -3,7 +3,7 @@ , boto3 , botocore , certifi -, dateutil +, python-dateutil , jsonpatch , jsonschema , pyyaml @@ -26,7 +26,7 @@ buildPythonApplication rec { boto3 botocore certifi - dateutil + python-dateutil jsonpatch jsonschema pyyaml diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index 96f806aad39..98925489e54 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgp"; - version = "2.28.0"; + version = "2.29.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-AlAfs1wi3hS7cqAtGqfUgv5CIonu7TmXWgxL1zSBh54="; + sha256 = "sha256-DhSIf8fAG2Zf0mwJ/iMgQU5sugHK2jJ6WJPbFbA/mhM="; }; vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY="; diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 8daa2f10d7e..e852fdb1c2d 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "kea"; - version = "1.9.8"; + version = "1.9.9"; src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-EAi1Ic3YEF0or37At48saKwmAczTwf5GtbEsQNopbl0="; + sha256 = "sha256-iVSWBR1+SkXlkwMii2PXpcxFSXYigz4lfNnMZBvS2kM="; }; patches = [ ./dont-create-var.patch ]; diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index 71ea50ea172..2a99c127acb 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -1,20 +1,34 @@ -{ lib, stdenv, fetchurl, glib, udev, libgudev, polkit, ppp, gettext, pkg-config -, libmbim, libqmi, systemd, vala, gobject-introspection, dbus }: +{ lib, stdenv, fetchurl, fetchpatch +, glib, udev, libgudev, polkit, ppp, gettext, pkg-config, python3 +, libmbim, libqmi, systemd, vala, gobject-introspection, dbus +}: stdenv.mkDerivation rec { pname = "modem-manager"; - version = "1.14.12"; + version = "1.16.6"; - package = "ModemManager"; src = fetchurl { - url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz"; - sha256 = "sha256-0QqXEZndwl3N8VbFasCOkWEsCVOdVlIueu1G1G5IO7E="; + url = "https://www.freedesktop.org/software/ModemManager/ModemManager-${version}.tar.xz"; + sha256 = "05wn94x71qr36avxjzvyf56nj5illynnf9nn15b17lv61wkbd41a"; }; + patches = [ + # Fix a broken test. + # https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/merge_requests/556 + (fetchpatch { + url = "https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/commit/a324667386f35df0c3b3bbf615fa0560d215485d.patch"; + sha256 = "1xj9gfl6spbp4xdp6gn76k8zvzam5m6lgmbiwdn6ixffzhlfwi5l"; + }) + ]; + nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ]; buildInputs = [ glib udev libgudev polkit ppp libmbim libqmi systemd ]; + installCheckInputs = [ + python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 + ]; + configureFlags = [ "--with-polkit" "--with-udev-base-dir=${placeholder "out"}/lib/udev" @@ -26,19 +40,29 @@ stdenv.mkDerivation rec { "--with-systemd-journal" ]; - preCheck = '' + postPatch = '' + patchShebangs tools/test-modemmanager-service.py + ''; + + # In Nixpkgs g-ir-scanner is patched to produce absolute paths, and + # that interferes with ModemManager's tests, causing them to try to + # load libraries from the install path, which doesn't usually exist + # when `make check' is run. So to work around that, we run it as an + # install check instead, when those paths will have been created. + doInstallCheck = true; + preInstallCheck = '' export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon" + patchShebangs tools/tests/test-wrapper.sh ''; + installCheckTarget = "check"; enableParallelBuilding = true; - doCheck = true; - meta = with lib; { description = "WWAN modem manager, part of NetworkManager"; homepage = "https://www.freedesktop.org/wiki/Software/ModemManager/"; license = licenses.gpl2Plus; - maintainers = [ ]; + maintainers = teams.freedesktop.members; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 15f6ff3dfa0..888d6a05c67 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, python_magic, dateutil }: +{ lib, buildPythonApplication, fetchFromGitHub, python_magic, python-dateutil }: buildPythonApplication rec { pname = "s3cmd"; @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "0p6mbgai7f0c12pkw4s7d649gj1f8hywj60pscxvj9jsna3iifhs"; }; - propagatedBuildInputs = [ python_magic dateutil ]; + propagatedBuildInputs = [ python_magic python-dateutil ]; dontUseSetuptoolsCheck = true; diff --git a/pkgs/tools/networking/stevenblack-blocklist/default.nix b/pkgs/tools/networking/stevenblack-blocklist/default.nix index 9edb878a53f..b8b04583108 100644 --- a/pkgs/tools/networking/stevenblack-blocklist/default.nix +++ b/pkgs/tools/networking/stevenblack-blocklist/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "3.7.11"; + version = "3.7.12"; in fetchFromGitHub { name = "stevenblack-blocklist-${version}"; @@ -9,7 +9,7 @@ fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; rev = version; - sha256 = "sha256-hoYh2FdZGY/4/QmrqZubJYHP3bBcnUQFR9C7dfVTnWE="; + sha256 = "sha256-hGaiIFHgsLb6oLJ4k4yfxqeDhK0W+diCAI5odo08Q0E="; meta = with lib; { description = "Unified hosts file with base extensions"; diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index f8b6c845a52..befc1c3c3ee 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "stunnel"; - version = "5.58"; + version = "5.59"; src = fetchurl { url = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "d4c14cc096577edca3f6a2a59c2f51869e35350b3988018ddf808c88e5973b79"; + sha256 = "sha256-E3d232vo8XAfHNWQt3eZMuEjR5+5HlGSFxwWeYgVzp8="; # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index f1fe0527639..6726e5b751a 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tcpdump"; - version = "4.99.0"; + version = "4.99.1"; src = fetchurl { url = "http://www.tcpdump.org/release/${pname}-${version}.tar.gz"; - sha256 = "0hmqh2fx8rgs9v1mk3vpywj61xvkifz260q685xllxr8jmxg3wlc"; + sha256 = "sha256-ebNphfsnAxRmGNh8Ss3j4Gi5HFU/uT8CGjN/F1/RDr4="; }; postPatch = '' diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix index 8228132b5c8..506869238e5 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/tools/networking/yggdrasil/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yggdrasil"; - version = "0.3.16"; + version = "0.4.0"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${version}"; - sha256 = "sha256-uUF0zkgtzdMZB/GKOtawjn7AQBkRoiAEj9nUUmpQSVQ="; + sha256 = "sha256-sMcbOTLdmAXp3U2XeNM0hrwOTjzr+9B6IvAaVbjhuFY="; }; - vendorSha256 = "sha256-619PSqd7pl3Akj/kzLQhDIp1adumBGhLrzQsZvMzC7w="; + vendorSha256 = "sha256-QQN8ePOQ7DT9KeuY4ohFuPtocuinh3Y3us6QMnCQ4gc="; doCheck = false; diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix index 6fa0dd38127..00b3a65be0d 100644 --- a/pkgs/tools/package-management/cargo-audit/default.nix +++ b/pkgs/tools/package-management/cargo-audit/default.nix @@ -1,19 +1,36 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security, libiconv }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, openssl +, pkg-config +, Security +, libiconv +}: + rustPlatform.buildRustPackage rec { pname = "cargo-audit"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "RustSec"; - repo = "cargo-audit"; - rev = "v${version}"; - sha256 = "sha256-apIhTgS7xzDGq2OE1o46bEQxGwkV7bTmzSxy85wHwyo="; + repo = "rustsec"; + rev = "cargo-audit%2Fv${version}"; + sha256 = "0pvb1m9277ysjzydjvx7viybi6bd23ch7sbjyx1wnz45ahrmia1j"; }; - cargoSha256 = "sha256-b4x5IxoT5KZnY6Pw3VEs/DuCPen6MlgQ2lSIxRDU+5U="; + cargoSha256 = "0cf8kg8vhfqbrkm227rzyl3394n7fsqhqgq13qks7374h5d04haw"; + + nativeBuildInputs = [ + pkg-config + ]; - buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ]; - nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + openssl + libiconv + ] ++ lib.optionals stdenv.isDarwin [ + Security + ]; # enables `cargo audit fix` cargoBuildFlags = [ "--features fix" ]; diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix index fe8f743c71c..beb04041861 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/tools/package-management/cargo-outdated/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.9.15"; + version = "0.9.17"; src = fetchFromGitHub { owner = "kbknapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Cd0QWFeAAHSkeCVQvb+Fsg5nBoutV1k1kQpMkWpci2E="; + sha256 = "sha256-Ian/vXGoPHecguQUp2IUgdLW6Ll8OdCA2W0WmoYPDrI="; }; - cargoSha256 = "sha256-VngJMDVKIV8+ODHia2U2gKKPKskyKiuKhSnO6NJsJHI="; + cargoSha256 = "sha256-eDu1dAs543AryUEsCY9COHrvuamQocCk0nBXDIdFmYs="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index bfe003c4890..aeb18f2efde 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "sunng87"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "sha256-hEpPRAUPHz9lDTJLyDMUAS+dH6hlppvi3Bb3ahnYW9U="; + sha256 = "sha256-+vQXaI6v8HXzsfXZFxmBJe+1u9nmW0z3SBjo38orJYA="; }; - cargoSha256 = "sha256-tOiralZWA21HBTxYWVB1LZH2ArfgY7HB45dVqHoXe/Q="; + cargoSha256 = "sha256-Zcg1MAAESD6qrh7domslisT2wG4ZaYyZtPCQ5IQrLVo="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix index ae01601dde4..af83d04e811 100644 --- a/pkgs/tools/package-management/nix-doc/default.nix +++ b/pkgs/tools/package-management/nix-doc/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "nix-doc"; - version = "0.3.3"; + version = "0.5.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "lf-"; repo = "nix-doc"; - sha256 = "0vd7159y5w8jjgaw51kfr3z3r50299gvw7vjchpqx3nwmdink8bh"; + sha256 = "1s0nlbn5fcgqfns8gpx3i87k5qivd8ar59rklvd7fbn6ckrmzi6m"; }; doCheck = true; @@ -16,11 +16,11 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "0xsy13yxm8vblab73gynb781ya168w66c32i1lyv0ns1lnz61dmh"; + cargoSha256 = "0xmw3fyic0fcg7a6z8dr3lv367bxqdhdrlrl2hhlz59xg5kq8b3f"; meta = with lib; { description = "An interactive Nix documentation tool"; - longDescription = "An interactive Nix documentation tool providing a CLI for function search and a Nix plugin for docs in the REPL"; + longDescription = "An interactive Nix documentation tool providing a CLI for function search, a Nix plugin for docs in the REPL, and a ctags implementation for Nix script"; homepage = "https://github.com/lf-/nix-doc"; license = licenses.lgpl3; maintainers = [ maintainers.lf- ]; diff --git a/pkgs/tools/package-management/nixops/azure-storage/default.nix b/pkgs/tools/package-management/nixops/azure-storage/default.nix index 6693a7464d4..c6f3d71e98e 100644 --- a/pkgs/tools/package-management/nixops/azure-storage/default.nix +++ b/pkgs/tools/package-management/nixops/azure-storage/default.nix @@ -4,7 +4,7 @@ , python , azure-common , futures -, dateutil +, python-dateutil , requests , isPy3k }: @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb"; }; - propagatedBuildInputs = [ azure-common dateutil requests ] + propagatedBuildInputs = [ azure-common python-dateutil requests ] ++ pkgs.lib.optionals (!isPy3k) [ futures ]; postInstall = '' diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index e15618da3f1..20735c6e578 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "age"; - version = "1.0.0-rc.1"; - vendorSha256 = "1qx6pkhq00y0lsi6f82g8hxxh65zk1c0ls91ap6hdlj7ch79bhl2"; + version = "1.0.0-rc.3"; + vendorSha256 = "sha256-sXUbfxhPmJXO+KgV/dmWmsyV49Pb6CoJLbt50yVgEvI="; src = fetchFromGitHub { owner = "FiloSottile"; repo = "age"; rev = "v${version}"; - sha256 = "1n25wip4qnd3v9ial1apc2ybx10b9z6lwz7flyss6kvj3x5g9jd1"; + sha256 = "sha256-YXdCTK9/eMvcHWg7gQQiPlLWYx2OjbOJDDNdSYO09HU="; }; meta = with lib; { diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index daddf9a71b6..39756c9e9a7 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -17,11 +17,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.26.4"; + x86_64-linux = "1.27.0"; }.${system} or ""; sha256 = { - x86_64-linux = "sha256-PYqLf1Y3SwPFjq8JJMxHrKWKuCqbVpmzugi3DjRNWUg="; + x86_64-linux = "sha256-Ik+g7jkTBHRbGwDhbiJGQorMmt6GhCXVUd82Sug9a28="; }.${system} or ""; meta = with lib; { diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix index e92fe7b951f..6ef07c2c355 100644 --- a/pkgs/tools/security/cfssl/default.nix +++ b/pkgs/tools/security/cfssl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cfssl"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cfssl"; rev = "v${version}"; - sha256 = "1yzxz2l7h2d3f8j6l9xlm7g9659gsa17zf4q0883s0jh3l3xgs5n"; + sha256 = "sha256-29HEaW5LCoHcuJrfVUN2hnsRtaSTrvIBo8ok2UJbfuQ="; }; subPackages = [ diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/tools/security/chkrootkit/default.nix index 338df2c2d1c..b365fa62f95 100644 --- a/pkgs/tools/security/chkrootkit/default.nix +++ b/pkgs/tools/security/chkrootkit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "chkrootkit"; - version = "0.54"; + version = "0.55"; src = fetchurl { url = "ftp://ftp.pangeia.com.br/pub/seg/pac/${pname}-${version}.tar.gz"; - sha256 = "01snj54hhgiqzs72hzabq6abcn46m1yckjx7503vcggm45lr4k0m"; + sha256 = "sha256-qBwChuxEkxP5U3ASAqAOgbIE/Cz0PieFhaEcEqXgJYs="; }; # TODO: a lazy work-around for linux build failure ... diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index ded48ffb273..bfcd1f81768 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-06-29"; + version = "2021-07-03"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-RF7+fo6I7rz7PTSHRDikeRpM0f4Bugn+Tt5Z7mjIKIM="; + sha256 = "sha256-q+p4OnDs7T4bfCgKg4KBRwNyutULSItFATBE/ECG8N4="; }; installPhase = '' diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index b2ef8d8354b..094aab1e86d 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitHub { owner = "CISOfy"; repo = pname; rev = version; - sha256 = "sha256-/pF1V8ZsylQOCW7K/O0R3HYYDdsdNDVmmUar21EzpcQ="; + sha256 = "sha256-IJCLj3iSPkfkYOqTu7adtU26jTgKfRmiwIfKvSApdIY="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 9f0af308cfb..79f85f2b375 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.49" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.51" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index ce054a6a480..8248f6e8181 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 2e07122e80d8ae23e6aa53ae0fcb9dfca6639c59 - ref: refs/tags/6.0.49 + revision: d9aeac3fea255c475f553be4c55f3ae7cefc8542 + ref: refs/tags/6.0.51 specs: - metasploit-framework (6.0.49) + metasploit-framework (6.0.51) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -55,6 +55,7 @@ GIT rb-readline recog redcarpet + reline (= 0.2.5) rex-arch rex-bin_tools rex-core @@ -125,13 +126,13 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.469.0) - aws-sdk-core (3.114.3) + aws-partitions (1.473.0) + aws-sdk-core (3.115.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.244.0) + aws-sdk-ec2 (1.246.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.55.0) @@ -155,7 +156,7 @@ GEM cookiejar (0.3.3) crass (1.0.6) daemons (1.4.0) - dnsruby (1.61.5) + dnsruby (1.61.7) simpleidn (~> 0.1) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) @@ -172,7 +173,7 @@ GEM eventmachine (1.2.7) faker (2.18.0) i18n (>= 1.6, < 2) - faraday (1.4.2) + faraday (1.4.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -198,8 +199,8 @@ GEM i18n (1.8.10) concurrent-ruby (~> 1.0) io-console (0.5.9) - irb (1.3.5) - reline (>= 0.1.5) + irb (1.3.6) + reline (>= 0.2.5) jmespath (1.4.0) jsobfu (0.4.2) rkelly-remix @@ -344,7 +345,7 @@ GEM rex-socket rex-text rex-struct2 (0.1.3) - rex-text (0.2.34) + rex-text (0.2.35) rex-zip (0.1.4) rex-text rexml (3.2.5) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index b8ad99b9178..c48c5e1690e 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.50"; + version = "6.0.51"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-ZtIpkUt3jIhe4st8JlxE0rvLe6P+QBGdjyTL13Avwj0="; + sha256 = "sha256-ICVF4GVOyCq7dUAvzUUzhG+NuEiHSFvVWbQ8tAqUFFg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 7f43161b5be..b52bff8aa8b 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -114,30 +114,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xh65jmz3s12kfi7ij0j89d638nzdvq4z6dq9amzgmiw09ycvdbr"; + sha256 = "1dw05k0l63lm631lwg5b1bx1nhkirds4rbc1v98bliwfjk5wf71a"; type = "gem"; }; - version = "1.469.0"; + version = "1.473.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10wk5y4flc04cc42cmcfgr9sj67mz4582d45xmll56mpz4cw5cfc"; + sha256 = "06cs5wj4njb2ivhv06v5d7rgy1i2g67a93c0kxly8h7fkkxh315q"; type = "gem"; }; - version = "3.114.3"; + version = "3.115.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xnpxgcmacmqs98swlv3qkg7svpwydb1kqsngqciyg3jddzxrzp6"; + sha256 = "0n3m2a8jnk64ai4wb1wh1a77i8c561ncjklvp650w8723avbj5bq"; type = "gem"; }; - version = "1.244.0"; + version = "1.246.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -274,10 +274,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q7k7wn8flcdr0kzgknq40cjddd0zn3g3n4gwwwdz0kq30pinzxx"; + sha256 = "1pbhj4xmj4262in6c1nwl5ssw0qypg8ysjrrkwn2akkzbxzy9rfq"; type = "gem"; }; - version = "1.61.5"; + version = "1.61.7"; }; domain_name = { groups = ["default"]; @@ -354,10 +354,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07mhk70gv453pg38md346470hknyhipdqppnplq706ll3k3lzb7v"; + sha256 = "0zmdsl6n05khwwq8gjssmfca0ifz6q82wwghf1qyzbxxjdna5mly"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.3"; }; faraday-em_http = { groups = ["default"]; @@ -494,10 +494,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06i0izb1jm4ijydwk9w2jqyvz72aznaa1b386769yfi8284cnwj6"; + sha256 = "0s4yjh5p1n05cm3pglh3g4ssrgy67x2bn3bsl0sydbm8mlf3xivr"; type = "gem"; }; - version = "1.3.5"; + version = "1.3.6"; }; jmespath = { groups = ["default"]; @@ -574,12 +574,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "2e07122e80d8ae23e6aa53ae0fcb9dfca6639c59"; - sha256 = "0zxyr1r88qslw6ypjqxx188vhmikl94fmkcdg3phm8r71qa375da"; + rev = "d9aeac3fea255c475f553be4c55f3ae7cefc8542"; + sha256 = "0n0ljh5b8g5lb7amnj4792w8svw46d2wsbs0fnxjmj2fcph4a990"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.49"; + version = "6.0.51"; }; metasploit-model = { groups = ["default"]; @@ -1156,10 +1156,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01g6jr73c3hbqhmzlc80jlqz2cwn9bq1j3cc19fpkq3hdg89drjp"; + sha256 = "0idgw5z813h5dp82n07g5ldpyfnk7mhvnzl87d9fpy6invixnnbq"; type = "gem"; }; - version = "0.2.34"; + version = "0.2.35"; }; rex-zip = { groups = ["default"]; diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix index 96616987510..17ecdee6d30 100644 --- a/pkgs/tools/security/rbw/default.nix +++ b/pkgs/tools/security/rbw/default.nix @@ -21,15 +21,15 @@ rustPlatform.buildRustPackage rec { pname = "rbw"; - version = "1.2.0"; + version = "1.3.0"; src = fetchCrate { inherit version; crateName = pname; - sha256 = "14cnqc5cf6qm2g9ypv2pbqbvymawyrqn3fc778labgqg24khqcyq"; + sha256 = "17x4q29rsljbalc70r3ks4r6g5zc6jl4si75i33fcicxsvx6f39q"; }; - cargoSha256 = "0izn5bcvk1rx69sjwyfc49nmvw7k0jysqb0bpdpwdliaa06ggl86"; + cargoSha256 = "14095ds8f5knrqcriphjlbvasc29n9rf8h5vlkmhpxyk7wh9azzc"; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/security/sipvicious/default.nix b/pkgs/tools/security/sipvicious/default.nix index 8403019a341..1167d40e432 100644 --- a/pkgs/tools/security/sipvicious/default.nix +++ b/pkgs/tools/security/sipvicious/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "sipvicious"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "EnableSecurity"; repo = pname; rev = "v${version}"; - sha256 = "17f6w7qh33zvlhqwf22y9y7skha0xjs46yk66q8xm4brsv4lfxxa"; + sha256 = "sha256-O8/9Vz/u8BoF1dfGceOJdzPPYLfkdBp2DkwA5WQ3dgo="; }; # Project has no tests diff --git a/pkgs/tools/security/sn0int/default.nix b/pkgs/tools/security/sn0int/default.nix index 5d1244e8619..43a39010441 100644 --- a/pkgs/tools/security/sn0int/default.nix +++ b/pkgs/tools/security/sn0int/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "sn0int"; - version = "0.21.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LjNOaqYGlhF0U+YxoLLmmXgxPa8f+t9BSm+qO23waaI="; + sha256 = "sha256-BKdi/o/A0fJBlcKTDTCX7uGkK6QR0S9hIn0DI3CN5Gg="; }; - cargoSha256 = "sha256-ruK+qDIqrltNcErBnrcHdPfVKmwPwiPfq42A/el206c="; + cargoSha256 = "sha256-MeMTXwb5v4iUJQSViOraXAck7n6VlIW2Qa0qNUZWu1g="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index 29762fc527c..4bd7a3ff221 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "sslscan"; - version = "2.0.9"; + version = "2.0.10"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; rev = version; - sha256 = "0594svwz4pya0syibar0ahmi5zdjbwd5kg6hrlhfpmmslrsyli6m"; + sha256 = "sha256-L6cNmvR6zy2tkMHh+LBsQ3VZDUr0tD5AlOEj+dTLV5k="; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index 36ccb89dcfe..5fd0578bc87 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -1,22 +1,22 @@ -{ buildGoModule +{ lib +, buildGoModule , fetchFromGitHub -, lib }: buildGoModule rec { pname = "terrascan"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P16CS1W42Q/glsB9G0kagB5oSgwLb5cGMvKFc9jzd8s="; + sha256 = "sha256-eCkinYJtZNf5Fo+LXu01cHRInA9CfDONvt1OIs3XJSk="; }; - vendorSha256 = "sha256-22T7C4/ph3z+O1c9uC1p2xzg0JFV+TEdfy4iiIS4Y40="; + vendorSha256 = "sha256-eez/g0Np/vnSO6uvUA8vtqR3DEaKlBo6lyd9t25LE7s="; - # tests want to download a vulnerable Terraform project + # Tests want to download a vulnerable Terraform project doCheck = false; meta = with lib; { diff --git a/pkgs/tools/security/traitor/default.nix b/pkgs/tools/security/traitor/default.nix index 2da9262709a..e056b556aad 100644 --- a/pkgs/tools/security/traitor/default.nix +++ b/pkgs/tools/security/traitor/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "traitor"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "liamg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UuWJe4nVr87ab3yskqKxnclMg9EywlcgaM/WOREXD/c="; + sha256 = "sha256-eUeKkjSpKel6XH3/VVw/WPCG/Nq8BcZwMNFG9z9FUuU="; }; vendorSha256 = null; diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/vaultwarden/default.nix index 2790a643499..4342c8f3ac9 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, nixosTests +{ lib, stdenv, rustPlatform, fetchFromGitHub, fetchurl, nixosTests , pkg-config, openssl , libiconv, Security, CoreServices , dbBackend ? "sqlite", libmysqlclient, postgresql }: @@ -7,16 +7,18 @@ let featuresFlag = "--features ${dbBackend}"; in rustPlatform.buildRustPackage rec { - pname = "bitwarden_rs"; - version = "1.20.0"; + pname = "vaultwarden"; + version = "1.22.1"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "1ncy4iwmdzdp8rv1gc5i4s1rp97d94n4l4bh08v6w4zdpx0zn8b9"; + sha256 = "sha256-aXbnNO3mTAgE1yNx7YVDo1vPpO8ACZpBGHQ633fNZ3k="; }; + cargoSha256 = "sha256-SFzq3OU0a0s3zlEzUkqGdZb/knYafqDamLy4ghH4i8I="; + nativeBuildInputs = [ pkg-config ]; buildInputs = with lib; [ openssl ] ++ optionals stdenv.isDarwin [ libiconv Security CoreServices ] @@ -25,7 +27,6 @@ in rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; - cargoSha256 = "0vdi792bzqxj8g215r9r5anzs4qhqsm6sjzwpj1l9861bn7j4xsz"; cargoBuildFlags = [ featuresFlag ]; checkPhase = '' @@ -35,11 +36,11 @@ in rustPlatform.buildRustPackage rec { runHook postCheck ''; - passthru.tests = nixosTests.bitwarden; + passthru.tests = nixosTests.vaultwarden; meta = with lib; { description = "Unofficial Bitwarden compatible server written in Rust"; - homepage = "https://github.com/dani-garcia/bitwarden_rs"; + homepage = "https://github.com/dani-garcia/vaultwarden"; license = licenses.gpl3Only; maintainers = with maintainers; [ msteen ]; }; diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/vaultwarden/vault.nix index 2b0855b821d..49e7cc4f3ba 100644 --- a/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/pkgs/tools/security/vaultwarden/vault.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, nixosTests }: stdenv.mkDerivation rec { - pname = "bitwarden_rs-vault"; + pname = "vaultwarden-vault"; version = "2.19.0"; src = fetchurl { @@ -10,16 +10,16 @@ stdenv.mkDerivation rec { }; buildCommand = '' - mkdir -p $out/share/bitwarden_rs/ - cd $out/share/bitwarden_rs/ + mkdir -p $out/share/vaultwarden/ + cd $out/share/vaultwarden/ tar xf $src mv web-vault vault ''; - passthru.tests = nixosTests.bitwarden; + passthru.tests = nixosTests.vaultwarden; meta = with lib; { - description = "Integrates the web vault into bitwarden_rs"; + description = "Integrates the web vault into vaultwarden"; homepage = "https://github.com/dani-garcia/bw_web_builds"; platforms = platforms.all; license = licenses.gpl3Plus; diff --git a/pkgs/tools/system/fancy-motd/default.nix b/pkgs/tools/system/fancy-motd/default.nix index a009fe1423b..2c30e7e9348 100644 --- a/pkgs/tools/system/fancy-motd/default.nix +++ b/pkgs/tools/system/fancy-motd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fancy-motd"; - version = "unstable-2021-06-27"; + version = "unstable-2021-07-04"; src = fetchFromGitHub { owner = "bcyran"; repo = pname; - rev = "839320ab261612c9ba5b13fc8d1445d094ea0ab3"; - sha256 = "00wv7nk2f3q186z2qfks5salf97s04vk7ilk8jnbimxg4fl7hcda"; + rev = "2cc3c3c164ef695c9dd465beca61716a364db32c"; + sha256 = "003p5rsyl216xwldrk8slpnzw6wdrcm8hpfdgy9a0mja5g1xdqzr"; }; buildInputs = [ bc curl figlet fortune gawk iproute2 ]; diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index ac980e6c36c..de9afdae294 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { description = "System management interface for AMD GPUs supported by ROCm"; homepage = "https://github.com/RadeonOpenCompute/ROC-smi"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 2e1c4e3a1fa..8065355383a 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.12.04"; + version = "0.12.11"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-tONL2o207TfjO3qGG8Bq13y70jTWMjbaLLWPAuPzIY4="; + sha256 = "sha256-lxOTB1Mhwkw9V2ms+rtwWRHR9BHO1ZN7fP6lhSjBtOY="; }; postPatch = '' diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/tools/system/tm/default.nix index aa946c72ffc..19ade9b929c 100644 --- a/pkgs/tools/system/tm/default.nix +++ b/pkgs/tools/system/tm/default.nix @@ -1,26 +1,28 @@ -{lib, stdenv, fetchurl}: +{ lib +, stdenv +, fetchurl +}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { + pname = "tm"; + version = "0.4.1"; - name = "tm-0.4.1"; + src = fetchurl { + url = "https://vicerveza.homeunix.net/~viric/soft/tm/tm-${version}.tar.gz"; + sha256 = "3b389bc03b6964ad5ffa57a344b891fdbcf7c9b2604adda723a863f83657c4a0"; + }; - installPhase=''make install "PREFIX=$out"''; + makeFlags = [ "PREFIX=$(out)" ]; - patchPhase = '' + postPatch = '' sed -i 's@/usr/bin/install@install@g ; s/gcc/cc/g' Makefile ''; - src = fetchurl { - url = "http://vicerveza.homeunix.net/~viric/soft/tm/tm-0.4.1.tar.gz"; - sha256 = "3b389bc03b6964ad5ffa57a344b891fdbcf7c9b2604adda723a863f83657c4a0"; - }; - meta = with lib; { - homepage = "http://vicerveza.homeunix.net/~viric/soft/tm"; description = "Terminal mixer - multiplexer for the i/o of terminal applications"; - license = licenses.gpl2; + homepage = "http://vicerveza.homeunix.net/~viric/soft/tm"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ viric ]; platforms = platforms.all; }; - } diff --git a/pkgs/tools/text/hottext/default.nix b/pkgs/tools/text/hottext/default.nix index 6d361f50f35..2e9d0a909a2 100644 --- a/pkgs/tools/text/hottext/default.nix +++ b/pkgs/tools/text/hottext/default.nix @@ -67,7 +67,7 @@ in stdenv.mkDerivation rec { nimFlags = [ "-d:release" ] ++ map (lib: "--path:${lib}/src") nimLibs; - HOTTEXT_FONT_PATH = "${gentium}/share/fonts/truetype/GentiumPlus-R.ttf"; + HOTTEXT_FONT_PATH = "${gentium}/share/fonts/truetype/GentiumPlus-Regular.ttf"; buildPhase = '' runHook preBuild diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 810e3feaa22..791d779bf83 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "LanguageTool"; - version = "5.3"; + version = "5.4"; src = fetchzip { url = "https://www.languagetool.org/download/${pname}-${version}.zip"; - sha256 = "1km20ajqb65vkhkrf94zy5srcss66ix8padp7ng59pa8pj11wmi2"; + sha256 = "sha256-2khadADfzwkW+J0uafPWJ6xUQRSQDm8seiBHueQGmKI="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 6f6750b1b02..e298a56c58c 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , rustPlatform , pkg-config @@ -11,19 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "0.22.2"; + version = "0.23.0"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "mdcat-${version}"; - hash = "sha256-i36MYTMkbSuWxxlWUDsyYMay/4Mg7M5jEFhHM60UrkM="; + hash = "sha256-bGXuYGQyrXa9gUEQfB7BF9K04z88r1UoM8R5gpL2nRM="; }; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; - buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + buildInputs = [ openssl ] + ++ lib.optional stdenv.isDarwin Security; - cargoSha256 = "sha256-y9yg4EQDL+RcD6NI7n6W/Hi6Tw4Wr1Kf6hbcIuidIf4="; + cargoSha256 = "sha256-hmv4LNk7NEYjT/5XXUpMd+xGS19KHOW+HIgsiFEWeig="; checkInputs = [ ansi2html ]; # Skip tests that use the network and that include files. @@ -32,6 +34,7 @@ rustPlatform.buildRustPackage rec { "--skip magic::tests::detect_mimetype_of_magic_param_bytes_max_length" "--skip magic::tests::detect_mimetype_of_png_image" "--skip magic::tests::detect_mimetype_of_svg_image" + "--skip resources::tests::read_url_with_http_url_fails_when_size_limit_is_exceeded" "--skip resources::tests::read_url_with_http_url_fails_when_status_404" "--skip resources::tests::read_url_with_http_url_returns_content_when_status_200" "--skip iterm2_tests_render_md_samples_images_md" @@ -48,6 +51,6 @@ rustPlatform.buildRustPackage rec { description = "cat for markdown"; homepage = "https://github.com/lunaryorn/mdcat"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ davidtwco ]; + maintainers = with maintainers; [ davidtwco SuperSandro2000 ]; }; } diff --git a/pkgs/tools/text/num-utils/default.nix b/pkgs/tools/text/num-utils/default.nix new file mode 100644 index 00000000000..14784a4e8cf --- /dev/null +++ b/pkgs/tools/text/num-utils/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + pname = "num-utils"; + version = "0.5"; + + src = fetchurl { + url = "https://suso.suso.org/programs/num-utils/downloads/num-utils-${version}.tar.gz"; + sha256 = "0kn6yskjww2agcqvas5l2xp55mp4njdxqkdicchlji3qzih2fn83"; + }; + + buildInputs = [ perl ]; + + patchPhase = '' + substituteInPlace Makefile --replace "-o 0 -g 0" "" --replace "\$(RPMDIR)" "" + ''; + makeFlags = [ + "TOPDIR=${placeholder "out"}" + "PERL=${perl}/bin/perl" + ]; + + meta = with lib; { + description = "Programs for dealing with numbers from the command line"; + homepage = "https://suso.suso.org/xulu/Num-utils"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.catern ]; + }; +} diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix index 1536e72ad29..009150062db 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/tools/text/sd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }: rustPlatform.buildRustPackage rec { @@ -14,8 +14,17 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1iwgy9zzdxay6hb9pz47jchy03jrsy5csxijlq4i228qhqnvq1lr"; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + preFixup = '' + installManPage $releaseDir/build/sd-*/out/sd.1 + + installShellCompletion $releaseDir/build/sd-*/out/sd.{bash,fish} + installShellCompletion --zsh $releaseDir/build/sd-*/out/_sd + ''; + meta = with lib; { description = "Intuitive find & replace CLI (sed alternative)"; homepage = "https://github.com/chmln/sd"; diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock index 4e321311f28..3240f65167e 100644 --- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock +++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock @@ -5,15 +5,15 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) afm (0.2.2) - asciidoctor (2.0.12) - asciidoctor-diagram (2.1.0) + asciidoctor (2.0.15) + asciidoctor-diagram (2.1.2) asciidoctor (>= 1.5.7, < 3.x) - asciidoctor-diagram-ditaamini (~> 0.13) + asciidoctor-diagram-ditaamini (~> 1.0.0) asciidoctor-diagram-plantuml (~> 1.2021) rexml - asciidoctor-diagram-ditaamini (0.13.1) - asciidoctor-diagram-plantuml (1.2021.0) - asciidoctor-epub3 (1.5.0.alpha.19) + asciidoctor-diagram-ditaamini (1.0.0) + asciidoctor-diagram-plantuml (1.2021.7) + asciidoctor-epub3 (1.5.1) asciidoctor (>= 1.5.6, < 3.0.0) gepub (~> 1.0.0) mime-types (~> 3.0) @@ -21,67 +21,66 @@ GEM asciidoctor (~> 2.0) asciimath (~> 2.0) mathematical (~> 1.6.0) - asciidoctor-pdf (1.5.4) - asciidoctor (>= 1.5.3, < 3.0.0) - concurrent-ruby (~> 1.1.0) - prawn (~> 2.2.0) - prawn-icon (~> 2.5.0) - prawn-svg (~> 0.31.0) + asciidoctor-pdf (1.6.0) + asciidoctor (~> 2.0) + concurrent-ruby (~> 1.1) + prawn (~> 2.4.0) + prawn-icon (~> 3.0.0) + prawn-svg (~> 0.32.0) prawn-table (~> 0.2.0) prawn-templates (~> 0.1.0) safe_yaml (~> 1.0.0) - thread_safe (~> 0.3.0) treetop (~> 1.6.0) - ttfunk (~> 1.5.0, >= 1.5.1) asciidoctor-revealjs (4.1.0) asciidoctor (>= 2.0.0, < 3.0.0) concurrent-ruby (~> 1.0) thread_safe (~> 0.3.5) asciimath (2.0.2) coderay (1.1.3) - concurrent-ruby (1.1.8) + concurrent-ruby (1.1.9) css_parser (1.9.0) addressable gepub (1.0.13) nokogiri (>= 1.8.2, < 1.12) rubyzip (> 1.1.1, < 2.4) hashery (2.1.2) - i18n (1.8.9) + i18n (1.8.10) concurrent-ruby (~> 1.0) mathematical (1.6.14) ruby-enum (~> 0.4) mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2021.0225) - mini_portile2 (2.5.0) - nokogiri (1.11.1) + mini_portile2 (2.5.3) + nokogiri (1.11.7) mini_portile2 (~> 2.5.0) racc (~> 1.4) - pdf-core (0.7.0) - pdf-reader (2.4.2) + pdf-core (0.9.0) + pdf-reader (2.5.0) Ascii85 (~> 1.0) afm (~> 0.2.1) hashery (~> 2.0) ruby-rc4 ttfunk polyglot (0.3.5) - prawn (2.2.2) - pdf-core (~> 0.7.0) - ttfunk (~> 1.5) - prawn-icon (2.5.0) + prawn (2.4.0) + pdf-core (~> 0.9.0) + ttfunk (~> 1.7) + prawn-icon (3.0.0) prawn (>= 1.1.0, < 3.0.0) - prawn-svg (0.31.0) + prawn-svg (0.32.0) css_parser (~> 1.6) prawn (>= 0.11.1, < 3) + rexml (~> 3.2) prawn-table (0.2.2) prawn (>= 1.3.0, < 3.0.0) prawn-templates (0.1.2) pdf-reader (~> 2.0) prawn (~> 2.2) public_suffix (4.0.6) - pygments.rb (2.1.0) + pygments.rb (2.2.0) racc (1.5.2) - rexml (3.2.4) + rexml (3.2.5) rouge (3.26.0) ruby-enum (0.9.0) i18n @@ -91,7 +90,7 @@ GEM thread_safe (0.3.6) treetop (1.6.11) polyglot (~> 0.3) - ttfunk (1.5.1) + ttfunk (1.7.0) PLATFORMS ruby diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix index 19106214c26..6fe57ff4856 100644 --- a/pkgs/tools/typesetting/asciidoctor/gemset.nix +++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix @@ -35,10 +35,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gjk9v83vw0pz4x0xqqnw231z9sgscm6vnacjw7hy5njkw8fskj9"; + sha256 = "0k3lijm4dmiz977bfmpclk5glj5jwv7bidamwwwywm60ywb0n4n4"; type = "gem"; }; - version = "2.0.12"; + version = "2.0.15"; }; asciidoctor-diagram = { dependencies = ["asciidoctor" "asciidoctor-diagram-ditaamini" "asciidoctor-diagram-plantuml" "rexml"]; @@ -46,30 +46,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fh73k306q1x4rzsly2fy1rdq1kpkdvs3r1084hgk0sh516ksc0s"; + sha256 = "09ci775f7y7d6spn0fl5wfmfyxianjp4z0p3fwcrzajy63f381v9"; type = "gem"; }; - version = "2.1.0"; + version = "2.1.2"; }; asciidoctor-diagram-ditaamini = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08jwpyklcplmfcxs4z9z0b0la6xdwrnf9bk6c02y54502228bg6b"; + sha256 = "1frnjz0j00v5hqp5macgnn6jq77jcpjy2l6hqmn5jn5ds7bmi2rl"; type = "gem"; }; - version = "0.13.1"; + version = "1.0.0"; }; asciidoctor-diagram-plantuml = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bxlkq3k775lhhnbs85cx8cbixhw7p70hnxrqnnig470h6jhmj0b"; + sha256 = "1kcxwbaancxfq08fr7syg8mxsi97jiczxyp4an2x0ymq3mkss0k8"; type = "gem"; }; - version = "1.2021.0"; + version = "1.2021.7"; }; asciidoctor-epub3 = { dependencies = ["asciidoctor" "gepub" "mime-types"]; @@ -77,10 +77,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fgi0rb8026k0a43wnanan6nzc8386azygmfl4zv7c9vram4nr6h"; + sha256 = "05lylv2k18vcnf3647n47zdqxpa70bg16znzn252ymp8say25zzg"; type = "gem"; }; - version = "1.5.0.alpha.19"; + version = "1.5.1"; }; asciidoctor-mathematical = { dependencies = ["asciidoctor" "asciimath" "mathematical"]; @@ -94,15 +94,15 @@ version = "0.3.5"; }; asciidoctor-pdf = { - dependencies = ["asciidoctor" "concurrent-ruby" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "safe_yaml" "thread_safe" "treetop" "ttfunk"]; + dependencies = ["asciidoctor" "concurrent-ruby" "prawn" "prawn-icon" "prawn-svg" "prawn-table" "prawn-templates" "safe_yaml" "treetop"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k8hn9lrvr08grqx17x2vrllw5qmfh0j08wp56464w2pj279ka67"; + sha256 = "0sxfz3qp2j76jlab7fb1d1ylbf0h2nnbkhg019qqch5wkd4k1iw9"; type = "gem"; }; - version = "1.5.4"; + version = "1.6.0"; }; asciidoctor-revealjs = { dependencies = ["asciidoctor" "concurrent-ruby" "thread_safe"]; @@ -140,10 +140,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; type = "gem"; }; - version = "1.1.8"; + version = "1.1.9"; }; css_parser = { dependencies = ["addressable"]; @@ -183,10 +183,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; + sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a"; type = "gem"; }; - version = "1.8.9"; + version = "1.8.10"; }; mathematical = { dependencies = ["ruby-enum"]; @@ -225,10 +225,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hdbpmamx8js53yk3h8cqy12kgv6ca06k0c9n3pxh6b6cjfs19x7"; + sha256 = "1ad0mli9rc0f17zw4ibp24dbj1y39zkykijsjmnzl4gwpg5s0j6k"; type = "gem"; }; - version = "2.5.0"; + version = "2.5.3"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -236,20 +236,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2"; + sha256 = "1vrn31385ix5k9b0yalnlzv360isv6dincbcvi8psllnwz4sjxj9"; type = "gem"; }; - version = "1.11.1"; + version = "1.11.7"; }; pdf-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19llwch2wfg51glb0kff0drfp3n6nb9vim4zlvzckxysksvxpby1"; + sha256 = "1fz0yj4zrlii2j08kaw11j769s373ayz8jrdhxwwjzmm28pqndjg"; type = "gem"; }; - version = "0.7.0"; + version = "0.9.0"; }; pdf-reader = { dependencies = ["Ascii85" "afm" "hashery" "ruby-rc4" "ttfunk"]; @@ -257,10 +257,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cxladxy18dhk4a3b263crq8hyxb3q0c7ifxrb5nr1bs6y0pk8i6"; + sha256 = "14cxj3ra9nnn334qpm2vsx9s0zk3095s8ih6cwcp47h3hv03c73y"; type = "gem"; }; - version = "2.4.2"; + version = "2.5.0"; }; polyglot = { groups = ["default"]; @@ -278,10 +278,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qdjf1v6sfl44g3rqxlg8k4jrzkwaxgvh2l4xws97a8f3xv4na4m"; + sha256 = "1g9avv2rprsjisdk137s9ljr05r7ajhm78hxa1vjsv0jyx22f1l2"; type = "gem"; }; - version = "2.2.2"; + version = "2.4.0"; }; prawn-icon = { dependencies = ["prawn"]; @@ -289,21 +289,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ivkdf8rdf92hhy97vbmc2a4w97vcvqd58jcj4z9hz3hfsb1526w"; + sha256 = "1xdnjik5zinnkjavmybbh2s52wzcpb8hzaqckiv0mxp0vs0x9j6s"; type = "gem"; }; - version = "2.5.0"; + version = "3.0.0"; }; prawn-svg = { - dependencies = ["css_parser" "prawn"]; + dependencies = ["css_parser" "prawn" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rb5hmjqc4hvy6liw9y51y6glbw66f09r09w0nvdfxhfi2kka16l"; + sha256 = "0mbxzw7r7hv43db9422flc24ib9d8bdy1nasbni2h998jc5a5lb6"; type = "gem"; }; - version = "0.31.0"; + version = "0.32.0"; }; prawn-table = { dependencies = ["prawn"]; @@ -342,10 +342,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1736rbjgin97p3vjknz60p6dl66c936djwsk7wnwvwmav8r1nx0y"; + sha256 = "1mshqjh8v0v8k29f8annqfr4qlgkp39nbwx3sgm69aymv4skfddb"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.0"; }; racc = { groups = ["default"]; @@ -362,10 +362,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; type = "gem"; }; - version = "3.2.4"; + version = "3.2.5"; }; rouge = { groups = ["default"]; @@ -444,9 +444,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mgrnqla5n51v4ivn844albsajkck7k6lviphfqa8470r46c58cd"; + sha256 = "15iaxz9iak5643bq2bc0jkbjv8w2zn649lxgvh5wg48q9d4blw13"; type = "gem"; }; - version = "1.5.1"; + version = "1.7.0"; }; } diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index dfd3321b6b6..1a0188127aa 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -18,14 +18,14 @@ buildPythonApplication rec { pname = "cloud-init"; - version = "20.3"; + version = "21.2"; namePrefix = ""; src = fetchFromGitHub { owner = "canonical"; repo = "cloud-init"; rev = version; - sha256 = "1fmckxf4q4sxjqs758vw7ca0rnhl9hyq67cqpqzz2v3s1gqzjhm4"; + sha256 = "0vhjkgs49ixfa3kkj5s3v3gcxvypm3cdvfk6adrk2bx3wv2cbhvz"; }; patches = [ ./0001-add-nixos-support.patch ]; @@ -59,9 +59,7 @@ buildPythonApplication rec { ]; makeWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ - dmidecode cloud-utils.guest - ]}/bin" + "--prefix PATH : ${lib.makeBinPath [ dmidecode cloud-utils.guest ]}/bin" ]; disabledTests = [ @@ -71,6 +69,27 @@ buildPythonApplication rec { "test_path_env_gets_set_from_main" # tries to read from /etc/ca-certificates.conf while inside the sandbox "test_handler_ca_certs" + # Doesn't work in the sandbox + "TestEphemeralDhcpNoNetworkSetup" + "TestHasURLConnectivity" + "TestReadFileOrUrl" + "TestConsumeUserDataHttp" + # Chef Omnibus + "TestInstallChefOmnibus" + ]; + + disabledTestPaths = [ + # Oracle tests are not passing + "cloudinit/sources/tests/test_oracle.py" + # Disable the integration tests. pycloudlib would be required + "tests/unittests/test_datasource/test_aliyun.py" + "tests/unittests/test_datasource/test_azure.py" + "tests/unittests/test_datasource/test_ec2.py" + "tests/unittests/test_datasource/test_exoscale.py" + "tests/unittests/test_datasource/test_gce.py" + "tests/unittests/test_datasource/test_openstack.py" + "tests/unittests/test_datasource/test_scaleway.py" + "tests/unittests/test_ec2_util.py" ]; preCheck = '' @@ -78,6 +97,8 @@ buildPythonApplication rec { export TMPDIR=/tmp ''; + pythonImportsCheck = [ "cloudinit" ]; + meta = with lib; { homepage = "https://cloudinit.readthedocs.org"; description = "Provides configuration and customization of cloud instance"; diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix new file mode 100644 index 00000000000..8673200172e --- /dev/null +++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchFromGitHub +, ocamlPackages +}: + +ocamlPackages.buildDunePackage rec { + pname = "wayland-proxy-virtwl"; + version = "unstable-2021-04-15"; + + src = fetchFromGitHub { + owner = "talex5"; + repo = pname; + rev = "09321a28f3d4c0fa7e41ebb3014106b62090b649"; + sha256 = "03rc2jp5d2y9y7mfis6kk9gchd49gvq0jg6fq5gi9r21ckb4k5v4"; + }; + + postPatch = '' + # no need to vendor + rm -r ocaml-wayland + ''; + + useDune2 = true; + minimumOCamlVersion = "4.08"; + + buildInputs = with ocamlPackages; [ + wayland + cmdliner + logs + ]; + + meta = { + homepage = "https://github.com/talex5/wayland-virtwl-proxy"; + description = "Proxy Wayland connections across a VM boundary"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5bfaed5ac45..d36f7e9719d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -88,6 +88,14 @@ mapAliases ({ bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync20 = throw "bittorrentSync20 has been deprecated by resilio-sync."; # added 2019-06-03 + + # bitwarden_rs renamed to vaultwarden with release 1.21.0 (2021-04-30) + bitwarden_rs = vaultwarden; + bitwarden_rs-sqlite = vaultwarden-sqlite; + bitwarden_rs-mysql = vaultwarden-mysql; + bitwarden_rs-postgresql = vaultwarden-postgresql; + bitwarden_rs-vault = vaultwarden-vault; + bs1770gain = throw "bs1770gain has been removed from nixpkgs, as it had no maintainer or reverse dependencies."; # added 2021-01-02 btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # added 2020-11-03 buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9cb868165b..ab5098bf2aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -474,6 +474,8 @@ in pkger = callPackage ../development/libraries/pkger { }; + tapview = callPackage ../development/tools/tapview { }; + run = callPackage ../development/tools/run { }; mod = callPackage ../development/tools/mod { }; @@ -799,6 +801,8 @@ in acme-client = callPackage ../tools/networking/acme-client { stdenv = gccStdenv; }; + adriconf = callPackage ../tools/graphics/adriconf { }; + amass = callPackage ../tools/networking/amass { }; afew = callPackage ../applications/networking/mailreaders/afew { }; @@ -869,6 +873,10 @@ in libgamemode32 = pkgsi686Linux.gamemode.lib; }; + elkhound = callPackage ../development/tools/elkhound { }; + + weidu = callPackage ../tools/games/weidu { }; + gfshare = callPackage ../tools/security/gfshare { }; gobgp = callPackage ../tools/networking/gobgp { }; @@ -1017,6 +1025,8 @@ in timedoctor = callPackage ../applications/office/timedoctor { }; + tvnamer = callPackage ../tools/misc/tvnamer { }; + twine = with python3Packages; toPythonApplication twine; wayst = callPackage ../applications/terminal-emulators/wayst { }; @@ -1082,6 +1092,8 @@ in apkid = callPackage ../development/tools/apkid { }; + apksigcopier = callPackage ../development/tools/apksigcopier { }; + apktool = callPackage ../development/tools/apktool { inherit (androidenv.androidPkgs_9_0) build-tools; }; @@ -1308,15 +1320,6 @@ in inherit (nodePackages) bitwarden-cli; - bitwarden_rs = callPackage ../tools/security/bitwarden_rs { - inherit (darwin.apple_sdk.frameworks) Security CoreServices; - }; - bitwarden_rs-sqlite = bitwarden_rs; - bitwarden_rs-mysql = bitwarden_rs.override { dbBackend = "mysql"; }; - bitwarden_rs-postgresql = bitwarden_rs.override { dbBackend = "postgresql"; }; - - bitwarden_rs-vault = callPackage ../tools/security/bitwarden_rs/vault.nix { }; - bkyml = callPackage ../tools/misc/bkyml { }; blockbench-electron = callPackage ../applications/graphics/blockbench-electron { }; @@ -2299,6 +2302,8 @@ in wayland-utils = callPackage ../tools/wayland/wayland-utils { }; + wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { }; + wev = callPackage ../tools/wayland/wev { }; wdomirror = callPackage ../tools/wayland/wdomirror { }; @@ -2891,6 +2896,8 @@ in jiten = callPackage ../applications/misc/jiten { }; + kanjidraw = callPackage ../applications/misc/kanjidraw { }; + jotta-cli = callPackage ../applications/misc/jotta-cli { }; joycond = callPackage ../os-specific/linux/joycond { }; @@ -2955,6 +2962,8 @@ in numworks-udev-rules = callPackage ../os-specific/linux/numworks-udev-rules { }; + num-utils = callPackage ../tools/text/num-utils { }; + iio-sensor-proxy = callPackage ../os-specific/linux/iio-sensor-proxy { }; ipvsadm = callPackage ../os-specific/linux/ipvsadm { }; @@ -3149,6 +3158,8 @@ in ps_mem = callPackage ../tools/system/ps_mem { }; + pscale = callPackage ../development/tools/pscale { }; + psstop = callPackage ../tools/system/psstop { }; precice = callPackage ../development/libraries/precice { }; @@ -4721,7 +4732,9 @@ in flatpak = callPackage ../development/libraries/flatpak { }; - flatpak-builder = callPackage ../development/tools/flatpak-builder { }; + flatpak-builder = callPackage ../development/tools/flatpak-builder { + binutils = binutils-unwrapped; + }; fltrdr = callPackage ../tools/misc/fltrdr { icu = icu63; @@ -5047,6 +5060,8 @@ in ghr = callPackage ../applications/version-management/git-and-tools/ghr { }; + gibberish-detector = with python3Packages; toPythonApplication gibberish-detector; + gibo = callPackage ../tools/misc/gibo { }; gifsicle = callPackage ../tools/graphics/gifsicle { }; @@ -5305,9 +5320,7 @@ in gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { }; - gnome-photos = callPackage ../applications/graphics/gnome-photos { - gegl = gegl_0_4; - }; + gnome-photos = callPackage ../applications/graphics/gnome-photos { }; gnokii = callPackage ../tools/misc/gnokii { }; @@ -5614,6 +5627,8 @@ in pgloader = callPackage ../development/tools/pgloader { }; + pgtop = callPackage ../development/tools/pgtop { }; + pigz = callPackage ../tools/compression/pigz { }; pixz = callPackage ../tools/compression/pixz { }; @@ -7668,6 +7683,8 @@ in otfcc = callPackage ../tools/misc/otfcc { }; + otpclient = callPackage ../applications/misc/otpclient { }; + otpw = callPackage ../os-specific/linux/otpw { }; ovftool = callPackage ../tools/virtualization/ovftool { }; @@ -7918,11 +7935,7 @@ in pk2cmd = callPackage ../tools/misc/pk2cmd { }; - plantuml = callPackage ../tools/misc/plantuml { - # Graphviz 2.39 and 2.40 are discouraged by the PlantUML project, see - # http://plantuml.com/faq (heading: "Which version of Graphviz should I use ?") - graphviz = graphviz_2_32; - }; + plantuml = callPackage ../tools/misc/plantuml { }; plantuml-server = callPackage ../tools/misc/plantuml-server { }; @@ -8203,6 +8216,8 @@ in qhull = callPackage ../development/libraries/qhull { }; + qjournalctl = libsForQt5.callPackage ../applications/system/qjournalctl { }; + qjoypad = callPackage ../tools/misc/qjoypad { }; qmk = callPackage ../tools/misc/qmk { }; @@ -11868,19 +11883,19 @@ in inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; llvm_10 = llvmPackages_10.libllvm; }; - rust_1_52 = callPackage ../development/compilers/rust/1_52.nix { + rust_1_53 = callPackage ../development/compilers/rust/1_53.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; llvm_12 = llvmPackages_12.libllvm; }; - rust = rust_1_52; + rust = rust_1_53; 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_52 = rust_1_52.packages.stable; - rustPackages = rustPackages_1_52; + rustPackages_1_53 = rust_1_53.packages.stable; + rustPackages = rustPackages_1_53; inherit (rustPackages) cargo clippy rustc rustPlatform; @@ -13196,6 +13211,8 @@ in cfr = callPackage ../development/tools/java/cfr { }; + checkra1n = callPackage ../development/mobile/checkra1n { }; + checkstyle = callPackage ../development/tools/analysis/checkstyle { }; chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome2.GConf; }; @@ -13301,6 +13318,8 @@ in inherit (llvmPackages_11) llvm libclang; }; + dprint = callPackage ../development/tools/dprint { }; + libcxx = llvmPackages.libcxx; libcxxabi = llvmPackages.libcxxabi; @@ -15130,10 +15149,6 @@ in }; gegl = callPackage ../development/libraries/gegl { - inherit (darwin.apple_sdk.frameworks) OpenGL; - }; - - gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix { inherit (darwin.apple_sdk.frameworks) OpenCL; }; @@ -15336,8 +15351,7 @@ in glpk = callPackage ../development/libraries/glpk { }; glsurf = callPackage ../applications/science/math/glsurf { - libpng = libpng12; - ocamlPackages = ocaml-ng.ocamlPackages_4_01_0; + ocamlPackages = ocaml-ng.ocamlPackages_4_05; }; glui = callPackage ../development/libraries/glui {}; @@ -16036,6 +16050,8 @@ in inherit (ocaml-ng.ocamlPackages) bap ocaml findlib ctypes; }; + libbaseencode = callPackage ../development/libraries/libbaseencode { }; + libbass = (callPackage ../development/libraries/audio/libbass { }).bass; libbass_fx = (callPackage ../development/libraries/audio/libbass { }).bass_fx; @@ -16149,6 +16165,8 @@ in libctemplate = callPackage ../development/libraries/libctemplate { }; + libcotp = callPackage ../development/libraries/libcotp { }; + libcouchbase = callPackage ../development/libraries/libcouchbase { }; libcue = callPackage ../development/libraries/libcue { }; @@ -16509,6 +16527,8 @@ in liblcf = callPackage ../development/libraries/liblcf { }; + libliftoff = callPackage ../development/libraries/libliftoff { }; + liblqr1 = callPackage ../development/libraries/liblqr-1 { }; liblockfile = callPackage ../development/libraries/liblockfile { }; @@ -17805,8 +17825,9 @@ in python = python37; }; - protobuf = protobuf3_16; + protobuf = protobuf3_17; + 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 { }; protobuf3_14 = callPackage ../development/libraries/protobuf/3.14.nix { }; @@ -20609,6 +20630,8 @@ in jool-cli = callPackage ../os-specific/linux/jool/cli.nix { }; + juju = callPackage ../applications/networking/juju { }; + jujuutils = callPackage ../os-specific/linux/jujuutils { }; kbd = callPackage ../os-specific/linux/kbd { }; @@ -20759,7 +20782,6 @@ in kernelPatches.bridge_stp_helper kernelPatches.request_key_helper kernelPatches.rtl8761b_support - kernelPatches.rtnetlink_fix_regression_in_bridge_vlan_configuration ]; }; @@ -20774,7 +20796,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.rtnetlink_fix_regression_in_bridge_vlan_configuration ]; }; @@ -20782,7 +20803,6 @@ in kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper - kernelPatches.rtnetlink_fix_regression_in_bridge_vlan_configuration ]; }; @@ -20908,8 +20928,6 @@ in dpdk-kmods = callPackage ../os-specific/linux/dpdk-kmods { }; - dpdk = throw "The dpdk driver has been renamed to dpdk-kmods."; - exfat-nofuse = callPackage ../os-specific/linux/exfat { }; evdi = callPackage ../os-specific/linux/evdi { }; @@ -21442,6 +21460,10 @@ in octomap = callPackage ../development/libraries/octomap { }; + odin = callPackage ../development/compilers/odin { + llvmPackages = llvmPackages_11; + }; + odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { }; odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { }; @@ -22490,6 +22512,8 @@ in redhat-official-fonts = callPackage ../data/fonts/redhat-official { }; + rime-data = callPackage ../data/misc/rime-data { }; + route159 = callPackage ../data/fonts/route159 { }; sampradaya = callPackage ../data/fonts/sampradaya { }; @@ -22796,7 +22820,7 @@ in acd-cli = callPackage ../applications/networking/sync/acd_cli { inherit (python3Packages) - buildPythonApplication appdirs colorama dateutil + buildPythonApplication appdirs colorama python-dateutil requests requests_toolbelt setuptools sqlalchemy fusepy; }; @@ -24161,7 +24185,6 @@ in gimp = callPackage ../applications/graphics/gimp { autoreconfHook = buildPackages.autoreconfHook269; - gegl = gegl_0_4; lcms = lcms2; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; @@ -24174,7 +24197,6 @@ in glimpse = callPackage ../applications/graphics/glimpse { autoreconfHook = buildPackages.autoreconfHook269; - gegl = gegl_0_4; lcms = lcms2; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; @@ -24762,6 +24784,7 @@ in lcms2 = null; openexr = null; libpng = null; + liblqr1 = null; librsvg = null; libtiff = null; libxml2 = null; @@ -24792,6 +24815,7 @@ in lcms2 = null; openexr = null; libpng = null; + liblqr1 = null; librsvg = null; libtiff = null; libxml2 = null; @@ -25089,6 +25113,8 @@ in kile-wl = callPackage ../applications/misc/kile-wl { }; + kiln = callPackage ../applications/misc/kiln { }; + kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; wrapHelm = callPackage ../applications/networking/cluster/helm/wrapper.nix { }; @@ -25419,7 +25445,7 @@ in inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; - mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); + mercurialFull = appendToName "full" (pkgs.mercurial.override { fullBuild = true; }); merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; @@ -26215,6 +26241,8 @@ in pianobooster = qt5.callPackage ../applications/audio/pianobooster { }; + pianoteq = callPackage ../applications/audio/pianoteq { }; + picard = callPackage ../applications/audio/picard { }; picocom = callPackage ../tools/misc/picocom { @@ -26263,6 +26291,8 @@ in purple-matrix = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-matrix { }; + purple-mm-sms = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms { }; + purple-plugin-pack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack { }; purple-slack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-slack { }; @@ -27245,6 +27275,10 @@ in tonelib-gfx = callPackage ../applications/audio/tonelib-gfx { }; + tonelib-jam = callPackage ../applications/audio/tonelib-jam { }; + + tonelib-zoom = callPackage ../applications/audio/tonelib-zoom { }; + tony = libsForQt514.callPackage ../applications/audio/tony { }; toot = callPackage ../applications/misc/toot { }; @@ -28174,7 +28208,7 @@ in ytmdesktop = callPackage ../applications/audio/ytmdesktop { }; - ytmdl = python3Packages.callPackage ../tools/misc/ytmdl { }; + ytmdl = callPackage ../tools/misc/ytmdl { }; zam-plugins = callPackage ../applications/audio/zam-plugins { }; @@ -28974,6 +29008,8 @@ in static = true; }; }; + openttd-grfcodec = callPackage ../games/openttd/grfcodec.nix {}; + openttd-nml = callPackage ../games/openttd/nml.nix {}; opentyrian = callPackage ../games/opentyrian { }; @@ -31553,6 +31589,8 @@ in urbit = callPackage ../misc/urbit { }; + usb-reset = callPackage ../applications/misc/usb-reset { }; + usql = callPackage ../applications/misc/usql { }; utf8cpp = callPackage ../development/libraries/utf8cpp { }; @@ -31571,6 +31609,15 @@ in vazir-code-font = callPackage ../data/fonts/vazir-code-font { }; + vaultwarden = callPackage ../tools/security/vaultwarden { + inherit (darwin.apple_sdk.frameworks) Security CoreServices; + }; + vaultwarden-sqlite = vaultwarden; + vaultwarden-mysql = vaultwarden.override { dbBackend = "mysql"; }; + vaultwarden-postgresql = vaultwarden.override { dbBackend = "postgresql"; }; + + vaultwarden-vault = callPackage ../tools/security/vaultwarden/vault.nix { }; + vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; vbam = callPackage ../misc/emulators/vbam { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 9931a7004b4..6e25108d04f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -120,12 +120,8 @@ let then callPackage ../development/ocaml-modules/camomile { } else callPackage ../development/ocaml-modules/camomile/0.8.5.nix { }; - camlimages_4_1_2 = - if lib.versionOlder "4.02" ocaml.version - then null - else callPackage ../development/ocaml-modules/camlimages/4.1.2.nix { - libpng = pkgs.libpng12; - }; + camlimages_4_2_4 = callPackage ../development/ocaml-modules/camlimages/4.2.4.nix { }; + camlimages = callPackage ../development/ocaml-modules/camlimages { }; benchmark = callPackage ../development/ocaml-modules/benchmark { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 7ea35711623..017d27a8a20 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -35,7 +35,11 @@ in mapAliases ({ blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 + dateutil = python-dateutil; # added 2021-07-03 detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 + dftfit = throw "it's dependency lammps-cython no longer builds"; + diff_cover = diff-cover; # added 2021-07-02 + discogs_client = discogs-client; # added 2021-07-02 dns = dnspython; # Alias for compatibility, 2017-12-10 faulthandler = throw "faulthandler is built into ${python.executable}"; gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 @@ -43,6 +47,7 @@ mapAliases ({ google_api_python_client = google-api-python-client; # added 2021-03-19 googleapis_common_protos = googleapis-common-protos; # added 2021-03-19 HAP-python = hap-python; # added 2021-06-01 + lammps-cython = throw "no longer builds and is unmaintained"; MechanicalSoup = mechanicalsoup; # added 2021-06-01 privacyidea = throw "renamed to pkgs.privacyidea"; # added 2021-06-20 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 @@ -56,5 +61,7 @@ mapAliases ({ smart_open = smart-open; # added 2021-03-14 smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 + tvnamer = throw "python3Packages.tvnamer was moved to tvnamer"; # 2021-07-05 websocket_client = websocket-client; + bt_proximity = bt-proximity; # added 2021-07-02 }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5eac97ab189..b18f22386b6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1218,9 +1218,11 @@ in { bsblan = callPackage ../development/python-modules/bsblan { }; + bson = callPackage ../development/python-modules/bson { }; + btchip = callPackage ../development/python-modules/btchip { }; - bt_proximity = callPackage ../development/python-modules/bt-proximity { }; + bt-proximity = callPackage ../development/python-modules/bt-proximity { }; BTrees = callPackage ../development/python-modules/btrees { }; @@ -1905,8 +1907,6 @@ in { devpi-common = callPackage ../development/python-modules/devpi-common { }; - dftfit = callPackage ../development/python-modules/dftfit { }; - diagrams = callPackage ../development/python-modules/diagrams { }; diceware = callPackage ../development/python-modules/diceware { }; @@ -1921,7 +1921,7 @@ in { dicttoxml = callPackage ../development/python-modules/dicttoxml { }; - diff_cover = callPackage ../development/python-modules/diff_cover { }; + diff-cover = callPackage ../development/python-modules/diff-cover { }; diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; @@ -1939,7 +1939,7 @@ in { discid = callPackage ../development/python-modules/discid { }; - discogs_client = callPackage ../development/python-modules/discogs_client { }; + discogs-client = callPackage ../development/python-modules/discogs-client { }; discordpy = callPackage ../development/python-modules/discordpy { }; @@ -2245,6 +2245,8 @@ in { editdistance = callPackage ../development/python-modules/editdistance { }; + editdistance-s = callPackage ../development/python-modules/editdistance-s { }; + editorconfig = callPackage ../development/python-modules/editorconfig { }; edward = callPackage ../development/python-modules/edward { }; @@ -2866,6 +2868,8 @@ in { ghp-import = callPackage ../development/python-modules/ghp-import { }; + gibberish-detector = callPackage ../development/python-modules/gibberish-detector { }; + gidgethub = callPackage ../development/python-modules/gidgethub { }; gin-config = callPackage ../development/python-modules/gin-config { }; @@ -3914,8 +3918,6 @@ in { labmath = callPackage ../development/python-modules/labmath { }; - lammps-cython = callPackage ../development/python-modules/lammps-cython { }; - langcodes = callPackage ../development/python-modules/langcodes { }; langdetect = callPackage ../development/python-modules/langdetect { }; @@ -5235,6 +5237,8 @@ in { phonenumbers = callPackage ../development/python-modules/phonenumbers { }; + micloud = callPackage ../development/python-modules/micloud { }; + netmap = callPackage ../development/python-modules/netmap { }; openapi-core = callPackage ../development/python-modules/openapi-core { }; @@ -6921,8 +6925,6 @@ in { python-daemon = callPackage ../development/python-modules/python-daemon { }; python-dateutil = callPackage ../development/python-modules/dateutil { }; - # Alias that we should deprecate - dateutil = self.python-dateutil; python-dbusmock = callPackage ../development/python-modules/python-dbusmock { }; @@ -6998,6 +7000,10 @@ in { python-louvain = callPackage ../development/python-modules/python-louvain { }; + python-lsp-jsonrpc = callPackage ../development/python-modules/python-lsp-jsonrpc { }; + + python-lsp-server = callPackage ../development/python-modules/python-lsp-server { }; + python-ly = callPackage ../development/python-modules/python-ly { }; python-lz4 = callPackage ../development/python-modules/python-lz4 { }; @@ -7061,8 +7067,12 @@ in { python-picnic-api = callPackage ../development/python-modules/python-picnic-api { }; + python-pidfile = callPackage ../development/python-modules/python-pidfile { }; + python-pipedrive = callPackage ../development/python-modules/python-pipedrive { }; + python-pkcs11 = callPackage ../development/python-modules/python-pkcs11 { }; + python-prctl = callPackage ../development/python-modules/python-prctl { }; python-ptrace = callPackage ../development/python-modules/python-ptrace { }; @@ -8733,8 +8743,6 @@ in { tvdb_api = callPackage ../development/python-modules/tvdb_api { }; - tvnamer = callPackage ../development/python-modules/tvnamer { }; - tweedledum = callPackage ../development/python-modules/tweedledum { }; tweepy = callPackage ../development/python-modules/tweepy { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 32d9872b51a..471548b9fa2 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -46,6 +46,8 @@ with self; with super; { cdecimal = callPackage ../development/python-modules/cdecimal { }; + certifi = callPackage ../development/python-modules/certifi/python2.nix { }; + chardet = callPackage ../development/python-modules/chardet/2.nix { }; cheetah = callPackage ../development/python-modules/cheetah { }; |