diff options
304 files changed, 6658 insertions, 5335 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index be54040ca2ed7..2f5c5950cdb67 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -196,12 +196,12 @@ /nixos/tests/prometheus-exporters.nix @WilliButz # PHP interpreter, packages, extensions, tests and documentation -/doc/languages-frameworks/php.section.md @NixOS/php -/nixos/tests/php @NixOS/php -/pkgs/build-support/build-pecl.nix @NixOS/php -/pkgs/development/interpreters/php @NixOS/php -/pkgs/development/php-packages @NixOS/php -/pkgs/top-level/php-packages.nix @NixOS/php +/doc/languages-frameworks/php.section.md @NixOS/php @aanderse @etu @globin @ma27 @talyz +/nixos/tests/php @NixOS/php @aanderse @etu @globin @ma27 @talyz +/pkgs/build-support/build-pecl.nix @NixOS/php @aanderse @etu @globin @ma27 @talyz +/pkgs/development/interpreters/php @jtojnar @NixOS/php @aanderse @etu @globin @ma27 @talyz +/pkgs/development/php-packages @NixOS/php @aanderse @etu @globin @ma27 @talyz +/pkgs/top-level/php-packages.nix @jtojnar @NixOS/php @aanderse @etu @globin @ma27 @talyz # Podman, CRI-O modules and related /nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 76bf94785f228..159b9f8434808 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -59,6 +59,15 @@ Follow these steps to backport a change into a release branch in compliance with 5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.09`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.09]`. 6. When the backport pull request is merged and you have the necessary privileges you can also replace the label `9.needs: port to stable` with `8.has: port to stable` on the original pull request. This way maintainers can keep track of missing backports easier. +## Criteria for Backporting changes + +Anything that does not cause user or downstream dependency regressions can be backported. This includes: +- New Packages / Modules +- Security / Patch updates +- Version updates which include new functionality (but no breaking changes) +- Services which require a client to be up-to-date regardless. (E.g. `spotify`, `steam`, or `discord`) +- Security critical applications (E.g. `firefox`) + ## Generating 21.11 Release Notes Documentation in nixpkgs is transitioning to a markdown-centric workflow. Release notes now require a translation step to convert from markdown to a compatible docbook document. diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md index 97b32c15df108..29b8ec493e7f5 100644 --- a/doc/contributing/submitting-changes.chapter.md +++ b/doc/contributing/submitting-changes.chapter.md @@ -269,3 +269,14 @@ Other examples of reasons are: - Previously the build would fail due to, e.g., `getaddrinfo` not being defined - The previous download links were all broken - Crash when starting on some X11 systems + +#### Acceptable backport criteria + +The stable branch does have some changes which cannot be backported. Most notable are breaking changes. The desire is to have stable users be uninterrupted when updating packages. + +However, many changes are able to be backported, including: +- New Packages / Modules +- Security / Patch updates +- Version updates which include new functionality (but no breaking changes) +- Services which require a client to be up-to-date regardless. (E.g. `spotify`, `steam`, or `discord`) +- Security critical applications (E.g. `firefox`) diff --git a/doc/functions.xml b/doc/functions.xml index e8ab8d97b913c..dd91d705aa995 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -8,7 +8,7 @@ </para> <xi:include href="functions/library.xml" /> <xi:include href="functions/generators.xml" /> - <xi:include href="functions/debug.xml" /> - <xi:include href="functions/prefer-remote-fetch.xml" /> + <xi:include href="functions/debug.section.xml" /> + <xi:include href="functions/prefer-remote-fetch.section.xml" /> <xi:include href="functions/nix-gitignore.section.xml" /> </chapter> diff --git a/doc/functions/debug.section.md b/doc/functions/debug.section.md new file mode 100644 index 0000000000000..b2d8589431ab5 --- /dev/null +++ b/doc/functions/debug.section.md @@ -0,0 +1,5 @@ +# Debugging Nix Expressions {#sec-debug} + +Nix is a unityped, dynamic language, this means every value can potentially appear anywhere. Since it is also non-strict, evaluation order and what ultimately is evaluated might surprise you. Therefore it is important to be able to debug nix expressions. + +In the `lib/debug.nix` file you will find a number of functions that help (pretty-)printing values while evaluation is running. You can even specify how deep these values should be printed recursively, and transform them on the fly. Please consult the docstrings in `lib/debug.nix` for usage information. diff --git a/doc/functions/debug.xml b/doc/functions/debug.xml deleted file mode 100644 index c27421f12e76c..0000000000000 --- a/doc/functions/debug.xml +++ /dev/null @@ -1,14 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - xml:id="sec-debug"> - <title>Debugging Nix Expressions</title> - - <para> - Nix is a unityped, dynamic language, this means every value can potentially appear anywhere. Since it is also non-strict, evaluation order and what ultimately is evaluated might surprise you. Therefore it is important to be able to debug nix expressions. - </para> - - <para> - In the <literal>lib/debug.nix</literal> file you will find a number of functions that help (pretty-)printing values while evaluation is runnnig. You can even specify how deep these values should be printed recursively, and transform them on the fly. Please consult the docstrings in <literal>lib/debug.nix</literal> for usage information. - </para> -</section> diff --git a/doc/functions/prefer-remote-fetch.section.md b/doc/functions/prefer-remote-fetch.section.md new file mode 100644 index 0000000000000..8760c100224a7 --- /dev/null +++ b/doc/functions/prefer-remote-fetch.section.md @@ -0,0 +1,17 @@ +# prefer-remote-fetch overlay {#sec-prefer-remote-fetch} + +`prefer-remote-fetch` is an overlay that download sources on remote builder. This is useful when the evaluating machine has a slow upload while the builder can fetch faster directly from the source. To use it, put the following snippet as a new overlay: + +```nix +self: super: + (super.prefer-remote-fetch self super) +``` + +A full configuration example for that sets the overlay up for your own account, could look like this + +```ShellSession +$ mkdir ~/.config/nixpkgs/overlays/ +$ cat > ~/.config/nixpkgs/overlays/prefer-remote-fetch.nix <<EOF + self: super: super.prefer-remote-fetch self super +EOF +``` diff --git a/doc/functions/prefer-remote-fetch.xml b/doc/functions/prefer-remote-fetch.xml deleted file mode 100644 index 94d25d3d3aeb6..0000000000000 --- a/doc/functions/prefer-remote-fetch.xml +++ /dev/null @@ -1,21 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/xinclude" - xml:id="sec-prefer-remote-fetch"> - <title>prefer-remote-fetch overlay</title> - - <para> - <function>prefer-remote-fetch</function> is an overlay that download sources on remote builder. This is useful when the evaluating machine has a slow upload while the builder can fetch faster directly from the source. To use it, put the following snippet as a new overlay: -<programlisting> -self: super: - (super.prefer-remote-fetch self super) -</programlisting> - A full configuration example for that sets the overlay up for your own account, could look like this -<screen> -<prompt>$ </prompt>mkdir ~/.config/nixpkgs/overlays/ -<prompt>$ </prompt>cat > ~/.config/nixpkgs/overlays/prefer-remote-fetch.nix <<EOF - self: super: super.prefer-remote-fetch self super -EOF -</screen> - </para> -</section> diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2448ad3f93da4..9e044942eab3e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4815,6 +4815,12 @@ githubId = 587870; name = "Jonathan Mettes"; }; + jo1gi = { + email = "joakimholm@protonmail.com"; + github = "jo1gi"; + githubId = 26695750; + name = "Joakim Holm"; + }; joachifm = { email = "joachifm@fastmail.fm"; github = "joachifm"; @@ -8589,6 +8595,12 @@ githubId = 6047658; name = "Ryan Horiguchi"; }; + ribose-jeffreylau = { + name = "Jeffrey Lau"; + email = "jeffrey.lau@ribose.com"; + github = "ribose-jeffreylau"; + githubId = 2649467; + }; richardipsum = { email = "richardipsum@fastmail.co.uk"; github = "richardipsum"; diff --git a/nixos/doc/manual/configuration/abstractions.section.md b/nixos/doc/manual/configuration/abstractions.section.md new file mode 100644 index 0000000000000..bf26e4c51ed37 --- /dev/null +++ b/nixos/doc/manual/configuration/abstractions.section.md @@ -0,0 +1,80 @@ +# Abstractions {#sec-module-abstractions} + +If you find yourself repeating yourself over and over, it’s time to abstract. Take, for instance, this Apache HTTP Server configuration: + +```nix +{ + services.httpd.virtualHosts = + { "blog.example.org" = { + documentRoot = "/webroot/blog.example.org"; + adminAddr = "alice@example.org"; + forceSSL = true; + enableACME = true; + enablePHP = true; + }; + "wiki.example.org" = { + documentRoot = "/webroot/wiki.example.org"; + adminAddr = "alice@example.org"; + forceSSL = true; + enableACME = true; + enablePHP = true; + }; + }; +} +``` + +It defines two virtual hosts with nearly identical configuration; the only difference is the document root directories. To prevent this duplication, we can use a `let`: +```nix +let + commonConfig = + { adminAddr = "alice@example.org"; + forceSSL = true; + enableACME = true; + }; +in +{ + services.httpd.virtualHosts = + { "blog.example.org" = (commonConfig // { documentRoot = "/webroot/blog.example.org"; }); + "wiki.example.org" = (commonConfig // { documentRoot = "/webroot/wiki.example.com"; }); + }; +} +``` + +The `let commonConfig = ...` defines a variable named `commonConfig`. The `//` operator merges two attribute sets, so the configuration of the second virtual host is the set `commonConfig` extended with the document root option. + +You can write a `let` wherever an expression is allowed. Thus, you also could have written: + +```nix +{ + services.httpd.virtualHosts = + let commonConfig = ...; in + { "blog.example.org" = (commonConfig // { ... }) + "wiki.example.org" = (commonConfig // { ... }) + }; +} +``` + +but not `{ let commonConfig = ...; in ...; }` since attributes (as opposed to attribute values) are not expressions. + +**Functions** provide another method of abstraction. For instance, suppose that we want to generate lots of different virtual hosts, all with identical configuration except for the document root. This can be done as follows: + +```nix +{ + services.httpd.virtualHosts = + let + makeVirtualHost = webroot: + { documentRoot = webroot; + adminAddr = "alice@example.org"; + forceSSL = true; + enableACME = true; + }; + in + { "example.org" = (makeVirtualHost "/webroot/example.org"); + "example.com" = (makeVirtualHost "/webroot/example.com"); + "example.gov" = (makeVirtualHost "/webroot/example.gov"); + "example.nl" = (makeVirtualHost "/webroot/example.nl"); + }; +} +``` + +Here, `makeVirtualHost` is a function that takes a single argument `webroot` and returns the configuration for a virtual host. That function is then called for several names to produce the list of virtual host configurations. diff --git a/nixos/doc/manual/configuration/abstractions.xml b/nixos/doc/manual/configuration/abstractions.xml deleted file mode 100644 index df9ff2615e1ae..0000000000000 --- a/nixos/doc/manual/configuration/abstractions.xml +++ /dev/null @@ -1,101 +0,0 @@ -<section xmlns="http://docbook.org/ns/docbook" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:xi="http://www.w3.org/2001/XInclude" - version="5.0" - xml:id="sec-module-abstractions"> - <title>Abstractions</title> - - <para> - If you find yourself repeating yourself over and over, it’s time to - abstract. Take, for instance, this Apache HTTP Server configuration: -<programlisting> -{ - <xref linkend="opt-services.httpd.virtualHosts"/> = - { "blog.example.org" = { - documentRoot = "/webroot/blog.example.org"; - adminAddr = "alice@example.org"; - forceSSL = true; - enableACME = true; - enablePHP = true; - }; - "wiki.example.org" = { - documentRoot = "/webroot/wiki.example.org"; - adminAddr = "alice@example.org"; - forceSSL = true; - enableACME = true; - enablePHP = true; - }; - }; -} -</programlisting> - It defines two virtual hosts with nearly identical configuration; the only - difference is the document root directories. To prevent this - duplication, we can use a <literal>let</literal>: -<programlisting> -let - commonConfig = - { adminAddr = "alice@example.org"; - forceSSL = true; - enableACME = true; - }; -in -{ - <xref linkend="opt-services.httpd.virtualHosts"/> = - { "blog.example.org" = (commonConfig // { documentRoot = "/webroot/blog.example.org"; }); - "wiki.example.org" = (commonConfig // { documentRoot = "/webroot/wiki.example.com"; }); - }; -} -</programlisting> - The <literal>let commonConfig = <replaceable>...</replaceable></literal> - defines a variable named <literal>commonConfig</literal>. The - <literal>//</literal> operator merges two attribute sets, so the - configuration of the second virtual host is the set - <literal>commonConfig</literal> extended with the document root option. - </para> - - <para> - You can write a <literal>let</literal> wherever an expression is allowed. - Thus, you also could have written: -<programlisting> -{ - <xref linkend="opt-services.httpd.virtualHosts"/> = - let commonConfig = <replaceable>...</replaceable>; in - { "blog.example.org" = (commonConfig // { <replaceable>...</replaceable> }) - "wiki.example.org" = (commonConfig // { <replaceable>...</replaceable> }) - }; -} -</programlisting> - but not <literal>{ let commonConfig = <replaceable>...</replaceable>; in - <replaceable>...</replaceable>; }</literal> since attributes (as opposed to - attribute values) are not expressions. - </para> - - <para> - <emphasis>Functions</emphasis> provide another method of abstraction. For - instance, suppose that we want to generate lots of different virtual hosts, - all with identical configuration except for the document root. This can be done - as follows: -<programlisting> -{ - <xref linkend="opt-services.httpd.virtualHosts"/> = - let - makeVirtualHost = webroot: - { documentRoot = webroot; - adminAddr = "alice@example.org"; - forceSSL = true; - enableACME = true; - }; - in - { "example.org" = (makeVirtualHost "/webroot/example.org"); - "example.com" = (makeVirtualHost "/webroot/example.com"); - "example.gov" = (makeVirtualHost "/webroot/example.gov"); - "example.nl" = (makeVirtualHost "/webroot/example.nl"); - }; -} -</programlisting> - Here, <varname>makeVirtualHost</varname> is a function that takes a single - argument <literal>webroot</literal> and returns the configuration for a virtual - host. That function is then called for several names to produce the list of - virtual host configurations. - </para> -</section> diff --git a/nixos/doc/manual/configuration/config-syntax.xml b/nixos/doc/manual/configuration/config-syntax.xml index 5526dea247c0a..a374c6a87074b 100644 --- a/nixos/doc/manual/configuration/config-syntax.xml +++ b/nixos/doc/manual/configuration/config-syntax.xml @@ -19,7 +19,7 @@ xlink:href="https://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix constructs useful in NixOS configuration files. </para> <xi:include href="config-file.xml" /> - <xi:include href="abstractions.xml" /> + <xi:include href="../from_md/configuration/abstractions.section.xml" /> <xi:include href="modularity.xml" /> <xi:include href="summary.xml" /> </chapter> diff --git a/nixos/doc/manual/from_md/configuration/abstractions.section.xml b/nixos/doc/manual/from_md/configuration/abstractions.section.xml new file mode 100644 index 0000000000000..c71e23e34adfd --- /dev/null +++ b/nixos/doc/manual/from_md/configuration/abstractions.section.xml @@ -0,0 +1,101 @@ +<section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xml:id="sec-module-abstractions"> + <title>Abstractions</title> + <para> + If you find yourself repeating yourself over and over, it’s time to + abstract. Take, for instance, this Apache HTTP Server configuration: + </para> + <programlisting language="bash"> +{ + services.httpd.virtualHosts = + { "blog.example.org" = { + documentRoot = "/webroot/blog.example.org"; + adminAddr = "alice@example.org"; + forceSSL = true; + enableACME = true; + enablePHP = true; + }; + "wiki.example.org" = { + documentRoot = "/webroot/wiki.example.org"; + adminAddr = "alice@example.org"; + forceSSL = true; + enableACME = true; + enablePHP = true; + }; + }; +} +</programlisting> + <para> + It defines two virtual hosts with nearly identical configuration; + the only difference is the document root directories. To prevent + this duplication, we can use a <literal>let</literal>: + </para> + <programlisting language="bash"> +let + commonConfig = + { adminAddr = "alice@example.org"; + forceSSL = true; + enableACME = true; + }; +in +{ + services.httpd.virtualHosts = + { "blog.example.org" = (commonConfig // { documentRoot = "/webroot/blog.example.org"; }); + "wiki.example.org" = (commonConfig // { documentRoot = "/webroot/wiki.example.com"; }); + }; +} +</programlisting> + <para> + The <literal>let commonConfig = ...</literal> defines a variable + named <literal>commonConfig</literal>. The <literal>//</literal> + operator merges two attribute sets, so the configuration of the + second virtual host is the set <literal>commonConfig</literal> + extended with the document root option. + </para> + <para> + You can write a <literal>let</literal> wherever an expression is + allowed. Thus, you also could have written: + </para> + <programlisting language="bash"> +{ + services.httpd.virtualHosts = + let commonConfig = ...; in + { "blog.example.org" = (commonConfig // { ... }) + "wiki.example.org" = (commonConfig // { ... }) + }; +} +</programlisting> + <para> + but not <literal>{ let commonConfig = ...; in ...; }</literal> since + attributes (as opposed to attribute values) are not expressions. + </para> + <para> + <emphasis role="strong">Functions</emphasis> provide another method + of abstraction. For instance, suppose that we want to generate lots + of different virtual hosts, all with identical configuration except + for the document root. This can be done as follows: + </para> + <programlisting language="bash"> +{ + services.httpd.virtualHosts = + let + makeVirtualHost = webroot: + { documentRoot = webroot; + adminAddr = "alice@example.org"; + forceSSL = true; + enableACME = true; + }; + in + { "example.org" = (makeVirtualHost "/webroot/example.org"); + "example.com" = (makeVirtualHost "/webroot/example.com"); + "example.gov" = (makeVirtualHost "/webroot/example.gov"); + "example.nl" = (makeVirtualHost "/webroot/example.nl"); + }; +} +</programlisting> + <para> + Here, <literal>makeVirtualHost</literal> is a function that takes a + single argument <literal>webroot</literal> and returns the + configuration for a virtual host. That function is then called for + several names to produce the list of virtual host configurations. + </para> +</section> 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 74bcf3483b2ac..070e7b142937a 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 @@ -64,6 +64,168 @@ this version for the entire lifecycle of the 21.11 release. </para> </listitem> + <listitem> + <para> + Those making use of <literal>buildBazelPackage</literal> will + need to regenerate the fetch hashes (preferred), or set + <literal>fetchConfigured = false;</literal>. + </para> + </listitem> + <listitem> + <para> + fsharp41 has been removed in preference to use the latest + dotnet-sdk + </para> + </listitem> + <listitem> + <para> + The following F#-related packages have been removed for being + unmaintaned. Please use <literal>fetchNuGet</literal> for + specific packages. + </para> + <itemizedlist spacing="compact"> + <listitem> + <para> + ExtCore + </para> + </listitem> + <listitem> + <para> + Fake + </para> + </listitem> + <listitem> + <para> + Fantomas + </para> + </listitem> + <listitem> + <para> + FsCheck + </para> + </listitem> + <listitem> + <para> + FsCheck262 + </para> + </listitem> + <listitem> + <para> + FsCheckNunit + </para> + </listitem> + <listitem> + <para> + FSharpAutoComplete + </para> + </listitem> + <listitem> + <para> + FSharpCompilerCodeDom + </para> + </listitem> + <listitem> + <para> + FSharpCompilerService + </para> + </listitem> + <listitem> + <para> + FSharpCompilerTools + </para> + </listitem> + <listitem> + <para> + FSharpCore302 + </para> + </listitem> + <listitem> + <para> + FSharpCore3125 + </para> + </listitem> + <listitem> + <para> + FSharpCore4001 + </para> + </listitem> + <listitem> + <para> + FSharpCore4117 + </para> + </listitem> + <listitem> + <para> + FSharpData + </para> + </listitem> + <listitem> + <para> + FSharpData225 + </para> + </listitem> + <listitem> + <para> + FSharpDataSQLProvider + </para> + </listitem> + <listitem> + <para> + FSharpFormatting + </para> + </listitem> + <listitem> + <para> + FsLexYacc + </para> + </listitem> + <listitem> + <para> + FsLexYacc706 + </para> + </listitem> + <listitem> + <para> + FsLexYaccRuntime + </para> + </listitem> + <listitem> + <para> + FsPickler + </para> + </listitem> + <listitem> + <para> + FsUnit + </para> + </listitem> + <listitem> + <para> + Projekt + </para> + </listitem> + <listitem> + <para> + Suave + </para> + </listitem> + <listitem> + <para> + UnionArgParser + </para> + </listitem> + <listitem> + <para> + ExcelDnaRegistration + </para> + </listitem> + <listitem> + <para> + MathNetNumerics + </para> + </listitem> + </itemizedlist> + </listitem> </itemizedlist> </section> <section xml:id="other-notable-changes"> diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index bdc2386f24c85..54abbb6e38e4a 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -183,15 +183,6 @@ <listitem> <para> - Enabling wireless networking now requires specifying at least one network - interface using <xref linkend="opt-networking.wireless.interfaces"/>. - This is to avoid a race condition with the card initialisation (see - <link xlink:href="https://github.com/NixOS/nixpkgs/issues/101963">issue - #101963</link> for more information). - </para> - </listitem> - <listitem> - <para> If you are using <option>services.udev.extraRules</option> to assign custom names to network interfaces, this may stop working due to a change in the initialisation of dhcpcd and systemd networkd. To avoid this, either diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 451d25a6ed988..c1fde5a032b4b 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -28,4 +28,40 @@ In addition to numerous new and upgraded packages, this release has the followin * PHP 7.3 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 21.11 release. +* Those making use of `buildBazelPackage` will need to regenerate the fetch + hashes (preferred), or set `fetchConfigured = false;`. + +* fsharp41 has been removed in preference to use the latest dotnet-sdk + +* The following F#-related packages have been removed for being unmaintaned. + Please use `fetchNuGet` for specific packages. + - ExtCore + - Fake + - Fantomas + - FsCheck + - FsCheck262 + - FsCheckNunit + - FSharpAutoComplete + - FSharpCompilerCodeDom + - FSharpCompilerService + - FSharpCompilerTools + - FSharpCore302 + - FSharpCore3125 + - FSharpCore4001 + - FSharpCore4117 + - FSharpData + - FSharpData225 + - FSharpDataSQLProvider + - FSharpFormatting + - FsLexYacc + - FsLexYacc706 + - FsLexYaccRuntime + - FsPickler + - FsUnit + - Projekt + - Suave + - UnionArgParser + - ExcelDnaRegistration + - MathNetNumerics + ## Other Notable Changes diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 97accc7b99a03..2be9da8f42a1d 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -92,7 +92,7 @@ in example = "PCI:4:0:0"; description = '' Bus ID of the AMD APU. You can find it using lspci; for example if lspci - shows the AMD APU at "04:00.0", set this option to "PCI:4:0:0". + shows the AMD APU at "04:00.0", set this option to "PCI:4:0:0". ''; }; @@ -159,7 +159,7 @@ in description = '' The NVIDIA X11 derivation to use. ''; - example = "config.boot.kernelPackages.nvidiaPackages.legacy340"; + example = "config.boot.kernelPackages.nvidiaPackages.legacy_340"; }; }; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index fc04997bd2eef..0c9a7055aa737 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -594,6 +594,7 @@ ./services/monitoring/loki.nix ./services/monitoring/longview.nix ./services/monitoring/mackerel-agent.nix + ./services/monitoring/metricbeat.nix ./services/monitoring/monit.nix ./services/monitoring/munin.nix ./services/monitoring/nagios.nix diff --git a/nixos/modules/security/pam_mount.nix b/nixos/modules/security/pam_mount.nix index 9a0143c155c57..e25ace38f57f9 100644 --- a/nixos/modules/security/pam_mount.nix +++ b/nixos/modules/security/pam_mount.nix @@ -29,6 +29,28 @@ in xlink:href="http://pam-mount.sourceforge.net/pam_mount.conf.5.html" />. ''; }; + + additionalSearchPaths = mkOption { + type = types.listOf types.package; + default = []; + example = literalExample "[ pkgs.bindfs ]"; + description = '' + Additional programs to include in the search path of pam_mount. + Useful for example if you want to use some FUSE filesystems like bindfs. + ''; + }; + + fuseMountOptions = mkOption { + type = types.listOf types.str; + default = []; + example = literalExample '' + [ "nodev" "nosuid" "force-user=%(USER)" "gid=%(USERGID)" "perms=0700" "chmod-deny" "chown-deny" "chgrp-deny" ] + ''; + description = '' + Global mount options that apply to every FUSE volume. + You can define volume-specific options in the volume definitions. + ''; + }; }; }; @@ -60,11 +82,12 @@ in <!-- if activated, requires ofl from hxtools to be present --> <logout wait="0" hup="no" term="no" kill="no" /> <!-- set PATH variable for pam_mount module --> - <path>${pkgs.util-linux}/bin</path> + <path>${makeBinPath ([ pkgs.util-linux ] ++ cfg.additionalSearchPaths)}</path> <!-- create mount point if not present --> <mkmountpoint enable="1" remove="true" /> <!-- specify the binaries to be called --> + <fusemount>${pkgs.fuse}/bin/mount.fuse %(VOLUME) %(MNTPT) -o ${concatStringsSep "," (cfg.fuseMountOptions ++ [ "%(OPTIONS)" ])}</fusemount> <cryptmount>${pkgs.pam_mount}/bin/mount.crypt %(VOLUME) %(MNTPT)</cryptmount> <cryptumount>${pkgs.pam_mount}/bin/umount.crypt %(MNTPT)</cryptumount> <pmvarrun>${pkgs.pam_mount}/bin/pmvarrun -u %(USER) -o %(OPERATION)</pmvarrun> diff --git a/nixos/modules/services/misc/bees.nix b/nixos/modules/services/misc/bees.nix index b0ed2d5c2862d..6b8cae84642f8 100644 --- a/nixos/modules/services/misc/bees.nix +++ b/nixos/modules/services/misc/bees.nix @@ -57,7 +57,7 @@ let }; options.extraOptions = mkOption { type = listOf str; - default = []; + default = [ ]; description = '' Extra command-line options passed to the daemon. See upstream bees documentation. ''; @@ -67,7 +67,8 @@ let }; }; -in { +in +{ options.services.beesd = { filesystems = mkOption { @@ -87,37 +88,42 @@ in { }; }; config = { - systemd.services = mapAttrs' (name: fs: nameValuePair "beesd@${name}" { - description = "Block-level BTRFS deduplication for %i"; - after = [ "sysinit.target" ]; + systemd.services = mapAttrs' + (name: fs: nameValuePair "beesd@${name}" { + description = "Block-level BTRFS deduplication for %i"; + after = [ "sysinit.target" ]; - serviceConfig = let - configOpts = [ - fs.spec - "verbosity=${toString fs.verbosity}" - "idxSizeMB=${toString fs.hashTableSizeMB}" - "workDir=${fs.workDir}" - ]; - configOptsStr = escapeShellArgs configOpts; - in { - # Values from https://github.com/Zygo/bees/blob/v0.6.1/scripts/beesd%40.service.in - ExecStart = "${pkgs.bees}/bin/bees-service-wrapper run ${configOptsStr} -- --no-timestamps ${escapeShellArgs fs.extraOptions}"; - ExecStopPost = "${pkgs.bees}/bin/bees-service-wrapper cleanup ${configOptsStr}"; - CPUAccounting = true; - CPUWeight = 12; - IOSchedulingClass = "idle"; - IOSchedulingPriority = 7; - IOWeight = 10; - KillMode = "control-group"; - KillSignal = "SIGTERM"; - MemoryAccounting = true; - Nice = 19; - Restart = "on-abnormal"; - StartupCPUWeight = 25; - StartupIOWeight = 25; - SyslogIdentifier = "bees"; # would otherwise be "bees-service-wrapper" - }; - wantedBy = ["multi-user.target"]; - }) cfg.filesystems; + serviceConfig = + let + configOpts = [ + fs.spec + "verbosity=${toString fs.verbosity}" + "idxSizeMB=${toString fs.hashTableSizeMB}" + "workDir=${fs.workDir}" + ]; + configOptsStr = escapeShellArgs configOpts; + in + { + # Values from https://github.com/Zygo/bees/blob/v0.6.5/scripts/beesd@.service.in + ExecStart = "${pkgs.bees}/bin/bees-service-wrapper run ${configOptsStr} -- --no-timestamps ${escapeShellArgs fs.extraOptions}"; + ExecStopPost = "${pkgs.bees}/bin/bees-service-wrapper cleanup ${configOptsStr}"; + CPUAccounting = true; + CPUSchedulingPolicy = "batch"; + CPUWeight = 12; + IOSchedulingClass = "idle"; + IOSchedulingPriority = 7; + IOWeight = 10; + KillMode = "control-group"; + KillSignal = "SIGTERM"; + MemoryAccounting = true; + Nice = 19; + Restart = "on-abnormal"; + StartupCPUWeight = 25; + StartupIOWeight = 25; + SyslogIdentifier = "beesd"; # would otherwise be "bees-service-wrapper" + }; + wantedBy = [ "multi-user.target" ]; + }) + cfg.filesystems; }; } diff --git a/nixos/modules/services/monitoring/metricbeat.nix b/nixos/modules/services/monitoring/metricbeat.nix new file mode 100644 index 0000000000000..b285559eaa9b3 --- /dev/null +++ b/nixos/modules/services/monitoring/metricbeat.nix @@ -0,0 +1,152 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) + attrValues + literalExample + mkEnableOption + mkIf + mkOption + types + ; + cfg = config.services.metricbeat; + + settingsFormat = pkgs.formats.yaml {}; + +in +{ + options = { + + services.metricbeat = { + + enable = mkEnableOption "metricbeat"; + + package = mkOption { + type = types.package; + default = pkgs.metricbeat; + defaultText = literalExample "pkgs.metricbeat"; + example = literalExample "pkgs.metricbeat7"; + description = '' + The metricbeat package to use + ''; + }; + + modules = mkOption { + description = '' + Metricbeat modules are responsible for reading metrics from the various sources. + + This is like <literal>services.metricbeat.settings.metricbeat.modules</literal>, + but structured as an attribute set. This has the benefit that multiple + NixOS modules can contribute settings to a single metricbeat module. + + A module can be specified multiple times by choosing a different <literal><name></literal> + for each, but setting <xref linkend="opt-services.metricbeat.modules._name_.module"/> to the same value. + + See <link xlink:href="https://www.elastic.co/guide/en/beats/metricbeat/current/metricbeat-modules.html"/>. + ''; + default = {}; + type = types.attrsOf (types.submodule ({ name, ... }: { + freeformType = settingsFormat.type; + options = { + module = mkOption { + type = types.str; + default = name; + defaultText = literalExample ''<name>''; + description = '' + The name of the module. + + Look for the value after <literal>module:</literal> on the individual + module pages linked from <link xlink:href="https://www.elastic.co/guide/en/beats/metricbeat/current/metricbeat-modules.html"/>. + ''; + }; + }; + })); + example = { + system = { + metricsets = ["cpu" "load" "memory" "network" "process" "process_summary" "uptime" "socket_summary"]; + enabled = true; + period = "10s"; + processes = [".*"]; + cpu.metrics = ["percentages" "normalized_percentages"]; + core.metrics = ["percentages"]; + }; + }; + }; + + settings = mkOption { + type = types.submodule { + freeformType = settingsFormat.type; + options = { + + name = mkOption { + type = types.str; + default = ""; + description = '' + Name of the beat. Defaults to the hostname. + See <link xlink:href="https://www.elastic.co/guide/en/beats/metricbeat/current/configuration-general-options.html#_name"/>. + ''; + }; + + tags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Tags to place on the shipped metrics. + See <link xlink:href="https://www.elastic.co/guide/en/beats/metricbeat/current/configuration-general-options.html#_tags_2"/>. + ''; + }; + + metricbeat.modules = mkOption { + type = types.listOf settingsFormat.type; + default = []; + internal = true; + description = '' + The metric collecting modules. Use <xref linkend="opt-services.metricbeat.modules"/> instead. + + See <link xlink:href="https://www.elastic.co/guide/en/beats/metricbeat/current/metricbeat-modules.html"/>. + ''; + }; + }; + }; + default = {}; + description = '' + Configuration for metricbeat. See <link xlink:href="https://www.elastic.co/guide/en/beats/metricbeat/current/configuring-howto-metricbeat.html"/> for supported values. + ''; + }; + + }; + }; + + config = mkIf cfg.enable { + + assertions = [ + { + # empty modules would cause a failure at runtime + assertion = cfg.settings.metricbeat.modules != []; + message = "services.metricbeat: You must configure one or more modules."; + } + ]; + + services.metricbeat.settings.metricbeat.modules = attrValues cfg.modules; + + systemd.services.metricbeat = { + description = "metricbeat metrics shipper"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = '' + ${cfg.package}/bin/metricbeat \ + -c ${settingsFormat.generate "metricbeat.yml" cfg.settings} \ + --path.data $STATE_DIRECTORY \ + --path.logs $LOGS_DIRECTORY \ + ; + ''; + Restart = "always"; + DynamicUser = true; + ProtectSystem = "strict"; + ProtectHome = "tmpfs"; + StateDirectory = "metricbeat"; + LogsDirectory = "metricbeat"; + }; + }; + }; +} diff --git a/nixos/modules/services/network-filesystems/davfs2.nix b/nixos/modules/services/network-filesystems/davfs2.nix index 4b6f85e4a2c97..8cf314fe63a50 100644 --- a/nixos/modules/services/network-filesystems/davfs2.nix +++ b/nixos/modules/services/network-filesystems/davfs2.nix @@ -70,6 +70,24 @@ in }; }; + security.wrappers."mount.davfs" = { + program = "mount.davfs"; + source = "${pkgs.davfs2}/bin/mount.davfs"; + owner = "root"; + group = cfg.davGroup; + setuid = true; + permissions = "u+rx,g+x"; + }; + + security.wrappers."umount.davfs" = { + program = "umount.davfs"; + source = "${pkgs.davfs2}/bin/umount.davfs"; + owner = "root"; + group = cfg.davGroup; + setuid = true; + permissions = "u+rx,g+x"; + }; + }; } diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 135f29be58c09..064018057cdbf 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -22,36 +22,51 @@ let enableIwd = cfg.wifi.backend == "iwd"; - configFile = pkgs.writeText "NetworkManager.conf" '' - [main] - plugins=keyfile - dhcp=${cfg.dhcp} - dns=${cfg.dns} - # If resolvconf is disabled that means that resolv.conf is managed by some other module. - rc-manager=${if config.networking.resolvconf.enable then "resolvconf" else "unmanaged"} - - [keyfile] - ${optionalString (cfg.unmanaged != []) - ''unmanaged-devices=${lib.concatStringsSep ";" cfg.unmanaged}''} - - [logging] - level=${cfg.logLevel} - audit=${lib.boolToString config.security.audit.enable} - - [connection] - ipv6.ip6-privacy=2 - ethernet.cloned-mac-address=${cfg.ethernet.macAddress} - wifi.cloned-mac-address=${cfg.wifi.macAddress} - ${optionalString (cfg.wifi.powersave != null) - ''wifi.powersave=${if cfg.wifi.powersave then "3" else "2"}''} - - [device] - wifi.scan-rand-mac-address=${if cfg.wifi.scanRandMacAddress then "yes" else "no"} - wifi.backend=${cfg.wifi.backend} - - ${cfg.extraConfig} + mkValue = v: + if v == true then "yes" + else if v == false then "no" + else if lib.isInt v then toString v + else v; + + mkSection = name: attrs: '' + [${name}] + ${ + lib.concatStringsSep "\n" + (lib.mapAttrsToList + (k: v: "${k}=${mkValue v}") + (lib.filterAttrs + (k: v: v != null) + attrs)) + } ''; + configFile = pkgs.writeText "NetworkManager.conf" (lib.concatStringsSep "\n" [ + (mkSection "main" { + plugins = "keyfile"; + dhcp = cfg.dhcp; + dns = cfg.dns; + # If resolvconf is disabled that means that resolv.conf is managed by some other module. + rc-manager = + if config.networking.resolvconf.enable then "resolvconf" + else "unmanaged"; + }) + (mkSection "keyfile" { + unmanaged-devices = + if cfg.unmanaged == [] then null + else lib.concatStringsSep ";" cfg.unmanaged; + }) + (mkSection "logging" { + audit = config.security.audit.enable; + level = cfg.logLevel; + }) + (mkSection "connection" cfg.connectionConfig) + (mkSection "device" { + "wifi.scan-rand-mac-address" = cfg.wifi.scanRandMacAddress; + "wifi.backend" = cfg.wifi.backend; + }) + cfg.extraConfig + ]); + /* [network-manager] Identity=unix-group:networkmanager @@ -154,6 +169,28 @@ in { ''; }; + connectionConfig = mkOption { + type = with types; attrsOf (nullOr (oneOf [ + bool + int + str + ])); + default = {}; + description = '' + Configuration for the [connection] section of NetworkManager.conf. + Refer to + <link xlink:href="https://developer.gnome.org/NetworkManager/stable/NetworkManager.conf.html"> + https://developer.gnome.org/NetworkManager/stable/NetworkManager.conf.html#id-1.2.3.11 + </link> + or + <citerefentry> + <refentrytitle>NetworkManager.conf</refentrytitle> + <manvolnum>5</manvolnum> + </citerefentry> + for more information. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; @@ -482,6 +519,18 @@ in { (mkIf enableIwd { wireless.iwd.enable = true; }) + + { + networkmanager.connectionConfig = { + "ipv6.ip6-privacy" = 2; + "ethernet.cloned-mac-address" = cfg.ethernet.macAddress; + "wifi.cloned-mac-address" = cfg.wifi.macAddress; + "wifi.powersave" = + if cfg.wifi.powersave == null then null + else if cfg.wifi.powersave then 3 + else 2; + }; + } ]; boot.kernelModules = [ "ctr" ]; diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index d9308b37064a6..c0a4ce40760af 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -40,7 +40,13 @@ in { default = []; example = [ "wlan0" "wlan1" ]; description = '' - The interfaces <command>wpa_supplicant</command> will use. + The interfaces <command>wpa_supplicant</command> will use. If empty, it will + automatically use all wireless interfaces. + <warning><para> + The automatic discovery of interfaces does not work reliably on boot: + it may fail and leave the system without network. When possible, specify + a known interface name. + </para></warning> ''; }; @@ -219,18 +225,19 @@ in { }; config = mkIf cfg.enable { - assertions = [ - { assertion = cfg.interfaces != []; - message = '' - No network interfaces for wpa_supplicant have been configured. - Please, specify at least one using networking.wireless.interfaces. - ''; - } - ] ++ flip mapAttrsToList cfg.networks (name: cfg: { + assertions = flip mapAttrsToList cfg.networks (name: cfg: { assertion = with cfg; count (x: x != null) [ psk pskRaw auth ] <= 1; message = ''options networking.wireless."${name}".{psk,pskRaw,auth} are mutually exclusive''; }); + warnings = + optional (cfg.interfaces == [] && config.systemd.services.wpa_supplicant.wantedBy != []) + '' + No network interfaces for wpa_supplicant have been configured: the service + may randomly fail to start at boot. You should specify at least one using the option + networking.wireless.interfaces. + ''; + environment.systemPackages = [ package ]; services.dbus.packages = [ package ]; @@ -261,7 +268,20 @@ in { then echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead." fi iface_args="-s -u -D${cfg.driver} ${configStr}" - args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}" + ${if ifaces == [] then '' + for i in $(cd /sys/class/net && echo *); do + DEVTYPE= + UEVENT_PATH=/sys/class/net/$i/uevent + if [ -e "$UEVENT_PATH" ]; then + source "$UEVENT_PATH" + if [ "$DEVTYPE" = "wlan" -o -e /sys/class/net/$i/wireless ]; then + args+="''${args:+ -N} -i$i $iface_args" + fi + fi + done + '' else '' + args="${concatMapStringsSep " -N " (i: "-i${i} $iface_args") ifaces}" + ''} exec wpa_supplicant $args ''; }; diff --git a/nixos/modules/services/system/self-deploy.nix b/nixos/modules/services/system/self-deploy.nix index 3c82ed4fc593f..33d15e08f4aac 100644 --- a/nixos/modules/services/system/self-deploy.nix +++ b/nixos/modules/services/system/self-deploy.nix @@ -37,7 +37,9 @@ in }; nixAttribute = lib.mkOption { - type = lib.types.str; + type = with lib.types; nullOr str; + + default = null; description = '' Attribute of `nixFile` that builds the current system. diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 2b2ee019aeb2e..b0859321a5258 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -180,7 +180,7 @@ in enable = mkOption { type = types.bool; default = false; - description = "Enable Gnome 3 desktop manager."; + description = "Enable GNOME desktop manager."; }; sessionPath = mkOption { @@ -283,7 +283,7 @@ in (mkIf (cfg.enable || flashbackEnabled) { # Seed our configuration into nixos-generate-config system.nixos-generate-config.desktopConfiguration = ['' - # Enable the GNOME 3 Desktop Environment. + # Enable the GNOME Desktop Environment. services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome.enable = true; '']; diff --git a/nixos/tests/custom-ca.nix b/nixos/tests/custom-ca.nix index 7ce1101911db0..26f29a3e68fef 100644 --- a/nixos/tests/custom-ca.nix +++ b/nixos/tests/custom-ca.nix @@ -107,8 +107,15 @@ in ''; }; - environment.systemPackages = with pkgs; - [ xdotool firefox chromium falkon midori ]; + environment.systemPackages = with pkgs; [ + xdotool + # Firefox was disabled here, because we needed to disable p11-kit support in nss, + # which is why it will not use the system certificate store for the time being. + # firefox + chromium + falkon + midori + ]; }; testScript = '' @@ -145,7 +152,14 @@ in with subtest("Unknown CA is untrusted in curl"): machine.fail("curl -fv https://bad.example.com") - browsers = ["firefox", "chromium", "falkon", "midori"] + browsers = [ + # Firefox was disabled here, because we needed to disable p11-kit support in nss, + # which is why it will not use the system certificate store for the time being. + # "firefox", + "chromium", + "falkon", + "midori" + ] errors = ["Security Risk", "not private", "Certificate Error", "Security"] machine.wait_for_x() diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index 71d39a647a5ac..2a1a4cba2956e 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -56,6 +56,24 @@ let ''); }; + metricbeat = { + enable = true; + package = elk.metricbeat; + modules.system = { + metricsets = ["cpu" "load" "memory" "network" "process" "process_summary" "uptime" "socket_summary"]; + enabled = true; + period = "5s"; + processes = [".*"]; + cpu.metrics = ["percentages" "normalized_percentages"]; + core.metrics = ["percentages"]; + }; + settings = { + output.elasticsearch = { + hosts = ["127.0.0.1:9200"]; + }; + }; + }; + logstash = { enable = true; package = elk.logstash; @@ -135,6 +153,16 @@ let ) + def has_metricbeat(): + dictionary = {"query": {"match": {"event.dataset": {"query": "system.cpu"}}}} + return ( + "curl --silent --show-error '${esUrl}/_search' " + + "-H 'Content-Type: application/json' " + + "-d '{}' ".format(json.dumps(dictionary)) + + "| jq '.hits.total > 0'" + ) + + start_all() one.wait_for_unit("elasticsearch.service") @@ -161,6 +189,12 @@ let "curl --silent --show-error 'http://localhost:5601/api/status' | jq .status.overall.state | grep green" ) + with subtest("Metricbeat is running"): + one.wait_for_unit("metricbeat.service") + + with subtest("Metricbeat metrics arrive in elasticsearch"): + one.wait_until_succeeds(has_metricbeat() + " | tee /dev/console | grep 'true'") + with subtest("Logstash messages arive in elasticsearch"): one.wait_until_succeeds(total_hits("flowers") + " | grep -v 0") one.wait_until_succeeds(total_hits("dragons") + " | grep 0") @@ -190,12 +224,14 @@ in pkgs.lib.mapAttrs mkElkTest { logstash = pkgs.logstash6; kibana = pkgs.kibana6; journalbeat = pkgs.journalbeat6; + metricbeat = pkgs.metricbeat6; } else { elasticsearch = pkgs.elasticsearch6-oss; logstash = pkgs.logstash6-oss; kibana = pkgs.kibana6-oss; journalbeat = pkgs.journalbeat6; + metricbeat = pkgs.metricbeat6; }; ELK-7 = if enableUnfree @@ -204,11 +240,13 @@ in pkgs.lib.mapAttrs mkElkTest { logstash = pkgs.logstash7; kibana = pkgs.kibana7; journalbeat = pkgs.journalbeat7; + metricbeat = pkgs.metricbeat7; } else { elasticsearch = pkgs.elasticsearch7-oss; logstash = pkgs.logstash7-oss; kibana = pkgs.kibana7-oss; journalbeat = pkgs.journalbeat7; + metricbeat = pkgs.metricbeat7; }; } diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index a300609cf2bfc..cb23bb2fc2d47 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -31,7 +31,6 @@ with pkgs; { linux_4_19 = makeKernelTest "4.19" linuxPackages_4_19; linux_5_4 = makeKernelTest "5.4" linuxPackages_5_4; linux_5_10 = makeKernelTest "5.10" linuxPackages_5_10; - linux_5_11 = makeKernelTest "5.11" linuxPackages_5_11; linux_5_12 = makeKernelTest "5.12" linuxPackages_5_12; linux_testing = makeKernelTest "testing" linuxPackages_testing; diff --git a/pkgs/applications/audio/bshapr/default.nix b/pkgs/applications/audio/bshapr/default.nix index e1a83537a6a04..728c60b2e86fd 100644 --- a/pkgs/applications/audio/bshapr/default.nix +++ b/pkgs/applications/audio/bshapr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bshapr"; - version = "0.12"; + version = "0.13"; src = fetchFromGitHub { owner = "sjaehn"; repo = "BShapr"; rev = "v${version}"; - sha256 = "sha256-2DySlD5ZTxeQ2U++Dr67bek5oVbAiOHCxM6S5rTTZN0="; + sha256 = "sha256-9I4DPRl6i/VL8Etw3qLGZkP45BGsbxFxNOvRy3B3I+M="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 28d0ae6f5f444..49aa0ba471471 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -18,13 +18,13 @@ let in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.6.2"; + version = "2.6.3"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "1dhkdzc3601rhg8pqljbv3dz7j0mx75brpfhlizhgwgv65qk3ifj"; + sha256 = "sha256-bSqGgRXqHGjT+OYCEafsT/btVe+n91+L0kB8fnrywss="; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 09fe6d1b2dddf..22bb3d445ada6 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.1.5"; + version = "1.1.7"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; - sha256 = "ZUxWOlJGQpeQCtWt0PSdcbMackHdeuNFkxHvYDPcU8Y="; + sha256 = "05hcckkv3vhz172w9kp5lh4srakizx1l383dijs50vgx2bj30m8v"; }; patches = [ @@ -38,6 +38,7 @@ python3Packages.buildPythonApplication rec { colorlog concurrent-log-handler cryptography + dnspython keyrings-cryptfile pyyaml setproctitle diff --git a/pkgs/applications/editors/edbrowse/0001-small-fixes.patch b/pkgs/applications/editors/edbrowse/0001-small-fixes.patch new file mode 100644 index 0000000000000..433b884cc5deb --- /dev/null +++ b/pkgs/applications/editors/edbrowse/0001-small-fixes.patch @@ -0,0 +1,20 @@ +diff -Naur source.old/src/makefile source/src/makefile +--- source.old/src/makefile 1969-12-31 21:00:01.000000000 -0300 ++++ source/src/makefile 2021-06-07 18:58:48.851231787 -0300 +@@ -101,14 +101,14 @@ + + # need packages nodejs and libnode-dev + js_hello_v8 : js_hello_v8.cpp +- g++ -I/usr/include/v8 js_hello_v8.cpp -lv8 -lstdc++ -o js_hello_v8 ++ $(CXX) -I/usr/include/v8 js_hello_v8.cpp -lv8 -lstdc++ -o js_hello_v8 + + HELLOEXTRA = stringfile.o messages.o msg-strings.o startwindow.o ebrc.o format.o http.o isup.o fetchmail.o sendmail.o plugin.o buffers.o dbstubs.o html.o decorate.o html-tidy.o css.o + js_hello_moz : js_hello_moz.o $(HELLOEXTRA) jseng-moz.o + $(CC) js_hello_moz.o $(HELLOEXTRA) jseng-moz.o $(LDFLAGS) -lmozjs-$(SMV) -lstdc++ -o $@ + + js_hello_quick : js_hello_quick.c +- gcc $(CFLAGS) js_hello_quick.c stringfile.o messages.o msg-strings.o ebrc.o format.o -o js_hello_quick -L/usr/local/lib/quickjs -lquickjs -lm -ldl -lpthread -latomic ++ $(CC) $(CFLAGS) js_hello_quick.c stringfile.o messages.o msg-strings.o ebrc.o format.o -o js_hello_quick $(QUICKJS_LDFLAGS) -lm -lpthread + + hello: js_hello_duk js_hello_v8 js_hello_moz js_hello_quick + diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix index 86cc81a58c268..5b37b86556b7f 100644 --- a/pkgs/applications/editors/edbrowse/default.nix +++ b/pkgs/applications/editors/edbrowse/default.nix @@ -1,41 +1,79 @@ -{ lib, stdenv, fetchFromGitHub, duktape, curl, pcre, readline, openssl, perl, html-tidy }: +{ lib +, stdenv +, fetchFromGitHub +, curl +, duktape +, html-tidy +, openssl +, pcre +, perl +, pkg-config +, quickjs +, readline +, which +}: stdenv.mkDerivation rec { pname = "edbrowse"; - version = "3.7.7"; + version = "3.8.0"; - buildInputs = [ curl pcre readline openssl duktape perl html-tidy ]; + src = fetchFromGitHub { + owner = "CMB"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ZXxzQBAmu7kM3sjqg/rDLBXNucO8sFRFKXV8UxQVQZU="; + }; + + nativeBuildInputs = [ + pkg-config + which + ]; + buildInputs = [ + curl + duktape + html-tidy + openssl + pcre + perl + quickjs + readline + ]; + + patches = [ + # Fixes some small annoyances on src/makefile + ./0001-small-fixes.patch + ]; postPatch = '' - for i in ./tools/*.pl - do - substituteInPlace $i --replace "/usr/bin/perl" "${perl}/bin/perl" + substituteInPlace src/makefile --replace\ + '-L/usr/local/lib/quickjs' '-L${quickjs}/lib/quickjs' + for i in $(find ./tools/ -type f ! -name '*.c'); do + patchShebangs $i done ''; makeFlags = [ "-C" "src" - "prefix=${placeholder "out"}" + "PREFIX=${placeholder "out"}" ]; - src = fetchFromGitHub { - owner = "CMB"; - repo = "edbrowse"; - rev = "v${version}"; - sha256 = "0cw9d60mdhwna57r1vxn53s8gl81rr3cxnvm769ifq3xyh49vfcf"; - }; meta = with lib; { + homepage = "https://edbrowse.org/"; description = "Command Line Editor Browser"; longDescription = '' - Edbrowse is a combination editor, browser, and mail client that is 100% text based. - The interface is similar to /bin/ed, though there are many more features, such as editing multiple files simultaneously, and rendering html. - This program was originally written for blind users, but many sighted users have taken advantage of the unique scripting capabilities of this program, which can be found nowhere else. - A batch job, or cron job, can access web pages on the internet, submit forms, and send email, with no human intervention whatsoever. - edbrowse can also tap into databases through odbc. It was primarily written by Karl Dahlke. - ''; + Edbrowse is a combination editor, browser, and mail client that is 100% + text based. The interface is similar to /bin/ed, though there are many + more features, such as editing multiple files simultaneously, and + rendering html. This program was originally written for blind users, but + many sighted users have taken advantage of the unique scripting + capabilities of this program, which can be found nowhere else. A batch + job, or cron job, can access web pages on the internet, submit forms, and + send email, with no human intervention whatsoever. edbrowse can also tap + into databases through odbc. It was primarily written by Karl Dahlke. + ''; license = licenses.gpl1Plus; - homepage = "https://edbrowse.org/"; maintainers = with maintainers; [ schmitthenner vrthra equirosa ]; platforms = platforms.linux; }; } +# TODO: send the patch to upstream developers diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 8012d85137e04..946cef998c1e4 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -238,10 +238,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.0.11"; + version = "13.0.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.0.11.tar"; - sha256 = "0sy4f1n38q58vyzw5l0f80ci3j99rb25gbwj0frl0pglfmgzl44k"; + url = "https://elpa.gnu.org/packages/auctex-13.0.12.tar"; + sha256 = "0fx3l6yyq63mlnapxiqpdhi5l314r3aj63404nly6hcdvc28g9nm"; }; packageRequires = [ emacs ]; meta = { @@ -636,6 +636,21 @@ license = lib.licenses.free; }; }) {}; + consult = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "consult"; + ename = "consult"; + version = "0.8"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/consult-0.8.tar"; + sha256 = "0vkq8dsj6k3gsdhiyg6ccv49fqgjw6f0db4wjsvm5zbkadjvlm86"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/consult.html"; + license = lib.licenses.free; + }; + }) {}; context-coloring = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "context-coloring"; @@ -816,6 +831,21 @@ license = lib.licenses.free; }; }) {}; + devdocs = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "devdocs"; + ename = "devdocs"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/devdocs-0.1.tar"; + sha256 = "1ps2jpp1ckq9839l63p6npqrf85b8zb5akwvjvv7fkm8nvspdkil"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/devdocs.html"; + license = lib.licenses.free; + }; + }) {}; dict-tree = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA, trie }: elpaBuild { pname = "dict-tree"; @@ -906,16 +936,16 @@ license = lib.licenses.free; }; }) {}; - dismal = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: + dismal = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "dismal"; ename = "dismal"; - version = "1.5"; + version = "1.5.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dismal-1.5.tar"; - sha256 = "1vhs6w6c2klsrfjpw8vr5c4gwiw83ppdjhsn2la0fvkm60jmc476"; + url = "https://elpa.gnu.org/packages/dismal-1.5.2.tar"; + sha256 = "0pl5cnziilm4ps1xzh1fa8irazn7vcp9nsxnxcvjqbkflpcpq5c7"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/dismal.html"; license = lib.licenses.free; @@ -985,10 +1015,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.6.22"; + version = "0.6.23"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.6.22.tar"; - sha256 = "0dljl21n6508c7ash7l6zgxhpn2wdfzga0va63d4k9nwnqmkvsgz"; + url = "https://elpa.gnu.org/packages/ebdb-0.6.23.tar"; + sha256 = "0j3jvy9s606qjqcmcjzgck3dp8bhpgly2g00wnswzcgk4makdzld"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -1045,10 +1075,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20210512"; + version = "20210607"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20210512.tar"; - sha256 = "0dj49lpqv5vsx02h8mla8cmv5cr5f2qbz74f9dn8q4adpzxsajin"; + url = "https://elpa.gnu.org/packages/eev-20210607.tar"; + sha256 = "0avd58m8630s4d3ys9g84csscdmf2y1swwwkgzjkrrq8q0j5yd3l"; }; packageRequires = [ emacs ]; meta = { @@ -1241,10 +1271,10 @@ elpaBuild { pname = "excorporate"; ename = "excorporate"; - version = "0.9.6"; + version = "1.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/excorporate-0.9.6.tar"; - sha256 = "0ljav8g1npg0a36x1xxpfs2gvk622fh3si95s3w2vmwa27ynirzj"; + url = "https://elpa.gnu.org/packages/excorporate-1.0.0.tar"; + sha256 = "1g0wc2kp15ra323b4rxvdh58q9c4h7m20grw6a0cs53m7l9xi62f"; }; packageRequires = [ cl-lib @@ -1742,10 +1772,10 @@ elpaBuild { pname = "isearch-mb"; ename = "isearch-mb"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/isearch-mb-0.2.tar"; - sha256 = "1mfjppv33cb5f5f6cc1486msxjxfjnnkryc1yax43k6fgzjr0j4h"; + url = "https://elpa.gnu.org/packages/isearch-mb-0.3.tar"; + sha256 = "01yq1skc6rm9yp80vz2fhh9lbkdb9nhf57h424mrkycdky2w50mx"; }; packageRequires = [ emacs ]; meta = { @@ -1987,10 +2017,10 @@ elpaBuild { pname = "leaf"; ename = "leaf"; - version = "4.4.4"; + version = "4.4.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/leaf-4.4.4.tar"; - sha256 = "1npg06zmy21kg2qsqgfm03l7vjib697i96awypcdb0hw5mvmc1a1"; + url = "https://elpa.gnu.org/packages/leaf-4.4.8.tar"; + sha256 = "0h0ksmgrhn29ci6z8y54dbbzcqlvfs1ra0kmf226gz0dqzk45vb3"; }; packageRequires = [ emacs ]; meta = { @@ -2118,6 +2148,21 @@ license = lib.licenses.free; }; }) {}; + marginalia = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "marginalia"; + ename = "marginalia"; + version = "0.6"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/marginalia-0.6.tar"; + sha256 = "05pwaz9643shxnv63l6r9m2c0qf1nc1hy6jiqw01bkvvgg8g4jag"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/marginalia.html"; + license = lib.licenses.free; + }; + }) {}; markchars = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "markchars"; @@ -2276,10 +2321,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "1.3.2"; + version = "1.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-themes-1.3.2.tar"; - sha256 = "085zi3ckf4s1kjskqb04b78rgrhbdhrrp74yksb5w0hl58bd8rsc"; + url = "https://elpa.gnu.org/packages/modus-themes-1.4.0.tar"; + sha256 = "0ssckl06jk08vaq4g7sxpzvc3ybm339fzbn9qw21w82v1l60rzpm"; }; packageRequires = [ emacs ]; meta = { @@ -2784,10 +2829,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-1.0.2.tar"; - sha256 = "19a1dkjyw9m74aamyqrsvzrdwshngqpmjzdngx6v5nifvcilrlnk"; + url = "https://elpa.gnu.org/packages/posframe-1.0.3.tar"; + sha256 = "0c3lnrydsysv8j25brgc0cckf1hz54yhkginncmw81y1ia43rqmx"; }; packageRequires = [ emacs ]; meta = { @@ -2844,10 +2889,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "3.7.6"; + version = "3.7.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-3.7.6.tar"; - sha256 = "1crimmvyppjmds9shfvxy9j5zi3mk133bv5av0fgicm7ddkivksr"; + url = "https://elpa.gnu.org/packages/pyim-3.7.9.tar"; + sha256 = "00ff1izdwcy53dcwpdn18wwndnw2jsw4bhg8gkqaa60xm468xzkl"; }; packageRequires = [ async emacs xr ]; meta = { @@ -3340,10 +3385,10 @@ elpaBuild { pname = "shell-command-plus"; ename = "shell-command+"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/shell-command+-2.1.0.tar"; - sha256 = "1jyrnv89989bi03m5h8dj0cllsw3rvyxkiyfrh9v6gpxjwfy8lmq"; + url = "https://elpa.gnu.org/packages/shell-command+-2.2.0.tar"; + sha256 = "1ms2xk7xfgd3ngwm90hnmlxwpvyb167bislc2wr3ilfrirbbw476"; }; packageRequires = [ emacs ]; meta = { @@ -3734,10 +3779,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.0.4"; + version = "2.5.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.0.4.tar"; - sha256 = "0yk4ckk45gkjp24nfywz49j8pazq33m6pga3lirb5h6zc8an5z24"; + url = "https://elpa.gnu.org/packages/tramp-2.5.0.5.tar"; + sha256 = "1dclxffynfacvwi2scpda35sxjb42603yyf2p0477qa9b0i4xha0"; }; packageRequires = [ emacs ]; meta = { @@ -3779,10 +3824,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.3.2"; + version = "0.3.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/transient-0.3.2.tar"; - sha256 = "10zqa245dn6z689z7ap6nx6q9s95whzgybpwl2slpmnawxix2q6i"; + url = "https://elpa.gnu.org/packages/transient-0.3.4.tar"; + sha256 = "1m71w52cr8f9wm6lybfa003w408lkrl6q9whs53hpp3pl5phhfvb"; }; packageRequires = [ emacs ]; meta = { @@ -3970,10 +4015,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "0.10"; + version = "0.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-0.10.tar"; - sha256 = "07bzhxgp3k6q4wl9ijhx4vg8diinn782xhr8axn790a5vj199j78"; + url = "https://elpa.gnu.org/packages/vertico-0.11.tar"; + sha256 = "0hzwddkac85i449173az8crlksj9ivrqf969r81kbr45ksgr1ij6"; }; packageRequires = [ emacs ]; meta = { @@ -4093,10 +4138,10 @@ elpaBuild { pname = "webfeeder"; ename = "webfeeder"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/webfeeder-1.1.1.tar"; - sha256 = "09caj12hfdfhlbcsmjyhw728w1f7yq13hdslh793yvfqv83ipvc4"; + url = "https://elpa.gnu.org/packages/webfeeder-1.1.2.tar"; + sha256 = "1l128q424qsq9jv2wk8cv4zli71rk34q5kgwa9axdz0d27p9l6v4"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index f862a1ae8a54d..7ccd96a9ca08a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -3,20 +3,25 @@ elisp-ffi = melpaBuild rec { pname = "elisp-ffi"; version = "1.0.0"; + src = pkgs.fetchFromGitHub { owner = "skeeto"; repo = "elisp-ffi"; rev = version; sha256 = "0z2n3h5l5fj8wl8i1ilfzv11l3zba14sgph6gz7dx7q12cnp9j22"; }; + buildInputs = [ pkgs.libffi ]; + preBuild = "make"; + recipe = pkgs.writeText "recipe" '' (elisp-ffi :repo "skeeto/elisp-ffi" :fetcher github :files ("ffi-glue" "ffi.el")) ''; + meta = { description = "Emacs Lisp Foreign Function Interface"; longDescription = '' @@ -65,27 +70,22 @@ }; }; - apheleia = callPackage ./apheleia {}; - - emacspeak = callPackage ./emacspeak {}; - - ess-R-object-popup = - callPackage ./ess-R-object-popup { }; - - evil-markdown = callPackage ./evil-markdown { }; - - font-lock-plus = callPackage ./font-lock-plus { }; - ghc-mod = melpaBuild { pname = "ghc"; version = pkgs.haskellPackages.ghc-mod.version; + src = pkgs.haskellPackages.ghc-mod.src; + packageRequires = [ haskell-mode ]; + propagatedUserEnvPkgs = [ pkgs.haskellPackages.ghc-mod ]; + recipe = pkgs.writeText "recipe" '' (ghc-mod :repo "DanielG/ghc-mod" :fetcher github :files ("elisp/*.el")) ''; + fileSpecs = [ "elisp/*.el" ]; + meta = { description = "An extension of haskell-mode that provides completion of symbols and documentation browsing"; license = bsd3; @@ -97,32 +97,28 @@ haskell-unicode-input-method = melpaBuild { pname = "emacs-haskell-unicode-input-method"; version = "20110905.2307"; + src = pkgs.fetchFromGitHub { owner = "roelvandijk"; repo = "emacs-haskell-unicode-input-method"; rev = "d8d168148c187ed19350bb7a1a190217c2915a63"; sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78"; }; + recipe = pkgs.writeText "recipe" '' (emacs-haskell-unicode-input-method :repo "roelvandijk/emacs-haskell-unicode-input-method" :fetcher github) ''; + packageRequires = []; + meta = { homepage = "https://melpa.org/#haskell-unicode-input-method/"; license = lib.licenses.free; }; }; - helm-words = callPackage ./helm-words { }; - - isearch-plus = callPackage ./isearch-plus { }; - - isearch-prop = callPackage ./isearch-prop { }; - - jam-mode = callPackage ./jam-mode { }; - llvm-mode = trivialBuild { pname = "llvm-mode"; inherit (pkgs.llvmPackages.llvm) src version; @@ -150,6 +146,7 @@ }; patches = [ + # Fix: avatar loading when imagemagick support is not available (pkgs.fetchpatch { url = "https://github.com/alphapapa/matrix-client.el/commit/5f49e615c7cf2872f48882d3ee5c4a2bff117d07.patch"; sha256 = "07bvid7s1nv1377p5n61q46yww3m1w6bw4vnd4iyayw3fby1lxbm"; @@ -187,11 +184,6 @@ }; - mu4e-patch = callPackage ./mu4e-patch { }; - - org-mac-link = - callPackage ./org-mac-link { }; - ott-mode = self.trivialBuild { pname = "ott-mod"; @@ -205,11 +197,28 @@ }; }; - perl-completion = - callPackage ./perl-completion { }; + # Packages made the classical callPackage way + + emacspeak = callPackage ./emacspeak { }; + + ess-R-object-popup = callPackage ./ess-R-object-popup { }; + + font-lock-plus = callPackage ./font-lock-plus { }; + + helm-words = callPackage ./helm-words { }; + + jam-mode = callPackage ./jam-mode { }; + + nano-theme = callPackage ./nano-theme { }; + + org-mac-link = callPackage ./org-mac-link { }; + + perl-completion = callPackage ./perl-completion { }; pod-mode = callPackage ./pod-mode { }; + power-mode = callPackage ./power-mode { }; + railgun = callPackage ./railgun { }; structured-haskell-mode = self.shm; @@ -243,34 +252,34 @@ # closer to the old outdated package infra. # # Ideally this should be dropped some time during/after 20.03 + + autoComplete = self.melpaStablePackages.auto-complete; bbdb3 = self.melpaStablePackages.bbdb; - jade = self.jade-mode; - # scalaMode2 = null; # No clear mapping as of now - flymakeCursor = self.melpaStablePackages.flymake-cursor; + colorTheme = self.color-theme; cryptol = self.melpaStablePackages.cryptol-mode; + d = self.melpaStablePackages.d-mode; + emacsw3m = self.w3m; + erlangMode = self.melpaStablePackages.erlang; + flymakeCursor = self.melpaStablePackages.flymake-cursor; + graphvizDot = self.melpaStablePackages.graphviz-dot-mode; + haskellMode = self.melpaStablePackages.haskell-mode; + hsc3Mode = self.hsc3-mode; + idris = self.melpaStablePackages.idris-mode; + jade = self.jade-mode; + js2 = self.melpaStablePackages.js2-mode; + loremIpsum = self.lorem-ipsum; + markdownMode = self.melpaStablePackages.markdown-mode; maudeMode = self.maude-mode; phpMode = self.melpaStablePackages.php-mode; - idris = self.melpaStablePackages.idris-mode; + prologMode = self.prolog-mode; + proofgeneral = self.melpaStablePackages.proof-general; + proofgeneral_HEAD = self.proof-general; rainbowDelimiters = self.melpaStablePackages.rainbow-delimiters; - colorTheme = self.color-theme; sbtMode = self.melpaStablePackages.sbt-mode; - markdownMode = self.melpaStablePackages.markdown-mode; scalaMode1 = self.melpaStablePackages.scala-mode; - prologMode = self.prolog-mode; - hsc3Mode = self.hsc3-mode; - graphvizDot = self.melpaStablePackages.graphviz-dot-mode; - proofgeneral_HEAD = self.proof-general; - proofgeneral = self.melpaStablePackages.proof-general; - haskellMode = self.melpaStablePackages.haskell-mode; - writeGood = self.melpaStablePackages.writegood-mode; - erlangMode = self.melpaStablePackages.erlang; - d = self.melpaStablePackages.d-mode; - autoComplete = self.melpaStablePackages.auto-complete; - tuaregMode = self.melpaStablePackages.tuareg; + # scalaMode2 = null; # No clear mapping as of now structuredHaskellMode = self.melpaStablePackages.shm; + tuaregMode = self.melpaStablePackages.tuareg; + writeGood = self.melpaStablePackages.writegood-mode; xmlRpc = self.melpaStablePackages.xml-rpc; - emacsw3m = self.w3m; - loremIpsum = self.lorem-ipsum; - js2 = self.melpaStablePackages.js2-mode; - } diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index e55a920e36a14..051759cb8c740 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -8,7 +8,7 @@ To update the list of packages from MELPA, 2. Check for evaluation errors: env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaStablePackages env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaPackages -3. Run `git commit -m "melpa-packages: $(date -Idate)" recipes-archive-melpa.json` +3. Run `git commit -m "melpa-packages $(date -Idate)" recipes-archive-melpa.json` ## Update from overlay diff --git a/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix b/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix new file mode 100644 index 0000000000000..8034f41a72d65 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/nano-theme/default.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchFromGitHub +, emacs +}: + +stdenv.mkDerivation rec { + pname = "nano-theme"; + version = "2021-06-05"; + + src = fetchFromGitHub { + owner = "rougier"; + repo = pname; + rev = "99ff1c5e78296a073c6e63b966045e0d83a136e7"; + hash = "sha256-IDVnl4J4hx2mlLaiA+tKxxRGcIyBULr2HBeY/GMHD90="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/emacs/site-lisp + install *.el $out/share/emacs/site-lisp + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/rougier/nano-theme"; + description = "GNU Emacs / N Λ N O Theme"; + inherit (emacs.meta) platforms; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix index 83c3a97727366..b70032982c01a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20210519"; + version = "20210607"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20210519.tar"; - sha256 = "14vchfg69wai1yxv1fzvjk185gnfr7d9qrdijf0qmbbr5znci8rf"; + url = "https://orgmode.org/elpa/org-20210607.tar"; + sha256 = "178z9bnzcdaymnwxf0kkw1yzlzkj5dmdjjwdklc9qb9iv6rckfji"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20210519"; + version = "20210607"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20210519.tar"; - sha256 = "0g765fsc7ssn779xnhjzrxy1sz5b019h7dk1q26yk2w6i540ybfl"; + url = "https://orgmode.org/elpa/org-plus-contrib-20210607.tar"; + sha256 = "03liivgfcmp0lh6p57bh2gyn85n3sc4p91y374kq8kzc7fzrgzyr"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix new file mode 100644 index 0000000000000..035c906c8ab36 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/power-mode/default.nix @@ -0,0 +1,30 @@ +{ lib +, stdenv +, fetchFromGitHub +, emacs +}: + +stdenv.mkDerivation rec { + pname = "power-mode"; + version = "2021-06-06"; + + src = fetchFromGitHub { + owner = "elizagamedev"; + repo = "power-mode.el"; + rev = "940e0aa36220f863e8f43840b4ed634b464fbdbb"; + hash = "sha256-Wy8o9QTWqvH9cP7xsTpF5QSd4mWNIPXJTadoADKeHWY="; + }; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/emacs/site-lisp + install *.el $out/share/emacs/site-lisp + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/rougier/nano-theme"; + description = "Imbue Emacs with power!"; + inherit (emacs.meta) platforms; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 7675abd502886..1429040e4158c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -198,11 +198,11 @@ "repo": "ymarco/auto-activating-snippets", "unstable": { "version": [ - 20210417, - 1134 + 20210605, + 1143 ], - "commit": "3076cefea0f6ae9d7757f13c27b5602e007b58ec", - "sha256": "1psy6qpqxh6dm2ix7pwqdcq0rbiy6hyd830g76jk4wvj4spm5rpf" + "commit": "118ed7fc948b6d91eea727df35a1639521bf5fdb", + "sha256": "0qnsyvvb0knarvd4lvnzazf8y756iwx435zswym5lwsw5v847l8d" }, "stable": { "version": [ @@ -1036,15 +1036,15 @@ "version": [ 2, 4, - 0 + 1 ], "deps": [ "ac-php-core", "auto-complete", "yasnippet" ], - "commit": "33ed12bb2ec627a8a05360885f071e4a88fff399", - "sha256": "1ffayysbqh7vq65vhbmqg9yp03fqfnwj3drwyinr5ia81acp37nz" + "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640", + "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f" } }, { @@ -1073,7 +1073,7 @@ "version": [ 2, 4, - 0 + 1 ], "deps": [ "dash", @@ -1083,8 +1083,8 @@ "s", "xcscope" ], - "commit": "33ed12bb2ec627a8a05360885f071e4a88fff399", - "sha256": "1ffayysbqh7vq65vhbmqg9yp03fqfnwj3drwyinr5ia81acp37nz" + "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640", + "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f" } }, { @@ -1597,10 +1597,10 @@ }, { "ename": "acme-theme", - "commit": "0bf14d91ff89556671b175d5f7e71066f27cb73d", - "sha256": "0zsrqvhly3si2qkvc4rhki89r2z185l684wf7j9kx32fgaaqanac", + "commit": "1b9a64eee8e5b3f75f873654fd6102fc4aaf5e10", + "sha256": "09079yjzc9dk052r5fjq9sxps2yld6rl36k6f58xj2rvghzdsbwc", "fetcher": "github", - "repo": "ianpan870102/acme-emacs-theme", + "repo": "ianyepan/acme-emacs-theme", "unstable": { "version": [ 20210430, @@ -1856,6 +1856,24 @@ } }, { + "ename": "affe", + "commit": "84b0a313d4246b6e0c0541300a62c4ed37a71cbf", + "sha256": "1x0w6zl8ivv2lbj3qncqmvgh09p8q5zljhqxylsi3kc13xkv9d0p", + "fetcher": "github", + "repo": "minad/affe", + "unstable": { + "version": [ + 20210603, + 1139 + ], + "deps": [ + "consult" + ], + "commit": "dee51350e1d7d3cfbfb12069dea9246454a3df31", + "sha256": "1dpzwwbkwxmkh430hk3w9p6z1rwns5znzbar071h95gi7phyhm2x" + } + }, + { "ename": "afternoon-theme", "commit": "583256b7fa48501c8bfad305d76d2e16b6441539", "sha256": "13xgdw8px58sxpl7nyhkcdxwqdpp13i8wghvlb3l4471plw3vqgj", @@ -1918,18 +1936,23 @@ "annotation", "eri" ], - "commit": "ed6730a1717a0e3ddc25a75de0c2e109371391c7", - "sha256": "0zlx4xh5c5d88zfbbwd79qb56mrvd3fhgqd7r64p6gx9gfa6kbi5" + "commit": "044843c5281a7bdb9479317793a75c8c0fcfadd9", + "sha256": "04lirb2p1h46c1l84ysdnr2jxvzsdw1zv6jhm7h8ybgzmaa65b6m" }, "stable": { "version": [ 2, 6, 1, - 3 + 3, + 20210605 + ], + "deps": [ + "annotation", + "eri" ], - "commit": "e5486b79cc78689e3fd07b6c924d0085063915ea", - "sha256": "1zl7c0rb5rg867a431apxlzj2flg3hjidamqa5prc1bzpmfaywyz" + "commit": "ab805592a0ae7066fbd5fa5f47e933194fce878f", + "sha256": "19ld12x4is0nx52i05zv20js0zysx3bljbdn2nr65vy11dq2cyyp" } }, { @@ -2287,6 +2310,32 @@ } }, { + "ename": "alectryon", + "commit": "4f7b6099b9167840602515f10ab02e70defbee1e", + "sha256": "0q1dsnrjak49dlmwkns79n996ip6zsdsv4k2ifgd9r8fd9yxki22", + "fetcher": "github", + "repo": "cpitclaudel/alectryon", + "unstable": { + "version": [ + 20210518, + 1550 + ], + "deps": [ + "flycheck" + ], + "commit": "df5664e71c1026af4aaf69e6b227d427a728e7c6", + "sha256": "1czy3sbwm6lfrgdbj0y12q4n70w6zg8g3y27iz1zr4y20hhcp2zk" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "55fc849cdb7a05bbaab6f9359386d8830bdcfb87", + "sha256": "0v5jfmqcvridh8z7y8i5hklybfxicgmbnambi21ml34px3p9fldc" + } + }, + { "ename": "alert", "commit": "113953825ac4ff98d90a5375eb48d8b7bfa224e7", "sha256": "0x3cvczq09jvshz435jw2fjm69457x2wxdvvbbjq46nfnybhi118", @@ -2378,23 +2427,20 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20210513, - 1918 + 20210603, + 1604 ], - "commit": "be99987eda1ba3fdc490984b207849689599b858", - "sha256": "0a0yva34hrz7d1zq9p6bn69ywc2zpi6zpwb2s5g1lbh23cihvi1g" + "commit": "facbde4a7be292bf9490932cbe403b443273f45d", + "sha256": "0lwgvgnqf7vihglm0c5bwsxbl4x7f641289cji5s7jwy2dbsqk7g" }, "stable": { "version": [ - 4, + 5, 0, - 1 - ], - "deps": [ - "memoize" + 0 ], - "commit": "d363bb3e73909be013fcf35e1458bb654ec5bbaa", - "sha256": "0yh7gnv9xfqn8q4rzaa6wpyn9575vyfxy7d3afly2mqsb367fgm5" + "commit": "facbde4a7be292bf9490932cbe403b443273f45d", + "sha256": "0lwgvgnqf7vihglm0c5bwsxbl4x7f641289cji5s7jwy2dbsqk7g" } }, { @@ -2504,28 +2550,28 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20210505, - 840 + 20210605, + 1700 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "0138c7e7f3b7a6c09665e45a6dd2168359efd47c", - "sha256": "0nbbkasbklxf62rx9mc5w37r014vdbbg3vm5dy03hxzvq3y1yrpn" + "commit": "e0eba9cb8f8c85c0b63434f6117f9fa232d8a890", + "sha256": "05a53s7v1vy688gwnn01p3flqlhznp2m0k1mg8ax4hjygyc05l8q" }, "stable": { "version": [ 1, 5, - 0 + 1 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "7f8249ac92321a81d3db11e56888e569988b51d5", - "sha256": "1fwih9qidv0wkqrcsngcainw8b5bxcbk15g5a0p5dpl6hqcxj3rz" + "commit": "0138c7e7f3b7a6c09665e45a6dd2168359efd47c", + "sha256": "0nbbkasbklxf62rx9mc5w37r014vdbbg3vm5dy03hxzvq3y1yrpn" } }, { @@ -3146,18 +3192,19 @@ 20200914, 644 ], - "commit": "ed6730a1717a0e3ddc25a75de0c2e109371391c7", - "sha256": "0zlx4xh5c5d88zfbbwd79qb56mrvd3fhgqd7r64p6gx9gfa6kbi5" + "commit": "044843c5281a7bdb9479317793a75c8c0fcfadd9", + "sha256": "04lirb2p1h46c1l84ysdnr2jxvzsdw1zv6jhm7h8ybgzmaa65b6m" }, "stable": { "version": [ 2, 6, 1, - 3 + 3, + 20210605 ], - "commit": "e5486b79cc78689e3fd07b6c924d0085063915ea", - "sha256": "1zl7c0rb5rg867a431apxlzj2flg3hjidamqa5prc1bzpmfaywyz" + "commit": "ab805592a0ae7066fbd5fa5f47e933194fce878f", + "sha256": "19ld12x4is0nx52i05zv20js0zysx3bljbdn2nr65vy11dq2cyyp" } }, { @@ -3790,14 +3837,14 @@ "repo": "stardiviner/arduino-mode", "unstable": { "version": [ - 20210216, - 926 + 20210527, + 1341 ], "deps": [ "spinner" ], - "commit": "969b49ef6c954a067b3cbca43a4cdc1c04b1a62a", - "sha256": "0cjygkddlla2ygiyn506mwqjfn52lqpwfbv1fbwcqljvfspc65am" + "commit": "d7c87812c205bc01c8c8a7ab02f201b6138c7e57", + "sha256": "08hjyxz187hc07d0g8s7z7d3pa2z9f8lwdzramki95gm27q08n4y" } }, { @@ -4414,6 +4461,38 @@ } }, { + "ename": "auth-source-keytar", + "commit": "4ba6f96ca2e20dcd75cf239370243bd8e484f851", + "sha256": "1wizylkfzsbkavqr7m88vnwgrikj8hd6v01x06k1c5kpwdggvyqv", + "fetcher": "github", + "repo": "emacs-grammarly/auth-source-keytar", + "unstable": { + "version": [ + 20210516, + 556 + ], + "deps": [ + "keytar", + "s" + ], + "commit": "9ecdd6226b50a1a04675b65589e6cc36fd3aea2c", + "sha256": "04vr0i4y9i96vm1pliac8snnvlwqzafy7xrq39wpvhvd99qr4845" + }, + "stable": { + "version": [ + 0, + 1, + 3 + ], + "deps": [ + "keytar", + "s" + ], + "commit": "6edf8ec86d74f1e9853da23052291cc28d2df8bc", + "sha256": "0vj2rfm516w9b4l0jwj6m9z1liqmddfmschsz2hc9i0zg1y312l5" + } + }, + { "ename": "auth-source-kwallet", "commit": "047cc780e55a0f574afaf7fa0d94c31ed86cb57f", "sha256": "1fz63fdfw3cm8k59nxnbsaiylbs0nn5f250fwwfh51bknrqj3vin", @@ -4421,11 +4500,20 @@ "repo": "vaartis/auth-source-kwallet", "unstable": { "version": [ - 20210421, - 1504 + 20210605, + 1032 + ], + "commit": "053ed5e964acaf6f16a1708c36d812eeb7c1817d", + "sha256": "0jqn49wqhg3qh6m76zc65z37kaw562laifjjj8lhi9g3f86sldsp" + }, + "stable": { + "version": [ + 0, + 0, + 1 ], - "commit": "c2abee6ada13d7332725bd700ad76da8aebea530", - "sha256": "1w43mlfslvmqabnm76j0bhkdsb4a2iwwidhm83qqrjpj08cq3ldj" + "commit": "1309cfcd00264a2bb8e0d1b435d4d03e3e02f314", + "sha256": "182wks10k0z1h24lkqx2rrs78f33rzarcq4s0r69cc6w67vj0fra" } }, { @@ -5094,14 +5182,14 @@ "repo": "ncaq/auto-sudoedit", "unstable": { "version": [ - 20210502, - 1103 + 20210522, + 612 ], "deps": [ "f" ], - "commit": "54a7f295e6b1eecbcc86741aaf5d72e404b43bce", - "sha256": "1rhdvrj2rjbvl7vkb0wcp6krqxcaigl7jk9z8yvhx6s4cm2qli6q" + "commit": "0dec9e632f1f3208f0da2f94b57efa1aae9ce2ab", + "sha256": "1isk9106lpdh45l41n2v8q8m9vcfb4biy9dv87rkks58nysrxy3z" }, "stable": { "version": [ @@ -5390,11 +5478,11 @@ "repo": "avkoval/avk-emacs-themes", "unstable": { "version": [ - 20210507, - 1127 + 20210521, + 1051 ], - "commit": "2da6de854b07f696da0cbc9e6961b3d228295f5e", - "sha256": "14rqaf6gaxabz92s9cv9fm7pjhc2vm154yjyvj3phaj188nn298x" + "commit": "7b9b6517873c4d4d73e6e34ca56c54062db60759", + "sha256": "0vah74474x9wby36hxi7jpmlr3q1zra33lkidvxf4xh9nsliqnqn" } }, { @@ -5442,8 +5530,8 @@ "avy", "embark" ], - "commit": "a21e510bc63c8ddc98b2bb3e6fff38e9d7f41ca9", - "sha256": "13c8l2dafqn3xm0lgrn4agy2i7ycz8dxwvxdcdrbba1gdb8ivm2n" + "commit": "ef609bf15368a68c4eb3c46fd8cc1bb623b6b83e", + "sha256": "0ddh7zqgaq07534l6m3wjvbcj23a01h3x7scd4pl5rj6wyxqwv76" }, "stable": { "version": [ @@ -5929,30 +6017,6 @@ } }, { - "ename": "bang", - "commit": "d9830cce42339243091f4463490954a8a955c65f", - "sha256": "1dx1130095ij09ix20jyqradkjw9gpdfpw0d9f3krrx6xjqfn2sk", - "fetcher": "git", - "url": "https://git.sr.ht/~zge/bang", - "unstable": { - "version": [ - 20210405, - 1640 - ], - "commit": "b5252a77aed6d1c533367fde0f11d6901bf23d96", - "sha256": "1m0wmcm1akdk19vf132y1g6wjdx9kgschf66qgggd97gl50za5ab" - }, - "stable": { - "version": [ - 1, - 0, - 3 - ], - "commit": "e02338331463461a85144c0ce6b9b877bd3a7567", - "sha256": "1rvgmkl950zrakczk9libws29c9l2hklw49m3xb4swa14kz1r639" - } - }, - { "ename": "banner-comment", "commit": "4bb69f15cb6be38a86abf4d15450a29c9a819068", "sha256": "0i5nkfdwfr9mcir2ijdhw563azmr5p7hyl6rfy1r04fzs8j7w2pc", @@ -6192,26 +6256,26 @@ "repo": "jasonmj/battery-notifier", "unstable": { "version": [ - 20210517, - 1247 + 20210521, + 1238 ], "deps": [ "alert" ], - "commit": "d348b2b72cb19905e7831f40e6d94f873e1da6b9", - "sha256": "0amkrvb0i20jjclh091zkr2m5q92x6yjx8w68x8hzaa2qkabdbzf" + "commit": "ae2043db954e131d9de7347ab1a6107fd07e8893", + "sha256": "1w2cymf9yd3siijplb6vrcxwqhqsqii8bnxki7vqb1s16v7ciczz" }, "stable": { "version": [ 0, 2, - 1 + 2 ], "deps": [ "alert" ], - "commit": "d348b2b72cb19905e7831f40e6d94f873e1da6b9", - "sha256": "0amkrvb0i20jjclh091zkr2m5q92x6yjx8w68x8hzaa2qkabdbzf" + "commit": "ae2043db954e131d9de7347ab1a6107fd07e8893", + "sha256": "1w2cymf9yd3siijplb6vrcxwqhqsqii8bnxki7vqb1s16v7ciczz" } }, { @@ -6246,11 +6310,11 @@ "repo": "bazelbuild/emacs-bazel-mode", "unstable": { "version": [ - 20210516, - 1724 + 20210605, + 906 ], - "commit": "56113b72d2016e9827e84a579abc700884590074", - "sha256": "1qck0qwzcjl90xsp5m1pi8x9jr8alwa4cm4yy45d5m5s3lhfd88b" + "commit": "667554f76696a3cbb50c4c01b121c1aef882195a", + "sha256": "169x8d52hkb30w2c4ww7lpipdin5406nm2i95fbbxs1sz1068b8r" } }, { @@ -6923,8 +6987,8 @@ "a", "pdf-tools" ], - "commit": "7bb01664b45fc08b7d013c91073cf3ce0d313984", - "sha256": "1hknnkidmd5w81i30xjj2q3x93mygqq7pk7kwfssnzrn8lih6a9b" + "commit": "246120647e28a27506ca0894ba98e371086881fd", + "sha256": "15gqzj4h0w33w38i8ihl74iy7aqxlds97gm93r72z69pm2l1d7dm" } }, { @@ -6972,14 +7036,14 @@ "repo": "bdarcus/bibtex-actions", "unstable": { "version": [ - 20210511, - 12 + 20210607, + 1230 ], "deps": [ "bibtex-completion" ], - "commit": "d994b7e34e39adcc069685220c7c3cb7516625b9", - "sha256": "1jxdfyf68d1gc240kzvllzlk7wzhsdg4m50r8g6m6a9xnyzi68ad" + "commit": "07a3c64b12673b722a21c932eb85c595dea0c863", + "sha256": "0afnb0aa3msnvg2p4pjdcliccsfhaa7pp7bx76h3sfvv4648kki5" }, "stable": { "version": [ @@ -7290,11 +7354,19 @@ "repo": "Wilfred/bison-mode", "unstable": { "version": [ - 20200226, - 47 + 20210527, + 717 ], - "commit": "675df47193accaf30ca44e142523b2b3bb122979", - "sha256": "08yg51pzpry5gy29fdbrrb7s5j5c5fxsrhgy0ncp0vl082fs1bv9" + "commit": "4f2e20394a475931409618c1635e9c9f1cf07d9c", + "sha256": "0rh4kjfapgnvv6yc3ps0n8y9nbrpdi5gs541j2axvqx97hhv8an9" + }, + "stable": { + "version": [ + 0, + 3 + ], + "commit": "1193903e36adf6770b673c3936ac0fbdac609b95", + "sha256": "0v1vqc22nfhq2c09j0xiyd0yplimf1gy3m5zlgl33dijhh6wxv8n" } }, { @@ -7891,29 +7963,28 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20210519, - 937 + 20210530, + 1158 ], "deps": [ "epkg", "magit" ], - "commit": "91668945db55e6c96940be1b49a868bd815b5e51", - "sha256": "1r2faskha94z55vs7kxj8pfdgw2yd0b3jl1h5higw9wjdwjwdzhb" + "commit": "e2263534e16ed8bbc935ee466f6ad2acbe9c603e", + "sha256": "169sdgi476hnxxv0s9qfi8cply9q7gb8i1hli4i74ynlrhc9wfq7" }, "stable": { "version": [ 3, - 1, - 2 + 2, + 0 ], "deps": [ - "dash", "epkg", "magit" ], - "commit": "3f9fc2281e9ae873873998782c98c57c5ebb0555", - "sha256": "1k889m4095lm97lphcwcrsl53vhgas7iha594mmk8cs7sm5csjy1" + "commit": "e2263534e16ed8bbc935ee466f6ad2acbe9c603e", + "sha256": "169sdgi476hnxxv0s9qfi8cply9q7gb8i1hli4i74ynlrhc9wfq7" } }, { @@ -8153,16 +8224,16 @@ "repo": "rmuslimov/browse-at-remote", "unstable": { "version": [ - 20210405, - 430 + 20210603, + 802 ], "deps": [ "cl-lib", "f", "s" ], - "commit": "e02ad2189c87da33f80bf4967a968772ce3e4431", - "sha256": "0vn53zlwmhi4d6i81840i9pmrs8w4j6az2p0b4hw99xvk68grfiz" + "commit": "cef26f2c063f2473af42d0e126c8613fe2f709e4", + "sha256": "094gbvpf9vy95ij7li9vb17nyhi1grh9mbv1csydb9y157baw03v" }, "stable": { "version": [ @@ -8399,6 +8470,21 @@ } }, { + "ename": "buffer-env", + "commit": "40651886215933432e77c680aea22bdee932fa9c", + "sha256": "18ab7jwr1w16vlgrgxsnb3dfvkfy9vs3szl9k9npckgzyar97y5m", + "fetcher": "github", + "repo": "astoff/buffer-env", + "unstable": { + "version": [ + 20210520, + 1616 + ], + "commit": "32c1cfdf06dfa7bdbd79aba8066064212672e755", + "sha256": "1mbrsakg7mbrr4szi7ha5hcfr88i79p5bn59dh7v6ywa357brmky" + } + }, + { "ename": "buffer-flip", "commit": "3924870cac1392a7eaeeda34b92614c26c674d63", "sha256": "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098", @@ -8477,6 +8563,39 @@ } }, { + "ename": "buffer-ring", + "commit": "f6a145814144e6386efa9f96b43cf81d59a1091f", + "sha256": "0ch8pgiq1d90d06zxa5xvkvy18nwxlp7mfaymd6ldq20vgks07x9", + "fetcher": "github", + "repo": "countvajhula/buffer-ring", + "unstable": { + "version": [ + 20210529, + 2059 + ], + "deps": [ + "dynaring", + "ht", + "s" + ], + "commit": "30572b4d8fff519c4996078a5ad743583fb22b0e", + "sha256": "1xg6kbjj4fccsr5awnh3ba9x33qznnala3kmnfwpmj94rd72whiy" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "dynaring", + "ht", + "s" + ], + "commit": "30572b4d8fff519c4996078a5ad743583fb22b0e", + "sha256": "1xg6kbjj4fccsr5awnh3ba9x33qznnala3kmnfwpmj94rd72whiy" + } + }, + { "ename": "buffer-sets", "commit": "61d07bbe7201fc991c7ab7ee6299a89d63ddb5e5", "sha256": "1xj9fn2x4kbx8kp999wvz1j68znp7j81zl6rnbaipbx7hjpqrsin", @@ -9076,6 +9195,21 @@ } }, { + "ename": "c-eval", + "commit": "0a62a92eb2142d0a08a18a966ee99fa62d1392af", + "sha256": "13rgaisjy6x3szknlp3f5ama3y9l5yhlx3q17kjzdv7bs56kzcbq", + "fetcher": "github", + "repo": "lassik/emacs-c-eval", + "unstable": { + "version": [ + 20210603, + 1716 + ], + "commit": "f79be8354a3c01fddbf38b731aa8934421cef22f", + "sha256": "1qpi5j2h9q4khp3kbk4ybsg4mp2cp5kws5fz7bjpxz4iz0s8mbx7" + } + }, + { "ename": "c0-mode", "commit": "268115452d9c22a6f2627cec1eb122b47e85b88c", "sha256": "0s3h4b3lpz4jsk222yyfdxh780dvykhaqgyv6r3ambz95vrmmpl4", @@ -9446,21 +9580,21 @@ "repo": "chenyanming/calibredb.el", "unstable": { "version": [ - 20210321, - 944 + 20210603, + 323 ], "deps": [ "dash", "s", "transient" ], - "commit": "a3b04c0c37b1e8ceff2472e21a3579e64e944528", - "sha256": "04fzskx066v5091467da3plsxkqx3acbaqmk282k8cdaxsnr4ifd" + "commit": "cb93563d0ec9e0c653210bc574f9546d1e7db437", + "sha256": "10dymcd17ili5r6ydiz7bj0q81y5fh0s1d64m4acfa8xfsi7zx55" }, "stable": { "version": [ 2, - 8, + 10, 0 ], "deps": [ @@ -9468,8 +9602,8 @@ "s", "transient" ], - "commit": "a62d7de582b16490b1af5add7b24a67022be531b", - "sha256": "19gc05k2p1l8wlkrqij9cw6d61hzknd6a9n64kzlpi87cpbav3lv" + "commit": "933140a3227ee61cfccf3cf0c567b5c9e64f1ded", + "sha256": "0s26a2fy1xldd0q57avds7zn0h7lkis2hjh9zmm1qhwn8409hys9" } }, { @@ -9674,6 +9808,21 @@ } }, { + "ename": "cargo-mode", + "commit": "48a13236086dad5b88834a27465bd77b1ee499b6", + "sha256": "1cpxhgxsnf6lmw8z2g1vxczs7pi9mk1xx1776726hajj4g8cx4p1", + "fetcher": "github", + "repo": "ayrat555/cargo-mode", + "unstable": { + "version": [ + 20210605, + 1003 + ], + "commit": "b98ea60ddec30eac174012671ee09e125748a193", + "sha256": "03vdinqm1hlbcflvks54ff9hqnjdzxih5bxnkm363s7mpr070d0d" + } + }, + { "ename": "caroline-theme", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "178nxcz73lmvnjcr6x6as25d8m5knc21jpr66b4rg0rmlmhchkal", @@ -9745,8 +9894,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20210424, - 125 + 20210528, + 1605 ], "deps": [ "ansi", @@ -9757,8 +9906,8 @@ "s", "shut-up" ], - "commit": "81edfa78428fd2d9689507fd4d3b13c24cd99323", - "sha256": "071biqz1fv3rzjbn9xprpazk65xfl78hzhf2gdvz944pks3rhdfi" + "commit": "daee4bec9c7d96a165366f7edeaa4616837bf432", + "sha256": "062hsgb4315wvydygvygjywi4wp8xri3h0gj4n5dmy884578hhjl" }, "stable": { "version": [ @@ -9955,8 +10104,8 @@ 20210501, 820 ], - "commit": "7a7e1ecaf7f4f68058f1b8831d0b7b839d228614", - "sha256": "0gcgbr28j88a73p5ng4f20qp0fx288na9hi4fnj32grqyrl6f1pq" + "commit": "ce0517127586e26f95f94f45d22a832f40a28321", + "sha256": "1qx99sigzmj4fc5wcaqs6wnyzsrzcqg73czn5aknxqkzd1whsk3a" } }, { @@ -10004,8 +10153,8 @@ 20200904, 1431 ], - "commit": "7a7e1ecaf7f4f68058f1b8831d0b7b839d228614", - "sha256": "0gcgbr28j88a73p5ng4f20qp0fx288na9hi4fnj32grqyrl6f1pq" + "commit": "ce0517127586e26f95f94f45d22a832f40a28321", + "sha256": "1qx99sigzmj4fc5wcaqs6wnyzsrzcqg73czn5aknxqkzd1whsk3a" } }, { @@ -10274,8 +10423,8 @@ 20171115, 2108 ], - "commit": "0c6f3539677300e591c8a2877270776ee2ab1be2", - "sha256": "038r1zw52ip12r6iddhjy458gaapl5g9vfrz4hqw23r4cp5zgxgn" + "commit": "35b67c8380bb284c9c59914d967ee157a62311b8", + "sha256": "1579n0m13l7ghw5g4b0iffrcvgsh5pk3abk29rrskq736i0h007s" }, "stable": { "version": [ @@ -10393,16 +10542,16 @@ "repo": "Alexander-Miller/cfrs", "unstable": { "version": [ - 20210217, - 1848 + 20210529, + 1123 ], "deps": [ "dash", "posframe", "s" ], - "commit": "7c42f2c82c7ae689f3ef291b066688c58ab96298", - "sha256": "1x8y4cc1cgln4qv6yzhsiqgnziilg5fh07bvg9ygcjmdhvnhsvcm" + "commit": "e16a01012545d378150432fa10684a2a7d1cc2d1", + "sha256": "1pj0l0jqgx3bixklllppgm6pwyfd0dc1ik5cs9x1azb1qdgf8kjs" }, "stable": { "version": [ @@ -10579,11 +10728,11 @@ "repo": "davep/cheat-sh.el", "unstable": { "version": [ - 20200226, - 1021 + 20210607, + 1307 ], - "commit": "52293c366044e44c8f6b648a312433345e4718ad", - "sha256": "098b70gvyr74ygzbpyfvpn2zzlij47bzvqqj89igh10s4lxj0lzb" + "commit": "33bae22feae8d3375739c6bdef08d0dcdf47ee42", + "sha256": "0blyhgdk0li5slkhlj689jdal6d1qr4g2acz8i0jm4kvgysjilb5" }, "stable": { "version": [ @@ -10717,11 +10866,11 @@ "repo": "sergiruiztrepat/chembalance", "unstable": { "version": [ - 20210504, - 1505 + 20210601, + 1653 ], - "commit": "80c8fd4c806366a4b75a27a656420e9e36316543", - "sha256": "0sshmw5ajfiff05000yhp4m3fyfdbhcqrm5crcqqw0cinvrfancn" + "commit": "ae36c823ca151f1dc6144ec96b2f5e98181c0dbb", + "sha256": "1n01h4lwfcm0skf0pgh7p87bmk4x3r6qsr5jcgm1ldafsx35x60g" } }, { @@ -10906,32 +11055,30 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20210507, - 923 + 20210603, + 1656 ], "deps": [ "dash", - "literate-elisp", "seq", "ts" ], - "commit": "ceb455288a74df6ff7cd45968f37f0f4d3919f28", - "sha256": "0366fwm7xwcja9qyx87zh0f78xfhjv5f40ybcfgk8zldbhz0zn6a" + "commit": "5c5b7fc5e72e2322af2cac14745c7adaab1d56cf", + "sha256": "104n79hj8649h90g8kh3i4rfyk1alq0skpjv8jjpbz0cybhp7n53" }, "stable": { "version": [ 0, - 7, + 8, 1 ], "deps": [ "dash", - "literate-elisp", "seq", "ts" ], - "commit": "ceb455288a74df6ff7cd45968f37f0f4d3919f28", - "sha256": "0366fwm7xwcja9qyx87zh0f78xfhjv5f40ybcfgk8zldbhz0zn6a" + "commit": "e9164ecca1e2f43676e5a071aca7644177866deb", + "sha256": "0fp0p1sv7jpam2vbgkv2yg7lsdlxa02213ka06cn8rb54lw7k702" } }, { @@ -10974,26 +11121,26 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20210514, - 827 + 20210603, + 1656 ], "deps": [ "chronometrist" ], - "commit": "ceb455288a74df6ff7cd45968f37f0f4d3919f28", - "sha256": "0366fwm7xwcja9qyx87zh0f78xfhjv5f40ybcfgk8zldbhz0zn6a" + "commit": "5c5b7fc5e72e2322af2cac14745c7adaab1d56cf", + "sha256": "104n79hj8649h90g8kh3i4rfyk1alq0skpjv8jjpbz0cybhp7n53" }, "stable": { "version": [ 0, - 7, + 8, 1 ], "deps": [ "chronometrist" ], - "commit": "ceb455288a74df6ff7cd45968f37f0f4d3919f28", - "sha256": "0366fwm7xwcja9qyx87zh0f78xfhjv5f40ybcfgk8zldbhz0zn6a" + "commit": "e9164ecca1e2f43676e5a071aca7644177866deb", + "sha256": "0fp0p1sv7jpam2vbgkv2yg7lsdlxa02213ka06cn8rb54lw7k702" } }, { @@ -11052,8 +11199,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20210518, - 1038 + 20210524, + 832 ], "deps": [ "clojure-mode", @@ -11064,14 +11211,13 @@ "sesman", "spinner" ], - "commit": "eccfcea186c3560527fbfc98491b3ab9a3f1e16f", - "sha256": "09k5bhvq7ksjpkjr7fzrvfr6cf1wd3fh2m8bfb8y25hbg2nnyisk" + "commit": "8f51546c0efb36226c4bae7d65465b0e0aa8c06f", + "sha256": "0bn1k34a0dr85c0jj3cb3w8afbhb5iy7whdddkfpa5fkrhc77acf" }, "stable": { "version": [ 1, 1, - 0, 1 ], "deps": [ @@ -11083,8 +11229,8 @@ "sesman", "spinner" ], - "commit": "45f6125301fbbe69333dc450804ce8ecdd611539", - "sha256": "1kf4056bga3cr40mm812m21r9mi0r30gn9v3jil3q6yhb5bm1gcl" + "commit": "8b3dabeefa8a3352d7a30a9fd9027c05a4c4f6e2", + "sha256": "0psd8zrhs5w1cfmksd5sjgy9xzfs9i9zp55g97rp7zp6y5als0lx" } }, { @@ -11257,14 +11403,14 @@ "repo": "jorgenschaefer/circe", "unstable": { "version": [ - 20210508, - 1616 + 20210601, + 801 ], "deps": [ "cl-lib" ], - "commit": "2798a75d625677402b01f138ebac6eb53337d9d6", - "sha256": "0r7k7cxs6gfam1rdy04vdq3q796v32wv5q9gq67sxfji8x1vbkn7" + "commit": "c0b2f997b3b73640d635ee84627bb8cf36c9adfe", + "sha256": "1kjfch0fhq67iivad56s071c8qlsssdsdg83h5v9iz2x4jipm0wa" }, "stable": { "version": [ @@ -12191,26 +12337,26 @@ "repo": "emacscollective/closql", "unstable": { "version": [ - 20200704, - 2124 + 20210530, + 1136 ], "deps": [ "emacsql-sqlite" ], - "commit": "1d5e9cbb69bc2992eaafa1bc084343efbd3e0c4c", - "sha256": "1s3pb8zn3ypc2pvkp7g7wvml02m06lk9d7c29pq1yqn9f5sisrcg" + "commit": "1b0e5bfef95de49bf669c54a15571386f10f4705", + "sha256": "01l4w3wc7rm7mca8pbkyz0yrks4z8i00ppy5c4bmrnn6akf7h9ih" }, "stable": { "version": [ 1, 0, - 4 + 5 ], "deps": [ "emacsql-sqlite" ], - "commit": "c864c1fadfea4a05fff29cb60891b7a32ac88c78", - "sha256": "06j0sc6dx8f34wc8i7dzkp8jwvwnrpnl8i93vpc1qw0ih0jwa2zh" + "commit": "1b0e5bfef95de49bf669c54a15571386f10f4705", + "sha256": "01l4w3wc7rm7mca8pbkyz0yrks4z8i00ppy5c4bmrnn6akf7h9ih" } }, { @@ -12337,8 +12483,8 @@ "repo": "atilaneves/cmake-ide", "unstable": { "version": [ - 20210512, - 630 + 20210603, + 1522 ], "deps": [ "cl-lib", @@ -12346,8 +12492,8 @@ "s", "seq" ], - "commit": "89b03795a02dcbfb14046c97230e82736a02f874", - "sha256": "027j4dcvjvvnjh6aln8brmi8xny787n0y2ycrajx043zjmh6x0cg" + "commit": "9b1100bd8d65b961b7478f9c011f0f6eb8cfcdd9", + "sha256": "1lr9cz856hqb3qz5fq6qqc2a55mfgdrh451np5m2bf2ljw0d67nh" }, "stable": { "version": [ @@ -12374,17 +12520,17 @@ 20210104, 1831 ], - "commit": "d98a7cdb25611ed6f1e856fd4c4ff980225b89cd", - "sha256": "0hq8w46c0ldckh11cb61bzhqccjfhh11hadkmdahv8605q8y31nk" + "commit": "05d8a586fa4eb6256b8b80a0f7f084e8c5d3c8e6", + "sha256": "11vxpkf8y9n0kxyfgkbyrq76b0g4xjl2rriyj2d59s3xlx27gqjp" }, "stable": { "version": [ 3, 20, - 2 + 3 ], - "commit": "1ad4501ae97fb6c6deab096ff0ac7e03d554e26d", - "sha256": "0zr4zbbd1zng0v3mj8kql0ci2w18p4izjfq7hh6g5adq6l7ckfhm" + "commit": "13d112ea03f2b068da1f7ac3239a42a6cff94eda", + "sha256": "1rn9gzjcg1km9pbyipkfgzq8jvsmwwa2zkmra5yksfwq2094apnh" } }, { @@ -12536,11 +12682,11 @@ "repo": "astoff/code-cells.el", "unstable": { "version": [ - 20210111, - 744 + 20210529, + 1452 ], - "commit": "d03621b1033cc33054e30169517c57d020c13050", - "sha256": "0c2agyg28lqsmkkjcnhx8wdn531lh0zsy37q939wf231lpl4asvj" + "commit": "2e40770d7963dcbb52ac45dcd83c0537fda5e188", + "sha256": "1m6csmg7y99ihw6nhknnr6wqamf5y5j931gfbsrhbar2hh8wjx5m" } }, { @@ -12756,14 +12902,14 @@ "repo": "ankurdave/color-identifiers-mode", "unstable": { "version": [ - 20201216, - 2223 + 20210607, + 1842 ], "deps": [ "dash" ], - "commit": "ca52e957254a07411c06716d2155968375943a12", - "sha256": "01g1x652gckzhihgiqx7jx58fd0ilv0yialfh3f8l1fsqw6cggqc" + "commit": "fa42b60f9e84995a8109a49798c0b4c618fc1ed3", + "sha256": "12ybgh8yzi62lw0c7yakgvfdx45sr11szyqdlf58n2pbkz9sxkmv" }, "stable": { "version": [ @@ -12899,11 +13045,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20210107, - 2111 + 20210528, + 2344 ], - "commit": "1445a556af9da3681ae0e7e7242352e9fe39fe73", - "sha256": "1d6wxzw1wf378jzvlzfsdq5gqq2i196lr8dszj4df472vsiw1hqi" + "commit": "c1a1091e39ecd69822e1494d8b6f0bbcb21eb9b1", + "sha256": "01afmfisii9cyri198s2g9rivkisfn6d3g40nyi0sgsx14jbyddz" }, "stable": { "version": [ @@ -13343,11 +13489,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20210516, - 211 + 20210606, + 135 ], - "commit": "5618f28d62cbbdcccdaee1b455fc6e9d1c8bff31", - "sha256": "00aiardy1k0fpjhx73mpyx4921zncx6avydvzh8rcn5w0p0zzx8p" + "commit": "e0f8c9ad754bdc2c02318f4baf433886c7aa83e3", + "sha256": "1wqwcggjzmqihdgs3bm23fbv2cxpbh9cjvnzgdj01vbgh4ccqkfh" }, "stable": { "version": [ @@ -13626,26 +13772,26 @@ "repo": "redguardtoo/company-ctags", "unstable": { "version": [ - 20201121, - 1116 + 20210528, + 1311 ], "deps": [ "company" ], - "commit": "b089a1e645cd14971c93397549b237ef63495adf", - "sha256": "045na4qi4n4w8vibjnxqd308ksgazx9ziy5x7ir7b4cklvkifvml" + "commit": "26f0a906a646b4885984e068a2046c3a1d0578eb", + "sha256": "0ix5zjwfjj4cbx61qy9d0rfbsmk5kgvm9r2v2r76qa39wx3dys82" }, "stable": { "version": [ 0, 0, - 4 + 5 ], "deps": [ "company" ], - "commit": "ba4d2577fbbe5ad7bb978838e3e3177f8a56e8f8", - "sha256": "0cy48my9d02v7wa40dw5x6djyjjacddj9p0pgdvr1rg70lqxii45" + "commit": "26f0a906a646b4885984e068a2046c3a1d0578eb", + "sha256": "0ix5zjwfjj4cbx61qy9d0rfbsmk5kgvm9r2v2r76qa39wx3dys82" } }, { @@ -14017,15 +14163,15 @@ "version": [ 1, 1, - 0 + 1 ], "deps": [ "cl-lib", "company", "irony" ], - "commit": "52aca45bcd0f2cb0648fcafa2bbb4f8ad4b2fee7", - "sha256": "1qgyam2vyjw90kpxns5cd6bq3qiqjhzpwrlvmi18vyb69qcgqd8a" + "commit": "9ca8f35ef268c0b0cffd49efa687685b373f09fe", + "sha256": "1d3jw0d4zymznri86a5iixyxnw16jzkkrbhrh657ys73189c1c73" } }, { @@ -14235,8 +14381,8 @@ "maxima", "seq" ], - "commit": "f92eafd716ae6e36665bbf027309477c2efa336d", - "sha256": "10a72c4v0v5c1npxq1fmglxjiczpf1x87jpd6523x337h054zgs0" + "commit": "74e10d5dedb16f74efc28299c98dd7db9a4392d6", + "sha256": "1r04mbn33y515b9fwr2x9rcbkvriz753dc0rasb8ca59klp1p5cv" }, "stable": { "version": [ @@ -14378,6 +14524,25 @@ } }, { + "ename": "company-org-block", + "commit": "564ba95530adedd74f24d329672de7df9cf7afd9", + "sha256": "1l29mz5y6ldrd9kcs7fxjd7chm1gbfbs9mcv3xsfgbcyhicqmrjf", + "fetcher": "github", + "repo": "xenodium/company-org-block", + "unstable": { + "version": [ + 20210607, + 1202 + ], + "deps": [ + "company", + "org" + ], + "commit": "e2742dea77b356ee11a1200263d48eed79f5fe43", + "sha256": "194kjkpaca7k60hxs96mah416fdn5mfbsa4wgrpc3cprlrbyp8jr" + } + }, + { "ename": "company-php", "commit": "ac283f1b65c3ba6278e9d3236e5a19734e42b123", "sha256": "1gnhklfkg17vxfx7fw65lr4nr07jx71y84mhs9zszwcr9p840hh5", @@ -14400,15 +14565,15 @@ "version": [ 2, 4, - 0 + 1 ], "deps": [ "ac-php-core", "cl-lib", "company" ], - "commit": "33ed12bb2ec627a8a05360885f071e4a88fff399", - "sha256": "1ffayysbqh7vq65vhbmqg9yp03fqfnwj3drwyinr5ia81acp37nz" + "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640", + "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f" } }, { @@ -15532,56 +15697,88 @@ }, { "ename": "consult", - "commit": "a0f3b8b11eb8f9adf182ab62fcb276b52bc26f19", - "sha256": "17zriam6hgz19ms78c9zh0hvb4b6h5hinrinbmbb2jcwi4cykxs3", + "commit": "5a141c728f28e53b9f92ccbbff07c2af1dde3706", + "sha256": "02z6h0x346230ayncsb8phks9mmjdq5mj9ja68380hl6gkic3407", "fetcher": "github", "repo": "minad/consult", "unstable": { "version": [ - 20210520, - 1824 + 20210606, + 1237 ], - "commit": "556ff4eb31eb1d00a2afdda6664d03b698264e3c", - "sha256": "0ss5idc0v5rn0hrbb07m8hdpcmggh46my8cciky98b9hdq3gch2v" + "commit": "ae905501bcdb8fdda0d10a0846d575fd2a38e6d7", + "sha256": "1jz4j27irxknfbcxsn8phhhaiwyc2z9gnyrj03ah1v57i0i9g79c" }, "stable": { "version": [ 0, - 7 + 8 ], - "commit": "7480f020e57036ef14c2fda1d83c830583b2a53b", - "sha256": "1kzwybp87srckd1238drdcn9h7jyyqz9pzcwvw3ld8bgyyrwsxkj" + "commit": "e538f168d9d16c926d92c19d6131298962b778a9", + "sha256": "1460818fb6y086vgn1mzmrwhpa5jswlwi4v71zr86cg6y7yg4248" } }, { "ename": "consult-flycheck", - "commit": "1a1fbbfebeb88dab2d032e994ec21c976f059d22", - "sha256": "0gf7nb2zylmm53xszd53qp7byvlppd2j9lh61p8syanjssqy4j67", + "commit": "5a141c728f28e53b9f92ccbbff07c2af1dde3706", + "sha256": "1cwbm7qsni8ycasx2v20yd1749lmlhf98kz28i1p8m0yqkjc3my0", "fetcher": "github", - "repo": "minad/consult", + "repo": "minad/consult-flycheck", "unstable": { "version": [ - 20210429, - 1158 + 20210530, + 202 ], "deps": [ "consult", "flycheck" ], - "commit": "556ff4eb31eb1d00a2afdda6664d03b698264e3c", - "sha256": "0ss5idc0v5rn0hrbb07m8hdpcmggh46my8cciky98b9hdq3gch2v" + "commit": "92b259e6a8ebe6439f67d3d7ffa44b7e64b76478", + "sha256": "15lihfdjdp5ynmq0g8wkq8dhb2jdlvfcqbb2ap588igi5vax3glz" }, "stable": { "version": [ 0, - 7 + 8 ], "deps": [ "consult", "flycheck" ], - "commit": "7480f020e57036ef14c2fda1d83c830583b2a53b", - "sha256": "1kzwybp87srckd1238drdcn9h7jyyqz9pzcwvw3ld8bgyyrwsxkj" + "commit": "92b259e6a8ebe6439f67d3d7ffa44b7e64b76478", + "sha256": "15lihfdjdp5ynmq0g8wkq8dhb2jdlvfcqbb2ap588igi5vax3glz" + } + }, + { + "ename": "consult-ghq", + "commit": "513921c684fbab5ff57e47c509a89b15d7d3a5ce", + "sha256": "091018x5y28lbffjrb75a5r2cvprlhz0jdj371nlyvrpsdgdfs4f", + "fetcher": "github", + "repo": "tomoya/consult-ghq", + "unstable": { + "version": [ + 20210606, + 2047 + ], + "deps": [ + "affe", + "consult" + ], + "commit": "c8619d66bd8f8728e43ed15096078b89eb4d2083", + "sha256": "1zrxigf7bnx6l9lv2xvnn3ba6c9dndijw1vlnli56cv215i0r4f6" + }, + "stable": { + "version": [ + 0, + 0, + 4 + ], + "deps": [ + "affe", + "consult" + ], + "commit": "c8619d66bd8f8728e43ed15096078b89eb4d2083", + "sha256": "1zrxigf7bnx6l9lv2xvnn3ba6c9dndijw1vlnli56cv215i0r4f6" } }, { @@ -15674,16 +15871,15 @@ "url": "https://codeberg.org/jao/espotify", "unstable": { "version": [ - 20210411, - 1305 + 20210605, + 1502 ], "deps": [ "consult", - "espotify", - "marginalia" + "espotify" ], - "commit": "22b81067ebcaef2cea633f967a4b55454af9326a", - "sha256": "0b93a8km80r1c3gbinnsigkkq8yc127jwrqj8s8z130b79ch91hn" + "commit": "3d62a3319ab03a810030058d3fb368b28dfd82d5", + "sha256": "0hj3nczmqmgiwsvh664rs34j63wl325x6nar21p1a84h5ximpkxq" } }, { @@ -16006,8 +16202,8 @@ "ivy", "swiper" ], - "commit": "7c5d49f84f0919bbf00c53a9db48630adf8b2fbe", - "sha256": "1rji3p7a2f4ag4785h1k1f2ng9vi2lh8ifyh3m3j0yjihwq36m92" + "commit": "040d458bce4a88f37359192061bcea5ebe87007c", + "sha256": "0lgpawrsvihksm9cx462qa1hsmxhhv1qp0h1f9m4wn1jrcrq7r24" }, "stable": { "version": [ @@ -16231,14 +16427,14 @@ "repo": "CsBigDataHub/counsel-fd", "unstable": { "version": [ - 20200902, - 2147 + 20210606, + 1724 ], "deps": [ "counsel" ], - "commit": "533d70f229abc73b013668bd03f7486effa1e369", - "sha256": "0iz0blxbi0zcilyg4a5aqzggy1b0rdygw5q45szp9hbzzqdb5wfg" + "commit": "e9513a3c7f6cdbdf038f951e828e631c0455e7d4", + "sha256": "005l1is12jq35nn1ap87a7p74qin26zpgbk599619lh9vai157ww" } }, { @@ -16861,6 +17057,33 @@ } }, { + "ename": "create-link", + "commit": "80b967b973240c5124957180819aeacac66271bb", + "sha256": "0ypj1sd9jabr5mmrpwibsahrchxs28kp4xv1yjk5pqwyz0r08a8b", + "fetcher": "github", + "repo": "kijimaD/create-link", + "unstable": { + "version": [ + 20210601, + 1327 + ], + "commit": "771a405e262c98b802e2c5302306aed802d8233e", + "sha256": "0kcv3jjygjvz75irjdddgakw8b0ckm5gqasrb2341zgqms7l9rfr" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "request", + "w3m" + ], + "commit": "fbc4e8eeec845f7d1610c52b81c0c7a4e961b991", + "sha256": "0h1ih1jsywhxhy91yjkz9464j79ma3mp73lxnfww71rwfd0wamyj" + } + }, + { "ename": "creds", "commit": "81b032049ccc3837e8693f010b39716912f76bba", "sha256": "0n11xxaf93bbc9ih25wj09zzw4sj32wb99qig4zcy8bpkl5y3llk", @@ -17827,8 +18050,8 @@ 20190111, 2150 ], - "commit": "940d80dcd5cbc8d55a0f9348d1a2472e9b8b7121", - "sha256": "00mhmfpp4vgfcvm6s7zbzxb0ayra1ghqvdhhqj6mzly15an85b40" + "commit": "7b018126aefb100a4f00aeba121688e8a168ee22", + "sha256": "0wxjnxic06kkdjlsd0r0afpms26rhdyskv2f4nj7gabiz1m341gm" }, "stable": { "version": [ @@ -18048,8 +18271,8 @@ "posframe", "s" ], - "commit": "434784654e26daa7a8512ed57907829a043592d3", - "sha256": "172z5qr7hwjsl9bhqzsgpgxslfxvrxvjlahwwfircrq1xqicvzlj" + "commit": "cc395e066755c7513d4862f5639f3d162b3bd30f", + "sha256": "0nmpldvkhgi668zpn5wym6rfvsdnib9ny2snzwsrrfgqa70lmky6" }, "stable": { "version": [ @@ -18266,8 +18489,8 @@ "repo": "bradyt/dart-server", "unstable": { "version": [ - 20190817, - 1254 + 20210501, + 1445 ], "deps": [ "cl-lib", @@ -18275,8 +18498,8 @@ "flycheck", "s" ], - "commit": "aba838e8ee2f30309f366e8a91c17616549003ce", - "sha256": "0lwss1s1n2kfy0i8nwwfmz5fnw137zkhjs6zv81piniad6hrmn1l" + "commit": "75562baf9a89b7e314bc2f795f6ecdc5d1f2cc8c", + "sha256": "06v4gbckfgdl7hbppgv15ynsxq37qqdw1h8yzicwjqgylma0if1y" }, "stable": { "version": [ @@ -18302,11 +18525,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20210330, - 1544 + 20210602, + 1928 ], - "commit": "b9286a84975874b10493f1cb4ea051c501f51273", - "sha256": "13qmv5h2fvy1aqcc3xg7am3phpraw4jliz6qjcx0fjfshndkh5xl" + "commit": "aab346ed9d8f0f7ea033029c9688810353052e7e", + "sha256": "0vq8sgbil17llimaar4j5ar07g17q8ir3a7hfpmv9572ah1zqpw9" }, "stable": { "version": [ @@ -18381,8 +18604,8 @@ "deps": [ "dash" ], - "commit": "b9286a84975874b10493f1cb4ea051c501f51273", - "sha256": "13qmv5h2fvy1aqcc3xg7am3phpraw4jliz6qjcx0fjfshndkh5xl" + "commit": "aab346ed9d8f0f7ea033029c9688810353052e7e", + "sha256": "0vq8sgbil17llimaar4j5ar07g17q8ir3a7hfpmv9572ah1zqpw9" }, "stable": { "version": [ @@ -18744,15 +18967,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20210112, - 2013 + 20210522, + 348 ], "deps": [ "ccc", "cdb" ], - "commit": "7a7e1ecaf7f4f68058f1b8831d0b7b839d228614", - "sha256": "0gcgbr28j88a73p5ng4f20qp0fx288na9hi4fnj32grqyrl6f1pq" + "commit": "ce0517127586e26f95f94f45d22a832f40a28321", + "sha256": "1qx99sigzmj4fc5wcaqs6wnyzsrzcqg73czn5aknxqkzd1whsk3a" } }, { @@ -19406,17 +19629,32 @@ }, { "ename": "devdocs", - "commit": "35763febad20f29320d459394f810668db6c3353", - "sha256": "14vab71fy5i1ccmzgfdg37lfs1ix3qwhcyk9lvbahcmwnbnimlzm", + "commit": "19d1adfa91593cc32a3ce94d47f4c32102408488", + "sha256": "1hizgj4fn3m986ri6zhx0a2dp0qkvm24farb4gcwf19p3ii70470", "fetcher": "github", - "repo": "xuchunyang/DevDocs.el", + "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20170731, - 850 + 20210606, + 933 + ], + "commit": "07fc164a680d02de2a7af983adb5e726cbfd7fc0", + "sha256": "1ldd4h9r7wiqgynxwlqf6hg5m2whzaczlhxmbch7i60rd72wwvrj" + } + }, + { + "ename": "devdocs-browser", + "commit": "6c13d0ea72261c4835b5f1983a1f3ee1e066f743", + "sha256": "0gqvjn0arrxdc7lbqrpak9l83ampsbdlbzmi1fk02i431yv89rpc", + "fetcher": "github", + "repo": "blahgeek/emacs-devdocs-browser", + "unstable": { + "version": [ + 20210601, + 1447 ], - "commit": "a2d51e824f0cc48a9dd611cc740bc8b86143e611", - "sha256": "0nzh7pgvj4cs5d29lrrmbas29xdslgqzsqjmpapzqzbnrgprnbx8" + "commit": "d3702670eb361715e41440eb699523b3f4c60bee", + "sha256": "1mv0d67y6m1wi779lc0mnpylqiw3cnaj0rkj199fxh91nkc6vk27" } }, { @@ -19460,11 +19698,11 @@ "repo": "redguardtoo/dianyou", "unstable": { "version": [ - 20191120, - 39 + 20210525, + 1517 ], - "commit": "da7443a680bd8db75884355314e9352cd8c68d05", - "sha256": "099iiwp52rfnxgwhiaxdaridhcjdp3qchmskxmb1j5dz757c6w1c" + "commit": "f77d9e76be5d8022fa6ee5426144f13f38dd09f2", + "sha256": "08pwp1pv8c3klingl0qpymdh9ybqrjj47rdd191vhah2ahn5bs1g" }, "stable": { "version": [ @@ -19629,14 +19867,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20210518, - 1621 + 20210523, + 11 ], "deps": [ "cl-lib" ], - "commit": "4f23c36da5bf102fcf6e7435fa79041feb7f1fbe", - "sha256": "1hpba4zznhkz2m9254h42ljccfd0kdz9lv1sjb4baq60f08lp5sj" + "commit": "d4340608c2d6d8b81aad8e690d0265799aba16f3", + "sha256": "1haqmaaj6ajqqfdni6gn3nmqaif8jqrpdnr84m3zjddsdw5zlcsk" }, "stable": { "version": [ @@ -19699,8 +19937,8 @@ "deps": [ "transient" ], - "commit": "fdb37bb696aaec6cb2bcece3760866760e68edc4", - "sha256": "1ig7hk9vhlym91gzk4s6h2a6aj425nln29m6f2hpq9jh3qicgh9i" + "commit": "96861493f95fe88118942bbe64954142250d6c24", + "sha256": "13dda1883pkji4nf44mx9xiys6rgirw12si9fnazsviiqycjaf1b" }, "stable": { "version": [ @@ -20021,8 +20259,8 @@ "deps": [ "treeview" ], - "commit": "1f88a9ddda0b431c79564f91d470e8e308ed3c32", - "sha256": "1pxkxlpbbm4si5z8gx7lbqaw2qvf6h3qc1qxsp6s47h10nrpi9kk" + "commit": "53dc9dae71d1be3a7a925332a53e72d2bd05366b", + "sha256": "0hgcargxbl58f4im57c1zqwnfxl52lfv78s8l69njjggvdki0hz1" } }, { @@ -20748,15 +20986,27 @@ "repo": "ShuguangSun/dired-view-data", "unstable": { "version": [ - 20210510, - 931 + 20210529, + 600 + ], + "deps": [ + "ess", + "ess-view-data" + ], + "commit": "c865c34536d9c3140ce647f03c8b7498b46e935c", + "sha256": "0xca6kjr9qf7w9hz63hfai2hl055cdp5gm8nldr1xjv5gk42765h" + }, + "stable": { + "version": [ + 1, + 0 ], "deps": [ "ess", "ess-view-data" ], - "commit": "80a5f254fc9e0a8f022e429a53c3d8b1da26c4b8", - "sha256": "04jj3jpgvnvrn7r1z5y7ilh1hah2d6rb91m17ll45i20sakhp2xc" + "commit": "c865c34536d9c3140ce647f03c8b7498b46e935c", + "sha256": "0xca6kjr9qf7w9hz63hfai2hl055cdp5gm8nldr1xjv5gk42765h" } }, { @@ -20767,14 +21017,14 @@ "repo": "Boruch-Baum/emacs-diredc", "unstable": { "version": [ - 20210520, - 748 + 20210603, + 2349 ], "deps": [ "key-assist" ], - "commit": "1cd91779b99e3920f8c19ddb3bb84410284108c2", - "sha256": "1264ycfvy9cl71qgd8n7xp1xl0ngzdwq2agic5faf6jmqyg77ax7" + "commit": "43159042ca788be74c387cc59ba3fffc57079993", + "sha256": "01r6sk2zlj3mf39vczaybhpzzmv379vvi85mc4gygif24m102sg3" }, "stable": { "version": [ @@ -21730,14 +21980,14 @@ "repo": "emacs-pe/docker-tramp.el", "unstable": { "version": [ - 20170207, - 325 + 20210526, + 748 ], "deps": [ "cl-lib" ], - "commit": "8e2b671eff7a81af43b76d9dfcf94ddaa8333a23", - "sha256": "1lgjvrss25d4hwgygr1amsbkh1l4kgpsdjpxxpyfgil1542haan1" + "commit": "aaee11cedf7b4c31700f24a1fd88dcef9c2a7c3d", + "sha256": "120sxrifn82hhrqhqdy0dhnni353vwzkkd5x7inqg1wpzsxjwhzl" }, "stable": { "version": [ @@ -21826,8 +22076,8 @@ "deps": [ "s" ], - "commit": "c14485468439056bcfc6a0862fe35fa8d787d34a", - "sha256": "198vqmhyasilxgz2lwn7y3a0g885ws3pyhvvj80wy7n4ml8mfdr4" + "commit": "f6dcb378bb69c23d58978d5bc1e37c4ae160d278", + "sha256": "055b24cskxp0wy74synnnsmfnzbavmazyackq0qfnfbkqryrzfml" }, "stable": { "version": [ @@ -21969,16 +22219,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20210517, - 411 + 20210606, + 1532 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "3b393766f447f6ee9622161a86ae90766b42a395", - "sha256": "14c4fsgsvlvxw1g1d9lk244bpz0snk3gir8ndd5zrb14b2nllwzb" + "commit": "1660910b758251608c17e1a0e27ff862e345daab", + "sha256": "1apbh9kp1qk3klx65imbhmxxnf8ax0hzzcdwj4n6qpm7s6bk1gc3" }, "stable": { "version": [ @@ -22022,14 +22272,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20210507, - 620 + 20210604, + 1922 ], "deps": [ "cl-lib" ], - "commit": "4d24728f11853b5bd231687ac3f7a95108688313", - "sha256": "0kws2305asszwjcc28zsbb6xwg25pxwabm5vml9jqk9w5f3ajl33" + "commit": "b2c0ea0f0778a6ea85b87e1b87916572e98e1fe7", + "sha256": "1rjhmjsszms4rlqq368f717ds4kmdjblkgd2ww830d7sy5h5rb6n" }, "stable": { "version": [ @@ -22172,11 +22422,11 @@ "repo": "gustavopuche/doxy-graph-mode", "unstable": { "version": [ - 20200807, - 646 + 20210604, + 723 ], - "commit": "2685c28e7a725614c23345195c3b85e505be2a1b", - "sha256": "0a4kil5v88wkki3r4jjc9ackv2z7ik0qgn4bdv75baskig8f8qjy" + "commit": "88af6ef4bc9c8918b66c7774f0a115b2addc310e", + "sha256": "0adis4gprh7gzi1nm274gqgzr794fsq4zfjfwz3nh96agc8h8g7j" } }, { @@ -22686,8 +22936,8 @@ 20210213, 757 ], - "commit": "03435a3608a703bac5b65bfa84c97d91dcc28a4f", - "sha256": "0ll1mc0vb81wkna70awgnw06q8xkjp0n2nmk997pjq8sm6d7prgm" + "commit": "ac3a66e0f7d3577b27cc5d5f2399163bfbe11828", + "sha256": "1grll7h2hv906bik224qn9fldmq4lhnlfcif1lg4grr3f4nhl1wc" }, "stable": { "version": [ @@ -22911,11 +23161,20 @@ "repo": "countvajhula/dynaring", "unstable": { "version": [ - 20210513, - 429 + 20210603, + 2331 + ], + "commit": "d3cc361b70b5dc4542624ced9c326523939ca021", + "sha256": "02mz2dfqfycw64z2906f9dvl5x6qb53xbhkn3hf5205hcg58w5zh" + }, + "stable": { + "version": [ + 0, + 2, + 0 ], - "commit": "2919e28d324f63a5ceb83adedd40ed41cb091911", - "sha256": "01n8afwpx0cq010b4j4w15kjk9cg9civffmz32wgiihmhpkkc0bq" + "commit": "d640a557e3e7197cebb56365ad3552ffda39b838", + "sha256": "1fd17xryl2pkdlalc9jgwdkgl2mgks83wh5s8wilvwb21y8g306l" } }, { @@ -23333,26 +23592,26 @@ "repo": "knu/easy-kill-extras.el", "unstable": { "version": [ - 20180920, - 1334 + 20210529, + 945 ], "deps": [ "easy-kill" ], - "commit": "b8ce8350cc86e0229f195082557970cd51def960", - "sha256": "1f8db92zzk8g8yyj0g334mdbgqmzrs8xamm1d24jai1289hm29xa" + "commit": "74e9d0fcafc38d5f24e6209671a552bc1ba5a867", + "sha256": "0yxfsp4zzzw9v4swgslsr4v35hs04sczskfyfdvw8wk0aahxcwrx" }, "stable": { "version": [ 0, 9, - 6 + 10 ], "deps": [ "easy-kill" ], - "commit": "b8ce8350cc86e0229f195082557970cd51def960", - "sha256": "1f8db92zzk8g8yyj0g334mdbgqmzrs8xamm1d24jai1289hm29xa" + "commit": "74e9d0fcafc38d5f24e6209671a552bc1ba5a867", + "sha256": "0yxfsp4zzzw9v4swgslsr4v35hs04sczskfyfdvw8wk0aahxcwrx" } }, { @@ -23419,14 +23678,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20210505, - 1914 + 20210607, + 2206 ], "deps": [ "parsebib" ], - "commit": "0ed8c3cb1ccc130e9d4060d19e478474cdf3d6e0", - "sha256": "1i37hsgywhcrmsj0cmvs67hzknhx56wrs868k4rrs9cwgc2yf6j1" + "commit": "7e49d7e1eaeca755c0086a81967673eb5b45d175", + "sha256": "0n6p460nmy6h6sc29j1nmhb6zcbbk7qczab6pz96hyxp1cj9g5gy" }, "stable": { "version": [ @@ -24267,8 +24526,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20210516, - 1044 + 20210526, + 1751 ], "deps": [ "eldoc", @@ -24277,8 +24536,8 @@ "project", "xref" ], - "commit": "1ac06d0bcc247fb19df6eceb57e2ea3d534806ec", - "sha256": "1arvfga8yhzr14bkfykivcrpzj94ai50rqjvz743wlm5xw295j45" + "commit": "e498cb171bb07ec36880a2494aafc8acb1cc34ca", + "sha256": "1q2rg6kk16h0wv70p2x1rg5cjmn0w0gc3phriwdd7iwn842dsrb7" }, "stable": { "version": [ @@ -24428,8 +24687,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20210505, - 2237 + 20210522, + 1036 ], "deps": [ "anaphora", @@ -24440,8 +24699,8 @@ "websocket", "with-editor" ], - "commit": "a9903b3b6df26eb5603aa38960c6bd9d826cecb8", - "sha256": "0di5275avxmd014zhwj420zapwdy0a00lkrl8j362f636kwp9lir" + "commit": "09af85821e4fce64675d5287fe9f3a6847d1c5d2", + "sha256": "12b8idh2mpd37nrc8ricr4s4hz4wgnp7cy1298qcpxl00xx99dqw" }, "stable": { "version": [ @@ -24604,11 +24863,11 @@ "repo": "dimitri/el-get", "unstable": { "version": [ - 20200912, - 1653 + 20210606, + 911 ], - "commit": "d76ac84ae9670de7bf7725b362cafe86688771f9", - "sha256": "18x4qj75bh45b0dirp3jpw1zqni8xfqqh1q13q6b5ncy1nhvm4gl" + "commit": "52df810e538243d07f2a317ad36e351b440a75e0", + "sha256": "0s9107bss982v4njwkfyi4gismg402xcrqkq9c2hrwhyr6pny4w0" }, "stable": { "version": [ @@ -24908,11 +25167,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20210513, - 1531 + 20210524, + 1611 ], - "commit": "78a1d616f6a4fe8033e425eeff19b1f21955dbd2", - "sha256": "0j5j6j2wlan73z7xpa3yhji2sgb6m1gayc9pwmxxkwqvjpngyc45" + "commit": "afe8f31e2b9f78d13b22a695b7cf9c373656b85e", + "sha256": "09yk4xvsdd5mvrzx4kdfyi2bkbdykjg80hcxvjamh967s6vinzjb" } }, { @@ -24957,11 +25216,11 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20210516, - 2029 + 20210530, + 1641 ], - "commit": "006d2474a58ba7cb63911d5a9b8b9febba6593c7", - "sha256": "093r3dqbi7r3b35744pjbxcb39r1pk2qlqgf0j4kqmgby1xhjcjs" + "commit": "e9af76aa8fd9ce5b7010b7322a73341828cfe690", + "sha256": "1wryp568bl5p0s78va2pgh9aiskhphmva20zmk1jg0qjxim58grv" }, "stable": { "version": [ @@ -25255,11 +25514,11 @@ "repo": "skeeto/elfeed", "unstable": { "version": [ - 20210309, - 2323 + 20210606, + 1130 ], - "commit": "e29c8b91450bd42d90041231f769c4e5fe5070da", - "sha256": "12m4q8zfmn6g0kz2v3vmch4kbmivxshj9xk58j2f3f3c8fvk6567" + "commit": "243add9e74003cd5718f33482b7bb8b4fe140fb5", + "sha256": "1lw8g9narlygqd7ypgbyvm4n12qxigzywglsjw6yjcry70p00kl3" }, "stable": { "version": [ @@ -25374,26 +25633,26 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20210429, - 1337 + 20210605, + 2212 ], "deps": [ "elfeed" ], - "commit": "8c694d0feb33dca66d9a8d88f9aaa6e7ded472ea", - "sha256": "0lcpj2vp947kbfk6fq7xz7j71mcpjs9086pqh690w4mzv1253gra" + "commit": "dd4a0ceded6200fe2367a2de7b0e45d7fb5b4909", + "sha256": "17hf6b5db4d0cm1996z4sl00y4c8gl3rga97xxp2bmwbhdr7kaxw" }, "stable": { "version": [ 0, 7, - 8 + 9 ], "deps": [ "elfeed" ], - "commit": "8c694d0feb33dca66d9a8d88f9aaa6e7ded472ea", - "sha256": "0lcpj2vp947kbfk6fq7xz7j71mcpjs9086pqh690w4mzv1253gra" + "commit": "dd4a0ceded6200fe2367a2de7b0e45d7fb5b4909", + "sha256": "17hf6b5db4d0cm1996z4sl00y4c8gl3rga97xxp2bmwbhdr7kaxw" } }, { @@ -25411,8 +25670,8 @@ "elfeed", "simple-httpd" ], - "commit": "e29c8b91450bd42d90041231f769c4e5fe5070da", - "sha256": "12m4q8zfmn6g0kz2v3vmch4kbmivxshj9xk58j2f3f3c8fvk6567" + "commit": "243add9e74003cd5718f33482b7bb8b4fe140fb5", + "sha256": "1lw8g9narlygqd7ypgbyvm4n12qxigzywglsjw6yjcry70p00kl3" }, "stable": { "version": [ @@ -25436,11 +25695,11 @@ "repo": "lassik/elforth", "unstable": { "version": [ - 20210506, - 454 + 20210522, + 928 ], - "commit": "f01437c1461b03de6d7f2f5748beb996a9fa497c", - "sha256": "00904bawhskz88z8hicrhiq5lx92q0bilz5nawymqrbmwq54a17q" + "commit": "2d8540434a28e7edaa04a992c3c362832b2fd61e", + "sha256": "0p4d6blqa3g6mpbn00vqysshga4i93l2s6i7nm2ckg4zrrn27pl5" } }, { @@ -25803,8 +26062,8 @@ "repo": "jcollard/elm-mode", "unstable": { "version": [ - 20210224, - 2314 + 20210525, + 152 ], "deps": [ "dash", @@ -25812,8 +26071,8 @@ "reformatter", "s" ], - "commit": "e9fcf9cc2779cf7f5ae7ee4be339164b26755c69", - "sha256": "05g3r5hc6slaca8g7n6i6bk9lpq9jsb2kv2q5v8nbz96abqg56zm" + "commit": "f2e2d0053f3272d9fc0c2e16c8d17d97724cf524", + "sha256": "1gaddxw63d5fna43d7kc3px9sbd2knbjga0lx2zz0lsbcjr54pzr" }, "stable": { "version": [ @@ -26487,11 +26746,11 @@ "stable": { "version": [ 1, - 3, - 2 + 4, + 0 ], - "commit": "f9f810ffcd3cce7ed15848c72ce299609ec09414", - "sha256": "1p3zpg4p4a1cn13sg3hsa33gs1bdra1mlmxkagx883p3808i5qha" + "commit": "53d257db92fb72ade8ea1b91dc6839c21563119e", + "sha256": "1qccz8z0410xhygrfy62h1j3553avdcb7m61ps6b6y74nz615l1r" } }, { @@ -26799,11 +27058,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210520, - 1753 + 20210607, + 1506 ], - "commit": "a21e510bc63c8ddc98b2bb3e6fff38e9d7f41ca9", - "sha256": "13c8l2dafqn3xm0lgrn4agy2i7ycz8dxwvxdcdrbba1gdb8ivm2n" + "commit": "ef609bf15368a68c4eb3c46fd8cc1bb623b6b83e", + "sha256": "0ddh7zqgaq07534l6m3wjvbcj23a01h3x7scd4pl5rj6wyxqwv76" }, "stable": { "version": [ @@ -26822,15 +27081,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210517, - 1319 + 20210525, + 1515 ], "deps": [ "consult", "embark" ], - "commit": "a21e510bc63c8ddc98b2bb3e6fff38e9d7f41ca9", - "sha256": "13c8l2dafqn3xm0lgrn4agy2i7ycz8dxwvxdcdrbba1gdb8ivm2n" + "commit": "ef609bf15368a68c4eb3c46fd8cc1bb623b6b83e", + "sha256": "0ddh7zqgaq07534l6m3wjvbcj23a01h3x7scd4pl5rj6wyxqwv76" }, "stable": { "version": [ @@ -26997,16 +27256,16 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20210514, - 2034 + 20210607, + 1450 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "06ef243c5a7b60de92ba5503bb385191e35fe21c", - "sha256": "1lrrbkvazalqlbiykhf9qvzxx53z05yjpzf7p0wlzkhhhmp87pm7" + "commit": "c360a8934c1e07ddab4e12d28800d362d254ccbd", + "sha256": "02aikwki7932dldhnsq8ndca59spbc4g2kjfal3sw16lklfw0sfa" }, "stable": { "version": [ @@ -27747,27 +28006,26 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20210227, - 1459 + 20210530, + 1147 ], "deps": [ "closql" ], - "commit": "245157564b9bd1575480044c8b24007b2090dacb", - "sha256": "1bdbwbrrz4brkmg50808vsj70d5yaxb1a71n014nx1a09wnw1hmj" + "commit": "8ee60b65bff02ef606d489b83e2def9922e9623d", + "sha256": "03zsysj78w43q902wi9dhck64q9va247avr6fhdw8ynf2lvb78d3" }, "stable": { "version": [ 3, - 2, - 2 + 3, + 0 ], "deps": [ - "closql", - "dash" + "closql" ], - "commit": "ca211c5225aa550374d77629dd9b87e2b0b0d992", - "sha256": "1pxz611qb3m33r6343h0xhwqvvhjl131zyc2klplzgb23rkm8lk0" + "commit": "8ee60b65bff02ef606d489b83e2def9922e9623d", + "sha256": "03zsysj78w43q902wi9dhck64q9va247avr6fhdw8ynf2lvb78d3" } }, { @@ -28004,11 +28262,11 @@ "repo": "kidd/erc-image.el", "unstable": { "version": [ - 20180522, - 1424 + 20210604, + 753 ], - "commit": "82fb3871f02e24b1e880770b9a3d187aab43d0f0", - "sha256": "1q8mkf612fb4fjp8h4kbr107wn083iqfdgv8f80pcmil8y33dw9i" + "commit": "883084f0801d46a5ccf183e51ae9a734755bbb97", + "sha256": "081c8pjmpwnmqah7dbpkj20bk7ln57g4n7c1zxzdlsz80pxnfay4" } }, { @@ -28385,18 +28643,19 @@ 20200914, 644 ], - "commit": "ed6730a1717a0e3ddc25a75de0c2e109371391c7", - "sha256": "0zlx4xh5c5d88zfbbwd79qb56mrvd3fhgqd7r64p6gx9gfa6kbi5" + "commit": "044843c5281a7bdb9479317793a75c8c0fcfadd9", + "sha256": "04lirb2p1h46c1l84ysdnr2jxvzsdw1zv6jhm7h8ybgzmaa65b6m" }, "stable": { "version": [ 2, 6, 1, - 3 + 3, + 20210605 ], - "commit": "e5486b79cc78689e3fd07b6c924d0085063915ea", - "sha256": "1zl7c0rb5rg867a431apxlzj2flg3hjidamqa5prc1bzpmfaywyz" + "commit": "ab805592a0ae7066fbd5fa5f47e933194fce878f", + "sha256": "19ld12x4is0nx52i05zv20js0zysx3bljbdn2nr65vy11dq2cyyp" } }, { @@ -28410,17 +28669,17 @@ 20210315, 1640 ], - "commit": "7d21e4b2ec7e6a5dc4a51f235a4a5b7d11f27f9b", - "sha256": "1k0qi9blvhayzbzr60g55lh8k7sgn9xbpnn6cb8i4km3470ihnwl" + "commit": "a8969ec16a91c0e1ac56a438d81069d288662518", + "sha256": "0wp6sf8rw73waws47av68d4sdd28qix74n53c4fpdc4c2xq3j3h6" }, "stable": { "version": [ 24, 0, - 1 + 2 ], - "commit": "ae4f8649c0ed90abf177124a5c974abf89dd70e3", - "sha256": "1j2y3m1k75c62gvhvj5f2jw3sijii1z8bjnk547w4ak4ldl60kfg" + "commit": "82f97b9d3d639ed87175aeed75747eb6594170ab", + "sha256": "065kc9p30jam23grpm7dwxjf76n6g1hzdrq9q1irr3qmw1rr0240" } }, { @@ -29159,8 +29418,8 @@ 20210405, 1808 ], - "commit": "22b81067ebcaef2cea633f967a4b55454af9326a", - "sha256": "0b93a8km80r1c3gbinnsigkkq8yc127jwrqj8s8z130b79ch91hn" + "commit": "3d62a3319ab03a810030058d3fb368b28dfd82d5", + "sha256": "0hj3nczmqmgiwsvh664rs34j63wl325x6nar21p1a84h5ximpkxq" } }, { @@ -29338,8 +29597,8 @@ "deps": [ "ess" ], - "commit": "554bdc7d6c7fafc5b8a886690970b5145276a3f5", - "sha256": "0v4cj8d44a52h3r8k4yhr84xalfwrkwpdn3c5m44x7xp36s6zgbn" + "commit": "f6731eb26dc0fc5b7ca1fa881a5f9100f8fcf494", + "sha256": "0pvjk5a5v03qnasqsja30bywb4c481x9agf1rfcwbqsva7p97wiy" }, "stable": { "version": [ @@ -29440,26 +29699,27 @@ "repo": "ShuguangSun/ess-view-data", "unstable": { "version": [ - 20210326, - 1431 + 20210603, + 1412 ], "deps": [ "csv-mode", "ess" ], - "commit": "283251e8ac19ac0c0f89a4b0f0eb38482167e52b", - "sha256": "0kp94y27csj08868rbiwdfzgjx9q71j7d0whpqhsh27qhc189crq" + "commit": "845412ba57efab1a28fbaf0dcdbe76bdab03f828", + "sha256": "0m5wmxi4zq3xy9jsg7d2318iyn9g6fpzqiraq0810fbmrdl4dda4" }, "stable": { "version": [ 1, - 2 + 3 ], "deps": [ + "csv-mode", "ess" ], - "commit": "99ddbceaa54941a5e8438eadb0210fd16470e581", - "sha256": "1crbrzphs49ghkx3rv952wbdv483rwfblryv8bx8lgpxv5gkar9w" + "commit": "845412ba57efab1a28fbaf0dcdbe76bdab03f828", + "sha256": "0m5wmxi4zq3xy9jsg7d2318iyn9g6fpzqiraq0810fbmrdl4dda4" } }, { @@ -29866,15 +30126,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20210515, - 1807 + 20210527, + 2107 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "f0fdfef7703c814f9bb1bb2858d3cadc79fdcbdd", - "sha256": "1d3lnfyp7n1digldamddmxwlycm7xk5ljn5i9ngw59b936050lp6" + "commit": "ad47644eea5e351269f5bead18e713768d96f207", + "sha256": "1bcdrvrrjq9r75cfrxziq84slrjm8gbbhbm72hqjfzka6zcnr39g" }, "stable": { "version": [ @@ -30068,15 +30328,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20210519, - 524 + 20210607, + 1954 ], "deps": [ "annalist", "evil" ], - "commit": "d576c49e04da7cb9f773edaebdf540151883be4a", - "sha256": "05fig8a05rdd2cjq5pzqb9v51lwibyiflny2rfw226wn5m6f75af" + "commit": "86b02f84a8df0ddd6216cb85d49bedd6ee2ab747", + "sha256": "0vh0wdzz9idfinbfd3mynlp88lgq5j9wk8c3pc5a1is6g3jpj938" }, "stable": { "version": [ @@ -30769,11 +31029,11 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20210512, - 1346 + 20210528, + 1009 ], - "commit": "9e7e96971900a2840fe2f7e8d6774c92fed2ccba", - "sha256": "04wyz472g4dlyyj7415s8wp4djaizrh7ncngqx8bl6zanksqyv56" + "commit": "c0f49e4e87300720b8e8a8296d92b8386956c7a2", + "sha256": "0ci3hjzgwayz9nvmwg5vbmvn80cz0lsppghi511cbr3cdf8xkkv4" }, "stable": { "version": [ @@ -30808,14 +31068,14 @@ "repo": "juliapath/evil-numbers", "unstable": { "version": [ - 20210520, - 1300 + 20210605, + 431 ], "deps": [ "evil" ], - "commit": "d7a3e6ddec9d69978318901cf75b911085969fc0", - "sha256": "12jk8l5k8lbvvg2yapfbpq31dzl4icsmr16imz32bpr7b7vvar65" + "commit": "cd23a7b458d73dc49434a3cf90d3d0caceb5811d", + "sha256": "1naxciaq1ci1ajs4if45wjy5qf8bgkxazyvl1kywrj299wi2qdv9" }, "stable": { "version": [ @@ -31203,15 +31463,15 @@ "repo": "hlissner/evil-snipe", "unstable": { "version": [ - 20200531, - 1008 + 20210607, + 420 ], "deps": [ "cl-lib", "evil" ], - "commit": "6dcac7f2516c6137a2de532fc2c052f242559ee3", - "sha256": "1faimkch2s08kbrwh3j77y0n5inrjr7vphy0xdl402bv0d20h8nq" + "commit": "9bd7345476174dfc6eeaa700a505e45b155ddb83", + "sha256": "1p7v9pnbyc4mhpkvmyl9vr825grqnfyl0h203sbnb1vnw15bbnbp" }, "stable": { "version": [ @@ -31303,8 +31563,8 @@ "deps": [ "evil" ], - "commit": "346d4d85fcf1f9517e9c4991c1efe68b4130f93a", - "sha256": "1gfgmr4909m36gknprcam6q4rkcqfbi6w43ky7x6jnlmgb6mxggg" + "commit": "4706987bc01a552343848da49b4951bd54374643", + "sha256": "0v2v58pchr5icdpvg4k6vblxhgjk09wi7f54hs1dj0f6rgvpxmx5" }, "stable": { "version": [ @@ -31394,8 +31654,8 @@ "deps": [ "evil" ], - "commit": "f0fdfef7703c814f9bb1bb2858d3cadc79fdcbdd", - "sha256": "1d3lnfyp7n1digldamddmxwlycm7xk5ljn5i9ngw59b936050lp6" + "commit": "ad47644eea5e351269f5bead18e713768d96f207", + "sha256": "1bcdrvrrjq9r75cfrxziq84slrjm8gbbhbm72hqjfzka6zcnr39g" }, "stable": { "version": [ @@ -32337,11 +32597,11 @@ "repo": "ieure/exwm-mff", "unstable": { "version": [ - 20201003, - 1651 + 20210603, + 1723 ], - "commit": "0d428aca46b8c251dc04d412832e6e7b6e910872", - "sha256": "0g4jvnygcn91kzay0dvahkmf7813cizfc3lhyx1mvi6riz9li3l7" + "commit": "89206f2e3189f589c27c56bd2b6203e906ee7100", + "sha256": "0ipmapyd4jmpnk34wk9kfbvqnl04x74yg2pmj298wqa61ylw1n9j" }, "stable": { "version": [ @@ -32462,8 +32722,20 @@ "repo": "Wilfred/ez-query-replace.el", "unstable": { "version": [ - 20170814, - 1321 + 20210525, + 2222 + ], + "deps": [ + "dash", + "s" + ], + "commit": "3202cf4644ed3b6549284c3816b90bb230970a5b", + "sha256": "1xsvwf7g7c3v4p59svmahhn9pkr6zgp6vyr6dyvfy24mgaqw4jzv" + }, + "stable": { + "version": [ + 0, + 4 ], "deps": [ "dash", @@ -32677,19 +32949,19 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20210427, - 2150 + 20210602, + 1952 ], - "commit": "7b994f27c798a6cd528af25bccbba28e27e6adcf", - "sha256": "0m826s1hll6gjr7y665kix7rnyghdrwi7rga57s158vgg0j345wy" + "commit": "45f2faef92ee23738b86f4f8d0a433ad729a5ca8", + "sha256": "0slvrgw508388il24wlx9g0bf32anpk6rbhmb2r99anq2vhn4b4g" }, "stable": { "version": [ 2, - 19 + 20 ], - "commit": "7b994f27c798a6cd528af25bccbba28e27e6adcf", - "sha256": "0m826s1hll6gjr7y665kix7rnyghdrwi7rga57s158vgg0j345wy" + "commit": "45f2faef92ee23738b86f4f8d0a433ad729a5ca8", + "sha256": "0slvrgw508388il24wlx9g0bf32anpk6rbhmb2r99anq2vhn4b4g" } }, { @@ -33030,11 +33302,11 @@ "repo": "yqrashawn/fd-dired", "unstable": { "version": [ - 20210311, - 321 + 20210605, + 1057 ], - "commit": "7d18938751d047eef18bfb5975195419f0d1e2d3", - "sha256": "0182hg9iayz371lv4flls3gwsvn7bad027h5bn7lizvxxmgg3c6s" + "commit": "c223aee30af7dc7f52fb20045226ed9f49f4ec49", + "sha256": "14dzn3ggq8vb6qb5babngrpgsb29k6y8ficgzwwd9wfd5npynrpa" }, "stable": { "version": [ @@ -33473,8 +33745,8 @@ 20210426, 835 ], - "commit": "af56f75afc240d8121c8944a614a272be811830c", - "sha256": "151c9hvsb5bnprn7kf3g23igazkw9l7xvzizikifizfabay9wi2h" + "commit": "904225a3f89bbd3b44ea097a282ec6ca7945f7f1", + "sha256": "0bf3qnzhv7z71f4h9l0cq6mllkfmc81655qwbzakw3gqqmn8kyr3" }, "stable": { "version": [ @@ -34188,15 +34460,15 @@ "repo": "wanderlust/flim", "unstable": { "version": [ - 20210324, - 1102 + 20210529, + 1253 ], "deps": [ "apel", "oauth2" ], - "commit": "ddf5b6eceb73d7dbf6ff3a2d5281a2957cc2b836", - "sha256": "1pf7jg0psirjm2s84hcmjxkhd5s8vlgprn1miykxks2yxkvk01xf" + "commit": "02735dede6603987e8309a76d0bc7a9ff9a5a227", + "sha256": "1jy2wsm1xc6iaxa449wwz14ky4yiaxd8g05ry59r9pf60cpxxy1h" } }, { @@ -34583,14 +34855,14 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20210411, - 2342 + 20210605, + 1713 ], "deps": [ "flycheck" ], - "commit": "74fa2837fd667235121a12eba43aa1675a58c0ec", - "sha256": "0kgib5igj4ngr589v57k3pwk5v8an33v9mdw5g8kxlsiw7ibr3xk" + "commit": "8c45988a12e7c149b17d7edb84e6dfc33bb7b288", + "sha256": "1lsfz3yi3i1mqmq6p9x6fx26wrlqihsaz3yk5g50yv6jqvfr1g79" } }, { @@ -37083,8 +37355,8 @@ 20210411, 2342 ], - "commit": "74fa2837fd667235121a12eba43aa1675a58c0ec", - "sha256": "0kgib5igj4ngr589v57k3pwk5v8an33v9mdw5g8kxlsiw7ibr3xk" + "commit": "8c45988a12e7c149b17d7edb84e6dfc33bb7b288", + "sha256": "1lsfz3yi3i1mqmq6p9x6fx26wrlqihsaz3yk5g50yv6jqvfr1g79" } }, { @@ -38173,8 +38445,8 @@ 20210124, 1143 ], - "commit": "94a2be0ef4515473101f823fccca71aa456bf84e", - "sha256": "1kw47ghvy7i87i6qrzijg64b43vsh4d7gn9r4g73jgdbqdmiqbyb" + "commit": "404233604439117301562deadc952fe82cb02120", + "sha256": "131yv9524yl7bwn9pd86pfjwjphv66lakfa9d293m4pq9mmg87s6" }, "stable": { "version": [ @@ -38201,8 +38473,8 @@ "avy-menu", "flyspell-correct" ], - "commit": "94a2be0ef4515473101f823fccca71aa456bf84e", - "sha256": "1kw47ghvy7i87i6qrzijg64b43vsh4d7gn9r4g73jgdbqdmiqbyb" + "commit": "404233604439117301562deadc952fe82cb02120", + "sha256": "131yv9524yl7bwn9pd86pfjwjphv66lakfa9d293m4pq9mmg87s6" }, "stable": { "version": [ @@ -38233,8 +38505,8 @@ "flyspell-correct", "helm" ], - "commit": "94a2be0ef4515473101f823fccca71aa456bf84e", - "sha256": "1kw47ghvy7i87i6qrzijg64b43vsh4d7gn9r4g73jgdbqdmiqbyb" + "commit": "404233604439117301562deadc952fe82cb02120", + "sha256": "131yv9524yl7bwn9pd86pfjwjphv66lakfa9d293m4pq9mmg87s6" }, "stable": { "version": [ @@ -38265,8 +38537,8 @@ "flyspell-correct", "ivy" ], - "commit": "94a2be0ef4515473101f823fccca71aa456bf84e", - "sha256": "1kw47ghvy7i87i6qrzijg64b43vsh4d7gn9r4g73jgdbqdmiqbyb" + "commit": "404233604439117301562deadc952fe82cb02120", + "sha256": "131yv9524yl7bwn9pd86pfjwjphv66lakfa9d293m4pq9mmg87s6" }, "stable": { "version": [ @@ -38297,8 +38569,8 @@ "flyspell-correct", "popup" ], - "commit": "94a2be0ef4515473101f823fccca71aa456bf84e", - "sha256": "1kw47ghvy7i87i6qrzijg64b43vsh4d7gn9r4g73jgdbqdmiqbyb" + "commit": "404233604439117301562deadc952fe82cb02120", + "sha256": "131yv9524yl7bwn9pd86pfjwjphv66lakfa9d293m4pq9mmg87s6" }, "stable": { "version": [ @@ -38692,8 +38964,8 @@ 20191004, 1850 ], - "commit": "7bb01664b45fc08b7d013c91073cf3ce0d313984", - "sha256": "1hknnkidmd5w81i30xjj2q3x93mygqq7pk7kwfssnzrn8lih6a9b" + "commit": "246120647e28a27506ca0894ba98e371086881fd", + "sha256": "15gqzj4h0w33w38i8ihl74iy7aqxlds97gm93r72z69pm2l1d7dm" } }, { @@ -38764,14 +39036,14 @@ }, { "ename": "forge", - "commit": "58c5ca46286712b2aa43e07bb5dcbc8b5eb321e8", - "sha256": "1ykpjgbi2yak9ww54wnm1gxj9zff2ggldg9msg3219r8frzjcnjv", + "commit": "6cee0395aa57874032cb75c9f3f71e62bd139235", + "sha256": "0a1yvdxx43zq9ivwmg34wyybkw4vhgzd2c54cchsbrbr972x9522", "fetcher": "github", "repo": "magit/forge", "unstable": { "version": [ - 20210507, - 1554 + 20210525, + 1345 ], "deps": [ "closql", @@ -38783,13 +39055,13 @@ "markdown-mode", "transient" ], - "commit": "37aa4e4b82a99246b3551daee6104dc1d192174a", - "sha256": "01z6mnl68lwm0nj0mbvns6xacfydadwcmjzfy3vnmj7hkcd9nynd" + "commit": "551e51511e25505d14e05699a1707fd57e394a9a", + "sha256": "139pndj9l9aifnvv2ak5zwf5gzwhp3m6dfpw1avf4vkh1zywzwa0" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ @@ -38797,14 +39069,13 @@ "dash", "emacsql-sqlite", "ghub", - "graphql", "let-alist", "magit", - "magit-popup", - "markdown-mode" + "markdown-mode", + "transient" ], - "commit": "f5fc99935e2059ddede9766ce4bb96d99dcd203b", - "sha256": "0jipyqj3r4gkdwpcy0m5ij7x510r2admi8fbzwfysqyrwahs60nv" + "commit": "551e51511e25505d14e05699a1707fd57e394a9a", + "sha256": "139pndj9l9aifnvv2ak5zwf5gzwhp3m6dfpw1avf4vkh1zywzwa0" } }, { @@ -38839,15 +39110,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20210413, - 802 + 20210604, + 1107 ], "deps": [ "inheritenv", "language-id" ], - "commit": "eb5906c7070b667432194da3991daf21f24b516a", - "sha256": "02i9qijkwzwjcl52ivzhcjamsiygdxn62gdkb9v511036vv4dqff" + "commit": "82f68e5d1f0641d7a050db02ab2c0a7d3888f358", + "sha256": "0761qmkza4sbl1k0vj4q18zm9p148h7131dq46wwajyxbmrxlxja" }, "stable": { "version": [ @@ -38978,20 +39249,20 @@ }, { "ename": "fountain-mode", - "commit": "12589d1eb14bfc87d2e6f2a5ff8f5fb66b574a56", - "sha256": "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840", + "commit": "27cc1d093ce12b559a4266184fb9077c9810d542", + "sha256": "1jmb5xm0d1wffw3gj0idv114dzs845n41312dvghv7bblbxyd7bj", "fetcher": "github", "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20210516, - 1556 + 20210523, + 1327 ], "deps": [ "seq" ], - "commit": "faccbe3e1f02ed75745999a7f6f11a0fb855936a", - "sha256": "0jdszkbzwh3w3r1sf09h3g65q5b1gnwwd502423lgq80gabf3ni9" + "commit": "77f3ce6b646868210f91b6a80fcaaa77297ed341", + "sha256": "1f0mzrn237kv2p5bz58km4b7a46shzm1v7n4a6ksyfd3n7cqas85" }, "stable": { "version": [ @@ -39602,14 +39873,14 @@ "repo": "factor/factor", "unstable": { "version": [ - 20210506, - 1352 + 20210602, + 1531 ], "deps": [ "cl-lib" ], - "commit": "a456d86694067c04dcdff3e48d654ceed2c72465", - "sha256": "0vijg7ybg128p2zx1fr4fzgyrf3p5vbhssf8j1l9y7bkdq8i7smp" + "commit": "b989a860d1d6191bb9c5911ac77ed0931424eaeb", + "sha256": "1w0hyfspi3kahj2lk1bzj3ny3r8bb0cj4yfjizzbfc1pz9dlkpkp" }, "stable": { "version": [ @@ -40092,11 +40363,11 @@ "repo": "wavexx/gcode-mode.el", "unstable": { "version": [ - 20201218, - 2109 + 20210522, + 1025 ], - "commit": "a1e2c6cbf4e364991ab2209d5cd5a3b698d459d9", - "sha256": "0x6aqh415gbn9x7qyb74zmw5v1ghi7y0lknlbdccxx3j62fmmv8w" + "commit": "1f83845af4102efc5e5856b55bd5ad165b2f0cdd", + "sha256": "0lrsnl08npknif66chs3spy6pnblx3mbxxw1dii8a7zcj2s0ripv" } }, { @@ -40518,11 +40789,11 @@ "url": "https://git.carcosa.net/jmcbray/gemini.el.git", "unstable": { "version": [ - 20200813, - 1424 + 20210226, + 1419 ], - "commit": "d114bacfb12f9e66821254ff0a1fb85443700b24", - "sha256": "0m7jricw40h4r30kcg60dl2ybgrdbiglnb55lz3n70bc5nsx8dcd" + "commit": "0a227125a4112266c06ed7247de039090314b525", + "sha256": "0fiix0ssaannim5kxpckhd5z6fssij3igv1dg9y7143dzxf274zz" }, "stable": { "version": [ @@ -40667,8 +40938,8 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20210329, - 817 + 20210530, + 402 ], "deps": [ "dash", @@ -40676,8 +40947,8 @@ "magit", "s" ], - "commit": "6a90e7233dccc2f997af2cd5c896c8d72d3c3a76", - "sha256": "1nmgngxgzbp1l4av6vb6fgl2nbizsffv51qnki8yaycl1f3cmrg9" + "commit": "f1bdc47ab2bb29c2a0a385aaa9a5f0f6d543ffb5", + "sha256": "1qcw5kzcw9g41hqg0gnq3k6i4ygfgrlghadmfzdnf7dbk93ngl4g" } }, { @@ -40935,28 +41206,28 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20210427, - 1239 + 20210531, + 2006 ], "deps": [ "let-alist", "treepy" ], - "commit": "d6e6b0666104f3896d05d2b03d08d84d9dca096f", - "sha256": "04ifyn8pkhg6lhlikxfgj6fcnz33mgr6x24y72754szc105irb0s" + "commit": "e9a819c9c997b8e752eeb4a3fcd1a7b55ab8da47", + "sha256": "1c92q4hrax9gfrw35qi3slr7man006v5vqzp6hi2an5haw2cz4x2" }, "stable": { "version": [ 3, 5, - 2 + 3 ], "deps": [ "let-alist", "treepy" ], - "commit": "d6e6b0666104f3896d05d2b03d08d84d9dca096f", - "sha256": "04ifyn8pkhg6lhlikxfgj6fcnz33mgr6x24y72754szc105irb0s" + "commit": "ae59388adbba32fa00e39f3323fe69367739ee6f", + "sha256": "1sn7rzfkm75vj3whhisrjk1s34lz6hc08hmf4nnznbdvyimnd013" } }, { @@ -41021,11 +41292,11 @@ "repo": "csrhodes/gift-mode", "unstable": { "version": [ - 20180530, - 1235 + 20210528, + 1459 ], - "commit": "b0441ae6e02f343be3b611a2d4b40495ecd932f0", - "sha256": "0dwpmvjsczcdzwhjvpfxrkfha513538z8wq3gr3l1zc1kdggx2bk" + "commit": "c93354e8fe1173b22f398f17b127875807f15b87", + "sha256": "1d974s7i2hi8yxdng2l02pfn2vkv65jzk5lm9p6if2myf5xbwis5" } }, { @@ -41301,29 +41572,30 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210512, - 1949 + 20210525, + 844 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "9d76233597aaad1c9ab188bde83c3b66d9bd3d0a", - "sha256": "1kmnvrgy71bk6z47w90vrmfl37j7q069vcdx9dcs4fpjaq2rbapw" + "commit": "4a8646a30df99bbafc95d4f21a0b2bf0a6f6566f", + "sha256": "0y3wzvyaxn5zybjak77r1cngaqqm462s3d4f1cwmzvrnpv99f3r9" }, "stable": { "version": [ - 2, - 90, - 1 + 3, + 0, + 0 ], "deps": [ "dash", + "transient", "with-editor" ], - "commit": "791901b2f1d26fa0a383147fe77948a9abc753da", - "sha256": "1kw94sdczswsyzn1zlk5s5aplpdv4qd7qcqc5zfxsmsfwm3jacl4" + "commit": "c3bbc9b9425f3370690cabb11bd35b9040773fdc", + "sha256": "0dbp3gx43ipxv8zg9m0hfhksz85rnkikaq35rx705qqz6xq6xq9m" } }, { @@ -41528,8 +41800,8 @@ "f", "hydra" ], - "commit": "24360718c1666a246a39aadc8a251faa8578cc66", - "sha256": "129xv2ddgdkc9ipkxvwprkwp245x1zq2r75liv31x8x4g4i4305i" + "commit": "5b1191f79f1845d7144bd2a49ad25c49866456aa", + "sha256": "06ybkpaqicx3q5hdjz99v3isj1jhrpmg55wf054dzx6wpjy8na21" }, "stable": { "version": [ @@ -41704,14 +41976,14 @@ "repo": "pidu/git-timemachine", "unstable": { "version": [ - 20200603, - 701 + 20210528, + 908 ], "deps": [ "transient" ], - "commit": "8d675750e921a047707fcdc36d84f8439b19a907", - "sha256": "1ppids836gdk5j8cli8wkzkjb85f4s1s550v5xpxyyq75rj1bnsr" + "commit": "3381797bcbf906b18dff654a2361032d2d01b4a3", + "sha256": "05pyjhi26charkjy0mhvigd72rvb4s1s8imycfynf0fmjy7f7n7x" }, "stable": { "version": [ @@ -41794,20 +42066,20 @@ "repo": "magit/git-modes", "unstable": { "version": [ - 20210426, - 2132 + 20210528, + 1854 ], - "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1", - "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6" + "commit": "433e1c57a63c88855fc41a942e29d7bc8c9c16c7", + "sha256": "0br3nwr2mjywysqn83npf45qpqii3xqzdggg5fd47r9vqqj6mc55" }, "stable": { "version": [ 1, 3, - 0 + 1 ], - "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1", - "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6" + "commit": "433e1c57a63c88855fc41a942e29d7bc8c9c16c7", + "sha256": "0br3nwr2mjywysqn83npf45qpqii3xqzdggg5fd47r9vqqj6mc55" } }, { @@ -41842,20 +42114,20 @@ "repo": "magit/git-modes", "unstable": { "version": [ - 20210426, - 2132 + 20210528, + 1856 ], - "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1", - "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6" + "commit": "433e1c57a63c88855fc41a942e29d7bc8c9c16c7", + "sha256": "0br3nwr2mjywysqn83npf45qpqii3xqzdggg5fd47r9vqqj6mc55" }, "stable": { "version": [ 1, 3, - 0 + 1 ], - "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1", - "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6" + "commit": "433e1c57a63c88855fc41a942e29d7bc8c9c16c7", + "sha256": "0br3nwr2mjywysqn83npf45qpqii3xqzdggg5fd47r9vqqj6mc55" } }, { @@ -42130,20 +42402,20 @@ "repo": "magit/git-modes", "unstable": { "version": [ - 20210426, - 2132 + 20210528, + 1856 ], - "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1", - "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6" + "commit": "433e1c57a63c88855fc41a942e29d7bc8c9c16c7", + "sha256": "0br3nwr2mjywysqn83npf45qpqii3xqzdggg5fd47r9vqqj6mc55" }, "stable": { "version": [ 1, 3, - 0 + 1 ], - "commit": "7678ead3cdbb1692c9728b9730c016283ed97af1", - "sha256": "0m8qfjj5hzxwyyi34sbk11qz5fix6z80hiki0v0a838sq4f586b6" + "commit": "433e1c57a63c88855fc41a942e29d7bc8c9c16c7", + "sha256": "0br3nwr2mjywysqn83npf45qpqii3xqzdggg5fd47r9vqqj6mc55" } }, { @@ -42292,14 +42564,14 @@ "repo": "TxGVNN/gitlab-pipeline", "unstable": { "version": [ - 20210430, - 151 + 20210601, + 1339 ], "deps": [ "ghub" ], - "commit": "0a07b64e402fa1e25423f8f6ed38b35ff09159d9", - "sha256": "1611nday1mxkkjjwcz62bvl8863vlkl4bq4vf3wj6p237m4ai3ks" + "commit": "2404f9cf0a064aabea975adada250895c385e057", + "sha256": "00i6q4pggaq97xgvi2ifanh0lx8nq5gbi4r2gy596635x26a55zq" }, "stable": { "version": [ @@ -42732,11 +43004,11 @@ "repo": "emacsorphanage/gnuplot", "unstable": { "version": [ - 20210104, - 1052 + 20210526, + 1848 ], - "commit": "116cad8e09024223f97e81b0a4503cef20de9bf5", - "sha256": "09y177sq24gs7wwjihw59g0m4n1rv2ws9890ynxjxawv823r0fxm" + "commit": "07a80272b86c081b40602ec0b080571f3269749d", + "sha256": "1d50b5vwnzca16g7hs2i0357lx9x5rvivdb5hdi0ngf6sb8d1afk" }, "stable": { "version": [ @@ -42857,11 +43129,11 @@ "repo": "unhammer/gnus-recent", "unstable": { "version": [ - 20210115, - 1107 + 20210604, + 720 ], - "commit": "52f05e7431b5ce5487e8a990eb2ad01cade973bc", - "sha256": "178b8l2f5ykrq1yllg9rmn1vsyp3aqslrga1gxx1rc4grx22x31z" + "commit": "09b9e96f8e0ab006d9cfe8f5ab000ce7e50ef4de", + "sha256": "0qsnfiqcivy7czg2j7kdsifz7p5nid1zvw6zdnaihghzdxa1w1ia" }, "stable": { "version": [ @@ -43032,30 +43304,6 @@ } }, { - "ename": "go-capf", - "commit": "be3dc9ae83c9d11a4f04f79775b17c5a2b86e96d", - "sha256": "0k6s65bf8iwkpr93agw9hqaxfckqi43lanffdic6j4vjrk4inlwz", - "fetcher": "git", - "url": "https://git.sr.ht/~zge/go-capf", - "unstable": { - "version": [ - 20200814, - 1046 - ], - "commit": "acc353135f390245453f0d90f5846f67b0a84952", - "sha256": "1hb8glprzpm94bsyx2mnv9w6b825y451agpqh2ry8ngydbc1llhi" - }, - "stable": { - "version": [ - 1, - 1, - 0 - ], - "commit": "de3b668b83a73da5ce189c536a58aa1d4f5d492c", - "sha256": "1y1dscqyd2jx5irj5pcy7sspzzp0nsy2j4zaqhln2snffpqa3hmf" - } - }, - { "ename": "go-complete", "commit": "4df81abbf3b16f06fa327c1626bef1245ea77758", "sha256": "0dl0ibw145f84kd709r5i2kaw07z1sjzn3dmsiqn8dncspcf2vb4", @@ -43610,11 +43858,11 @@ "repo": "lorniu/go-translate", "unstable": { "version": [ - 20201203, - 203 + 20210527, + 1257 ], - "commit": "ea63d0ad9816aa1c478c66bd1ff9978e8330d3cb", - "sha256": "0v3w3ffls9h4vpalmkvswsrdcny3z1g7p9gdp75lw6pc9xkmkgnz" + "commit": "7a9b7978057bf747ed06fa6c9d2f30047714aa05", + "sha256": "1wydx9ak09dfmvqvvkdd5zdzablj8rhisk3im1f41a4hgiba80hr" }, "stable": { "version": [ @@ -43833,20 +44081,20 @@ "repo": "io12/good-scroll.el", "unstable": { "version": [ - 20210520, - 431 + 20210607, + 339 ], - "commit": "60fd0a7a5d663150728027bfc4e7adb33970d277", - "sha256": "19apz49ba2cmlf449yc55s3150nrqhv5lajmw1rx36w0vbjkbyyn" + "commit": "b4233500bbbdb64758283ba8a4b7cef5a85181a2", + "sha256": "05k03bycwpgs9wf9rh4rxfp38lhzr46c8zpvkd5qr6zwb1nnvr00" }, "stable": { "version": [ 1, - 0, + 1, 1 ], - "commit": "c72aa45b69025c2ee2c62eeccdaf15117cffe10d", - "sha256": "02lcw836dkj0dlv5g2pgx68i6a93lazsy7vln46dm5dckficr9bs" + "commit": "61aa3b57d572e6a46a1415b66dbc4b80c33bfb73", + "sha256": "0zprygv94rp1hdq7qxcmp3ns04j6l28y9w5hp087mhfbr1v5y54m" } }, { @@ -44235,13 +44483,13 @@ "magit-popup", "s" ], - "commit": "13851af3d26288ec5760970b5b3ae3fd298d014d", - "sha256": "1ngl263wx18x3gw92i1rjffl6siacrvwbznmgv3793na96cvzs0f" + "commit": "da0ae769e70e1af16865c3fadb25e9132d089dc6", + "sha256": "09kdlz6h31yasi1rv7759m40zb12vj6llv70pqh9swrpii2nmdzp" }, "stable": { "version": [ 0, - 25, + 26, 0 ], "deps": [ @@ -44250,8 +44498,8 @@ "magit-popup", "s" ], - "commit": "bb0307eb84ae981cfca7fc8d680821a2c2be3c6d", - "sha256": "0jwfk4kqz8jzxlhdihb0wvyiza1zfwcwr2p9frk0cw50p6fjqbs6" + "commit": "34586b6650fb19689755570628a558ca9ea7946a", + "sha256": "0a7bnw01j4fbhga5x00v5bbk38j2q7mg7ablz6kswlmarqwr4fm6" } }, { @@ -44610,6 +44858,38 @@ } }, { + "ename": "graphql-doc", + "commit": "54bd4ea32fb912c51735243fa8f609890516fad9", + "sha256": "1szibk2ragp0pbbzw6bw1jmbpdbc6llj4cmd20wz8lvjwp3p1qss", + "fetcher": "github", + "repo": "ifitzpatrick/graphql-doc.el", + "unstable": { + "version": [ + 20210530, + 221 + ], + "deps": [ + "promise", + "request" + ], + "commit": "a60a646413fce528ecf42be3ee111b3f92d9f95b", + "sha256": "168yqaygyvrw05kip10azdcjsczahrsflg43vl6ki7ii6x595b5s" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "promise", + "request" + ], + "commit": "1623cdd887846057200579cfddc0fa1815d1af9c", + "sha256": "0nqx88ng72vvz1vl7hj1m77ncf9i0d4l3n1bab0kp90fmrgxa69p" + } + }, + { "ename": "graphql-mode", "commit": "3850073e6706d4d8151bc6ab12963a19deae8be9", "sha256": "074dc8fgbrikb5inv837n9bpmz1ami7aaxsqcci1f94x3iw8i74i", @@ -45040,14 +45320,14 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20210105, - 1136 + 20210606, + 1419 ], "deps": [ "autothemer" ], - "commit": "0013c68458ae62fe1dc4bbbb23f6a54a9d41e398", - "sha256": "197r166c4pj0kc2v65rip93pcmmnm4li2jvagvajblang1svr2v0" + "commit": "c2ae5e3fff39f78f23109d90fdf36b3b189df511", + "sha256": "1vx3grgnnb5mamig3cd882pvcbqpni3kglrjawgdc96wwiv1krbg" }, "stable": { "version": [ @@ -46255,16 +46535,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210520, - 1523 + 20210607, + 1026 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "2b60812516a0560ba5b2501771b53273a56c6488", - "sha256": "0z3axb0ql8cgzgqa5wa90y35vdwmq8qxlpzv3sw9ypmcgl652fy6" + "commit": "a92156303021e0ec91a904e16a994d8e1ccd78f7", + "sha256": "1lxmp0a7wk7wqb6qcy1zn9sr47vakgxzn0j8yyvdv1vps4hz9wk0" }, "stable": { "version": [ @@ -47163,14 +47443,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210519, - 1827 + 20210606, + 1857 ], "deps": [ "async" ], - "commit": "2b60812516a0560ba5b2501771b53273a56c6488", - "sha256": "0z3axb0ql8cgzgqa5wa90y35vdwmq8qxlpzv3sw9ypmcgl652fy6" + "commit": "a92156303021e0ec91a904e16a994d8e1ccd78f7", + "sha256": "1lxmp0a7wk7wqb6qcy1zn9sr47vakgxzn0j8yyvdv1vps4hz9wk0" }, "stable": { "version": [ @@ -48248,14 +48528,14 @@ "url": "https://framagit.org/steckerhalter/helm-google.git", "unstable": { "version": [ - 20180606, - 520 + 20210527, + 900 ], "deps": [ "helm" ], - "commit": "48e91a73d5f48c39d7a219022a24440cff548e1a", - "sha256": "05xj6bkr330glh56n8c63297zqh1cmlhxlyxpr04srjraifyzba1" + "commit": "27834161391c350ef790062391cb7eab1d59fb62", + "sha256": "1rb1pmzr6szg8jjm43dndnk99v4i5zb1wp24rs9w8zmhygdn8jf4" } }, { @@ -50768,14 +51048,14 @@ "repo": "emacs-helm/helm-wikipedia", "unstable": { "version": [ - 20200630, - 504 + 20210525, + 717 ], "deps": [ "helm" ], - "commit": "a6c8b1d1ab5dc0a69cb44bb5f3eb6792ef091147", - "sha256": "1him1sqdl15qfjqrkgmnhligwqc6a9liiqndssa1law3bd36c2jb" + "commit": "c242c74efaeda2ffbafd281ee6bceae1a42507bb", + "sha256": "17210p61q6g1rx8a3gacbrv69c4n92h5ajh28yw5ya23c275dnkb" } }, { @@ -52739,11 +53019,11 @@ "repo": "humanoid-colors/emacs-humanoid-themes", "unstable": { "version": [ - 20210520, - 2212 + 20210525, + 2259 ], - "commit": "09ec7a3da848f24d232578fc7e4ac5ff4a7736c7", - "sha256": "0kbvb71y2780ghy8pc4i8s0rf8kd58xfngbsqpjhl4ard2qvh9sp" + "commit": "9b4587417f2583c503f84f3b1e994d7934e57bdd", + "sha256": "1dpanfa8qpy9l2i2pw5w95lqsw06944qbcz8c9fgpj2s3nchhkpi" } }, { @@ -52857,11 +53137,11 @@ "repo": "Riyyi/emacs-hybrid-reverse", "unstable": { "version": [ - 20210325, - 2311 + 20210527, + 2324 ], - "commit": "81e6651203ef666af4ddc63dc726cfb1443fe16b", - "sha256": "0m7k91kwhy8v602li3rfzmcb4qb443w2iv8qh38ncsl0l6bsc982" + "commit": "4cad8a17f6c9d98a628d78fe358d589b03172b57", + "sha256": "0xwl0fycygzwsrv4vrph6q6hy0550j3z1ir9ahfc7fjl091k192x" } }, { @@ -52996,14 +53276,14 @@ "repo": "ieure/hyperspace-el", "unstable": { "version": [ - 20190908, - 550 + 20210603, + 1825 ], "deps": [ "s" ], - "commit": "a7ea085baf4a51cac0513cb57216677722938781", - "sha256": "004bdas6339af8zzb2agc27vb86wwbxxinp1n4fhswnlb2llr18c" + "commit": "c4c363c140250ba6b775516082063878975a6154", + "sha256": "13nvp7hzynrddws3x7f7p4529arn3m7km7ma4226mc7mbpfbjgi1" }, "stable": { "version": [ @@ -53311,11 +53591,11 @@ "repo": "oantolin/icomplete-vertical", "unstable": { "version": [ - 20210520, - 2058 + 20210603, + 1343 ], - "commit": "99f7cf94f362d18b2f2716b431b9fcc64345c05b", - "sha256": "08ppnakyzxqx7cwr08rmgj2m5bh4w5ssqxxdz10gx8majgqrr6li" + "commit": "3bee30b374226deecde8a5cbbc6ca8471c303348", + "sha256": "1c7riqgm5fi13kb2k7qfykr0zsx3hkwyzgcxh4kqnd1y5w54pgs2" }, "stable": { "version": [ @@ -53334,27 +53614,27 @@ "repo": "plandes/icsql", "unstable": { "version": [ - 20210304, - 1843 + 20210605, + 1658 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "759a63d373681e09d71e0f5522d063a811d7127e", - "sha256": "191cwfjrcv2yvgh0f6n0f2s64w6r2v19vvc41x4g1x48szzrzbg2" + "commit": "bc7c5f27f9d804613759a1d1357166f9ccecbe0e", + "sha256": "1g3wy9jjlag4ma610kdqnb0f2sy1032m5q419ankh5fv0gfxlwbl" }, "stable": { "version": [ 0, - 6 + 7 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "bc600ecb6e6134e98dfb67f10301bde5a4e07adf", - "sha256": "0j27iiwgzysd9ymb4nc0m1300sqz0gqmri7ky9zfgv2g5gpjs4w0" + "commit": "bc7c5f27f9d804613759a1d1357166f9ccecbe0e", + "sha256": "1g3wy9jjlag4ma610kdqnb0f2sy1032m5q419ankh5fv0gfxlwbl" } }, { @@ -53544,29 +53824,27 @@ "repo": "DarwinAwardWinner/ido-completing-read-plus", "unstable": { "version": [ - 20210402, - 53 + 20210529, + 1318 ], "deps": [ - "cl-lib", "memoize", "seq" ], - "commit": "ba997f0cad2797453d0ecf1c754a45a53da140da", - "sha256": "01lrafc2gam4msgmwrwn375sfmwg7lj30hq2cjv0gsaxv669l0mk" + "commit": "49e7967ea8c0ab0a206b40d70fc19be115083fa1", + "sha256": "0amjz5l586w6qbhjr32gzcbg2d94k904h5is0030zgy2qswphnfn" }, "stable": { "version": [ 4, - 13 + 14 ], "deps": [ - "cl-lib", "memoize", - "s" + "seq" ], - "commit": "41b42779e22c064192b95e4de855ff7ebad45af6", - "sha256": "088b50iajgj602wsm1280gn5pqirycazndhs27r1li5d84fm1nvj" + "commit": "c97f0d0c314fe4b49a3c1e58144e97c72926172c", + "sha256": "05s2a7ncw53w6713cqsr6n20ax2g99h4hr1qsp400l05vzp1m531" } }, { @@ -53918,11 +54196,11 @@ "repo": "victorhge/iedit", "unstable": { "version": [ - 20210402, - 854 + 20210606, + 1026 ], - "commit": "ff68c2065316aa5fb72662428f8d5812ec8da83a", - "sha256": "1c5qxms26q2pd5g7p8zayqbbgypjix5ayk074kk07a4km4wx31h8" + "commit": "94650d77719a554cdcebfc6e26a731de87e14483", + "sha256": "029z9j3anb948mbmh6ai8asxgfim8193ymm41c7crqzga9p4ivc7" }, "stable": { "version": [ @@ -54838,11 +55116,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20210427, - 1755 + 20210607, + 2336 ], - "commit": "92d5d122fa172bc49b5ec9ee1891aa9c84805c92", - "sha256": "1dn8wml7jwf3dx2nbkjpf2v6k88apiin8wqmz4yix5d2k3x2qm46" + "commit": "03dd9c9d4e3f94f5519a786804d3ef9d3a09ef9f", + "sha256": "1xjaqh3m32lbc6avccv5clz1q2ra4pcl58wwlzkg0yhkxn7r750i" }, "stable": { "version": [ @@ -55116,11 +55394,11 @@ "repo": "zonuexe/init-open-recentf.el", "unstable": { "version": [ - 20200321, - 737 + 20210528, + 1902 ], - "commit": "369304d6adb6875948c4534419c4f303ac23c4f6", - "sha256": "1i41xcjj0kdhn7m29jb5gq2j2cyxn424y4lwx6s3fjj1ckx808ii" + "commit": "c019ea85a9c589815b0af60153858d09bcef130e", + "sha256": "12jwz0ssfxz1z55fb7v978xz8pwnclnqnzq5pqggzb06zkfxx7iv" }, "stable": { "version": [ @@ -55706,15 +55984,15 @@ "stable": { "version": [ 1, - 4, + 5, 0 ], "deps": [ "cl-lib", "json" ], - "commit": "e630c497f973fa4d1f0fd0e0fd87fb9d18666986", - "sha256": "0n2nfcq58md1p2xdhq1smh8v7lsyj0ci7ma5xyd6bkg5rvhsh10i" + "commit": "b9c64abf81e73860e39ecd82dfa00cca90b53d99", + "sha256": "1ilvfqn7hzrjjy2zrv08dbdnmgksdgsmrdcvx05s8704430ag0pb" } }, { @@ -56016,11 +56294,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210518, - 1815 + 20210602, + 1349 ], - "commit": "7c5d49f84f0919bbf00c53a9db48630adf8b2fbe", - "sha256": "1rji3p7a2f4ag4785h1k1f2ng9vi2lh8ifyh3m3j0yjihwq36m92" + "commit": "040d458bce4a88f37359192061bcea5ebe87007c", + "sha256": "0lgpawrsvihksm9cx462qa1hsmxhhv1qp0h1f9m4wn1jrcrq7r24" }, "stable": { "version": [ @@ -56047,8 +56325,8 @@ "avy", "ivy" ], - "commit": "7c5d49f84f0919bbf00c53a9db48630adf8b2fbe", - "sha256": "1rji3p7a2f4ag4785h1k1f2ng9vi2lh8ifyh3m3j0yjihwq36m92" + "commit": "040d458bce4a88f37359192061bcea5ebe87007c", + "sha256": "0lgpawrsvihksm9cx462qa1hsmxhhv1qp0h1f9m4wn1jrcrq7r24" }, "stable": { "version": [ @@ -56415,8 +56693,8 @@ "hydra", "ivy" ], - "commit": "7c5d49f84f0919bbf00c53a9db48630adf8b2fbe", - "sha256": "1rji3p7a2f4ag4785h1k1f2ng9vi2lh8ifyh3m3j0yjihwq36m92" + "commit": "040d458bce4a88f37359192061bcea5ebe87007c", + "sha256": "0lgpawrsvihksm9cx462qa1hsmxhhv1qp0h1f9m4wn1jrcrq7r24" }, "stable": { "version": [ @@ -56782,8 +57060,8 @@ "espotify", "ivy" ], - "commit": "22b81067ebcaef2cea633f967a4b55454af9326a", - "sha256": "0b93a8km80r1c3gbinnsigkkq8yc127jwrqj8s8z130b79ch91hn" + "commit": "3d62a3319ab03a810030058d3fb368b28dfd82d5", + "sha256": "0hj3nczmqmgiwsvh664rs34j63wl325x6nar21p1a84h5ximpkxq" } }, { @@ -57621,17 +57899,17 @@ }, { "ename": "jetbrains-darcula-theme", - "commit": "f4b9f64cae9ab15388352e0d93f34f7e73dbe201", - "sha256": "1d31aw9nmgj7m5hvj0qq290v1cfn12ljlvnc6f25g7003a68fv9z", + "commit": "e13051402c177efee0e9e3296f20beb1ec4a63fb", + "sha256": "0wfg2477mixndwhj9i1b6j9gl2avh9cyzapxdi0qpw862qk6g0fv", "fetcher": "github", - "repo": "ianpan870102/jetbrains-darcula-emacs-theme", + "repo": "ianyepan/jetbrains-darcula-emacs-theme", "unstable": { "version": [ - 20200927, - 1317 + 20210602, + 1430 ], - "commit": "b9b3c39743be5aeba17d4d8e5d379613451ddec6", - "sha256": "1j3dxj4cr26vir226zb84zn0jsjwnhz02xb60a69jv4k1wcl6bq9" + "commit": "f57c359044ff1fa90db62a60b6691ff8d65c82f3", + "sha256": "17wd6yzhjdw5j3bpn6bnga5nkwdnqgk8nprqiavsir4ghkzw2h46" }, "stable": { "version": [ @@ -58358,11 +58636,11 @@ "url": "https://gitea.petton.fr/nico/json-process-client.git", "unstable": { "version": [ - 20190827, - 1858 + 20210525, + 733 ], - "commit": "422606a7bf08d13646e3db4f6c2bddb69bd61dec", - "sha256": "16fyb0gwm4llwbmg12m4r9r8h540hcvhrsnlly6cry60h9p8dpc1" + "commit": "373b2cc7e3d26dc00594e0b2c1bb66815aad2826", + "sha256": "0f6vimdzg28j1jsr31ma0wf6y18jamv8znn4fwvf7pdd51hdn36x" }, "stable": { "version": [ @@ -58499,26 +58777,26 @@ "repo": "tminor/jsonnet-mode", "unstable": { "version": [ - 20210407, - 2013 + 20210527, + 1557 ], "deps": [ "dash" ], - "commit": "9bb6f86dfe6418ccccb929e8a03fb4bb24a9ac0e", - "sha256": "1rx7kr4pdhrmpcm5rm0h9kawk7czgdy1w5z3w4a2jw0v442bhx44" + "commit": "54a89b0aaba7a68782008c5e1ab00d5ec757316a", + "sha256": "14nxfa91yg2243v4d5kvynp2645x3811ispmhmpgil3x9qbl9jg9" }, "stable": { "version": [ 0, 1, - 2 + 3 ], "deps": [ "dash" ], - "commit": "e93a1f55e5f9bc2b34b025c6f7a60a6f159268d1", - "sha256": "0vi7415n90d1z2ww1hld0gdp6v7z4rd6f70h476dp2x4hydk293i" + "commit": "54a89b0aaba7a68782008c5e1ab00d5ec757316a", + "sha256": "14nxfa91yg2243v4d5kvynp2645x3811ispmhmpgil3x9qbl9jg9" } }, { @@ -59147,14 +59425,14 @@ "repo": "chenyanming/kana", "unstable": { "version": [ - 20201012, - 1415 + 20210531, + 1427 ], "deps": [ "dash" ], - "commit": "b93cdbf72a1c818d1a48530ef20c5dec64d7945e", - "sha256": "1ikpwghvqjf3bc60xmils2prx99lm1x326mw4gic8n7z9kasqizd" + "commit": "d3d550aad67ef8625b3860598bf3622f5b2a7d32", + "sha256": "0d5qnqhvnxw5009mq34jnnc19r01y4kz0ypnv1mby80g8jz2gl62" } }, { @@ -59229,15 +59507,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20210507, - 1241 + 20210605, + 1117 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "4e46cc6c843d95427139f824f448f779be80fbc7", - "sha256": "1q3wa0i8ng2b0gsmpi9cvdr1h0ffs1pys95pgnxnsdw2cvlh4v6m" + "commit": "7eb08e47bc5f227c72c318ff327c689ab54a7620", + "sha256": "181vnz6ancqhb13w9890pbplnw6lzbzcx3xkg4li9fk10lab72zk" }, "stable": { "version": [ @@ -59571,20 +59849,20 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20210123, - 1149 + 20210521, + 828 ], - "commit": "a3a0798349adf3e33277091fa8dee63173b68edf", - "sha256": "08n4lfd6zb0qwpaw48q7p1mi6rn5rzja02113fphz7ra2kapbpva" + "commit": "a12ef1fb480b56c34c92f48fc7f7aa8a1d7c4c4b", + "sha256": "0093v1c5nl2bh1lvccqq6fzpgjald3yypp87dsim982aywl2vlv1" }, "stable": { "version": [ 1, - 0, - 4 + 1, + 0 ], - "commit": "16d9961d15536054632be1eff75fd0fb1a4420f8", - "sha256": "1g9arjdhdpvsw47ny9gi5k758ya37yza4mr0rhbf02yvrqyfsrgr" + "commit": "a12ef1fb480b56c34c92f48fc7f7aa8a1d7c4c4b", + "sha256": "0093v1c5nl2bh1lvccqq6fzpgjald3yypp87dsim982aywl2vlv1" } }, { @@ -59796,6 +60074,30 @@ } }, { + "ename": "keytar", + "commit": "4ba6f96ca2e20dcd75cf239370243bd8e484f851", + "sha256": "1bm0kxrbkkk3c4zljf9azfm22msknkvrcns1j1r2hczjqdviay28", + "fetcher": "github", + "repo": "emacs-grammarly/keytar", + "unstable": { + "version": [ + 20210523, + 403 + ], + "commit": "8d2a5ec4a7fe766a62037b05f26a8f36fff45c06", + "sha256": "1rszkzpr22dy9yr54k2pz6p2j6lbgvy189f6ki8gmlsqzdyxmssk" + }, + "stable": { + "version": [ + 0, + 1, + 2 + ], + "commit": "17972320ef140bd56e551842d89f5d8c2d979f83", + "sha256": "06r84kcg7ig1xky01sa3kyw4iam5wzag4qpp2rm3q9rad246pjr0" + } + }, + { "ename": "keyword-search", "commit": "8ecdc51938f2300bf005e2d1b1819e0fa59e0bd7", "sha256": "0wvci1v8pblfbdslfzpi46c149y8pi49kza9jf33jzhj357lp5qa", @@ -60014,8 +60316,8 @@ 20210318, 2106 ], - "commit": "28bfe768d8066b9b42d5e9081ba7318ae7ca5fbe", - "sha256": "13lsva3lk9wrwp03flvgh9fcazw99var1b25v1gv75yfhj0m9hyy" + "commit": "3894a454ee03ede25e920759e6ac2df040ff3431", + "sha256": "1crqrmzxhm21psv5mkbzn3h2syrgszx50i4kd4n92f56dq7s8i4b" }, "stable": { "version": [ @@ -60365,16 +60667,16 @@ "repo": "chrisbarrett/kubernetes-el", "unstable": { "version": [ - 20210519, - 642 + 20210604, + 909 ], "deps": [ "dash", "magit", "magit-popup" ], - "commit": "d95e52547952743ebee1394223d2b202291deec0", - "sha256": "1c0lwdi1yin40q71vlfgf3iw0r1777whzlx79x9hnbgqavkq3xyw" + "commit": "93d7b4d1b079b3cf1fbe3949154b6a1bc06904ef", + "sha256": "0xz35j38ph1l870zrdd0r2xycxq65pbq1a1hi270q4mikpai85gb" }, "stable": { "version": [ @@ -60406,8 +60708,8 @@ "evil", "kubernetes" ], - "commit": "d95e52547952743ebee1394223d2b202291deec0", - "sha256": "1c0lwdi1yin40q71vlfgf3iw0r1777whzlx79x9hnbgqavkq3xyw" + "commit": "93d7b4d1b079b3cf1fbe3949154b6a1bc06904ef", + "sha256": "0xz35j38ph1l870zrdd0r2xycxq65pbq1a1hi270q4mikpai85gb" }, "stable": { "version": [ @@ -60557,16 +60859,16 @@ "repo": "tecosaur/LaTeX-auto-activating-snippets", "unstable": { "version": [ - 20210508, - 1224 + 20210607, + 1851 ], "deps": [ "aas", "auctex", "yasnippet" ], - "commit": "635e974cb692973856a4d26093876f5ad2285d3a", - "sha256": "0c3fz2v3zyq6s1gzz2013yafdhg46lffr4w8hwhxmgpsci6vf3hd" + "commit": "9d6f4448347fcf48d0fed51eba16423c9254c212", + "sha256": "0kfivjdjhlrbrn1z6i51y36s6f4qj386iy1jpcbvv33xa0lh5ksi" }, "stable": { "version": [ @@ -60667,8 +60969,8 @@ "highlight", "math-symbol-lists" ], - "commit": "4d12e7dd4c26bc5dd7594fc519bdbcf36b02e2ed", - "sha256": "18my5kh5wga049ygdg4ri8qh5lvf1c6v174fy3h3z972w4apk21n" + "commit": "63796ccadcc9147c5badd9a87f626611f63e3c4c", + "sha256": "1iwgi7jm20qwxlfa7klkz5zmdfxa14psly6xsl29i37j9p6146sb" } }, { @@ -60750,6 +61052,24 @@ } }, { + "ename": "langtool-ignore-fonts", + "commit": "9792610d9325ce5f0cc7d07a621755d8fadd90c3", + "sha256": "1vivb57kyd3gnigf8j1xhnpn3d6jxcs5rb3699qyc18w1zk4y154", + "fetcher": "github", + "repo": "cjl8zf/langtool-ignore-fonts", + "unstable": { + "version": [ + 20210526, + 2340 + ], + "deps": [ + "langtool" + ], + "commit": "c3291c85b733b9047653cbb1f525655394610bdb", + "sha256": "1pmpnpbl1xanprmikawcy9v4441q3381mmyp1v0mgf0dyzg871m6" + } + }, + { "ename": "language-detection", "commit": "ed2b68d0a11e5db0e7f2f5cbb2eb93c298bcb765", "sha256": "1c613dj6j05idqyjd6ix7llw04d0327aicac04cicrb006km3r51", @@ -61156,11 +61476,11 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20210316, - 1822 + 20210603, + 1518 ], - "commit": "ab5cc26b56a6a53a3338ebfde17b746522c2c14c", - "sha256": "1ds545sh8hg2vg5l7fm4v6z31lzax14ivdni3a37278jfx82xxrx" + "commit": "af0d4d8daaa323c34502d3cbea85ec8f70b06c00", + "sha256": "0p4smpfld1ky07cy5qn8kqpbqw5ymrn8valkpx4c519lj6pb9rn6" }, "stable": { "version": [ @@ -61371,11 +61691,11 @@ "repo": "pfitaxel/learn-ocaml.el", "unstable": { "version": [ - 20210209, - 4 + 20210527, + 1449 ], - "commit": "ac7e2887baebedd51afbadc9e4c6f7b59351b0bb", - "sha256": "0v6nw2yqy8lhwssq2myx91jjlsg8d97f60yhrpjk3qc62037q60b" + "commit": "b8ba2a0bf56b751f077f13137a1904d66061a4d0", + "sha256": "0cc9s00flbih3kkbkan7xfqlv5qq9j4cz52ljj4xyxbf51r2lh0z" } }, { @@ -61653,11 +61973,11 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20210507, - 1556 + 20210602, + 709 ], - "commit": "7a2a8c49fd17c43c276dbe0aa941fd676a54a5cf", - "sha256": "02i7d8lzalwv6xaja82gn48qkf9ks0xvnaqzl9qwxiw980545z0y" + "commit": "b8b5076d643046008ea1496559acdd4ddfdb649a", + "sha256": "16rfyjk0cp487ra6v5c1cmf106ixipr9b71zfp0bwm35wa2mvdic" }, "stable": { "version": [ @@ -61726,19 +62046,19 @@ "repo": "rvirding/lfe", "unstable": { "version": [ - 20201007, - 2214 + 20210603, + 1241 ], - "commit": "f762e9310390edb7a5a49d8d9dc22693fbcde973", - "sha256": "022bnn3ksaaihi3cnc7ib15ry2kydp4rjh1v25vym7vmfxlw9akz" + "commit": "1feb8af64c977946b6184b7d63b436c49dbeb52d", + "sha256": "0vxpkvp8fsi52zb2sqqd9xfdndyxb59hqg8qkpdfsdwszxngfij5" }, "stable": { "version": [ - 1, - 3 + 2, + 0 ], - "commit": "d8337516ab09edd4b281a27ac85684b81cdeb8bd", - "sha256": "0pgwi0h0d34353m39jin8dxw4yykgfcg90k6pc4qkjyrg40hh4l6" + "commit": "76eaf432f768b45393e404c1bd1861a08c19de3b", + "sha256": "0vxpkvp8fsi52zb2sqqd9xfdndyxb59hqg8qkpdfsdwszxngfij5" } }, { @@ -61809,11 +62129,11 @@ "repo": "merrickluo/liberime", "unstable": { "version": [ - 20201106, - 858 + 20210526, + 623 ], - "commit": "8d4d1d4f2924dc560bce1d79680df36dcc086d49", - "sha256": "0gk2y14lsfc9nw31xhrxqvlf834l8kyjnsqi7rhfk2sl6j1p669v" + "commit": "4a6da0f6ab9b43651f3fcc73412e3480b9403caa", + "sha256": "04ag7icqqdhz40fi91fx4bxx8j6vw2774gw1fbppbks3sasimyy0" }, "stable": { "version": [ @@ -61976,17 +62296,17 @@ 20210303, 1751 ], - "commit": "868a001dc06cd75342b30da53936ab2ed286872e", - "sha256": "0z2415smaclx4rip10hm8jmn7byswl4y41iijbl1ga78mhvd227l" + "commit": "be7ff92e4dfb06ed51baaa10157d9a1ee1cd666a", + "sha256": "067i605hk3qy01106l90bbl91ivr3zqv2yqr41jf5pfysafykx4x" }, "stable": { "version": [ 0, - 16, - 1 + 17, + 0 ], - "commit": "79105db651ff2f920193e2a715caf2c40b2379ca", - "sha256": "0z2415smaclx4rip10hm8jmn7byswl4y41iijbl1ga78mhvd227l" + "commit": "ec97fdf14ce7a65398ecc2755654db46a3ef3b14", + "sha256": "067i605hk3qy01106l90bbl91ivr3zqv2yqr41jf5pfysafykx4x" } }, { @@ -61997,27 +62317,28 @@ "repo": "jcs-elpa/line-reminder", "unstable": { "version": [ - 20210426, - 1859 + 20210531, + 743 ], "deps": [ "fringe-helper", "indicators" ], - "commit": "8c9f824b1dc67c8489afef05b06d9525b29dab00", - "sha256": "0qr7qvcl6rlsagim3y71im24z85l3f7cvj39r0g77mnhm733z9m3" + "commit": "1856034d0ed8ce41a29a1ea051184ee7c2f3e276", + "sha256": "0ni73ybrg21l63hs51pixkxf77bl288hzji03bm8v1hzsm72vxxs" }, "stable": { "version": [ 0, - 4, - 5 + 5, + 0 ], "deps": [ + "fringe-helper", "indicators" ], - "commit": "bc488bbdba2172629183891758cfa9466a64182f", - "sha256": "1993rwd9bgr1lqxgxzwp6h2r57ljsbjh5r08f57jaalanjp4iq55" + "commit": "4d73b84a84227b01b7fbc6f717f6c380682cde2f", + "sha256": "0qkgmg60jfcwfsc693x9c066vgbclgqwzkqbmjrc32kcs57zhvni" } }, { @@ -62031,8 +62352,8 @@ 20180219, 1024 ], - "commit": "a49afb9c168eaf8aaaf94f0c631b7b74db9a1d82", - "sha256": "0213ppx15rdb5cxg7w8978880fzv3dh2m9p6idkmlfj7bndfd411" + "commit": "68e59d0fff1eb76c7b1a72c438f344c251115e81", + "sha256": "1ipqf3qfgzcrrp6xwgxb6wkk8a6ii5jx5im5gfhghdhy45z2m3ii" }, "stable": { "version": [ @@ -62299,11 +62620,11 @@ "repo": "lispunion/emacs-lisp-local", "unstable": { "version": [ - 20210307, - 1545 + 20210605, + 1347 ], - "commit": "3a3237a5c25db9526dfbe1b3ac1e7125f8f459b0", - "sha256": "1nm2kmilhk2hm9nfd1f6drhlpwkpk31s1072y8im16ci7i13lig4" + "commit": "22e221c9330d2b5dc07e8b2caa34c83ac7c20b0d", + "sha256": "10dflrabhn974k9lr4jvib5vs7v45hj9skryc4wjc09wzz5qphpk" }, "stable": { "version": [ @@ -62334,8 +62655,8 @@ }, { "ename": "lispy", - "commit": "29a704fede83b02e19c2ad213485f0f651931753", - "sha256": "1c8gz46ab5f07dljv2chr0i5lini81wl3zx4zw8xjysb4a5dp05v", + "commit": "45a02d8edf65ccf5929b8508294588507adaaf83", + "sha256": "0s0rjfy344pyxnbgmkbil38vy32iwkw3n50j30pl3ivnqm1wa3rz", "fetcher": "github", "repo": "abo-abo/lispy", "unstable": { @@ -62617,14 +62938,14 @@ "repo": "sulami/literate-calc-mode.el", "unstable": { "version": [ - 20210324, - 1547 + 20210528, + 815 ], "deps": [ "s" ], - "commit": "211eec1e8b03503a53fa3eb4528375f36972f759", - "sha256": "1kawczbjdvjzyz3fflp1ij0vi9qcrl0yhrv7knx9j1zh187jp7z7" + "commit": "29bb40a7150b6cfe1a96948ae1f36e9c107eb759", + "sha256": "1dznafcfwmd52jakkzzk3dhji55aal7hsfkglr3051fz8pkz7xfx" } }, { @@ -62664,11 +62985,11 @@ "repo": "jingtaozf/literate-elisp", "unstable": { "version": [ - 20210424, - 918 + 20210605, + 1238 ], - "commit": "3e00b497711ac78f0ac26669e35f375451f6711a", - "sha256": "0gpg60xr86qx2ib5q9ig5pi9lmhk5vjsb7fh5g6kifvsch31cry3" + "commit": "41f0946037b50323901ce708c1af82e59a334433", + "sha256": "1hjb1f835xq5jgq4s0dpr85vs5cap001lxv9n02l198gb2qppq6k" }, "stable": { "version": [ @@ -62764,8 +63085,8 @@ 20210413, 205 ], - "commit": "a37f6b2394dcc2a848a055399dd45b052c9b707d", - "sha256": "0sbwva6asklx78wn1xcmxpr1758zwxncsl2gqn5x8f480bbafjbh" + "commit": "c191b149f93ed473f3900e506cfc762d53145237", + "sha256": "0likjz2q0pbs3cbqczdfhh6k0c1j8y6j32cxkcpjm9wakp1vzxq2" }, "stable": { "version": [ @@ -62875,26 +63196,26 @@ "url": "https://git.sr.ht/~tarsius/llama", "unstable": { "version": [ - 20210201, - 837 + 20210525, + 2005 ], "deps": [ "seq" ], - "commit": "f2f1476e88153b167bf4ce755f7455fcb3f98458", - "sha256": "0qnzbamf763h8fwjsn7i47a1amb8nixl25zw58jh4hhl470czi2f" + "commit": "2694b2aeb1c87bb2ad8b0f611ca438c30f5eaeae", + "sha256": "1xihy4xnvxvwwzy50z7msm9fkplsyy2kvi6zzlpgs8bad6aamg5f" }, "stable": { "version": [ 0, 1, - 0 + 1 ], "deps": [ "seq" ], - "commit": "2027ce79165bf40314ad838c282920c53b5d7eae", - "sha256": "1jnll9xaxfwwvs0xjpdz8y6xlrsckm3a8ri5ml8k3fp81yby9as5" + "commit": "2694b2aeb1c87bb2ad8b0f611ca438c30f5eaeae", + "sha256": "1xihy4xnvxvwwzy50z7msm9fkplsyy2kvi6zzlpgs8bad6aamg5f" } }, { @@ -63330,6 +63651,40 @@ } }, { + "ename": "loopy", + "commit": "7f4e68f6feb5d0082580cc28f6184a6091e7c117", + "sha256": "1w4416vjbbba80bhcalpvr9ram1ijk3y9687525p3wicrfylx9s3", + "fetcher": "github", + "repo": "okamsn/loopy", + "unstable": { + "version": [ + 20210601, + 133 + ], + "commit": "50494b545b9a909fc6570216230beda1ebeedf36", + "sha256": "0wag0hhpak0i1k2bmzz896jkpadrmacj1m0bbb3y7rrl9sw1dcqg" + } + }, + { + "ename": "loopy-dash", + "commit": "7f4e68f6feb5d0082580cc28f6184a6091e7c117", + "sha256": "0hk4c415wp4dqx1xjs246p8hqn15iamj8xiig2cla1f24zd7kd28", + "fetcher": "github", + "repo": "okamsn/loopy", + "unstable": { + "version": [ + 20210601, + 129 + ], + "deps": [ + "dash", + "loopy" + ], + "commit": "50494b545b9a909fc6570216230beda1ebeedf36", + "sha256": "0wag0hhpak0i1k2bmzz896jkpadrmacj1m0bbb3y7rrl9sw1dcqg" + } + }, + { "ename": "lorem-ipsum", "commit": "0c09f9b82430992d119d9148314c758f067832cd", "sha256": "0p62yifbrknjn8z0613wy2aaknj44liyrgbknhpa0qn0d4fcrp4h", @@ -63393,8 +63748,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20210506, - 34 + 20210601, + 420 ], "deps": [ "dap-mode", @@ -63405,14 +63760,14 @@ "lsp-treemacs", "pkg-info" ], - "commit": "96949d1c1cb5c63eb17ebbd43a125abead79149f", - "sha256": "0yqfb57pa2ks4y3v07asy2x7rvzlfcn7aj45x77dcqcssipnddps" + "commit": "7ef909a1c9e0e1c924b43637899e0d53b0d1b00f", + "sha256": "1vsfs0jpk7fdfb3zmpxs3f7fy0s7d9b8jha5p7y6g0afhxz4iqn1" }, "stable": { "version": [ 1, 18, - 3 + 5 ], "deps": [ "dap-mode", @@ -63423,8 +63778,8 @@ "lsp-treemacs", "pkg-info" ], - "commit": "96949d1c1cb5c63eb17ebbd43a125abead79149f", - "sha256": "0yqfb57pa2ks4y3v07asy2x7rvzlfcn7aj45x77dcqcssipnddps" + "commit": "90a06dfc23750c3861628256a4af4e3b00b2e23d", + "sha256": "1cabxsz7gbjywhsqjqp32vdgycg2mq21mdxvwbfcs6k0cf319dwh" } }, { @@ -63435,15 +63790,15 @@ "repo": "emacs-lsp/lsp-docker", "unstable": { "version": [ - 20210404, - 1717 + 20210529, + 621 ], "deps": [ "dash", "lsp-mode" ], - "commit": "1909466ee7f7f4aeef624acd10c710afe685ef8a", - "sha256": "0y5w97c37wj67mvwk23l4rq3i80fw82r758dsma6ly32h5xlsq8b" + "commit": "fa304ea402ac492e97bee14496a41afa8508cc5e", + "sha256": "0y0z4ind08jj93qsxgvi5zqa5f8lnamg8fv2dvkgipx1qvq25r4c" } }, { @@ -63486,8 +63841,8 @@ "repo": "emacs-grammarly/lsp-grammarly", "unstable": { "version": [ - 20210418, - 1806 + 20210523, + 403 ], "deps": [ "grammarly", @@ -63496,8 +63851,8 @@ "request", "s" ], - "commit": "aff219380a7d192a37c8c25823b6bfc816bae825", - "sha256": "0ghqmay00r7lfmqx57r5kkldkgr4r20fb5xqh3i440wjdw8m3i3p" + "commit": "f34f0d50a91a82ab9c49e2cf5ddcb42a98cc2ede", + "sha256": "1hqilkbxa63gkl6sc8km6j0m4lxindf184c1zl91h4sfh4kg67zb" }, "stable": { "version": [ @@ -63657,14 +64012,14 @@ "repo": "fredcamps/lsp-jedi", "unstable": { "version": [ - 20210419, - 2007 + 20210602, + 1925 ], "deps": [ "lsp-mode" ], - "commit": "a6a6dcfbab69caee0b88dbe4244772e0bea5531a", - "sha256": "0l2dawi7avzb9i1wfff4kdfbz9s7vp4443y7x3va0jrsn3v33485" + "commit": "ab265f7fb26f4fa0385158a9f9d3649b606d2e23", + "sha256": "013vmhcxz7648jxxhk69rr0v5br2839517l72fwzk770l02mc6si" }, "stable": { "version": [ @@ -63687,28 +64042,28 @@ "repo": "non-Jedi/lsp-julia", "unstable": { "version": [ - 20210329, - 1551 + 20210530, + 2152 ], "deps": [ "julia-mode", "lsp-mode" ], - "commit": "81f7de5b9fe8e8e0e1e3a3ccc677f052edad140d", - "sha256": "1hwkx5ssix2si7jpsbfcg1i65v3z265l39158qjm31cxf8pk52dw" + "commit": "d4a7a27d6ac7c6831b4f493dd89f82fa0c75bdf5", + "sha256": "1rkf2ibjilf023fv68ql4bray8bdnl2biq5zmn1qk5pdp988iq4j" }, "stable": { "version": [ 0, - 4, + 5, 0 ], "deps": [ "julia-mode", "lsp-mode" ], - "commit": "81f7de5b9fe8e8e0e1e3a3ccc677f052edad140d", - "sha256": "1hwkx5ssix2si7jpsbfcg1i65v3z265l39158qjm31cxf8pk52dw" + "commit": "d4a7a27d6ac7c6831b4f493dd89f82fa0c75bdf5", + "sha256": "1rkf2ibjilf023fv68ql4bray8bdnl2biq5zmn1qk5pdp988iq4j" } }, { @@ -63719,26 +64074,56 @@ "repo": "ROCKTAKEY/lsp-latex", "unstable": { "version": [ - 20210110, - 1914 + 20210607, + 1206 ], "deps": [ "lsp-mode" ], - "commit": "5fc536f24dc659f998bc673129d9e7c4b20d297c", - "sha256": "1k34zpg6f3i1pb68zh6fc7azd4hmbclnjpad1893q2zhqwxqdwz8" + "commit": "a5de6b7166935af4a1e05d254fc1a44600518066", + "sha256": "0i5mbz7mwnax7jwv9c1bkwp5jwqrvwvh51fgwkmnz0kpjxhzfpsm" }, "stable": { "version": [ + 2, + 0, + 0 + ], + "deps": [ + "lsp-mode" + ], + "commit": "1c60c2d331baf778bd8a3ac9d5688516398ae323", + "sha256": "1nm03yn02ja867d9ba3n980v86kcd5varzng1lhzv7fr7akv5j13" + } + }, + { + "ename": "lsp-ltex", + "commit": "47faf55fd4876b28258173b7012eb413ab69a1be", + "sha256": "063yy68sy05gzcfp5bsk0mjh7g9x76r1c0qx0i8zw3r2a50g6llq", + "fetcher": "github", + "repo": "emacs-languagetool/lsp-ltex", + "unstable": { + "version": [ + 20210405, + 1702 + ], + "deps": [ + "lsp-mode" + ], + "commit": "0fd8baec7e5f92d74b8b80d02c926d32332d86bd", + "sha256": "04jx5bknns1fyany1x8wzs6yx9qxzwrwj8m1iardxy8la3jp6ncd" + }, + "stable": { + "version": [ + 0, 1, - 3, 0 ], "deps": [ "lsp-mode" ], - "commit": "969846d5d0c9a9d1fc8deae30a0f664607f06e72", - "sha256": "1dz9yib9g7a5b1yipxjc6mqq9ffkpkm2icpj6xzanfdnc1ymj7c9" + "commit": "5546970c7949d498947e4b6a281707feb2aee928", + "sha256": "0s7v43jmpbjjxvfp9s51kc5d9mk3kf5mwvc4iwbvrzpi0ar4vfdy" } }, { @@ -63749,8 +64134,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20210426, - 739 + 20210529, + 752 ], "deps": [ "dap-mode", @@ -63762,8 +64147,8 @@ "scala-mode", "treemacs" ], - "commit": "5aea52dfe08b8f5936ea3982be6c25339f652eba", - "sha256": "0ca5xq1l3lscx36pcdnpy2axgyikjrl18naqr140kr1y500sy37s" + "commit": "4c11fe47ef3c71a2fc7cd67a055ea0bc5883a0c6", + "sha256": "16laslmvsamvcn58gsi6hfs53p12q0nz7zx993ipa2xhy6n04hcg" }, "stable": { "version": [ @@ -63793,8 +64178,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20210520, - 1557 + 20210605, + 1854 ], "deps": [ "dash", @@ -63804,8 +64189,8 @@ "markdown-mode", "spinner" ], - "commit": "98284ed3ee58277b956579586b1ab3d4e2ff581d", - "sha256": "0841f90fzazdzs17b1v8dal3cz0w3a77hi8dbszsl96fgyy1gz0a" + "commit": "7b75d6bf01bed9ccb108cf1406d0e2af29d7e39b", + "sha256": "1lbb3bpizibpnw77bgdf8j2303gwh2133n8s518frmz6gcb7kz8s" }, "stable": { "version": [ @@ -63961,8 +64346,8 @@ "ht", "lsp-mode" ], - "commit": "e986eeb15d1b3bf0f8c59be71684eac0d3894de5", - "sha256": "05y3rhhcm7i230if0n17yqdn0jz4mz3g98h5wgg6s3bdn3kjlckn" + "commit": "71a79760938d2132923fbff58dc25301892b1654", + "sha256": "0si9qca8lml2hd8zj420dmks4cwzfidq14h3xfczhvrshhsc0mny" } }, { @@ -63979,8 +64364,8 @@ "deps": [ "lsp-mode" ], - "commit": "5856c08d6393c10951f39b993a8d7bf2d506b44f", - "sha256": "0m55i7w1am55c7p35il3i06d4za8z5qamfwb8nki5zhiacw26bkw" + "commit": "4eb78c43046fceb53a66ccd24c85601bdb87ed17", + "sha256": "10d949gb3v7flnkb5khk11dcmfnlr4h02yfj8g3b0ihr1zr7c958" }, "stable": { "version": [ @@ -64062,8 +64447,8 @@ "deps": [ "lsp-mode" ], - "commit": "aafa9878a3df2f08e5a9c846d91fd53350ce3c99", - "sha256": "1la4mfaykd6vi7d0nw45a2ia8zwr8xflqhc4a9rmdl8biyrp47kj" + "commit": "ae4aa8705cc3a27ed86f1e7ee04d5c8f0522d8c0", + "sha256": "0q3dji9qy0aj7ai43xjcpb4hy6kvscrpr8r5cb9137g34zc0pd9x" } }, { @@ -64074,14 +64459,14 @@ "repo": "merrickluo/lsp-tailwindcss", "unstable": { "version": [ - 20210508, - 454 + 20210605, + 315 ], "deps": [ "lsp-mode" ], - "commit": "7156fcd0d8beea0536c2830399631cd189ee4038", - "sha256": "0lvsdnn48z379cj553vwng6hsp9mnmy03qgxbnnamw5d0lkvfp9i" + "commit": "77ebadcb7decd953c069b421a7ab18188295e4b6", + "sha256": "0s34djc945zbzykazrd7k8gizbfws3xp8rjdbnplg4996k1c71n1" } }, { @@ -64102,8 +64487,8 @@ "lsp-mode", "treemacs" ], - "commit": "b07868740d6f7d364e496048cee00bce10a6ab33", - "sha256": "1g8qkk6g67myz8rjvwa7iysrj0xpf0kcwrcdvf4dkc3rgh3kzm2v" + "commit": "f360d54fa68a00baec228d9582bc67c1a327d757", + "sha256": "0wbni6njz98c23pns4wxg4mq26zrvpyxh0qcz0a4l46zdn1962vm" }, "stable": { "version": [ @@ -64130,16 +64515,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20210520, - 1518 + 20210604, + 1158 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "bd94da9348d9b4e814fdb55dae061826f48ffde9", - "sha256": "0y97i8yyvkyf7alfs27jkij6kjg9l47spxkdzm11abkb14z5gpr5" + "commit": "c4ffa7abf6706d591300c608c51d2b72178848ad", + "sha256": "1qr7is4k5w6dcfkcvg7crna6r26lqmb02v08i3yggq09qd01c08g" }, "stable": { "version": [ @@ -64237,6 +64622,21 @@ } }, { + "ename": "lux-mode", + "commit": "ca88d6e55ea272698f26e6d8ff66a3e57b7689ee", + "sha256": "0n0964gr5cac6k0zwfi9slyh2gsccmp7kipvjarvsj5nhx8khxb2", + "fetcher": "github", + "repo": "hawk/lux", + "unstable": { + "version": [ + 20210607, + 1130 + ], + "commit": "b5391e8dc088d95d8f131f49982d5c7cbaa23677", + "sha256": "08bfjg51ydznfk8w7hwznzyybl42mqa5l0pvb4xapqcq2na3d3yf" + } + }, + { "ename": "lv", "commit": "5114349617617673d5055fe28cb8f8c86cf41f83", "sha256": "1lkm40rwpj9hmckng9bz5g4jbx9g9i3wlqgl6rq0m6i14syr69v4", @@ -64596,40 +64996,40 @@ }, { "ename": "magit", - "commit": "15a5916ec8e9062e41b1dd7d4f5535a86c2170a3", - "sha256": "1bcv0yv5l51j3xyli9rq3zqjkf0b9w7yd0kykfmy1dp1hx39qf8r", + "commit": "4158066a2c75cf0bff128bd2dc1073472c32b1f4", + "sha256": "1hrh90qd47s6q6grr6rp2y7kfqq8bzhdfpyq2saihrric91s1rqz", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20210519, - 2015 + 20210531, + 1524 ], "deps": [ "dash", "git-commit", + "magit-section", "transient", "with-editor" ], - "commit": "9d76233597aaad1c9ab188bde83c3b66d9bd3d0a", - "sha256": "1kmnvrgy71bk6z47w90vrmfl37j7q069vcdx9dcs4fpjaq2rbapw" + "commit": "4a8646a30df99bbafc95d4f21a0b2bf0a6f6566f", + "sha256": "0y3wzvyaxn5zybjak77r1cngaqqm462s3d4f1cwmzvrnpv99f3r9" }, "stable": { "version": [ - 2, - 90, - 1 + 3, + 0, + 0 ], "deps": [ - "async", "dash", - "ghub", "git-commit", - "magit-popup", + "magit-section", + "transient", "with-editor" ], - "commit": "791901b2f1d26fa0a383147fe77948a9abc753da", - "sha256": "1kw94sdczswsyzn1zlk5s5aplpdv4qd7qcqc5zfxsmsfwm3jacl4" + "commit": "c3bbc9b9425f3370690cabb11bd35b9040773fdc", + "sha256": "0dbp3gx43ipxv8zg9m0hfhksz85rnkikaq35rx705qqz6xq6xq9m" } }, { @@ -64640,28 +65040,28 @@ "repo": "magit/magit-annex", "unstable": { "version": [ - 20210512, - 405 + 20210525, + 2331 ], "deps": [ "cl-lib", "magit" ], - "commit": "d48fc38da0ed8c79a02591c5393aaef55498a988", - "sha256": "0qsnrwji66b0bwrgp1kj3b2mqq5vwphcs95mzk2y7xr75fwnvcbw" + "commit": "17e5e60b59eac3cf5938c1b22c29458c0d694b0a", + "sha256": "0ak4chfn95p2vj3y0wiyimj609a4jfzrfpsc1kn0is1jv3dlkl6c" }, "stable": { "version": [ 1, - 7, - 1 + 8, + 0 ], "deps": [ "cl-lib", "magit" ], - "commit": "21cb2927d672cc6bf631d8373a361b1766ccf004", - "sha256": "07r0d2i1hws63wfv1jys63r3lmrl4ywwi76gi7srwhzhqdr1af0n" + "commit": "17e5e60b59eac3cf5938c1b22c29458c0d694b0a", + "sha256": "0ak4chfn95p2vj3y0wiyimj609a4jfzrfpsc1kn0is1jv3dlkl6c" } }, { @@ -64890,26 +65290,26 @@ "repo": "magit/magit-imerge", "unstable": { "version": [ - 20210512, - 408 + 20210525, + 2326 ], "deps": [ "magit" ], - "commit": "04633693d1e902d54d19d404e96201637714361d", - "sha256": "1knm30fzh7lri89gl8scimb5gf3rzbnr7x033zzn12v9w8i3dchy" + "commit": "cf3b4646aa0205e8d7f47e45165fe6403d6440f5", + "sha256": "1j96vg9kc03vxxq4r5a7v4di88pvbb5i01n8js06lgs9qzl097k7" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "magit" ], - "commit": "5b45efa65317886640c339d1c71d2b9e00e98b77", - "sha256": "02597aq00fq7b9284kq7s55ddrjb6xhh1l280gq3czi75658d3db" + "commit": "cf3b4646aa0205e8d7f47e45165fe6403d6440f5", + "sha256": "1j96vg9kc03vxxq4r5a7v4di88pvbb5i01n8js06lgs9qzl097k7" } }, { @@ -64952,15 +65352,28 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210124, - 1829 + 20210525, + 814 ], "deps": [ "libgit", "magit" ], - "commit": "9d76233597aaad1c9ab188bde83c3b66d9bd3d0a", - "sha256": "1kmnvrgy71bk6z47w90vrmfl37j7q069vcdx9dcs4fpjaq2rbapw" + "commit": "4a8646a30df99bbafc95d4f21a0b2bf0a6f6566f", + "sha256": "0y3wzvyaxn5zybjak77r1cngaqqm462s3d4f1cwmzvrnpv99f3r9" + }, + "stable": { + "version": [ + 3, + 0, + 0 + ], + "deps": [ + "libgit", + "magit" + ], + "commit": "c3bbc9b9425f3370690cabb11bd35b9040773fdc", + "sha256": "0dbp3gx43ipxv8zg9m0hfhksz85rnkikaq35rx705qqz6xq6xq9m" } }, { @@ -65022,14 +65435,14 @@ "repo": "dickmao/magit-patch-changelog", "unstable": { "version": [ - 20200217, - 1202 + 20210607, + 1635 ], "deps": [ "magit" ], - "commit": "876c780bdb676b6ece64861704e199b94f33cf71", - "sha256": "0wkjh9s67vs90lysdx3gjyrax9mlbzfvs563pzr6ab3l4p5pgnsw" + "commit": "5cd99a6336ad4b60e9e8ce766b8a9c0395289775", + "sha256": "17s5268kcqhgd141fvjqnn2wrny7v03yz940k2whr383l1253k6v" } }, { @@ -65108,23 +65521,26 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210224, - 1417 + 20210525, + 844 ], "deps": [ "dash" ], - "commit": "9d76233597aaad1c9ab188bde83c3b66d9bd3d0a", - "sha256": "1kmnvrgy71bk6z47w90vrmfl37j7q069vcdx9dcs4fpjaq2rbapw" + "commit": "4a8646a30df99bbafc95d4f21a0b2bf0a6f6566f", + "sha256": "0y3wzvyaxn5zybjak77r1cngaqqm462s3d4f1cwmzvrnpv99f3r9" }, "stable": { "version": [ - 2, - 90, - 1 + 3, + 0, + 0 + ], + "deps": [ + "dash" ], - "commit": "791901b2f1d26fa0a383147fe77948a9abc753da", - "sha256": "1kw94sdczswsyzn1zlk5s5aplpdv4qd7qcqc5zfxsmsfwm3jacl4" + "commit": "c3bbc9b9425f3370690cabb11bd35b9040773fdc", + "sha256": "0dbp3gx43ipxv8zg9m0hfhksz85rnkikaq35rx705qqz6xq6xq9m" } }, { @@ -65191,26 +65607,26 @@ "repo": "magit/magit-tbdiff", "unstable": { "version": [ - 20210512, - 407 + 20210525, + 2329 ], "deps": [ "magit" ], - "commit": "d8609cb28d0411edf40031c1a551d64f383fac51", - "sha256": "1l3wqrv3338w7lgmpqpqqmc3wwh0dhl76nmfqlp8xjf44r3is2v7" + "commit": "fef1b7772fe192c434089b67644ff93765e384d4", + "sha256": "1g5nsg6zb3jrm7w1ssawv109ai2l7dpnd1dqrjsry2dnx1mxd212" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "magit" ], - "commit": "4273bfab1d2b620d68d890fbaaa78c56cf210059", - "sha256": "0d1cn0nshxnvgjvl9j7wsai75pvsxmrmkdj57xdpyggwxgcpl1m4" + "commit": "fef1b7772fe192c434089b67644ff93765e384d4", + "sha256": "1g5nsg6zb3jrm7w1ssawv109ai2l7dpnd1dqrjsry2dnx1mxd212" } }, { @@ -65906,19 +66322,19 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20210518, - 1405 + 20210605, + 1213 ], - "commit": "624028c69b55deb3387452b9eeabe9cb963bd2a4", - "sha256": "1z9s6n0d03l7cpz7x50jjcqdpyhjy4ifc3wqsv3snv54rz68gpwq" + "commit": "4c6272ffc4836de052c8b06f681b0e700cb01602", + "sha256": "0l4sl4w4yq3hkpvvw7w1mh046f95bkg1c3av07kwk9cm038rwhvg" }, "stable": { "version": [ 0, - 5 + 6 ], - "commit": "5126ba6244e13e3e2cf608e7f3955377bcbd8c04", - "sha256": "07vfidgq9am07zz2ydhdifmp4jmgs9jn5l1nfqiyp16sd1br6czj" + "commit": "ca9a5e35913569d66d34193a87d8511b2bb9d2b2", + "sha256": "1lisns2vghmqlg8wiv6jy15cfgnc8j83khz0vfnmrjwgcmjw3bbz" } }, { @@ -66026,11 +66442,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20210504, - 249 + 20210530, + 1825 ], - "commit": "9977753eebe3f5cca7ab85b18a7c719fdb0b7654", - "sha256": "0aaj4bdl7cks06kx0jbhw0rvcwl2g68wyniy344fz2dzwwmp7acf" + "commit": "58f2d22526ac1e4abd4ee1afff8624d2dd3123d3", + "sha256": "1k17zpx05yafxfsw89dlkymqc5xajzv28qby12kdhwwlsbarqvd0" }, "stable": { "version": [ @@ -66509,15 +66925,15 @@ "repo": "sasanidas/maxima", "unstable": { "version": [ - 20210520, - 2021 + 20210526, + 1525 ], "deps": [ "s", "test-simple" ], - "commit": "f92eafd716ae6e36665bbf027309477c2efa336d", - "sha256": "10a72c4v0v5c1npxq1fmglxjiczpf1x87jpd6523x337h054zgs0" + "commit": "74e10d5dedb16f74efc28299c98dd7db9a4392d6", + "sha256": "1r04mbn33y515b9fwr2x9rcbkvriz753dc0rasb8ca59klp1p5cv" }, "stable": { "version": [ @@ -66947,16 +67363,16 @@ "repo": "DogLooksGood/meow", "unstable": { "version": [ - 20210511, - 314 + 20210606, + 1056 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "bfe4a67b6f3ea14dcc9140e16731f45afb64faf0", - "sha256": "13w54vpv5y4mxvrzc36f6vciq5sjxxmfj7k0d81svpjywz9cd12r" + "commit": "1cf2508f8e95311aa9ca405f899c3596cf8c2bc7", + "sha256": "12xzq9sxczjppqpx75bny2dp647m3f9ww6zf9a22rgmmspzkk5cx" } }, { @@ -67307,8 +67723,8 @@ 20210422, 326 ], - "commit": "c1b386f3522054f063f4ac60730397ed1f724478", - "sha256": "0d0s9hxjvv39n1rik894yh7d20aw120r6cadyp4hqw4n24j8cs5q" + "commit": "543813e0acceb55653d876302a5d5741879fb717", + "sha256": "1w0pfz5dbhqglb5w3c2g4ww2c32nbsir8gqnsh69pa43h9q1msz1" }, "stable": { "version": [ @@ -67384,11 +67800,11 @@ "repo": "sggutier/mexican-holidays", "unstable": { "version": [ - 20200622, - 132 + 20210604, + 1421 ], - "commit": "5b5dd6e71505e8938bac9e9733b30bd394631923", - "sha256": "04d4148nq3lmrpkxvzzkn88j30iv2l2466ps035x7v8hc83wxnjw" + "commit": "8e28907ea69f2c0ed9aad9f3b99664ca147379d0", + "sha256": "0mly44x0nq26pw8v98k3nnlc8ca1mn20jcqj5k5gzdbp6k49lkxa" } }, { @@ -67399,8 +67815,8 @@ "repo": "danielsz/meyvn-el", "unstable": { "version": [ - 20210130, - 2016 + 20210606, + 1501 ], "deps": [ "cider", @@ -67410,8 +67826,8 @@ "projectile", "s" ], - "commit": "a49731f39020b7c7626ba12e4c7b2f1c17a69341", - "sha256": "13m1qym94qvy197ngd8lyn8nzfsbxbr5ss29mkbvaidhi13jdrwa" + "commit": "ddba1d60d6729bbeeefd0f76dac4e6c20e848f67", + "sha256": "1c454baagnvbg79yia5vwk51n0fp031rz0xhgawk70lrfjbc8256" }, "stable": { "version": [ @@ -67821,14 +68237,11 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20201204, - 1051 - ], - "deps": [ - "dash" + 20210603, + 2150 ], - "commit": "4a81446e13f5bfb514e593d0e1c5253a60113301", - "sha256": "19gwv9dn6g3jv12qq1h4fal2adsawrszyfkd62x99rlfa81ixg6d" + "commit": "aed285155dc8f073d766e752520ec599e77ce8b7", + "sha256": "1qxszcx9n1yfc9j9ihvrdwb57n19w03600z3v4z2ybxap1y0nq3v" }, "stable": { "version": [ @@ -67965,11 +68378,11 @@ "repo": "ayrat555/mix.el", "unstable": { "version": [ - 20210105, - 1821 + 20210605, + 1015 ], - "commit": "39a7d3e35769086c0008389b3975dd90b91b657c", - "sha256": "0f74wb9f1j47qc0xhhn23i8nrsyznhngwvdrg62ixdzdz9z0z5hh" + "commit": "bfe61ed4e7dd8cfc0bb2603fbac3eb44b32438bf", + "sha256": "0wfjgkz08zsdl24b71x7ync05qnnh46grs8ahdn8s9j35q9kxqvf" } }, { @@ -68015,6 +68428,30 @@ } }, { + "ename": "mlscroll", + "commit": "7f37b0e3fb8ee6770ea9320ce759bf8cf2ba2292", + "sha256": "1a0n6jxx0a71yjrdlly0bckly5pkz5mlqg5x9cmvq687mqv7mhkc", + "fetcher": "github", + "repo": "jdtsmith/mlscroll", + "unstable": { + "version": [ + 20210601, + 2158 + ], + "commit": "db502020ffe6bc65576b93527a20c0bf3df562da", + "sha256": "0gw6xw38x8h72gbvhmddgzijs4xvkrgs6c7v552db56hrlsj9lhp" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "5811cb564727f74eb0c8b8b075e6dc982e6ac5f6", + "sha256": "1wj71kz9zdp1rb2lmxrfrrwjg7wb4yjgsaqmhv2l4hyq97pzr0nm" + } + }, + { "ename": "mmm-jinja2", "commit": "721b9a6f16fb8efd4d339ac7953cc07d7a234b53", "sha256": "0zg4psrgikb8644x3vmsns0id71ni9fcpm591zn16b4j64llvgsi", @@ -68320,20 +68757,20 @@ "repo": "tarsius/mode-line-debug", "unstable": { "version": [ - 20201118, - 1530 + 20210525, + 2014 ], - "commit": "1848f94fe7bb7a0a11e976d1d64922a5b69a5cfc", - "sha256": "1jlcrymj1ssfrnz017916bm32918wkypzz0m57xixmng06x375g2" + "commit": "41184eb66a3205abcc32a885780004207df86dbd", + "sha256": "0qnrvddbka8klmihfaydpkwrigrjmbabxnm0vkybdqwzx619hwyi" }, "stable": { "version": [ 1, - 3, - 0 + 4, + 1 ], - "commit": "6d2c9c14f6a3835f4d54091ea241fd436da18ef0", - "sha256": "0y5bkbl6achfdpk4pjyan2hy8y45mvhrzwkf1mz5j4lwr476g18l" + "commit": "41184eb66a3205abcc32a885780004207df86dbd", + "sha256": "0qnrvddbka8klmihfaydpkwrigrjmbabxnm0vkybdqwzx619hwyi" } }, { @@ -68455,20 +68892,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20210520, - 1651 + 20210607, + 917 ], - "commit": "334a472a1d132bb748b8c9cb607dffe596144251", - "sha256": "0f7q05n4nd1rj2g0gzj06aav3ilv699czadbgj5g1jsjxq5g1i7g" + "commit": "a2c8796fcbcbdd332165e02476c6de5799996d31", + "sha256": "0p9yzj70kx3s740dl7k3vwwkr1g9zxsirwl83n1nvswc4csgv20j" }, "stable": { "version": [ 1, - 3, + 4, 0 ], - "commit": "69248a97c9da98de786891215ab6baafcc44a55d", - "sha256": "0d3i07g8sxg30llzx519ph3qp4bx0vk0xy80sxhy5vra2l30ihlj" + "commit": "15c973f716378084a937e777f86182741fd9b697", + "sha256": "0p9yzj70kx3s740dl7k3vwwkr1g9zxsirwl83n1nvswc4csgv20j" } }, { @@ -68802,20 +69239,20 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20210114, - 850 + 20210522, + 1100 ], - "commit": "2a29baa0cb6e364c5acbbf590a6d7c936c4378ae", - "sha256": "0l6cgr2969flhkdkiycqppvblpsn0qkdp19r406jpqbc1ql394lj" + "commit": "392c77174ace6c57921f237f41eaa4c3a83ac303", + "sha256": "0b4kg4dxy4ywwin96vz6x3rpvgr718y5rgrdarmwym9wv1qz0a0c" }, "stable": { "version": [ 0, 5, - 4 + 5 ], - "commit": "f6bebfe6fe51b728ebd013b7084becad23cabad3", - "sha256": "0n8p864yj5m3n7f9qiq9hy24dwfvv0a0wchx2818rppff6vfq3hf" + "commit": "392c77174ace6c57921f237f41eaa4c3a83ac303", + "sha256": "0b4kg4dxy4ywwin96vz6x3rpvgr718y5rgrdarmwym9wv1qz0a0c" } }, { @@ -69161,8 +69598,8 @@ 20210306, 1053 ], - "commit": "3b3068e924e17f8820a35899f105f2ef838d0535", - "sha256": "0bsxy0v7mm153wxwhwbm039fbfhr9l0xa5sgz9l7gdzkwsxmcbna" + "commit": "d031469630c70188c20598c0f3a3c3c46c6c7a14", + "sha256": "13mbkpzfdy136y5w6ns73qy1fsxwqzsvnnfcid2x7rrrqbxrcm5r" }, "stable": { "version": [ @@ -69713,15 +70150,16 @@ "repo": "lordpretzel/mu4e-views", "unstable": { "version": [ - 20210228, - 1556 + 20210601, + 1402 ], "deps": [ + "esxml", "ht", "xwidgets-reuse" ], - "commit": "1a0ceeb874e2a56b3ebe06c8375221031bb90a5c", - "sha256": "0v7d899pvpwvvp9x0yaskhjf1c6bjmqajk2mclfkykadrh89z61j" + "commit": "c7f2398612218407e72b174f02b26cf2916eba22", + "sha256": "0irvzwfrrqzk8pcq1m3w9s21v2y0h6f5jrvsv88knz0ki1bdkbai" }, "stable": { "version": [ @@ -69818,14 +70256,14 @@ "repo": "ReanGD/emacs-multi-compile", "unstable": { "version": [ - 20200913, - 8 + 20210604, + 140 ], "deps": [ "dash" ], - "commit": "508b524aa880e0ca6695f0d5543ee7659f2dea7c", - "sha256": "0g5ja8ra6kyfpvkavy9diiwjasc4v2z80yi98kahi5nckfp90kvc" + "commit": "948ee25878c509d0f9ba8715b209eae79143b76e", + "sha256": "0lgp64pgblidm4jyr3wlv5xq2x81znzi0xvqm8h0f8af9jzl2b38" } }, { @@ -70211,8 +70649,8 @@ 20181002, 1617 ], - "commit": "ffa40235b7dabb6c6c165f64f32a963cde8031f0", - "sha256": "0ximk0aan7jqn5x7fk4pj35bxhi6zaspvyxrmac9kxaiz8znwffr" + "commit": "223723d9ceeb2878b884e83abb8ca74ad2e42081", + "sha256": "1sl7kfg5w73cw9mv4x1m497dg27h42zgx2ywl4s8fmx2k9f2pq1q" } }, { @@ -71197,6 +71635,20 @@ ], "commit": "a968a923aad07ab15fb35deb79ac95581a427b4c", "sha256": "1mb55bbsb32gxms488pjw9fsqiic2qfmwkhm3pwcgy194723vcaa" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "company", + "f", + "markdown-mode", + "s" + ], + "commit": "3f86d26fb2006e82c673a5bf122594820a4842d8", + "sha256": "0xsljyirv7iwfclxzlj8h274pps02ni3bdwwlpjcmffz8v1fh3l5" } }, { @@ -71469,8 +71921,8 @@ 20181024, 1439 ], - "commit": "c573f6b8b23593f46a08616b76325d3ce0175002", - "sha256": "05kicpy4higgdhxbsn7a15cgv85xbwwaf5nzy7pxjk4yg4wvpd7v" + "commit": "8fa4d05fea5140f80ff5f4629d19c6ce0d6f5cca", + "sha256": "0dn53fjq4dl8szpjqxn91md0xvr4sa458j1p0w8vgskc0iibzn4c" }, "stable": { "version": [ @@ -71568,11 +72020,11 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20210124, - 204 + 20210523, + 326 ], - "commit": "0023fc5b100ec0c939ffe699d1a7d1afcf1f417a", - "sha256": "1fjf16dah95i3vlxk63rlixskgq18kn69fyg6dgpiw7pm98kjviy" + "commit": "e4844f7a711c8d7dceb82b6b841a1e8485e12586", + "sha256": "0g05qa926xkayd79n2zi9ypd4m5245jjxwv2vp4hqn2cl76pnpak" }, "stable": { "version": [ @@ -71860,14 +72312,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20210124, - 1559 + 20210605, + 1753 ], "deps": [ "cl-lib" ], - "commit": "57357e15643158b4e0d9b3b4f70a82f5fc73178a", - "sha256": "1kbbbx1agzcxc5n1b6cavdx3wjxz6mgi9rafja8mk8cyaaiz0rkd" + "commit": "a6c8e0575766eb573a7add103836d578bd205962", + "sha256": "1r8rarcp0q0rl19kc6q7lll0djkvf3iw17rrsjswsq3z9fyq8iyr" }, "stable": { "version": [ @@ -71905,16 +72357,15 @@ "repo": "thomp/noaa", "unstable": { "version": [ - 20190202, - 1634 + 20210606, + 2050 ], "deps": [ - "cl-lib", "dash", "request" ], - "commit": "ebc6a4a1cc56c01d2bb882e4a40934a6a1f4e9ca", - "sha256": "04zhhz8v6bx627g1vhvd0s8bl5g3d6a1mfgf7pb13627npsvbrdx" + "commit": "e2a4870fd5f8e37956d9317b74317d99f17b87ad", + "sha256": "1djlfvnmzcjva1s4pjhr4hhmqmd30mm48933lpgy3pnwp7gq910x" } }, { @@ -72166,11 +72617,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20210515, - 1210 + 20210605, + 1839 ], - "commit": "ff07183a02a480b36e70284289607c1315ac3db7", - "sha256": "10mx3vj7aqa646r0f308f7rr67v9zss6x5z4dpibmx5bhl5zz8r4" + "commit": "6f0f83660e222cfdd05b05ad134763a7ab26f097", + "sha256": "0rs37inh95c1r91mjjwf1kssmxq8mliblzvdjypijps13fxk7m60" }, "stable": { "version": [ @@ -72350,15 +72801,15 @@ "repo": "shaneikennedy/npm.el", "unstable": { "version": [ - 20200812, - 1850 + 20210601, + 1122 ], "deps": [ "jest", "transient" ], - "commit": "26d5cf79dfd1a2a74a66c44de129483d26354345", - "sha256": "0akjjb5xqpzg784qi6hbjfjm335mixqszzrxwz69ggl50iy9s6rk" + "commit": "d14d654c025d8f75f678503c98cd8682e69341cd", + "sha256": "0a54s7l01z5s5vasysxfysnzc2smn6r5pq01a6a3vqyaq3hz4khi" }, "stable": { "version": [ @@ -72670,28 +73121,27 @@ "repo": "douglasdavis/numpydoc.el", "unstable": { "version": [ - 20210510, - 1558 + 20210523, + 1746 ], "deps": [ "dash", "s" ], - "commit": "01c067e1b83175cb3f03c2061528393166173012", - "sha256": "1wla0drxbk7kqxpam4yrmlz2ajrqv6sz66jg11795k7wh16ab21s" + "commit": "dcbc06429084e209f081a8c6318b46c1c9ff7309", + "sha256": "0bggm5ssxpj49km8q8z9hj351garl1xydz1dya7r0yvz12y6wn5g" }, "stable": { "version": [ 0, - 3, - 0 + 4 ], "deps": [ "dash", "s" ], - "commit": "01c067e1b83175cb3f03c2061528393166173012", - "sha256": "1wla0drxbk7kqxpam4yrmlz2ajrqv6sz66jg11795k7wh16ab21s" + "commit": "b8efad7723a0c1d5738d74c7ce56ea962726a74f", + "sha256": "11y73fwn4ca6pll5vb1p04l08z48kj2ldks3qavqj4pamdcm698d" } }, { @@ -73546,14 +73996,14 @@ "repo": "Lompik/ob-nim", "unstable": { "version": [ - 20170809, - 1830 + 20210601, + 1807 ], "deps": [ "cl-lib" ], - "commit": "bf1642cb93f0a898804dc13fd9408d2964403bd2", - "sha256": "1xgi863wn1pvlsajmldd706k1dk7d7pa6b9nbgsh34kzchvhd75s" + "commit": "6fd060a3ecd38be37e4ec2261cd65760a3c35a91", + "sha256": "12sinii7i917v1f3czvmc0rrwk3ksr1ls7wv4yvv9f8jdkzr0msm" } }, { @@ -73966,11 +74416,11 @@ "repo": "ocaml-ppx/ocamlformat", "unstable": { "version": [ - 20201204, - 945 + 20210601, + 901 ], - "commit": "a948866021f86461d3b6259b6cdc3506d31d3011", - "sha256": "1790c3hymn91nr03y1ragq703cj18877r8g233f27i0cz6gnbbqh" + "commit": "be14af363e9338e86173c2d96732f59b3c76e73e", + "sha256": "10q2xd4mqdi9h6dbjfx5081l8sc025rgkxsz9hwm93yrb5xw1rwd" }, "stable": { "version": [ @@ -74163,26 +74613,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20210512, - 1429 + 20210521, + 1311 ], "deps": [ "org-re-reveal" ], - "commit": "fbadeea46739954649c8eb6dd61f74eb1ba2bf8b", - "sha256": "0qsqj7yb608bgzyicn9zpqxvranbs94xapbssxp7y64ng1ad68d2" + "commit": "fe1feb913bf69b1e854053e3f07026c14c6c91dc", + "sha256": "0w4x18srwhznd4xicr2sk7m3lhzgw6pyza7skar5i4n7y30q38xp" }, "stable": { "version": [ 3, 20, - 0 + 1 ], "deps": [ "org-re-reveal" ], - "commit": "fbadeea46739954649c8eb6dd61f74eb1ba2bf8b", - "sha256": "0qsqj7yb608bgzyicn9zpqxvranbs94xapbssxp7y64ng1ad68d2" + "commit": "fe1feb913bf69b1e854053e3f07026c14c6c91dc", + "sha256": "0w4x18srwhznd4xicr2sk7m3lhzgw6pyza7skar5i4n7y30q38xp" } }, { @@ -74878,11 +75328,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20210518, - 1413 + 20210603, + 1335 ], - "commit": "9637d7fd59f76a5b6d37470b1543ab827a0f9b8d", - "sha256": "0741jyin11dwf52srgjgw4xk581p16bwslzrq7qsnx4h4fnagarg" + "commit": "e85084e733d6eb50893974fc5fd569b944a5010c", + "sha256": "1lmjmp0iwp8n9nrqvygav7y2fxxwqpv4kk2wy2gg4bi056arbx5a" }, "stable": { "version": [ @@ -75041,15 +75491,26 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20201220, - 2144 + 20210603, + 1352 ], "deps": [ - "ox-slimhtml", "request" ], - "commit": "efa9e3aa2d768c00440f745192aba6672b28d086", - "sha256": "009n23gcgyfylp4q6igj67r606syq2r43s86g12xkl3vmc14929b" + "commit": "03c1ca90a7f2583074f020619c7cb92a783fb375", + "sha256": "1pwgs9xm6i0cqhrwpl60y3xbd0k64nr48kfa83x3yk9x38i6ddp0" + }, + "stable": { + "version": [ + 0, + 0, + 2 + ], + "deps": [ + "request" + ], + "commit": "03c1ca90a7f2583074f020619c7cb92a783fb375", + "sha256": "1pwgs9xm6i0cqhrwpl60y3xbd0k64nr48kfa83x3yk9x38i6ddp0" } }, { @@ -75060,14 +75521,14 @@ "repo": "awth13/org-appear", "unstable": { "version": [ - 20210516, - 1936 + 20210605, + 904 ], "deps": [ "org" ], - "commit": "9fcf2486e70362d9fbdd40f3eae26ee0c04f13a9", - "sha256": "0gfwhnz3ir0c7ah1v6ahg54a6vjyjmbybgg9w232jz3hhjsqyk9y" + "commit": "cf87546d6458d36492a89661a1e097e5596aa26a", + "sha256": "18p8s0syqhqpk21ylbk8np3srknhi4ckxfxn7i4jkscsy8282lcb" } }, { @@ -76004,6 +76465,21 @@ } }, { + "ename": "org-gamedb", + "commit": "ca995957e201a1df81839ac326807d789f05a5e1", + "sha256": "0r6m78spjfk8vpgki747al3klms1g9ql9b7spvirlqykaw9nmrb6", + "fetcher": "github", + "repo": "repelliuss/org-gamedb", + "unstable": { + "version": [ + 20210525, + 2338 + ], + "commit": "f283b6f6a7e8ad090405be57202caa3d3c424447", + "sha256": "1sxjxh4yrb7zf4k17sa2wyxsf70krl3mg1jp6qs8qn37gyn2x3d4" + } + }, + { "ename": "org-gcal", "commit": "d97c701819ea8deaa8a9664db1f391200ee52c4f", "sha256": "014h67ba0cwi4i1llngypscyvyrm74ljh067i3iapx5a18q7xw5v", @@ -76165,21 +76641,21 @@ "repo": "marcIhm/org-id-cleanup", "unstable": { "version": [ - 20210320, - 1023 + 20210326, + 1711 ], "deps": [ "dash", "org" ], - "commit": "0877bd57f95ad96a342505a6ecef0c15977f6bd6", - "sha256": "02q343sznbw1ma9zcxnpa7sy37s85ph9phpg479pfz5c51kji09h" + "commit": "2cb87624238281b438cda67ed375c56403524489", + "sha256": "1xmbrrp1zyvij18v3rqmini6w9i6v7dl4fp103ph6wznav8x0jbl" }, "stable": { "version": [ 1, 6, - 0 + 1 ], "deps": [ "dash", @@ -76221,30 +76697,30 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20210517, - 1508 + 20210602, + 358 ], "deps": [ "dash", "org", "s" ], - "commit": "1ee39e4f8616199ad8e5cb6b2d6b410e75857ecd", - "sha256": "06mf8s68mw6fcdpvdddcvy2x8z6zyisfvgh4sdrpz2z5j03v7qd7" + "commit": "40716a4cfd36304b4a16977020b1e82870faec15", + "sha256": "1wncx69rqlvx9pnr5mlwn9i00nrfhi1icxv0zpc7z2kzf03wn930" }, "stable": { "version": [ 7, - 1, - 7 + 2, + 1 ], "deps": [ "dash", "org", "s" ], - "commit": "47805bb8dc681872f3ad5dc74711938978d5c7f2", - "sha256": "0iiw798clq6hmml6fs60wwd38c4rzvxrdv4xr57innj06cja4dvy" + "commit": "1ee39e4f8616199ad8e5cb6b2d6b410e75857ecd", + "sha256": "06mf8s68mw6fcdpvdddcvy2x8z6zyisfvgh4sdrpz2z5j03v7qd7" } }, { @@ -76304,16 +76780,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20210514, - 1352 + 20210527, + 1629 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "21364700245acd2fe7a15f389db15370f0b67a02", - "sha256": "1h1fadjhvv2f6l4sk9b8mxpacxb82jnppbd6j4np4g4jcbc54ijx" + "commit": "a01f0453667f9baccf0b8a514e9c9f0a9fb9fb6e", + "sha256": "1gn2sflvcc4gvgci3m12d16mjrwxywrd8vvrs7s87k0cf7yl74vf" }, "stable": { "version": [ @@ -76344,8 +76820,8 @@ "deps": [ "org" ], - "commit": "043bb9e26f75066dc1787cdc9265daca7a14dd4e", - "sha256": "0x4fvxdrllih2n643v3wgq0rl72dyhk11xqi2l1h718iaz4kqi5i" + "commit": "5f253a880e1919ef4b98f0d91f271a8b522eaae5", + "sha256": "1cirbb5x29qnf59qkcfsjw467xx02vl4f17iqd4qqxwaarwkyq30" }, "stable": { "version": [ @@ -77612,15 +78088,15 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20201128, - 706 + 20210531, + 1929 ], "deps": [ "dash", "org" ], - "commit": "be24274dd62cd3c586cbea99c8f73db251bf319d", - "sha256": "1kjydjj2bwrvvckxh1c31gk1h09j876jg7rbyv0jb0kzfim79d2j" + "commit": "e7a7109e4c34811d471bf685b710234564a556f6", + "sha256": "10p35q5l9racfqp92xcqard7n75gpqw6l5zjgbybswnkzvdjzd8c" }, "stable": { "version": [ @@ -77723,16 +78199,16 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20210507, - 2051 + 20210602, + 2113 ], "deps": [ "bibtex-completion", "org-ref", "org-roam" ], - "commit": "80a86980801ff233d7c12ae9efef589ffa53df67", - "sha256": "0sm4l32xscpq9hmilj0srqh7vij5x3602h1f0yh9wmckz9jq4f4w" + "commit": "f7b5be2ce0b43dd4d842484fc0ec37fdc8526907", + "sha256": "1cqx2izzchwd6yi0gmskdb0kiqjwk2m7rgk074bzzq0dzbpl180j" }, "stable": { "version": [ @@ -77758,8 +78234,8 @@ "repo": "org-roam/org-roam-server", "unstable": { "version": [ - 20210517, - 1731 + 20210521, + 1055 ], "deps": [ "dash", @@ -77769,8 +78245,8 @@ "s", "simple-httpd" ], - "commit": "ea4082f54af14cb692d6eb7f8f085971ebdca69d", - "sha256": "0dnnawh248mnjw7j0zwck0fxfhk828a9xbx5r1xizqmh50qv65mm" + "commit": "a0f82bf41e318d4ef606a26f54054262ed6c3441", + "sha256": "06j8wabbxay9h8ca4pbv5xgjygfzbb3kbk4icni3lrfj6izsp3i4" }, "stable": { "version": [ @@ -77921,8 +78397,8 @@ "org-super-agenda", "s" ], - "commit": "67fe1b5c6c879e14d34c34eec2190e9719046b6c", - "sha256": "00danbc1w5wd3gj0sdas26ip3lyxcsapq9ly4kbaprrxbf187b56" + "commit": "1b37069e47d1ea4745eacdf2dec2bdad756ee235", + "sha256": "0sf406dz4mkpaqaql3z8xs6jcksxasa5j7xkk79a9xnbanaxhzaq" }, "stable": { "version": [ @@ -78106,11 +78582,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20210329, - 848 + 20210606, + 1806 ], - "commit": "c000cdff0cf3c10ac756bd7c5b5729965cfce876", - "sha256": "0vff4wh9vlkzix47kxqxabcl29glnxbmmpmppkp6cfk42zb6sw1g" + "commit": "0bd38b604405ba8e6ba00dd32ce4773eb02eb901", + "sha256": "1d9kdcdiz600swcy318hd56l751w2qyafdibnkzfkhjzw63c2hwh" }, "stable": { "version": [ @@ -78331,15 +78807,15 @@ "repo": "stardiviner/org-tag-beautify", "unstable": { "version": [ - 20210304, - 1124 + 20210527, + 1130 ], "deps": [ "all-the-icons", "org-pretty-tags" ], - "commit": "e655ced70140cbec8fe12f9207614ca2b3a6c37c", - "sha256": "0853avvi2qpr19ca6c9ix8ls7r2r5v5f38nzkr4lbindmmxl6kpv" + "commit": "20193bf9b07efba03fdd5ffb2852cd43fcd88051", + "sha256": "0diccvg4gx9djayihd1hp39q5n2s8cahck93s5r58vk0d4jlcyyk" } }, { @@ -78712,8 +79188,8 @@ 20210414, 1844 ], - "commit": "7bb01664b45fc08b7d013c91073cf3ce0d313984", - "sha256": "1hknnkidmd5w81i30xjj2q3x93mygqq7pk7kwfssnzrn8lih6a9b" + "commit": "246120647e28a27506ca0894ba98e371086881fd", + "sha256": "15gqzj4h0w33w38i8ihl74iy7aqxlds97gm93r72z69pm2l1d7dm" } }, { @@ -78850,7 +79326,7 @@ "stable": { "version": [ 2, - 4, + 5, 4 ], "deps": [ @@ -78901,8 +79377,8 @@ "metaweblog", "xml-rpc" ], - "commit": "c1b386f3522054f063f4ac60730397ed1f724478", - "sha256": "0d0s9hxjvv39n1rik894yh7d20aw120r6cadyp4hqw4n24j8cs5q" + "commit": "543813e0acceb55653d876302a5d5741879fb717", + "sha256": "1w0pfz5dbhqglb5w3c2g4ww2c32nbsir8gqnsh69pa43h9q1msz1" }, "stable": { "version": [ @@ -79141,28 +79617,28 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20210512, - 1945 + 20210525, + 1956 ], "deps": [ "magit", "org" ], - "commit": "043db4f0957416652f872ca18289ef00b9474963", - "sha256": "1rybcybb4xb6wsfhh772mapggabn14i7ca2fl30qkzyc5qmhc3s9" + "commit": "26242895ef1642bf30c63683fb224fdba25e0853", + "sha256": "1xd58yqqsb79lgxkhxs4s50jq8f3639k6fhlza9hsy53apfczkal" }, "stable": { "version": [ 1, - 6, - 3 + 7, + 0 ], "deps": [ "magit", "org" ], - "commit": "ac9b1a42863a864fde9d225890ef5464bffdc646", - "sha256": "08amzcvw483dpfq5r34ysn84wzd538qk0jblc94vgcaidspx6481" + "commit": "26242895ef1642bf30c63683fb224fdba25e0853", + "sha256": "1xd58yqqsb79lgxkhxs4s50jq8f3639k6fhlza9hsy53apfczkal" } }, { @@ -79173,8 +79649,8 @@ "repo": "magit/orgit-forge", "unstable": { "version": [ - 20210512, - 2014 + 20210525, + 1957 ], "deps": [ "forge", @@ -79182,14 +79658,14 @@ "org", "orgit" ], - "commit": "cfca04232337cb9ad62ffd9929d964ff6b8e8754", - "sha256": "1gvpccxxxhkddfjvgsbxrxqsvman0d6ndkimy9nsz8flzwb8g5gm" + "commit": "ea2a1cf9d337901b413e9df258b8e07af55c00f6", + "sha256": "07ia3b6bfilnpify93kq5g10xhh794v5pmc9cmmb312c3qyqi7b4" }, "stable": { "version": [ 0, 1, - 0 + 1 ], "deps": [ "forge", @@ -79197,8 +79673,8 @@ "org", "orgit" ], - "commit": "63a19d1df1434e583aac1329ba4dcfa2ee59d7c1", - "sha256": "1vd7wnas53z0985if22sv0wpww2dp0g8b0z9hwlzdhlcrsjay5fz" + "commit": "ea2a1cf9d337901b413e9df258b8e07af55c00f6", + "sha256": "07ia3b6bfilnpify93kq5g10xhh794v5pmc9cmmb312c3qyqi7b4" } }, { @@ -79446,8 +79922,8 @@ 20210507, 1619 ], - "commit": "71216d56575da602ec713bf1bbe75c92606c1049", - "sha256": "1qfgfkww6v0glpnqdx3a6qixr63vbcvkby7ccw8qzpyb9bpar9g2" + "commit": "c0ba49bb01d037ce8800aa04db06f454ef043cb6", + "sha256": "07ck6slz0z484lywdymh719pfmxhvfsb1cvk2bdbrx4xq89sqwq6" }, "stable": { "version": [ @@ -79755,20 +80231,20 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20210214, - 1715 + 20210530, + 1259 ], - "commit": "bb6db842e4fc2ed4d635001938ebafe93925f48c", - "sha256": "0h54wdsh6g0wmqf356s6br08hq29p6cdrsd14q9w6qaxhmfzbs7m" + "commit": "942bd43ea7099984e9ebccf48db70af345d4b6bf", + "sha256": "0xnzwb1ybhq38qgd3ml18565bbagfx6yzcfndc5d4ll7bzij6jbh" }, "stable": { "version": [ 0, 2, - 3 + 4 ], - "commit": "a34602b59063dd22ca6877466b85b2728f03c242", - "sha256": "1k3zfcmlwfby7yixjdxfynhys2kyhggg0n3d251a9frzrkyg6gxb" + "commit": "942bd43ea7099984e9ebccf48db70af345d4b6bf", + "sha256": "0xnzwb1ybhq38qgd3ml18565bbagfx6yzcfndc5d4ll7bzij6jbh" } }, { @@ -80059,8 +80535,8 @@ "deps": [ "org" ], - "commit": "a79dc519cd28c000ebca4254a4744ce2b9b82168", - "sha256": "1ffpslv58kzw9nhrfv2cp42vq0pdx5gm1bk20g6k697ijiz1r1jj" + "commit": "545d2e1547fdc48a5757152d19233effa11d9ee2", + "sha256": "1mv0x345rn85cyq0qm4kz22ymxbaa4r9lhnp7n2d2cp0cn23m9zv" }, "stable": { "version": [ @@ -80098,15 +80574,15 @@ "repo": "jkitchin/ox-clip", "unstable": { "version": [ - 20210323, - 2145 + 20210528, + 2059 ], "deps": [ "htmlize", "org" ], - "commit": "2095537695135c7f1bc19db043925eb7d482907b", - "sha256": "0pingsmmdpw9g88rri7rkw8ajp1f982vx9rh97nfn51ppr94ihbw" + "commit": "05a14d56bbffe569d86f20b49ae31ed2ac7d1101", + "sha256": "14z5pghli7d3rkq3xmbjpssskx3zgwqwypb59wcprkyw8pl66rfp" } }, { @@ -80237,8 +80713,8 @@ "deps": [ "org" ], - "commit": "600a44cdd7caf0944c3b849d65e46580105f0375", - "sha256": "1jflz2a6hhdrnsnxdbh2y8ysw37za8d974513ak2w41w4k5k6xji" + "commit": "074c3abf0a6aa5d671da1a39a20137140ba41d24", + "sha256": "1a134x8pmgas5k1m769clk3yhrzdh4n0cwmh23bf22avk6n3bz8z" }, "stable": { "version": [ @@ -80547,14 +81023,14 @@ "repo": "0x60df/ox-qmd", "unstable": { "version": [ - 20201205, - 721 + 20210529, + 1012 ], "deps": [ "org" ], - "commit": "de78970b85dfd342b49f9956f350c6f7d0a13050", - "sha256": "1fggy2b6yklgm66zmyqcmib0aklilh99f51vxyifrhjlsrvinz1v" + "commit": "7e69c04626f8d35756f3b049bd7836fb751f7734", + "sha256": "14hdjkyyh4714vsc4amkdfhdda94gpaz7hy702ygmyfx0il1v92a" } }, { @@ -80565,14 +81041,14 @@ "repo": "DarkBuffalo/ox-report", "unstable": { "version": [ - 20210430, - 1212 + 20210604, + 1436 ], "deps": [ "org-msg" ], - "commit": "1e730396b8b7aa5101b3e3f538d6d4c15514f415", - "sha256": "1firb26xnci1qprb4v4p3cp9vnmmp5bvsm3154gy0n2jr0hzvbjj" + "commit": "9354a9687f7175d26c854204878b2fe545c069b5", + "sha256": "15jqcwmcpcb8vczzd50jasz46db9667yqcmzd4v4ahnxhvvb2vfb" }, "stable": { "version": [ @@ -81072,15 +81548,15 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20210511, - 2055 + 20210528, + 2348 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "f910d9912997230e3a34429265ee95b7c0dbec8e", - "sha256": "0sd016in8sg5nazly0mr379j9y59b8mffsa2lpzkwqbj379rnzgl" + "commit": "10b6f3aab4f7c014ce339694255cf2c6dfd2bdea", + "sha256": "0ps3v3v4279rbma8fscrpm13dimv2d93hgbq3fqcq4j9kfd25jzq" }, "stable": { "version": [ @@ -81103,14 +81579,14 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20210110, - 2231 + 20210530, + 319 ], "deps": [ "package-lint" ], - "commit": "f910d9912997230e3a34429265ee95b7c0dbec8e", - "sha256": "0sd016in8sg5nazly0mr379j9y59b8mffsa2lpzkwqbj379rnzgl" + "commit": "10b6f3aab4f7c014ce339694255cf2c6dfd2bdea", + "sha256": "0ps3v3v4279rbma8fscrpm13dimv2d93hgbq3fqcq4j9kfd25jzq" }, "stable": { "version": [ @@ -81125,6 +81601,21 @@ } }, { + "ename": "package-loading-notifier", + "commit": "9d7c94da6374291527055e47dcbf55cc7a6edf39", + "sha256": "0ha47s60dkbi7n2a6ynnva6nh3fl7dyv7c7hkjr8d1lcc2jpdi8d", + "fetcher": "github", + "repo": "tttuuu888/package-loading-notifier", + "unstable": { + "version": [ + 20210603, + 1138 + ], + "commit": "8fd10303e19a2a1e8b5544ce8c34c8466af5d08a", + "sha256": "11d9mc9ca9bn9x3by8fqcan2c8wn85d8xnmkfvzxcmw7dz87kis2" + } + }, + { "ename": "package-safe-delete", "commit": "61b961211276bd95655b6a0967eda5037a3d240b", "sha256": "12ss5yjhnyxsif4vlbgxamn5jfa0wxkkphffxnv6drhvmpq226jw", @@ -81539,8 +82030,8 @@ 20200510, 5 ], - "commit": "7bb01664b45fc08b7d013c91073cf3ce0d313984", - "sha256": "1hknnkidmd5w81i30xjj2q3x93mygqq7pk7kwfssnzrn8lih6a9b" + "commit": "246120647e28a27506ca0894ba98e371086881fd", + "sha256": "15gqzj4h0w33w38i8ihl74iy7aqxlds97gm93r72z69pm2l1d7dm" } }, { @@ -82618,15 +83109,15 @@ "repo": "vedang/pdf-tools", "unstable": { "version": [ - 20210511, - 1739 + 20210531, + 1613 ], "deps": [ "let-alist", "tablist" ], - "commit": "d262cf9e19d57c6567e06e51d109150c20753839", - "sha256": "0bls4kh7qv5wkjmxizj7rwn2kby0awg1fzkra3fkmg9xbvqzm7qh" + "commit": "5f77dae43eb8f71e52e10ba8cf994883f74c3fb7", + "sha256": "0hzqcnxi66d0c3dq7y3dn28f3yri4zcx46yylhy0xnm3f1yja0rm" }, "stable": { "version": [ @@ -82956,6 +83447,24 @@ } }, { + "ename": "persp-mode-project-bridge", + "commit": "fa5d72aad13e1f7e1863deb5487a6ebc9eb09e1f", + "sha256": "0h7k03z91h7qx0kgdy5nam886730w9llmrbaajcz801892ddkn3a", + "fetcher": "github", + "repo": "CIAvash/persp-mode-project-bridge", + "unstable": { + "version": [ + 20210524, + 656 + ], + "deps": [ + "persp-mode" + ], + "commit": "c8a2b76c4972c1e00648def5a9b59a2942bd462a", + "sha256": "1fzvz7f86azffyqrqx3jiwj54b739p2adb5yp9cilbfwkkqyff0v" + } + }, + { "ename": "persp-mode-projectile-bridge", "commit": "2c049b0067b70577511114dc8abac0a00a9e0588", "sha256": "169mpikixa33ljmh2n9sm186yibrik3f5p8m1hcisnzdsc3wgxmp", @@ -83017,14 +83526,14 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20210401, - 1950 + 20210523, + 2254 ], "deps": [ "cl-lib" ], - "commit": "dd2a380ac71edf1321a6462f14668baf99879e80", - "sha256": "0l9i7ky25d9ii04w2brgxc8dk2rky50naba8lbfqi7hcc34z8pp6" + "commit": "b37c6756700a167742c8ab06fa5a850d9d94f4bd", + "sha256": "1ciab9xz4lbnnnx9407bagyf10dv6h9nalzm2wj6w6x7kckb4105" }, "stable": { "version": [ @@ -83936,11 +84445,11 @@ "repo": "EricCrosson/pine-script-mode", "unstable": { "version": [ - 20210514, - 1232 + 20210605, + 1527 ], - "commit": "cb88aa6eb15c2bf52814b712e4b09ceb1e13ea25", - "sha256": "0vfrcy4vkbfa24f0a5n2q93vpbvqww4chbfyzpcrkwgclp07g53x" + "commit": "e465c0264958cbed0fb29dad2b30b9f18fbf1064", + "sha256": "0crc2q5mzflyz13zx0ghsf2kdmj67lcqb2vnnsw0z2sk7wafrz2i" }, "stable": { "version": [ @@ -84218,10 +84727,10 @@ }, { "ename": "plain-theme", - "commit": "d4bd77883375b229e344384e42c3603ca096891c", - "sha256": "0igncivhnzzirglmz451czx69cwshjkigqvqddj0a77b1cwszfw8", + "commit": "d25eb506b358a3c89c950e66200ea52fe3ca9133", + "sha256": "16i60lp0af15sw4fbsj37yd4hs6i212smili9mjaqgiai7wxqv4f", "fetcher": "github", - "repo": "yegortimoshenko/plain-theme", + "repo": "abelianring/plain-theme", "unstable": { "version": [ 20171124, @@ -85273,11 +85782,11 @@ "repo": "polymode/polymode", "unstable": { "version": [ - 20210413, - 2004 + 20210521, + 1131 ], - "commit": "b50ec54097d279bde6567ee3ba8a22471f466ec0", - "sha256": "0q2vjvz72m3nrnpck4hl059cjgcf2jdw2rl9h8fxyvbllyj0733f" + "commit": "7d1f822f0833b43326cc9253dc8a3e267ad4b376", + "sha256": "15gyqf9vs3yxls8l830ik5rdhvd0wiybqpi0yxnfpd6g9pcajm6w" }, "stable": { "version": [ @@ -85476,11 +85985,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20210326, - 2042 + 20210602, + 847 ], - "commit": "096078acea59df6109906641e9dd44893ed4f6a2", - "sha256": "1cvb40ad3zazfqjzwqgz4bnn9a2pl8yi52b0qfd56ccp32b24n91" + "commit": "2be084a77cc2bc79ea7dc23edada161f4ff6dfdb", + "sha256": "118sbcm6qavckxva81vamrs98dj38yv0qccqqj4p3a4q7brfi8cw" } }, { @@ -85736,11 +86245,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20210423, - 220 + 20210604, + 647 ], - "commit": "739d8fd1081bdd0d20dee9e437d64df58747b871", - "sha256": "1hapg4dwrpa1ffkx8s3pialkh9zsh3r5jxk076c750k9rdwl3q4m" + "commit": "3257a52e3599bc1d5c9a4b646d36d7a49b0dd025", + "sha256": "13p7122100ywg6dc32wq0hvcn52x8djxq6vgcmdpdsdy7k4fkxwc" }, "stable": { "version": [ @@ -85831,14 +86340,14 @@ "repo": "milkypostman/powerline", "unstable": { "version": [ - 20210428, - 1229 + 20210527, + 1953 ], "deps": [ "cl-lib" ], - "commit": "346de84be53cae3663b4e2512222c279933846d4", - "sha256": "00yy96a1rqcpbkvbn1hmb1pz5i7l0pwb2bqyxcc8qry7rkmvw7gy" + "commit": "cfba2aa9cfa190e7720900f01a946e1e78aac7e2", + "sha256": "1ljyp3a1dhak2h89yabjpf88037c7yhk4naxach1p86x3brwk68q" }, "stable": { "version": [ @@ -86087,15 +86596,15 @@ "repo": "jscheid/prettier.el", "unstable": { "version": [ - 20210313, - 1047 + 20210606, + 1152 ], "deps": [ "iter2", "nvm" ], - "commit": "5232b886bb6a4fb3848d63db1bcfcb30487a180f", - "sha256": "0sbka039sccqip36y98s1b5z6rd5w5q0jzl5kbdq4wmzi7j823ri" + "commit": "e38d21a885e234af9ea6b03f499c487175570571", + "sha256": "1c7n43xi1sjprqn0xhd1hfdr39ipqiw1r8w76qbm3xx04h9bccy8" }, "stable": { "version": [ @@ -86652,26 +87161,26 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20210503, - 738 + 20210607, + 1513 ], "deps": [ "pkg-info" ], - "commit": "35c6f9898272796694d04ab4fc4fbc85751e6b44", - "sha256": "0lxmd139aj42r1gyiw2hgr9riww7fdifngzmgy4k2946j3vr7ilc" + "commit": "155fdb44176347c9599357c7935993033260a930", + "sha256": "040g4frdjabpa8ddhag81dx3kphh5kp3iv34x4zsbkhb6gryd5zf" }, "stable": { "version": [ 2, - 3, + 4, 0 ], "deps": [ "pkg-info" ], - "commit": "18f694931f0afe8b33e34731914e8bae81107b55", - "sha256": "0jgnj5il4ynbqgpvy41y6xwwdwnd8m7vsx2f8y8dlwnczr0a022r" + "commit": "bbb7b8d4c498e88046e4e6227990626f2b5dbe1b", + "sha256": "0w2s1mxbi8qqv0k34q0jj368n0p764rz72grdzzrmdlc96bbd03s" } }, { @@ -87063,11 +87572,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20210512, - 556 + 20210607, + 1422 ], - "commit": "632297dd0ab35a42ed6eac163dcaca1e71fcd83b", - "sha256": "0gzggng9iq62qlyzx0v6f586qfqvwibpz7jp7ar8r3wz32h95vjm" + "commit": "bc86736abb728ec0d28abc90ef0adae21d29a66a", + "sha256": "00cga3n9nj2xa3ivb0fdkkdx3k11fp4879y188738631yd1x2lsa" }, "stable": { "version": [ @@ -87170,17 +87679,17 @@ 20200619, 1742 ], - "commit": "96ccf402fe8e62649f2be48a05944d552701aa5f", - "sha256": "031rag0y1k2f0mxjsvblnhib6qh2sxqbq85bcv8bbvb18j6k7rp9" + "commit": "4644980d818ec9d987f74c74b1a1d45de9ab01fd", + "sha256": "1mzblak9s46wsfh3l1798k9pjwbddnz030y0cfx831lfpr20227b" }, "stable": { "version": [ 3, 17, - 0 + 2 ], - "commit": "652d99a8ee8aa6b801e11977951fbf444cfccc8f", - "sha256": "18w8v2djl5fjhivc09w6ilc5npgacdxqn962q6vl5awc50crkgs3" + "commit": "70db61a91bae270dca5db2f9837deea11118b148", + "sha256": "08a7rnflhklbabqm5yyz2nwyzzfbh24miiy3wsxphaanjz4xr6yi" } }, { @@ -87482,26 +87991,26 @@ "repo": "hlissner/emacs-pug-mode", "unstable": { "version": [ - 20180513, - 2126 + 20210503, + 147 ], "deps": [ "cl-lib" ], - "commit": "685fd3414d89736bf232f5d1a6bed9e0353b98fe", - "sha256": "06qy9bgizc68k57avrbcl2qd2kyb8s17gr6rvxdbjknk6i55dgp4" + "commit": "d08090485eb8c0488a7d2fbf63680dc0880c7d2f", + "sha256": "1f6bhdr1a72x94dlz2i1fwwln8crc2mbpc2iq23hvsbsfmj7xfzp" }, "stable": { "version": [ 1, 0, - 7 + 8 ], "deps": [ "cl-lib" ], - "commit": "96718f802dad3acd5a3f770b1452b81e39f77d92", - "sha256": "1jqj3qfc4686v09am869ls1k3jwy397646cql4a8dg7crjdpf023" + "commit": "d08090485eb8c0488a7d2fbf63680dc0880c7d2f", + "sha256": "1f6bhdr1a72x94dlz2i1fwwln8crc2mbpc2iq23hvsbsfmj7xfzp" } }, { @@ -88024,15 +88533,15 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20210513, - 450 + 20210607, + 427 ], "deps": [ "async", "xr" ], - "commit": "924167a356ee4355e39461ea62c7dbd1eac45fc3", - "sha256": "01p8427w6a6kw5xbkyl8wgzj4xg6k7a3acisrp986c94zwi091ml" + "commit": "eaf331f67ad3d6ea5b63c92bcd0cfc0134466b53", + "sha256": "0prrkn2yaj6wm2hn17jgfxb1vz58mdm3ivmqsncrfhl1vdll73jm" }, "stable": { "version": [ @@ -88194,17 +88703,17 @@ 20210411, 1931 ], - "commit": "55d3cb79d846d093dba5a351d87803ad5e9b05bf", - "sha256": "11ji3q2zm60454x6awgp3pvkxbfbvcm725zffmi837x675rqydg6" + "commit": "6c7bc2b576a705fcc7bc52494163e9a1a240ea80", + "sha256": "1m4swr0v998c6iq589mzx6glq7g2gc109469wcsjyi9j4cv7qgkr" }, "stable": { "version": [ 2, 8, - 2 + 3 ], - "commit": "091cb92314dc701f10390136da78fbbb362e892e", - "sha256": "13qiv3v8yc2b7sfvizlnx6xcam7yjicdkfjw00q50s5xqmali22p" + "commit": "735c958d3b36fb5d343b7bcb81b1055a430cb042", + "sha256": "1m8f8qv88bvqbviszwf0n4ch5dpyqa33067ampy706cpg7mwjvn0" } }, { @@ -88445,14 +88954,14 @@ "repo": "wyuenho/emacs-python-isort", "unstable": { "version": [ - 20210509, - 1532 + 20210603, + 2153 ], "deps": [ "reformatter" ], - "commit": "4ba3dd75e7dd9f953d8b7c0b9c4c6d1b1c263047", - "sha256": "0lnl4byf93ibl2g353z9pzarvqwc1q732fz5gj11gv4yfp8p6xif" + "commit": "339814df22b87eebca02137e581f65d6283fce97", + "sha256": "094nqaf60cw3kch2hka5jbbrc5b6v3z6np98w3y6690yxwx7wmz4" }, "stable": { "version": [ @@ -88475,11 +88984,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20210408, - 800 + 20210601, + 1845 ], - "commit": "710ffadeb43136d400de0a4c9e4a94c8b7ff36f0", - "sha256": "1vym8nlpwv9ym7yixldjxp999b26a9pr4z0pka28fldxykfccwq0" + "commit": "198ba8e15e848825b2215e9fc363f06d8c173a28", + "sha256": "1z6vnbnqvn20gs131d0rjncr4nk11amahvmfaffkhiwmpsl1b3gv" }, "stable": { "version": [ @@ -88630,11 +89139,11 @@ "repo": "jorgenschaefer/pyvenv", "unstable": { "version": [ - 20201227, - 1623 + 20210527, + 829 ], - "commit": "9b3678bc29192d2dba64df90fbdb17393ef8d877", - "sha256": "1pxinj6gc0mga0sl7y5ys3xsy94c33cbgahw418c36lhj8xxx21n" + "commit": "045ff9476dac26086a04538d9b7ba186aa8f0fd1", + "sha256": "1y5jqqqh0df75qydw3h7rx24pv5z628ci8ymdksn5khl1qp5041x" }, "stable": { "version": [ @@ -89119,15 +89628,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20210517, - 1613 + 20210604, + 1431 ], "deps": [ "faceup", "pos-tip" ], - "commit": "abd59fd4538f09fb201957d87887e58e377f0255", - "sha256": "1vs4yxxca8r7n4cjgsfzljj0kb3b3h7nl5k4yqvc8r0q0rrhyn4d" + "commit": "4b46a818c08820e04d25df7fe830e80ea82e1126", + "sha256": "0kr1sd819rvyfw34g6sqcnygkllcx07ccc5zc773kn0ngiqd0zvn" } }, { @@ -89746,8 +90255,8 @@ "deps": [ "yasnippet" ], - "commit": "9d0a1bb90ac36c689cded48b661e81d4544fd719", - "sha256": "15vnybyvz18scladfqy1qj6vrwx1ac38ra8ymdg938aayvl57354" + "commit": "969c21734dab638057fe9e284f6a51edcc3407c9", + "sha256": "0sdh2qaa6fb11y3h8xy0f6frisan2bkxrk68r89bq875g21z8jfr" }, "stable": { "version": [ @@ -89837,16 +90346,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20210516, - 1047 + 20210522, + 2151 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "cde79dd47f25617959c6cfa059e198a565b91f77", - "sha256": "1rpc0viymnm5jdrl16nmvsz0y8wnca03l0nhllwidyvazbf4x5zl" + "commit": "7a70b27614c488be274898d0141ec82feb3a8d5a", + "sha256": "116f94sslg1cd5cy5w25ygazdwrrlh85pfib7692a180vk6kz8g6" }, "stable": { "version": [ @@ -90417,8 +90926,8 @@ "repo": "thanhvg/emacs-reddigg", "unstable": { "version": [ - 20210301, - 2307 + 20210603, + 2305 ], "deps": [ "ht", @@ -90426,8 +90935,8 @@ "promise", "request" ], - "commit": "196200eeccc4e821c5200c2e04429aeaafe4d536", - "sha256": "06q6vb0gxq323zhrq3im7xadgxgb9b8h0bxqak8xfmcnny0mcjlr" + "commit": "1a6eaf3d1a5e44205399526c0f425281b8d9ccc3", + "sha256": "070zghnrh4ywndk6bz1vd750g2nxj4rd42gphymyz8x7kazqqh1j" } }, { @@ -91936,14 +92445,14 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20210520, - 1124 + 20210608, + 17 ], "deps": [ "inf-ruby" ], - "commit": "c9cb1abcc4caca7aa89aa61e648d323117d49d88", - "sha256": "1yhwlz60wqw08z04fz0rybgbh6g609pbl9n857i1cvmrhm38k3f5" + "commit": "bcddba77ba11b46f94730708fff2215f4b620428", + "sha256": "04az3rk7h606pv2l16wf2bmad9nqb7nx6r7cwap90dvnfjn56a3y" }, "stable": { "version": [ @@ -92593,11 +93102,11 @@ "repo": "bard/emacs-run-command", "unstable": { "version": [ - 20210323, - 1742 + 20210529, + 1505 ], - "commit": "92b70a1ed0aa9bdbed3915efe47b3ba92fe2cb74", - "sha256": "1jvclzlr9lhvb05zdnqw2l3y2m1nca2m5z8m1a7rmq9bk1wwl4pa" + "commit": "ce2d69feeffb9ef9815ef5b5e32f236763197a10", + "sha256": "132gsmgqnfzx8q0f4gchjzhm3wqm5frjrsb8q9cmqsa5y2g7qjmf" } }, { @@ -92608,11 +93117,11 @@ "repo": "ideasman42/emacs-run-stuff", "unstable": { "version": [ - 20210308, - 453 + 20210522, + 243 ], - "commit": "e5ee96c50c350cf860982b7b5deff1ed8d488c8a", - "sha256": "0g60kk49dbn331z06gpi3c8pqjsb780iwd07bl87bgbcxcpa2fg9" + "commit": "767eea8928b92da032aca7c8a429b1cced46781d", + "sha256": "0pdjhvma0hsd8slz240bavpyzvn9mdna7lsrd1ddw3nf8xjibczq" } }, { @@ -92796,11 +93305,11 @@ "repo": "Kungsgeten/ryo-modal", "unstable": { "version": [ - 20210507, - 646 + 20210523, + 757 ], - "commit": "b44321c6fbbfc53e211083dfa565525e79f596c6", - "sha256": "0gwf9a4cgpl3agggaj8x6r5hmq88wghzvyh69shc378n564n1cq5" + "commit": "ab6417d8e546f1836618ee72d074ec65431ebc80", + "sha256": "1yy0jr7n55qbraxif2zhgmyr31jd5sd62jyhd3cg327vl5ga1ajg" } }, { @@ -92811,11 +93320,11 @@ "repo": "magnars/s.el", "unstable": { "version": [ - 20180406, - 808 + 20210603, + 736 ], - "commit": "3a5166c81ac9e50eaccf5490c5c632f93452287e", - "sha256": "131z1g43xh6z20069s6lccm08srwhwgpbiwb7fp2h29pxp41g30z" + "commit": "e1710af8d058faca32529d1129deb5d57871385a", + "sha256": "1zm9zqa1479kn74a1hbs7jc8rli7vzz5hk8k2rqpi34yf569yjhj" }, "stable": { "version": [ @@ -93231,8 +93740,8 @@ 20200830, 301 ], - "commit": "34389b16731dbde58e9597047e2111d587ce4fcf", - "sha256": "073g3132h64afzl0jcxl84n60ajb7p5y547rp4349c0zlsk3fwg0" + "commit": "393a5f2be890c1e90b3d5f331ce1bf34dad09742", + "sha256": "16y5njqb9v58fmsp9nn38wvzx71jgy0di2m8933a8dkirddi324v" } }, { @@ -93724,6 +94233,21 @@ } }, { + "ename": "sculpture-themes", + "commit": "408a269ccf0d938c3248880c5220b5b0b979f271", + "sha256": "1zyiki3raldp4wnhjsnfc5rzs6pycbagfp7qjjjxz1qgqig36wbw", + "fetcher": "github", + "repo": "t-e-r-m/sculpture-themes", + "unstable": { + "version": [ + 20210530, + 624 + ], + "commit": "1da2b3501f3732b4a58d28b502e356226a43a96f", + "sha256": "198rjkyv876h7mbs73h8dq4lx5xhl66p7xrpvb23v0vk4vw0q5vz" + } + }, + { "ename": "sdcv", "commit": "173e233b2dacaaf54d92f3bcc06e54d068520dd4", "sha256": "1bj3b17sjd9fha686g6w191l4p8a1p8sb9br65xf54n6nd9bmv7a", @@ -94035,11 +94559,11 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20210520, - 1825 + 20210530, + 245 ], - "commit": "a922b19f715ad6d046072a35a3df5ac5e4ed73d3", - "sha256": "1n5qf7lh4q0j9yxxxzfx5y2dlcdni3k7bwbf7d3gp5byl46as92z" + "commit": "a19bbe94de492bf504399c093cfc5695eb630fa8", + "sha256": "0jhc0qn3q7npsixj1b1cmplxdvpy30745h32y0ybyydahqc3yc30" }, "stable": { "version": [ @@ -94123,15 +94647,15 @@ "repo": "wanderlust/semi", "unstable": { "version": [ - 20210214, - 853 + 20210529, + 1313 ], "deps": [ "apel", "flim" ], - "commit": "20d75302509b5fba9849e74b61c1ce93e5819864", - "sha256": "14qy9k64fi8asd4ka9hv5v0aa7mkdnx6252n02gldg760janr7xl" + "commit": "95259568446f32c1af56dfc27e3614815322a1bf", + "sha256": "09xld1vpxdz1kvw039g7hk89p2d8pi95j9hgls6iviwzs6ni41yl" } }, { @@ -94243,15 +94767,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20210420, - 1527 + 20210521, + 1050 ], "deps": [ "dash", "edit-indirect" ], - "commit": "424b0f260a1bca20cd9359c42a0bc64a1a5e1928", - "sha256": "1i85mbnh6ijycsgxiknzvkimxag72cxg8asg3d1g4bakv3gp32rr" + "commit": "900fdc33b647e92d0f464872da1b12d724de7d43", + "sha256": "1ji8qjg3qsxprsqjp4hks999f0rfqnl3nyj08hr4vra5nqk6x4cg" }, "stable": { "version": [ @@ -94722,14 +95246,14 @@ "repo": "sebasmonia/sharper", "unstable": { "version": [ - 20210328, - 1533 + 20210523, + 1821 ], "deps": [ "transient" ], - "commit": "70ae6071478f3e451ed9318d67a5d024c01235e0", - "sha256": "1fw2qn88b84v0fkaigyyipyvvhhllkw1s1h6fgv2xl2h19i8r0gd" + "commit": "08277b6c30568adfbe438c9f2a1d6c3db4b7ebeb", + "sha256": "1n0nc3g57kl5d4zh0k0gis70kd05yb2pv7kw8akmdp9q7hxs6m93" } }, { @@ -94940,11 +95464,11 @@ "repo": "deech/shen-elisp", "unstable": { "version": [ - 20180915, - 2028 + 20210530, + 349 ], - "commit": "73b74c8d6e3a2ea34b667d177d9f130765bfe501", - "sha256": "1ym048cmkghx373fb7n5m6r73q5nfa62m10mqr4nzhsizgyzdbrn" + "commit": "dabb829d0d86f454ceb3b0846cdfc11af1f91cc7", + "sha256": "1h7v3bbljkw7lsxz4ijvw47c6fj070j0p268v4il2xh2mzw1nhjm" }, "stable": { "version": [ @@ -95034,11 +95558,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210329, - 149 + 20210606, + 124 ], - "commit": "2f95627b93dd49023b1d982329b4ccf8b7854109", - "sha256": "0l2dh75v1vmkh738iq5japh3fmqcinsb5s7qqirxlq54gznl7qm5" + "commit": "0e18a7e96c8e425ac7c2e69aa26fa6a1e8e6e51a", + "sha256": "1jxp447d8xnk4ixpni7rsph7fd3p58ydmi39yrx201hbqh15jxiz" } }, { @@ -95566,14 +96090,14 @@ "repo": "vapniks/simple-call-tree", "unstable": { "version": [ - 20180224, - 2056 + 20210608, + 33 ], "deps": [ "anaphora" ], - "commit": "20059eb5549408def76aeb03d0d20839903dedef", - "sha256": "0gvhn2r7h6jz7a3i3a8gwlmghv1xfzj0sdib25kz645iylazji4h" + "commit": "d776c801d773e535d1647524e2c4f63b200d8ef1", + "sha256": "1jh1h09l4vkzj40l8nskkilbggfl889l3rhi8b70jm4yvmk9np62" } }, { @@ -96321,11 +96845,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20210303, - 1148 + 20210604, + 937 ], - "commit": "5966d68727898fa6130fb6bb02208f70aa8d5ce3", - "sha256": "00yk9g0gi4gsa99n2gsq41mkwgvmih52mngmk4g8ajzxsv0pbwq0" + "commit": "c783ba6576b554f3fc15a70bf30d225f277d1863", + "sha256": "1lwghrqw81dr7mhx8i92nn4xhamnpqwdvmzx1lg1fzy7g5qx7fl6" }, "stable": { "version": [ @@ -96773,11 +97297,11 @@ "url": "https://git.genehack.net/genehack/smart-tab.git", "unstable": { "version": [ - 20200416, - 2228 + 20210530, + 1743 ], - "commit": "67bf4f93f8afca61a3dc4f6c7a34b0b8ca9ede21", - "sha256": "1ws49lbafch1rb6g0j9k5h30c9shk3vvqhbjkf4qvhaqii94lgml" + "commit": "2f1b4073904805c8454ebc9bc967b23836a2d577", + "sha256": "0fflc9f3gwf1kl3rplfb4dr10j167l85z2hwy77b4gbjzd7lp502" } }, { @@ -96829,15 +97353,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20210330, - 850 + 20210529, + 1129 ], "deps": [ "cl-lib", "dash" ], - "commit": "25f4d6d1b732f4deabf922059d22a0a7dc04bd0a", - "sha256": "0jaa81fk6376fpxx6k4c9nsv0dhsyk23v9c5jbhkqj3zkf1dcj4x" + "commit": "911cc896a0f2eb8b5fbdd6fc8331523ad9889a3a", + "sha256": "12g7q86ncawikvxr87p7vda21pbfiwi3kr3rgkm7b1lx3zabwcai" }, "stable": { "version": [ @@ -97016,6 +97540,25 @@ } }, { + "ename": "smithers", + "commit": "147ae745350bd331d43c5a29e2cc4b56481c66a8", + "sha256": "07hv94qgkxxbanx0v7x7m18cy7f2jxraqyc83xycizlq4dx1k2vh", + "fetcher": "gitlab", + "repo": "mtekman/smithers.el", + "unstable": { + "version": [ + 20210531, + 2232 + ], + "deps": [ + "dash", + "org" + ], + "commit": "db9ed12a8d2c131b6d37b4e7aff01b8e3cec81a6", + "sha256": "1rk1x096akhn5rip8vp2lf0yyyybqwq3w75vkmkg4dcb9cbrwz1q" + } + }, + { "ename": "sml-basis", "commit": "043c253879bbc159c4867e58d4741ba2e9b8bb91", "sha256": "1q0q2xg6hzmm34hfb2p4s81wa2n4ydr48ar3mi7f4r03cy0b2p5z", @@ -97322,15 +97865,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20210515, - 1542 + 20210605, + 1242 ], "deps": [ "dash", "s" ], - "commit": "e42d88b1b1c121b0bcfa1869c3338d7b159172a3", - "sha256": "1cxgyd0pssx9n1kh0b5pi4pz0ws3rq8dyg0vfidih36vglg0dplx" + "commit": "54005eb19dfab02f38074e696fa8d247b59a2ad8", + "sha256": "18ynqkf98rjyzl48l5399g49x9gdmsj0wyc4jp7mly7xrv51zblx" } }, { @@ -97506,26 +98049,26 @@ "repo": "hlissner/emacs-solaire-mode", "unstable": { "version": [ - 20210327, - 2155 + 20210601, + 1921 ], "deps": [ "cl-lib" ], - "commit": "9d143db85428c5a7798e429f3b8abd2bf3f80747", - "sha256": "1g5cph02m07dxpmzd72xrzm56l62zdngis6xgz385zdfj67vi9a2" + "commit": "2298fd806d28daf511eb7836b23775e7df1f65e2", + "sha256": "1jfl0nhnv3ljagdlpsi2d7mhcrm8rww8crnhzad5zimzwc48nlcq" }, "stable": { "version": [ - 1, - 1, - 2 + 2, + 0, + 0 ], "deps": [ "cl-lib" ], - "commit": "4ac324ccb0b751be80ce64449553462eafab4f32", - "sha256": "1klyzqrlsgx8q89zx1kn5z6wnpv1dmvbglldpv1y74hxhzi6ryps" + "commit": "59efa9c52ec407161f741e67071813c3c1901680", + "sha256": "0aigavrqfi2dy4q5vrfs48n5k7839gqnafq7mp14cmcbrzcwadrd" } }, { @@ -97754,35 +98297,6 @@ } }, { - "ename": "sos", - "commit": "e8acf595ef51c928b4b41a9fea171fbfd40c080d", - "sha256": "1sny4wa2746fi9p18js0y9fm2f9ix7yblqyqa36ibkfj4b50hvxi", - "fetcher": "github", - "repo": "emacsattic/sos", - "unstable": { - "version": [ - 20141215, - 403 - ], - "deps": [ - "org" - ], - "commit": "1573adca912b88b5010d99a25c83a5b2313bd39c", - "sha256": "19jwnny0v6ppakpaaxv9qhr6353mksh9kxiz61kp4h12n6sfrb7p" - }, - "stable": { - "version": [ - 0, - 1 - ], - "deps": [ - "org" - ], - "commit": "c3906ca6872f460c0bdd276410519308626313f1", - "sha256": "0b5w3vdr8llg3hqd22gnc6b6y089lq6vfk0ajkws6gfldz2gg2v1" - } - }, - { "ename": "sotclojure", "commit": "3a2ccef8af91eada4449d9cd4bda6bd28272722e", "sha256": "12byqjzg0pffqyq958265qq8yxxmf3iyy4m7zib492qcj8ccy090", @@ -98291,11 +98805,11 @@ "repo": "brailcom/speechd-el", "unstable": { "version": [ - 20200706, - 1236 + 20210607, + 2032 ], - "commit": "058f91b4d1b0350221218656202ea80cd6827d65", - "sha256": "0c9k68mnwm7hhd9mj6f3p8k83kmd67rgzcr27791mnjfkhipynvb" + "commit": "2ffae385139936a03e1d1a96993d3bf5f9509bbf", + "sha256": "1kwg74qy66kwhsl2pqn4cvkrqrfdvyyaz13h4h1bqpxckb1dc05z" } }, { @@ -98921,11 +99435,11 @@ "repo": "srcery-colors/srcery-emacs", "unstable": { "version": [ - 20210201, - 1444 + 20210601, + 1247 ], - "commit": "760dc6cb854383ab087d9b924de7273deddefe6a", - "sha256": "15anfzsfgddrlskppk068dzlz4zkg7xyk9727a7hwg4845126q6w" + "commit": "58dd21cd63e4a2eed15e0082c2547069363f107b", + "sha256": "128ri2g7jjgpacvaxhwwv4f2h3kdzf5vv3p01yqbs23m8mri8d9w" }, "stable": { "version": [ @@ -98968,11 +99482,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20210504, - 632 + 20210528, + 2053 ], - "commit": "ce69158f5efb3040a00e89ffef0d1931e5038f53", - "sha256": "1sfrp9iwrinx1q9hm6rdb1gayn4jhqsh00c3yzg83wbdw1vl8vpw" + "commit": "c4ff94490dd8124e633f907f94955b30b7a4d8d4", + "sha256": "065n3x1mzhjgkyvy5j3fgqa75npxqp1dq05xgac9pqgcr2j09mi6" }, "stable": { "version": [ @@ -100503,14 +101017,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210509, - 1535 + 20210521, + 1319 ], "deps": [ "ivy" ], - "commit": "7c5d49f84f0919bbf00c53a9db48630adf8b2fbe", - "sha256": "1rji3p7a2f4ag4785h1k1f2ng9vi2lh8ifyh3m3j0yjihwq36m92" + "commit": "040d458bce4a88f37359192061bcea5ebe87007c", + "sha256": "0lgpawrsvihksm9cx462qa1hsmxhhv1qp0h1f9m4wn1jrcrq7r24" }, "stable": { "version": [ @@ -100840,8 +101354,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20210505, - 11 + 20210528, + 406 ], "deps": [ "evil", @@ -100853,8 +101367,8 @@ "seq", "undo-tree" ], - "commit": "5649ff2b7c0547e20adc7d32243f5b5ef99ddf54", - "sha256": "05vx9470prpqj54bq90alzgq7pnf1bap7wn5j21n02hrbp647jmv" + "commit": "1b6466e75295bbf7847253dfb6bf580b1c68eb9f", + "sha256": "1rbb7zl45x9xkf05601j05vq3f3hj0nh3rbv16a3n8d0ab5qnvhr" }, "stable": { "version": [ @@ -101232,11 +101746,11 @@ "repo": "fritzgrabo/tab-bar-echo-area", "unstable": { "version": [ - 20210519, - 922 + 20210525, + 2204 ], - "commit": "97272ee04dbcf11341f18845c743e355ca514a87", - "sha256": "1kr4n7jzqps1zchhczrdqycvj6gfrb25g2rhjg78wifhd8rsj6wj" + "commit": "2196e76cb6f11e6ae0f35ac8259dfb755ea60336", + "sha256": "1xifgdwqpf0ccmdxhdr9zxzqsa769984xs4343v657171f53flz4" } }, { @@ -101247,14 +101761,14 @@ "repo": "fritzgrabo/tab-bar-groups", "unstable": { "version": [ - 20210515, - 2206 + 20210526, + 2044 ], "deps": [ "s" ], - "commit": "dacbebb1c4afc7d8572b9801dc7efb156afbb968", - "sha256": "084i2sjzjchn9hylbg7hk5b06a8wac46n2w90fh41wqzdkpagk7r" + "commit": "63af8dced377a346b4559145b2e6e1767263f916", + "sha256": "16628wjk14h99z9i822xjv8fkxra6n65nafm3cr3ci86qd00j7a2" } }, { @@ -101573,20 +102087,20 @@ "deps": [ "cider" ], - "commit": "331e14b838a42adebbd325f80f60830fa0915d76", - "sha256": "1jpig982z0lbbnv2167q4lfv8dhhpg698gi6i7184lrjxr7dxqw7" + "commit": "82f343bac637e62f31152d72086c7facd4dfea27", + "sha256": "0bdai4gwz8nyc26gmb10z6pq6r2gw04iflzsc476xrp56d2abgbc" }, "stable": { "version": [ 2, - 0, - 3 + 3, + 0 ], "deps": [ "cider" ], - "commit": "ce85fd9bcd008031a605ea8913577f452b49e352", - "sha256": "06dm6gdh10jbmyjr0y96s06qi3k12phq522pviis68qm7v2ryr47" + "commit": "5da72b601cb9f052f35e88c41f1a18b326c03791", + "sha256": "1hhwyh4qkmhc303sf4qsarpczyqihh45z2xb96m2ra5zlqnklcpp" } }, { @@ -101716,15 +102230,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20210511, - 1722 + 20210607, + 1622 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "bc57c9e27a8c8c82d17cf2a2131e386494d49a1f", - "sha256": "0v9297syqz42fah5ng90a26b16wq1xvm4nh5cqphx4dgb31q2s08" + "commit": "0fcca201db99fbe93e8b0fd404dc00fd55cd658a", + "sha256": "0nqx5sddfa9442dgsssp022rfarznnq69gclj4h5kk726rkf9cid" }, "stable": { "version": [ @@ -102173,11 +102687,11 @@ "repo": "davidshepherd7/terminal-here", "unstable": { "version": [ - 20201230, - 1219 + 20210605, + 1453 ], - "commit": "cb561b5feb37a03a1c35708c3eebf9b51b01f7a0", - "sha256": "02vmy0xbssqvs97f7ypmk50hiyb7qdsbrmmnlf3mlm55c2abk73s" + "commit": "e0e89344624fadf080f6770132ebdd7991355fdd", + "sha256": "11hvyvnbr6skw6czwk8gjw9v08azf8s2kafqh5jb1nlznfghcr11" }, "stable": { "version": [ @@ -102807,18 +103321,18 @@ 20200212, 1903 ], - "commit": "9f15dc7bd57833ba9168551c85ede1d5e7036264", - "sha256": "05gg1634dkl1fbl9v8izln32ak188x4b4gxp4qaapm9dlpqp9rld" + "commit": "a67ce1533462256ff418027a3aa56516a1139d02", + "sha256": "0f20x4bklq32lcwa2ihnlnb6ri884xx7dyhg62yqz9y4w8filhhv" }, "stable": { "version": [ 2021, - 5, - 17, + 6, + 7, 0 ], - "commit": "4c4030f0f99458ff151652d8c8c41f0655dfc2d9", - "sha256": "0wqff7q9xkr0h9xp8f9fj7zmqqpz55p11z20q49h6rfqbwyi95wh" + "commit": "ec71afa89573c92de4a2a2ab87a51bd9021f5819", + "sha256": "0h3b89nb8sshhc52fxsgpdiqr85mfg1rpzp69qmiiwx1yz0b66wi" } }, { @@ -103116,6 +103630,21 @@ } }, { + "ename": "timu-spacegrey-theme", + "commit": "1bebe80350df731711bc526ca9fe942410211220", + "sha256": "1hl91gdj52zp8w4c6zp4bzkizj3x7ssr6wl465qq3fw1k5wp8l7n", + "fetcher": "gitlab", + "repo": "aimebertrand/timu-spacegrey-theme", + "unstable": { + "version": [ + 20210607, + 1412 + ], + "commit": "34a4499fac484c369774e356373b1f4994d65176", + "sha256": "11cjyiwi87rv9lj09810aazxgphdhpxpfhbhzr64176vqgmb8khr" + } + }, + { "ename": "tinkerer", "commit": "8a28e1dfe987287bac7c45f83ae6e754bc13e345", "sha256": "0qh6pzjn98jlpxcm9zf25ga0y3d3v53275a9zgswyhz33mafd7pd", @@ -103750,11 +104279,11 @@ "repo": "jorgenschaefer/circe", "unstable": { "version": [ - 20201101, - 1045 + 20210528, + 754 ], - "commit": "2798a75d625677402b01f138ebac6eb53337d9d6", - "sha256": "0r7k7cxs6gfam1rdy04vdq3q796v32wv5q9gq67sxfji8x1vbkn7" + "commit": "c0b2f997b3b73640d635ee84627bb8cf36c9adfe", + "sha256": "1kjfch0fhq67iivad56s071c8qlsssdsdg83h5v9iz2x4jipm0wa" }, "stable": { "version": [ @@ -103809,11 +104338,11 @@ "repo": "raghavgautam/tramp-hdfs", "unstable": { "version": [ - 20201001, - 2022 + 20210526, + 339 ], - "commit": "822c7b8a5bfca97544817d04e8a4ff1ffbaf4267", - "sha256": "0kxxdpmr9h0kqsylh8aj8m5arwf4m5yrkcadjssa76drhdlhcirl" + "commit": "aa93bdbb3d5619c262ce53af1981edcd2a0705e5", + "sha256": "1ar1565qhw6wx76p5p7dyb5k0lplnfbf866x2mc6kn9vydmb29za" } }, { @@ -103857,20 +104386,20 @@ "repo": "magit/transient", "unstable": { "version": [ - 20210426, - 2141 + 20210530, + 2252 ], - "commit": "6ceddc4d8c7a3c13d78c459213c796d2c19234c6", - "sha256": "0dhz5ca9i83vgi3pvkbvwanxbi1ibzwbmnhm8ymxdvzn508rlswl" + "commit": "a96818c93a10d9ef9bb14e5c0b9fdc1a808b13b9", + "sha256": "1mvccsfalnr4ybsgqazxcw62vfhigxg61y6v98k2fqncnmsbripa" }, "stable": { "version": [ 0, 3, - 2 + 4 ], - "commit": "162698aa9d40ecafefcb1af7bdf602954d766970", - "sha256": "1766hdqzg95k62nqhadfv502mpnjlx1l59ppqmc6r0las82dc6a8" + "commit": "b47e9d7d769437e279628d801a95c173c4ff26b4", + "sha256": "16z0j69sk7k51sd1vri3y2v0xjj0w7wpf5mmwnsxp8y6d3m0yjbv" } }, { @@ -104231,8 +104760,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210518, - 2056 + 20210606, + 1918 ], "deps": [ "ace-window", @@ -104244,8 +104773,8 @@ "pfuture", "s" ], - "commit": "1a396fb66470736f3f76ae9342b20357426e371f", - "sha256": "044p01vjb8i5c2fk5b9ji064224vxmj8d9qy9ddbik2bizqd51k1" + "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", + "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" }, "stable": { "version": [ @@ -104281,8 +104810,8 @@ "all-the-icons", "treemacs" ], - "commit": "1a396fb66470736f3f76ae9342b20357426e371f", - "sha256": "044p01vjb8i5c2fk5b9ji064224vxmj8d9qy9ddbik2bizqd51k1" + "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", + "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" } }, { @@ -104300,8 +104829,8 @@ "evil", "treemacs" ], - "commit": "1a396fb66470736f3f76ae9342b20357426e371f", - "sha256": "044p01vjb8i5c2fk5b9ji064224vxmj8d9qy9ddbik2bizqd51k1" + "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", + "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" }, "stable": { "version": [ @@ -104324,14 +104853,14 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210107, - 1251 + 20210605, + 1118 ], "deps": [ "treemacs" ], - "commit": "1a396fb66470736f3f76ae9342b20357426e371f", - "sha256": "044p01vjb8i5c2fk5b9ji064224vxmj8d9qy9ddbik2bizqd51k1" + "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", + "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" }, "stable": { "version": [ @@ -104362,8 +104891,8 @@ "pfuture", "treemacs" ], - "commit": "1a396fb66470736f3f76ae9342b20357426e371f", - "sha256": "044p01vjb8i5c2fk5b9ji064224vxmj8d9qy9ddbik2bizqd51k1" + "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", + "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" }, "stable": { "version": [ @@ -104395,8 +104924,8 @@ "persp-mode", "treemacs" ], - "commit": "1a396fb66470736f3f76ae9342b20357426e371f", - "sha256": "044p01vjb8i5c2fk5b9ji064224vxmj8d9qy9ddbik2bizqd51k1" + "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", + "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" }, "stable": { "version": [ @@ -104428,8 +104957,8 @@ "perspective", "treemacs" ], - "commit": "1a396fb66470736f3f76ae9342b20357426e371f", - "sha256": "044p01vjb8i5c2fk5b9ji064224vxmj8d9qy9ddbik2bizqd51k1" + "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", + "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" } }, { @@ -104447,8 +104976,8 @@ "projectile", "treemacs" ], - "commit": "1a396fb66470736f3f76ae9342b20357426e371f", - "sha256": "044p01vjb8i5c2fk5b9ji064224vxmj8d9qy9ddbik2bizqd51k1" + "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", + "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" }, "stable": { "version": [ @@ -104548,10 +105077,10 @@ }, { "ename": "tron-legacy-theme", - "commit": "975e93e060f50a1fd00a6ba1566a9386271bdfd6", - "sha256": "08cfhnkb62121h6dksw9c0d38vxm38dfbfww7c8kj491is0w63f4", + "commit": "f217fe20e19e1c3e249857c4fdde7a7cfde76c36", + "sha256": "1xy6n2rdga2if1slkqs6xdl2h8kf8h92xb03a3k99gznmgxdzcxw", "fetcher": "github", - "repo": "ianpan870102/tron-legacy-emacs-theme", + "repo": "ianyepan/tron-legacy-emacs-theme", "unstable": { "version": [ 20210420, @@ -104785,14 +105314,14 @@ "repo": "ocaml/tuareg", "unstable": { "version": [ - 20210320, - 1929 + 20210605, + 1629 ], "deps": [ "caml" ], - "commit": "37a673020152ae0dbcaa250118b155d84e448f68", - "sha256": "0b9bnfwcnxkwjrdb4vm7y8wznqz4z990pv1s473gs97l7p04b1j9" + "commit": "24c1a1adbe51d93f681e72442fa73f885eb33776", + "sha256": "1cp6g117kfmwfqb7sq4y4jx8ggp29f4hz2kz5g3355s8zhjlld2y" }, "stable": { "version": [ @@ -105343,28 +105872,28 @@ "repo": "undercover-el/undercover.el", "unstable": { "version": [ - 20210123, - 2157 + 20210602, + 2119 ], "deps": [ "dash", "shut-up" ], - "commit": "c36a7366aa080558125fa651ed6a28d5df735b37", - "sha256": "0qji4738q0yx2n0xrpk12q2akx8rgsvpfgnnfxrnk8xiywjfrqwz" + "commit": "1d3587f1fad66a747688f36636b67b33b73447d3", + "sha256": "0qmvyy3xg5qi7ws8zcs934d6afsappr1a6pgfp796xpa9vdr4y6j" }, "stable": { "version": [ 0, 8, - 0 + 1 ], "deps": [ "dash", "shut-up" ], - "commit": "0bc3583065e49647db47d8a595fec13cb517d12f", - "sha256": "19d3373fy635vbfwr1yhxirwqn68qzny9byv74smxws4ly04mr02" + "commit": "1d3587f1fad66a747688f36636b67b33b73447d3", + "sha256": "0qmvyy3xg5qi7ws8zcs934d6afsappr1a6pgfp796xpa9vdr4y6j" } }, { @@ -106345,14 +106874,14 @@ "repo": "diml/utop", "unstable": { "version": [ - 20210404, - 318 + 20210607, + 1941 ], "deps": [ "tuareg" ], - "commit": "711c24661ce625070f8981fab9c6f31ce72b0a52", - "sha256": "0xwc14blqzrsyp7mzza0vavbp622a86bz9na8dks5zir2fgmmaxm" + "commit": "bac3946079a98df00f31656dc10c6c9f1a8bc422", + "sha256": "1wbmr0n384501i97x0akcfwcigklwqgwvhdwgxw6zxxn5wdg60b2" }, "stable": { "version": [ @@ -107039,11 +107568,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20210429, - 2113 + 20210525, + 2135 ], - "commit": "a6e46f436495fb54ba57832450995425ad8dbc26", - "sha256": "0zm3ks1j60vdm9fqspa06fcgcz5mmz1pz4fgr21q001bi3wg8vfq" + "commit": "9e3e8a1edd82f7d056d3744f9e40cf8a5bac4ecc", + "sha256": "1kjzglpyrf1vbsb5gjcwmi5b38fvn5rx95yc8fwbizgisx70abkc" }, "stable": { "version": [ @@ -107658,11 +108187,11 @@ "repo": "blak3mill3r/vmd-mode", "unstable": { "version": [ - 20200727, - 701 + 20210524, + 27 ], - "commit": "31655a41caf006c3dd64d6e57f6c4488098f8bce", - "sha256": "1pnx977pm305kr0zakwy1wkdfpk09rilwx8rmai4459lyz0sa8j9" + "commit": "b2bdf2ab54f8fc37780e6b473e4ad69c0e9ff4a6", + "sha256": "0wraiy5v0h1j4i31fr1b83k613c01pajq2436f93r485c2529pzp" } }, { @@ -107796,17 +108325,17 @@ }, { "ename": "vscode-dark-plus-theme", - "commit": "0e7e489ea5cee3b1d2b6b5295cf95f3e1d9d6c60", - "sha256": "001xhi87dsh75sd0vg26v4w78rf1p8bhj1zhn3w7j255817xvcgd", + "commit": "f2397ff679c9f3b03bdead7b31a0dabc1e2f8d97", + "sha256": "0pwmv26cassw5d5h8p82i6jm8vd85m1ffb7i31w72w1s8x5y3j31", "fetcher": "github", - "repo": "ianpan870102/vscode-dark-plus-emacs-theme", + "repo": "ianyepan/vscode-dark-plus-emacs-theme", "unstable": { "version": [ - 20210430, - 819 + 20210530, + 629 ], - "commit": "24c4cb28042b3b9cc8f4e5294d7597f986aa6fae", - "sha256": "0b85sm6n2ahyyj220k5mqd5ar3x8204p0cfxjyhlk2f989jvfm3i" + "commit": "961c8c1fdd7eb874d4e2ce386d5e6d1f318b5b72", + "sha256": "1dga7yhb5pnqj5d86pvzbabrq05xj1ppx6g0hinhm8z6m8h6y540" }, "stable": { "version": [ @@ -107856,14 +108385,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20210518, - 1528 + 20210531, + 1453 ], "deps": [ "vterm" ], - "commit": "d726b54332b591ed05a89f1bd765960dd49d9a59", - "sha256": "03mcblwwfsa5d8k6xdfjzz5hp767j3p0ng3s113i2vylq4r27jav" + "commit": "afe60b814d9d045b968f4a464bbedb241b35392b", + "sha256": "007spqyc474k8fxi6l3s0jh8dg18d9b07wvz3lvbyrgdqwdw2a0p" } }, { @@ -108077,11 +108606,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210507, - 231 + 20210606, + 2300 ], - "commit": "2f95627b93dd49023b1d982329b4ccf8b7854109", - "sha256": "0l2dh75v1vmkh738iq5japh3fmqcinsb5s7qqirxlq54gznl7qm5" + "commit": "0e18a7e96c8e425ac7c2e69aa26fa6a1e8e6e51a", + "sha256": "1jxp447d8xnk4ixpni7rsph7fd3p58ydmi39yrx201hbqh15jxiz" } }, { @@ -108725,14 +109254,14 @@ "repo": "emacs-love/weblorg", "unstable": { "version": [ - 20210430, - 2251 + 20210526, + 129 ], "deps": [ "templatel" ], - "commit": "11ec801222eeb468878e6585efb55721592dbfe8", - "sha256": "01ipk5fwx5phsd6kr7kvdckhd19hly4szwlwl1a0jaxy0ab6iv54" + "commit": "ffea6a93f5d35fed8532f1187463a27eb46bff0a", + "sha256": "185crf3dgfqjq58s2bvdmvff5vmy73v4m4l2d17iwjyw3ifji5a8" }, "stable": { "version": [ @@ -108911,11 +109440,11 @@ "repo": "jstaursky/weyland-yutani-theme", "unstable": { "version": [ - 20210518, - 1738 + 20210530, + 1418 ], - "commit": "7e9b8d930b22900030f76b1e109ce64eb275b793", - "sha256": "06qimv5pxyz6rqz7v5fjkji3ay2cxs7h9bqf2y2jxpy6zsdy851m" + "commit": "a56c56de048900409d271f91fd08a408fd9bf32e", + "sha256": "0nblkcz52qvfkf4q3yb7drv0rbpkqgzv3clwb6vkvwz13s29b6my" } }, { @@ -109085,11 +109614,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20210407, - 28 + 20210601, + 252 ], - "commit": "5fb30301cb3b4fca5a0e1ce8ec1ef59290b79199", - "sha256": "1wgygby4zwlbx6ry6asraaixl169qdz092zgk1brvg63w7f8vkkb" + "commit": "fc29864395fdaf688e2ef5111831663bad89a020", + "sha256": "1adv32z8dmpygbrk14l1pj2535c10ncv8znfzgi1s908ds20kad1" }, "stable": { "version": [ @@ -109418,15 +109947,15 @@ "repo": "progfolio/wikinforg", "unstable": { "version": [ - 20210126, - 405 + 20210602, + 1459 ], "deps": [ "org", "wikinfo" ], - "commit": "2eb31ab00e4c8ad53dc15234f29527b9f0f54d71", - "sha256": "0sghvnvbbv3d7kdvcv2dbbzbv38b3jjzbrhjv6fn5lynyr929vqr" + "commit": "3aecd23e68b9117a03c65fafa85a0805b58609d1", + "sha256": "0m1fj06x9r941k2842v2091xbff89wp704ifrcdgb6zbksx5d8i2" } }, { @@ -109837,23 +110366,20 @@ "repo": "magit/with-editor", "unstable": { "version": [ - 20210427, - 1244 + 20210524, + 1654 ], - "commit": "86bdff68a106bc9d383fdab3bbf1ad4b703a52f0", - "sha256": "1rk8vza2g8gxybhjk10xj3pw9whc80cs9qv4avyv926g7dw60as9" + "commit": "5519b6a67ecd66865b4fdd5447425eee900c54f4", + "sha256": "1bmvkrfnjzrf0ch2mh75cv784mzs64i4f44l91xysapjqv46lfqn" }, "stable": { "version": [ 3, 0, - 2 - ], - "deps": [ - "async" + 4 ], - "commit": "6735180e73e787b79535c245b162249b70dbf841", - "sha256": "0hw6i5r3adkm4988badi94825lywkrh3sddiff4z04kj1nj15d0k" + "commit": "5519b6a67ecd66865b4fdd5447425eee900c54f4", + "sha256": "1bmvkrfnjzrf0ch2mh75cv784mzs64i4f44l91xysapjqv46lfqn" } }, { @@ -109943,23 +110469,19 @@ "repo": "DarwinAwardWinner/with-simulated-input", "unstable": { "version": [ - 20210514, - 349 + 20210527, + 2320 ], - "commit": "c377a673c86cdedd5d48418caf8f1ce621aca767", - "sha256": "10ms0cqxvicjs9lsbiy8h0hphx2dikr6bf1npybqwi7g643f2jzk" + "commit": "0f43fe46d4ab098c18a90b9df18cb96bab8e4a35", + "sha256": "0im6a1nr75mgz13zjavwycd5zsm5ysz5flbsmka7i8bkn2js1fm1" }, "stable": { "version": [ - 2, - 4 - ], - "deps": [ - "s", - "seq" + 3, + 0 ], - "commit": "3d881793521c5618cdb0968a85879e0e49da7fca", - "sha256": "12d3mhvzj74qwc4rdcb236jbqnf5lam8pk78j92kwbwjk1jaz2cf" + "commit": "ee4d2b75fd99bac3de40675b0a0e03529718f59f", + "sha256": "0n8h84whsh0aph8xhn9plprix9f6bysgvarz2anz7kwns19js6s4" } }, { @@ -111438,20 +111960,20 @@ "repo": "zkry/yaml.el", "unstable": { "version": [ - 20210424, - 2033 + 20210604, + 1500 ], - "commit": "d0abc17e3ddf42624d87fa6d2d3e1ba1dd175035", - "sha256": "19937d26gvj5ir1absb8rxyv35ac85xwvgb0nqcldmnqxqa2h66p" + "commit": "5b352258f50ec9d2e7ff8bd16323a24fb484b52b", + "sha256": "1zaj7w0jfzz7iwsnd8ql3pxgiw108dx0ggk2q5rqxdz5902hksqs" }, "stable": { "version": [ 0, - 2, - 1 + 3, + 2 ], - "commit": "d8ac09e8cad7f67339e19c53e77da1cd0ff98d36", - "sha256": "0wkrvhb5yhb38sf7w1njxij1x0pfxp56hn97j2bk4w58dz94fxir" + "commit": "5b352258f50ec9d2e7ff8bd16323a24fb484b52b", + "sha256": "1zaj7w0jfzz7iwsnd8ql3pxgiw108dx0ggk2q5rqxdz5902hksqs" } }, { @@ -111462,26 +111984,26 @@ "repo": "knu/yaml-imenu.el", "unstable": { "version": [ - 20201023, - 1524 + 20210530, + 251 ], "deps": [ "yaml-mode" ], - "commit": "fa37d9bf8a09af144980a42cc22891b1555a12ae", - "sha256": "08v2wxdcp5f43vl8976bn3lsiqkaph4driczgc0bw9p495fljb2p" + "commit": "01741205fb33d2ed511502d1cd65a711e07a3117", + "sha256": "1z8yzi322y8wnvci77xp7fb7x5l3z8zy1ng4zaa1z856va8x2971" }, "stable": { "version": [ 1, 0, - 2 + 3 ], "deps": [ "yaml-mode" ], - "commit": "fa37d9bf8a09af144980a42cc22891b1555a12ae", - "sha256": "08v2wxdcp5f43vl8976bn3lsiqkaph4driczgc0bw9p495fljb2p" + "commit": "01741205fb33d2ed511502d1cd65a711e07a3117", + "sha256": "1z8yzi322y8wnvci77xp7fb7x5l3z8zy1ng4zaa1z856va8x2971" } }, { @@ -112467,15 +112989,15 @@ "repo": "EFLS/zetteldeft", "unstable": { "version": [ - 20210520, - 724 + 20210602, + 841 ], "deps": [ "ace-window", "deft" ], - "commit": "bf46e764ed799d08e27c84e2c79cc643cab61322", - "sha256": "0x930i82090nfypm2qm60fx50y2ixv2b9szzz1ab07bb42ikpic2" + "commit": "b71f24d382887aeefde9c47fb6aa521d0ebeb806", + "sha256": "09wy2gllacry2n0cp52fakaa36lnd1mnbb26zysdjxh0429siy4a" }, "stable": { "version": [ @@ -112529,11 +113051,11 @@ "repo": "ziglang/zig-mode", "unstable": { "version": [ - 20210412, - 1428 + 20210605, + 513 ], - "commit": "2d0eb23e6b5c12b946f12c23803157605c90f02f", - "sha256": "0lpsqclk37nx8i9jfskbnvxrhvh6vaflgh63xijhv9ajx2iwpw0r" + "commit": "0babe7ec524f59d57c01e2fc66294d1afa01f5eb", + "sha256": "0balv7ggz10izjw7r6z9vx17qq88229jdzpsjas6z37gk61bfngk" } }, { @@ -112992,6 +113514,24 @@ } }, { + "ename": "zprint-format", + "commit": "54457e29def6ecfdf96f599e6a007f5ebee485b9", + "sha256": "1flb1i5byp6s8fj1vpgm5wc43f8hld7rg940m20a40ysr1x35szk", + "fetcher": "github", + "repo": "dpassen/zprint-format", + "unstable": { + "version": [ + 20210602, + 146 + ], + "deps": [ + "reformatter" + ], + "commit": "6051a5709ea6182974d7239f26e04c9731e04447", + "sha256": "1in5cyrj0kn1fdfcw7iaxhsxx5hn3r3r0aiida8p9dvkx8kq540l" + } + }, + { "ename": "zprint-mode", "commit": "188d40daec1ff86dcfa807a91eb77a1281de3951", "sha256": "1dwf941plwxib96n4g95pm51hhhaq643djn1hps8s7yyrzz77czz", diff --git a/pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix b/pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix index 237c05c5fa761..72dbf7a0f476b 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix @@ -1,16 +1,28 @@ -{ lib, stdenv, fetchurl, emacs, texinfo }: +{ lib +, stdenv +, fetchurl +, emacs +, texinfo +}: stdenv.mkDerivation rec { - name = "tramp-2.4.2"; + pname = "tramp"; + version = "2.5.0"; + src = fetchurl { - url = "mirror://gnu/tramp/${name}.tar.gz"; - sha256 = "082nwvi99y0bvpl1yhn4yjc8a613jh1pdck253lxn062lkcxxw61"; + url = "mirror://gnu/tramp/${pname}-${version}.tar.gz"; + sha256 = "sha256-w+6HJA8kFb75Z+7vM1zDnzOnkSSIXKnLVyCcEh+nMGY="; }; - buildInputs = [ emacs texinfo ]; + + buildInputs = [ + emacs + texinfo + ]; + meta = { - description = "Transparently access remote files from Emacs. Newer versions than built-in."; homepage = "https://www.gnu.org/software/tramp"; + description = "Transparently access remote files from Emacs. Newer versions than built-in."; license = lib.licenses.gpl3Plus; - platforms = lib.platforms.all; + inherit (emacs.meta) platforms; }; } diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index 597bd1f17056f..d6a2658d86267 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -13,14 +13,14 @@ let pythonPackages = python3Packages; in mkDerivation rec { - version = "1.13"; + version = "1.14"; pname = "renderdoc"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "MBvdnB1YPeCaXSgqqtGs0SMocbarjmaWtIUkBBCvufc="; + sha256 = "VO7pOLodXI0J7O4Y9b7YSl5BdtsIxmalFG5mqfuiJEw="; }; buildInputs = [ diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix index 6af4f67d8c65b..08d5524fc3a55 100644 --- a/pkgs/applications/misc/archivy/default.nix +++ b/pkgs/applications/misc/archivy/default.nix @@ -21,11 +21,11 @@ buildPythonApplication rec { pname = "archivy"; - version = "1.1.4"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oSmwQcKvp9RABmc7aq6fdLOZapMauIi6+7azVTXVb30="; + sha256 = "sha256-g7H22zJOQuxSmoJ3373eRcbderC67vkuiLN1CgaytFM="; }; # Relax some dependencies diff --git a/pkgs/applications/misc/base16-universal-manager/default.nix b/pkgs/applications/misc/base16-universal-manager/default.nix new file mode 100644 index 0000000000000..3d43a28709457 --- /dev/null +++ b/pkgs/applications/misc/base16-universal-manager/default.nix @@ -0,0 +1,22 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "base16-universal-manager"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "pinpox"; + repo = "base16-universal-manager"; + rev = "v${version}"; + sha256 = "11kal7x0lajzydbc2cvbsix9ympinsiqzfib7dg4b3xprqkyb9zl"; + }; + + vendorSha256 = "19rba689319w3wf0b10yafydyz01kqg8b051vnijcyjyk0khwvsk"; + + meta = with lib; { + description = "A universal manager to set base16 themes for any supported application"; + homepage = "https://github.com/pinpox/base16-universal-manager"; + license = licenses.mit; + maintainers = with maintainers; [ jo1gi ]; + }; +} diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index cf5ede1c7febf..305ab8917130f 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -12,7 +12,7 @@ , pugixml, llvmPackages, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL , potrace , openxr-loader -, embree, gmp +, embree, gmp, libharu }: with lib; @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { gmp pugixml potrace + libharu ] ++ (if (!stdenv.isDarwin) then [ libXi libX11 libXext libXrender diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix index b34661e6eb8ec..08ca656301431 100644 --- a/pkgs/applications/misc/jotta-cli/default.nix +++ b/pkgs/applications/misc/jotta-cli/default.nix @@ -5,10 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.9.39536"; + version = "0.11.44593"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "sha256-JZtc6Si3ZQoRG3q+ctzPPQm7WbMYRailIuq/Y5Avd2s="; + sha256 = "1f06zmcpvm0f3phwc43ai6v4ykhkrd4f3br2j89nx9bfmj6ss2ic"; stripRoot = false; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { postFixup = '' patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/jotta-cli patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/jottad - $out/bin/jotta-cli completion > $out/share/bash-completion/completions/jotta-cli.bash + $out/bin/jotta-cli completion bash > $out/share/bash-completion/completions/jotta-cli.bash ''; meta = with lib; { diff --git a/pkgs/applications/misc/navit/CMakeLists.txt.patch b/pkgs/applications/misc/navit/CMakeLists.txt.patch deleted file mode 100644 index 7f8a75f319be2..0000000000000 --- a/pkgs/applications/misc/navit/CMakeLists.txt.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 763f75b..defa74a 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -212,7 +212,7 @@ CHECK_INCLUDE_FILES(endian.h HAVE_ENDIAN_H) - CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H) - CHECK_INCLUDE_FILES(byteswap.h HAVE_BYTESWAP_H) - CHECK_LIBRARY_EXISTS(gypsy gypsy_control_get_default "" GYPSY_FOUND) --CHECK_INCLUDE_FILES(libspeechd.h HAVE_LIBSPEECHD) -+CHECK_INCLUDE_FILES(speech-dispatcher/libspeechd.h HAVE_LIBSPEECHD) - CHECK_INCLUDE_FILES(sys/socket.h HAVE_SOCKET) - CHECK_INCLUDE_FILES(sys/shm.h HAVE_SHMEM) - CHECK_FUNCTION_EXISTS(snprintf HAVE_SNPRINTF) diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix deleted file mode 100644 index c041c2969274e..0000000000000 --- a/pkgs/applications/misc/navit/default.nix +++ /dev/null @@ -1,90 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, gtk2, fontconfig, freetype, imlib2 -, SDL_image, libGLU, libGL, libXmu, freeglut, pcre, dbus, dbus-glib, glib -, librsvg, freeimage, libxslt, cairo, gdk-pixbuf, pango -, atk, patchelf, fetchurl, bzip2, python, gettext, quesoglc -, gd, cmake, shapelib, SDL_ttf, fribidi, makeWrapper -, qtquickcontrols, qtmultimedia, qtspeech, qtsensors -, qtlocation, qtdeclarative, qtsvg -, qtSupport ? false, qtbase #need to fix qt_qpainter -, sdlSupport ? true, SDL -, xkbdSupport ? true, xkbd -, espeakSupport ? true, espeak -, postgresqlSupport ? false, postgresql -, speechdSupport ? false, speechd ? null -}: - -assert speechdSupport -> speechd != null; - -with lib; -stdenv.mkDerivation rec { - pname = "navit"; - version = "0.5.3"; - - src = fetchFromGitHub { - owner = "navit-gps"; - repo = "navit"; - rev = "v${version}"; - sha256 = "071drvqzxpxbfh0lf0lra5a97rv8ny40l96n9xl0dx0s8w30j61i"; - }; - - sample_map = fetchurl { - url = "http://www.navit-project.org/maps/osm_bbox_11.3,47.9,11.7,48.2.osm.bz2"; - name = "sample_map.bz2"; - sha256 = "0vg6b6rhsa2cxqj4rbhfhhfss71syhnfa6f1jg2i2d7l88dm5x7d"; - }; - - patches = [ ./CMakeLists.txt.patch ]; - - NIX_CFLAGS_COMPILE = toString (optional sdlSupport "-I${SDL.dev}/include/SDL" - ++ optional speechdSupport "-I${speechd}/include/speech-dispatcher"); - - # we choose only cmdline and speech-dispatcher speech options. - # espeak builtins is made for non-cmdline OS as winCE - cmakeFlags = [ - "-DSAMPLE_MAP=n " "-DCMAKE_BUILD_TYPE=Release" - "-Dspeech/qt5_espeak=FALSE" "-Dsupport/espeak=FALSE" - ]; - - buildInputs = [ - gtk2 fontconfig freetype imlib2 libGLU libGL freeimage - libxslt libXmu freeglut python gettext quesoglc gd - fribidi pcre dbus dbus-glib librsvg shapelib glib - cairo gdk-pixbuf pango atk - ] ++ optionals sdlSupport [ SDL SDL_ttf SDL_image ] - ++ optional postgresqlSupport postgresql - ++ optional speechdSupport speechd - ++ optionals qtSupport [ - qtquickcontrols qtmultimedia qtspeech qtsensors - qtbase qtlocation qtdeclarative qtsvg - ]; - - nativeBuildInputs = [ makeWrapper pkg-config cmake patchelf bzip2 ]; - - # we dont want blank screen by defaut - postInstall = '' - # emulate DSAMPLE_MAP - mkdir -p $out/share/navit/maps/ - bzcat "${sample_map}" | $out/bin/maptool "$out/share/navit/maps/osm_bbox_11.3,47.9,11.7,48.2.bin" - ''; - - # TODO: fix upstream? - libPath = lib.makeLibraryPath ([ stdenv.cc.libc ] ++ buildInputs ); - postFixup = - '' - find "$out/lib" -type f -name "*.so" -exec patchelf --set-rpath $libPath {} \; - - wrapProgram $out/bin/navit \ - --prefix PATH : ${makeBinPath ( - optional xkbdSupport xkbd - ++ optional espeakSupport espeak - ++ optional speechdSupport speechd ) } - ''; - - meta = { - homepage = "https://www.navit-project.org"; - description = "Car navigation system with routing engine using OSM maps"; - license = licenses.gpl2; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index 41dc179efe09f..adff6741d31fe 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -1,18 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, asciidoctor }: stdenv.mkDerivation rec { pname = "timewarrior"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "GothenburgBitFactory"; repo = "timewarrior"; rev = "v${version}"; - sha256 = "0qvhpva0hmhybn0c2aajndw5vnxar1jw4pjjajd2k2cr6vax29dw"; + sha256 = "00ydikzmxym5jhv6w1ii12a6zw5ighddbzxsw03xg8yabzzfnvzw"; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake asciidoctor ]; + + dontUseCmakeBuildDir = true; meta = with lib; { description = "A command-line time tracker"; diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index 6bd2c60b09b07..fbd48287e32ac 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.13.1"; + version = "0.14.0"; src = fetchCrate { inherit pname version; - sha256 = "1aanw0l8b4ak0kikkixmb817qw48ypviq9dxdivzwc29rjvgp152"; + sha256 = "1cyybqb91n91h6nig7rxxxw9c7krz80jdfl25bdr7mlbzymssn0q"; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "16iaj1pqvqwi0rq4k3lmqwd8skbjf55133ri69hj26gz88k4q43w"; + cargoSha256 = "1bj1rgsmkbby4ma325fhpb911bwabhd5bihyv9j0dfvgm1ffdm8a"; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 7e95da747d1e5..57cac09191295 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -54,9 +54,9 @@ let # source tree. extraAttrs = buildFun base; - githubPatch = commit: sha256: fetchpatch { + githubPatch = { commit, sha256, revert ? false }: fetchpatch { url = "https://github.com/chromium/chromium/commit/${commit}.patch"; - inherit sha256; + inherit sha256 revert; }; mkGnFlags = @@ -166,6 +166,14 @@ let # Fix the build by adding a missing dependency (s. https://crbug.com/1197837): ./patches/fix-missing-atspi2-dependency.patch ./patches/closure_compiler-Use-the-Java-binary-from-the-system.patch + ] ++ lib.optionals (chromiumVersionAtLeast "93") [ + # We need to revert this patch to build M93 with LLVM 12. + (githubPatch { + # Reland "Replace 'blacklist' with 'ignorelist' in ./tools/msan/." + commit = "9d080c0934b848ee4a05013c78641e612fcc1e03"; + sha256 = "1bxdhxmiy6h4acq26lq43x2mxx6rawmfmlgsh5j7w8kyhkw5af0c"; + revert = true; + }) ]; postPatch = '' diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 9762bcbbe9d95..be7a84576b3ef 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -31,9 +31,9 @@ } }, "dev": { - "version": "93.0.4530.5", - "sha256": "0xxnn9fbwgmfk0zz5an35na1zprhas487pbg2qpgg76g50zxnsx5", - "sha256bin64": "14fzmfhaiish91byg7knr9nf2cigklfvy145vc7qhg17b6gzba25", + "version": "93.0.4535.3", + "sha256": "19iy4p59n0pg9s39g614y4yxh5f6h86bcp471qdnm6fvzmzcxd18", + "sha256bin64": "16q9s8l20bmr2n0y3pi505l5hbhbmpi8kh47aylj5gzk1nr30a8r", "deps": { "gn": { "version": "2021-05-07", diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index e35fd6ca701b7..a44fb2032f487 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -116,7 +116,9 @@ let then overrideCC stdenv llvmPackages.clangUseLLVM else stdenv; - nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss; + # Disable p11-kit support in nss until our cacert packages has caught up exposing CKA_NSS_MOZILLA_CA_POLICY + # https://github.com/NixOS/nixpkgs/issues/126065 + nss_pkg = if lib.versionOlder ffversion "83" then nss_3_53 else nss.override { useP11kit = false; }; # --enable-release adds -ffunction-sections & LTO that require a big amount of # RAM and the 32-bit memory space cannot handle that linking diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0fe5b452ffc8b..c9c61254c527e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -14,6 +14,15 @@ "sha256": "1wdrjpd3l0xadsa3lqhsc9c57g8x2qkwb76q824sk8za1a7lapii", "version": "1.5.0-patched" }, + "aiven": { + "owner": "aiven", + "provider-source-address": "registry.terraform.io/aiven/aiven", + "repo": "terraform-provider-aiven", + "rev": "v2.1.14", + "sha256": "14bfdhn3daygj1v3lm9b3791sx2cd5h0panchpp39h6vrccrpmmk", + "vendorSha256": "1j09bfbld03yxq0vv9ld0xmw5axbza2bwlz01i1gl1v9dprlnbkc", + "version": "2.1.14" + }, "akamai": { "owner": "terraform-providers", "provider-source-address": "registry.terraform.io/akamai/akamai", @@ -611,6 +620,7 @@ }, "metal": { "owner": "equinix", + "provider-source-address": "registry.terraform.io/equinix/metal", "repo": "terraform-provider-metal", "rev": "v2.1.0", "sha256": "06i3rj6ig8hxbncdpa8b11v8pr3zhi90ppmf77jjin1114ikd172", diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index f2c11bc92cb6f..66185b2cc3d91 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -171,6 +171,14 @@ in rec { passthru = { inherit plugins; }; }); + terraform_1_0_0 = pluggable (generic { + version = "1.0.0"; + sha256 = "sha256-ddcT/I2Qn1pKFyhXgh+CcD3fSv2steSNmjyyiS2SE/o="; + vendorSha256 = "sha256-oFvoEsDunJR4IULdGwS6nHBKWEgUehgT+nNM41W/GYo="; + patches = [ ./provider-path-0_15.patch ]; + passthru = { inherit plugins; }; + }); + # Tests that the plugins are being used. Terraform looks at the specific # file pattern and if the plugin is not found it will try to download it # from the Internet. With sandboxing enable this test will fail if that is diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index f1e23908723a2..2c3deff9f15ea 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.29.8"; + version = "0.29.9"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zHfY1pl9r9N1Jx9TzbOFYt2VR9hvHWcdFhPc36Q3apE="; + sha256 = "sha256-xgoKxA8lc72yhFVHeFkbF5j5/vGAd9TTaJ/aDEYL8Wg="; }; vendorSha256 = "sha256-qlSCQtiGHmlk3DyETMoQbbSYhuUSZTsvAnBKuDJI8x8="; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index d07b7d2912a39..d4332c0265c54 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -18,24 +18,15 @@ stdenv.mkDerivation rec { pname = "dino"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; rev = "v${version}"; - sha256 = "0wy1hb3kz3k4gqqwx308n37cqag2d017jwfz0b5s30nkx2pbwspw"; + sha256 = "11m38syqzb1z92wmdaf45gryl6gjxwbcnk32j4p984ipqj2vdzd8"; }; - patches = [ - # Fixes https://github.com/dino/dino/issues/1010 (double' is not a supported generic type argument) - (fetchpatch { - name = "dino-vala-boxing.patch"; - url = "https://github.com/dino/dino/commit/9acb54df9254609f2fe4de83c9047d408412de28.patch"; - sha256 = "1jz4r7d8b1ljwgq846wihp864b6gjdkgh6fnmxh13b2i10x52xsm"; - }) - ]; - nativeBuildInputs = [ vala cmake diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 901e056025be2..5293c55f12783 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.29", + "version": "1.7.30", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -47,8 +47,9 @@ "electron-builder-squirrel-windows": "22.10.5", "electron-devtools-installer": "^3.1.1", "electron-notarize": "^1.0.0", - "eslint": "7.3.1", - "eslint-config-matrix-org": "^0.1.2", + "eslint": "7.18.0", + "eslint-config-google": "^0.14.0", + "eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#main", "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", @@ -67,7 +68,7 @@ }, "build": { "appId": "im.riot.app", - "electronVersion": "12.0.2", + "electronVersion": "12.0.9", "files": [ "package.json", { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index 7d26fbbbff76c..258f5cb2dade5 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -26,14 +26,6 @@ }; } { - name = "_babel_code_frame___code_frame_7.10.4.tgz"; - path = fetchurl { - name = "_babel_code_frame___code_frame_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz"; - sha1 = "168da1a36e90da68ae8d49c0f1b48c7c6249213a"; - }; - } - { name = "_babel_code_frame___code_frame_7.12.13.tgz"; path = fetchurl { name = "_babel_code_frame___code_frame_7.12.13.tgz"; @@ -42,14 +34,6 @@ }; } { - name = "_babel_generator___generator_7.10.5.tgz"; - path = fetchurl { - name = "_babel_generator___generator_7.10.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.10.5.tgz"; - sha1 = "1b903554bc8c583ee8d25f1e8969732e6b829a69"; - }; - } - { name = "_babel_generator___generator_7.13.16.tgz"; path = fetchurl { name = "_babel_generator___generator_7.13.16.tgz"; @@ -58,14 +42,6 @@ }; } { - name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; - path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"; - sha1 = "d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"; - }; - } - { name = "_babel_helper_function_name___helper_function_name_7.12.13.tgz"; path = fetchurl { name = "_babel_helper_function_name___helper_function_name_7.12.13.tgz"; @@ -74,14 +50,6 @@ }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; - path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz"; - sha1 = "98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"; - }; - } - { name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; path = fetchurl { name = "_babel_helper_get_function_arity___helper_get_function_arity_7.12.13.tgz"; @@ -90,14 +58,6 @@ }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.4.tgz"; - path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.4.tgz"; - sha1 = "2c70576eaa3b5609b24cb99db2888cc3fc4251d1"; - }; - } - { name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; path = fetchurl { name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.12.13.tgz"; @@ -106,14 +66,6 @@ }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; - path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz"; - sha1 = "a78c7a7251e01f616512d31b10adcf52ada5e0d2"; - }; - } - { name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; path = fetchurl { name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; @@ -130,14 +82,6 @@ }; } { - name = "_babel_highlight___highlight_7.10.4.tgz"; - path = fetchurl { - name = "_babel_highlight___highlight_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz"; - sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143"; - }; - } - { name = "_babel_highlight___highlight_7.13.10.tgz"; path = fetchurl { name = "_babel_highlight___highlight_7.13.10.tgz"; @@ -146,14 +90,6 @@ }; } { - name = "_babel_parser___parser_7.10.5.tgz"; - path = fetchurl { - name = "_babel_parser___parser_7.10.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.5.tgz"; - sha1 = "e7c6bf5a7deff957cec9f04b551e2762909d826b"; - }; - } - { name = "_babel_parser___parser_7.13.16.tgz"; path = fetchurl { name = "_babel_parser___parser_7.13.16.tgz"; @@ -170,14 +106,6 @@ }; } { - name = "_babel_template___template_7.10.4.tgz"; - path = fetchurl { - name = "_babel_template___template_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz"; - sha1 = "3251996c4200ebc71d1a8fc405fba940f36ba278"; - }; - } - { name = "_babel_template___template_7.12.13.tgz"; path = fetchurl { name = "_babel_template___template_7.12.13.tgz"; @@ -194,22 +122,6 @@ }; } { - name = "_babel_traverse___traverse_7.10.5.tgz"; - path = fetchurl { - name = "_babel_traverse___traverse_7.10.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.5.tgz"; - sha1 = "77ce464f5b258be265af618d8fddf0536f20b564"; - }; - } - { - name = "_babel_types___types_7.10.5.tgz"; - path = fetchurl { - name = "_babel_types___types_7.10.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.10.5.tgz"; - sha1 = "d88ae7e2fde86bfbfe851d4d81afa70a997b5d15"; - }; - } - { name = "_babel_types___types_7.13.17.tgz"; path = fetchurl { name = "_babel_types___types_7.13.17.tgz"; @@ -234,6 +146,14 @@ }; } { + name = "_eslint_eslintrc___eslintrc_0.3.0.tgz"; + path = fetchurl { + name = "_eslint_eslintrc___eslintrc_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz"; + sha1 = "d736d6963d7003b6514e6324bec9c602ac340318"; + }; + } + { name = "_iarna_cli___cli_1.2.0.tgz"; path = fetchurl { name = "_iarna_cli___cli_1.2.0.tgz"; @@ -530,14 +450,6 @@ }; } { - name = "_types_eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz"; - path = fetchurl { - name = "_types_eslint_visitor_keys___eslint_visitor_keys_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz"; - sha1 = "1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"; - }; - } - { name = "_types_fs_extra___fs_extra_9.0.9.tgz"; path = fetchurl { name = "_types_fs_extra___fs_extra_9.0.9.tgz"; @@ -554,22 +466,6 @@ }; } { - name = "_types_json_schema___json_schema_7.0.5.tgz"; - path = fetchurl { - name = "_types_json_schema___json_schema_7.0.5.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.5.tgz"; - sha1 = "dcce4430e64b443ba8945f0290fb564ad5bac6dd"; - }; - } - { - name = "_types_json5___json5_0.0.29.tgz"; - path = fetchurl { - name = "_types_json5___json5_0.0.29.tgz"; - url = "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz"; - sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; - }; - } - { name = "_types_minimatch___minimatch_3.0.4.tgz"; path = fetchurl { name = "_types_minimatch___minimatch_3.0.4.tgz"; @@ -626,54 +522,6 @@ }; } { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_3.7.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.7.0.tgz"; - sha1 = "0f91aa3c83d019591719e597fbdb73a59595a263"; - }; - } - { - name = "_typescript_eslint_experimental_utils___experimental_utils_3.7.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_experimental_utils___experimental_utils_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-3.7.0.tgz"; - sha1 = "0ee21f6c48b2b30c63211da23827725078d5169a"; - }; - } - { - name = "_typescript_eslint_parser___parser_3.7.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_parser___parser_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-3.7.0.tgz"; - sha1 = "3e9cd9df9ea644536feb6e5acdb8279ecff96ce9"; - }; - } - { - name = "_typescript_eslint_types___types_3.7.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_types___types_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.7.0.tgz"; - sha1 = "09897fab0cb95479c01166b10b2c03c224821077"; - }; - } - { - name = "_typescript_eslint_typescript_estree___typescript_estree_3.7.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.7.0.tgz"; - sha1 = "66872e6da120caa4b64e6b4ca5c8702afc74738d"; - }; - } - { - name = "_typescript_eslint_visitor_keys___visitor_keys_3.7.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_visitor_keys___visitor_keys_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-3.7.0.tgz"; - sha1 = "ac0417d382a136e4571a0b0dcfe52088cb628177"; - }; - } - { name = "JSONStream___JSONStream_1.3.5.tgz"; path = fetchurl { name = "JSONStream___JSONStream_1.3.5.tgz"; @@ -690,19 +538,19 @@ }; } { - name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz"; - sha1 = "4c66069173d6fdd68ed85239fc256226182b2ebe"; + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; + sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b"; }; } { - name = "acorn___acorn_7.3.1.tgz"; + name = "acorn___acorn_7.4.1.tgz"; path = fetchurl { - name = "acorn___acorn_7.3.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz"; - sha1 = "85010754db53c3fbaf3b9ea3e083aa5c5d147ffd"; + name = "acorn___acorn_7.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; + sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa"; }; } { @@ -746,14 +594,6 @@ }; } { - name = "ajv___ajv_6.10.2.tgz"; - path = fetchurl { - name = "ajv___ajv_6.10.2.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz"; - sha1 = "d3cea04d6b017b2894ad69040fec8b623eb4bd52"; - }; - } - { name = "ajv___ajv_6.12.2.tgz"; path = fetchurl { name = "ajv___ajv_6.12.2.tgz"; @@ -778,6 +618,22 @@ }; } { + name = "ajv___ajv_6.10.2.tgz"; + path = fetchurl { + name = "ajv___ajv_6.10.2.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz"; + sha1 = "d3cea04d6b017b2894ad69040fec8b623eb4bd52"; + }; + } + { + name = "ajv___ajv_8.5.0.tgz"; + path = fetchurl { + name = "ajv___ajv_8.5.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.5.0.tgz"; + sha1 = "695528274bcb5afc865446aa275484049a18ae4b"; + }; + } + { name = "ansi_align___ansi_align_2.0.0.tgz"; path = fetchurl { name = "ansi_align___ansi_align_2.0.0.tgz"; @@ -802,14 +658,6 @@ }; } { - name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; - path = fetchurl { - name = "ansi_escapes___ansi_escapes_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; - sha1 = "a5c47cc43181f1f38ffd7076837700d395522a61"; - }; - } - { name = "ansi_regex___ansi_regex_2.1.1.tgz"; path = fetchurl { name = "ansi_regex___ansi_regex_2.1.1.tgz"; @@ -970,30 +818,6 @@ }; } { - name = "array_includes___array_includes_3.1.1.tgz"; - path = fetchurl { - name = "array_includes___array_includes_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz"; - sha1 = "cdd67e6852bdf9c1215460786732255ed2459348"; - }; - } - { - name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; - path = fetchurl { - name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz"; - sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b"; - }; - } - { - name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz"; - path = fetchurl { - name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz"; - sha1 = "1c13f84a178566042dd63de4414440db9222e443"; - }; - } - { name = "asap___asap_2.0.6.tgz"; path = fetchurl { name = "asap___asap_2.0.6.tgz"; @@ -1034,11 +858,11 @@ }; } { - name = "astral_regex___astral_regex_1.0.0.tgz"; + name = "astral_regex___astral_regex_2.0.0.tgz"; path = fetchurl { - name = "astral_regex___astral_regex_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz"; - sha1 = "6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"; + name = "astral_regex___astral_regex_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; + sha1 = "483143c567aeed4785759c0865786dc77d7d2e31"; }; } { @@ -1114,14 +938,6 @@ }; } { - name = "babel_eslint___babel_eslint_10.1.0.tgz"; - path = fetchurl { - name = "babel_eslint___babel_eslint_10.1.0.tgz"; - url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz"; - sha1 = "6968e568a910b78fb3779cdd8b6ac2f479943232"; - }; - } - { name = "balanced_match___balanced_match_1.0.0.tgz"; path = fetchurl { name = "balanced_match___balanced_match_1.0.0.tgz"; @@ -1410,14 +1226,6 @@ }; } { - name = "chardet___chardet_0.7.0.tgz"; - path = fetchurl { - name = "chardet___chardet_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz"; - sha1 = "90094849f0937f2eedc2425d0d28a9e5f0cbad9e"; - }; - } - { name = "chownr___chownr_1.1.4.tgz"; path = fetchurl { name = "chownr___chownr_1.1.4.tgz"; @@ -1490,14 +1298,6 @@ }; } { - name = "cli_cursor___cli_cursor_3.1.0.tgz"; - path = fetchurl { - name = "cli_cursor___cli_cursor_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz"; - sha1 = "264305a7ae490d1d03bf0c9ba7c925d1753af307"; - }; - } - { name = "cli_table3___cli_table3_0.5.1.tgz"; path = fetchurl { name = "cli_table3___cli_table3_0.5.1.tgz"; @@ -1514,14 +1314,6 @@ }; } { - name = "cli_width___cli_width_3.0.0.tgz"; - path = fetchurl { - name = "cli_width___cli_width_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz"; - sha1 = "a2f48437a2caa9a22436e794bf071ec9e61cedf6"; - }; - } - { name = "cliui___cliui_3.2.0.tgz"; path = fetchurl { name = "cliui___cliui_3.2.0.tgz"; @@ -1730,14 +1522,6 @@ }; } { - name = "contains_path___contains_path_0.1.0.tgz"; - path = fetchurl { - name = "contains_path___contains_path_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz"; - sha1 = "fe8cf184ff6670b6baef01a9d4861a5cbec4120a"; - }; - } - { name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; path = fetchurl { name = "copy_concurrently___copy_concurrently_1.0.5.tgz"; @@ -1802,14 +1586,6 @@ }; } { - name = "cross_spawn___cross_spawn_6.0.5.tgz"; - path = fetchurl { - name = "cross_spawn___cross_spawn_6.0.5.tgz"; - url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz"; - sha1 = "4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"; - }; - } - { name = "cross_spawn___cross_spawn_7.0.3.tgz"; path = fetchurl { name = "cross_spawn___cross_spawn_7.0.3.tgz"; @@ -1882,14 +1658,6 @@ }; } { - name = "debug___debug_2.6.9.tgz"; - path = fetchurl { - name = "debug___debug_2.6.9.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; - sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; - }; - } - { name = "debug___debug_3.2.6.tgz"; path = fetchurl { name = "debug___debug_3.2.6.tgz"; @@ -2066,22 +1834,6 @@ }; } { - name = "doctrine___doctrine_1.5.0.tgz"; - path = fetchurl { - name = "doctrine___doctrine_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz"; - sha1 = "379dce730f6166f76cefa4e6707a159b02c5a6fa"; - }; - } - { - name = "doctrine___doctrine_2.1.0.tgz"; - path = fetchurl { - name = "doctrine___doctrine_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz"; - sha1 = "5cd01fc101621b42c4cd7f5d1a66243716d3f39d"; - }; - } - { name = "doctrine___doctrine_3.0.0.tgz"; path = fetchurl { name = "doctrine___doctrine_3.0.0.tgz"; @@ -2322,14 +2074,6 @@ }; } { - name = "es_abstract___es_abstract_1.17.6.tgz"; - path = fetchurl { - name = "es_abstract___es_abstract_1.17.6.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.6.tgz"; - sha1 = "9142071707857b2cacc7b89ecb670316c3e2d52a"; - }; - } - { name = "es_abstract___es_abstract_1.16.3.tgz"; path = fetchurl { name = "es_abstract___es_abstract_1.16.3.tgz"; @@ -2386,14 +2130,6 @@ }; } { - name = "eslint_config_esnext___eslint_config_esnext_4.1.0.tgz"; - path = fetchurl { - name = "eslint_config_esnext___eslint_config_esnext_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-esnext/-/eslint-config-esnext-4.1.0.tgz"; - sha1 = "8695b858fcf40d28c1aedca181f700528c7b60c6"; - }; - } - { name = "eslint_config_google___eslint_config_google_0.14.0.tgz"; path = fetchurl { name = "eslint_config_google___eslint_config_google_0.14.0.tgz"; @@ -2402,115 +2138,19 @@ }; } { - name = "eslint_config_matrix_org___eslint_config_matrix_org_0.1.2.tgz"; - path = fetchurl { - name = "eslint_config_matrix_org___eslint_config_matrix_org_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-matrix-org/-/eslint-config-matrix-org-0.1.2.tgz"; - sha1 = "b5d7e193e4f3fc5041905967b53c5ddd6924c793"; - }; - } - { - name = "eslint_config_node___eslint_config_node_4.1.0.tgz"; - path = fetchurl { - name = "eslint_config_node___eslint_config_node_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-node/-/eslint-config-node-4.1.0.tgz"; - sha1 = "fc1f13946d83766d6b83b0e67699e2071a56f417"; - }; - } - { - name = "eslint_config_react_native___eslint_config_react_native_4.1.0.tgz"; - path = fetchurl { - name = "eslint_config_react_native___eslint_config_react_native_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-react-native/-/eslint-config-react-native-4.1.0.tgz"; - sha1 = "63e9401c7fac146804785f609e7df8f15b3e04eb"; - }; - } - { - name = "eslint_config_recommended___eslint_config_recommended_4.1.0.tgz"; - path = fetchurl { - name = "eslint_config_recommended___eslint_config_recommended_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-recommended/-/eslint-config-recommended-4.1.0.tgz"; - sha1 = "1adff90e0716d439be471d192977f233de171a46"; - }; - } - { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; - path = fetchurl { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz"; - sha1 = "85ffa81942c25012d8231096ddf679c03042c717"; - }; - } - { - name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; - path = fetchurl { - name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz"; - sha1 = "579ebd094f56af7797d19c9866c9c9486629bfa6"; - }; - } - { - name = "eslint_plugin_babel___eslint_plugin_babel_5.3.1.tgz"; - path = fetchurl { - name = "eslint_plugin_babel___eslint_plugin_babel_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-5.3.1.tgz"; - sha1 = "75a2413ffbf17e7be57458301c60291f2cfbf560"; - }; - } - { - name = "eslint_plugin_import___eslint_plugin_import_2.22.0.tgz"; - path = fetchurl { - name = "eslint_plugin_import___eslint_plugin_import_2.22.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz"; - sha1 = "92f7736fe1fde3e2de77623c838dd992ff5ffb7e"; - }; - } - { - name = "eslint_plugin_react_native_globals___eslint_plugin_react_native_globals_0.1.2.tgz"; - path = fetchurl { - name = "eslint_plugin_react_native_globals___eslint_plugin_react_native_globals_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react-native-globals/-/eslint-plugin-react-native-globals-0.1.2.tgz"; - sha1 = "ee1348bc2ceb912303ce6bdbd22e2f045ea86ea2"; - }; - } - { - name = "eslint_plugin_react_native___eslint_plugin_react_native_3.8.1.tgz"; - path = fetchurl { - name = "eslint_plugin_react_native___eslint_plugin_react_native_3.8.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react-native/-/eslint-plugin-react-native-3.8.1.tgz"; - sha1 = "92811e37191ecb0d29c0f0a0c9e5c943ee573821"; - }; - } - { - name = "eslint_plugin_react___eslint_plugin_react_7.20.3.tgz"; + name = "53000626a9256811f6b355de4eafeb5575bda7fc"; path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.20.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.3.tgz"; - sha1 = "0590525e7eb83890ce71f73c2cf836284ad8c2f1"; + name = "53000626a9256811f6b355de4eafeb5575bda7fc"; + url = "https://codeload.github.com/matrix-org/eslint-plugin-matrix-org/tar.gz/53000626a9256811f6b355de4eafeb5575bda7fc"; + sha1 = "12617a8105ab0ea2e7df2567928260a41ebffd58"; }; } { - name = "eslint_rule_composer___eslint_rule_composer_0.3.0.tgz"; + name = "eslint_scope___eslint_scope_5.1.1.tgz"; path = fetchurl { - name = "eslint_rule_composer___eslint_rule_composer_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz"; - sha1 = "79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"; - }; - } - { - name = "eslint_scope___eslint_scope_5.1.0.tgz"; - path = fetchurl { - name = "eslint_scope___eslint_scope_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz"; - sha1 = "d0f971dfe59c69e0cada684b23d49dbf82600ce5"; - }; - } - { - name = "eslint_utils___eslint_utils_1.4.3.tgz"; - path = fetchurl { - name = "eslint_utils___eslint_utils_1.4.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz"; - sha1 = "74fec7c54d0776b6f67e0251040b5806564e981f"; + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha1 = "e786e59a66cb92b3f6c1fb0d508aab174848f48c"; }; } { @@ -2538,35 +2178,27 @@ }; } { - name = "eslint___eslint_7.3.1.tgz"; - path = fetchurl { - name = "eslint___eslint_7.3.1.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-7.3.1.tgz"; - sha1 = "76392bd7e44468d046149ba128d1566c59acbe19"; - }; - } - { - name = "eslint___eslint_6.8.0.tgz"; + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; path = fetchurl { - name = "eslint___eslint_6.8.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz"; - sha1 = "62262d6729739f9275723824302fb227c8c93ffb"; + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; + sha1 = "f65328259305927392c938ed44eb0a5c9b2bd303"; }; } { - name = "espree___espree_6.2.1.tgz"; + name = "eslint___eslint_7.18.0.tgz"; path = fetchurl { - name = "espree___espree_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz"; - sha1 = "77fc72e1fd744a2052c20f38a5b575832e82734a"; + name = "eslint___eslint_7.18.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.18.0.tgz"; + sha1 = "7fdcd2f3715a41fe6295a16234bd69aed2c75e67"; }; } { - name = "espree___espree_7.2.0.tgz"; + name = "espree___espree_7.3.1.tgz"; path = fetchurl { - name = "espree___espree_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-7.2.0.tgz"; - sha1 = "1c263d5b513dbad0ac30c4991b93ac354e948d69"; + name = "espree___espree_7.3.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz"; + sha1 = "f2df330b752c6f55019f8bd89b7660039c1bbbb6"; }; } { @@ -2578,14 +2210,6 @@ }; } { - name = "esquery___esquery_1.0.1.tgz"; - path = fetchurl { - name = "esquery___esquery_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz"; - sha1 = "406c51658b1f5991a5f9b62b1dc25b00e3e5c708"; - }; - } - { name = "esquery___esquery_1.3.1.tgz"; path = fetchurl { name = "esquery___esquery_1.3.1.tgz"; @@ -2594,11 +2218,11 @@ }; } { - name = "esrecurse___esrecurse_4.2.1.tgz"; + name = "esrecurse___esrecurse_4.3.0.tgz"; path = fetchurl { - name = "esrecurse___esrecurse_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz"; - sha1 = "007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"; + name = "esrecurse___esrecurse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; + sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921"; }; } { @@ -2618,6 +2242,14 @@ }; } { + name = "estraverse___estraverse_5.2.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; + sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880"; + }; + } + { name = "esutils___esutils_2.0.3.tgz"; path = fetchurl { name = "esutils___esutils_2.0.3.tgz"; @@ -2666,14 +2298,6 @@ }; } { - name = "external_editor___external_editor_3.1.0.tgz"; - path = fetchurl { - name = "external_editor___external_editor_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz"; - sha1 = "cb03f740befae03ea4d283caed2741a83f335495"; - }; - } - { name = "extsprintf___extsprintf_1.3.0.tgz"; path = fetchurl { name = "extsprintf___extsprintf_1.3.0.tgz"; @@ -2730,19 +2354,11 @@ }; } { - name = "figures___figures_3.2.0.tgz"; + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; path = fetchurl { - name = "figures___figures_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz"; - sha1 = "625c18bd293c604dc4a8ddb2febf0c88341746af"; - }; - } - { - name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; - path = fetchurl { - name = "file_entry_cache___file_entry_cache_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz"; - sha1 = "ca0f6efa6dd3d561333fb14515065c2fafdf439c"; + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; + sha1 = "211b2dd9659cb0394b073e7323ac3c933d522027"; }; } { @@ -2786,19 +2402,19 @@ }; } { - name = "flat_cache___flat_cache_2.0.1.tgz"; + name = "flat_cache___flat_cache_3.0.4.tgz"; path = fetchurl { - name = "flat_cache___flat_cache_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz"; - sha1 = "5d296d6f04bda44a4630a301413bdbc2ec085ec0"; + name = "flat_cache___flat_cache_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz"; + sha1 = "61b0338302b2fe9f957dcc32fc2a87f1c3048b11"; }; } { - name = "flatted___flatted_2.0.1.tgz"; + name = "flatted___flatted_3.1.1.tgz"; path = fetchurl { - name = "flatted___flatted_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz"; - sha1 = "69e57caa8f0eacbc281d2e2cb458d46fdb449e08"; + name = "flatted___flatted_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz"; + sha1 = "c4b489e80096d9df1dfc97c79871aea7c617c469"; }; } { @@ -3370,6 +2986,14 @@ }; } { + name = "import_fresh___import_fresh_3.3.0.tgz"; + path = fetchurl { + name = "import_fresh___import_fresh_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz"; + sha1 = "37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"; + }; + } + { name = "import_lazy___import_lazy_2.1.0.tgz"; path = fetchurl { name = "import_lazy___import_lazy_2.1.0.tgz"; @@ -3442,22 +3066,6 @@ }; } { - name = "inquirer___inquirer_7.3.2.tgz"; - path = fetchurl { - name = "inquirer___inquirer_7.3.2.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.2.tgz"; - sha1 = "25245d2e32dc9f33dbe26eeaada231daa66e9c7c"; - }; - } - { - name = "internal_slot___internal_slot_1.0.2.tgz"; - path = fetchurl { - name = "internal_slot___internal_slot_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz"; - sha1 = "9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"; - }; - } - { name = "invert_kv___invert_kv_1.0.0.tgz"; path = fetchurl { name = "invert_kv___invert_kv_1.0.0.tgz"; @@ -3498,14 +3106,6 @@ }; } { - name = "is_callable___is_callable_1.2.0.tgz"; - path = fetchurl { - name = "is_callable___is_callable_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.0.tgz"; - sha1 = "83336560b54a38e35e3a2df7afd0454d691468bb"; - }; - } - { name = "is_ci___is_ci_1.2.1.tgz"; path = fetchurl { name = "is_ci___is_ci_1.2.1.tgz"; @@ -3674,14 +3274,6 @@ }; } { - name = "is_regex___is_regex_1.1.0.tgz"; - path = fetchurl { - name = "is_regex___is_regex_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.0.tgz"; - sha1 = "ece38e389e490df0dc21caea2bd596f987f767ff"; - }; - } - { name = "is_retry_allowed___is_retry_allowed_1.2.0.tgz"; path = fetchurl { name = "is_retry_allowed___is_retry_allowed_1.2.0.tgz"; @@ -3698,14 +3290,6 @@ }; } { - name = "is_string___is_string_1.0.5.tgz"; - path = fetchurl { - name = "is_string___is_string_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz"; - sha1 = "40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"; - }; - } - { name = "is_symbol___is_symbol_1.0.3.tgz"; path = fetchurl { name = "is_symbol___is_symbol_1.0.3.tgz"; @@ -3858,6 +3442,14 @@ }; } { + name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; + sha1 = "ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"; + }; + } + { name = "json_schema_typed___json_schema_typed_7.0.3.tgz"; path = fetchurl { name = "json_schema_typed___json_schema_typed_7.0.3.tgz"; @@ -3890,14 +3482,6 @@ }; } { - name = "json5___json5_1.0.1.tgz"; - path = fetchurl { - name = "json5___json5_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz"; - sha1 = "779fb0018604fa854eacbf6252180d83543e3dbe"; - }; - } - { name = "json5___json5_2.1.3.tgz"; path = fetchurl { name = "json5___json5_2.1.3.tgz"; @@ -3938,14 +3522,6 @@ }; } { - name = "jsx_ast_utils___jsx_ast_utils_2.4.1.tgz"; - path = fetchurl { - name = "jsx_ast_utils___jsx_ast_utils_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz"; - sha1 = "1114a4c1209481db06c690c2b4f488cc665f657e"; - }; - } - { name = "jszip___jszip_3.5.0.tgz"; path = fetchurl { name = "jszip___jszip_3.5.0.tgz"; @@ -4010,14 +3586,6 @@ }; } { - name = "levn___levn_0.3.0.tgz"; - path = fetchurl { - name = "levn___levn_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; - sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; - }; - } - { name = "levn___levn_0.4.1.tgz"; path = fetchurl { name = "levn___levn_0.4.1.tgz"; @@ -4226,6 +3794,14 @@ }; } { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + path = fetchurl { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; + sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; + }; + } + { name = "lodash.union___lodash.union_4.6.0.tgz"; path = fetchurl { name = "lodash.union___lodash.union_4.6.0.tgz"; @@ -4250,27 +3826,11 @@ }; } { - name = "lodash___lodash_4.17.15.tgz"; - path = fetchurl { - name = "lodash___lodash_4.17.15.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz"; - sha1 = "b447f6670a0455bbfeedd11392eff330ea097548"; - }; - } - { - name = "lodash___lodash_4.17.19.tgz"; + name = "lodash___lodash_4.17.21.tgz"; path = fetchurl { - name = "lodash___lodash_4.17.19.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz"; - sha1 = "e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"; - }; - } - { - name = "loose_envify___loose_envify_1.4.0.tgz"; - path = fetchurl { - name = "loose_envify___loose_envify_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz"; - sha1 = "71ee51fa7be4caec1a63839f7e682d8132d30caf"; + name = "lodash___lodash_4.17.21.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; + sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; }; } { @@ -4594,14 +4154,6 @@ }; } { - name = "nice_try___nice_try_1.0.5.tgz"; - path = fetchurl { - name = "nice_try___nice_try_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz"; - sha1 = "a3378a7696ce7d223e88fc9b764bd7ef1089e366"; - }; - } - { name = "node_addon_api___node_addon_api_1.7.2.tgz"; path = fetchurl { name = "node_addon_api___node_addon_api_1.7.2.tgz"; @@ -4882,30 +4434,6 @@ }; } { - name = "object.assign___object.assign_4.1.0.tgz"; - path = fetchurl { - name = "object.assign___object.assign_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz"; - sha1 = "968bf1100d7956bb3ca086f006f846b3bc4008da"; - }; - } - { - name = "object.entries___object.entries_1.1.2.tgz"; - path = fetchurl { - name = "object.entries___object.entries_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz"; - sha1 = "bc73f00acb6b6bb16c203434b10f9a7e797d3add"; - }; - } - { - name = "object.fromentries___object.fromentries_2.0.2.tgz"; - path = fetchurl { - name = "object.fromentries___object.fromentries_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz"; - sha1 = "4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"; - }; - } - { name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz"; path = fetchurl { name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz"; @@ -4914,14 +4442,6 @@ }; } { - name = "object.values___object.values_1.1.1.tgz"; - path = fetchurl { - name = "object.values___object.values_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz"; - sha1 = "68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"; - }; - } - { name = "omggif___omggif_1.0.10.tgz"; path = fetchurl { name = "omggif___omggif_1.0.10.tgz"; @@ -4954,14 +4474,6 @@ }; } { - name = "optionator___optionator_0.8.3.tgz"; - path = fetchurl { - name = "optionator___optionator_0.8.3.tgz"; - url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; - sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; - }; - } - { name = "optionator___optionator_0.9.1.tgz"; path = fetchurl { name = "optionator___optionator_0.9.1.tgz"; @@ -5250,14 +4762,6 @@ }; } { - name = "pkg_dir___pkg_dir_2.0.0.tgz"; - path = fetchurl { - name = "pkg_dir___pkg_dir_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz"; - sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; - }; - } - { name = "pkg_up___pkg_up_3.1.0.tgz"; path = fetchurl { name = "pkg_up___pkg_up_3.1.0.tgz"; @@ -5306,14 +4810,6 @@ }; } { - name = "prelude_ls___prelude_ls_1.1.2.tgz"; - path = fetchurl { - name = "prelude_ls___prelude_ls_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz"; - sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; - }; - } - { name = "prepend_http___prepend_http_1.0.4.tgz"; path = fetchurl { name = "prepend_http___prepend_http_1.0.4.tgz"; @@ -5386,14 +4882,6 @@ }; } { - name = "prop_types___prop_types_15.7.2.tgz"; - path = fetchurl { - name = "prop_types___prop_types_15.7.2.tgz"; - url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz"; - sha1 = "52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"; - }; - } - { name = "proto_list___proto_list_1.2.4.tgz"; path = fetchurl { name = "proto_list___proto_list_1.2.4.tgz"; @@ -5530,14 +5018,6 @@ }; } { - name = "react_is___react_is_16.13.1.tgz"; - path = fetchurl { - name = "react_is___react_is_16.13.1.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz"; - sha1 = "789729a4dc36de2999dc156dd6c1d9c18cea56a4"; - }; - } - { name = "read_cmd_shim___read_cmd_shim_1.0.5.tgz"; path = fetchurl { name = "read_cmd_shim___read_cmd_shim_1.0.5.tgz"; @@ -5650,22 +5130,6 @@ }; } { - name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; - path = fetchurl { - name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"; - sha1 = "7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"; - }; - } - { - name = "regexpp___regexpp_2.0.1.tgz"; - path = fetchurl { - name = "regexpp___regexpp_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz"; - sha1 = "8d19d31cf632482b589049f8281f93dbcba4d07f"; - }; - } - { name = "regexpp___regexpp_3.1.0.tgz"; path = fetchurl { name = "regexpp___regexpp_3.1.0.tgz"; @@ -5730,6 +5194,14 @@ }; } { + name = "require_from_string___require_from_string_2.0.2.tgz"; + path = fetchurl { + name = "require_from_string___require_from_string_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz"; + sha1 = "89a7fdd938261267318eafe14f9c32e598c36909"; + }; + } + { name = "require_main_filename___require_main_filename_1.0.1.tgz"; path = fetchurl { name = "require_main_filename___require_main_filename_1.0.1.tgz"; @@ -5762,14 +5234,6 @@ }; } { - name = "resolve___resolve_1.17.0.tgz"; - path = fetchurl { - name = "resolve___resolve_1.17.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz"; - sha1 = "b25941b54968231cc2d1bb76a79cb7f2c0bf8444"; - }; - } - { name = "resolve___resolve_1.20.0.tgz"; path = fetchurl { name = "resolve___resolve_1.20.0.tgz"; @@ -5786,14 +5250,6 @@ }; } { - name = "restore_cursor___restore_cursor_3.1.0.tgz"; - path = fetchurl { - name = "restore_cursor___restore_cursor_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz"; - sha1 = "39f67c54b3a7a58cea5236d95cf0034239631f7e"; - }; - } - { name = "retry___retry_0.10.1.tgz"; path = fetchurl { name = "retry___retry_0.10.1.tgz"; @@ -5810,14 +5266,6 @@ }; } { - name = "rimraf___rimraf_2.6.3.tgz"; - path = fetchurl { - name = "rimraf___rimraf_2.6.3.tgz"; - url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz"; - sha1 = "b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"; - }; - } - { name = "rimraf___rimraf_2.7.1.tgz"; path = fetchurl { name = "rimraf___rimraf_2.7.1.tgz"; @@ -5834,14 +5282,6 @@ }; } { - name = "run_async___run_async_2.4.1.tgz"; - path = fetchurl { - name = "run_async___run_async_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz"; - sha1 = "8440eccf99ea3e70bd409d49aab88e10c189a455"; - }; - } - { name = "run_queue___run_queue_1.0.3.tgz"; path = fetchurl { name = "run_queue___run_queue_1.0.3.tgz"; @@ -5850,14 +5290,6 @@ }; } { - name = "rxjs___rxjs_6.6.0.tgz"; - path = fetchurl { - name = "rxjs___rxjs_6.6.0.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.0.tgz"; - sha1 = "af2901eedf02e3a83ffa7f886240ff9018bbec84"; - }; - } - { name = "safe_buffer___safe_buffer_5.2.0.tgz"; path = fetchurl { name = "safe_buffer___safe_buffer_5.2.0.tgz"; @@ -6010,14 +5442,6 @@ }; } { - name = "side_channel___side_channel_1.0.2.tgz"; - path = fetchurl { - name = "side_channel___side_channel_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz"; - sha1 = "df5d1abadb4e4bf4af1cd8852bf132d2f7876947"; - }; - } - { name = "signal_exit___signal_exit_3.0.2.tgz"; path = fetchurl { name = "signal_exit___signal_exit_3.0.2.tgz"; @@ -6034,11 +5458,11 @@ }; } { - name = "slice_ansi___slice_ansi_2.1.0.tgz"; + name = "slice_ansi___slice_ansi_4.0.0.tgz"; path = fetchurl { - name = "slice_ansi___slice_ansi_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz"; - sha1 = "cacd7693461a637a5788d92a7dd4fba068e81636"; + name = "slice_ansi___slice_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz"; + sha1 = "500e8dd0fd55b05815086255b3195adf2a45fe6b"; }; } { @@ -6258,22 +5682,6 @@ }; } { - name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; - path = fetchurl { - name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz"; - sha1 = "48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"; - }; - } - { - name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; - path = fetchurl { - name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; - sha1 = "85812a6b847ac002270f5808146064c995fb6913"; - }; - } - { name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz"; path = fetchurl { name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz"; @@ -6290,14 +5698,6 @@ }; } { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; - path = fetchurl { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; - sha1 = "14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"; - }; - } - { name = "string_decoder___string_decoder_1.3.0.tgz"; path = fetchurl { name = "string_decoder___string_decoder_1.3.0.tgz"; @@ -6410,11 +5810,11 @@ }; } { - name = "table___table_5.4.6.tgz"; + name = "table___table_6.7.1.tgz"; path = fetchurl { - name = "table___table_5.4.6.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz"; - sha1 = "1292d19500ce3f86053b05f0e8e7e4a3bb21079e"; + name = "table___table_6.7.1.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz"; + sha1 = "ee05592b7143831a8c94f3cee6aae4c1ccef33e2"; }; } { @@ -6538,14 +5938,6 @@ }; } { - name = "tmp___tmp_0.0.33.tgz"; - path = fetchurl { - name = "tmp___tmp_0.0.33.tgz"; - url = "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz"; - sha1 = "6d34335889768d21b2bcda0aa277ced3b1bfadf9"; - }; - } - { name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; path = fetchurl { name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; @@ -6586,38 +5978,6 @@ }; } { - name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; - path = fetchurl { - name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; - url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz"; - sha1 = "098547a6c4448807e8fcb8eae081064ee9a3c90b"; - }; - } - { - name = "tslib___tslib_1.13.0.tgz"; - path = fetchurl { - name = "tslib___tslib_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz"; - sha1 = "c881e13cc7015894ed914862d276436fa9a47043"; - }; - } - { - name = "tslib___tslib_1.10.0.tgz"; - path = fetchurl { - name = "tslib___tslib_1.10.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz"; - sha1 = "c3c19f95973fb0a62973fb09d90d961ee43e5c8a"; - }; - } - { - name = "tsutils___tsutils_3.17.1.tgz"; - path = fetchurl { - name = "tsutils___tsutils_3.17.1.tgz"; - url = "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz"; - sha1 = "ed719917f11ca0dee586272b2ac49e015a2dd759"; - }; - } - { name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; path = fetchurl { name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; @@ -6642,22 +6002,6 @@ }; } { - name = "type_check___type_check_0.3.2.tgz"; - path = fetchurl { - name = "type_check___type_check_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz"; - sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; - }; - } - { - name = "type_fest___type_fest_0.11.0.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.11.0.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz"; - sha1 = "97abf0872310fed88a5c466b25681576145e33f1"; - }; - } - { name = "type_fest___type_fest_0.16.0.tgz"; path = fetchurl { name = "type_fest___type_fest_0.16.0.tgz"; @@ -6698,14 +6042,6 @@ }; } { - name = "typescript___typescript_3.9.7.tgz"; - path = fetchurl { - name = "typescript___typescript_3.9.7.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz"; - sha1 = "98d600a5ebdc38f40cb277522f12dc800e9e25fa"; - }; - } - { name = "uid_number___uid_number_0.0.6.tgz"; path = fetchurl { name = "uid_number___uid_number_0.0.6.tgz"; @@ -7098,14 +6434,6 @@ }; } { - name = "write___write_1.0.3.tgz"; - path = fetchurl { - name = "write___write_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz"; - sha1 = "0800e14523b923a387e415123c865616aae0f5c3"; - }; - } - { name = "xdg_basedir___xdg_basedir_3.0.0.tgz"; path = fetchurl { name = "xdg_basedir___xdg_basedir_3.0.0.tgz"; diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 6642d4ca02490..6424972cbf741 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.29"; + version = "1.7.30"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-nCtgVVOdjZ/OK8gMInBbNeuJadchDYUO2UQxEmcOm4s="; + sha256 = "09k1xxmzqvw8c1x9ndsdvwj4598rdx9zqraz3rmr3i58s51vycxp"; }; in mkYarnPackage rec { name = "element-desktop-${version}"; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 92f9fa0ab19e0..5baed75ba5293 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.29"; + version = "1.7.30"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "sha256-wFC0B9v0V3JK9sLKH7GviVO/JEjePOJ06PwRq/MVqDE="; + sha256 = "1pnmgdyacxfk8hdf930rqqvqrcvckc3m4pb5mkznlirsmw06nfay"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index a512e3a004d04..67a52113df329 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -28,7 +28,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.4.0"; # Please backport all updates to the stable channel. + version = "5.4.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "046xy033ars70ay5ryj39i5053py00xj92ajdg212pamq415z1zb"; + sha256 = "1f1narpqj8gcyi4r574nqm1cbyi3azk1y7d1j300scr51gk74fq6"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index 593e63d32f529..a26fbed2a0490 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchgit, jre, coreutils, gradle_6, git, perl +{ lib, stdenv, fetchurl, fetchgit, jre_headless, coreutils, gradle_6, git, perl , makeWrapper }: let @@ -52,20 +52,28 @@ in stdenv.mkDerivation rec { inherit pname src version postPatch patches; buildPhase = '' + runHook preBuild + export GRADLE_USER_HOME=$(mktemp -d) # Use the local packages from -deps sed -i -e 's|mavenCentral()|mavenLocal(); maven { url uri("${deps}") }|' build.gradle gradle --offline --no-daemon distTar + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out tar xvf ./build/distributions/signald.tar --strip-components=1 --directory $out/ wrapProgram $out/bin/signald \ --prefix PATH : ${lib.makeBinPath [ coreutils ]} \ - --set JAVA_HOME "${jre}" + --set JAVA_HOME "${jre_headless}" + + runHook postInstall ''; nativeBuildInputs = [ git gradle_6 makeWrapper ]; diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 4a741ab2b165c..890553b338ebf 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, genericUpdater, writeShellScript , atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg, minizip -, lsb-release, freetype, fontconfig, polkit, polkit_gnome +, lsb-release, freetype, fontconfig, polkit, polkit_gnome, pciutils , pulseaudio }: let @@ -76,7 +76,7 @@ in stdenv.mkDerivation rec { $out/bin/anydesk wrapProgram $out/bin/anydesk \ - --prefix PATH : ${lib.makeBinPath [ lsb-release ]} + --prefix PATH : ${lib.makeBinPath [ lsb-release pciutils ]} substituteInPlace $out/share/applications/*.desktop \ --subst-var out diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index 7a8f35b76b04a..7ecb8936a690f 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -9,18 +9,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "07gfi0l9l19cy7304v18knbfhs7zqhfglw0jjhcmxa79dg6wzdia"; + sha256 = "0fgkjv7p2p0k58ifs77qfy0ni2yhrmk8rqyysjxq0im6j3f3az11"; }; modRoot = "./agent"; - vendorSha256 = "0rcb384yxk1dsip15qh32rkd07i2zzr1k53wcfpnrgi6jpixvsvi"; + vendorSha256 = "1avl5xvav9y2vni5w3ksvrcz67x2kkadqw9p1cfq5rkjny1c2jrg"; buildFlagsArray = [ "-ldflags=-s -w -X main.AgentVersion=v${version}" ]; diff --git a/pkgs/applications/science/math/mathematica/l10ns.nix b/pkgs/applications/science/math/mathematica/l10ns.nix index 896983ce1563d..d9f6a0c74e82a 100644 --- a/pkgs/applications/science/math/mathematica/l10ns.nix +++ b/pkgs/applications/science/math/mathematica/l10ns.nix @@ -8,10 +8,10 @@ let allVersions = with lib; flip map # N.B. Versions in this list should be ordered from newest to oldest. [ { - version = "12.2.0"; + version = "12.3.0"; lang = "en"; language = "English"; - sha256 = "3b6676a203c6adb7e9c418a5484b037974287b5be09c64e7dfea74ddc0e400d7"; + sha256 = "045df045f6e796ded59f64eb2e0f1949ac88dcba1d5b6e05fb53ea0a4aed7215"; } { version = "11.3.0"; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 20b239dc6771b..b3d0e96a56484 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,20 +1,20 @@ -{ stdenv, lib, fetchurl, makeWrapper, cmake, ftgl, gl2ps, glew, gsl, llvm_5 -, libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, xz, pcre +{ stdenv, lib, fetchurl, makeWrapper, cmake, git, ftgl, gl2ps, glew, gsl +, libX11, libXpm, libXft, libXext, libGLU, libGL, libxml2, lz4, xz, pcre, nlohmann_json , pkg-config, python, xxHash, zlib, zstd , libAfterImage, giflib, libjpeg, libtiff, libpng , Cocoa, OpenGL, noSplash ? false }: stdenv.mkDerivation rec { pname = "root"; - version = "6.22.08"; + version = "6.24.00"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "0vrgi83hrw4n9zgx873fn4ba3vk54slrwk1cl4cc4plgxzv1y1kg"; + sha256 = "12crjzd7pzx5qpk2pb3z0rhmxlw5gsqaqzfl48qiq8c9l940b8wx"; }; - nativeBuildInputs = [ makeWrapper cmake pkg-config llvm_5.dev ]; - buildInputs = [ ftgl gl2ps glew pcre zlib zstd llvm_5 libxml2 lz4 xz gsl xxHash libAfterImage giflib libjpeg libtiff libpng python.pkgs.numpy ] + nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; + buildInputs = [ ftgl gl2ps glew pcre zlib zstd libxml2 lz4 xz gsl xxHash libAfterImage giflib libjpeg libtiff libpng nlohmann_json python.pkgs.numpy ] ++ lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU libGL ] ++ lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; @@ -28,6 +28,13 @@ stdenv.mkDerivation rec { substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \ --replace 'set(lcgpackages ' '#set(lcgpackages ' + # Don't require textutil on macOS + : > cmake/modules/RootCPack.cmake + + # Hardcode path to fix use with cmake + sed -i cmake/scripts/ROOTConfig.cmake.in \ + -e 'iset(nlohmann_json_DIR "${nlohmann_json}/lib/cmake/nlohmann_json/")' + patchShebangs build/unix/ '' + lib.optionalString noSplash '' substituteInPlace rootx/src/rootx.cxx --replace "gNoLogo = false" "gNoLogo = true" @@ -35,11 +42,13 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-Drpath=ON" + "-DCMAKE_CXX_STANDARD=17" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-Dbuiltin_nlohmannjson=OFF" + "-Dbuiltin_openui5=OFF" "-Dalien=OFF" "-Dbonjour=OFF" - "-Dbuiltin_llvm=OFF" "-Dcastor=OFF" "-Dchirp=OFF" "-Dclad=OFF" @@ -53,6 +62,7 @@ stdenv.mkDerivation rec { "-Dgfal=OFF" "-Dgviz=OFF" "-Dhdfs=OFF" + "-Dhttp=ON" "-Dkrb5=OFF" "-Dldap=OFF" "-Dmonalisa=OFF" @@ -64,9 +74,11 @@ stdenv.mkDerivation rec { "-Dpythia6=OFF" "-Dpythia8=OFF" "-Drfio=OFF" + "-Droot7=OFF" "-Dsqlite=OFF" "-Dssl=OFF" "-Dvdt=OFF" + "-Dwebgui=OFF" "-Dxml=ON" "-Dxrootd=OFF" ] diff --git a/pkgs/applications/science/misc/root/sw_vers.patch b/pkgs/applications/science/misc/root/sw_vers.patch index b2ee1b6a4ceba..836bbb5b17a46 100644 --- a/pkgs/applications/science/misc/root/sw_vers.patch +++ b/pkgs/applications/science/misc/root/sw_vers.patch @@ -1,8 +1,8 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake --- a/cmake/modules/SetUpMacOS.cmake +++ b/cmake/modules/SetUpMacOS.cmake -@@ -8,17 +8,10 @@ set(ROOT_ARCHITECTURE macosx) - set(ROOT_PLATFORM macosx) +@@ -28,17 +28,10 @@ if(CMAKE_VERSION VERSION_LESS 3.14.4) + endif() if (CMAKE_SYSTEM_NAME MATCHES Darwin) - EXECUTE_PROCESS(COMMAND sw_vers "-productVersion" @@ -19,16 +19,15 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake #TODO: check haveconfig and rpath -> set rpath true #TODO: check Thread, define link command #TODO: more stuff check configure script -@@ -37,23 +30,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) +@@ -57,22 +50,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) + SET(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS} -m64") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64") - SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64") - else() -- MESSAGE(STATUS "Found a 32bit system") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") - SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32") -- endif() + endif() - endif() - - if(MACOSX_VERSION VERSION_GREATER 10.6) @@ -40,11 +39,10 @@ diff a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake - if(MACOSX_VERSION VERSION_GREATER 10.8) - set(MACOSX_GLU_DEPRECATED ON) - endif() -+ endif() if (CMAKE_COMPILER_IS_GNUCXX) - message(STATUS "Found GNU compiler collection") -@@ -115,7 +92,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -W -Wshadow -Wall -Woverloaded-virtual -fsigned-char -fno-common") +@@ -130,7 +108,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) endif() #---Set Linker flags---------------------------------------------------------------------- diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix index 8beecf2def949..62e4c6876fd74 100644 --- a/pkgs/applications/science/programming/fdr/default.nix +++ b/pkgs/applications/science/programming/fdr/default.nix @@ -1,9 +1,10 @@ -{lib, stdenv, fetchurl, qtbase, qtx11extras, ncurses5, xorg, zlib, python27Packages}: +{ lib, stdenv, fetchurl, qtbase, qtx11extras, ncurses5, xorg, zlib, python27Packages }: stdenv.mkDerivation { - name = "fdr-4.2.3"; + pname = "fdr"; + version = "4.2.7"; src = fetchurl { - url = "https://www.cs.ox.ac.uk/projects/fdr/downloads/fdr-3789-linux-x86_64.tar.gz"; - sha256 = "0n2yqichym5xdawlgk3r7yha88k7ycnx6585jfrcm7043sls1i88"; + url = "https://dl.cocotec.io/fdr/fdr-3814-linux-x86_64.tar.gz"; + sha256 = "0cajz1gz4slq9nfhm8dqdgxl0kc950838n0lrf8jw4vl54gv6chh"; }; libPath = lib.makeLibraryPath [ @@ -59,7 +60,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - homepage = "https://www.cs.ox.ac.uk/projects/fdr/"; + homepage = "https://cocotec.io/fdr/"; description = "The CSP refinement checker"; license = licenses.unfreeRedistributable; platforms = platforms.linux; diff --git a/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix b/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix index 8e3b9f136745d..c7884c2b52e7a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-vendor/default.nix @@ -2,8 +2,8 @@ }: let - version = "1.2.0"; - sha256 = "1z9fmrfxqi56pj7f1506q2z41crz702jk88gv57baf6fz63m93v2"; + version = "1.2.1"; + sha256 = "sha256-sm5SmckaXVjF3odqzYrbC46E1nPzQ9cuNJnNSAa7RWY="; in stdenv.mkDerivation { pname = "git-vendor"; diff --git a/pkgs/applications/version-management/git-and-tools/glab/default.nix b/pkgs/applications/version-management/git-and-tools/glab/default.nix index c810598d7cfe5..12fd8357fc7a0 100644 --- a/pkgs/applications/version-management/git-and-tools/glab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "profclems"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UW6KYqqeDnswPSHrjprbClnIwpX5zA+ePq7kwlsWEfA="; + sha256 = "sha256-/WKfMmaFjnzRWCJZEZF/CguU0K7FOtgvKNMSQGvjODQ="; }; - vendorSha256 = "sha256-5hVIwEG70r9EDyapQ/OBlHfA1Zw5y4KxEysX415t3xk="; + vendorSha256 = "sha256-PCkVjLdOdOhJGNSkVPFK/ONRdJT7MS0COjYgPNT5dNw="; runVend = true; # Tests are trying to access /homeless-shelter diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 75a9fe3776498..c84375cfece55 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.15.3"; + version = "2.15.4"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-SuHp6C5ueUErvRiWDQNEmCybFIa7Iu7C/FtnHys9XqU="; + sha256 = "1ayw2pz9falcsi528q63z3w7npzkk7y8z258danqh41j6q9871js"; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/video/mpv/scripts/youtube-quality.nix b/pkgs/applications/video/mpv/scripts/youtube-quality.nix index 3c55a36d0a796..5301e4232a066 100644 --- a/pkgs/applications/video/mpv/scripts/youtube-quality.nix +++ b/pkgs/applications/video/mpv/scripts/youtube-quality.nix @@ -5,7 +5,7 @@ }: stdenvNoCC.mkDerivation rec { - pname = "mpv-playlistmanager"; + pname = "mpv-youtube-quality"; version = "unstable-2020-02-11"; src = fetchFromGitHub { diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix index e6b83286c00d7..4cd043d4eb6d6 100644 --- a/pkgs/applications/virtualization/gvisor/default.nix +++ b/pkgs/applications/virtualization/gvisor/default.nix @@ -1,6 +1,8 @@ { lib , buildBazelPackage , fetchFromGitHub +, callPackage +, bash , cacert , git , glibcLocales @@ -9,6 +11,7 @@ , iptables , makeWrapper , procps +, protobuf , python3 }: @@ -16,9 +19,12 @@ let preBuild = '' patchShebangs . + substituteInPlace tools/defs.bzl \ + --replace "#!/bin/bash" "#!${bash}/bin/bash" + # Tell rules_go to use the Go binary found in the PATH sed -E -i \ - -e 's|go_version\s*=\s*"[^"]+",|go_version = "host",|g' \ + -e 's|go_version\s*=\s*"[^"]+"|go_version = "host"|g' \ WORKSPACE # The gazelle Go tooling needs CA certs @@ -31,20 +37,37 @@ let export GOPATH= ''; + # Patch the protoc alias so that it always builds from source. + rulesProto = fetchFromGitHub { + owner = "bazelbuild"; + repo = "rules_proto"; + rev = "f7a30f6f80006b591fa7c437fe5a951eb10bcbcf"; + sha256 = "10bcw0ir0skk7h33lmqm38n9w4nfs24mwajnngkbs6jb5wsvkqv8"; + extraPostFetch = '' + sed -i 's|name = "protoc"|name = "_protoc_original"|' $out/proto/private/BUILD.release + cat <<EOF >>$out/proto/private/BUILD.release + alias(name = "protoc", actual = "@com_github_protocolbuffers_protobuf//:protoc", visibility = ["//visibility:public"]) + EOF + ''; + }; + in buildBazelPackage rec { name = "gvisor-${version}"; - version = "2019-11-14"; + version = "20210518.0"; src = fetchFromGitHub { owner = "google"; repo = "gvisor"; - rev = "release-20191114.0"; - sha256 = "0kyixjjlws9iz2r2srgpdd4rrq94vpxkmh2rmmzxd9mcqy2i9bg1"; + rev = "release-${version}"; + sha256 = "15a6mlclnyfc9mx3bjksnnf4vla0xh0rv9kxdp34la4gw3c4hksn"; }; nativeBuildInputs = [ git glibcLocales go makeWrapper python3 ]; bazelTarget = "//runsc:runsc"; + bazelFlags = [ + "--override_repository=rules_proto=${rulesProto}" + ]; # gvisor uses the Starlark implementation of rules_cc, not the built-in one, # so we shouldn't delete it from our dependencies. @@ -76,14 +99,14 @@ in buildBazelPackage rec { rm -f "$bazelOut"/java.log "$bazelOut"/java.log.* ''; - sha256 = "0fhmlq0d2317gwhma2mz1anb69j4chybk90j71j88wpgw1hxbk34"; + sha256 = "13pahppm431m198v5bffrzq5iw8m79riplbfqp0afh384ln669hb"; }; buildAttrs = { inherit preBuild; installPhase = '' - install -Dm755 bazel-bin/runsc/*_pure_stripped/runsc $out/bin/runsc + install -Dm755 bazel-out/*/bin/runsc/runsc_/runsc $out/bin/runsc # Needed for the 'runsc do' subcomand wrapProgram $out/bin/runsc \ diff --git a/pkgs/applications/window-managers/i3/balance-workspace.nix b/pkgs/applications/window-managers/i3/balance-workspace.nix index 18e9167227fe1..335b18d3eb863 100644 --- a/pkgs/applications/window-managers/i3/balance-workspace.nix +++ b/pkgs/applications/window-managers/i3/balance-workspace.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "i3-balance-workspace"; - version = "1.8.3"; + version = "1.8.4"; src = fetchPypi { inherit pname version; - sha256 = "1gndzrwff8gfdqjjxv4zf2h2k0x7y97w1c3mrjpihz8xd0hbnk4d"; + sha256 = "bb220eb373e290312b0aafe3d7b1cc1cca34c93189a4fca5bee93ef39aafbe3d"; }; propagatedBuildInputs = [ i3ipc ]; diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index 5c02484236c47..6fbcf1b287031 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "river"; - version = "unstable-2021-05-07"; + version = "unstable-2021-06-06"; src = fetchFromGitHub { owner = "ifreund"; repo = pname; - rev = "7ffa2f4b9e7abf7d152134f555373c2b63ccfc1d"; - sha256 = "1z5qjid73lfn654f2k74nwgvpr88fpdfpbzhihybx9cyy1mqfz7j"; + rev = "0e9dc089d14e2b5c923d483c62d342af29493cf0"; + sha256 = "sha256-2rIZYr9Y+IBrox5MVrPpHeI8OVSXHsMZmcCagsX56lU="; fetchSubmodules = true; }; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - zig build -Drelease-safe -Dtarget=${stdenv.hostPlatform.parsed.cpu.name}-native -Dxwayland -Dman-pages --prefix $out install + zig build -Drelease-safe -Dcpu=baseline -Dxwayland -Dman-pages --prefix $out install runHook postInstall ''; diff --git a/pkgs/build-support/build-bazel-package/default.nix b/pkgs/build-support/build-bazel-package/default.nix index 988298ac72bfe..198b9c3f617fc 100644 --- a/pkgs/build-support/build-bazel-package/default.nix +++ b/pkgs/build-support/build-bazel-package/default.nix @@ -35,7 +35,7 @@ args@{ # required for the build as configured, rather than fetching all the dependencies # which may not work in some situations (e.g. Java code which ends up relying on # Debian-specific /usr/share/java paths, but doesn't in the configured build). -, fetchConfigured ? false +, fetchConfigured ? true # Don’t add Bazel --copt and --linkopt from NIX_CFLAGS_COMPILE / # NIX_LDFLAGS. This is necessary when using a custom toolchain which @@ -126,7 +126,7 @@ in stdenv.mkDerivation (fBuildAttrs // { find $bazelOut/external -maxdepth 1 -type l | while read symlink; do name="$(basename "$symlink")" rm "$symlink" - test -f "$bazelOut/external/@$name.marker" && rm "$bazelOut/external/@$name.marker" + test -f "$bazelOut/external/@$name.marker" && rm "$bazelOut/external/@$name.marker" || true done # Patching symlinks to remove build directory reference diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index 689b45a126ff7..d0824b17bd1b3 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -13,11 +13,11 @@ with writers; let bin = { - bash = writeBashBin "test_writers" '' + bash = writeBashBin "test-writers-bash-bin" '' if [[ "test" == "test" ]]; then echo "success"; fi ''; - c = writeCBin "test_writers" { libraries = [ ]; } '' + c = writeCBin "test-writers-c" { libraries = [ ]; } '' #include <stdio.h> int main() { printf("success\n"); @@ -25,17 +25,17 @@ let } ''; - dash = writeDashBin "test_writers" '' + dash = writeDashBin "test-writers-dash-bin" '' test '~' = '~' && echo 'success' ''; - rust = writeRustBin "test_writers" {} '' + rust = writeRustBin "test-writers-rust-bin" {} '' fn main(){ println!("success") } ''; - haskell = writeHaskellBin "test_writers" { libraries = [ haskellPackages.acme-default ]; } '' + haskell = writeHaskellBin "test-writers-haskell-bin" { libraries = [ haskellPackages.acme-default ]; } '' import Data.Default int :: Int @@ -47,7 +47,7 @@ let _ -> print "fail" ''; - js = writeJSBin "test_writers" { libraries = [ nodePackages.semver ]; } '' + js = writeJSBin "test-writers-js-bin" { libraries = [ nodePackages.semver ]; } '' var semver = require('semver'); if (semver.valid('1.2.3')) { @@ -57,12 +57,12 @@ let } ''; - perl = writePerlBin "test_writers" { libraries = [ perlPackages.boolean ]; } '' + perl = writePerlBin "test-writers-perl-bin" { libraries = [ perlPackages.boolean ]; } '' use boolean; print "success\n" if true; ''; - python2 = writePython2Bin "test_writers" { libraries = [ python2Packages.enum ]; } '' + python2 = writePython2Bin "test-writers-python2-bin" { libraries = [ python2Packages.enum ]; } '' from enum import Enum @@ -73,7 +73,7 @@ let print Test.a ''; - python3 = writePython3Bin "test_writers" { libraries = [ python3Packages.pyyaml ]; } '' + python3 = writePython3Bin "test-writers-python3-bin" { libraries = [ python3Packages.pyyaml ]; } '' import yaml y = yaml.load(""" @@ -84,11 +84,11 @@ let }; simple = { - bash = writeBash "test_bash" '' + bash = writeBash "test-writers-bash" '' if [[ "test" == "test" ]]; then echo "success"; fi ''; - c = writeC "test_c" { libraries = [ glib.dev ]; } '' + c = writeC "test-writers-c" { libraries = [ glib.dev ]; } '' #include <gio/gio.h> #include <stdio.h> int main() { @@ -106,11 +106,11 @@ let } ''; - dash = writeDash "test_dash" '' + dash = writeDash "test-writers-dash" '' test '~' = '~' && echo 'success' ''; - haskell = writeHaskell "test_haskell" { libraries = [ haskellPackages.acme-default ]; } '' + haskell = writeHaskell "test-writers-haskell" { libraries = [ haskellPackages.acme-default ]; } '' import Data.Default int :: Int @@ -122,7 +122,7 @@ let _ -> print "fail" ''; - js = writeJS "test_js" { libraries = [ nodePackages.semver ]; } '' + js = writeJS "test-writers-js" { libraries = [ nodePackages.semver ]; } '' var semver = require('semver'); if (semver.valid('1.2.3')) { @@ -132,12 +132,12 @@ let } ''; - perl = writePerl "test_perl" { libraries = [ perlPackages.boolean ]; } '' + perl = writePerl "test-writers-perl" { libraries = [ perlPackages.boolean ]; } '' use boolean; print "success\n" if true; ''; - python2 = writePython2 "test_python2" { libraries = [ python2Packages.enum ]; } '' + python2 = writePython2 "test-writers-python2" { libraries = [ python2Packages.enum ]; } '' from enum import Enum @@ -148,7 +148,7 @@ let print Test.a ''; - python3 = writePython3 "test_python3" { libraries = [ python3Packages.pyyaml ]; } '' + python3 = writePython3 "test-writers-python3" { libraries = [ python3Packages.pyyaml ]; } '' import yaml y = yaml.load(""" @@ -157,21 +157,21 @@ let print(y[0]['test']) ''; - python2NoLibs = writePython2 "test_python2_no_libs" {} '' + python2NoLibs = writePython2 "test-writers-python2-no-libs" {} '' print("success") ''; - python3NoLibs = writePython3 "test_python3_no_libs" {} '' + python3NoLibs = writePython3 "test-writers-python3-no-libs" {} '' print("success") ''; }; path = { - bash = writeBash "test_bash" (writeText "test" '' + bash = writeBash "test-writers-bash-path" (writeText "test" '' if [[ "test" == "test" ]]; then echo "success"; fi ''); - haskell = writeHaskell "test_haskell" { libraries = [ haskellPackages.acme-default ]; } (writeText "test" '' + haskell = writeHaskell "test-writers-haskell-path" { libraries = [ haskellPackages.acme-default ]; } (writeText "test" '' import Data.Default int :: Int @@ -184,8 +184,8 @@ let ''); }; - writeTest = expectedValue: test: - writeDash "test-writers" '' + writeTest = expectedValue: name: test: + writeDash "run-${name}" '' if test "$(${test})" != "${expectedValue}"; then echo 'test ${test} failed' exit 1 @@ -196,9 +196,9 @@ in runCommand "test-writers" { passthru = { inherit writeTest bin simple; }; meta.platforms = lib.platforms.all; } '' - ${lib.concatMapStringsSep "\n" (test: writeTest "success" "${test}/bin/test_writers") (lib.attrValues bin)} - ${lib.concatMapStringsSep "\n" (test: writeTest "success" test) (lib.attrValues simple)} - ${lib.concatMapStringsSep "\n" (test: writeTest "success" test) (lib.attrValues path)} + ${lib.concatMapStringsSep "\n" (test: writeTest "success" test.name "${test}/bin/${test.name}") (lib.attrValues bin)} + ${lib.concatMapStringsSep "\n" (test: writeTest "success" test.name test) (lib.attrValues simple)} + ${lib.concatMapStringsSep "\n" (test: writeTest "success" test.name test) (lib.attrValues path)} echo 'nix-writers successfully tested' >&2 touch $out diff --git a/pkgs/data/themes/vimix/default.nix b/pkgs/data/themes/vimix/default.nix index 5a56128937087..1694063e4fefc 100644 --- a/pkgs/data/themes/vimix/default.nix +++ b/pkgs/data/themes/vimix/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vimix-gtk-themes"; - version = "2020-11-28"; + version = "2021-04-25"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "1m84p4cs9dfwc27zfjnwgkfdnfmlzbimq3g5z4mhz23cijm178rf"; + sha256 = "0ak763vs27h5z2pgcqpz1g1hypn5gl0p0ylffawc9zdi1wp2mpxb"; }; buildInputs = [ gtk_engines ]; @@ -16,16 +16,18 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; installPhase = '' + runHook preInstall patchShebangs . mkdir -p $out/share/themes - name= ./install.sh -d $out/share/themes + name= ./install.sh --all --dest $out/share/themes rm $out/share/themes/*/{AUTHORS,LICENSE} + runHook postInstall ''; meta = with lib; { description = "Flat Material Design theme for GTK based desktop environments"; homepage = "https://github.com/vinceliuice/vimix-gtk-themes"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/development/beam-modules/build-mix.nix b/pkgs/development/beam-modules/build-mix.nix index 783ae34dcd38b..728d249c97d8c 100644 --- a/pkgs/development/beam-modules/build-mix.nix +++ b/pkgs/development/beam-modules/build-mix.nix @@ -4,6 +4,7 @@ , version , src , buildInputs ? [ ] +, nativeBuildInputs ? [ ] , beamDeps ? [ ] , propagatedBuildInputs ? [ ] , postPatch ? "" @@ -23,7 +24,7 @@ let pkg = self: stdenv.mkDerivation (attrs // { name = "${name}-${version}"; - inherit version src buildInputs; + inherit version src; MIX_ENV = mixEnv; MIX_DEBUG = if enableDebugInfo then 1 else 0; @@ -37,7 +38,8 @@ let addToSearchPath ERL_LIBS "$1/lib/erlang/lib" ''; - nativeBuildInputs = [ elixir hex ]; + buildInputs = buildInputs ++ [ ]; + nativeBuildInputs = nativeBuildInputs ++ [ elixir hex ]; propagatedBuildInputs = propagatedBuildInputs ++ beamDeps; buildPhase = attrs.buildPhase or '' diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 0c184e0ba7304..6c33298ff926e 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -21,8 +21,8 @@ let inherit (callPackage ../tools/build-managers/rebar3 { }) rebar3 rebar3WithPlugins; rebar = callPackage ../tools/build-managers/rebar { }; - # rebar3 port compiler plugin is required by buildRebar3 pc = callPackage ./pc { }; + rebar3-proper = callPackage ./rebar3-proper { }; rebar3-nix = callPackage ./rebar3-nix { }; fetchHex = callPackage ./fetch-hex.nix { }; diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index e6f3e7fb9e96b..b2a69a6927837 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, lib }: +{ fetchFromGitHub, fetchHex, rebar3Relx, buildRebar3, rebar3-proper, lib }: let version = "0.16.0"; owner = "erlang-ls"; @@ -6,6 +6,11 @@ let deps = import ./rebar-deps.nix { inherit fetchHex fetchFromGitHub; builder = buildRebar3; + overrides = (self: super: { + proper = super.proper.overrideAttrs (_: { + configurePhase = "true"; + }); + }); }; in rebar3Relx { name = "erlang-ls"; @@ -17,7 +22,16 @@ in rebar3Relx { }; releaseType = "escript"; beamDeps = builtins.attrValues deps; + buildPlugins = [ rebar3-proper ]; buildPhase = "HOME=. make"; + # based on https://github.com/erlang-ls/erlang_ls/blob/main/.github/workflows/build.yml + # these tests are excessively long and we should probably skip them + checkPhase = '' + HOME=. epmd -daemon + HOME=. rebar3 ct + HOME=. rebar3 proper --constraint_tries 100 + ''; + doCheck = true; installPhase = '' mkdir -p $out/bin cp _build/default/bin/erlang_ls $out/bin/ diff --git a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix index 12cbb182ceb46..5d55ce0c52364 100644 --- a/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix +++ b/pkgs/development/beam-modules/erlang-ls/rebar-deps.nix @@ -1,175 +1,219 @@ # Generated by rebar3_nix let fetchOnly = { src, ... }: src; -in { builder ? fetchOnly, fetchHex, fetchFromGitHub }: rec { - getopt = builder { - name = "getopt"; - version = "1.0.1"; - src = fetchHex { - pkg = "getopt"; +in { builder ? fetchOnly, fetchHex, fetchFromGitHub, overrides ? (x: y: { }) }: +let + self = packages // (overrides self packages); + packages = with self; { + getopt = builder { + name = "getopt"; version = "1.0.1"; - sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw="; - }; - beamDeps = [ ]; - }; - zipper = builder { - name = "zipper"; - version = "1.0.1"; - src = fetchHex { - pkg = "zipper"; + src = fetchHex { + pkg = "getopt"; + version = "1.0.1"; + sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw="; + }; + beamDeps = [ ]; + }; + zipper = builder { + name = "zipper"; version = "1.0.1"; - sha256 = "sha256-ah/T4fDMHR31ZCyaDOIXgDZBGwpclkKFHR2idr1zfC0="; - }; - beamDeps = [ ]; - }; - quickrand = builder { - name = "quickrand"; - version = "2.0.1"; - src = fetchHex { - pkg = "quickrand"; + src = fetchHex { + pkg = "zipper"; + version = "1.0.1"; + sha256 = "sha256-ah/T4fDMHR31ZCyaDOIXgDZBGwpclkKFHR2idr1zfC0="; + }; + beamDeps = [ ]; + }; + quickrand = builder { + name = "quickrand"; version = "2.0.1"; - sha256 = "sha256-FNtn1K72uIFYEOyfPM714yS3O1bK42h/mddSuFvdTJY="; - }; - beamDeps = [ ]; - }; - providers = builder { - name = "providers"; - version = "1.8.1"; - src = fetchHex { - pkg = "providers"; + src = fetchHex { + pkg = "quickrand"; + version = "2.0.1"; + sha256 = "sha256-FNtn1K72uIFYEOyfPM714yS3O1bK42h/mddSuFvdTJY="; + }; + beamDeps = [ ]; + }; + providers = builder { + name = "providers"; version = "1.8.1"; - sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A="; - }; - beamDeps = [ getopt ]; - }; - katana_code = builder { - name = "katana_code"; - version = "0.2.1"; - src = fetchHex { - pkg = "katana_code"; + src = fetchHex { + pkg = "providers"; + version = "1.8.1"; + sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A="; + }; + beamDeps = [ getopt ]; + }; + katana_code = builder { + name = "katana_code"; version = "0.2.1"; - sha256 = "sha256-hEitP1bZgU+YoovmUPcZG91QZXXjRcwW1YZmCxD26ZI="; - }; - beamDeps = [ ]; - }; - bucs = builder { - name = "bucs"; - version = "1.0.16"; - src = fetchHex { - pkg = "bucs"; + src = fetchHex { + pkg = "katana_code"; + version = "0.2.1"; + sha256 = "sha256-hEitP1bZgU+YoovmUPcZG91QZXXjRcwW1YZmCxD26ZI="; + }; + beamDeps = [ ]; + }; + bucs = builder { + name = "bucs"; version = "1.0.16"; - sha256 = "sha256-/2pccqUArXrsHuO6FkrjxFDq3uiYsNFR4frKGKyNDWI="; - }; - beamDeps = [ ]; - }; - yamerl = builder { - name = "yamerl"; - version = "0.8.1"; - src = fetchHex { - pkg = "yamerl"; + src = fetchHex { + pkg = "bucs"; + version = "1.0.16"; + sha256 = "sha256-/2pccqUArXrsHuO6FkrjxFDq3uiYsNFR4frKGKyNDWI="; + }; + beamDeps = [ ]; + }; + yamerl = builder { + name = "yamerl"; version = "0.8.1"; - sha256 = "sha256-lssw+dZDRP7Q74qS6fFvIH3mwE3/9PNmdSynn1vOsj8="; - }; - beamDeps = [ ]; - }; - uuid = builder { - name = "uuid"; - version = "2.0.1"; - src = fetchHex { - pkg = "uuid_erl"; + src = fetchHex { + pkg = "yamerl"; + version = "0.8.1"; + sha256 = "sha256-lssw+dZDRP7Q74qS6fFvIH3mwE3/9PNmdSynn1vOsj8="; + }; + beamDeps = [ ]; + }; + uuid = builder { + name = "uuid"; version = "2.0.1"; - sha256 = "sha256-q1fKzNUfFwAR5fREzoZfhLQWBeSDqe/MRowa+uyHVTs="; - }; - beamDeps = [ quickrand ]; - }; - tdiff = builder { - name = "tdiff"; - version = "0.1.2"; - src = fetchHex { - pkg = "tdiff"; + src = fetchHex { + pkg = "uuid_erl"; + version = "2.0.1"; + sha256 = "sha256-q1fKzNUfFwAR5fREzoZfhLQWBeSDqe/MRowa+uyHVTs="; + }; + beamDeps = [ quickrand ]; + }; + tdiff = builder { + name = "tdiff"; version = "0.1.2"; - sha256 = "sha256-4MLhaPmSUqWIl2jVyPHmUQoYRZLUz6BrIneKGNM9eHU="; - }; - beamDeps = [ ]; - }; - redbug = builder { - name = "redbug"; - version = "2.0.6"; - src = fetchHex { - pkg = "redbug"; + src = fetchHex { + pkg = "tdiff"; + version = "0.1.2"; + sha256 = "sha256-4MLhaPmSUqWIl2jVyPHmUQoYRZLUz6BrIneKGNM9eHU="; + }; + beamDeps = [ ]; + }; + redbug = builder { + name = "redbug"; version = "2.0.6"; - sha256 = "sha256-qtlJhnH0q5HqylCZ/oWmFhgVimNuYoaJLE989K8XHQQ="; - }; - beamDeps = [ ]; - }; - rebar3_format = builder { - name = "rebar3_format"; - version = "0.8.2"; - src = fetchHex { - pkg = "rebar3_format"; + src = fetchHex { + pkg = "redbug"; + version = "2.0.6"; + sha256 = "sha256-qtlJhnH0q5HqylCZ/oWmFhgVimNuYoaJLE989K8XHQQ="; + }; + beamDeps = [ ]; + }; + rebar3_format = builder { + name = "rebar3_format"; version = "0.8.2"; - sha256 = "sha256-yo/ydjjCFpWT0USdrL6IlWNBk+0zNOkGtU/JfwgfUhM="; - }; - beamDeps = [ katana_code ]; - }; - ranch = builder { - name = "ranch"; - version = "2.0.0"; - src = fetchHex { - pkg = "ranch"; + src = fetchHex { + pkg = "rebar3_format"; + version = "0.8.2"; + sha256 = "sha256-yo/ydjjCFpWT0USdrL6IlWNBk+0zNOkGtU/JfwgfUhM="; + }; + beamDeps = [ katana_code ]; + }; + ranch = builder { + name = "ranch"; version = "2.0.0"; - sha256 = "sha256-wgpIQMfWYjwZgS06fIKLLxvRU+8PEky2nFT+UdikKuA="; - }; - beamDeps = [ ]; - }; - jsx = builder { - name = "jsx"; - version = "3.0.0"; - src = fetchHex { - pkg = "jsx"; + src = fetchHex { + pkg = "ranch"; + version = "2.0.0"; + sha256 = "sha256-wgpIQMfWYjwZgS06fIKLLxvRU+8PEky2nFT+UdikKuA="; + }; + beamDeps = [ ]; + }; + jsx = builder { + name = "jsx"; version = "3.0.0"; - sha256 = "sha256-N77KBDX1yoovRfdqRiEedkGPvvgMNvA2HCSfx1BZ3G0="; - }; - beamDeps = [ ]; - }; - erlfmt = builder { - name = "erlfmt"; - version = "git"; - src = fetchFromGitHub { - owner = "whatsapp"; - repo = "erlfmt"; - rev = "2e93fc4a646111357642b0179a2a63151868d890"; - sha256 = "0n7kygycn05aqdp5dyj192mja89l4nxv2wg16qg2c0bmw9s7j2mr"; - }; - beamDeps = [ ]; - }; - ephemeral = builder { - name = "ephemeral"; - version = "2.0.4"; - src = fetchHex { - pkg = "ephemeral"; + src = fetchHex { + pkg = "jsx"; + version = "3.0.0"; + sha256 = "sha256-N77KBDX1yoovRfdqRiEedkGPvvgMNvA2HCSfx1BZ3G0="; + }; + beamDeps = [ ]; + }; + erlfmt = builder { + name = "erlfmt"; + version = "git"; + src = fetchFromGitHub { + owner = "whatsapp"; + repo = "erlfmt"; + rev = "2e93fc4a646111357642b0179a2a63151868d890"; + sha256 = "0n7kygycn05aqdp5dyj192mja89l4nxv2wg16qg2c0bmw9s7j2mr"; + }; + beamDeps = [ ]; + }; + ephemeral = builder { + name = "ephemeral"; version = "2.0.4"; - sha256 = "sha256-Syk9gPdfnEV1/0ucjoiaVoAvQLAYv1fnTxlkTv7myFA="; - }; - beamDeps = [ bucs ]; - }; - elvis_core = builder { - name = "elvis_core"; - version = "1.1.1"; - src = fetchHex { - pkg = "elvis_core"; + src = fetchHex { + pkg = "ephemeral"; + version = "2.0.4"; + sha256 = "sha256-Syk9gPdfnEV1/0ucjoiaVoAvQLAYv1fnTxlkTv7myFA="; + }; + beamDeps = [ bucs ]; + }; + elvis_core = builder { + name = "elvis_core"; version = "1.1.1"; - sha256 = "sha256-ORyVuqSfJxjX+0mLzwgEbd/CAs8Kq2Oy5DknFIXJ3EI="; - }; - beamDeps = [ katana_code zipper ]; - }; - docsh = builder { - name = "docsh"; - version = "0.7.2"; - src = fetchHex { - pkg = "docsh"; + src = fetchHex { + pkg = "elvis_core"; + version = "1.1.1"; + sha256 = "sha256-ORyVuqSfJxjX+0mLzwgEbd/CAs8Kq2Oy5DknFIXJ3EI="; + }; + beamDeps = [ katana_code zipper ]; + }; + docsh = builder { + name = "docsh"; version = "0.7.2"; - sha256 = "sha256-Tn20YbsHVA0rw9NmuFE/AZdxLQSVu4V0TzZ9OBUHYTQ="; - }; - beamDeps = [ providers ]; - }; -} + src = fetchHex { + pkg = "docsh"; + version = "0.7.2"; + sha256 = "sha256-Tn20YbsHVA0rw9NmuFE/AZdxLQSVu4V0TzZ9OBUHYTQ="; + }; + beamDeps = [ providers ]; + }; + proper_contrib = builder { + name = "proper_contrib"; + version = "0.2.0"; + src = fetchHex { + pkg = "proper_contrib"; + version = "0.2.0"; + sha256 = "sha256-jFRRL1zr9JKaG1eqMDfcKk2xe93uOrXUenB14icVCBU="; + }; + beamDeps = [ proper ]; + }; + proper = builder { + name = "proper"; + version = "1.3.0"; + src = fetchHex { + pkg = "proper"; + version = "1.3.0"; + sha256 = "sha256-SqGS/M3dA/2+UP72IL6dTS+SY1tU9V+4OuwYWZRAPLw="; + }; + beamDeps = [ ]; + }; + meck = builder { + name = "meck"; + version = "0.9.0"; + src = fetchHex { + pkg = "meck"; + version = "0.9.0"; + sha256 = "sha256-+BPpDdC4myUWoCAaNV6EsavHi1dRqgy/ZpqdhagQrGM="; + }; + beamDeps = [ ]; + }; + coveralls = builder { + name = "coveralls"; + version = "2.2.0"; + src = fetchHex { + pkg = "coveralls"; + version = "2.2.0"; + sha256 = "sha256-zVTbCqjGS1OSgBicVhns7hOkaiiw8ct3RUTdzBZiBKM="; + }; + beamDeps = [ jsx ]; + }; + }; +in self diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index e096bdee0cfd9..80e8721302e8c 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, elixir, erlang, findutils, hex, rebar3, fetchMixDeps, makeWrapper, git, ripgrep }: +{ stdenv, lib, elixir, erlang, findutils, hex, rebar, rebar3, fetchMixDeps, makeWrapper, git, ripgrep }: { pname , version @@ -32,6 +32,8 @@ stdenv.mkDerivation (overridable // { HEX_OFFLINE = 1; DEBUG = if enableDebugInfo then 1 else 0; # for Rebar3 compilation # the api with `mix local.rebar rebar path` makes a copy of the binary + # some older dependencies still use rebar + MIX_REBAR = "${rebar}/bin/rebar"; MIX_REBAR3 = "${rebar3}/bin/rebar3"; postUnpack = '' diff --git a/pkgs/development/beam-modules/rebar3-proper/default.nix b/pkgs/development/beam-modules/rebar3-proper/default.nix new file mode 100644 index 0000000000000..2955beeeb5b50 --- /dev/null +++ b/pkgs/development/beam-modules/rebar3-proper/default.nix @@ -0,0 +1,13 @@ +{ lib, buildHex }: + +buildHex { + name = "rebar3_proper"; + version = "0.12.1"; + sha256 = "1f174fb6h2071wr7qbw9aqqvnglzsjlylmyi8215fhrmi38w94b6"; + + meta = { + description = "rebar3 proper plugin"; + license = lib.licenses.bsd3; + homepage = "https://github.com/ferd/rebar3_proper"; + }; +} diff --git a/pkgs/development/beam-modules/rebar3-release.nix b/pkgs/development/beam-modules/rebar3-release.nix index 80082945e4c9e..98d10cb87c4fb 100644 --- a/pkgs/development/beam-modules/rebar3-release.nix +++ b/pkgs/development/beam-modules/rebar3-release.nix @@ -51,20 +51,12 @@ let inherit src; + REBAR_IGNORE_DEPS = beamDeps != [ ]; + configurePhase = '' runHook preConfigure ${lib.optionalString (checkouts != null) "cp --no-preserve=all -R ${checkouts}/_checkouts ."} - ${# Prevent rebar3 from trying to manage deps - lib.optionalString (beamDeps != [ ]) '' - erl -noshell -eval ' - {ok, Terms0} = file:consult("rebar.config"), - Terms = lists:keydelete(deps, 1, Terms0), - ok = file:write_file("rebar.config", [io_lib:format("~tp.~n", [T]) || T <- Terms]), - init:stop(0) - ' - rm -f rebar.lock - ''} runHook postConfigure ''; diff --git a/pkgs/development/compilers/acme/default.nix b/pkgs/development/compilers/acme/default.nix index f8731f554718d..cebcbf3b2fa51 100644 --- a/pkgs/development/compilers/acme/default.nix +++ b/pkgs/development/compilers/acme/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "acme"; - version = "unstable-2020-12-27"; + version = "unstable-2021-02-14"; src = fetchsvn { url = "svn://svn.code.sf.net/p/acme-crossass/code-0/trunk"; - rev = "314"; - sha256 = "08zg26rh19nlif7id91nv0syx5n243ssxhfw0nk2r2bhjm5jrjz1"; + rev = "319"; + sha256 = "sha256-VifIQ+UEVMKJ+cNS+Xxusazinr5Cgu1lmGuhqj/5Mpk="; }; sourceRoot = "code-0-r${src.rev}/src"; diff --git a/pkgs/development/compilers/cc65/default.nix b/pkgs/development/compilers/cc65/default.nix index 03325d2fd6061..cb2410ba06a43 100644 --- a/pkgs/development/compilers/cc65/default.nix +++ b/pkgs/development/compilers/cc65/default.nix @@ -1,8 +1,6 @@ -{ lib, stdenv -, fetchFromGitHub -}: +{ lib, gccStdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +gccStdenv.mkDerivation rec { pname = "cc65"; version = "2.19"; @@ -13,10 +11,9 @@ stdenv.mkDerivation rec { sha256 = "01a15yvs455qp20hri2pbg2wqvcip0d50kb7dibi9427hqk9cnj4"; }; - makeFlags = [ - "PREFIX=${placeholder "out"}" - "CC=${stdenv.cc.targetPrefix}cc" - ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + enableParallelBuilding = true; meta = with lib; { homepage = "https://cc65.github.io/"; @@ -56,6 +53,6 @@ stdenv.mkDerivation rec { ''; license = licenses.zlib; maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; + platforms = platforms.unix; }; } diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix deleted file mode 100644 index e9f9088df3a68..0000000000000 --- a/pkgs/development/compilers/fsharp41/default.nix +++ /dev/null @@ -1,126 +0,0 @@ -# Temporaririly avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it - -{ lib, stdenv, fetchurl, pkg-config, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }: - -stdenv.mkDerivation rec { - pname = "fsharp"; - version = "4.1.34"; - - src = fetchurl { - url = "https://github.com/fsharp/fsharp/archive/${version}.tar.gz"; - sha256 = "0cv6p5pin962vhbpsji40nkckkag5c96kq5qihvg60pc1z821p0i"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - autoconf - automake - which - mono - msbuild - dotnetbuildhelpers - dotnetPackages.FsCheck262 - dotnetPackages.FSharpCompilerTools - dotnetPackages.FSharpCore302 - dotnetPackages.FSharpCore3125 - dotnetPackages.FSharpCore4001 - dotnetPackages.FSharpCore4117 - dotnetPackages.FSharpData225 - dotnetPackages.FsLexYacc706 - dotnetPackages.MicrosoftDiaSymReader - dotnetPackages.MicrosoftDiaSymReaderPortablePdb - dotnetPackages.NUnit350 - dotnetPackages.SystemCollectionsImmutable131 - dotnetPackages.SystemReflectionMetadata - dotnetPackages.SystemValueTuple - ]; - - # https://github.com/mono/mono/tree/fe0f311a848068ab2d17a9b9dd15326e5712d520/packaging/MacSDK/patches - # https://github.com/mono/mono/issues/7805 - patches = [ - ./fsharp-IsPathRooted-type-inference.patch - ./fsharp-string-switchName.patch - ./fsharp-path-overloads.patch - ./fsharp-GetFileNameWithoutExtension-type-inference.patch - ]; - - configurePhase = '' - substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "${stdenv.shell}" - ./autogen.sh --prefix $out - ''; - - preBuild = '' - substituteInPlace Makefile --replace "MONO_ENV_OPTIONS=\$(monoopts) mono .nuget/NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget/NuGet.Config" "true" - substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "<FSharpCoreOptSigFiles Include=\"\$(FSharpCoreLkgPath)\\FSharp.Core.dll\" />" "" - substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "<FSharpCoreOptSigFiles Include=\"\$(FSharpCoreLkgPath)\\FSharp.Core.optdata\" />" "" - substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "<FSharpCoreOptSigFiles Include=\"\$(FSharpCoreLkgPath)\\FSharp.Core.sigdata\" />" "" - substituteInPlace src/fsharp/Fsc-proto/Fsc-proto.fsproj --replace "<FSharpCoreOptSigFiles Include=\"\$(FSharpCoreLkgPath)\\FSharp.Core.xml\" />" "" - - rm -rf packages - mkdir packages - - ln -s ${dotnetPackages.FsCheck262}/lib/dotnet/FsCheck packages/FsCheck.2.6.2 - ln -s ${dotnetPackages.FSharpCompilerTools}/lib/dotnet/FSharp.Compiler.Tools packages/FSharp.Compiler.Tools.4.1.27 - ln -s ${dotnetPackages.FSharpCore302}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.3.0.2 - ln -s ${dotnetPackages.FSharpCore3125}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.3.1.2.5 - ln -s ${dotnetPackages.FSharpCore4001}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.4.0.0.1 - ln -s ${dotnetPackages.FSharpCore4117}/lib/dotnet/FSharp.Core/ packages/FSharp.Core.4.1.17 - ln -s ${dotnetPackages.FSharpData225}/lib/dotnet/FSharp.Data/ packages/FSharp.Data.2.2.5 - ln -s ${dotnetPackages.FsLexYacc706}/lib/dotnet/FsLexYacc/ packages/FsLexYacc.7.0.6 - ln -s ${dotnetPackages.MicrosoftDiaSymReader}/lib/dotnet/Microsoft.DiaSymReader/ packages/Microsoft.DiaSymReader.1.1.0 - ln -s ${dotnetPackages.MicrosoftDiaSymReaderPortablePdb}/lib/dotnet/Microsoft.DiaSymReader.PortablePdb/ packages/Microsoft.DiaSymReader.PortablePdb.1.2.0 - ln -s ${dotnetPackages.NUnit350}/lib/dotnet/NUnit/ packages/NUnit.3.5.0 - ln -s ${dotnetPackages.SystemCollectionsImmutable131}/lib/dotnet/System.Collections.Immutable/ packages/System.Collections.Immutable.1.3.1 - ln -s ${dotnetPackages.SystemReflectionMetadata}/lib/dotnet/System.Reflection.Metadata/ packages/System.Reflection.Metadata.1.4.2 - ln -s ${dotnetPackages.SystemValueTuple}/lib/dotnet/System.ValueTuple/ packages/System.ValueTuple.4.3.1 - ''; - - # Signing /home/jdanek/nix/nixpkgs/build/fss/fsharp-4.1.34/again/fsharp-4.1.34/Release/fsharp30/net40/bin/FSharp.Core.dll with Mono key - # ERROR: Unknown error during processing: System.UnauthorizedAccessException: Access to the path - # "Release/fsharp30/net40/bin/FSharp.Core.dll" is denied. - preInstall = '' - find Release/ -name FSharp.Core.dll -exec chmod u+w {} \; - ''; - - # Set up some symlinks for backwards compatibility. - postInstall = '' - ln -s $out/bin/fsharpc $out/bin/fsc - ln -s $out/bin/fsharpi $out/bin/fsi - for dll in "$out/lib/mono/fsharp"/FSharp*.dll - do - create-pkg-config-for-dll.sh "$out/lib/pkgconfig" "$dll" - done - ''; - - doInstallCheck = true; - installCheckPhase = '' - echo 'printf "int = %i" (6 * 7);;' > script.fsx - $out/bin/fsi --exec script.fsx | grep "int = 42" - $out/bin/fsharpi --exec script.fsx | grep "int = 42" - $out/bin/fsharpiAnyCpu --exec script.fsx | grep "int = 42" - - cat > answer.fs <<EOF -open System - -[<EntryPoint>] -let main argv = - printfn "int = %i" (6 * 7) - 0 -EOF - - $out/bin/fsc answer.fs - ${mono}/bin/mono answer.exe | grep "int = 42" - ''; - - # To fix this error when running: - # The file "/nix/store/path/whatever.exe" is an not a valid CIL image - dontStrip = true; - - meta = { - description = "A functional CLI language"; - homepage = "https://fsharp.org/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ thoughtpolice raskin ]; - platforms = with lib.platforms; unix; - }; -} diff --git a/pkgs/development/compilers/fsharp41/fsharp-GetFileNameWithoutExtension-type-inference.patch b/pkgs/development/compilers/fsharp41/fsharp-GetFileNameWithoutExtension-type-inference.patch deleted file mode 100644 index 14e9444b1de3b..0000000000000 --- a/pkgs/development/compilers/fsharp41/fsharp-GetFileNameWithoutExtension-type-inference.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/scripts/fssrgen.fsx b/src/scripts/fssrgen.fsx -index 0bee9b79e..e6ceda11e 100644 ---- a/src/scripts/fssrgen.fsx -+++ b/src/scripts/fssrgen.fsx -@@ -329,7 +329,7 @@ let StringBoilerPlate filename = - // END BOILERPLATE - " - --let RunMain(filename, outFilename, outXmlFilenameOpt, projectNameOpt) = -+let RunMain(filename:string, outFilename, outXmlFilenameOpt, projectNameOpt) = - try - let justfilename = System.IO.Path.GetFileNameWithoutExtension(filename) - if justfilename |> Seq.exists (fun c -> not(System.Char.IsLetterOrDigit(c))) then diff --git a/pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch b/pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch deleted file mode 100644 index 06dd3e82adc91..0000000000000 --- a/pkgs/development/compilers/fsharp41/fsharp-IsPathRooted-type-inference.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit c37fce5b3019c7a150203fc3a484885591b194de -Author: Alexis Christoforides <alexis@thenull.net> -Date: Sun Dec 2 00:10:24 2018 -0500 - - Help Path.IsPathRooted method overload selection. - - .NET Core, and Mono after merging https://github.com/mono/mono/pull/11342, introduce ambiguity with a new overload. - -diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx -index cc797e305..699c7bb93 100644 ---- a/src/scripts/scriptlib.fsx -+++ b/src/scripts/scriptlib.fsx -@@ -92,7 +92,7 @@ module Scripting = - - module Process = - -- let processExePath baseDir exe = -+ let processExePath baseDir (exe:string) = - if Path.IsPathRooted(exe) then exe - else - match Path.GetDirectoryName(exe) with diff --git a/pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch b/pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch deleted file mode 100644 index f791317d0802d..0000000000000 --- a/pkgs/development/compilers/fsharp41/fsharp-path-overloads.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx -index cc797e305..ae8a6d3cc 100644 ---- a/src/scripts/scriptlib.fsx -+++ b/src/scripts/scriptlib.fsx -@@ -59,12 +59,12 @@ module Scripting = - - let (++) a b = Path.Combine(a,b) - -- let getBasename a = Path.GetFileNameWithoutExtension a -- let getFullPath a = Path.GetFullPath a -- let getFilename a = Path.GetFileName a -- let getDirectoryName a = Path.GetDirectoryName a -+ let getBasename (path: string) = Path.GetFileNameWithoutExtension path -+ let getFullPath (path: string) = Path.GetFullPath path -+ let getFilename (path: string) = Path.GetFileName path -+ let getDirectoryName (path: string) = Path.GetDirectoryName path - -- let copyFile source dir = -+ let copyFile (source: string) dir = - let dest = - if not (Directory.Exists dir) then Directory.CreateDirectory dir |>ignore - let result = Path.Combine(dir, Path.GetFileName source) diff --git a/pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch b/pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch deleted file mode 100644 index 4b36eaabcafc0..0000000000000 --- a/pkgs/development/compilers/fsharp41/fsharp-string-switchName.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx -index cc797e305..5a7be7d2b 100644 ---- a/src/scripts/scriptlib.fsx -+++ b/src/scripts/scriptlib.fsx -@@ -36,7 +36,7 @@ module Scripting = - #if INTERACTIVE - let argv = Microsoft.FSharp.Compiler.Interactive.Settings.fsi.CommandLineArgs |> Seq.skip 1 |> Seq.toArray - -- let getCmdLineArgOptional switchName = -+ let getCmdLineArgOptional (switchName: string) = - argv |> Array.filter(fun t -> t.StartsWith(switchName)) |> Array.map(fun t -> t.Remove(0, switchName.Length).Trim()) |> Array.tryHead - - let getCmdLineArg switchName defaultValue = diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index f8f4ad71e358d..143681c2a5bbe 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -282,11 +282,7 @@ stdenv.mkDerivation ({ maintainers = lib.teams.gcc.members; - platforms = - lib.platforms.linux ++ - lib.platforms.freebsd ++ - lib.platforms.illumos ++ - lib.platforms.darwin; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index fe29440c25d5c..7efc9d589f988 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -287,11 +287,7 @@ stdenv.mkDerivation ({ maintainers = lib.teams.gcc.members; - platforms = - lib.platforms.linux ++ - lib.platforms.freebsd ++ - lib.platforms.illumos ++ - lib.platforms.darwin; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 86dd9247f5a04..98332290a0789 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -309,11 +309,7 @@ stdenv.mkDerivation ({ maintainers = with lib.maintainers; [ peti veprbl ]; - platforms = - lib.platforms.linux ++ - lib.platforms.freebsd ++ - lib.platforms.illumos ++ - lib.platforms.darwin; + platforms = lib.platforms.unix; badPlatforms = [ "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index b7c9e5bcc0a54..a15cb770fdfad 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -321,11 +321,7 @@ stdenv.mkDerivation ({ maintainers = with lib.maintainers; [ peti veprbl ]; - platforms = - lib.platforms.linux ++ - lib.platforms.freebsd ++ - lib.platforms.illumos ++ - lib.platforms.darwin; + platforms = lib.platforms.unix; badPlatforms = [ "x86_64-darwin" ]; }; } diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index b70d8a57b9d20..4567e8b43e9f5 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -343,11 +343,7 @@ stdenv.mkDerivation ({ maintainers = with lib.maintainers; [ peti ]; - platforms = - lib.platforms.linux ++ - lib.platforms.freebsd ++ - lib.platforms.illumos ++ - lib.platforms.darwin; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 5eb4389be3aa8..44e8b38fdf806 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -296,11 +296,7 @@ stdenv.mkDerivation ({ maintainers = lib.teams.gcc.members; - platforms = - lib.platforms.linux ++ - lib.platforms.freebsd ++ - lib.platforms.illumos ++ - lib.platforms.darwin; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index ca1b31467af44..b264d37418e8e 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -278,11 +278,7 @@ stdenv.mkDerivation ({ maintainers = lib.teams.gcc.members; - platforms = - lib.platforms.linux ++ - lib.platforms.freebsd ++ - lib.platforms.illumos ++ - lib.platforms.darwin; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 93e75389bd9fa..857263e51e0bc 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -297,11 +297,7 @@ stdenv.mkDerivation ({ maintainers = lib.teams.gcc.members; - platforms = - lib.platforms.linux ++ - lib.platforms.freebsd ++ - lib.platforms.illumos ++ - lib.platforms.darwin; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/koka/default.nix b/pkgs/development/compilers/koka/default.nix index 6523dcca2f623..30e273271ae38 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.1"; + version = "2.1.4"; src = fetchFromGitHub { owner = "koka-lang"; repo = "koka"; rev = "v${version}"; - sha256 = "sha256-cq+dljfTKJh5NgwQfxQQP9jRcg2PQxxBVEgQ59ll36o="; + sha256 = "sha256-MPMA8ZErEKv1SrkliLsy35k88GrdsPqIK6yokQreIjE="; fetchSubmodules = true; }; kklib = stdenv.mkDerivation { diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index a65748d06422d..dbc6f40a68cee 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune_2 -, fix, menhir, menhirLib, menhirSdk, merlin-extend, ppx_tools_versioned, utop, cppo +{ lib, callPackage, stdenv, makeWrapper, fetchFromGitHub, ocaml, findlib, dune_2 +, fix, menhir, menhirLib, menhirSdk, merlin-extend, ppxlib, utop, cppo, ppx_derivers }: stdenv.mkDerivation rec { @@ -13,11 +13,28 @@ stdenv.mkDerivation rec { sha256 = "0m6ldrci1a4j0qv1cbwh770zni3al8qxsphl353rv19f6rblplhs"; }; - nativeBuildInputs = [ makeWrapper menhir ]; - - propagatedBuildInputs = [ menhirLib merlin-extend ppx_tools_versioned ]; - - buildInputs = [ ocaml findlib dune_2 cppo fix utop menhir menhirSdk ]; + nativeBuildInputs = [ + makeWrapper + menhir + ]; + + buildInputs = [ + cppo + dune_2 + findlib + fix + menhir + menhirSdk + ocaml + ppxlib + utop + ]; + + propagatedBuildInputs = [ + menhirLib + merlin-extend + ppx_derivers + ]; buildFlags = [ "build" ]; # do not "make tests" before reason lib is installed @@ -29,11 +46,16 @@ stdenv.mkDerivation rec { --prefix OCAMLPATH : "$OCAMLPATH:$OCAMLFIND_DESTDIR" ''; + passthru.tests = { + hello = callPackage ./tests/hello { }; + }; + meta = with lib; { homepage = "https://reasonml.github.io/"; + downloadPage = "https://github.com/reasonml/reason"; description = "Facebook's friendly syntax to OCaml"; license = licenses.mit; inherit (ocaml.meta) platforms; - maintainers = [ maintainers.volth ]; + maintainers = with maintainers; [ superherointj ]; }; } diff --git a/pkgs/development/compilers/reason/tests/hello/default.nix b/pkgs/development/compilers/reason/tests/hello/default.nix new file mode 100644 index 0000000000000..9b551a0a1ee59 --- /dev/null +++ b/pkgs/development/compilers/reason/tests/hello/default.nix @@ -0,0 +1,23 @@ +{ lib, buildDunePackage, reason }: + +buildDunePackage rec { + pname = "helloreason"; + version = "0.0.1"; + + src = ./.; + + useDune2 = true; + + buildInputs = [ + reason + ]; + + doCheck = true; + + doInstallCheck = true; + postInstallCheck = '' + $out/bin/${pname} | grep -q "Hello From Reason" > /dev/null + ''; + + meta.timeout = 60; +} diff --git a/pkgs/development/compilers/reason/tests/hello/dune b/pkgs/development/compilers/reason/tests/hello/dune new file mode 100644 index 0000000000000..578a56dc6de45 --- /dev/null +++ b/pkgs/development/compilers/reason/tests/hello/dune @@ -0,0 +1,4 @@ +(executable + (name helloreason) + (public_name helloreason) + (libraries reason)) diff --git a/pkgs/development/compilers/reason/tests/hello/helloreason.opam b/pkgs/development/compilers/reason/tests/hello/helloreason.opam new file mode 100644 index 0000000000000..e69de29bb2d1d --- /dev/null +++ b/pkgs/development/compilers/reason/tests/hello/helloreason.opam diff --git a/pkgs/development/compilers/reason/tests/hello/helloreason.re b/pkgs/development/compilers/reason/tests/hello/helloreason.re new file mode 100644 index 0000000000000..795bd314dcfb7 --- /dev/null +++ b/pkgs/development/compilers/reason/tests/hello/helloreason.re @@ -0,0 +1,6 @@ +let sayHello = () => { + let fromWhom = "From Reason"; + print_endline("Hello " ++ fromWhom); +}; + +sayHello(); diff --git a/pkgs/development/coq-modules/reglang/default.nix b/pkgs/development/coq-modules/reglang/default.nix new file mode 100644 index 0000000000000..bc18108264a1a --- /dev/null +++ b/pkgs/development/coq-modules/reglang/default.nix @@ -0,0 +1,25 @@ +{ lib, mkCoqDerivation, coq, ssreflect, version ? null }: +with lib; + +mkCoqDerivation { + pname = "reglang"; + + releaseRev = v: "v${v}"; + + release."1.1.2".sha256 = "sha256-SEnMilLNxh6a3oiDNGLaBr8quQ/nO2T9Fwdf/1il2Yk="; + + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.10" "8.13"; out = "1.1.2"; } + ] null; + + + propagatedBuildInputs = [ ssreflect ]; + + meta = { + description = "Regular Language Representations in Coq"; + maintainers = with maintainers; [ siraben ]; + license = licenses.cecill-b; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix index 64fd89008e335..2edeaf9e4e876 100644 --- a/pkgs/development/interpreters/clips/default.nix +++ b/pkgs/development/interpreters/clips/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "6.31"; + version = "6.40"; pname = "clips"; src = fetchurl { url = "mirror://sourceforge/clipsrules/CLIPS/${version}/clips_core_source_${ builtins.replaceStrings [ "." ] [ "" ] version }.tar.gz"; - sha256 = "165k0z7dsv04q432sanmw0jxmxwf56cnhsdfw5ffjqxd3lzkjnv6"; + sha256 = "1pr5l61zxf6kjs8b2b028g2aq45pigavwjmrf4l5mrdmlnk3fq5d"; }; postPatch = '' diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 80f9fac63ceb3..9ae94f0a24877 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.3.849"; + version = "1.10.3.855"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-0bHb6FsCZP1LdxY21+hz6lF+ka9N0yoIHUWVd+zc7wg="; + sha256 = "sha256-y2PuOBRq5kZlTpPV8NwkWhspQKlNxwjl+k/Drwixk4Q="; }; nativeBuildInputs = [ diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix index 79e736b30d5de..c4e566ee27ceb 100644 --- a/pkgs/development/interpreters/php/7.4.nix +++ b/pkgs/development/interpreters/php/7.4.nix @@ -1,9 +1,7 @@ -{ callPackage, lib, stdenv, nixosTests, ... }@_args: +{ callPackage, lib, stdenv, ... }@_args: let - generic = (import ./generic.nix) _args; - - base = callPackage generic (_args // { + base = callPackage ./generic.nix (_args // { version = "7.4.20"; sha256 = "0d5ncz97y0271dsmz269wl4721vhq2fn6pmm9rxglc756p36pnha"; }); diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 9d357f88afee9..90f7c3b796c00 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -1,9 +1,7 @@ -{ callPackage, lib, stdenv, nixosTests, ... }@_args: +{ callPackage, lib, stdenv, ... }@_args: let - generic = (import ./generic.nix) _args; - - base = callPackage generic (_args // { + base = callPackage ./generic.nix (_args // { version = "8.0.7"; sha256 = "0yazcc9x66xg1gmi3rpgk891g6s3mm7aywcadqfqnx1mdz4z5ckj"; }); diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index 233e1b7007f4f..558fa45a1fd91 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -1,8 +1,6 @@ # We have tests for PCRE and PHP-FPM in nixos/tests/php/ or # both in the same attribute named nixosTests.php -{ callPackage, lib, stdenv, nixosTests, ... }: - let generic = { callPackage, lib, stdenv, nixosTests, fetchurl, makeWrapper @@ -33,250 +31,251 @@ let , valgrindSupport ? !stdenv.isDarwin , ztsSupport ? apxs2Support }@args: - let - # buildEnv wraps php to provide additional extensions and - # configuration. Its usage is documented in - # doc/languages-frameworks/php.section.md. - # - # Create a buildEnv with earlier overridden values and - # extensions functions in its closure. This is necessary for - # consecutive calls to buildEnv and overrides to work as - # expected. - mkBuildEnv = prevArgs: prevExtensionFunctions: lib.makeOverridable ( - { extensions ? ({ enabled, ... }: enabled), extraConfig ? "", ... }@innerArgs: - let - allArgs = args // prevArgs // innerArgs; - filteredArgs = builtins.removeAttrs allArgs [ "extensions" "extraConfig" ]; - php = generic filteredArgs; - - php-packages = (callPackage ../../../top-level/php-packages.nix { - phpPackage = phpWithExtensions; - }).overrideScope' packageOverrides; - - allExtensionFunctions = prevExtensionFunctions ++ [ extensions ]; - enabledExtensions = - builtins.foldl' - (enabled: f: - f { inherit enabled; all = php-packages.extensions; }) - [] - allExtensionFunctions; - - getExtName = ext: lib.removePrefix "php-" (builtins.parseDrvName ext.name).name; - - # Recursively get a list of all internal dependencies - # for a list of extensions. - getDepsRecursively = extensions: - let - deps = lib.concatMap - (ext: (ext.internalDeps or []) ++ (ext.peclDeps or [])) - extensions; - in - if ! (deps == []) then - deps ++ (getDepsRecursively deps) - else - deps; - - # Generate extension load configuration snippets from the - # extension parameter. This is an attrset suitable for use - # with textClosureList, which is used to put the strings in - # the right order - if a plugin which is dependent on - # another plugin is placed before its dependency, it will - # fail to load. - extensionTexts = - lib.listToAttrs - (map (ext: - let - extName = getExtName ext; - phpDeps = (ext.internalDeps or []) ++ (ext.peclDeps or []); - type = "${lib.optionalString (ext.zendExtension or false) "zend_"}extension"; - in - lib.nameValuePair extName { - text = "${type}=${ext}/lib/php/extensions/${extName}.so"; - deps = map getExtName phpDeps; - }) - (enabledExtensions ++ (getDepsRecursively enabledExtensions))); - - extNames = map getExtName enabledExtensions; - extraInit = writeText "php-extra-init-${version}.ini" '' - ${lib.concatStringsSep "\n" - (lib.textClosureList extensionTexts extNames)} - ${extraConfig} - ''; - phpWithExtensions = symlinkJoin { - name = "php-with-extensions-${version}"; - inherit (php) version; - nativeBuildInputs = [ makeWrapper ]; - passthru = php.passthru // { - buildEnv = mkBuildEnv allArgs allExtensionFunctions; - withExtensions = mkWithExtensions allArgs allExtensionFunctions; - phpIni = "${phpWithExtensions}/lib/php.ini"; - unwrapped = php; - # Select the right php tests for the php version - tests = nixosTests."php${lib.strings.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor php.version)}"; - inherit (php-packages) extensions buildPecl; - packages = php-packages.tools; - meta = php.meta // { - outputsToInstall = [ "out" ]; - }; + let + # buildEnv wraps php to provide additional extensions and + # configuration. Its usage is documented in + # doc/languages-frameworks/php.section.md. + # + # Create a buildEnv with earlier overridden values and + # extensions functions in its closure. This is necessary for + # consecutive calls to buildEnv and overrides to work as + # expected. + mkBuildEnv = prevArgs: prevExtensionFunctions: lib.makeOverridable ( + { extensions ? ({ enabled, ... }: enabled), extraConfig ? "", ... }@innerArgs: + let + allArgs = args // prevArgs // innerArgs; + filteredArgs = builtins.removeAttrs allArgs [ "extensions" "extraConfig" ]; + php = generic filteredArgs; + + php-packages = (callPackage ../../../top-level/php-packages.nix { + phpPackage = phpWithExtensions; + }).overrideScope' packageOverrides; + + allExtensionFunctions = prevExtensionFunctions ++ [ extensions ]; + enabledExtensions = + builtins.foldl' + (enabled: f: + f { inherit enabled; all = php-packages.extensions; }) + [] + allExtensionFunctions; + + getExtName = ext: lib.removePrefix "php-" (builtins.parseDrvName ext.name).name; + + # Recursively get a list of all internal dependencies + # for a list of extensions. + getDepsRecursively = extensions: + let + deps = lib.concatMap + (ext: (ext.internalDeps or []) ++ (ext.peclDeps or [])) + extensions; + in + if ! (deps == []) then + deps ++ (getDepsRecursively deps) + else + deps; + + # Generate extension load configuration snippets from the + # extension parameter. This is an attrset suitable for use + # with textClosureList, which is used to put the strings in + # the right order - if a plugin which is dependent on + # another plugin is placed before its dependency, it will + # fail to load. + extensionTexts = + lib.listToAttrs + (map (ext: + let + extName = getExtName ext; + phpDeps = (ext.internalDeps or []) ++ (ext.peclDeps or []); + type = "${lib.optionalString (ext.zendExtension or false) "zend_"}extension"; + in + lib.nameValuePair extName { + text = "${type}=${ext}/lib/php/extensions/${extName}.so"; + deps = map getExtName phpDeps; + }) + (enabledExtensions ++ (getDepsRecursively enabledExtensions))); + + extNames = map getExtName enabledExtensions; + extraInit = writeText "php-extra-init-${version}.ini" '' + ${lib.concatStringsSep "\n" + (lib.textClosureList extensionTexts extNames)} + ${extraConfig} + ''; + + phpWithExtensions = symlinkJoin { + name = "php-with-extensions-${version}"; + inherit (php) version; + nativeBuildInputs = [ makeWrapper ]; + passthru = php.passthru // { + buildEnv = mkBuildEnv allArgs allExtensionFunctions; + withExtensions = mkWithExtensions allArgs allExtensionFunctions; + phpIni = "${phpWithExtensions}/lib/php.ini"; + unwrapped = php; + # Select the right php tests for the php version + tests = nixosTests."php${lib.strings.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor php.version)}"; + inherit (php-packages) extensions buildPecl; + packages = php-packages.tools; + meta = php.meta // { + outputsToInstall = [ "out" ]; }; - paths = [ php ]; - postBuild = '' - ln -s ${extraInit} $out/lib/php.ini - - if test -e $out/bin/php; then - wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib - fi - - if test -e $out/bin/php-fpm; then - wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib - fi - - if test -e $out/bin/phpdbg; then - wrapProgram $out/bin/phpdbg --set PHP_INI_SCAN_DIR $out/lib - fi - ''; }; - in - phpWithExtensions); - - mkWithExtensions = prevArgs: prevExtensionFunctions: extensions: - mkBuildEnv prevArgs prevExtensionFunctions { inherit extensions; }; - in - stdenv.mkDerivation { - pname = "php"; - - inherit version; - - enableParallelBuilding = true; - - nativeBuildInputs = [ autoconf automake bison flex libtool pkg-config re2c ] - ++ lib.optional stdenv.isDarwin xcbuild; - - buildInputs = - # PCRE extension - [ pcre2 ] - - # Enable sapis - ++ lib.optional pearSupport [ libxml2.dev ] - - # Misc deps - ++ lib.optional apxs2Support apacheHttpd - ++ lib.optional argon2Support libargon2 - ++ lib.optional systemdSupport systemd - ++ lib.optional valgrindSupport valgrind - ; - - CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; - - configureFlags = - # Disable all extensions - [ "--disable-all" ] - - # PCRE - ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" ] - ++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre2.dev}" ] - ++ lib.optionals (lib.versionOlder version "7.3") [ "--with-pcre-regex=${pcre2.dev}" ] - ++ [ "PCRE_LIBDIR=${pcre2}" ] - - - # Enable sapis - ++ lib.optional (!cgiSupport) "--disable-cgi" - ++ lib.optional (!cliSupport) "--disable-cli" - ++ lib.optional fpmSupport "--enable-fpm" - ++ lib.optional pearSupport [ "--with-pear" "--enable-xml" "--with-libxml" ] - ++ lib.optionals (pearSupport && (lib.versionOlder version "7.4")) [ - "--enable-libxml" - "--with-libxml-dir=${libxml2.dev}" - ] - ++ lib.optional pharSupport "--enable-phar" - ++ lib.optional (!phpdbgSupport) "--disable-phpdbg" - - - # Misc flags - ++ lib.optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs" - ++ lib.optional argon2Support "--with-password-argon2=${libargon2}" - ++ lib.optional cgotoSupport "--enable-re2c-cgoto" - ++ lib.optional embedSupport "--enable-embed" - ++ lib.optional (!ipv6Support) "--disable-ipv6" - ++ lib.optional systemdSupport "--with-fpm-systemd" - ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" - ++ lib.optional (ztsSupport && (lib.versionOlder version "8.0")) "--enable-maintainer-zts" - ++ lib.optional (ztsSupport && (lib.versionAtLeast version "8.0")) "--enable-zts" - - - # Sendmail - ++ [ "PROG_SENDMAIL=${system-sendmail}/bin/sendmail" ] - ; - - hardeningDisable = [ "bindnow" ]; - - preConfigure = - # Don't record the configure flags since this causes unnecessary - # runtime dependencies - '' - for i in main/build-defs.h.in scripts/php-config.in; do - substituteInPlace $i \ - --replace '@CONFIGURE_COMMAND@' '(omitted)' \ - --replace '@CONFIGURE_OPTIONS@' "" \ - --replace '@PHP_LDFLAGS@' "" - done - - export EXTENSION_DIR=$out/lib/php/extensions - '' - # PKG_CONFIG need not be a relative path - + lib.optionalString (! lib.versionAtLeast version "7.4") '' - for i in $(find . -type f -name "*.m4"); do - substituteInPlace $i \ - --replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null' - done - '' + '' - ./buildconf --copy --force - - if test -f $src/genfiles; then - ./genfiles - fi - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace configure --replace "-lstdc++" "-lc++" - ''; - - postInstall = '' - test -d $out/etc || mkdir $out/etc - cp php.ini-production $out/etc/php.ini - ''; - - postFixup = '' - mkdir -p $dev/bin $dev/share/man/man1 - mv $out/bin/phpize $out/bin/php-config $dev/bin/ - mv $out/share/man/man1/phpize.1.gz \ - $out/share/man/man1/php-config.1.gz \ - $dev/share/man/man1/ - ''; - - src = fetchurl { - url = "https://www.php.net/distributions/php-${version}.tar.bz2"; - inherit sha256; - }; - - patches = [ ./fix-paths-php7.patch ] ++ extraPatches; - - separateDebugInfo = true; - - outputs = [ "out" "dev" ]; - - passthru = { - buildEnv = mkBuildEnv {} []; - withExtensions = mkWithExtensions {} []; - inherit ztsSupport; - }; - - meta = with lib; { - description = "An HTML-embedded scripting language"; - homepage = "https://www.php.net/"; - license = licenses.php301; - maintainers = teams.php.members; - platforms = platforms.all; - outputsToInstall = [ "out" "dev" ]; - }; - }; + paths = [ php ]; + postBuild = '' + ln -s ${extraInit} $out/lib/php.ini + + if test -e $out/bin/php; then + wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib + fi + + if test -e $out/bin/php-fpm; then + wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib + fi + + if test -e $out/bin/phpdbg; then + wrapProgram $out/bin/phpdbg --set PHP_INI_SCAN_DIR $out/lib + fi + ''; + }; + in + phpWithExtensions); + + mkWithExtensions = prevArgs: prevExtensionFunctions: extensions: + mkBuildEnv prevArgs prevExtensionFunctions { inherit extensions; }; + in + stdenv.mkDerivation { + pname = "php"; + + inherit version; + + enableParallelBuilding = true; + + nativeBuildInputs = [ autoconf automake bison flex libtool pkg-config re2c ] + ++ lib.optional stdenv.isDarwin xcbuild; + + buildInputs = + # PCRE extension + [ pcre2 ] + + # Enable sapis + ++ lib.optional pearSupport [ libxml2.dev ] + + # Misc deps + ++ lib.optional apxs2Support apacheHttpd + ++ lib.optional argon2Support libargon2 + ++ lib.optional systemdSupport systemd + ++ lib.optional valgrindSupport valgrind + ; + + CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; + + configureFlags = + # Disable all extensions + [ "--disable-all" ] + + # PCRE + ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" ] + ++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre2.dev}" ] + ++ lib.optionals (lib.versionOlder version "7.3") [ "--with-pcre-regex=${pcre2.dev}" ] + ++ [ "PCRE_LIBDIR=${pcre2}" ] + + + # Enable sapis + ++ lib.optional (!cgiSupport) "--disable-cgi" + ++ lib.optional (!cliSupport) "--disable-cli" + ++ lib.optional fpmSupport "--enable-fpm" + ++ lib.optional pearSupport [ "--with-pear" "--enable-xml" "--with-libxml" ] + ++ lib.optionals (pearSupport && (lib.versionOlder version "7.4")) [ + "--enable-libxml" + "--with-libxml-dir=${libxml2.dev}" + ] + ++ lib.optional pharSupport "--enable-phar" + ++ lib.optional (!phpdbgSupport) "--disable-phpdbg" + + + # Misc flags + ++ lib.optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs" + ++ lib.optional argon2Support "--with-password-argon2=${libargon2}" + ++ lib.optional cgotoSupport "--enable-re2c-cgoto" + ++ lib.optional embedSupport "--enable-embed" + ++ lib.optional (!ipv6Support) "--disable-ipv6" + ++ lib.optional systemdSupport "--with-fpm-systemd" + ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" + ++ lib.optional (ztsSupport && (lib.versionOlder version "8.0")) "--enable-maintainer-zts" + ++ lib.optional (ztsSupport && (lib.versionAtLeast version "8.0")) "--enable-zts" + + + # Sendmail + ++ [ "PROG_SENDMAIL=${system-sendmail}/bin/sendmail" ] + ; + + hardeningDisable = [ "bindnow" ]; + + preConfigure = + # Don't record the configure flags since this causes unnecessary + # runtime dependencies + '' + for i in main/build-defs.h.in scripts/php-config.in; do + substituteInPlace $i \ + --replace '@CONFIGURE_COMMAND@' '(omitted)' \ + --replace '@CONFIGURE_OPTIONS@' "" \ + --replace '@PHP_LDFLAGS@' "" + done + + export EXTENSION_DIR=$out/lib/php/extensions + '' + # PKG_CONFIG need not be a relative path + + lib.optionalString (! lib.versionAtLeast version "7.4") '' + for i in $(find . -type f -name "*.m4"); do + substituteInPlace $i \ + --replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null' + done + '' + '' + ./buildconf --copy --force + + if test -f $src/genfiles; then + ./genfiles + fi + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace configure --replace "-lstdc++" "-lc++" + ''; + + postInstall = '' + test -d $out/etc || mkdir $out/etc + cp php.ini-production $out/etc/php.ini + ''; + + postFixup = '' + mkdir -p $dev/bin $dev/share/man/man1 + mv $out/bin/phpize $out/bin/php-config $dev/bin/ + mv $out/share/man/man1/phpize.1.gz \ + $out/share/man/man1/php-config.1.gz \ + $dev/share/man/man1/ + ''; + + src = fetchurl { + url = "https://www.php.net/distributions/php-${version}.tar.bz2"; + inherit sha256; + }; + + patches = [ ./fix-paths-php7.patch ] ++ extraPatches; + + separateDebugInfo = true; + + outputs = [ "out" "dev" ]; + + passthru = { + buildEnv = mkBuildEnv {} []; + withExtensions = mkWithExtensions {} []; + inherit ztsSupport; + }; + + meta = with lib; { + description = "An HTML-embedded scripting language"; + homepage = "https://www.php.net/"; + license = licenses.php301; + maintainers = teams.php.members; + platforms = platforms.all; + outputsToInstall = [ "out" "dev" ]; + }; + }; in generic diff --git a/pkgs/development/interpreters/quickjs/default.nix b/pkgs/development/interpreters/quickjs/default.nix index ac70a50eaa728..4bc0ec528a016 100644 --- a/pkgs/development/interpreters/quickjs/default.nix +++ b/pkgs/development/interpreters/quickjs/default.nix @@ -1,17 +1,37 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchFromGitHub +, texinfo +}: stdenv.mkDerivation rec { pname = "quickjs"; - version = "2020-11-08"; + version = "2021-03-27"; - src = fetchurl { - url = "https://bellard.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0yqqcjxi3cqagw184mqrxpvqg486x7c233r3cp9mxachngd6779f"; + src = fetchFromGitHub { + owner = "bellard"; + repo = pname; + rev = "b5e62895c619d4ffc75c9d822c8d85f1ece77e5b"; + hash = "sha256-VMaxVVQuJ3DAwYrC14uJqlRBg0//ugYvtyhOXsTUbCA="; }; makeFlags = [ "prefix=${placeholder "out"}" ]; enableParallelBuilding = true; + nativeBuildInputs = [ + texinfo + ]; + + postBuild = '' + (cd doc + makeinfo *texi) + ''; + + postInstall = '' + (cd doc + install -Dt $out/share/doc *texi *info) + ''; + doInstallCheck = true; installCheckPhase = '' PATH="$out/bin:$PATH" @@ -32,7 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A small and embeddable Javascript engine"; homepage = "https://bellard.org/quickjs/"; - maintainers = with maintainers; [ stesie ]; + maintainers = with maintainers; [ stesie AndersonTorres ]; platforms = platforms.linux; license = licenses.mit; }; diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index dd215dc01c5d3..2aa5ea015fdad 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -25,15 +25,21 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake curl ]; buildInputs = [ - curl openssl s2n-tls zlib - aws-c-common aws-c-event-stream aws-checksums + curl openssl zlib ] ++ lib.optionals (stdenv.isDarwin && ((builtins.elem "text-to-speech" apis) || (builtins.elem "*" apis))) [ CoreAudio AudioToolbox ]; # propagation is needed for Security.framework to be available when linking - propagatedBuildInputs = [ aws-c-cal aws-c-io ]; + propagatedBuildInputs = [ + aws-c-cal + aws-c-event-stream + aws-c-io + aws-c-common + aws-checksums + s2n-tls + ]; cmakeFlags = [ "-DBUILD_DEPS=OFF" diff --git a/pkgs/development/libraries/flatbuffers/1.12.nix b/pkgs/development/libraries/flatbuffers/1.12.nix new file mode 100644 index 0000000000000..df2980ba204f3 --- /dev/null +++ b/pkgs/development/libraries/flatbuffers/1.12.nix @@ -0,0 +1,26 @@ +{ callPackage, fetchpatch, lib, stdenv }: + +callPackage ./generic.nix { + version = "1.12.0"; + sha256 = "0f7xd66vc1lzjbn7jzd5kyqrgxpsfxi4zc7iymhb5xrwyxipjl1g"; + + patches = [ + (fetchpatch { + # Fixed a compilation error with GCC 10.0 to 11.0. June 1, 2020. + # Should be included in the next release after 1.12.0 + url = "https://github.com/google/flatbuffers/commit/988164f6e1675bbea9c852e2d6001baf4d1fcf59.patch"; + sha256 = "0d8c2bywqmkhdi0a41cry85wy4j58pl0vd6h5xpfqm3fr8w0mi9s"; + excludes = [ "src/idl_gen_cpp.cpp" ]; + }) + (fetchpatch { + # Fixed a compilation error with GCC 10.0 to 11.0. July 6, 2020. + # Should be included in the next release after 1.12.0 + url = "https://github.com/google/flatbuffers/pull/6020/commits/44c7a4cf439b0a298720b5a448bcc243a882b0c9.patch"; + sha256 = "126xwkvnlc4ignjhxv9jygfd9j6kr1jx39hyk0ddpcmvzfqsccf4"; + }) + ]; + + preConfigure = lib.optional stdenv.buildPlatform.isDarwin '' + rm BUILD + ''; +} diff --git a/pkgs/development/libraries/flatbuffers/2.0.nix b/pkgs/development/libraries/flatbuffers/2.0.nix new file mode 100644 index 0000000000000..2b907e77c499c --- /dev/null +++ b/pkgs/development/libraries/flatbuffers/2.0.nix @@ -0,0 +1,6 @@ +{ callPackage }: + +callPackage ./generic.nix { + version = "2.0.0"; + sha256 = "1zbf6bdpps8369r1ql00irxrp58jnalycc8jcapb8iqg654vlfz8"; +} diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix deleted file mode 100644 index 374203556a608..0000000000000 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake }: - -stdenv.mkDerivation rec { - pname = "flatbuffers"; - version = "1.12.0"; - - src = fetchFromGitHub { - owner = "google"; - repo = "flatbuffers"; - rev = "v${version}"; - sha256 = "0f7xd66vc1lzjbn7jzd5kyqrgxpsfxi4zc7iymhb5xrwyxipjl1g"; - }; - patches = [ - (fetchpatch { - # Fixed a compilation error with GCC 10.0 to 11.0. June 1, 2020. - # Should be included in the next release after 1.12.0 - url = "https://github.com/google/flatbuffers/commit/988164f6e1675bbea9c852e2d6001baf4d1fcf59.patch"; - sha256 = "0d8c2bywqmkhdi0a41cry85wy4j58pl0vd6h5xpfqm3fr8w0mi9s"; - excludes = [ "src/idl_gen_cpp.cpp" ]; - }) - (fetchpatch { - # Fixed a compilation error with GCC 10.0 to 11.0. July 6, 2020. - # Should be included in the next release after 1.12.0 - url = "https://github.com/google/flatbuffers/pull/6020/commits/44c7a4cf439b0a298720b5a448bcc243a882b0c9.patch"; - sha256 = "126xwkvnlc4ignjhxv9jygfd9j6kr1jx39hyk0ddpcmvzfqsccf4"; - }) - ]; - - preConfigure = lib.optional stdenv.buildPlatform.isDarwin '' - rm BUILD - ''; - - nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ "-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" ]; - - # tests fail to compile - doCheck = false; - # doCheck = stdenv.hostPlatform == stdenv.buildPlatform; - checkTarget = "test"; - - meta = with lib; { - description = "Memory Efficient Serialization Library"; - longDescription = '' - FlatBuffers is an efficient cross platform serialization library for - games and other memory constrained apps. It allows you to directly - access serialized data without unpacking/parsing it first, while still - having great forwards/backwards compatibility. - ''; - maintainers = [ maintainers.teh ]; - license = licenses.asl20; - platforms = platforms.unix; - homepage = "https://google.github.io/flatbuffers/"; - }; -} diff --git a/pkgs/development/libraries/flatbuffers/generic.nix b/pkgs/development/libraries/flatbuffers/generic.nix new file mode 100644 index 0000000000000..1cdfb4b9c8703 --- /dev/null +++ b/pkgs/development/libraries/flatbuffers/generic.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, version +, sha256 +, patches ? [ ] +, preConfigure ? null +}: + +stdenv.mkDerivation rec { + pname = "flatbuffers"; + inherit version; + + src = fetchFromGitHub { + owner = "google"; + repo = "flatbuffers"; + rev = "v${version}"; + inherit sha256; + }; + + inherit patches preConfigure; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" + ]; + + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + checkTarget = "test"; + + meta = with lib; { + description = "Memory Efficient Serialization Library"; + longDescription = '' + FlatBuffers is an efficient cross platform serialization library for + games and other memory constrained apps. It allows you to directly + access serialized data without unpacking/parsing it first, while still + having great forwards/backwards compatibility. + ''; + maintainers = [ maintainers.teh ]; + license = licenses.asl20; + platforms = platforms.unix; + homepage = "https://google.github.io/flatbuffers/"; + }; +} diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 0c668525e9277..03573716fa351 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "igraph"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "igraph"; repo = pname; rev = version; - sha256 = "sha256-StRXtP2PelPcS+l5O1AOVFkza3hiKFwCdp8XLal4grE="; + sha256 = "sha256-tF+cnJRv125bSpZIpABTIHAfJO4TNfSBHjnzpNTbFgk="; }; # Normally, igraph wants us to call bootstrap.sh, which will call diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index a782e088820d7..37375f52c32e3 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "21.2.1"; + version = "21.2.2"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "0a49087ca3li1cbsdcwp31zlakfw9dxcr2lnxzm5s3x63jvwlbag"; + sha256 = "0cz2zr5qmhlsb1ydffakpkw9adyvn5n2y269fp0k2sskqwlykn48"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index 11f1c7fd9c679..363140b5f58f4 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "leptonica"; - version = "1.80.0"; + version = "1.81.0"; src = fetchurl { url = "http://www.leptonica.org/source/${pname}-${version}.tar.gz"; - sha256 = "192bs676ind8627f0v3v8d1q7r4xwc7q0zvbdbxn1fgvmv14d77c"; + sha256 = "sha256-0ZKwVem9YLhBEQI8yYDDc5Dm1CexlKj9K9YRVDo73a0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix index ad1df00c25092..bc64924187223 100644 --- a/pkgs/development/libraries/libimagequant/default.nix +++ b/pkgs/development/libraries/libimagequant/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patchShebangs ./configure ''; - configureFlags = lib.optionals stdenv.isAarch64 [ "--disable-sse" ]; + configureFlags = lib.optionals (!stdenv.isi686 && !stdenv.isx86_64) [ "--disable-sse" ]; meta = with lib; { homepage = "https://pngquant.org/lib/"; diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/development/libraries/libime/default.nix index f9fcdedf1803c..4f0caa7cc33ce 100644 --- a/pkgs/development/libraries/libime/default.nix +++ b/pkgs/development/libraries/libime/default.nix @@ -18,21 +18,21 @@ let url = "https://download.fcitx-im.org/data/lm_sc.3gm.arpa-${arpaVer}.tar.bz2"; sha256 = "0bqy3l7mif0yygjrcm65qallszgn17mvgyxhvz7a54zaamyan6vm"; }; - dictVer = "20200715"; + dictVer = "20210402"; dict = fetchurl { url = "https://download.fcitx-im.org/data/dict.utf8-${dictVer}.tar.xz"; - sha256 = "1ln7r64j8mc7wz4j0q4v8wd68wy7qqz4bz1dpxk7zqbdvza6rhr3"; + sha256 = "sha256-gYz7tama5bQMJwe2FYc09KEBlkRIU0AMvWsUUFWS2A0="; }; in stdenv.mkDerivation rec { pname = "libime"; - version = "1.0.3"; + version = "1.0.7"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; rev = version; - sha256 = "sha256-Ykj4/3yKUqK0BRqW1E2zFYNgeUOXQ1DsotmKU6c8vEg="; + sha256 = "sha256-q/SXS6pT4vBkCkCTarPVHrZPXijYnc2t51YGRvzQ0FY="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/mvapich/default.nix b/pkgs/development/libraries/mvapich/default.nix index 71c6ce38f952c..704a28dbb8cd3 100644 --- a/pkgs/development/libraries/mvapich/default.nix +++ b/pkgs/development/libraries/mvapich/default.nix @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { done # Ensure the default compilers are the ones mvapich was built with - substituteInPlace $out/bin/mpicc --replace 'CC="gcc"' 'CC=${stdenv.cc}/bin/gcc' - substituteInPlace $out/bin/mpicxx --replace 'CXX="g++"' 'CC=${stdenv.cc}/bin/g++' - substituteInPlace $out/bin/mpifort --replace 'FC="gfortran"' 'CC=${gfortran}/bin/gfortran' + substituteInPlace $out/bin/mpicc --replace 'CC="gcc"' 'CC=${stdenv.cc}/bin/cc' + substituteInPlace $out/bin/mpicxx --replace 'CXX="g++"' 'CXX=${stdenv.cc}/bin/c++' + substituteInPlace $out/bin/mpifort --replace 'FC="gfortran"' 'FC=${gfortran}/bin/gfortran' ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 19e9f9d9ec860..143f72541b4d7 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2, makeWrapper }: +{ lib, stdenv, fetchurl, python, makeWrapper }: stdenv.mkDerivation rec { pname = "lhapdf"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ python2 ]; + buildInputs = [ python ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/pico-sdk/default.nix b/pkgs/development/libraries/pico-sdk/default.nix new file mode 100644 index 0000000000000..3db4ff336ffb7 --- /dev/null +++ b/pkgs/development/libraries/pico-sdk/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "pico-sdk"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "raspberrypi"; + repo = pname; + rev = version; + sha256 = "00z160f7ypws5pzp1ql7xrs3gmjcbw6gywnnq2fiwl47940balns"; + }; + + nativeBuildInputs = [ cmake ]; + + # SDK contains libraries and build-system to develop projects for RP2040 chip + # We only need to compile pioasm binary + sourceRoot = "source/tools/pioasm"; + + installPhase = '' + runHook preInstall + mkdir -p $out/lib/pico-sdk + cp -a ../../../* $out/lib/pico-sdk/ + chmod 755 $out/lib/pico-sdk/tools/pioasm/build/pioasm + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/raspberrypi/picotool"; + description = "SDK provides the headers, libraries and build system necessary to write programs for the RP2040-based devices"; + license = licenses.bsd3; + maintainers = with maintainers; [ musfay ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/xcb-imdkit/default.nix b/pkgs/development/libraries/xcb-imdkit/default.nix index a3bcc822b3676..b2e56c8193b5f 100644 --- a/pkgs/development/libraries/xcb-imdkit/default.nix +++ b/pkgs/development/libraries/xcb-imdkit/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "xcb-imdkit"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "fcitx"; repo = "xcb-imdkit"; rev = version; - sha256 = "sha256-ISaVsMtDsyfhbhsAwDSWkQ7ZcpNtvC7M9NFQsWA5ju8="; + sha256 = "sha256-IPuTRSgmrnCJRgGWcE4JRaxd0sGCcHrKRnn2B1OdDMU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/zchunk/default.nix b/pkgs/development/libraries/zchunk/default.nix index 2037d815a81b3..cf0063f7780d0 100644 --- a/pkgs/development/libraries/zchunk/default.nix +++ b/pkgs/development/libraries/zchunk/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.1.9"; + version = "1.1.11"; outputs = [ "out" "lib" "dev" ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "zchunk"; repo = pname; rev = version; - hash = "sha256-MqnHtqOjLl6R5GZ4f2UX1iLoO9FUT2IfZlSN58wW8JA="; + hash = "sha256-r+qWJOUnTyPJjM9eW44Q2DMKxx4HloyfNrQ6xWDO9vQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/cairo2/default.nix b/pkgs/development/ocaml-modules/cairo2/default.nix index 020006b19c5d2..0a9922f67885c 100644 --- a/pkgs/development/ocaml-modules/cairo2/default.nix +++ b/pkgs/development/ocaml-modules/cairo2/default.nix @@ -1,18 +1,17 @@ -{ stdenv, lib, fetchurl, buildDunePackage, ocaml, dune-configurator -, pkg-config, cairo -}: +{ stdenv, lib, fetchurl, buildDunePackage, ocaml, dune-configurator, pkg-config, cairo }: buildDunePackage rec { pname = "cairo2"; - version = "0.6.1"; - - useDune2 = true; + version = "0.6.2"; src = fetchurl { url = "https://github.com/Chris00/ocaml-cairo/releases/download/${version}/cairo2-${version}.tbz"; - sha256 = "1ik4qf4b9443sliq2z7x9acd40rmzvyzjh3bh98wvjklxbb84a9i"; + sha256 = "sha256-a7P1kiVmIwT6Fhtwxs29ffgO4iexsulxUoc9cnJmEK4="; }; + minimalOCamlVersion = "4.02"; + useDune2 = true; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo dune-configurator ]; @@ -20,7 +19,7 @@ buildDunePackage rec { # https://github.com/Chris00/ocaml-cairo/issues/19 || lib.versionAtLeast ocaml.version "4.10"); - meta = { + meta = with lib; { homepage = "https://github.com/Chris00/ocaml-cairo"; description = "Binding to Cairo, a 2D Vector Graphics Library"; longDescription = '' @@ -29,7 +28,7 @@ buildDunePackage rec { the X Window System, Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. ''; - license = lib.licenses.lgpl3; - maintainers = with lib.maintainers; [ jirkamarsik vbgl ]; + license = licenses.lgpl3; + maintainers = with maintainers; [ jirkamarsik vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index ee0c3b5b00cc0..b0f73546eed9b 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -8,13 +8,13 @@ let inherit (lib) optional versionAtLeast; in buildDunePackage rec { pname = "lwt"; - version = "5.4.0"; + version = "5.4.1"; useDune2 = true; src = fetchzip { url = "https://github.com/ocsigen/${pname}/archive/${version}.tar.gz"; - sha256 = "1ay1zgadnw19r9hl2awfjr22n37l7rzxd9v73pjbahavwm2ay65d"; + sha256 = "0cq2qy23sa1a5zk6nja3c652mp29i84yfrkcwks6i8sdqwli36jy"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/ocaml-modules/octavius/default.nix b/pkgs/development/ocaml-modules/octavius/default.nix index c71c8f35f4ba6..a4124df666404 100644 --- a/pkgs/development/ocaml-modules/octavius/default.nix +++ b/pkgs/development/ocaml-modules/octavius/default.nix @@ -1,24 +1,25 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, topkg }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml }: -if !lib.versionAtLeast ocaml.version "4.03" -then throw "octavius is not available for OCaml ${ocaml.version}" else +buildDunePackage rec { + pname = "octavius"; + version = "1.2.2"; -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-octavius-0.2.0"; - src = fetchurl { - url = "https://github.com/ocaml-doc/octavius/releases/download/v0.2.0/octavius-0.2.0.tbz"; - sha256 = "02milzzlr4xk5aymg2fjz27f528d5pyscqvld3q0dm41zcpkz5ml"; + src = fetchFromGitHub { + owner = "ocaml-doc"; + repo = "octavius"; + rev = "v${version}"; + sha256 = "sha256-/S6WpIo1c5J9uM3xgtAM/elhnsl0XimnIFsKy3ootbA="; }; - buildInputs = [ ocaml findlib ocamlbuild topkg ]; + minimumOCamlVersion = "4.03"; + useDune2 = lib.versionAtLeast ocaml.version "4.08"; - inherit (topkg) buildPhase installPhase; + doCheck = true; - meta = { + meta = with lib; { description = "Ocamldoc comment syntax parser"; homepage = "https://github.com/ocaml-doc/octavius"; - license = lib.licenses.isc; - maintainers = [ lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; + license = licenses.isc; + maintainers = with maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix index 5aa8b2b4f9b18..0cfc7b4b44fd3 100644 --- a/pkgs/development/php-packages/apcu/default.nix +++ b/pkgs/development/php-packages/apcu/default.nix @@ -13,5 +13,10 @@ buildPecl { makeFlags = [ "phpincludedir=$(dev)/include" ]; outputs = [ "out" "dev" ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Userland cache for PHP"; + license = licenses.php301; + homepage = "https://pecl.php.net/package/APCu"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/apcu_bc/default.nix b/pkgs/development/php-packages/apcu_bc/default.nix index 448c25bee64b3..e487a075dbdec 100644 --- a/pkgs/development/php-packages/apcu_bc/default.nix +++ b/pkgs/development/php-packages/apcu_bc/default.nix @@ -14,6 +14,11 @@ buildPecl { mv $out/lib/php/extensions/apc.so $out/lib/php/extensions/apcu_bc.so ''; - meta.maintainers = lib.teams.php.members; - meta.broken = lib.versionAtLeast php.version "8"; + meta = with lib; { + description = "APCu Backwards Compatibility Module"; + license = licenses.php301; + homepage = "https://pecl.php.net/package/apcu_bc"; + maintainers = teams.php.members; + broken = versionAtLeast php.version "8"; + }; } diff --git a/pkgs/development/php-packages/ast/default.nix b/pkgs/development/php-packages/ast/default.nix index fb609b9f04f2c..03cd439867a67 100644 --- a/pkgs/development/php-packages/ast/default.nix +++ b/pkgs/development/php-packages/ast/default.nix @@ -6,5 +6,10 @@ buildPecl { version = "1.0.10"; sha256 = "13s5r1szd80g1mqickghdd38mvjkwss221322mmbrykcfgp4fs30"; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Exposes the abstract syntax tree generated by PHP"; + license = licenses.bsd3; + homepage = "https://pecl.php.net/package/ast"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index f749ddf8cc490..b86980031fbea 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "2.1.1"; + version = "2.1.2"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "1ki106973q74inwgd4hjmml905rqg82808qq4wiysrkr7mzmfnj4"; + sha256 = "0gd4hxkxdds3nxpbcd38chrkijha31p6nygdq3f73mbb984h3v1d"; }; dontUnpack = true; diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix index 6d6bdf76e40c9..0b34ffe780a88 100644 --- a/pkgs/development/php-packages/couchbase/default.nix +++ b/pkgs/development/php-packages/couchbase/default.nix @@ -44,6 +44,11 @@ buildPecl { '') ]; - meta.broken = lib.versionAtLeast php.version "8.0"; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Couchbase Server PHP extension"; + license = licenses.asl20; + homepage = "https://docs.couchbase.com/php-sdk/current/project-docs/sdk-release-notes.html"; + maintainers = teams.php.members; + broken = versionAtLeast php.version "8.0"; + }; } diff --git a/pkgs/development/php-packages/igbinary/default.nix b/pkgs/development/php-packages/igbinary/default.nix index 7a321cc90b4e1..9e710f3c3d1e6 100644 --- a/pkgs/development/php-packages/igbinary/default.nix +++ b/pkgs/development/php-packages/igbinary/default.nix @@ -10,5 +10,10 @@ buildPecl { makeFlags = [ "phpincludedir=$(dev)/include" ]; outputs = [ "out" "dev" ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Binary serialization for PHP"; + license = licenses.bsd3; + homepage = "https://github.com/igbinary/igbinary/"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/imagick/default.nix b/pkgs/development/php-packages/imagick/default.nix index 744ba2302f7be..1af4f1a23b471 100644 --- a/pkgs/development/php-packages/imagick/default.nix +++ b/pkgs/development/php-packages/imagick/default.nix @@ -23,5 +23,10 @@ buildPecl { nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcre2 ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Imagick is a native php extension to create and modify images using the ImageMagick API"; + license = licenses.php301; + homepage = "https://pecl.php.net/package/imagick"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/mailparse/default.nix b/pkgs/development/php-packages/mailparse/default.nix index 820bbbdbad6b9..1981b3d6aea2c 100644 --- a/pkgs/development/php-packages/mailparse/default.nix +++ b/pkgs/development/php-packages/mailparse/default.nix @@ -11,5 +11,10 @@ buildPecl { echo "#define HAVE_MBSTRING 1" >> config.h ''; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Mailparse is an extension for parsing and working with email messages"; + license = licenses.php301; + homepage = "https://pecl.php.net/package/mailparse"; + maintainers = lib.teams.php.members; + }; } diff --git a/pkgs/development/php-packages/maxminddb/default.nix b/pkgs/development/php-packages/maxminddb/default.nix index 9a5a96e15c23c..ae7ef3d0602f3 100644 --- a/pkgs/development/php-packages/maxminddb/default.nix +++ b/pkgs/development/php-packages/maxminddb/default.nix @@ -19,6 +19,7 @@ buildPecl { meta = with lib; { description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; license = with licenses; [ asl20 ]; + homepage = "https://github.com/maxmind/MaxMind-DB-Reader-php"; maintainers = with maintainers; [ ajs124 das_j ] ++ teams.php.members; }; } diff --git a/pkgs/development/php-packages/memcached/default.nix b/pkgs/development/php-packages/memcached/default.nix index 4880e08e0629a..0aea58572cba0 100644 --- a/pkgs/development/php-packages/memcached/default.nix +++ b/pkgs/development/php-packages/memcached/default.nix @@ -26,5 +26,10 @@ buildPecl { nativeBuildInputs = [ pkg-config ]; buildInputs = [ cyrus_sasl zlib ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "PHP extension for interfacing with memcached via libmemcached library"; + license = licenses.php301; + homepage = "https://github.com/php-memcached-dev/php-memcached"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index d0e5e545f6b96..f8cd990d26704 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -17,5 +17,10 @@ buildPecl { pcre2 ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "MongoDB driver for PHP"; + license = licenses.asl20; + homepage = "https://docs.mongodb.com/drivers/php/"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/oci8/default.nix b/pkgs/development/php-packages/oci8/default.nix index eeaffb4b7fc98..eb65b5a27cdab 100644 --- a/pkgs/development/php-packages/oci8/default.nix +++ b/pkgs/development/php-packages/oci8/default.nix @@ -11,5 +11,10 @@ buildPecl { sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${oracle-instantclient.dev}/include"|' config.m4 ''; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Extension for Oracle Database"; + license = licenses.php301; + homepage = "https://pecl.php.net/package/oci8"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/pcov/default.nix b/pkgs/development/php-packages/pcov/default.nix index 0583f776e56a6..8511ccbebc549 100644 --- a/pkgs/development/php-packages/pcov/default.nix +++ b/pkgs/development/php-packages/pcov/default.nix @@ -8,5 +8,10 @@ buildPecl { buildInputs = [ pcre2 ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "A self contained php-code-coverage compatible driver for PHP."; + license = licenses.php301; + homepage = "https://github.com/krakjoe/pcov"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/pdlib/default.nix b/pkgs/development/php-packages/pdlib/default.nix index e217edd29ef7f..5a1e431d52d83 100644 --- a/pkgs/development/php-packages/pdlib/default.nix +++ b/pkgs/development/php-packages/pdlib/default.nix @@ -19,6 +19,7 @@ buildPecl { meta = with lib; { description = "A PHP extension for Dlib"; license = with licenses; [ mit ]; + homepage = "https://github.com/goodspb/pdlib"; maintainers = lib.teams.php.members; }; } diff --git a/pkgs/development/php-packages/pdo_sqlsrv/default.nix b/pkgs/development/php-packages/pdo_sqlsrv/default.nix index d80944ada09f5..ab7e6e71fea57 100644 --- a/pkgs/development/php-packages/pdo_sqlsrv/default.nix +++ b/pkgs/development/php-packages/pdo_sqlsrv/default.nix @@ -10,5 +10,10 @@ buildPecl { buildInputs = [ unixODBC ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Microsoft Drivers for PHP for SQL Server"; + license = licenses.mit; + homepage = "https://github.com/Microsoft/msphpsql"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/php_excel/default.nix b/pkgs/development/php-packages/php_excel/default.nix index 4effddaed4949..0930926a06e04 100644 --- a/pkgs/development/php-packages/php_excel/default.nix +++ b/pkgs/development/php-packages/php_excel/default.nix @@ -20,6 +20,11 @@ buildPecl { "--with-libxl-libdir=${libxl}/lib" ]; - meta.broken = lib.versionAtLeast php.version "8.0"; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "PHP Extension interface to the Excel writing/reading library"; + license = licenses.php301; + homepage = "https://github.com/iliaal/php_excel"; + maintainers = lib.teams.php.members; + broken = lib.versionAtLeast php.version "8.0"; + }; } diff --git a/pkgs/development/php-packages/phpmd/default.nix b/pkgs/development/php-packages/phpmd/default.nix index fde674701eb22..bf6979f88eaee 100644 --- a/pkgs/development/php-packages/phpmd/default.nix +++ b/pkgs/development/php-packages/phpmd/default.nix @@ -2,8 +2,6 @@ let pname = "phpmd"; version = "2.8.2"; - - isPhp74 = lib.versionAtLeast php.version "7.4"; in mkDerivation { inherit pname version; @@ -28,6 +26,6 @@ mkDerivation { license = licenses.bsd3; homepage = "https://phpmd.org/"; maintainers = teams.php.members; - broken = !isPhp74; + broken = versionAtLeast php.version "7.4"; }; } diff --git a/pkgs/development/php-packages/pinba/default.nix b/pkgs/development/php-packages/pinba/default.nix index 4c1b42183ba75..0373e74d9fcae 100644 --- a/pkgs/development/php-packages/pinba/default.nix +++ b/pkgs/development/php-packages/pinba/default.nix @@ -17,6 +17,7 @@ buildPecl { Pinba is a MySQL storage engine that acts as a realtime monitoring and statistics server for PHP using MySQL as a read-only interface. ''; + license = licenses.lgpl2Plus; homepage = "http://pinba.org/"; maintainers = teams.php.members; }; diff --git a/pkgs/development/php-packages/rdkafka/default.nix b/pkgs/development/php-packages/rdkafka/default.nix index c8dea9463d664..1b963a01ad5dc 100644 --- a/pkgs/development/php-packages/rdkafka/default.nix +++ b/pkgs/development/php-packages/rdkafka/default.nix @@ -15,6 +15,7 @@ buildPecl { meta = with lib; { description = "Kafka client based on librdkafka"; + license = licenses.mit; homepage = "https://github.com/arnaud-lb/php-rdkafka"; maintainers = teams.php.members; }; diff --git a/pkgs/development/php-packages/redis/default.nix b/pkgs/development/php-packages/redis/default.nix index fedc7a7ffde2f..35e9a909b3770 100644 --- a/pkgs/development/php-packages/redis/default.nix +++ b/pkgs/development/php-packages/redis/default.nix @@ -14,5 +14,10 @@ buildPecl { hash ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "PHP extension for interfacing with Redis"; + license = licenses.php301; + homepage = "https://github.com/phpredis/phpredis/"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/smbclient/default.nix b/pkgs/development/php-packages/smbclient/default.nix index 0b485e048052a..65cfad9ea3ad2 100644 --- a/pkgs/development/php-packages/smbclient/default.nix +++ b/pkgs/development/php-packages/smbclient/default.nix @@ -10,5 +10,10 @@ buildPecl { nativeBuildInputs = [ pkg-config ]; buildInputs = [ samba ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "PHP wrapper for libsmbclient"; + license = licenses.bsd2; + homepage = "https://github.com/eduardok/libsmbclient-php"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/sqlsrv/default.nix b/pkgs/development/php-packages/sqlsrv/default.nix index 4522129b2aa33..37ff1cb187ee3 100644 --- a/pkgs/development/php-packages/sqlsrv/default.nix +++ b/pkgs/development/php-packages/sqlsrv/default.nix @@ -10,5 +10,10 @@ buildPecl { unixODBC ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Microsoft Drivers for PHP for SQL Server"; + license = licenses.mit; + homepage = "https://github.com/Microsoft/msphpsql"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index 56341be436a0f..eaadb4b1f544c 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -11,5 +11,10 @@ buildPecl { zendExtension = true; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Provides functions for function traces and profiling"; + license = licenses.php301; + homepage = "https://xdebug.org/"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/yaml/default.nix b/pkgs/development/php-packages/yaml/default.nix index 9bd30ff4e3c41..ef58b315faeec 100644 --- a/pkgs/development/php-packages/yaml/default.nix +++ b/pkgs/development/php-packages/yaml/default.nix @@ -10,5 +10,10 @@ buildPecl { nativeBuildInputs = [ pkg-config ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "YAML-1.1 parser and emitter"; + license = licenses.mit; + homepage = "http://bd808.com/pecl-file_formats-yaml/"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index de1a749bc32b5..e555d69169b54 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.7833"; + version = "9.0.7912"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GUy1wETKV9Y9RYwJZqV22a0GrWkVRJRuFv/ADzPCzPg="; + sha256 = "sha256-q1mi8ZNvjb3XM3le4ysy58bb978102OFKypTp9mSzxo="; }; propagatedBuildInputs = [ pyvex ]; diff --git a/pkgs/development/python-modules/aio-georss-gdacs/default.nix b/pkgs/development/python-modules/aio-georss-gdacs/default.nix index 75894aa0e7a7b..6b6d295f8b86e 100644 --- a/pkgs/development/python-modules/aio-georss-gdacs/default.nix +++ b/pkgs/development/python-modules/aio-georss-gdacs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "aio-georss-gdacs"; - version = "0.4"; + version = "0.5"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-aio-georss-gdacs"; rev = "v${version}"; - sha256 = "0rcrhdpgj84hfifx9rzxz15ajzsk069iknb28gicw1cm1qv4vfxm"; + sha256 = "sha256-CIQoQRk5KIPEa/Y/7C1NPctuHvoiZ/o2bDa5YSWY+9M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix index 47b820161886a..388c856fc619d 100644 --- a/pkgs/development/python-modules/aioguardian/default.nix +++ b/pkgs/development/python-modules/aioguardian/default.nix @@ -5,7 +5,7 @@ , asynctest , buildPythonPackage , fetchFromGitHub -, poetry +, poetry-core , pytest-aiohttp , pytest-asyncio , pytestCheckHook @@ -27,7 +27,9 @@ buildPythonPackage rec { format = "pyproject"; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ aiohttp @@ -44,8 +46,17 @@ buildPythonPackage rec { pytestCheckHook ]; - # Ignore the examples as they are prefixed with test_ - pytestFlagsArray = [ "--ignore examples/" ]; + postPatch = '' + # https://github.com/bachya/aioguardian/pull/66 + substituteInPlace pyproject.toml \ + --replace 'asyncio_dgram = "^1.0.1"' 'asyncio_dgram = "^2.0.0"' + # https://github.com/bachya/aioguardian/pull/67 + substituteInPlace pyproject.toml \ + --replace "poetry>=0.12" "poetry-core" + ''; + + disabledTestPaths = [ "examples/" ]; + pythonImportsCheck = [ "aioguardian" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index fd3bb30d20ac8..0ea298e06e19a 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -42,14 +42,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.7833"; + version = "9.0.7912"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-1D1FhRhFHpQSQnMAPmp78TRIx9T5LL5MIdaYV/hPCv0="; + sha256 = "sha256-261fk0JM37Hq+xsMF95VqLyidWE4ZUeygp8BP/DBXG4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 997cd6c401a8b..cbe2ed9db2ad8 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.7833"; + version = "9.0.7912"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JhD4/P5/IhmLBvmG3XoIEYVkowK+dDoLuwOdMhGi5q8="; + sha256 = "sha256-nbVvgbTk9LFA376alu4Cxqcu9b9CT9yutnfE5fVT8gY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index ba678975fea6a..601dd954bc423 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.7833"; + version = "9.0.7912"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wieg38cHxliHU7esoSOl5ViiS/uR5yVJh9l3SEsb3mo="; + sha256 = "sha256-nHXF6Il6rHHrnGYEmv4FPQr6MsurzH1exkJS9UXThBs="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/asyncio-dgram/default.nix b/pkgs/development/python-modules/asyncio-dgram/default.nix index 2360d170f38ee..b5ae2b4baf8d4 100644 --- a/pkgs/development/python-modules/asyncio-dgram/default.nix +++ b/pkgs/development/python-modules/asyncio-dgram/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "asyncio-dgram"; - version = "1.2.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "jsbronder"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wgcL/BdNjzitkkaGyRUQbW1uv1enLDnHk30YHClK58o="; + sha256 = "sha256-EL3iOoCfLAtfdMI1J2XMf4izOEo9+a+0PNQs+4HuEfo="; }; # OSError: AF_UNIX path too long diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index d89def355f9ad..93f70108c3590 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.2.0"; + version = "7.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "919e81d6d9e6e098dbb7abf51d90282a73c0071846b104e70488417cd5d07863"; + sha256 = "sha256-NigQxqZjekZjlu6wSrziVwbEBclxfwSK4svd0eHPKr8="; }; propagatedBuildInputs = [ @@ -35,7 +35,7 @@ buildPythonPackage rec { pythonImportsCheck = lib.optionals isPy3k [ "azure.servicebus" ]; meta = with lib; { - description = "This is the Microsoft Azure Service Bus Client Library"; + description = "Microsoft Azure Service Bus Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; diff --git a/pkgs/development/python-modules/chiapos/default.nix b/pkgs/development/python-modules/chiapos/default.nix index 1faf5a94f8ccb..e0a86f499a2ac 100644 --- a/pkgs/development/python-modules/chiapos/default.nix +++ b/pkgs/development/python-modules/chiapos/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "chiapos"; - version = "1.0.1"; + version = "1.0.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kJx57EtwPBrGMpjnSzeYYhWqc/g1N1Bg8slW5oZKjg8="; + sha256 = "09mwj9m9rcvcb3zn6v2xykgd4a9lpwl6c86nwl8d1iqr82gb5hb5"; }; patches = [ diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 4866d302815b9..ad3c97b920d75 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.7833"; + version = "9.0.7912"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-C+YjpnMpz96v9QUkcdlhGl83V4UHnWAKZV2eR+vZX3c="; + sha256 = "sha256-p9i3ajN/CpLdwcg8HLhtION0ghgs1fcnqjzUrxu1wDw="; }; # Use upstream z3 implementation diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index cb9daa66b0d5c..45e619b25c6d7 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.7833"; + version = "9.0.7912"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P8bz50OgJifGWbWRyGXEB3FRfJHG1m9RgMatKA/XQLc="; + sha256 = "sha256-AHJk40uRhrlQbfzRmMJXremKxnxjpmxLLAAYxNV9vkc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/defusedxml/default.nix b/pkgs/development/python-modules/defusedxml/default.nix index c39ca96bfe17d..6ac1bab0845eb 100644 --- a/pkgs/development/python-modules/defusedxml/default.nix +++ b/pkgs/development/python-modules/defusedxml/default.nix @@ -1,14 +1,12 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder , python }: buildPythonPackage rec { pname = "defusedxml"; version = "0.7.1"; - disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/dwdwfsapi/default.nix b/pkgs/development/python-modules/dwdwfsapi/default.nix index 6699050035d08..1a68e7474af0c 100644 --- a/pkgs/development/python-modules/dwdwfsapi/default.nix +++ b/pkgs/development/python-modules/dwdwfsapi/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "dwdwfsapi"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PX1b1msaZH8HKVBo3GU7TOr8Lo7INLjjJBkDHHs6mzk="; + sha256 = "sha256-JOIg6rLrU8v39z1I6smIPEeiUPdSdJcD2avUsTQq+bU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index fbcf09de2eb3c..e1a5611dfd30f 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -1,32 +1,43 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder , pytestCheckHook , numpy -, stdenv , aiohttp , pytest-vcr , requests +, paramiko +, smbprotocol }: buildPythonPackage rec { pname = "fsspec"; - version = "2021.04.0"; - disabled = pythonOlder "3.5"; + version = "2021.05.0"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "intake"; repo = "filesystem_spec"; rev = version; - sha256 = "sha256-9072kb1VEQ0xg9hB8yEzJMD2Ttd3UGjBmTuhE+Uya1k="; + sha256 = "sha256-MQjUBLmx3Lb3nZNU/AgBKUQ/qNOd+XH+2YI51wV8AO0="; }; - checkInputs = [ pytestCheckHook numpy pytest-vcr ]; + propagatedBuildInputs = [ + aiohttp + paramiko + requests + smbprotocol + ]; - __darwinAllowLocalNetworking = true; + checkInputs = [ + numpy + pytest-vcr + pytestCheckHook + ]; - propagatedBuildInputs = [ aiohttp requests ]; + __darwinAllowLocalNetworking = true; disabledTests = [ # Test assumes user name is part of $HOME @@ -43,8 +54,10 @@ buildPythonPackage rec { "test_touch" ]; + pythonImportsCheck = [ "fsspec" ]; + meta = with lib; { - description = "A specification that python filesystems should adhere to"; + description = "A specification that Python filesystems should adhere to"; homepage = "https://github.com/intake/filesystem_spec"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix index 483e4a61084e9..c71794b106eb4 100644 --- a/pkgs/development/python-modules/gcsfs/default.nix +++ b/pkgs/development/python-modules/gcsfs/default.nix @@ -1,31 +1,54 @@ -{ buildPythonPackage, fetchFromGitHub, lib, pytestCheckHook, google-auth -, google-auth-oauthlib, requests, decorator, fsspec, ujson, aiohttp, crcmod -, pytest-vcr, vcrpy }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, google-auth +, google-auth-oauthlib +, requests +, decorator +, fsspec +, ujson +, aiohttp +, crcmod +, pytest-vcr +, vcrpy +}: buildPythonPackage rec { pname = "gcsfs"; - version = "2021.04.0"; + version = "2021.05.0"; + disabled = pythonOlder "3.6"; - # github sources needed for test data src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - sha256 = "sha256-OA43DaQue7R5d6SzfKThEQFEwJndjLfznu1LMubs5fs="; + sha256 = "sha256-I17eWaijxn0+8CzfzvzXVc0t9gQ03vx29a/i+QCQ0/U="; }; propagatedBuildInputs = [ + aiohttp + crcmod + decorator + fsspec google-auth google-auth-oauthlib requests - decorator - fsspec - aiohttp ujson - crcmod ]; - checkInputs = [ pytestCheckHook pytest-vcr vcrpy ]; + checkInputs = [ + pytest-vcr + pytestCheckHook + vcrpy + ]; + + disabledTests = [ + # Tests wants to communicate with the Link-local address + "test_GoogleCredentials_None" + ]; + pythonImportsCheck = [ "gcsfs" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix index f95e0a4702bf4..954e4a6237fbc 100644 --- a/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix +++ b/pkgs/development/python-modules/georss-qld-bushfire-alert-client/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "georss-qld-bushfire-alert-client"; - version = "0.4"; + version = "0.5"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-qld-bushfire-alert-client"; rev = "v${version}"; - sha256 = "14k7q0ynray1fj0lhxvgxpbdh4pmsqqk9gzmv38p9i7ijx8h1sc8"; + sha256 = "sha256-G7rIoG48MTWngtXCT5xzcjntzsYxtVWVhXflLsWY/dk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/hdate/default.nix b/pkgs/development/python-modules/hdate/default.nix index a034eddd56517..5c8a2c1e9fc56 100644 --- a/pkgs/development/python-modules/hdate/default.nix +++ b/pkgs/development/python-modules/hdate/default.nix @@ -2,7 +2,6 @@ , astral , buildPythonPackage , fetchFromGitHub -, fetchpatch , poetry-core , pytestCheckHook , pythonOlder @@ -11,7 +10,7 @@ buildPythonPackage rec { pname = "hdate"; - version = "0.10.2"; + version = "0.10.3"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -19,7 +18,7 @@ buildPythonPackage rec { owner = "py-libhdate"; repo = "py-libhdate"; rev = "v${version}"; - sha256 = "07b0c7q8w6flj4q72v58d3wymsxfp5qz8z97qhhc2977mjx5fsxd"; + sha256 = "sha256-6rOsG6qgq4woBhj25SNWvKshvFLBL/6MJiBZb+NPvdk="; }; nativeBuildInputs = [ @@ -35,15 +34,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Version was not updated for the release - (fetchpatch { - name = "update-version.patch"; - url = "https://github.com/py-libhdate/py-libhdate/commit/b8186a891b29fed99def5ce0985ee0ae1e0dd77e.patch"; - sha256 = "1pmhgh57x9390ff5gyisng0l6b79sd6dxmf172hpk1gr03c3hv98"; - }) - ]; - postPatch = '' substituteInPlace pyproject.toml --replace "^2020.5" ">=2020.5" ''; diff --git a/pkgs/development/python-modules/hupper/default.nix b/pkgs/development/python-modules/hupper/default.nix index 27e308ee44774..9726069746023 100644 --- a/pkgs/development/python-modules/hupper/default.nix +++ b/pkgs/development/python-modules/hupper/default.nix @@ -3,25 +3,35 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, pytest-cov , watchdog }: buildPythonPackage rec { pname = "hupper"; - version = "1.10.2"; + version = "1.10.3"; src = fetchPypi { inherit pname version; - sha256 = "3818f53dabc24da66f65cf4878c1c7a9b5df0c46b813e014abdd7c569eb9a02a"; + sha256 = "sha256-zW9Rtyx1h7ybzopl7NAloelfGwMoRRm/6RKE0BAxbNk="; }; # FIXME: watchdog dependency is disabled on Darwin because of #31865, which causes very silent # segfaults in the testsuite that end up failing the tests in a background thread (in myapp) - checkInputs = [ pytestCheckHook pytest-cov ] ++ lib.optional (!stdenv.isDarwin) watchdog; + checkInputs = [ + pytestCheckHook + ] ++ lib.optional (!stdenv.isDarwin) [ + watchdog + ]; + + disabledTestPaths = [ + # Doesn't work with an exported home, RuntimeError: timeout waiting for change to file=/build/tmpgfn145cx + "tests/test_it.py" + ]; + + pythonImportsCheck = [ "hupper" ]; meta = with lib; { - description = "in-process file monitor / reloader for reloading your code automatically during development"; + description = "In-process file monitor/reloader for reloading your code automatically during development"; homepage = "https://github.com/Pylons/hupper"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix index 343c7869a6c13..ab3cdd6e6d063 100644 --- a/pkgs/development/python-modules/imgaug/default.nix +++ b/pkgs/development/python-modules/imgaug/default.nix @@ -4,7 +4,7 @@ , imagecorruptions , numpy , opencv3 -, pytest +, pytestCheckHook , scikitimage , scipy , shapely @@ -43,11 +43,30 @@ buildPythonPackage rec { six ]; - checkPhase = '' - pytest ./test - ''; + checkInputs = [ + opencv3 + pytestCheckHook + ]; + + disabledTests = [ + # Tests are outdated + "test_quokka_segmentation_map" + "test_pool" + "test_avg_pool" + "test_max_pool" + "test_min_pool" + "est_median_pool" + "test_alpha_is_080" + "test_face_and_lines_at_half_visibility" + "test_polygon_fully_inside_image__no_rectangular_shape" + ]; + + disabledTestPaths = [ + # TypeError: int() argument must be a string, a bytes-like object or a number, not 'NoneType' + "test/augmenters/test_pooling.py" + ]; - checkInputs = [ opencv3 pytest ]; + pythonImportsCheck = [ "imgaug" ]; meta = with lib; { homepage = "https://github.com/aleju/imgaug"; diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix index 3d09e6a439713..9d5ea1bebd203 100644 --- a/pkgs/development/python-modules/imread/default.nix +++ b/pkgs/development/python-modules/imread/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "python-imread"; - version = "0.7.0"; + version = "0.7.4"; src = fetchPypi { inherit version; pname = "imread"; - sha256 = "0yb0fmy6ilh5fvbk69wl2bzqgss2g0951668mx8z9yyj4jhr1z2y"; + sha256 = "0kvlpy62vc16i0mysv1b2gv746in41q75hb815q6h8d227psv1q4"; }; diff --git a/pkgs/development/python-modules/injector/default.nix b/pkgs/development/python-modules/injector/default.nix new file mode 100644 index 0000000000000..921db5d1a8774 --- /dev/null +++ b/pkgs/development/python-modules/injector/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, typing-extensions }: + +buildPythonPackage rec { + pname = "injector"; + version = "0.18.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "10miwi58g4b8rvdf1pl7s7x9j91qyxxv3kdn5idzkfc387hqxn6f"; + }; + + propagatedBuildInputs = [ typing-extensions ]; + + doCheck = false; # No tests are available + pythonImportsCheck = [ "injector" ]; + + meta = with lib; { + description = "Python dependency injection framework, inspired by Guice"; + homepage = "https://github.com/alecthomas/injector"; + maintainers = [ maintainers.ivar ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index fbdfd5b7900a3..b34aa13bbcfc8 100644 --- a/pkgs/development/python-modules/ipdb/default.nix +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -3,21 +3,21 @@ , fetchPypi , ipython , isPyPy -, isPy27 , mock +, toml }: buildPythonPackage rec { pname = "ipdb"; version = "0.13.7"; - disabled = isPyPy || isPy27; # setupterm: could not find terminfo database + disabled = isPyPy; # setupterm: could not find terminfo database src = fetchPypi { inherit pname version; sha256 = "178c367a61c1039e44e17c56fcc4a6e7dc11b33561261382d419b6ddb4401810"; }; - propagatedBuildInputs = [ ipython ]; + propagatedBuildInputs = [ ipython toml ]; checkInputs = [ mock ]; preCheck = '' diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index cff5dc194aa44..cdd0485b68430 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy3k , ipython , traitlets , glibcLocales @@ -12,6 +13,7 @@ buildPythonPackage rec { pname = "jupyter_core"; version = "4.7.1"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index 818ff459985cd..707ad9f3c8f6d 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -1,26 +1,36 @@ -{ buildPythonPackage, fetchFromGitHub, nose, pillow, scipy, numpy, imread, lib, stdenv }: +{ buildPythonPackage, fetchFromGitHub, pillow, scipy, numpy, pytestCheckHook, imread, freeimage, lib, stdenv }: buildPythonPackage rec { pname = "mahotas"; - version = "1.4.10"; + version = "1.4.11"; src = fetchFromGitHub { owner = "luispedro"; repo = "mahotas"; rev = "v${version}"; - sha256 = "0fjiyl82wj1a6xzr9mss2y2rydl4zchl2cbdbg0jm0fcrs99q4hw"; + sha256 = "029gvy1fb855pvxvy8zwj44k4s7qpqi0161bg5wldfiprrysn1kw"; }; - # remove this as soon as https://github.com/luispedro/mahotas/issues/97 is fixed - patches = [ ./disable-impure-tests.patch ]; + propagatedBuildInputs = [ numpy imread pillow scipy freeimage ]; + checkInputs = [ pytestCheckHook ]; - propagatedBuildInputs = [ numpy imread pillow scipy ]; - checkInputs = [ nose ]; + postPatch = '' + substituteInPlace mahotas/io/freeimage.py --replace "/opt/local/lib" "${freeimage}/lib" + ''; - checkPhase= '' - python setup.py test + # tests must be run in the build directory + preCheck = '' + cd build/lib* ''; + # re-enable as soon as https://github.com/luispedro/mahotas/issues/97 is fixed + disabledTests = [ + "test_colors" + "test_ellipse_axes" + "test_normalize" + "test_haralick3d" + ]; + disabled = stdenv.isi686; # Failing tests meta = with lib; { diff --git a/pkgs/development/python-modules/mahotas/disable-impure-tests.patch b/pkgs/development/python-modules/mahotas/disable-impure-tests.patch deleted file mode 100644 index f19bd329e6626..0000000000000 --- a/pkgs/development/python-modules/mahotas/disable-impure-tests.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff --git a/mahotas/tests/test_colors.py b/mahotas/tests/test_colors.py -index 8a8183b..0d34c9f 100644 ---- a/mahotas/tests/test_colors.py -+++ b/mahotas/tests/test_colors.py -@@ -2,7 +2,9 @@ import mahotas - import numpy as np - from mahotas.tests.utils import luispedro_jpg - from mahotas.colors import rgb2xyz, rgb2lab, xyz2rgb, rgb2grey, rgb2sepia -+from nose.tools import nottest - -+@nottest - def test_colors(): - f = luispedro_jpg() - lab = rgb2lab(f) -diff --git a/mahotas/tests/test_features_shape.py b/mahotas/tests/test_features_shape.py -index 462f467..2381793 100644 ---- a/mahotas/tests/test_features_shape.py -+++ b/mahotas/tests/test_features_shape.py -@@ -2,6 +2,7 @@ import mahotas.features.shape - import numpy as np - import mahotas as mh - from mahotas.features.shape import roundness, eccentricity -+from nose.tools import nottest - - def test_eccentricity(): - D = mh.disk(32, 2) -@@ -29,6 +30,7 @@ def test_zeros(): - I[8:4:12] = 1 - assert eccentricity(I) == 0 - -+@nottest - def test_ellipse_axes(): - Y,X = np.mgrid[:1024,:1024] - Y = Y/1024. -diff --git a/mahotas/tests/test_moments.py b/mahotas/tests/test_moments.py -index 686c7c3..ba3487b 100644 ---- a/mahotas/tests/test_moments.py -+++ b/mahotas/tests/test_moments.py -@@ -1,6 +1,7 @@ - import numpy as np - import mahotas as mh - from mahotas.features.moments import moments -+from nose.tools import nottest - - def _slow(A, p0, p1, cm): - c0,c1 = cm -@@ -28,7 +29,7 @@ def test_against_slow(): - yield perform, 1, 2, (0, 0), A - yield perform, 1, 0, (0, 0), A - -- -+@nottest - def test_normalize(): - A,B = np.meshgrid(np.arange(128),np.arange(128)) - for p0,p1 in [(1,1), (1,2), (2,1), (2,2)]: -diff --git a/mahotas/tests/test_texture.py b/mahotas/tests/test_texture.py -index 7e101ba..af1305d 100644 ---- a/mahotas/tests/test_texture.py -+++ b/mahotas/tests/test_texture.py -@@ -2,7 +2,7 @@ import numpy as np - from mahotas.features import texture - import mahotas as mh - import mahotas.features._texture --from nose.tools import raises -+from nose.tools import raises, nottest - - def test__cooccurence(): - cooccurence = mahotas.features._texture.cooccurence -@@ -149,6 +149,7 @@ def test_float_haralick(): - A[2,2]=12 - texture.haralick(A) - -+@nottest - def test_haralick3d(): - np.random.seed(22) - img = mahotas.stretch(255*np.random.rand(20,20,4)) diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index cf61eb2fa3866..6a39ff347cd5d 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 = "5.2.0"; + version = "6.0.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Dinnerbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RlqzeixaHgyIl/7mMRkZAEsqJEP79Bz1bDGAU8PIetU="; + sha256 = "sha256-YBtVWcOZDt2jQB9bHDrSCP9f2OC+IHzJKlBBGorLnZU="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index b23d264f72dbe..fdbcf09534b27 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -1,38 +1,53 @@ -{ lib, buildPythonPackage, isPy3k, fetchPypi +{ lib +, buildPythonPackage +, certifi , configparser , faker +, fetchFromGitHub , future , mock , nose +, pytestCheckHook , python-dateutil +, pythonOlder , pytz -, pytestCheckHook , urllib3 -, certifi }: buildPythonPackage rec { pname = "minio"; - version = "7.0.2"; - disabled = !isPy3k; + version = "7.0.3"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "f2f6022cfe4694d946972efef2a752f87d08cc030940faa50a640088772953c8"; + src = fetchFromGitHub { + owner = "minio"; + repo = "minio-py"; + rev = version; + sha256 = "14symk7b3i9xzfc2wkcnqmfsvh9j3jx2ijz7dgy1xyrbjwb7yzhc"; }; propagatedBuildInputs = [ + certifi configparser future python-dateutil pytz urllib3 - certifi ]; - checkInputs = [ faker mock nose pytestCheckHook ]; + checkInputs = [ + faker + mock + nose + pytestCheckHook + ]; + # example credentials aren't present - pytestFlagsArray = [ "--ignore=tests/unit/credentials_test.py" ]; + disabledTestPaths = [ + "tests/unit/credentials_test.py" + ]; + + pythonImportsCheck = [ "minio" ]; meta = with lib; { description = "Simple APIs to access any Amazon S3 compatible object storage server"; diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix index e6f9242dde6d3..c49601786732e 100644 --- a/pkgs/development/python-modules/pipx/default.nix +++ b/pkgs/development/python-modules/pipx/default.nix @@ -6,13 +6,12 @@ , argcomplete , packaging , importlib-metadata -, colorama , pytestCheckHook }: buildPythonPackage rec { pname = "pipx"; - version = "0.16.2.1"; + version = "0.16.3"; disabled = pythonOlder "3.6"; @@ -21,14 +20,13 @@ buildPythonPackage rec { owner = "pipxproject"; repo = pname; rev = version; - sha256 = "1agdp8j4lw6z0lk2vv1m8d49r5vwfkpal3hdgq67vnjyp9904pf6"; + sha256 = "1w5pzn5mgl9rr9zbmqza5is4mvjvcgjps1q9qa1mvbnyvakdkr4c"; }; propagatedBuildInputs = [ userpath argcomplete packaging - colorama ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; @@ -39,9 +37,17 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - # disable tests, which require internet connection - pytestFlagsArray = [ "--ignore=tests/test_install_all_packages.py" ]; + pytestFlagsArray = [ + "--ignore=tests/test_install_all_packages.py" + # start local pypi server and use in tests + "--net-pypiserver" + ]; disabledTests = [ + # disable tests which are difficult to emulate due to shell manipulations + "path_warning" + "script_from_internet" + "ensure_null_pythonpath" + # disable tests, which require internet connection "install" "inject" "ensure_null_pythonpath" diff --git a/pkgs/development/python-modules/pyialarm/default.nix b/pkgs/development/python-modules/pyialarm/default.nix index 977fbcd323cf6..9603964ca481f 100644 --- a/pkgs/development/python-modules/pyialarm/default.nix +++ b/pkgs/development/python-modules/pyialarm/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyialarm"; - version = "1.7"; + version = "1.8.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "RyuzakiKK"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Gk5kWOqsPyq/0Vc+jdRRyj+ko3CpmqQ6/McvJYAGjLY="; + sha256 = "sha256-Hig1BlgZX2FBh+wx7qz9lmkBIFn/IHActf9FXDU6Yz8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index 1066b95fd6f04..f71f2f4d52aec 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pylutron-caseta"; - version = "0.10.0"; + version = "0.11.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "gurumitts"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wKnca9sMdjvxxAW5YwLZFK/skmE6QMZG99HZRR3BIzw="; + sha256 = "sha256-2w8kRSZK9Bq3O6r6i0CJgxEXGo8KsWah9bMLlDNzMGk="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymfy/default.nix b/pkgs/development/python-modules/pymfy/default.nix index 32483eea7b9a1..2c17c0a085d9d 100644 --- a/pkgs/development/python-modules/pymfy/default.nix +++ b/pkgs/development/python-modules/pymfy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pymfy"; - version = "0.9.4"; + version = "0.10.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tetienne"; repo = "somfy-open-api"; rev = "v${version}"; - sha256 = "1ml536dvva2xd52jfgrd557h2sr5w6567sxnyq0blhkgpyz4m2av"; + sha256 = "sha256-xX7vNBQaYPdnsukFcQyEa2G1XIvf9ehADNXbLUUCRoU="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pyspnego/default.nix b/pkgs/development/python-modules/pyspnego/default.nix new file mode 100644 index 0000000000000..2f8e775e34043 --- /dev/null +++ b/pkgs/development/python-modules/pyspnego/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, pytest-mock +, pytestCheckHook +, pythonOlder +, glibcLocales +}: + +buildPythonPackage rec { + pname = "pyspnego"; + version = "0.1.6"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "jborean93"; + repo = pname; + rev = "v${version}"; + sha256 = "0pfh2x0539f0k2qi2pbjm64b2fqp64c63xxpinvg1yfaw915kgpb"; + }; + + propagatedBuildInputs = [ + cryptography + ]; + + checkInputs = [ + glibcLocales + pytest-mock + pytestCheckHook + ]; + + LC_ALL = "en_US.UTF-8"; + + pythonImportsCheck = [ "spnego" ]; + + meta = with lib; { + description = "Python SPNEGO authentication library"; + homepage = "Python SPNEGO authentication library"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-igraph/default.nix b/pkgs/development/python-modules/python-igraph/default.nix index 8e90ce5190f68..d196cf6e74788 100644 --- a/pkgs/development/python-modules/python-igraph/default.nix +++ b/pkgs/development/python-modules/python-igraph/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "python-igraph"; - version = "0.9.1"; + version = "0.9.4"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "igraph"; repo = "python-igraph"; rev = version; - sha256 = "1ldyzza25zvwh144lw8x856z76s8gfvnbdm56fcmwkvm7aj81npw"; + sha256 = "sha256-0iqYzeqVJwBqDL7AllrNaI5c7fmtrVwWpinCnO+ACzo="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/python-velbus/default.nix b/pkgs/development/python-modules/python-velbus/default.nix index a02edfdc1f6d0..c83ff853f1d55 100644 --- a/pkgs/development/python-modules/python-velbus/default.nix +++ b/pkgs/development/python-modules/python-velbus/default.nix @@ -6,19 +6,22 @@ buildPythonPackage rec { pname = "python-velbus"; - version = "2.1.2"; + version = "2.1.4"; src = fetchFromGitHub { owner = "thomasdelaet"; repo = pname; - rev = "v${version}"; - sha256 = "0dv7dsjp5li87ispdphaz7jd0a9xc328rxwawf2f58b1ii904xr4"; + rev = version; + sha256 = "1z0a7fc9xfrcpwi9xiimxsgbzbp2iwyi1rij6vqd5z47mzi49fv9"; }; - propagatedBuildInputs = [ pyserial ]; + propagatedBuildInputs = [ + pyserial + ]; # Project has not tests doCheck = false; + pythonImportsCheck = [ "velbus" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index fa757a39dda1c..cb0547dfe4ce9 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.7833"; + version = "9.0.7912"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vasPukhDpvTNEvSy3A2H4ZkFMpLSoHB6+uuimYH1VT4="; + sha256 = "sha256-KqTfu49Muicr5oJcXcoYpz3S7+0hk7dxbU7GMCDlJQA="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 86701865861f0..63a9e722f2c19 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -1,24 +1,38 @@ -{ lib, buildPythonPackage, fetchPypi, docutils, aiobotocore, fsspec }: +{ lib +, buildPythonPackage +, fetchPypi +, docutils +, aiobotocore +, fsspec +}: buildPythonPackage rec { pname = "s3fs"; - version = "0.5.2"; + version = "2021.5.0"; src = fetchPypi { inherit pname version; - sha256 = "87e5210415db17b9de18c77bcfc4a301570cc9030ee112b77dc47ab82426bae1"; + sha256 = "sha256-cEJVMIFMaC3E9829ofKTCtgy2/G+40G1yQURxUzBJpA="; }; - buildInputs = [ docutils ]; - propagatedBuildInputs = [ aiobotocore fsspec ]; + buildInputs = [ + docutils + ]; + + propagatedBuildInputs = [ + aiobotocore + fsspec + ]; # Depends on `moto` which has a long dependency chain with exact # version requirements that can't be made to work with current # pythonPackages. doCheck = false; + pythonImportsCheck = [ "s3fs" ]; + meta = with lib; { - description = "S3FS builds on boto3 to provide a convenient Python filesystem interface for S3."; + description = "S3FS builds on boto3 to provide a convenient Python filesystem interface for S3"; homepage = "https://github.com/dask/s3fs/"; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; diff --git a/pkgs/development/python-modules/skytemple-dtef/default.nix b/pkgs/development/python-modules/skytemple-dtef/default.nix index 80bebd5569687..c1a950dc2ae6c 100644 --- a/pkgs/development/python-modules/skytemple-dtef/default.nix +++ b/pkgs/development/python-modules/skytemple-dtef/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "skytemple-dtef"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = version; - sha256 = "177ydif01fai6z5yhgpa27pzfgabblzhl8nsczczcmw74vxqwzyc"; + sha256 = "0hisg7gq6ph0as9vvx2p1h104bn6x2kx8y477p9zcqc71f3yrx82"; }; propagatedBuildInputs = [ skytemple-files ]; diff --git a/pkgs/development/python-modules/smbprotocol/default.nix b/pkgs/development/python-modules/smbprotocol/default.nix new file mode 100644 index 0000000000000..517acd6f9cca0 --- /dev/null +++ b/pkgs/development/python-modules/smbprotocol/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, cryptography +, fetchFromGitHub +, pyspnego +, pytest-mock +, pytestCheckHook +, pythonOlder +, six +}: + +buildPythonPackage rec { + pname = "smbprotocol"; + version = "1.5.1"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "jborean93"; + repo = pname; + rev = "v${version}"; + sha256 = "1ym0fvljbwgl1h7f63m3psbsvqm64fipsrrmbqb97hrhfdzxqxpa"; + }; + + propagatedBuildInputs = [ + cryptography + pyspnego + six + ]; + + checkInputs = [ + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "smbprotocol" ]; + + meta = with lib; { + description = "Python SMBv2 and v3 Client"; + homepage = "https://github.com/jborean93/smbprotocol"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 522fd73012719..bbdecc8bdcdf7 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -288,9 +288,9 @@ let fetchAttrs = { # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "1i7z2a7bc2q1vn1h9nx1xc6g1r1cby2xvbcs20fj9h6c2fgaw9j4" + "10m6qj3kchgxfgb6qh59vc51knm9r9pkng8bf90h00dnggvv8234" else - "0s8q5rxq8abr50c5jpwv96ncfc0k8jw7w70ri8viqy031g9v9v45"; + "04a98yrp09nd0p17k0jbzkgjppxs0yma7m5zkfrwgvr4g0w71v68"; }; buildAttrs = { diff --git a/pkgs/development/python-modules/xmlsec/default.nix b/pkgs/development/python-modules/xmlsec/default.nix index 82f4a968ba6e3..b8c60f1b64253 100644 --- a/pkgs/development/python-modules/xmlsec/default.nix +++ b/pkgs/development/python-modules/xmlsec/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "xmlsec"; - version = "1.3.9"; + version = "1.3.11"; src = fetchPypi { inherit pname version; - sha256 = "1c4k42zv3plm6v65p7z6l5rxyf50h40d02nhc16vq7cjrfvdf4rx"; + sha256 = "sha256-zS6q/38xeEoH3ZnOgfp2cxPfO6GDT6pBQ+4sBwAMrHo="; }; # https://github.com/mehcode/python-xmlsec/issues/84#issuecomment-632930116 @@ -38,6 +38,8 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook hypothesis ]; disabledTestPaths = [ "tests/test_doc_examples.py" ]; + pythonImportsCheck = [ "xmlsec" ]; + meta = with lib; { description = "Python bindings for the XML Security Library"; homepage = "https://github.com/mehcode/python-xmlsec"; diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 50dda4c8edbda..7c72d25003463 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -1,85 +1,85 @@ -{ fetchPypi -, lib -, fetchpatch -, buildPythonPackage -, isPy3k +{ lib +, aiohttp +, aioresponses , appdirs , attrs +, buildPythonPackage , cached-property , defusedxml +, fetchFromGitHub +, freezegun +, httpx , isodate , lxml -, requests -, requests_toolbelt -, six -, pytz -, tornado -, aiohttp -# test dependencies -, freezegun , mock , pretend -, pytest -, pytestcov +, pytest-asyncio +, pytest-httpx +, pytestCheckHook +, pythonOlder +, pytz +, requests +, requests_toolbelt +, requests-file , requests-mock -, aioresponses +, xmlsec }: buildPythonPackage rec { pname = "zeep"; - version = "3.4.0"; + version = "4.0.0"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "0e98669cfeb60756231ae185498f9ae21b30b2681786b8de58ed34c3b93e41dd"; + src = fetchFromGitHub { + owner = "mvantellingen"; + repo = "python-zeep"; + rev = version; + sha256 = "1rwmwk47fxs8dxwv5dr6gbnbiyilznifb47fhbxgzj231w0y82cm"; }; - patches = [ - ( fetchpatch { - url = "https://github.com/mvantellingen/python-zeep/pull/1006/commits/ba7edd6bf2b31023b31e8f17c161e1d6d5af3d29.patch"; - sha256 = "1j0jd5hmh457im9sbawaqf6pnfy36fhr9wqdim8wk5da9ixr0ajs"; - }) - ]; - propagatedBuildInputs = [ appdirs attrs cached-property defusedxml + httpx isodate lxml + pytz requests requests_toolbelt - six - pytz - - # optional requirements - tornado - ] ++ lib.optional isPy3k aiohttp; + requests-file + xmlsec + ]; checkInputs = [ + aiohttp + aioresponses freezegun mock pretend - pytestcov - pytest + pytest-asyncio + pytest-httpx + pytestCheckHook requests-mock - ] ++ lib.optional isPy3k aioresponses; + xmlsec + ]; - checkPhase = '' - runHook preCheck - # fix compatibility with pytest 4 - substituteInPlace tests/conftest.py \ - --replace 'request.node.get_marker("requests")' 'request.node.get_closest_marker("requests")' - # ignored tests requires xmlsec python module - HOME=$(mktemp -d) pytest tests --ignore tests/test_wsse_signature.py - runHook postCheck + preCheck = '' + export HOME=$(mktemp -d); ''; + disabledTests = [ + # lxml.etree.XMLSyntaxError: Extra content at the end of the document, line 2, column 64 + "test_mime_content_serialize_text_xml" + ]; + + pythonImportsCheck = [ "zeep" ]; + meta = with lib; { + description = "Python SOAP client"; homepage = "http://docs.python-zeep.org"; license = licenses.mit; - description = "A modern/fast Python SOAP client based on lxml / requests"; maintainers = with maintainers; [ rvl ]; }; } diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 657704a653c73..e10a455c0906d 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -56,7 +56,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "0rwwjjj6zaj4hdcbsbp0di53xn6203r2vgpddhdrp8iph9ab60cg"; + sha256 = "1j175z3d4fbi4pl35py7yjq7ywrvwin6id131jv32hx0ck4g1m46"; }; buildAttrs = { diff --git a/pkgs/development/tools/build-managers/bmake/setup-hook.sh b/pkgs/development/tools/build-managers/bmake/setup-hook.sh index ae8f78ec90fa4..c5ca27dd91050 100644 --- a/pkgs/development/tools/build-managers/bmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/bmake/setup-hook.sh @@ -1,3 +1,13 @@ +addMakeFlags() { + export prefix="$out" + export MANDIR="${!outputMan}/share/man" + export MANTARGET=man + export BINOWN= + export STRIP_FLAG= +} + +preConfigureHooks+=(addMakeFlags) + bmakeBuildPhase() { runHook preBuild diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index b04eac35b05cf..702652db878bb 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -8,6 +8,7 @@ , useOpenSSL ? !isBootstrap, openssl , useNcurses ? false, ncurses , withQt5 ? false, qtbase +, buildDocs ? (!isBootstrap && (useNcurses || withQt5)), sphinx, texinfo }: stdenv.mkDerivation (rec { @@ -35,14 +36,16 @@ stdenv.mkDerivation (rec { ] ++ lib.optional stdenv.isCygwin ./3.2.2-cygwin.patch; - outputs = [ "out" ]; + outputs = [ "out" ] + ++ lib.optionals buildDocs [ "man" "info" ]; setOutputFlags = false; setupHook = ./setup-hook.sh; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ setupHook pkg-config ]; + nativeBuildInputs = [ setupHook pkg-config ] + ++ lib.optionals buildDocs [ texinfo ]; buildInputs = [] ++ lib.optionals useSharedLibraries [ bzip2 curlMinimal expat libarchive xz zlib libuv rhash ] @@ -68,6 +71,11 @@ stdenv.mkDerivation (rec { "--docdir=share/doc/${pname}${version}" ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup ++ lib.optional withQt5 "--qt-gui" + ++ lib.optionals buildDocs [ + "--sphinx-build=${sphinx}/bin/sphinx-build" + "--sphinx-man" + "--sphinx-info" + ] # Workaround https://gitlab.kitware.com/cmake/cmake/-/issues/20568 ++ lib.optionals stdenv.hostPlatform.is32bit [ "CFLAGS=-D_FILE_OFFSET_BITS=64" diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index d551b98b5b848..9be3d232fb898 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -39,6 +39,12 @@ let HOME=. escript bootstrap ''; + checkPhase = '' + HOME=. escript ./rebar3 ct + ''; + + doCheck = true; + installPhase = '' mkdir -p $out/bin cp rebar3 $out/bin/rebar3 @@ -101,6 +107,9 @@ let # instruct rebar3 to always load a certain plugin. It is necessary since # REBAR_GLOBAL_CONFIG_DIR doesn't seem to work for this. patches = [ ./skip-plugins.patch ./global-plugins.patch ]; + + # our patches cause the tests to fail + doCheck = false; })); in stdenv.mkDerivation { pname = "rebar3-with-plugins"; @@ -118,9 +127,11 @@ let {ok, _} = zip:extract(Archive, [{cwd, "'$out/lib'"}]), init:stop(0) ' + cp ${./rebar_ignore_deps.erl} rebar_ignore_deps.erl + erlc -o $out/lib/rebar/ebin rebar_ignore_deps.erl mkdir -p $out/bin makeWrapper ${erlang}/bin/erl $out/bin/rebar3 \ - --set REBAR_GLOBAL_PLUGINS "${toString globalPluginNames}" \ + --set REBAR_GLOBAL_PLUGINS "${toString globalPluginNames} rebar_ignore_deps" \ --suffix-each ERL_LIBS ":" "$out/lib ${toString pluginLibDirs}" \ --add-flags "+sbtu +A1 -noshell -boot start_clean -s rebar3 main -extra" ''; diff --git a/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix index 6894b8666e68d..34c4821aaeca7 100644 --- a/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix +++ b/pkgs/development/tools/build-managers/rebar3/rebar-deps.nix @@ -1,54 +1,118 @@ # Generated by rebar3_nix -{ fetchHex, fetchFromGitHub }: -{ - ssl_verify_fun = fetchHex { - pkg = "ssl_verify_fun"; - version = "1.1.6"; - sha256 = "sha256-vbDSRx9FPIj/OQjnaG+G+b4yfQZcwewW+kVAGX6gRoA="; +let fetchOnly = { src, ... }: src; +in { builder ? fetchOnly, fetchHex, fetchFromGitHub, overrides ? (x: y: { }) }: +let + self = packages // (overrides self packages); + packages = with self; { + ssl_verify_fun = builder { + name = "ssl_verify_fun"; + version = "1.1.6"; + src = fetchHex { + pkg = "ssl_verify_fun"; + version = "1.1.6"; + sha256 = "sha256-vbDSRx9FPIj/OQjnaG+G+b4yfQZcwewW+kVAGX6gRoA="; + }; + beamDeps = [ ]; + }; + relx = builder { + name = "relx"; + version = "4.4.0"; + src = fetchHex { + pkg = "relx"; + version = "4.4.0"; + sha256 = "sha256-VcDtY7tdVeuYOhnrlNfzB1320Sbb3/QxAqZmCpH86SU="; + }; + beamDeps = [ bbmustache ]; + }; + providers = builder { + name = "providers"; + version = "1.8.1"; + src = fetchHex { + pkg = "providers"; + version = "1.8.1"; + sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A="; + }; + beamDeps = [ getopt ]; + }; + getopt = builder { + name = "getopt"; + version = "1.0.1"; + src = fetchHex { + pkg = "getopt"; + version = "1.0.1"; + sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw="; + }; + beamDeps = [ ]; + }; + eunit_formatters = builder { + name = "eunit_formatters"; + version = "0.5.0"; + src = fetchHex { + pkg = "eunit_formatters"; + version = "0.5.0"; + sha256 = "sha256-1si6ITQklE5uBbvAl8MgAc3Qq+OSXQJFTyKbINaHY8k="; + }; + beamDeps = [ ]; + }; + erlware_commons = builder { + name = "erlware_commons"; + version = "1.5.0"; + src = fetchHex { + pkg = "erlware_commons"; + version = "1.5.0"; + sha256 = "sha256-PnxvsrpMKbDdXf6dAxtmRJ4giOzsGoFGW9n94F7X0Ns="; + }; + beamDeps = [ cf ]; + }; + cth_readable = builder { + name = "cth_readable"; + version = "1.5.1"; + src = fetchHex { + pkg = "cth_readable"; + version = "1.5.1"; + sha256 = "sha256-aGVBoi7+bKWkGgR7OVFsLdKPs8reXySi8ZFFs5Z/nYA="; + }; + beamDeps = [ cf ]; + }; + cf = builder { + name = "cf"; + version = "0.3.1"; + src = fetchHex { + pkg = "cf"; + version = "0.3.1"; + sha256 = "sha256-MV6NRH06SwK82/o5etA7u5iKbgqm9E063Q9OPDv5dnI="; + }; + beamDeps = [ ]; + }; + certifi = builder { + name = "certifi"; + version = "2.6.1"; + src = fetchHex { + pkg = "certifi"; + version = "2.6.1"; + sha256 = "sha256-UkyXtJkbOEndXBemMSI4licsawr0RneLpGdaHf9Tu34="; + }; + beamDeps = [ ]; + }; + bbmustache = builder { + name = "bbmustache"; + version = "1.10.0"; + src = fetchHex { + pkg = "bbmustache"; + version = "1.10.0"; + sha256 = "sha256-Q+/6P9S7lSMVevWp4idsSTSVuEWfyHNxRKoYbLE84u4="; + }; + beamDeps = [ ]; + }; + meck = builder { + name = "meck"; + version = "0.8.13"; + src = fetchHex { + pkg = "meck"; + version = "0.8.13"; + sha256 = "sha256-008BPBVttRrVfMVWiRuXIOahwd9f4uFa+ZnITWzr6xo="; + }; + beamDeps = [ ]; + }; }; - relx = fetchHex { - pkg = "relx"; - version = "4.4.0"; - sha256 = "sha256-VcDtY7tdVeuYOhnrlNfzB1320Sbb3/QxAqZmCpH86SU="; - }; - providers = fetchHex { - pkg = "providers"; - version = "1.8.1"; - sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A="; - }; - getopt = fetchHex { - pkg = "getopt"; - version = "1.0.1"; - sha256 = "sha256-U+Grg7nOtlyWctPno1uAkum9ybPugHIUcaFhwQxZlZw="; - }; - eunit_formatters = fetchHex { - pkg = "eunit_formatters"; - version = "0.5.0"; - sha256 = "sha256-1si6ITQklE5uBbvAl8MgAc3Qq+OSXQJFTyKbINaHY8k="; - }; - erlware_commons = fetchHex { - pkg = "erlware_commons"; - version = "1.5.0"; - sha256 = "sha256-PnxvsrpMKbDdXf6dAxtmRJ4giOzsGoFGW9n94F7X0Ns="; - }; - cth_readable = fetchHex { - pkg = "cth_readable"; - version = "1.5.1"; - sha256 = "sha256-aGVBoi7+bKWkGgR7OVFsLdKPs8reXySi8ZFFs5Z/nYA="; - }; - cf = fetchHex { - pkg = "cf"; - version = "0.3.1"; - sha256 = "sha256-MV6NRH06SwK82/o5etA7u5iKbgqm9E063Q9OPDv5dnI="; - }; - certifi = fetchHex { - pkg = "certifi"; - version = "2.6.1"; - sha256 = "sha256-UkyXtJkbOEndXBemMSI4licsawr0RneLpGdaHf9Tu34="; - }; - bbmustache = fetchHex { - pkg = "bbmustache"; - version = "1.10.0"; - sha256 = "sha256-Q+/6P9S7lSMVevWp4idsSTSVuEWfyHNxRKoYbLE84u4="; - }; -} +in self diff --git a/pkgs/development/tools/build-managers/rebar3/rebar_ignore_deps.erl b/pkgs/development/tools/build-managers/rebar3/rebar_ignore_deps.erl new file mode 100644 index 0000000000000..3e0ae67c4539b --- /dev/null +++ b/pkgs/development/tools/build-managers/rebar3/rebar_ignore_deps.erl @@ -0,0 +1,43 @@ +%% This module, when loaded as a plugin, overrides the default `install_deps` +%% provider and erases the dependencies from the rebar3 state, when +%% REBAR_IGNORE_DEPS is true. + +-module(rebar_ignore_deps). + +-export([init/1, do/1, format_error/1]). + +init(State0) -> + case os:getenv("REBAR_IGNORE_DEPS", "") of + "" -> + {ok, State0}; + _ -> + do_init(State0) + end. + +do_init(State0) -> + State1 = rebar_state:allow_provider_overrides(State0, true), + Provider = providers:create( + [ + {name, install_deps}, %% override the default install_deps provider + {module, ?MODULE}, + {bare, false}, + {deps, [app_discovery]}, + {example, undefined}, + {opts, []}, + {short_desc, ""}, + {desc, ""} + ]), + State2 = rebar_state:add_provider(State1, Provider), + {ok, rebar_state:allow_provider_overrides(State2, false)}. + +do(State0) -> + io:format("Ignoring deps...~n"), + Profiles = rebar_state:current_profiles(State0), + State = lists:foldl(fun(P, Acc0) -> + Acc = rebar_state:set(Acc0, {deps, P}, []), + rebar_state:set(Acc, {parsed_deps, P}, []) + end, State0, Profiles), + {ok, State}. + +format_error(Reason) -> + io_lib:format("~p", [Reason]). diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 7b9c6bca7e2b2..89628b81fbc2e 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.5.1"; + version = "1.5.3"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; - sha256 = "0dsbqipr549awv584fyl227s1gknlpsf5krp990w7w3bbxl3avb7"; + sha256 = "10kIQNy+3V1SD4uEZs/BJ4E6bTCRV3wjBN8gw9jr9VQ="; }; postPatch = '' diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 86aef4de9b8ea..e3828eb7f14c9 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.21.0"; + version = "1.21.1"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-uNb5HCEft1vXASli+2zdKWzFzsAlI9/ILBWa7OQZBwE="; + sha256 = "sha256-Wes52lTcv3Jb6gJeUS6fmf4Nee3qEcc3SibaTFvQ8sQ="; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/dockle/default.nix b/pkgs/development/tools/dockle/default.nix index f0d8a5ac6e07b..55869b0229523 100644 --- a/pkgs/development/tools/dockle/default.nix +++ b/pkgs/development/tools/dockle/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dockle"; - version = "0.3.13"; + version = "0.3.14"; src = fetchFromGitHub { owner = "goodwithtech"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U0nIGuQ4QjBaCck0Kg1RTS2IQwfivN3VI5vxh8lxAYE="; + sha256 = "sha256-Xe5qgM0yPBVtH9S4OSiNnkKxcH0W89aABJF6PVRBEhQ="; }; - vendorSha256 = "sha256-uHHm4AgnjTdPgpu3OpXXIRzrGhkpOoRY8qynfl7DO6w="; + vendorSha256 = "sha256-h+2AcppNUJ7zjHeBzDy1iWoR3i7a2v0Pc7vOfoUqPOw="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ btrfs-progs lvm2 ]; diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index f73de077acbb4..82f59817b2216 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "earthly"; - version = "0.5.14"; + version = "0.5.15"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-XB3zfbcuEgkqQ7DGnyUJj3K+qUH2DNv3n1/0mlocqfM="; + sha256 = "sha256-3hiiCcCgbWxSfG8XCcoKdNJsQoP2L2G4g4zFQkFtzQI="; }; vendorSha256 = "sha256-q3dDV0eop2NxXHFrlppWsZrO2Hz1q5xhs1DnB6PvG9g="; diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 2aa67483337cb..894168145aeee 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.6"; + version = "0.12.7"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-ncRHsYxG4XVT7TUJv+VgXMsLmQ52+/dXUlgMy8QnzNc="; + sha256 = "sha256-LHM3dlVfwgA1HJPg/77Er/RWEDVmmQuuhrS5KzTAtV0="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 75aa8a00f00c7..cc1a46c834b5e 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -46,13 +46,13 @@ let installed_test_metadir = "${placeholder "installedTests"}/share/installed-tests/flatpak-builder"; in stdenv.mkDerivation rec { pname = "flatpak-builder"; - version = "1.0.12"; + version = "1.0.14"; outputs = [ "out" "doc" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-R4DBuOCDj/tk6WOb14AUF5ZP2BjHxtXpr8pNVRHe0sg="; + sha256 = "sha256-abZa9PY4BBJ1GMVFGE+d/JqTWM3tqr7yseUGI64rjYs="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 247d055f5786e..dbd10772a6263 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.9.1"; + version = "0.9.4"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5W/5HgXjDmr2JGYGy5FPmCNIuAagmzEHnskDUg+FzjY="; + sha256 = "sha256-C0W5oMnKlQ5hg/0YLKZKiQfLghJ7yAJYW6k0G6eOFQE="; }; - cargoSha256 = "sha256-4lLWtj/MLaSZU7nC4gVn7TyhaLtO1FUSinQejocpiuY="; + cargoSha256 = "sha256-TqvUunBFpKIog0pG85M/JLz8orncgbRqnQolseXYSo4="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; @@ -31,6 +31,7 @@ rustPlatform.buildRustPackage rec { # USER must not be empty export USER=just-user export USERNAME=just-user + export JUST_CHOOSER="${coreutils}/bin/cat" # Prevent string.rs from being changed cp tests/string.rs $TMPDIR/string.rs @@ -38,22 +39,22 @@ rustPlatform.buildRustPackage rec { sed -i src/justfile.rs \ -i tests/*.rs \ -e "s@/bin/echo@${coreutils}/bin/echo@g" \ - -e "s@#!/usr/bin/env sh@#!${bash}/bin/sh@g" \ - -e "s@#!/usr/bin/env cat@#!${coreutils}/bin/cat@g" \ - -e "s@#!/usr/bin/env bash@#!${bash}/bin/sh@g" + -e "s@/usr/bin/env@${coreutils}/bin/env@g" # Return unchanged string.rs cp $TMPDIR/string.rs tests/string.rs ''; - # Skip "edit" when running "cargo test", since this test case needs "cat" and "vim". - # Skip "choose" when running "cargo test", since this test case needs "fzf". - checkFlags = [ "--skip=choose" "--skip=edit" ]; + checkFlags = [ + "--skip=edit" # trying to run "vim" fails as there's no /usr/bin/env or which in the sandbox to find vim and the dependency is not easily patched + "--skip=run_shebang" # test case very rarely fails with "Text file busy" + ]; meta = with lib; { - description = "A handy way to save and run project-specific commands"; homepage = "https://github.com/casey/just"; + changelog = "https://github.com/casey/just/blob/v${version}/CHANGELOG.md"; + description = "A handy way to save and run project-specific commands"; license = licenses.cc0; - maintainers = with maintainers; [ xrelkd ]; + maintainers = with maintainers; [ xrelkd jk ]; }; } diff --git a/pkgs/development/tools/picotool/default.nix b/pkgs/development/tools/picotool/default.nix new file mode 100644 index 0000000000000..d4a6f1c409b1f --- /dev/null +++ b/pkgs/development/tools/picotool/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libusb1, pico-sdk }: + +stdenv.mkDerivation rec { + pname = "picotool"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "raspberrypi"; + repo = pname; + rev = version; + sha256 = "1k5j742sj91akdrgnd3wa5csqb638dgaz0c09zsr22fcqz0qhzig"; + }; + + buildInputs = [ libusb1 pico-sdk ]; + nativeBuildInputs = [ cmake pkg-config ]; + cmakeFlags = [ "-DPICO_SDK_PATH=${pico-sdk}/lib/pico-sdk" ]; + + installPhase = '' + runHook preInstall + install -Dm755 ./picotool -t $out/bin + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/raspberrypi/picotool"; + description = "Tool for interacting with a RP2040 device in BOOTSEL mode, or with a RP2040 binary"; + license = licenses.bsd3; + maintainers = with maintainers; [ musfay ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 712baf613e4e2..3971a7631d46e 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -5,7 +5,7 @@ }: let # Poetry2nix version - version = "1.17.0"; + version = "1.17.1"; inherit (poetryLib) isCompatible readTOML moduleName; @@ -209,12 +209,12 @@ lib.makeScope pkgs.newScope (self: { poetry-core = if __isBootstrap then null else poetryPkg.passthru.python.pkgs.poetry-core; poetry = if __isBootstrap then null else poetryPkg; - # The canonical name is setuptools-scm - setuptools-scm = super.setuptools-scm; - __toPluginAble = toPluginAble self; inherit (hooks) pipBuildHook removePathDependenciesHook poetry2nixFixupHook wheelUnpackHook; + } // lib.optionalAttrs (! super ? setuptools-scm) { + # The canonical name is setuptools-scm + setuptools-scm = super.setuptools_scm; } ) # Null out any filtered packages, we don't want python.pkgs from nixpkgs diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index 193e44935b42d..b403e9941f34e 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -89,7 +89,7 @@ pythonPackages.callPackage # Prevent infinite recursion skipSetupToolsSCM = [ - "setuptools-scm" + "setuptools_scm" "setuptools-scm" "toml" # Toml is an extra for setuptools-scm ]; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index ea0045c114748..7875138557725 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -598,7 +598,7 @@ self: super: lxml = super.lxml.overridePythonAttrs ( old: { - nativeBuildInputs = with pkgs; (old.nativeBuildInputs or [ ]) ++ [ pkg-config libxml2.dev libxslt.dev ]; + nativeBuildInputs = with pkgs; (old.nativeBuildInputs or [ ]) ++ [ pkg-config libxml2.dev libxslt.dev ] ++ lib.optionals stdenv.isDarwin [ xcodebuild ]; buildInputs = with pkgs; (old.buildInputs or [ ]) ++ [ libxml2 libxslt ]; } ); @@ -636,6 +636,10 @@ self: super: cat > setup.cfg <<EOF [libs] system_freetype = True + '' + lib.optionalString stdenv.isDarwin '' + # LTO not working in darwin stdenv, see NixOS/nixpkgs/pull/19312 + enable_lto = false + '' + '' EOF ''; diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 066ecefaa143a..8eca1fda2e5bd 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -6,14 +6,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2021-05-31"; - cargoSha256 = "sha256-atfpcP3esMQQ2lOFTKksQH1nV78KAic51XZi+R++vHg="; + version = "2021-06-07"; + cargoSha256 = "sha256-TyoCu2Q4Tr2EIWxQcjSxASni4dkeEVsfrF5UN7IVxSs="; src = fetchFromGitHub { owner = "rust-analyzer"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-v2zS9qnvNrImQ3UqU80YagwLJKkVxwvwMMISimFbMOI="; + sha256 = "sha256-f8jdBL42+bU8KKchkW4fF6+kDBjgpoOZyP5yOYsebBk="; }; buildAndTestSubdir = "crates/rust-analyzer"; diff --git a/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock b/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock index 165aa6ac856c9..094c703b65f63 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock +++ b/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock @@ -15,9 +15,9 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "aho-corasick" -version = "0.7.13" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" dependencies = [ "memchr", ] @@ -33,9 +33,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.32" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b" +checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" [[package]] name = "arrayref" @@ -45,21 +45,21 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" [[package]] name = "arrayvec" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "ascii" -version = "0.8.7" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14" +checksum = "bbf56136a5198c7b01a49e3afcbef6cf84597273d298f54432926024107b0109" [[package]] name = "askama" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a6e7ebd44d0047fd48206c83c5cd3214acc7b9d87f001da170145c47ef7d12" +checksum = "d298738b6e47e1034e560e5afe63aa488fea34e25ec11b855a76f0d7b8e73134" dependencies = [ "askama_derive", "askama_escape", @@ -68,13 +68,12 @@ dependencies = [ [[package]] name = "askama_derive" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d7169690c4f56343dcd821ab834972a22570a2662a19a84fd7775d5e1c3881" +checksum = "ca2925c4c290382f9d2fa3d1c1b6a63fa1427099721ecca4749b154cc9c25522" dependencies = [ "askama_shared", "proc-macro2", - "quote", "syn", ] @@ -86,15 +85,15 @@ checksum = "90c108c1a94380c89d2215d0ac54ce09796823cca0fd91b299cfff3b33e346fb" [[package]] name = "askama_shared" -version = "0.10.4" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62fc272363345c8cdc030e4c259d9d028237f8b057dc9bb327772a257bde6bb5" +checksum = "2582b77e0f3c506ec4838a25fa8a5f97b9bed72bb6d3d272ea1c031d8bd373bc" dependencies = [ "askama_escape", "humansize", - "nom", - "num-traits 0.2.12", - "percent-encoding 2.1.0", + "nom 6.1.2", + "num-traits 0.2.14", + "percent-encoding", "proc-macro2", "quote", "serde", @@ -104,10 +103,11 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "1.0.1" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c88b9ca26f9c16ec830350d309397e74ee9abdfd8eb1f71cb6ecc71a3fc818da" +checksum = "a88b6bd5df287567ffdf4ddf4d33060048e1068308e5f62d81c6f9824a045a48" dependencies = [ + "bstr", "doc-comment", "predicates", "predicates-core", @@ -134,9 +134,9 @@ checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" [[package]] name = "autocfg" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "base64" @@ -150,9 +150,18 @@ dependencies = [ [[package]] name = "base64" -version = "0.11.0" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" +dependencies = [ + "byteorder", +] + +[[package]] +name = "base64" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bitflags" @@ -167,10 +176,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] +name = "bitvec" +version = "0.19.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] name = "blake2b_simd" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" +checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" dependencies = [ "arrayref", "arrayvec", @@ -178,6 +199,17 @@ dependencies = [ ] [[package]] +name = "bstr" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279" +dependencies = [ + "lazy_static", + "memchr", + "regex-automata", +] + +[[package]] name = "buf_redux" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -189,15 +221,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.4.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" +checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" [[package]] name = "byteorder" -version = "1.3.4" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "canvas" @@ -210,9 +242,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.58" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518" +checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787" [[package]] name = "cfg-if" @@ -235,26 +267,28 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.13" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c74d84029116787153e02106bf53e66828452a4b325cc8652b788b5967c0a0b6" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" dependencies = [ + "libc", "num-integer", - "num-traits 0.2.12", + "num-traits 0.2.14", "time", + "winapi", ] [[package]] name = "chunked_transfer" -version = "0.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87" +checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e" [[package]] name = "clap" -version = "2.33.1" +version = "2.33.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" +checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" dependencies = [ "ansi_term", "atty", @@ -285,9 +319,9 @@ dependencies = [ [[package]] name = "color_quant" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "console_error_panic_hook" @@ -314,58 +348,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] -name = "crossbeam-deque" -version = "0.7.3" +name = "crossbeam-channel" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" +checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" dependencies = [ - "crossbeam-epoch", + "cfg-if 1.0.0", "crossbeam-utils", - "maybe-uninit", ] [[package]] -name = "crossbeam-epoch" -version = "0.8.2" +name = "crossbeam-deque" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" +checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" dependencies = [ - "autocfg 1.0.0", - "cfg-if 0.1.10", + "cfg-if 1.0.0", + "crossbeam-epoch", "crossbeam-utils", - "lazy_static", - "maybe-uninit", - "memoffset", - "scopeguard", ] [[package]] -name = "crossbeam-queue" -version = "0.2.3" +name = "crossbeam-epoch" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" +checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "crossbeam-utils", - "maybe-uninit", + "lazy_static", + "memoffset", + "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.7.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" +checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" dependencies = [ - "autocfg 1.0.0", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "lazy_static", ] [[package]] name = "curl" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9447ad28eee2a5cfb031c329d46bef77487244fff6a724b378885b8691a35f78" +checksum = "003cb79c1c6d1c93344c7e1201bb51c2148f24ec2bd9c253709d6b2efb796515" dependencies = [ "curl-sys", "libc", @@ -378,9 +408,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.33+curl-7.71.1" +version = "0.4.44+curl-7.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9818ea018327f79c811612f29b9834d2abddbe7db81460a2d5c7e12946b337" +checksum = "4b6d85e9322b193f117c966e79c2d6929ec08c02f339f950044aba12e20bbaf1" dependencies = [ "cc", "libc", @@ -439,14 +469,14 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "docopt" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969" +checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f" dependencies = [ "lazy_static", "regex", "serde", - "strsim 0.9.3", + "strsim 0.10.0", ] [[package]] @@ -459,9 +489,9 @@ dependencies = [ [[package]] name = "either" -version = "1.5.3" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "enum_primitive" @@ -480,7 +510,7 @@ checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" dependencies = [ "atty", "humantime", - "log 0.4.11", + "log 0.4.14", "regex", "termcolor", ] @@ -499,13 +529,13 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e500da2fab70bdc43f8f0e0b350a227f31c72311c56aba48f01d5cd62bb0345b" +checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.2.8", "winapi", ] @@ -515,7 +545,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" dependencies = [ - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] @@ -534,16 +564,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] +name = "form_urlencoded" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +dependencies = [ + "matches", + "percent-encoding", +] + +[[package]] name = "fuchsia-cprng" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" [[package]] +name = "funty" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" + +[[package]] name = "futures" -version = "0.3.5" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613" +checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27" dependencies = [ "futures-channel", "futures-core", @@ -556,9 +602,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.5" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5" +checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2" dependencies = [ "futures-core", "futures-sink", @@ -575,9 +621,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94" +checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1" [[package]] name = "futures-core-preview" @@ -587,9 +633,9 @@ checksum = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a" [[package]] name = "futures-executor" -version = "0.3.5" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314" +checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79" dependencies = [ "futures-core", "futures-task", @@ -598,27 +644,27 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.5" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789" +checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1" [[package]] name = "futures-lite" -version = "1.11.3" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4481d0cd0de1d204a4fa55e7d45f07b1d958abcb06714b3446438e2eff695fb" +checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" dependencies = [ "futures-core", - "memchr", "pin-project-lite", ] [[package]] name = "futures-macro" -version = "0.3.5" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39" +checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121" dependencies = [ + "autocfg 1.0.1", "proc-macro-hack", "proc-macro2", "quote", @@ -627,25 +673,23 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.5" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc" +checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282" [[package]] name = "futures-task" -version = "0.3.5" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626" -dependencies = [ - "once_cell", -] +checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae" [[package]] name = "futures-util" -version = "0.3.5" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6" +checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967" dependencies = [ + "autocfg 1.0.1", "futures-channel", "futures-core", "futures-io", @@ -653,7 +697,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project", + "pin-project-lite", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -662,13 +706,24 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.14" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" +checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", - "wasi", + "wasi 0.10.2+wasi-snapshot-preview1", ] [[package]] @@ -696,9 +751,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" dependencies = [ "unicode-segmentation", ] @@ -712,30 +767,30 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.15" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" +checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" dependencies = [ "libc", ] [[package]] name = "httparse" -version = "1.3.4" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" +checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" [[package]] name = "humansize" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6cab2627acfc432780848602f3f558f7e9dd427352224b0d9324025796d2a5e" +checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026" [[package]] name = "humantime" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "id-arena" @@ -748,9 +803,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.1.5" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" dependencies = [ "matches", "unicode-bidi", @@ -789,23 +844,22 @@ checksum = "e7e0062d2dc2f17d2f13750d95316ae8a2ff909af0fda957084f5defd87c43bb" [[package]] name = "itoa" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" [[package]] name = "jpeg-decoder" -version = "0.1.20" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc797adac5f083b8ff0ca6f6294a999393d76e197c36488e2ef732c4715f6fa3" +checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" dependencies = [ - "byteorder", "rayon", ] [[package]] name = "js-sys" -version = "0.3.50" +version = "0.3.51" dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", @@ -833,16 +887,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" [[package]] +name = "lexical-core" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" +dependencies = [ + "arrayvec", + "bitflags 1.2.1", + "cfg-if 1.0.0", + "ryu", + "static_assertions", +] + +[[package]] name = "libc" -version = "0.2.74" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10" +checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36" [[package]] name = "libz-sys" -version = "1.0.25" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" +checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" dependencies = [ "cc", "libc", @@ -856,16 +923,16 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" dependencies = [ - "log 0.4.11", + "log 0.4.14", ] [[package]] name = "log" -version = "0.4.11" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", ] [[package]] @@ -881,24 +948,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" [[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - -[[package]] name = "memchr" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" +checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" [[package]] name = "memoffset" -version = "0.5.5" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f" +checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" dependencies = [ - "autocfg 1.0.0", + "autocfg 1.0.1", ] [[package]] @@ -924,19 +985,19 @@ dependencies = [ [[package]] name = "multipart" -version = "0.15.4" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adba94490a79baf2d6a23eac897157047008272fa3eecb3373ae6377b91eca28" +checksum = "136eed74cadb9edd2651ffba732b19a450316b680e4f48d6c79e905799e19d01" dependencies = [ "buf_redux", "httparse", - "log 0.4.11", + "log 0.4.14", "mime", "mime_guess", "quick-error", - "rand 0.4.6", + "rand 0.6.5", "safemem", - "tempdir", + "tempfile", "twoway", ] @@ -954,7 +1015,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" dependencies = [ "memchr", - "version_check 0.9.2", + "version_check 0.9.3", +] + +[[package]] +name = "nom" +version = "6.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" +dependencies = [ + "bitvec", + "funty", + "lexical-core", + "memchr", + "version_check 0.9.3", ] [[package]] @@ -965,23 +1039,23 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "num-integer" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" dependencies = [ - "autocfg 1.0.0", - "num-traits 0.2.12", + "autocfg 1.0.1", + "num-traits 0.2.14", ] [[package]] name = "num-iter" -version = "0.1.41" +version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f" +checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" dependencies = [ - "autocfg 1.0.0", + "autocfg 1.0.1", "num-integer", - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] @@ -991,7 +1065,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" dependencies = [ "num-integer", - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] @@ -1000,16 +1074,16 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] name = "num-traits" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" dependencies = [ - "autocfg 1.0.0", + "autocfg 1.0.1", ] [[package]] @@ -1024,46 +1098,46 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.4.0" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" +checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" [[package]] name = "openssl" -version = "0.10.30" +version = "0.10.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" +checksum = "6d7830286ad6a3973c0f1d9b73738f69c76b739301d0229c4b96501695cbe4c8" dependencies = [ "bitflags 1.2.1", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "foreign-types", - "lazy_static", "libc", + "once_cell", "openssl-sys", ] [[package]] name = "openssl-probe" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" +checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-src" -version = "111.10.2+1.1.1g" +version = "111.15.0+1.1.1k" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a287fdb22e32b5b60624d4a5a7a02dbe82777f730ec0dbc42a0554326fef5a70" +checksum = "b1a5f6ae2ac04393b217ea9f700cd04fa9bf3d93fae2872069f3d15d908af70a" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.58" +version = "0.9.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" +checksum = "b6b0d6fb7d80f877617dfcb014e605e2b5ab2fb0afdf27935219bb6bd984cb98" dependencies = [ - "autocfg 1.0.0", + "autocfg 1.0.1", "cc", "libc", "openssl-src", @@ -1073,12 +1147,6 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - -[[package]] -name = "percent-encoding" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" @@ -1132,26 +1200,6 @@ dependencies = [ ] [[package]] -name = "pin-project" -version = "0.4.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] name = "pin-project-lite" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1165,9 +1213,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" +checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" [[package]] name = "png" @@ -1183,15 +1231,15 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" [[package]] name = "predicates" -version = "1.0.5" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bfead12e90dccead362d62bb2c90a5f6fc4584963645bc7f71a735e0b0735a" +checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df" dependencies = [ "difference", "float-cmp", @@ -1202,15 +1250,15 @@ dependencies = [ [[package]] name = "predicates-core" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178" +checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451" [[package]] name = "predicates-tree" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124" +checksum = "15f553275e5721409451eb85e15fd9a860a6e5ab4496eb215987502b5f5391f2" dependencies = [ "predicates-core", "treeline", @@ -1218,47 +1266,45 @@ dependencies = [ [[package]] name = "proc-macro-error" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc175e9777c3116627248584e8f8b3e2987405cabe1c0adf7d1dd28f09dc7880" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", "syn", - "version_check 0.9.2", + "version_check 0.9.3", ] [[package]] name = "proc-macro-error-attr" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc9795ca17eb581285ec44936da7fc2335a3f34f2ddd13118b6f4d515435c50" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2", "quote", - "syn", - "syn-mid", - "version_check 0.9.2", + "version_check 0.9.3", ] [[package]] name = "proc-macro-hack" -version = "0.5.18" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro-nested" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" +checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] name = "proc-macro2" -version = "1.0.24" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" dependencies = [ "unicode-xid", ] @@ -1271,38 +1317,18 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" dependencies = [ "proc-macro2", ] [[package]] -name = "rand" -version = "0.4.6" +name = "radium" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi", -] - -[[package]] -name = "rand" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "winapi", -] +checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" [[package]] name = "rand" @@ -1329,7 +1355,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ - "getrandom", + "getrandom 0.1.16", "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", @@ -1337,6 +1363,18 @@ dependencies = [ ] [[package]] +name = "rand" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" +dependencies = [ + "libc", + "rand_chacha 0.3.0", + "rand_core 0.6.2", + "rand_hc 0.3.0", +] + +[[package]] name = "rand_chacha" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1357,6 +1395,16 @@ dependencies = [ ] [[package]] +name = "rand_chacha" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.2", +] + +[[package]] name = "rand_core" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1377,7 +1425,16 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" dependencies = [ - "getrandom", + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" +dependencies = [ + "getrandom 0.2.3", ] [[package]] @@ -1399,6 +1456,15 @@ dependencies = [ ] [[package]] +name = "rand_hc" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" +dependencies = [ + "rand_core 0.6.2", +] + +[[package]] name = "rand_isaac" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1453,11 +1519,11 @@ dependencies = [ [[package]] name = "rayon" -version = "1.3.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080" +checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" dependencies = [ - "autocfg 1.0.0", + "autocfg 1.0.1", "crossbeam-deque", "either", "rayon-core", @@ -1465,12 +1531,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.7.1" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280" +checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" dependencies = [ + "crossbeam-channel", "crossbeam-deque", - "crossbeam-queue", "crossbeam-utils", "lazy_static", "num_cpus", @@ -1517,33 +1583,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] +name = "redox_syscall" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc" +dependencies = [ + "bitflags 1.2.1", +] + +[[package]] name = "redox_users" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" +checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" dependencies = [ - "getrandom", - "redox_syscall", + "getrandom 0.1.16", + "redox_syscall 0.1.57", "rust-argon2", ] [[package]] name = "regex" -version = "1.3.9" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" dependencies = [ "aho-corasick", "memchr", "regex-syntax", - "thread_local", ] [[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" + +[[package]] name = "regex-syntax" -version = "0.6.18" +version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "remove_dir_all" @@ -1564,16 +1644,17 @@ dependencies = [ [[package]] name = "rouille" -version = "3.0.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112568052ec17fa26c6c11c40acbb30d3ad244bf3d6da0be181f5e7e42e5004f" +checksum = "0cfaebc11a52b7415f07e69f18f8240a0ea5eedf0dcb888c5fb7b432e7b4729b" dependencies = [ - "base64 0.9.3", + "base64 0.10.1", "chrono", "filetime", "multipart", "num_cpus", - "rand 0.5.6", + "percent-encoding", + "rand 0.7.3", "serde", "serde_derive", "serde_json", @@ -1587,11 +1668,11 @@ dependencies = [ [[package]] name = "rust-argon2" -version = "0.7.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" +checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" dependencies = [ - "base64 0.11.0", + "base64 0.13.0", "blake2b_simd", "constant_time_eq", "crossbeam-utils", @@ -1606,9 +1687,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.16" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" +checksum = "410f7acf3cb3a44527c5d9546bad4bf4e6c460915d5f9f2fc524498bfe8f70ce" [[package]] name = "ryu" @@ -1662,18 +1743,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.114" +version = "1.0.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" +checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.114" +version = "1.0.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" +checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" dependencies = [ "proc-macro2", "quote", @@ -1682,9 +1763,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.57" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c" +checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" dependencies = [ "itoa", "ryu", @@ -1705,19 +1786,17 @@ checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" [[package]] name = "slab" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" +checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" [[package]] name = "socket2" -version = "0.3.12" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" +checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" dependencies = [ - "cfg-if 0.1.10", "libc", - "redox_syscall", "winapi", ] @@ -1728,6 +1807,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" [[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] name = "strsim" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1735,15 +1820,15 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "strsim" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "structopt" -version = "0.3.15" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c" +checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c" dependencies = [ "clap", "lazy_static", @@ -1752,9 +1837,9 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.8" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118" +checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90" dependencies = [ "heck", "proc-macro-error", @@ -1765,9 +1850,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.67" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702" +checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" dependencies = [ "proc-macro2", "quote", @@ -1775,36 +1860,21 @@ dependencies = [ ] [[package]] -name = "syn-mid" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tempdir" -version = "0.3.7" +name = "tap" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -dependencies = [ - "rand 0.4.6", - "remove_dir_all", -] +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", - "rand 0.7.3", - "redox_syscall", + "rand 0.8.3", + "redox_syscall 0.2.8", "remove_dir_all", "winapi", ] @@ -1822,9 +1892,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" +checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" dependencies = [ "winapi-util", ] @@ -1839,15 +1909,6 @@ dependencies = [ ] [[package]] -name = "thread_local" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -dependencies = [ - "lazy_static", -] - -[[package]] name = "threadpool" version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1868,22 +1929,31 @@ dependencies = [ [[package]] name = "tiny_http" -version = "0.6.2" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951" +checksum = "9ce51b50006056f590c9b7c3808c3bd70f0d1101666629713866c227d6e58d39" dependencies = [ "ascii", "chrono", "chunked_transfer", - "log 0.4.11", + "log 0.4.14", "url", ] [[package]] name = "tinyvec" -version = "0.3.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" +checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "todomvc" @@ -1898,9 +1968,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" dependencies = [ "serde", ] @@ -1913,9 +1983,9 @@ checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" [[package]] name = "trybuild" -version = "1.0.31" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a4d94e6adf00b96b1ab94fcfcd8c3cf916733b39adf90c8f72693629887b9b8" +checksum = "1768998d9a3b179411618e377dbb134c58a88cda284b0aa71c42c40660127d46" dependencies = [ "glob", "lazy_static", @@ -1954,27 +2024,27 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" dependencies = [ "matches", ] [[package]] name = "unicode-normalization" -version = "0.1.13" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" +checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" +checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" [[package]] name = "unicode-width" @@ -1984,26 +2054,27 @@ checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" [[package]] name = "unicode-xid" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" [[package]] name = "url" -version = "1.7.2" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" +checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" dependencies = [ + "form_urlencoded", "idna", "matches", - "percent-encoding 1.0.1", + "percent-encoding", ] [[package]] name = "vcpkg" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" +checksum = "025ce40a007e1907e58d5bc1a594def78e5573bb0b1160bc389634e8f12e4faa" [[package]] name = "vec_map" @@ -2019,9 +2090,9 @@ checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" [[package]] name = "version_check" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" [[package]] name = "wait-timeout" @@ -2034,24 +2105,24 @@ dependencies = [ [[package]] name = "walrus" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d470d0583e65f4cab21a1ff3c1ba3dd23ae49e68f516f0afceaeb001b32af39" +checksum = "4eb08e48cde54c05f363d984bb54ce374f49e242def9468d2e1b6c2372d291f8" dependencies = [ "anyhow", "id-arena", "leb128", - "log 0.4.11", + "log 0.4.14", "rayon", "walrus-macro", - "wasmparser 0.59.0", + "wasmparser 0.77.0", ] [[package]] name = "walrus-macro" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c2bb690b44cb1b0fdcc54d4998d21f8bdaf706b93775425e440b174f39ad16" +checksum = "0a6e5bd22c71e77d60140b0bd5be56155a37e5bd14e24f5f87298040d0cc40d7" dependencies = [ "heck", "proc-macro2", @@ -2066,8 +2137,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + +[[package]] name = "wasm-bindgen" -version = "0.2.73" +version = "0.2.74" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -2083,11 +2160,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.73" +version = "0.2.74" dependencies = [ "bumpalo", "lazy_static", - "log 0.4.11", + "log 0.4.14", "proc-macro2", "quote", "syn", @@ -2104,7 +2181,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-cli" -version = "0.2.73" +version = "0.2.74" dependencies = [ "anyhow", "assert_cmd", @@ -2112,7 +2189,7 @@ dependencies = [ "diff", "docopt", "env_logger", - "log 0.4.11", + "log 0.4.14", "openssl", "predicates", "rayon", @@ -2132,11 +2209,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-cli-support" -version = "0.2.73" +version = "0.2.74" dependencies = [ "anyhow", "base64 0.9.3", - "log 0.4.11", + "log 0.4.14", "rustc-demangle", "serde_json", "tempfile", @@ -2154,19 +2231,19 @@ dependencies = [ [[package]] name = "wasm-bindgen-externref-xform" -version = "0.2.73" +version = "0.2.74" dependencies = [ "anyhow", "rayon", "walrus", "wasmprinter", - "wast", + "wast 21.0.0", "wat", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.23" +version = "0.4.24" dependencies = [ "cfg-if 1.0.0", "futures-channel-preview", @@ -2180,7 +2257,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.73" +version = "0.2.74" dependencies = [ "quote", "trybuild", @@ -2191,7 +2268,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.73" +version = "0.2.74" dependencies = [ "proc-macro2", "quote", @@ -2202,13 +2279,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-multi-value-xform" -version = "0.2.73" +version = "0.2.74" dependencies = [ "anyhow", "rayon", "walrus", "wasmprinter", - "wast", + "wast 21.0.0", "wat", ] @@ -2223,11 +2300,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.73" +version = "0.2.74" [[package]] name = "wasm-bindgen-test" -version = "0.3.23" +version = "0.3.24" dependencies = [ "console_error_panic_hook", "js-sys", @@ -2253,7 +2330,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.23" +version = "0.3.24" dependencies = [ "proc-macro2", "quote", @@ -2261,7 +2338,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-threads-xform" -version = "0.2.73" +version = "0.2.74" dependencies = [ "anyhow", "walrus", @@ -2270,7 +2347,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-conventions" -version = "0.2.73" +version = "0.2.74" dependencies = [ "anyhow", "walrus", @@ -2278,10 +2355,10 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-interpreter" -version = "0.2.73" +version = "0.2.74" dependencies = [ "anyhow", - "log 0.4.11", + "log 0.4.14", "tempfile", "walrus", "wasm-bindgen-wasm-conventions", @@ -2290,13 +2367,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-webidl" -version = "0.2.73" +version = "0.2.74" dependencies = [ "anyhow", "env_logger", "heck", "lazy_static", - "log 0.4.11", + "log 0.4.14", "proc-macro2", "quote", "sourcefile", @@ -2325,6 +2402,15 @@ dependencies = [ ] [[package]] +name = "wasm-in-web-worker" +version = "0.1.0" +dependencies = [ + "console_error_panic_hook", + "wasm-bindgen", + "web-sys", +] + +[[package]] name = "wasm2js" version = "0.1.0" dependencies = [ @@ -2339,18 +2425,24 @@ checksum = "a950e6a618f62147fd514ff445b2a0b53120d382751960797f85f058c7eda9b9" [[package]] name = "wasmparser" -version = "0.60.2" +version = "0.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2d5790a08f11f3d6b5767f6c49152df74b215e3dc5a38147713c4f6a05aac7f" +checksum = "b35c86d22e720a07d954ebbed772d01180501afe7d03d464f413bb5f8914a8d6" + +[[package]] +name = "wasmparser" +version = "0.78.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52144d4c78e5cf8b055ceab8e5fa22814ce4315d6002ad32cfd914f37c12fd65" [[package]] name = "wasmprinter" -version = "0.2.7" +version = "0.2.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc836dba85dd00df43d71b22063bcb367d324aa1be0d046077cc7fca4c43876" +checksum = "2ccec894c70710c2e4669320a532cb2b9cfb97adb0429745642f8ce76916ed85" dependencies = [ "anyhow", - "wasmparser 0.60.2", + "wasmparser 0.78.2", ] [[package]] @@ -2363,17 +2455,26 @@ dependencies = [ ] [[package]] +name = "wast" +version = "35.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ef140f1b49946586078353a453a1d28ba90adfc54dde75710bc1931de204d68" +dependencies = [ + "leb128", +] + +[[package]] name = "wat" -version = "1.0.22" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce85d72b74242c340e9e3492cfb602652d7bb324c3172dd441b5577e39a2e18c" +checksum = "8ec280a739b69173e0ffd12c1658507996836ba4e992ed9bc1e5385a0bd72a02" dependencies = [ - "wast", + "wast 35.0.2", ] [[package]] name = "web-sys" -version = "0.3.50" +version = "0.3.51" dependencies = [ "js-sys", "wasm-bindgen", @@ -2447,7 +2548,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "610950904727748ca09682e857f0d6d6437f0ca862f32f9229edba8cec8b2635" dependencies = [ - "nom", + "nom 5.1.2", ] [[package]] @@ -2517,7 +2618,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33358e95c77d660f1c7c07f4a93c2bd89768965e844e3c50730bb4b42658df5f" dependencies = [ "anyhow", - "wast", + "wast 21.0.0", "wit-writer", ] @@ -2535,9 +2636,9 @@ dependencies = [ [[package]] name = "wit-walrus" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b532d7bc47d02a08463adc934301efbf67e7b1e1284f8a68edc85d1ca84fa125" +checksum = "ad559e3e4c6404b2a6a675d44129d62a3836e3b951b90112fa1c5feb852757cd" dependencies = [ "anyhow", "id-arena", @@ -2572,3 +2673,9 @@ dependencies = [ "wasm-bindgen", "web-sys", ] + +[[package]] +name = "wyz" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index a52f7b6550c1e..ef8affdf2446b 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -1,10 +1,17 @@ -{ rustPlatform, fetchFromGitHub, lib, openssl, pkg-config, stdenv, curl, Security +{ rustPlatform +, fetchFromGitHub +, lib +, openssl +, pkg-config +, stdenv +, curl +, Security , runCommand }: rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.73"; + version = "0.2.74"; src = let @@ -12,9 +19,10 @@ rustPlatform.buildRustPackage rec { owner = "rustwasm"; repo = "wasm-bindgen"; rev = version; - sha256 = "sha256-JrfS9Z/ZqhoZXJxrxMSLpl2NiktTUkjW6q3xN9AU2zw="; + hash = "sha256-GsraYfWzUZjFpPpufTyXF0i2llBzjh04iTKio6m4NRA="; }; - in runCommand "source" { } '' + in + runCommand "source" { } '' cp -R ${tarball} $out chmod -R +w $out cp ${./Cargo.lock} $out/Cargo.lock @@ -23,7 +31,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-GUdoOms4FrNmPkELFX1PXcU/ww7CSN8JGHoCvnm73PQ="; + cargoHash = "sha256-djeI7kSGRHMpXnsbVlM2CDek02u5tFAsyAdHwbKC0y8="; cargoBuildFlags = [ "-p" pname ]; meta = with lib; { diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index cd195cc4d6032..24ef1e85751e5 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -228,6 +228,7 @@ in rec { yarnNix ? mkYarnNix { inherit yarnLock; }, yarnFlags ? defaultYarnFlags, yarnPreBuild ? "", + yarnPostBuild ? "", pkgConfig ? {}, extraBuildInputs ? [], publishBinsFor ? null, @@ -249,6 +250,7 @@ in rec { deps = mkYarnModules { name = "${safeName}-modules-${version}"; preBuild = yarnPreBuild; + postBuild = yarnPostBuild; workspaceDependencies = workspaceDependenciesTransitive; inherit packageJSON pname version yarnLock yarnNix yarnFlags pkgConfig; }; diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 9b84f9897fab6..287709bbbad7f 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "7.4.0"; + version = "7.5.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "1xhjmn6cwpdph12k4gbl2f1v72bp689779l5i16i90i01m31kwjp"; + sha256 = "07i475b17v8qazdq6qzjqsdfpvhg1b8x1p5a51hwhcxaym3p5njj"; }; passthru.updateScript = ./update.sh; diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 08c69dde39991..dee8ad0c9b847 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.10.3"; + version = "1.11.0"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-25FfxGtPZ+KQCmXur6pwrb1l/xjCWgw69CMLPihnhAU="; + sha256 = "sha256-rsQ9MdMgYPqnLzMfW4rwDpx5QKVDm6TMCCHqJzvTpjw="; }; - cargoSha256 = "sha256-CopfdjafWAhpbrdYSHJjKHKCLw94TSaiSAH4CVFOHi8="; + cargoSha256 = "sha256-nKbc73bEKb0XzuBZApu21E1OzkgU9sqbCaaWhUMiWdQ="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/deno/librusty_v8.nix b/pkgs/development/web/deno/librusty_v8.nix index 8ae163f2c907c..6ae0de15c7705 100644 --- a/pkgs/development/web/deno/librusty_v8.nix +++ b/pkgs/development/web/deno/librusty_v8.nix @@ -11,11 +11,11 @@ let }; in fetch_librusty_v8 { - version = "0.22.2"; + version = "0.22.3"; shas = { - x86_64-linux = "sha256-bLGSt9a+drzXMy64iiERFHfdDsIR2YqwwNlkpzIM07Q="; - aarch64-linux = "sha256-MtCB7XaFho+a64fidPO88URIq7X9HvGqN5a9hzuCX4s="; - x86_64-darwin = "sha256-aLeZ0cIdmQHDxSGPx6IBwweZWwDI/m/1kFQTC7dQ3bs="; - aarch64-darwin = "sha256-SZGx/kRvp88mfMqDX+d4GNDs4t+P383kjnNPqwkqkHI="; + x86_64-linux = "sha256-RS1fUuTm6zhln67ank6Sit9nhGyKij1UsJ77ezffCh8="; + aarch64-linux = "sha256-E7SSFYODO8diPmEvpJyzAcltrh7YUXhWlqsRytFRmtA="; + x86_64-darwin = "sha256-29XTC7RoUDNJq46WkLCQT1vCuv4dzBrp8no6vVCsQ2g="; + aarch64-darwin = "sha256-UZHhKUjWQGklH26z2Kc2J7VwlV83LWl5n3YZt5ryKrY="; }; } diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 7d70ee9e6d3cd..ee47a0ecdc21e 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, nixosTests, jre_headless }: stdenv.mkDerivation { pname = "minecraft-server"; - version = "1.16.5"; + version = "1.17"; src = fetchurl { - url = "https://launcher.mojang.com/v1/objects/1b557e7b033b583cd9f66746b7a9ab1ec1673ced/server.jar"; + url = "https://launcher.mojang.com/v1/objects/0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e/server.jar"; # sha1 because that comes from mojang via api - sha1 = "1b557e7b033b583cd9f66746b7a9ab1ec1673ced"; + sha1 = "0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e"; }; preferLocalBuild = true; diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix index f5bf9573e6bed..72612394fe2a9 100644 --- a/pkgs/games/papermc/default.nix +++ b/pkgs/games/papermc/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, bash, jre }: let mcVersion = "1.16.5"; - buildNum = "488"; + buildNum = "771"; jar = fetchurl { - url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download"; - sha256 = "07zgq6pfgwd9a9daqv1dab0q8cwgidsn6sszn7bpr37y457a4ka8"; + url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download"; + sha256 = "1lmlfhigbzbkgzfq6knglka0ccf4i32ch25gkny0c5fllmsnm08l"; }; in stdenv.mkDerivation { pname = "papermc"; diff --git a/pkgs/games/rpg-cli/default.nix b/pkgs/games/rpg-cli/default.nix index 0c3a58c98a96f..1c5e8fce97a7a 100644 --- a/pkgs/games/rpg-cli/default.nix +++ b/pkgs/games/rpg-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rpg-cli"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "facundoolano"; repo = pname; rev = version; - sha256 = "sha256-pcVxUX6CPIE5GJniXbAiwZQjwv2eer8LevFl6gASKmM="; + sha256 = "0rbj27zd7ydkvnyszd56hazj64aqqrwn34fsy4jymk50lvicwxjg"; }; - cargoSha256 = "sha256-4DB3Zj9awmKX5t1zCgWxetz/+tl6ojpCEKxWpZFlMcw="; + cargoSha256 = "sha256-VftJgRqrFwTElp2/e+zQYZOLZPjbc9C8SZ4DlBEtRvQ="; # tests assume the authors macbook, and thus fail doCheck = false; diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index a11d698b8016a..ec18a26829fb4 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -10,15 +10,15 @@ let pname = "shattered-pixel-dungeon"; - version = "0.9.2b"; + version = "0.9.3"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; # NOTE: always use the commit sha, not the tag. Tags _will_ disappear! # https://github.com/00-Evan/shattered-pixel-dungeon/issues/596 - rev = "eba806ef561921b86637cf26818e095556edec0d"; - sha256 = "05m4sfchccr437pxjvgzjk6nd9r3n4c4p3q8lxcc5pj6qrppk49j"; + rev = "785c869f2b61013a15fddbf5f0c65d67fe900e80"; + sha256 = "sha256-d7Fc1IPOW/0RwLYe9vwaD3gFw6div2/J0DOFdWYDXWY="; }; postPatch = '' diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 44bee8ff11a1b..fe3dde7167b5a 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -98,6 +98,7 @@ in buildFHSUserEnv rec { xorg.libXfixes libGL libva + pipewire.lib # Not formally in runtime but needed by some games at-spi2-atk diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index b501df598ef6d..ab2c19249aa25 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "steam-runtime"; # from https://repo.steampowered.com/steamrt-images-scout/snapshots/ - version = "0.20210317.0"; + version = "0.20210527.0"; src = fetchurl { url = "https://repo.steampowered.com/steamrt-images-scout/snapshots/${version}/steam-runtime.tar.xz"; - sha256 = "061z2r33n2017prmhdxm82cly3qp3bma2q70pqs57adl65yvg7vw"; + sha256 = "1880d1byn265w0vy5p98d8w8virnbywj707ydybj7rixhid2gzdc"; name = "scout-runtime-${version}.tar.gz"; }; diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix index de07821c36a69..ba0fcf784f4ef 100644 --- a/pkgs/games/xsnow/default.nix +++ b/pkgs/games/xsnow/default.nix @@ -1,26 +1,26 @@ -{ lib, stdenv, fetchurl, libXt, libXpm, libXext, imake, gccmakedep }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, gtk3-x11, libXt, libXpm }: stdenv.mkDerivation rec { - - version = "1.42"; pname = "xsnow"; + version = "3.3.0"; src = fetchurl { - url = "https://janswaal.home.xs4all.nl/Xsnow/${pname}-${version}.tar.gz"; - sha256 = "06jnbp88wc9i9dbmy7kggplw4hzlx2bhghxijmlhkjlizgqwimyh"; + url = "https://ratrabbit.nl/downloads/xsnow/xsnow-${version}.tar.gz"; + sha256 = "1xnpqbamhglv7xsxzlrlpvsz6bbzlrvdpn5x2n9baww9kcrkbwjg"; }; - nativeBuildInputs = [ imake gccmakedep ]; - buildInputs = [ - libXt libXpm libXext - ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gtk3-x11 libxml2 libXt libXpm ]; + + makeFlags = [ "gamesdir=$(out)/bin" ]; - makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ]; + enableParallelBuilding = true; - meta = { + meta = with lib; { description = "An X-windows application that will let it snow on the root, in between and on windows"; - homepage = "http://janswaal.home.xs4all.nl/Xsnow/"; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.robberer ]; + homepage = "https://ratrabbit.nl/ratrabbit/xsnow/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ robberer ]; + platforms = platforms.unix; }; } diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index ce80b174d3274..81b8ba0ab5bfd 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }: +{ lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, nixosTests, systemd }: let beat = package : extraArgs : buildGoPackage (rec { name = "${package}-${version}"; @@ -22,10 +22,17 @@ let beat = package : extraArgs : buildGoPackage (rec { platforms = platforms.linux; }; } // extraArgs); -in { +in rec { filebeat6 = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; heartbeat6 = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; - metricbeat6 = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";}; + metricbeat6 = beat "metricbeat" { + meta.description = "Lightweight shipper for metrics"; + passthru.tests = + assert metricbeat6.drvPath == nixosTests.elk.ELK-6.elkPackages.metricbeat.drvPath; + { + elk = nixosTests.elk.ELK-6; + }; + }; packetbeat6 = beat "packetbeat" { buildInputs = [ libpcap ]; meta.broken = true; diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index 43ea85508c690..77e14e96c54ea 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }: +{ lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, nixosTests, systemd }: let beat = package : extraArgs : buildGoPackage (rec { name = "${package}-${version}"; @@ -22,10 +22,17 @@ let beat = package : extraArgs : buildGoPackage (rec { platforms = platforms.linux; }; } // extraArgs); -in { +in rec { filebeat7 = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; heartbeat7 = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; - metricbeat7 = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";}; + metricbeat7 = beat "metricbeat" { + meta.description = "Lightweight shipper for metrics"; + passthru.tests = + assert metricbeat7.drvPath == nixosTests.elk.ELK-7.elkPackages.metricbeat.drvPath; + { + elk = nixosTests.elk.ELK-7; + }; + }; packetbeat7 = beat "packetbeat" { buildInputs = [ libpcap ]; meta.description = "Network packet analyzer that ships data to Elasticsearch"; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 12c6e885d7b33..f1a0626468835 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3995,6 +3995,18 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/popup.nvim/"; }; + presence-nvim = buildVimPluginFrom2Nix { + pname = "presence-nvim"; + version = "2021-06-08"; + src = fetchFromGitHub { + owner = "andweeb"; + repo = "presence.nvim"; + rev = "f4c1e227be0a0c863c2de201155401950eda572e"; + sha256 = "08s4az1gv6r5sl0jqkaf4yzibglibb7n2sivh7qccj8dz8id3883"; + }; + meta.homepage = "https://github.com/andweeb/presence.nvim/"; + }; + PreserveNoEOL = buildVimPluginFrom2Nix { pname = "PreserveNoEOL"; version = "2013-06-14"; @@ -8970,6 +8982,18 @@ final: prev: meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; + vim-unicoder = buildVimPluginFrom2Nix { + pname = "vim-unicoder"; + version = "2019-04-16"; + src = fetchFromGitHub { + owner = "arthurxavierx"; + repo = "vim-unicoder"; + rev = "a71fc3670f9337c56806fa9e8e97b7ea09fd5e39"; + sha256 = "1kcnxx909pdvrvk0kyz3h8f9szn6hmalm8qyakq3pv6dknlkwb0b"; + }; + meta.homepage = "https://github.com/arthurxavierx/vim-unicoder/"; + }; + vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; version = "2020-04-26"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 1d43a2d8eaecb..1a2457d36d373 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -20,11 +20,13 @@ AndrewRadev/sideways.vim@main AndrewRadev/splitjoin.vim@main andsild/peskcolor.vim andviro/flake8-vim +andweeb/presence.nvim andymass/vim-matchup andys8/vim-elm-syntax antoinemadec/coc-fzf ap/vim-css-color arcticicestudio/nord-vim +arthurxavierx/vim-unicoder artur-shaik/vim-javacomplete2 autozimu/LanguageClient-neovim axelf4/vim-strip-trailing-whitespace diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 1163f5dd9f0e2..5ca3aef235885 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -184,7 +184,7 @@ let rtpPath = "share/vim-plugins"; - nativeImpl = packages: lib.optionalString (packages != null) + nativeImpl = packages: (let link = (packageName: dir: pluginPath: "ln -sf ${pluginPath}/share/vim-plugins/* $out/pack/${packageName}/${dir}"); packageLinks = (packageName: {start ? [], opt ? []}: @@ -340,8 +340,8 @@ let entries = [ beforePlugins vamImpl - (nativeImpl packages) ] + ++ lib.optional (packages != null && packages != []) (nativeImpl packages) ++ lib.optional (pathogen != null) pathogenImpl ++ lib.optional (plug != null) plugImpl ++ [ customRC ]; diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 9d21b057c8a24..1ca566bf7f270 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -668,6 +668,18 @@ let }; }; + johnpapa.vscode-peacock = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-peacock"; + publisher = "johnpapa"; + version = "3.9.1"; + sha256 = "1g7apzzgfm8s9sjavhwr8jpf9slhq8b9jfkww3q5n41mzzx8m94p"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + jpoissonnier.vscode-styled-components = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-styled-components"; @@ -829,6 +841,18 @@ let }; }; + octref.vetur = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vetur"; + publisher = "octref"; + version = "0.34.1"; + sha256 = "09w3bik1mxs7qac67wgrc58vl98ham3syrn2anycpwd7135wlpby"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + redhat.java = buildVscodeMarketplaceExtension { mktplcRef = { name = "java"; @@ -1173,6 +1197,18 @@ let }; }; + wix.vscode-import-cost = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-import-cost"; + publisher = "wix"; + version = "2.15.0"; + sha256 = "0d3b6654cdck1syn74vmmd1jmgkrw5v4c4cyrhdxbhggkip732bc"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + xaver.clang-format = buildVscodeMarketplaceExtension { mktplcRef = { name = "clang-format"; diff --git a/pkgs/misc/vscode-extensions/terraform/default.nix b/pkgs/misc/vscode-extensions/terraform/default.nix index 44e2bdb1005c0..90ea121850d23 100644 --- a/pkgs/misc/vscode-extensions/terraform/default.nix +++ b/pkgs/misc/vscode-extensions/terraform/default.nix @@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "terraform"; publisher = "hashicorp"; - version = "2.11.0"; + version = "2.12.0"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/${mktplcRef.name}-${mktplcRef.version}.vsix"; - sha256 = "0wqdya353b415qxs8jczmis3q6d8fddv1pdd8jdd0w64s1ibv3sy"; + sha256 = "1r12yxpf0wlh7vdxpj04356zlgxmlwz9apdlxnv5ay056a2a8k3a"; }; patches = [ ./fix-terraform-ls.patch ]; diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index d099a62bc8104..6f94d0f892545 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools to display or change the CPU governor settings"; homepage = "http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html"; - license = licenses.gpl2; - platforms = platforms.linux; + license = licenses.gpl2Only; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix index 971a1abffddbd..5566103b2cd90 100644 --- a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix +++ b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix @@ -1,15 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, autoconf-archive, gettext, libtool, intltool, autoconf, automake +{ lib, stdenv, fetchFromGitLab, autoconf-archive, gettext, libtool, intltool, autoconf, automake , glib, gtk3, gtk-doc, libgudev, pkg-config, systemd }: stdenv.mkDerivation rec { pname = "iio-sensor-proxy"; - version = "2.8"; + version = "3.0"; - src = fetchFromGitHub { + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; owner = "hadess"; repo = pname; rev = version; - sha256 = "07rzm1z2p6lh4iv5pyp0p2x5805m9gsh19kcsjls3fi25p3a2c00"; + sha256 = "0ngbz1vkbjci3ml6p47jh6c6caipvbkm8mxrc8ayr6vc2p9l1g49"; }; configurePhase = '' diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 6cf635da18b3d..bb668a6e90404 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,38 +1,32 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.234-hardened1.patch", - "sha256": "1vdr3j62whc2xdy1l4imkp6axpwh7r3cjp0sgsld7l5331x19qh7", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.234-hardened1/linux-hardened-4.14.234-hardened1.patch" + "name": "linux-hardened-4.14.235-hardened1.patch", + "sha256": "0m49pg27pnp6kwkbawg0fw3lzm5nchqjhqkfgprckwgb9v5bgbcc", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.235-hardened1/linux-hardened-4.14.235-hardened1.patch" }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.192-hardened1.patch", - "sha256": "0gy4h73ygiqr6c9zbmfz4as18ldcnnzgc4qd2nss08m2x1cb1n76", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.192-hardened1/linux-hardened-4.19.192-hardened1.patch" + "name": "linux-hardened-4.19.193-hardened1.patch", + "sha256": "0r2rxl08x2l1yimaqksrc79s36rnp77xm5in9cvp7ff24y9r9g0j", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.193-hardened1/linux-hardened-4.19.193-hardened1.patch" }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.40-hardened1.patch", - "sha256": "15nprqyw9whqghpnr39wpn54snxz49wdr4dq41dbmmqmrrlfyxnr", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.40-hardened1/linux-hardened-5.10.40-hardened1.patch" - }, - "5.11": { - "extra": "-hardened1", - "name": "linux-hardened-5.11.22-hardened1.patch", - "sha256": "1lwf56pxyzqzjqw4k1qd93vi44abmbz6hqbalamz6ancxkb800hh", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.11.22-hardened1/linux-hardened-5.11.22-hardened1.patch" + "name": "linux-hardened-5.10.42-hardened1.patch", + "sha256": "1hignnqy0d7nrfnh5j8h1xkj15kvx80h55qzzq1wlmyjxpr6c0ix", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.42-hardened1/linux-hardened-5.10.42-hardened1.patch" }, "5.12": { "extra": "-hardened1", - "name": "linux-hardened-5.12.7-hardened1.patch", - "sha256": "1r8bf8hrxpzyxqcy3zf1m86bfi0lr4aijbrq12sqb7n2g1wc1j87", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.7-hardened1/linux-hardened-5.12.7-hardened1.patch" + "name": "linux-hardened-5.12.9-hardened1.patch", + "sha256": "08ijifhl8sl858ik32ny47h7pq0r160sv55a07igkbhrh60arfqa", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.9-hardened1/linux-hardened-5.12.9-hardened1.patch" }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.122-hardened1.patch", - "sha256": "1wa3h18gwgn4blkidf8mlw3r0nb2asya5rbwylghq3qnaa2hc0k7", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.122-hardened1/linux-hardened-5.4.122-hardened1.patch" + "name": "linux-hardened-5.4.124-hardened1.patch", + "sha256": "1bn7fa09kzgv6v9d3gl66l8wg6z23chjhk6g219cqb7mfd4m5ykl", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.124-hardened1/linux-hardened-5.4.124-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 5880415876192..7c986259dff6d 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.234"; + version = "4.14.235"; # 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 = "1mwqb9sq6qd9angl3xysdsrfpgppf46g3kiwg1svqgpgrx7cqn1b"; + sha256 = "03k793hj294zf7jncs1h8zh5dh6xagkfvnydd9jadxvq2z8vvl8f"; }; 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 23d651e21da4f..3a31ad473cf8d 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.192"; + version = "4.19.193"; # 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 = "1680dz4wjg721a8lqwh6ijd90zcr2f3wzcvhwgn3shbwgjkwsk87"; + sha256 = "17ci49ak5iw01kfkn3fcgncg9hm4j188417bxi3bnsq9il5ymhl4"; }; 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 8320c2fb9ce64..9bc01eeff490a 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.270"; + version = "4.4.271"; extraMeta.branch = "4.4"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1lz48gv1v3wvw9xvd3y9q4py7ii1g9fj4dwyvvjdzbipyw7s21pq"; + sha256 = "0n5h2lv1p542a45pas3pi0vkhgrk096vwrps79a7v3a6c1q2dxx6"; }; 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 7dda6f5356dc6..4be4b6fb222a1 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.270"; + version = "4.9.271"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0ck5abzpla291gcxrxjindj5szgcvmb2fwfilvdnzc6pnqk00ay3"; + sha256 = "1480miixphkf0b8w00m753ar7yp1rnl3zyr9wp4inngi2f90553r"; }; 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 ae8f509530705..ec7b16f9f3f7e 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.40"; + version = "5.10.42"; # 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 = "091g9g29m4vh66bxihiylyprb3cxr8cy4m494klb2lkirlx8103l"; + sha256 = "1r86v6q7ml7zv001f25w3h667nqqy39439s94vnqsyyn7g3jg84b"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-5.11.nix b/pkgs/os-specific/linux/kernel/linux-5.11.nix deleted file mode 100644 index e6a8aef650b21..0000000000000 --- a/pkgs/os-specific/linux/kernel/linux-5.11.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: - -with lib; - -buildLinux (args // rec { - version = "5.11.22"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "003nlphkqish6l4xblhi369v4qv2zck7529prkdnx4gb2ihpq0hi"; - }; - - kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_11 ]; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.12.nix b/pkgs/os-specific/linux/kernel/linux-5.12.nix index 80a25ad23965a..85a69f0c5ad18 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.7"; + version = "5.12.9"; # 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 = "0ircrclggrbmm80vz7irhg73qvhjddsmf7zclw5cqnnmm3qfj8jk"; + sha256 = "0vg71h8r90fl01a8khyf1776y76rgqisxafky89cswa2fpsvxyn7"; }; 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 a245ee7c44ec1..4cf7c2bfafdef 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.122"; + version = "5.4.124"; # 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 = "00g6s3ymriwddshy5sd458b1wfvw2ynxv6dr63ziykwfq50jlr9p"; + sha256 = "10kxa1ng9w9xd2d5xh48fbhp1kri650p90nihrcpnb845gd9vwpp"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 6d1c733972004..2001b350eccc7 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18096"; - sha256 = "08m7afj0h9bcgg8rx8ksp85hmaqjl4k4p4q4zy6x51788xn4mycg"; + rev = "18115"; + sha256 = "00wsxlhz7lc4qk7jcgshb05hvv3mm4m8r3zalc9wvp4r1r6xbbjp"; } , ... }: diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index 4bc5cee4444f5..609dc494c69df 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.11.21"; + version = "5.12.9"; suffix = "lqx1"; in @@ -14,13 +14,13 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "1klvik8nrqsqi5ijnga1li4gacsknmap75g2zp8f3hd3hz18d5n1"; + sha256 = "sha256-qmX66nz+gVOt1RGsUT9fA3wPUT7I9Z4jhxpybP0I8Cw="; }; extraMeta = { - branch = "5.10/master"; + branch = "5.12/master"; maintainers = with lib.maintainers; [ atemu ]; description = linux_zen.meta.description + " (Same as linux_zen but less aggressive release schedule)"; }; -} // (args.argsOverride or {})) +} // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 90c0c4e29303b..5567022edccb7 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.35-rt39"; # updated by ./update-rt.sh + version = "5.10.41-rt42"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1zcqsjzqgcvlhkjwhzs6sxgbhzkfg898pbisivjqfymp8nfs2dxc"; + sha256 = "0wb739q7dha8nxkd72x42k4in5nw633yw065ppwc8rq7x2fpa17n"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "03gq9y111k4js4cc87yc9y7hyg1wxwbc1bjyjdvb4nrx2wqka79y"; + sha256 = "1z8jgsq5fkg486xxawg4c4wk1l9xra7x1cfqaf4grhw0csbbx883"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 34efc8e21ee9b..8592ad4c3b34e 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.115-rt57"; # updated by ./update-rt.sh + version = "5.4.123-rt59"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "1llxk04vlpi7a4ca2f5vlcxfn68n8yhmsar3hsl259i7hms28isv"; + sha256 = "1pi223dls52piw65s3v4ml23wdyy73xpbdvp511187b6zgzk7zlf"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1xh7xi27q58njhfayi2lnk4id7hnlklkgh2zx012gxv4ari76g0k"; + sha256 = "1m1mnmk7h35p7dv6mg3pla6pw3b645hbbccjmp1jc3fyn6qiy6fq"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index b28400819d53d..47e72a61c182b 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.11.16"; + version = "5.12.9"; suffix = "zen1"; in @@ -14,13 +14,13 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "0jyicnpqccn194jrm1mc4zq0cil7ls9l57ws3nv783vlk7b0k3gv"; + sha256 = "sha256-Sbe7pY/htLRRx5Qs78BpEzNCSIEsnZMj1+bkAftZdbQ="; }; extraMeta = { - branch = "5.10/master"; + branch = "5.12/master"; maintainers = with lib.maintainers; [ atemu andresilva ]; description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads."; }; -} // (args.argsOverride or {})) +} // (args.argsOverride or { })) diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index b94bd3128e4b1..b4def6f001ca1 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, kernel, bc }: stdenv.mkDerivation rec { - pname = "rtl8821ce-${kernel.version}"; - version = "unstable-2021-03-21"; + pname = "rtl8821ce"; + version = "${kernel.version}-unstable-2021-05-28"; src = fetchFromGitHub { owner = "tomaspinho"; repo = "rtl8821ce"; - rev = "897e7c4c15dd5a0a569745dc223d969a26ff5bfc"; - sha256 = "0935dzz0njxh78wfd17yqah1dxn6b3kaszvzclwwrwwhwcrdp80j"; + rev = "f93db734666f75ebf65e44ceb943c19b598b1647"; + sha256 = "sha256-cqXV52U+6Jl9Jje1nEOYDvmH4rgA1QdrwNCfYeul3hU="; }; hardeningDisable = [ "pic" ]; diff --git a/pkgs/os-specific/linux/veikk-linux-driver/default.nix b/pkgs/os-specific/linux/veikk-linux-driver/default.nix new file mode 100644 index 0000000000000..117103cdf28ac --- /dev/null +++ b/pkgs/os-specific/linux/veikk-linux-driver/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, kernel }: + +stdenv.mkDerivation rec { + pname = "veikk-linux-driver"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "jlam55555"; + repo = pname; + rev = "v${version}"; + sha256 = "11mg74ds58jwvdmi3i7c4chxs6v9g09r9ll22pc2kbxjdnrp8zrn"; + }; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + buildInputs = [ kernel ]; + + buildPhase = '' + make BUILD_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build + ''; + + installPhase = '' + mkdir -p $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/veikk + install -Dm755 veikk.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/veikk + ''; + + meta = with lib; { + description = "Linux driver for VEIKK-brand digitizers"; + homepage = "https://github.com/jlam55555/veikk-linux-driver/"; + license = licenses.gpl2Only; + platforms = platforms.linux; + maintainers = with maintainers; [ nicbk ]; + }; +} diff --git a/pkgs/servers/gemini/agate/default.nix b/pkgs/servers/gemini/agate/default.nix index 5585926da5816..faaef53f164e9 100644 --- a/pkgs/servers/gemini/agate/default.nix +++ b/pkgs/servers/gemini/agate/default.nix @@ -2,26 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "agate"; - version = "3.0.3"; + version = "3.1.0"; src = fetchFromGitHub { owner = "mbrubeck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0sh9OuX52kvhTt681uZesOUttrxH8ZMxn6mTILQDQuU="; + sha256 = "sha256-miIMz4Lk4R5So96Ceqe1Fl5ozpf47qWq0GgtKFDDCCA="; }; - cargoSha256 = "sha256-JBmSa2sc/eor0bCcIMhGGLmcJN+wCloP0Ao9DBybQbc="; + cargoSha256 = "sha256-NZpqCl37dZUvXmn4Q1Pvbz3LSxk1s0s5x1CBO0POA/4="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; - checkFlags = [ - # Username and Password use the same ports and causes collision - # https://github.com/mbrubeck/agate/issues/50 - "--skip username" - "--skip password" - ]; - doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck diff --git a/pkgs/servers/http/bozohttpd/default.nix b/pkgs/servers/http/bozohttpd/default.nix index c01be041e86f6..1574a953b174c 100644 --- a/pkgs/servers/http/bozohttpd/default.nix +++ b/pkgs/servers/http/bozohttpd/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ++ optional (stdenv.hostPlatform.libc != "libSystem") "-lcrypt" ++ optional (luaSupport) "-llua" ++ optionals (sslSupport) [ "-lssl" "-lcrypto" ]; - makeFlags = [ "LDADD=$(_LDADD)" "prefix=$(out)" "MANDIR=$(out)/share/man" "BINOWN=" ]; + makeFlags = [ "LDADD=$(_LDADD)" ]; doCheck = true; checkInputs = [ inetutils wget ]; diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index 57c0e22d8affe..d26782560a470 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -3,7 +3,9 @@ , fetchFromGitHub , stdenv , cmake +, gn , go +, jdk , ninja , python3 , nixosTests @@ -15,8 +17,8 @@ let # However, the version string is more useful for end-users. # These are contained in a attrset of their own to make it obvious that # people should update both. - version = "1.16.2"; - commit = "e98e41a8e168af7acae8079fc0cd68155f699aa3"; + version = "1.17.3"; + commit = "46bf743b97d0d3f01ff437b2f10cc0bd9cdfe6e4"; }; in buildBazelPackage rec { @@ -26,7 +28,7 @@ buildBazelPackage rec { owner = "envoyproxy"; repo = "envoy"; rev = srcVer.commit; - hash = "sha256-aWVMRKFCZzf9/96NRPCP4jiW38DJhXyi0gEqW7uIpnQ="; + hash = "sha256:09zzr4h3zjsb2rkxrvlazpx0jy33yn9j65ilxiqbvv0ckaralqfc"; extraPostFetch = '' chmod -R +w $out @@ -36,29 +38,29 @@ buildBazelPackage rec { ''; }; - patches = [ - # Quiche needs to be updated to compile under newer GCC. - # This is a manual backport of https://github.com/envoyproxy/envoy/pull/13949. - ./0001-quiche-update-QUICHE-tar-13949.patch - - # upb needs to be updated to compile under newer GCC. - # This is a manual backport of https://github.com/protocolbuffers/upb/commit/9bd23dab4240b015321a53c45b3c9e4847fbf020. - ./0002-Add-upb-patch-to-make-it-compile-under-GCC10.patch - ]; postPatch = '' sed -i 's,#!/usr/bin/env python3,#!${python3}/bin/python,' bazel/foreign_cc/luajit.patch + sed -i '/javabase=/d' .bazelrc + # Patch paths to build tools, and disable gold because it just segfaults. + substituteInPlace bazel/external/wee8.genrule_cmd \ + --replace '"''$$gn"' '"''$$(command -v gn)"' \ + --replace '"''$$ninja"' '"''$$(command -v ninja)"' \ + --replace '"''$$WEE8_BUILD_ARGS"' '"''$$WEE8_BUILD_ARGS use_gold=false"' ''; nativeBuildInputs = [ cmake python3 + gn go + jdk ninja ]; fetchAttrs = { - sha256 = "0q72c2zrl5vc8afkhkwyalb2h0mxn3133d4b9z4gag0p95wbwgc0"; + sha256 = "sha256:1cy2b73x8jzczq9z9c1kl7zrg5iasvsakb50zxn4mswpmajkbj5h"; dontUseCmakeConfigure = true; + dontUseGnConfigure = true; preInstall = '' # Strip out the path to the build location (by deleting the comment line). find $bazelOut/external -name requirements.bzl | while read requirements; do @@ -78,10 +80,14 @@ buildBazelPackage rec { >$bazelOut/external/config_validation_pip3/PyYAML-5.3.1-cp38-cp38-linux_x86_64.whl >$bazelOut/external/protodoc_pip3/PyYAML-5.3.1-cp38-cp38-linux_x86_64.whl >$bazelOut/external/thrift_pip3/thrift-0.13.0-cp38-cp38-linux_x86_64.whl + + # Remove Unix timestamps from go cache. + rm -rf $bazelOut/external/bazel_gazelle_go_repository_cache/{gocache,pkg/mod/cache,pkg/sumdb} ''; }; buildAttrs = { dontUseCmakeConfigure = true; + dontUseGnConfigure = true; dontUseNinjaInstall = true; preConfigure = '' sed -i 's,#!/usr/bin/env bash,#!${stdenv.shell},' $bazelOut/external/rules_foreign_cc/tools/build_defs/framework.bzl @@ -98,7 +104,6 @@ buildBazelPackage rec { ''; }; - fetchConfigured = true; removeRulesCC = false; removeLocalConfigCc = true; removeLocal = false; diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/servers/http/pomerium/default.nix index 0605a12eca470..036e44ca621e0 100644 --- a/pkgs/servers/http/pomerium/default.nix +++ b/pkgs/servers/http/pomerium/default.nix @@ -11,15 +11,15 @@ let in buildGoModule rec { pname = "pomerium"; - version = "0.13.3"; + version = "0.14.4"; src = fetchFromGitHub { owner = "pomerium"; repo = "pomerium"; rev = "v${version}"; - hash = "sha256-g0w1aIHvf2rJANvGWHeUxdnyCDsvy/PQ9Kp8nDdT/0w="; + hash = "sha256:097csr8f43cn0iq030ajvvpwnwcfmjxyyk6pcisdy937axlrzska"; }; - vendorSha256 = "sha256-grihU85OcGyf9/KKrv87xZonX5r+Z1oHQTf84Ya61fg="; + vendorSha256 = "sha256:0n45xvwjiqyh41dsm4z1rnkgkycf5wfmacm804hqnd5rz7xk2shf"; subPackages = [ "cmd/pomerium" "cmd/pomerium-cli" diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index db9041574fca6..4387542e5af0b 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -65,5 +65,8 @@ stdenv.mkDerivation rec { description = "Enterprise-class Open Source LDAP server for Linux"; license = licenses.gpl3Plus; platforms = platforms.linux; + knownVulnerabilities = [ + "CVE-2021-3514" # https://nvd.nist.gov/vuln/detail/CVE-2021-3514 + ]; }; } diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index c747e5266a050..450e454374f0f 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.27.0"; + version = "2.28.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-Ofg+z8wUttqM1THatPFi0cuyLSEryhTmg3JC1o+16eA="; + sha256 = "sha256-AlAfs1wi3hS7cqAtGqfUgv5CIonu7TmXWgxL1zSBh54="; }; vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY="; diff --git a/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/pkgs/servers/monitoring/grafana-image-renderer/default.nix index 27013c2a7787a..fab8d4b0096bb 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -10,13 +10,13 @@ mkYarnPackage rec { name = "grafana-image-renderer"; - version = "2.1.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; rev = "v${version}"; - sha256 = "sha256-loWLbeu8h0fhMcUzmeYVSw4x6R0GVfqwb/vHwCNT/fM="; + sha256 = "sha256-wg+cMAMqj4JORh5LPJnNELgsJYAxVgz2YPOl87WWda4="; }; buildPhase = '' diff --git a/pkgs/servers/monitoring/grafana-image-renderer/package.json b/pkgs/servers/monitoring/grafana-image-renderer/package.json index 36f9a3297692f..c1db7f861816e 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/package.json +++ b/pkgs/servers/monitoring/grafana-image-renderer/package.json @@ -21,6 +21,7 @@ "@grpc/grpc-js": "^1.0", "@grpc/proto-loader": "^0.5.4", "@hapi/boom": "^9.1.0", + "chokidar": "^3.5.1", "eslint": "^7.13.0", "express": "^4.16.3", "express-prom-bundle": "^5.1.5", diff --git a/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock b/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock index cf769ed5920bb..80fd4569e6913 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock +++ b/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock @@ -373,6 +373,14 @@ any-observable@^0.3.0: resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b" integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog== +anymatch@~3.1.1: + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== + dependencies: + normalize-path "^3.0.0" + picomatch "^2.0.4" + aproba@^1.0.3: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" @@ -442,6 +450,11 @@ basic-auth@~2.0.1: dependencies: safe-buffer "5.1.2" +binary-extensions@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" + integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== + bintrees@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.1.tgz#0e655c9b9c2435eaab68bf4027226d2b55a34524" @@ -480,7 +493,7 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -braces@^3.0.1: +braces@^3.0.1, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== @@ -557,6 +570,21 @@ chalk@^4.0.0, chalk@^4.1.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +chokidar@^3.5.1: + version "3.5.1" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" + integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== + dependencies: + anymatch "~3.1.1" + braces "~3.0.2" + glob-parent "~5.1.0" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.5.0" + optionalDependencies: + fsevents "~2.3.1" + chownr@^1.1.1: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" @@ -1281,6 +1309,11 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= +fsevents@~2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" + integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== + function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -1327,7 +1360,7 @@ github-from-package@0.0.0: resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce" integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4= -glob-parent@^5.0.0, glob-parent@^5.1.0: +glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -1570,6 +1603,13 @@ is-arrayish@^0.3.1: resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== +is-binary-path@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" + integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== + dependencies: + binary-extensions "^2.0.0" + is-core-module@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887" @@ -1604,7 +1644,7 @@ is-fullwidth-code-point@^3.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== -is-glob@^4.0.0, is-glob@^4.0.1: +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== @@ -2046,7 +2086,7 @@ noop-logger@^0.1.1: resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2" integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI= -normalize-path@^3.0.0: +normalize-path@^3.0.0, normalize-path@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== @@ -2229,9 +2269,9 @@ path-key@^3.0.0, path-key@^3.1.0: integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== path-parse@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" - integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== path-to-regexp@0.1.7: version "0.1.7" @@ -2255,7 +2295,7 @@ pend@~1.2.0: resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA= -picomatch@^2.2.1, picomatch@^2.2.3: +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d" integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg== @@ -2492,6 +2532,13 @@ readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: string_decoder "^1.1.1" util-deprecate "^1.0.1" +readdirp@~3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" + integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== + dependencies: + picomatch "^2.2.1" + regexpp@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" @@ -3129,9 +3176,9 @@ wrappy@1: integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= ws@^7.2.3: - version "7.4.5" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1" - integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g== + version "7.4.6" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" + integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== y18n@^5.0.5: version "5.0.8" diff --git a/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix b/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix index 53fbca36c22b1..7eb3a3bb8a767 100644 --- a/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix +++ b/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix @@ -458,6 +458,14 @@ }; } { + name = "anymatch___anymatch_3.1.2.tgz"; + path = fetchurl { + name = "anymatch___anymatch_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz"; + sha1 = "c0557c096af32f106198f4f4e2a383537e378716"; + }; + } + { name = "aproba___aproba_1.2.0.tgz"; path = fetchurl { name = "aproba___aproba_1.2.0.tgz"; @@ -554,6 +562,14 @@ }; } { + name = "binary_extensions___binary_extensions_2.2.0.tgz"; + path = fetchurl { + name = "binary_extensions___binary_extensions_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz"; + sha1 = "75f502eeaf9ffde42fc98829645be4ea76bd9e2d"; + }; + } + { name = "bintrees___bintrees_1.0.1.tgz"; path = fetchurl { name = "bintrees___bintrees_1.0.1.tgz"; @@ -674,6 +690,14 @@ }; } { + name = "chokidar___chokidar_3.5.1.tgz"; + path = fetchurl { + name = "chokidar___chokidar_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz"; + sha1 = "ee9ce7bbebd2b79f49f304799d5468e31e14e68a"; + }; + } + { name = "chownr___chownr_1.1.4.tgz"; path = fetchurl { name = "chownr___chownr_1.1.4.tgz"; @@ -1474,6 +1498,14 @@ }; } { + name = "fsevents___fsevents_2.3.2.tgz"; + path = fetchurl { + name = "fsevents___fsevents_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz"; + sha1 = "8a526f78b8fdf4623b709e0b975c52c24c02fd1a"; + }; + } + { name = "function_bind___function_bind_1.1.1.tgz"; path = fetchurl { name = "function_bind___function_bind_1.1.1.tgz"; @@ -1802,6 +1834,14 @@ }; } { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + path = fetchurl { + name = "is_binary_path___is_binary_path_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha1 = "ea1f7f3b80f064236e83470f86c09c254fb45b09"; + }; + } + { name = "is_core_module___is_core_module_2.3.0.tgz"; path = fetchurl { name = "is_core_module___is_core_module_2.3.0.tgz"; @@ -2626,11 +2666,11 @@ }; } { - name = "path_parse___path_parse_1.0.6.tgz"; + name = "path_parse___path_parse_1.0.7.tgz"; path = fetchurl { - name = "path_parse___path_parse_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz"; - sha1 = "d62dbb5679405d72c4737ec58600e9ddcf06d24c"; + name = "path_parse___path_parse_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz"; + sha1 = "fbc114b60ca42b30d9daf5858e4bd68bbedb6735"; }; } { @@ -2882,6 +2922,14 @@ }; } { + name = "readdirp___readdirp_3.5.0.tgz"; + path = fetchurl { + name = "readdirp___readdirp_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz"; + sha1 = "9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"; + }; + } + { name = "regexpp___regexpp_3.1.0.tgz"; path = fetchurl { name = "regexpp___regexpp_3.1.0.tgz"; @@ -3658,11 +3706,11 @@ }; } { - name = "ws___ws_7.4.5.tgz"; + name = "ws___ws_7.4.6.tgz"; path = fetchurl { - name = "ws___ws_7.4.5.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz"; - sha1 = "a484dd851e9beb6fdb420027e3885e8ce48986c1"; + name = "ws___ws_7.4.6.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz"; + sha1 = "5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"; }; } { diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 89e49671d8662..24bb3633caea0 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "7.5.7"; + version = "8.0.0"; excludedPackages = [ "release_publisher" ]; @@ -10,32 +10,32 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-GTQK02zxOBTE+93vT0zLMhAeZ7F3Cq/0lbvbzwB2QZA="; + sha256 = "sha256-HtubiSx4Orf9knZcuYy4eF2qwclX/JVd2Ba9L33tM74="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-IQ7aAuUrNa+bSh5ld6IttujM8AgKUSlu8H7pwzDi164="; + sha256 = "sha256-bwBpkPy4kwfnkRsLOktUgQx+Sm8WJA2d65efMBCnGp4="; }; - vendorSha256 = "sha256-AsPRaRLomp090XAKLXLXKm40ESPO4im9qi6VLpLYRQU="; + vendorSha256 = "sha256-Hon5WrhXUvZUtMRxx3XcBDQe3rkRkfqbnXjY3xCzuuM="; - # grafana-aws-sdk is specified with two versions which causes a problem later: - # go: inconsistent vendoring in /build/source: - # github.com/grafana/grafana-aws-sdk@v0.3.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt - # Remove the older one here to fix this. - postPatch = '' - substituteInPlace go.mod \ - --replace 'github.com/grafana/grafana-aws-sdk v0.3.0' "" - - substituteInPlace pkg/cmd/grafana-server/main.go \ - --replace 'var version = "5.0.0"' 'var version = "${version}"' - ''; - - # main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/scripts/go - # main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/dashboard-schemas preBuild = '' - rm -r dashboard-schemas scripts/go + # The testcase makes an API call against grafana.com: + # + # --- Expected + # +++ Actual + # @@ -1,4 +1,4 @@ + # (map[string]interface {}) (len=2) { + # - (string) (len=5) "error": (string) (len=16) "plugin not found", + # - (string) (len=7) "message": (string) (len=16) "Plugin not found" + # + (string) (len=5) "error": (string) (len=171) "Failed to send request: Get \"https://grafana.com/api/plugins/repo/test\": dial tcp: lookup grafana.com on [::1]:53: read udp [::1]:48019->[::1]:53: read: connection refused", + # + (string) (len=7) "message": (string) (len=24) "Failed to install plugin" + # } + sed -ie '/func TestPluginInstallAccess/a t.Skip();' pkg/tests/api/plugins/api_install_test.go + + # main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/scripts/go + rm -r scripts/go ''; postInstall = '' diff --git a/pkgs/servers/openafs/1.9/srcs.nix b/pkgs/servers/openafs/1.9/srcs.nix index 8c5f63cac1110..853cd2aabad9e 100644 --- a/pkgs/servers/openafs/1.9/srcs.nix +++ b/pkgs/servers/openafs/1.9/srcs.nix @@ -1,14 +1,14 @@ { fetchurl }: rec { - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "1jw99zwisq25l0smdm8f0gfwhynk532s2ch44blrvxyd7all8kcd"; + sha256 = "sha256-7rHihVR4VobHAzt0ZALFOLJnlfd1Qwsa5ohpRFWBPbw="; }; srcs = [ src (fetchurl { url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; - sha256 = "03x1pv8l4bv2fdns1l4sfy200nggy0a4b1f7qd0mnggdaj12c4jp"; + sha256 = "sha256-pvF8CdTl+5DNuymNvhb3UrGW05LcXRv8cZp2QQlXF+E="; })]; } diff --git a/pkgs/servers/reproxy/default.nix b/pkgs/servers/reproxy/default.nix index 6c1be8f34c4c7..0d25b4267838d 100644 --- a/pkgs/servers/reproxy/default.nix +++ b/pkgs/servers/reproxy/default.nix @@ -2,19 +2,21 @@ buildGoModule rec { pname = "reproxy"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "umputun"; repo = pname; rev = "v${version}"; - hash = "sha256-TwqfnOKWpFC3fnHNu3/F6KLHuzE7uF6WEgZOArntpWI="; + hash = "sha256-zwQZr6BbvJ2Ol5pCLkZ49j0j5KWTK0N8BybvTr8PPeg="; }; postPatch = '' # Requires network access substituteInPlace app/main_test.go \ --replace "Test_Main" "Skip_Main" + substituteInPlace app/proxy/proxy_test.go \ + --replace "TestHttp_matchHandler" "SkipHttp_matchHandler" '' + lib.optionalString stdenv.isDarwin '' # Fails on Darwin. # https://github.com/umputun/reproxy/issues/77 diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 63446a684b256..933ff6292e839 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -240,4 +240,13 @@ in self: { thisAttr = "postgresql_13"; inherit self; }; + + postgresql_14 = self.callPackage generic { + version = "14beta1"; + psqlSchema = "14"; + sha256 = "0lih2iykychhvis3mxqyp087m1hld3lyi48n3qwd2js44prxv464"; + this = self.postgresql_14; + thisAttr = "postgresql_14"; + inherit self; + }; } diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index aeaa4409aa757..0cca27a6be9d1 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -52,7 +52,7 @@ in rec { }; unifi6 = generic { - version = "6.1.71"; - sha256 = "1lvsq0xpfgwpbzs25khy7bnrhv8i1jgzi8ij75bsh65hfa3rplc2"; + version = "6.2.25"; + sha256 = "14pfy9cxjyaczdp9lk56by8s5485sjsz2414x7wshf1x76yfjh27"; }; } diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index d3e2c6534aa22..88451979cbb6a 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zsh-prezto"; - version = "unstable-2021-01-19"; + version = "unstable-2021-06-02"; src = fetchFromGitHub { owner = "sorin-ionescu"; repo = "prezto"; - rev = "704fc46c3f83ca1055becce65fb513a533f48982"; - sha256 = "0rkbx6hllf6w6x64mggbhvm1fvbq5sr5kvf06sarfkpz5l0a5wh3"; + rev = "6833fcd2f2afbc7396ea7a5fa9eb3b49f4678242"; + sha256 = "1a8gndj1f8sjnq7clc742lm4qyhp1a2zid6g6lmfr1axhcbn38v6"; fetchSubmodules = true; }; diff --git a/pkgs/stdenv/darwin/fixed-xnu-python3.patch b/pkgs/stdenv/darwin/fixed-xnu-python3.patch new file mode 100644 index 0000000000000..9f29376187f4c --- /dev/null +++ b/pkgs/stdenv/darwin/fixed-xnu-python3.patch @@ -0,0 +1,41 @@ +diff --git a/bsd/kern/makekdebugevents.py b/bsd/kern/makekdebugevents.py +index 73b2db4..d354ba0 100755 +--- a/bsd/kern/makekdebugevents.py ++++ b/bsd/kern/makekdebugevents.py +@@ -5,7 +5,7 @@ + # named kd_events[] or these mappings. + # Required to generate a header file used by DEVELOPMENT and DEBUG kernels. + # +- ++ + import sys + import re + +@@ -21,18 +21,18 @@ code_table = [] + # scan file to generate internal table + with open(trace_code_file, 'rt') as codes: + for line in codes: +- m = id_name_pattern.match(line) +- if m: ++ m = id_name_pattern.match(line) ++ if m: + code_table += [(int(m.group(1),base=16), m.group(2))] + + # emit typedef: +-print "typedef struct {" +-print " uint32_t id;" +-print " const char *name;" +-print "} kd_event_t;" ++print("typedef struct {") ++print(" uint32_t id;") ++print(" const char *name;") ++print("} kd_event_t;") + # emit structure declaration and sorted initialization: +-print "kd_event_t kd_events[] = {" ++print("kd_event_t kd_events[] = {") + for mapping in sorted(code_table, key=lambda x: x[0]): +- print " {0x%x, \"%s\"}," % mapping +-print "};" ++ print(" {0x%x, \"%s\"}," % mapping) ++print("};") + diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 3af444a2e52c3..08b4372a0a114 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -1,14 +1,20 @@ -{ pkgspath ? ../../.., test-pkgspath ? pkgspath, system ? builtins.currentSystem, crossSystem ? null }: +{ pkgspath ? ../../.., test-pkgspath ? pkgspath +, system ? builtins.currentSystem, crossSystem ? null, bootstrapFiles ? null +}: + +let cross = if crossSystem != null + then { inherit crossSystem; } + else {}; + custom-bootstrap = if bootstrapFiles != null + then { stdenvStages = args: + let args' = args // { bootstrapFiles = bootstrapFiles; }; + in (import "${pkgspath}/pkgs/stdenv/darwin" args').stagesDarwin; + } + else {}; +in with import pkgspath ({ inherit system; } // cross // custom-bootstrap); let - pkgs = import pkgspath ({ inherit system; } // (if (crossSystem != null) then { inherit crossSystem; } else {})); -in - -with pkgs; - -let - llvmPackageSet = if stdenv.hostPlatform.isAarch64 then "llvmPackages_11" else "llvmPackages_7"; - llvmPackages = pkgs."${llvmPackageSet}"; + llvmPackages = llvmPackages_11; storePrefixLen = builtins.stringLength builtins.storeDir; in rec { coreutils_ = coreutils.override (args: { @@ -26,6 +32,50 @@ in rec { # Avoid messing with libkrb5 and libnghttp2. curl_ = curlMinimal.override (args: { gssSupport = false; http2Support = false; }); + # Avoid stdenv rebuild. + Libsystem_ = (darwin.Libsystem.override (args: + { xnu = darwin.xnu.overrideAttrs (oldAttrs: + { patches = [ ./fixed-xnu-python3.patch ]; }); + })).overrideAttrs (oldAttrs: + { installPhase = oldAttrs.installPhase + '' + cat <<EOF > $out/include/TargetConditionals.h + #ifndef __TARGETCONDITIONALS__ + #define __TARGETCONDITIONALS__ + #define TARGET_OS_MAC 1 + #define TARGET_OS_WIN32 0 + #define TARGET_OS_UNIX 0 + #define TARGET_OS_OSX 1 + #define TARGET_OS_IPHONE 0 + #define TARGET_OS_IOS 0 + #define TARGET_OS_WATCH 0 + #define TARGET_OS_BRIDGE 0 + #define TARGET_OS_TV 0 + #define TARGET_OS_SIMULATOR 0 + #define TARGET_OS_EMBEDDED 0 + #define TARGET_OS_EMBEDDED_OTHER 0 /* Used in configd */ + #define TARGET_IPHONE_SIMULATOR TARGET_OS_SIMULATOR /* deprecated */ + #define TARGET_OS_NANO TARGET_OS_WATCH /* deprecated */ + + #define TARGET_CPU_PPC 0 + #define TARGET_CPU_PPC64 0 + #define TARGET_CPU_68K 0 + #define TARGET_CPU_X86 0 + #define TARGET_CPU_X86_64 1 + #define TARGET_CPU_ARM 0 + #define TARGET_CPU_ARM64 0 + #define TARGET_CPU_MIPS 0 + #define TARGET_CPU_SPARC 0 + #define TARGET_CPU_ALPHA 0 + #define TARGET_RT_MAC_CFM 0 + #define TARGET_RT_MAC_MACHO 1 + #define TARGET_RT_LITTLE_ENDIAN 1 + #define TARGET_RT_BIG_ENDIAN 0 + #define TARGET_RT_64_BIT 1 + #endif /* __TARGETCONDITIONALS__ */ + EOF + ''; + }); + build = stdenv.mkDerivation { name = "stdenv-bootstrap-tools"; @@ -37,12 +87,12 @@ in rec { ${lib.optionalString stdenv.targetPlatform.isx86_64 '' # Copy libSystem's .o files for various low-level boot stuff. - cp -d ${darwin.Libsystem}/lib/*.o $out/lib + cp -d ${Libsystem_}/lib/*.o $out/lib # Resolv is actually a link to another package, so let's copy it properly - cp -L ${darwin.Libsystem}/lib/libresolv.9.dylib $out/lib + cp -L ${Libsystem_}/lib/libresolv.9.dylib $out/lib - cp -rL ${darwin.Libsystem}/include $out + cp -rL ${Libsystem_}/include $out chmod -R u+w $out/include cp -rL ${darwin.ICU}/include* $out/include cp -rL ${libiconv}/include/* $out/include diff --git a/pkgs/tools/X11/opentabletdriver/default.nix b/pkgs/tools/X11/opentabletdriver/default.nix index 5128e4d30ca54..2d1ce4a4e33f0 100644 --- a/pkgs/tools/X11/opentabletdriver/default.nix +++ b/pkgs/tools/X11/opentabletdriver/default.nix @@ -23,18 +23,18 @@ stdenv.mkDerivation rec { pname = "OpenTabletDriver"; - version = "0.5.3.1"; + version = "0.5.3.2"; src = fetchFromGitHub { owner = "InfinityGhost"; repo = "OpenTabletDriver"; rev = "v${version}"; - sha256 = "OT8/c+6wNpZyq/q7uMxIqmyJKNAq0B4ynEAqFF0GWyo="; + sha256 = "qRc/9Edp3x7/XVEWgBbPush76MSQz4biYSk+E9Gt68w="; }; debPkg = fetchurl { url = "https://github.com/InfinityGhost/OpenTabletDriver/releases/download/v${version}/OpenTabletDriver.deb"; - sha256 = "0nm0v1xhphl6g6rz3li4rbdp7408g6sf9l4nh3mbbif5042xa0qh"; + sha256 = "14k06iyc642x42yadyfmmf8ky84y8rc6kgd63b4ipskkcxyl1gvl"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/X11/opentabletdriver/deps.nix b/pkgs/tools/X11/opentabletdriver/deps.nix index 041795596b1f0..45ded855587a1 100644 --- a/pkgs/tools/X11/opentabletdriver/deps.nix +++ b/pkgs/tools/X11/opentabletdriver/deps.nix @@ -1,13 +1,13 @@ { fetchNuGet }: [ (fetchNuGet { name = "AtkSharp"; - version = "3.22.25.74"; - sha256 = "04zjpjrddw5clac0mjpk0q00rbmv45bh1bsqa4s3pc5pb7fm9cd9"; + version = "3.24.24.34"; + sha256 = "1jn1vgi9xm0jp7769k6sbdi8d273kigjrsh93i6s4c03hqxv7cqs"; }) (fetchNuGet { name = "CairoSharp"; - version = "3.22.25.74"; - sha256 = "0sx7vmwcrfbkg3g887v051iklcdmdhh43ndp96nk4bccjimmmwl6"; + version = "3.24.24.34"; + sha256 = "0pydn1k0cam1gclg9sc1sbnmbyzh28qlc5qanyxcylwghink3kgz"; }) (fetchNuGet { name = "Eto.Forms"; @@ -15,29 +15,34 @@ sha256 = "1d71wglk4ixfqfbm6sxmj753x5iwbar8i9zzjy3bh64fy1dn8lz7"; }) (fetchNuGet { + name = "Eto.Forms"; + version = "2.5.11"; + sha256 = "0h86jc19wy3ssj7pb34w1h02v92mg29gdipszwjs3y15piy66z3s"; + }) + (fetchNuGet { name = "Eto.Platform.Gtk"; - version = "2.5.10"; - sha256 = "1pkqvlfx7bzracnw19bl50i9jg4ym376vihmy9qq7m5z5nfdqn4g"; + version = "2.5.11"; + sha256 = "1s9njz7l9zghrbzli7lbiav5ss3glqf17npj07f3jldd933nb95j"; }) (fetchNuGet { name = "GdkSharp"; - version = "3.22.25.74"; - sha256 = "07sdfvqk2jmyjj7fyd0mikhnzsk52zd3g2dhip8kz3006cczqm81"; + version = "3.24.24.34"; + sha256 = "0r0x0yib7chwsyrbpvicrfwldwqx5lyqq4p86zaxpmzd6zdaj0x5"; }) (fetchNuGet { name = "GioSharp"; - version = "3.22.25.74"; - sha256 = "01l4216bm5jxbxypkkq4d2527c6zd68kbywr3h1lr1darc9nf1d1"; + version = "3.24.24.34"; + sha256 = "02hxvgjd4w9jpzbkk7qf9q9bkvyp5hfzwxfqp10vg5lpl9yl3xpx"; }) (fetchNuGet { name = "GLibSharp"; - version = "3.22.25.74"; - sha256 = "0k2p79z4wcswi528v0ykc37rsqfqi6xd6pl0j4csdj9zf19svgx2"; + version = "3.24.24.34"; + sha256 = "0kvp033fgdwc8p2abfp5z9pzq66cvwbnjfvr4v4bkpy5s5h181kq"; }) (fetchNuGet { name = "GtkSharp"; - version = "3.22.25.74"; - sha256 = "0vazfvkjyzppcynqa1h70s1jmp4vq2j30v5x2scg8n2c5dxaj0k3"; + version = "3.24.24.34"; + sha256 = "0028hzmmqyfx87qqmaf9cgb5psn7gkbmqvixcid67x1d6mzxjicb"; }) (fetchNuGet { name = "HidSharpCore"; @@ -126,8 +131,8 @@ }) (fetchNuGet { name = "PangoSharp"; - version = "3.22.25.74"; - sha256 = "172i1hjpz4rgqlilir8a57kgmciw9x0shz4zwbhhlr59mndvqbih"; + version = "3.24.24.34"; + sha256 = "1r0h14cklglfpv1lhv93cxmzi2w7d5s03gzpq3j5dmrz43flg9zw"; }) (fetchNuGet { name = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix index 8396540cd2762..4a26603a13412 100644 --- a/pkgs/tools/admin/chamber/default.nix +++ b/pkgs/tools/admin/chamber/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "chamber"; - version = "2.10.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "4G/QGoztpcLIspHxD5G+obG5h05SZek4keOJ5qS3/zg="; + sha256 = "sha256-nIIoU+iz2uOglNaqGIhQ2kUjpFOyOx+flXXwu02UG6Y="; }; CGO_ENABLED = 0; - vendorSha256 = "XpLLolxWu9aMp1cyG4dUQk4YtknbIRMmBUdSeyY4PNk="; + vendorSha256 = "sha256-XpLLolxWu9aMp1cyG4dUQk4YtknbIRMmBUdSeyY4PNk="; buildFlagsArray = [ "-ldflags=-s -w -X main.Version=v${version}" ]; diff --git a/pkgs/tools/compression/flips/default.nix b/pkgs/tools/compression/flips/default.nix index e99f3fec163ef..b4a79aac21278 100644 --- a/pkgs/tools/compression/flips/default.nix +++ b/pkgs/tools/compression/flips/default.nix @@ -2,20 +2,24 @@ stdenv.mkDerivation { pname = "flips"; - version = "unstable-2020-10-02"; + version = "unstable-2021-05-18"; src = fetchFromGitHub { owner = "Alcaro"; repo = "Flips"; - rev = "5a3d2012b8ea53ae777c24b8ac4edb9a6bdb9761"; - sha256 = "1ksh9j1n5z8b78yd7gjxswndsqnb1azp84xk4rc0p7zq127l0fyy"; + rev = "3476e5e46fc6f10df475f0cad1714358ba04c756"; + sha256 = "0s13qrmqfmlb2vy0smpgw39vjkl8vzsmpzk52jnc9r7b4hisii39"; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ gtk3 libdivsufsort ]; patches = [ ./use-system-libdivsufsort.patch ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; - buildPhase = "./make.sh"; + buildPhase = '' + runHook preBuild + ./make.sh + runHook postBuild + ''; meta = with lib; { description = "A patcher for IPS and BPS files"; diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix index 7ba27208fe880..c82ea23debd90 100644 --- a/pkgs/tools/filesystems/bees/default.nix +++ b/pkgs/tools/filesystems/bees/default.nix @@ -1,26 +1,35 @@ -{ lib, stdenv, runCommand, fetchFromGitHub, bash, btrfs-progs, coreutils -, python3Packages, util-linux, nixosTests }: +{ lib +, stdenv +, runCommand +, fetchFromGitHub +, bash +, btrfs-progs +, coreutils +, python3Packages +, util-linux +, nixosTests +}: let bees = stdenv.mkDerivation rec { pname = "bees"; - version = "0.6.3"; + version = "0.6.5"; src = fetchFromGitHub { owner = "Zygo"; repo = "bees"; rev = "v${version}"; - sha256 = "sha256-brEjr7lhmKDCIDeLq+XP+ZTxv1RvwoUlszMSEYygxv8="; + sha256 = "11ppbf23b8ngzfy02am0skxlybzmgsp6kna21jimb01x9pp1q7l7"; }; buildInputs = [ - btrfs-progs # for btrfs/ioctl.h - util-linux # for uuid.h + btrfs-progs # for btrfs/ioctl.h + util-linux # for uuid.h ]; nativeBuildInputs = [ - python3Packages.markdown # documentation build + python3Packages.markdown # documentation build ]; preBuild = '' @@ -56,11 +65,12 @@ let in -(runCommand "bees-service" { - inherit bash bees coreutils; - utillinux = util-linux; # needs to be a valid shell variable name - btrfsProgs = btrfs-progs; # needs to be a valid shell variable name -} '' +(runCommand "bees-service" + { + inherit bash bees coreutils; + utillinux = util-linux; # needs to be a valid shell variable name + btrfsProgs = btrfs-progs; # needs to be a valid shell variable name + } '' mkdir -p -- "$out/bin" substituteAll ${./bees-service-wrapper} "$out"/bin/bees-service-wrapper chmod +x "$out"/bin/bees-service-wrapper diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index b8b330c129a0a..c2e022ca4bde7 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -1,28 +1,42 @@ { lib +, stdenv , buildGoModule , fetchFromGitHub , openssl , pandoc , pkg-config +, libfido2 }: +let + # pandoc is currently broken on aarch64-darwin + # because of missing ghc + brokenPandoc = stdenv.isDarwin && stdenv.isAarch64; +in + buildGoModule rec { pname = "gocryptfs"; - version = "1.8.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "rfjakob"; repo = pname; rev = "v${version}"; - sha256 = "1acalwrr5xqhpqca3gypj0s68w6vpckxmg5z5gfgh8wx6nqx4aw9"; + sha256 = "0wiagmym8mwi0vpvrs5ryn3zjwha8ilh7xkavvkd1gqd5laln0kp"; }; - runVend = true; - vendorSha256 = "0z3y51sgr1rmr23jpc5h5d5lw14p3qzv48rc7zj7qa4rd5cfhsgi"; + vendorSha256 = "10az8n7z4rhsk1af2x6v3pmxg4zp7c9cal35ily8bdzzcb9cpgs0"; + + nativeBuildInputs = [ + pkg-config + ] ++ lib.optionals (!brokenPandoc) [ + pandoc + ]; - nativeBuildInputs = [ pandoc pkg-config ]; buildInputs = [ openssl ]; + propagatedBuildInputs = [ libfido2 ]; + buildFlagsArray = '' -ldflags= -X main.GitVersion=${version} @@ -32,9 +46,10 @@ buildGoModule rec { subPackages = [ "." "gocryptfs-xray" "contrib/statfs" ]; - postBuild = '' + postBuild = lib.optionalString (!brokenPandoc) '' pushd Documentation/ mkdir -p $out/share/man/man1 + # taken from Documentation/MANPAGE-render.bash pandoc MANPAGE.md -s -t man -o $out/share/man/man1/gocryptfs.1 pandoc MANPAGE-XRAY.md -s -t man -o $out/share/man/man1/gocryptfs-xray.1 pandoc MANPAGE-STATFS.md -s -t man -o $out/share/man/man1/statfs.1 diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index e575bd3e13853..879199347bd18 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -22,7 +22,7 @@ in if stdenv.isDarwin then } else mkSSHFS { - version = "3.7.1"; - sha256 = "088mgcsqv9f2vly4xn6lvvkmqkgr9jjmjs9qp8938hl7j6rrgd17"; + version = "3.7.2"; + sha256 = "0i0ycgwdxja8313hlkrlwrl85a4ykkyqddgg484jkr4rnr7ylk8w"; platforms = lib.platforms.linux; } diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 806b03061c745..6429448125775 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -1,23 +1,55 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libjpeg, libpng, xorg, libX11, libGL, libdrm, - python27, wayland, udev, mesa, wafHook }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, makeWrapper +, libjpeg +, libpng +, xorg +, libX11 +, libGL +, libdrm +, udev +, python3 +, wayland +, wayland-protocols +, mesa +, wafHook +}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "glmark2"; - version = "2017-09-01"; + version = "2021.02"; src = fetchFromGitHub { owner = "glmark2"; repo = "glmark2"; - rev = "7265e8e6c77c4f60302507eca0e18560b1117a86"; - sha256 = "076l75rfl6pnp1wgiwlaihy1vg2advg1z8bi0x84kk259kldgvwn"; + rev = version; + sha256 = "1a75gg1dn03d3jq7n74wsw7kc14ildbb8azzbj4k28xik1m6khr9"; }; - nativeBuildInputs = [ pkg-config wafHook ]; + nativeBuildInputs = [ pkg-config wafHook makeWrapper ]; buildInputs = [ - libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland udev mesa + libjpeg + libpng + xorg.libxcb + libX11 + libdrm + python3 + udev + wayland + wayland-protocols + mesa ]; - wafConfigureFlags = ["--with-flavors=x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2"]; + wafConfigureFlags = [ "--with-flavors=x11-gl,x11-glesv2,drm-gl,drm-glesv2,wayland-gl,wayland-glesv2" ]; + + postInstall = '' + for binary in $out/bin/glmark2*; do + wrapProgram $binary \ + --set LD_LIBRARY_PATH ${libGL}/lib + done + ''; meta = with lib; { description = "OpenGL (ES) 2.0 benchmark"; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index 6d3952c9c225c..3a4a38c6b708b 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -31,13 +31,13 @@ in mkDerivation rec { pname = "fcitx5-chinese-addons"; - version = "5.0.3"; + version = "5.0.6"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-chinese-addons"; rev = version; - sha256 = "sha256-kCihpRUtUXrqqf7FPQp8ZRexiygOuDVOdQwVx7tSn+c="; + sha256 = "sha256-+DhXFqUxECGZYHAmEw5cZJQnRHHgvT0nVVqY9DXgWBU="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/update.py b/pkgs/tools/inputmethods/fcitx5/update.py index e3513c747fcd2..9f54e313fd346 100755 --- a/pkgs/tools/inputmethods/fcitx5/update.py +++ b/pkgs/tools/inputmethods/fcitx5/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i python3 -p nix-prefetch-github python3Packages.requests +#!nix-shell -i python3 -p nix-update nix-prefetch-github python3Packages.requests from nix_prefetch_github import * import json @@ -12,8 +12,7 @@ REPOS = [ "libime", "xcb-imdkit", "fcitx5", "fcitx5-gtk", "fcitx5-qt", "fcitx5-c OWNER = "fcitx" def get_latest_tag(repo, owner=OWNER): - r = requests.get( 'https://api.github.com/repos/{}/{}/tags'.format(owner,repo) - , auth=('poscat', 'db5e6fd16d0eb8c36385d3d944e058a1178b4265')) + r = requests.get('https://api.github.com/repos/{}/{}/tags'.format(owner,repo)) return r.json()[0].get("name") def main(): diff --git a/pkgs/tools/inputmethods/hime/default.nix b/pkgs/tools/inputmethods/hime/default.nix index 988f8941d14b1..4c86fb04cf04c 100644 --- a/pkgs/tools/inputmethods/hime/default.nix +++ b/pkgs/tools/inputmethods/hime/default.nix @@ -1,27 +1,40 @@ -{ -stdenv, fetchFromGitHub, pkg-config, which, gtk2, gtk3, qt4, qt5, libXtst, lib, +{ stdenv +, fetchFromGitHub +, pkg-config +, which +, gtk2 +, gtk3 +, qt4 +, qt5 +, libXtst +, lib +, libchewing +, unixtools +, anthy }: -# chewing and anthy do not work well -# so we do not enable these input method at this moment - -stdenv.mkDerivation { - name = "hime"; - version = "unstable-2020-06-27"; +stdenv.mkDerivation rec { + pname = "hime"; + version = "0.9.11"; src = fetchFromGitHub { + repo = pname; owner = "hime-ime"; - repo = "hime"; - rev = "c89751a58836906e6916355fd037fc74fd7a7a15"; - sha256 = "024w67q0clzxigsrvqbxpiy8firjvrqi7wbkkcapzzhzapv3nm8x"; + rev = "v${version}"; + sha256 = "sha256-fCqet+foQjI+LpTQ/6Egup1GzXELlL2hgbh0dCKLwPI="; }; - nativeBuildInputs = [ which pkg-config ]; - buildInputs = [ libXtst gtk2 gtk3 qt4 qt5.qtbase ]; + nativeBuildInputs = [ which pkg-config unixtools.whereis ]; + buildInputs = [ libXtst gtk2 gtk3 qt4 qt5.qtbase libchewing anthy ]; preConfigure = "patchShebangs configure"; configureFlags = [ "--disable-lib64" "--disable-qt5-immodule" ]; dontWrapQtApps = true; + postFixup = '' + hime_rpath=$(patchelf --print-rpath $out/bin/hime) + patchelf --set-rpath $out/lib/hime:$hime_rpath $out/bin/hime + ''; + meta = with lib; { homepage = "http://hime-ime.github.io/"; diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 4090a0f5051c6..32c5d3b474574 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.12.2"; + version = "2.13.0"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-0w9RKkoKWwPrVLkQieL69HIsSWbqS0vQesi7yijwXRw="; + sha256 = "sha256-gJOEMp2Ex9gBsvYOmIKH7WNLQejiJhY8wnw2JYxcUU4="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-JqOblCWJSKuTzE4XQzk5nCQL7NIwC5ZDhue1HA7JdzA="; + cargoSha256 = "sha256-cN5rURv1RmesLzwm3ZXyGJXxvFeIbpTb6kWzJSKgX5o="; doCheck = false; diff --git a/pkgs/tools/misc/gwe/default.nix b/pkgs/tools/misc/gwe/default.nix new file mode 100644 index 0000000000000..2eeb2f0d2c546 --- /dev/null +++ b/pkgs/tools/misc/gwe/default.nix @@ -0,0 +1,89 @@ +{ lib +, stdenv +, fetchFromGitLab +, wrapGAppsHook +, makeWrapper +, pkg-config +, meson +, ninja +, cmake +, gobject-introspection +, desktop-file-utils +, python3 +, gtk3 +, libdazzle +, libappindicator-gtk3 +, libnotify +, nvidia_x11 + }: + +let + pythonEnv = python3.withPackages (pypkgs: with pypkgs; [ + injector + matplotlib + peewee + pynvml + pygobject3 + xlib + pyxdg + requests + rx + gtk3 + ]); +in stdenv.mkDerivation rec { + pname = "gwe"; + version = "0.15.3"; + + src = fetchFromGitLab { + owner = "leinardi"; + repo = pname; + rev = version; + sha256 = "1znd2g02j0klg8w6cgwvaxc8anan6sidadknl0vh9jxmzz75xp9z"; + }; + + prePatch = '' + patchShebangs scripts/{make_local_manifest,meson_post_install}.py + + substituteInPlace gwe/repository/nvidia_repository.py \ + --replace "from py3nvml import py3nvml" "import pynvml" \ + --replace "py3nvml.py3nvml" "pynvml" \ + --replace "py3nvml" "pynvml" + ''; + + nativeBuildInputs = [ + wrapGAppsHook + pkg-config + meson + ninja + cmake + gobject-introspection + desktop-file-utils + pythonEnv + ]; + + buildInputs = [ + gtk3 + libdazzle + libappindicator-gtk3 + libnotify + ]; + + postInstall = '' + mv $out/bin/gwe $out/lib/gwe-bin + + makeWrapper ${pythonEnv}/bin/python $out/bin/gwe \ + --add-flags "$out/lib/gwe-bin" \ + --prefix LD_LIBRARY_PATH : "/run/opengl-driver/lib" \ + --prefix PATH : "${builtins.concatStringsSep ":" [ (lib.makeBinPath [ nvidia_x11 nvidia_x11.settings ]) "/run/wrappers/bin" ]}" \ + --unset "SHELL" \ + ''${gappsWrapperArgs[@]} + ''; + + meta = with lib; { + description = "System utility designed to provide information, control the fans and overclock your NVIDIA card"; + homepage = "https://gitlab.com/leinardi/gwe"; + platforms = platforms.linux; + license = licenses.gpl3Only; + maintainers = [ maintainers.ivar ]; + }; +} diff --git a/pkgs/tools/misc/nix-direnv/default.nix b/pkgs/tools/misc/nix-direnv/default.nix index 94ce54a2a9acf..526efc65f6a44 100644 --- a/pkgs/tools/misc/nix-direnv/default.nix +++ b/pkgs/tools/misc/nix-direnv/default.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, gnugrep, nixUnstable }: +{ lib +, stdenv +, fetchFromGitHub +, gnugrep +, nixStable +, nixUnstable +, enableFlakes ? false +}: +let + nix = if enableFlakes then nixUnstable else nixStable; +in stdenv.mkDerivation rec { pname = "nix-direnv"; version = "1.2.6"; @@ -14,7 +24,7 @@ stdenv.mkDerivation rec { # Substitute instead of wrapping because the resulting file is # getting sourced, not executed: postPatch = '' - sed -i "1a NIX_BIN_PREFIX=${nixUnstable}/bin/" direnvrc + sed -i "1a NIX_BIN_PREFIX=${nix}/bin/" direnvrc substituteInPlace direnvrc --replace "grep" "${gnugrep}/bin/grep" ''; diff --git a/pkgs/tools/misc/nvimpager/default.nix b/pkgs/tools/misc/nvimpager/default.nix index 61f9e7262c92b..e079891988686 100644 --- a/pkgs/tools/misc/nvimpager/default.nix +++ b/pkgs/tools/misc/nvimpager/default.nix @@ -1,36 +1,43 @@ { fetchFromGitHub , lib, stdenv , ncurses, neovim, procps -, pandoc, lua51Packages, util-linux +, scdoc, lua51Packages, util-linux }: stdenv.mkDerivation rec { pname = "nvimpager"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "lucc"; repo = pname; rev = "v${version}"; - sha256 = "1xy5387szfw0bp8dr7d4z33wd4xva7q219rvz8gc0vvv1vsy73va"; + sha256 = "sha256-okYnPwuxU/syxcKIMUBc25r791D6Bug2w2axH4vvmAY="; }; buildInputs = [ ncurses # for tput procps # for nvim_get_proc() which uses ps(1) ]; - nativeBuildInputs = [ pandoc ]; + nativeBuildInputs = [ scdoc ]; makeFlags = [ "PREFIX=$(out)" ]; - buildFlags = [ "nvimpager.configured" ]; + buildFlags = [ "nvimpager.configured" "nvimpager.1" ]; preBuild = '' patchShebangs nvimpager substituteInPlace nvimpager --replace ':-nvim' ':-${neovim}/bin/nvim' + # remove git command from makefile as we run from a tarball + # replace with actual timestamp of the commit + substituteInPlace makefile --replace '$(shell git log -1 --no-show-signature --pretty="%ct")' 1623019602 ''; doCheck = true; checkInputs = [ lua51Packages.busted util-linux neovim ]; - checkPhase = ''script -c "busted --lpath './?.lua' test"''; + checkPhase = '' + runHook preCheck + script -c "busted --lpath './?.lua' test" + runHook postCheck + ''; meta = with lib; { description = "Use neovim as pager"; diff --git a/pkgs/tools/misc/veikk-linux-driver-gui/default.nix b/pkgs/tools/misc/veikk-linux-driver-gui/default.nix index e216823f7ab6f..a833846dd00f0 100644 --- a/pkgs/tools/misc/veikk-linux-driver-gui/default.nix +++ b/pkgs/tools/misc/veikk-linux-driver-gui/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { meta = with lib; { description = "Configuration tool for the VEIKK Linux driver"; homepage = "https://github.com/jlam55555/veikk-linux-driver-gui/"; - license = licenses.unfree; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ nicbk ]; }; diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index 942df983fcdc1..96f806aad39f0 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.27.0"; + version = "2.28.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-Ofg+z8wUttqM1THatPFi0cuyLSEryhTmg3JC1o+16eA="; + sha256 = "sha256-AlAfs1wi3hS7cqAtGqfUgv5CIonu7TmXWgxL1zSBh54="; }; vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY="; diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index f6263f187bf5b..666e19ca81ae7 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "isync"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz"; - sha256 = "0l01880fcyqn6xq9n8236ha5n2a3wl5g8rmv22z8nv5hgfsxndhd"; + sha256 = "0hskfpj4r4q3959k3npyqli353daj3r5d9mfia9bbmig87nyfd8r"; }; nativeBuildInputs = [ pkg-config perl ]; diff --git a/pkgs/tools/networking/notemap/default.nix b/pkgs/tools/networking/notemap/default.nix new file mode 100644 index 0000000000000..040f26752b516 --- /dev/null +++ b/pkgs/tools/networking/notemap/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenv +, fetchzip +, pkg-config +, libressl +}: + +stdenv.mkDerivation rec { + pname = "notemap"; + version = "1.3"; + + src = fetchzip { + url = "https://git.causal.agency/notemap/snapshot/notemap-${version}.tar.gz"; + sha256 = "0s9c1xx0iggyzclqw3294bjv7qgvd5l5zgbryks4hvfibr73r6ps"; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libressl + ]; + + meta = { + description = "Mirror notes to IMAP"; + longDescription = '' + notemap(1) mirrors text files to an IMAP mailbox in a format compatible with the iOS + Notes app. It's intended to make notes managed in git(1) easily accessible + from the phone. + ''; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.sternenseemann ]; + homepage = "https://git.causal.agency/notemap/about/"; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix index 67ee51d661027..8b9d4c9e7b898 100644 --- a/pkgs/tools/networking/spiped/default.nix +++ b/pkgs/tools/networking/spiped/default.nix @@ -2,33 +2,30 @@ stdenv.mkDerivation rec { pname = "spiped"; - version = "1.5.0"; + version = "1.6.1"; src = fetchurl { url = "https://www.tarsnap.com/spiped/${pname}-${version}.tgz"; - sha256 = "1mxcbxifr3bnj6ga8lz88y4bhff016i6kjdzwbb3gzb2zcs4pxxj"; + sha256 = "8d7089979db79a531a0ecc507b113ac6f2cf5f19305571eff1d3413e0ab33713"; }; buildInputs = [ openssl ]; - patchPhase = '' + postPatch = '' substituteInPlace libcperciva/cpusupport/Build/cpusupport.sh \ + --replace "dirname" "${coreutils}/bin/dirname" \ --replace "2>/dev/null" "2>stderr.log" - substituteInPlace POSIX/posix-l.sh \ + substituteInPlace libcperciva/POSIX/posix-l.sh \ --replace "rm" "${coreutils}/bin/rm" \ - --replace ">/dev/stderr" ">stderr.log" \ --replace "2>/dev/null" "2>stderr.log" - - substituteInPlace POSIX/posix-cflags.sh \ - --replace "rm" "${coreutils}/bin/rm" \ - --replace ">/dev/stderr" ">stderr.log" \ - --replace "2>/dev/null" "2>stderr.log" - ''; + ''; installPhase = '' + runHook preInstall mkdir -p $out/bin $out/share/man/man1 make install BINDIR=$out/bin MAN1DIR=$out/share/man/man1 + runHook postInstall ''; meta = { diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 5f139a1b3b9dd..a7b3d12f7a5de 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -93,14 +93,12 @@ common = patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* ''} '' + - # On all versions before c9f51e87057652db0013289a95deffba495b35e7, - # released with 2.3.8, we need to patch around an issue where the Nix - # configure step pulls in the build system's bash and other utilities - # when cross-compiling. + # On all versions before c9f51e87057652db0013289a95deffba495b35e7, which + # removes config.nix entirely and is not present in 2.3.x, we need to + # patch around an issue where the Nix configure step pulls in the build + # system's bash and other utilities when cross-compiling. lib.optionalString ( - stdenv.buildPlatform != stdenv.hostPlatform && - (lib.versionOlder "2.3.8" version && !is24) - # The additional is24 condition is required as versionOlder doesn't understand nixUnstable version strings + stdenv.buildPlatform != stdenv.hostPlatform && !is24 ) '' mkdir tmp/ substitute corepkgs/config.nix.in tmp/config.nix.in \ diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index e07ea1a333799..a2a6caf2b1174 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "eid-mw"; # NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS. - version = "5.0.21"; + version = "5.0.23"; src = fetchFromGitHub { rev = "v${version}"; - sha256 = "1sz7996q6gd6vbdxqgyx1jwjznpki1k9zbgaj1j1a51y6w0g0kdh"; + sha256 = "0annkm0hqhkpjmfa6ywvzgn1n9619baqdzdbhjfhzfi4hf7mml1d"; repo = "eid-mw"; owner = "Fedict"; }; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Belgian electronic identity card (eID) middleware"; homepage = "https://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/"; - license = licenses.lgpl3; + license = licenses.lgpl3Only; longDescription = '' Allows user authentication and digital signatures with Belgian ID cards. Also requires a running pcscd service and compatible card reader. diff --git a/pkgs/tools/security/pass/extensions/checkup.nix b/pkgs/tools/security/pass/extensions/checkup.nix index bafaabba843bc..5ae846d4a4b31 100644 --- a/pkgs/tools/security/pass/extensions/checkup.nix +++ b/pkgs/tools/security/pass/extensions/checkup.nix @@ -1,18 +1,22 @@ { lib, stdenv, fetchFromGitHub -, curl, findutils, gnugrep, gnused }: +, curl, findutils, gnugrep, gnused, shellcheck }: -stdenv.mkDerivation rec { +let pname = "pass-checkup"; - version = "0.2.0"; + version = "0.2.1"; +in stdenv.mkDerivation { + inherit pname version; src = fetchFromGitHub { owner = "etu"; - repo = "pass-checkup"; + repo = pname; rev = version; - sha256 = "17fyf8zj535fg43yddjww1jhxfb3nbdkn622wjxaai2nf46jzh7y"; + sha256 = "18b6rx59r7g0hvqs2affvw0g0jyifyzhanwgz2q2b8nhjgqgnar2"; }; - patchPhase = '' + nativeBuildInputs = [ shellcheck ]; + + postPatch = '' substituteInPlace checkup.bash \ --replace curl ${curl}/bin/curl \ --replace find ${findutils}/bin/find \ @@ -21,13 +25,17 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + install -D -m755 checkup.bash $out/lib/password-store/extensions/checkup.bash + + runHook postInstall ''; meta = with lib; { description = "A pass extension to check against the Have I been pwned API to see if your passwords are publicly leaked or not"; homepage = "https://github.com/etu/pass-checkup"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ etu ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/rnp/default.nix b/pkgs/tools/security/rnp/default.nix new file mode 100644 index 0000000000000..3c60190f12870 --- /dev/null +++ b/pkgs/tools/security/rnp/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, asciidoctor +, botan2 +, bzip2 +, cmake +, fetchFromGitHub +, gnupg +, gtest +, json_c +, pkg-config +, python3 +, zlib +}: + +stdenv.mkDerivation rec { + pname = "rnp"; + version = "0.15.1"; + + src = fetchFromGitHub { + owner = "rnpgp"; + repo = "rnp"; + rev = "v${version}"; + sha256 = "1l7y99rcss5w24lil6nqwr0dzh2jvq0qxmdvq7j5yx3fdssd5xsv"; + }; + + buildInputs = [ zlib bzip2 json_c botan2 ]; + + cmakeFlags = [ + "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}" + "-DBUILD_SHARED_LIBS=on" + "-DBUILD_TESTING=on" + "-DDOWNLOAD_GTEST=off" + "-DDOWNLOAD_RUBYRNP=off" + ]; + + nativeBuildInputs = [ asciidoctor cmake gnupg gtest pkg-config python3 ]; + + # NOTE: check-only inputs should ideally be moved to checkInputs, but it + # would fail during buildPhase. + # checkInputs = [ gtest python3 ]; + + outputs = [ "out" "lib" "dev" ]; + + preConfigure = '' + echo "v${version}" > version.txt + ''; + + meta = with lib; { + homepage = "https://github.com/rnpgp/rnp"; + description = "High performance C++ OpenPGP library, fully compliant to RFC 4880"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ ribose-jeffreylau ]; + }; +} diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 629085d346f69..bff605dbcdeb6 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gdu"; - version = "5.0.1"; + version = "5.1.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-78eQinKR4w7K8MFd4uyj5IPkUs0Mz5XeO7JUG/1cKLw="; + sha256 = "sha256-OellGxW/2I/dKBxWgEv1Ta9OJ/2HUfDIzICQwvmjTCM="; }; - vendorSha256 = "sha256-9upXhTvQJ9oFfomgqja3SiifiZpl8RUQ85HwL9bDPlQ="; + vendorSha256 = "sha256-9W1K01PJ+tRLSJ0L7NGHXT5w5oHmlBkT8kwnOLOzSCc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix index 8fc9637bfb9f8..1e36614c4274d 100644 --- a/pkgs/tools/system/zenith/default.nix +++ b/pkgs/tools/system/zenith/default.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, IOKit }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, IOKit +, nvidiaSupport ? false +, makeWrapper +}: rustPlatform.buildRustPackage rec { pname = "zenith"; @@ -11,12 +18,20 @@ rustPlatform.buildRustPackage rec { sha256 = "1bn364rmp0q86rd7vgv4n7x09cdf9m4njcaq92jnk85ni6h147ax"; }; + cargoBuildFlags = lib.optionals nvidiaSupport [ "--features" "nvidia" ]; cargoSha256 = "0c2mk2bcz4qjyqmf11yqhnhy4pqxr77b3c1gvr5jfmjshx4ff7v2"; + nativeBuildInputs = lib.optional nvidiaSupport makeWrapper; buildInputs = lib.optionals stdenv.isDarwin [ IOKit ]; + postInstall = lib.optionalString nvidiaSupport '' + wrapProgram $out/bin/zenith \ + --suffix LD_LIBRARY_PATH : "/run/opengl-driver/lib" + ''; + meta = with lib; { - description = "Sort of like top or htop but with zoom-able charts, network, and disk usage"; + description = "Sort of like top or htop but with zoom-able charts, network, and disk usage" + + lib.optionalString nvidiaSupport ", and NVIDIA GPU usage"; homepage = "https://github.com/bvaisvil/zenith"; license = licenses.mit; maintainers = with maintainers; [ bbigras ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 89553642a2daf..08d8ed9494f32 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -237,6 +237,7 @@ mapAliases ({ ''; font-droid = throw "font-droid has been deprecated by noto-fonts"; # 2019-04-12 foomatic_filters = foomatic-filters; # 2016-08 + fsharp41 = throw "fsharp41 has been removed, please use dotnet-sdk_5 or later"; fuse_exfat = exfat; # 2015-09-11 fuseki = apache-jena-fuseki; # added 2018-04-25 fusesmb = throw "fusesmb is abandoned by upstream"; # added 2019-10-15 @@ -482,6 +483,7 @@ mapAliases ({ mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative."; # added 2021-04-15 mysqlWorkbench = mysql-workbench; # added 2017-01-19 nagiosPluginsOfficial = monitoring-plugins; + navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # added 2021-06-07 ncat = nmap; # added 2016-01-26 netcat-openbsd = libressl.nc; # added 2018-04-25 netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # added 2020-08-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4988effa17690..f324ca75eb330 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1275,6 +1275,8 @@ in barman = python3Packages.callPackage ../tools/misc/barman { }; + base16-universal-manager = callPackage ../applications/misc/base16-universal-manager { }; + bashate = python3Packages.callPackage ../development/tools/bashate { }; bash-my-aws = callPackage ../tools/admin/bash-my-aws { }; @@ -3033,6 +3035,8 @@ in nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools; + notemap = callPackage ../tools/networking/notemap { }; + noteshrink = callPackage ../tools/misc/noteshrink { }; noti = callPackage ../tools/misc/noti { @@ -8314,6 +8318,8 @@ in rnnoise-plugin = callPackage ../development/libraries/rnnoise-plugin {}; + rnp = callPackage ../tools/security/rnp { }; + rnv = callPackage ../tools/text/xml/rnv { }; rosie = callPackage ../tools/text/rosie { }; @@ -10109,6 +10115,13 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; + # Nvidia support does not require any propietary libraries, so CI can build it. + # Note that when enabling this unconditionally, non-nvidia users will always have an empty "GPU" section. + zenith-nvidia = callPackage ../tools/system/zenith { + inherit (darwin.apple_sdk.frameworks) IOKit; + nvidiaSupport = true; + }; + zerotierone = callPackage ../tools/networking/zerotierone { }; zerofree = callPackage ../tools/filesystems/zerofree { }; @@ -11103,8 +11116,6 @@ in fsharp = callPackage ../development/compilers/fsharp { }; - fsharp41 = callPackage ../development/compilers/fsharp41 { }; - fstar = callPackage ../development/compilers/fstar { ocamlPackages = ocaml-ng.ocamlPackages_4_07; }; @@ -11153,6 +11164,10 @@ in gprolog = callPackage ../development/compilers/gprolog { }; + gwe = callPackage ../tools/misc/gwe { + nvidia_x11 = linuxPackages.nvidia_x11; + }; + gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { }; idrisPackages = dontRecurseIntoAttrs (callPackage ../development/idris-modules { @@ -13746,6 +13761,8 @@ in phantomjs2 = libsForQt514.callPackage ../development/tools/phantomjs2 { }; + picotool = callPackage ../development/tools/picotool { }; + pmccabe = callPackage ../development/tools/misc/pmccabe { }; pkgconf-unwrapped = callPackage ../development/tools/misc/pkgconf {}; @@ -17518,6 +17535,8 @@ in physfs_2 physfs; + pico-sdk = callPackage ../development/libraries/pico-sdk { }; + pipelight = callPackage ../tools/misc/pipelight { stdenv = stdenv_32bit; wine-staging = pkgsi686Linux.wine-staging; @@ -17612,7 +17631,9 @@ in protozero = callPackage ../development/libraries/protozero { }; - flatbuffers = callPackage ../development/libraries/flatbuffers { }; + flatbuffers = flatbuffers_2_0; + flatbuffers_2_0 = callPackage ../development/libraries/flatbuffers/2.0.nix { }; + flatbuffers_1_12 = callPackage ../development/libraries/flatbuffers/1.12.nix { }; nanopb = callPackage ../development/libraries/nanopb { }; @@ -19102,7 +19123,10 @@ in engelsystem = callPackage ../servers/web-apps/engelsystem { php = php74; }; - envoy = callPackage ../servers/http/envoy { }; + envoy = callPackage ../servers/http/envoy { + go = go_1_15; + jdk = openjdk11; + }; etcd = callPackage ../servers/etcd { }; etcd_3_4 = callPackage ../servers/etcd/3.4.nix { }; @@ -19684,6 +19708,7 @@ in postgresql_11 postgresql_12 postgresql_13 + postgresql_14 ; postgresql = postgresql_11.override { this = postgresql; }; postgresqlPackages = recurseIntoAttrs postgresql.pkgs; @@ -20550,13 +20575,6 @@ in ]; }; - linux_5_11 = callPackage ../os-specific/linux/kernel/linux-5.11.nix { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - linux_5_12 = callPackage ../os-specific/linux/kernel/linux-5.12.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -20806,6 +20824,8 @@ in v86d = callPackage ../os-specific/linux/v86d { }; + veikk-linux-driver = callPackage ../os-specific/linux/veikk-linux-driver { }; + vendor-reset = callPackage ../os-specific/linux/vendor-reset { }; vhba = callPackage ../misc/emulators/cdemu/vhba.nix { }; @@ -20868,7 +20888,6 @@ in linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10); - linuxPackages_5_11 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_11); linuxPackages_5_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_12); # When adding to the list above: @@ -20902,7 +20921,7 @@ in # Hardened Linux hardenedLinuxPackagesFor = kernel': overrides: let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates: - linux_latest_for_hardened = pkgs.linux_5_11; + linux_latest_for_hardened = pkgs.linux_5_12; kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides; in linuxPackagesFor (kernel.override { structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix { @@ -24167,7 +24186,7 @@ in gv = callPackage ../applications/misc/gv { }; gvisor = callPackage ../applications/virtualization/gvisor { - go = go_1_14; + go = go_1_16; }; gvisor-containerd-shim = callPackage ../applications/virtualization/gvisor/containerd-shim.nix { }; @@ -25666,8 +25685,6 @@ in navipowm = callPackage ../applications/misc/navipowm { }; - navit = libsForQt5.callPackage ../applications/misc/navit { }; - netbeans = callPackage ../applications/editors/netbeans { jdk = jdk11; }; @@ -30211,7 +30228,9 @@ in herwig = callPackage ../development/libraries/physics/herwig { }; - lhapdf = callPackage ../development/libraries/physics/lhapdf { }; + lhapdf = callPackage ../development/libraries/physics/lhapdf { + python = python3; + }; mela = callPackage ../development/libraries/physics/mela { }; @@ -31172,6 +31191,7 @@ in terraform_0_13 terraform_0_14 terraform_0_15 + terraform_1_0_0 terraform_plugins_test ; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index bd957bdb49d56..1ac8c4c40057e 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -69,6 +69,7 @@ let paramcoq = callPackage ../development/coq-modules/paramcoq {}; pocklington = callPackage ../development/coq-modules/pocklington {}; QuickChick = callPackage ../development/coq-modules/QuickChick {}; + reglang = callPackage ../development/coq-modules/reglang {}; relation-algebra = callPackage ../development/coq-modules/relation-algebra {}; simple-io = callPackage ../development/coq-modules/simple-io { }; stdpp = callPackage ../development/coq-modules/stdpp { }; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 55eb567640331..f3310d90b1264 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -8,14 +8,12 @@ , glib , pkg-config , mono -, fsharp , overrides ? {} }: let self = dotnetPackages // overrides; dotnetPackages = with self; { # BINARY PACKAGES - Autofac = fetchNuGet { baseName = "Autofac"; version = "3.5.2"; @@ -23,176 +21,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "lib/portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1/*" ]; }; - Fake = fetchNuGet { - baseName = "FAKE"; - version = "3.33.0"; - sha256 = "04gllx9d1w8zn9gq9p5k76b79ix07rilk3apdi72dmz6h3yylcdm"; - outputFiles = [ "tools/*" ]; - dllFiles = [ "Fake*.dll" ]; - }; - - Fantomas = fetchNuGet { - baseName = "Fantomas"; - version = "4.4.0"; - sha256 = "cYz0ewJdK9nRlMKmigk3IENfOXvJRhXJfLXshaqgZ6o="; - outputFiles = [ "lib/*" ]; - dllFiles = [ "Fantomas*.dll" ]; - - meta = with lib; { - description = "FSharp source code formatter"; - homepage = "https://github.com/fsprojects/fantomas"; - license = licenses.asl20; - maintainers = [ maintainers.ratsclub ]; - }; - }; - - FSharpCompilerCodeDom = fetchNuGet { - baseName = "FSharp.Compiler.CodeDom"; - version = "0.9.2"; - sha256 = "0cy9gbvmfx2g74m7bgp6x9mr4avb6s560yjii7cyyxb7jlwabfcj"; - outputFiles = [ "lib/net40/*" ]; - }; - - FSharpCore302 = fetchNuGet { - baseName = "FSharp.Core"; - version = "3.0.2"; - sha256 = "1s4pqwbmhrsg5sw8i6dixdri3x0yjyilmkhsf4apfkp80si7d73q"; - outputFiles = [ "*" ]; - }; - - FSharpCore3125 = fetchNuGet { - baseName = "FSharp.Core"; - version = "3.1.2.5"; - sha256 = "0pfvjimrgrffb5rj612gsid044lfpk8g2cxyh9792dc1n8ck5hih"; - outputFiles = [ "*" ]; - }; - - FSharpCore4001 = fetchNuGet { - baseName = "FSharp.Core"; - version = "4.0.0.1"; - sha256 = "0v53iq12ji2d1bkdyg9dn8sz5l93sprrh835amh39dghh8v8vm8k"; - outputFiles = [ "*" ]; - }; - - FSharpCore4117 = fetchNuGet { - baseName = "FSharp.Core"; - version = "4.1.17"; - sha256 = "1yk23ir66fgqm5r6qyf66zf64l0s223l3yd7p9yvbyimyg0hgzb1"; - outputFiles = [ "*" ]; - }; - - FSharpData = fetchNuGet { - baseName = "FSharp.Data"; - version = "4.1.1"; - sha256 = "0ytjiQi8vQQU51JYexnC13Bi7NqVmLRzM75SOZ+hhQU="; - outputFiles = [ "lib/*" ]; - - meta = with lib; { - description = "F# Data: Library for Data Access"; - homepage = "https://fsprojects.github.io/FSharp.Data/"; - license = licenses.asl20; - maintainers = [ maintainers.ratsclub ]; - }; - }; - - FSharpData225 = fetchNuGet { - baseName = "FSharp.Data"; - version = "2.2.5"; - sha256 = "1c9l6bk0d2srccash2980y9phq3kmfm0m76k4wghnysnq94vm724"; - outputFiles = [ "*" ]; - }; - - FSharpDataSQLProvider = fetchNuGet { - baseName = "SQLProvider"; - version = "0.0.9-alpha"; - sha256 = "1wmgr5ca9hh6a7f0s8yc87n6arn7bq6nwc8n4crbbdil4r0bw46w"; - outputFiles = [ "lib/net40/*" ]; - }; - - FsCheck = fetchNuGet { - baseName = "FsCheck"; - version = "1.0.4"; - sha256 = "1q2wk4d4d1q94qzcccgmxb2lh0b8qkmpyz0p7lfphkw2gx6cy5ad"; - outputFiles = [ "lib/net45/*" ]; - }; - - FsCheck262 = fetchNuGet { - baseName = "FsCheck"; - version = "2.6.2"; - sha256 = "0fh9yvsc4i61z31qf00d6gjv6xxd54pv1ykf5bpv95a5crc3qfvl"; - outputFiles = [ "*" ]; - }; - - FsCheckNunit = fetchNuGet { - baseName = "FsCheck.Nunit"; - version = "1.0.4"; - sha256 = "1s62jrsa5hxqy1ginl8r29rjdc8vbkwmz7mb0hglhwccdqfyr5xy"; - outputFiles = [ "lib/net45/*" ]; - }; - - FSharpCompilerTools = fetchNuGet { - baseName = "FSharp.Compiler.Tools"; - version = "4.1.27"; - sha256 = "1m3hl8ja9gp5ajxmjf7bnq24bbkd6kx7yhxf4zb8si27h1n9l6dl"; - outputFiles = [ "*" ]; - }; - - FsLexYacc = fetchNuGet { - baseName = "FsLexYacc"; - version = "6.1.0"; - sha256 = "1v5myn62zqs431i046gscqw2v0c969fc7pdplx7z9cnpy0p2s4rv"; - outputFiles = [ "build/*" ]; - }; - - FsLexYacc706 = fetchNuGet { - baseName = "FsLexYacc"; - version = "7.0.6"; - sha256 = "0xwiq8q5q6ga6zj24w83ch5csbv405xcg6jg2hmnjic0npz0drk2"; - outputFiles = [ "*" ]; - }; - - FsLexYaccRuntime = fetchNuGet { - baseName = "FsLexYacc.Runtime"; - version = "6.1.0"; - sha256 = "18vrx4lxsn4hkfishg4abv0d4q21dsph0bm4mdq5z8afaypp5cr7"; - outputFiles = [ "lib/net40/*" ]; - }; - - FsPickler = fetchNuGet { - baseName = "FsPickler"; - version = "1.2.9"; - sha256 = "12fgcj7pvffsj1s1kaz15j22i1n98dy5mf4z84555xdf7mw7dpm4"; - outputFiles = [ "lib/net45/*" ]; - }; - - FsUnit = fetchNuGet { - baseName = "FsUnit"; - version = "1.3.0.1"; - sha256 = "1k7w8pc81aplsfn7n46617khmzingd2v7hcgdhh7vgsssibwms64"; - outputFiles = [ "Lib/Net40/*" ]; - }; - - FSharpFormatting = fetchNuGet { - baseName = "FSharp.Formatting"; - version = "11.2.0"; - sha256 = "4IMrd+jpRZw+vBXx4X89/B/Fdpiuy2hwtmQNGWQp0wM="; - outputFiles = [ "lib/*" ]; - postUnpack = '' - chmod -R a+r $sourceRoot - ''; - - meta = with lib; { - description = "F# tools for generating documentation (Markdown processor and F# code formatter)"; - homepage = "https://fsprojects.github.io/FSharp.Formatting/"; - longDescription = '' - The FSharp.Formatting package includes libraries and tools for processing F# script files, - markdown and components for documentation generation. - ''; - license = licenses.asl20; - maintainers = [ maintainers.ratsclub ]; - }; - }; - NUnit3 = fetchNuGet { baseName = "NUnit"; version = "3.0.1"; @@ -349,15 +177,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { sha256 = "19fhdgd35yg52gyckhgwrphq07nv7v7r73hcg69ns94xfg1i6r7i"; outputFiles = [ "*" ]; }; - - Suave = fetchNuGet { - baseName = "Suave"; - version = "0.29.0"; - propagatedBuildInputs = [ FsPickler ]; - sha256 = "0rgqy0afwm50gq5ca94w16s565yx5wf961683ghfld6ir0k3dhln"; - outputFiles = [ "lib/net40/*" ]; - }; - # SOURCE PACKAGES Boogie = buildDotnetPackage rec { @@ -518,164 +337,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - ExcelDnaRegistration = buildDotnetPackage rec { - baseName = "Excel-DNA.Registration"; - version = "git-" + (builtins.substring 0 10 rev); - rev = "69abb1b3528f40dbcf425e13690aaeab5f707bb6"; - - src = fetchFromGitHub { - inherit rev; - owner = "Excel-DNA"; - repo = "Registration"; - sha256 = "094932h6r2f4x9r5mnw8rm4jzz8vkfv90d95qi3h0i89ws2dnn07"; - }; - - buildInputs = [ - fsharp - dotnetPackages.ExcelDna - ]; - - xBuildFiles = [ "Source/ExcelDna.Registration/ExcelDna.Registration.csproj" "Source/ExcelDna.Registration.FSharp/ExcelDna.Registration.FSharp.fsproj" ]; - outputFiles = [ "Source/ExcelDna.Registration/bin/Release/*" "Source/ExcelDna.Registration.FSharp/bin/Release/*FSharp*" ]; - - meta = { - description = "This library implements helper functions to assist and modify the Excel-DNA function registration"; - homepage = "https://github.com/Excel-DNA/Registration"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ obadz ]; - platforms = with lib.platforms; linux; - }; - }; - - ExtCore = buildDotnetPackage { - baseName = "ExtCore"; - version = "0.8.46"; - - src = fetchFromGitHub { - owner = "jack-pappas"; - repo = "ExtCore"; - rev = "0269b6d3c479f45abd7aa983aaeca08d07473943"; - sha256 = "1kxkiszpvqisffhd6wciha8j3dhkq06w9c540bmq8zixa4xaj83p"; - }; - - buildInputs = [ - fsharp - dotnetPackages.NUnit - dotnetPackages.FsCheck - ]; - - postConfigure = '' - # Fix case - sed -i -e s,nuget.targets,NuGet.targets, ExtCore.Tests/ExtCore.Tests.fsproj - ''; - - xBuildFlags = [ "/p:Configuration=Release (net45)" ]; - outputFiles = [ "ExtCore/bin/net45/Release/*" ]; - - meta = { - description = "ExtCore is an extended core library for F#"; - homepage = "https://github.com/jack-pappas/ExtCore"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ obadz ]; - platforms = with lib.platforms; linux; - broken = true; - }; - }; - - FSharpAutoComplete = buildDotnetPackage rec { - baseName = "FSharp.AutoComplete"; - version = "0.18.2"; - - src = fetchFromGitHub { - owner = "fsharp"; - repo = "FSharp.AutoComplete"; - rev = version; - sha256 = "1ikl72003xzqq2dc8i6h404hnq3q5g1p1q4rmzz9bdm7282q2jgs"; - }; - - buildInputs = [ - fsharp - glib - dotnetPackages.FSharpCompilerService - dotnetPackages.NewtonsoftJson - dotnetPackages.NDeskOptions - ]; - - outputFiles = [ "FSharp.AutoComplete/bin/Release/*" ]; - - meta = { - description = "An interface to the FSharp.Compiler.Service project"; - longDescription = '' - This project provides a command-line interface to the - FSharp.Compiler.Service project. It is intended to be used as a backend - service for rich editing or 'intellisense' features for editors. - ''; - homepage = "https://github.com/fsharp/FSharp.AutoComplete"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ obadz ]; - platforms = with lib.platforms; linux; - }; - }; - - FSharpCompilerService = buildDotnetPackage { - baseName = "FSharp.Compiler.Service"; - version = "0.0.90"; - - src = fetchFromGitHub { - owner = "fsharp"; - repo = "FSharp.Compiler.Service"; - rev = "a87939ab3f3c571cad79bc3b5f298aa3e180e6b3"; - sha256 = "0axr38q8m0h11hhbxg5myd1wwfgysadriln8c7bqsv5sf9djihvd"; - }; - - buildInputs = [ - fsharp - dotnetPackages.NUnit - ]; - - outputFiles = [ "bin/v4.5/*" ]; - - meta = { - description = "The F# compiler services package is a component derived from the F# compiler source code that exposes additional functionality for implementing F# language bindings"; - homepage = "https://fsharp.github.io/FSharp.Compiler.Service/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ obadz ]; - platforms = with lib.platforms; linux; - }; - }; - - # FSharpxExtras = buildDotnetPackage rec { - # baseName = "FSharpx.Extras"; - # version = "1.8.41"; - # - # src = fetchurl { - # name = "${baseName}-${version}.tar.gz"; - # url = "https://github.com/fsprojects/FSharpx.Extras/archive/${version}.tar.gz"; - # sha256 = "102z5bvk3ffi1crgyp51488vamv41fsf61n8x8pdiznq155zydhl"; - # }; - # - # buildInputs = [ - # fsharp - # dotnetPackages.NUnit - # dotnetPackages.FsCheck - # dotnetPackages.FsCheckNunit - # dotnetPackages.FsUnit - # ]; - # - # patches = [ ./disable_excel.patch ]; - # - # xBuildFiles = [ "FSharpx.WithTypeProviders.sln" ]; - # outputFiles = [ "build/*" ]; - # - # meta = { - # description = "FSharpx.Extras is a collection of libraries and tools for use with F#"; - # homepage = "https://fsprojects.github.io/FSharpx.Extras/"; - # license = lib.licenses.asl20; - # maintainers = with lib.maintainers; [ obadz ]; - # platforms = with lib.platforms; linux; - # }; - # }; - GitVersionTree = buildDotnetPackage { baseName = "GitVersionTree"; version = "2013-10-01"; @@ -724,30 +385,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - MathNetNumerics = buildDotnetPackage rec { - baseName = "MathNet.Numerics"; - version = "3.7.0"; - - src = fetchurl { - name = "${baseName}-${version}.tar.gz"; - url = "https://github.com/mathnet/mathnet-numerics/archive/v${version}.tar.gz"; - sha256 = "1yq6aqmc2gwh96z544qn83kby01lv1lsxm158hq0bimv2i9yywc7"; - }; - - buildInputs = [ fsharp ]; - - xBuildFiles = [ "MathNet.Numerics.sln" ]; - outputFiles = [ "out/lib/Net40/*" "src/FSharp/MathNet.Numerics.fsx" "src/FSharp/MathNet.Numerics.IfSharp.fsx" ]; - - meta = { - description = "Math.NET Numerics is an opensource numerical library for .Net, Silverlight and Mono"; - homepage = "https://numerics.mathdotnet.com/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ obadz ]; - platforms = with lib.platforms; linux; - }; - }; - MonoAddins = buildDotnetPackage rec { baseName = "Mono.Addins"; version = "1.2"; @@ -780,62 +417,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { }; }; - # MonoDevelopFSharpBinding = buildDotnetPackage rec { - # baseName = "MonoDevelop.FSharpBinding"; - # version = "git-a09c8185eb"; - - # broken = true; - - # src = fetchFromGitHub { - # owner = "fsharp"; - # repo = "fsharpbinding"; - # rev = "a09c8185ebf23fe2f7d22b14b4af2e3268d4f011"; - # sha256 = "1zp5gig42s1h681kch0rw5ykbbj0mcsmdvpyz1319wy9s7n2ng91"; - # }; - - # buildInputs = [ - # fsharp - # monodevelop - # pkgs.gtk-sharp - # pkgs.gnome-sharp - # dotnetPackages.ExtCore - # dotnetPackages.FSharpCompilerService - # dotnetPackages.FSharpCompilerCodeDom - # dotnetPackages.FSharpAutoComplete - # dotnetPackages.Fantomas - # ]; - - # patches = [ - # ../development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch - # ../development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch - # ]; - - # preConfigure = '' - # substituteInPlace monodevelop/configure.fsx --replace /usr/lib/monodevelop ${monodevelop}/lib/monodevelop - # substituteInPlace monodevelop/configure.fsx --replace bin/MonoDevelop.exe ../../bin/monodevelop - # (cd monodevelop; fsharpi ./configure.fsx) - # ''; - - # # This will not work as monodevelop probably looks in absolute nix store path rather than path - # # relative to its executable. Need to ln -s /run/current-system/sw/lib/dotnet/MonoDevelop.FSharpBinding - # # ~/.local/share/MonoDevelop-5.0/LocalInstall/Addins/ to install until we have a better way - - # # postInstall = '' - # # mkdir -p "$out/lib/monodevelop/AddIns" - # # ln -sv "$out/lib/dotnet/${baseName}" "$out/lib/monodevelop/AddIns" - # # ''; - - # xBuildFiles = [ "monodevelop/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.mac-linux.fsproj" ]; - # outputFiles = [ "monodevelop/bin/mac-linux/Release/*" ]; - - # meta = { - # description = "F# addin for MonoDevelop 5.9"; - # homepage = "https://github.com/fsharp/fsharpbinding/tree/5.9"; - # license = lib.licenses.asl20; - # maintainers = with lib.maintainers; [ obadz ]; - # platforms = with lib.platforms; linux; - # }; - # }; NDeskOptions = stdenv.mkDerivation rec { pname = "NDesk.Options"; @@ -900,67 +481,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { outputFiles = [ "*" ]; }; - Projekt = buildDotnetPackage rec { - baseName = "projekt"; - version = "git-" + (builtins.substring 0 10 rev); - rev = "715a21e5cd3c86310387562618b04e979d0ec9c4"; - - src = fetchFromGitHub { - inherit rev; - owner = "kjnilsson"; - repo = "projekt"; - sha256 = "1ph3af07wmia6qkiq1qlywaj2xh6zn5drdx19dwb1g3237h5fnz0"; - }; - - buildInputs = [ - fsharp - dotnetPackages.UnionArgParser - dotnetPackages.FsUnit - ]; - - preConfigure = '' - sed -i -e "s/FSharp.Core, Version=\$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a/FSharp.Core/" src/Projekt/Projekt.fsproj - ''; - - outputFiles = [ "src/Projekt/bin/Release/*" ]; - - meta = { - description = "A command-line tool for manipulating F# project files"; - homepage = "https://github.com/kjnilsson/projekt"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ obadz ]; - platforms = with lib.platforms; linux; - }; - }; - - UnionArgParser = buildDotnetPackage { - baseName = "UnionArgParser"; - version = "0.8.7"; - - src = fetchFromGitHub { - owner = "nessos"; - repo = "UnionArgParser"; - rev = "acaeb946e53cbb0bd9768977c656b3242146070a"; - sha256 = "1yrs7ycf2hg7h8z6vm9lr7i3gr9s30k74fr2maigdydnnls93als"; - }; - - buildInputs = [ - fsharp - dotnetPackages.NUnit - dotnetPackages.FsUnit - ]; - - outputFiles = [ "bin/net40/*" ]; - - meta = { - description = "A declarative CLI argument/XML configuration parser for F# applications"; - homepage = "https://nessos.github.io/UnionArgParser/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ obadz ]; - platforms = with lib.platforms; linux; - }; - }; - YamlDotNet = fetchNuGet { baseName = "YamlDotNet"; version = "11.1.1"; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 7b0c8b5fe9a19..330c29269db6c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -23939,6 +23939,21 @@ let }; }; + XSParseKeyword = buildPerlModule { + pname = "XS-Parse-Keyword"; + version = "0.06"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.06.tar.gz"; + sha256 = "0nnr8akkxb2h2y3d5r51pr84vvxkq89ynmi9azkbnn79jmbcbgvq"; + }; + perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; + meta = { + description = "XS functions to assist in parsing keyword syntax"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.zakame ]; + }; + }; + XSParseSublike = buildPerlModule { pname = "XS-Parse-Sublike"; version = "0.10"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 35935450e2a95..0e284963befd2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3400,6 +3400,8 @@ in { iniparse = callPackage ../development/python-modules/iniparse { }; + injector = callPackage ../development/python-modules/injector { }; + inotify-simple = callPackage ../development/python-modules/inotify-simple { }; inquirer = callPackage ../development/python-modules/inquirer { }; @@ -3840,6 +3842,10 @@ in { lexid = callPackage ../development/python-modules/lexid { }; + lhapdf = toPythonModule (pkgs.lhapdf.override { + inherit python; + }); + libagent = callPackage ../development/python-modules/libagent { }; pa-ringbuffer = callPackage ../development/python-modules/pa-ringbuffer { }; @@ -6394,6 +6400,8 @@ in { pyspinel = callPackage ../development/python-modules/pyspinel { }; + pyspnego = callPackage ../development/python-modules/pyspnego { }; + pyspotify = callPackage ../development/python-modules/pyspotify { }; pysptk = callPackage ../development/python-modules/pysptk { }; @@ -7784,6 +7792,8 @@ in { smartypants = callPackage ../development/python-modules/smartypants { }; + smbprotocol = callPackage ../development/python-modules/smbprotocol { }; + smbus-cffi = callPackage ../development/python-modules/smbus-cffi { }; smdebug-rulesconfig = callPackage ../development/python-modules/smdebug-rulesconfig { }; |