diff options
477 files changed, 7600 insertions, 3354 deletions
diff --git a/.editorconfig b/.editorconfig index 43970edebe5..129ef84df80 100644 --- a/.editorconfig +++ b/.editorconfig @@ -105,6 +105,13 @@ insert_final_newline = unset indent_size = unset trim_trailing_whitespace = unset +[pkgs/tools/misc/timidity/timidity.cfg] +trim_trailing_whitespace = unset + +[pkgs/tools/security/enpass/data.json] +insert_final_newline = unset +trim_trailing_whitespace = unset + [pkgs/top-level/emscripten-packages.nix] trim_trailing_whitespace = unset diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index cb0264b0167..fd2a6073df6 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -55,7 +55,7 @@ Follow these steps to backport a change into a release branch in compliance with 1. Take note of the commits in which the change was introduced into `master` branch. 2. Check out the target _release branch_, e.g. `release-20.03`. Do not use a _channel branch_ like `nixos-20.03` or `nixpkgs-20.03`. 3. Create a branch for your change, e.g. `git checkout -b backport`. -4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe <original commit>` and add a reason. Otherwise use `git cherry-pick -x <original commit>`. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. +4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe <original commit>` and add a reason. Otherwise use `git cherry-pick -x <original commit>`. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. Please also ensure the commits exists on the master branch; in the case of squashed or rebased merges, the commit hash will change and the new commits can be found in the merge message at the bottom of the master pull request. 5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.03`) 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.03]`. ## Reviewing contributions diff --git a/doc/builders/images/dockertools.xml b/doc/builders/images/dockertools.xml index 126698d0a9e..d881e712a04 100644 --- a/doc/builders/images/dockertools.xml +++ b/doc/builders/images/dockertools.xml @@ -132,11 +132,11 @@ buildImage { <para> By default <function>buildImage</function> will use a static date of one second past the UNIX Epoch. This allows <function>buildImage</function> to produce binary reproducible images. When listing images with <command>docker images</command>, the newly created images will be listed like this: </para> -<screen><![CDATA[ -$ docker images +<screen> +<prompt>$ </prompt>docker images REPOSITORY TAG IMAGE ID CREATED SIZE hello latest 08c791c7846e 48 years ago 25.2MB -]]></screen> +</screen> <para> You can break binary reproducibility but have a sorted, meaningful <literal>CREATED</literal> column by setting <literal>created</literal> to <literal>now</literal>. </para> @@ -152,11 +152,11 @@ pkgs.dockerTools.buildImage { ]]></programlisting> <para> and now the Docker CLI will display a reasonable date and sort the images as expected: -<screen><![CDATA[ -$ docker images +<screen> +<prompt>$ </prompt>docker images REPOSITORY TAG IMAGE ID CREATED SIZE hello latest de2bf4786de6 About a minute ago 25.2MB -]]></screen> +</screen> however, the produced images will not be binary reproducible. </para> </example> diff --git a/doc/builders/images/ocitools.xml b/doc/builders/images/ocitools.xml index e8cd3472f54..f26ed864427 100644 --- a/doc/builders/images/ocitools.xml +++ b/doc/builders/images/ocitools.xml @@ -38,8 +38,7 @@ buildContainer { readonly = false; <co xml:id='ex-ociTools-buildContainer-3' /> } - - </programlisting> +</programlisting> <calloutlist> <callout arearefs='ex-ociTools-buildContainer-1'> <para> diff --git a/doc/builders/packages/citrix.xml b/doc/builders/packages/citrix.xml index 16f1bc6f8f2..803eb2e4fc4 100644 --- a/doc/builders/packages/citrix.xml +++ b/doc/builders/packages/citrix.xml @@ -22,10 +22,10 @@ </para> <para> In order to set this up, you first have to <link xlink:href="https://its.uiowa.edu/support/article/102186">download the <literal>.cr</literal> file from the Netscaler Gateway</link>. After that you can configure the <command>selfservice</command> like this: - <screen> - <prompt>$ </prompt>storebrowse -C ~/Downloads/receiverconfig.cr - <prompt>$ </prompt>selfservice - </screen> +<screen> +<prompt>$ </prompt>storebrowse -C ~/Downloads/receiverconfig.cr +<prompt>$ </prompt>selfservice +</screen> </para> </section> diff --git a/doc/builders/packages/urxvt.xml b/doc/builders/packages/urxvt.xml index 135cc82a0b5..330e056b656 100644 --- a/doc/builders/packages/urxvt.xml +++ b/doc/builders/packages/urxvt.xml @@ -18,10 +18,13 @@ includes all available plugins. To make use of this functionality, use an overlay or directly install an expression that overrides its configuration, such as - <programlisting>rxvt-unicode.override { configure = { availablePlugins, ... }: { +<programlisting> +rxvt-unicode.override { + configure = { availablePlugins, ... }: { plugins = with availablePlugins; [ perls resize-font vtwheel ]; - } -}</programlisting> + }; +} +</programlisting> If the <literal>configure</literal> function returns an attrset without the <literal>plugins</literal> attribute, <literal>availablePlugins</literal> will be used automatically. @@ -30,18 +33,22 @@ <para> In order to add plugins but also keep all default plugins installed, it is possible to use the following method: - <programlisting>rxvt-unicode.override { configure = { availablePlugins, ... }: { - plugins = (builtins.attrValues availablePlugins) ++ [ custom-plugin ]; - }; -}</programlisting> +<programlisting> +rxvt-unicode.override { + configure = { availablePlugins, ... }: { + plugins = (builtins.attrValues availablePlugins) ++ [ custom-plugin ]; + }; +} +</programlisting> </para> <para> To get a list of all the plugins available, open the Nix REPL and run - <programlisting>$ nix repl +<screen> +<prompt>$ </prompt>nix repl :l <nixpkgs> map (p: p.name) pkgs.rxvt-unicode.plugins - </programlisting> +</screen> Alternatively, if your shell is bash or zsh and have completion enabled, simply type <literal>nixpkgs.rxvt-unicode.plugins.<tab></literal>. </para> @@ -53,18 +60,24 @@ map (p: p.name) pkgs.rxvt-unicode.plugins <literal>extraDeps</literal> can be used, for example, to provide <literal>xsel</literal> (a clipboard manager) to the clipboard plugin, without installing it globally: - <programlisting>rxvt-unicode.override { configure = { availablePlugins, ... }: { - pluginsDeps = [ xsel ]; - } -}</programlisting> +<programlisting> +rxvt-unicode.override { + configure = { availablePlugins, ... }: { + pluginsDeps = [ xsel ]; + }; +} +</programlisting> <literal>perlDeps</literal> is a handy way to provide Perl packages to your custom plugins (in <literal>$HOME/.urxvt/ext</literal>). For example, if you need <literal>AnyEvent</literal> you can do: - <programlisting>rxvt-unicode.override { configure = { availablePlugins, ... }: { - perlDeps = with perlPackages; [ AnyEvent ]; - } -}</programlisting> +<programlisting> +rxvt-unicode.override { + configure = { availablePlugins, ... }: { + perlDeps = with perlPackages; [ AnyEvent ]; + }; +} +</programlisting> </para> </section> @@ -90,7 +103,8 @@ map (p: p.name) pkgs.rxvt-unicode.plugins <para> If the plugin is itself a perl package that needs to be imported from other plugins or scripts, add the following passthrough: - <programlisting>passthru.perlPackages = [ "self" ]; +<programlisting> +passthru.perlPackages = [ "self" ]; </programlisting> This will make the urxvt wrapper pick up the dependency and set up the perl path accordingly. diff --git a/doc/contributing/submitting-changes.xml b/doc/contributing/submitting-changes.xml index a88965f5cc6..22389c24ea2 100644 --- a/doc/contributing/submitting-changes.xml +++ b/doc/contributing/submitting-changes.xml @@ -209,12 +209,12 @@ Additional information. </para> <programlisting> - (fetchpatch { - name = "CVE-2019-11068.patch"; - url = "https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch"; - sha256 = "0pkpb4837km15zgg6h57bncp66d5lwrlvkr73h0lanywq7zrwhj8"; - }) - </programlisting> +(fetchpatch { + name = "CVE-2019-11068.patch"; + url = "https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch"; + sha256 = "0pkpb4837km15zgg6h57bncp66d5lwrlvkr73h0lanywq7zrwhj8"; +}) +</programlisting> <para> If a security fix applies to both master and a stable release then, similar to regular changes, they are preferably delivered via master first and cherry-picked to the release branch. diff --git a/doc/languages-frameworks/beam.xml b/doc/languages-frameworks/beam.xml index 1d307e1d6dc..addab24f7f6 100644 --- a/doc/languages-frameworks/beam.xml +++ b/doc/languages-frameworks/beam.xml @@ -72,9 +72,9 @@ To install any of those builders into your profile, refer to them by their attribute path <literal>beamPackages.rebar3</literal>: </para> - <screen> - <prompt>$ </prompt>nix-env -f "<nixpkgs>" -iA beamPackages.rebar3 - </screen> +<screen> +<prompt>$ </prompt>nix-env -f "<nixpkgs>" -iA beamPackages.rebar3 +</screen> </section> <section xml:id="packaging-beam-applications"> diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml index 7cff7a85c62..ebdcf616054 100644 --- a/doc/languages-frameworks/go.xml +++ b/doc/languages-frameworks/go.xml @@ -38,11 +38,7 @@ pet = buildGoModule rec { vendorSha256 = "1879j77k96684wi554rkjxydrj8g3hpp0kvxz03sd8dmwr3lh83j"; <co xml:id='ex-buildGoModule-1' /> - subPackages = [ "." ]; <co xml:id='ex-buildGoModule-2' /> - - deleteVendor = true; <co xml:id='ex-buildGoModule-3' /> - - runVend = true; <co xml:id='ex-buildGoModule-4' /> + runVend = true; <co xml:id='ex-buildGoModule-2' /> meta = with lib; { description = "Simple command-line snippet manager, written in Go"; @@ -65,16 +61,6 @@ pet = buildGoModule rec { </callout> <callout arearefs='ex-buildGoModule-2'> <para> - <varname>subPackages</varname> limits the builder from building child packages that have not been listed. If <varname>subPackages</varname> is not specified, all child packages will be built. - </para> - </callout> - <callout arearefs='ex-buildGoModule-3'> - <para> - <varname>deleteVendor</varname> removes the pre-existing vendor directory and fetches the dependencies. This should only be used if the dependencies included in the vendor folder are broken or incomplete. - </para> - </callout> - <callout arearefs='ex-buildGoModule-4'> - <para> <varname>runVend</varname> runs the vend command to generate the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build. </para> </callout> @@ -82,12 +68,7 @@ pet = buildGoModule rec { </para> <para> - <varname>vendorSha256</varname> can also take <varname>null</varname> as an input. - - When `null` is used as a value, rather than fetching the dependencies - and vendoring them, we use the vendoring included within the source repo. - If you'd like to not have to update this field on dependency changes, - run `go mod vendor` in your source repo and set 'vendorSha256 = null;' + <varname>vendorSha256</varname> can also take <varname>null</varname> as an input. When `null` is used as a value, rather than fetching the dependencies and vendoring them, we use the vendoring included within the source repo. If you'd like to not have to update this field on dependency changes, run `go mod vendor` in your source repo and set 'vendorSha256 = null;' </para> </section> @@ -106,7 +87,6 @@ deis = buildGoPackage rec { version = "1.13.0"; goPackagePath = "github.com/deis/deis"; <co xml:id='ex-buildGoPackage-1' /> - subPackages = [ "client" ]; <co xml:id='ex-buildGoPackage-2' /> src = fetchFromGitHub { owner = "deis"; @@ -115,11 +95,7 @@ deis = buildGoPackage rec { sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw"; }; - goDeps = ./deps.nix; <co xml:id='ex-buildGoPackage-3' /> - - deleteVendor = true; <co xml:id='ex-buildGoPackage-4' /> - - buildFlags = [ "--tags" "release" ]; <co xml:id='ex-buildGoPackage-5' /> + goDeps = ./deps.nix; <co xml:id='ex-buildGoPackage-2' /> } </programlisting> </example> @@ -134,27 +110,9 @@ deis = buildGoPackage rec { </callout> <callout arearefs='ex-buildGoPackage-2'> <para> - <varname>subPackages</varname> limits the builder from building child packages that have not been listed. If <varname>subPackages</varname> is not specified, all child packages will be built. - </para> - <para> - In this example only <literal>github.com/deis/deis/client</literal> will be built. - </para> - </callout> - <callout arearefs='ex-buildGoPackage-3'> - <para> <varname>goDeps</varname> is where the Go dependencies of a Go program are listed as a list of package source identified by Go import path. It could be imported as a separate <varname>deps.nix</varname> file for readability. The dependency data structure is described below. </para> </callout> - <callout arearefs='ex-buildGoPackage-4'> - <para> - <varname>deleteVendor</varname> removes the pre-existing vendor directory. This should only be used if the dependencies included in the vendor folder are broken or incomplete. - </para> - </callout> - <callout arearefs='ex-buildGoPackage-5'> - <para> - <varname>buildFlags</varname> is a list of flags passed to the go build command. - </para> - </callout> </calloutlist> </para> @@ -221,4 +179,70 @@ done </screen> </para> </section> + + <section xml:id="ssec-go-common-attributes"> + <title>Attributes used by the builders</title> + + <para> + Both <link xlink:href="#ssec-go-modules"><varname>buildGoModule</varname></link> and <link xlink:href="#ssec-go-modules"><varname>buildGoPackage</varname></link> can be tweaked to behave slightly differently, if the following attributes are used: + </para> + + <variablelist> + <varlistentry xml:id="var-go-buildFlagsArray"> + <term> + <varname>buildFlagsArray</varname> and <varname>buildFlags</varname> + </term> + <listitem> + <para> + These attributes set build flags supported by <varname>go build</varname>. We recommend using <varname>buildFlagsArray</varname>. The most common use case of these attributes is to make the resulting executable aware of its own version. For example: + </para> + <example xml:id='ex-goBuildFlags-nospaces'> + <title>buildFlagsArray</title> +<programlisting> + buildFlagsArray = [ + "-ldflags=-X main.Version=${version} -X main.Commit=${version}" <co xml:id='ex-goBuildFlags-1' /> + ]; +</programlisting> + </example> + <calloutlist> + <callout arearefs='ex-goBuildFlags-1'> + <para> + Note: single quotes are not needed. + </para> + </callout> + </calloutlist> + <example xml:id='ex-goBuildFlags-noarray'> + <title>buildFlagsArray</title> +<programlisting> + buildFlagsArray = '' + -ldflags= + -X main.Version=${version} + -X main.Commit=${version} + ''; +</programlisting> + </example> + </listitem> + </varlistentry> + <varlistentry xml:id="var-go-deleteVendor"> + <term> + <varname>deleteVendor</varname> + </term> + <listitem> + <para> + Removes the pre-existing vendor directory. This should only be used if the dependencies included in the vendor folder are broken or incomplete. + </para> + </listitem> + </varlistentry> + <varlistentry xml:id="var-go-subPackages"> + <term> + <varname>subPackages</varname> + </term> + <listitem> + <para> + Limits the builder from building child packages that have not been listed. If <varname>subPackages</varname> is not specified, all child packages will be built. + </para> + </listitem> + </varlistentry> + </variablelist> + </section> </section> diff --git a/doc/languages-frameworks/perl.xml b/doc/languages-frameworks/perl.xml index ff0f350e99c..b017c028f64 100644 --- a/doc/languages-frameworks/perl.xml +++ b/doc/languages-frameworks/perl.xml @@ -8,28 +8,28 @@ <para> When executing a Perl script, it is possible you get an error such as <literal>./myscript.pl: bad interpreter: /usr/bin/perl: no such file or directory</literal>. This happens when the script expects Perl to be installed at <filename>/usr/bin/perl</filename>, which is not the case when using Perl from nixpkgs. You can fix the script by changing the first line to: - <programlisting> - #!/usr/bin/env perl - </programlisting> +<programlisting> +#!/usr/bin/env perl +</programlisting> to take the Perl installation from the <literal>PATH</literal> environment variable, or invoke Perl directly with: - <screen> - <prompt>$ </prompt>perl ./myscript.pl - </screen> +<screen> +<prompt>$ </prompt>perl ./myscript.pl +</screen> </para> <para> When the script is using a Perl library that is not installed globally, you might get an error such as <literal>Can't locate DB_File.pm in @INC (you may need to install the DB_File module)</literal>. In that case, you can use <command>nix-shell</command> to start an ad-hoc shell with that library installed, for instance: - <screen> - <prompt>$ </prompt>nix-shell -p perl perlPackages.DBFile --run ./myscript.pl - </screen> +<screen> +<prompt>$ </prompt>nix-shell -p perl perlPackages.DBFile --run ./myscript.pl +</screen> </para> <para> If you are always using the script in places where <command>nix-shell</command> is available, you can embed the <command>nix-shell</command> invocation in the shebang like this: - <programlisting> - #!/usr/bin/env nix-shell - #! nix-shell -i perl -p perl perlPackages.DBFile - </programlisting> +<programlisting> +#!/usr/bin/env nix-shell +#! nix-shell -i perl -p perl perlPackages.DBFile +</programlisting> </para> </section> @@ -44,30 +44,30 @@ <para> Perl packages from CPAN are defined in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link>, rather than <filename>pkgs/all-packages.nix</filename>. Most Perl packages are so straight-forward to build that they are defined here directly, rather than having a separate function for each package called from <filename>perl-packages.nix</filename>. However, more complicated packages should be put in a separate file, typically in <filename>pkgs/development/perl-modules</filename>. Here is an example of the former: - <programlisting> - ClassC3 = buildPerlPackage rec { - name = "Class-C3-0.21"; - src = fetchurl { - url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; - sha256 = "1bl8z095y4js66pwxnm7s853pi9czala4sqc743fdlnk27kq94gz"; - }; - }; - </programlisting> +<programlisting> +ClassC3 = buildPerlPackage rec { + name = "Class-C3-0.21"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; + sha256 = "1bl8z095y4js66pwxnm7s853pi9czala4sqc743fdlnk27kq94gz"; + }; +}; +</programlisting> Note the use of <literal>mirror://cpan/</literal>, and the <literal>${name}</literal> in the URL definition to ensure that the name attribute is consistent with the source that we’re actually downloading. Perl packages are made available in <filename>all-packages.nix</filename> through the variable <varname>perlPackages</varname>. For instance, if you have a package that needs <varname>ClassC3</varname>, you would typically write - <programlisting> - foo = import ../path/to/foo.nix { - inherit stdenv fetchurl ...; - inherit (perlPackages) ClassC3; - }; - </programlisting> +<programlisting> +foo = import ../path/to/foo.nix { + inherit stdenv fetchurl ...; + inherit (perlPackages) ClassC3; +}; +</programlisting> in <filename>all-packages.nix</filename>. You can test building a Perl package as follows: - <screen> - <prompt>$ </prompt>nix-build -A perlPackages.ClassC3 - </screen> +<screen> +<prompt>$ </prompt>nix-build -A perlPackages.ClassC3 +</screen> <varname>buildPerlPackage</varname> adds <literal>perl-</literal> to the start of the name attribute, so the package above is actually called <literal>perl-Class-C3-0.21</literal>. So to install it, you can say: - <screen> - <prompt>$ </prompt>nix-env -i perl-Class-C3 - </screen> +<screen> +<prompt>$ </prompt>nix-env -i perl-Class-C3 +</screen> (Of course you can also install using the attribute name: <literal>nix-env -i -A perlPackages.ClassC3</literal>.) </para> @@ -94,61 +94,61 @@ <para> <varname>buildPerlPackage</varname> is built on top of <varname>stdenv</varname>, so everything can be customised in the usual way. For instance, the <literal>BerkeleyDB</literal> module has a <varname>preConfigure</varname> hook to generate a configuration file used by <filename>Makefile.PL</filename>: - <programlisting> - { buildPerlPackage, fetchurl, db }: - - buildPerlPackage rec { - name = "BerkeleyDB-0.36"; - - src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; - sha256 = "07xf50riarb60l1h6m2dqmql8q5dij619712fsgw7ach04d8g3z1"; - }; - - preConfigure = '' - echo "LIB = ${db.out}/lib" > config.in - echo "INCLUDE = ${db.dev}/include" >> config.in - ''; - } - </programlisting> +<programlisting> +{ buildPerlPackage, fetchurl, db }: + +buildPerlPackage rec { + name = "BerkeleyDB-0.36"; + + src = fetchurl { + url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz"; + sha256 = "07xf50riarb60l1h6m2dqmql8q5dij619712fsgw7ach04d8g3z1"; + }; + + preConfigure = '' + echo "LIB = ${db.out}/lib" > config.in + echo "INCLUDE = ${db.dev}/include" >> config.in + ''; +} +</programlisting> </para> <para> Dependencies on other Perl packages can be specified in the <varname>buildInputs</varname> and <varname>propagatedBuildInputs</varname> attributes. If something is exclusively a build-time dependency, use <varname>buildInputs</varname>; if it’s (also) a runtime dependency, use <varname>propagatedBuildInputs</varname>. For instance, this builds a Perl module that has runtime dependencies on a bunch of other modules: - <programlisting> - ClassC3Componentised = buildPerlPackage rec { - name = "Class-C3-Componentised-1.0004"; - src = fetchurl { - url = "mirror://cpan/authors/id/A/AS/ASH/${name}.tar.gz"; - sha256 = "0xql73jkcdbq4q9m0b0rnca6nrlvf5hyzy8is0crdk65bynvs8q1"; - }; - propagatedBuildInputs = [ - ClassC3 ClassInspector TestException MROCompat - ]; - }; - </programlisting> +<programlisting> +ClassC3Componentised = buildPerlPackage rec { + name = "Class-C3-Componentised-1.0004"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AS/ASH/${name}.tar.gz"; + sha256 = "0xql73jkcdbq4q9m0b0rnca6nrlvf5hyzy8is0crdk65bynvs8q1"; + }; + propagatedBuildInputs = [ + ClassC3 ClassInspector TestException MROCompat + ]; +}; +</programlisting> </para> <para> On Darwin, if a script has too many <literal>-I<replaceable>dir</replaceable></literal> flags in its first line (its “shebang line”), it will not run. This can be worked around by calling the <literal>shortenPerlShebang</literal> function from the <literal>postInstall</literal> phase: - <programlisting> - { stdenv, buildPerlPackage, fetchurl, shortenPerlShebang }: - - ImageExifTool = buildPerlPackage { - pname = "Image-ExifTool"; - version = "11.50"; - - src = fetchurl { - url = "https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-11.50.tar.gz"; - sha256 = "0d8v48y94z8maxkmw1rv7v9m0jg2dc8xbp581njb6yhr7abwqdv3"; - }; - - buildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = stdenv.lib.optional stdenv.isDarwin '' - shortenPerlShebang $out/bin/exiftool - ''; - }; - </programlisting> +<programlisting> +{ stdenv, buildPerlPackage, fetchurl, shortenPerlShebang }: + +ImageExifTool = buildPerlPackage { + pname = "Image-ExifTool"; + version = "11.50"; + + src = fetchurl { + url = "https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-11.50.tar.gz"; + sha256 = "0d8v48y94z8maxkmw1rv7v9m0jg2dc8xbp581njb6yhr7abwqdv3"; + }; + + buildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = stdenv.lib.optional stdenv.isDarwin '' + shortenPerlShebang $out/bin/exiftool + ''; +}; +</programlisting> This will remove the <literal>-I</literal> flags from the shebang line, rewrite them in the <literal>use lib</literal> form, and put them on the next line instead. This function can be given any number of Perl scripts as arguments; it will modify them in-place. </para> @@ -159,27 +159,27 @@ Nix expressions for Perl packages can be generated (almost) automatically from CPAN. This is done by the program <command>nix-generate-from-cpan</command>, which can be installed as follows: </para> - <screen> - <prompt>$ </prompt>nix-env -i nix-generate-from-cpan - </screen> +<screen> +<prompt>$ </prompt>nix-env -i nix-generate-from-cpan +</screen> <para> This program takes a Perl module name, looks it up on CPAN, fetches and unpacks the corresponding package, and prints a Nix expression on standard output. For example: - <screen> - <prompt>$ </prompt>nix-generate-from-cpan XML::Simple - XMLSimple = buildPerlPackage rec { - name = "XML-Simple-2.22"; - src = fetchurl { - url = "mirror://cpan/authors/id/G/GR/GRANTM/${name}.tar.gz"; - sha256 = "b9450ef22ea9644ae5d6ada086dc4300fa105be050a2030ebd4efd28c198eb49"; - }; - propagatedBuildInputs = [ XMLNamespaceSupport XMLSAX XMLSAXExpat ]; - meta = { - description = "An API for simple XML files"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; - </screen> +<screen> +<prompt>$ </prompt>nix-generate-from-cpan XML::Simple + XMLSimple = buildPerlPackage rec { + name = "XML-Simple-2.22"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GR/GRANTM/${name}.tar.gz"; + sha256 = "b9450ef22ea9644ae5d6ada086dc4300fa105be050a2030ebd4efd28c198eb49"; + }; + propagatedBuildInputs = [ XMLNamespaceSupport XMLSAX XMLSAXExpat ]; + meta = { + description = "An API for simple XML files"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; +</screen> The output can be pasted into <filename>pkgs/top-level/perl-packages.nix</filename> or wherever else you need it. </para> </section> diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index f189ce31448..e2d9172919e 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -567,7 +567,7 @@ test run would be: checkPhase = "pytest"; ``` -However, many repositories' test suites do not translate well to nix's build +However, many repositories' test suites do not translate well to nix's build sandbox, and will generally need many tests to be disabled. To filter tests using pytest, one can do the following: diff --git a/doc/languages-frameworks/qt.xml b/doc/languages-frameworks/qt.xml index 8d97de504ad..ec95621d8ff 100644 --- a/doc/languages-frameworks/qt.xml +++ b/doc/languages-frameworks/qt.xml @@ -18,7 +18,7 @@ mkDerivation { <co xml:id='qt-default-nix-co-2' /> buildInputs = [ qtbase ]; <co xml:id='qt-default-nix-co-3' /> } - </programlisting> +</programlisting> </example> <calloutlist> diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml index 9b36801fb96..9b579d6804f 100644 --- a/doc/languages-frameworks/ruby.xml +++ b/doc/languages-frameworks/ruby.xml @@ -12,14 +12,14 @@ </para> <screen> -<![CDATA[$ cd pkgs/servers/monitoring -$ mkdir sensu -$ cd sensu -$ cat > Gemfile +<prompt>$ </prompt>cd pkgs/servers/monitoring +<prompt>$ </prompt>mkdir sensu +<prompt>$ </prompt>cd sensu +<prompt>$ </prompt>cat > Gemfile source 'https://rubygems.org' gem 'sensu' -$ $(nix-build '<nixpkgs>' -A bundix --no-out-link)/bin/bundix --magic -$ cat > default.nix +<prompt>$ </prompt>$(nix-build '<nixpkgs>' -A bundix --no-out-link)/bin/bundix --magic +<prompt>$ </prompt>cat > default.nix { lib, bundlerEnv, ruby }: bundlerEnv rec { @@ -37,7 +37,7 @@ bundlerEnv rec { maintainers = with maintainers; [ theuni ]; platforms = platforms.unix; }; -}]]> +} </screen> <para> @@ -49,17 +49,16 @@ bundlerEnv rec { </para> <screen> -<![CDATA[$ cd pkgs/servers/monitoring/sensu -$ nix-shell -p bundler --run 'bundle lock --update' -$ nix-shell -p bundix --run 'bundix' -]]> +<prompt>$ </prompt>cd pkgs/servers/monitoring/sensu +<prompt>$ </prompt>nix-shell -p bundler --run 'bundle lock --update' +<prompt>$ </prompt>nix-shell -p bundix --run 'bundix' </screen> <para> For tools written in Ruby - i.e. where the desire is to install a package and then execute e.g. <command>rake</command> at the command line, there is an alternative builder called <literal>bundlerApp</literal>. Set up the <filename>gemset.nix</filename> the same way, and then, for example: </para> -<screen> +<programlisting> <![CDATA[{ lib, bundlerApp }: bundlerApp { @@ -75,7 +74,7 @@ bundlerApp { platforms = platforms.unix; }; }]]> -</screen> +</programlisting> <para> The chief advantage of <literal>bundlerApp</literal> over <literal>bundlerEnv</literal> is the executables introduced in the environment are precisely those selected in the <literal>exes</literal> list, as opposed to <literal>bundlerEnv</literal> which adds all the executables made available by gems in the gemset, which can mean e.g. <command>rspec</command> or <command>rake</command> in unpredictable versions available from various packages. diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 7f9d93216ed..0e1d59e1a95 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -119,6 +119,18 @@ The above are just guidelines, and exceptions may be granted on a case-by-case b However, please check if it's possible to disable a problematic subset of the test suite and leave a comment explaining your reasoning. +#### Setting `test-threads` + +`buildRustPackage` will use parallel test threads by default, +sometimes it may be necessary to disable this so the tests run consecutively. + +```nix +rustPlatform.buildRustPackage { + /* ... */ + cargoParallelTestThreads = false; +} +``` + ### Building a package in `debug` mode By default, `buildRustPackage` will use `release` mode for builds. If a package diff --git a/doc/languages-frameworks/texlive.xml b/doc/languages-frameworks/texlive.xml index a581ec5911c..141c46e5a62 100644 --- a/doc/languages-frameworks/texlive.xml +++ b/doc/languages-frameworks/texlive.xml @@ -44,11 +44,11 @@ texlive.combine { <listitem> <para> You can list packages e.g. by <command>nix repl</command>. -<programlisting><![CDATA[ -$ nix repl -nix-repl> :l <nixpkgs> -nix-repl> texlive.collection-<TAB> -]]></programlisting> +<programlisting> +<prompt>$ </prompt>nix repl +<prompt>nix-repl> </prompt>:l <nixpkgs> +<prompt>nix-repl> </prompt>texlive.collection-<keycap function="tab" /> +</programlisting> </para> </listitem> <listitem> diff --git a/doc/manual.xml b/doc/manual.xml index 1f69872d2a7..4ca497e234e 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -1,7 +1,7 @@ <book xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude"> <info> - <title>Nixpkgs Users and Contributors Guide</title> + <title>Nixpkgs Manual</title> <subtitle>Version <xi:include href=".version" parse="text" /> </subtitle> </info> diff --git a/doc/stdenv/multiple-output.xml b/doc/stdenv/multiple-output.xml index 0f177ec719f..20658918db7 100644 --- a/doc/stdenv/multiple-output.xml +++ b/doc/stdenv/multiple-output.xml @@ -67,7 +67,7 @@ <para> <command>nix-env</command> silenty disregards the outputs selected by the user, and instead installs the outputs from <varname>meta.outputsToInstall</varname>. For example, </para> -<programlisting>$ nix-env -iA nixpkgs.coreutils.info</programlisting> +<screen><prompt>$ </prompt>nix-env -iA nixpkgs.coreutils.info</screen> <para> installs the <literal>"out"</literal> output (<varname>coreutils.meta.outputsToInstall</varname> is <literal>[ "out" ]</literal>) instead of the requested <literal>"info"</literal>. </para> diff --git a/doc/using/configuration.xml b/doc/using/configuration.xml index b670f78f28b..3e21b0e2284 100644 --- a/doc/using/configuration.xml +++ b/doc/using/configuration.xml @@ -66,7 +66,7 @@ <listitem> <para> For allowing the build of a broken package once, you can use an environment variable for a single invocation of the nix tools: -<programlisting>$ export NIXPKGS_ALLOW_BROKEN=1</programlisting> +<screen><prompt>$ </prompt>export NIXPKGS_ALLOW_BROKEN=1</screen> </para> </listitem> <listitem> @@ -92,7 +92,7 @@ <listitem> <para> For allowing the build of an unsupported package once, you can use an environment variable for a single invocation of the nix tools: -<programlisting>$ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1</programlisting> +<screen><prompt>$ </prompt>export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1</screen> </para> </listitem> <listitem> @@ -122,7 +122,7 @@ <listitem> <para> To temporarily allow all unfree packages, you can use an environment variable for a single invocation of the nix tools: -<programlisting>$ export NIXPKGS_ALLOW_UNFREE=1</programlisting> +<screen><prompt>$ </prompt>export NIXPKGS_ALLOW_UNFREE=1</screen> </para> </listitem> <listitem> @@ -187,7 +187,7 @@ <listitem> <para> To temporarily allow all insecure packages, you can use an environment variable for a single invocation of the nix tools: -<programlisting>$ export NIXPKGS_ALLOW_INSECURE=1</programlisting> +<screen><prompt>$ </prompt>export NIXPKGS_ALLOW_INSECURE=1</screen> </para> </listitem> <listitem> diff --git a/doc/using/overlays.xml b/doc/using/overlays.xml index f6e02b969ea..4937e950885 100644 --- a/doc/using/overlays.xml +++ b/doc/using/overlays.xml @@ -240,7 +240,7 @@ self: super: lapackProvider = self.mkl; } } - </programlisting> +</programlisting> <para> This overlay uses Intel’s MKL library for both BLAS and LAPACK interfaces. Note that the same can be accomplished at runtime @@ -248,9 +248,9 @@ self: super: <literal>libblas.so.3</literal> and <literal>liblapack.so.3</literal>. For instance: </para> - <programlisting> -$ LD_LIBRARY_PATH=$(nix-build -A mkl)/lib:$LD_LIBRARY_PATH nix-shell -p octave --run octave - </programlisting> +<screen> +<prompt>$ </prompt>LD_LIBRARY_PATH=$(nix-build -A mkl)/lib:$LD_LIBRARY_PATH nix-shell -p octave --run octave +</screen> <para> Intel MKL requires an <literal>openmp</literal> implementation when running with multiple processors. By default, @@ -288,7 +288,7 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation { ... } - </programlisting> +</programlisting> </section> </section> </chapter> diff --git a/flake.nix b/flake.nix index e7c04417ac8..8440c460b16 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,6 @@ outputs = { self }: let - jobs = import ./pkgs/top-level/release.nix { nixpkgs = self; }; @@ -28,10 +27,31 @@ lib = lib.extend (final: prev: { nixosSystem = { modules, ... } @ args: import ./nixos/lib/eval-config.nix (args // { - modules = modules ++ - [ { system.nixos.versionSuffix = + modules = + let + vmConfig = (import ./nixos/lib/eval-config.nix + (args // { + modules = modules ++ [ ./nixos/modules/virtualisation/qemu-vm.nix ]; + })).config; + + vmWithBootLoaderConfig = (import ./nixos/lib/eval-config.nix + (args // { + modules = modules ++ [ + ./nixos/modules/virtualisation/qemu-vm.nix + { virtualisation.useBootLoader = true; } + ]; + })).config; + in + modules ++ [ + { + system.nixos.versionSuffix = ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified)}.${self.shortRev or "dirty"}"; system.nixos.revision = final.mkIf (self ? rev) self.rev; + + system.build = { + vm = vmConfig.system.build.vm; + vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm; + }; } ]; }); diff --git a/lib/generators.nix b/lib/generators.nix index abd237eb7d3..501a23599f4 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -203,40 +203,59 @@ rec { /* If this option is true, attrsets like { __pretty = fn; val = …; } will use fn to convert val to a pretty printed representation. (This means fn is type Val -> String.) */ - allowPrettyValues ? false - }@args: v: with builtins; + allowPrettyValues ? false, + /* If this option is true, the output is indented with newlines for attribute sets and lists */ + multiline ? true + }@args: let + go = indent: v: with builtins; let isPath = v: typeOf v == "path"; + introSpace = if multiline then "\n${indent} " else " "; + outroSpace = if multiline then "\n${indent}" else " "; in if isInt v then toString v else if isFloat v then "~${toString v}" - else if isString v then ''"${libStr.escape [''"''] v}"'' + else if isString v then + let + # Separate a string into its lines + newlineSplits = filter (v: ! isList v) (builtins.split "\n" v); + # For a '' string terminated by a \n, which happens when the closing '' is on a new line + multilineResult = "''" + introSpace + concatStringsSep introSpace (lib.init newlineSplits) + outroSpace + "''"; + # For a '' string not terminated by a \n, which happens when the closing '' is not on a new line + multilineResult' = "''" + introSpace + concatStringsSep introSpace newlineSplits + "''"; + # For single lines, replace all newlines with their escaped representation + singlelineResult = "\"" + libStr.escape [ "\"" ] (concatStringsSep "\\n" newlineSplits) + "\""; + in if multiline && length newlineSplits > 1 then + if lib.last newlineSplits == "" then multilineResult else multilineResult' + else singlelineResult else if true == v then "true" else if false == v then "false" else if null == v then "null" else if isPath v then toString v - else if isList v then "[ " - + libStr.concatMapStringsSep " " (toPretty args) v - + " ]" + else if isList v then + if v == [] then "[ ]" + else "[" + introSpace + + libStr.concatMapStringsSep introSpace (go (indent + " ")) v + + outroSpace + "]" + else if isFunction v then + let fna = lib.functionArgs v; + showFnas = concatStringsSep ", " (libAttr.mapAttrsToList + (name: hasDefVal: if hasDefVal then name + "?" else name) + fna); + in if fna == {} then "<function>" + else "<function, args: {${showFnas}}>" else if isAttrs v then # apply pretty values if allowed if attrNames v == [ "__pretty" "val" ] && allowPrettyValues then v.__pretty v.val - # TODO: there is probably a better representation? + else if v == {} then "{ }" else if v ? type && v.type == "derivation" then - "<δ:${v.name}>" - # "<δ:${concatStringsSep "," (builtins.attrNames v)}>" - else "{ " - + libStr.concatStringsSep " " (libAttr.mapAttrsToList + "<derivation ${v.drvPath}>" + else "{" + introSpace + + libStr.concatStringsSep introSpace (libAttr.mapAttrsToList (name: value: - "${toPretty args name} = ${toPretty args value};") v) - + " }" - else if isFunction v then - let fna = lib.functionArgs v; - showFnas = concatStringsSep "," (libAttr.mapAttrsToList - (name: hasDefVal: if hasDefVal then "(${name})" else name) - fna); - in if fna == {} then "<λ>" - else "<λ:{${showFnas}}>" + "${libStr.escapeNixIdentifier name} = ${go (indent + " ") value};") v) + + outroSpace + "}" else abort "generators.toPretty: should never happen (v = ${v})"; + in go ""; # PLIST handling toPlist = {}: v: let diff --git a/lib/modules.nix b/lib/modules.nix index 412c7f1df71..02a669df659 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -117,7 +117,7 @@ rec { if config._module.check && config._module.freeformType == null && merged.unmatchedDefns != [] then let firstDef = head merged.unmatchedDefns; - baseMsg = "The option `${showOption (prefix ++ firstDef.prefix)}' defined in `${firstDef.file}' does not exist."; + baseMsg = "The option `${showOption (prefix ++ firstDef.prefix)}' does not exist. Definition values:${showDefs [ firstDef ]}"; in if attrNames options == [ "_module" ] then throw '' @@ -449,7 +449,13 @@ rec { # Handle properties, check types, and merge everything together. res = if opt.readOnly or false && length defs' > 1 then - throw "The option `${showOption loc}' is read-only, but it's set multiple times." + let + # For a better error message, evaluate all readOnly definitions as + # if they were the only definition. + separateDefs = map (def: def // { + value = (mergeDefinitions loc opt.type [ def ]).mergedValue; + }) defs'; + in throw "The option `${showOption loc}' is read-only, but it's set multiple times. Definition values:${showDefs separateDefs}" else mergeDefinitions loc opt.type defs'; @@ -497,8 +503,8 @@ rec { mergedValue = if isDefined then if all (def: type.check def.value) defsFinal then type.merge loc defsFinal - else let firstInvalid = findFirst (def: ! type.check def.value) null defsFinal; - in throw "The option value `${showOption loc}' in `${firstInvalid.file}' is not of type `${type.description}'." + else let allInvalid = filter (def: ! type.check def.value) defsFinal; + in throw "A definition for option `${showOption loc}' is not of type `${type.description}'. Definition values:${showDefs allInvalid}" else # (nixos-option detects this specific error message and gives it special # handling. If changed here, please change it there too.) diff --git a/lib/options.nix b/lib/options.nix index 38f4f1329f2..5b7482c8093 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -96,22 +96,26 @@ rec { else if all isBool list then foldl' lib.or false list else if all isString list then lib.concatStrings list else if all isInt list && all (x: x == head list) list then head list - else throw "Cannot merge definitions of `${showOption loc}' given in ${showFiles (getFiles defs)}."; + else throw "Cannot merge definitions of `${showOption loc}'. Definition values:${showDefs defs}"; mergeOneOption = loc: defs: if defs == [] then abort "This case should never happen." else if length defs != 1 then - throw "The unique option `${showOption loc}' is defined multiple times, in:\n - ${concatStringsSep "\n - " (getFiles defs)}." + throw "The unique option `${showOption loc}' is defined multiple times. Definition values:${showDefs defs}" else (head defs).value; /* "Merge" option definitions by checking that they all have the same value. */ mergeEqualOption = loc: defs: if defs == [] then abort "This case should never happen." - else foldl' (val: def: - if def.value != val then - throw "The option `${showOption loc}' has conflicting definitions, in ${showFiles (getFiles defs)}." + # Return early if we only have one element + # This also makes it work for functions, because the foldl' below would try + # to compare the first element with itself, which is false for functions + else if length defs == 1 then (elemAt defs 0).value + else (foldl' (first: def: + if def.value != first.value then + throw "The option `${showOption loc}' has conflicting definition values:${showDefs [ first def ]}" else - val) (head defs).value defs; + first) (head defs) defs).value; /* Extracts values of all "value" keys of the given list. @@ -209,6 +213,24 @@ rec { else escaped; in (concatStringsSep ".") (map escapeOptionPart parts); showFiles = files: concatStringsSep " and " (map (f: "`${f}'") files); + + showDefs = defs: concatMapStrings (def: + let + # Pretty print the value for display, if successful + prettyEval = builtins.tryEval (lib.generators.toPretty {} def.value); + # Split it into its lines + lines = filter (v: ! isList v) (builtins.split "\n" prettyEval.value); + # Only display the first 5 lines, and indent them for better visibility + value = concatStringsSep "\n " (take 5 lines ++ optional (length lines > 5) "..."); + result = + # Don't print any value if evaluating the value strictly fails + if ! prettyEval.success then "" + # Put it on a new line if it consists of multiple + else if length lines > 1 then ":\n " + value + else ": " + value; + in "\n- In `${def.file}'${result}" + ) defs; + unknownModule = "<unknown-file>"; } diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index fb7d722e737..517a7296afd 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -50,32 +50,35 @@ in { none = []; - arm = filterDoubles predicates.isAarch32; - aarch64 = filterDoubles predicates.isAarch64; - x86 = filterDoubles predicates.isx86; - i686 = filterDoubles predicates.isi686; - x86_64 = filterDoubles predicates.isx86_64; - mips = filterDoubles predicates.isMips; - riscv = filterDoubles predicates.isRiscV; - vc4 = filterDoubles predicates.isVc4; - js = filterDoubles predicates.isJavaScript; - - cygwin = filterDoubles predicates.isCygwin; - darwin = filterDoubles predicates.isDarwin; - freebsd = filterDoubles predicates.isFreeBSD; + arm = filterDoubles predicates.isAarch32; + aarch64 = filterDoubles predicates.isAarch64; + x86 = filterDoubles predicates.isx86; + i686 = filterDoubles predicates.isi686; + x86_64 = filterDoubles predicates.isx86_64; + mips = filterDoubles predicates.isMips; + riscv = filterDoubles predicates.isRiscV; + vc4 = filterDoubles predicates.isVc4; + js = filterDoubles predicates.isJavaScript; + + bigEndian = filterDoubles predicates.isBigEndian; + littleEndian = filterDoubles predicates.isLittleEndian; + + cygwin = filterDoubles predicates.isCygwin; + darwin = filterDoubles predicates.isDarwin; + freebsd = filterDoubles predicates.isFreeBSD; # Should be better, but MinGW is unclear. - gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; }); - illumos = filterDoubles predicates.isSunOS; - linux = filterDoubles predicates.isLinux; - netbsd = filterDoubles predicates.isNetBSD; - openbsd = filterDoubles predicates.isOpenBSD; - unix = filterDoubles predicates.isUnix; - wasi = filterDoubles predicates.isWasi; - redox = filterDoubles predicates.isRedox; - windows = filterDoubles predicates.isWindows; - genode = filterDoubles predicates.isGenode; - - embedded = filterDoubles predicates.isNone; + gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }) ++ filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; }); + illumos = filterDoubles predicates.isSunOS; + linux = filterDoubles predicates.isLinux; + netbsd = filterDoubles predicates.isNetBSD; + openbsd = filterDoubles predicates.isOpenBSD; + unix = filterDoubles predicates.isUnix; + wasi = filterDoubles predicates.isWasi; + redox = filterDoubles predicates.isRedox; + windows = filterDoubles predicates.isWindows; + genode = filterDoubles predicates.isGenode; + + embedded = filterDoubles predicates.isNone; mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "armv7a-linux" "aarch64-linux" "powerpc64le-linux"]; } diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 03eff4ce48b..3a6db53c276 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -445,32 +445,90 @@ runTests { expected = builtins.toJSON val; }; - testToPretty = { - expr = mapAttrs (const (generators.toPretty {})) rec { + testToPretty = + let + deriv = derivation { name = "test"; builder = "/bin/sh"; system = builtins.currentSystem; }; + in { + expr = mapAttrs (const (generators.toPretty { multiline = false; })) rec { int = 42; float = 0.1337; bool = true; + emptystring = ""; string = ''fno"rd''; + newlinestring = "\n"; path = /. + "/foo"; null_ = null; function = x: x; functionArgs = { arg ? 4, foo }: arg; list = [ 3 4 function [ false ] ]; + emptylist = []; attrs = { foo = null; "foo bar" = "baz"; }; - drv = derivation { name = "test"; system = builtins.currentSystem; }; + emptyattrs = {}; + drv = deriv; }; expected = rec { int = "42"; float = "~0.133700"; bool = "true"; + emptystring = ''""''; string = ''"fno\"rd"''; + newlinestring = "\"\\n\""; path = "/foo"; null_ = "null"; - function = "<λ>"; - functionArgs = "<λ:{(arg),foo}>"; + function = "<function>"; + functionArgs = "<function, args: {arg?, foo}>"; list = "[ 3 4 ${function} [ false ] ]"; - attrs = "{ \"foo\" = null; \"foo bar\" = \"baz\"; }"; - drv = "<δ:test>"; + emptylist = "[ ]"; + attrs = "{ foo = null; \"foo bar\" = \"baz\"; }"; + emptyattrs = "{ }"; + drv = "<derivation ${deriv.drvPath}>"; + }; + }; + + testToPrettyMultiline = { + expr = mapAttrs (const (generators.toPretty { })) rec { + list = [ 3 4 [ false ] ]; + attrs = { foo = null; bar.foo = "baz"; }; + newlinestring = "\n"; + multilinestring = '' + hello + there + test + ''; + multilinestring' = '' + hello + there + test''; + }; + expected = rec { + list = '' + [ + 3 + 4 + [ + false + ] + ]''; + attrs = '' + { + bar = { + foo = "baz"; + }; + foo = null; + }''; + newlinestring = "''\n \n''"; + multilinestring = '' + ''' + hello + there + test + '''''; + multilinestring' = '' + ''' + hello + there + test'''''; + }; }; diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 943deebe3c0..309c5311361 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -49,7 +49,7 @@ checkConfigError() { reportFailure "$@" return 1 else - if echo "$err" | grep --silent "$errorContains" ; then + if echo "$err" | grep -zP --silent "$errorContains" ; then pass=$((pass + 1)) return 0; else @@ -62,17 +62,17 @@ checkConfigError() { # Check boolean option. checkConfigOutput "false" config.enable ./declare-enable.nix -checkConfigError 'The option .* defined in .* does not exist.' config.enable ./define-enable.nix +checkConfigError 'The option .* does not exist. Definition values:\n- In .*: true' config.enable ./define-enable.nix # Check integer types. # unsigned checkConfigOutput "42" config.value ./declare-int-unsigned-value.nix ./define-value-int-positive.nix -checkConfigError 'The option value .* in .* is not of type.*unsigned integer.*' config.value ./declare-int-unsigned-value.nix ./define-value-int-negative.nix +checkConfigError 'A definition for option .* is not of type.*unsigned integer.*. Definition values:\n- In .*: -23' config.value ./declare-int-unsigned-value.nix ./define-value-int-negative.nix # positive -checkConfigError 'The option value .* in .* is not of type.*positive integer.*' config.value ./declare-int-positive-value.nix ./define-value-int-zero.nix +checkConfigError 'A definition for option .* is not of type.*positive integer.*. Definition values:\n- In .*: 0' config.value ./declare-int-positive-value.nix ./define-value-int-zero.nix # between checkConfigOutput "42" config.value ./declare-int-between-value.nix ./define-value-int-positive.nix -checkConfigError 'The option value .* in .* is not of type.*between.*-21 and 43.*inclusive.*' config.value ./declare-int-between-value.nix ./define-value-int-negative.nix +checkConfigError 'A definition for option .* is not of type.*between.*-21 and 43.*inclusive.*. Definition values:\n- In .*: -23' config.value ./declare-int-between-value.nix ./define-value-int-negative.nix # Check either types # types.either @@ -125,7 +125,7 @@ checkConfigOutput 'true' "$@" ./define-enable.nix ./define-attrsOfSub-foo-enable set -- config.enable ./define-enable.nix ./declare-enable.nix checkConfigOutput "true" "$@" checkConfigOutput "false" "$@" ./disable-define-enable.nix -checkConfigError "The option .*enable.* defined in .* does not exist" "$@" ./disable-declare-enable.nix +checkConfigError "The option .*enable.* does not exist. Definition values:\n- In .*: true" "$@" ./disable-declare-enable.nix checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-define-enable.nix ./disable-declare-enable.nix checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-enable-modules.nix @@ -142,17 +142,17 @@ checkConfigError 'infinite recursion encountered' "$@" # Check _module.check. set -- config.enable ./declare-enable.nix ./define-enable.nix ./define-attrsOfSub-foo.nix -checkConfigError 'The option .* defined in .* does not exist.' "$@" +checkConfigError 'The option .* does not exist. Definition values:\n- In .*' "$@" checkConfigOutput "true" "$@" ./define-module-check.nix # Check coerced value. checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix -checkConfigError 'The option value .* in .* is not.*string or signed integer convertible to it' config.value ./declare-coerced-value.nix ./define-value-list.nix +checkConfigError 'A definition for option .* is not.*string or signed integer convertible to it.*. Definition values:\n- In .*: \[ \]' config.value ./declare-coerced-value.nix ./define-value-list.nix # Check coerced value with unsound coercion checkConfigOutput "12" config.value ./declare-coerced-value-unsound.nix -checkConfigError 'The option value .* in .* is not.*8 bit signed integer.* or string convertible to it' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix +checkConfigError 'A definition for option .* is not of type .*. Definition values:\n- In .*: "1000"' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix checkConfigError 'unrecognised JSON value' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix # Check mkAliasOptionModule. @@ -183,7 +183,7 @@ checkConfigOutput "true" config.submodule.enable ./declare-submoduleWith-path.ni checkConfigOutput "true" config.enable ./disable-recursive/main.nix checkConfigOutput "true" config.enable ./disable-recursive/{main.nix,disable-foo.nix} checkConfigOutput "true" config.enable ./disable-recursive/{main.nix,disable-bar.nix} -checkConfigError 'The option .* defined in .* does not exist' config.enable ./disable-recursive/{main.nix,disable-foo.nix,disable-bar.nix} +checkConfigError 'The option .* does not exist. Definition values:\n- In .*: true' config.enable ./disable-recursive/{main.nix,disable-foo.nix,disable-bar.nix} # Check that imports can depend on derivations checkConfigOutput "true" config.enable ./import-from-store.nix @@ -207,7 +207,7 @@ checkConfigOutput "empty" config.value.foo ./declare-lazyAttrsOf.nix ./attrsOf-c # Even with multiple assignments, a type error should be thrown if any of them aren't valid -checkConfigError 'The option value .* in .* is not of type .*' \ +checkConfigError 'A definition for option .* is not of type .*' \ config.value ./declare-int-unsigned-value.nix ./define-value-list.nix ./define-value-int-positive.nix ## Freeform modules @@ -216,7 +216,7 @@ checkConfigOutput 24 config.value ./freeform-attrsOf.nix ./define-value-string.n # No freeform assigments shouldn't make it error checkConfigOutput '{ }' config ./freeform-attrsOf.nix # but only if the type matches -checkConfigError 'The option value .* in .* is not of type .*' config.value ./freeform-attrsOf.nix ./define-value-list.nix +checkConfigError 'A definition for option .* is not of type .*' config.value ./freeform-attrsOf.nix ./define-value-list.nix # and properties should be applied checkConfigOutput yes config.value ./freeform-attrsOf.nix ./define-value-string-properties.nix # Options should still be declarable, and be able to have a type that doesn't match the freeform type @@ -233,6 +233,35 @@ checkConfigError 'infinite recursion encountered' config.foo ./freeform-attrsOf. checkConfigError 'The option .* is used but not defined' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix checkConfigOutput 24 config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix ./define-value-string.nix +## types.anything +# Check that attribute sets are merged recursively +checkConfigOutput null config.value.foo ./types-anything/nested-attrs.nix +checkConfigOutput null config.value.l1.foo ./types-anything/nested-attrs.nix +checkConfigOutput null config.value.l1.l2.foo ./types-anything/nested-attrs.nix +checkConfigOutput null config.value.l1.l2.l3.foo ./types-anything/nested-attrs.nix +# Attribute sets that are coercible to strings shouldn't be recursed into +checkConfigOutput foo config.value.outPath ./types-anything/attrs-coercible.nix +# Multiple lists aren't concatenated together +checkConfigError 'The option .* has conflicting definitions' config.value ./types-anything/lists.nix +# Check that all equalizable atoms can be used as long as all definitions are equal +checkConfigOutput 0 config.value.int ./types-anything/equal-atoms.nix +checkConfigOutput false config.value.bool ./types-anything/equal-atoms.nix +checkConfigOutput '""' config.value.string ./types-anything/equal-atoms.nix +checkConfigOutput / config.value.path ./types-anything/equal-atoms.nix +checkConfigOutput null config.value.null ./types-anything/equal-atoms.nix +checkConfigOutput 0.1 config.value.float ./types-anything/equal-atoms.nix +# Functions can't be merged together +checkConfigError "The option .* has conflicting definition values" config.value.multiple-lambdas ./types-anything/functions.nix +checkConfigOutput '<LAMBDA>' config.value.single-lambda ./types-anything/functions.nix +# Check that all mk* modifiers are applied +checkConfigError 'attribute .* not found' config.value.mkiffalse ./types-anything/mk-mods.nix +checkConfigOutput '{ }' config.value.mkiftrue ./types-anything/mk-mods.nix +checkConfigOutput 1 config.value.mkdefault ./types-anything/mk-mods.nix +checkConfigOutput '{ }' config.value.mkmerge ./types-anything/mk-mods.nix +checkConfigOutput true config.value.mkbefore ./types-anything/mk-mods.nix +checkConfigOutput 1 config.value.nested.foo ./types-anything/mk-mods.nix +checkConfigOutput baz config.value.nested.bar.baz ./types-anything/mk-mods.nix + cat <<EOF ====== module tests ====== $pass Pass diff --git a/lib/tests/modules/types-anything/attrs-coercible.nix b/lib/tests/modules/types-anything/attrs-coercible.nix new file mode 100644 index 00000000000..085cbd638f1 --- /dev/null +++ b/lib/tests/modules/types-anything/attrs-coercible.nix @@ -0,0 +1,12 @@ +{ lib, ... }: { + + options.value = lib.mkOption { + type = lib.types.anything; + }; + + config.value = { + outPath = "foo"; + err = throw "err"; + }; + +} diff --git a/lib/tests/modules/types-anything/equal-atoms.nix b/lib/tests/modules/types-anything/equal-atoms.nix new file mode 100644 index 00000000000..972711201a0 --- /dev/null +++ b/lib/tests/modules/types-anything/equal-atoms.nix @@ -0,0 +1,26 @@ +{ lib, ... }: { + + options.value = lib.mkOption { + type = lib.types.anything; + }; + + config = lib.mkMerge [ + { + value.int = 0; + value.bool = false; + value.string = ""; + value.path = /.; + value.null = null; + value.float = 0.1; + } + { + value.int = 0; + value.bool = false; + value.string = ""; + value.path = /.; + value.null = null; + value.float = 0.1; + } + ]; + +} diff --git a/lib/tests/modules/types-anything/functions.nix b/lib/tests/modules/types-anything/functions.nix new file mode 100644 index 00000000000..07951891391 --- /dev/null +++ b/lib/tests/modules/types-anything/functions.nix @@ -0,0 +1,17 @@ +{ lib, ... }: { + + options.value = lib.mkOption { + type = lib.types.anything; + }; + + config = lib.mkMerge [ + { + value.single-lambda = x: x; + value.multiple-lambdas = x: x; + } + { + value.multiple-lambdas = x: x; + } + ]; + +} diff --git a/lib/tests/modules/types-anything/lists.nix b/lib/tests/modules/types-anything/lists.nix new file mode 100644 index 00000000000..bd846afd3d1 --- /dev/null +++ b/lib/tests/modules/types-anything/lists.nix @@ -0,0 +1,16 @@ +{ lib, ... }: { + + options.value = lib.mkOption { + type = lib.types.anything; + }; + + config = lib.mkMerge [ + { + value = [ null ]; + } + { + value = [ null ]; + } + ]; + +} diff --git a/lib/tests/modules/types-anything/mk-mods.nix b/lib/tests/modules/types-anything/mk-mods.nix new file mode 100644 index 00000000000..f84ad01df01 --- /dev/null +++ b/lib/tests/modules/types-anything/mk-mods.nix @@ -0,0 +1,44 @@ +{ lib, ... }: { + + options.value = lib.mkOption { + type = lib.types.anything; + }; + + config = lib.mkMerge [ + { + value.mkiffalse = lib.mkIf false {}; + } + { + value.mkiftrue = lib.mkIf true {}; + } + { + value.mkdefault = lib.mkDefault 0; + } + { + value.mkdefault = 1; + } + { + value.mkmerge = lib.mkMerge [ + {} + ]; + } + { + value.mkbefore = lib.mkBefore true; + } + { + value.nested = lib.mkMerge [ + { + foo = lib.mkDefault 0; + bar = lib.mkIf false 0; + } + (lib.mkIf true { + foo = lib.mkIf true (lib.mkForce 1); + bar = { + baz = lib.mkDefault "baz"; + }; + }) + ]; + } + ]; + +} diff --git a/lib/tests/modules/types-anything/nested-attrs.nix b/lib/tests/modules/types-anything/nested-attrs.nix new file mode 100644 index 00000000000..e57d33ef871 --- /dev/null +++ b/lib/tests/modules/types-anything/nested-attrs.nix @@ -0,0 +1,22 @@ +{ lib, ... }: { + + options.value = lib.mkOption { + type = lib.types.anything; + }; + + config = lib.mkMerge [ + { + value.foo = null; + } + { + value.l1.foo = null; + } + { + value.l1.l2.foo = null; + } + { + value.l1.l2.l3.foo = null; + } + ]; + +} diff --git a/lib/types.nix b/lib/types.nix index ef2c78082f8..77105740bc2 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -104,6 +104,42 @@ rec { # When adding new types don't forget to document them in # nixos/doc/manual/development/option-types.xml! types = rec { + + anything = mkOptionType { + name = "anything"; + description = "anything"; + check = value: true; + merge = loc: defs: + let + getType = value: + if isAttrs value && isCoercibleToString value + then "stringCoercibleSet" + else builtins.typeOf value; + + # Returns the common type of all definitions, throws an error if they + # don't have the same type + commonType = foldl' (type: def: + if getType def.value == type + then type + else throw "The option `${showOption loc}' has conflicting option types in ${showFiles (getFiles defs)}" + ) (getType (head defs).value) defs; + + mergeFunction = { + # Recursively merge attribute sets + set = (attrsOf anything).merge; + # Safe and deterministic behavior for lists is to only accept one definition + # listOf only used to apply mkIf and co. + list = + if length defs > 1 + then throw "The option `${showOption loc}' has conflicting definitions, in ${showFiles (getFiles defs)}." + else (listOf anything).merge; + # This is the type of packages, only accept a single definition + stringCoercibleSet = mergeOneOption; + # Otherwise fall back to only allowing all equal definitions + }.${commonType} or mergeEqualOption; + in mergeFunction loc defs; + }; + unspecified = mkOptionType { name = "unspecified"; }; @@ -263,16 +299,14 @@ rec { check = isList; merge = loc: defs: map (x: x.value) (filter (x: x ? value) (concatLists (imap1 (n: def: - if isList def.value then - imap1 (m: def': - (mergeDefinitions - (loc ++ ["[definition ${toString n}-entry ${toString m}]"]) - elemType - [{ inherit (def) file; value = def'; }] - ).optionalValue - ) def.value - else - throw "The option value `${showOption loc}` in `${def.file}` is not a list.") defs))); + imap1 (m: def': + (mergeDefinitions + (loc ++ ["[definition ${toString n}-entry ${toString m}]"]) + elemType + [{ inherit (def) file; value = def'; }] + ).optionalValue + ) def.value + ) defs))); emptyValue = { value = {}; }; getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]); getSubModules = elemType.getSubModules; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3b09303f75b..cbff5670550 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1224,6 +1224,12 @@ githubId = 3043718; name = "Brett Lyons"; }; + bryanasdev000 = { + email = "bryanasdev000@gmail.com"; + github = "bryanasdev000"; + githubId = 53131727; + name = "Bryan Albuquerque"; + }; btlvr = { email = "btlvr@protonmail.com"; github = "btlvr"; @@ -1439,6 +1445,12 @@ githubId = 89596; name = "Florian Friesdorf"; }; + charvp = { + email = "nixpkgs@cvpetegem.be"; + github = "charvp"; + githubId = 42220376; + name = "Charlotte Van Petegem"; + }; chattered = { email = "me@philscotted.com"; name = "Phil Scott"; @@ -3137,6 +3149,12 @@ githubId = 3217744; name = "Peter Ferenczy"; }; + ghuntley = { + email = "ghuntley@ghuntley.com"; + github = "ghuntley"; + githubId = 127353; + name = "Geoffrey Huntley"; + }; gila = { email = "jeffry.molanus@gmail.com"; github = "gila"; @@ -3449,6 +3467,12 @@ githubId = 896431; name = "Chris Hodapp"; }; + hongchangwu = { + email = "wuhc85@gmail.com"; + github = "hongchangwu"; + githubId = 362833; + name = "Hongchang Wu"; + }; hrdinka = { email = "c.nix@hrdinka.at"; github = "hrdinka"; @@ -3727,6 +3751,12 @@ githubId = 5283991; name = "Jake Waksbaum"; }; + jamiemagee = { + email = "jamie.magee@gmail.com"; + github = "JamieMagee"; + githubId = 1358764; + name = "Jamie Magee"; + }; jammerful = { email = "jammerful@gmail.com"; github = "jammerful"; @@ -4102,12 +4132,6 @@ githubId = 1843676; name = "Jonathan Reeve"; }; - joncojonathan = { - email = "joncojonathan@gmail.com"; - github = "joncojonathan"; - githubId = 11414454; - name = "Jonathan Haddock"; - }; jonringer = { email = "jonringer117@gmail.com"; github = "jonringer"; diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml index 435ed230f51..bc19acf9f69 100644 --- a/nixos/doc/manual/administration/imperative-containers.xml +++ b/nixos/doc/manual/administration/imperative-containers.xml @@ -14,18 +14,18 @@ <para> You create a container with identifier <literal>foo</literal> as follows: <screen> -# nixos-container create foo +<prompt># </prompt>nixos-container create <replaceable>foo</replaceable> </screen> This creates the container’s root directory in - <filename>/var/lib/containers/foo</filename> and a small configuration file - in <filename>/etc/containers/foo.conf</filename>. It also builds the + <filename>/var/lib/containers/<replaceable>foo</replaceable></filename> and a small configuration file + in <filename>/etc/containers/<replaceable>foo</replaceable>.conf</filename>. It also builds the container’s initial system configuration and stores it in - <filename>/nix/var/nix/profiles/per-container/foo/system</filename>. You can + <filename>/nix/var/nix/profiles/per-container/<replaceable>foo</replaceable>/system</filename>. You can modify the initial configuration of the container on the command line. For instance, to create a container that has <command>sshd</command> running, with the given public key for <literal>root</literal>: <screen> -# nixos-container create foo --config ' +<prompt># </prompt>nixos-container create <replaceable>foo</replaceable> --config ' <xref linkend="opt-services.openssh.enable"/> = true; <link linkend="opt-users.users._name_.openssh.authorizedKeys.keys">users.users.root.openssh.authorizedKeys.keys</link> = ["ssh-dss AAAAB3N…"]; ' @@ -34,7 +34,7 @@ as container IP. This behavior can be altered by setting <literal>--host-address</literal> and <literal>--local-address</literal>: <screen> -# nixos-container create test --config-file test-container.nix \ +<prompt># </prompt>nixos-container create test --config-file test-container.nix \ --local-address 10.235.1.2 --host-address 10.235.1.1 </screen> </para> @@ -42,7 +42,7 @@ <para> Creating a container does not start it. To start the container, run: <screen> -# nixos-container start foo +<prompt># </prompt>nixos-container start <replaceable>foo</replaceable> </screen> This command will return as soon as the container has booted and has reached <literal>multi-user.target</literal>. On the host, the container runs within @@ -51,7 +51,7 @@ Thus, if something went wrong, you can get status info using <command>systemctl</command>: <screen> -# systemctl status container@foo +<prompt># </prompt>systemctl status container@<replaceable>foo</replaceable> </screen> </para> @@ -59,22 +59,22 @@ If the container has started successfully, you can log in as root using the <command>root-login</command> operation: <screen> -# nixos-container root-login foo -[root@foo:~]# +<prompt># </prompt>nixos-container root-login <replaceable>foo</replaceable> +<prompt>[root@foo:~]#</prompt> </screen> Note that only root on the host can do this (since there is no authentication). You can also get a regular login prompt using the <command>login</command> operation, which is available to all users on the host: <screen> -# nixos-container login foo +<prompt># </prompt>nixos-container login <replaceable>foo</replaceable> foo login: alice Password: *** </screen> With <command>nixos-container run</command>, you can execute arbitrary commands in the container: <screen> -# nixos-container run foo -- uname -a +<prompt># </prompt>nixos-container run <replaceable>foo</replaceable> -- uname -a Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux </screen> </para> @@ -85,18 +85,18 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux <literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>, and run <screen> -# nixos-container update foo +<prompt># </prompt>nixos-container update <replaceable>foo</replaceable> </screen> This will build and activate the new configuration. You can also specify a new configuration on the command line: <screen> -# nixos-container update foo --config ' +<prompt># </prompt>nixos-container update <replaceable>foo</replaceable> --config ' <xref linkend="opt-services.httpd.enable"/> = true; <xref linkend="opt-services.httpd.adminAddr"/> = "foo@example.org"; <xref linkend="opt-networking.firewall.allowedTCPPorts"/> = [ 80 ]; ' -# curl http://$(nixos-container show-ip foo)/ +<prompt># </prompt>curl http://$(nixos-container show-ip <replaceable>foo</replaceable>)/ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">… </screen> However, note that this will overwrite the container’s @@ -117,7 +117,7 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux by using <command>systemctl</command> on the container’s service unit. To destroy a container, including its file system, do <screen> -# nixos-container destroy foo +<prompt># </prompt>nixos-container destroy <replaceable>foo</replaceable> </screen> </para> </section> diff --git a/nixos/doc/manual/administration/maintenance-mode.xml b/nixos/doc/manual/administration/maintenance-mode.xml index 71e3f9ea665..74abfdd7c66 100644 --- a/nixos/doc/manual/administration/maintenance-mode.xml +++ b/nixos/doc/manual/administration/maintenance-mode.xml @@ -8,7 +8,7 @@ <para> You can enter rescue mode by running: <screen> -# systemctl rescue</screen> +<prompt># </prompt>systemctl rescue</screen> This will eventually give you a single-user root shell. Systemd will stop (almost) all system services. To get out of maintenance mode, just exit from the rescue shell. diff --git a/nixos/doc/manual/administration/network-problems.xml b/nixos/doc/manual/administration/network-problems.xml index 570f5835884..1035e4e056a 100644 --- a/nixos/doc/manual/administration/network-problems.xml +++ b/nixos/doc/manual/administration/network-problems.xml @@ -16,12 +16,12 @@ disable the use of the binary cache by adding <option>--option use-binary-caches false</option>, e.g. <screen> -# nixos-rebuild switch --option use-binary-caches false +<prompt># </prompt>nixos-rebuild switch --option use-binary-caches false </screen> If you have an alternative binary cache at your disposal, you can use it instead: <screen> -# nixos-rebuild switch --option binary-caches http://my-cache.example.org/ +<prompt># </prompt>nixos-rebuild switch --option binary-caches <replaceable>http://my-cache.example.org/</replaceable> </screen> </para> </section> diff --git a/nixos/doc/manual/administration/rebooting.xml b/nixos/doc/manual/administration/rebooting.xml index a5abd6f0258..c57d885c5f3 100644 --- a/nixos/doc/manual/administration/rebooting.xml +++ b/nixos/doc/manual/administration/rebooting.xml @@ -7,20 +7,20 @@ <para> The system can be shut down (and automatically powered off) by doing: <screen> -# shutdown +<prompt># </prompt>shutdown </screen> This is equivalent to running <command>systemctl poweroff</command>. </para> <para> To reboot the system, run <screen> -# reboot +<prompt># </prompt>reboot </screen> which is equivalent to <command>systemctl reboot</command>. Alternatively, you can quickly reboot the system using <literal>kexec</literal>, which bypasses the BIOS by directly loading the new kernel into memory: <screen> -# systemctl kexec +<prompt># </prompt>systemctl kexec </screen> </para> <para> diff --git a/nixos/doc/manual/administration/rollback.xml b/nixos/doc/manual/administration/rollback.xml index fb87810ba46..80d79e1a53f 100644 --- a/nixos/doc/manual/administration/rollback.xml +++ b/nixos/doc/manual/administration/rollback.xml @@ -20,16 +20,16 @@ has booted, you can make the selected configuration the default for subsequent boots: <screen> -# /run/current-system/bin/switch-to-configuration boot</screen> +<prompt># </prompt>/run/current-system/bin/switch-to-configuration boot</screen> </para> <para> Second, you can switch to the previous configuration in a running system: <screen> -# nixos-rebuild switch --rollback</screen> +<prompt># </prompt>nixos-rebuild switch --rollback</screen> This is equivalent to running: <screen> -# /nix/var/nix/profiles/system-<replaceable>N</replaceable>-link/bin/switch-to-configuration switch</screen> +<prompt># </prompt>/nix/var/nix/profiles/system-<replaceable>N</replaceable>-link/bin/switch-to-configuration switch</screen> where <replaceable>N</replaceable> is the number of the NixOS system configuration. To get a list of the available configurations, do: <screen> diff --git a/nixos/doc/manual/administration/service-mgmt.xml b/nixos/doc/manual/administration/service-mgmt.xml index 1b9c745eb59..1c5d48a5bcf 100644 --- a/nixos/doc/manual/administration/service-mgmt.xml +++ b/nixos/doc/manual/administration/service-mgmt.xml @@ -58,9 +58,9 @@ Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server. <para> Units can be stopped, started or restarted: <screen> -# systemctl stop postgresql.service -# systemctl start postgresql.service -# systemctl restart postgresql.service +<prompt># </prompt>systemctl stop postgresql.service +<prompt># </prompt>systemctl start postgresql.service +<prompt># </prompt>systemctl restart postgresql.service </screen> These operations are synchronous: they wait until the service has finished starting or stopping (or has failed). Starting a unit will cause the diff --git a/nixos/doc/manual/administration/user-sessions.xml b/nixos/doc/manual/administration/user-sessions.xml index 80daf6bdbff..9acb147ac1a 100644 --- a/nixos/doc/manual/administration/user-sessions.xml +++ b/nixos/doc/manual/administration/user-sessions.xml @@ -39,7 +39,7 @@ c3 - root (0) can terminate a session in a way that ensures that all the session’s processes are gone: <screen> -# loginctl terminate-session c3 +<prompt># </prompt>loginctl terminate-session c3 </screen> </para> </chapter> diff --git a/nixos/doc/manual/configuration/adding-custom-packages.xml b/nixos/doc/manual/configuration/adding-custom-packages.xml index 02cb78f47e8..19eb2429d0a 100644 --- a/nixos/doc/manual/configuration/adding-custom-packages.xml +++ b/nixos/doc/manual/configuration/adding-custom-packages.xml @@ -25,7 +25,7 @@ xlink:href="https://nixos.org/nixpkgs/manual">Nixpkgs and you run <command>nixos-rebuild</command>, specifying your own Nixpkgs tree: <screen> -# nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs</screen> +<prompt># </prompt>nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs</screen> </para> <para> diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml index 644d3a33ffd..dbdcc941495 100644 --- a/nixos/doc/manual/configuration/linux-kernel.xml +++ b/nixos/doc/manual/configuration/linux-kernel.xml @@ -126,13 +126,13 @@ nixpkgs.config.packageOverrides = pkgs: <literal>mellanox</literal> drivers. </para> -<screen><![CDATA[ -$ nix-build '<nixpkgs>' -A linuxPackages.kernel.dev -$ nix-shell '<nixpkgs>' -A linuxPackages.kernel -$ unpackPhase -$ cd linux-* -$ make -C $dev/lib/modules/*/build M=$(pwd)/drivers/net/ethernet/mellanox modules -# insmod ./drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko -]]></screen> +<screen> +<prompt>$ </prompt>nix-build '<nixpkgs>' -A linuxPackages.kernel.dev +<prompt>$ </prompt>nix-shell '<nixpkgs>' -A linuxPackages.kernel +<prompt>$ </prompt>unpackPhase +<prompt>$ </prompt>cd linux-* +<prompt>$ </prompt>make -C $dev/lib/modules/*/build M=$(pwd)/drivers/net/ethernet/mellanox modules +<prompt># </prompt>insmod ./drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko +</screen> </section> </chapter> diff --git a/nixos/doc/manual/configuration/luks-file-systems.xml b/nixos/doc/manual/configuration/luks-file-systems.xml index 8a8168c095f..405a50a9e43 100644 --- a/nixos/doc/manual/configuration/luks-file-systems.xml +++ b/nixos/doc/manual/configuration/luks-file-systems.xml @@ -11,7 +11,7 @@ you create an encrypted Ext4 file system on the device <filename>/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d</filename>: <screen> -# cryptsetup luksFormat /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d +<prompt># </prompt>cryptsetup luksFormat <replaceable>/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d</replaceable> WARNING! ======== @@ -21,17 +21,17 @@ Are you sure? (Type uppercase yes): YES Enter LUKS passphrase: *** Verify passphrase: *** -# cryptsetup luksOpen /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d crypted +<prompt># </prompt>cryptsetup luksOpen <replaceable>/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d</replaceable> <replaceable>crypted</replaceable> Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: *** -# mkfs.ext4 /dev/mapper/crypted +<prompt># </prompt>mkfs.ext4 /dev/mapper/<replaceable>crypted</replaceable> </screen> To ensure that this file system is automatically mounted at boot time as <filename>/</filename>, add the following to <filename>configuration.nix</filename>: <programlisting> -<link linkend="opt-boot.initrd.luks.devices._name_.device">boot.initrd.luks.devices.crypted.device</link> = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d"; -<xref linkend="opt-fileSystems"/>."/".device = "/dev/mapper/crypted"; +<link linkend="opt-boot.initrd.luks.devices._name_.device">boot.initrd.luks.devices.crypted.device</link> = "<replaceable>/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d</replaceable>"; +<xref linkend="opt-fileSystems"/>."/".device = "/dev/mapper/<replaceable>crypted</replaceable>"; </programlisting> Should grub be used as bootloader, and <filename>/boot</filename> is located on an encrypted partition, it is necessary to add the following grub option: @@ -45,11 +45,11 @@ Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: *** and add it as a new key to our existing device <filename>/dev/sda2</filename>: <screen> -# export FIDO2_LABEL="/dev/sda2 @ $HOSTNAME" -# fido2luks credential "$FIDO2_LABEL" +<prompt># </prompt>export FIDO2_LABEL="<replaceable>/dev/sda2</replaceable> @ $HOSTNAME" +<prompt># </prompt>fido2luks credential "$FIDO2_LABEL" f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7 -# fido2luks -i add-key /dev/sda2 f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7 +<prompt># </prompt>fido2luks -i add-key <replaceable>/dev/sda2</replaceable> <replaceable>f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7</replaceable> Password: Password (again): Old password: @@ -60,13 +60,13 @@ Added to key to device /dev/sda2, slot: 2 To ensure that this file system is decrypted using the FIDO2 compatible key, add the following to <filename>configuration.nix</filename>: <programlisting> <link linkend="opt-boot.initrd.luks.fido2Support">boot.initrd.luks.fido2Support</link> = true; -<link linkend="opt-boot.initrd.luks.devices._name_.fido2.credential">boot.initrd.luks.devices."/dev/sda2".fido2.credential</link> = "f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7"; +<link linkend="opt-boot.initrd.luks.devices._name_.fido2.credential">boot.initrd.luks.devices."<replaceable>/dev/sda2</replaceable>".fido2.credential</link> = "<replaceable>f1d00200108b9d6e849a8b388da457688e3dd653b4e53770012d8f28e5d3b269865038c346802f36f3da7278b13ad6a3bb6a1452e24ebeeaa24ba40eef559b1b287d2a2f80b7</replaceable>"; </programlisting> You can also use the FIDO2 passwordless setup, but for security reasons, you might want to enable it only when your device is PIN protected, such as <link xlink:href="https://trezor.io/">Trezor</link>. <programlisting> -<link linkend="opt-boot.initrd.luks.devices._name_.fido2.passwordLess">boot.initrd.luks.devices."/dev/sda2".fido2.passwordLess</link> = true; +<link linkend="opt-boot.initrd.luks.devices._name_.fido2.passwordLess">boot.initrd.luks.devices."<replaceable>/dev/sda2</replaceable>".fido2.passwordLess</link> = true; </programlisting> </para> </section> diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml index 68324cc85b5..cbec83814c9 100644 --- a/nixos/doc/manual/configuration/user-mgmt.xml +++ b/nixos/doc/manual/configuration/user-mgmt.xml @@ -62,24 +62,24 @@ uid = 1000; <command>useradd</command>, <command>groupmod</command> and so on. For instance, to create a user account named <literal>alice</literal>: <screen> -# useradd -m alice</screen> +<prompt># </prompt>useradd -m <replaceable>alice</replaceable></screen> To make all nix tools available to this new user use `su - USER` which opens a login shell (==shell that loads the profile) for given user. This will create the ~/.nix-defexpr symlink. So run: <screen> -# su - alice -c "true"</screen> +<prompt># </prompt>su - <replaceable>alice</replaceable> -c "true"</screen> The flag <option>-m</option> causes the creation of a home directory for the new user, which is generally what you want. The user does not have an initial password and therefore cannot log in. A password can be set using the <command>passwd</command> utility: <screen> -# passwd alice +<prompt># </prompt>passwd <replaceable>alice</replaceable> Enter new UNIX password: *** Retype new UNIX password: *** </screen> A user can be deleted using <command>userdel</command>: <screen> -# userdel -r alice</screen> +<prompt># </prompt>userdel -r <replaceable>alice</replaceable></screen> The flag <option>-r</option> deletes the user’s home directory. Accounts can be modified using <command>usermod</command>. Unix groups can be managed using <command>groupadd</command>, <command>groupmod</command> and diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index 18f0be5e7f3..b33f6cf82b5 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -58,7 +58,7 @@ </programlisting> The X server can then be started manually: <screen> -# systemctl start display-manager.service +<prompt># </prompt>systemctl start display-manager.service </screen> </para> <para> diff --git a/nixos/doc/manual/development/meta-attributes.xml b/nixos/doc/manual/development/meta-attributes.xml index 3d019a4987e..c626ef30e9d 100644 --- a/nixos/doc/manual/development/meta-attributes.xml +++ b/nixos/doc/manual/development/meta-attributes.xml @@ -57,7 +57,7 @@ linkend="ch-configuration"/>. Changes to a module documentation have to be checked to not break building the NixOS manual: </para> -<programlisting>$ nix-build nixos/release.nix -A manual</programlisting> +<screen><prompt>$ </prompt>nix-build nixos/release.nix -A manual</screen> </callout> </calloutlist> </section> diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 5a6dae6e991..3d2191e2f3f 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -23,16 +23,6 @@ <variablelist> <varlistentry> <term> - <varname>types.attrs</varname> - </term> - <listitem> - <para> - A free-form attribute set. - </para> - </listitem> - </varlistentry> - <varlistentry> - <term> <varname>types.bool</varname> </term> <listitem> @@ -64,6 +54,64 @@ </para> </listitem> </varlistentry> + <varlistentry> + <term> + <varname>types.anything</varname> + </term> + <listitem> + <para> + A type that accepts any value and recursively merges attribute sets together. + This type is recommended when the option type is unknown. + <example xml:id="ex-types-anything"> + <title><literal>types.anything</literal> Example</title> + <para> + Two definitions of this type like +<programlisting> +{ + str = lib.mkDefault "foo"; + pkg.hello = pkgs.hello; + fun.fun = x: x + 1; +} +</programlisting> +<programlisting> +{ + str = lib.mkIf true "bar"; + pkg.gcc = pkgs.gcc; + fun.fun = lib.mkForce (x: x + 2); +} +</programlisting> + will get merged to +<programlisting> +{ + str = "bar"; + pkg.gcc = pkgs.gcc; + pkg.hello = pkgs.hello; + fun.fun = x: x + 2; +} +</programlisting> + </para> + </example> + </para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <varname>types.attrs</varname> + </term> + <listitem> + <para> + A free-form attribute set. + <warning><para> + This type will be deprecated in the future because it doesn't recurse + into attribute sets, silently drops earlier attribute definitions, and + doesn't discharge <literal>lib.mkDefault</literal>, <literal>lib.mkIf + </literal> and co. For allowing arbitrary attribute sets, prefer + <literal>types.attrsOf types.anything</literal> instead which doesn't + have these problems. + </para></warning> + </para> + </listitem> + </varlistentry> </variablelist> <para> diff --git a/nixos/doc/manual/development/writing-documentation.xml b/nixos/doc/manual/development/writing-documentation.xml index 2183937ad0d..32e00544cef 100644 --- a/nixos/doc/manual/development/writing-documentation.xml +++ b/nixos/doc/manual/development/writing-documentation.xml @@ -24,8 +24,8 @@ </para> <screen> - $ cd /path/to/nixpkgs/nixos/doc/manual - $ make +<prompt>$ </prompt>cd /path/to/nixpkgs/nixos/doc/manual +<prompt>$ </prompt>make </screen> <para> diff --git a/nixos/doc/manual/installation/installing-behind-a-proxy.xml b/nixos/doc/manual/installation/installing-behind-a-proxy.xml index c1ef638e876..6788882aa8c 100644 --- a/nixos/doc/manual/installation/installing-behind-a-proxy.xml +++ b/nixos/doc/manual/installation/installing-behind-a-proxy.xml @@ -27,13 +27,13 @@ networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; Setup the proxy environment variables in the shell where you are running <literal>nixos-install</literal>. </para> -<programlisting> -# proxy_url="http://user:password@proxy:port/" -# export http_proxy="$proxy_url" -# export HTTP_PROXY="$proxy_url" -# export https_proxy="$proxy_url" -# export HTTPS_PROXY="$proxy_url" -</programlisting> +<screen> +<prompt># </prompt>proxy_url="http://user:password@proxy:port/" +<prompt># </prompt>export http_proxy="$proxy_url" +<prompt># </prompt>export HTTP_PROXY="$proxy_url" +<prompt># </prompt>export https_proxy="$proxy_url" +<prompt># </prompt>export HTTPS_PROXY="$proxy_url" +</screen> </listitem> </orderedlist> diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml index d2d1245c57a..8aac3226473 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.xml +++ b/nixos/doc/manual/installation/installing-from-other-distro.xml @@ -325,14 +325,14 @@ sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot to boot on a USB rescue disk and do something along these lines: </para> <screen> -# mkdir root -# mount /dev/sdaX root -# mkdir root/nixos-root -# mv -v root/* root/nixos-root/ -# mv -v root/nixos-root/old-root/* root/ -# mv -v root/boot.bak root/boot # We had renamed this by hand earlier -# umount root -# reboot</screen> +<prompt># </prompt>mkdir root +<prompt># </prompt>mount /dev/sdaX root +<prompt># </prompt>mkdir root/nixos-root +<prompt># </prompt>mv -v root/* root/nixos-root/ +<prompt># </prompt>mv -v root/nixos-root/old-root/* root/ +<prompt># </prompt>mv -v root/boot.bak root/boot # We had renamed this by hand earlier +<prompt># </prompt>umount root +<prompt># </prompt>reboot</screen> <para> This may work as is or you might also need to reinstall the boot loader </para> diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml index e5e02aa0752..08780051d5f 100644 --- a/nixos/doc/manual/installation/upgrading.xml +++ b/nixos/doc/manual/installation/upgrading.xml @@ -67,32 +67,32 @@ <literal>nixos-20.03</literal> channel. To see which NixOS channel you’re subscribed to, run the following as root: <screen> -# nix-channel --list | grep nixos +<prompt># </prompt>nix-channel --list | grep nixos nixos https://nixos.org/channels/nixos-unstable </screen> To switch to a different NixOS channel, do <screen> -# nix-channel --add https://nixos.org/channels/<replaceable>channel-name</replaceable> nixos +<prompt># </prompt>nix-channel --add https://nixos.org/channels/<replaceable>channel-name</replaceable> nixos </screen> (Be sure to include the <literal>nixos</literal> parameter at the end.) For instance, to use the NixOS 20.03 stable channel: <screen> -# nix-channel --add https://nixos.org/channels/nixos-20.03 nixos +<prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-20.03 nixos </screen> If you have a server, you may want to use the “small” channel instead: <screen> -# nix-channel --add https://nixos.org/channels/nixos-20.03-small nixos +<prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-20.03-small nixos </screen> And if you want to live on the bleeding edge: <screen> -# nix-channel --add https://nixos.org/channels/nixos-unstable nixos +<prompt># </prompt>nix-channel --add https://nixos.org/channels/nixos-unstable nixos </screen> </para> <para> You can then upgrade NixOS to the latest version in your chosen channel by running <screen> -# nixos-rebuild switch --upgrade +<prompt># </prompt>nixos-rebuild switch --upgrade </screen> which is equivalent to the more verbose <literal>nix-channel --update nixos; nixos-rebuild switch</literal>. diff --git a/nixos/doc/manual/man-nixos-enter.xml b/nixos/doc/manual/man-nixos-enter.xml index f533d66099d..41f0e6b9751 100644 --- a/nixos/doc/manual/man-nixos-enter.xml +++ b/nixos/doc/manual/man-nixos-enter.xml @@ -136,13 +136,13 @@ <filename>/mnt</filename>: </para> <screen> -# nixos-enter --root /mnt +<prompt># </prompt>nixos-enter --root /mnt </screen> <para> Run a shell command: </para> <screen> -# nixos-enter -c 'ls -l /; cat /proc/mounts' +<prompt># </prompt>nixos-enter -c 'ls -l /; cat /proc/mounts' </screen> <para> Run a non-shell command: diff --git a/nixos/doc/manual/man-nixos-version.xml b/nixos/doc/manual/man-nixos-version.xml index aada08c5b4a..fae25721e39 100644 --- a/nixos/doc/manual/man-nixos-version.xml +++ b/nixos/doc/manual/man-nixos-version.xml @@ -33,7 +33,7 @@ <para> This command shows the version of the currently active NixOS configuration. For example: -<screen>$ nixos-version +<screen><prompt>$ </prompt>nixos-version 16.03.1011.6317da4 (Emu) </screen> The version consists of the following elements: @@ -111,7 +111,7 @@ <para> Show the full SHA1 hash of the Git commit from which this configuration was built, e.g. -<screen>$ nixos-version --hash +<screen><prompt>$ </prompt>nixos-version --hash 6317da40006f6bc2480c6781999c52d88dde2acf </screen> </para> diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index 543c8a8882e..c9dfdbed99a 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -2,6 +2,11 @@ pkgs: with pkgs.lib; rec { + # Copy configuration files to avoid having the entire sources in the system closure + copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} '' + cp ${filePath} $out + ''; + # Check whenever fileSystem is needed for boot. NOTE: Make sure # pathsNeededForBoot is closed under the parent relationship, i.e. if /a/b/c # is in the list, put /a and /a/b in as well. diff --git a/nixos/modules/hardware/system-76.nix b/nixos/modules/hardware/system-76.nix new file mode 100644 index 00000000000..48eb63f4f22 --- /dev/null +++ b/nixos/modules/hardware/system-76.nix @@ -0,0 +1,56 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkOption mkEnableOption types mkIf mkMerge optional versionOlder; + cfg = config.hardware.system76; + + kpkgs = config.boot.kernelPackages; + modules = [ "system76" "system76-io" ] ++ (optional (versionOlder kpkgs.kernel.version "5.5") "system76-acpi"); + modulePackages = map (m: kpkgs.${m}) modules; + moduleConfig = mkIf cfg.kernel-modules.enable { + boot.extraModulePackages = modulePackages; + + boot.kernelModules = modules; + + services.udev.packages = modulePackages; + }; + + firmware-pkg = pkgs.system76-firmware; + firmwareConfig = mkIf cfg.firmware-daemon.enable { + services.dbus.packages = [ firmware-pkg ]; + + systemd.services.system76-firmware-daemon = { + description = "The System76 Firmware Daemon"; + + serviceConfig = { + ExecStart = "${firmware-pkg}/bin/system76-firmware-daemon"; + + Restart = "on-failure"; + }; + + wantedBy = [ "multi-user.target" ]; + }; + }; +in { + options = { + hardware.system76 = { + enableAll = mkEnableOption "all recommended configuration for system76 systems"; + + firmware-daemon.enable = mkOption { + default = cfg.enableAll; + example = true; + description = "Whether to enable the system76 firmware daemon"; + type = types.bool; + }; + + kernel-modules.enable = mkOption { + default = cfg.enableAll; + example = true; + description = "Whether to make the system76 out-of-tree kernel modules available"; + type = types.bool; + }; + }; + }; + + config = mkMerge [ moduleConfig firmwareConfig ]; +} diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 6328971492c..2acb891f1a9 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -16,6 +16,8 @@ let kernelPackages.nvidia_x11 else if elem "nvidiaBeta" drivers then kernelPackages.nvidia_x11_beta + else if elem "nvidiaVulkanBeta" drivers then + kernelPackages.nvidia_x11_vulkan_beta else if elem "nvidiaLegacy304" drivers then kernelPackages.nvidia_x11_legacy304 else if elem "nvidiaLegacy340" drivers then diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index ad40fd2811d..909e8b229c8 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -438,15 +438,17 @@ if [ -z "$rollback" ]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A vm -k "${extraBuildFlags[@]}")" else - echo "$0: 'build-vm' is not supported with '--flake'" >&2 - exit 1 + nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.vm" \ + "${extraBuildFlags[@]}" "${lockFlags[@]}" + pathToConfig="$(readlink -f ./result)" fi elif [ "$action" = build-vm-with-bootloader ]; then if [[ -z $flake ]]; then pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A vmWithBootLoader -k "${extraBuildFlags[@]}")" else - echo "$0: 'build-vm-with-bootloader' is not supported with '--flake'" >&2 - exit 1 + nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.vmWithBootLoader" \ + "${extraBuildFlags[@]}" "${lockFlags[@]}" + pathToConfig="$(readlink -f ./result)" fi else showSyntax diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 1da3a5b27eb..e1e1b47aafc 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -22,10 +22,10 @@ let src = ./nixos-install.sh; inherit (pkgs) runtimeShell; nix = config.nix.package.out; - path = makeBinPath [ - pkgs.nixUnstable + path = makeBinPath [ + pkgs.nixUnstable pkgs.jq - nixos-enter + nixos-enter ]; }; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e7e5fbb4f3f..96529424e8f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -60,6 +60,7 @@ ./hardware/printers.nix ./hardware/raid/hpsa.nix ./hardware/steam-hardware.nix + ./hardware/system-76.nix ./hardware/tuxedo-keyboard.nix ./hardware/usb-wwan.nix ./hardware/onlykey.nix diff --git a/nixos/modules/services/backup/borgbackup.xml b/nixos/modules/services/backup/borgbackup.xml index a197f38ffb9..8f623c93656 100644 --- a/nixos/modules/services/backup/borgbackup.xml +++ b/nixos/modules/services/backup/borgbackup.xml @@ -69,10 +69,10 @@ access this single repository. You need the output of the generate pub file. </para> <para> - <programlisting> -# sudo ssh-keygen -N '' -t ed25519 -f /run/keys/id_ed25519_my_borg_repo -# cat /run/keys/id_ed25519_my_borg_repo -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID78zmOyA+5uPG4Ot0hfAy+sLDPU1L4AiIoRYEIVbbQ/ root@nixos</programlisting> +<screen> +<prompt># </prompt>sudo ssh-keygen -N '' -t ed25519 -f /run/keys/id_ed25519_my_borg_repo +<prompt># </prompt>cat /run/keys/id_ed25519_my_borg_repo +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID78zmOyA+5uPG4Ot0hfAy+sLDPU1L4AiIoRYEIVbbQ/ root@nixos</screen> </para> <para> Add the following snippet to your NixOS configuration: diff --git a/nixos/modules/services/hardware/thermald.nix b/nixos/modules/services/hardware/thermald.nix index ecb529e9bf0..b7be0e89d0c 100644 --- a/nixos/modules/services/hardware/thermald.nix +++ b/nixos/modules/services/hardware/thermald.nix @@ -23,6 +23,15 @@ in { default = null; description = "the thermald manual configuration file."; }; + + adaptive = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable adaptive mode, only working on kernel versions greater than 5.8. + Thermald will detect this itself, safe to enable on kernel versions below 5.8. + ''; + }; }; }; @@ -39,6 +48,7 @@ in { --no-daemon \ ${optionalString cfg.debug "--loglevel=debug"} \ ${optionalString (cfg.configFile != null) "--config-file ${cfg.configFile}"} \ + ${optionalString cfg.adaptive "--adaptive"} \ --dbus-enable ''; }; diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index bc23606edf1..98aaa9c0f03 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -638,7 +638,9 @@ in { config = mkIf cfg.enable { assertions = [ ( let - legacy = builtins.match "(.*):(.*)" cfg.listenAddress; + # Match something with dots (an IPv4 address) or something ending in + # a square bracket (an IPv6 addresses) followed by a port number. + legacy = builtins.match "(.*\\..*|.*]):([[:digit:]]+)" cfg.listenAddress; in { assertion = legacy == null; message = '' diff --git a/nixos/modules/services/web-apps/codimd.nix b/nixos/modules/services/web-apps/codimd.nix index ab922a38e5c..c787c36b877 100644 --- a/nixos/modules/services/web-apps/codimd.nix +++ b/nixos/modules/services/web-apps/codimd.nix @@ -877,6 +877,37 @@ in description = "Configure the SAML integration."; }; }; + + + environmentFile = mkOption { + type = with types; nullOr path; + default = null; + example = "/var/lib/codimd/codimd.env"; + description = '' + Environment file as defined in <citerefentry> + <refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum> + </citerefentry>. + + Secrets may be passed to the service without adding them to the world-readable + Nix store, by specifying placeholder variables as the option value in Nix and + setting these variables accordingly in the environment file. + + <programlisting> + # snippet of CodiMD-related config + services.codimd.configuration.dbURL = "postgres://codimd:\''${DB_PASSWORD}@db-host:5432/codimddb"; + services.codimd.configuration.minio.secretKey = "$MINIO_SECRET_KEY"; + </programlisting> + + <programlisting> + # content of the environment file + DB_PASSWORD=verysecretdbpassword + MINIO_SECRET_KEY=verysecretminiokey + </programlisting> + + Note that this file needs to be available on the host on which + <literal>CodiMD</literal> is running. + ''; + }; }; config = mkIf cfg.enable { @@ -900,11 +931,17 @@ in description = "CodiMD Service"; wantedBy = [ "multi-user.target" ]; after = [ "networking.target" ]; + preStart = '' + ${pkgs.envsubst}/bin/envsubst \ + -o ${cfg.workDir}/config.json \ + -i ${prettyJSON cfg.configuration} + ''; serviceConfig = { WorkingDirectory = cfg.workDir; ExecStart = "${pkgs.codimd}/bin/codimd"; + EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; Environment = [ - "CMD_CONFIG_FILE=${prettyJSON cfg.configuration}" + "CMD_CONFIG_FILE=${cfg.workDir}/config.json" "NODE_ENV=production" ]; Restart = "always"; diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index fb8644dd13a..2724d9f9cb6 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -159,9 +159,9 @@ in To switch to a specialised configuration (e.g. <literal>fewJobsManyCores</literal>) at runtime, run: - <programlisting> - # sudo /run/current-system/specialisation/fewJobsManyCores/bin/switch-to-configuration test - </programlisting> + <screen> + <prompt># </prompt>sudo /run/current-system/specialisation/fewJobsManyCores/bin/switch-to-configuration test + </screen> ''; type = types.attrsOf (types.submodule ( { ... }: { diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 0c1be71cf53..f7c2940049e 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -218,6 +218,7 @@ done # Create device nodes in /dev. @preDeviceCommands@ echo "running udev..." +ln -sfn /proc/self/fd /dev/fd mkdir -p /etc/systemd ln -sfn @linkUnits@ /etc/systemd/network mkdir -p /etc/udev diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index de97ba3f7bb..997edf77ba9 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: let cfg = config.virtualisation.containers; @@ -13,10 +13,6 @@ let json2toml "$valuePath" "$out" ''; - # Copy configuration files to avoid having the entire sources in the system closure - copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} '' - cp ${filePath} $out - ''; in { meta = { @@ -136,7 +132,7 @@ in environment.etc."containers/policy.json".source = if cfg.policy != {} then pkgs.writeText "policy.json" (builtins.toJSON cfg.policy) - else copyFile "${pkgs.skopeo.src}/default-policy.json"; + else utils.copyFile "${pkgs.skopeo.src}/default-policy.json"; }; } diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index 70e7c8794d4..aa416e7990a 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -1,16 +1,11 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: with lib; - let cfg = config.virtualisation.cri-o; crioPackage = (pkgs.cri-o.override { inherit (cfg) extraPackages; }); - # Copy configuration files to avoid having the entire sources in the system closure - copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} '' - cp ${filePath} $out - ''; in { imports = [ @@ -78,12 +73,19 @@ in The final CRI-O package (including extra packages). ''; }; + + networkDir = mkOption { + type = types.nullOr types.path; + default = null; + description = "Override the network_dir option."; + internal = true; + }; }; config = mkIf cfg.enable { environment.systemPackages = [ cfg.package pkgs.cri-tools ]; - environment.etc."crictl.yaml".source = copyFile "${pkgs.cri-o-unwrapped.src}/crictl.yaml"; + environment.etc."crictl.yaml".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/crictl.yaml"; environment.etc."crio/crio.conf.d/00-default.conf".text = '' [crio] @@ -95,6 +97,7 @@ in [crio.network] plugin_dirs = ["${pkgs.cni-plugins}/bin/"] + ${optionalString (cfg.networkDir != null) ''network_dir = "${cfg.networkDir}"''} [crio.runtime] cgroup_manager = "systemd" @@ -109,8 +112,8 @@ in ''} ''; - environment.etc."cni/net.d/10-crio-bridge.conf".source = copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/10-crio-bridge.conf"; - environment.etc."cni/net.d/99-loopback.conf".source = copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/99-loopback.conf"; + environment.etc."cni/net.d/10-crio-bridge.conf".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/10-crio-bridge.conf"; + environment.etc."cni/net.d/99-loopback.conf".source = utils.copyFile "${pkgs.cri-o-unwrapped.src}/contrib/cni/99-loopback.conf"; # Enable common /etc/containers configuration virtualisation.containers.enable = true; diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index e0e2f04e24c..f554aeffb45 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: let cfg = config.virtualisation.podman; @@ -21,11 +21,6 @@ let done ''; - # Copy configuration files to avoid having the entire sources in the system closure - copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} '' - cp ${filePath} $out - ''; - in { imports = [ @@ -88,7 +83,7 @@ in environment.systemPackages = [ cfg.package ] ++ lib.optional cfg.dockerCompat dockerCompat; - environment.etc."cni/net.d/87-podman-bridge.conflist".source = copyFile "${pkgs.podman-unwrapped.src}/cni/87-podman-bridge.conflist"; + environment.etc."cni/net.d/87-podman-bridge.conflist".source = utils.copyFile "${pkgs.podman-unwrapped.src}/cni/87-podman-bridge.conflist"; # Enable common /etc/containers configuration virtualisation.containers.enable = true; diff --git a/nixos/tests/codimd.nix b/nixos/tests/codimd.nix index b1acbf4a832..aa581dfeb58 100644 --- a/nixos/tests/codimd.nix +++ b/nixos/tests/codimd.nix @@ -21,7 +21,15 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: services = { codimd = { enable = true; - configuration.dbURL = "postgres://codimd:snakeoilpassword@localhost:5432/codimddb"; + configuration.dbURL = "postgres://codimd:\${DB_PASSWORD}@localhost:5432/codimddb"; + + /* + * Do not use pkgs.writeText for secrets as + * they will end up in the world-readable Nix store. + */ + environmentFile = pkgs.writeText "codimd-env" '' + DB_PASSWORD=snakeoilpassword + ''; }; postgresql = { enable = true; diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix index d29c802b47b..88e30b62baa 100644 --- a/nixos/tests/kafka.nix +++ b/nixos/tests/kafka.nix @@ -90,4 +90,5 @@ in with pkgs; { kafka_2_2 = makeKafkaTest "kafka_2_2" apacheKafka_2_2; kafka_2_3 = makeKafkaTest "kafka_2_3" apacheKafka_2_3; kafka_2_4 = makeKafkaTest "kafka_2_4" apacheKafka_2_4; + kafka_2_5 = makeKafkaTest "kafka_2_5" apacheKafka_2_5; } diff --git a/nixos/tests/magnetico.nix b/nixos/tests/magnetico.nix index 6770d32358e..e79a728b2ac 100644 --- a/nixos/tests/magnetico.nix +++ b/nixos/tests/magnetico.nix @@ -27,12 +27,13 @@ in start_all() machine.wait_for_unit("magneticod") machine.wait_for_unit("magneticow") + machine.wait_for_open_port(${toString port}) machine.succeed( - "${pkgs.curl}/bin/curl " + "${pkgs.curl}/bin/curl --fail " + "-u user:password http://localhost:${toString port}" ) - assert "Unauthorised." in machine.succeed( - "${pkgs.curl}/bin/curl " + machine.fail( + "${pkgs.curl}/bin/curl --fail " + "-u user:wrongpwd http://localhost:${toString port}" ) machine.shutdown() diff --git a/nixos/tests/signal-desktop.nix b/nixos/tests/signal-desktop.nix index e4b830e9e23..65ae49a267d 100644 --- a/nixos/tests/signal-desktop.nix +++ b/nixos/tests/signal-desktop.nix @@ -31,8 +31,13 @@ import ./make-test-python.nix ({ pkgs, ...} : # start signal desktop machine.execute("su - alice -c signal-desktop &") - # wait for the "Link your phone to Signal Desktop" message - machine.wait_for_text("Link your phone to Signal Desktop") + # Wait for the Signal window to appear. Since usually the tests + # are run sandboxed and therfore with no internet, we can not wait + # for the message "Link your phone ...". Nor should we wait for + # the "Failed to connect to server" message, because when manually + # running this test it will be not sandboxed. + machine.wait_for_text("Signal") + machine.wait_for_text("File Edit View Window Help") machine.screenshot("signal_desktop") ''; }) diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 8c956c53fb3..7a6acb25e80 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "drumkv1"; - version = "0.9.15"; + version = "0.9.16"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz"; - sha256 = "108jk8p1sbm99plipf98ssij6dxaip1lmznibg8y2c4x0v2la6ab"; + sha256 = "1r55575w9r0ifysw9mgxjvv0fszvx8ykjgim3zczf3mb5s9ngavv"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; diff --git a/pkgs/applications/audio/fdkaac/default.nix b/pkgs/applications/audio/fdkaac/default.nix index 55c0d7c597c..8969f3a47b2 100644 --- a/pkgs/applications/audio/fdkaac/default.nix +++ b/pkgs/applications/audio/fdkaac/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fdkaac"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "nu774"; repo = pname; - rev = version; - sha256 = "16iwqmwagnb929byz8kj79pmmr0anbyv26drbavhppmxhk7rrpgh"; + rev = "v${version}"; + sha256 = "02mzx4bird2q5chzpavfc9pg259hwfvq6px85xarm59vmj9nryb6"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/audio/jamulus/default.nix b/pkgs/applications/audio/jamulus/default.nix index b8763f07b45..7a5887d4f92 100644 --- a/pkgs/applications/audio/jamulus/default.nix +++ b/pkgs/applications/audio/jamulus/default.nix @@ -3,12 +3,12 @@ mkDerivation rec { pname = "jamulus"; - version = "3.5.9"; + version = "3.5.10"; src = fetchFromGitHub { owner = "corrados"; repo = "jamulus"; rev = "r${stdenv.lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "0h2m1sahi8cg15k6wa9m2d38va2cs3nvi0q8rpr9vak8g8d3p460"; + sha256 = "0bw2v40csjmlkvkhr3dh0g1a7mfqrs1xkqjsii61yfzy2ckbsi82"; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/pkgs/applications/audio/littlegptracker/0001-Remove-coherency-checks.patch b/pkgs/applications/audio/littlegptracker/0001-Remove-coherency-checks.patch new file mode 100644 index 00000000000..3cabd2a2c56 --- /dev/null +++ b/pkgs/applications/audio/littlegptracker/0001-Remove-coherency-checks.patch @@ -0,0 +1,52 @@ +From 2e1e9b3ffce9d1069fca0b27b8011f85c7547c3b Mon Sep 17 00:00:00 2001 +From: Francesco Gazzetta <fgaz@fgaz.me> +Date: Wed, 19 Aug 2020 15:06:19 +0200 +Subject: [PATCH 1/2] Remove coherency checks >:) + +As far as I can see, they are just to make sure that the types can fit +in the word length, but this check was written when 64 bits weren't a +possibility and didn't take that into account, +so although the types do fit, the checks fail. +Indeed, the program seems to work well on 64 bits. +More info here: +https://github.com/Mdashdotdashn/LittleGPTracker/issues/4 +--- + sources/Externals/Soundfont/DATATYPE.H | 22 ---------------------- + 1 file changed, 22 deletions(-) + +diff --git a/sources/Externals/Soundfont/DATATYPE.H b/sources/Externals/Soundfont/DATATYPE.H +index 762a724..f6b031f 100644 +--- a/sources/Externals/Soundfont/DATATYPE.H ++++ b/sources/Externals/Soundfont/DATATYPE.H +@@ -123,28 +123,6 @@ typedef short SHORT; /* 16 bit signed value was: INT */ + ********************************************************************/ + typedef unsigned short EMUSTAT; + +-/******************************************************************** +-* Compare <limits.h> values with SoundFont Enabler limits. Fail compile +-* if discrepency. If compile fails due to one of these errors, then +-* the SoundFont enabler will not work with your system or the state of your +-* development environment. +-********************************************************************/ +-#if (SCHAR_MAX != CHAR_MAXVAL) || (UCHAR_MAX != BYTE_MAXVAL) +- #error <datatype.h>: char is out of range! +-#endif +- +-#if (SHRT_MAX != SHRT_MAXVAL) +- #error <datatype.h>: short is out of range! +-#endif +- +-#if (LONG_MAX != LONG_MAXVAL) +- #error <datatype.h>: long is out of range! +-#endif +- +-#if (ULONG_MAX != DWORD_MAXVAL) +- #error <datatype.h>: unsigned long is out of range! +-#endif +- + #ifdef __BYTE_COHERENT + + /******************************************************************** +-- +2.25.4 + diff --git a/pkgs/applications/audio/littlegptracker/0002-Set-the-initial-directory-to-the-current-directory.patch b/pkgs/applications/audio/littlegptracker/0002-Set-the-initial-directory-to-the-current-directory.patch new file mode 100644 index 00000000000..3e1c822be2a --- /dev/null +++ b/pkgs/applications/audio/littlegptracker/0002-Set-the-initial-directory-to-the-current-directory.patch @@ -0,0 +1,27 @@ +From c3865405ca707e3284a81709577d85ce2b3db72c Mon Sep 17 00:00:00 2001 +From: Francesco Gazzetta <fgaz@fgaz.me> +Date: Wed, 19 Aug 2020 15:06:58 +0200 +Subject: [PATCH 2/2] Set the initial directory to the current directory + +otherwise the user has to navigate from the nix store, which makes the program +crash due to its size +--- + sources/Adapters/DEB/System/DEBSystem.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sources/Adapters/DEB/System/DEBSystem.cpp b/sources/Adapters/DEB/System/DEBSystem.cpp +index 6e86693..65d2cdd 100644 +--- a/sources/Adapters/DEB/System/DEBSystem.cpp ++++ b/sources/Adapters/DEB/System/DEBSystem.cpp +@@ -54,7 +54,7 @@ void DEBSystem::Boot(int argc,char **argv) { + } + Path::SetAlias("bin",dirname(buff)) ; + +- Path::SetAlias("root","bin:..") ; ++ Path::SetAlias("root",".") ; + + #ifdef _DEBUG + Trace::GetInstance()->SetLogger(*(new StdOutLogger())); +-- +2.25.4 + diff --git a/pkgs/applications/audio/littlegptracker/default.nix b/pkgs/applications/audio/littlegptracker/default.nix new file mode 100644 index 00000000000..91d70968794 --- /dev/null +++ b/pkgs/applications/audio/littlegptracker/default.nix @@ -0,0 +1,72 @@ +{ stdenv +, fetchFromGitHub +, SDL +, jack2 +, Foundation +}: + +stdenv.mkDerivation rec { + pname = "littlegptracker"; + version = "unstable-2019-04-14"; + + src = fetchFromGitHub { + owner = "Mdashdotdashn"; + repo = "littlegptracker"; + rev = "0ed729b46739e3df5e111c6fa4d548fde2d3b891"; + sha256 = "1pc6lg2qp6xh7ahs5d5pb63ms4h2dz7ryp3c7mci4g37gbwbsj5b"; + }; + + buildInputs = [ + SDL + ] + ++ stdenv.lib.optional stdenv.isDarwin Foundation + ++ stdenv.lib.optional stdenv.isLinux jack2; + + patches = [ + # Remove outdated (pre-64bit) checks that would fail on modern platforms + # (see description in patch file) + ./0001-Remove-coherency-checks.patch + # Set starting directory to cwd, default is in /nix/store and causes a crash + # (see description in patch file) + ./0002-Set-the-initial-directory-to-the-current-directory.patch + ]; + + preBuild = "cd projects"; + + makeFlags = [ "CXX=${stdenv.cc.targetPrefix}c++" ] + ++ stdenv.lib.optionals stdenv.isLinux [ "PLATFORM=DEB" ] + ++ stdenv.lib.optionals stdenv.isDarwin [ "PLATFORM=OSX" ]; + + NIX_CFLAGS_COMPILE = [ "-fpermissive" ] ++ + stdenv.lib.optional stdenv.hostPlatform.isAarch64 "-Wno-error=narrowing"; + + NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin "-framework Foundation"; + + installPhase = let extension = if stdenv.isDarwin then "app" else "deb-exe"; + in "install -Dm555 lgpt.${extension} $out/bin/lgpt"; + + meta = with stdenv.lib; { + description = "A music tracker similar to lsdj optimised to run on portable game consoles"; + longDescription = '' + LittleGPTracker (a.k.a 'The piggy', 'lgpt') is a music tracker optimised + to run on portable game consoles. It is currently running on Game Park's + GP2x & Caanoo, PSP, Dingoo, Windows, Mac OSX (intel/ppc) & Linux (Debian). + + It implements the user interface of littlesounddj, a very famous tracker + for the Gameboy platform that has been tried and tested by many users over + the years, leading to a little complex but yet extremely efficent way of + working. + + Piggy currently supports 8 monophonic 16Bit/44.1Khz stereo sample playback + channels. Additionally, the program can drive MIDI instruments (with the + gp32 and gp2x a custom MIDI interface is required). + ''; + homepage = "http://www.littlegptracker.com/"; + downloadPage = "http://www.littlegptracker.com/download.php"; + license = licenses.bsd3; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + # https://github.com/NixOS/nixpkgs/pull/91766#issuecomment-688751821 + broken = stdenv.isDarwin; + }; +} diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 21dffa8d509..f3203566a13 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -1,5 +1,9 @@ { stdenv -, fetchurl, alsaLib +, fetchurl +, makeWrapper + +, alsaLib +, perl }: stdenv.mkDerivation rec { @@ -10,12 +14,30 @@ stdenv.mkDerivation rec { sha256 = "0vkcfdx0mqq6lmpczsmpa2jsb0s6dryx3i7gvr32i3w9b9w9ij9h"; }; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; + outputs = [ "out" "conplay" ]; + + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ perl ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; configureFlags = stdenv.lib.optional (stdenv.hostPlatform ? mpg123) "--with-cpu=${stdenv.hostPlatform.mpg123.cpu}"; + postInstall = '' + mkdir -p $conplay/bin + mv scripts/conplay $conplay/bin/ + ''; + + preFixup = '' + patchShebangs $conplay/bin/conplay + ''; + + postFixup = '' + wrapProgram $conplay/bin/conplay \ + --prefix PATH : $out/bin + ''; + meta = { description = "Fast console MPEG Audio Player and decoder library"; homepage = "http://mpg123.org"; diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 15d38a1eea7..0646407582e 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -2,14 +2,14 @@ , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let - version = "0.5.1"; + version = "0.5.2"; in stdenv.mkDerivation { pname = "openmpt123"; inherit version; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "1vpalfsrkbx4vyrh1qy564lr91jwdxlbjivv5gzf8zcywxasf0xa"; + sha256 = "1cwpc4j90dpxa2siia68rg9qwwm2xk6bhxnslfjj364507jy6s4l"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 2aeae1f1890..9274044090b 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -12,13 +12,13 @@ let ; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.4.2"; + version = "2.4.4"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "0sbccsisk9w0gnblvhg7wk1c5ydppldjbvaa0zhl3yrid5a363ah"; + sha256 = "0iw2v37j70881v0a2rjp2miq97nscq04x1ysk1dqmi1b9hi0y17q"; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index caa703f59ce..36462aa28bc 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "3.1.1"; + version = "3.2.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; - sha256 = "11hgcysa1x9yqvha6ri4vl1zk8gf8vhcpnh3j38wg9ncd7nz5k2v"; + sha256 = "R1BhobnwoU7oJ7bNes8kH2neXqHlMPbRCNjcHyzUPqo="; name="${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 245d96dee01..13edd8ea383 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -64,7 +64,7 @@ let in stdenv.mkDerivation { - pname = "spotify"; + pname = "spotify-unwrapped"; inherit version; # fetch from snapcraft instead of the debian repository most repos fetch from. diff --git a/pkgs/applications/audio/spotify/wrapper.nix b/pkgs/applications/audio/spotify/wrapper.nix new file mode 100644 index 00000000000..418ef3cbc03 --- /dev/null +++ b/pkgs/applications/audio/spotify/wrapper.nix @@ -0,0 +1,31 @@ +{ symlinkJoin +, lib +, spotify-unwrapped +, makeWrapper + + # High-DPI support: Spotify's --force-device-scale-factor argument; not added + # if `null`, otherwise, should be a number. +, deviceScaleFactor ? null +}: + +symlinkJoin { + name = "spotify-${spotify-unwrapped.version}"; + + paths = [ spotify-unwrapped.out ]; + + nativeBuildInputs = [ makeWrapper ]; + preferLocalBuild = true; + passthru.unwrapped = spotify-unwrapped; + postBuild = '' + wrapProgram $out/bin/spotify \ + ${lib.optionalString (deviceScaleFactor != null) '' + --add-flags ${lib.escapeShellArg "--force-device-scale-factor=${ + builtins.toString deviceScaleFactor + }"} + ''} + ''; + + meta = spotify-unwrapped.meta // { + priority = (spotify-unwrapped.meta.priority or 0) - 1; + }; +} diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix index 48ad9bc971c..2cd48806f7d 100644 --- a/pkgs/applications/audio/sunvox/default.nix +++ b/pkgs/applications/audio/sunvox/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.warmplace.ru/soft/sunvox/sunvox-${version}.zip"; - sha256 = "15pyc3dk4dqlivgzki8sv7xpwg3bbn5xv9338g16a0dbn7s3kich"; + sha256 = "04f7psm0lvc09nw7d2wp0sncf37bym2v7hhxp4v8c8gdgayj7k8m"; }; buildInputs = [ unzip ]; diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 5d1d75e31eb..ad4fc9728be 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://wiki.gnome.org/Apps/DejaDup"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ jtojnar joncojonathan ]; + maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix index 65feac9565b..09dc59a051a 100644 --- a/pkgs/applications/blockchains/bitcoin.nix +++ b/pkgs/applications/blockchains/bitcoin.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { homepage = "https://bitcoin.org/"; downloadPage = "https://bitcoincore.org/bin/bitcoin-core-${version}/"; changelog = "https://bitcoincore.org/en/releases/${version}/"; - maintainers = with maintainers; [ roconnor AndersonTorres ]; + maintainers = with maintainers; [ roconnor ]; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix index 43de23b68fc..2467d309922 100644 --- a/pkgs/applications/blockchains/clightning.nix +++ b/pkgs/applications/blockchains/clightning.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "clightning"; - version = "0.9.0-1"; + version = "0.9.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "01cwcrqysqsrf96bbbj0grm8j5m46a3acgwy0kzxdx05jdzld9sc"; + sha256 = "4923e2fa001cfc2403d1bed368710499d5def322e6384b8eea2bd39d3351a417"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/blockchains/dashpay.nix b/pkgs/applications/blockchains/dashpay.nix index b88aa3af19e..7bdf93b2dac 100644 --- a/pkgs/applications/blockchains/dashpay.nix +++ b/pkgs/applications/blockchains/dashpay.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { private as you make transactions without waits, similar to cash. ''; homepage = "https://www.dash.org"; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; license = licenses.mit; }; diff --git a/pkgs/applications/blockchains/dogecoin.nix b/pkgs/applications/blockchains/dogecoin.nix index b1ebebdd213..27a1f6132f0 100644 --- a/pkgs/applications/blockchains/dogecoin.nix +++ b/pkgs/applications/blockchains/dogecoin.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.dogecoin.com/"; license = licenses.mit; - maintainers = with maintainers; [ edwtjo offline AndersonTorres ]; + maintainers = with maintainers; [ edwtjo offline ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/blockchains/litecoin.nix b/pkgs/applications/blockchains/litecoin.nix index 22cfa3dbb91..fa352652dbf 100644 --- a/pkgs/applications/blockchains/litecoin.nix +++ b/pkgs/applications/blockchains/litecoin.nix @@ -50,6 +50,6 @@ mkDerivation rec { platforms = platforms.unix; license = licenses.mit; broken = stdenv.isDarwin; - maintainers = with maintainers; [ offline AndersonTorres ]; + maintainers = with maintainers; [ offline ]; }; } diff --git a/pkgs/applications/blockchains/namecoin.nix b/pkgs/applications/blockchains/namecoin.nix index 548213a52fd..936eaa2505e 100644 --- a/pkgs/applications/blockchains/namecoin.nix +++ b/pkgs/applications/blockchains/namecoin.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency"; homepage = "https://namecoin.org"; license = licenses.mit; - maintainers = with maintainers; [ doublec AndersonTorres infinisil ]; + maintainers = with maintainers; [ doublec infinisil ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/blockchains/wasabibackend/deps.nix b/pkgs/applications/blockchains/wasabibackend/deps.nix index 1058cfcf93c..4d4489efa3c 100644 --- a/pkgs/applications/blockchains/wasabibackend/deps.nix +++ b/pkgs/applications/blockchains/wasabibackend/deps.nix @@ -770,13 +770,13 @@ in [ }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.1.2"; - sha256 = "19wfh9yg4n2khbl7pvf6ngx95m5p8lw4l9y935pv7nh4xgwk02p9"; + version = "3.1.8"; + sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "3.1.2"; - sha256 = "0a332ia5pabnz7mdfc99a5hlc7drnwzlc7cj9b5c3an6dq636p66"; + version = "3.1.8"; + sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa"; }) (fetchNuGet { name = "Microsoft.CSharp"; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 964a1cd7ae1..f35e695d1b6 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -19,9 +19,9 @@ let sha256Hash = "sha256-qbxmR9g8DSKzcP09bJuc+am79BSXWG39UQxFEb1bZ88="; }; latestVersion = { # canary & dev - version = "4.2.0.10"; # "Android Studio 4.2 Canary 10" - build = "202.6811877"; - sha256Hash = "sha256-ZKfETCECIOq+q/5N+I13ceb5dqGMGTXMGrqSeTL9KCc="; + version = "4.2.0.11"; # "Android Studio 4.2 Canary 11" + build = "202.6825553"; + sha256Hash = "sha256-la3J0mgUxJA50l1PLr9FPMKI5QYkoBRriVyu3aVq7io="; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/bluej/default.nix b/pkgs/applications/editors/bluej/default.nix new file mode 100644 index 00000000000..25caf4b7ac7 --- /dev/null +++ b/pkgs/applications/editors/bluej/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, makeWrapper, jdk }: + +stdenv.mkDerivation rec { + pname = "bluej"; + version = "4.2.2"; + src = fetchurl { + # We use the deb here. First instinct might be to go for the "generic" JAR + # download, but that is actually a graphical installer that is much harder + # to unpack than the deb. + url = "https://www.bluej.org/download/files/BlueJ-linux-${builtins.replaceStrings ["."] [""] version}.deb"; + sha256 = "5c2241f2208e98fcf9aad7c7a282bcf16e6fd543faa5fdb0b99b34d1023113c3"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + unpackPhase = '' + ar xf $src + tar xf data.tar.xz + ''; + + installPhase = '' + mkdir -p $out + cp -r usr/* $out + + makeWrapper ${jdk}/bin/java $out/bin/bluej \ + --add-flags "-Djavafx.embed.singleThread=true -Dawt.useSystemAAFontSettings=on -Xmx512M -cp \"$out/share/bluej/bluej.jar\" bluej.Boot" + ''; + + meta = with stdenv.lib; { + description = "A simple integrated development environment for Java"; + homepage = "https://www.bluej.org/"; + license = licenses.gpl2ClasspathPlus; + maintainers = [ maintainers.charvp ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index c48e342977e..03e9923f737 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -196,6 +196,26 @@ let ivy-rtags = fix-rtags super.ivy-rtags; + libgit = super.libgit.overrideAttrs(attrs: { + nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ pkgs.cmake ]; + buildInputs = attrs.buildInputs ++ [ pkgs.libgit2 ]; + dontUseCmakeBuildDir = true; + postPatch = '' + sed -i s/'add_subdirectory(libgit2)'// CMakeLists.txt + ''; + postBuild = '' + pushd working/libgit + make + popd + ''; + postInstall = '' + outd=$(echo $out/share/emacs/site-lisp/elpa/libgit-**) + mkdir $outd/build + install -m444 -t $outd/build ./source/src/libegit2.so + rm -r $outd/src $outd/Makefile $outd/CMakeLists.txt + ''; + }); + magit = super.magit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix index 178494b0498..18fe236983a 100644 --- a/pkgs/applications/editors/jedit/default.nix +++ b/pkgs/applications/editors/jedit/default.nix @@ -44,12 +44,8 @@ stdenv.mkDerivation { mkdir -p $out/share/applications mv package-files/linux/deb/jedit.desktop $out/share/applications/jedit.desktop - patch package-files/linux/jedit << EOF - 5a6,8 - > # specify the correct JAVA_HOME - > JAVA_HOME=${jdk.jre.home}/jre - > - EOF + # specify the correct JAVA_HOME + sed -i '1a JAVA_HOME=${jdk}' package-files/linux/jedit sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit mkdir -p $out/bin cp package-files/linux/jedit $out/bin/jedit diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index bedc8c60c70..a99cba67d3c 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1i4vq8a81jgshn9iqkj8rp0yqihq2bjim27c8sh4vl9d6a8a6vcr"; - x86_64-darwin = "090xj8pq3fdn7dcfrzvgvx906k6gs2xm04xkymz8vpm3a4rq1svn"; + x86_64-linux = "1kgvwcwkdvywsiyg86srfzcq6jcas6hyi9ds4qvndsnd64j0fgkn"; + x86_64-darwin = "03jci05psxkknpjrrgjpdxsii2xyf5cfpkhrp5nnfafb5acfvs1x"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.48.2"; + version = "1.49.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 5039fa4707c..d311e644a29 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "17frdyli375l20mb7sb5bmw000p9cplj4pagmhnb6nibi9wqypdx"; - x86_64-darwin = "1dh5k36fjdfwhidlsg1grjwy3s9jik3pg6xpdgi6946vzqv1vxll"; + x86_64-linux = "10v13j1zg1bpgmr99vqhs1gwcipvnbkln0w6yphwn9440fw9fyp4"; + x86_64-darwin = "1mgi2awrqsm11l1yb8rgmfrxvjfn9z3qvp5np76vgbaibq2ihh0k"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.48.2"; + version = "1.49.1"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 5d037bba5ba..5a5ce5d8b21 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "13.6.2"; + version = "13.7.3"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "17nahdv06d41vyqkcqflf652wjp410i3hn4rhlv5cnd3jcr5vgih"; + sha256 = "14wcj9jbpv1rg0g7djihzzq088aj96mwys4rc9540ajbkbbm9d36"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix index 99ca119b3bc..3c67b11844d 100644 --- a/pkgs/applications/graphics/fontmatrix/default.nix +++ b/pkgs/applications/graphics/fontmatrix/default.nix @@ -1,26 +1,32 @@ -{ stdenv, fetchFromGitHub, cmake, qt4 }: +{ lib, mkDerivation, fetchpatch, fetchFromGitHub, cmake, qttools, qtwebkit }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "fontmatrix"; - version = "0.6.0"; + version = "0.6.0-qt5"; src = fetchFromGitHub { - owner = "fontmatrix"; + owner = "fcoiffie"; repo = "fontmatrix"; - rev = "v${version}"; - sha256 = "0aqndj1jhm6hjpwmj1qm92z2ljh7w78a5ff5ag47qywqha1ngn05"; + rev = "1ff8382d8c85c18d9962918f461341ff4fe21993"; + sha256 = "0yx1gbsjj9ddq1kiqplif1w5x5saw250zbmhmd4phqmaqzr60w0h"; }; - buildInputs = [ qt4 ]; + # Add missing QAction include + patches = [ (fetchpatch { + url = "https://github.com/fcoiffie/fontmatrix/commit/dc6de8c414ae21516b72daead79c8db88309b102.patch"; + sha256 = "092860fdyf5gq67jqfxnlgwzjgpizi6j0njjv3m62aiznrhig7c8"; + })]; + + buildInputs = [ qttools qtwebkit ]; nativeBuildInputs = [ cmake ]; hardeningDisable = [ "format" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac"; homepage = "https://github.com/fontmatrix/fontmatrix"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index eeaf8d56185..34b9b21f57d 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "1.1.1"; + version = "1.7.0"; src = if stdenv.isLinux then fetchzip { url = { @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { "x86_64-linux" = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; }.${stdenv.hostPlatform.system}; sha256 = { - "i686-linux" = "1andl3ripkcg4jhwdkd4b39c9aaxqpx9wzq21pysn6rlyy4hfcb0"; - "x86_64-linux" = "0qj5v8psqyp0sra0pvzkwjpm28kx3bgg36y37wklb6zl2ngpxm5g"; + "i686-linux" = "0fvi9pfcm6pfy628q2lg62bkikrgsisynrk3kkjisb9ldcyjgabw"; + "x86_64-linux" = "1iskhls8g8w2zhk79gprz4vzrmm7r7fq87gwgd4xmj5md4nkzran"; }.${stdenv.hostPlatform.system}; stripRoot = false; } else fetchurl { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg"; - sha256 = "16inwxkrky4xwlr7vara1l8kapdgjg3kfq1l94i5855782hn4ppm"; + sha256 = "0x6s26zgjryzmcg9qxmv5s2vml06q96yqbapasjfxqc3l205lnnn"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ xar cpio ]; diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index e3ffdef44d0..77717ff50a2 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "4.0.4"; + version = "4.1.0"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "0cracw6pja3d7z6ip6lbmpvfxlxcnh3fbgh5ba8c87bhfz99idqn"; + sha256 = "0x6msbbqkwxs6msqacpqw4wlw7c9ilf8n6jqmx297ij6isswgksh"; }; subPackages = [ "cmd/cheat" ]; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index e8a04aa2e14..3d7d7bb40af 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.2.0"; + version = "7.2.1"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0zpxsdzhn5fsrlq04v5kvkrgf4dsj5zmpypj9awsd2mjcbp6yxd7"; + sha256 = "0vdwbgff55aq5l67fczdvw7kn7kf0dsz183x5lz2v1sb2blsjvjj"; }; installPhase = '' diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index bed673ef8d4..fab83b75e7c 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl }: let - version = "6.4.8"; + version = "6.4.12"; in stdenv.mkDerivation { pname = "fetchmail"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "1g893dr3982vrqzxybmflnqfmd1q6yipd9krvxn0avhlrrp97k96"; + sha256 = "11s83af63gs9nnrjb66yq58xriyvi8hzj4ykxp3kws5z3nby111b"; }; buildInputs = [ openssl ]; diff --git a/pkgs/applications/misc/fuzzel/default.nix b/pkgs/applications/misc/fuzzel/default.nix index cef58b353a3..717d4a3aab3 100644 --- a/pkgs/applications/misc/fuzzel/default.nix +++ b/pkgs/applications/misc/fuzzel/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "fuzzel"; - version = "1.4.1"; + version = "1.4.2"; src = fetchgit { url = "https://codeberg.org/dnkl/fuzzel"; rev = "${version}"; - sha256 = "18pg46xry7q4i19mpjfz942c6vkqlrj4q18p85zldzv9gdsxnm9c"; + sha256 = "0c0p9spklzmy9f7abz3mvw0vp6zgnk3ns1i6ks95ljjb3kqy9vs2"; }; nativeBuildInputs = [ pkg-config meson ninja scdoc git ]; @@ -19,5 +19,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ fionera ]; platforms = with platforms; linux; + changelog = "https://codeberg.org/dnkl/fuzzel/releases/tag/${version}"; }; } diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index ef634fcf72b..db82aea2a50 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.14.5"; + version = "1.15.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "03xkrmwk4bvkqai9ghdm5arw9i4zhnfbabdn99lr1cv5prq7m4p3"; + sha256 = "1g9hmb5637x8bhm2wzarqnxzj0i93fcdm1myvld2d97a2d32hy6m"; }; doCheck = false; diff --git a/pkgs/applications/misc/go-jira/default.nix b/pkgs/applications/misc/go-jira/default.nix index 7844a6a593c..8b3ca1e2d8d 100644 --- a/pkgs/applications/misc/go-jira/default.nix +++ b/pkgs/applications/misc/go-jira/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-jira"; - version = "1.0.23"; + version = "1.0.24"; src = fetchFromGitHub { rev = "v${version}"; owner = "go-jira"; repo = "jira"; - sha256 = "0qk5ifjxkqisvgv066rw8xj2zszc9mhc0by4338xjd7ng10jkk7b"; + sha256 = "1qpimh39hsg75mb32hlvxmd7jj5b0cmhdkqz3dizfcnidllr3grd"; }; vendorSha256 = "18jwxnkv94lsxfv57ga519knxm077cc8chp5c992ipk58a04nv18"; diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 63ca213c2c4..828b3ca9bf0 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11 }: +{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk }: stdenv.mkDerivation rec { pname = "gpsprune"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jdk11 ]; + buildInputs = [ jdk ]; desktopItem = makeDesktopItem { name = "gpsprune"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildCommand = '' mkdir -p $out/bin $out/share/java cp -v $src $out/share/java/gpsprune.jar - makeWrapper ${jdk11}/bin/java $out/bin/gpsprune \ + makeWrapper ${jdk}/bin/java $out/bin/gpsprune \ --add-flags "-jar $out/share/java/gpsprune.jar" mkdir -p $out/share/applications cp $desktopItem/share/applications"/"* $out/share/applications diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index e5a2b87f16e..09717cd6426 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -13,14 +13,13 @@ in buildPythonApplication rec { pname = "gramps"; nativeBuildInputs = [ wrapGAppsHook gettext ]; - buildInputs = [ intltool gtk3 gobject-introspection pango gnome3.gexiv2 ] + buildInputs = [ intltool gtk3 gobject-introspection pango gnome3.gexiv2 ] # Map support ++ stdenv.lib.optional enableOSM osm-gps-map # Graphviz support ++ stdenv.lib.optional enableGraphviz graphviz # Ghostscript support ++ stdenv.lib.optional enableGhostscript ghostscript - ; src = fetchFromGitHub { @@ -60,6 +59,5 @@ in buildPythonApplication rec { description = "Genealogy software"; homepage = "https://gramps-project.org"; license = licenses.gpl2; - maintainers = with maintainers; [ joncojonathan ]; }; } diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index b1985be2c94..02544812eb1 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -2,11 +2,11 @@ , curl, cdparanoia, libid3tag, ncurses, libtool }: stdenv.mkDerivation rec { - name = "grip-4.1.1"; + name = "grip-4.2.0"; src = fetchurl { url = "mirror://sourceforge/grip/${name}.tar.gz"; - sha256 = "1sbjgawb7qrinixybwi0adk7mpdfb565gkffp5gxxsw8fqd068fs"; + sha256 = "1si5kidwg0i2jg0brzyvjrzw24v3km2hdgd4kda1adzq81a3p1cs"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 1626fc440e9..19034c1dc76 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "16p18svfcp201gd624wzmf0gpdvywybxp8539igin6s70k6rpc97"; + sha256 = "18paabqfxz49fahdi4fs5z870aynmyfj3xw8q768qffgc26zhl3m"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index ea579ce4117..23f80eaa9ca 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -87,7 +87,7 @@ with builtins; buildDotnetPackage rec { dynlibPath = stdenv.lib.makeLibraryPath [ gtk2 ]; - postInstall = + postInstall = let extractFDeskIcons = ./extractWinRscIconsToStdFreeDesktopDir.sh; in @@ -111,7 +111,7 @@ with builtins; buildDotnetPackage rec { meta = { description = "GUI password manager with strong cryptography"; homepage = "http://www.keepass.info/"; - maintainers = with stdenv.lib.maintainers; [ amorsillo obadz joncojonathan jraygauthier ]; + maintainers = with stdenv.lib.maintainers; [ amorsillo obadz jraygauthier ]; platforms = with stdenv.lib.platforms; all; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 26b6f329764..a0d370c00ac 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -1,23 +1,27 @@ { boost , fetchFromGitHub +, libGLU , mkDerivationWith , muparser , pkgconfig +, qtbase , qmake -, qt5 +, qtscript +, qtsvg +, qtxmlpatterns +, qttools , stdenv -, libGLU }: mkDerivationWith stdenv.mkDerivation rec { pname = "qcad"; - version = "3.25.0.0"; + version = "3.25.2.0"; src = fetchFromGitHub { owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "07qph2645m1wi9yi04ixdvx8dli03q1vimj3laqdmnpipi54lljc"; + sha256 = "1lz6q9n2p0l7k8rwqsdj6av9p3426423g5avc4y6s7nbk36280mz"; }; patches = [ @@ -25,11 +29,11 @@ mkDerivationWith stdenv.mkDerivation rec { ]; postPatch = '' - if ! [ -d src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version} ]; then - mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version} + if ! [ -d src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version} ]; then + mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version} cp \ src/3rdparty/qt-labs-qtscriptgenerator-5.14.0/qt-labs-qtscriptgenerator-5.14.0.pro \ - src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version}/qt-labs-qtscriptgenerator-${qt5.qtbase.version}.pro + src/3rdparty/qt-labs-qtscriptgenerator-${qtbase.version}/qt-labs-qtscriptgenerator-${qtbase.version}.pro fi ''; @@ -61,6 +65,10 @@ mkDerivationWith stdenv.mkDerivation rec { cp -r plugins $out/lib/plugins cp -r patterns $out/lib/patterns + # workaround to fix the library browser: + rm -r $out/lib/plugins/sqldrivers + ln -s -t $out/lib/plugins ${qtbase}/${qtbase.qtPluginPrefix}/sqldrivers + install -Dm644 scripts/qcad_icon.svg $out/share/icons/hicolor/scalable/apps/qcad.svg runHook postInstall @@ -70,16 +78,16 @@ mkDerivationWith stdenv.mkDerivation rec { boost muparser libGLU - qt5.qtbase - qt5.qtscript - qt5.qtsvg - qt5.qtxmlpatterns + qtbase + qtscript + qtsvg + qtxmlpatterns ]; nativeBuildInputs = [ pkgconfig - qt5.qmake - qt5.qttools + qmake + qttools ]; enableParallelBuilding = true; @@ -89,6 +97,6 @@ mkDerivationWith stdenv.mkDerivation rec { homepage = "https://qcad.org"; license = licenses.gpl3; maintainers = with maintainers; [ yvesf ]; - platforms = qt5.qtbase.meta.platforms; + platforms = qtbase.meta.platforms; }; } diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix index f44b5f1f56a..7894bc2f5e4 100644 --- a/pkgs/applications/misc/weather/default.nix +++ b/pkgs/applications/misc/weather/default.nix @@ -1,41 +1,48 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, pythonPackages, installShellFiles }: stdenv.mkDerivation rec { - version = "2.4.1"; - pname = "weather"; - - src = fetchurl { - url = "http://fungi.yuggoth.org/weather/src/${pname}-${version}.tar.xz"; - sha256 = "0nf680dl7a2vlgavdhj6ljq8a7lkhvr6zghkpzad53vmilxsndys"; - }; - - nativeBuildInputs = [ pythonPackages.wrapPython ]; - - buildInputs = [ pythonPackages.python ]; - - phases = [ "unpackPhase" "installPhase" ]; - - installPhase = '' - site_packages=$out/${pythonPackages.python.sitePackages} - mkdir -p $out/{share/{man,weather-util},bin,etc} $site_packages - cp weather $out/bin/ - cp weather.py $site_packages/ - chmod +x $out/bin/weather - cp airports overrides.{conf,log} places slist stations zctas zlist zones $out/share/weather-util/ - cp weatherrc $out/etc - cp weather.1 weatherrc.5 $out/share/man/ - sed -i \ - -e "s|/etc|$out/etc|g" \ - -e "s|else: default_setpath = \".:~/.weather|&:$out/share/weather-util|" \ - $site_packages/weather.py - wrapPythonPrograms - ''; - - meta = with stdenv.lib; { - homepage = "http://fungi.yuggoth.org/weather"; - description = "Quick access to current weather conditions and forecasts"; - license = licenses.isc; - maintainers = [ maintainers.matthiasbeyer ]; - platforms = platforms.linux; # my only platform - }; + version = "2.4.1"; + pname = "weather"; + + src = fetchurl { + url = "http://fungi.yuggoth.org/weather/src/${pname}-${version}.tar.xz"; + sha256 = "0nf680dl7a2vlgavdhj6ljq8a7lkhvr6zghkpzad53vmilxsndys"; + }; + + nativeBuildInputs = [ + installShellFiles + pythonPackages.wrapPython + ]; + + dontConfigure = true; + dontBuild = true; + + # Upstream doesn't provide a setup.py or alike, so we follow: + # http://fungi.yuggoth.org/weather/doc/install.rst#id3 + installPhase = '' + site_packages=$out/${pythonPackages.python.sitePackages} + install -Dt $out/bin -m 755 weather + install -Dt $site_packages weather.py + install -Dt $out/share/weather-util \ + airports overrides.{conf,log} places slist stations \ + zctas zlist zones + install -Dt $out/etc weatherrc + + sed -i \ + -e "s|/etc|$out/etc|g" \ + -e "s|else: default_setpath = \".:~/.weather|&:$out/share/weather-util|" \ + $site_packages/weather.py + + wrapPythonPrograms + + installManPage weather.1 weatherrc.5 + ''; + + meta = with stdenv.lib; { + homepage = "http://fungi.yuggoth.org/weather"; + description = "Quick access to current weather conditions and forecasts"; + license = licenses.isc; + maintainers = [ maintainers.matthiasbeyer ]; + platforms = platforms.unix; + }; } diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix index 0796e117311..1ab7a0da5dc 100644 --- a/pkgs/applications/networking/Sylk/default.nix +++ b/pkgs/applications/networking/Sylk/default.nix @@ -2,7 +2,7 @@ let pname = "Sylk"; - version = "2.8.2"; + version = "2.8.4"; in appimageTools.wrapType2 rec { @@ -10,7 +10,7 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; - hash = "sha256:0figpfm5cgbryq6v26k9gj42zgbk335bsa3bzyxpvz2slq8rzb2y"; + hash = "sha256-2s4ezyszNZD9YBj69f62aqtJWwFeida6G/fOA1exu2M="; }; profile = '' diff --git a/pkgs/applications/networking/browsers/castor/default.nix b/pkgs/applications/networking/browsers/castor/default.nix index dd8ddd2dccb..c9ad213cf1d 100644 --- a/pkgs/applications/networking/browsers/castor/default.nix +++ b/pkgs/applications/networking/browsers/castor/default.nix @@ -39,8 +39,7 @@ rustPlatform.buildRustPackage rec { postInstall = "make PREFIX=$out copy-data"; # Sometimes tests fail when run in parallel - #checkFlags = [ "--test-threads=1" ]; - doCheck = false; + cargoParallelTestThreads = false; meta = with stdenv.lib; { description = "A graphical client for plain-text protocols written in Rust with GTK. It currently supports the Gemini, Gopher and Finger protocols"; @@ -49,4 +48,3 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ fgaz ]; }; } - diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 4e3960ee729..a79a48fffcc 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -17,7 +17,7 @@ , libXScrnSaver, libXcursor, libXtst, libGLU, libGL , protobuf, speechd, libXdamage, cups , ffmpeg_3, libxslt, libxml2, at-spi2-core -, jre +, jre8 , pipewire_0_2 # optional dependencies @@ -50,6 +50,8 @@ with stdenv.lib; # see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html let + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + # The additional attributes for creating derivations based on the chromium # source tree. extraAttrs = buildFun base; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index dae7f741b35..ec8fc3407d2 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,17 +1,17 @@ { "stable": { - "version": "85.0.4183.102", - "sha256": "032yh1mfwins7a62zw8kwwq8xw1n52a0a93lqz7qlyjaf9sd8s4a", - "sha256bin64": "1i8xaxxnmg80vsia8hxnq58qi9k5nnbrl80d6d23g9lb7dbc9cpm" + "version": "85.0.4183.121", + "sha256": "0a1xn39kmvyfpal6pgnylpy30z0322p3v7sx6vxi0r2naiz58670", + "sha256bin64": "08vqf1v91703aik47344bl409rsl4myar9bsd2lsvzqncncwsaca" }, "beta": { - "version": "86.0.4240.30", - "sha256": "1isj0zngb72k1hhn3h0s8mccg1cdmppz1mjmg19f2h306farzmzl", - "sha256bin64": "10d8im2adqqnkd6265gngv6xlm5qsz6r13z6cbbchsss0ssr8fxa" + "version": "86.0.4240.42", + "sha256": "06cfhiym9xmz2q86v6b6xcicrrp2pmr7karavylzz4fqvwd2v6fa", + "sha256bin64": "1z5zmdc2i31iimps7p5z43vv4qi83c8ljb7x68zc1rvf8x62p7xj" }, "dev": { - "version": "87.0.4252.0", - "sha256": "1lxlsdni63zh79hxvpwgmnfn67kgfzhz3yg9bkxghqchqykkz92y", - "sha256bin64": "130hf7b35wcxpw05ddbqq89x10c0kays1vb9qg6xhq3zx2mk6ijw" + "version": "87.0.4263.3", + "sha256": "1ybfrlm4417lpbg5qcwhq5p6nnxrw68wzyy5zvb1sg1ma8s9hhkk", + "sha256bin64": "1f7a272kalglmdwmrrzb4iw3crvvpv3mhxca5jh75qpldn4gby6m" } } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index e7f064b2f6b..403ef9bea1f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "80.0.1"; + version = "81.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ach/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ach/firefox-81.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "d3297316b481d6fa10cf71e7d1331f407e6167fbd1b6a854fc39fe2aca466250"; + sha256 = "7ff2b7ec6f3f55fccfb7988d7a42bc9cbe572af6edc64ac9b42ea15aaed9cd4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/af/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/af/firefox-81.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "464726f6cf660a8f5d6059ee85fdd0b87cd97c51abf578fdb851a181c94b110a"; + sha256 = "c1a29b1473583d28f87c764c8ccf67f7cba874fd85e5820f968230c9ce29670b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/an/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/an/firefox-81.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "3fcc891f53ed5986554c5f595fa75631402ae35eb484ae22c15cdcf3d1885311"; + sha256 = "bddab1deeaf3c6474586beb41ad9c720ed6e84f9e999a856b17bb4e7c9d97991"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ar/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ar/firefox-81.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "d30299d7e707c7528a87d3094612bff6013bf135f4ca5e2cc2105bcd434baddf"; + sha256 = "3c4e339627fc94df273ba7e1e1c150188033331def09678b2e0abb54e52f2120"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ast/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ast/firefox-81.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "c766b9c3fc2b63e0e61e113678afa783efabb96620d1715fb72bd17f4a93188d"; + sha256 = "e421c32fefef657287ad52dc11f2f3166e549ef9d54065099f84e5f35c8a52af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/az/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/az/firefox-81.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "49264b6f35bc0cc5198782fd2fa62a0388e04141b1580a44f71c48e6b44853df"; + sha256 = "e1099ab7b028d8124446a21056e55dc4b87d1f20972dea60125347b1b099e35d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/be/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/be/firefox-81.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "391f9423e7211790509e03822a4186117320da8f660a1e3b44ff44712235762e"; + sha256 = "a216a2cd652905d946aff1cb3a0fc8738a1e3d5746d080dd863d34be244a2a50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/bg/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/bg/firefox-81.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "45e04e624329abe7704242581599a11e177ff3418adc49cd5bd59f45b2f0d517"; + sha256 = "68a8a4ec3d0c1fb8a174a7466abbfb6c806bb8a263ab852b15dfdd15c35487aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/bn/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/bn/firefox-81.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "36c1ce02ae8b4ed1dd78ade3dadfb24042c6fe7d942c9e3be6b9c94dd7fa96df"; + sha256 = "3eaae9060b690391cbc63aacdb1d833b2895c7aaf6da36c32cb117e7994d94d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/br/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/br/firefox-81.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "83c0b3ec0fcf7d26a45c7e59a7c467c64fbc7d9fcce5358451e51828aa57acde"; + sha256 = "806b366419eb6edab57c8f3af9f0465d3547e3e28047983af7cb2f08ad822a8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/bs/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/bs/firefox-81.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "d1c1dbb0060ab256ca932f1ae2a8df8e8b130242c8a1d9014a047eae79d95687"; + sha256 = "025a79c350f35f8bba1a5fdd894d0eb237d22be8ee5825e6a657f18b0c99bd87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ca-valencia/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ca-valencia/firefox-81.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "8b4b1b7bb92287b4049712335c6da52f7bd825490996a48e4b376a3811700790"; + sha256 = "806f26efe0a6317cb5dd1b631f8b96bceeaa6e8fced624d15ac334d0d2d78dc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ca/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ca/firefox-81.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "34a48e1d85e7557b318590faccf621fd4c32e51060dc5d06f40ec933599ac4b6"; + sha256 = "dfa651a556e024d2d27a27d97eec87750d8f4e692345a0f4e12c7a3480ac1d20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/cak/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/cak/firefox-81.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "8db14d21c578d8e238b3a0882bcce70bb48d66fe60fc74053acf5bcf212fd243"; + sha256 = "7225d8cf7a529d8688aa7386fe14e50e4e208d55732523d5407690f63b6ab775"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/cs/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/cs/firefox-81.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "361414fede99694a9b8f31076b1a9d7c871d857870cfe0ef01cb3e02a5be0b3f"; + sha256 = "17d22031176a4604d498743eea242fe257c74620ac8ab88f8f197d57f8615663"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/cy/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/cy/firefox-81.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "bde481d7acfca3e0c33c63d7dffd9772adbd11c252dc4e92367476c5fc347cd5"; + sha256 = "82581e54dc72e188a5d4976bed58bcb8ba4153e72854fc439d3a903a5f60e6e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/da/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/da/firefox-81.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "bca4e7d4690cb950d9fa87623da30b93f54d0efd005e440b1af9acb06833baf2"; + sha256 = "87a600d73b3fb74ff8aaf26e1d915afa52692501ce67f13e308a7c9af63e6853"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/de/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/de/firefox-81.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "e4deb64c304ec7b5c06c0f8ec8299d6c513def1e0524cb93dba2fb3e22fca8e4"; + sha256 = "a15fdfafe598fe5e2d5c5854755e316844518eb1b4634aad6cbe99fefc3e5986"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/dsb/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/dsb/firefox-81.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "809080cde0646ed2e4a64e2e70beb25aa3dcc47f7f749f2722c898f8efd9271b"; + sha256 = "abb71f8df0de953ab2c27e50c9b49a69c012fbe52a0d6eb66744b03754d494ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/el/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/el/firefox-81.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "7f5abfb89c70187b9b8e954c21b566da9b28781f1de80634da6c47d149363cff"; + sha256 = "ed3782c6e619f9e0e59b2eb1f36e5c94a92e2f7b617b2ef87e0a2da0c4e65032"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/en-CA/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/en-CA/firefox-81.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "61d6a1cf59a89d2e690423f38779dc7c776757ed39a1fd66b9bfa6b5e63e68b4"; + sha256 = "5c5ae0e8345f13c346e2b756a57f465776e8d5a1ea62dd00dc6fe5a3b7c904fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/en-GB/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/en-GB/firefox-81.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "75b1808a6d5ea0b70df3bbb7d9b8890418069c5fa9bd8a5dce6b0f18f5e3b2de"; + sha256 = "3ed2a11824c00fd157b9b3d02dcde95ae8347b6add687f4bbc3284601360c1a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/en-US/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/en-US/firefox-81.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "3ac0c9c4454647ce986bbe6f3567b0e1de5c0719ed6b6627344292c581a2afd3"; + sha256 = "689d75035303b47266a3819e8aa3bb9026559b819aec2f6e95faa67b86888ce0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/eo/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/eo/firefox-81.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "5c61e9348fe69bbd32d9501730b9cc12c14b55746b5b670379ab0c463f2d71c2"; + sha256 = "cbebf5a97e5b2fb58c187553c8fcfd6474dae4a911c97cd8730977b8bee6c6cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/es-AR/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/es-AR/firefox-81.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "0203caa38c1526c8c3df9c315e205770b43594f222364f9bebb3e89485a1803d"; + sha256 = "e664214c7b2809919b672426c5d35e467eadf69fcbf43d20e00f379e5ab6f558"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/es-CL/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/es-CL/firefox-81.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "c2b7e09dce573ef945379a7a5f7691d877efa14e226bcd20ad48a3dedba1d1d2"; + sha256 = "10b07cafb315ef4497d9b2caaac0a83c86701506adab2f0e154a7873f39b3066"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/es-ES/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/es-ES/firefox-81.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "0653d855ff0e04b6f6a6e44de558de69fac582996c7b944dec043810c8faa704"; + sha256 = "aeb7d0af26b7fa4be27eb0b82da4051ab57ee1406eb20d3b5d12ec5d32d0104b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/es-MX/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/es-MX/firefox-81.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "9c6f7b6208b390a73dfe778ac0a798b4999abe93840b4224a5852143f3588f2a"; + sha256 = "c515c089afe6e4ef46df7ace24260118ed464a62146f59cce064ca465bb7affe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/et/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/et/firefox-81.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "786495f0ef9af4475755378d9ae3095041c4f329e9cbca197eaff0199d6bdf02"; + sha256 = "930c174be085acb50b18b4ee5b20b158c9a790ca19232cc25a1e34628a7b4346"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/eu/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/eu/firefox-81.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "91c9baea255e46ebc3ef8702eb8e233b395cd39c9c092c0812adcdcb60f5f3ae"; + sha256 = "2f0e39cece971b12f6f5c325277e77e5a3f053ab57cdc2a2905d9f7f3e739fe8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/fa/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/fa/firefox-81.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "1baf78177598c3e0fa6714ed85a305b6a811baa26b1d0c6d7d6d05c8bb8b8595"; + sha256 = "98029d664de21403cb54276a30d650a124e5b5250939c7e315a0435ebcc2bf26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ff/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ff/firefox-81.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "20e44b613633e84c8808c76ccd61a78bb8dce1a09bdaa1d6aa95dae1eacaafc6"; + sha256 = "097747294c73df707c7652c239330c106c69f77868fad65d490d1b896f90e689"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/fi/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/fi/firefox-81.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "d6f634e7aa109d368bb2b7e8b3c3682117d350ad7630d6283006f8d22f98201c"; + sha256 = "c915afc5e73f837e1e09ac0d14510271602ef5527ebf270b399be880c183b5a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/fr/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/fr/firefox-81.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "a0c7326670acb7b097c17905b23410819429b2357534eade971a9c3b22b268ba"; + sha256 = "775fee38f2033be70e4d68d985602bce3df69f9106d1c427a06b3f8233e7c30f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/fy-NL/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/fy-NL/firefox-81.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "f28ae560003555ded4590f0640a89090cbe0e732449973aa2b42d530e3829b73"; + sha256 = "49efc463dfe6b7b7a8dc0bf351cc903160bef3e1886c8faee6f11cca3abd3e90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ga-IE/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ga-IE/firefox-81.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "04b260885b755f9c7fe93a82ad10855abfbd14706ec81f0fe38c96c2355c833d"; + sha256 = "6dcf0be88e5fad96c79ccd4b6a612d721b792099d9f1bc029ff5b592c4004922"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/gd/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/gd/firefox-81.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "b8f4529a7970906654a6df2f91a5687d49dccf8f1438ed86bcc4d9608a2f26fc"; + sha256 = "924d9190a1d5dc85abcb1f23aacffb98c0116c5cbd430ec04c5275317639772e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/gl/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/gl/firefox-81.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "234c4f3ddb6e5a59f8eaae2b58d8a1dc302f66a5e7edc6337d9b1e6e1e1dab24"; + sha256 = "256c1b81294bc262770c655e2fdb5e36684286f4eb1857d6d38b87beba2b3d3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/gn/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/gn/firefox-81.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "0c7688233efc95bcbefa8b2faaced313d69c0fb246a91564b3629ec24026843b"; + sha256 = "2d9d55f4755f372e18a7d07786d64f09a4b4f76e6a80d8904e06188bc6edff41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/gu-IN/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/gu-IN/firefox-81.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "12c45963b4b7e4976f656b60e9c4964ad871f96cefeb5e898c3a830c85d92d78"; + sha256 = "86a64d446efcaa014fbbb05787223a025d99947ae4aa8e704661f1236c08bbcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/he/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/he/firefox-81.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "8e0c8c06f5e9665a7bc9733e3afe514620c2b6071451c9ca05f0a1fa9b953c58"; + sha256 = "64b1fcd9c454d1248eb1f2d02877f964e50dce38ffbdd93ca4c367246121eed2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/hi-IN/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hi-IN/firefox-81.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "008d5f194b9572ecee09ea67481ed1fa91f6a7987105d90c53924fd9d8e7ec7b"; + sha256 = "5d5f52e34c735df3ec5571e03e834919001fe3417a4190515f86f1e479690ace"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/hr/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hr/firefox-81.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "2ce4d27f389f2f4137d8f8487c4f4d32bf6833870592755e13694f48ab6966f2"; + sha256 = "e6085effe2607a416e80a310ace23381fcdd752bba8e58ad7611f05885e01e11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/hsb/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hsb/firefox-81.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "2c540fc55a0bebe2886123e3edcaaedf793e022eb0244c2eead9e1fba337d129"; + sha256 = "6a35c1657d78cfa843a24bea346fd98aeae041fdeb65297693f89b012f0c3786"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/hu/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hu/firefox-81.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "8f2c14860f0a97c2aea13b262a7f4ba62efbf643eb285f2282ba3467d7aa59c3"; + sha256 = "3717f43d3d771cbf4dee43889e0bfac3eb60dff8989c06496cbf14ace5753ca3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/hy-AM/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/hy-AM/firefox-81.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "c003e6572b150a9c0f33f1fe0d2d2e537e1d5bd901b937663cbdb8c50a0b2639"; + sha256 = "c376e1f35c8067b41415175bcb597c331b5f5352d4262f5a38d08296a307343d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ia/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ia/firefox-81.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "b8da547a7236c08b681d33d405f6ddf3f17a5342f8354a3565c6dfc39d3cabd4"; + sha256 = "99e0aafd820a965cd85fe9094b7465d700f8e62cbba86ef9746a44445e5bba2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/id/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/id/firefox-81.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "7c3adc7ec426b3f8a2da36fba744d07774037fa8dbadbf727eae3fdbb19a3bf7"; + sha256 = "ada432c2d6a04fe928416980b0f3575e2a42668c7298f68c32071ae2c4f5bb8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/is/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/is/firefox-81.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "57bbfd97596d9d2c557186d729ea74f233bc50833d8a1d768402cf6d25cb8dd7"; + sha256 = "df304bee0b2235222c97e49e0ad8bc0e3fe1cbe3ec0ffbf1b996902a6817d863"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/it/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/it/firefox-81.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "0de8a984c4a328020d351edfefe717325d4c50403f126b8c211b2798062c854c"; + sha256 = "8c35e143b73d3019b284a006501f93aa2550b32688d7d3285e56f92703df959d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ja/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ja/firefox-81.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "5a718d304fd3dd30abb9b9b5f6a54aca5c9a6cd1c9ccc3bd5859773112432f8a"; + sha256 = "39c23321100cee799e7024ac27d547a6cd7672485f07125d02c75dcd8e38f268"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ka/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ka/firefox-81.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "2422236d92428e2a0f921433f6bbcb87505aac7110cacc6ca61173a28555ba35"; + sha256 = "b40137c85d1783ee9a8a11fbd72e33bb9a2d3baa4bc2cc9f31a0c0bf020c2233"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/kab/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/kab/firefox-81.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "ab81137395002af2626e534e5133b455d4b50f441cf71f9a11b8f92444221535"; + sha256 = "61dab84674aef3fd91db859900de4709744816f621fecdb3df46a63f4426289b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/kk/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/kk/firefox-81.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "daba81c27dc36bcd267a0c77255b8333b8ab0f3e0e338a74eb17a36cd83af7db"; + sha256 = "a9e8e32cd7441a4b78c5c7b9ea7943c756f5b362a9e6a9028e20dfcb461bb056"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/km/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/km/firefox-81.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "021f7787bfe87ccc8bc33ed6668196f4a7d528672ba14eff1ca4fa4efe0c2768"; + sha256 = "f003c7a5eab166f29c37aaaf2c5cc4669d90fff33854d43e157130f606011820"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/kn/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/kn/firefox-81.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "973259c5b54672b0f5aedbb5c2126716cc7b8792f3b2c6f9d6d745eb9e6d9529"; + sha256 = "f23a998f16c3a93c210b7f08337bb3e739311ada223e85ac4599819b89bf7110"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ko/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ko/firefox-81.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "3bda308c8bce3b00250827d7b505c9cbe9574cd7809dd866ffe7a230dbdbb7bb"; + sha256 = "b6748a4a86fe9864a3378e32357c0fbc542846308ae8ac8005460d40f4f869b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/lij/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/lij/firefox-81.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "c57dccdb4f9281b31c1b359bd2a07b3376a693f3f37c513223029fa854b61644"; + sha256 = "267633fa63849ae002ebffd892ea3f520d59bace0a7dafe1f92dcbbfcaa7cf00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/lt/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/lt/firefox-81.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "ce04853033bb00b760c4814b436a67e151f54842ab736b440f118c44945e53d1"; + sha256 = "a985da29e6d91efed407bc9d898e8bd8f68d42cd4673b6ea163b99d8bb9cd642"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/lv/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/lv/firefox-81.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "79b71529569df018e86925e8df25dae43cc54629eee50035fe515c9299d2664f"; + sha256 = "05a05361cd3b5772c30c2a8cef03e8753311245caea3ee94e03fbb3b5b6ae9ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/mk/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/mk/firefox-81.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "3a015b82f1f966e1ecc49af369ff80bd922dd1dd4d93a642c9b7bb8f9ea078bd"; + sha256 = "0433579dfaa3dff715129cc45e72d83f93b7dc3a928b65744dece0a5b5687916"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/mr/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/mr/firefox-81.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "4fbf77e82ac6739eb4f557ef9fbf2d86574c50260d2661964ee01b99d496a10b"; + sha256 = "38177842df2df76fda10791eaa518d30b92f03016705eb555630fa356992416f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ms/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ms/firefox-81.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "c6e07a8f1eff5239ee19eec7d4828ca175535656fd130fcb72552e4585e1d9e8"; + sha256 = "34b724fc82f330d897b1073fd4383f5fbfaec9d312cc7991f395d37d98416da1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/my/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/my/firefox-81.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "a98a72b72665fda08f2b834af3a7c060d07cd638a69cad4f165f9af4730b642e"; + sha256 = "a527914488954bdf8aea31a6ab406791cc723b88c11a5a27f161aef970e00d6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/nb-NO/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/nb-NO/firefox-81.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "948454e67ed57e47f3879c866c9ef72245b552066689d1e5d7e95431c06c72ac"; + sha256 = "ccfa39917b8b0c2704a011bd41b0cfe4e890b0c1bc14bbbf641b7add2bf0750b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ne-NP/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ne-NP/firefox-81.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "280857446256df49b901eae8d64f4255fb279dae7f67ff83beefd59d227ea466"; + sha256 = "a3deb02b843fa9ff7a12590ad86195a9deb1be1eae055b493c34614fb361edf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/nl/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/nl/firefox-81.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "6e50983c69ac40ddb403c1e2a5b6ac1fb713bd1d169d8dd402516f827907d457"; + sha256 = "864ab1ee8d70e0968570fabc1e110bd97c86d27ce5d8106a70a31c6843e16db3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/nn-NO/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/nn-NO/firefox-81.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "27178fe7b5bf19c4b9fdc42c90651f4c53379996ba67b743485decce0fd9e18d"; + sha256 = "46d109379dba5dd3e5c9c413e54ff2578117960ac3c85ca937b48baf08bcdb76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/oc/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/oc/firefox-81.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "aa517e0e68aff16ccd693a7a282ee8aef1df8486b68b546af166bf39ef67baba"; + sha256 = "71638cc84a7eccb4a563b7640c84557bc203cbb91114e433e1400554a16b2c1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/pa-IN/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/pa-IN/firefox-81.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "cb5ea9559d416f44c0830cb1bc85fffd3ee02a63697ffed7c0d5ec9bee8bf1e8"; + sha256 = "8fb76633497115f927ce2be5064f6c6bb70d552c53491ccd6558df163941ef52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/pl/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/pl/firefox-81.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "36d0b84933e689b36701b50c1145b6f64e8f09af4ab8a7aafa53e1d33d8148f2"; + sha256 = "e6d38535433cc0a0c4aa07ab9aa33bad4d019041d4a2b30ccfc5553a10579a8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/pt-BR/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/pt-BR/firefox-81.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "24093debf351c29812350c5feb68f741fd0d05cadad962ec5acb5ea0d9450bec"; + sha256 = "399ef81afd3b05dbcb43553cdd36a2fd95e681296a21e7476cfa0c64c0c13ae4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/pt-PT/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/pt-PT/firefox-81.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "bac0a7f9f902ec3a1006a45a330b52520377b43c61aba4b6fb3a45eb126379ef"; + sha256 = "d6d87228f6a46237583ad8520c6758fd53d778e1905d019978a8da5fe0819cfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/rm/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/rm/firefox-81.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "e86c79a49f0c980ff4ad60f151e9350e66df0ecf8b9bfcd08586cbae9abad957"; + sha256 = "46dd4f4ddc69d82964289463baf67c05eab92a4500ad17f691a06fa0ea72830e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ro/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ro/firefox-81.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "32d089bfa4ebed3c6938abea0e16a9527cf303f6b9c5fd68e3adb2cd967ac3b2"; + sha256 = "8720bf2abd57615d098360e7ddb384c0d570d4422f18d509c8b2b7759dd84550"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ru/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ru/firefox-81.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "75a470c503f19282b3b1730cfc1bfef450634f1166d094b4e4f30a8f872da1ff"; + sha256 = "6a8db970a3be16e8a0524c2bb576e4c368d33f8bd874ae201d000d112f86282f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/si/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/si/firefox-81.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "f919ae9b3f2b6e1df1d073e3e7556091bc3586584c39a8dcbe91b8c29a4396d4"; + sha256 = "1ee0f867be47f5a7884577caf08778152d8ee08d8fd1b25440a69fe8bb0d1174"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/sk/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sk/firefox-81.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "de6b476f015fad31e80a504c29c05d60c95c0dce18309765a3108ab27c926900"; + sha256 = "97bc401f7c3c48b62fb66b3b5ea759345641874a46eb001ec1570ce53b610764"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/sl/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sl/firefox-81.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "9cba9b423bfda5788a76692e78310d961db70cc870e0797bcfc4020dc63e2019"; + sha256 = "5b5dbd25fc83048de4fdeaef13126701b01e070740345838c29b8aeba65934e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/son/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/son/firefox-81.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "4423551873bfee1d1d4c7acdeaed8a133df3d467e711d4b2ffdcfe4dcecf434f"; + sha256 = "99a2c222c6e14f511dda1f5cbbef2effd2aec7d169893024e25f2dc8f4900e39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/sq/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sq/firefox-81.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "739918066fae4e5b20093540a2ea6e527878991ffab59ecbbd264aba5a13eabf"; + sha256 = "7ff0ec6837ed3536f73aacc8295b5439aa0e18cdd80f2882bf2b644f5e7a1637"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/sr/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sr/firefox-81.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "5fe944b1fcb260fdbd747b9009ce05708d6ac82ae9f501d6a7efefc87d95fbfe"; + sha256 = "274b86c7dbdffcd11453e8103feeaf6e98931c7224ca2336d231cf885c809f21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/sv-SE/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/sv-SE/firefox-81.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "3f0ba11adce493f8ab6a771a362ada50abe442f60a2d910a36339ee19889b152"; + sha256 = "0fc7edddf1a3aa812664e08e94cf5967c69a5f4821616400a8144c3bdda9860b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ta/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ta/firefox-81.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "7fdcfb26091269bbda4f81991d3dff20fcbfba534be9e9ae315459306aef0d17"; + sha256 = "20121341b05c91142bd8fb4a0a2195693e78a89691b02651f6d6c3ac9f848a4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/te/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/te/firefox-81.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "54fbdcd804f4d2dec3096a041927e65ed999126f21a748a7f0b36091c4c4c7b3"; + sha256 = "bc306272b6bd53e312dfab3f404f1f92199945be9f74e1d87d19b58e7ae2ee95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/th/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/th/firefox-81.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "ebccb1cfdc0394889e7c67a5ef9be54dd87818c8f326e89ac6a97fcd9865c721"; + sha256 = "52c8825f27f78624a81271a01c3b522cf6617030046a38734611ee741215658d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/tl/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/tl/firefox-81.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "7585a169f7975bbaa752caacf1863a2bd3ac9eeb17a031492a7cea5dd1b24efe"; + sha256 = "c87f99419608a06d79bec67f54bafec6650dbcbed7fb52bda058bfe68d0ea102"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/tr/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/tr/firefox-81.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "a475825fb5f0125f16edc895921d3839393fa806a12b3bf2f296321853cb66ff"; + sha256 = "a030a15ce1424717b8fd0787f1a0d13ad8e050f0f5b4cd679d6c2686fe81e0c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/trs/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/trs/firefox-81.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "4dedb4d60db089358b9371a828165f6fa7e329af5deb1177d090730c22323b9e"; + sha256 = "762f7e33307811f6ec18c198b4f524526a085828af2621885b276ecd8bac6dd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/uk/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/uk/firefox-81.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "5a2a6f9234db28e79c8472206d40f1d403af05de2f9f4e1b6253bf3e912386e6"; + sha256 = "a698aa0d0599b97c7e9791547573d0afdc5e1bf0e5e644069752686d50644564"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/ur/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/ur/firefox-81.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "30f3516680ef54d1e3636e858b8000aac4ac462e3fe6e20db16fbb0d037c2394"; + sha256 = "7d1759bd2f0b746be76471ebc3c0da2fa224f4550a787e72ebe52b6356fb9370"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/uz/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/uz/firefox-81.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "84a6ed8eed48ebf993ebf779c623472ea3d2bee84457fdc4e1968c013c8b8383"; + sha256 = "51c21a2cf377633a46c35b2bf9096b97f5acab1bf7f8014122c96668d14c6d95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/vi/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/vi/firefox-81.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "eb58bad9266d0e46b55d4815212083609197acc4c8a7cd3a1ee9901adca7dae2"; + sha256 = "e1f3cc7866b19e60b8c368b0633bb0603d7176a87ebc910fe4c4a7575a98be7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/xh/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/xh/firefox-81.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "d478b199b9096b264f92f793f713b3e1cb42fb7c5f017ac0f1b82eea33434cbf"; + sha256 = "cce6577abd88d3b34ad3e83577bbb82b6df8754679fc4cdd8a34c9ec9d59acae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/zh-CN/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/zh-CN/firefox-81.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "b91d7637a20ebd8dc3200d222f98ac2d065a3633988ef0d17591cc8e72efac03"; + sha256 = "e042d66ae743d1889d6d8ce13ef3510644098efa0943d332656b7e361b976da3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-x86_64/zh-TW/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-x86_64/zh-TW/firefox-81.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "42bbf8d38c417fbf0d6de21e4fb4f3090096e0bcc2820504b8ea69f057d50a91"; + sha256 = "07c6ac6268b54caefc44654bbc68d19dbe8e6e15fb768c921a8030e179ec8ef4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ach/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ach/firefox-81.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "1d39224b647c9a18c6a5021366775c05bf704bf316d6329f170cc4eb59c05a10"; + sha256 = "bdd0995ca7d73be587ef1a9bd0395b869ec4f7f90a93ec854a5bbd1c18060ea0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/af/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/af/firefox-81.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "a4b998c95454270fa98c59cb94dcad6e5db2da8a92f9cd75e8d0e30041eccc5b"; + sha256 = "f662391298377d8d7f38f90c31b90bf705e61b1c3df5e1a7ed7e6c705ac700e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/an/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/an/firefox-81.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "ff786a29ef12215fdc8bc057f596ef9ab1ef207fbe84910504a314e27fa54c79"; + sha256 = "46ca1495a74861429af6cf33eb791738abcfb5fa29c23060c7b9d307fc6a1b5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ar/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ar/firefox-81.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "498ecc3042b4ccfbb155e632531df9ab75f7e3225820f0fe6929f80a91a91660"; + sha256 = "1b781b56560f0bad0d67f155d68da1b5b759051434c76095c8ff884837595866"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ast/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ast/firefox-81.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "1174347fac624e8c4573bf80ce0867ec8e94694bb0cd623de86949fab0780044"; + sha256 = "eae1a5378babbeb88c6b000dc6500bfccbbe8337eeb32d7bfdc9bab67448d8ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/az/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/az/firefox-81.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "ddd0856d036f9f3eb87874440bcd6e85106f7391f03e76cd1f1d5428a69b8374"; + sha256 = "4ba58be6ffb171c843ac5d267e97bf8ad219b4d1058a96b18f08ac4dd83c6b0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/be/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/be/firefox-81.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "23a8c4cb1c4d9e0e0b5a5924119670a4224ded0595d8326ae500a7bbafdd49a8"; + sha256 = "b7cbd330b3b261e8b57134c27a291348219105cbd8cc685917ccf8e03099f2e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/bg/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/bg/firefox-81.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "a0fdc2f520e251f624ae19a169ee7f1349017a8af87b9c149ea731e32054ef4e"; + sha256 = "e6354feae56c656365fc4604bf394c4038399ea3a7ee503fd38610e1525d6539"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/bn/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/bn/firefox-81.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "553e9a0704e4984e091716d41fb040f3b93bb192fa292cd7453ede137b170b74"; + sha256 = "280d01e9dbfb09a08264e36c01b5fecef97831fc2c9d99e2f5e0ed498bbf427a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/br/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/br/firefox-81.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "dd82f29c768befcbcc691a1665a5fe2e519f94558c331ed29c368c005e764d25"; + sha256 = "a223fec4d16418befd75ce455f470cdc831afcecb6fb4c36139fd2f7c2588337"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/bs/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/bs/firefox-81.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "59fca5c16258a5f5e3f8725ae1da886381fc78963fc6174762c9b74e6a83b01f"; + sha256 = "ed7910663750af303d197ab3919f54d2a108ed691e016696e4c9a6254fe74003"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ca-valencia/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ca-valencia/firefox-81.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "d75878b8d573a96a65fe320cd00208733f46984b88f44a3ab571bbbec17f2fb2"; + sha256 = "19d4244b6711d3378835fd00715d7db17052de0345dd9b33b013169920f388c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ca/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ca/firefox-81.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "f89d8655184f74f3218510d8e44b8bf4fe9840fc3555d4a4ca59dab8b77f8a46"; + sha256 = "bcfa0b1785d3aeec8e5ea25b472da288c3ebced8661a70c21db08741e9ed5c67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/cak/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/cak/firefox-81.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "31008fdaf9a7ff5a3051b936dbd4253da76770da2e59fd97707378b4c9cae4c2"; + sha256 = "cbf0745604bd3f757851cb4772eaac212d16288c7279634d470610ea280b7884"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/cs/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/cs/firefox-81.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "7e8ed50ec696cf3fa98aa2ec0d2755e0064dd285c43f17fc4f58adfb427cbb3b"; + sha256 = "1e91a12e484a2a41d87de5e60c0b3f455f81669025ceaec0c7adbb447446c367"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/cy/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/cy/firefox-81.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "64b5cda8d4a0febaa96c778a3b45c380903835b7eb27ff375cb24c7ab3c56813"; + sha256 = "c48491eadec23c78f071f4bedd23ac02235ef090375dd0bcb190e0b1d94fe94a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/da/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/da/firefox-81.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "b7ba473e03fb0bd3efc7f00882270e65e2f74d12e4a150221519e9fefed6f470"; + sha256 = "81a1fc46b7f92b2375edb20d3464c4d7facb493a07aa4471947f8b8b84cc3054"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/de/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/de/firefox-81.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "4ff6aa86a82b4466c5809fb192021fcacefe3309f73cbcbb8d4f952c066e4307"; + sha256 = "719db056506ca0b908d121cd3e7785b1d8739610c7728723e650ca35b99ce26f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/dsb/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/dsb/firefox-81.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "8ff130011dd318c45d7c85f26137a73f2abdd90eeb21ff4e29f45eb786e24541"; + sha256 = "1ef45291cecb8727951808d20df4469c1f0d731b0d3442283fa1f45f39c0e3c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/el/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/el/firefox-81.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "c2c7f0d40a3c32896678cffce276a8d71613b09eda6fa715d10f156c13a1f6e6"; + sha256 = "b0cbd8c13a40116779b1dca51191fcc0a8b203327b568f8467f6864e4f5db9ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/en-CA/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/en-CA/firefox-81.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "b06db042a7429c1743f4b0488e403a5051acfa1be556e07769880345b72f5cf1"; + sha256 = "4e4e204fb9ed3ed167fb9e3a9af2727384d09e37f1d5262bba05e296a8cb4a16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/en-GB/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/en-GB/firefox-81.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "435e24ff0665065a2eef6efbd8ea86e5c7e2752f44c420e94a7b0fdd503ea5b8"; + sha256 = "7533f99bc58783e5779b4fbbfc77b96a6c04958c0e752d71b1f57387824faa74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/en-US/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/en-US/firefox-81.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "fc1d7b798644f41a0da9e2dccc1e8fda86cd12e2f2dd3808ccbc247084221648"; + sha256 = "68bebc780f225d5694506c4cdc6a7c31c779d2f1feffa792e599f99d0b2e58cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/eo/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/eo/firefox-81.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "e5504a7bf75e2eba860f61fc3fdd979b2a766a4299b3652bf62d5a46526e50eb"; + sha256 = "ab08e50d0a5e5d6d02a8daf1c6a428ce9ae19b3a343bf0838739adc9a4170bb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/es-AR/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/es-AR/firefox-81.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "b53c9605b8798c6ecea9f1f47b0a1590a788c12f2fa9c09293a05ffbf4b22d53"; + sha256 = "837f5cff13186af4f38c0c21410f20c57f28a3b5293ec986a449fdcb3358ddc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/es-CL/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/es-CL/firefox-81.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "a2fd6bfce565cebfae759dcbb7b3cc3f504f0bee5324849a63a39fc65c36724c"; + sha256 = "1f73cb2ab7eb1b7cd8198113941fc71c17972227365edfd5cad73680d30a9c6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/es-ES/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/es-ES/firefox-81.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "c15751d3f0dc389d2a2e9cd40e8da88f1710a6f64999d106bee1dcab09daed5b"; + sha256 = "1e95337b4607808c3c3b319343e253d575a07fbe48f7ae8d8346f92a3d9c70e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/es-MX/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/es-MX/firefox-81.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "070a68c0893d63c5663252e52664cbeabbbf0d31542499575507644e003664ef"; + sha256 = "cefb685c2da73fe485ff0817901a19c609a73befbb82fec151765e889e4c2d91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/et/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/et/firefox-81.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "2eecd4ff182a25ba4e1a1edb78a8a9b1881321cea2740207795351700af1f4a2"; + sha256 = "95dbe912beb0ee6196e3bbd169093388c22fb1ed0981a7827fee4bbdbb774316"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/eu/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/eu/firefox-81.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "5fa2531712b5dff1d9931a369e774dfe15d2fc74078ed65ced0196b80faf2c8e"; + sha256 = "44047e7f01fb086c099db0ddda6e1d6641e33e038a4e658b3a57ce331ce61523"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/fa/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/fa/firefox-81.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "c22c673516a9837fe3d454bdecf0a59efd3b18f1e7cec51a6e742a343367aaed"; + sha256 = "252f1e06b2faac3c3f94d1a1f9f52f566c84efffca8a3147c32ee6f109feaad2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ff/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ff/firefox-81.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "64de30cf7241daa09cbf7b027017c6411fbe01aa84c8bcb62d4cfac0eb86b540"; + sha256 = "1bd050b8d4840a17d12f042a27295b71a4a62ebdac4153ffec843230b1cc0b25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/fi/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/fi/firefox-81.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "549743b069385b594c78f8732f28cdae1a73324d3662f671e9721b566629ea01"; + sha256 = "6582223e393876a91ab0250c976b1aeac0559722b17e198e05925863e53d81d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/fr/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/fr/firefox-81.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "abfb9e7c89fed1a4553bdd7cdbaab84f7f5221d31df404af0143bed0e6b817c4"; + sha256 = "b96dc92220680f3c87d6c7cfe79f071382f8183856967133b6fcb6783a60ae6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/fy-NL/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/fy-NL/firefox-81.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "97accf68261aa9b04cbbcf424afeb7a3aea92853c70a4f0a52d10fc408d5e83d"; + sha256 = "4a90cf75ab890ebef3517db701bcdd065e42c2fd8055121ea9b97897be299543"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ga-IE/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ga-IE/firefox-81.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "61f830ff111c0de73a229d12705ef6b3cc1b597abe668488c8f8ba3bf5dde217"; + sha256 = "56491146a39eae10e9f8fb4ef1fe303a6bead300b680571427e6a410766d0069"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/gd/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/gd/firefox-81.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "cd4904d29ba8f649f3a960953e99a5a8ea12375d2cbe651d1bf09210a08e6400"; + sha256 = "0d9f9ad6563e31fd0ead7ec35e594e033f7f1ad0b4c94f0a5cc01cf515fea5ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/gl/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/gl/firefox-81.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "0589a2465fff938d88a248f4175d9c3c0ccd4602b317f403ed3b7966b1d1cdc1"; + sha256 = "8100b774f3bb3a1c3551b9f2c4751ee9e184b04c61489652dbdc81b1fc0b6bcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/gn/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/gn/firefox-81.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "64f4f44b7b6b07970fe0c2f73b9e8afc5df75125a8c84f4c56b839c47899ee5f"; + sha256 = "a0002b17f1133194c9f0a0b2b3c56c6ae0d4cd981d5325193a2c96d4b5ec78b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/gu-IN/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/gu-IN/firefox-81.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "46ac00838fe4775ad83a4cf6a510c7a80a6106896060bc3d6c2a94ae91004202"; + sha256 = "6ef49394aec077569251eed4dc7631130be41991022672f477989f5202ac4d1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/he/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/he/firefox-81.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "563abdb4e26b3bf628f14bd5ef0cb3fe326b3e0a0bd65aba67fece4460b434aa"; + sha256 = "07e11a9d1a4ef6e3c87e09227d070f75098697a89e057946bb71c1336429d9bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/hi-IN/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hi-IN/firefox-81.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "828c6e01a4f2db95d36e1f8826fde98c8d762ea0e0aaff0abd50a9ade5638b8e"; + sha256 = "39e6c7eab9945a7b9e8d500d8e0dfd416a7a915498683a4966732d8e09183e2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/hr/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hr/firefox-81.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "6cffbcc579f3c489e6d3e8da4bff44189851565cbe196b6f8f3e1a864ebf15d7"; + sha256 = "8946ba5a92d73500cee5c379a796e18cf1b50fe0df4c1867040794850ba0df04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/hsb/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hsb/firefox-81.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "c2a744f2115d1e67d430dbbfc7388043a740840dbbdbc40bb34b6d7c8feda525"; + sha256 = "9d87edfdb5498c16a279f0f262855c4e6f822760cf6d90281cf6c38e65c325f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/hu/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hu/firefox-81.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "cb382f9253652ed6109f8ab1b90eddcb3f7a5bb56aa3b4d99faa755b09dd197a"; + sha256 = "9f515b6b8267b97efec1046c0c2329c5871337b95d7a3b4fdee310699c63b265"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/hy-AM/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/hy-AM/firefox-81.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "f298f1a9a427ba647d99f082a40e39be2e80dfa2388b731ed7e27a6da4efbd8c"; + sha256 = "1de03462f87b629033b99bb014042d774a52404e279b625f20448809399af44d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ia/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ia/firefox-81.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "d823238dd340f45f776d73710c0cd77edca6be241aab189618f6def9d46f60e3"; + sha256 = "fdcbf5cc522e20587cbac0b4979d77589532ba683ca811e27a7b499f37fe1841"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/id/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/id/firefox-81.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "667ec59c3743f707d4b3084a19ba09aac625794d2c7a240a04f9d932ffba9046"; + sha256 = "e3cafaff6d65ca2da4513d27949b85b2fb8a1ab154d736e980df0ba8caf898be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/is/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/is/firefox-81.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "bfa3be98edd904965d65c1094a9b83807633867c802b605bb93dda031e979a22"; + sha256 = "21fba4796f2ee43a3662c3f493879d4d656ec710e46369f6da92f757e24ee706"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/it/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/it/firefox-81.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "198aef68d51404fd37ad602e1f450afa8dd439d4ebcacffe1e920d4629593da9"; + sha256 = "c8775280055d5b8eb251253e72465149da165b7295cb4c8f400a5286a16168bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ja/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ja/firefox-81.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "4a443e7b2d8169871b789ad90ca23ef8a01e7578fcf6b1af6ceccd4af93fdadf"; + sha256 = "8870d59360577f8247be0fa51ad33afcc7ebaa2b7d6c8cd5bc100199c5436399"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ka/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ka/firefox-81.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "8884da1d0c2cd6fa7aace95a8be04c8fd691b24428207eb62ffd3e7509494eb6"; + sha256 = "394edc1246d9cb08587a67069b27dfe3fb1a92f4ff4a58d314b55128c39d2bd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/kab/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/kab/firefox-81.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "328ca68297bf281c573e6059f3cedb872396f0a7474e92caf78906d4d4089531"; + sha256 = "e30a08d4427fe896b528beb93b08b1bdc96a38a0817739faa63cd15c2f3014b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/kk/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/kk/firefox-81.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "f632d1f23c5936bd498b695de562935a968e592013ffdfaf878516b94db9f149"; + sha256 = "f1b807647ea9deaf7d44e9bfb56403b9a27205c19c3b9f07ba4cfa174b6532c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/km/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/km/firefox-81.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "8f7a5370f6108b6b7ac28c35a845378ae67929accafba911cca34c2e67dd6da8"; + sha256 = "650ad04c9b0c4d461ba28fab7e591453aaf75fe5bddce3c6b8993389814be589"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/kn/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/kn/firefox-81.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "395311e396a7267baa31f74dd30cb2e2721784de4ebdaba72c44bb384e4a6aa7"; + sha256 = "459ec332671ff0e51e110ebb0e8b10e67743fb4b717e5fa165b5dae80054ffe1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ko/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ko/firefox-81.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "40e0ca4c3380213a902ed08e0f7cb7feab7d45f9ac035467ac0a50cc99af771c"; + sha256 = "266849f41f7aa820ba459740becfbbbcb4a551140bf8e76b1eaafc63a6f9d2da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/lij/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/lij/firefox-81.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "35ed355715f7d6263ba90a563f573a3cd6ac186727b6e982692458720dfaedb2"; + sha256 = "b429ef6b085822fd3ea0fb14fd501a894b96a3f4af8fc34944fdc9ed1c82853b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/lt/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/lt/firefox-81.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "0d0df39e1552a6e310d279f53384a8f8f8298df2f590fdb2683012499e599152"; + sha256 = "7b3c089719e901d12c8ad9153a582d229958db035badd4b94b5b496a2ab545d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/lv/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/lv/firefox-81.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "41905b366ba007d226c07064c90b104eba01be85397541e50ec7858e72c444df"; + sha256 = "3efd9d52bc61076208cedef303396c066ec260f7aa5fcccec5b072f2935d89de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/mk/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/mk/firefox-81.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "3461c717fb3c1560ee383c044423874244c5fba95edbd2b8ab0ffd6223c03b10"; + sha256 = "f0b1dd701cd7e068d938ec4771fba8f4c3f04e906f575e64dca1dee640fdce22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/mr/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/mr/firefox-81.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "3453bbf846392782d902217a331e1b74aaa93475131a866661e233ecdb4e108f"; + sha256 = "bd5adc1fa68f82a9d2fa54b74b74bdc170f4ead9bed5a79ec1ebf1bd12781a07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ms/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ms/firefox-81.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "7e3f92a4429eea8f3d79dd105164461b6e218842c3131e8a186cda71504ca3d7"; + sha256 = "dd106a1944d8ac9e49df16b3c67a86010be1ee62e3a780ad9c725f2335779131"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/my/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/my/firefox-81.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "bb4ef9a5ea013aed6a85aad02211f744b8cbce62ae94ac815b6880b986503b9a"; + sha256 = "86e45fb6f490ad0cd66564a36e40c6d23169d69d1875022027aed09a1cad3d50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/nb-NO/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/nb-NO/firefox-81.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "e0e6524cfc56b09bb37501acf0ba2074c8fd2d1b3e9130e8c223b0156a02ee2d"; + sha256 = "ef6d5320470da9619f5668e13edae553038a53f80593b5d8392b3678dd8c1d5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ne-NP/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ne-NP/firefox-81.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "ed13d6e6826b14efe1e7d322e7c93243c413277cc360c2f2f6389975e8a234a7"; + sha256 = "8607d4c024fb1d71068b73fb528bfbe42ee69bb12f9703343deb6a7e340c29f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/nl/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/nl/firefox-81.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "08e06314f3633a93363c79a4470fd78ae7fadb1421140da81ddf82f2cd8a1a87"; + sha256 = "a3ea133034cd0014f34c186d9c2fafc902bd51b5314429bb9b7c06e77447fd22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/nn-NO/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/nn-NO/firefox-81.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "ca2cc7cd99ae698e48bc75274811ca2e0cf92e34fead87fa4b3450d5cfeac522"; + sha256 = "09bff657619d23af40014b2e3bc845e6901abee241dfd28f4b5ef8f90c211c30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/oc/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/oc/firefox-81.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "2136473ae8be4213aa16f542014a3c2671d538792ed87d06ab205be9d3ef2bf0"; + sha256 = "6eb63b7f50acf894e33fe9ea98c11b4133b7fb521e23e2fdd6bf9788570b4c78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/pa-IN/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/pa-IN/firefox-81.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "8bcb5f76cab4a7c9635eb456ea05697c32e2eb22a4f81ff91142e0a92c9f358f"; + sha256 = "df15da9ff35e192b587ffdaea4d47d368a054148061117bb8f4222e5da6c82a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/pl/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/pl/firefox-81.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "445021b7e78eb046bafe176abd466679c296ddf2795deefb2c1e325388db0876"; + sha256 = "b12bd00b3de180f77f80e80622a8631ff37c32b45362856a64122ad54abf07d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/pt-BR/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/pt-BR/firefox-81.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "65212c864d33f04ad6e5250fdf674c274c696ee8d7c13a0c91f38d204b9dacda"; + sha256 = "0296501261b2c55e9acd14fff125f40f8a84fe0508004ea9fda03d2ff69f238c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/pt-PT/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/pt-PT/firefox-81.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "9e1664031ca29e5f0f9cab5bd0cddfe3a053a0737d5fae82ce42d8c4a89c3044"; + sha256 = "6a5a8328dcd10ad2da9bd45658bd43fca9ae58cc331546305594ce5d84f35017"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/rm/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/rm/firefox-81.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "7ee02dc6ae964991e4aed47bd47fdea644cf6ab98a541f59c7f72eb175a04c57"; + sha256 = "41b5bd2e52f0d57475179c46c089ce36c3e1441b5751c670f6fbb6406853aab8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ro/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ro/firefox-81.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "932a7723262b8c3c1ee54e9e06f4301b8996eb590c6c52030b42804d18f1cbdc"; + sha256 = "40a2e53b6b7dcdbd9380d3ede3e425178b670db2205b5a5066d0c4e93a3297c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ru/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ru/firefox-81.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "36727824ef047330a2448ea1c8a436dc074de60d64eec981d4cc52c3f3f6a4d9"; + sha256 = "b8f7ecf4a5d8f034e57672d19254cda671f213ce04914995260f6b5f97181edc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/si/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/si/firefox-81.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "8bbda31d0e2a7cc46740b2c0545c725c881f482c300efd9baa6fb4e2e7103d0d"; + sha256 = "19d29defd33580089317b72bc6209749727a53978d48294950feba3226839135"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/sk/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sk/firefox-81.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "2ac41667c392735f11b21c149b7a1f29122c4528eed7863180c5f9a3528bc6b3"; + sha256 = "4e57b3bdba217d1550fa1ec847b825d66e2d5211d6d0f5342c50ccbab33bf464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/sl/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sl/firefox-81.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "4f60048b39306e9da94a5205a89dcaed1a30927fe1865ce6934a1ef0b0050a71"; + sha256 = "cf89ee419f552622fb9eccf8a28c15f6647afd06de27af0635ab74bfd9aa9619"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/son/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/son/firefox-81.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "3c83ccf6b9a037af11f9431423afada70c979cdd8d12117f0256576e56600b1b"; + sha256 = "64e7605b287432c38798e029ab2b02f136d7df876a9c8b3689ca603db0a736cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/sq/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sq/firefox-81.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "d87237e6ecdb3797c787f35f9ced339cc32380c23c3a0663cc3d46d3312aa8ea"; + sha256 = "9b56875e2f5505f7fef3c41d4ed7fd8801df8e981f9c8f7cf665104a40e255ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/sr/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sr/firefox-81.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "4e2a7a21e3f94b0344fa5bb471dafb11d4589ae3966799b7b4e82d8503f5e7a6"; + sha256 = "489a2d092f626f39a8e466c269486be8ae455d233e0e26d0c94953039668a57a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/sv-SE/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/sv-SE/firefox-81.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "4b91c958b998f7f3cd59b26a27bc848aea98d5319a169684b82dfc3750ab0fc6"; + sha256 = "9e45e9a0c79f9cb3c0c34fb2a26e608afb544716aa16843d53b3e6fd390e2685"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ta/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ta/firefox-81.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "9772ccd592e51ce71ea86b241c9bfdd78793a90b8f0156c049f1b603f1d9a8ea"; + sha256 = "2843290d4b90b057c6caa437514df0fa61a0cb901809c93690ac8247ff5b1233"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/te/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/te/firefox-81.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "b7906bbb4993e1fc231e02f390af62fcd40d7e6fb0cdc5031447d97c8e29eca9"; + sha256 = "fc9f7e9312fd1430cbbf0d92d8f001077d0af89ccef6c7edb3eff504772ddb79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/th/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/th/firefox-81.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "dc978d91b6de96590cfd95514a9563510d4f4725a80402e2eb6b2289de1f49a9"; + sha256 = "622105aa85a0a5874c62f62afd77ffcdb1f4b2d329c255c56c7154a4bbfcb481"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/tl/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/tl/firefox-81.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "98d617fb0ca75a977b127633a8050e119a047fc881161d97a852431231ecdc67"; + sha256 = "998b966b13dc0b1eaf9ffac1788cc354049c43834d3678b51e946f907e42bd9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/tr/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/tr/firefox-81.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "1228b0ba249cb2b9367db532647fdd0d58057e11d1b182a0982ac12e2c8f686f"; + sha256 = "3dacf51f059f7b974e18d0cf4437bba48a0cf246014ed8ec38d06e2e09cb76f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/trs/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/trs/firefox-81.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "e32783dc73b6e8d5aa2f0fc1e44fb361e07aecdacfa8a5f3dbcf0aadfa871762"; + sha256 = "e9ce3a2591c8a9b7c5cccc20c2b56ff47ff22947d2393f5e7b010f1242ba1982"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/uk/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/uk/firefox-81.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "aea971a56865756e9e6cd25638051e3e8048c2110e72aad2961bad40025fec05"; + sha256 = "a8f78984d01fb54b7475e980aa5775fe7c298e1796cf603446e7cb9baa371bdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/ur/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/ur/firefox-81.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "aa9ba0b3709ae1afc610b873877ec4b46a5ef3a801d04157c104ee985db4d9c7"; + sha256 = "0b56702343d7495b752246a9d03e4a5571be05394cebefd1ccd2ca822180259d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/uz/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/uz/firefox-81.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "a3f0e1c314825ee0d8c6dfe6d5d5dabada792088342565d65cdc336fc74a8e98"; + sha256 = "46a98ce354b40d64690c0aaf1c553b1d1e5ce51494291ff93ae0e54a82d897d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/vi/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/vi/firefox-81.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "92f17fffcdbea8ca77dfc0da435ed936bd2011bb8b3bff7b565433ff281a9dc5"; + sha256 = "fcbaf1dbab64bbc8983d444b1601721591c164bb8ff50ae09d2b7925fa41185a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/xh/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/xh/firefox-81.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "05a56d5d5abb3d0090b2bcae93a7d1ea45050da6ecbdef013916dd3b26228c16"; + sha256 = "af8ff1f66472bbe39724ca714993246f02b0e9025b537ac7e52e65be29db4534"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/zh-CN/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/zh-CN/firefox-81.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "39231fb7720d7e35f81eb4aaf188eeda2414cc700d8e9658c776ff3bb535e418"; + sha256 = "147a51431333da2333e4ecb0b307d4c74b3d66a626340b6bc25ded8c22c1acf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0.1/linux-i686/zh-TW/firefox-80.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0/linux-i686/zh-TW/firefox-81.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "09d04e81464057e0ecb222b28009a255a51023ff70aab58ba4411c8457d331fc"; + sha256 = "e8d577aca0ac90285e9db278c2fc9eec1318407b830e4c231082b139320a4216"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 78ee2134908..f76a108c7ff 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -21,7 +21,7 @@ , pulseaudioSupport ? stdenv.isLinux, libpulseaudio , ffmpegSupport ? true , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook -, waylandSupport ? true, libxkbcommon +, waylandSupport ? true, libxkbcommon, pipewire , gssSupport ? true, kerberos ## privacy-related options @@ -94,6 +94,11 @@ stdenv.mkDerivation ({ patches = [ ./env_var_for_system_dir.patch + (fetchpatch { + # https://src.fedoraproject.org/rpms/firefox/blob/master/f/firefox-pipewire-0-3.patch + url = "https://src.fedoraproject.org/rpms/firefox/raw/e99b683a352cf5b2c9ff198756859bae408b5d9d/f/firefox-pipewire-0-3.patch"; + sha256 = "0qc62di5823r7ly2lxkclzj9rhg2z7ms81igz44nv0fzv3dszdab"; + }) ] ++ patches; @@ -123,7 +128,7 @@ stdenv.mkDerivation ({ ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional gtk3Support gtk3 ++ lib.optional gssSupport kerberos - ++ lib.optional waylandSupport libxkbcommon + ++ lib.optionals waylandSupport [ libxkbcommon pipewire ] ++ lib.optionals stdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos AVFoundation MediaToolbox CoreLocation Foundation libobjc AddressBook cups ]; @@ -133,8 +138,15 @@ stdenv.mkDerivation ({ "-I${nss.dev}/include/nss" ]; + MACH_USE_SYSTEM_PYTHON = "1"; + postPatch = '' rm -rf obj-x86_64-pc-linux-gnu + + # needed for enabling webrtc+pipewire + substituteInPlace \ + media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_capture_generic_gn/moz.build \ + --replace /usr/include ${pipewire.dev}/include '' + lib.optionalString (lib.versionAtLeast ffversion "80") '' substituteInPlace dom/system/IOUtils.h \ --replace '#include "nspr/prio.h"' '#include "prio.h"' diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index a024fc359d8..daed3c150b6 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "80.0.1"; + ffversion = "81.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "081sf41r7ickjij3kfrdq29a0d6wz7qv8950kx116kakh8qxgjy8ahk2mfwlcp6digrl4mimi8rl7ns1wjngsmrjh4lvqzh1xglx9cp"; + sha512 = "1dnxn754vb99mccqrj3wr3pg2scjy42rvs5xc6bw022gh6n8kgipx9pbkapwfivkglynxmmbw1k11ak34zhr1g6p31m3550ad6azq19"; }; patches = [ @@ -36,10 +36,10 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.2.0esr"; + ffversion = "78.3.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "1dnvr9nyvnv5dkpnjnadff38lf9r7g37gk401c1i22d661ib5xj0gm2rnz1rjyrkvzrnr6p9f7liy3i41varja00g0x1racccj1my9q"; + sha512 = "3rg4rjmigir2wsvzdl5dkh74hahjv36yvd04rhq0rszw6xz9wyig64nxhkrpf416z6iy3y1qavk7x9j6j02sc2f545pd6cx8abjgqc9"; }; patches = [ diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index bf10043e942..3c391c9ffda 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "luakit"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "luakit"; repo = "luakit"; rev = version; - sha256 = "05mm76g72fs48410pbij4mw0s3nqji3r7f3mnr2fvhv02xqj05aa"; + sha256 = "sha256-rpHW5VyntmmtekdNcZMIw8Xdv4cfiqJaaHj4ZFFGjYc="; }; nativeBuildInputs = [ @@ -54,9 +54,17 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Fast, small, webkit based browser framework extensible in Lua"; + description = "Fast, small, webkit-based browser framework extensible in Lua"; + longDescription = '' + Luakit is a highly configurable browser framework based on the WebKit web + content engine and the GTK+ toolkit. It is very fast, extensible with Lua, + and licensed under the GNU GPLv3 license. It is primarily targeted at + power users, developers and anyone who wants to have fine-grained control + over their web browser’s behaviour and interface. + ''; homepage = "https://luakit.github.io/"; - license = licenses.gpl3; - platforms = platforms.linux; # Only tested linux + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.AndersonTorres ]; }; } diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index ab528a2c1cb..d8a2e042993 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -91,19 +91,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "9.5.4"; + version = "10.0"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "sha256-XW2B2wTgqMU2w9XhPJNcUjGLrHykQIngMcG/fFTWb04="; + sha256 = "1l2rfknffnh6hsi16dzps1wav5s723vyk57fzv9y5vjmbcbf7l2l"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "sha256-EyDyAxB5Og1Cn04tuBF9ob8BxqULy2Ur07BuDxZlmqQ="; + sha256 = "0x80w02ckb6mznrm1gjdpkxk9yf2rdcl16ljjglivq358a309cl2"; }; }; in diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix index 4d537f8dd4c..421d6bb745a 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix @@ -17,7 +17,7 @@ , libXScrnSaver, libXcursor, libXtst, libGLU, libGL , protobuf, speechd, libXdamage, cups , ffmpeg_3, libxslt, libxml2, at-spi2-core -, jre +, jre8 , pipewire_0_2 # optional dependencies @@ -52,6 +52,8 @@ with stdenv.lib; # see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html let + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + # The additional attributes for creating derivations based on the chromium # source tree. extraAttrs = buildFun base; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 16de2a6d14c..fbf49b9f41b 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "3.3.2022.39-1"; + version = "3.3.2022.47-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1d49556l067zilndm1381n1y22076qgww4n6nkscwchik2mj79sy"; + sha256 = "0lraliqb5r8akh8lfmw2sy90s58sbghcpc598nlz2d89f91yq7vz"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cawbird/default.nix b/pkgs/applications/networking/cawbird/default.nix index 2ff9e5581b0..bd927d2b68e 100644 --- a/pkgs/applications/networking/cawbird/default.nix +++ b/pkgs/applications/networking/cawbird/default.nix @@ -16,18 +16,19 @@ , wrapGAppsHook , gobject-introspection , glib-networking +, librest , python3 }: stdenv.mkDerivation rec { - version = "1.1.0"; + version = "1.2.1"; pname = "cawbird"; src = fetchFromGitHub { owner = "IBBoard"; repo = "cawbird"; rev = "v${version}"; - sha256 = "0zghryx5y47ff8kxa65lvgmy1cnhvhazxml7r1lxixxj3d88wh7p"; + sha256 = "11s8x48syy5wjj23ab4bn5jxhi7l5sx7aw6q2ggk99v042hxh3h2"; }; nativeBuildInputs = [ @@ -50,6 +51,7 @@ stdenv.mkDerivation rec { dconf gspell glib-networking + librest ] ++ (with gst_all_1; [ gstreamer gst-plugins-base diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 11eb24ff703..3dd9fe2c4f8 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -3,7 +3,7 @@ stdenv , makeWrapper , makeDesktopItem , fetchurl -, jre +, jdk8 }: let @@ -31,7 +31,7 @@ let buildInputs = [ makeWrapper ]; installPhase = '' - makeWrapper ${jre}/bin/java $out/bin/charles \ + makeWrapper ${jdk8.jre}/bin/java $out/bin/charles \ --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar" for fn in lib/*.jar; do diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix deleted file mode 100644 index aa86dcbeb24..00000000000 --- a/pkgs/applications/networking/cluster/heptio-ark/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: - -buildGoPackage rec { - pname = "heptio-ark"; - version = "0.10.0"; - - goPackagePath = "github.com/heptio/ark"; - - src = fetchFromGitHub { - rev = "v${version}"; - owner = "heptio"; - repo = "ark"; - sha256 = "18h9hvp95va0hyl268gnzciwy1dqmc57bpifbj885870rdfp0ffv"; - }; - - excludedPackages = [ "issue-template-gen" ]; - - meta = with stdenv.lib; { - description = "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; - homepage = "https://heptio.github.io/ark/"; - license = licenses.asl20; - maintainers = [maintainers.mbode]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix new file mode 100644 index 00000000000..ff180bdc9b2 --- /dev/null +++ b/pkgs/applications/networking/cluster/popeye/default.nix @@ -0,0 +1,34 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "popeye"; + version = "0.8.10"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "derailed"; + repo = "popeye"; + sha256 = "1cx39xipvvhb12nhvg7kfssnqafajni662b070ynlw8p870bj0sn"; + }; + + buildFlagsArray = '' + -ldflags= + -s -w + -X github.com/derailed/popeye/cmd.version=${version} + -X github.com/derailed/popeye/cmd.commit=b7a876eafd4f7ec5683808d8d6880c41c805056a + -X github.com/derailed/popeye/cmd.date=2020-08-25T23:02:30Z + ''; + + vendorSha256 = "0b2bawc9wnqwgvrv614rq5y4ns9di65zqcbb199y2ijpsaw5d9a7"; + + doCheck = false; + + meta = with stdenv.lib; { + description = "A Kubernetes cluster resource sanitizer"; + homepage = "https://github.com/derailed/popeye"; + changelog = "https://github.com/derailed/popeye/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = [ maintainers.bryanasdev000 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform-compliance/default.nix b/pkgs/applications/networking/cluster/terraform-compliance/default.nix index e906f035fda..6205b3bf5fe 100644 --- a/pkgs/applications/networking/cluster/terraform-compliance/default.nix +++ b/pkgs/applications/networking/cluster/terraform-compliance/default.nix @@ -27,6 +27,11 @@ buildPythonApplication rec { sha256 = "161mszmxqp3wypnda48ama2mmq8yjilkxahwc1mxjwzy1n19sn7v"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "IPython==7.16.1" "IPython" + ''; + checkInputs = [ pytestCheckHook ]; disabledTests = [ diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix new file mode 100644 index 00000000000..0d5835a8cde --- /dev/null +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -0,0 +1,45 @@ +{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "velero"; + version = "1.5.1"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "vmware-tanzu"; + repo = "velero"; + sha256 = "1rmymwmglcia5j0c692g34hlffba1yqs2s0iyjpafma2zabrcnai"; + }; + + buildFlagsArray = '' + -ldflags= + -s -w + -X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version} + -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=87d86a45a6ca66c6c942c7c7f08352e26809426c + -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean + ''; + + vendorSha256 = "1izl7z689jf3i3wax7rfpk0jjly7nsi7vzasy1j9v5cwjy2d5z4v"; + + excludedPackages = [ "issue-template-gen" ]; + + doCheck = false; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + $out/bin/velero completion bash > helm.bash + $out/bin/velero completion zsh > helm.zsh + installShellCompletion helm.{bash,zsh} + ''; + + meta = with stdenv.lib; { + description = + "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; + homepage = "https://velero.io/"; + changelog = + "https://github.com/vmware-tanzu/velero/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = [ maintainers.mbode maintainers.bryanasdev000 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/datovka/default.nix b/pkgs/applications/networking/datovka/default.nix index 6dc996c7975..f004a807aa7 100644 --- a/pkgs/applications/networking/datovka/default.nix +++ b/pkgs/applications/networking/datovka/default.nix @@ -11,11 +11,11 @@ mkDerivation rec { pname = "datovka"; - version = "4.15.1"; + version = "4.15.2"; src = fetchurl { url = "https://secure.nic.cz/files/datove_schranky/${version}/${pname}-${version}.tar.xz"; - sha256 = "0ab1s1r6zrqxcfjnij5ar352kzyrl1m92c04nqk6hahpzzma2p3r"; + sha256 = "0vna3vaivi6w7nlkwpqhwmyly0s1d5y2yg51br2f918pjhp2cp7q"; }; buildInputs = [ libisds qmake qtbase qtsvg libxml2 ]; diff --git a/pkgs/applications/networking/gnome-network-displays/default.nix b/pkgs/applications/networking/gnome-network-displays/default.nix new file mode 100644 index 00000000000..80fbb6dd6e7 --- /dev/null +++ b/pkgs/applications/networking/gnome-network-displays/default.nix @@ -0,0 +1,82 @@ +{ stdenv +, fetchurl +, fetchpatch +# native +, meson +, ninja +, pkg-config +, gettext +, desktop-file-utils +, appstream-glib +, wrapGAppsHook +, python3 +# Not native +, gst_all_1 +, gsettings-desktop-schemas +, gtk3 +, glib +, networkmanager +, libpulseaudio +}: + +stdenv.mkDerivation rec { + pname = "gnome-network-displays"; + version = "0.90.4"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "04snnfz5jxxpjkrwa7dchc2h4shszi8mq9g3ihvsvipgzjw3d498"; + }; + + patches = [ + # Undeclared dependency on gio-unix-2.0, see: + # https://github.com/NixOS/nixpkgs/issues/36468 and + # https://gitlab.gnome.org/GNOME/gnome-network-displays/-/merge_requests/147 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-network-displays/-/commit/ef3f3ff565acd8238da46de604a1e750d4f02f07.diff"; + sha256 = "1ljiwgqia6am4lansg70qnwkch9mp1fr6bga98s5fwyiaw6b6f4p"; + }) + # Fixes an upstream bug: https://gitlab.gnome.org/GNOME/gnome-network-displays/-/issues/147 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-network-displays/-/commit/23164b58f4d5dd59de988525906d6e5e82c5a63c.patch"; + sha256 = "0x32dvkzv9m04q41aicscpf4aspghx81a65462kjqnsavi64lga5"; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gettext + desktop-file-utils + appstream-glib + wrapGAppsHook + python3 + ]; + + buildInputs = [ + gtk3 + glib + gsettings-desktop-schemas + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + gst_all_1.gst-rtsp-server + networkmanager + libpulseaudio + ]; + + preConfigure = '' + patchShebangs ./build-aux/meson/postinstall.py + ''; + + meta = with stdenv.lib; { + homepage = "https://gitlab.gnome.org/GNOME/gnome-network-displays"; + description = "Miracast implementation for GNOME"; + maintainers = with maintainers; [ doronbehar ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 867a49e47b3..4341daba9a2 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, libsForQt5 }: let - stableVersion = "2.2.13"; + stableVersion = "2.2.14"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -26,8 +26,8 @@ let }; mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "1vhch8hgbzdfmgpxlzgdasv6lxgl7rs96n5v4mn2pcccvfmbqj66"; - serverSrcHash = "1vlnhlcnjh0kd623zxjjgkvln0rn5zr43zn00vkvbzwc9cgm2jxz"; + guiSrcHash = "0y0dkyky2vw8ixm8nx4qhsj5b6hk0lv2cayrj4879icmp8zc4dy3"; + serverSrcHash = "1vpsvvisw0sivlbjwawskkyiavl092qxaqxi13khkimz5fk0d3rc"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 7a6d82cd28e..a6189da7ee3 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -14,9 +14,10 @@ , swig , gettext , fetchpatch +, coreutils }: let - preConfigure = (import ./script.nix); + preConfigure = (import ./script.nix {inherit coreutils;}); in stdenv.mkDerivation rec { pname = "zeek"; diff --git a/pkgs/applications/networking/ids/zeek/script.nix b/pkgs/applications/networking/ids/zeek/script.nix index 10a2d11a148..4c8bbcf22c0 100644 --- a/pkgs/applications/networking/ids/zeek/script.nix +++ b/pkgs/applications/networking/ids/zeek/script.nix @@ -1,4 +1,10 @@ +{coreutils}: '' + sed -i 's|/bin/mv|${coreutils}/bin/mv|' scripts/base/frameworks/logging/writers/ascii.zeek + sed -i 's|/bin/mv|${coreutils}/bin/mv|' scripts/policy/misc/trim-trace-file.zeek + sed -i 's|/bin/cat|${coreutils}/bin/cat|' scripts/base/frameworks/notice/actions/pp-alarms.zeek + sed -i 's|/bin/cat|${coreutils}/bin/cat|' scripts/base/frameworks/notice/main.zeek + sed -i "1i##! test dpd" $PWD/scripts/base/frameworks/dpd/__load__.zeek sed -i "1i##! test x509" $PWD/scripts/base/files/x509/__load__.zeek sed -i "1i##! test files-extract" $PWD/scripts/base/files/extract/__load__.zeek @@ -32,6 +38,7 @@ sed -i "1i##! test dns" $PWD/scripts/base/protocols/dns/__load__.zeek sed -i "1i##! test ftp" $PWD/scripts/base/protocols/ftp/__load__.zeek sed -i "1i##! test http" $PWD/scripts/base/protocols/http/__load__.zeek + sed -i "1i##! test tunnels" $PWD/scripts/base/protocols/tunnels/__load__.zeek sed -i "1i##! test imap" $PWD/scripts/base/protocols/imap/__load__.zeek sed -i "1i##! test irc" $PWD/scripts/base/protocols/irc/__load__.zeek sed -i "1i##! test krb" $PWD/scripts/base/protocols/krb/__load__.zeek diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 8fd0128ef2c..617c02de263 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -2,12 +2,12 @@ mkDerivation rec { pname = "chatterino2"; - version = "2.1.7"; + version = "2.2.2"; src = fetchFromGitHub { - owner = "fourtf"; + owner = "Chatterino"; repo = pname; rev = "v${version}"; - sha256 = "0bbdzainfa7hlz5p0jfq4y04i3wix7z3i6w193906bi4gr9wilpg"; + sha256 = "026cs48hmqkv7k4akbm205avj2pn3x1g7q46chwa707k9km325dz"; fetchSubmodules = true; }; nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; @@ -26,8 +26,9 @@ mkDerivation rec { improved/extended version of the Twitch web chat. Chatterino 2 is the second installment of the Twitch chat client series "Chatterino". - ''; - homepage = "https://github.com/fourtf/chatterino2"; + ''; + homepage = "https://github.com/Chatterino/chatterino2"; + changelog = "https://github.com/Chatterino/chatterino2/blob/master/CHANGELOG.md"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ rexim ]; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 9c286d00832..795f71a3cd0 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub , vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext , gobject-introspection, gnome3, glib, gdk-pixbuf, gtk3, glib-networking , xorg, libXdmcp, libxkbcommon @@ -60,23 +60,39 @@ stdenv.mkDerivation rec { libgcrypt libsoup pcre - xorg.libxcb - xorg.libpthreadstubs - libXdmcp - libxkbcommon epoxy at-spi2-core dbus icu libsignal-protocol-c librsvg + ] ++ lib.optionals (!stdenv.isDarwin) [ + xorg.libxcb + xorg.libpthreadstubs + libXdmcp + libxkbcommon ]; + # Dino looks for plugins with a .so filename extension, even on macOS where + # .dylib is appropriate, and despite the fact that it builds said plugins with + # that as their filename extension + # + # Therefore, on macOS rename all of the plugins to use correct names that Dino + # will load + # + # See https://github.com/dino/dino/wiki/macOS + postFixup = lib.optionalString (stdenv.isDarwin) '' + cd "$out/lib/dino/plugins/" + for f in *.dylib; do + mv "$f" "$(basename "$f" .dylib).so" + done + ''; + meta = with stdenv.lib; { description = "Modern Jabber/XMPP Client using GTK/Vala"; homepage = "https://github.com/dino/dino"; license = licenses.gpl3; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ mic92 qyliss ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 63bcc58ac3e..938be9a9778 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -1,8 +1,9 @@ -{ stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk +{ stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk8 # Optional, Jitsi still runs without, but you may pass null: , alsaLib, dbus, gtk2, libpulseaudio, openssl, xorg }: +let jdk = jdk8; in stdenv.mkDerivation rec { pname = "jitsi"; version = "2.10.5550"; diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index e6f80de821f..a067259d112 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -3,18 +3,18 @@ }: let - version = "0.7.5"; + version = "0.7.6"; in stdenv.mkDerivation rec { pname = "rambox"; inherit version; src = { x86_64-linux = fetchurl { url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-amd64.deb"; - sha256 = "108yd5djnap37yh0nbjyqkp5ci1zmydfzqcsbapin40a4f36zm31"; + sha256 = "1v9l5nfd25mq448457hg0mj5bzylh0krk411kbr73s7lbaaww1jl"; }; i686-linux = fetchurl { url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.deb"; - sha256 = "1pvh048h6m19rmbscsy69ih0jkyhazmq2pcagmf3kk8gmbi7y6p6"; + sha256 = "0zhn5hnpl6fpgshp1vwghq6f1hz3f7gds7rjnhky1352cb6cr89i"; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 881d7458c09..87ca24db8b9 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.36.1"; # Please backport all updates to the stable channel. + version = "1.36.2"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0lc56g09g2xfwxwm046bcykvxd0nq63zazamnp268z28lnn937mc"; + sha256 = "08273a395cjsiqkgalxj3flh268wi3c6dbz52kxrl6z9gkrnrp3r"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 777aabf021b..2edccd8c019 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -40,8 +40,8 @@ let pname = "slack"; version = { - x86_64-darwin = "4.8.0"; - x86_64-linux = "4.8.0"; + x86_64-darwin = "4.9.0"; + x86_64-linux = "4.9.1"; }.${system} or throwSystem; src = let @@ -49,11 +49,11 @@ let in { x86_64-darwin = fetchurl { url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg"; - sha256 = "0k22w3c3brbc7ivmc5npqy8h7zxfgnbs7bqwii03psymm6sw53j2"; + sha256 = "007fflncvvclj4agb6g5hc5k9j5hhz1rpvlcfd8w31rn1vad4abk"; }; x86_64-linux = fetchurl { url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "0q8qpz5nwhps7y5gq1bl8hjw7vsk789srrv39hzc7jrl8f1bxzk0"; + sha256 = "1n8br5vlcnf13b8m6727hy4bkmd6wayss96ck4ba9zsjiyj7v74i"; }; }.${system} or throwSystem; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 07602468427..d176b66f7e5 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "5.2.458699.0906"; + version = "5.3.465578.0920"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "0cwai5v2m99cvw1dnysl88fi97dwm6rq7xv3y0ydgg3499n8cjpf"; + sha256 = "0gqpisbzyx2xic0drvyqfbd2x2a5qcizl355qkwwibq3v24mx7kp"; }; }; diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index dbc6dc97ef2..01e808a9e72 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,19 +2,20 @@ buildGoModule rec { pname = "ipfs"; - version = "0.6.0"; + version = "0.7.0"; rev = "v${version}"; # go-ipfs makes changes to it's source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; - sha256 = "14bgq2j2bjjy0pspy2lsj5dm3w9rmfha0l8kyq5ig86yhc4nzn80"; + sha256 = "1fkzwm4qxxpmbjammk6s5qcyjxivfa0ydqz4mpz1w756c4jq0jf3"; }; # tarball contains multiple files/directories postUnpack = '' mkdir ipfs-src - mv * ipfs-src || true + shopt -s extglob + mv !(ipfs-src) ipfs-src || true cd ipfs-src ''; @@ -27,9 +28,9 @@ buildGoModule rec { vendorSha256 = null; postInstall = '' - install -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service - install -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket - install -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket + install --mode=444 -D misc/systemd/ipfs.service $out/etc/systemd/system/ipfs.service + install --mode=444 -D misc/systemd/ipfs-api.socket $out/etc/systemd/system/ipfs-api.socket + install --mode=444 -D misc/systemd/ipfs-gateway.socket $out/etc/systemd/system/ipfs-gateway.socket substituteInPlace $out/etc/systemd/system/ipfs.service \ --replace /usr/bin/ipfs $out/bin/ipfs ''; diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index ea6303a3c34..d6a7705b19e 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.1.0"; + version = "1.2.0"; disabled = python3.pkgs.pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "v${version}"; - sha256 = "0clzzwwbrynfbvawhaaa4mp2qi8smng31mmz0is166z6g67bwdl6"; + sha256 = "sha256-bEVxtp2MqEsjQvcVXmrWcwys3AMg+lPcdYn4IlYhyqw="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 84c81ecff64..699d08536fb 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "20200821"; + version = "20200925"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "0l66xf6qp2fdhm5h2v58bbc73pwj72c80mriqac9pfyjh5padir5"; + sha256 = "1q931n9sijq1iin3swzk57rz7qmy485hvr1fahy5i2wd1xx9yhb2"; }; buildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/pkgs/applications/networking/mailreaders/thunderbird/68.nix index fef707b7293..707b35dd499 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/68.nix @@ -333,6 +333,7 @@ stdenv.mkDerivation rec { eelco lovesegfault pierron + vcunat ]; platforms = platforms.linux; license = licenses.mpl20; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index e6b279fd35c..06bfd92f5fb 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -6,6 +6,7 @@ , curl , dbus , dbus-glib +, fetchpatch , fetchurl , file , fontconfig @@ -146,6 +147,13 @@ stdenv.mkDerivation rec { patches = [ ./no-buildconfig.patch + (fetchpatch { # included in 78.3.0 + name = "empty-UI.patch"; + url = "https://hg.mozilla.org/releases/comm-esr78/raw-rev/f085dbd311bc"; + # paths: {a,b}/foo -> {a,b}/comm/foo + stripLen = 1; extraPrefix = "comm/"; + sha256 = "0x9pw62w93kyd99q9wi2d8llcfzbrqib7fp5kcrjidvhnkxpr6j7"; + }) ]; postPatch = '' @@ -327,6 +335,7 @@ stdenv.mkDerivation rec { eelco lovesegfault pierron + vcunat ]; platforms = platforms.linux; license = licenses.mpl20; diff --git a/pkgs/applications/networking/p2p/gnunet/git.nix b/pkgs/applications/networking/p2p/gnunet/git.nix deleted file mode 100644 index b3d455599bf..00000000000 --- a/pkgs/applications/networking/p2p/gnunet/git.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ stdenv, fetchgit, libextractor, libmicrohttpd, libgcrypt -, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig -, libxml2, ncurses, gettext, libunistring, libidn -, makeWrapper, autoconf, automake, texinfo, which -, withVerbose ? false }: - -let - rev = "ce2864cfaa27e55096b480bf35db5f8cee2a5e7e"; -in -stdenv.mkDerivation { - name = "gnunet-git-${rev}"; - - src = fetchgit { - url = "https://gnunet.org/git/gnunet.git"; - inherit rev; - sha256 = "0gbw920m9v4b3425c0d1h7drgl2m1fni1bwjn4fwqnyz7kdqzsgl"; - }; - - buildInputs = [ - libextractor libmicrohttpd libgcrypt gmp curl libtool - zlib adns sqlite libxml2 ncurses libidn - pkgconfig gettext libunistring makeWrapper - autoconf automake texinfo which - ]; - - configureFlags = stdenv.lib.optional withVerbose "--enable-logging=verbose "; - - preConfigure = '' - # Brute force: since nix-worker chroots don't provide - # /etc/{resolv.conf,hosts}, replace all references to `localhost' - # by their IPv4 equivalent. - for i in $(find . \( -name \*.c -or -name \*.conf \) \ - -exec grep -l '\<localhost\>' {} \;) - do - echo "$i: substituting \`127.0.0.1' to \`localhost'..." - sed -i "$i" -e's/\<localhost\>/127.0.0.1/g' - done - - # Make sure the tests don't rely on `/tmp', for the sake of chroot - # builds. - for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \ - -exec grep -l /tmp {} \;) - do - echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..." - substituteInPlace "$i" --replace "/tmp" "$TMPDIR" - done - - # Ensure NSS installation works fine - configureFlags="$configureFlags --with-nssdir=$out/lib" - - sh contrib/pogen.sh - sh bootstrap - ''; - - doCheck = false; - - /* FIXME: Tests must be run this way, but there are still a couple of - failures. - - postInstall = - '' export GNUNET_PREFIX="$out" - export PATH="$out/bin:$PATH" - make -k check - ''; - */ - - meta = with stdenv.lib; { - description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework"; - - longDescription = '' - GNUnet is a framework for secure peer-to-peer networking that - does not use any centralized or otherwise trusted services. A - first service implemented on top of the networking layer - allows anonymous censorship-resistant file-sharing. Anonymity - is provided by making messages originating from a peer - indistinguishable from messages that the peer is routing. All - peers act as routers and use link-encrypted connections with - stable bandwidth utilization to communicate with each other. - GNUnet uses a simple, excess-based economic model to allocate - resources. Peers in GNUnet monitor each others behavior with - respect to resource usage; peers that contribute to the - network are rewarded with better service. - ''; - - homepage = "https://gnunet.org/"; - - license = licenses.agpl3Plus; - - maintainers = with stdenv.lib.maintainers; [ ]; - platforms = platforms.gnu ++ platforms.linux; - }; -} diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index 93ccf254a3a..61d149ba5b8 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -10,11 +10,11 @@ assert !withPython; stdenv.mkDerivation rec { pname = "kismet"; - version = "2020-04-R2"; + version = "2020-09-R2"; src = fetchurl { url = "https://www.kismetwireless.net/code/${pname}-${version}.tar.xz"; - sha256 = "0hxmaln0y6bk9m1rshr4swmg0sqy3ic693vfk8haj7f5gnph96cm"; + sha256 = "1n6y6sgqf50bng8n0mhs2r1w0ak14mv654sqay72a78wh2s7ywzg"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/office/gtg/default.nix b/pkgs/applications/office/gtg/default.nix index 9bd25cfff1d..9fccd574eb1 100644 --- a/pkgs/applications/office/gtg/default.nix +++ b/pkgs/applications/office/gtg/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "gtg"; - version = "unstable-2020-08-02"; + version = "unstable-2020-09-16"; src = fetchFromGitHub { owner = "getting-things-gnome"; repo = "gtg"; - rev = "6623731f301c1b9c7b727e009f4a6462ad381c68"; - sha256 = "14gxgg4nl0ki3dn913041jpyfhxsj90fkd55z6mmpyklhr8mwss1"; + rev = "1be991c6d7f7b2e4b8ac16f82e8a07f9dce4272f"; + sha256 = "1f5acpjwnp08c78dds7xm22qjzcfnx2qs121yvm3rswkh27s4n23"; }; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 1f60d7df927..dcda1c41e3c 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.4.2"; + name = "homebank-5.4.3"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "0bkjvd819kw9cwmr3macggbg8yil3yc8v2za8pjrl6g746s89kn6"; + sha256 = "02wd569viwy6ncy0144z9nxr3zmpl4shkqhz7zzwyky4gknxf8lj"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/pkgs/applications/office/softmaker/freeoffice.nix b/pkgs/applications/office/softmaker/freeoffice.nix index 634a696a73e..2e12e6d3d43 100644 --- a/pkgs/applications/office/softmaker/freeoffice.nix +++ b/pkgs/applications/office/softmaker/freeoffice.nix @@ -5,9 +5,9 @@ # overridable. This is useful when the upstream archive was replaced # and nixpkgs is not in sync yet. , officeVersion ? { - version = "976"; + version = "978"; edition = "2018"; - sha256 = "13yh4lyqakbdqf4r8vw8imy5gwpfva697iqfd85qmp3wimqvzskl"; + sha256 = "1c5div1kbyyj48f89wkhc1i1759n70bsbp3w4a42cr0jmllyl60v"; } , ... } @ args: diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix index c7803fa3d1d..c1e25ecb00e 100644 --- a/pkgs/applications/office/softmaker/generic.nix +++ b/pkgs/applications/office/softmaker/generic.nix @@ -5,7 +5,7 @@ # For fixing up execution of /bin/ls, which is necessary for # product unlocking. -, coreutils, libredirect +, coreutils , pname, version, edition, suiteName, src, archive @@ -52,22 +52,7 @@ in stdenv.mkDerivation { runHook postUnpack ''; - installPhase = let - # SoftMaker/FreeOffice collects some system information upon - # unlocking the product. But in doing so, it attempts to execute - # /bin/ls. If the execve syscall fails, the whole unlock - # procedure fails. This works around that by rewriting /bin/ls - # to the proper path. - # - # SoftMaker Office restarts itself upon some operations, such - # changing the theme and unlocking. Unfortunately, we do not - # have control over its environment then and it will fail - # with an error. - lsIntercept = '' - --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ - --set NIX_REDIRECTS "/bin/ls=${coreutils}/bin/ls" - ''; - in '' + installPhase = '' runHook preInstall mkdir -p $out/share @@ -76,12 +61,9 @@ in stdenv.mkDerivation { # Wrap rather than symlinking, so that the programs can determine # their resource path. mkdir -p $out/bin - makeWrapper $out/share/${pname}${edition}/planmaker $out/bin/${pname}-planmaker \ - ${lsIntercept} - makeWrapper $out/share/${pname}${edition}/presentations $out/bin/${pname}-presentations \ - ${lsIntercept} - makeWrapper $out/share/${pname}${edition}/textmaker $out/bin/${pname}-textmaker \ - ${lsIntercept} + makeWrapper $out/share/${pname}${edition}/planmaker $out/bin/${pname}-planmaker + makeWrapper $out/share/${pname}${edition}/presentations $out/bin/${pname}-presentations + makeWrapper $out/share/${pname}${edition}/textmaker $out/bin/${pname}-textmaker for size in 16 32 48 64 96 128 256 512 1024; do mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps diff --git a/pkgs/applications/science/biology/bwa/default.nix b/pkgs/applications/science/biology/bwa/default.nix index e478c104ede..7212b42198c 100644 --- a/pkgs/applications/science/biology/bwa/default.nix +++ b/pkgs/applications/science/biology/bwa/default.nix @@ -11,8 +11,15 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; + # it's unclear which headers are intended to be part of the public interface + # so we may find ourselves having to add more here over time installPhase = '' - install -vD bwa $out/bin/bwa + install -vD -t $out/bin bwa + install -vD -t $out/lib libbwa.a + install -vD -t $out/include bntseq.h + install -vD -t $out/include bwa.h + install -vD -t $out/include bwamem.h + install -vD -t $out/include bwt.h ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/biology/obitools/obitools3.nix b/pkgs/applications/science/biology/obitools/obitools3.nix new file mode 100644 index 00000000000..076e459c8f0 --- /dev/null +++ b/pkgs/applications/science/biology/obitools/obitools3.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, python3Packages, cmake, python3 }: + +let + pythonPackages = python3Packages; +in + +pythonPackages.buildPythonApplication rec { + pname = "obitools3"; + version = "3.0.0-beta14"; + + src = fetchurl { + url = "https://git.metabarcoding.org/obitools/${pname}/repository/v${version}/archive.tar.gz"; + sha256 = "17krklxfvxl6baf2m394gm1a88y0lg0bwqx20cf5q39zyw04z442"; + }; + + preBuild = '' + substituteInPlace src/CMakeLists.txt --replace \$'{PYTHONLIB}' "$out/lib/${python3.libPrefix}/site-packages"; + export NIX_CFLAGS_COMPILE="-L $out/lib/${python3.libPrefix}/site-packages $NIX_CFLAGS_COMPILE" + ''; + + disabled = !pythonPackages.isPy3k; + + nativeBuildInputs = [ pythonPackages.cython cmake ]; + + dontConfigure = true; + + doCheck = true; + + enableParallelBuilding = true; + + meta = with stdenv.lib ; { + description = "Management of analyses and data in DNA metabarcoding"; + homepage = "https://git.metabarcoding.org/obitools/obitools3"; + license = licenses.cecill20; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/biology/octopus/default.nix b/pkgs/applications/science/biology/octopus/default.nix index 9d81e08d729..7dee07275a0 100644 --- a/pkgs/applications/science/biology/octopus/default.nix +++ b/pkgs/applications/science/biology/octopus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "octopus"; - version = "0.6.3-beta"; + version = "0.7.0"; src = fetchFromGitHub { owner = "luntergroup"; repo = "octopus"; rev = "v${version}"; - sha256 = "042fycg8ppld7iajpzq2d8h8wr0nw43zbl57y125sfihryvr373n"; + sha256 = "0y3g0xc3x3adbcmds6hh60023pfv1qrz6ak7jd88fg9vxi9bdrfb"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/science/biology/truvari/default.nix b/pkgs/applications/science/biology/truvari/default.nix index 84cc9909a48..fffeca2c740 100644 --- a/pkgs/applications/science/biology/truvari/default.nix +++ b/pkgs/applications/science/biology/truvari/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "truvari"; - version = "1.3.4"; + version = "2.0.2"; src = fetchFromGitHub { owner = "spiralgenetics"; repo = "truvari"; rev = "v${version}"; - sha256 = "1bph7v48s7pyfagz8a2fzl5fycjliqzn5lcbv3m2bp2ih1f1gd1v"; + sha256 = "0lp1wnldjv92k4ncga1h0icb0dpjsrx427vggg40x04a7kp9lwx0"; }; propagatedBuildInputs = with python3Packages; [ @@ -21,15 +21,16 @@ python3Packages.buildPythonApplication rec { pysam pyfaidx intervaltree + pytabix + acebinf + bwapy + joblib + pandas ]; - prePatch = '' - substituteInPlace ./setup.py \ - --replace '"progressbar2==3.41.0",' '"progressbar2",' \ - --replace '"pysam==0.15.2",' '"pysam",' \ - --replace '"pyfaidx==0.5.5.2",' '"pyfaidx",' \ - --replace '"intervaltree==3.0.2",' '"intervaltree",' - ''; + # no tests + doCheck = false; + pythonImportsCheck = [ "truvari" ]; meta = with lib; { description = "Structural variant comparison tool for VCFs"; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 99101a5fd1c..6545472a529 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.2"; + version = "14.31.3"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "0p2cbzxhw1s4l76kbriag3r4dkpsfvrnydryyikgkbdwnq479hm2"; + sha256 = "067051wp9kgkgcy3mvqwxhim0h1qfcf4jk8vrbzd3y9pwmjismzy"; }; patchPhase = '' diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index 082d44ddc6e..df1ce7b7235 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -1,7 +1,17 @@ { stdenv, fetchFromGitHub, autoconf, gperf, flex, bison, readline, ncurses , bzip2, zlib +# Test inputs +, perl }: +let + iverilog-test = fetchFromGitHub { + owner = "steveicarus"; + repo = "ivtest"; + rev = "6882cb8ec08926c4e356c6092f0c5f8c23328d5c"; + sha256 = "04sj5nqzwls1y760kgnd9c2whkcrr8kvj9lisd5rvk0w580kjb2x"; + }; +in stdenv.mkDerivation rec { pname = "iverilog"; version = "unstable-2020-08-24"; @@ -15,11 +25,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - prePatch = '' - substituteInPlace configure.in \ - --replace "AC_CHECK_LIB(termcap, tputs)" "AC_CHECK_LIB(termcap, tputs)" - ''; - preConfigure = '' chmod +x $PWD/autoconf.sh $PWD/autoconf.sh @@ -29,11 +34,32 @@ stdenv.mkDerivation rec { buildInputs = [ readline ncurses bzip2 zlib ]; + # tests from .travis.yml + doCheck = true; # runs ``make check`` + # most tests pass, but some that rely on exact text of floating-point numbers fail on aarch64. + doInstallCheck = !stdenv.isAarch64; + installCheckInputs = [ perl ]; + + installCheckPhase = '' + # copy tests to allow writing results + export TESTDIR=$(mktemp -d) + cp -r ${iverilog-test}/* $TESTDIR + + pushd $TESTDIR + + # Run & check tests + PATH=$out/bin:$PATH perl vvp_reg.pl + # Check the tests, will error if unexpected tests fail. Some failures MIGHT be normal. + diff regression_report-devel.txt regression_report.txt + PATH=$out/bin:$PATH perl vpi_reg.pl + + popd + ''; + meta = with stdenv.lib; { description = "Icarus Verilog compiler"; - repositories.git = "https://github.com/steveicarus/iverilog.git"; homepage = "http://iverilog.icarus.com/"; - license = licenses.lgpl21; + license = with licenses; [ gpl2Plus lgpl21Plus] ; maintainers = with maintainers; [ winden ]; platforms = platforms.all; }; diff --git a/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch b/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch deleted file mode 100644 index a53142faba6..00000000000 --- a/pkgs/applications/science/logic/avy/0001-no-static-boost-libs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/avy/CMakeLists.txt b/avy/CMakeLists.txt -index 5913076..b0453b5 100644 ---- a/avy/CMakeLists.txt -+++ b/avy/CMakeLists.txt -@@ -23,7 +23,6 @@ if (CUSTOM_BOOST_ROOT) - set (Boost_NO_SYSTEM_PATHS "ON") - endif() - --set (Boost_USE_STATIC_LIBS ON) - find_package (Boost 1.46.1 REQUIRED program_options) - IF (Boost_FOUND) - include_directories (${Boost_INCLUDE_DIRS}) diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix index 78ed641a809..6b48c1e3448 100644 --- a/pkgs/applications/science/logic/avy/default.nix +++ b/pkgs/applications/science/logic/avy/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchgit, cmake, zlib, boost }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "avy"; - version = "2017.10.16"; + version = "2019.05.01"; # date of cav19 tag src = fetchgit { url = "https://bitbucket.org/arieg/extavy"; - rev = "c75c83379c38d6ea1046d0caee95aef77283ffe3"; - sha256 = "0zcycnypg4q5g710bnkjpycaawmibc092vmyhgfbixkgq9fb5lfh"; + rev = "cav19"; + sha256 = "0qdzy9srxp5f38x4dbb3prnr9il6cy0kz80avrvd7fxqzy7wdlwy"; fetchSubmodules = true; }; @@ -31,10 +31,6 @@ stdenv.mkDerivation { patch -p1 -d glucose -i ${./glucose-fenv.patch} ''; - patches = - [ ./0001-no-static-boost-libs.patch - ]; - installPhase = '' mkdir -p $out/bin cp avy/src/{avy,avybmc} $out/bin/ diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix index ff481fd7ab4..be80565115f 100644 --- a/pkgs/applications/science/logic/cvc3/default.nix +++ b/pkgs/applications/science/logic/cvc3/default.nix @@ -13,16 +13,21 @@ stdenv.mkDerivation rec { patches = [ ./cvc3-2.4.1-gccv6-fix.patch ]; - preConfigure = '' + postPatch = '' sed -e "s@ /bin/bash@bash@g" -i Makefile.std find . -exec sed -e "s@/usr/bin/perl@${perl}/bin/perl@g" -i '{}' ';' + + # bison 3.7 workaround + for f in parsePL parseLisp parsesmtlib parsesmtlib2 ; do + ln -s ../parser/''${f}_defs.h src/include/''${f}.hpp + done ''; meta = with stdenv.lib; { description = "A prover for satisfiability modulo theory (SMT)"; maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.free; homepage = "http://www.cs.nyu.edu/acsys/cvc3/index.html"; }; diff --git a/pkgs/applications/science/logic/leo3/binary.nix b/pkgs/applications/science/logic/leo3/binary.nix index dcea9c27acb..29a9adf94c4 100644 --- a/pkgs/applications/science/logic/leo3/binary.nix +++ b/pkgs/applications/science/logic/leo3/binary.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { mkdir -p "$out"/{bin,lib/java/leo3} cp "${jar}" "$out/lib/java/leo3/leo3.jar" echo "#!${runtimeShell}" > "$out/bin/leo3" - echo "'${openjdk}/bin/java' -jar '$out/lib/java/leo3/leo3.jar' \"\$@\"" > "$out/bin/leo3" + echo "'${openjdk}/bin/java' -jar '$out/lib/java/leo3/leo3.jar' \"\$@\"" >> "$out/bin/leo3" chmod a+x "$out/bin/leo3" ''; diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index b9bd2172bb1..eacff32bdf6 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation { pname = "why3"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/38291/why3-1.3.1.tar.gz"; - sha256 = "16zcrc60zz2j3gd3ww93z2z9x2jkxb3kr57y8i5rcgmacy7mw3bv"; + url = "https://gforge.inria.fr/frs/download.php/file/38367/why3-1.3.3.tar.gz"; + sha256 = "1n0a2nn1gnk0zg339lh698g4wpk7m8m1vyi2yvifd5adqvk4milw"; }; buildInputs = with ocamlPackages; [ diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index 626e1bf1ea9..ba7f6ccd18b 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -50,7 +50,7 @@ , zlib , gsl , ntl -, jdk +, jdk8 , less }: @@ -61,6 +61,8 @@ assert (!blas.isILP64) && (!lapack.isILP64); # dependencies. let + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + runtimepath = (lib.makeBinPath ([ "@sage-local@" "@sage-local@/build" diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index 0db007f543f..12cdeb453d7 100644 --- a/pkgs/applications/science/misc/cytoscape/default.nix +++ b/pkgs/applications/science/misc/cytoscape/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cytoscape"; - version = "3.8.0"; + version = "3.8.1"; src = fetchurl { url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-unix-${version}.tar.gz"; - sha256 = "0kksx12m83cjprdygmcc286990byf25yqfx5s7c07cizc21aavyg"; + sha256 = "006g0w29sccg5h0zlrxdp3lx4vx1bfdhx2cms6aah85r5b82wgkf"; }; patches = [ diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index d068fb73169..2946f7cd501 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -112,7 +112,7 @@ let git-ignore = callPackage ./git-ignore { }; - git-imerge = callPackage ./git-imerge { }; + git-imerge = python3Packages.callPackage ./git-imerge { }; git-interactive-rebase-tool = callPackage ./git-interactive-rebase-tool { inherit (darwin.apple_sdk.frameworks) Security; diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix index 721a7784e9c..e1caede77d8 100644 --- a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix @@ -1,25 +1,24 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ lib, buildPythonApplication, fetchPypi, installShellFiles }: -stdenv.mkDerivation rec { +buildPythonApplication rec { pname = "git-imerge"; - version = "1.1.0"; + version = "1.2.0"; - src = fetchFromGitHub { - owner = "mhagger"; - repo = "git-imerge"; - rev = "v${version}"; - sha256 = "0vi1w3f0yk4gqhxj2hzqafqq28rihyhyfnp8x7xzib96j2si14a4"; + src = fetchPypi { + inherit pname version; + sha256 = "df5818f40164b916eb089a004a47e5b8febae2b4471a827e3aaa4ebec3831a3f"; }; - buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; + nativeBuildInputs = [ installShellFiles ]; - makeFlags = [ "PREFIX=" "DESTDIR=$(out)" ] ; - - meta = with stdenv.lib; { + postInstall = '' + installShellCompletion --bash completions/git-imerge + ''; + + meta = with lib; { homepage = "https://github.com/mhagger/git-imerge"; description = "Perform a merge between two branches incrementally"; - license = licenses.gpl2; - platforms = platforms.all; + license = licenses.gpl2Plus; maintainers = [ maintainers.spwhitt ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix index e6185ec8ab9..b656deaa716 100644 --- a/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix @@ -15,8 +15,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses5 ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; - #checkFlagsArray = [ "--test-threads=1" ]; - doCheck = false; + cargoParallelTestThreads = false; meta = with stdenv.lib; { homepage = "https://github.com/MitMaro/git-interactive-rebase-tool"; diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 2e1c790348e..cbb69403531 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "git-machete"; - version = "2.15.5"; + version = "2.15.6"; src = fetchPypi { inherit pname version; - sha256 = "11an0hwva1jlf9y7vd9mscs4g6lzja1rwizsani6411xs6m121a3"; + sha256 = "0ajb3m3i3pfc5v3gshglk7qphk1rpniwx8q8isgx1a6cyarzr9bd"; }; nativeBuildInputs = [ installShellFiles pbr ]; diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index b0e14859eed..cb41ae67057 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -1,23 +1,73 @@ -{ callPackage, stdenv, fetchFromGitHub, ...}: +{ callPackage, stdenv, fetchFromGitHub, git, zsh, ...}: stdenv.mkDerivation rec { pname = "gitstatus"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "1kspz2fhryyjhn6gqf029rv0386a1ga08sf6g0l6smivw628k71l"; + sha256 = "0zan1sa8c24hpqwj66y9srd4n15f4nk64fc5jrd4smgfgn22wph8"; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; patchPhase = '' - sed -i "1i GITSTATUS_DAEMON=$out/bin/gitstatusd" gitstatus.plugin.zsh + sed -i '1i GITSTATUS_AUTO_INSTALL=''${GITSTATUS_AUTO_INSTALL-0}' gitstatus.plugin.zsh + sed -i "1a GITSTATUS_DAEMON=$out/bin/gitstatusd" install ''; installPhase = '' install -Dm755 usrbin/gitstatusd $out/bin/gitstatusd install -Dm444 gitstatus.plugin.zsh $out + install -Dm555 install $out + install -Dm444 build.info $out + ''; + # Don't install the "install" and "build.info" files, which the end user + # should not need to worry about. + pathsToLink = [ + "/bin/gitstatusd" + "/gitstatus.plugin.zsh" + ]; + + # The install check sets up an empty Git repository and a minimal zshrc that + # invokes gitstatus.plugin.zsh. It runs zsh against this zshrc and verifies + # that the script was sourced successfully and that the "gitstatus_query" + # command ran successfully. This tests the binary itself and the zsh + # integration. + installCheckInputs = [ git zsh ]; + doInstallCheck = true; + installCheckPhase = '' + TEMP=$(mktemp -d) + cd "$TEMP" + + git init + + echo ' + GITSTATUS_LOG_LEVEL=DEBUG + . $out/gitstatus.plugin.zsh || exit 1 + + gitstatus_stop NIX_TEST && gitstatus_start NIX_TEST + gitstatus_query NIX_TEST + if [[ $? -ne 0 ]]; then + print -- "Something went wrong with gitstatus" + exit 1 + elif [[ $VCS_STATUS_RESULT != "ok-sync" ]]; then + print -- "Not in a Git repo" + exit 1 + else + print -- "OK" + exit 0 + fi + ' > .zshrc + + # If we try to run zsh like "zsh -i -c true" or "zsh -i > output" then job + # control will be disabled in the shell and the gitstatus plugin script + # will fail when it tries to set the MONITOR option. As a workaround, we + # run zsh as a full-fledged independent process and then wait for it to + # exit. (The "exit" statements in the zshrc ensure that zsh will exit + # almost immediately after starting.) + ZDOTDIR=. zsh -i & + wait $! ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix index 80a30852dae..ca9ecb48188 100644 --- a/pkgs/applications/video/celluloid/default.nix +++ b/pkgs/applications/video/celluloid/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "celluloid"; - version = "0.19"; + version = "0.20"; src = fetchFromGitHub { owner = "celluloid-player"; repo = "celluloid"; rev = "v${version}"; - sha256 = "1jdmwljckajqb3ys8azd1nyy49nvq9kb2knrrqdcfnvzq0m5lpqr"; + hash = "sha256-fEZnH8EqU6CykgKINXnKChuBUlisroa97B1vjcx2cWA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/dvdbackup/default.nix b/pkgs/applications/video/dvdbackup/default.nix index e129031fd49..633eea3d282 100644 --- a/pkgs/applications/video/dvdbackup/default.nix +++ b/pkgs/applications/video/dvdbackup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libdvdread, libdvdcss, dvdauthor }: +{ stdenv, fetchurl, fetchpatch, libdvdread, libdvdcss, dvdauthor }: stdenv.mkDerivation rec { version = "0.4.2"; @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { buildInputs = [ libdvdread libdvdcss dvdauthor ]; + # see https://bugs.launchpad.net/dvdbackup/+bug/1869226 + patchFlags = [ "-p0" ]; + patches = [ (fetchpatch { + url = "https://git.slackbuilds.org/slackbuilds/plain/multimedia/dvdbackup/patches/dvdbackup-dvdread-6.1.patch"; + sha256 = "1v3xl01bwq1592i5x5dyh95r0mmm1zvvwf92fgjc0smr0k3davfz"; + })]; + meta = { description = "A tool to rip video DVDs from the command line"; homepage = "http://dvdbackup.sourceforge.net/"; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 697a468f890..4b7d78303b2 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -209,6 +209,7 @@ in stdenv.mkDerivation rec { mkdir -p $out/share/mpv ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf + cp TOOLS/mpv_identify.sh $out/bin cp TOOLS/umpv $out/bin '' + optionalString stdenv.isDarwin '' mkdir -p $out/Applications diff --git a/pkgs/applications/video/obs-studio/v4l2sink.nix b/pkgs/applications/video/obs-studio/v4l2sink.nix index 97eae68b6e7..eb8e4186882 100644 --- a/pkgs/applications/video/obs-studio/v4l2sink.nix +++ b/pkgs/applications/video/obs-studio/v4l2sink.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-v4l2sink"; - version = "0.1.0"; + version = "0.1.0-12-g1ec3c8a"; src = fetchFromGitHub { owner = "CatxFish"; repo = "obs-v4l2sink"; rev = version; - sha256 = "0l4lavaywih5lzwgxcbnvdrxhpvkrmh56li06s3aryikngxwsk3z"; + sha256 = "03ah91cm1qz26k90mfx51l0d598i9bcmw39lkikjs1msm4c9dfxx"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/video/vcs/default.nix b/pkgs/applications/video/vcs/default.nix new file mode 100644 index 00000000000..0cbdeaaf6ff --- /dev/null +++ b/pkgs/applications/video/vcs/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, makeWrapper +, coreutils, ffmpeg, gawk, gnugrep, gnused, imagemagick, mplayer, utillinux +, dejavu_fonts +}: +with stdenv.lib; +let + version = "1.13.4"; + runtimeDeps = [ coreutils ffmpeg gawk gnugrep gnused imagemagick mplayer utillinux ]; +in +stdenv.mkDerivation { + pname = "vcs"; + inherit version; + src = fetchurl { + url = "http://p.outlyer.net/files/vcs/vcs-${version}.bash"; + sha256 = "0nhwcpffp3skz24kdfg4445i6j37ks6a0qsbpfd3dbi4vnpa60a0"; + }; + + unpackCmd = "mkdir src; cp $curSrc src/vcs"; + patches = [ ./fonts.patch ]; + nativeBuildInputs = [ makeWrapper ]; + doBuild = false; + + inherit dejavu_fonts; + installPhase = '' + mkdir -p $out/bin + mv vcs $out/bin/vcs + substituteAllInPlace $out/bin/vcs + chmod +x $out/bin/vcs + wrapProgram $out/bin/vcs --argv0 vcs --set PATH "${makeBinPath runtimeDeps}" + ''; + + meta = { + description = "Generates contact sheets from video files"; + homepage = "http://p.outlyer.net/vcs"; + license = licenses.cc-by-nc-sa-30; + maintainers = with maintainers; [ elitak ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/applications/video/vcs/fonts.patch b/pkgs/applications/video/vcs/fonts.patch new file mode 100644 index 00000000000..3df0359f8b2 --- /dev/null +++ b/pkgs/applications/video/vcs/fonts.patch @@ -0,0 +1,23 @@ +--- a/vcs 2020-04-04 14:37:53.531095977 -0700 ++++ b/vcs 2020-04-04 14:40:46.459407878 -0700 +@@ -3669,18 +3669,8 @@ + [[ ( -z $USR_FONT_TITLE ) && ( $FONT_TITLE != 'DejaVu-Sans-Book' ) ]] && return + [[ ( -z $USR_FONT_TSTAMPS ) && ( $FONT_TSTAMPS != 'DejaVu-Sans-Book' ) ]] && return + [[ ( -z $USR_FONT_SIGN ) && ( $FONT_SIGN != 'DejaVu-Sans-Book' ) ]] && return +- # Try to locate DejaVu Sans +- local dvs='' +- if [[ -d /usr/local/share/fonts ]]; then +- dvs=$(find /usr/local/share/fonts/ -type f -iname 'dejavusans.ttf') +- fi +- if [[ ( -z $dvs ) && ( -d /usr/share/fonts ) ]]; then +- dvs=$(find /usr/share/fonts/ -type f -iname 'dejavusans.ttf') +- fi +- if [[ -z $dvs ]]; then +- warn "Unable to locate DejaVu Sans font. Falling back to helvetica." +- dvs=helvetica +- fi ++ # Use DejaVu Sans, by default ++ local dvs='@dejavu_fonts@/share/fonts/truetype/DejaVuSans.ttf' + [[ -z $USR_FONT_HEADING ]] && FONT_HEADING="$dvs" + [[ -z $USR_FONT_TITLE ]] && FONT_TITLE="$dvs" + [[ -z $USR_FONT_TSTAMPS ]] && FONT_TSTAMPS="$dvs" diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 5f002f5ddc8..e52401ba35f 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -25,6 +25,7 @@ let "test_pid.py" "test_pid_file.py" "test_preserve_fds.py" + "test_resources" "test_start.py" "test_uid_gid.py" "test_update.py" @@ -34,13 +35,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "0.14.1"; + version = "0.15"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "0r77ksdrpxskf79m898a7ai8wxw9fmmsf2lg8fw3ychnk74l8jvh"; + sha256 = "0cqzk2lm1w0g2v6qhiliq565cf4p7hzh839jb01p3i5cr9kx11kc"; fetchSubmodules = true; }; diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index 79d1b606bcb..9513457d86d 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv }: let - version = "0.21.1"; + version = "0.22.0"; suffix = { x86_64-linux = "x86_64"; @@ -15,13 +15,13 @@ let }; firecracker-bin = fetchbin "firecracker" { - x86_64-linux = "0g4fja3bz1fsyz8vj99199yblkn46ygf33ldwd1ssw8f957vbwnb"; - aarch64-linux = "1qyppcxnh7f42fs4px5rvkk6lza57h2sq9naskvqn5zy4vsvq89s"; + x86_64-linux = "1jl7cmw53fbykcji8a0bkdy82mgpfr8km3ab6iwsrswvahh4srx7"; + aarch64-linux = "15vi6441gr4jy0698ifashgv1ic7iz0kbm7c28m2jd8z08p6bnlz"; }; jailer-bin = fetchbin "jailer" { - x86_64-linux = "0x89pfmqci9d3i9fi9b9zm94yr2v7pq7kp3drlb952jkdfj0njyk"; - aarch64-linux = "03fx9sk88jm23wqm8fraqd1ccfhbqvc310mkfv1f5p2ykhq2ahrk"; + x86_64-linux = "0wir7fi1iqvw02908axfaqzp9q5qyg4yk5jicp8s493iz3vhm9h7"; + aarch64-linux = "1l3yc9j27vxfyn89xmxi1ir635v7l8ikwpw9a30dhh50wa3rm4jy"; }; in diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 871592c88c2..e1e7d2c277d 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "podman"; - version = "2.0.6"; + version = "2.1.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "1kl8cfsqwfbjl14mbp58wrxfm90y2w58x6138zq0sn4jzwwpy1a4"; + sha256 = "033pdkrmdsk33n1mglpcpl3g9i62raw47wpab752qhbmpy1c49lr"; }; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 0c1569145e6..2f2d66f3b2f 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -18,11 +18,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.6.2"; + version = "3.6.3"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "16sd08bfa2b1qgpnd3q6k7glw0w1wyrqyf47fz2220yafrryrmyz"; + sha256 = "1zd29s8lggv4x5xracgzywayg1skl9qc2bqh1zdxh1wrg9sqbadi"; }; goPackagePath = "github.com/sylabs/singularity"; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 7fb4f8b59d1..c320eca0bbe 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -23,7 +23,8 @@ let buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - version = "6.1.10"; + version = "6.1.14"; + tarballVersion = "${version}a"; iasl' = iasl.overrideAttrs (old: rec { inherit (old) pname; @@ -39,8 +40,8 @@ in stdenv.mkDerivation { inherit version; src = fetchurl { - url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "37d8b30c0be82a50c858f3fc70cde967882239b6212bb32e138d3615b423c477"; + url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${tarballVersion}.tar.bz2"; + sha256 = "16f3cb83ab3c4dacf2a9d3cc638cbd18db23767828bba6b8ba1c1b57abeb6aef"; }; outputs = [ "out" "modsrc" ]; diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 90eed1ff72e..03b3be7e96e 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -12,7 +12,7 @@ fetchurl rec { # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS - let value = "03067f27f4da07c5d0fdafc56d27e3ea23a60682b333b2a1010fb74ef9a40c28"; + let value = "b224e796e886b19bce69f0aaedf6ca82bad0ca29c61fb0ed86166efb84356942"; in assert (builtins.stringLength value) == 64; value; meta = { diff --git a/pkgs/applications/virtualization/virtualbox/extra_symbols.patch b/pkgs/applications/virtualization/virtualbox/extra_symbols.patch index 174bb8d9e70..44d3d972cfc 100644 --- a/pkgs/applications/virtualization/virtualbox/extra_symbols.patch +++ b/pkgs/applications/virtualization/virtualbox/extra_symbols.patch @@ -1,21 +1,25 @@ diff --git a/src/VBox/HostDrivers/linux/Makefile b/src/VBox/HostDrivers/linux/Makefile -index 6e44129b..e68ce128 100644 +index 8ba33952..3b8abe60 100644 --- a/src/VBox/HostDrivers/linux/Makefile +++ b/src/VBox/HostDrivers/linux/Makefile -@@ -95,13 +95,13 @@ vboxpci: vboxdrv - install: - @$(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxdrv install - @if [ -d vboxnetflt ]; then \ +@@ -99,17 +99,17 @@ install-vboxdrv: + + install-vboxnetflt: + +@if [ -d vboxnetflt ]; then \ - $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetflt install; \ -+ $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxnetflt/Module.symvers) -C vboxnetflt install; \ ++ $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxnetflt/Module.symvers) -C vboxnetflt install; \ fi - @if [ -d vboxnetadp ]; then \ + + install-vboxnetadp: + +@if [ -d vboxnetadp ]; then \ - $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxnetadp install; \ + $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxnetadp/Module.symvers) -C vboxnetadp install; \ fi - @if [ -d vboxpci ]; then \ + + install-vboxpci: + +@if [ -d vboxpci ]; then \ - $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) -C vboxpci install; \ + $(MAKE) KBUILD_VERBOSE=$(KBUILD_VERBOSE) KBUILD_EXTRA_SYMBOLS=$(abspath vboxpci/Module.symvers) -C vboxpci install; \ fi - else + install: install-vboxdrv install-vboxnetflt install-vboxnetadp install-vboxpci diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 4482e9a0535..3937d70e869 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "62a0c6715bee164817a6f58858dec1d60f01fd0ae00a377a75bbf885ddbd0a61"; + sha256 = "dd9f176abb89043c01cea7ec7e20130e76db71bd83beafeb2dc5858d4c9c86cd"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh index d3f7d382c19..5714b228c59 100644 --- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh @@ -15,6 +15,8 @@ if [[ -n "@coreutils_bin@" && -n "@gnugrep_bin@" ]]; then PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin" fi +cInclude=0 + source @out@/nix-support/utils.bash # Flirting with a layer violation here. diff --git a/pkgs/build-support/dotnetenv/build-solution.nix b/pkgs/build-support/dotnetenv/build-solution.nix index 62370d361cd..57af1fe9bd4 100644 --- a/pkgs/build-support/dotnetenv/build-solution.nix +++ b/pkgs/build-support/dotnetenv/build-solution.nix @@ -16,20 +16,20 @@ assert modifyPublicMain -> mainClassFile != null; stdenv.mkDerivation { inherit name src; - - buildInputs = [ dotnetfx ]; + + buildInputs = [ dotnetfx ]; preConfigure = '' cd ${baseDir} ''; - + preBuild = '' ${stdenv.lib.optionalString modifyPublicMain '' sed -i -e "s|static void Main|public static void Main|" ${mainClassFile} ''} ${preBuild} ''; - + installPhase = '' addDeps() { @@ -39,44 +39,44 @@ stdenv.mkDerivation { do windowsPath=$(cygpath --windows $i) assemblySearchPaths="$assemblySearchPaths;$windowsPath" - + addDeps $i done fi } - + for i in ${toString assemblyInputs} do - windowsPath=$(cygpath --windows $i) + windowsPath=$(cygpath --windows $i) echo "Using assembly path: $windowsPath" - + if [ "$assemblySearchPaths" = "" ] then assemblySearchPaths="$windowsPath" else assemblySearchPaths="$assemblySearchPaths;$windowsPath" fi - + addDeps $i done - + echo "Assembly search paths are: $assemblySearchPaths" - + if [ "$assemblySearchPaths" != "" ] then echo "Using assembly search paths args: $assemblySearchPathsArg" export AssemblySearchPaths=$assemblySearchPaths fi - + mkdir -p $out MSBuild.exe ${toString slnFile} /nologo /t:${targets} /p:IntermediateOutputPath=$(cygpath --windows $out)\\ /p:OutputPath=$(cygpath --windows $out)\\ /verbosity:${verbosity} ${options} - + # Because .NET assemblies store strings as UTF-16 internally, we cannot detect # hashes. Therefore a text files containing the proper paths is created # We can also use this file the propagate transitive dependencies. - + mkdir -p $out/nix-support - + for i in ${toString assemblyInputs} do echo $i >> $out/nix-support/dotnet-assemblies diff --git a/pkgs/build-support/dotnetenv/default.nix b/pkgs/build-support/dotnetenv/default.nix index 781a5ba8c0e..c7145504eb7 100644 --- a/pkgs/build-support/dotnetenv/default.nix +++ b/pkgs/build-support/dotnetenv/default.nix @@ -10,7 +10,7 @@ let dotnetenv = buildWrapper = import ./wrapper.nix { inherit dotnetenv; }; - + inherit (dotnetfx) assembly20Path wcfPath referenceAssembly30Path referenceAssembly35Path; }; in diff --git a/pkgs/build-support/dotnetenv/wrapper.nix b/pkgs/build-support/dotnetenv/wrapper.nix index 4b07fc27dcb..423303c3084 100644 --- a/pkgs/build-support/dotnetenv/wrapper.nix +++ b/pkgs/build-support/dotnetenv/wrapper.nix @@ -36,25 +36,25 @@ dotnetenv.buildSolution { do windowsPath=$(cygpath --windows $i | sed 's|\\|\\\\|g') assemblySearchArray="$assemblySearchArray @\"$windowsPath\"" - + addRuntimeDeps $i done fi } - + export exePath=$(cygpath --windows $(find ${application} -name \*.exe) | sed 's|\\|\\\\|g') - + # Generate assemblySearchPaths string array contents for path in ${toString assemblyInputs} do assemblySearchArray="$assemblySearchArray @\"$(cygpath --windows $path | sed 's|\\|\\\\|g')\", " addRuntimeDeps $path done - + sed -e "s|@ROOTNAMESPACE@|${namespace}Wrapper|" \ -e "s|@ASSEMBLYNAME@|${namespace}|" \ Wrapper/Wrapper.csproj.in > Wrapper/Wrapper.csproj - + sed -e "s|@NAMESPACE@|${namespace}|g" \ -e "s|@MAINCLASSNAME@|${mainClassName}|g" \ -e "s|@EXEPATH@|$exePath|g" \ diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 23fb56539e4..f6177ce198d 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -29,6 +29,8 @@ , target ? null , cargoVendorDir ? null , checkType ? buildType +, depsExtraArgs ? {} +, cargoParallelTestThreads ? true # Needed to `pushd`/`popd` into a subdir of a tarball if this subdir # contains a Cargo.toml, but isn't part of a workspace (which is e.g. the @@ -43,11 +45,11 @@ assert buildType == "release" || buildType == "debug"; let cargoDeps = if cargoVendorDir == null - then fetchCargoTarball { + then fetchCargoTarball ({ inherit name src srcs sourceRoot unpackPhase cargoUpdateHook; patches = cargoPatches; sha256 = cargoSha256; - } + } // depsExtraArgs) else null; # If we have a cargoSha256 fixed-output derivation, validate it at build time @@ -83,7 +85,7 @@ let in -stdenv.mkDerivation (args // { +stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // { inherit cargoDeps; patchRegistryDeps = ./patch-registry-deps; @@ -204,11 +206,12 @@ stdenv.mkDerivation (args // { checkPhase = args.checkPhase or (let argstr = "${stdenv.lib.optionalString (checkType == "release") "--release"} --target ${rustTarget} --frozen"; + threads = if cargoParallelTestThreads then "$NIX_BUILD_CORES" else "1"; in '' ${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"} runHook preCheck echo "Running cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" - cargo test -j $NIX_BUILD_CORES ${argstr} -- --test-threads=$NIX_BUILD_CORES ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} + cargo test -j $NIX_BUILD_CORES ${argstr} -- --test-threads=${threads} ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} runHook postCheck ${stdenv.lib.optionalString (buildAndTestSubdir != null) "popd"} ''); diff --git a/pkgs/data/fonts/comic-neue/default.nix b/pkgs/data/fonts/comic-neue/default.nix index 709d93dc2c9..d50e8974342 100644 --- a/pkgs/data/fonts/comic-neue/default.nix +++ b/pkgs/data/fonts/comic-neue/default.nix @@ -1,32 +1,44 @@ -{ lib, fetchzip }: +{ stdenv, fetchzip }: -let - version = "2.3"; -in fetchzip rec { - name = "comic-neue-${version}"; +stdenv.mkDerivation rec { + pname = "comic-neue"; + version = "2.5"; - url = "http://comicneue.com/${name}.zip"; + src = fetchzip { + url = "http://comicneue.com/${pname}-${version}.zip"; + sha256 = "1kc0yyha6cc584vcl9z1cq1z6prgkxk93g75mr8gapfdrj25dp3q"; + stripRoot = false; # because it comes with a __MACOSX directory + }; - postFetch = '' - mkdir -vp $out/share/{doc,fonts} - unzip -j $downloadedFile OTF/\*.otf -d $out/share/fonts/opentype - unzip -j $downloadedFile Web/\*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile Web/\*.eot -d $out/share/fonts/EOT - unzip -j $downloadedFile Web/\*.woff -d $out/share/fonts/WOFF - unzip -j $downloadedFile Web/\*.woff2 -d $out/share/fonts/WOFF2 - unzip -j $downloadedFile \*.pdf FONTLOG.txt OFL-FAQ.txt SIL-License.txt -d $out/share/doc/${name} - ''; + phases = [ "unpackPhase" "installPhase" ]; - sha256 = "1gs4vhys0m3qsw06qaxzyi81f06w5v66kbyl64yw3pq2rb656779"; + installPhase = '' + mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,EOT,WOFF,WOFF2}} + cp -v ${pname}-${version}/{FONTLOG,OFL-FAQ,OFL}.txt $out/share/doc/ + cp -v ${pname}-${version}/OTF/ComicNeue-Angular/*.otf $out/share/fonts/opentype + cp -v ${pname}-${version}/OTF/ComicNeue/*.otf $out/share/fonts/opentype + cp -v ${pname}-${version}/TTF/ComicNeue-Angular/*.ttf $out/share/fonts/truetype + cp -v ${pname}-${version}/TTF/ComicNeue/*.ttf $out/share/fonts/truetype + cp -v ${pname}-${version}/WebFonts/eot/ComicNeue-Angular/*.eot $out/share/fonts/EOT + cp -v ${pname}-${version}/WebFonts/eot/ComicNeue/*.eot $out/share/fonts/EOT + cp -v ${pname}-${version}/WebFonts/woff/ComicNeue-Angular/*.woff $out/share/fonts/WOFF + cp -v ${pname}-${version}/WebFonts/woff/ComicNeue/*.woff $out/share/fonts/WOFF + cp -v ${pname}-${version}/WebFonts/woff2/ComicNeue/*.woff2 $out/share/fonts/WOFF2 + + # Quick fix for conflicting names in upstream + for i in ${pname}-${version}/WebFonts/woff2/ComicNeue-Angular/*.woff2; do + cp -v $i $out/share/fonts/WOFF2/`basename $i|sed -e 's|ComicNeue|ComicNeue-Angular|'` + done + ''; - meta = with lib; { + meta = with stdenv.lib; { homepage = "http://comicneue.com/"; description = "A casual type face: Make your lemonade stand look like a fortune 500 company"; longDescription = '' - It is inspired by Comic Sans but more regular. The font was - designed by Craig Rozynski. It is available in two variants: - Comic Neue and Comic Neue Angular. The former having round and - the latter angular terminals. Both variants come in Light, + ComicNeue is inspired by Comic Sans but more regular. It was + designed by Craig Rozynski. It is available in two variants: + Comic Neue and Comic Neue Angular. The former having round and + the latter angular terminals. Both variants come in Light, Regular, and Bold weights with Oblique variants. ''; license = licenses.ofl; diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 40a6c887439..79f8cb8b336 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -111,18 +111,18 @@ in }; noto-fonts-emoji = let - version = "unstable-2020-08-20"; + version = "2020-09-16-unicode13_1"; emojiPythonEnv = python3.withPackages (p: with p; [ fonttools nototools ]); in stdenv.mkDerivation { pname = "noto-fonts-emoji"; - inherit version; + version = builtins.replaceStrings [ "_" ] [ "." ] version; src = fetchFromGitHub { owner = "googlefonts"; repo = "noto-emoji"; - rev = "1bc491419fa2925d018f27bfe702792031be0e68"; - sha256 = "1vak4s1p4wlwzpnqfb1c2sg62q82gnjpnmqrfz8xl6bd0z55imzy"; + rev = "v${version}"; + sha256 = "0659336dp0l2nkac153jpcb9yvp0p3dx1crcyxjd14i8cqkfi2hh"; }; nativeBuildInputs = [ diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index 6ea26f7c79d..f5bd6335dfb 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "nototools"; - version = "0.2.12"; + version = "0.2.13"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "googlefonts"; repo = "nototools"; rev = "v${version}"; - sha256 = "0drmx1asni3g6616fa4gjn5n43qkcf7icvxq9y2krpjxq78wcmc5"; + sha256 = "0ggp65xgkf9y7jamncm65lkm84wapsa47abf133pcb702875v8jz"; }; postPatch = '' diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix index 5f34d079114..0638241df53 100644 --- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix +++ b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-appindicator"; - version = "33"; + version = "34"; src = fetchFromGitHub { owner = "Ubuntu"; repo = "gnome-shell-extension-appindicator"; rev = "v${version}"; - sha256 = "0qm77s080nbf4gqnfzpwp8a7jf7lliz6fxbsd3lasvrr11pgsk87"; + sha256 = "0p9sk8cv2z242d5783gx2m4l1x9vg5fy1a7yr1wcfshvajlrj23m"; }; # This package has a Makefile, but it's used for building a zip for diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index efd68988c9b..7fbec79cbd4 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -39,27 +39,22 @@ let elixir = elixir_1_10; elixir_1_10 = lib.callElixir ../interpreters/elixir/1.10.nix { - inherit rebar erlang; + inherit erlang; debugInfo = true; }; elixir_1_9 = lib.callElixir ../interpreters/elixir/1.9.nix { - inherit rebar erlang; + inherit erlang; debugInfo = true; }; elixir_1_8 = lib.callElixir ../interpreters/elixir/1.8.nix { - inherit rebar erlang; + inherit erlang; debugInfo = true; }; elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix { - inherit rebar erlang; - debugInfo = true; - }; - - elixir_1_6 = lib.callElixir ../interpreters/elixir/1.6.nix { - inherit rebar erlang; + inherit erlang; debugInfo = true; }; diff --git a/pkgs/development/chez-modules/chez-mit/default.nix b/pkgs/development/chez-modules/chez-mit/default.nix index 3942195aaa7..63d6ef2c676 100644 --- a/pkgs/development/chez-modules/chez-mit/default.nix +++ b/pkgs/development/chez-modules/chez-mit/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation { buildInputs = [ chez chez-srfi ]; buildPhase = '' - export CHEZSCHEMELIBDIRS=${chez-srfi}/lib/csv-site make PREFIX=$out CHEZ=${chez}/bin/scheme ''; diff --git a/pkgs/development/chez-modules/chez-scmutils/default.nix b/pkgs/development/chez-modules/chez-scmutils/default.nix index cda24f0959a..19fe43da49e 100644 --- a/pkgs/development/chez-modules/chez-scmutils/default.nix +++ b/pkgs/development/chez-modules/chez-scmutils/default.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation { buildInputs = [ chez chez-srfi chez-mit ]; buildPhase = '' - export CHEZSCHEMELIBDIRS=${chez-srfi}/lib/csv-site:${chez-mit}/lib/csv-site make PREFIX=$out CHEZ=${chez}/bin/scheme ''; diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index 32116048a43..a3bac2b1722 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -1,17 +1,29 @@ -{ fetchurl, stdenv, gmp }: +{ fetchurl, stdenv, autoconf, automake, libtool, gmp +, darwin +}: stdenv.mkDerivation rec { pname = "bigloo"; - version = "4.1a-2"; + version = "4.3h"; src = fetchurl { - url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo${version}.tar.gz"; - sha256 = "09yrz8r0jpj7bda39fdxzrrdyhi851nlfajsyf0b6jxanz6ygcjx"; + url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo-${version}.tar.gz"; + sha256 = "0fw08096sf8ma2cncipnidnysxii0h0pc7kcqkjhkhdchknp8vig"; }; + nativeBuildInputs = [ autoconf automake libtool ]; + + buildInputs = stdenv.lib.optional stdenv.isDarwin + darwin.apple_sdk.frameworks.ApplicationServices + ; + propagatedBuildInputs = [ gmp ]; preConfigure = + # For libuv on darwin + stdenv.lib.optionalString stdenv.isDarwin '' + export LIBTOOLIZE=libtoolize + '' + # Help libgc's configure. '' export CXXCPP="$CXX -E" ''; diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index 2d2e0df1ec9..864ccc5a743 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -65,6 +65,8 @@ stdenv.mkDerivation rec { rm -rf $out/lib/csv${version}/examples ''; + setupHook = ./setup-hook.sh; + meta = { description = "A powerful and incredibly fast R6RS Scheme compiler"; homepage = "https://cisco.github.io/ChezScheme/"; diff --git a/pkgs/development/compilers/chez/setup-hook.sh b/pkgs/development/compilers/chez/setup-hook.sh new file mode 100644 index 00000000000..1d81489bd4e --- /dev/null +++ b/pkgs/development/compilers/chez/setup-hook.sh @@ -0,0 +1,5 @@ +addChezLibraryPath() { + addToSearchPath CHEZSCHEMELIBDIRS "$1/lib/csv-site" +} + +addEnvHooks "$targetOffset" addChezLibraryPath diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index e04f7a03f94..b4d6a0933e9 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -12,32 +12,32 @@ in rec { combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {}; - # v2.1.15 (LTS) + # v2.1.22 (LTS) aspnetcore_2_1 = buildAspNetCore { - version = "2.1.16"; + version = "2.1.22"; sha512 = { - x86_64-linux = "0awdzi8dysbg8xcy4l8wx2sb8gaaklphmwv61qxh7dj6ih4nla34l02xdax1l8nw41znnnqzsa77avglnrz36pckm9mc52m7wc7877h"; + x86_64-linux = "27v3a69dgnnb4lz5p2dn2qwadb8vpnqwdy6mnnqfp1dl4kgg3izvriz2268if272sy6flcz5lckjlmn0i0i1jci5zypc7x9kykj991l"; aarch64-linux = null; # no aarch64 version of this package is available - x86_64-darwin = "1psqqpin4hipr2hzfp79712d6cag892jx4fx5001nlsynwrdq3vi4liakz4yz41rvk0jyd7f07z90wj97xlxyrqiqcc1fdbgn2q0px9"; + x86_64-darwin = "0xh06jmzx2cfq51hv9l4h72hbfyh3r0wlla217821gi0hlw6xcc0gb3b4xmqcs240fllqnwrnrwz0axi3xi21wacgn3xbcmzpbi6jml"; }; }; netcore_2_1 = buildNetCore { - version = "2.1.16"; + version = "2.1.22"; sha512 = { - x86_64-linux = "07vvmza32hsblpw4zpcksm2gicy4agh0d1fwradqj16y6xbh3frdp87mqgbj5m54mmyfp5bc8c46v1w6dfm1w3y80v2y46aynild45l"; - aarch64-linux = "27ab982vz9rn2vzpq68dqfzhryfixq3s0apx7vi0cwiray3scgfmf45fm7qj63k9mvaqnk5g69i339109yasw3q5vpvpyjc1ykbi710"; - x86_64-darwin = "2pxqpcw3djr18m0y124fbd6pz4lb5brlgvpvd9pdirkpsar8dmipsrhxcsk0d902zyxzgj1ac1ygzxsz49xvrkmh6s1m3w5fk8fws2f"; + x86_64-linux = "0c2b31l59izcxbhz5wzjpjkdl550s5p3aid4vyghq468vyf67pm0npjny50c172b63vw0ikfbps2b2hj16hpifp116gj4b5llmqjhyc"; + aarch64-linux = "3llai3d2xpgbr7a4ndg9wqfpnb5zb8k07dicc57a6cmniiqyqigyxinhpx2k0l45mbnihjsr5k1rih3r6bwlj241v67iwd2i0dpqd8a"; + x86_64-darwin = "106mx6a4rwcvq41v54c1yx89156s43n889im9g0q2pvm7054q8b6xm6qrnymzmj5i2i6awyk0z02j5pfiyh35sw9afxb3695ymsb3v8"; }; }; sdk_2_1 = buildNetCoreSdk { - version = "2.1.804"; + version = "2.1.810"; sha512 = { - x86_64-linux = "1kbzxcdgyvs94kkm6ikr1j0p0k3zq30d10sl69ig0rgbqbqm4rpqi6dq94jjbw7q3jlwz83vgq3549q38d2s9kalmzv9lmddn2kkc42"; - aarch64-linux = "2d97xvhxnkdgghqlichkwdxxh641dzkd9hq5xgffgvbqv1qsh31k9yib2q1nsarpnbx0d758bdn2jm2wvsj7nx0gpxlb3nab0b3hc2g"; - x86_64-darwin = "0fjn18vizgfdbziklhgppnvka5iw2hb4pfi6047i46il8ydb6z1m40cflq436sdf07sivi0mnldg9247qvqrl6f078w3fwnh3bwlac8"; + x86_64-linux = "388nrba5f7z9syq23xh3k45rzy3iys58s32ya7a0q9mwdf1y3haw7yvbq79cn08741hhqdi73mip8jf50f4s64mbr62ay1p76zsrkj5"; + aarch64-linux = "2vs8bhk63cjrqkm5n164ahc6bdz58aq9vmhaiyy27krp7wlkz4gpiva9153h7mywhk709l1qc7cddj99qsh2ygv6axjfigbhgrzslqi"; + x86_64-darwin = "3qxlgbd0np0w8wmp98mhp4cqgva4zglqf7k9kzqbwxfwr5s795kap7rs5w0cy7h0bsvj0ygx3d5nzyn9hp3fsswx4jl4mkvillnvjzy"; }; }; @@ -77,29 +77,40 @@ rec { # v3.1.1 (LTS) aspnetcore_3_1 = buildAspNetCore { - version = "3.1.5"; + version = "3.1.8"; sha512 = { - x86_64-linux = "3ziyvm6llvhnjg8ayr4cfcabwkc46fqscgj12faavib34r5zx4mnv3qccqm3gg2r8jps60h42lvrwj3fliqmr0qqnhsw04819kqwai6"; - aarch64-linux = "2nbhvh8dpg7dghcs6ysdg7mcc60hbk5d3zab0nnbqkib93fdhbzhzcra9qhh80h8x03zw0jsn3gzqx0d1z2vz5z3lsa14vmb86pzj4a"; - x86_64-darwin = "1sfnp849vmsv8775fjsf9nzx28cmkvfgk8fa81h2l849z31ssaw9fn89kk0n83l0wrhr24ivmprfr11sp42gnjbncqfsnz4883lfchw"; + x86_64-linux = "0i3dqsmh5x2aaagw30zvr0ydmzms5j6xvmwq0yx79r1hncw0zg8w1zq7cxvaddszl13d24wxb8vm4varkiv3fy8z3n2ndmhlqa2qcyw"; + aarch64-linux = "3f3xky7jqpqwnsg730ka1576ppsspi25xlqsrqmwlbanad0r89lidfppr34nsys9gb5f1vx1zkv73dn4jhl6yawnas9j9f8nhi5mq40"; + x86_64-darwin = "1gbiizljh80m9sqv4ynvch7si55if43f4ccfd9ynakwm777fddbg8py338l7irnxc5rid3xzw7c0yj5p8f22n38krlxkvr1zcwij68b"; }; }; netcore_3_1 = buildNetCore { - version = "3.1.5"; + version = "3.1.8"; sha512 = { - x86_64-linux = "03g6aghbpsxj9csaq9lkc8cad1nk8kvlivkarq6bfqvx992fxw6zryp7kcm5h6a5gkgpimb1nr17vndj1r629hdhpincqj8yw6i33mq"; - aarch64-linux = "25gwicmpzhzs96w3azypbl32bx967f14xkfdgvl7knw234rcmfv7zr0a7lb3vci68dbx4xywpnwlrvgi54mimzp8nagrgwva8zrrxzb"; - x86_64-darwin = "2g28jmv1n7pgxfq4wk9x58y5dp835c7rckz6c88ylk7g9w6z75l94pblfl1rc7mr6g3wddiy5cl87a607j9g283hv28a4vcpvll8s7g"; + x86_64-linux = "19gbb92lkfwmx4ic27v5g4cs8qzxiq8cv7sw9pxa8kibgr7lgifvg8dh3pd0i30a78yg5lc3fsdy0jal5i2k049nak72rfhxhrk5yxc"; + aarch64-linux = "0h0zfj82wafk6brmh35ah1qfxgxs4nm3wc47i14vhvkg78rz25w46rnah88zf9gkllnbhfxkw1ivcl4mm6l4ri9hv9367rr627hybvf"; + x86_64-darwin = "0zcp77lh6rvj1vlnjnnd9gqrwazn9v572l0x6r7b9pkjjq7fdh5cnjcc1cvkv9rb00mssd9jjv7yjdpv4i8i9hwby85g9bn500qx42c"; }; }; sdk_3_1 = buildNetCoreSdk { - version = "3.1.102"; + version = "3.1.402"; sha512 = { - x86_64-linux = "0lmz8ac5j0i4zcq4904kr6qibvyjcm2ckfg27kqyqfii00qmm80xb5sk3i7f06xqkbgkrqkbg9rsldk75akw6m5dxg932j602bxrb4w"; - aarch64-linux = "34k6cm69gxm7vcd9m6bp47sdx96j32z6lfhb2vjcdznc6xgs2wy8zcang3b1mjm5919dq7v6iysm6ffcpgjhhphy7prlnaqa69q5mks"; - x86_64-darwin = "00xs87zj94v6yr6xs294bficp6lxpghyfswhnwqfkx62jy80qr5fa2y7s10ich3cbm2daa8dby56iizdvi7rnlvp23gfkq12gq4w1g8"; + x86_64-linux = "2zdb5cl4swg7kvnla6kgnnwg3kkb3rj2ccizg43fw89h8nacr1klz3zdl5km9l553lvm364dy8xsdwm79bw1ch0qgff6snnbbxlw5a2"; + aarch64-linux = "1aq8fhsn15362x99dfp72m67zbswrg30xscy1n983mmq76qn5ha6sy8pyj84l7qcs0n1b7akb77qyi3d2ns8bd2wl6s1dacl24gn10p"; + x86_64-darwin = "1gk6sgd9gdc6nr64mdfj6lhzdi6ixi5c1r0i1b7bhkg2xycx5cnbgjycrpqh17h6wbp68dz4mkg5hf1y3527hdwypa9k0sqdg3yrdb8"; + }; + }; + + # v5.0.0 + + sdk_5_0 = buildNetCoreSdk { + version = "5.0.100-rc.1.20452.10"; + sha512 = { + x86_64-linux = "d7e709dacc4bb188c2380060d24bfb5b791240dc33af8499fb4a31e1885a9377dad1d1ebc76847432ea67d5e4ac832a31679dc293e09fa6dade28f5fbbe4db9b"; + aarch64-linux = "2d04890c71e845d1eb08f5dfbbb9c93024d7a52fb1cc3fd50bd51bc6bd44e455c5c82abc8f04eef23bd012984ae5f86143c600ceb49c4c733935d95d5b68785f"; + x86_64-darwin = "06bb40273071f3dd1e84ebf58abc7798795d5f1ac298f24bf7109d1597fd52ff31bcbf2b81f86d91d37ae293678d07f8da0469d7cbd318d19a8d718b6629dcac"; }; }; } diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 53ccb57abe6..369ea862620 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -30,18 +30,6 @@ let `package/nix/build.sh` */ elm-format = justStaticExecutables (overrideCabal (self.callPackage ./packages/elm-format.nix {}) (drv: { - # GHC 8.8.3 support - # https://github.com/avh4/elm-format/pull/640 - patches = [( - fetchpatch { - url = "https://github.com/turboMaCk/elm-format/commit/4f4abdc7117ed6ce3335f6cf39b6495b48067b7c.patch"; - sha256 = "1zqk6q6w0ph12mnwffgwzf4h1hcgqg0v09ws9q2g5bg2riq4rvd9"; - } - )]; - # Tests are failing after upgrade to ghc881. - # Cause is probably just a minor change in stdout output - # see https://github.com/avh4/elm-format/pull/640 - doCheck = false; jailbreak = true; })); diff --git a/pkgs/development/compilers/elm/packages/elm-format.nix b/pkgs/development/compilers/elm/packages/elm-format.nix index e498b4b1494..ff944cc4b64 100644 --- a/pkgs/development/compilers/elm/packages/elm-format.nix +++ b/pkgs/development/compilers/elm/packages/elm-format.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchgit, ansi-terminal, ansi-wl-pprint, base, binary +{ mkDerivation, fetchgit, ansi-terminal, ansi-wl-pprint, array, base, binary , bytestring, cmark, containers, directory, filepath, free, HUnit , indents, json, mtl, optparse-applicative, parsec, process , QuickCheck, quickcheck-io, split, stdenv, tasty, tasty-golden @@ -6,11 +6,11 @@ }: mkDerivation { pname = "elm-format"; - version = "0.8.3"; + version = "0.8.4"; src = fetchgit { url = "https://github.com/avh4/elm-format"; - sha256 = "0n6lrqj6mq044hdyraj3ss5cg74dn8k4z05xmwn2apjpm146iaw8"; - rev = "b97e3593d564a1e069c0a022da8cbd98ca2c5a4b"; + sha256 = "0cxlhhdjx4h9g03z83pxv91qrysbi0ab92rl52jb0yvkaix989ai"; + rev = "5bd4fbe591fe8b456160c180cb875ef60bc57890"; }; postPatch = '' mkdir -p ./generated @@ -18,15 +18,15 @@ mkDerivation { module Build_elm_format where gitDescribe :: String - gitDescribe = "0.8.3" + gitDescribe = "0.8.4" EOHS ''; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal ansi-wl-pprint base binary bytestring containers - directory filepath free indents json mtl optparse-applicative - parsec process split text + ansi-terminal ansi-wl-pprint array base binary bytestring + containers directory filepath free indents json mtl + optparse-applicative parsec process split text ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ diff --git a/pkgs/development/compilers/hop/default.nix b/pkgs/development/compilers/hop/default.nix index f63f4169bc3..fd3ef137ae6 100644 --- a/pkgs/development/compilers/hop/default.nix +++ b/pkgs/development/compilers/hop/default.nix @@ -1,21 +1,27 @@ { stdenv, fetchurl, bigloo }: +# Compute the “release” version of bigloo (before the first dash, if any) +let bigloo-release = + let inherit (stdenv.lib) head splitString; in + head (splitString "-" (builtins.parseDrvName bigloo.name).version) +; in + stdenv.mkDerivation rec { - name = "hop-2.5.1"; + name = "hop-3.3.0"; src = fetchurl { url = "ftp://ftp-sop.inria.fr/indes/fp/Hop/${name}.tar.gz"; - sha256 = "1bvp7pc71bln5yvfj87s8750c6l53wjl6f8m12v62q9926adhwys"; + sha256 = "14gf9ihmw95zdnxsqhn5jymfivpfq5cg9v0y7yjd5i7c787dncp5"; }; - buildInputs = [ bigloo ]; - - preConfigure = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -lbigloogc-4.1a"; + postPatch = '' + substituteInPlace configure --replace "(os-tmp)" '(getenv "TMPDIR")' ''; + buildInputs = [ bigloo ]; + configureFlags = [ "--bigloo=${bigloo}/bin/bigloo" - "--bigloolibdir=${bigloo}/lib/bigloo/4.1a/" + "--bigloolibdir=${bigloo}/lib/bigloo/${bigloo-release}/" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/jasmin/default.nix b/pkgs/development/compilers/jasmin/default.nix index ef1b3055190..7defdc5c689 100644 --- a/pkgs/development/compilers/jasmin/default.nix +++ b/pkgs/development/compilers/jasmin/default.nix @@ -1,13 +1,13 @@ { stdenv , fetchurl , unzip -, jdk +, jdk8 , ant , makeWrapper -, jre , callPackage }: +let jre = jdk8.jre; jdk = jdk8; in stdenv.mkDerivation rec { pname = "jasmin"; version = "2.4"; diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix index e0698e1dcf3..e827f76231f 100644 --- a/pkgs/development/compilers/llvm/5/lldb.nix +++ b/pkgs/development/compilers/llvm/5/lldb.nix @@ -1,5 +1,6 @@ { stdenv , fetch +, fetchpatch , cmake , zlib , ncurses @@ -20,6 +21,15 @@ stdenv.mkDerivation { src = fetch "lldb" "05j2a63yzln43852nng8a7y47spzlyr1cvdmgmbxgd29c8r0bfkq"; + patches = [ + # Fix PythonString::GetString for >=python-3.7 + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5457b426f5e15a29c0acc8af1a476132f8be2a36.patch"; + sha256 = "1zbx4m0m8kbg0wq6740jcw151vb2pb1p25p401wiq8diqqagkjps"; + stripLen = 1; + }) + ]; + postPatch = '' # Fix up various paths that assume llvm and clang are installed in the same place sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \ diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix index 80e298eaf8c..629749e10f3 100644 --- a/pkgs/development/compilers/llvm/6/lldb.nix +++ b/pkgs/development/compilers/llvm/6/lldb.nix @@ -1,5 +1,6 @@ { stdenv , fetch +, fetchpatch , cmake , zlib , ncurses @@ -20,6 +21,15 @@ stdenv.mkDerivation { src = fetch "lldb" "05178zkyh84x32n91md6wm22lkzzrrfwa5cpmgzn0yrg3y2771bb"; + patches = [ + # Fix PythonString::GetString for >=python-3.7 + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5457b426f5e15a29c0acc8af1a476132f8be2a36.patch"; + sha256 = "1zbx4m0m8kbg0wq6740jcw151vb2pb1p25p401wiq8diqqagkjps"; + stripLen = 1; + }) + ]; + postPatch = '' # Fix up various paths that assume llvm and clang are installed in the same place sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \ diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix index d29a2bda330..3e2c3cec0c1 100644 --- a/pkgs/development/compilers/llvm/rocm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, callPackage, wrapCCWith }: let - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${version}"; - sha256 = "02p0s041wwsi4q0dhs1sj5l6059y02s31az505h0f22agz3jnpfn"; + sha256 = "19771lxqbm7yhsy06s4bk7amiryrfdbc0jawribw063l7n599xs6"; }; in rec { clang = wrapCCWith rec { diff --git a/pkgs/development/compilers/lobster/default.nix b/pkgs/development/compilers/lobster/default.nix new file mode 100644 index 00000000000..f8d31f12cd4 --- /dev/null +++ b/pkgs/development/compilers/lobster/default.nix @@ -0,0 +1,66 @@ +{ stdenv +, fetchFromGitHub +, cmake +, callPackage + +# Linux deps +, libGL +, xorg + +# Darwin deps +, cf-private +, Cocoa +, AudioToolbox +, OpenGL +, Foundation +, ForceFeedback +}: + +stdenv.mkDerivation rec { + pname = "lobster"; + version = "unstable-2020-07-27"; + + src = fetchFromGitHub { + owner = "aardappel"; + repo = pname; + rev = "9d68171494a79c83931426b624a0249a9c51882c"; + sha256 = "0d4gn71jym662i00rdmynv53ng1lgl81s5lw1sdddgn41wzs28dd"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = if stdenv.isDarwin + then [ + cf-private + Cocoa + AudioToolbox + OpenGL + Foundation + ForceFeedback + ] + else [ + libGL + xorg.libX11 + xorg.libXext + ]; + + preConfigure = "cd dev"; + enableParallelBuilding = true; + + passthru.tests = { + can-run-hello-world = callPackage ./test-can-run-hello-world.nix {}; + }; + + meta = with stdenv.lib; { + homepage = "http://strlen.com/lobster"; + description = "The Lobster programming language"; + longDescription = '' + Lobster is a programming language that tries to combine the advantages of + very static typing and memory management with a very lightweight, + friendly and terse syntax, by doing most of the heavy lifting for you. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/development/compilers/lobster/test-can-run-hello-world.nix b/pkgs/development/compilers/lobster/test-can-run-hello-world.nix new file mode 100644 index 00000000000..ceb0536b582 --- /dev/null +++ b/pkgs/development/compilers/lobster/test-can-run-hello-world.nix @@ -0,0 +1,13 @@ +{ stdenv, lobster }: + +stdenv.mkDerivation { + name = "lobster-test-can-run-hello-world"; + meta.timeout = 10; + buildCommand = '' + ${lobster}/bin/lobster \ + ${lobster}/share/Lobster/samples/rosettacode/hello_world_test.lobster \ + | grep 'Goodbye, World!' + touch $out + ''; +} + diff --git a/pkgs/development/compilers/mcpp/default.nix b/pkgs/development/compilers/mcpp/default.nix index bf0db4c1f6c..023bae48b3e 100644 --- a/pkgs/development/compilers/mcpp/default.nix +++ b/pkgs/development/compilers/mcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { pname = "mcpp"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-mcpplib" ]; + patches = [ + (fetchpatch { + name = "CVE-2019-14274.patch"; + url = "https://github.com/h8liu/mcpp/commit/ea453aca2742be6ac43ba4ce0da6f938a7e5a5d8.patch"; + sha256 = "0svkdr3w9b45v6scgzvggw9nsh6a3k7g19fqk0w3vlckwmk5ydzr"; + }) + ]; + meta = with stdenv.lib; { homepage = "http://mcpp.sourceforge.net/"; description = "A portable c preprocessor"; diff --git a/pkgs/development/compilers/mruby/bison-36-compat.patch b/pkgs/development/compilers/mruby/bison-36-compat.patch deleted file mode 100644 index 674a88fe4c2..00000000000 --- a/pkgs/development/compilers/mruby/bison-36-compat.patch +++ /dev/null @@ -1,59 +0,0 @@ -From acab088fd6af0b2ef2df1396aeb93bfc2e020fa5 Mon Sep 17 00:00:00 2001 -From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp> -Date: Mon, 27 Apr 2020 18:52:43 +0900 -Subject: [PATCH 1/2] Updating `parse.y for recent `bison` (retry). - ---- - mrbgems/mruby-compiler/core/parse.y | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y -index 6a1faf4e..2a4f740e 100644 ---- a/mrbgems/mruby-compiler/core/parse.y -+++ b/mrbgems/mruby-compiler/core/parse.y -@@ -1323,7 +1323,7 @@ heredoc_end(parser_state *p) - - %} - --%pure-parser -+%define api.pure - %parse-param {parser_state *p} - %lex-param {parser_state *p} - --- -2.27.0 - -From 3cc682d943b29e84928a847a23f411ddbace74b7 Mon Sep 17 00:00:00 2001 -From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby.or.jp> -Date: Fri, 15 May 2020 12:30:13 +0900 -Subject: [PATCH 2/2] Remove `YYERROR_VERBOSE` which no longer supported since - `bison 3.6`. - -Instead we added `%define parse.error verbose`. ---- - mrbgems/mruby-compiler/core/parse.y | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y -index 2a4f740e..eee6a5e5 100644 ---- a/mrbgems/mruby-compiler/core/parse.y -+++ b/mrbgems/mruby-compiler/core/parse.y -@@ -9,7 +9,6 @@ - #ifdef PARSER_DEBUG - # define YYDEBUG 1 - #endif --#define YYERROR_VERBOSE 1 - #define YYSTACK_USE_ALLOCA 1 - - #include <ctype.h> -@@ -1323,6 +1322,7 @@ heredoc_end(parser_state *p) - - %} - -+%define parse.error verbose - %define api.pure - %parse-param {parser_state *p} - %lex-param {parser_state *p} --- -2.27.0 - diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix index 2589c47c3be..eee4f2c64eb 100644 --- a/pkgs/development/compilers/mruby/default.nix +++ b/pkgs/development/compilers/mruby/default.nix @@ -2,26 +2,24 @@ stdenv.mkDerivation rec { pname = "mruby"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "mruby"; repo = "mruby"; rev = version; - sha256 = "gEEb0Vn/G+dNgeY6r0VP8bMSPrEOf5s+0GoOcnIPtEU="; + sha256 = "0fhfv8pi7i8jn2vgk2n2rjnbnfa12nhj514v8i4k353n7q4pmkh3"; }; nativeBuildInputs = [ ruby bison rake ]; - patches = [ ./bison-36-compat.patch ]; - # Necessary so it uses `gcc` instead of `ld` for linking. # https://github.com/mruby/mruby/blob/35be8b252495d92ca811d76996f03c470ee33380/tasks/toolchains/gcc.rake#L25 preBuild = if stdenv.isLinux then "unset LD" else null; installPhase = '' mkdir $out - cp -R build/host/{bin,lib} $out + cp -R include build/host/{bin,lib} $out ''; doCheck = true; diff --git a/pkgs/development/compilers/pforth/default.nix b/pkgs/development/compilers/pforth/default.nix index c13d28c6a3b..ce228c2f1cb 100644 --- a/pkgs/development/compilers/pforth/default.nix +++ b/pkgs/development/compilers/pforth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation { version = "28"; @@ -10,6 +10,14 @@ stdenv.mkDerivation { sha256 = "0k3pmcgybsnwrxy75piyb2420r8d4ij190606js32j99062glr3x"; }; + patches = [ + (fetchpatch { + name = "gnumake-4.3-fix.patch"; + url = "https://github.com/philburk/pforth/commit/457cb99f57292bc855e53abcdcb7b12d6681e847.patch"; + sha256 = "0x1bwx3pqb09ddjhmdli47lnk1ys4ny42819g17kfn8nkjs5hbx7"; + }) + ]; + makeFlags = [ "SRCDIR=." ]; makefile = "build/unix/Makefile"; diff --git a/pkgs/development/coq-modules/metalib/default.nix b/pkgs/development/coq-modules/metalib/default.nix index a0268a543a5..862184c1460 100644 --- a/pkgs/development/coq-modules/metalib/default.nix +++ b/pkgs/development/coq-modules/metalib/default.nix @@ -1,46 +1,23 @@ -{ stdenv, fetchgit, coq, haskellPackages, which, ott -}: +{ stdenv, fetchFromGitHub, coq }: stdenv.mkDerivation rec { - name = "metalib-${coq.coq-version}-${version}"; - version = "20170713"; - - src = fetchgit { - url = "https://github.com/plclub/metalib.git"; - rev = "44e40aa082452dd333fc1ca2d2cc55311519bd52"; - sha256 = "1pra0nvx69q8d4bvpcvh9ngic1cy6z1chi03x56nisfqnc61b6y9"; + name = "coq${coq.coq-version}-metalib-${version}"; + version = "20200527"; + + src = fetchFromGitHub { + owner = "plclub"; + repo = "metalib"; + rev = "597fd7d0c93eb159274e84a39d554f10f1efccf8"; + sha256 = "0wbypc05d2lqfm9qaw98ynr5yc1p0ipsvyc3bh1rk9nz7zwirmjs"; }; - # The 'lngen' command-line utility is built from Haskell sources - lngen = with haskellPackages; mkDerivation { - pname = "lngen"; - version = "0.0.1"; - src = fetchgit { - url = "https://github.com/plclub/lngen"; - rev = "ea73ad315de33afd25f87ca738c71f358f1cd51c"; - sha256 = "1a0sj8n3lmsl1wlnqfy176k9lb9s8rl422bvg3ihl2i70ql8wisd"; - }; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base containers mtl parsec syb ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/plclub/lngen"; - description = "Tool for generating Locally Nameless definitions and proofs in Coq, working together with Ott"; - license = stdenv.lib.licenses.mit; - }; + sourceRoot = "source/Metalib"; - buildInputs = with coq.ocamlPackages; [ ocaml camlp5 which coq lngen ott findlib ]; - propagatedBuildInputs = [ coq ]; + buildInputs = [ coq ]; enableParallelBuilding = true; - buildPhase = '' - (cd Metalib; make) - ''; - - installPhase = '' - (cd Metalib; make -f CoqSrc.mk DSTROOT=/ COQLIB=$out/lib/coq/${coq.coq-version}/ install) - ''; + installFlags = "COQMF_COQLIB=$(out)/lib/coq/${coq.coq-version}"; meta = with stdenv.lib; { homepage = "https://github.com/plclub/metalib"; @@ -50,7 +27,7 @@ stdenv.mkDerivation rec { }; passthru = { - compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" ]; + compatibleCoqVersions = v: builtins.elem v [ "8.10" "8.11" "8.12" ]; }; } diff --git a/pkgs/development/dotnet-modules/python-language-server/deps.nix b/pkgs/development/dotnet-modules/python-language-server/deps.nix index c47e29b6420..6a494e7e521 100644 --- a/pkgs/development/dotnet-modules/python-language-server/deps.nix +++ b/pkgs/development/dotnet-modules/python-language-server/deps.nix @@ -54,26 +54,14 @@ in [ (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.0.2"; - sha256 = "0d4r744n3bk4v7ddfjpy5ils150h0693bil3c7v27n84037hqndj"; - }) - - (fetchNuGet { - name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "3.0.3"; sha256 = "1jcqy8i9fzb1pmkazi80yqr09zi5nk30n57i46ggr5ky45jngfq9"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.1.2"; - sha256 = "19wfh9yg4n2khbl7pvf6ngx95m5p8lw4l9y935pv7nh4xgwk02p9"; - }) - - (fetchNuGet { - name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.1.3"; - sha256 = "0kvnzb9xjii48kg30ac63qdf0fn1y8j3nblbrfaqv2aiy6kp0iwn"; + version = "3.1.8"; + sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135"; }) (fetchNuGet { @@ -102,20 +90,14 @@ in [ (fetchNuGet { name = "Microsoft.NetCore.App.Host.linux-x64"; - version = "3.0.2"; - sha256 = "0y14y2x3wbi44i23ndmf4323cii8wrqw9s289gcab3s393l71sf5"; - }) - - (fetchNuGet { - name = "Microsoft.NetCore.App.Host.linux-x64"; version = "3.0.3"; sha256 = "19igfvwsjzwkh90gqzabl6pdkyygslj2iwpsxg680phffzr411w4"; }) (fetchNuGet { name = "Microsoft.NetCore.App.Host.linux-x64"; - version = "3.1.3"; - sha256 = "013ibnhsimgqj5l2dqma035xvsvrb47bn65z6xbxgg88383hpgvw"; + version = "3.1.8"; + sha256 = "0iawz5mqaf1c4r5cf0ks4wqhgpbqi185l80q4909axh516xsjnvs"; }) (fetchNuGet { @@ -132,26 +114,14 @@ in [ (fetchNuGet { name = "Microsoft.NetCore.App.Runtime.linux-x64"; - version = "3.0.2"; - sha256 = "1h6d0nl495k0bh4my43l578l7m8qwah7ll42aax7jrib2py354f1"; - }) - - (fetchNuGet { - name = "Microsoft.NetCore.App.Runtime.linux-x64"; version = "3.0.3"; sha256 = "1ykgfnphbkyck0gqbbh5n96w59z2bq47g896ygal1j4nblj3s44v"; }) (fetchNuGet { name = "Microsoft.NetCore.App.Runtime.linux-x64"; - version = "3.1.2"; - sha256 = "0a332ia5pabnz7mdfc99a5hlc7drnwzlc7cj9b5c3an6dq636p66"; - }) - - (fetchNuGet { - name = "Microsoft.NetCore.App.Runtime.linux-x64"; - version = "3.1.3"; - sha256 = "1ynhzsr8a0hfby2wjhzkdiimj18izgfzp7m2yp3pby2iwb4v3xy9"; + version = "3.1.8"; + sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa"; }) (fetchNuGet { diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 53cef387ae4..39db54babe4 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, installShellFiles, jdk11, rlwrap, makeWrapper }: +{ stdenv, fetchurl, installShellFiles, jdk, rlwrap, makeWrapper }: stdenv.mkDerivation rec { pname = "clojure"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = let - binPath = stdenv.lib.makeBinPath [ rlwrap jdk11 ]; + binPath = stdenv.lib.makeBinPath [ rlwrap jdk ]; in '' mkdir -p $out/libexec diff --git a/pkgs/development/interpreters/elixir/1.6.nix b/pkgs/development/interpreters/elixir/1.6.nix deleted file mode 100644 index 94dffd1f763..00000000000 --- a/pkgs/development/interpreters/elixir/1.6.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ mkDerivation }: - -mkDerivation { - version = "1.6.6"; - sha256 = "1wl8rfpw0dxacq4f7xf6wjr8v2ww5691d0cfw9pzw7phd19vazgl"; - minimumOTPVersion = "19"; -} diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 54b046beaab..f821baf66c5 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchFromGitHub, erlang, rebar, makeWrapper, +{ pkgs, stdenv, fetchFromGitHub, erlang, makeWrapper, coreutils, curl, bash, debugInfo ? false }: { baseName ? "elixir" @@ -20,7 +20,7 @@ in inherit src version; - buildInputs = [ erlang rebar makeWrapper ]; + buildInputs = [ erlang makeWrapper ]; LANG = "C.UTF-8"; LC_TYPE = "C.UTF-8"; @@ -32,10 +32,6 @@ in buildFlags = optional debugInfo "ERL_COMPILER_OPTIONS=debug_info"; preBuild = '' - # The build process uses ./rebar. Link it to the nixpkgs rebar - rm -vf rebar - ln -s ${rebar}/bin/rebar rebar - patchShebangs lib/elixir/generate_app.escript || true substituteInPlace Makefile \ diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index a53a917b7b3..18b658ae37c 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -1,6 +1,7 @@ { pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused , libxml2, libxslt, ncurses, openssl, perl, autoconf -, openjdk ? null # javacSupport +# TODO: use jdk https://github.com/NixOS/nixpkgs/pull/89731 +, openjdk8 ? null # javacSupport , unixODBC ? null # odbcSupport , libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport , parallelBuild ? false @@ -17,7 +18,7 @@ , enableThreads ? true , enableSmpSupport ? true , enableKernelPoll ? true -, javacSupport ? false, javacPackages ? [ openjdk ] +, javacSupport ? false, javacPackages ? [ openjdk8 ] , odbcSupport ? false, odbcPackages ? [ unixODBC ] , wxSupport ? true, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ] , preUnpack ? "", postUnpack ? "" @@ -36,7 +37,7 @@ assert wxSupport -> (if stdenv.isDarwin else libGL != null && libGLU != null && wxGTK != null && xorg != null); assert odbcSupport -> unixODBC != null; -assert javacSupport -> openjdk != null; +assert javacSupport -> openjdk8 != null; let inherit (stdenv.lib) optional optionals optionalAttrs optionalString; diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 52d0b371915..113a582392f 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.10.1"; + version = "1.12.2"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "18k6dzxzr149p0bby4r0z6kybylig87rwj7gk3z6a98zf6k4xmsw"; + sha256 = "0if514zdmbjvvrsa9x5yfvg2b14sz53yaka12g3yhwkq8ls3qk0c"; }; nativeBuildInputs = [ meson ninja ]; diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index e4511da498c..8d27bfb64f8 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -40,6 +40,10 @@ jruby = stdenv.mkDerivation rec { EOF ''; + postFixup = '' + PATH=$out/bin:$PATH patchShebangs $out/bin + ''; + passthru = rec { rubyEngine = "jruby"; gemPath = "lib/${rubyEngine}/gems/${rubyVersion.libDir}"; diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 06d69ed8117..d9766108596 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,4 +1,7 @@ { stdenv +# Note: either stdenv.mkDerivation or, for octaveFull, the qt-5 mkDerivation +# with wrapQtAppsHook (comes from libsForQt5.callPackage) +, mkDerivation , fetchurl , gfortran , ncurses @@ -55,7 +58,7 @@ assert (!blas.isILP64) && (!lapack.isILP64); -stdenv.mkDerivation rec { +mkDerivation rec { version = "5.2.0"; pname = "octave"; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 7fad936260c..991c385cedc 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -73,7 +73,7 @@ let # Miniperl needs -lm. perl needs -lrt. configureFlags = (if crossCompiling - then [ "-Dlibpth=\"\"" "-Dglibpth=\"\"" ] + then [ "-Dlibpth=\"\"" "-Dglibpth=\"\"" "-Ddefault_inc_excludes_dot" ] else [ "-de" "-Dcc=cc" ]) ++ [ "-Uinstallusrbinperl" diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index e4230093e9c..94422518b25 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib }: +{ pkgs }: with pkgs; diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix index 574629d8efd..d4e5f1b62bf 100644 --- a/pkgs/development/java-modules/jogl/default.nix +++ b/pkgs/development/java-modules/jogl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ant, jdk, git, xorg, udev, libGL, libGLU }: +{ stdenv, fetchgit, ant, jdk8, git, xorg, udev, libGL, libGLU }: { jogl_2_3_2 = @@ -28,7 +28,8 @@ -exec sed -i 's@"libGLU.so"@"${libGLU}/lib/libGLU.so"@' {} \; ''; - nativeBuildInputs = [ jdk ant git ]; + # TODO: upgrade to jdk https://github.com/NixOS/nixpkgs/pull/89731 + nativeBuildInputs = [ jdk8 ant git ]; buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ]; buildPhase = '' diff --git a/pkgs/development/libraries/audiality2/default.nix b/pkgs/development/libraries/audiality2/default.nix new file mode 100644 index 00000000000..a311c5f5479 --- /dev/null +++ b/pkgs/development/libraries/audiality2/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchFromGitHub +, cmake +, pkg-config +# The two audio backends: +, SDL2 +, jack2 +}: + +stdenv.mkDerivation rec { + pname = "audiality2"; + version = "1.9.4"; + + src = fetchFromGitHub { + owner = "olofson"; + repo = "audiality2"; + rev = "v${version}"; + sha256 = "0ipqna7a9mxqm0fl9ggwhbc7i9yxz3jfyi0w3dymjp40v7jw1n20"; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + SDL2 + jack2 + ]; + + meta = with stdenv.lib; { + description = "A realtime scripted modular audio engine for video games and musical applications"; + homepage = "http://audiality.org"; + license = licenses.zlib; + platforms = platforms.all; + maintainers = with maintainers; [ fgaz ]; + }; +} + diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix index 76b5390fb69..a9a10fc6317 100644 --- a/pkgs/development/libraries/cddlib/default.nix +++ b/pkgs/development/libraries/cddlib/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "cddlib"; - version = "0.94j"; + version = "0.94l"; src = fetchFromGitHub { owner = "cddlib"; repo = "cddlib"; rev = version; - sha256 = "1z03ljy3rrr0qq5gq54vynnif6fn0xhn05g90nnv0dpyc3ps8lzp"; + sha256 = "0934a0i2m2bamlibi4cbrf1md1pz7dp35jbfamb0k7x644sayl4k"; }; buildInputs = [gmp]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 312f927767d..1963534ae51 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - sha256 = "0vl7dscbms4834gm1000sp17pr714pbqwicn40pbl85mxr3pnjp3"; + sha256 = "sha256-7v8651yDkxTdRMoGhEl4d/k7mxYwfIwW/rkuyjqVGwY="; }; installPhase = '' diff --git a/pkgs/development/libraries/crc32c/default.nix b/pkgs/development/libraries/crc32c/default.nix index 1da2f210c5c..b9c12b1889c 100644 --- a/pkgs/development/libraries/crc32c/default.nix +++ b/pkgs/development/libraries/crc32c/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake, gflags }: +{ stdenv, lib, fetchFromGitHub, cmake, gflags +, staticOnly ? false }: + stdenv.mkDerivation rec { pname = "crc32c"; version = "1.1.0"; @@ -14,6 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ gflags ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc"; + cmakeFlags = lib.optionals (!staticOnly) [ "-DBUILD_SHARED_LIBS=1" ]; meta = with stdenv.lib; { homepage = "https://github.com/google/crc32c"; diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix index 4055cb8eb71..2f7fe184845 100644 --- a/pkgs/development/libraries/hiredis/default.nix +++ b/pkgs/development/libraries/hiredis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hiredis"; - version = "0.14.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "redis"; repo = "hiredis"; rev = "v${version}"; - sha256 = "1r93ssniiv610pj6d78i1cngism0cdv2k8cmzy7jf9klf76jiwfq"; + sha256 = "01xnynm9d56a0alb5wxbfayakybm5pnr12icj9mqkn4xxihbnbgr"; }; PREFIX = "\${out}"; diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix index 5e574151650..0133138b478 100644 --- a/pkgs/development/libraries/java/dbus-java/default.nix +++ b/pkgs/development/libraries/java/dbus-java/default.nix @@ -1,5 +1,6 @@ -{stdenv, fetchurl, gettext, jdk, libmatthew_java}: +{stdenv, fetchurl, gettext, jdk8, libmatthew_java}: +let jdk = jdk8; in stdenv.mkDerivation { name = "dbus-java-2.7"; src = fetchurl { diff --git a/pkgs/development/libraries/libbacktrace/default.nix b/pkgs/development/libraries/libbacktrace/default.nix new file mode 100644 index 00000000000..0032941f870 --- /dev/null +++ b/pkgs/development/libraries/libbacktrace/default.nix @@ -0,0 +1,23 @@ +{ stdenv, callPackage, fetchFromGitHub, enableStatic ? false, enableShared ? true }: +let + yesno = b: if b then "yes" else "no"; +in stdenv.mkDerivation rec { + pname = "libbacktrace"; + version = "2020-05-13"; + src = fetchFromGitHub { + owner = "ianlancetaylor"; + repo = pname; + rev = "9b7f216e867916594d81e8b6118f092ac3fcf704"; + sha256 = "0qr624v954gnfkmpdlfk66sxz3acyfmv805rybsaggw5gz5sd1nh"; + }; + configureFlags = [ + "--enable-static=${yesno enableStatic}" + "--enable-shared=${yesno enableShared}" + ]; + meta = with stdenv.lib; { + description = "A C library that may be linked into a C/C++ program to produce symbolic backtraces"; + homepage = https://github.com/ianlancetaylor/libbacktrace; + maintainers = with maintainers; [ twey ]; + license = with licenses; [ bsd3 ]; + }; +} diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index 6d77a28d55f..68078bbc9a0 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libgpiod"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - sha256 = "14iv8iwyvfznyifhkqz1bjh24dvb03gmpjn8v3fs6h734l93vvw5"; + sha256 = "1bknh7kn5gxc8xwf913lsdm9zgn1bwj42nsnp6kbkyn6ip7s6c4r"; }; buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ]; diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/development/libraries/libgumath/default.nix index 27a10507a58..55e89d87664 100644 --- a/pkgs/development/libraries/libgumath/default.nix +++ b/pkgs/development/libraries/libgumath/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "libgumath"; - version = "unstable-2018-11-27"; + version = "unstable-2019-08-01"; src = fetchFromGitHub { - owner = "plures"; + owner = "xnd-project"; repo = "gumath"; - rev = "5a9d27883b40432246d6a93cd6133157267fd166"; - sha256 = "0w2qzp7anxd1wzkvv5r2pdkkpgrnqzgrq47lrvpqc1i1wqzcwf0w"; + rev = "360ed454105ac5615a7cb7d216ad25bc4181b876"; + sha256 = "1wprkxpmjrk369fpw8rbq51r7jvqkcndqs209y7p560cnagmsxc6"; }; buildInputs = [ libndtypes libxnd ]; diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix index ffb2f56d67e..d27c1ba376d 100644 --- a/pkgs/development/libraries/libndtypes/default.nix +++ b/pkgs/development/libraries/libndtypes/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { pname = "libndtypes"; - version = "unstable-2018-11-27"; + version = "unstable-2019-08-01"; src = fetchFromGitHub { - owner = "plures"; + owner = "xnd-project"; repo = "ndtypes"; - rev = "4d810d0c4d54c81a7136f313f0ae6623853d574a"; - sha256 = "1kk1sa7f17ffh49jc1qlizlsj536fr3s4flb6x4rjyi81rp7psb9"; + rev = "3ce6607c96d8fe67b72cc0c97bf595620cdd274e"; + sha256 = "18303q0jfar1lmi4krp94plczb455zcgw772f9lb8xa5p0bkhx01"; }; # Override linker with cc (symlink to either gcc or clang) diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix index 1b2d83b84d0..956538b7624 100644 --- a/pkgs/development/libraries/liboping/default.nix +++ b/pkgs/development/libraries/liboping/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses ? null, perl ? null }: +{ stdenv, fetchurl, ncurses ? null, perl ? null, lib }: stdenv.mkDerivation rec { name = "liboping-1.10.0"; @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1n2wkmvw6n80ybdwkjq8ka43z2x8mvxq49byv61b52iyz69slf7b"; }; - NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; + NIX_CFLAGS_COMPILE = lib.optionalString + stdenv.cc.isGNU "-Wno-error=format-truncation"; buildInputs = [ ncurses perl ]; diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix index cee04fa79e4..a26aa9b5694 100644 --- a/pkgs/development/libraries/libversion/default.nix +++ b/pkgs/development/libraries/libversion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, cmake, lib }: stdenv.mkDerivation rec { pname = "libversion"; @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + cmakeFlags = lib.optional stdenv.isDarwin [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" # needed for tests + ]; + preCheck = '' export LD_LIBRARY_PATH=/build/source/build/libversion/''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ''; diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix index 7313b2582be..1fac0d86d4c 100644 --- a/pkgs/development/libraries/libxnd/default.nix +++ b/pkgs/development/libraries/libxnd/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "libxnd"; - version = "unstable-2018-11-27"; + version = "unstable-2019-08-01"; src = fetchFromGitHub { - owner = "plures"; + owner = "xnd-project"; repo = "xnd"; - rev = "8a9f3bd1d01d872828b40bc9dbd0bc0184524da3"; - sha256 = "10jh2kqvhpzwy50adayh9az7z2lm16yxy4flrh99alzzbqdyls44"; + rev = "6f305cd40d90b4f3fc2fe51ae144b433d186a6cc"; + sha256 = "1n31d64qwlc7m3qkzbafhp0dgrvgvkdx89ykj63kll7r1n3yk59y"; }; buildInputs = [ libndtypes ]; @@ -28,6 +28,14 @@ stdenv.mkDerivation { "--with-libs=${libndtypes}/lib" ]; + # other packages which depend on libxnd seem to expect overflow.h, but + # it doesn't seem to be included in the installed headers. for now this + # works, but the generic name of the header could produce problems + # with collisions down the line. + postInstall = '' + cp libxnd/overflow.h $out/include/overflow.h + ''; + doCheck = true; meta = { diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix index 2c4357e1e93..2eba3ca8bc1 100644 --- a/pkgs/development/libraries/neatvnc/default.nix +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -4,15 +4,20 @@ stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "036kzhbabbwc3gvsw8kqf6rs0gh8kgn6i0by9pxski38mi0qs1qs"; + sha256 = "0zx9f9h1hqcyh3sf6k0scny2039p1lwdqbwqi8ppwwhjl2fzniv8"; }; + postPatch = '' + substituteInPlace meson.build --replace \ + "version: '0.2.0'" "version: '${version}'" + ''; + nativeBuildInputs = [ meson pkg-config ninja ]; buildInputs = [ pixman gnutls libdrm libjpeg_turbo zlib aml ]; diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index 8334bf195f7..c0b2366ab7f 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -1,6 +1,9 @@ { stdenv, fetchFromGitHub, fetchpatch, libGL, libGLU, libXmu, cmake, ninja, - pkgconfig, fontconfig, freetype, expat, freeimage, vtk }: + pkgconfig, fontconfig, freetype, expat, freeimage, vtk, gl2ps, tbb, + OpenCL, Cocoa +}: +with stdenv.lib; stdenv.mkDerivation rec { pname = "opencascade-oce"; version = "0.18.3"; @@ -13,13 +16,21 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ninja pkgconfig ]; - buildInputs = [ libGL libGLU libXmu freetype fontconfig expat freeimage vtk ]; + buildInputs = [ + libGL libGLU libXmu freetype fontconfig expat freeimage vtk + gl2ps tbb + ] + ++ optionals stdenv.isDarwin [OpenCL Cocoa] + ; cmakeFlags = [ "-DOCE_INSTALL_PREFIX=${placeholder "out"}" "-DOCE_WITH_FREEIMAGE=ON" "-DOCE_WITH_VTK=ON" - ]; + "-DOCE_WITH_GL2PS=ON" + "-DOCE_MULTITHREAD_LIBRARY=TBB" + ] + ++ optionals stdenv.isDarwin ["-DOCE_OSX_USE_COCOA=ON" "-DOCE_WITH_OPENCL=ON"]; patches = [ # Use fontconfig instead of hardcoded directory list @@ -33,6 +44,10 @@ stdenv.mkDerivation rec { url = "https://github.com/tpaviot/oce/commit/3b44656e93270d782009b06ec4be84d2a13f8126.patch"; sha256 = "1ccakkcwy5g0184m23x0mnh22i0lk45xm8kgiv5z3pl7nh35dh8k"; }) + (fetchpatch { + url = "https://github.com/tpaviot/oce/commit/cf50d078cd5fac03a48fd204938bd240930a08dc.patch"; + sha256 = "1xv94hcvggmb1c8vqwic1aiw9jw1sxk8mqbaak9xs9ycfqdvgdyc"; + }) ]; postPatch = '' @@ -41,11 +56,11 @@ stdenv.mkDerivation rec { --replace FONTCONFIG_LIBRARIES FONTCONFIG_LINK_LIBRARIES ''; - meta = with stdenv.lib; { + meta = { description = "Open CASCADE Technology, libraries for 3D modeling and numerical simulation"; homepage = "https://github.com/tpaviot/oce"; maintainers = [ maintainers.viric ]; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/orocos-kdl/default.nix b/pkgs/development/libraries/orocos-kdl/default.nix new file mode 100644 index 00000000000..094ee544649 --- /dev/null +++ b/pkgs/development/libraries/orocos-kdl/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, cmake, eigen }: + +stdenv.mkDerivation rec { + pname = "orocos-kdl"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "orocos"; + repo = "orocos_kinematics_dynamics"; + rev = "v${version}"; + sha256 = "0qj56j231h0rnjbglakammxn2lwmhy5f2qa37v1f6pcn81dn13vv"; + }; + + sourceRoot = "source/orocos_kdl"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ eigen ]; + + meta = with lib; { + description = "Kinematics and Dynamics Library"; + homepage = "https://www.orocos.org/kdl.html"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ lopsided98 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index 4e0836946c1..2034b658dc7 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocclr"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; rev = "rocm-${version}"; - sha256 = "0sx4irbmjgs5bm8dc8jc9fl1jmfdnrp3ar14hdhrsmbani7gqah3"; + sha256 = "05vh70qh6jb7038b1rcmz24bg4an0nw98bv2vn3jcyygj4dr3fmf"; }; nativeBuildInputs = [ cmake rocm-cmake ]; diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index 22fbc0e998a..916af543499 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-comgr"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-CompilerSupport"; rev = "rocm-${version}"; - sha256 = "1r7arfdqfh6pfvjza6x2dzd5gjmkndngrp688d3n2ab92n5ijiqf"; + sha256 = "05gs282kqnz7lf3b8r1908zk05dbzdx02ar2ns2900fas1l27qc1"; }; sourceRoot = "source/lib/comgr"; diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index c1878700aaa..bf302ff227c 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "rocm-device-libs"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; rev = "rocm-${version}"; - sha256 = "1sg7wzj2mi5vhba53cp52gnya7c799f0p325ig262vi70r7mr7n2"; + sha256 = "0kgsp22rbg09q09n36j1vfs9v8x0liap3ycnqyn1g7dxy38kqmi4"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index 90bc206a7bc..6504ae10043 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "rocm-opencl-runtime"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-OpenCL-Runtime"; rev = "rocm-${version}"; - sha256 = "15rz11a8qwvxmd0kkaikj04q1glfg9sgqqblcqp3iahr3by8z0wd"; + sha256 = "07zc6ww92nsq1z0gcp1sfhqsk0jkrjnv9cnw5akh471f7n7jiznm"; }; nativeBuildInputs = [ cmake rocm-cmake ]; diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index 6f573adabe1..57635a3470c 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "rocm-runtime"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index c43f9b04b93..ba780ae4bd6 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rocm-thunk"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${version}"; - sha256 = "05963lxip3175g4b7k45r94yayp9gcwl3fpma9g5mdkbrlbvwlvz"; + sha256 = "00xrwxndah2frdggqniz1j4s46ha3dav8qlnxm3gk9m4b80m774k"; }; preConfigure = '' diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix index c473fcedde3..e56952abcb2 100644 --- a/pkgs/development/libraries/science/math/cliquer/default.nix +++ b/pkgs/development/libraries/science/math/cliquer/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - version = "1.21"; + version = "1.22"; pname = "cliquer"; # autotoolized version of the original cliquer @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "dimpase"; repo = "autocliquer"; rev = "v${version}"; - sha256 = "180i4qj1a25qfp75ig2d3144xfpb1dgcgpha0iqqghd7di4awg7z"; + sha256 = "00gcmrhi2fjn8b246w5a3b0pl7p6haxy5wjvd9kcqib1xanz59z4"; }; doCheck = true; diff --git a/pkgs/development/libraries/sundials/2.x.nix b/pkgs/development/libraries/sundials/2.x.nix index b54e537fb82..ae22f0be179 100644 --- a/pkgs/development/libraries/sundials/2.x.nix +++ b/pkgs/development/libraries/sundials/2.x.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { description = "Suite of nonlinear differential/algebraic equation solvers"; homepage = "https://computation.llnl.gov/projects/sundials"; platforms = platforms.all; - maintainers = with maintainers; [ flokli idontgetoutmuch ]; + maintainers = with maintainers; [ idontgetoutmuch ]; license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 24980e9b709..e1b4d375282 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -5,7 +5,9 @@ , blas , lapack , gfortran -, lapackSupport ? true }: +, suitesparse +, lapackSupport ? true +, kluSupport ? true }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -13,7 +15,20 @@ stdenv.mkDerivation rec { pname = "sundials"; version = "5.3.0"; - buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran blas lapack ]; + buildInputs = [ + python + ] ++ stdenv.lib.optionals (lapackSupport) [ + gfortran + blas + lapack + ] + # KLU support is based on Suitesparse. + # It is tested upstream according to the section 1.1.4 of + # [INSTALL_GUIDE.pdf](https://raw.githubusercontent.com/LLNL/sundials/master/INSTALL_GUIDE.pdf) + ++ stdenv.lib.optionals (kluSupport) [ + suitesparse + ]; + nativeBuildInputs = [ cmake ]; src = fetchurl { @@ -35,6 +50,10 @@ stdenv.mkDerivation rec { "-DSUNDIALS_INDEX_TYPE=int32_t" "-DLAPACK_ENABLE=ON" "-DLAPACK_LIBRARIES=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" + ] ++ stdenv.lib.optionals (kluSupport) [ + "-DKLU_ENABLE=ON" + "-DKLU_INCLUDE_DIR=${suitesparse.dev}/include" + "-DKLU_LIBRARY_DIR=${suitesparse}/lib" ]; doCheck = true; @@ -44,7 +63,7 @@ stdenv.mkDerivation rec { description = "Suite of nonlinear differential/algebraic equation solvers"; homepage = "https://computation.llnl.gov/projects/sundials"; platforms = platforms.all; - maintainers = with maintainers; [ flokli idontgetoutmuch ]; + maintainers = with maintainers; [ idontgetoutmuch ]; license = licenses.bsd3; }; } diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix index 21c186a6732..f191a976437 100644 --- a/pkgs/development/libraries/vmmlib/default.nix +++ b/pkgs/development/libraries/vmmlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, blas +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, lapack , Accelerate, CoreGraphics, CoreVideo }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ boost blas ] + buildInputs = [ boost lapack ] ++ stdenv.lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ]; enableParallelBuilding = true; @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A vector and matrix math library implemented using C++ templates"; - longDescription = ''vmmlib is a vector and matrix math library implemented - using C++ templates. Its basic functionality includes a vector - and a matrix class, with additional functionality for the + longDescription = ''vmmlib is a vector and matrix math library implemented + using C++ templates. Its basic functionality includes a vector + and a matrix class, with additional functionality for the often-used 3d and 4d vectors and 3x3 and 4x4 matrices. - More advanced functionality include solvers, frustum + More advanced functionality include solvers, frustum computations and frustum culling classes, and spatial data structures''; license = licenses.bsd2; @@ -43,4 +43,3 @@ stdenv.mkDerivation rec { platforms = platforms.all; }; } - diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index e650a28c61e..8b5aa742863 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; preConfigure = '' - substituteInPlace loader/vulkan.pc.in --replace 'includedir=''${prefix}/include' 'includedir=${vulkan-headers}/include' + substituteInPlace loader/vulkan.pc.in \ + --replace 'includedir=''${prefix}/include' 'includedir=${vulkan-headers}/include' \ + --replace 'libdir=''${exec_prefix}/@CMAKE_INSTALL_LIBDIR@' 'libdir=@CMAKE_INSTALL_LIBDIR@' ''; cmakeFlags = [ diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index 0deec273881..afb13a03cbb 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zimg"; - version = "3.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "157lqfgz4lqa782iij7lkajgjbxv3vqf6y5hpdz36i6dg06paqqa"; + sha256 = "1mpns443ifbkbaxsw6yy8z01l7815259pxzd7s006npr0dxnc8ng"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 6a4affb915f..ba8488bda2a 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -205,6 +205,7 @@ , "vscode-css-languageserver-bin" , "vscode-html-languageserver-bin" , "vscode-json-languageserver-bin" +, { "vscode-lldb-build-deps": "../../misc/vscode-extensions/vscode-lldb/build-deps" } , "vue-cli" , "vue-language-server" , "web-ext" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 201deab6607..8d56372af25 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -1228,13 +1228,13 @@ let sha512 = "wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A=="; }; }; - "@babel/polyfill-7.10.4" = { + "@babel/polyfill-7.11.5" = { name = "_at_babel_slash_polyfill"; packageName = "@babel/polyfill"; - version = "7.10.4"; + version = "7.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.10.4.tgz"; - sha512 = "8BYcnVqQ5kMD2HXoHInBH7H1b/uP3KdnwCYXOqFnXqguOyuu443WXusbIUbWEfY3Z0Txk0M1uG/8YuAMhNl6zg=="; + url = "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.11.5.tgz"; + sha512 = "FunXnE0Sgpd61pKSj2OSOs1D44rKTD3pGOfGilZ6LGrrIH0QEtJlTjqOqdF8Bs98JmjfGhni2BBkTfv9KcKJ9g=="; }; }; "@babel/preset-env-7.11.5" = { @@ -1291,15 +1291,6 @@ let sha512 = "CAml0ioKX+kOAvBQDHa/+t1fgOt3qkTIz0TrRtRAT6XY0m5qYZXR85k6/sLCNPMGhYDlCFHCYuU0ybTJbvlC6w=="; }; }; - "@babel/runtime-7.10.5" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.5.tgz"; - sha512 = "otddXKhdNn7d0ptoFRHtMLa8LqDxLYwTjB4nYgM1yy5N6gU/MUf8zqyyLltCH3yAVitBzmwK4us+DD0l/MauAg=="; - }; - }; "@babel/runtime-7.11.2" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; @@ -1660,13 +1651,13 @@ let sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ=="; }; }; - "@fluentui/react-7.138.0" = { + "@fluentui/react-7.139.0" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.138.0"; + version = "7.139.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.138.0.tgz"; - sha512 = "fekFIGSMqzSUbiqwm1GvYZ+BvmBPHwP0sUcoNct92WCTrfcwnHhX7q770RbcRGGG7K9OuasbGafP3auFHSz7FQ=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.139.0.tgz"; + sha512 = "Y3u80PnrK/ZnTlezo+Syfvy8UXkHEpwCHNW8hjezfOkhPVVI8fpmrPeHy2dDnqah5HDbuC6KUU9owWg/UojSCw=="; }; }; "@fluentui/react-focus-7.16.5" = { @@ -1723,94 +1714,94 @@ let sha512 = "oJZb4PScX25ZGObpw9n7/bJBE7R0oF6hJ4ABe+WvMqSCI3kxaReMTgJJNIrxpmbXscxWM8U1ndLefP5IjPcU7Q=="; }; }; - "@graphql-tools/delegate-6.2.2" = { + "@graphql-tools/delegate-6.2.3" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.2.2.tgz"; - sha512 = "8VycfZYQ+m4HgajewQT6v6BzAEFxc6mh6rO+uqewnvh143nvv3ud4nXEAfOddUm0PrE6iD3Ng2BZtPSWF5mt+w=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.2.3.tgz"; + sha512 = "j4P7RaI5J9AvGcfBDITO6bZDeSvjMgDby2smn3L2dmXpPfMYh00KRRSZjzdMwSkLxi+0octh9buUAeCdvVMkKQ=="; }; }; - "@graphql-tools/graphql-file-loader-6.2.2" = { + "@graphql-tools/graphql-file-loader-6.2.3" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.2.tgz"; - sha512 = "dKuOk4vH2WWzVGydL13FjdR3WEmJHMoud3MXF9uyvLcjuDm9L0r+PdSI1PSPiCYs7Ii2bJ8zgmdz32jCBHZszA=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.3.tgz"; + sha512 = "9K+foDqfcJXf2jNNOWWZnV+PdxJkKmzAY58qlbFEFfUeRC6ZmOA9B3vTkcFadVdSwIsaWHhaxqHrNAD+OfkAyQ=="; }; }; - "@graphql-tools/import-6.2.2" = { + "@graphql-tools/import-6.2.3" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.2.tgz"; - sha512 = "fxQx+960CBzG6+MGGRaWv9tQ71ir2NZQeVC2dfieQLv5/LXH0fqKe9ltYCfJFskscAmzWeuS19Sibhdn0JMecw=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.2.3.tgz"; + sha512 = "2ftXR84aPy2ueAEEGw/yFvYGPbvJYs2m18FEODhAq5z4P285ZlCMluxTUR9yNjumzgQP5Eer4fl64ztsdJvCyg=="; }; }; - "@graphql-tools/json-file-loader-6.2.2" = { + "@graphql-tools/json-file-loader-6.2.3" = { name = "_at_graphql-tools_slash_json-file-loader"; packageName = "@graphql-tools/json-file-loader"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.2.2.tgz"; - sha512 = "m/gKQGJS+4bUy/8v0uup3su9RcCLdWvmhYW9+J8WDSzDE2QEdYQMeyDFYV14x0r92IhRpftLd//JvoE3cTV5Kg=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.2.3.tgz"; + sha512 = "7v445KZLVB3owbibu2HsFmVSsdDOn0NzYSqIXaaIZ7saqoVtG8etSt699kLw5gJM3j0Kjm7XDz9tK60Apes/xg=="; }; }; - "@graphql-tools/load-6.2.2" = { + "@graphql-tools/load-6.2.3" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.2.2.tgz"; - sha512 = "p5fvGSvtrIjL3rmQbdESnYH5zxqdKeQOIwoPnfvx6uDqqm3HaRBzS+k5V/PkhGsFRR5VFrqA8kPAbE87BYpkqw=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.2.3.tgz"; + sha512 = "3wmzrwf7tVY8rDRT2jxfQKlKgSB6P8OordFoOxpk1qNP2vmkUN9tWKxaI1ANkdm+et1D3ovUHeSoW6jKscnUAA=="; }; }; - "@graphql-tools/merge-6.2.2" = { + "@graphql-tools/merge-6.2.3" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.2.tgz"; - sha512 = "2YyErSvq4hn5mjE6qJ/0Q8r3WU9JB3+obv2xyvb+oW+E/T1iYRJGxSFldi6lqO5IADZz8QASLJeSpRBw40gpBg=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.3.tgz"; + sha512 = "qSSxdM2AKjnAHuChcnxIfzsGej78B56EE6ZD3tXMtKJOMQMhk4T4yXnKRHEw8fw7ZtNk/KqCmb6LJHy8Ws8frg=="; }; }; - "@graphql-tools/schema-6.2.2" = { + "@graphql-tools/schema-6.2.3" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.2.2.tgz"; - sha512 = "KITlyr//1oKyxIOlGvNZDl4c6bLj2Gc+3eJXyUKWfSmgsmAZPudpQNa/8VbiVujpm7UaX0cyM3FdeCaxWFeBgg=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.2.3.tgz"; + sha512 = "CV5vDfQhXidssLK5hjT55FfwRAvBoGW53lVBl0rbXrbsSX7H9iVHdUf4UaDIlMc6WcnnzOrRiue/khHz3rzDEg=="; }; }; - "@graphql-tools/url-loader-6.2.2" = { + "@graphql-tools/url-loader-6.2.3" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.2.2.tgz"; - sha512 = "vNDjhf7SJr9RnIDPBBEyTfKBb3aWRA3uy3jDkqQ/AFyh4hXRkg8xnECH7c6glRnWiZJeObMTxowZSUnDA68IyA=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.2.3.tgz"; + sha512 = "cV/VR/lT1bHxwhrZlyG+sevl4zU0zZQHS7+TelTfAdKGrSswEozK98pPjkFP57+6ghitH6XoHUE91hFxtaODsA=="; }; }; - "@graphql-tools/utils-6.2.2" = { + "@graphql-tools/utils-6.2.3" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.2.2.tgz"; - sha512 = "a0SSYF76dnKHs8te4Igfnrrq1VOO4sFG8yx3ehO7464eGUfUUYo2QmNRjhxny2HRMvqzX40xuQikyg6LBXDNLQ=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.2.3.tgz"; + sha512 = "eOhZy4y23r6AddokBqvFpQybtHvhTyZCc3VFWn8eIqF92vre90UKHbCX6Cf6VBo6i7l0ZwChPPbUzEiHOk+HJQ=="; }; }; - "@graphql-tools/wrap-6.2.2" = { + "@graphql-tools/wrap-6.2.3" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "6.2.2"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.2.2.tgz"; - sha512 = "FjCE+NvMwcCiAlt9EAw9uDi2zblE4Z5CEkY+z4NRO1AmCB5THoWJKG+csPh8tGuU80mAJI51Wy9FQGyUo/EU0g=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.2.3.tgz"; + sha512 = "bxMXobcuKy8r7jKefQx5VH3FSyXVHKfDWfJ65Kq4oAC2+d7DUlpr3HZ6BWoMhfgUf6s6PPM26Us00TGsUQlAGg=="; }; }; "@gulp-sourcemaps/identity-map-1.0.2" = { @@ -2596,13 +2587,13 @@ let sha512 = "RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A=="; }; }; - "@microsoft/load-themed-styles-1.10.93" = { + "@microsoft/load-themed-styles-1.10.97" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.93"; + version = "1.10.97"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.93.tgz"; - sha512 = "iziiQyDJmyP8QE33hYjuVsj18RvtzRMdON1QLDkJSrs9xisXWgEjK8U12UsEkBYpYXzxPxqq5+X+fK8Vs6g8vQ=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.97.tgz"; + sha512 = "FX8a2rXhYzXJWSoSjbxSyOvOo2SOHUjLG7JRWTf6rwiQDM/8fSTC/7TLkE2BAMg9n4vG+AxrgfN561VPnHQxrw=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -3145,13 +3136,13 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; - "@prettier/plugin-pug-1.5.1" = { + "@prettier/plugin-pug-1.6.1" = { name = "_at_prettier_slash_plugin-pug"; packageName = "@prettier/plugin-pug"; - version = "1.5.1"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@prettier/plugin-pug/-/plugin-pug-1.5.1.tgz"; - sha512 = "LUuXiILPURVCF8u4gnE6SWQZ/+1kVnRatXK6SmQyk+ed8F4uDyNCGuIu3/W7jYQB+k7kD6eQZqINuPWvbPTzYQ=="; + url = "https://registry.npmjs.org/@prettier/plugin-pug/-/plugin-pug-1.6.1.tgz"; + sha512 = "FqFByfSa72q2bxNocGlziXM/wAkhhIG5ecFU6+MddikqWTI+KIoeXRz6QHTtTWjcXqu6svlUNjNLhXMEMh25Hw=="; }; }; "@primer/octicons-10.1.0" = { @@ -3271,13 +3262,13 @@ let sha512 = "9JXf2k8xqvMYfqmhgtB6eCgMN9fbxwF1XDF3mGKJc6pkAmt0jnsqurxQ0tC1akQKNSXCm7c3unQxa3zuxtZ7mQ=="; }; }; - "@rollup/plugin-commonjs-15.0.0" = { + "@rollup/plugin-commonjs-15.1.0" = { name = "_at_rollup_slash_plugin-commonjs"; packageName = "@rollup/plugin-commonjs"; - version = "15.0.0"; + version = "15.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-15.0.0.tgz"; - sha512 = "8uAdikHqVyrT32w1zB9VhW6uGwGjhKgnDNP4pQJsjdnyF4FgCj6/bmv24c7v2CuKhq32CcyCwRzMPEElaKkn0w=="; + url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-15.1.0.tgz"; + sha512 = "xCQqz4z/o0h2syQ7d9LskIMvBSH4PX5PjYdpSSvgS+pQik3WahkQVNWg3D8XJeYjZoVWnIUQYDghuEMRGrmQYQ=="; }; }; "@rollup/plugin-json-4.1.0" = { @@ -3442,13 +3433,13 @@ let sha512 = "3guXwRmHOujBy6Lmf7THtnfJQcLRYzpTRpL1rCxLko7OtIWcOth3TvW2JtWNu6qubauA+5kpLB2rdCaPefZYbQ=="; }; }; - "@serverless/platform-client-china-1.0.37" = { + "@serverless/platform-client-china-1.1.0" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "1.0.37"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.37.tgz"; - sha512 = "eN2UBK51Z9RkRY5Im0j2wCl3XuHBKiuY3kpQIxtGs52yuQx8PA0I/HBsYwyRgoTpvATK3MM/SsyeKpvNs90+uw=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.1.0.tgz"; + sha512 = "QVk55zO5wcax3tPFp6IiZwf7yI0wZ64kNuR0eGM31g37AMt2+rBM6plE41zNKADRDBSqOtmnwEbsPiWlxZ/S9A=="; }; }; "@serverless/platform-sdk-2.3.2" = { @@ -4405,6 +4396,15 @@ let sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; }; }; + "@types/json5-0.0.30" = { + name = "_at_types_slash_json5"; + packageName = "@types/json5"; + version = "0.0.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json5/-/json5-0.0.30.tgz"; + sha512 = "sqm9g7mHlPY/43fcSNrCYfOeX9zkTTK+euO5E6+CVijSMm5tTjkVdwdqRkY3ljjIAf8679vps5jKUoJBCLsMDA=="; + }; + }; "@types/keygrip-1.0.2" = { name = "_at_types_slash_keygrip"; packageName = "@types/keygrip"; @@ -4612,6 +4612,15 @@ let sha512 = "7iPCCv/SOqeGvz3CcBBnhG+3vBMntO3SMVcyUHmrJq6Lzdbi4dtSxk3JkIUm+JDGnT26mtxlNQHmTKlvDnjFwg=="; }; }; + "@types/node-8.10.64" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "8.10.64"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-8.10.64.tgz"; + sha512 = "/EwBIb+imu8Qi/A3NF9sJ9iuKo7yV+pryqjmeRqaU0C4wBAOhas5mdvoYeJ5PCKrh6thRSJHdoasFqh3BQGILA=="; + }; + }; "@types/node-fetch-2.5.7" = { name = "_at_types_slash_node-fetch"; packageName = "@types/node-fetch"; @@ -4963,6 +4972,15 @@ let sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="; }; }; + "@types/yauzl-2.9.1" = { + name = "_at_types_slash_yauzl"; + packageName = "@types/yauzl"; + version = "2.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz"; + sha512 = "A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA=="; + }; + }; "@types/yoga-layout-1.9.2" = { name = "_at_types_slash_yoga-layout"; packageName = "@types/yoga-layout"; @@ -5953,13 +5971,13 @@ let sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; }; }; - "addons-linter-2.1.0" = { + "addons-linter-2.5.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "2.1.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-2.1.0.tgz"; - sha512 = "ISCPobK6VdQ+5btMf1abkuD/9V+6RjnpJAVmEzjxDitk7HY03mLXVhA8SoD0XgngrI6cFlM2/i4OxfY4dHokpw=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-2.5.0.tgz"; + sha512 = "d3GGf27ibN9ioxmjEiAFkGQRdyw5W+Gb2/9G55AZ6YygtBjtJDotTnSsE6Tz+mEFY4QKo/OaVs1XKjcZEl2fJA=="; }; }; "addr-to-ip-port-1.5.1" = { @@ -6340,6 +6358,15 @@ let sha512 = "SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA=="; }; }; + "ansi-colors-3.2.3" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "3.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz"; + sha512 = "LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw=="; + }; + }; "ansi-colors-3.2.4" = { name = "ansi-colors"; packageName = "ansi-colors"; @@ -10678,13 +10705,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001131" = { + "caniuse-lite-1.0.30001133" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001131"; + version = "1.0.30001133"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001131.tgz"; - sha512 = "4QYi6Mal4MMfQMSqGIRPGbKIbZygeN83QsWq1ixpUwvtfgAZot5BrCKzGygvZaV+CnELdTwD0S4cqUNozq7/Cw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001133.tgz"; + sha512 = "s3XAUFaC/ntDb1O3lcw9K8MPeOW7KO3z9+GzAoBxfz1B0VdacXPMKgFUtG4KIsgmnbexmi013s9miVu4h+qMHw=="; }; }; "canvas-2.6.1" = { @@ -11200,6 +11227,15 @@ let sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA=="; }; }; + "chokidar-3.3.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz"; + sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; + }; + }; "chokidar-3.4.2" = { name = "chokidar"; packageName = "chokidar"; @@ -13730,13 +13766,13 @@ let sha512 = "MSHgpjQqgbT/94D4CyADeNoYh52zMkCX4pcJvPP5WqPsLFMKjr2TCMg381ox5qI0ii2dPwaLx/00477knXqXVw=="; }; }; - "cross-fetch-3.0.5" = { + "cross-fetch-3.0.6" = { name = "cross-fetch"; packageName = "cross-fetch"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.5.tgz"; - sha512 = "FFLcLtraisj5eteosnX1gf01qYDCOc4fDy0+euOt8Kn9YBY2NtXL/pCoYPavw24NIQkQqm5ZOLsGD5Zzj0gyew=="; + url = "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.6.tgz"; + sha512 = "KBPUbqgFjzWlVcURG+Svp9TlhA5uliYtiNx/0r8nv0pdypeQCRJ9IaSIc3q/x3q8t3F75cHuwxVql1HFGHCNJQ=="; }; }; "cross-spawn-4.0.2" = { @@ -14873,13 +14909,13 @@ let sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; }; }; - "debug-4.2.0" = { + "debug-4.3.0" = { name = "debug"; packageName = "debug"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz"; - sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.0.tgz"; + sha512 = "jjO6JD2rKfiZQnBoRzhRTbXjHLGLfH+UtGkWLc/UXAh/rzZMyjbgn0NcfFpqT8nd1kTtFnDiJcrIFkq4UKeJVg=="; }; }; "debug-fabulous-1.1.0" = { @@ -15143,13 +15179,13 @@ let sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; }; }; - "deepcopy-2.0.0" = { + "deepcopy-2.1.0" = { name = "deepcopy"; packageName = "deepcopy"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/deepcopy/-/deepcopy-2.0.0.tgz"; - sha512 = "d5ZK7pJw7F3k6M5vqDjGiiUS9xliIyWkdzBjnPhnSeRGjkYOGZMCFkdKVwV/WiHOe0NwzB8q+iDo7afvSf0arA=="; + url = "https://registry.npmjs.org/deepcopy/-/deepcopy-2.1.0.tgz"; + sha512 = "8cZeTb1ZKC3bdSCP6XOM1IsTczIO73fdqtwa2B0N15eAz7gmyhQo+mc5gnFuulsgN3vIQYmTgbmQVKalH1dKvQ=="; }; }; "deepmerge-2.1.0" = { @@ -15953,13 +15989,13 @@ let sha512 = "EAyaxl8hy4Ph07kzlzGTfpbZMNAAAHXSZtNEMwdlnSd1noHzvA6HsgKt4fEMSvaEXQYLSphe5rPMxN4WOj0hcQ=="; }; }; - "dispensary-0.52.0" = { + "dispensary-0.55.0" = { name = "dispensary"; packageName = "dispensary"; - version = "0.52.0"; + version = "0.55.0"; src = fetchurl { - url = "https://registry.npmjs.org/dispensary/-/dispensary-0.52.0.tgz"; - sha512 = "A13TTo/2yaK/Z3So4OdzodBTbyTMpqVOH15cbmUuKvl+T1cOLn0VGQjibrG9cELa9mkLfhjFodqYQWkOGkG9Ig=="; + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.55.0.tgz"; + sha512 = "5+6E0kQNVWIZCGwTw34B48bJQyUuvwJD6hsI/b7ScKbjfrzUIgod/ROsTX6t9d3O031A9O5RPVHIqkX4ZzcAfw=="; }; }; "diveSync-0.3.0" = { @@ -17655,15 +17691,6 @@ let sha512 = "K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig=="; }; }; - "eslint-7.5.0" = { - name = "eslint"; - packageName = "eslint"; - version = "7.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.5.0.tgz"; - sha512 = "vlUP10xse9sWt9SGRtcr1LAC67BENcQMFeV+w5EvLEoFe3xJ8cF1Skd0msziRx/VMC+72B4DxreCE+OR12OA6Q=="; - }; - }; "eslint-7.9.0" = { name = "eslint"; packageName = "eslint"; @@ -17754,6 +17781,15 @@ let sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; }; }; + "eslint-visitor-keys-2.0.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"; + sha512 = "QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ=="; + }; + }; "esm-3.2.25" = { name = "esm"; packageName = "esm"; @@ -17808,15 +17844,6 @@ let sha512 = "ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw=="; }; }; - "espree-7.2.0" = { - name = "espree"; - packageName = "espree"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-7.2.0.tgz"; - sha512 = "H+cQ3+3JYRMEIOl87e7QdHX70ocly5iW4+dttuR8iYSPr/hXKFb+7dBsZ7+u1adC4VrnPlTkv0+OwuPnDop19g=="; - }; - }; "espree-7.3.0" = { name = "espree"; packageName = "espree"; @@ -21120,6 +21147,15 @@ let sha512 = "MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ=="; }; }; + "glob-7.1.3" = { + name = "glob"; + packageName = "glob"; + version = "7.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz"; + sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; + }; + }; "glob-7.1.5" = { name = "glob"; packageName = "glob"; @@ -21553,13 +21589,13 @@ let sha512 = "yUhpEDLeuGiGJjRSzEq3kvt4zJtAcjKmhIiwNp/eUs75tRlXfWcHo5tcBaMQtnjHWC7nQYT5HkY/l0QOQTkVww=="; }; }; - "got-11.6.2" = { + "got-11.7.0" = { name = "got"; packageName = "got"; - version = "11.6.2"; + version = "11.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-11.6.2.tgz"; - sha512 = "/21qgUePCeus29Jk7MEti8cgQUNXFSWfIevNIk4H7u1wmXNDrGPKPY6YsPY+o9CIT/a2DjCjRz0x1nM9FtS2/A=="; + url = "https://registry.npmjs.org/got/-/got-11.7.0.tgz"; + sha512 = "7en2XwH2MEqOsrK0xaKhbWibBoZqy+f1RSUoIeF1BLcnf+pyQdDsljWMfmOh+QKJwuvDIiKx38GtPh5wFdGGjg=="; }; }; "got-6.7.1" = { @@ -23750,22 +23786,22 @@ let sha512 = "zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw=="; }; }; - "ink-3.0.5" = { + "ink-3.0.6" = { name = "ink"; packageName = "ink"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/ink/-/ink-3.0.5.tgz"; - sha512 = "Zc/Yoi3P0cY0DC9ryb3HTwmi4Qgke9332ebOhDRaK9Cw6D+ABAOQPeHG8IdmI1GOkMKRMZwTP/1jRs/b1D1n9Q=="; + url = "https://registry.npmjs.org/ink/-/ink-3.0.6.tgz"; + sha512 = "MOaRUKlDdyzBr6IhiBpBA5+9tv+OlVvQrEErQlN2dfofJ0Q52Xc3gZ5YtgGj0UVD24Ex79WL2QZGJh0emz+jDQ=="; }; }; - "ink-text-input-4.0.0" = { + "ink-text-input-4.0.1" = { name = "ink-text-input"; packageName = "ink-text-input"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-4.0.0.tgz"; - sha512 = "mzftl3MRUYEi4/lQQzjUGgmPtPIQgGbeedp6G9cDIGTQPMOiaklrCX8zWi9aY5n0OKoJpjmi3TR6eRBNNhCP8Q=="; + url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-4.0.1.tgz"; + sha512 = "wiqkrB2tgnCnv51r2LpNLVfgrd/V+UXF3ccry+/Q7on9CBt8LVavX6NDYRMdXljuM+CcFV/sVro0bCr5oxB05w=="; }; }; "inline-source-map-0.6.2" = { @@ -26054,6 +26090,15 @@ let sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; }; + "js-yaml-3.13.1" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; + sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; + }; + }; "js-yaml-3.14.0" = { name = "js-yaml"; packageName = "js-yaml"; @@ -30249,13 +30294,13 @@ let sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8"; }; }; - "mdn-browser-compat-data-1.0.31" = { + "mdn-browser-compat-data-1.0.35" = { name = "mdn-browser-compat-data"; packageName = "mdn-browser-compat-data"; - version = "1.0.31"; + version = "1.0.35"; src = fetchurl { - url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.31.tgz"; - sha512 = "GVQQYWgoH3jbBaIy8M4hrg34qaNpPedtZvwAjUmkpHq4FXKKCea8Ji5rlS32YJSU9dt7TPvuWWX7Cce5mZyFPA=="; + url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.35.tgz"; + sha512 = "7SMAEZgBaElDNcqFhmInBnSo+c+MOzprt7hrGNcEo9hMhDiPQ7L4dwEt6gunudjI0jXenPJaW0S8U4ckeP2uhw=="; }; }; "mdn-data-2.0.4" = { @@ -31302,13 +31347,13 @@ let sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; }; }; - "mobx-4.15.6" = { + "mobx-4.15.7" = { name = "mobx"; packageName = "mobx"; - version = "4.15.6"; + version = "4.15.7"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-4.15.6.tgz"; - sha512 = "eZVEHZLi/Fe+V4qurBBQoFHCqaGrfMuYK1Vy4t5MHYfy90f52ptAKsemHsJcYl+R5/sA3oeT3rMLiVsbB7bllA=="; + url = "https://registry.npmjs.org/mobx/-/mobx-4.15.7.tgz"; + sha512 = "X4uQvuf2zYKHVO5kRT5Utmr+J9fDnRgxWWnSqJ4oiccPTQU38YG+/O3nPmOhUy4jeHexl7XJJpWDBgEnEfp+8w=="; }; }; "mobx-react-5.4.4" = { @@ -31329,6 +31374,15 @@ let sha1 = "161be5bdeb496771eb9b35745050b622b5aefc58"; }; }; + "mocha-7.2.0" = { + name = "mocha"; + packageName = "mocha"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mocha/-/mocha-7.2.0.tgz"; + sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ=="; + }; + }; "mocha-8.1.3" = { name = "mocha"; packageName = "mocha"; @@ -32256,13 +32310,13 @@ let sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; }; }; - "nearley-2.19.6" = { + "nearley-2.19.7" = { name = "nearley"; packageName = "nearley"; - version = "2.19.6"; + version = "2.19.7"; src = fetchurl { - url = "https://registry.npmjs.org/nearley/-/nearley-2.19.6.tgz"; - sha512 = "OV3Lx+o5iIGWVY38zs+7aiSnBqaHTFAOQiz83VHJje/wOOaSgzE3H0S/xfISxJhFSoPcX611OEDV9sCT8F283g=="; + url = "https://registry.npmjs.org/nearley/-/nearley-2.19.7.tgz"; + sha512 = "Y+KNwhBPcSJKeyQCFjn8B/MIe+DDlhaaDgjVldhy5xtFewIbiQgcbZV8k2gCVwkI1ZsKCnjIYZbR+0Fim5QYgg=="; }; }; "neat-csv-2.1.0" = { @@ -32690,6 +32744,15 @@ let sha256 = "224950cc405150c37dbd3c4aa65dc0cfb799b1a57f674e9bb76f993268106406"; }; }; + "node-environment-flags-1.0.6" = { + name = "node-environment-flags"; + packageName = "node-environment-flags"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz"; + sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw=="; + }; + }; "node-fetch-1.6.3" = { name = "node-fetch"; packageName = "node-fetch"; @@ -32906,13 +32969,13 @@ let sha512 = "SVfQ/wMw+DesunOm5cKqr6yDcvUTDl/yc97ybGHMrteNEY6oekXpNpS3lZwgLlwz0FLgHoiW28ZpmBHUDg37cw=="; }; }; - "node-notifier-7.0.2" = { + "node-notifier-8.0.0" = { name = "node-notifier"; packageName = "node-notifier"; - version = "7.0.2"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-notifier/-/node-notifier-7.0.2.tgz"; - sha512 = "ux+n4hPVETuTL8+daJXTOC6uKLgMsl1RYfFv7DKRzyvzBapqco0rZZ9g72ZN8VS6V+gvNYHYa/ofcCY8fkJWsA=="; + url = "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.0.tgz"; + sha512 = "46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA=="; }; }; "node-persist-2.1.0" = { @@ -34059,13 +34122,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.138.0" = { + "office-ui-fabric-react-7.139.0" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.138.0"; + version = "7.139.0"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.138.0.tgz"; - sha512 = "HW4ugd+x7Jg96yBWxmUNMfkTS0U8RMwf5mGsHBAvW9s5l1ektjTjKnb5beHxNrddXKqcjz9ZThdTk/Gxds0jig=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.139.0.tgz"; + sha512 = "kqt3LUKUJfPie/32bmWxMcn3VdZoH5yiicdOj8B/huu1WPDDmhM+UlsUX2AmLeAEmqkH8XZxlgpmym96dhstaA=="; }; }; "omggif-1.0.10" = { @@ -36516,13 +36579,13 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pino-6.4.0" = { + "pino-6.6.1" = { name = "pino"; packageName = "pino"; - version = "6.4.0"; + version = "6.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-6.4.0.tgz"; - sha512 = "TRDp5fJKRBtVlxd4CTox3rJL+TzwQztB/VNmT5n87zFgKVU7ztnmZkcX1zypPP+3ZZcveOTYKJy74UXdVBaXFQ=="; + url = "https://registry.npmjs.org/pino/-/pino-6.6.1.tgz"; + sha512 = "DOgm7rn6ctBkBYemHXSLj7+j3o3U1q1FWBXbHcprur8mA93QcJSycEkEqhqKiFB9Mx/3Qld2FGr6+9yfQza0kA=="; }; }; "pino-std-serializers-2.5.0" = { @@ -36786,13 +36849,13 @@ let sha512 = "40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="; }; }; - "polished-3.6.6" = { + "polished-3.6.7" = { name = "polished"; packageName = "polished"; - version = "3.6.6"; + version = "3.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/polished/-/polished-3.6.6.tgz"; - sha512 = "yiB2ims2DZPem0kCD6V0wnhcVGFEhNh0Iw0axNpKU+oSAgFt6yx6HxIT23Qg0WWvgS379cS35zT4AOyZZRzpQQ=="; + url = "https://registry.npmjs.org/polished/-/polished-3.6.7.tgz"; + sha512 = "b4OViUOihwV0icb9PHmWbR+vPqaSzSAEbgLskvb7ANPATVXGiYv/TQFHQo65S53WU9i5EQ1I03YDOJW7K0bmYg=="; }; }; "portfinder-1.0.28" = { @@ -37345,6 +37408,15 @@ let sha512 = "36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg=="; }; }; + "postcss-selector-parser-6.0.3" = { + name = "postcss-selector-parser"; + packageName = "postcss-selector-parser"; + version = "6.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.3.tgz"; + sha512 = "0ClFaY4X1ra21LRqbW6y3rUbWcxnSVkDFG57R7Nxus9J9myPFlv+jYDMohzpkBx0RrjjiqjtycpchQ+PLGmZ9w=="; + }; + }; "postcss-svgo-4.0.2" = { name = "postcss-svgo"; packageName = "postcss-svgo"; @@ -39856,6 +39928,15 @@ let sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; + "readdirp-3.2.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz"; + sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; + }; + }; "readdirp-3.4.0" = { name = "readdirp"; packageName = "readdirp"; @@ -41278,13 +41359,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.27.1" = { + "rollup-2.28.1" = { name = "rollup"; packageName = "rollup"; - version = "2.27.1"; + version = "2.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.27.1.tgz"; - sha512 = "GiWHQvnmMgBktSpY/1+nrGpwPsTw4b9P28og2uedfeq4JZ16rzAmnQ5Pm/E0/BEmDNia1ZbY7+qu3nBgNa19Hg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.28.1.tgz"; + sha512 = "DOtVoqOZt3+FjPJWLU8hDIvBjUylc9s6IZvy76XklxzcLvAQLtVAG/bbhsMhcWnYxC0TKKcf1QQ/tg29zeID0Q=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -42691,13 +42772,13 @@ let sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; }; }; - "sign-addon-2.0.6" = { + "sign-addon-3.1.0" = { name = "sign-addon"; packageName = "sign-addon"; - version = "2.0.6"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/sign-addon/-/sign-addon-2.0.6.tgz"; - sha512 = "/8SQPNCrrZKMthdDf1IfI4XMbq8k9YsiiMyVeQL8xhhQSsZho6ZvEUBFSA70N0eznLZyab3k1d2CNOchYRYA6Q=="; + url = "https://registry.npmjs.org/sign-addon/-/sign-addon-3.1.0.tgz"; + sha512 = "zZ7nKc5/3QWM3skYBosGDvYQf2jkKhW2u8BELrZoN1wgCSOnwsV9T47Vx9uaNbA3CyZ+V9XSA0tDVHoV1QfVPw=="; }; }; "signal-exit-3.0.3" = { @@ -45076,6 +45157,15 @@ let sha1 = "5ea211cd92d228e184294990a6cc97b366a77cb0"; }; }; + "string-argv-0.3.1" = { + name = "string-argv"; + packageName = "string-argv"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz"; + sha512 = "a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg=="; + }; + }; "string-env-interpolation-1.0.1" = { name = "string-env-interpolation"; packageName = "string-env-interpolation"; @@ -45877,6 +45967,15 @@ let sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; + "supports-color-6.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz"; + sha512 = "on9Kwidc1IUQo+bQdhi8+Tijpo0e1SS6RoGo2guUwn5vdaxw8RXOF9Vb2ws+ihWOmh4JnCJOvaziZWP1VABaLg=="; + }; + }; "supports-color-6.1.0" = { name = "supports-color"; packageName = "supports-color"; @@ -47705,6 +47804,15 @@ let sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="; }; }; + "ts-loader-6.2.2" = { + name = "ts-loader"; + packageName = "ts-loader"; + version = "6.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-loader/-/ts-loader-6.2.2.tgz"; + sha512 = "HDo5kXZCBml3EUPcc7RlZOV/JGlLHwppTLEHb3SHnr5V7NXD4klMEkrhJe5wgRbaWsSXi+Y1SIBN/K9B6zWGWQ=="; + }; + }; "ts-loader-8.0.1" = { name = "ts-loader"; packageName = "ts-loader"; @@ -49199,15 +49307,6 @@ let sha512 = "grrmrB6Zb8DUiyDIaeRTBCkgISYUgETNe7NglEbVsrLWXeESnlCSP50WfRSj/GmzMPl6Uchj24S/p80nP/ZQrQ=="; }; }; - "update-notifier-4.1.0" = { - name = "update-notifier"; - packageName = "update-notifier"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.0.tgz"; - sha512 = "w3doE1qtI0/ZmgeoDoARmI5fjDoT93IfKgEGqm26dGUOh8oNpaSTsGNdYRN/SjOuo10jcJGwkEL3mroKzktkew=="; - }; - }; "update-notifier-4.1.1" = { name = "update-notifier"; packageName = "update-notifier"; @@ -50504,6 +50603,24 @@ let sha512 = "/0HCaxiSL0Rmm3sJ+iyZekljKEYKo1UHSzX4UFOo5VDLgRhKomJf7g1p8glcbCHXB/70IcH8IhKnwlTznf8RPQ=="; }; }; + "vscode-debugadapter-testsupport-1.41.0" = { + name = "vscode-debugadapter-testsupport"; + packageName = "vscode-debugadapter-testsupport"; + version = "1.41.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.41.0.tgz"; + sha512 = "3aEDm+B6trSxUJWETbNBM5qbEAUbzPpLZ9YT9ez+C1ITG4uaioc8GIQtkVk1kpxP++WPWo0LVjYY8CbVRCRapg=="; + }; + }; + "vscode-debugprotocol-1.41.0" = { + name = "vscode-debugprotocol"; + packageName = "vscode-debugprotocol"; + version = "1.41.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.41.0.tgz"; + sha512 = "Sxp7kDDuhpEZiDaIfhM0jLF3RtMqvc6CpoESANE77t351uezsd/oDoqALLcOnmmsDzTgQ3W0sCvM4gErnjDFpA=="; + }; + }; "vscode-emmet-helper-1.2.17" = { name = "vscode-emmet-helper"; packageName = "vscode-emmet-helper"; @@ -50576,13 +50693,13 @@ let sha512 = "JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A=="; }; }; - "vscode-jsonrpc-5.1.0-next.1" = { + "vscode-jsonrpc-6.0.0-next.5" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "5.1.0-next.1"; + version = "6.0.0-next.5"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.1.0-next.1.tgz"; - sha512 = "mwLDojZkbmpizSJSmp690oa9FB9jig18SIDGZeBCvFc2/LYSRvMm/WwWtMBJuJ1MfFh7rZXfQige4Uje5Z9NzA=="; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.5.tgz"; + sha512 = "IAgsltQPwg/pXOPsdXgbUTCaO9VSKZwirZN5SGtkdYQ/R3VjeC4v00WTVvoNayWMZpoC3O9u0ogqmsKzKhVasQ=="; }; }; "vscode-languageclient-4.0.1" = { @@ -50594,13 +50711,13 @@ let sha512 = "0fuBZj9pMkeJ8OMyIvSGeRaRVhUaJt+yeFxi7a3sz/AbrngQdcxOovMXPgKuieoBSBKS05gXPS88BsWpJZfBkA=="; }; }; - "vscode-languageclient-7.0.0-next.1" = { + "vscode-languageclient-7.0.0-next.9" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; - version = "7.0.0-next.1"; + version = "7.0.0-next.9"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.1.tgz"; - sha512 = "JrjCUhLpQZxQ5VpWpilOHDMhVsn0fdN5jBh1uFNhSr5c2loJvRdr9Km2EuSQOFfOQsBKx0+xvY8PbsypNEcJ6w=="; + url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.9.tgz"; + sha512 = "lFO+rN/i72CM2va6iKXq1lD7pJg8J93KEXf0w0boWVqU+DJhWzLrV3pXl8Xk1nCv//qOAyhlc/nx2KZCTeRF/A=="; }; }; "vscode-languageserver-3.5.1" = { @@ -50675,13 +50792,13 @@ let sha512 = "zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw=="; }; }; - "vscode-languageserver-protocol-3.16.0-next.2" = { + "vscode-languageserver-protocol-3.16.0-next.7" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.16.0-next.2"; + version = "3.16.0-next.7"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.2.tgz"; - sha512 = "atmkGT/W6tF0cx4SaWFYtFs2UeSeC28RPiap9myv2YZTaTCFvTBEPNWrU5QRKfkyM0tbgtGo6T3UCQ8tkDpjzA=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.7.tgz"; + sha512 = "tOjrg+K3RddJ547zpC9/LAgTbzadkPuHlqJFFWIcKjVhiJOh73XyY+Ngcu9wukGaTsuSGjJ0W8rlmwanixa0FQ=="; }; }; "vscode-languageserver-protocol-3.5.1" = { @@ -50738,22 +50855,22 @@ let sha512 = "+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="; }; }; - "vscode-languageserver-types-3.16.0-next.1" = { + "vscode-languageserver-types-3.16.0-next.2" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; - version = "3.16.0-next.1"; + version = "3.16.0-next.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.1.tgz"; - sha512 = "tZFUSbyjUcrh+qQf13ALX4QDdOfDX0cVaBFgy7ktJ0VwS7AW/yRKgGPSxVqqP9OCMNPdqP57O5q47w2pEwfaUg=="; + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz"; + sha512 = "QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q=="; }; }; - "vscode-languageserver-types-3.16.0-next.2" = { + "vscode-languageserver-types-3.16.0-next.3" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; - version = "3.16.0-next.2"; + version = "3.16.0-next.3"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz"; - sha512 = "QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q=="; + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.3.tgz"; + sha512 = "s/z5ZqSe7VpoXJ6JQcvwRiPPA3nG0nAcJ/HH03zoU6QaFfnkcgPK+HshC3WKPPnC2G08xA0iRB6h7kmyBB5Adg=="; }; }; "vscode-languageserver-types-3.5.0" = { @@ -51125,13 +51242,13 @@ let sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; }; }; - "webidl-conversions-5.0.0" = { + "webidl-conversions-6.1.0" = { name = "webidl-conversions"; packageName = "webidl-conversions"; - version = "5.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz"; - sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="; + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz"; + sha512 = "qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="; }; }; "webpack-4.44.0" = { @@ -51332,13 +51449,13 @@ let sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg=="; }; }; - "whatwg-url-8.1.0" = { + "whatwg-url-8.2.2" = { name = "whatwg-url"; packageName = "whatwg-url"; - version = "8.1.0"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.1.0.tgz"; - sha512 = "vEIkwNi9Hqt4TV9RdnaBPNt+E2Sgmo3gePebCRgZ1R7g6d23+53zCTnuB0amKI4AXq6VM8jj2DUAa0S1vjJxkw=="; + url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.2.2.tgz"; + sha512 = "PcVnO6NiewhkmzV0qn7A+UZ9Xx4maNTI+O+TShmfE4pqjoCMwUMjkvoNhNHPTvgR7QH9Xt3R13iHuWy2sToFxQ=="; }; }; "whatwg-url-compat-0.6.5" = { @@ -52647,13 +52764,13 @@ let sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4"; }; }; - "yargs-parser-20.0.0" = { + "yargs-parser-20.2.0" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "20.0.0"; + version = "20.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.0.0.tgz"; - sha512 = "8eblPHTL7ZWRkyjIZJjnGf+TijiKJSwA24svzLRVvtgoi/RZiKa9fFQTrlx0OKLnyHSdt/enrdadji6WFfESVA=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.0.tgz"; + sha512 = "2agPoRFPoIcFzOIp6656gcvsg2ohtscpw2OINr/q46+Sq41xz2OYLqx5HRHabmFU1OARIPAYH5uteICE7mn/5A=="; }; }; "yargs-parser-4.2.1" = { @@ -52692,6 +52809,15 @@ let sha1 = "9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"; }; }; + "yargs-unparser-1.6.0" = { + name = "yargs-unparser"; + packageName = "yargs-unparser"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz"; + sha512 = "W9tKgmSn0DpSatfri0nx52Joq5hVXgeLiqR/5G0sZNDoLZFOr/xjBUDcShCOGNsBnEMNo1KAMBkTej1Hm62HTw=="; + }; + }; "yargs-unparser-1.6.1" = { name = "yargs-unparser"; packageName = "yargs-unparser"; @@ -53687,7 +53813,7 @@ in sources."cssstyle-1.4.0" sources."dashdash-1.14.1" sources."data-urls-1.1.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-is-0.1.3" sources."delayed-stream-1.0.0" sources."domexception-1.0.1" @@ -55132,7 +55258,7 @@ in sources."callsites-2.0.0" sources."camel-case-4.1.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001131" + sources."caniuse-lite-1.0.30001133" sources."capital-case-1.0.3" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" @@ -55274,7 +55400,7 @@ in sources."csv-parser-1.12.1" sources."dashdash-1.14.1" sources."date-fns-1.30.1" - (sources."debug-4.2.0" // { + (sources."debug-4.3.0" // { dependencies = [ sources."ms-2.1.2" ]; @@ -55947,7 +56073,7 @@ in sources."postcss-modules-local-by-default-3.0.3" sources."postcss-modules-scope-2.2.0" sources."postcss-modules-values-3.0.0" - sources."postcss-selector-parser-6.0.2" + sources."postcss-selector-parser-6.0.3" sources."postcss-value-parser-4.1.0" sources."prepend-http-1.0.4" sources."prismjs-1.21.0" @@ -56659,7 +56785,7 @@ in sources."commander-2.20.3" sources."concat-map-0.0.1" sources."convert-source-map-1.7.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ejs-2.5.7" sources."ensure-posix-path-1.1.1" sources."escape-string-regexp-1.0.5" @@ -57331,7 +57457,7 @@ in sources."caseless-0.12.0" (sources."castv2-0.1.10" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" ]; }) sources."castv2-client-1.2.0" @@ -57760,10 +57886,10 @@ in coc-eslint = nodeEnv.buildNodePackage { name = "coc-eslint"; packageName = "coc-eslint"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.3.0.tgz"; - sha512 = "V3yyEXLi+XAFPSvA1WiA+qkBytEqLvEsqfwquyZfXkpOAcG4b2PtA+MLou6OFSpJeYpe4d2Xr3sY8ThBCoxx3g=="; + url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.3.1.tgz"; + sha512 = "yiWUByuOtIHs1GnXspO59F5K0QtGYxMmpt8ZC2VvvB3DZZhEbhmBNrcoU66JaJP9y8tCZWTRh1eyobCRBL0pTA=="; }; buildInputs = globalBuildInputs; meta = { @@ -57777,10 +57903,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.0.0.tgz"; - sha512 = "uGqh7FKFXc26zjuzErw7vtnR8xHxmEf9jJNOekKyYncRg5Wzc7g5kYt2aFo+lA9zk3qC62DJ6LAaDJkfREQDmA=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.0.1.tgz"; + sha512 = "kPNmgaCx6hKshq/Vv5uugrPkQcDa7pVp+hosGADBP8qzHxudbumDA5va2vSzqjhUxAYEGTL92F0mBapg29pJhg=="; }; buildInputs = globalBuildInputs; meta = { @@ -57856,10 +57982,10 @@ in coc-imselect = nodeEnv.buildNodePackage { name = "coc-imselect"; packageName = "coc-imselect"; - version = "0.0.12"; + version = "0.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/coc-imselect/-/coc-imselect-0.0.12.tgz"; - sha512 = "X8TBe8UTwNd01HrWBXy93jQ1PShGtTa4bm2aH2bQwx9EH9FW7ufRlw7euPKkR2kzilshwb3UbJnLET2vFdZjJw=="; + url = "https://registry.npmjs.org/coc-imselect/-/coc-imselect-0.0.13.tgz"; + sha512 = "5hL7FmrLILl6PwZDUndOfHqfMjAl31pvB6YifmnZJO/ht4J3lFLCWxkiyXt5PRQbrHKLGnPT7sySTKxF8X303g=="; }; buildInputs = globalBuildInputs; meta = { @@ -57980,7 +58106,7 @@ in }) sources."date-format-3.0.0" sources."debounce-1.2.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-extend-0.6.0" sources."define-properties-1.1.3" sources."duplexer2-0.1.4" @@ -58221,7 +58347,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001131" + sources."caniuse-lite-1.0.30001133" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -58288,7 +58414,7 @@ in }) sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" sources."decamelize-keys-1.1.0" sources."decode-uri-component-0.2.0" @@ -59308,7 +59434,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001131" + sources."caniuse-lite-1.0.30001133" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -59348,7 +59474,7 @@ in sources."copy-descriptor-0.1.1" sources."cosmiconfig-5.2.1" sources."currently-unhandled-0.4.1" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -59934,10 +60060,10 @@ in coc-vetur = nodeEnv.buildNodePackage { name = "coc-vetur"; packageName = "coc-vetur"; - version = "1.1.13"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.1.13.tgz"; - sha512 = "RVjVqe3CiT+XCSupp8UrUeEGFPLfSrHl4yTxhizqV5SdovxWQ3UOTrDgLvH6HyKiMNphKRhTyknpHyDE6LtdZQ=="; + url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.2.0.tgz"; + sha512 = "JtuTM6DHU21h6j1fEeAaOtfFveLOzeqVXh9mjd53fVHws9T89wW8yV0ZsU5gz4u4g0tw7nN779sJqOEAXnmR8w=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -59946,7 +60072,7 @@ in sources."@emmetio/extract-abbreviation-0.2.0" (sources."@eslint/eslintrc-0.1.3" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ignore-4.0.6" sources."strip-json-comments-3.1.1" ]; @@ -59959,7 +60085,7 @@ in }) sources."@nodelib/fs.stat-1.1.3" sources."@nodelib/fs.walk-1.2.4" - sources."@prettier/plugin-pug-1.5.1" + sources."@prettier/plugin-pug-1.6.1" sources."@sindresorhus/is-0.14.0" sources."@sorg/log-2.2.0" sources."@starptech/expression-parser-0.10.0" @@ -59997,7 +60123,7 @@ in sources."@typescript-eslint/types-3.10.1" (sources."@typescript-eslint/typescript-estree-3.10.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."semver-7.3.2" ]; }) @@ -60221,7 +60347,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."cross-spawn-7.0.3" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."has-flag-4.0.0" sources."ignore-4.0.6" sources."path-key-3.1.1" @@ -60603,7 +60729,7 @@ in sources."semver-5.7.1" ]; }) - sources."debug-4.2.0" + sources."debug-4.3.0" sources."eslint-6.8.0" sources."eslint-utils-1.4.3" sources."espree-6.2.1" @@ -60941,7 +61067,7 @@ in sources."vscode-web-custom-data-0.3.1" (sources."vue-eslint-parser-7.1.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."espree-6.2.1" ]; }) @@ -62565,7 +62691,7 @@ in sources."dat-secret-storage-4.0.1" sources."dat-storage-1.1.1" sources."dat-swarm-defaults-1.0.2" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decode-uri-component-0.2.0" sources."decompress-response-4.2.1" sources."deep-equal-0.2.2" @@ -63415,7 +63541,7 @@ in sources."convert-to-spaces-1.0.2" sources."cross-spawn-6.0.5" sources."debounce-fn-4.0.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -63445,7 +63571,7 @@ in sources."get-stream-4.1.0" sources."glob-7.1.6" sources."globals-11.12.0" - sources."got-11.6.2" + sources."got-11.7.0" sources."hard-rejection-2.1.0" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.8" @@ -63455,7 +63581,7 @@ in sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."ink-3.0.5" // { + (sources."ink-3.0.6" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-4.1.0" @@ -63465,7 +63591,7 @@ in sources."supports-color-7.2.0" ]; }) - (sources."ink-text-input-4.0.0" // { + (sources."ink-text-input-4.0.1" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-4.1.0" @@ -63677,7 +63803,7 @@ in sources."@fluentui/date-time-utilities-7.8.1" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.138.0" + sources."@fluentui/react-7.139.0" sources."@fluentui/react-focus-7.16.5" sources."@fluentui/react-icons-0.3.4" sources."@fluentui/react-window-provider-0.3.3" @@ -63693,7 +63819,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.93" + sources."@microsoft/load-themed-styles-1.10.97" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -64460,7 +64586,7 @@ in sources."lodash.some-4.6.0" (sources."log4js-6.3.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -64655,7 +64781,7 @@ in sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.138.0" + sources."office-ui-fabric-react-7.139.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -64996,7 +65122,7 @@ in (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."fs-extra-8.1.0" sources."jsonfile-4.0.0" sources."ms-2.1.2" @@ -65270,7 +65396,7 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-is-0.1.3" sources."doctrine-3.0.0" sources."emoji-regex-7.0.3" @@ -65414,7 +65540,7 @@ in sources."concat-map-0.0.1" sources."core_d-2.0.0" sources."cross-spawn-7.0.3" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-is-0.1.3" sources."doctrine-3.0.0" sources."emoji-regex-7.0.3" @@ -66335,7 +66461,7 @@ in }; dependencies = [ sources."async-2.6.3" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."lodash-4.17.20" sources."lodash.groupby-4.6.0" sources."microee-0.0.6" @@ -66367,7 +66493,7 @@ in sources."chloride-2.3.0" sources."chloride-test-1.2.4" sources."commander-2.20.3" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-extend-0.6.0" sources."diff-3.5.0" sources."discontinuous-range-1.0.0" @@ -66412,7 +66538,7 @@ in sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."muxrpc-6.5.0" - sources."nearley-2.19.6" + sources."nearley-2.19.7" sources."node-gyp-build-4.2.3" sources."node-polyglot-1.0.0" sources."non-private-ip-1.4.4" @@ -66560,10 +66686,10 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "3.2.10"; + version = "3.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.10.tgz"; - sha512 = "IVwhdySPQyHTfImCGllphBqHZtDWGnphjZG4EhkKtJY98b69sbaRU8PRO+XEC0rutbb5Gf0oCHvM3QswtAVCeQ=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.12.tgz"; + sha512 = "ZL27e8s3lkkrKrGCCQDlwIGnLOihrrehDI1jriWaU+UaVME1IYCtOiYbLp59iITK2s8Ak7e0LSSCyO08bRLAvQ=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -66859,32 +66985,33 @@ in sources."@exodus/schemasafe-1.0.0-rc.2" sources."@graphql-cli/common-4.0.0" sources."@graphql-cli/init-4.0.0" - sources."@graphql-tools/delegate-6.2.2" - (sources."@graphql-tools/graphql-file-loader-6.2.2" // { + sources."@graphql-tools/delegate-6.2.3" + (sources."@graphql-tools/graphql-file-loader-6.2.3" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-tools/import-6.2.2" // { + (sources."@graphql-tools/import-6.2.3" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-tools/json-file-loader-6.2.2" // { + (sources."@graphql-tools/json-file-loader-6.2.3" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - sources."@graphql-tools/load-6.2.2" - sources."@graphql-tools/merge-6.2.2" - sources."@graphql-tools/schema-6.2.2" - (sources."@graphql-tools/url-loader-6.2.2" // { + sources."@graphql-tools/load-6.2.3" + sources."@graphql-tools/merge-6.2.3" + sources."@graphql-tools/schema-6.2.3" + (sources."@graphql-tools/url-loader-6.2.3" // { dependencies = [ - sources."cross-fetch-3.0.5" + sources."cross-fetch-3.0.6" + sources."node-fetch-2.6.1" ]; }) - sources."@graphql-tools/utils-6.2.2" - sources."@graphql-tools/wrap-6.2.2" + sources."@graphql-tools/utils-6.2.3" + sources."@graphql-tools/wrap-6.2.3" sources."@kwsites/exec-p-0.4.0" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" @@ -66977,7 +67104,7 @@ in sources."d-1.0.1" sources."dashdash-1.14.1" sources."dataloader-2.0.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" sources."decompress-response-3.3.0" sources."deep-equal-2.0.3" @@ -69027,7 +69154,7 @@ in sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."data-uri-to-buffer-1.2.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-is-0.1.3" sources."degenerator-1.0.4" sources."delayed-stream-1.0.0" @@ -69779,10 +69906,10 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.0.168"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.0.168.tgz"; - sha512 = "h4ng5Qc2C1RST9cLlVpu+79TpANA9vIEESCv56rzEy0zyhKGtlMeD0IiiY7ZJalmHCousNfYzdTPhM2pg1Q0ug=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.1.8.tgz"; + sha512 = "oBMVeCZP/gQ66imuK65rQIXDl5NrpyMPoPGqzcBxsIyTKHV3w5nAYvB+TQUO1fHNw61EsaRhGVMCrO139kkdQw=="; }; dependencies = [ sources."@cronvel/get-pixels-3.4.0" @@ -70688,10 +70815,10 @@ in jsdoc = nodeEnv.buildNodePackage { name = "jsdoc"; packageName = "jsdoc"; - version = "3.6.5"; + version = "3.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.5.tgz"; - sha512 = "SbY+i9ONuxSK35cgVHaI8O9senTE4CDYAmGSDJ5l3+sfe62Ff4gy96osy6OW84t4K4A8iGnMrlRrsSItSNp3RQ=="; + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.6.tgz"; + sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ=="; }; dependencies = [ sources."@babel/parser-7.11.5" @@ -71289,7 +71416,7 @@ in sources."lodash-4.17.20" (sources."log4js-6.3.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -71356,7 +71483,7 @@ in (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -73993,7 +74120,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001131" + sources."caniuse-lite-1.0.30001133" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -74095,7 +74222,7 @@ in sources."dash-ast-1.0.0" sources."dashdash-1.14.1" sources."death-1.1.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."define-properties-1.1.3" @@ -75329,12 +75456,12 @@ in sources."@fluentui/date-time-utilities-7.8.1" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.138.0" + sources."@fluentui/react-7.139.0" sources."@fluentui/react-focus-7.16.5" sources."@fluentui/react-icons-0.3.4" sources."@fluentui/react-window-provider-0.3.3" sources."@fluentui/theme-0.3.2" - sources."@microsoft/load-themed-styles-1.10.93" + sources."@microsoft/load-themed-styles-1.10.97" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@uifabric/foundation-7.9.5" @@ -75469,7 +75596,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.138.0" + sources."office-ui-fabric-react-7.139.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -75889,10 +76016,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "2.63.2"; + version = "2.63.3"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.63.2.tgz"; - sha512 = "H9c4UIuhOG5jl7ZlwuB/D4ac35BbYgiwXi77jTwx2QLy5Gy/UfId6ocFAdV5KYwSY5Yx2aS5txt4uYXm5qAb6w=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.63.3.tgz"; + sha512 = "XHokxG0dgSYbewUj9ifRI/EiM8PYAwWaA31+WFCbGHi0kKHrVwFLx1FsQH3Yo35dQk7MM0dnHjT8xTir0slgZw=="; }; dependencies = [ sources."@analytics/cookie-utils-0.2.3" @@ -76188,7 +76315,7 @@ in sources."@octokit/rest-16.43.2" sources."@octokit/types-5.5.0" sources."@rollup/plugin-babel-5.2.1" - (sources."@rollup/plugin-commonjs-15.0.0" // { + (sources."@rollup/plugin-commonjs-15.1.0" // { dependencies = [ sources."estree-walker-2.0.1" ]; @@ -76332,7 +76459,7 @@ in sources."cachedir-2.3.0" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001131" + sources."caniuse-lite-1.0.30001133" sources."cardinal-2.1.1" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -76464,7 +76591,7 @@ in sources."crypto-random-string-2.0.0" sources."cyclist-1.0.1" sources."date-time-2.1.0" - (sources."debug-4.2.0" // { + (sources."debug-4.3.0" // { dependencies = [ sources."ms-2.1.2" ]; @@ -77252,7 +77379,7 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.27.1" + sources."rollup-2.28.1" sources."run-async-2.4.1" sources."run-parallel-1.1.9" sources."rxjs-6.6.3" @@ -78140,7 +78267,7 @@ in sources."accepts-1.3.7" (sources."agent-base-6.0.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -78346,7 +78473,7 @@ in sources."http-signature-1.2.0" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -79069,7 +79196,7 @@ in sources."core-util-is-1.0.2" sources."crypto-random-string-2.0.0" sources."dashdash-1.14.1" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."debuglog-1.0.1" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" @@ -79796,7 +79923,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001131" + sources."caniuse-lite-1.0.30001133" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -79879,7 +80006,7 @@ in sources."dashdash-1.14.1" sources."data-urls-1.1.0" sources."deasync-0.1.20" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decode-uri-component-0.2.0" sources."deep-is-0.1.3" (sources."defaults-1.0.3" // { @@ -80292,7 +80419,7 @@ in sources."postcss-ordered-values-4.1.2" sources."postcss-reduce-initial-4.0.3" sources."postcss-reduce-transforms-4.0.2" - sources."postcss-selector-parser-6.0.2" + sources."postcss-selector-parser-6.0.3" sources."postcss-svgo-4.0.2" sources."postcss-unique-selectors-4.0.1" sources."postcss-value-parser-3.3.1" @@ -80482,6 +80609,7 @@ in (sources."uncss-0.17.3" // { dependencies = [ sources."is-absolute-url-3.0.3" + sources."postcss-selector-parser-6.0.2" ]; }) sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -81823,10 +81951,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.6.1"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.6.1.tgz"; - sha512 = "pHEgIV5hIqwaMqDlDNj5yuNuSjN5CKAZvBgdL5CC2mo2itdpqoYy/NkLId0bnnRgrsmyA57Nz4Q78JFnx0Jcdw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.7.0.tgz"; + sha512 = "5+ZKJUKhh6indenG8egpELjgAEQKO6fx5LHlepDr3zymkX6EupySjPh/E/20ue920bUbMdvC0Hi2S71S45IJ7A=="; }; buildInputs = globalBuildInputs; meta = { @@ -82375,10 +82503,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.72"; + version = "1.1.73"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.72.tgz"; - sha512 = "nRYCxhlGwG/NRl6eCZX3oxUaZGy7VRVuL/b46ZsDh69ZzkZ/CSMsxW19Jb4vZgGb8M2eLcFpan45m7UtiHBMWA=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.73.tgz"; + sha512 = "IWW7ZCp/Mk0WOVX9o1/L/Usq+vQODEDOaxlLSCDCClBAdjQsxCCo4FYZPMs4Ec3GKRwEmXHwzW8ZIit3J/cHKw=="; }; buildInputs = globalBuildInputs; meta = { @@ -82660,7 +82788,7 @@ in sources."crypto-browserify-3.12.0" sources."css-color-keywords-1.0.0" sources."css-to-react-native-3.0.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" sources."decko-1.2.0" sources."delegate-3.2.0" @@ -82765,7 +82893,7 @@ in sources."minimalistic-crypto-utils-1.0.1" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."mobx-4.15.6" + sources."mobx-4.15.7" sources."mobx-react-5.4.4" sources."ms-2.1.2" sources."neo-async-2.6.2" @@ -82801,7 +82929,7 @@ in sources."pbkdf2-3.1.1" sources."perfect-scrollbar-1.5.0" sources."picomatch-2.2.2" - sources."polished-3.6.6" + sources."polished-3.6.7" sources."postcss-value-parser-4.1.0" sources."prismjs-1.21.0" sources."process-0.11.10" @@ -82974,10 +83102,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.27.1"; + version = "2.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.27.1.tgz"; - sha512 = "GiWHQvnmMgBktSpY/1+nrGpwPsTw4b9P28og2uedfeq4JZ16rzAmnQ5Pm/E0/BEmDNia1ZbY7+qu3nBgNa19Hg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.28.1.tgz"; + sha512 = "DOtVoqOZt3+FjPJWLU8hDIvBjUylc9s6IZvy76XklxzcLvAQLtVAG/bbhsMhcWnYxC0TKKcf1QQ/tg29zeID0Q=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -83084,7 +83212,7 @@ in sources."cross-spawn-7.0.3" sources."css-select-1.2.0" sources."css-what-2.1.3" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" sources."deep-freeze-0.0.1" sources."deep-is-0.1.3" @@ -83277,7 +83405,7 @@ in sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."rimraf-2.6.3" - sources."rollup-2.27.1" + sources."rollup-2.28.1" sources."safe-buffer-5.2.1" sources."semver-6.3.0" sources."serialize-javascript-4.0.0" @@ -83328,10 +83456,10 @@ in sources."semver-5.7.1" ]; }) - sources."vscode-jsonrpc-5.1.0-next.1" - sources."vscode-languageclient-7.0.0-next.1" - sources."vscode-languageserver-protocol-3.16.0-next.2" - sources."vscode-languageserver-types-3.16.0-next.1" + sources."vscode-jsonrpc-6.0.0-next.5" + sources."vscode-languageclient-7.0.0-next.9" + sources."vscode-languageserver-protocol-3.16.0-next.7" + sources."vscode-languageserver-types-3.16.0-next.3" sources."vscode-test-1.4.0" sources."which-2.0.2" sources."which-module-2.0.0" @@ -83419,7 +83547,7 @@ in sources."crc-0.2.0" sources."crypto-0.0.3" sources."dashdash-1.14.1" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."events.node-0.4.9" @@ -83653,7 +83781,7 @@ in sources."2-thenable-1.0.0" (sources."@kwsites/file-exists-1.1.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -83703,7 +83831,7 @@ in ]; }) sources."@serverless/platform-client-1.1.10" - (sources."@serverless/platform-client-china-1.0.37" // { + (sources."@serverless/platform-client-china-1.1.0" // { dependencies = [ sources."archiver-4.0.2" sources."async-3.2.0" @@ -83713,7 +83841,7 @@ in (sources."@serverless/platform-sdk-2.3.2" // { dependencies = [ sources."chalk-2.4.2" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."https-proxy-agent-4.0.0" sources."is-docker-1.1.0" sources."ms-2.1.2" @@ -84079,7 +84207,7 @@ in (sources."https-proxy-agent-5.0.0" // { dependencies = [ sources."agent-base-6.0.1" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -84294,7 +84422,7 @@ in sources."signal-exit-3.0.3" (sources."simple-git-2.20.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -84344,7 +84472,7 @@ in sources."supports-color-5.5.0" (sources."tabtab-3.0.2" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" sources."untildify-3.0.3" ]; @@ -84412,7 +84540,7 @@ in sources."xtend-4.0.2" sources."yaml-ast-parser-0.0.43" sources."yamljs-0.3.0" - sources."yargs-parser-20.0.0" + sources."yargs-parser-20.2.0" sources."yauzl-2.10.0" sources."yeast-0.1.2" sources."zip-stream-3.0.1" @@ -85054,10 +85182,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.398.1"; + version = "1.399.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.398.1.tgz"; - sha512 = "jH24ztdJY8DQlqkd1z8n/JutdOqHtTPccCynM2hfOedW20yAp9c108LFjXvqBEk/EH3YyNmWzyLkkHOySeDkwQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.399.0.tgz"; + sha512 = "o1okhJvmRpETbMHCyJvXaVOLIVtlbledhztTZKsnMRs0wgim/GyNNWTboqM5a0aR23OpQzW8qlV3BQRsAvEisw=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" @@ -85181,7 +85309,7 @@ in }) sources."crypto-random-string-2.0.0" sources."data-uri-to-buffer-1.2.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" (sources."decompress-response-6.0.0" // { dependencies = [ @@ -86018,7 +86146,7 @@ in sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."cross-spawn-6.0.5" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decode-uri-component-0.2.0" sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" @@ -86295,7 +86423,7 @@ in }) sources."napi-macros-2.0.0" sources."ncp-2.0.0" - sources."nearley-2.19.6" + sources."nearley-2.19.7" sources."nice-try-1.0.5" sources."node-gyp-build-4.2.3" sources."non-private-ip-1.4.4" @@ -88336,7 +88464,7 @@ in sources."combined-stream-1.0.8" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" sources."delayed-stream-1.0.0" sources."discord.js-11.6.4" @@ -88526,7 +88654,7 @@ in sources."concat-stream-1.6.2" sources."core-util-is-1.0.2" sources."crypt-0.0.2" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."deep-equal-1.1.1" sources."deep-is-0.1.3" sources."define-properties-1.1.3" @@ -88857,7 +88985,7 @@ in sources."core-util-is-1.0.2" sources."crypto-random-string-2.0.0" sources."cuss-1.21.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -89607,7 +89735,7 @@ in sources."after-0.8.2" (sources."agent-base-6.0.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -89771,7 +89899,7 @@ in sources."http_ece-1.1.0" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -91240,6 +91368,816 @@ in bypassCache = true; reconstructLock = true; }; + "vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage { + name = "vscode-lldb"; + packageName = "vscode-lldb"; + version = "1.5.3"; + src = ../../misc/vscode-extensions/vscode-lldb/build-deps; + dependencies = [ + sources."@types/json5-0.0.30" + sources."@types/mocha-7.0.2" + sources."@types/node-8.10.64" + sources."@types/vscode-1.49.0" + sources."@types/yauzl-2.9.1" + sources."@webassemblyjs/ast-1.9.0" + sources."@webassemblyjs/floating-point-hex-parser-1.9.0" + sources."@webassemblyjs/helper-api-error-1.9.0" + sources."@webassemblyjs/helper-buffer-1.9.0" + sources."@webassemblyjs/helper-code-frame-1.9.0" + sources."@webassemblyjs/helper-fsm-1.9.0" + sources."@webassemblyjs/helper-module-context-1.9.0" + sources."@webassemblyjs/helper-wasm-bytecode-1.9.0" + sources."@webassemblyjs/helper-wasm-section-1.9.0" + sources."@webassemblyjs/ieee754-1.9.0" + sources."@webassemblyjs/leb128-1.9.0" + sources."@webassemblyjs/utf8-1.9.0" + sources."@webassemblyjs/wasm-edit-1.9.0" + sources."@webassemblyjs/wasm-gen-1.9.0" + sources."@webassemblyjs/wasm-opt-1.9.0" + sources."@webassemblyjs/wasm-parser-1.9.0" + sources."@webassemblyjs/wast-parser-1.9.0" + sources."@webassemblyjs/wast-printer-1.9.0" + sources."@xtuc/ieee754-1.2.0" + sources."@xtuc/long-4.2.2" + sources."acorn-6.4.1" + sources."ajv-6.12.5" + sources."ajv-errors-1.0.1" + sources."ajv-keywords-3.5.2" + sources."ansi-colors-3.2.3" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."anymatch-3.1.1" + sources."aproba-1.2.0" + sources."argparse-1.0.10" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-unique-0.3.2" + (sources."asn1.js-5.4.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + (sources."assert-1.5.0" // { + dependencies = [ + sources."inherits-2.0.1" + sources."util-0.10.3" + ]; + }) + sources."assign-symbols-1.0.0" + sources."async-each-1.0.3" + sources."atob-2.1.2" + sources."azure-devops-node-api-7.2.0" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."base64-js-1.3.1" + sources."big.js-5.2.2" + sources."binary-extensions-2.1.0" + sources."bindings-1.5.0" + sources."bluebird-3.7.2" + sources."bn.js-5.1.3" + sources."boolbase-1.0.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."brorand-1.1.0" + sources."browser-stdout-1.3.1" + sources."browserify-aes-1.2.0" + sources."browserify-cipher-1.0.1" + sources."browserify-des-1.0.2" + (sources."browserify-rsa-4.0.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + (sources."browserify-sign-4.2.1" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + sources."string_decoder-1.3.0" + ]; + }) + sources."browserify-zlib-0.2.0" + (sources."buffer-4.9.2" // { + dependencies = [ + sources."isarray-1.0.0" + ]; + }) + sources."buffer-crc32-0.2.13" + sources."buffer-from-1.1.1" + sources."buffer-xor-1.0.3" + sources."builtin-status-codes-3.0.0" + (sources."cacache-12.0.4" // { + dependencies = [ + sources."glob-7.1.6" + ]; + }) + sources."cache-base-1.0.1" + sources."camelcase-5.3.1" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) + sources."cheerio-1.0.0-rc.3" + sources."chokidar-3.3.0" + sources."chownr-1.1.4" + sources."chrome-trace-event-1.0.2" + sources."cipher-base-1.0.4" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-buffer-1.1.6" + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."cliui-5.0.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."commander-2.20.3" + sources."commondir-1.0.1" + sources."component-emitter-1.3.0" + sources."concat-map-0.0.1" + (sources."concat-stream-1.6.2" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."console-browserify-1.2.0" + sources."constants-browserify-1.0.0" + sources."copy-concurrently-1.0.5" + sources."copy-descriptor-0.1.1" + sources."core-util-is-1.0.2" + (sources."create-ecdh-4.0.4" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" + sources."cross-spawn-6.0.5" + sources."crypto-browserify-3.12.0" + sources."css-select-1.2.0" + sources."css-what-2.1.3" + sources."cyclist-1.0.1" + sources."debug-3.2.6" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" + sources."denodeify-1.2.1" + sources."des.js-1.0.1" + sources."detect-file-1.0.0" + sources."diff-3.5.0" + (sources."diffie-hellman-5.0.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."dom-serializer-0.1.1" + sources."domain-browser-1.2.0" + sources."domelementtype-1.3.1" + sources."domhandler-2.4.2" + sources."domutils-1.5.1" + (sources."duplexify-3.7.1" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + (sources."elliptic-6.5.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."emoji-regex-7.0.3" + sources."emojis-list-3.0.0" + sources."end-of-stream-1.4.4" + sources."enhanced-resolve-4.3.0" + sources."entities-1.1.2" + sources."errno-0.1.7" + sources."es-abstract-1.17.6" + sources."es-to-primitive-1.2.1" + sources."escape-string-regexp-1.0.5" + sources."eslint-scope-4.0.3" + sources."esprima-4.0.1" + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) + sources."estraverse-4.3.0" + sources."events-3.2.0" + sources."evp_bytestokey-1.0.3" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-buffer-1.1.6" + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + sources."expand-tilde-2.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."fd-slicer-1.1.0" + sources."figgy-pudding-3.5.2" + sources."file-uri-to-path-1.0.0" + sources."fill-range-7.0.1" + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" + (sources."findup-sync-3.0.0" // { + dependencies = [ + sources."braces-2.3.2" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."is-buffer-1.1.6" + sources."is-number-3.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."to-regex-range-2.1.1" + ]; + }) + sources."flat-4.1.0" + (sources."flush-write-stream-1.1.1" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."for-in-1.0.2" + sources."fragment-cache-0.2.1" + (sources."from2-2.3.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."fs-write-stream-atomic-1.0.10" + sources."fs.realpath-1.0.0" + sources."fsevents-2.1.3" + sources."function-bind-1.1.1" + sources."get-caller-file-2.0.5" + sources."get-value-2.0.6" + sources."glob-7.1.3" + sources."glob-parent-5.1.1" + (sources."global-modules-2.0.0" // { + dependencies = [ + sources."global-prefix-3.0.0" + ]; + }) + sources."global-prefix-1.0.2" + sources."graceful-fs-4.2.4" + sources."growl-1.10.5" + sources."has-1.0.3" + sources."has-flag-3.0.0" + sources."has-symbols-1.0.1" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."is-buffer-1.1.6" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + sources."string_decoder-1.3.0" + ]; + }) + sources."hash.js-1.1.7" + sources."he-1.2.0" + sources."hmac-drbg-1.0.1" + sources."homedir-polyfill-1.0.3" + (sources."htmlparser2-3.10.1" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.1" + sources."string_decoder-1.3.0" + ]; + }) + sources."https-browserify-1.0.0" + sources."ieee754-1.1.13" + sources."iferr-0.1.5" + sources."import-local-2.0.0" + sources."imurmurhash-0.1.4" + sources."infer-owner-1.0.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + sources."interpret-1.4.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-binary-path-2.1.0" + sources."is-buffer-2.0.4" + sources."is-callable-1.2.1" + sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.2" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."is-plain-object-2.0.4" + sources."is-regex-1.1.1" + sources."is-symbol-1.0.3" + sources."is-windows-1.0.2" + sources."is-wsl-1.1.0" + sources."isarray-0.0.1" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."js-yaml-3.13.1" + sources."json-parse-better-errors-1.0.2" + sources."json-schema-traverse-0.4.1" + sources."json5-2.1.3" + sources."kind-of-6.0.3" + sources."leven-3.1.0" + sources."linkify-it-2.2.0" + sources."loader-runner-2.4.0" + (sources."loader-utils-1.4.0" // { + dependencies = [ + sources."json5-1.0.1" + ]; + }) + sources."locate-path-3.0.0" + sources."lodash-4.17.20" + sources."log-symbols-3.0.0" + sources."lru-cache-5.1.1" + sources."make-dir-2.1.0" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + (sources."markdown-it-10.0.0" // { + dependencies = [ + sources."entities-2.0.3" + ]; + }) + sources."md5.js-1.3.5" + sources."mdurl-1.0.1" + (sources."memory-fs-0.5.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."memory-streams-0.1.3" + sources."micromatch-4.0.2" + (sources."miller-rabin-4.0.1" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."mime-1.6.0" + sources."minimalistic-assert-1.0.1" + sources."minimalistic-crypto-utils-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."mississippi-3.0.0" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."mkdirp-0.5.5" + sources."mocha-7.2.0" + sources."move-concurrently-1.0.1" + sources."ms-2.1.1" + sources."mute-stream-0.0.8" + sources."nan-2.14.1" + sources."nanomatch-1.2.13" + sources."neo-async-2.6.2" + sources."nice-try-1.0.5" + sources."node-environment-flags-1.0.6" + (sources."node-libs-browser-2.2.1" // { + dependencies = [ + sources."isarray-1.0.0" + sources."punycode-1.4.1" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."string_decoder-1.1.1" + ]; + }) + sources."safe-buffer-5.2.1" + sources."string_decoder-1.3.0" + ]; + }) + sources."normalize-path-3.0.0" + sources."nth-check-1.0.2" + sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-buffer-1.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-inspect-1.8.0" + sources."object-keys-1.1.1" + sources."object-visit-1.0.1" + sources."object.assign-4.1.0" + sources."object.getownpropertydescriptors-2.1.0" + sources."object.pick-1.3.0" + sources."once-1.4.0" + sources."os-0.1.1" + sources."os-browserify-0.3.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."p-limit-2.3.0" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."pako-1.0.11" + (sources."parallel-transform-1.2.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."parse-asn1-5.1.6" + sources."parse-passwd-1.0.0" + sources."parse-semver-1.1.1" + sources."parse5-3.0.3" + sources."pascalcase-0.1.1" + sources."path-browserify-0.0.1" + sources."path-dirname-1.0.2" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."pbkdf2-3.1.1" + sources."pend-1.2.0" + sources."picomatch-2.2.2" + sources."pify-4.0.1" + sources."pkg-dir-3.0.0" + sources."posix-character-classes-0.1.1" + sources."process-0.11.10" + sources."process-nextick-args-2.0.1" + sources."promise-inflight-1.0.1" + sources."prr-1.0.1" + (sources."public-encrypt-4.0.3" // { + dependencies = [ + sources."bn.js-4.11.9" + ]; + }) + sources."pump-3.0.0" + (sources."pumpify-1.5.1" // { + dependencies = [ + sources."pump-2.0.1" + ]; + }) + sources."punycode-2.1.1" + sources."querystring-0.2.0" + sources."querystring-es3-0.2.1" + sources."randombytes-2.1.0" + sources."randomfill-1.0.4" + sources."read-1.0.7" + sources."readable-stream-1.0.34" + sources."readdirp-3.2.0" + sources."regex-not-1.0.2" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."resolve-cwd-2.0.0" + (sources."resolve-dir-1.0.1" // { + dependencies = [ + sources."global-modules-1.0.0" + ]; + }) + sources."resolve-from-3.0.0" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."rimraf-2.7.1" + sources."ripemd160-2.0.2" + sources."run-queue-1.0.3" + sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."schema-utils-1.0.0" + sources."semver-5.7.1" + sources."serialize-javascript-4.0.0" + sources."set-blocking-2.0.0" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."setimmediate-1.0.5" + sources."sha.js-2.4.11" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-buffer-1.1.6" + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + sources."source-map-0.5.7" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."is-buffer-1.1.6" + sources."kind-of-3.2.2" + ]; + }) + sources."source-list-map-2.0.1" + sources."source-map-0.6.1" + sources."source-map-resolve-0.5.3" + sources."source-map-support-0.5.19" + sources."source-map-url-0.4.0" + sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" + sources."ssri-6.0.1" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-buffer-1.1.6" + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."stream-browserify-2.0.2" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."stream-each-1.2.3" + (sources."stream-http-2.8.3" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."stream-shift-1.0.1" + sources."string-argv-0.3.1" + sources."string-width-2.1.1" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimstart-1.0.1" + sources."string_decoder-0.10.31" + sources."strip-ansi-4.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-6.0.0" + sources."tapable-1.1.3" + sources."terser-4.8.0" + sources."terser-webpack-plugin-1.4.5" + (sources."through2-2.0.5" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) + sources."timers-browserify-2.0.11" + sources."tmp-0.0.29" + sources."to-arraybuffer-1.0.1" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."is-buffer-1.1.6" + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-5.0.1" + (sources."ts-loader-6.2.2" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."tslib-1.13.0" + sources."tty-browserify-0.0.0" + sources."tunnel-0.0.4" + sources."typed-rest-client-1.2.0" + sources."typedarray-0.0.6" + sources."typescript-3.9.7" + sources."uc.micro-1.0.6" + sources."underscore-1.8.3" + sources."union-value-1.0.1" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + sources."isarray-1.0.0" + ]; + }) + sources."upath-1.2.0" + sources."uri-js-4.4.0" + sources."urix-0.1.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + sources."url-join-1.1.0" + sources."use-3.1.1" + (sources."util-0.11.1" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."util-deprecate-1.0.2" + sources."v8-compile-cache-2.1.1" + sources."vm-browserify-1.1.2" + sources."vsce-1.79.5" + sources."vscode-debugadapter-testsupport-1.41.0" + sources."vscode-debugprotocol-1.41.0" + (sources."watchpack-1.7.4" // { + dependencies = [ + sources."chokidar-3.4.2" + sources."readdirp-3.4.0" + ]; + }) + (sources."watchpack-chokidar2-2.0.0" // { + dependencies = [ + sources."anymatch-2.0.0" + sources."binary-extensions-1.13.1" + sources."braces-2.3.2" + sources."chokidar-2.1.8" + sources."extend-shallow-2.0.1" + sources."fill-range-4.0.0" + sources."fsevents-1.2.13" + sources."glob-parent-3.1.0" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-glob-3.1.0" + sources."is-number-3.0.0" + sources."isarray-1.0.0" + sources."kind-of-3.2.2" + sources."micromatch-3.1.10" + sources."normalize-path-2.1.1" + sources."readable-stream-2.3.7" + sources."readdirp-2.2.1" + sources."string_decoder-1.1.1" + sources."to-regex-range-2.1.1" + ]; + }) + (sources."webpack-4.44.2" // { + dependencies = [ + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."is-buffer-1.1.6" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."isarray-1.0.0" + sources."memory-fs-0.4.1" + sources."micromatch-3.1.10" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + sources."to-regex-range-2.1.1" + ]; + }) + (sources."webpack-cli-3.3.12" // { + dependencies = [ + sources."supports-color-6.1.0" + ]; + }) + sources."webpack-sources-1.4.3" + sources."which-1.3.1" + sources."which-module-2.0.0" + sources."wide-align-1.1.3" + sources."worker-farm-1.7.0" + (sources."wrap-ansi-5.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."wrappy-1.0.2" + sources."xtend-4.0.2" + sources."y18n-4.0.0" + sources."yallist-3.1.1" + (sources."yargs-13.3.2" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."yargs-parser-13.1.2" + sources."yargs-unparser-1.6.0" + sources."yauzl-2.10.0" + sources."yazl-2.5.1" + ]; + buildInputs = globalBuildInputs; + meta = { + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; vue-cli = nodeEnv.buildNodePackage { name = "vue-cli"; packageName = "vue-cli"; @@ -91742,14 +92680,14 @@ in (sources."eslint-5.16.0" // { dependencies = [ sources."cross-spawn-6.0.5" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ignore-4.0.6" ]; }) (sources."eslint-plugin-vue-6.2.2" // { dependencies = [ sources."acorn-7.4.0" - sources."debug-4.2.0" + sources."debug-4.3.0" sources."eslint-scope-5.1.1" sources."espree-6.2.1" sources."vue-eslint-parser-7.1.0" @@ -92434,7 +93372,7 @@ in sources."vscode-uri-1.0.8" (sources."vue-eslint-parser-6.0.5" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" ]; }) sources."vue-onsenui-helper-json-1.0.2" @@ -92481,10 +93419,10 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-5.0.0.tgz"; - sha512 = "K5rzVijxNbOjxv+au1Sj7J82s1/CCyBQ9bhJE9TWdOD3OLELhC3bWJHyNJ1u2sT+kf8guaJjFvPnd6WG67PHtw=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-5.1.0.tgz"; + sha512 = "Eupjwvif/9P4uGdZIddJziLLLD/RuzW8r8HEANGCW8e3dlPV4GJu5z815k9DLVshG0v+q/stUPR968Q2p7hhMQ=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -92499,10 +93437,16 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/polyfill-7.10.4" - sources."@babel/runtime-7.10.5" + sources."@babel/polyfill-7.11.5" + sources."@babel/runtime-7.11.2" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" + (sources."@eslint/eslintrc-0.1.3" // { + dependencies = [ + sources."debug-4.3.0" + sources."ms-2.1.2" + ]; + }) sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" @@ -92514,9 +93458,9 @@ in sources."adbkit-2.11.1" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" - sources."addons-linter-2.1.0" + sources."addons-linter-2.5.0" sources."adm-zip-0.4.16" - sources."ajv-6.12.3" + sources."ajv-6.12.5" sources."ajv-merge-patch-4.1.0" sources."ansi-align-3.0.0" sources."ansi-colors-4.1.1" @@ -92714,14 +93658,14 @@ in sources."deep-equal-1.1.1" sources."deep-extend-0.6.0" sources."deep-is-0.1.3" - sources."deepcopy-2.0.0" + sources."deepcopy-2.1.0" sources."deepmerge-4.2.2" sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" - (sources."dispensary-0.52.0" // { + (sources."dispensary-0.55.0" // { dependencies = [ sources."async-3.2.0" ]; @@ -92748,19 +93692,28 @@ in sources."es6-promisify-6.1.1" sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.5.0" // { + (sources."eslint-7.9.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."debug-4.2.0" + sources."debug-4.3.0" + sources."eslint-visitor-keys-1.3.0" sources."ms-2.1.2" sources."strip-ansi-6.0.0" ]; }) sources."eslint-plugin-no-unsanitized-3.1.2" sources."eslint-scope-5.1.1" - sources."eslint-utils-2.1.0" - sources."eslint-visitor-keys-1.3.0" - sources."espree-7.2.0" + (sources."eslint-utils-2.1.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."eslint-visitor-keys-2.0.0" + (sources."espree-7.3.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ @@ -92997,7 +93950,7 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."marky-1.2.1" - sources."mdn-browser-compat-data-1.0.31" + sources."mdn-browser-compat-data-1.0.35" sources."mem-5.1.1" sources."merge-stream-2.0.0" (sources."micromatch-3.1.10" // { @@ -93051,7 +94004,7 @@ in sources."neo-async-2.6.2" sources."next-tick-1.1.0" sources."node-forge-0.7.6" - (sources."node-notifier-7.0.2" // { + (sources."node-notifier-8.0.0" // { dependencies = [ sources."uuid-8.3.0" ]; @@ -93114,7 +94067,7 @@ in sources."pend-1.2.0" sources."performance-now-2.1.0" sources."picomatch-2.2.2" - sources."pino-6.4.0" + sources."pino-6.6.1" sources."pino-std-serializers-2.5.0" sources."posix-character-classes-0.1.1" (sources."postcss-7.0.32" // { @@ -93198,7 +94151,7 @@ in sources."shebang-regex-3.0.0" sources."shell-quote-1.6.1" sources."shellwords-0.1.1" - (sources."sign-addon-2.0.6" // { + (sources."sign-addon-3.1.0" // { dependencies = [ sources."core-js-3.6.5" ]; @@ -93342,7 +94295,7 @@ in ]; }) sources."upath-1.2.0" - (sources."update-notifier-4.1.0" // { + (sources."update-notifier-4.1.1" // { dependencies = [ sources."chalk-3.0.0" ]; @@ -93383,8 +94336,8 @@ in ]; }) sources."wcwidth-1.0.1" - sources."webidl-conversions-5.0.0" - sources."whatwg-url-8.1.0" + sources."webidl-conversions-6.1.0" + sources."whatwg-url-8.2.2" sources."when-3.7.7" sources."which-2.0.2" sources."which-module-2.0.0" @@ -94419,7 +95372,7 @@ in sources."semver-5.7.1" ]; }) - (sources."debug-4.2.0" // { + (sources."debug-4.3.0" // { dependencies = [ sources."ms-2.1.2" ]; @@ -95038,20 +95991,20 @@ in sources."bitfield-3.0.0" (sources."bittorrent-dht-10.0.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) sources."bittorrent-peerid-1.3.3" (sources."bittorrent-protocol-3.1.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) (sources."bittorrent-tracker-9.15.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" sources."ms-2.1.2" @@ -95071,7 +96024,7 @@ in sources."bufferutil-4.0.1" (sources."castv2-0.1.10" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -95216,7 +96169,7 @@ in sources."record-cache-1.1.0" (sources."render-media-3.4.3" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -95232,14 +96185,14 @@ in sources."simple-get-2.8.1" (sources."simple-peer-9.7.2" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) sources."simple-sha1-3.0.1" (sources."simple-websocket-8.1.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -95260,7 +96213,7 @@ in sources."to-arraybuffer-1.0.1" (sources."torrent-discovery-9.3.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -95274,7 +96227,7 @@ in sources."url-join-4.0.1" (sources."ut_metadata-3.5.1" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."ms-2.1.2" ]; }) @@ -95285,7 +96238,7 @@ in sources."vlc-command-1.2.0" (sources."webtorrent-0.108.6" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."decompress-response-4.2.1" sources."mimic-response-2.1.0" sources."ms-2.1.2" @@ -96329,7 +97282,7 @@ in }) (sources."yeoman-generator-4.12.0" // { dependencies = [ - sources."debug-4.2.0" + sources."debug-4.3.0" sources."diff-4.0.2" sources."dir-glob-2.2.2" sources."ejs-3.1.5" diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix index 7dc87194d6a..0da1ab74e19 100644 --- a/pkgs/development/ocaml-modules/apron/default.nix +++ b/pkgs/development/ocaml-modules/apron/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-apron-${version}"; - version = "0.9.12"; + version = "0.9.13"; src = fetchFromGitHub { owner = "antoinemine"; repo = "apron"; rev = "v${version}"; - sha256 = "0bciv4wz52p57q0aggmvixvqrsd1slflfyrm1z6fy5c44f4fmjjn"; + sha256 = "14ymjahqdxj26da8wik9d5dzlxn81b3z1iggdl7rn2nn06jy7lvy"; }; buildInputs = [ perl gmp mpfr ppl ocaml findlib camlidl ]; diff --git a/pkgs/development/ocaml-modules/csexp/default.nix b/pkgs/development/ocaml-modules/csexp/default.nix index 51274890700..610de2cb8ad 100644 --- a/pkgs/development/ocaml-modules/csexp/default.nix +++ b/pkgs/development/ocaml-modules/csexp/default.nix @@ -2,15 +2,13 @@ buildDunePackage rec { pname = "csexp"; - version = "1.3.1"; - - useDune2 = true; + version = "1.3.2"; minimumOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/ocaml-dune/csexp/releases/download/${version}/csexp-${version}.tbz"; - sha256 = "0maihbqbqq9bwr0r1cv51r3m4hrkx9cf5wnxcz7rjgn13lcc9s49"; + sha256 = "0jhwrxfjb0x31xj4g4b89fzw34sq19j0rq2hs2zyh1vz4xxl47zj"; }; postPatch = '' diff --git a/pkgs/development/ocaml-modules/irmin/1.4.nix b/pkgs/development/ocaml-modules/irmin/1.4.nix deleted file mode 100644 index c1d170f78ee..00000000000 --- a/pkgs/development/ocaml-modules/irmin/1.4.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, fetchurl, buildDunePackage, ocaml -, astring, cstruct, fmt, hex, jsonm, logs, ocaml_lwt, ocamlgraph, uri -}: - -buildDunePackage rec { - pname = "irmin"; - version = "1.4.0"; - - minimumOCamlVersion = "4.03"; - - src = fetchurl { - url = "https://github.com/mirage/${pname}/releases/download/${version}/${pname}-${version}.tbz"; - sha256 = "019di4cz0z65knl232rnwj26npnc1mqh8j71xbf0mav6x350g1w5"; - }; - - propagatedBuildInputs = [ astring cstruct fmt hex jsonm logs ocaml_lwt ocamlgraph uri ]; - - doCheck = true; - - meta = with lib; { - homepage = "https://github.com/mirage/irmin"; - description = "Irmin, a distributed database that follows the same design principles as Git"; - license = licenses.isc; - maintainers = [ maintainers.alexfmpe ]; - }; -} diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix index 51a8e08983c..3bbb542bcba 100644 --- a/pkgs/development/ocaml-modules/qtest/default.nix +++ b/pkgs/development/ocaml-modules/qtest/default.nix @@ -1,28 +1,22 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, qcheck, ounit }: +{ lib, buildDunePackage, fetchFromGitHub, qcheck }: -if !stdenv.lib.versionAtLeast ocaml.version "4" -then throw "qtest is not available for OCaml ${ocaml.version}" -else +buildDunePackage rec { + pname = "qtest"; + version = "2.11"; -let version = "2.7"; in - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-qtest-${version}"; - src = fetchzip { - url = "https://github.com/vincent-hugot/iTeML/archive/v${version}.tar.gz"; - sha256 = "0z72m2drp67qchvsxx4sg2qjrrq8hp6p9kzdx16ibx58pvpw1sh2"; + src = fetchFromGitHub { + owner = "vincent-hugot"; + repo = pname; + rev = "v${version}"; + sha256 = "10fi2093ny8pp3jsi1gdqsllp3lr4r5mfcs2hrm7qvbnhrdbb0g3"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ qcheck ounit ]; - - installFlags = [ "BIN=$(out)/bin" ]; - preInstall = "mkdir -p $out/bin"; + propagatedBuildInputs = [ qcheck ]; meta = { - description = "Inline (Unit) Tests for OCaml (formerly “qtest”)"; - homepage = "https://github.com/vincent-hugot/iTeML"; - platforms = ocaml.meta.platforms or []; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + description = "Inline (Unit) Tests for OCaml"; + inherit (src.meta) homepage; + maintainers = with lib.maintainers; [ vbgl ]; + license = lib.licenses.gpl3; }; } diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 1123cc0d2b4..f9996eb6af6 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -6,9 +6,9 @@ let source = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "1.9"; - url = "https://github.com/ocaml/Zarith/archive/release-1.9.tar.gz"; - sha256 = "1xrqcaj5gp52xp4ybpnblw8ciwlgrr0zi7rg7hnk8x83isjkpmwx"; + version = "1.10"; + url = "https://github.com/ocaml/Zarith/archive/release-1.10.tar.gz"; + sha256 = "1qxrl0v2mk9wghc1iix3n0vfz2jbg6k5wpn1z7p02m2sqskb0zhb"; } else { version = "1.3"; url = "http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz"; diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix index 66054b33407..847951783ee 100644 --- a/pkgs/development/ocaml-modules/zed/default.nix +++ b/pkgs/development/ocaml-modules/zed/default.nix @@ -3,8 +3,8 @@ let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "2.0.3"; - sha256 = "0pa9awinqr0plp4b2az78dwpvh01pwaljnn5ydg8mc6hi7rmir55"; + version = "3.1.0"; + sha256 = "04vr1a94imsghm98iigc35rhifsz0rh3qz2qm0wam2wvp6vmrx0p"; buildInputs = [ dune ]; propagatedBuildInputs = [ charInfo_width ]; extra = { diff --git a/pkgs/development/python-modules/WSME/default.nix b/pkgs/development/python-modules/WSME/default.nix index f587d186bfd..c1c6395ab25 100644 --- a/pkgs/development/python-modules/WSME/default.nix +++ b/pkgs/development/python-modules/WSME/default.nix @@ -1,7 +1,23 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, pbr, six, simplegeneric, netaddr, pytz, webob -, cornice, nose, webtest, pecan, transaction, cherrypy, sphinx -, flask, flask-restful, suds-jurko, glibcLocales }: +{ lib +, buildPythonPackage +, fetchPypi +, pbr +, six +, simplegeneric +, netaddr +, pytz +, webob +# Test inputs +, cherrypy +, flask +, flask-restful +, glibcLocales +, nose +, pecan +, sphinx +, transaction +, webtest +}: buildPythonPackage rec { pname = "WSME"; @@ -12,38 +28,37 @@ buildPythonPackage rec { sha256 = "965b9ce48161e5c50d84aedcf50dca698f05bf07e9d489201bccaec3141cd304"; }; - postPatch = '' - # remove turbogears tests as we don't have it packaged - rm tests/test_tg* - # WSME seems incompatible with recent SQLAlchemy version - rm wsmeext/tests/test_sqlalchemy* - # https://bugs.launchpad.net/wsme/+bug/1510823 - ${if isPy3k then "rm tests/test_cornice.py" else ""} - ''; - - checkPhae = '' - nosetests --exclude test_buildhtml \ - --exlcude test_custom_clientside_error \ - --exclude test_custom_non_http_clientside_error - ''; - - # UnicodeEncodeError, ImportError, ... - doCheck = !isPy3k; - nativeBuildInputs = [ pbr ]; propagatedBuildInputs = [ - six simplegeneric netaddr pytz webob + netaddr + pytz + simplegeneric + six + webob ]; checkInputs = [ - cornice nose webtest pecan transaction cherrypy sphinx - flask flask-restful suds-jurko glibcLocales + nose + cherrypy + flask + flask-restful + glibcLocales + pecan + sphinx + transaction + webtest ]; + # from tox.ini, tests don't work with pytest + checkPhase = '' + nosetests wsme/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose + ''; + meta = with lib; { description = "Simplify the writing of REST APIs, and extend them with additional protocols"; - homepage = "http://git.openstack.org/cgit/openstack/wsme"; + homepage = "https://pythonhosted.org/WSME/"; + changelog = "https://pythonhosted.org/WSME/changes.html"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/acebinf/default.nix b/pkgs/development/python-modules/acebinf/default.nix new file mode 100644 index 00000000000..78810de1740 --- /dev/null +++ b/pkgs/development/python-modules/acebinf/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pyvcf +}: + +buildPythonPackage rec { + pname = "ACEBinf"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1168pny671l6zfm2vv1pwspnflmzi7f4v8yldjl7zlz0b9cm5zlz"; + }; + + buildInputs = [ pyvcf ]; + + # no tests + doCheck = false; + pythonImportsCheck = [ "acebinf" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/ACEnglish/acebinf"; + description = "Collection of simple utilities used when building bioinformatics tools"; + license = licenses.unlicense; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index cd7a9cd526b..08516d05f00 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy }: +{ stdenv, fetchPypi, buildPythonPackage, agate, sqlalchemy, crate }: buildPythonPackage rec { pname = "agate-sql"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "50a39754babef6cd0d1b1e75763324a49593394fe46ab1ea9546791b5e6b69a7"; }; - propagatedBuildInputs = [ agate sqlalchemy ]; + propagatedBuildInputs = [ agate sqlalchemy crate ]; meta = with stdenv.lib; { description = "Adds SQL read/write support to agate."; diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix new file mode 100644 index 00000000000..7dfce0d75c5 --- /dev/null +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, isPy27, pytestCheckHook +, requests, arrow, logfury, tqdm }: + +buildPythonPackage rec { + pname = "b2sdk"; + version = "1.1.4"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "0g527qdda105r5g9yjh4lxzlmz34m2bdz8dydqqy09igdsmiyi9j"; + }; + + pythonImportsCheck = [ "b2sdk" ]; + + nativebuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ requests arrow logfury tqdm ]; + + # requires unpackaged dependencies like liccheck + doCheck = false; + + meta = with stdenv.lib; { + description = "Client library and utilities for access to B2 Cloud Storage (backblaze)."; + homepage = "https://github.com/Backblaze/b2-sdk-python"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index ea7af2dfeaa..26cd6441ba5 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , buildPythonApplication, python -, mock, pathpy, pyhamcrest, pytest, pytest-html +, pytestCheckHook, mock, pathpy, pyhamcrest, pytest-html , glibcLocales , colorama, cucumber-tag-expressions, parse, parse-type, six }: @@ -16,7 +16,7 @@ buildPythonApplication rec { sha256 = "1ssgixmqlg8sxsyalr83a1970njc2wg3zl8idsmxnsljwacv7qwv"; }; - checkInputs = [ mock pathpy pyhamcrest pytest pytest-html ]; + checkInputs = [ pytestCheckHook mock pathpy pyhamcrest pytest-html ]; buildInputs = [ glibcLocales ]; propagatedBuildInputs = [ colorama cucumber-tag-expressions parse parse-type six ]; @@ -24,14 +24,14 @@ buildPythonApplication rec { patchShebangs bin ''; - doCheck = true; + # timing-based test flaky on Darwin + # https://github.com/NixOS/nixpkgs/pull/97737#issuecomment-691489824 + disabledTests = stdenv.lib.optionals stdenv.isDarwin [ "test_step_decorator_async_run_until_complete" ]; - checkPhase = '' + postCheck = '' export LANG="en_US.UTF-8" export LC_ALL="en_US.UTF-8" - pytest tests - ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' features/ ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' tools/test-features/ ${python.interpreter} bin/behave -f progress3 --stop --tags='~@xfail' issue.features/ diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 850070b1c00..55a01c65f1c 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pname = "bokeh"; - version = "2.1.1"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "2dfabf228f55676b88acc464f416e2b13ee06470a8ad1dd3e609bb789425fbad"; + sha256 = "qC6e69eh4uu3+PwerYAv79EKhNrvjsS/yYYSEyOUhVU="; }; patches = [ diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 9a49be777b0..595f97bcb8f 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -25,11 +25,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.8.2"; + version = "2.8.4"; src = fetchPypi { inherit pname version; - sha256 = "0rdrz2zkd6xaf9kb5l41xmbfzq618sz498w23irshih4c802pdv5"; + sha256 = "0i2sbxhsqyk2yr234il0zsyp1rf2v1l5hmzvw0yrgds6jpr19cqv"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index 4bb8613afea..ff61f988109 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1yz3k6dg15q4911x8kjy396dccfgrs50mjz278l09p6zmm71llax"; + sha256 = "1p9qnrqx72y4jrhawgbpwisgily7zg4rh39hpky4x56d5afvjgqc"; }; postPatch = '' diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 4c5aa374562..9a39cc90b69 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "19qwr0h6qavznx8rfjq6zjccyd2y7x4nc8asldvay3b44xfsr385"; + sha256 = "1hi44jbnafp7iqncad01hwr087aqmdszvc2if0d9gw6bm159zf4s"; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "1wfhwmb1d32k8isk7k8525pmkfih8hlvy53zsj19l3gvjm0da9gw"; + sha256 = "1vkh4kdlnm9z5r62b4vxx6qxc90g65gm1m4qxfc6xjk1265i1w6h"; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0g62v0maz3b9bmjvvjcin6ayg0f5k0n8m93zk75lagyr69g5vaka"; + sha256 = "0v94p1m9fb6m6ik5xyi7bs4jrsgvnyf3sl7f4w1qmb24xc47k2gj"; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0dlq8pchgccc66gfdlssydacisia5fbwc8b4gd8f9gcbish8jmf7"; + sha256 = "13bg289al6dmyrin3l6ih3sk7hm660m69kls3kpagg6j6nmpa5wz"; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "193nni55py6yzw730yyp5va2n4313sjf6a7jmi0xs9bivvvzg5w9"; + sha256 = "11cr7m7m8ah8qqjcqj7qvjjak62cx1sq41cazd4i3r07dyhc3ypn"; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 05938e43ad6..f0eaa7e81ae 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -7,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "0p1w6ailp6xpa6ckl5prj413ilxx5s3lga5mzqxj9nn00vni8ik2"; + sha256 = "1v1bcc2m4pz90rsh5pjb9m9agkvhqdk1viyf64gi1h85h191vkib"; }; propagatedBuildInputs = [ twisted future ]; diff --git a/pkgs/development/python-modules/bwapy/default.nix b/pkgs/development/python-modules/bwapy/default.nix new file mode 100644 index 00000000000..31884074def --- /dev/null +++ b/pkgs/development/python-modules/bwapy/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, buildPythonPackage +, pythonOlder +, fetchPypi +, bwa +, cffi +, zlib +}: + +buildPythonPackage rec { + pname = "bwapy"; + version = "0.1.4"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "090qwx3vl729zn3a7sksbviyg04kc71gpbm3nd8dalqp673x1npw"; + }; + postPatch = '' + # replace bundled bwa + rm -r bwa/* + cp ${bwa}/lib/*.a ${bwa}/include/*.h bwa/ + + substituteInPlace setup.py \ + --replace 'setuptools>=49.2.0' 'setuptools' + ''; + + buildInputs = [ zlib bwa ]; + + propagatedBuildInputs = [ cffi ]; + + # no tests + doCheck = false; + pythonImportsCheck = [ "bwapy" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/ACEnglish/acebinf"; + description = "Python bindings to bwa mem aligner"; + license = licenses.mpl20; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index f18e307c61c..b79bf761317 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -1,28 +1,34 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder -, pyyaml -, six -, requests , aws-sam-translator , importlib-metadata , importlib-resources , jsonpatch , jsonschema -, pathlib2 -, setuptools , junit-xml , networkx +, pathlib2 +, pyyaml +, requests +, setuptools +, six +# Test inputs +, pytestCheckHook +, mock +, pydot }: buildPythonPackage rec { pname = "cfn-lint"; - version = "0.35.0"; + version = "0.35.1"; - src = fetchPypi { - inherit pname version; - sha256 = "42023d89520e3a29891ec2eb4c326eef9d1f7516fe9abee8b6c97ce064187b45"; + src = fetchFromGitHub { + owner = "aws-cloudformation"; + repo = "cfn-python-lint"; + rev = "v${version}"; + sha256 = "1ajb0412hw9fg9m4b3xbpfbp8cixmnpjxrkaks6k749xinzsv7qk"; }; postPatch = '' @@ -30,20 +36,18 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - pyyaml - six - requests aws-sam-translator jsonpatch jsonschema - pathlib2 - setuptools junit-xml networkx + pathlib2 + pyyaml + requests + setuptools + six ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata importlib-resources ]; - # No tests included in archive - doCheck = false; pythonImportsCheck = [ "cfnlint" "cfnlint.conditions" @@ -60,9 +64,13 @@ buildPythonPackage rec { "cfnlint.transform" ]; + checkInputs = [ pytestCheckHook mock pydot ]; + preCheck = "export PATH=$out/bin:$PATH"; + meta = with lib; { description = "Checks cloudformation for practices and behaviour that could potentially be improved"; homepage = "https://github.com/aws-cloudformation/cfn-python-lint"; + changelog = "https://github.com/aws-cloudformation/cfn-python-lint/blob/master/CHANGELOG.md"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix new file mode 100644 index 00000000000..69813e6a2eb --- /dev/null +++ b/pkgs/development/python-modules/clldutils/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, attrs +, colorlog +, csvw +, dateutil +, tabulate +, mock +, postgresql +, pytestCheckHook +, pytest-mock +}: + +buildPythonPackage rec { + pname = "clldutils"; + version = "3.5.2"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "clld"; + repo = pname; + rev = "v${version}"; + sha256 = "0qlqp9yq4lbi9ik2psgw0svxlb7raadqaxdh2dgkn85d7h20y4nd"; + }; + + patchPhase = '' + substituteInPlace setup.cfg --replace "--cov" "" + ''; + + propagatedBuildInputs = [ + dateutil + tabulate + colorlog + attrs + csvw + ]; + + checkInputs = [ + mock + postgresql + pytestCheckHook + pytest-mock + ]; + + meta = with lib; { + description = "CSV on the Web"; + homepage = "https://github.com/cldf/csvw"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/cozy/default.nix b/pkgs/development/python-modules/cozy/default.nix index c55c85c3dfd..39f2d1227e7 100644 --- a/pkgs/development/python-modules/cozy/default.nix +++ b/pkgs/development/python-modules/cozy/default.nix @@ -4,6 +4,7 @@ buildPythonPackage { pname = "cozy"; version = "2.0a1"; + disabled = !isPy3k; propagatedBuildInputs = [ z3 ply python-igraph oset ordered-set dictionaries @@ -18,18 +19,18 @@ buildPythonPackage { # Yoink the Z3 dependency name, because our Z3 package doesn't provide it. postPatch = '' - sed -i -e '/z3-solver/d' requirements.txt + sed -i -e '/z3-solver/d' -e 's/^dictionaries.*$/dictionaries/' requirements.txt ''; # Tests are not correctly set up in the source tree. doCheck = false; + pythonImportsCheck = [ "cozy" ]; # There is some first-time-run codegen that we will force to happen. postInstall = '' $out/bin/cozy --help ''; - disabled = !isPy3k; meta = { description = "The collection synthesizer"; diff --git a/pkgs/development/python-modules/crate/default.nix b/pkgs/development/python-modules/crate/default.nix new file mode 100644 index 00000000000..42236b4d7c2 --- /dev/null +++ b/pkgs/development/python-modules/crate/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchPypi +, buildPythonPackage +, urllib3 +, isPy3k +, mock +, sqlalchemy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "crate"; + version = "0.24.0"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "028q9r1qyqkq185awkazhplfy7y1081963fnjzi3kf3lxvz6yhay"; + }; + + propagatedBuildInputs = [ + urllib3 + ]; + + checkInputs = [ + pytestCheckHook + sqlalchemy + mock + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/crate/crate-python"; + description = "A Python client library for CrateDB"; + license = licenses.asl20; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/development/python-modules/csvw/default.nix b/pkgs/development/python-modules/csvw/default.nix new file mode 100644 index 00000000000..76f7cb73b4c --- /dev/null +++ b/pkgs/development/python-modules/csvw/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, attrs +, isodate +, dateutil +, rfc3986 +, uritemplate +, mock +, pytestCheckHook +, pytest-mock +}: + +buildPythonPackage rec { + pname = "csvw"; + version = "1.8.0"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "cldf"; + repo = "csvw"; + rev = "v${version}"; + sha256 = "0maxrsiv9i9hkg627hwqyq8g6jg3g8iv8gdqaxz4aysjd9xddydd"; + }; + + patchPhase = '' + substituteInPlace setup.cfg --replace "--cov" "" + ''; + + propagatedBuildInputs = [ + attrs + isodate + dateutil + rfc3986 + uritemplate + ]; + + checkInputs = [ + mock + pytestCheckHook + pytest-mock + ]; + + meta = with lib; { + description = "CSV on the Web"; + homepage = "https://github.com/cldf/csvw"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/dbus-next/default.nix b/pkgs/development/python-modules/dbus-next/default.nix new file mode 100644 index 00000000000..163a7adcb10 --- /dev/null +++ b/pkgs/development/python-modules/dbus-next/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, python +, dbus, dbus-python, pytest, pytestcov, pytest-asyncio, pytest-timeout +}: + +buildPythonPackage rec { + pname = "dbus-next"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "altdesktop"; + repo = "python-dbus-next"; + rev = "v${version}"; + sha256 = "sha256-C/aFDHmt6Qws6ek+++wM5GRN6TEvMGMiFktKIXRdGL0="; + }; + + checkInputs = [ + dbus + dbus-python + pytest + pytestcov + pytest-asyncio + pytest-timeout + ]; + + # test_peer_interface hits a timeout + checkPhase = '' + dbus-run-session --config-file=${dbus.daemon}/share/dbus-1/session.conf \ + ${python.interpreter} -m pytest -sv --cov=dbus_next \ + -k "not test_peer_interface" + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/altdesktop/python-dbus-next"; + description = "A zero-dependency DBus library for Python with asyncio support"; + license = licenses.mit; + maintainers = with maintainers; [ sfrijters ]; + }; +} diff --git a/pkgs/development/python-modules/dipy/default.nix b/pkgs/development/python-modules/dipy/default.nix index 939f0912fe1..a1360ada225 100644 --- a/pkgs/development/python-modules/dipy/default.nix +++ b/pkgs/development/python-modules/dipy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dipy"; - version = "1.1.1"; + version = "1.2.0"; disabled = isPy27; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "dipy"; repo = pname; rev = version; - sha256 = "08abx0f4li6ya62ilc59miw4mk6wndizahyylxhgcrpacb6ydw28"; + sha256 = "0x49lph400ndlvk419nd2g9ss4jg75xr7xh88ggv5d2ama19v7py"; }; nativeBuildInputs = [ cython packaging ]; diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index fe4213d13f0..91f6f06f6d9 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -23,6 +23,7 @@ , singledispatch , mpi4py , bokeh +, pythonOlder }: buildPythonPackage rec { @@ -35,11 +36,13 @@ buildPythonPackage rec { sha256 = "469e505fd7ce75f600188bdb69a95641899d5b372f74246c8f308376b6929e9c"; }; + disabled = pythonOlder "3.6"; + checkInputs = [ pytest pytest-repeat pytest-timeout mock joblib ]; propagatedBuildInputs = [ click cloudpickle dask msgpack psutil six sortedcontainers tblib toolz tornado zict pyyaml mpi4py bokeh - ] ++ lib.optionals (!isPy3k) [ futures singledispatch ]; + ]; # tests take about 10-15 minutes # ignore 5 cli tests out of 1000 total tests that fail due to subprocesses diff --git a/pkgs/development/python-modules/django/2_2.nix b/pkgs/development/python-modules/django/2_2.nix index 99f71b9d862..3a88f0703d0 100644 --- a/pkgs/development/python-modules/django/2_2.nix +++ b/pkgs/development/python-modules/django/2_2.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.2.15"; + version = "2.2.16"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "3e2f5d172215862abf2bac3138d8a04229d34dbd2d0dab42c6bf33876cc22323"; + sha256 = "1535g2r322cl4x52fb0dmzlbg23539j2wx6027j54p22xvjlbkv2"; }; patches = stdenv.lib.optional withGdal diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 51ddaa0de23..754fe962b5a 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dropbox"; - version = "10.3.1"; + version = "10.4.1"; src = fetchPypi { inherit pname version; - sha256 = "6de5f6f36aad32d4382f3d0ad88ee85a22d81d638c960667b8e1ada05db2f98c"; + sha256 = "sha256-INA50DD3wfVPItGCgywZCe5bViatUkaaGdJ0vwcEHgY="; }; # Set DROPBOX_TOKEN environment variable to a valid token. diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix index 6f52eb392a5..916812f1535 100644 --- a/pkgs/development/python-modules/glom/default.nix +++ b/pkgs/development/python-modules/glom/default.nix @@ -21,9 +21,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ boltons attrs face ]; checkInputs = [ pytest pyyaml ]; - checkPhase = "pytest glom/test"; - - doCheck = !isPy37; # https://github.com/mahmoud/glom/issues/72 + # test_cli.py checks the output of running "glom" + checkPhase = "PATH=$out/bin:$PATH pytest glom/test"; meta = with stdenv.lib; { homepage = "https://github.com/mahmoud/glom"; diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 14a9c7841a8..4b02cfdfa37 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.12.1"; + version = "1.12.2"; src = fetchPypi { inherit pname version; - sha256 = "ddadc243ce627512c2a27e11d369f5ddf658ef80dbffb247787499486ef1ea98"; + sha256 = "54a7d330833a2e7b0587446d7e4ae6d0244925a9a8e1dfe878f3f7e06cdedb62"; }; # No tests included in archive diff --git a/pkgs/development/python-modules/google-crc32c/default.nix b/pkgs/development/python-modules/google-crc32c/default.nix new file mode 100644 index 00000000000..fbed406cebc --- /dev/null +++ b/pkgs/development/python-modules/google-crc32c/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, cffi, crc32c, pytestCheckHook }: + +buildPythonPackage rec { + pname = "google-crc32c"; + version = "1.0.0"; + + disabled = !isPy3k; + + src = fetchFromGitHub { + owner = "googleapis"; + repo = "python-crc32c"; + rev = "v${version}"; + sha256 = "0n3ggsxmk1fhq0kz6p5rcj4gypfb05i26fcn7lsawakgl7fzxqyl"; + }; + + buildInputs = [ crc32c ]; + propagatedBuildInputs = [ cffi ]; + + LDFLAGS = "-L${crc32c}/lib"; + CFLAGS = "-I${crc32c}/include"; + + checkInputs = [ pytestCheckHook crc32c ]; + pythonImportsCheck = [ "google_crc32c" ]; + + meta = with lib; { + homepage = "https://github.com/googleapis/python-crc32c"; + description = "Wrapper the google/crc32c hardware-based implementation of the CRC32C hashing algorithm"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/pkgs/development/python-modules/google_resumable_media/default.nix b/pkgs/development/python-modules/google_resumable_media/default.nix index ac8a111b3e7..5bd95004f93 100644 --- a/pkgs/development/python-modules/google_resumable_media/default.nix +++ b/pkgs/development/python-modules/google_resumable_media/default.nix @@ -1,30 +1,35 @@ -{ stdenv +{ lib , buildPythonPackage +, isPy3k , fetchPypi , six , requests , setuptools , pytest , mock +, crcmod +, google-crc32c }: buildPythonPackage rec { pname = "google-resumable-media"; - version = "0.7.1"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "57841f5e65fb285c01071f439724745b2549a72eb75e5fd979198eb518608ed0"; + sha256 = "FzrMa63hSApSn6KcbCcXVDri3AnULpRh/bhvOVAu/PI="; }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ requests setuptools six ]; + propagatedBuildInputs = [ requests setuptools six ] + ++ lib.optional isPy3k google-crc32c + ++ lib.optional (!isPy3k) crcmod; checkPhase = '' py.test tests/unit ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilities for Google Media Downloads and Resumable Uploads"; homepage = "https://github.com/GoogleCloudPlatform/google-resumable-media-python"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index 622360edd24..9013c7d978f 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -1,14 +1,13 @@ { stdenv , lib , buildPythonPackage +, pythonOlder , fetchFromGitHub , six -, enum34 , decorator , nose , krb5Full , darwin -, isPy27 , parameterized , shouldbe , cython @@ -18,13 +17,14 @@ buildPythonPackage rec { pname = "gssapi"; - version = "1.6.2"; + version = "1.6.9"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pythongssapi"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "195x3zqzyv491i9hf7l4asmic5pb2w3l1r7bps89651wkb3mrz1l"; + sha256 = "1shm3pc0l2r91qadkpq4bx45my0165nw3kdcp0gw4lk50z215hag"; }; # It's used to locate headers @@ -41,7 +41,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ decorator six - ] ++ lib.optional isPy27 enum34; + ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.GSS @@ -55,12 +55,21 @@ buildPythonPackage rec { six ]; - doCheck = !stdenv.isDarwin; # many failures on darwin + doCheck = pythonOlder "3.8" # `shouldbe` not available + && !stdenv.isDarwin; # many failures on darwin + # skip tests which fail possibly due to be an upstream issue (see + # https://github.com/pythongssapi/python-gssapi/issues/220) checkPhase = '' + # some tests don't respond to being disabled through nosetests -x + echo $'\ndel CredsTestCase.test_add_with_impersonate' >> gssapi/tests/test_high_level.py + echo $'\ndel TestBaseUtilities.test_acquire_creds_impersonate_name' >> gssapi/tests/test_raw.py + echo $'\ndel TestBaseUtilities.test_add_cred_impersonate_name' >> gssapi/tests/test_raw.py + export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" - ${python.interpreter} setup.py nosetests + ${python.interpreter} setup.py nosetests -e 'ext_test_\d.*' ''; + pythonImportsCheck = [ "gssapi" ]; meta = with lib; { homepage = "https://pypi.python.org/pypi/gssapi"; diff --git a/pkgs/development/python-modules/gumath/default.nix b/pkgs/development/python-modules/gumath/default.nix index 2937b876dec..ccf1627d7f3 100644 --- a/pkgs/development/python-modules/gumath/default.nix +++ b/pkgs/development/python-modules/gumath/default.nix @@ -1,4 +1,6 @@ -{ buildPythonPackage +{ stdenv +, buildPythonPackage +, python , numba , ndtypes , xnd @@ -25,4 +27,20 @@ buildPythonPackage { --replace 'add_runtime_library_dirs = ["$ORIGIN"]' \ 'add_runtime_library_dirs = ["${libndtypes}/lib", "${libxnd}/lib", "${libgumath}/lib"]' ''; + + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -add_rpath ${libgumath}/lib $out/${python.sitePackages}/gumath/_gumath.*.so + ''; + + checkPhase = '' + pushd python + mv gumath _gumath + # minor precision issues + substituteInPlace test_gumath.py --replace 'test_sin' 'dont_test_sin' + python test_gumath.py + python test_xndarray.py + popd + ''; + } + diff --git a/pkgs/development/python-modules/http-parser/default.nix b/pkgs/development/python-modules/http-parser/default.nix new file mode 100644 index 00000000000..d98785576f4 --- /dev/null +++ b/pkgs/development/python-modules/http-parser/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest +}: + +buildPythonPackage rec { + pname = "http-parser"; + version = "0.9.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "benoitc"; + repo = pname; + rev = version; + sha256 = "05byv1079qi7ypvzm13yf5nc23ink6gr6c5wrhq7fwld4syscy2q"; + }; + + checkInputs = [ pytest ]; + + checkPhase = "pytest testing/"; + + pythonImportsCheck = [ "http_parser" ]; + + meta = with lib; { + description = "HTTP request/response parser for python in C"; + homepage = "https://github.com/benoitc/http-parser"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index c7a4fc3f423..99b7f304a9e 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -3,27 +3,28 @@ , fetchFromGitHub , pythonOlder , python -, blinker, bugsnag, click, dropbox, fasteners, keyring, keyrings-alt, pathspec, Pyro5, requests, u-msgpack-python, watchdog +, blinker, bugsnag, click, dbus-next, dropbox, fasteners, keyring, keyrings-alt, pathspec, Pyro5, requests, sqlalchemy, u-msgpack-python, watchdog , sdnotify , systemd }: buildPythonPackage rec { pname = "maestral"; - version = "1.1.0"; + version = "1.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; rev = "v${version}"; - sha256 = "0d1pxbg69ll07w4bbpzs7zz1yn82qyrym95b0mqmhrrg2ysxjngg"; + sha256 = "sha256-/xm6sGios5N68X94GqFFzH1jNSMK1OnvQiEykU9IAZU="; }; propagatedBuildInputs = [ blinker bugsnag click + dbus-next dropbox fasteners keyring @@ -31,6 +32,7 @@ buildPythonPackage rec { pathspec Pyro5 requests + sqlalchemy u-msgpack-python watchdog ] ++ stdenv.lib.optionals stdenv.isLinux [ diff --git a/pkgs/development/python-modules/mock-open/default.nix b/pkgs/development/python-modules/mock-open/default.nix index 449430a593d..391ba29a98c 100644 --- a/pkgs/development/python-modules/mock-open/default.nix +++ b/pkgs/development/python-modules/mock-open/default.nix @@ -1,17 +1,24 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, mock }: +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, pythonOlder, mock }: buildPythonPackage rec { pname = "mock-open"; - version = "1.3.1"; + version = "1.4.0"; # no tests in PyPI tarball src = fetchFromGitHub { owner = "nivbend"; repo = pname; rev = "v${version}"; - sha256 = "0ikhrhlkl5c7qbigpsv44jw89ws1z7j06gzyg5dh1ki533ifbjm2"; + sha256 = "0qlz4y8jqxsnmqg03yp9f87rmnjrvmxm5qvm6n1218gm9k5dixbm"; }; + patches = lib.optional (pythonOlder "3.0") + (fetchpatch { + name = "ascii-only.patch"; + url = "https://github.com/das-g/mock-open/commit/521ff260da127949fe4aceff1667cba223c5b07b.patch"; + sha256 = "0ampbhk7kwkn0q5d2h9wrflkr8fji2bybmdck4qdzw1qkslfwwrn"; + }); + propagatedBuildInputs = lib.optional (pythonOlder "3.3") mock; meta = with lib; { diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index a7de28afcc3..234fdbebc00 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -1,5 +1,6 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27 , decorator +, http-parser , importlib-metadata , python , python_magic @@ -8,11 +9,11 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.8.9"; + version = "3.9.0"; src = fetchPypi { inherit pname version; - sha256 = "12gfqp7y7w6bgky3daxdggdzp08cg9ss64hbf5f49kywvsmcs01i"; + sha256 = "1n1h9xbi1my0vgjsh7mfkd51qfa6imjzxnwqccsvshqa8grcv1wm"; }; patchPhase = '' @@ -24,6 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ decorator + http-parser python_magic urllib3 six diff --git a/pkgs/development/python-modules/mohawk/default.nix b/pkgs/development/python-modules/mohawk/default.nix new file mode 100644 index 00000000000..e260bb7b54a --- /dev/null +++ b/pkgs/development/python-modules/mohawk/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchPypi, python, mock, nose, pytest, six }: + +with lib; +buildPythonPackage rec { + pname = "mohawk"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "08wppsv65yd0gdxy5zwq37yp6jmxakfz4a2yx5wwq2d222my786j"; + }; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ mock nose pytest ]; + + checkPhase = '' + pytest mohawk/tests.py + ''; + + meta = { + description = "Python library for Hawk HTTP authorization."; + homepage = "https://github.com/kumar303/mohawk"; + license = licenses.mpl20; + maintainers = [ ]; + }; +} diff --git a/pkgs/development/python-modules/ndtypes/default.nix b/pkgs/development/python-modules/ndtypes/default.nix index 0d5923820d2..0a6e5635a4f 100644 --- a/pkgs/development/python-modules/ndtypes/default.nix +++ b/pkgs/development/python-modules/ndtypes/default.nix @@ -1,4 +1,6 @@ -{ buildPythonPackage +{ stdenv +, buildPythonPackage +, python , numpy , libndtypes , isPy27 @@ -24,5 +26,14 @@ buildPythonPackage { postInstall = '' mkdir $out/include cp python/ndtypes/*.h $out/include + '' + stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -add_rpath ${libndtypes}/lib $out/${python.sitePackages}/ndtypes/_ndtypes.*.so + ''; + + checkPhase = '' + pushd python + mv ndtypes _ndtypes + python test_ndtypes.py + popd ''; } diff --git a/pkgs/development/python-modules/netaddr/default.nix b/pkgs/development/python-modules/netaddr/default.nix index 200392c85f8..95f567a6c0c 100644 --- a/pkgs/development/python-modules/netaddr/default.nix +++ b/pkgs/development/python-modules/netaddr/default.nix @@ -1,41 +1,32 @@ { stdenv , buildPythonPackage , fetchPypi -, pytest -, fetchpatch +, pythonOlder , glibcLocales +, importlib-resources +, pytestCheckHook }: buildPythonPackage rec { pname = "netaddr"; - version = "0.7.19"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "38aeec7cdd035081d3a4c306394b19d677623bf76fa0913f6695127c7753aefd"; + sha256 = "0hx2npi0wnhwlcybilgwlddw6qffx1mb7a3sj4p9s7bvl33mgk6n"; }; LC_ALL = "en_US.UTF-8"; - checkInputs = [ glibcLocales pytest ]; - checkPhase = '' - # fails on python3.7: https://github.com/drkjam/netaddr/issues/182 - py.test \ - -k 'not test_ip_splitter_remove_prefix_larger_than_input_range' \ - netaddr/tests - ''; + propagatedBuildInputs = stdenv.lib.optionals (pythonOlder "3.7") [ importlib-resources ]; - patches = [ - (fetchpatch { - url = "https://github.com/drkjam/netaddr/commit/2ab73f10be7069c9412e853d2d0caf29bd624012.patch"; - sha256 = "0s1cdn9v5alpviabhcjmzc0m2pnpq9dh2fnnk2x96dnry1pshg39"; - }) - ]; + checkInputs = [ glibcLocales pytestCheckHook ]; meta = with stdenv.lib; { - homepage = "https://github.com/drkjam/netaddr/"; + homepage = "https://netaddr.readthedocs.io/en/latest/"; + downloadPage = "https://github.com/netaddr/netaddr/releases"; + changelog = "https://netaddr.readthedocs.io/en/latest/changes.html"; description = "A network address manipulation library for Python"; license = licenses.mit; }; - } diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 7ac4bc5fdbe..04fe19377f8 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "notebook"; - version = "6.1.3"; + version = "6.1.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "9990d51b9931a31e681635899aeb198b4c4b41586a9e87fbfaaed1a71d0a05b6"; + sha256 = "0cnyi4zd3byh7zixdj2q71axm31xgjiyfklh1c63c87acgwh2zb8"; }; LC_ALL = "en_US.utf8"; @@ -67,6 +67,9 @@ buildPythonPackage rec { "TestInstallServerExtension" "launch_socket" "sock_server" + ] ++ lib.optional stdenv.isDarwin [ + "test_delete" + "test_checkpoints_follow_file" ]; # Some of the tests use localhost networking. diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix index 8353e8d7895..09cda279730 100644 --- a/pkgs/development/python-modules/pamqp/default.nix +++ b/pkgs/development/python-modules/pamqp/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "3.0.1"; + version = "2.3.0"; pname = "pamqp"; src = fetchPypi { inherit pname version; - sha256 = "0a9b49bde3f554ec49b47ebdb789133979985f24d5f4698935ed589a2d4392a4"; + sha256 = "1s4lwbsiikz3czqad7jarb7k303q0wamla0rirghvwl9bslgbl2w"; }; buildInputs = [ mock nose pep8 pylint mccabe ]; diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index 4fb029bad50..7b160237d5e 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "parse"; - version = "1.16.0"; + version = "1.18.0"; src = fetchPypi { inherit pname version; - sha256 = "cd89e57aed38dcf3e0ff8253f53121a3b23e6181758993323658bffc048a5c19"; + sha256 = "91666032d6723dc5905248417ef0dc9e4c51df9526aaeef271eacad6491f06a4"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix index 9f3c009f8c1..332f5153a98 100644 --- a/pkgs/development/python-modules/pecan/default.nix +++ b/pkgs/development/python-modules/pecan/default.nix @@ -1,38 +1,59 @@ { stdenv , fetchPypi , buildPythonPackage +, isPy27 # Python deps -, singledispatch , logutils -, webtest , Mako +, singledispatch +, six +, webtest +# Test Inputs +, pytestCheckHook , genshi -, Kajiki -, sqlalchemy , gunicorn , jinja2 -, virtualenv +, Kajiki , mock +, sqlalchemy +, uwsgi +, virtualenv }: buildPythonPackage rec { pname = "pecan"; - version = "1.3.3"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "b5461add4e3f35a7ee377b3d7f72ff13e93f40f3823b3208ab978b29bde936ff"; + sha256 = "4b2acd6802a04b59e306d0a6ccf37701d24376f4dc044bbbafba3afdf9d3389a"; }; - propagatedBuildInputs = [ singledispatch logutils ]; - buildInputs = [ - webtest Mako genshi Kajiki sqlalchemy gunicorn jinja2 virtualenv + propagatedBuildInputs = [ + logutils + Mako + singledispatch + six + webtest ]; - checkInputs = [ mock ]; + checkInputs = [ + pytestCheckHook + genshi + gunicorn + jinja2 + mock + sqlalchemy + virtualenv + ] ++ stdenv.lib.optionals isPy27 [ Kajiki ]; + + pytestFlagsArray = [ + "--pyargs pecan " + ]; meta = with stdenv.lib; { description = "Pecan"; - homepage = "https://github.com/pecan/pecan"; + homepage = "http://www.pecanpy.org/"; + changelog = "https://pecan.readthedocs.io/en/latest/changes.html"; }; } diff --git a/pkgs/development/python-modules/pykdl/default.nix b/pkgs/development/python-modules/pykdl/default.nix new file mode 100644 index 00000000000..5fc38cd5dd4 --- /dev/null +++ b/pkgs/development/python-modules/pykdl/default.nix @@ -0,0 +1,20 @@ +{ lib, stdenv, toPythonModule, cmake, orocos-kdl, python, sip }: + +toPythonModule (stdenv.mkDerivation { + pname = "pykdl"; + inherit (orocos-kdl) version src; + + sourceRoot = "source/python_orocos_kdl"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ orocos-kdl ]; + propagatedBuildInputs = [ python sip ]; + + meta = with lib; { + description = "Kinematics and Dynamics Library (Python bindings)"; + homepage = "https://www.orocos.org/kdl.html"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ lopsided98 ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch b/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch index ca723a0e573..db6895edfbf 100644 --- a/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch +++ b/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch @@ -1,119 +1,100 @@ -diff -ru PySDL2-0.9.6-old/sdl2/dll.py PySDL2-0.9.6/sdl2/dll.py ---- PySDL2-0.9.6-old/sdl2/dll.py 2018-03-08 10:18:37.583471745 +0100 -+++ PySDL2-0.9.6/sdl2/dll.py 2018-03-08 10:20:06.705517520 +0100 -@@ -45,29 +45,31 @@ +diff -ru PySDL2-0.9.7-old/sdl2/dll.py PySDL2-0.9.7/sdl2/dll.py +--- PySDL2-0.9.7-old/sdl2/dll.py 2020-02-15 09:36:29.000000000 +0100 ++++ PySDL2-0.9.7/sdl2/dll.py 2020-09-23 20:24:09.365497270 +0200 +@@ -94,15 +94,16 @@ """Function wrapper around the different DLL functions. Do not use or instantiate this one directly from your user code. """ - def __init__(self, libinfo, libnames, path=None): -- self._dll = None ++ def __init__(self, libinfo, libfile): + self._dll = None + self._libname = libinfo + self._version = None - foundlibs = _findlib(libnames, path) - dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset") - if len(foundlibs) == 0: - raise RuntimeError("could not find any library for %s (%s)" % - (libinfo, dllmsg)) -- for libfile in foundlibs: -- try: -- self._dll = CDLL(libfile) -- self._libfile = libfile -- break -- except Exception as exc: -- # Could not load the DLL, move to the next, but inform the user -- # about something weird going on - this may become noisy, but -- # is better than confusing the users with the RuntimeError below -- warnings.warn(repr(exc), DLLWarning) -- if self._dll is None: -- raise RuntimeError("found %s, but it's not usable for the library %s" % -- (foundlibs, libinfo)) ++ #foundlibs = _findlib(libnames, path) ++ #dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset") ++ #if len(foundlibs) == 0: ++ # raise RuntimeError("could not find any library for %s (%s)" % ++ # (libinfo, dllmsg)) ++ foundlibs = [ libfile ] + for libfile in foundlibs: + try: + self._dll = CDLL(libfile) +@@ -117,9 +118,9 @@ + if self._dll is None: + raise RuntimeError("found %s, but it's not usable for the library %s" % + (foundlibs, libinfo)) - if path is not None and sys.platform in ("win32",) and \ - path in self._libfile: - os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"]) -+ def __init__(self, libfile): -+ self._dll = CDLL(libfile) -+ self._libfile = libfile -+ # self._dll = None -+ # foundlibs = _findlib(libnames, path) -+ # dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset") -+ # if len(foundlibs) == 0: -+ # raise RuntimeError("could not find any library for %s (%s)" % -+ # (libinfo, dllmsg)) -+ # for libfile in foundlibs: -+ # try: -+ # self._dll = CDLL(libfile) -+ # self._libfile = libfile -+ # break -+ # except Exception as exc: -+ # # Could not load the DLL, move to the next, but inform the user -+ # # about something weird going on - this may become noisy, but -+ # # is better than confusing the users with the RuntimeError below -+ # warnings.warn(repr(exc), DLLWarning) -+ # if self._dll is None: -+ # raise RuntimeError("found %s, but it's not usable for the library %s" % -+ # (foundlibs, libinfo)) -+ # if path is not None and sys.platform in ("win32",) and \ -+ # path in self._libfile: -+ # os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"]) ++ #if path is not None and sys.platform in ("win32",) and \ ++ # path in self._libfile: ++ # os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"]) - def bind_function(self, funcname, args=None, returns=None, optfunc=None): + def bind_function(self, funcname, args=None, returns=None, added=None): """Binds the passed argument and return value types to the specified -@@ -110,7 +112,7 @@ +@@ -220,7 +221,7 @@ return try: - dll = DLL("SDL2", ["SDL2", "SDL2-2.0"], os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2") ++ dll = DLL("SDL2", "@sdl2@") except RuntimeError as exc: raise ImportError(exc) -diff -ru PySDL2-0.9.6-old/sdl2/sdlgfx.py PySDL2-0.9.6/sdl2/sdlgfx.py ---- PySDL2-0.9.6-old/sdl2/sdlgfx.py 2018-03-08 10:18:37.585471769 +0100 -+++ PySDL2-0.9.6/sdl2/sdlgfx.py 2018-03-08 10:20:06.705517520 +0100 -@@ -34,8 +34,7 @@ +diff -ru PySDL2-0.9.7-old/sdl2/sdlgfx.py PySDL2-0.9.7/sdl2/sdlgfx.py +--- PySDL2-0.9.7-old/sdl2/sdlgfx.py 2020-02-02 11:07:00.000000000 +0100 ++++ PySDL2-0.9.7/sdl2/sdlgfx.py 2020-09-23 20:23:56.997419129 +0200 +@@ -39,8 +39,7 @@ ] try: - dll = DLL("SDL2_gfx", ["SDL2_gfx", "SDL2_gfx-1.0"], - os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2_gfx") ++ dll = DLL("SDL2_gfx", "@sdl2_gfx@") except RuntimeError as exc: raise ImportError(exc) -diff -ru PySDL2-0.9.6-old/sdl2/sdlimage.py PySDL2-0.9.6/sdl2/sdlimage.py ---- PySDL2-0.9.6-old/sdl2/sdlimage.py 2018-03-08 10:18:37.585471769 +0100 -+++ PySDL2-0.9.6/sdl2/sdlimage.py 2018-03-08 10:20:06.705517520 +0100 -@@ -26,8 +26,7 @@ +diff -ru PySDL2-0.9.7-old/sdl2/sdlimage.py PySDL2-0.9.7/sdl2/sdlimage.py +--- PySDL2-0.9.7-old/sdl2/sdlimage.py 2020-02-02 11:07:00.000000000 +0100 ++++ PySDL2-0.9.7/sdl2/sdlimage.py 2020-09-23 20:23:50.085375658 +0200 +@@ -27,8 +27,7 @@ ] try: - dll = DLL("SDL2_image", ["SDL2_image", "SDL2_image-2.0"], - os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2_image") ++ dll = DLL("SDL2_image", "@sdl2_image@") except RuntimeError as exc: raise ImportError(exc) -diff -ru PySDL2-0.9.6-old/sdl2/sdlmixer.py PySDL2-0.9.6/sdl2/sdlmixer.py ---- PySDL2-0.9.6-old/sdl2/sdlmixer.py 2018-03-08 10:18:37.585471769 +0100 -+++ PySDL2-0.9.6/sdl2/sdlmixer.py 2018-03-08 10:20:27.415758478 +0100 -@@ -50,8 +50,7 @@ +diff -ru PySDL2-0.9.7-old/sdl2/sdlmixer.py PySDL2-0.9.7/sdl2/sdlmixer.py +--- PySDL2-0.9.7-old/sdl2/sdlmixer.py 2020-02-02 11:07:00.000000000 +0100 ++++ PySDL2-0.9.7/sdl2/sdlmixer.py 2020-09-23 20:23:46.117350771 +0200 +@@ -53,8 +53,7 @@ ] try: - dll = DLL("SDL2_mixer", ["SDL2_mixer", "SDL2_mixer-2.0"], - os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2_mixer") ++ dll = DLL("SDL2_mixer", "@sdl2_mixer@") except RuntimeError as exc: raise ImportError(exc) -diff -ru PySDL2-0.9.6-old/sdl2/sdlttf.py PySDL2-0.9.6/sdl2/sdlttf.py ---- PySDL2-0.9.6-old/sdl2/sdlttf.py 2018-03-08 10:18:37.585471769 +0100 -+++ PySDL2-0.9.6/sdl2/sdlttf.py 2018-03-08 10:20:06.705517520 +0100 -@@ -38,8 +38,7 @@ +diff -ru PySDL2-0.9.7-old/sdl2/sdlttf.py PySDL2-0.9.7/sdl2/sdlttf.py +--- PySDL2-0.9.7-old/sdl2/sdlttf.py 2020-02-02 11:07:00.000000000 +0100 ++++ PySDL2-0.9.7/sdl2/sdlttf.py 2020-09-23 20:23:40.069312931 +0200 +@@ -39,8 +39,7 @@ ] try: - dll = DLL("SDL2_ttf", ["SDL2_ttf", "SDL2_ttf-2.0"], - os.getenv("PYSDL2_DLL_PATH")) -+ dll = DLL("SDL2_ttf") ++ dll = DLL("SDL2_ttf", "@sdl2_ttf@") except RuntimeError as exc: raise ImportError(exc) diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index b22da8b83ac..be9663245bb 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchPypi, buildPythonPackage, SDL2, SDL2_ttf, SDL2_image, SDL2_gfx, SDL2_mixer }: +{ stdenv, lib, substituteAll, fetchPypi, buildPythonPackage, SDL2, SDL2_ttf, SDL2_image, SDL2_gfx, SDL2_mixer }: buildPythonPackage rec { pname = "PySDL2"; @@ -18,19 +18,18 @@ buildPythonPackage rec { # which library they want to include. buildInputs = [ SDL2_ttf SDL2_image SDL2_gfx SDL2_mixer ]; propagatedBuildInputs = [ SDL2 ]; - patches = [ ./PySDL2-dll.patch ]; - postPatch = '' - substituteInPlace sdl2/dll.py --replace \ - "DLL(\"SDL2\")" "DLL('${SDL2}/lib/libSDL2${stdenv.hostPlatform.extensions.sharedLibrary}')" - substituteInPlace sdl2/sdlttf.py --replace \ - "DLL(\"SDL2_ttf\")" "DLL('${SDL2_ttf}/lib/libSDL2_ttf${stdenv.hostPlatform.extensions.sharedLibrary}')" - substituteInPlace sdl2/sdlimage.py --replace \ - "DLL(\"SDL2_image\")" "DLL('${SDL2_image}/lib/libSDL2_image${stdenv.hostPlatform.extensions.sharedLibrary}')" - substituteInPlace sdl2/sdlgfx.py --replace \ - "DLL(\"SDL2_gfx\")" "DLL('${SDL2_gfx}/lib/libSDL2_gfx${stdenv.hostPlatform.extensions.sharedLibrary}')" - substituteInPlace sdl2/sdlmixer.py --replace \ - "DLL(\"SDL2_mixer\")" "DLL('${SDL2_mixer}/lib/libSDL2_mixer${stdenv.hostPlatform.extensions.sharedLibrary}')" - ''; + patches = [ + (substituteAll ({ + src = ./PySDL2-dll.patch; + } // builtins.mapAttrs (_: pkg: "${pkg}/lib/lib${pkg.pname}${stdenv.hostPlatform.extensions.sharedLibrary}") { + # substituteAll keys must start lowercase + sdl2 = SDL2; + sdl2_ttf = SDL2_ttf; + sdl2_image = SDL2_image; + sdl2_gfx = SDL2_gfx; + sdl2_mixer = SDL2_mixer; + })) + ]; meta = { description = "A wrapper around the SDL2 library and as such similar to the discontinued PySDL project"; diff --git a/pkgs/development/python-modules/pyspice/default.nix b/pkgs/development/python-modules/pyspice/default.nix new file mode 100644 index 00000000000..f2cce09c8b3 --- /dev/null +++ b/pkgs/development/python-modules/pyspice/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, libngspice +, numpy +, ply +, scipy +, pyyaml +, cffi +, requests +, matplotlib +, setuptools +}: + +buildPythonPackage rec { + pname = "PySpice"; + version = "1.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0mnyy8nr06d1al99kniyqcm0p9a8dvkg719s42sajl8yf51sayc9"; + }; + + propagatedBuildInputs = [ + setuptools + requests + pyyaml + cffi + matplotlib + numpy + ply + scipy + libngspice + ]; + + doCheck = false; + pythonImportsCheck = [ "PySpice" ]; + + postPatch = '' + substituteInPlace PySpice/Spice/NgSpice/Shared.py --replace \ + "ffi.dlopen(self.library_path)" \ + "ffi.dlopen('${libngspice}/lib/libngspice${stdenv.hostPlatform.extensions.sharedLibrary}')" + ''; + + meta = with stdenv.lib; { + description = "Simulate electronic circuit using Python and the Ngspice / Xyce simulators"; + homepage = "https://github.com/FabriceSalvaire/PySpice"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ matthuszagh ]; + }; +} diff --git a/pkgs/development/python-modules/pytabix/default.nix b/pkgs/development/python-modules/pytabix/default.nix new file mode 100644 index 00000000000..eb21ca19818 --- /dev/null +++ b/pkgs/development/python-modules/pytabix/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, isPy3k +, fetchPypi +, zlib +}: + +buildPythonPackage rec { + pname = "pytabix"; + version = "0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ldp5r4ggskji6qx4bp2qxy2vrvb3fam03ksn0gq2hdxgrlg2x07"; + }; + + buildInputs = [ zlib ]; + + doCheck = !isPy3k; + preCheck = '' + substituteInPlace test/test.py \ + --replace 'test_remote_file' 'dont_test_remote_file' + ''; + pythonImportsCheck = [ "tabix" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/slowkow/pytabix"; + description = "Python interface for tabix"; + license = licenses.mit; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/pkgs/development/python-modules/python-docx/default.nix b/pkgs/development/python-modules/python-docx/default.nix index 15ccd45760d..025a13958cd 100644 --- a/pkgs/development/python-modules/python-docx/default.nix +++ b/pkgs/development/python-modules/python-docx/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { checkPhase = '' py.test tests + behave --format progress --stop --tags=-wip ''; meta = { diff --git a/pkgs/development/python-modules/pyxnat/default.nix b/pkgs/development/python-modules/pyxnat/default.nix new file mode 100644 index 00000000000..2c255753722 --- /dev/null +++ b/pkgs/development/python-modules/pyxnat/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, nose +, lxml +, requests +}: + +buildPythonPackage rec { + pname = "pyxnat"; + version = "1.3"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "113d13cs5ab7wy4vmyqyh8isjhlgfvan7y2g8n25vcpn3j4j00h0"; + }; + + propagatedBuildInputs = [ lxml requests ]; + + checkInputs = [ nose ]; + checkPhase = "nosetests pyxnat/tests"; + doCheck = false; # requires a docker container running an XNAT server + + pythonImportsCheck = [ "pyxnat" ]; + + meta = with lib; { + homepage = "https://pyxnat.github.io/pyxnat"; + description = "Python API to XNAT"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/rabbitpy/default.nix b/pkgs/development/python-modules/rabbitpy/default.nix index 26f3ffd4fe6..9844c8dca44 100644 --- a/pkgs/development/python-modules/rabbitpy/default.nix +++ b/pkgs/development/python-modules/rabbitpy/default.nix @@ -7,7 +7,7 @@ }: buildPythonPackage rec { - version = "1.0.0"; + version = "2.0.1"; pname = "rabbitpy"; # No tests in the pypi tarball, so we directly fetch from git @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "gmr"; repo = pname; rev = version; - sha256 = "0fd80zlr4p2sh77rxyyfi9l0h2zqi2csgadr0rhnpgpqsy10qck6"; + sha256 = "0m5z3i3d5adrz1wh6y35xjlls3cq6p4y9p1mzghw3k7hdvg26cck"; }; propagatedBuildInputs = [ pamqp ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { postPatch = '' # See: https://github.com/gmr/rabbitpy/issues/118 substituteInPlace setup.py \ - --replace 'pamqp>=1.6.1,<2.0' 'pamqp' + --replace 'pamqp>=2,<3' 'pamqp' ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/rising/default.nix b/pkgs/development/python-modules/rising/default.nix new file mode 100644 index 00000000000..eb9afc8353c --- /dev/null +++ b/pkgs/development/python-modules/rising/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +, pytestCheckHook +, pytestcov +, dill +, numpy +, pytorch +, threadpoolctl +, tqdm +}: + +buildPythonPackage rec { + pname = "rising"; + version = "0.2.0post0"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "PhoenixDL"; + repo = pname; + rev = "v${version}"; + sha256 = "0fb9894ppcp18wc2dhhjizj8ja53gbv9wpql4mixxxdz8z2bn33c"; + }; + + propagatedBuildInputs = [ numpy pytorch threadpoolctl tqdm ]; + checkInputs = [ dill pytestcov pytestCheckHook ]; + + disabledTests = [ "test_affine" ]; # deprecated division operator '/' + + meta = { + description = "High-performance data loading and augmentation library in PyTorch"; + homepage = "https://rising.rtfd.io"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/scikit-optimize/default.nix b/pkgs/development/python-modules/scikit-optimize/default.nix index f8e30397189..0a5171f22fb 100644 --- a/pkgs/development/python-modules/scikit-optimize/default.nix +++ b/pkgs/development/python-modules/scikit-optimize/default.nix @@ -1,25 +1,29 @@ { lib +, isPy27 , buildPythonPackage , fetchFromGitHub +, matplotlib , numpy , scipy , scikitlearn , pyaml -, pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "scikit-optimize"; - version = "0.6"; + version = "0.8.1"; + disabled = isPy27; src = fetchFromGitHub { owner = "scikit-optimize"; repo = "scikit-optimize"; rev = "v${version}"; - sha256 = "1srbb20k8ddhpcfxwdflapfh6xfyrd3dnclcg3bsfq1byrcmv0d4"; + sha256 = "1bz8gxccx8n99abw49j8h5zf3i568g5hcf8nz1yinma8jqhxjkjh"; }; propagatedBuildInputs = [ + matplotlib numpy scipy scikitlearn @@ -27,14 +31,9 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook ]; - # remove --ignore at next release > 0.6 - checkPhase = '' - pytest skopt --ignore skopt/tests/test_searchcv.py - ''; - meta = with lib; { description = "Sequential model-based optimization toolbox"; homepage = "https://scikit-optimize.github.io/"; diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix index 7927da30c89..d85d8e396f2 100644 --- a/pkgs/development/python-modules/scikits-odes/default.nix +++ b/pkgs/development/python-modules/scikits-odes/default.nix @@ -6,6 +6,7 @@ , cython , enum34 , gfortran +, isPy27 , isPy3k , numpy , pytest @@ -18,6 +19,8 @@ buildPythonPackage rec { pname = "scikits.odes"; version = "2.6.1"; + disabled = isPy27; + src = fetchPypi { inherit pname version; sha256 = "0kbf2n16h9s35x6pavlx6sff0pqr68i0x0609z92a4vadni32n6b"; @@ -46,7 +49,7 @@ buildPythonPackage rec { description = "A scikit offering extra ode/dae solvers, as an extension to what is available in scipy"; homepage = "https://github.com/bmcage/odes"; license = licenses.bsd3; - maintainers = with maintainers; [ flokli idontgetoutmuch ]; + maintainers = with maintainers; [ idontgetoutmuch ]; platforms = [ "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/development/python-modules/segments/default.nix b/pkgs/development/python-modules/segments/default.nix new file mode 100644 index 00000000000..8c2e22708aa --- /dev/null +++ b/pkgs/development/python-modules/segments/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, regex +, csvw +, clldutils +, mock +, pytestCheckHook +, pytest-mock +}: + +buildPythonPackage rec { + pname = "segments"; + version = "2.1.3"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "cldf"; + repo = pname; + rev = "v${version}"; + sha256 = "12lnpk834r3y7hw5x7nvswa60ddh69ylvr44k46gqcfba160hhb0"; + }; + + patchPhase = '' + substituteInPlace setup.cfg --replace "--cov" "" + ''; + + propagatedBuildInputs = [ + regex + csvw + clldutils + ]; + + checkInputs = [ + mock + pytestCheckHook + pytest-mock + ]; + + meta = with lib; { + description = "Unicode Standard tokenization routines and orthography profile segmentation"; + homepage = "https://github.com/cldf/segments"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/shouldbe/default.nix b/pkgs/development/python-modules/shouldbe/default.nix index 1623d216ac9..068ed934311 100644 --- a/pkgs/development/python-modules/shouldbe/default.nix +++ b/pkgs/development/python-modules/shouldbe/default.nix @@ -1,5 +1,6 @@ { stdenv , buildPythonPackage +, pythonAtLeast , fetchPypi , nose , forbiddenfruit @@ -8,6 +9,8 @@ buildPythonPackage rec { version = "0.1.2"; pname = "shouldbe"; + # incompatible, https://github.com/DirectXMan12/should_be/issues/4 + disabled = pythonAtLeast "3.8"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 7652d2cf4c9..868ce80558a 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "1.9.3"; + version = "1.9.4"; src = fetchPypi { inherit pname version; - sha256 = "877109d0691376f8ffb380ec1daf9b867958231065660277dbc5ccf0b4bf87d0"; + sha256 = "ca9d997c475b714b54d2fd67aa140837ec3630e91cbbc2e0cd190f1b0bd9fe9d"; }; propagatedBuildInputs = [ @@ -23,7 +23,9 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Jupyter kernels for Spyder's console"; - homepage = "https://github.com/spyder-ide/spyder-kernels"; + homepage = "https://docs.spyder-ide.org/current/ipythonconsole.html"; + downloadPage = "https://github.com/spyder-ide/spyder-kernels/releases"; + changelog = "https://github.com/spyder-ide/spyder-kernels/blob/master/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ gebner ]; }; diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index acaa2e888f8..2b0276afc9d 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "spyder"; - version = "4.1.4"; + version = "4.1.5"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6946b2128afaf1b64e878a74d33f9abd60c91f75949b3d05f305b3c3f5fec1e2"; + sha256 = "d467f020b694193873a237ce6744ae36bd5a59f4d2b7ffbeb15dda68b03f5aa1"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; @@ -42,7 +42,10 @@ buildPythonPackage rec { # remove dependency on pyqtwebengine # this is still part of the pyqt 5.11 version we have in nixpkgs sed -i /pyqtwebengine/d setup.py - substituteInPlace setup.py --replace "pyqt5<5.13" "pyqt5" + substituteInPlace setup.py \ + --replace "pyqt5<5.13" "pyqt5" \ + --replace "parso==0.7.0" "parso" \ + --replace "jedi==0.17.1" "jedi" ''; postInstall = '' @@ -69,7 +72,9 @@ buildPythonPackage rec { environment for the Python language with advanced editing, interactive testing, debugging and introspection features. ''; - homepage = "https://github.com/spyder-ide/spyder/"; + homepage = "https://www.spyder-ide.org/"; + downloadPage = "https://github.com/spyder-ide/spyder/releases"; + changelog = "https://github.com/spyder-ide/spyder/blob/master/CHANGELOG.md"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ gebner ]; diff --git a/pkgs/development/python-modules/sslyze/default.nix b/pkgs/development/python-modules/sslyze/default.nix index c127f6ea2e5..24b334ef882 100644 --- a/pkgs/development/python-modules/sslyze/default.nix +++ b/pkgs/development/python-modules/sslyze/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { patchPhase = '' substituteInPlace setup.py \ - --replace "cryptography>=2.6,<=2.9" "cryptography>=2.6,<=3" + --replace "cryptography>=2.6,<=2.9" "cryptography" ''; checkInputs = [ pytest ]; @@ -39,6 +39,7 @@ buildPythonPackage rec { tests/plugins_tests/certificate_info/test_certificate_utils.py \ -k "not (TestScanner and test_client_certificate_missing)" ''; + pythonImportsCheck = [ "sslyze" ]; propagatedBuildInputs = [ nassl cryptography typing-extensions faker ]; diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix index 420ee7b2472..d34a826a060 100644 --- a/pkgs/development/python-modules/streamz/default.nix +++ b/pkgs/development/python-modules/streamz/default.nix @@ -10,6 +10,7 @@ , toolz , tornado , zict +, pythonOlder }: buildPythonPackage rec { @@ -38,6 +39,8 @@ buildPythonPackage rec { requests ]; + disabled = pythonOlder "3.6"; + # Disable test_tcp_async because fails on sandbox build # disable kafka tests checkPhase = '' diff --git a/pkgs/development/python-modules/tensorflow/1/default.nix b/pkgs/development/python-modules/tensorflow/1/default.nix index 5f65004b3d6..1aad8677ca2 100644 --- a/pkgs/development/python-modules/tensorflow/1/default.nix +++ b/pkgs/development/python-modules/tensorflow/1/default.nix @@ -132,6 +132,13 @@ let }) ./lift-gast-restriction.patch + (fetchpatch { + # fix compilation with numpy >= 1.19 + name = "add-const-overload.patch"; + url = "https://github.com/tensorflow/tensorflow/commit/75ea0b31477d6ba9e990e296bbbd8ca4e7eebadf.patch"; + sha256 = "1xp1icacig0xm0nmb05sbrf4nw4xbln9fhc308birrv8286zx7wv"; + }) + # cuda 10.2 does not have "-bin2c-path" option anymore # https://github.com/tensorflow/tensorflow/issues/34429 ../cuda-10.2-no-bin2c-path.patch diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index aa6db6a7353..328cfb0ba8b 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -6,6 +6,7 @@ , regex , requests , numpy +, parameterized , sacremoses , sentencepiece , timeout-decorator @@ -16,13 +17,13 @@ buildPythonPackage rec { pname = "transformers"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "v${version}"; - sha256 = "0wg36qrcljmpsyhjaxpqw3s1r6276yg8cq0bjrf52l4zlc5k4xzk"; + sha256 = "0jj94153kgdyklra30xcszxv11hwzfigzy82fgvgzvbwlxv3a1j5"; }; propagatedBuildInputs = [ @@ -38,6 +39,7 @@ buildPythonPackage rec { ]; checkInputs = [ + parameterized pytestCheckHook timeout-decorator ]; @@ -49,14 +51,17 @@ buildPythonPackage rec { preCheck = '' export HOME="$TMPDIR" - cd tests # This test requires the nlp module, which we haven't # packaged yet. However, nlp is optional for transformers # itself - rm test_trainer.py + rm tests/test_trainer.py ''; + # We have to run from the main directory for the tests. However, + # letting pytest discover tests leads to errors. + pytestFlagsArray = [ "tests" ]; + # Disable tests that require network access. disabledTests = [ "PegasusTokenizationTest" @@ -76,6 +81,7 @@ buildPythonPackage rec { "test_tokenizer_from_model_type" "test_tokenizer_from_model_type" "test_tokenizer_from_pretrained" + "test_tokenizer_from_tokenizer_class" "test_tokenizer_identifier_with_correct_config" ]; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 344615c9014..d905a11e341 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.16.0"; + version = "0.16.1"; src = fetchPypi { inherit pname version; - sha256 = "1js3xr3fl9bwid8hl3w2pnigqzjd2rvkncald5x1x5fg7wjy8pb6"; + sha256 = "5e1af056ff834bf62ca57da917159328fab21b1f8c25284f92083016bb2d92a5"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix index 4c98497c8b1..3d82b599dc0 100644 --- a/pkgs/development/python-modules/xlib/default.nix +++ b/pkgs/development/python-modules/xlib/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "xlib"; - version = "0.25"; + version = "0.28"; src = fetchFromGitHub { owner = "python-xlib"; repo = "python-xlib"; rev = version; - sha256 = "1nncx7v9chmgh56afg6dklz3479s5zg3kq91mzh4mj512y0skyki"; + sha256 = "13551vi65034pjf2g7zkw5dyjqcjfyk32a640g5jr055ssf0bjkc"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/xnd/default.nix b/pkgs/development/python-modules/xnd/default.nix index 558e414debf..3178e171f84 100644 --- a/pkgs/development/python-modules/xnd/default.nix +++ b/pkgs/development/python-modules/xnd/default.nix @@ -1,4 +1,6 @@ -{ buildPythonPackage +{ stdenv +, buildPythonPackage +, python , ndtypes , libndtypes , libxnd @@ -25,5 +27,14 @@ buildPythonPackage { postInstall = '' mkdir $out/include cp python/xnd/*.h $out/include + '' + stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -add_rpath ${libxnd}/lib $out/${python.sitePackages}/xnd/_xnd.*.so + ''; + + checkPhase = '' + pushd python + mv xnd _xnd + python test_xnd.py + popd ''; } diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/python-modules/yq/default.nix index cfca8a32f93..f795a8fdfad 100644 --- a/pkgs/development/tools/yq/default.nix +++ b/pkgs/development/python-modules/yq/default.nix @@ -1,6 +1,7 @@ { lib -, buildPythonApplication +, buildPythonPackage , fetchPypi +, pkgs , argcomplete , pyyaml , xmltodict @@ -9,31 +10,40 @@ , flake8 , jq , pytest +, unixtools , toml }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "yq"; - version = "2.10.1"; + version = "2.11.0"; - propagatedBuildInputs = [ pyyaml xmltodict jq argcomplete ]; + src = fetchPypi { + inherit pname version; + sha256 = "1gp9q5w1bjbw7wmba5hm8ippwvkind0p02n07fqa9jlqglhxhm46"; + }; + + propagatedBuildInputs = [ + pyyaml + xmltodict + argcomplete + ]; doCheck = true; checkInputs = [ + unixtools.script pytest coverage flake8 - jq + pkgs.jq toml ]; - checkPhase = "pytest ./test/test.py"; + # tests fails if stdin is not a tty + checkPhase = "echo | script -c 'pytest ./test/test.py'"; - src = fetchPypi { - inherit pname version; - sha256 = "1h6nnkp53mm4spwy8nyxwvh9j6p4lxvf20j4bgjskhnhaw3jl9gn"; - }; + pythonImportsCheck = [ "yq" ]; meta = with lib; { description = "Command-line YAML processor - jq wrapper for YAML documents."; diff --git a/pkgs/development/python-modules/zict/default.nix b/pkgs/development/python-modules/zict/default.nix index 0aa379322ee..c5629a6fb73 100644 --- a/pkgs/development/python-modules/zict/default.nix +++ b/pkgs/development/python-modules/zict/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, heapdict }: +, pytest, heapdict, pythonOlder }: buildPythonPackage rec { pname = "zict"; @@ -10,6 +10,8 @@ buildPythonPackage rec { sha256 = "8e2969797627c8a663575c2fc6fcb53a05e37cdb83ee65f341fc6e0c3d0ced16"; }; + disabled = pythonOlder "3.6"; + buildInputs = [ pytest ]; propagatedBuildInputs = [ heapdict ]; diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index abaff0a8067..fe7b834e8e8 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "06y4p65zzd7nmpvpnfcig58wbrav9ifbpqw1lhs2vdav17035xif"; + sha256 = "123ndg7byrflczxzhk2c48bb8wlwgqzf1m0dzi0mnw3h52qiqjyp"; }; - vendorSha256 = "0c1b06np4yhixndig11kxxvj24rk50l1sdqah8kzhi2cqjwvmpw0"; + vendorSha256 = "1prf1hffvwl2hdkrr8hqz1wwcz2n9dzhf68ziz5k3fzsx30jki9l"; doCheck = false; diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 61ed0e07af5..e10052203ed 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.25.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "liamg"; repo = pname; rev = "v${version}"; - sha256 = "06sr20zrbhyj35cyw64bk6sjj9q9lh52kc8wg1ryaimr3dc6lrn1"; + sha256 = "12n6l18g0kg28clzyzwc2lq9rnch3vshp07isgvfp7193bhf8hyv"; }; goPackagePath = "github.com/liamg/tfsec"; diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index f146929019f..ae2e63e040b 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "rocm-cmake"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index d93ec54b3e3..7c796b47f28 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.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "0nndm936g0i18ly6395y5s4h1f6cfbg602cvlg7c6w007f2j15hq"; + sha256 = "0zvf060nsd8cvyclkaasqlc9bw699vh2004qrvcy8hf50b2z1bi2"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index ae746f9c54c..af591a540d4 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "13.3.1"; + version = "13.4.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "0bm6vgdy0lhy1cw6rjsifihxrin33h8c5xwca0mgwd4f7ad64dgs"; + sha256 = "0rdnrnkm9pcdzi3ddmk0ia9r6lv548by08q1nrb7683jywr7bin3"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "1pjpqmi45c0d41cwrb8vb4lkcqarq430mni37h1bsijgqiap8rqk"; + sha256 = "1nd32vqp096h36p89c0v21yijn3dzz4ix5bwsbl20mc8m802wvg7"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "15v5m420vv3vxmmga65j0agaa7b9mn1iywkq2ggpnrnznk5m613f"; + sha256 = "124gplxs3a6kyc7b7mwsf0l02i9qi0ifjn3r2m7vq5wvk31qa97b"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 104b1c46e09..553f9ce9280 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "3.10.2"; + version = "4.0.0"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "19wdflkp4n0pds4lkliagg8l5kf9db5f5bn39akhwasc4yj0g7j2"; + sha256 = "06wpvqyv7w749l3ndvzg1p774rv1apbmbpwbdlad57pih4nqa7mm"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/development/tools/drip/default.nix b/pkgs/development/tools/drip/default.nix index 2a7d2c6626b..b4edf8ec081 100644 --- a/pkgs/development/tools/drip/default.nix +++ b/pkgs/development/tools/drip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jdk, which, makeWrapper }: +{ stdenv, fetchFromGitHub, jdk8, which, makeWrapper }: stdenv.mkDerivation rec { pname = "drip"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jdk ]; + buildInputs = [ jdk8 ]; postPatch = '' patchShebangs . diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 78db979299c..c89b7acc51d 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "6.5.4"; + version = "6.5.5"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "1ga4qhydswalz02hz32p764zipn1lw63nhqlwqq96vjj9cwj1wii"; + sha256 = "0g40lgrm9cslkdr4yn0h737djdr9fdyrc4hkq7wsrj0wx6d819dn"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index a9fb671f4a3..2f125d3ea8a 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchFromGitHub, jdk, maven, makeWrapper, jre_headless, pcsclite }: +{ stdenv, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite }: +let jdk = jdk8; jre_headless = jre8_headless; in # TODO: This is quite a bit of duplicated logic with gephi. Factor it out? stdenv.mkDerivation rec { pname = "global-platform-pro"; diff --git a/pkgs/development/tools/go-toml/default.nix b/pkgs/development/tools/go-toml/default.nix index 0cb16354b21..3d892378133 100644 --- a/pkgs/development/tools/go-toml/default.nix +++ b/pkgs/development/tools/go-toml/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "go-toml"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "pelletier"; repo = pname; rev = "v${version}"; - sha256 = "0fxmjm85c9h43lvqz71wr93fcc63bhj82nwby80222xx8ja63g7y"; + sha256 = "1pi1r9ds0vxjza4qrbk52y98wxrzh1ghwzc9c2v1w6i02pdwdcz9"; }; goPackagePath = "github.com/pelletier/go-toml"; diff --git a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix index 275aa7eb304..60b9ba3e0e4 100644 --- a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix +++ b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix @@ -1,13 +1,13 @@ -{ mkDerivation, base, containers, fetchgit, optparse-applicative -, parsec, stdenv, text +{ mkDerivation, base, containers, fetchgit, hedgehog +, optparse-applicative, parsec, stdenv, template-haskell, text }: mkDerivation { pname = "dconf2nix"; - version = "0.0.5"; + version = "0.0.6"; src = fetchgit { url = "https://github.com/gvolpe/dconf2nix.git"; - sha256 = "0immbx4bgfq3xmbbrpw441nx0sdpm4cp64s7qbvcbvllp4gbivpg"; - rev = "848ff9966db21c66e61a19c04ab6dfc9270eb78e"; + sha256 = "0ql3xrr05kg1xrfxq86mhzh5ky33sngx57sahzck3rb8fv2g6amv"; + rev = "cf976e033c1a89f897924baa219c3b227fe68489"; fetchSubmodules = true; }; isLibrary = true; @@ -16,6 +16,9 @@ mkDerivation { base containers optparse-applicative parsec text ]; executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers hedgehog parsec template-haskell text + ]; description = "Convert dconf files to Nix, as expected by Home Manager"; license = stdenv.lib.licenses.asl20; } diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index caee8058f0f..55125fbeff4 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.9.3"; + version = "0.9.4"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0mr0pxicka4qd0cn002g5r80dyg59164czyb0r7012l0q1xighz2"; + outputHash = "1k07gg13z3kambvvrxsc27781cd5npb2a50ahdbj7x6j6h67k0pg"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/argbash/default.nix b/pkgs/development/tools/misc/argbash/default.nix index fc1d3550e82..0c0511ec792 100644 --- a/pkgs/development/tools/misc/argbash/default.nix +++ b/pkgs/development/tools/misc/argbash/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "argbash"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "matejak"; repo = "argbash"; rev = "${version}"; - sha256 = "1h6kw510r43b6d6rjhkhw4d67nc7grak4mgqs9ngjjv07qj3qfqc"; + sha256 = "1xdhpbnc0xjv6ydcm122hhdjcl77jhiqnccjfqjp3cd1lfmzvg8v"; }; sourceRoot = "source/resources"; diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 6f24fc7251e..36798fe4fc1 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "global"; - version = "6.6.4"; + version = "6.6.5"; src = fetchurl { url = "mirror://gnu/global/${pname}-${version}.tar.gz"; - sha256 = "1515642wsjz7x3rsgaqk4sc7n0z2znl7idsk8jz8wgy5aswqqzlq"; + sha256 = "10vvsgx8v54whb4j9mk5qqyb5h3rdd9da0il3wir8pcpksyk0dww"; }; nativeBuildInputs = [ libtool makeWrapper ]; diff --git a/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix new file mode 100644 index 00000000000..7af1b4513a8 --- /dev/null +++ b/pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix @@ -0,0 +1,24 @@ +{ lib, fetchurl, ocamlPackages }: + +with ocamlPackages; + +buildDunePackage rec { + pname = "dot-merlin-reader"; + version = "3.4.0"; + + minimumOCamlVersion = "4.02.1"; + + src = fetchurl { + url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; + sha256 = "048rkpbvayksv8mgmkgi17vv0y9xplv7v2ww4d1hs7bkm5zzsvg2"; + }; + + buildInputs = [ yojson csexp result ]; + + meta = with lib; { + description = "Reads config files for merlin"; + homepage = "https://github.com/ocaml/merlin"; + license = licenses.mit; + maintainers = [ maintainers.hongchangwu ]; + }; +} diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index 069f0471595..5b607d3d6c6 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -1,19 +1,49 @@ -{ lib, fetchurl, ocamlPackages }: +{ lib, fetchurl, fetchzip, ocamlPackages }: -with ocamlPackages; buildDunePackage rec { - pname = "ocamlformat"; - version = "0.15.0"; +with ocamlPackages; - minimumOCamlVersion = "4.06"; +let + mkOCamlformat = { + version, + sha256, + buildInputs, + useDune2 ? true, + tarballName ? "ocamlformat-${version}.tbz", + # The 'src' argument can be removed when 0.11.0 is pruned + src ? fetchurl { + url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/${tarballName}"; + inherit sha256; + } + }: + buildDunePackage rec { + pname = "ocamlformat"; - useDune2 = true; + minimumOCamlVersion = "4.06"; - src = fetchurl { - url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/ocamlformat-${version}.tbz"; - sha256 = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6"; - }; + inherit src version useDune2 buildInputs; + + meta = { + homepage = "https://github.com/ocaml-ppx/ocamlformat"; + description = "Auto-formatter for OCaml code"; + maintainers = [ lib.maintainers.Zimmi48 lib.maintainers.marsam ]; + license = lib.licenses.mit; + }; + }; + + post_0_11_buildInputs = [ + base + cmdliner + fpath + ocaml-migrate-parsetree + odoc + re + stdio + uuseg + uutf + ]; - buildInputs = [ + post_0_14_buildInputs = [ + base cmdliner fpath ocaml-migrate-parsetree @@ -25,11 +55,62 @@ with ocamlPackages; buildDunePackage rec { fix menhir ]; +in + +# Older versions should be removed when their usage decrease +# This script scraps Github looking for OCamlformat's options and versions usage: +# https://gist.github.com/Julow/110dc94308d6078225e0665e3eccd433 - meta = { - homepage = "https://github.com/ocaml-ppx/ocamlformat"; - description = "Auto-formatter for OCaml code"; - maintainers = [ lib.maintainers.Zimmi48 lib.maintainers.marsam ]; - license = lib.licenses.mit; +rec { + ocamlformat_0_11_0 = mkOCamlformat rec { + version = "0.11.0"; + src = fetchzip { + url = "https://github.com/ocaml-ppx/ocamlformat/archive/0.11.0.tar.gz"; + inherit sha256; + }; + sha256 = "0zvjn71jd4d3znnpgh0yphb2w8ggs457b6bl6cg1fmpdgxnds6yx"; + useDune2 = false; + buildInputs = post_0_11_buildInputs; }; + + ocamlformat_0_12 = mkOCamlformat { + version = "0.12"; + sha256 = "1zi8x597dhp2822j6j28s84yyiqppl7kykpwqqclx6ybypvlzdpj"; + useDune2 = false; + buildInputs = post_0_11_buildInputs; + }; + + ocamlformat_0_13_0 = mkOCamlformat rec { + version = "0.13.0"; + sha256 = "0ki2flqi3xkhw9mfridivb6laxm7gml8rj9qz42vqmy9yx76jjxq"; + tarballName = "ocamlformat-${version}-2.tbz"; + useDune2 = false; + buildInputs = post_0_11_buildInputs; + }; + + ocamlformat_0_14_0 = mkOCamlformat { + version = "0.14.0"; + sha256 = "070c0x6z5y0lyls56zm34g8lyc093wkr0jfp50dvrkr9fk1sx2wi"; + buildInputs = post_0_14_buildInputs; + }; + + ocamlformat_0_14_1 = mkOCamlformat { + version = "0.14.1"; + sha256 = "03wn46xib63748157xchj7gflkw5000fcjw6n89h9g82q9slazaa"; + buildInputs = post_0_14_buildInputs; + }; + + ocamlformat_0_14_2 = mkOCamlformat { + version = "0.14.2"; + sha256 = "16phz1sg9b070p6fm8d42j0piizg05vghdjmw8aj7xm82b1pm7sz"; + buildInputs = post_0_14_buildInputs; + }; + + ocamlformat_0_15_0 = mkOCamlformat { + version = "0.15.0"; + sha256 = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6"; + buildInputs = post_0_14_buildInputs; + }; + + ocamlformat = ocamlformat_0_15_0; } diff --git a/pkgs/development/tools/rust/cargo-sync-readme/default.nix b/pkgs/development/tools/rust/cargo-sync-readme/default.nix new file mode 100644 index 00000000000..f42868826d5 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-sync-readme/default.nix @@ -0,0 +1,22 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-sync-readme"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "phaazon"; + repo = pname; + rev = version; + sha256 = "1c38q87fyfmj6nlwdpavb1xxpi26ncywkgqcwbvblad15c6ydcyc"; + }; + + cargoSha256 = "1x15q6wv5278hm3ns2wmw4i8602g35y1jyv1b8wa5i4dnh52dj83"; + + meta = with stdenv.lib; { + description = "A cargo plugin that generates a Markdown section in your README based on your Rust documentation"; + homepage = "https://github.com/phaazon/cargo-sync-readme"; + license = licenses.bsd3; + maintainers = with maintainers; [ b4dm4n ]; + }; +} diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index c9c87991a8a..5d66f6e2100 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2020-08-24"; + rev = "2020-09-21"; version = "unstable-${rev}"; - sha256 = "11q5shrq55krgpj7rjfqw84131j5g55zyrwww3cxcbr8ndi3xdnf"; - cargoSha256 = "15kjcgxmigm0lwbp8p0kdxax86ldjqq9q8ysj6khfhqd0173184n"; + sha256 = "1wjm69r1c6s8a4rd91csg7c48bp8jamxsrm5m6rg3bk2gqp8yzz8"; + cargoSha256 = "089w2i6lvpjxkxghkb2mij9sxfxlcc1zv4iq4qmzq8gnc6ddz12d"; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/pkgs/development/tools/rust/rust-analyzer/generic.nix b/pkgs/development/tools/rust/rust-analyzer/generic.nix index 7092f5291dd..3bd6d1ccee1 100644 --- a/pkgs/development/tools/rust/rust-analyzer/generic.nix +++ b/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -1,9 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin -, useJemalloc ? false +{ lib, stdenv, fetchFromGitHub, rustPlatform, darwin, cmake +, useMimalloc ? false , doCheck ? true # Version specific args -, rev, version, sha256, cargoSha256 }: +, rev, version, sha256, cargoSha256 +}: rustPlatform.buildRustPackage { pname = "rust-analyzer-unwrapped"; @@ -15,11 +16,17 @@ rustPlatform.buildRustPackage { inherit rev sha256; }; + patches = [ + # FIXME: Temporary fix for our rust 1.45.0 since rust-analyzer requires 1.46.0 + ./no-loop-in-const-fn.patch + ./no-option-zip.patch + ]; + buildAndTestSubdir = "crates/rust-analyzer"; - cargoBuildFlags = lib.optional useJemalloc "--features=jemalloc"; + cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc"; - nativeBuildInputs = lib.optionals doCheck [ rustPlatform.rustcSrc ]; + nativeBuildInputs = lib.optional useMimalloc cmake; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ]; @@ -27,16 +34,11 @@ rustPlatform.buildRustPackage { RUST_ANALYZER_REV = rev; inherit doCheck; - # Skip tests running `rustup` for `cargo fmt`. - preCheck = '' - fakeRustup=$(mktemp -d) - ln -s $(command -v true) $fakeRustup/rustup - export PATH=$PATH''${PATH:+:}$fakeRustup + preCheck = lib.optionalString doCheck '' export RUST_SRC_PATH=${rustPlatform.rustcSrc} ''; - # Temporary disabled until #93119 is fixed. - doInstallCheck = false; + doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck versionOutput="$($out/bin/rust-analyzer --version)" diff --git a/pkgs/development/tools/rust/rust-analyzer/no-loop-in-const-fn.patch b/pkgs/development/tools/rust/rust-analyzer/no-loop-in-const-fn.patch new file mode 100644 index 00000000000..e750b3c4e12 --- /dev/null +++ b/pkgs/development/tools/rust/rust-analyzer/no-loop-in-const-fn.patch @@ -0,0 +1,223 @@ +This patch revert 4b989009e3839cfc6f021d1552a46561cee6cde2 (CONST LOOPS ARE HERE). + +diff --git a/crates/parser/src/grammar/expressions.rs b/crates/parser/src/grammar/expressions.rs +index 5f885edfd..e72929f8c 100644 +--- a/crates/parser/src/grammar/expressions.rs ++++ b/crates/parser/src/grammar/expressions.rs +@@ -316,7 +316,7 @@ fn expr_bp(p: &mut Parser, mut r: Restrictions, bp: u8) -> (Option<CompletedMark + } + + const LHS_FIRST: TokenSet = +- atom::ATOM_EXPR_FIRST.union(TokenSet::new(&[T![&], T![*], T![!], T![.], T![-]])); ++ atom::ATOM_EXPR_FIRST.union(token_set![T![&], T![*], T![!], T![.], T![-]]); + + fn lhs(p: &mut Parser, r: Restrictions) -> Option<(CompletedMarker, BlockLike)> { + let m; +diff --git a/crates/parser/src/grammar/expressions/atom.rs b/crates/parser/src/grammar/expressions/atom.rs +index 66a92a4e1..ba6dd2fbc 100644 +--- a/crates/parser/src/grammar/expressions/atom.rs ++++ b/crates/parser/src/grammar/expressions/atom.rs +@@ -15,7 +15,7 @@ use super::*; + // let _ = b"e"; + // let _ = br"f"; + // } +-pub(crate) const LITERAL_FIRST: TokenSet = TokenSet::new(&[ ++pub(crate) const LITERAL_FIRST: TokenSet = token_set![ + TRUE_KW, + FALSE_KW, + INT_NUMBER, +@@ -25,8 +25,8 @@ pub(crate) const LITERAL_FIRST: TokenSet = TokenSet::new(&[ + STRING, + RAW_STRING, + BYTE_STRING, +- RAW_BYTE_STRING, +-]); ++ RAW_BYTE_STRING ++]; + + pub(crate) fn literal(p: &mut Parser) -> Option<CompletedMarker> { + if !p.at_ts(LITERAL_FIRST) { +@@ -39,7 +39,7 @@ pub(crate) fn literal(p: &mut Parser) -> Option<CompletedMarker> { + + // E.g. for after the break in `if break {}`, this should not match + pub(super) const ATOM_EXPR_FIRST: TokenSet = +- LITERAL_FIRST.union(paths::PATH_FIRST).union(TokenSet::new(&[ ++ LITERAL_FIRST.union(paths::PATH_FIRST).union(token_set![ + T!['('], + T!['{'], + T!['['], +@@ -59,9 +59,9 @@ pub(super) const ATOM_EXPR_FIRST: TokenSet = + T![loop], + T![for], + LIFETIME, +- ])); ++ ]); + +-const EXPR_RECOVERY_SET: TokenSet = TokenSet::new(&[LET_KW, R_DOLLAR]); ++const EXPR_RECOVERY_SET: TokenSet = token_set![LET_KW, R_DOLLAR]; + + pub(super) fn atom_expr(p: &mut Parser, r: Restrictions) -> Option<(CompletedMarker, BlockLike)> { + if let Some(m) = literal(p) { +diff --git a/crates/parser/src/grammar/items.rs b/crates/parser/src/grammar/items.rs +index 22810e6fb..8fd8f3b80 100644 +--- a/crates/parser/src/grammar/items.rs ++++ b/crates/parser/src/grammar/items.rs +@@ -26,7 +26,7 @@ pub(super) fn mod_contents(p: &mut Parser, stop_on_r_curly: bool) { + } + } + +-pub(super) const ITEM_RECOVERY_SET: TokenSet = TokenSet::new(&[ ++pub(super) const ITEM_RECOVERY_SET: TokenSet = token_set![ + FN_KW, + STRUCT_KW, + ENUM_KW, +@@ -41,7 +41,7 @@ pub(super) const ITEM_RECOVERY_SET: TokenSet = TokenSet::new(&[ + USE_KW, + MACRO_KW, + T![;], +-]); ++]; + + pub(super) fn item_or_macro(p: &mut Parser, stop_on_r_curly: bool) { + let m = p.start(); +diff --git a/crates/parser/src/grammar/paths.rs b/crates/parser/src/grammar/paths.rs +index 5d297e2d6..52562afa4 100644 +--- a/crates/parser/src/grammar/paths.rs ++++ b/crates/parser/src/grammar/paths.rs +@@ -3,7 +3,7 @@ + use super::*; + + pub(super) const PATH_FIRST: TokenSet = +- TokenSet::new(&[IDENT, T![self], T![super], T![crate], T![:], T![<]]); ++ token_set![IDENT, T![self], T![super], T![crate], T![:], T![<]]; + + pub(super) fn is_path_start(p: &Parser) -> bool { + is_use_path_start(p) || p.at(T![<]) +diff --git a/crates/parser/src/grammar/patterns.rs b/crates/parser/src/grammar/patterns.rs +index 796f206e1..07b1d6dd5 100644 +--- a/crates/parser/src/grammar/patterns.rs ++++ b/crates/parser/src/grammar/patterns.rs +@@ -2,18 +2,9 @@ + + use super::*; + +-pub(super) const PATTERN_FIRST: TokenSet = +- expressions::LITERAL_FIRST.union(paths::PATH_FIRST).union(TokenSet::new(&[ +- T![box], +- T![ref], +- T![mut], +- T!['('], +- T!['['], +- T![&], +- T![_], +- T![-], +- T![.], +- ])); ++pub(super) const PATTERN_FIRST: TokenSet = expressions::LITERAL_FIRST ++ .union(paths::PATH_FIRST) ++ .union(token_set![T![box], T![ref], T![mut], T!['('], T!['['], T![&], T![_], T![-], T![.]]); + + pub(crate) fn pattern(p: &mut Parser) { + pattern_r(p, PAT_RECOVERY_SET); +@@ -83,7 +74,7 @@ fn pattern_single_r(p: &mut Parser, recovery_set: TokenSet) { + } + + const PAT_RECOVERY_SET: TokenSet = +- TokenSet::new(&[LET_KW, IF_KW, WHILE_KW, LOOP_KW, MATCH_KW, R_PAREN, COMMA]); ++ token_set![LET_KW, IF_KW, WHILE_KW, LOOP_KW, MATCH_KW, R_PAREN, COMMA]; + + fn atom_pat(p: &mut Parser, recovery_set: TokenSet) -> Option<CompletedMarker> { + let m = match p.nth(0) { +diff --git a/crates/parser/src/grammar/types.rs b/crates/parser/src/grammar/types.rs +index 1ea130ac5..9d00eb9b9 100644 +--- a/crates/parser/src/grammar/types.rs ++++ b/crates/parser/src/grammar/types.rs +@@ -2,7 +2,7 @@ + + use super::*; + +-pub(super) const TYPE_FIRST: TokenSet = paths::PATH_FIRST.union(TokenSet::new(&[ ++pub(super) const TYPE_FIRST: TokenSet = paths::PATH_FIRST.union(token_set![ + T!['('], + T!['['], + T![<], +@@ -16,16 +16,16 @@ pub(super) const TYPE_FIRST: TokenSet = paths::PATH_FIRST.union(TokenSet::new(&[ + T![for], + T![impl], + T![dyn], +-])); ++]); + +-const TYPE_RECOVERY_SET: TokenSet = TokenSet::new(&[ ++const TYPE_RECOVERY_SET: TokenSet = token_set![ + T![')'], + T![,], + L_DOLLAR, + // test_err struct_field_recover + // struct S { f pub g: () } + T![pub], +-]); ++]; + + pub(crate) fn type_(p: &mut Parser) { + type_with_bounds_cond(p, true); +diff --git a/crates/parser/src/token_set.rs b/crates/parser/src/token_set.rs +index a68f0144e..994017acf 100644 +--- a/crates/parser/src/token_set.rs ++++ b/crates/parser/src/token_set.rs +@@ -9,21 +9,15 @@ pub(crate) struct TokenSet(u128); + impl TokenSet { + pub(crate) const EMPTY: TokenSet = TokenSet(0); + +- pub(crate) const fn new(kinds: &[SyntaxKind]) -> TokenSet { +- let mut res = 0u128; +- let mut i = 0; +- while i < kinds.len() { +- res |= mask(kinds[i]); +- i += 1 +- } +- TokenSet(res) ++ pub(crate) const fn singleton(kind: SyntaxKind) -> TokenSet { ++ TokenSet(mask(kind)) + } + + pub(crate) const fn union(self, other: TokenSet) -> TokenSet { + TokenSet(self.0 | other.0) + } + +- pub(crate) const fn contains(&self, kind: SyntaxKind) -> bool { ++ pub(crate) fn contains(&self, kind: SyntaxKind) -> bool { + self.0 & mask(kind) != 0 + } + } +@@ -32,10 +26,16 @@ const fn mask(kind: SyntaxKind) -> u128 { + 1u128 << (kind as usize) + } + ++#[macro_export] ++macro_rules! token_set { ++ ($($t:expr),*) => { TokenSet::EMPTY$(.union(TokenSet::singleton($t)))* }; ++ ($($t:expr),* ,) => { token_set!($($t),*) }; ++} ++ + #[test] + fn token_set_works_for_tokens() { + use crate::SyntaxKind::*; +- let ts = TokenSet::new(&[EOF, SHEBANG]); ++ let ts = token_set![EOF, SHEBANG]; + assert!(ts.contains(EOF)); + assert!(ts.contains(SHEBANG)); + assert!(!ts.contains(PLUS)); +diff --git a/xtask/src/install.rs b/xtask/src/install.rs +index d829790d7..b25a6e301 100644 +--- a/xtask/src/install.rs ++++ b/xtask/src/install.rs +@@ -7,7 +7,7 @@ use anyhow::{bail, format_err, Context, Result}; + use crate::not_bash::{pushd, run}; + + // Latest stable, feel free to send a PR if this lags behind. +-const REQUIRED_RUST_VERSION: u32 = 46; ++const REQUIRED_RUST_VERSION: u32 = 43; + + pub struct InstallCmd { + pub client: Option<ClientOpt>, diff --git a/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch b/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch new file mode 100644 index 00000000000..b2cf679cee9 --- /dev/null +++ b/pkgs/development/tools/rust/rust-analyzer/no-option-zip.patch @@ -0,0 +1,72 @@ +diff --git a/crates/assists/src/handlers/merge_imports.rs b/crates/assists/src/handlers/merge_imports.rs +index fe33cee53..2184a4154 100644 +--- a/crates/assists/src/handlers/merge_imports.rs ++++ b/crates/assists/src/handlers/merge_imports.rs +@@ -32,7 +32,7 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<() + if let Some(use_item) = tree.syntax().parent().and_then(ast::Use::cast) { + let (merged, to_delete) = + next_prev().filter_map(|dir| neighbor(&use_item, dir)).find_map(|use_item2| { +- try_merge_imports(&use_item, &use_item2, MergeBehaviour::Full).zip(Some(use_item2)) ++ Some((try_merge_imports(&use_item, &use_item2, MergeBehaviour::Full)?, use_item2)) + })?; + + rewriter.replace_ast(&use_item, &merged); +@@ -44,7 +44,7 @@ pub(crate) fn merge_imports(acc: &mut Assists, ctx: &AssistContext) -> Option<() + } else { + let (merged, to_delete) = + next_prev().filter_map(|dir| neighbor(&tree, dir)).find_map(|use_tree| { +- try_merge_trees(&tree, &use_tree, MergeBehaviour::Full).zip(Some(use_tree)) ++ Some((try_merge_trees(&tree, &use_tree, MergeBehaviour::Full)?, use_tree)) + })?; + + rewriter.replace_ast(&tree, &merged); +diff --git a/crates/assists/src/utils/insert_use.rs b/crates/assists/src/utils/insert_use.rs +index 09f4a2224..2c3a0ca0b 100644 +--- a/crates/assists/src/utils/insert_use.rs ++++ b/crates/assists/src/utils/insert_use.rs +@@ -280,7 +280,7 @@ fn common_prefix(lhs: &ast::Path, rhs: &ast::Path) -> Option<(ast::Path, ast::Pa + } + res = Some((lhs_curr.clone(), rhs_curr.clone())); + +- match lhs_curr.parent_path().zip(rhs_curr.parent_path()) { ++ match zip(lhs_curr.parent_path(), rhs_curr.parent_path()) { + Some((lhs, rhs)) => { + lhs_curr = lhs; + rhs_curr = rhs; +@@ -324,7 +324,7 @@ fn path_cmp(a: &ast::Path, b: &ast::Path) -> Ordering { + // cmp_by would be useful for us here but that is currently unstable + // cmp doesnt work due the lifetimes on text's return type + a.zip(b) +- .flat_map(|(seg, seg2)| seg.name_ref().zip(seg2.name_ref())) ++ .flat_map(|(seg, seg2)| zip(seg.name_ref(), seg2.name_ref())) + .find_map(|(a, b)| match a.text().cmp(b.text()) { + ord @ Ordering::Greater | ord @ Ordering::Less => Some(ord), + Ordering::Equal => None, +@@ -404,8 +404,8 @@ fn find_insert_position( + let path_node_iter = scope + .as_syntax_node() + .children() +- .filter_map(|node| ast::Use::cast(node.clone()).zip(Some(node))) +- .flat_map(|(use_, node)| use_.use_tree().and_then(|tree| tree.path()).zip(Some(node))); ++ .filter_map(|node| zip(ast::Use::cast(node.clone()), Some(node))) ++ .flat_map(|(use_, node)| zip(use_.use_tree().and_then(|tree| tree.path()), Some(node))); + // Iterator that discards anything thats not in the required grouping + // This implementation allows the user to rearrange their import groups as this only takes the first group that fits + let group_iter = path_node_iter +@@ -423,7 +423,7 @@ fn find_insert_position( + segments + .clone() + .zip(check_segments) +- .flat_map(|(seg, seg2)| seg.name_ref().zip(seg2.name_ref())) ++ .flat_map(|(seg, seg2)| zip(seg.name_ref(), seg2.name_ref())) + .all(|(l, r)| l.text() <= r.text()) + }); + match post_insert { +@@ -931,3 +931,7 @@ use foo::bar::baz::Qux;", + assert_eq!(result.map(|u| u.to_string()), None); + } + } ++ ++fn zip<T, U>(x: Option<T>, y: Option<U>) -> Option<(T, U)> { ++ Some((x?, y?)) ++} diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 32b9c61f5d4..69744509748 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,7 +1,6 @@ { stdenv , buildGoModule , fetchFromGitHub -, runCommand , gpgme , lvm2 , btrfs-progs @@ -10,18 +9,17 @@ , installShellFiles , makeWrapper , fuse-overlayfs -, nixosTests }: buildGoModule rec { pname = "skopeo"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "0wkpw8fizxjpfypflp7rs1q128dg4hadwzdvn8k41h7f8cbcb39x"; + sha256 = "1v7k3ki10i6082r7zswblyirx6zck674y6bw3plssw4p1l2611rd"; }; outputs = [ "out" "man" ]; @@ -37,12 +35,12 @@ buildGoModule rec { buildPhase = '' patchShebangs . - make binary-local + make bin/skopeo docs ''; installPhase = '' - make install-binary PREFIX=$out - make install-docs MANINSTALLDIR="$man/share/man" + install -Dm755 bin/skopeo -t $out/bin + installManPage docs/*.[1-9] installShellCompletion --bash completions/bash/skopeo ''; @@ -51,8 +49,6 @@ buildGoModule rec { --prefix PATH : ${stdenv.lib.makeBinPath [ fuse-overlayfs ]} ''; - passthru.tests.docker-tools = nixosTests.docker-tools; - meta = with stdenv.lib; { description = "A command line utility for various operations on container images and image repositories"; homepage = "https://github.com/containers/skopeo"; diff --git a/pkgs/development/tools/the-way/default.nix b/pkgs/development/tools/the-way/default.nix index dce18580577..6042f5f891a 100644 --- a/pkgs/development/tools/the-way/default.nix +++ b/pkgs/development/tools/the-way/default.nix @@ -16,8 +16,8 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; cargoSha256 = "0adhgp6blwx7s1hlwqzzsgkzc43q9avxx8a9ykvvv2s1w7m9ql78"; - #checkFlags = "--test-threads=1"; - doCheck = false; + checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=copy" ]; + cargoParallelTestThreads = false; postInstall = '' $out/bin/the-way config default tmp.toml diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 0664af117e1..2a4df9bf7cf 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -86,6 +86,8 @@ let twbt = twbt; dfhack = dfhack; dwarf-therapist = dwarf-therapist; + + jdk = pkgs.jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; }) (lib.attrNames self.df-hashes)); @@ -104,7 +106,9 @@ let soundSense = callPackage ./soundsense.nix { }; - legends-browser = callPackage ./legends-browser {}; + legends-browser = callPackage ./legends-browser { + jre = pkgs.jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; themes = recurseIntoAttrs (callPackage ./themes { stdenv = stdenvNoCC; diff --git a/pkgs/games/dwarf-fortress/themes/themes.json b/pkgs/games/dwarf-fortress/themes/themes.json index 48f47c4fbb9..8b0b9127d5b 100644 --- a/pkgs/games/dwarf-fortress/themes/themes.json +++ b/pkgs/games/dwarf-fortress/themes/themes.json @@ -1,8 +1,8 @@ [ { "name": "afro-graphics", - "version": "47.02", - "sha256": "0np4jc05905q3bjplbrfi09q4rq3pjbf2vmbrmazfagj2mp8m7z5" + "version": "47.04", + "sha256": "1x1ir0qi3g8wgzwm1pnrkrqb6lhnjq87vs30l8kva6y5wr4sz7q0" }, { "name": "autoreiv", @@ -21,48 +21,53 @@ }, { "name": "gemset", - "version": "47.02", - "sha256": "0gz6cfx9kyldh5dxicyw0yl9lq4qw51vvlpzl767ml0bx3w38bwy" + "version": "47.04", + "sha256": "015nkkdnpykhz6a1n8qi3wgap19a4wavz4n2xbvfa4g770lcjd92" }, { "name": "ironhand", - "version": "47.02", - "sha256": "0j612xxz8g91zslw3a6yls3bzzmz0xdi2n0zx9zkmpzcl67f39ry" + "version": "47.04", + "sha256": "0x3hi1isgc2cv7c3qz87rm7ik0kbd748djpnghvjdqpj3a0n1ih2" }, { "name": "jolly-bastion", - "version": "47.02", - "sha256": "1df2hvm72lklmhhphcwsqm1m3dnaqxd8qvpygg5x71cfgkjd41ic" + "version": "47.04", + "sha256": "0799ad90g62nvpdcl6zq3vr2nvfc62lprm4br9n2hbs8wgrra6rq" }, { "name": "mayday", - "version": "47.01", - "sha256": "02fby7y4zzq8qgq2wsdvzp1k6zgfhdkm768zp0zzj9byi6gmnaq6" + "version": "47.04a", + "sha256": "1hpj40762n81grsddg3nc5jxc0bqmy2xamxvsgxzb2bx0b7akz0w" + }, + { + "name": "meph", + "version": "47.04_v5.5.0_V1.1.2", + "sha256": "0q8hfm66rag61qd2hab7lsr4nyg52bn1hvy6bl7z6kv4yj5cra50" }, { "name": "obsidian", - "version": "47.02", - "sha256": "03b26z557099k0l44lizagh17pz1y6apy496ivzv426xy0mzz684" + "version": "47.04a", + "sha256": "0y5kmj362i9y8w1n5d1nx80yq88c0xqps9i02gvnls6r421a4nms" }, { "name": "phoebus", - "version": "47.02a", - "sha256": "16zllnkrxi2365rd5m392xv72a9wvai0l3pz8xwkb8nlws8f58lb" + "version": "47.04a", + "sha256": "1ihbqs5a3b8pydbcynblvgw2bxkgr9hhpmgjlji7a7zvz8m6h6pw" }, { "name": "rally-ho", - "version": "47.02", - "sha256": "0xw2psmfjrgab0267scc7frgl9h1ypc0mbymn8z3x06m5wc3hbdh" + "version": "47.04", + "sha256": "0pmvpfbj07ll674lw7mjgkb4kgjk4mxr82fjq4ppvwrnzx6vi2g0" }, { "name": "spacefox", - "version": "47.02", - "sha256": "180fp2s489m2arc2z11j1qjnpcadjjkyami13yr3zd0v7msg64h8" + "version": "47.04", + "sha256": "0sk3k5bcpfl2xind4vfrgzbcqqbw0mg47pm3d3h44vi6hl3bdaqj" }, { "name": "taffer", - "version": "47.01b", - "sha256": "0b5hnli3gg32r7yvb3x1fqrmpxlk33j1hila2wiihybkkfnvxy5f" + "version": "47.04", + "sha256": "1ly2sc0pb2kybb8grj19zx372whblmd0bj8p64akpi2rrywi13sy" }, { "name": "tergel", @@ -70,8 +75,13 @@ "sha256": "142sd1i11vvirn68rp4gqzl67ww597df1lc57ycnpnz0n3q39kxy" }, { + "name": "vettlingr", + "version": "1.4a", + "sha256": "1p4y0dm52rb49dnmcnivddlsd94m4gr1pxn04fpjbrvck22klgpj" + }, + { "name": "wanderlust", - "version": "47.02", - "sha256": "0c36nxry189qdyinjk03wwm3j7q9q7b2sabkv7glx8yz2i61j5q9" + "version": "47.04", + "sha256": "1z56m8zplq5d18sbkwg5lwcy8iwfa5hbxixsm3hdxm04qyld1z89" } ] diff --git a/pkgs/games/koboredux/default.nix b/pkgs/games/koboredux/default.nix new file mode 100644 index 00000000000..746e9d6bbef --- /dev/null +++ b/pkgs/games/koboredux/default.nix @@ -0,0 +1,87 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, requireFile +, cmake +, pkg-config +, SDL2 +, SDL2_image +, audiality2 +, useProprietaryAssets ? true +}: + +with stdenv.lib; +stdenv.mkDerivation rec { + pname = "koboredux"; + version = "0.7.5.1"; + + src = + [(fetchFromGitHub { + owner = "olofson"; + repo = "koboredux"; + rev = "v${version}"; + sha256 = "09h9r65z8bar2z89s09j6px0gdq355kjf38rmd85xb2aqwnm6xig"; + })] + ++ + (optional useProprietaryAssets (requireFile { + name = "koboredux-${version}-Linux.tar.bz2"; + sha256 = "11bmicx9i11m4c3dp19jsql0zy4rjf5a28x4hd2wl8h3bf8cdgav"; + message = '' + Please purchase the game on https://olofson.itch.io/kobo-redux + and download the Linux build. + + Once you have downloaded the file, please use the following command + and re-run the installation: + + nix-prefetch-url file://\$PWD/koboredux-${version}-Linux.tar.bz2 + + Alternatively, install the "koboredux-free" package, which replaces the + proprietary assets with a placeholder theme. + ''; + })); + + sourceRoot = "source"; # needed when we have the assets source + + # Fix clang build + patches = [(fetchpatch { + url = "https://github.com/olofson/koboredux/commit/cf92b8a61d002ccaa9fbcda7a96dab08a681dee4.patch"; + sha256 = "0dwhvis7ghf3mgzjd2rwn8hk3ndlgfwwcqaq581yc5rwd73v6vw4"; + })]; + + postPatch = optionalString useProprietaryAssets '' + cp -r ../koboredux-${version}-Linux/sfx/redux data/sfx/ + cp -r ../koboredux-${version}-Linux/gfx/redux data/gfx/ + cp -r ../koboredux-${version}-Linux/gfx/redux_fullscreen data/gfx/ + ''; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + SDL2 + SDL2_image + audiality2 + ]; + + meta = { + description = "A frantic 80's style 2D shooter, similar to XKobo and Kobo Deluxe" + + optionalString (!useProprietaryAssets) " (built without proprietary assets)"; + longDescription = '' + Kobo Redux is a frantic 80's style 2D shooter, inspired by the look and + feel of 90's arcade cabinets. The gameplay is fast and unforgiving, + although with less of the frustrating quirkiness of the actual games + of the 80's. A true challenge in the spirit of the arcade era! + '' + optionalString (!useProprietaryAssets) '' + + This version replaces the official proprietary assets with placeholders. + For the full experience, consider installing "koboredux" instead. + ''; + homepage = "https://olofson.itch.io/kobo-redux"; + license = with licenses; if useProprietaryAssets then unfree else gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ fgaz ]; + }; +} + diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 9d23515c039..9bdf979d7dd 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -59,7 +59,6 @@ let freetype gdk-pixbuf glib - gnome2.GConf gnome2.pango gtk3-x11 gtk2-x11 @@ -87,11 +86,11 @@ in stdenv.mkDerivation rec { pname = "minecraft-launcher"; - version = "2.1.16102"; + version = "2.1.17627"; src = fetchurl { url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; - sha256 = "17zgxmijk9mq651h7ymkr7h2099cw23kc0r7jyfkdccp60dfd60i"; + sha256 = "04zjjyy0psfxfibzbac9w0kkgqwfpf1qmbj5gspyvhaib7k8may0"; }; icon = fetchurl { diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix index bcdd950de4a..472a8b2966c 100644 --- a/pkgs/games/multimc/default.nix +++ b/pkgs/games/multimc/default.nix @@ -1,6 +1,7 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase }: +{ stdenv, mkDerivation, fetchFromGitHub, cmake, jdk8, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase }: let + jdk = jdk8; libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ]; in mkDerivation rec { pname = "multimc"; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 2ce6806bcb4..fa27eab2758 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { mkdir -p $HOME/.nuget/NuGet cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet - dotnet restore --source nixos osu.Desktop + dotnet restore --source "$PWD/nixos" osu.Desktop runHook postConfigure ''; diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 2c8063d4a05..32acef9757b 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -35,7 +35,7 @@ let # Steam VR procps usbutils - ] ++ lib.optional withJava jdk + ] ++ lib.optional withJava jdk8 # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731 ++ lib.optional withPrimus primus ++ extraPkgs pkgs; diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index 5e8429f0336..bdea1db9b3e 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -4,20 +4,31 @@ let arch = if stdenv.isx86_64 then "x86-64" else if stdenv.isi686 then "x86-32" else "unknown"; - version = "11"; + version = "12"; + + nnueFile = "nn-82215d0fd0df.nnue"; + nnue = fetchurl { + name = nnueFile; + url = "https://tests.stockfishchess.org/api/nn/${nnueFile}"; + sha256 = "1r4yqrh4di05syyhl84hqcz84djpbd605b27zhbxwg6zs07ms8c2"; + }; in stdenv.mkDerivation { - pname = "stockfish"; inherit version; src = fetchurl { url = "https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz"; - sha256 = "16di83s79gf9kzdhcal5y0q9d59544gd5xqf1k8bwrqvc36628l0"; + sha256 = "16980aicm5i6i9252239q4f9bcxg1gnqkv6nphrmpz4drg8i3v6i"; }; - postUnpack = "sourceRoot+=/src"; + postUnpack = '' + sourceRoot+=/src + echo ${nnue} + cp "${nnue}" "$sourceRoot/${nnueFile}" + ''; + makeFlags = [ "PREFIX=$(out)" "ARCH=${arch}" ]; buildFlags = [ "build" ]; diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix index ea37ded6b6c..a5bea42d04e 100644 --- a/pkgs/games/tuxpaint/default.nix +++ b/pkgs/games/tuxpaint/default.nix @@ -30,6 +30,12 @@ stdenv.mkDerivation rec { }; postInstall = '' + # Install desktop file + mkdir -p $out/share/applications + cp hildon/tuxpaint.xpm $out/share/pixmaps + sed -e "s+Exec=tuxpaint+Exec=$out/bin/tuxpaint+" < src/tuxpaint.desktop > $out/share/applications/tuxpaint.desktop + + # Install stamps tar xzf $stamps cd tuxpaint-stamps-2014.08.23 make install-all PREFIX=$out diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index 4de6e54cd5f..29264b4f61d 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -34,9 +34,6 @@ buildPythonApplication rec { preFixup = '' gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH") - # gdk-pixbuf setup hook can not choose between propagated librsvg - # and our librsvg with GObject introspection. - GDK_PIXBUF_MODULE_FILE=$(echo ${librsvg}/lib/gdk-pixbuf-2.0/*/loaders.cache) ''; postFixup = '' diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix index ea5e9776226..f83e26c28ce 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/misc/emulators/mame/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper +{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, makeDesktopItem, makeWrapper , python, pkgconfig, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama , libpcap, CoreAudioKit, ForceFeedback , installShellFiles }: @@ -7,7 +7,7 @@ with stdenv; let majorVersion = "0"; - minorVersion = "223"; + minorVersion = "224"; desktopItem = makeDesktopItem { name = "MAME"; @@ -26,7 +26,7 @@ in mkDerivation { owner = "mamedev"; repo = "mame"; rev = "mame${majorVersion}${minorVersion}"; - sha256 = "1lh5cmz4f6km2d8fn3m9ns7fc4wzbdp71v0s6vjcynycpyhy3yl1"; + sha256 = "1z012fk7nlvxxixxcavmzc9443xli6i7xzz7fdf755g7v1cys7im"; }; hardeningDisable = [ "fortify" ]; @@ -51,7 +51,15 @@ in mkDerivation { # by default MAME assumes that paths with stock resources # are relative and that you run MAME changing to # install directory, so we add absolute paths here - patches = [ ./emuopts.patch ]; + patches = [ + ./emuopts.patch + # Make the parallel build reliable -- see https://github.com/mamedev/mame/pull/7279 + (fetchpatch { + name = "fix-mame-parallel-build.patch"; + url = "https://github.com/mamedev/mame/commit/13a54fd4e8b8b1a4aad77671562b2d9ef3d82e1f.patch"; + sha256 = "1p4bszir9hcdjx6am58p48zh17rhjzlhx2baiacas7fnig61i02n"; + }) + ]; postPatch = '' substituteInPlace src/emu/emuopts.cpp \ diff --git a/pkgs/misc/emulators/ryujinx/default.nix b/pkgs/misc/emulators/ryujinx/default.nix index 568af317d25..d1fa0389823 100644 --- a/pkgs/misc/emulators/ryujinx/default.nix +++ b/pkgs/misc/emulators/ryujinx/default.nix @@ -13,13 +13,13 @@ let ]; in stdenv.mkDerivation rec { pname = "ryujinx"; - version = "1.0.5160"; + version = "1.0.5346"; src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "58f65b6523fb25d989b011c51f963520c811f9f0"; - sha256 = "19fizqmcr8i3axi3j5hg8p6dxr1pxnl5l58z4pws6nj1xbq8z5mi"; + rev = "2ce59c44bcb2d789f4d6312b26cf41f36915d73c"; + sha256 = "0hk8jdacg8ryhh0mpnfjbzrrpy8gv87f4hp0hybyypglmaxz8grm"; }; nativeBuildInputs = [ dotnet-sdk_3 dotnetPackages.Nuget makeWrapper wrapGAppsHook gobject-introspection ]; @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { mkdir -p $HOME/.nuget/NuGet cp $HOME/.config/NuGet/NuGet.Config $HOME/.nuget/NuGet - dotnet restore --source nixos Ryujinx.sln + dotnet restore --source "$PWD/nixos" Ryujinx.sln runHook postConfigure ''; diff --git a/pkgs/misc/emulators/ryujinx/deps.nix b/pkgs/misc/emulators/ryujinx/deps.nix index cb25865f219..94093e1e29c 100644 --- a/pkgs/misc/emulators/ryujinx/deps.nix +++ b/pkgs/misc/emulators/ryujinx/deps.nix @@ -56,33 +56,28 @@ }) (fetchNuGet { name = "LibHac"; - version = "0.11.3"; - sha256 = "0xj2ip3bjy29xwy4fn5fncjadwbbg59sa3580cmkj47aab9cddyn"; + version = "0.12.0"; + sha256 = "08r9b9cdcbz6339sw8r5dfy2a8iw53df0j3xq9rygkg02xspimld"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "3.1.2"; - sha256 = "19wfh9yg4n2khbl7pvf6ngx95m5p8lw4l9y935pv7nh4xgwk02p9"; + version = "3.1.8"; + sha256 = "140zr3nwkmf6xc52gq4iz6ycyh95fxy0jpgn637pkd9z423z8135"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.osx-x64"; - version = "3.1.2"; - sha256 = "1v7i4f1k3j8xavbfwb7qr5f680gg5nblrmx5zcsj7l07q4wbnmwl"; + version = "3.1.8"; + sha256 = "0dkib4r4v5wqxsi6zca6x3zin1x4lha53dqbgsaiah961h1yhpp4"; }) (fetchNuGet { name = "Microsoft.AspNetCore.App.Runtime.win-x64"; - version = "3.1.2"; - sha256 = "1gciv56vzfpl86lb9gzvyfj8w2qd7jhdrbxph6l1aykwzqbxf7bd"; + version = "3.1.8"; + sha256 = "05sv39b6sc8fhh3m8kwq0lp58n8mrv5ivxa60rfqk6v6i7gs8b0f"; }) (fetchNuGet { name = "Microsoft.CodeCoverage"; - version = "16.2.0"; - sha256 = "07h1ylca2j7a4hznq4m4b8nrzv1lw7gcf848k2a3nbm6rapv61ki"; - }) - (fetchNuGet { - name = "Microsoft.CodeCoverage"; - version = "16.5.0"; - sha256 = "0610wzn4qyywf9lb4538vwqhprxc4g0g7gjbmnjzvx97jr5nd5mf"; + version = "16.7.0"; + sha256 = "10f6y1q8w61vc8ffqd7jsndwfskkfqbdzfqswyxnrr0qkkqx29v1"; }) (fetchNuGet { name = "Microsoft.CSharp"; @@ -96,28 +91,28 @@ }) (fetchNuGet { name = "Microsoft.NETCore.App.Host.osx-x64"; - version = "3.1.2"; - sha256 = "0sy1h7ffq8s3bkvf1carf4rn9qf7hn0yv6dcjklgh3g9jhlsq34f"; + version = "3.1.8"; + sha256 = "1ip8pgra9z6ha3yc4xqkb85cl9kx2jbwhwzdi3dp8bkqbvlirvkb"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Host.win-x64"; - version = "3.1.2"; - sha256 = "1yqsnl4my2q1ps666162kn0h34wyfajiwqs6snhrww195b59msdv"; + version = "3.1.8"; + sha256 = "1d7wlnibf9fgq57hwnjqhlh33hxg417ljf1djb9yan4xik1wl4hb"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "3.1.2"; - sha256 = "0a332ia5pabnz7mdfc99a5hlc7drnwzlc7cj9b5c3an6dq636p66"; + version = "3.1.8"; + sha256 = "1bv9n9wzsqf9g8h6z10p61xkcx8ad4nnip83qv8yyfvhr4kdmbsa"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.osx-x64"; - version = "3.1.2"; - sha256 = "1wb8h30di1mix8liz937snl1w8hbblixrpiazjskxclp3i7m1rg3"; + version = "3.1.8"; + sha256 = "1iabp5czrz9wmsqcl0gi8r580vlhky3aak5ndz9fw065wlsqpv7w"; }) (fetchNuGet { name = "Microsoft.NETCore.App.Runtime.win-x64"; - version = "3.1.2"; - sha256 = "0aj005mh57ynscf87cpfshc3ff22l4svf6lqz0hpqsi0hlidqwqx"; + version = "3.1.8"; + sha256 = "010c514ls1q9gdnyj0kvknx7a0z034lfbbcxqa8cjiv0snax4pqz"; }) (fetchNuGet { name = "Microsoft.NETCore.Platforms"; @@ -151,33 +146,18 @@ }) (fetchNuGet { name = "Microsoft.NET.Test.Sdk"; - version = "16.2.0"; - sha256 = "1nr5jxchdy3p7jm4fm73d5yivghjisdsyafma8fs5d1v49bhgckq"; - }) - (fetchNuGet { - name = "Microsoft.NET.Test.Sdk"; - version = "16.5.0"; - sha256 = "19f5bvzci5mmfz81jwc4dax4qdf7w4k67n263383mn8mawf22bfq"; + version = "16.7.0"; + sha256 = "1vkp6b82566z2pxn9035wrh4339kz3ki17g5qlwmwdbn4br6lcfy"; }) (fetchNuGet { name = "Microsoft.TestPlatform.ObjectModel"; - version = "16.2.0"; - sha256 = "1ywzyx75d61wm75l7wglxzglg5k9nq66wd56m52hmmg8mf253z57"; - }) - (fetchNuGet { - name = "Microsoft.TestPlatform.ObjectModel"; - version = "16.5.0"; - sha256 = "02h7j1fr0fwcggn0wgddh59k8b2wmly3snckwhswzqvks5rvfnnw"; - }) - (fetchNuGet { - name = "Microsoft.TestPlatform.TestHost"; - version = "16.2.0"; - sha256 = "05dx9nv1skc5ji79ji5vz6c93b09w9xh70iyy6j5ca978ga92i6g"; + version = "16.7.0"; + sha256 = "0nmw80ap2rn9h4i1x7qb15n763sh3wy8hjp1i5n0av7100g0yjqz"; }) (fetchNuGet { name = "Microsoft.TestPlatform.TestHost"; - version = "16.5.0"; - sha256 = "08cvss66lqa92h55dxkbrzn796jckhlyj53zz22x3qyr6xi21v5v"; + version = "16.7.0"; + sha256 = "0485nv0wcwdwjhif5a7d1i0znaf9acqyawhpqcwschw827chqzrs"; }) (fetchNuGet { name = "Microsoft.Win32.Primitives"; @@ -191,11 +171,6 @@ }) (fetchNuGet { name = "Microsoft.Win32.Registry"; - version = "4.0.0"; - sha256 = "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k"; - }) - (fetchNuGet { - name = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) @@ -256,13 +231,8 @@ }) (fetchNuGet { name = "NUnit3TestAdapter"; - version = "3.15.1"; - sha256 = "1nhpvzxbxgymmkb3bd5ci40rg8k71bfx2ghbgc99znvnvhf2034y"; - }) - (fetchNuGet { - name = "NUnit3TestAdapter"; - version = "3.16.1"; - sha256 = "1pzhmapfdszsfza7zjr3zrlz4fssdxsyiwmlj76a40mbhxhfa4q9"; + version = "3.17.0"; + sha256 = "0kxc6z3b8ccdrcyqz88jm5yh5ch9nbg303v67q8sp5hhs8rl8nk6"; }) (fetchNuGet { name = "OpenTK.NetStandard"; @@ -276,21 +246,11 @@ }) (fetchNuGet { name = "runtime.any.System.Collections"; - version = "4.0.11"; - sha256 = "1x44bm1cgv28zmrp095wf9mn8a6a0ivnzp9v14dcbhx06igxzgg0"; - }) - (fetchNuGet { - name = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { name = "runtime.any.System.Diagnostics.Tools"; - version = "4.0.1"; - sha256 = "0qcpm90hrm9gx9pmxlvfml65jm0bwpr5dg3r7l7xm9nvmibvc7n7"; - }) - (fetchNuGet { - name = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) @@ -301,11 +261,6 @@ }) (fetchNuGet { name = "runtime.any.System.Globalization"; - version = "4.0.11"; - sha256 = "0240rp66pi5bw1xklmh421hj7arwcdmjmgfkiq1cbc6nrm8ah286"; - }) - (fetchNuGet { - name = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) @@ -316,111 +271,56 @@ }) (fetchNuGet { name = "runtime.any.System.IO"; - version = "4.1.0"; - sha256 = "0kasfkjiml2kk8prnyn1990nhsahnjggvqwszqjdsfwfl43vpcb5"; - }) - (fetchNuGet { - name = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) (fetchNuGet { name = "runtime.any.System.Reflection"; - version = "4.1.0"; - sha256 = "06kcs059d5czyakx75rvlwa2mr86156w18fs7chd03f7084l7mq6"; - }) - (fetchNuGet { - name = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) (fetchNuGet { name = "runtime.any.System.Reflection.Extensions"; - version = "4.0.1"; - sha256 = "05k34ijz9g9csh0vbbv3g3lrxl163izwcfncmbcl7k073h32rzkr"; - }) - (fetchNuGet { - name = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) (fetchNuGet { name = "runtime.any.System.Reflection.Primitives"; - version = "4.0.1"; - sha256 = "1zxrpvixr5fqzkxpnin6g6gjq6xajy1snghz99ds2dwbhm276rhz"; - }) - (fetchNuGet { - name = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) (fetchNuGet { name = "runtime.any.System.Resources.ResourceManager"; - version = "4.0.1"; - sha256 = "1jmgs7hynb2rff48623wnyb37558bbh1q28k9c249j5r5sgsr5kr"; - }) - (fetchNuGet { - name = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) (fetchNuGet { name = "runtime.any.System.Runtime"; - version = "4.1.0"; - sha256 = "0mjr2bi7wvnkphfjqgkyf8vfyvy15a829jz6mivl6jmksh2bx40m"; - }) - (fetchNuGet { - name = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) (fetchNuGet { name = "runtime.any.System.Runtime.Handles"; - version = "4.0.1"; - sha256 = "1kswgqhy34qvc49i981fk711s7knd6z13bp0rin8ms6axkh98nas"; - }) - (fetchNuGet { - name = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) (fetchNuGet { name = "runtime.any.System.Runtime.InteropServices"; - version = "4.1.0"; - sha256 = "0gm8if0hcmp1qys1wmx4970k2x62pqvldgljsyzbjhiy5644vl8z"; - }) - (fetchNuGet { - name = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) (fetchNuGet { name = "runtime.any.System.Text.Encoding"; - version = "4.0.11"; - sha256 = "0m4vgmzi1ky8xlj0r7xcyazxln3j9dlialnk6d2gmgrfnzf8f9m7"; - }) - (fetchNuGet { - name = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) (fetchNuGet { name = "runtime.any.System.Text.Encoding.Extensions"; - version = "4.0.11"; - sha256 = "0d1rxxpvg9v7wlibsfgz0r4hwigpadas822qf8m8fs1gma9gs877"; - }) - (fetchNuGet { - name = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) (fetchNuGet { name = "runtime.any.System.Threading.Tasks"; - version = "4.0.11"; - sha256 = "1qzdp09qs8br5qxzlm1lgbjn4n57fk8vr1lzrmli2ysdg6x1xzvk"; - }) - (fetchNuGet { - name = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) @@ -521,21 +421,11 @@ }) (fetchNuGet { name = "runtime.unix.System.Diagnostics.Debug"; - version = "4.0.11"; - sha256 = "05ndbai4vpqrry0ghbfgqc8xblmplwjgndxmdn1zklqimczwjg2d"; - }) - (fetchNuGet { - name = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) (fetchNuGet { name = "runtime.unix.System.IO.FileSystem"; - version = "4.0.1"; - sha256 = "02wnlydnbhai0zy7c3kihg0cis0l1b2z78kyi1ci47c5v0jklwha"; - }) - (fetchNuGet { - name = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) @@ -551,21 +441,11 @@ }) (fetchNuGet { name = "runtime.unix.System.Private.Uri"; - version = "4.0.1"; - sha256 = "0ic5dgc45jkhcr1g9xmmzjm7ffiw4cymm0fprczlx4fnww4783nm"; - }) - (fetchNuGet { - name = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { name = "runtime.unix.System.Runtime.Extensions"; - version = "4.1.0"; - sha256 = "0x1cwd7cvifzmn5x1wafvj75zdxlk3mxy860igh3x1wx0s8167y4"; - }) - (fetchNuGet { - name = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) @@ -581,21 +461,11 @@ }) (fetchNuGet { name = "runtime.win.System.Diagnostics.Debug"; - version = "4.0.11"; - sha256 = "1ylkj4v7aq00svij7aq82d86afpwqgrqf2kpikabxl26p19ry9wm"; - }) - (fetchNuGet { - name = "runtime.win.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "16fbn4bcynad1ygdq0yk1wmckvs8jvrrf104xa5dc2hlc8y3x58f"; }) (fetchNuGet { name = "runtime.win.System.IO.FileSystem"; - version = "4.0.1"; - sha256 = "1dn9k6x8h27b6vbqh72hsfxax4fwf30jj8lc5328rg52lw29cyn1"; - }) - (fetchNuGet { - name = "runtime.win.System.IO.FileSystem"; version = "4.3.0"; sha256 = "1c01nklbxywszsbfaxc76hsz7gdxac3jkphrywfkdsi3v4bwd6g8"; }) @@ -611,11 +481,6 @@ }) (fetchNuGet { name = "runtime.win.System.Runtime.Extensions"; - version = "4.1.0"; - sha256 = "1zmx2msa04ka8mgh8viahi4pqpp86vdhzij2rg1jg131bwlv59yw"; - }) - (fetchNuGet { - name = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; }) @@ -625,26 +490,6 @@ sha256 = "0szgbdhyhvzpw8nb9k2ww37p5qipab1pdll8idkk57y5xnl2f7ll"; }) (fetchNuGet { - name = "SkiaSharp"; - version = "1.68.1.1"; - sha256 = "013yzsk798dwxdf2y5yx675x96nagfapkri5k3pgsjnmyfp1lvzk"; - }) - (fetchNuGet { - name = "SkiaSharp.NativeAssets.Linux"; - version = "1.68.1.1"; - sha256 = "07448kn9x56pxlnkxp2dpr5jmwj62k48y5m4608mwci32vs675hn"; - }) - (fetchNuGet { - name = "SkiaSharp.Views.Desktop.Common"; - version = "1.68.1.1"; - sha256 = "0wkj952iha7w2i8mvl0mksz2wqkx7vi7xylh10xgddld8kkm03r7"; - }) - (fetchNuGet { - name = "SkiaSharp.Views.Gtk3"; - version = "1.68.1.1"; - sha256 = "19fgshim2i60p55j4jcr0biq6k2xwal5dsmbgvyrrajnssaj3r95"; - }) - (fetchNuGet { name = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; @@ -685,67 +530,32 @@ sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) (fetchNuGet { - name = "System.Collections.Immutable"; - version = "1.2.0"; - sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m"; - }) - (fetchNuGet { - name = "System.Collections.NonGeneric"; - version = "4.0.1"; - sha256 = "19994r5y5bpdhj7di6w047apvil8lh06lh2c2yv9zc4fc5g9bl4d"; - }) - (fetchNuGet { name = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) (fetchNuGet { name = "System.Collections.Specialized"; - version = "4.0.1"; - sha256 = "1wbv7y686p5x169rnaim7sln67ivmv6r57falrnx8aap9y33mam9"; - }) - (fetchNuGet { - name = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) (fetchNuGet { name = "System.ComponentModel"; - version = "4.0.1"; - sha256 = "0v4qpmqlzyfad2kswxxj2frnaqqhz9201c3yn8fmmarx5vlzg52z"; - }) - (fetchNuGet { - name = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) (fetchNuGet { name = "System.ComponentModel.EventBasedAsync"; - version = "4.0.11"; - sha256 = "07r5i7xwban347nsfw28hhjwpr78ywksjyhywvhj1yr0s7sr00wh"; - }) - (fetchNuGet { - name = "System.ComponentModel.EventBasedAsync"; version = "4.3.0"; sha256 = "1rv9bkb8yyhqqqrx6x95njv6mdxlbvv527b44mrd93g8fmgkifl7"; }) (fetchNuGet { name = "System.ComponentModel.Primitives"; - version = "4.1.0"; - sha256 = "0wb5mnaag0w4fnyc40x19j8v2vshxp266razw64bcqfyj1whb1q0"; - }) - (fetchNuGet { - name = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) (fetchNuGet { name = "System.ComponentModel.TypeConverter"; - version = "4.1.0"; - sha256 = "178cva9p1cs043h5n2fry5xkzr3wc9n0hwbxa8m3ymld9m6wcv0y"; - }) - (fetchNuGet { - name = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) @@ -771,30 +581,15 @@ }) (fetchNuGet { name = "System.Diagnostics.Process"; - version = "4.1.0"; - sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s"; - }) - (fetchNuGet { - name = "System.Diagnostics.Process"; version = "4.3.0"; sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; }) (fetchNuGet { - name = "System.Diagnostics.TextWriterTraceListener"; - version = "4.0.0"; - sha256 = "1xigiwkwyxak0dhm0p8i2zb7a9syly9cdb5s9zkr9rbad4f2fqhs"; - }) - (fetchNuGet { name = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { - name = "System.Diagnostics.TraceSource"; - version = "4.0.0"; - sha256 = "1mc7r72xznczzf6mz62dm8xhdi14if1h8qgx353xvhz89qyxsa3h"; - }) - (fetchNuGet { name = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; @@ -930,16 +725,6 @@ sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) (fetchNuGet { - name = "System.Private.DataContractSerialization"; - version = "4.1.1"; - sha256 = "1xk9wvgzipssp1393nsg4n16zbr5481k03nkdlj954hzq5jkx89r"; - }) - (fetchNuGet { - name = "System.Private.Uri"; - version = "4.0.1"; - sha256 = "0k57qhawjysm4cpbfpc49kl4av7lji310kjcamkl23bwgij5ld9j"; - }) - (fetchNuGet { name = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; @@ -995,11 +780,6 @@ sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) (fetchNuGet { - name = "System.Reflection.Metadata"; - version = "1.3.0"; - sha256 = "1y5m6kryhjpqqm2g3h3b6bzig13wkiw954x3b7icqjm6xypm1x3b"; - }) - (fetchNuGet { name = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; @@ -1040,6 +820,16 @@ sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "4.6.0"; + sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; + }) + (fetchNuGet { + name = "System.Runtime.CompilerServices.Unsafe"; + version = "5.0.0-preview.7.20364.11"; + sha256 = "19sl184f6rjhfsizq0vapysazd6yd66lf638rszvrdhqlsxssz2m"; + }) + (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; @@ -1080,21 +870,11 @@ sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) (fetchNuGet { - name = "System.Runtime.Loader"; - version = "4.0.0"; - sha256 = "0lpfi3psqcp6zxsjk2qyahal7zaawviimc8lhrlswhip2mx7ykl0"; - }) - (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.0.1"; sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; }) (fetchNuGet { - name = "System.Runtime.Serialization.Json"; - version = "4.0.2"; - sha256 = "08ypbzs0sb302ga04ds5b2wxa2gg0q50zpa0nvc87ipjhs0v66dn"; - }) - (fetchNuGet { name = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; @@ -1211,11 +991,6 @@ }) (fetchNuGet { name = "System.Threading.Overlapped"; - version = "4.0.1"; - sha256 = "0fi79az3vmqdp9mv3wh2phblfjls89zlj6p9nc3i9f6wmfarj188"; - }) - (fetchNuGet { - name = "System.Threading.Overlapped"; version = "4.3.0"; sha256 = "1nahikhqh9nk756dh8p011j36rlcp1bzz3vwi2b4m1l2s3vz8idm"; }) @@ -1241,21 +1016,11 @@ }) (fetchNuGet { name = "System.Threading.Thread"; - version = "4.0.0"; - sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; - }) - (fetchNuGet { - name = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) (fetchNuGet { name = "System.Threading.ThreadPool"; - version = "4.0.10"; - sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx"; - }) - (fetchNuGet { - name = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) @@ -1281,36 +1046,16 @@ }) (fetchNuGet { name = "System.Xml.XmlDocument"; - version = "4.0.1"; - sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; - }) - (fetchNuGet { - name = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) (fetchNuGet { - name = "System.Xml.XmlSerializer"; - version = "4.0.11"; - sha256 = "01nzc3gdslw90qfykq4qzr2mdnqxjl4sj0wp3fixiwdmlmvpib5z"; - }) - (fetchNuGet { - name = "System.Xml.XPath"; - version = "4.0.1"; - sha256 = "0fjqgb6y66d72d5n8qq1h213d9nv2vi8mpv8p28j3m9rccmsh04m"; - }) - (fetchNuGet { name = "System.Xml.XPath"; version = "4.3.0"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; }) (fetchNuGet { name = "System.Xml.XPath.XmlDocument"; - version = "4.0.1"; - sha256 = "0l7yljgif41iv5g56l3nxy97hzzgck2a7rhnfnljhx9b0ry41bvc"; - }) - (fetchNuGet { - name = "System.Xml.XPath.XmlDocument"; version = "4.3.0"; sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm"; }) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 90dd6c94d37..f1b2b6d6386 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -341,12 +341,12 @@ let clang_complete = buildVimPluginFrom2Nix { pname = "clang_complete"; - version = "2020-09-02"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "xavierd"; repo = "clang_complete"; - rev = "e0f5c246883fb06b6331ff5bec8ef1c3c71af3d4"; - sha256 = "0kincdj1l3d552pjnrdjcl72fpln6klc85b01m1sn2b2dlin3xhz"; + rev = "293a1062274a06be61797612034bd8d87851406e"; + sha256 = "1whipcrr4pcg1bkivq3l753v3f3glbhkdd6wp6f9czspr7hx2h2d"; }; meta.homepage = "https://github.com/xavierd/clang_complete/"; }; @@ -389,12 +389,12 @@ let coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2020-09-17"; + version = "2020-09-19"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "fd1fbf5eaba58ff25cae154bc98b3ceaa6467d8b"; - sha256 = "0h9ff2n7mw00vn0yw5jkfa8p8ii9gj25lnir7812b182480my1mg"; + rev = "810fa85761f44519116d4c8020f163e4ec76ad01"; + sha256 = "04gnz214gkb3hsxb2xwisbmmjf6njka6yvaf8xcwzplzxxnl2zxg"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; @@ -461,12 +461,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-09-13"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "825f7f5b89fb1708f18711798ef7a2ba6aa1bde5"; - sha256 = "19lp2znwjc6p9wmqbp92qjvy1hvddh89hfcy739haf53pbnscds4"; + rev = "12a5c97ef43d7f6865b5e51d6238a3a0bf1e8847"; + sha256 = "0l6dbjadwn4kmpyqjj6r4imn2i6zjqriskpp5m87krhj513516aw"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -522,12 +522,12 @@ let completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2020-09-17"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "f6f63add3a6004183ae6f2fff12b5b9f5067f493"; - sha256 = "059msciykax5gcf71i80zxn0qm9hpf7g7k5cn8h2xqxil13jxrin"; + rev = "5c153f8ae094867a414cb2a7c0f59454299f17b3"; + sha256 = "0jm39f4qrm5sgrq1q70wx9674zw1gh7kb0vhi57r42m3jivvxvjy"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; @@ -558,12 +558,12 @@ let conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2020-09-08"; + version = "2020-09-20"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "566915cc545edd68bab2ad76eb59dfa43648a8b3"; - sha256 = "0qcg51wmkz6bfz8pz4ryl78ifl7pf8lsjszp2kh0sbq7raz1kpkn"; + rev = "a9431410d74f2281ae626727342a5d23d4a12552"; + sha256 = "00b73dxirn3m0rvagskgc00vyrkkcnbxfkn22jnzv84fjvvcj375"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -678,12 +678,12 @@ let ctrlp-vim = buildVimPluginFrom2Nix { pname = "ctrlp-vim"; - version = "2020-05-26"; + version = "2020-09-21"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "d93d97813dc839ef0782302a0debd7c4877f09f3"; - sha256 = "0lgw839xnmdsbaiflqp3i2liqhg4lp01iaz0jv380kbw9g6k666k"; + rev = "ae5237f8eb9bbc1ad7f8903738e0dc2af194f740"; + sha256 = "18inmxhqzw40sm5ixybbliikbhs10zrqp58qjcd8qc4grj8z6lcp"; }; meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; @@ -726,12 +726,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-09-17"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "ac40f5170ba097efec0f9055c92fe95e20ee2a7e"; - sha256 = "031bgs5ypw20ffml7x2nbrfzpi4zqb64d1n9j3blyy4yyaa60089"; + rev = "a84cb7f88afc904123858b226240c3339b7ca814"; + sha256 = "1ryc0ahrjjc20344jbvxz9miyrqdjs7gz6r2awkf0ayyz6nx5gch"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -774,12 +774,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-09-15"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "7d54f44e1035aea4cba99bdb34f0565b55008706"; - sha256 = "1bjslhsw3xm4pvzks7b1v7il8ap2mr7n64sv2sgx56c5fl410pkl"; + rev = "cb06d89aaded0bc2418d03a8fbb263ca0ef70406"; + sha256 = "0dk4w6yljnhf4qwhgamnw2bnmqikgqb8nshifn5l767sm3hk7d2h"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -908,24 +908,24 @@ let deoplete-khard = buildVimPluginFrom2Nix { pname = "deoplete-khard"; - version = "2020-04-30"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "nicoe"; repo = "deoplete-khard"; - rev = "7f81116b1c68d49f189a2aca62a31729fb7bb0e7"; - sha256 = "0jnpv0lpli9qjqwkzfl66fyhywa6q586q44d26q3h7sllxpz0066"; + rev = "dc2b519e8da0df10c3954946285caf484d376497"; + sha256 = "126mhnn4dqwm3aw6v4c3s3fnz40lki4cbb8xfrmxfbnbnjw1yx4x"; }; meta.homepage = "https://github.com/nicoe/deoplete-khard/"; }; deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2020-08-25"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete-lsp"; - rev = "4fd2507dd295d9c114febabb0c9cf31da87df008"; - sha256 = "1alwf8gjvgj5q3sbrqxrm0f2nbf6drk6dxqipk9pmvbj50iadyf1"; + rev = "17cd3fae3044eb8148bc22167257d4ae13165eb1"; + sha256 = "1xag51j71ifjn64xyaz7whml796pdl8vsw0ad22wndwzb95kyxdm"; }; meta.homepage = "https://github.com/Shougo/deoplete-lsp/"; }; @@ -1125,12 +1125,12 @@ let elm-vim = buildVimPluginFrom2Nix { pname = "elm-vim"; - version = "2019-04-05"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "elmcast"; repo = "elm-vim"; - rev = "165107a9fd2b20c8f050fc4f977b4e41c790b1e7"; - sha256 = "0gf7b49by0ybx3ndz7sz5dwcfnps4sz6wsr02lyarj8f8116ysy5"; + rev = "4b71facd77297cb33bbb3b14894676cff0a9bd1d"; + sha256 = "1kxkjm6fzmircg5gh7w2bmvjgk8ly5vvq9l31m4p6ql48azg2ilc"; }; meta.homepage = "https://github.com/elmcast/elm-vim/"; }; @@ -1533,6 +1533,18 @@ let meta.homepage = "https://github.com/mpickering/hlint-refactor-vim/"; }; + hoon-vim = buildVimPluginFrom2Nix { + pname = "hoon-vim"; + version = "2020-02-19"; + src = fetchFromGitHub { + owner = "urbit"; + repo = "hoon.vim"; + rev = "116f29971a2fbec8e484daeba8afd9d60f85800f"; + sha256 = "029rm8njpsa0lhhh504975lmw7yr2bkvxi2gag1l9279r629vp2r"; + }; + meta.homepage = "https://github.com/urbit/hoon.vim/"; + }; + i3config-vim = buildVimPluginFrom2Nix { pname = "i3config-vim"; version = "2020-03-28"; @@ -1930,6 +1942,18 @@ let meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; + lsp_extensions-nvim = buildVimPluginFrom2Nix { + pname = "lsp_extensions-nvim"; + version = "2020-09-06"; + src = fetchFromGitHub { + owner = "tjdevries"; + repo = "lsp_extensions.nvim"; + rev = "7c3f907c3cf94d5797dcdaf5a72c5364a91e6bd2"; + sha256 = "0c9glx0hn28m5jzz52ny1rcp63s9fdlznvywy4gzwwqi9rscqznz"; + }; + meta.homepage = "https://github.com/tjdevries/lsp_extensions.nvim/"; + }; + lushtags = buildVimPluginFrom2Nix { pname = "lushtags"; version = "2017-04-19"; @@ -2256,12 +2280,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-09-16"; + version = "2020-09-19"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "edb1751fbe5330f32ded49d736b8c403ae071fba"; - sha256 = "19m0yyasjnm5863yw9qlkbschj6f901p6qn89brf2ml7app9vmb4"; + rev = "4f259033bfbc1465c3a8348fcf632260d96a3e6f"; + sha256 = "09grfx66m5wasqy8blhqhfcqnsh3b4gfyyi09l1zda1vr2hhvz15"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -2304,12 +2328,12 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2020-08-16"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "b7ba77a4eb39a95ffbb6b3ff0c3c43746441b2aa"; - sha256 = "0yf55pi6d35brdva4n0x7yygjnymwbgwn1fx83nbzxhixmgbk45b"; + rev = "886a414e339fe40a47f30da8aa6012a6e0906018"; + sha256 = "0rnqa2cc7imapizg52r5dxzq2x2m8sxvds2q27ablzcvvghsjh96"; }; meta.homepage = "https://github.com/Shougo/neosnippet-snippets/"; }; @@ -2340,12 +2364,12 @@ let neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2020-08-06"; + version = "2020-09-22"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "48bc5d0bddd3debb9bdf73ee1d1153d7cafa693e"; - sha256 = "0495n0l9isi7pgfgc2axkk0v4g7r4dpbzxg5dl4hg7qkw6la7l5k"; + rev = "807a94f746bac2ab328dc22e6ca88bd411283cc8"; + sha256 = "0wrz8kghnb52i2sxnnkx74kpj1ibp956707x5zlx0gqipvbqdvs8"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; @@ -2412,12 +2436,12 @@ let nerdtree-git-plugin = buildVimPluginFrom2Nix { pname = "nerdtree-git-plugin"; - version = "2020-09-11"; + version = "2020-09-20"; src = fetchFromGitHub { owner = "Xuyuanp"; repo = "nerdtree-git-plugin"; - rev = "a8c031f11dd312f53357729ca47ad493e798aa86"; - sha256 = "1d64cmywhj43q9fkrh0kcfsxa7ijxcb1fbz38pxaacg082y6l0jy"; + rev = "97eeaee46308a39cadfd2273280fcc4906988dd0"; + sha256 = "1s4mldcyq88mqnw3h4cq41w4217n6wmh1p4cwhqfz0caihb06jfb"; }; meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/"; }; @@ -2544,12 +2568,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-09-17"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "b2e1ea1edf2cb42d20a941595cd0b4fcb871a0b5"; - sha256 = "1lg7mmp87r35h9rsf8pkngnxkgrjwg43a3aig6zmg37v58kgwv1j"; + rev = "98c12ec23a6df2f2f505304b61c4b2eefc0a568f"; + sha256 = "138rsbk2kx929cih6r3rqmgrygamnc1l9kh62pqsrphi28jh5178"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -2952,12 +2976,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2020-09-10"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "2a6736852cbe64e2883adc70a427cb47cb3305bc"; - sha256 = "1zykkq674rg7b6bh57bpfrw5fwhk4fij7mqgdcxi5sk6blcld5j0"; + rev = "96e79e397126be1a64fb53d8e3656842fe1a4532"; + sha256 = "0siml7vqiq5nvymyw8az48rv5dsf9dad8y8hy22j57lknd67b8h3"; }; meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; @@ -3048,12 +3072,12 @@ let sideways-vim = buildVimPluginFrom2Nix { pname = "sideways-vim"; - version = "2020-09-13"; + version = "2020-09-21"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "ea78de9eda97728d3489c29eb3e9c8a9b2fdd868"; - sha256 = "0kn1qpkwsv7m58gr3jydynnm12gqns503dhnfqcw7yshbq5sr9rr"; + rev = "19c5a21206b6c9f999004256a10e7381450ea83f"; + sha256 = "14h8lf70wccafapifzf9c6cjprik9n1a1wmv5gpajyqqbvzh1yv6"; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; @@ -3132,12 +3156,12 @@ let Spacegray-vim = buildVimPluginFrom2Nix { pname = "Spacegray-vim"; - version = "2019-02-23"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "ajh17"; repo = "Spacegray.vim"; - rev = "69e8fefce04e2aff6a01cc4c295493359b0e4fa1"; - sha256 = "0ks5yd1vmpjw8ml7hqd2zz2d8mqkqhfw2ya73y1igf6as70za896"; + rev = "338b319da09b5e62744a54c79148262ba0f24bf3"; + sha256 = "0jkv0sg1sc7d8br32zmwr5m1iwbvzi43f4gvshfi71c6k2fyhwlb"; }; meta.homepage = "https://github.com/ajh17/Spacegray.vim/"; }; @@ -3192,12 +3216,12 @@ let splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2020-07-21"; + version = "2020-09-21"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "46efa9796716fe645d43f6018de3e06296978c7b"; - sha256 = "126a9v4j217g1kflfabqx0bz02k0xkwqfagzhk51n7drh2r2m7k6"; + rev = "7148cbc3b9c4f70cea9fdccb72ae246b6d499c20"; + sha256 = "0smaghrigmr8jmw919pmlcvv6a7w7rw2j12gnbks30pi45y547jm"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -3253,12 +3277,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2020-09-09"; + version = "2020-09-17"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "3e31762a26f7c29c0f6344c4215ca9074f4ead8d"; - sha256 = "11wbxnvqgkgmcb3yl5zsn4v6va17p20nnrqxrqbr6y8ia39n7wa0"; + rev = "20fb41cb3ee7efd041866fad7384668d131a0029"; + sha256 = "1gmk9hlyz8k5880gzs0pqbpmscjzfj3cwfdkg950w5ky2lm0i7n2"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -3301,12 +3325,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-09-13"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "30fb229937d640889448de9c4f8b71b19946c67b"; - sha256 = "01vl3id1fmkd8p9hb2x2mb5iyyfad5a84ibfl6fkr7sm59jfgc2j"; + rev = "6099093050d84094001f2f226ddc09d7c2edcdd6"; + sha256 = "1gvyq1gra9k3fjjzr4lh9kwf0h2a5di242kxlwyj78p9606cdf9g"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -4046,12 +4070,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2020-09-17"; + version = "2020-09-21"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "415fd21e109ca05e22a38613f93baf1f96ede08c"; - sha256 = "066k0mdcxqv2hl9jdy93i6v5mi8mhr3q8zr1cd5xrxsxzgv9r476"; + rev = "f5f9f60558c7bc1bfe6a577f1fd9f91ff9ab55bf"; + sha256 = "0l55j2vb4l76jlamwxvd1l38irzfvyqlqwi2s13iy8xx4i54vsfx"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4550,12 +4574,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2020-09-14"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "72f4b6d4ec8aac44ea6f5ee6e3693b7388cd3449"; - sha256 = "07wcpc7kr113m574zfxjlh65pyhfm24a2f7lyadmhr1sah05iv6s"; + rev = "f936a7671888638dec54b86f2e49001a0e5e6005"; + sha256 = "0yvvwi4kf6frrgdwd86p2bpcgh4x2lrhav1yl58q6mrdp2qjl446"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -4658,12 +4682,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-08-26"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "511d3035d4da2453a9cb0188b6020ed7bc8fc18f"; - sha256 = "003k746mqasd64yca0ay4lzbif7jx0p6ivs2g2f3mlnvpwiiim23"; + rev = "49315d0c74acb983f2902260ebc9d86f85758ea4"; + sha256 = "0i2lhfw542c7xm7d10b0q5isw3398ycyn06mnp429nwb7fldv1ww"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -4694,12 +4718,12 @@ let vim-gista = buildVimPluginFrom2Nix { pname = "vim-gista"; - version = "2020-01-04"; + version = "2020-09-19"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "vim-gista"; - rev = "af13c0062a46d73384f15abee5a54e164fcaad8e"; - sha256 = "0f3pxahsaj37iln1k3289h7pj7z4fm0z3vfd0szf1spv3hzcjapd"; + rev = "c046de1b9d4cf97ff6f80cf3bdbb75b1094f2aaf"; + sha256 = "0q08hs4y9d4c4zdd0lh4k054133y0455fkn47gi7h16m01g92imc"; }; meta.homepage = "https://github.com/lambdalisue/vim-gista/"; }; @@ -4754,12 +4778,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-09-15"; + version = "2020-09-21"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "b919c60a6d1ca70a93d56fa4ee13dbcf412a8554"; - sha256 = "0sz08nbmk8pqlc4b1vypwv6xbhg7nrns6g1abp7xkzwn07lnrqb2"; + rev = "0a9792612fb87c5581906a9cc410b472c25a0d78"; + sha256 = "1gwswqmxd29hpj8rvf2v866877xc4fz3jhymkf0whhw62ya5gr9v"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -5343,36 +5367,36 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2020-08-29"; + version = "2020-09-21"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "ab952d62a3c57d176e6c63b3f3c95b8ba37b0630"; - sha256 = "07caiz9k3bx5qn5kg5hbh2a2d77bfvyfg9rx7s7zkavpz312r4kc"; + rev = "8262f528ca50832826efd0605ddc17a3830b53d1"; + sha256 = "0s1ayrprv59dki7xhzzlzxdfrkm3i70p8wh8sf48higvcrsjjylv"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2020-09-17"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "46330cd0cbab3780b59a53c16fde6273bb217071"; - sha256 = "121pr3s13bcy1hqc4bcx0x7isg0x5izbrsvir33d39q2x0wj44my"; + rev = "9755ec0c99e3cc4f3b4e0171c0fba02c132d6800"; + sha256 = "17ahwyjyb6w9504301hjc7nlsgnn7y5mjp0a1akj4dh8wb4hhzg6"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2020-08-06"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "f60443777137a0f91e489b1757c6602c63fb3731"; - sha256 = "1r6raxhwg78azcqv7brvas3w4xr7aja1gmcapm7j6mv69izf1fzw"; + rev = "cdf8247c0abd251475be26a044b2e95698df6c09"; + sha256 = "0i4926gw06m8pqqn8a8k2xsxxg0pm3q8q1k3xd0imxi3gkyvz1fq"; }; meta.homepage = "https://github.com/google/vim-maktaba/"; }; @@ -5715,12 +5739,12 @@ let vim-osc52 = buildVimPluginFrom2Nix { pname = "vim-osc52"; - version = "2017-06-23"; + version = "2020-09-19"; src = fetchFromGitHub { owner = "fcpg"; repo = "vim-osc52"; - rev = "01a311169b2678d853c87b371201205daf8fdf1a"; - sha256 = "1nxla8r4036shbmyx6wpxy9ncy1s2c5ghi5n5ip22b01lcv6lnv5"; + rev = "551f20e62e68684a5b745ae08b0c4236d86e4c2b"; + sha256 = "0yxjs32ab27l3kmh5lpinj15m11winqsnmykjq7lizs15v7gd2s9"; }; meta.homepage = "https://github.com/fcpg/vim-osc52/"; }; @@ -5907,12 +5931,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-09-16"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "06548fe61765d8a68a289741ce8d30f04a037e60"; - sha256 = "18yiqj62vpkvnxgcy1hqbdy846g4c3i807d3bbiz1kgwf9jh50ik"; + rev = "e2bbed8acc1f1cf498a0085cf771cf9bf40fb709"; + sha256 = "1cg0lfpjrzp7wajmdggwy56vjymrvhlmvmg3j7z67avvck8n2fn9"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -6111,12 +6135,12 @@ let vim-rooter = buildVimPluginFrom2Nix { pname = "vim-rooter"; - version = "2020-09-08"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-rooter"; - rev = "98595736d4d91552647ea0130e704cd1a3d5d1d1"; - sha256 = "1b6224f4q4lpd3sdn3ka8gdcnyi82ii8bh4baxf8mp9c0r6qwcns"; + rev = "45ea40da3f223fff83fce0a643875e560ed20aae"; + sha256 = "1bm8hpnm02pbivcvjn20qr6hk3yyb3flfkv7pk66sffhiyj44rh2"; }; meta.homepage = "https://github.com/airblade/vim-rooter/"; }; @@ -6147,12 +6171,12 @@ let vim-salve = buildVimPluginFrom2Nix { pname = "vim-salve"; - version = "2019-11-13"; + version = "2020-09-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-salve"; - rev = "876104d364420a7a11a2d97729dd4ab0a2f8a72e"; - sha256 = "1hj0qg182jv3cwg85rg4z0f8f8hr409is71z7sxhnhjq9fn1h6xj"; + rev = "5958a99c4ac783cec668380917ac1f62b27466fe"; + sha256 = "1vs2rfhcxm9v4ndnsx85b1i29h67qv748k3nvdxc145v1hjcnapm"; }; meta.homepage = "https://github.com/tpope/vim-salve/"; }; @@ -6375,12 +6399,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-09-05"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "791c72d53399c7db9ec5a19922efee15d8f5a94b"; - sha256 = "0ap477g8265w7rprk4z402m3xxpci35xq602z1g7x86488afgsrw"; + rev = "06fbadd9b3c8e4be1e1343addb51cd0582c047f7"; + sha256 = "14v5p1khr56pdy0x0pn540cjbvwxr6782pvsdwwbfdq9p2hmhnq1"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -6567,12 +6591,12 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2020-09-15"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "4c0ae1aa9324dc37e0d8bb672ecdcb313f97f75c"; - sha256 = "1rg9r0zpxwbzj710rm3jh9bvgdngmn8c4ikcv0rjk7d7wy2pclkn"; + rev = "f77a07617a649684148de97e5a9115e659166f6a"; + sha256 = "01rgbiddczyx56b6fha6jgxmr0kfhjz8d9rmbfnqlnynmy5545ic"; }; meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; @@ -6724,12 +6748,12 @@ let vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2020-04-23"; + version = "2020-09-18"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "44ba6fbe45895cd541ebfc87606add5c76e3829b"; - sha256 = "075cncr53w9xc1kqm50zl8yl18aspn3zdr6qjqyslf7gkw8yk38d"; + rev = "2fd76aa930e34838335c1aa125b88e7ea671e6c0"; + sha256 = "1xy0vp9sgqjm6qpfic2bbla4mxihw7j41gvi8cn0wsira6qcwda0"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -6856,12 +6880,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-09-15"; + version = "2020-09-20"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "d74c0b97ab0514ac924daa6dde87bee005d3469a"; - sha256 = "0jg2prsdfhs0vq43flsm8clhbamnddpafn2ajwjcxgyjb6dn6ndj"; + rev = "68c9570285f067020f0358623cafe63dbc2bd63f"; + sha256 = "1dpv6v449bcn6n72jjgvlnc9mnq3cpfy9b8m6mmjgvzgzkc1wj10"; }; meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; @@ -6880,12 +6904,12 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2020-09-17"; + version = "2020-09-23"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "3d2d4b8e6cb219d615d54e3fa31288ff85879711"; - sha256 = "1iadzwzf0v64a89zavw9dh1n6cp7388npm7zihcfdflhisrbrk22"; + rev = "ec25ffcdf793dd5af6d73ce75d21709a60a4689f"; + sha256 = "07gkygdspxn0fwlgcyhli85nlgg8g4y4v991n80vmk0rhsxqdh90"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -6940,12 +6964,12 @@ let vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2020-09-14"; + version = "2020-09-22"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "2109edb1706b26dab64a1851bd934571d5b48dc1"; - sha256 = "12zmhv49wx1h1zd28l9591iglipx2avmfwg7qk918sgx96bym1sf"; + rev = "89644adb8cc75ea96b4ab8e8218f22f1cc0deb23"; + sha256 = "1cyzfj86qizqnqi3ypf0cx4pvl9bsas77pxd1jpb5f3lslh2xhh8"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -7132,12 +7156,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2020-09-11"; + version = "2020-09-19"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "173f2d6f375bc58bffc6b871c5786ba183af09ee"; - sha256 = "0gyqp71c21yd134065c6brf3avlwy4s9zzf471gal7y41kap5ya4"; + rev = "6a5c0cf63e9414bfbf627999f9859259a01d9d2c"; + sha256 = "1bwdnhsa5lrid21pz5byhvc5d3vfsrzq7laqxpcq0h67cch154m3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -7145,12 +7169,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-09-16"; + version = "2020-09-24"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "9b53bb31a04e4ad4aaad43f3b5200f2494c256ae"; - sha256 = "180w0ajhjvwscl1f0w15yrb1lhvxm878izici1wj0sn06gkb51cp"; + rev = "a19c398b1e7876694ff5f6c65d95b23d5b8aadde"; + sha256 = "1mrlafqh1y6yc1m3gybwsi8400gyvnvbwzbmpxdizlx87iiz3bpq"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -7193,12 +7217,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-09-17"; + version = "2020-09-22"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "7972a7c6ebb3d5a1ab505605477b0fb79b5a7700"; - sha256 = "0qh8kwvl5dbc3k3pqfpc7liqvisjh08v7w9igrh719v0zdhdlyhv"; + rev = "9c9adf16db3445005181751f0d3db143d58fe24d"; + sha256 = "0d1c2p63kkvhgwcrj97qc4yahnx7z9q14qwadbj924w8qlvylmff"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -7326,12 +7350,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-09-16"; + version = "2020-09-20"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "d98f896ada495c3687007313374b2f945a2f2fb4"; - sha256 = "1p6x5qd6zvzg3ypllsgl7n9vk18g67dqyqg4zg9j07c9fsqs6383"; + rev = "4891999f055167cf845671c231d7740c104074bd"; + sha256 = "0cgbrgw1ppk7a8vwg0j2zf123clczkf9qv6gaaqmm8kz9j2n4pkb"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -7375,12 +7399,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2020-09-14"; + version = "2020-09-20"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "9e26b43ada8959f533604be3622fa56bf1d54752"; - sha256 = "1hlqnq83fl0jma0w7pra1iwq174gc2v32sfcjg39yd3hv9dmkl4v"; + rev = "9979e503e675b432c55a83891238c631f7f16a01"; + sha256 = "05cmc3173yscmk2r976280z53z3z7v8ysyy4i0z4v998l804hq5c"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index f97280adf7b..f328d0505fa 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -492,6 +492,7 @@ thirtythreeforty/lessspace.vim thosakwe/vim-flutter tiagofumo/vim-nerdtree-syntax-highlight tikhomirov/vim-glsl +tjdevries/lsp_extensions.nvim tmhedberg/SimpylFold tmsvg/pear-tree tmux-plugins/vim-tmux @@ -544,6 +545,7 @@ uarun/vim-protobuf udalov/kotlin-vim ujihisa/neco-look unblevable/quick-scope +urbit/hoon.vim Valodim/deoplete-notmuch vhda/verilog_systemverilog.vim vim-airline/vim-airline diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 04eabef9ec3..a914d70f173 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, vscode-utils, llvmPackages_8 }: +{ stdenv, callPackage, vscode-utils, llvmPackages_8, llvmPackages_latest }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; @@ -60,6 +60,18 @@ in }; }; + haskell.haskell = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "haskell"; + publisher = "haskell"; + version = "1.1.0"; + sha256 = "1wg06lyk0qn9jd6gi007sg7v0z9z8gwq7x2449d4ihs9n3w5l0gb"; + }; + meta = with stdenv.lib; { + license = licenses.mit; + }; + }; + james-yu.latex-workshop = buildVscodeMarketplaceExtension { mktplcRef = { name = "latex-workshop"; @@ -178,6 +190,10 @@ in }; }; + vadimcn.vscode-lldb = callPackage ./vscode-lldb { + lldb = llvmPackages_latest.lldb; + }; + vscodevim.vim = buildVscodeMarketplaceExtension { mktplcRef = { name = "vim"; diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json index ac2da521c22..4af15f4619e 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -2,25 +2,25 @@ "name": "rust-analyzer", "version": "0.4.0-dev", "dependencies": { - "node-fetch": "^2.6.0", - "vscode-languageclient": "7.0.0-next.1", - "@rollup/plugin-commonjs": "^13.0.0", - "@rollup/plugin-node-resolve": "^8.1.0", - "@types/glob": "^7.1.2", + "node-fetch": "^2.6.1", + "vscode-languageclient": "7.0.0-next.9", + "@rollup/plugin-commonjs": "^13.0.2", + "@rollup/plugin-node-resolve": "^8.4.0", + "@types/glob": "^7.1.3", "@types/mocha": "^7.0.2", "@types/node": "~12.7.0", "@types/node-fetch": "^2.5.7", - "@types/vscode": "^1.44.1", - "@typescript-eslint/eslint-plugin": "^3.4.0", - "@typescript-eslint/parser": "^3.4.0", - "eslint": "^7.3.1", + "@types/vscode": "^1.47.1", + "@typescript-eslint/eslint-plugin": "^3.10.1", + "@typescript-eslint/parser": "^3.10.1", + "eslint": "^7.8.0", "glob": "^7.1.6", - "mocha": "^8.0.1", - "rollup": "^2.18.1", - "tslib": "^2.0.0", - "typescript": "^3.9.5", + "mocha": "^8.1.3", + "rollup": "^2.26.9", + "tslib": "^2.0.1", + "typescript": "^3.9.7", "typescript-formatter": "^7.2.2", - "vsce": "^1.75.0", + "vsce": "^1.79.5", "vscode-test": "^1.4.0" } } diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json b/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json new file mode 100644 index 00000000000..6e73ee446d8 --- /dev/null +++ b/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json @@ -0,0 +1,24 @@ +{ + "name": "vscode-lldb", + "version": "1.5.3", + "dependencies": { + "@types/json5": "^0.0.30", + "@types/mocha": "^7.0.1", + "@types/node": "^8.10.50", + "@types/vscode": "^1.31.0", + "@types/yauzl": "^2.9.0", + "json5": "^2.1.0", + "memory-streams": "^0.1.3", + "mocha": "^7.0.1", + "source-map-support": "^0.5.12", + "string-argv": "^0.3.1", + "ts-loader": "^6.2.1", + "typescript": "^3.7.0", + "vsce": "^1.73.0", + "vscode-debugadapter-testsupport": "^1.35.0", + "vscode-debugprotocol": "^1.35.0", + "webpack": "^4.39.1", + "webpack-cli": "^3.3.7", + "yauzl": "^2.10.0" + } +} diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch b/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch new file mode 100644 index 00000000000..db62552b913 --- /dev/null +++ b/pkgs/misc/vscode-extensions/vscode-lldb/cmake-build-extension-only.patch @@ -0,0 +1,45 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,13 +9,6 @@ include(cmake/CopyFiles.cmake) + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_INSTALL_PREFIX $ENV{HOME}/.vscode/extensions/vscode-lldb CACHE PATH "Install location") + +-set(LLDB_ROOT $ENV{LLDB_ROOT} CACHE PATH "Root of LLDB build directory") +-if (LLDB_ROOT) +- message("Using LLDB from ${LLDB_ROOT}") +-else() +- message(FATAL_ERROR "LLDB_ROOT not set." ) +-endif() +- + # General OS-specific definitions + if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + set(DylibPrefix lib) +@@ -64,8 +57,9 @@ set(UpdateFile ${CMAKE_COMMAND} -E copy_if_different) + + # Adapter + +-add_subdirectory(adapter) +-add_subdirectory(lldb) ++add_custom_target(adapter) ++add_custom_target(lldb) ++add_custom_target(codelldb) + + # Extension package content + +@@ -74,16 +68,6 @@ configure_file(package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY) + configure_file(webpack.config.js ${CMAKE_CURRENT_BINARY_DIR}/webpack.config.js @ONLY) + file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) + +-# Run 'npm install' +-execute_process( +- COMMAND ${NPM} install +- WORKING_DIRECTORY ${CMAKE_BINARY_DIR} +- RESULT_VARIABLE Result +-) +-if (NOT ${Result} EQUAL 0) +- message(FATAL_ERROR "npm intall failed: ${Result}") +-endif() +- + # Copy it back, so we can commit the lock file. + file(COPY ${CMAKE_CURRENT_BINARY_DIR}/package-lock.json DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}) + \ No newline at end of file diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix new file mode 100644 index 00000000000..f22c9df36a1 --- /dev/null +++ b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix @@ -0,0 +1,106 @@ +{ lib, stdenv, vscode-utils, fetchFromGitHub, rustPlatform, makeWrapper, jq +, nodePackages, cmake, nodejs, unzip, python3, lldb, breakpointHook +, setDefaultLldbPath ? true +}: +assert lib.versionAtLeast python3.version "3.5"; +let + publisher = "vadimcn"; + name = "vscode-lldb"; + version = "1.5.3"; + + dylibExt = stdenv.hostPlatform.extensions.sharedLibrary; + + src = fetchFromGitHub { + owner = "vadimcn"; + repo = "vscode-lldb"; + rev = "v${version}"; + sha256 = "1139945j3z0fxc3nlyvd81k0ypymqsj051idrbgbibwshpi86y93"; + fetchSubmodules = true; + }; + + adapter = rustPlatform.buildRustPackage { + pname = "${name}-adapter"; + inherit version src; + + cargoSha256 = "0jl4msf2jcjxddwqkx8fr0c35wg4vwvg5c19mihri1v34i09zc5r"; + + # It will pollute the build environment of `buildRustPackage`. + cargoPatches = [ ./reset-cargo-config.patch ]; + + nativeBuildInputs = [ makeWrapper ]; + + buildAndTestSubdir = "adapter"; + + # Hack: Need a nightly compiler. + RUSTC_BOOTSTRAP = 1; + + # `adapter` expects a special hierarchy to resolve everything well. + postInstall = '' + mkdir -p $out/adapter + mv -t $out/adapter \ + $out/bin/* \ + $out/lib/* \ + ./adapter/*.py \ + ./formatters/*.py + rmdir $out/{bin,lib} + ''; + + postFixup = '' + wrapProgram $out/adapter/codelldb \ + --prefix PATH : "${python3}/bin" \ + --prefix LD_LIBRARY_PATH : "${python3}/lib" + ''; + }; + + build-deps = nodePackages."vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps"; + + vsix = stdenv.mkDerivation { + name = "${name}-${version}-vsix"; + inherit src; + + # Only build the extension. We handle `adapter` and `lldb` with nix. + patches = [ ./cmake-build-extension-only.patch ]; + + nativeBuildInputs = [ cmake nodejs unzip breakpointHook ]; + + postConfigure = '' + cp -r ${build-deps}/lib/node_modules/vscode-lldb/{node_modules,package-lock.json} . + ''; + + makeFlags = [ "vsix_bootstrap" ]; + + installPhase = '' + unzip ./codelldb-bootstrap.vsix 'extension/*' -d ./vsix-extracted + mv vsix-extracted/extension $out + + ln -s ${adapter}/adapter $out + # Mark that adapter and lldb are installed. + touch $out/platform.ok + ''; + + dontStrip = true; + dontPatchELF = true; + }; + +in vscode-utils.buildVscodeExtension { + inherit name; + src = vsix; + + nativeBuildInputs = lib.optional setDefaultLldbPath jq; + postUnpack = lib.optionalString setDefaultLldbPath '' + jq '.contributes.configuration.properties."lldb.library".default = $s' \ + --arg s "${lldb}/lib/liblldb.so" \ + $sourceRoot/package.json >$sourceRoot/package.json.new + mv $sourceRoot/package.json.new $sourceRoot/package.json + ''; + + vscodeExtUniqueId = "${publisher}.${name}"; + + meta = with lib; { + description = "A native debugger extension for VSCode based on LLDB"; + homepage = "https://github.com/vadimcn/vscode-lldb"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ oxalica ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch b/pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch new file mode 100644 index 00000000000..300f8cd96ef --- /dev/null +++ b/pkgs/misc/vscode-extensions/vscode-lldb/reset-cargo-config.patch @@ -0,0 +1,11 @@ +--- a/.cargo/config ++++ b/.cargo/config +@@ -1,8 +0,0 @@ +-[build] +-target-dir = "build/target" +- +-[target.armv7-unknown-linux-gnueabihf] +-linker = "arm-linux-gnueabihf-gcc" +- +-[target.aarch64-unknown-linux-gnu] +-linker = "aarch64-linux-gnu-gcc" diff --git a/pkgs/os-specific/linux/can-isotp/default.nix b/pkgs/os-specific/linux/can-isotp/default.nix index 7f16ecb9e6d..cccc7550fba 100644 --- a/pkgs/os-specific/linux/can-isotp/default.nix +++ b/pkgs/os-specific/linux/can-isotp/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation { pname = "can-isotp"; - version = "20180629"; + version = "20200910"; hardeningDisable = [ "pic" ]; src = fetchFromGitHub { owner = "hartkopp"; repo = "can-isotp"; - rev = "6003f9997587e6a563cebf1f246bcd0eb6deff3d"; - sha256 = "0b2pqb0vd1wgv2zpl7lvfavqkzr8mrwhrv7zdqkq3rz9givcv8w7"; + rev = "21a3a59e2bfad246782896841e7af042382fcae7"; + sha256 = "1laax93czalclg7cy9iq1r7hfh9jigh7igj06y9lski75ap2vhfq"; }; KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index 321f00b0ef2..79132852d23 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -1,14 +1,14 @@ -{ fetchurl, stdenv, kernel ? false }: +{ fetchFromGitHub, stdenv, kernel ? false }: stdenv.mkDerivation rec { - pname = "cryptodev-linux-1.9"; + pname = "cryptodev-linux-1.11"; name = "${pname}-${kernel.version}"; - src = fetchurl { - urls = [ - "http://nwl.cc/pub/cryptodev-linux/${pname}.tar.gz" - ]; - sha256 = "0l3r8s71vkd0s2h01r7fhqnc3j8cqw4msibrdxvps9hfnd4hnk4z"; + src = fetchFromGitHub { + owner = "cryptodev-linux"; + repo = "cryptodev-linux"; + rev = pname; + sha256 = "1ky850qiyacq8p3lng7n3w6h3x2clqrz4lkv2cv3psy92mg9pvc9"; }; hardeningDisable = [ "pic" ]; @@ -22,6 +22,5 @@ stdenv.mkDerivation rec { homepage = "http://cryptodev-linux.org/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; - broken = !stdenv.lib.versionOlder kernel.version "4.13"; }; } diff --git a/pkgs/os-specific/linux/firmware/firmware-manager/default.nix b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix new file mode 100644 index 00000000000..e98de6bbe9e --- /dev/null +++ b/pkgs/os-specific/linux/firmware/firmware-manager/default.nix @@ -0,0 +1,38 @@ +{ rustPlatform, lib, fetchFromGitHub, lzma, pkgconfig, openssl, dbus, glib, udev, cairo, pango, atk, gdk-pixbuf, gtk3, wrapGAppsHook }: +rustPlatform.buildRustPackage rec { + pname = "firmware-manager"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = pname; + rev = version; + sha256 = "0x9604jsflqxvbkfp139mzjicpyx8v21139jj8bp88c14ngvmdlw"; + }; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + + buildInputs = [ lzma openssl dbus glib udev cairo pango atk gdk-pixbuf gtk3 ]; + + depsExtraArgs.postPatch = "make prefix='$(out)' toml-gen"; + + postPatch = '' + sed -i 's|etc|$(prefix)/etc|' Makefile + ''; + + buildPhase = "make prefix='$(out)'"; + + installPhase = "make prefix='$(out)' install"; + + cargoSha256 = "0byc0pqa1w2qnfrx3psrzdq1c8qjslbmzxg872b9v6fr5d4c9cvg"; + + doCheck = false; + + meta = { + description = "Graphical frontend for firmware management"; + homepage = "https://github.com/pop-os/firmware-manager"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.shlevy ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix new file mode 100644 index 00000000000..40598abac92 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/system76-firmware/default.nix @@ -0,0 +1,39 @@ +{ rustPlatform, lib, fetchFromGitHub, lzma, pkgconfig, openssl, dbus, efibootmgr, makeWrapper }: +rustPlatform.buildRustPackage rec { + pname = "system76-firmware"; + # Check Makefile when updating, make sure postInstall matches make install + version = "1.0.17"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = pname; + rev = version; + sha256 = "0cnrskfk3sam90lfpgsraqs4bx9yz8rxhwfs8rxdri04lakxgghg"; + }; + + nativeBuildInputs = [ pkgconfig makeWrapper ]; + + buildInputs = [ lzma openssl dbus ]; + + cargoBuildFlags = [ "--workspace" ]; + + cargoSha256 = "06jrmxy68glcmbn9px29wc0s8pqdn26iy4jn3c246dapv1zvbb4s"; + + # Purposefully don't install systemd unit file, that's for NixOS + postInstall = '' + install -D -m -0644 data/system76-firmware-daemon.conf $out/etc/dbus-1/system.d/system76-firmware-daemon.conf + + for bin in $out/bin/system76-firmware-* + do + wrapProgram $bin --prefix PATH : "${efibootmgr}/bin" + done + ''; + + meta = { + description = "Tools for managing firmware updates for system76 devices."; + homepage = "https://github.com/pop-os/system76-firmware"; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.shlevy ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index fd62f07cd9c..5de0eea0bea 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "fwts"; - version = "20.07.00"; + version = "20.08.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "0azhcnlfziwn8wvw3fly2jfjyg53m8zba3jlcxgzrasgb0kvzb1c"; + sha256 = "098vxj5sd2nm88jmj6cxzcvid8w81m8fxdz881iki0pi7ysixa5q"; stripRoot = false; }; diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index 585bbfd165e..cbd19b7da8b 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iw"; - version = "5.4"; + version = "5.8"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0prrgb11pjrr6dw71v7nx2bic127qzrjifvz183v3mw8f1kryim2"; + sha256 = "1d1dfynrzh52zdia1l23ajv4q5wixgffnc1gkz05qrxnn2n4p75m"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c903b88e350..ca353ae9227 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -10,9 +10,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.144.a/linux-hardened-4.19.144.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.65.a.patch", - "sha256": "028nxwjy2sp5bvi9m76nl9x1gyrk4752p376bwvz1h47ljw2hwni", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.65.a/linux-hardened-5.4.65.a.patch" + "name": "linux-hardened-5.4.67.a.patch", + "sha256": "0jpjc1magvlhfwrx43n68xcxxk1g5w2g0rvp92n7yli0db97k1bm", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.67.a/linux-hardened-5.4.67.a.patch" }, "5.7": { "name": "linux-hardened-5.7.19.a.patch", @@ -20,8 +20,8 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.19.a/linux-hardened-5.7.19.a.patch" }, "5.8": { - "name": "linux-hardened-5.8.10.a.patch", - "sha256": "0myfn5iz7gljj977fwsi3vzvm3n66yihrj2w207m3sr9mw9hp6d9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.10.a/linux-hardened-5.8.10.a.patch" + "name": "linux-hardened-5.8.11.a.patch", + "sha256": "0cbmlwfzh9ppcvih437sp832rkhr7dfhx97drnkz4gysfyiyh07l", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.11.a/linux-hardened-5.8.11.a.patch" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 58721a2a642..e0c370c5946 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 stdenv.lib; buildLinux (args // rec { - version = "4.14.198"; + version = "4.14.199"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "00xmij2l4qmx1s07hplxkn9ddlwiyalh2l5fqdk6d8v031cbmyhy"; + sha256 = "1yflafb0n783igghk6d392pk6lbk3p2w7y01ams08f1b4qm47wq2"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index d50535e5d32..aebded8cb73 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 stdenv.lib; buildLinux (args // rec { - version = "4.19.146"; + version = "4.19.147"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0jl17yk3fpz0sx203l9l1fj5bly3jgsyr8hy5qa6py99fbk0qnim"; + sha256 = "19nnx61v7c0102ik1rjan0kdsj8av8v7iqz5vm3v3kjllmjmvr2x"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 937149c571c..c6f9b6ddb47 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.236"; + version = "4.4.237"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1v1mx16x1crnxf4pix0bhw40lq89n7wpd66gjc2mhxi75h6x6i80"; + sha256 = "1q6hwjwvlsikgr8b04l7v2jia2wyqxgbli6i7y20aq49h13ap2qk"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 116e40fed78..c6d29d2d8a5 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.236"; + version = "4.9.237"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1ma2z0nvby4qyxzi3vxa28f0wvlnl74njk6cryjrqaksq6161qp7"; + sha256 = "07w6mwgh7i3bvg1w3w5i9kgxjmvqr7cv7nzrmx7j9p6cq295gv41"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 90f191c3681..046007c58e6 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 stdenv.lib; buildLinux (args // rec { - version = "5.4.66"; + version = "5.4.67"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1cnsrz21kcf0h7krpv9p1a7n59mybr5ii0jdi3yc3x3lcwvk06gz"; + sha256 = "196avi0950qrd0lxdpdsl6lxa51f20sz476mcl1i5islbnfbsxf1"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.8.nix b/pkgs/os-specific/linux/kernel/linux-5.8.nix index 14abb483eee..d9567b20e03 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.8.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.8.10"; + version = "5.8.11"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1wjsdc93xilag0pk205m2q0ixmpp93ql5qj0fm3qlqddgxm14vlx"; + sha256 = "0jy0yrrixzql9dlk9305w98pja2pm6ijrdbai326595pnk740n9y"; }; } // (args.argsOverride or {})) 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 b59a367c4ad..f58f08ca913 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.61-rt37"; # updated by ./update-rt.sh + version = "5.4.66-rt38"; # 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 = "197y2yb60m1k8i7mig4pa9wsrklfxq81ba3zfahwb2b31w2kvwc6"; + sha256 = "1cnsrz21kcf0h7krpv9p1a7n59mybr5ii0jdi3yc3x3lcwvk06gz"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1qgd55x62pczgmxcxbigkg6f622ma5a6mz4gi55a8mlbxzh2pddj"; + sha256 = "1w0v5wl5fhxl5axd4701dljxhv9rywpgiix3yv7l6i3c5b8iw1zi"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 57c6b941c8d..3a96013abdf 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.9-rc4"; + version = "5.9-rc6"; extraMeta.branch = "5.9"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "080qd0dmxs0zmkpcx62vnf719wgkk64a3012r4vsaiymzhddxy8k"; + sha256 = "1zg93k1fl73qd46kbvz2y4ahsm208d63dj89jdlnb64gfpppf373"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/lockdep/default.nix b/pkgs/os-specific/linux/lockdep/default.nix index 74abd12868d..2e9003c3f92 100644 --- a/pkgs/os-specific/linux/lockdep/default.nix +++ b/pkgs/os-specific/linux/lockdep/default.nix @@ -1,16 +1,47 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, bash, flex, bison, valgrind }: stdenv.mkDerivation rec { pname = "lockdep"; - version = "4.1.2"; - fullver = "4.1.2"; + # it would be nice to be able to pick a kernel version in sync with something + # else we already ship, but it seems userspace lockdep isn't very well maintained + # and appears broken in many kernel releases + version = "5.0.21"; + fullver = "5.0.21"; src = fetchurl { - url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1mdyjhnzhh254cblahqmpsk226z006z6sm9dmwvg6jlhpsw4cjhy"; + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "1my2m9hvnvdrvzcg0fgqgaga59y2cd5zlpv7xrfj2nn98sjhglwq"; }; - preConfigure = "cd tools/lib/lockdep"; + # ensure *this* kernel's userspace-headers are picked up before we + # fall back to those in glibc, as they will be from a mismatched + # kernel version + postPatch = '' + substituteInPlace tools/lib/lockdep/Makefile \ + --replace 'CONFIG_INCLUDES =' $'CONFIG_INCLUDES = -I../../../usr/include\n#' + ''; + + nativeBuildInputs = [ flex bison ]; + + buildPhase = '' + make defconfig + make headers_install + cd tools/lib/lockdep + make + ''; + + doCheck = true; + checkInputs = [ valgrind ]; + checkPhase = '' + # there are more /bin/bash references than just shebangs + for f in lockdep run_tests.sh tests/*.sh; do + substituteInPlace $f \ + --replace '/bin/bash' '${bash}/bin/bash' + done + + ./run_tests.sh + ''; + installPhase = '' mkdir -p $out/bin $out/lib $out/include diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index df71a953fee..7c37fcf231f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -32,6 +32,17 @@ rec { # No active beta right now beta = stable; + # Vulkan developer beta driver + vulkan_beta = generic { + version = "450.56.11"; + persistencedVersion = "450.57"; + settingsVersion = "450.57"; + sha256_64bit = "1k64h8sp4rf6kc7liypznjgkmxi67njy1s8xy2r341fhl62pl010"; + settingsSha256 = "1clbj9a3kv3j8jg35c197gd7b3f9f9f4h9ll5hlax95hdg12lgan"; + persistencedSha256 = "17747z1fsbiznfsmahxmz8kmhwwcjanpfih60v5mwzk63gy4i3d5"; + url = "https://developer.nvidia.com/vulkan-beta-4505611-linux"; + }; + # Last one supporting x86 legacy_390 = generic { version = "390.138"; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 63091e9875f..8a9e340a20a 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -1,8 +1,11 @@ { version +, url ? null , sha256_32bit ? null , sha256_64bit , settingsSha256 +, settingsVersion ? version , persistencedSha256 +, persistencedVersion ? version , useGLVND ? true , useProfiles ? true , preferGtk2 ? false @@ -11,7 +14,7 @@ , prePatch ? "" , patches ? [] , broken ? false -}: +}@args: { stdenv, callPackage, pkgs, pkgsi686Linux, fetchurl , kernel ? null, perl, nukeReferences @@ -46,12 +49,12 @@ let src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run"; + url = args.url or "https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run"; sha256 = sha256_64bit; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run"; + url = args.url or "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run"; sha256 = sha256_32bit; } else throw "nvidia-x11 does not support platform ${stdenv.hostPlatform.system}"; @@ -89,6 +92,7 @@ let withGtk3 = !preferGtk2; }; persistenced = mapNullable (hash: callPackage (import ./persistenced.nix self hash) { }) persistencedSha256; + inherit persistencedVersion settingsVersion; }; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index de36ad06c60..ff2792ac315 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -2,14 +2,14 @@ nvidia_x11: sha256: { stdenv, fetchFromGitHub, m4 }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "nvidia-persistenced"; - inherit (nvidia_x11) version; + version = nvidia_x11.persistencedVersion; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-persistenced"; - rev = nvidia_x11.version; + rev = nvidia_x11.persistencedVersion; inherit sha256; }; diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index b1250e56ee0..fbddd7b7fa2 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -9,13 +9,13 @@ let src = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-settings"; - rev = nvidia_x11.version; + rev = nvidia_x11.settingsVersion; inherit sha256; }; libXNVCtrl = stdenv.mkDerivation { pname = "libXNVCtrl"; - inherit (nvidia_x11) version; + version = nvidia_x11.settingsVersion; inherit src; buildInputs = [ libXrandr libXext ]; @@ -42,7 +42,7 @@ in stdenv.mkDerivation { pname = "nvidia-settings"; - inherit (nvidia_x11) version; + version = nvidia_x11.settingsVersion; inherit src; nativeBuildInputs = [ pkgconfig m4 ]; diff --git a/pkgs/os-specific/linux/system76-acpi/default.nix b/pkgs/os-specific/linux/system76-acpi/default.nix index e97e17784cb..b7c0e27669d 100644 --- a/pkgs/os-specific/linux/system76-acpi/default.nix +++ b/pkgs/os-specific/linux/system76-acpi/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation { installPhase = '' install -D system76_acpi.ko $out/lib/modules/${kernel.modDirVersion}/misc/system76_acpi.ko + mkdir -p $out/lib/udev/hwdb.d + mv lib/udev/hwdb.d/* $out/lib/udev/hwdb.d ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/system76/default.nix b/pkgs/os-specific/linux/system76/default.nix index be6c1f6c3ad..02eca1d5bbd 100644 --- a/pkgs/os-specific/linux/system76/default.nix +++ b/pkgs/os-specific/linux/system76/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation { installPhase = '' install -D system76.ko $out/lib/modules/${kernel.modDirVersion}/misc/system76.ko + mkdir -p $out/lib/udev/hwdb.d + mv lib/udev/hwdb.d/* $out/lib/udev/hwdb.d ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/xpadneo/default.nix b/pkgs/os-specific/linux/xpadneo/default.nix index 7a1c2d1cec9..5f101896921 100644 --- a/pkgs/os-specific/linux/xpadneo/default.nix +++ b/pkgs/os-specific/linux/xpadneo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xpadneo"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "atar-axis"; repo = pname; rev = "v${version}"; - sha256 = "0v688j7jx2b68zlwnrr5y63zxzhldygw1lcp8f3irayhcp8ikzzy"; + sha256 = "1g3ml7vq0dzwl9815c3l0i0qz3a7v8c376c6dqbfkbj2f1d43vqs"; }; setSourceRoot = '' diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index c4b3070e9f2..2d0d4abd914 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.8.5"; + version = "3.8.8"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "014pfgfj90scas40lf0yjx14vhx5l5zbi3by2nnb704lg8w2n456"; + sha256 = "14rzlikaqxi7cvpy4np1s1pnkila547zdxsb7nl4ilman1zwdgk7"; }; buildInputs = @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://www.rabbitmq.com/"; description = "An implementation of the AMQP messaging protocol"; - license = stdenv.lib.licenses.mpl11; + license = stdenv.lib.licenses.mpl20; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ Profpatsch ]; }; diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index a8baefa98ea..6daf3251102 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, jre, makeWrapper, bash, coreutils, gnugrep, gnused, ps, +{ stdenv, fetchurl, jre8, makeWrapper, bash, coreutils, gnugrep, gnused, ps, majorVersion ? "1.0" }: let @@ -49,11 +49,18 @@ let sha256 = "0bldfrvd351agm237icnvn36va67crpnzmbh6dlq84ip910xsgas"; }; "2.4" = { - kafkaVersion = "2.4.0"; + kafkaVersion = "2.4.1"; scalaVersion = "2.12"; - sha256 = "1vng5ipkjzqy0wijc706w2m1rjl5d0nsgbxiacci739y1jmjnn5r"; + sha256 = "0ahsprmpjz026mhbr79187wfdrxcg352iipyfqfrx68q878wnxr1"; + }; + "2.5" = { + kafkaVersion = "2.5.0"; + scalaVersion = "2.13"; + sha256 = "0w3g7ii8x63m2blv2a8c491d0diczpliaqm9f7w5yn98hikh0aqi"; }; }; + + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 in with versionMap.${majorVersion}; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 2aae5634cc5..2afc5da51f5 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,8 +1,8 @@ { config, stdenv, lib, fetchurl, fetchpatch -, perl -, libcap, libtool, libxml2, openssl +, perl, pkg-config +, libcap, libtool, libxml2, openssl, libuv , enablePython ? config.bind.enablePython or false, python3 ? null -, enableSeccomp ? false, libseccomp ? null, buildPackages +, enableSeccomp ? false, libseccomp ? null, buildPackages, nixosTests }: assert enableSeccomp -> libseccomp != null; @@ -10,11 +10,11 @@ assert enablePython -> python3 != null; stdenv.mkDerivation rec { pname = "bind"; - version = "9.14.12"; + version = "9.16.7"; src = fetchurl { - url = "https://ftp.isc.org/isc/bind9/${version}/${pname}-${version}.tar.gz"; - sha256 = "1j7ldvdschmvzxrbajjhmdsl2iqxc1lm64vk0a5sdykxpy9y8kcw"; + url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz"; + sha256 = "1l8lhgnkj3fnl1101bs3pzj5gv2x5m9ahvrbyscsc9mxxc91hzcz"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { ./remove-mkdir-var.patch ]; - nativeBuildInputs = [ perl ]; - buildInputs = [ libtool libxml2 openssl ] + nativeBuildInputs = [ perl pkg-config ]; + buildInputs = [ libtool libxml2 openssl libuv ] ++ lib.optional stdenv.isLinux libcap ++ lib.optional enableSeccomp libseccomp ++ lib.optional enablePython (python3.withPackages (ps: with ps; [ ply ])); @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--with-libtool" - "--with-libxml2=${libxml2.dev}" - "--with-openssl=${openssl.dev}" (if enablePython then "--with-python" else "--without-python") "--without-atf" "--without-dlopen" @@ -59,7 +57,6 @@ stdenv.mkDerivation rec { postInstall = '' moveToOutput bin/bind9-config $dev - moveToOutput bin/isc-config.sh $dev moveToOutput bin/host $host @@ -68,13 +65,15 @@ stdenv.mkDerivation rec { moveToOutput bin/nslookup $dnsutils moveToOutput bin/nsupdate $dnsutils - for f in "$lib/lib/"*.la "$dev/bin/"{isc-config.sh,bind*-config}; do + for f in "$lib/lib/"*.la "$dev/bin/"bind*-config; do sed -i "$f" -e 's|-L${openssl.dev}|-L${openssl.out}|g' done ''; doCheck = false; # requires root and the net + passthru.tests = { inherit (nixosTests) bind; }; + meta = with stdenv.lib; { homepage = "https://www.isc.org/downloads/bind/"; description = "Domain name server"; diff --git a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch b/pkgs/servers/dns/bind/dont-keep-configure-flags.patch index 17fdb15ad46..ceb887e678e 100644 --- a/pkgs/servers/dns/bind/dont-keep-configure-flags.patch +++ b/pkgs/servers/dns/bind/dont-keep-configure-flags.patch @@ -1,40 +1,37 @@ -diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h -index b8e356b..cbe6c94 100644 ---- a/bin/named/include/named/globals.h -+++ b/bin/named/include/named/globals.h -@@ -68,7 +68,9 @@ EXTERN const char * named_g_version INIT(VERSION); - EXTERN const char * named_g_product INIT(PRODUCT); - EXTERN const char * named_g_description INIT(DESCRIPTION); - EXTERN const char * named_g_srcid INIT(SRCID); +diff -ru a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h +--- a/bin/named/include/named/globals.h 2020-09-24 17:43:49.398977491 +0200 ++++ b/bin/named/include/named/globals.h 2020-09-24 17:44:36.826590553 +0200 +@@ -69,7 +69,9 @@ + EXTERN const char *named_g_product INIT(PRODUCT); + EXTERN const char *named_g_description INIT(DESCRIPTION); + EXTERN const char *named_g_srcid INIT(SRCID); +#if 0 - EXTERN const char * named_g_configargs INIT(CONFIGARGS); + EXTERN const char *named_g_configargs INIT(CONFIGARGS); +#endif - EXTERN const char * named_g_builder INIT(BUILDER); - EXTERN in_port_t named_g_port INIT(0); - EXTERN isc_dscp_t named_g_dscp INIT(-1); -diff --git a/bin/named/main.c b/bin/named/main.c -index 62d9ce3..342abdc 100644 ---- a/bin/named/main.c -+++ b/bin/named/main.c -@@ -459,8 +459,10 @@ printversion(bool verbose) { + EXTERN const char *named_g_builder INIT(BUILDER); + EXTERN in_port_t named_g_port INIT(0); + EXTERN isc_dscp_t named_g_dscp INIT(-1); +diff -ru a/bin/named/main.c b/bin/named/main.c +--- a/bin/named/main.c 2020-09-24 17:43:49.399977504 +0200 ++++ b/bin/named/main.c 2020-09-24 17:44:24.102426273 +0200 +@@ -506,7 +506,9 @@ } printf("running on %s\n", named_os_uname()); +#if 0 - printf("built by %s with %s\n", - named_g_builder, named_g_configargs); + printf("built by %s with %s\n", named_g_builder, named_g_configargs); +#endif #ifdef __clang__ printf("compiled by CLANG %s\n", __VERSION__); - #else -@@ -1001,9 +1003,11 @@ setup(void) { - NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, - "running on %s", named_os_uname()); + #else /* ifdef __clang__ */ +@@ -1102,9 +1104,11 @@ + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "running on %s", + named_os_uname()); +#if 0 isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, - NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, - "built with %s", named_g_configargs); + NAMED_LOGMODULE_MAIN, ISC_LOG_NOTICE, "built with %s", + named_g_configargs); +#endif isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL, diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 9d1a56877d7..5197b1d3dff 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "2.14.1"; + version = "2.15.0"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "048bfkazjijf7p0wb5y09qhl7pgg297xxshgmkfyr025d7d50lf4"; + sha256 = "0p6vy5b6dhv23qnn6sk99hn0j5wiwqpaprsg5jgm2wxb0w2bfz0w"; rev = "v${version}"; }; - vendorSha256 = "1pvyr3lazza89njdl6q3h2nd0mkvjvbryyrfqv11kd3s52055ckz"; + vendorSha256 = "0jrp778cjr8k8sbal0yn1zy7s9sj534q9i90qv4c29fxd9xw7qgp"; doCheck = false; diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index bb9302479e9..d2387a1fa62 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -1,26 +1,32 @@ -{ stdenv, python2, fetchFromGitHub }: +{ stdenv, python3Packages, fetchFromGitHub }: + +with python3Packages; buildPythonApplication rec { -with python2.pkgs; buildPythonApplication rec { pname = "isso"; - version = "0.12.2"; + # Can not use 0.12.2 because of: + # https://github.com/posativ/isso/issues/617 + version = "unstable-2020-09-14"; # no tests on PyPI src = fetchFromGitHub { owner = "posativ"; repo = pname; - rev = version; - sha256 = "18v8lzwgl5hcbnawy50lfp3wnlc0rjhrnw9ja9260awkx7jra9ba"; + rev = "f4d2705d4f1b51f444d0629355a6fcbcec8d57b5"; + sha256 = "02jgfzq3svd54zj09jj7lm2r7ypqqjynzxa9dgnnm0pqvq728wzr"; }; propagatedBuildInputs = [ - bleach - cffi - configparser - html5lib - ipaddr + itsdangerous jinja2 misaka + html5lib werkzeug + bleach + flask-caching + ]; + + buildInputs = [ + cffi ]; checkInputs = [ nose ]; diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index a12c86cd3f0..1a11e065d93 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://dovecot.org/"; description = "Open source IMAP and POP3 email server written with security primarily in mind"; - maintainers = with stdenv.lib.maintainers; [ peti rickynils fpletz globin ]; + maintainers = with stdenv.lib.maintainers; [ peti fpletz globin ]; platforms = stdenv.lib.platforms.unix; }; passthru.tests = { diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index aca694f53d6..5c01453cb27 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = "http://pigeonhole.dovecot.org/"; description = "A sieve plugin for the Dovecot IMAP server"; license = licenses.lgpl21; - maintainers = with maintainers; [ rickynils globin ]; + maintainers = with maintainers; [ globin ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index c489f2b14f7..a59e18837d7 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ''; license = licenses.isc; platforms = platforms.linux; - maintainers = with maintainers; [ rickynils obadz ekleog ]; + maintainers = with maintainers; [ obadz ekleog ]; }; passthru.tests = { basic-functionality-and-dovecot-interaction = nixosTests.opensmtpd; diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index ac5b9475028..e449f4ae954 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { description = "A fast, easy to administer, and secure mail server"; license = with licenses; [ ipl10 epl20 ]; platforms = platforms.linux; - maintainers = with maintainers; [ rickynils globin ]; + maintainers = with maintainers; [ globin ]; }; } diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 3758505edba..cc4447914c4 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -9,11 +9,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.19.2"; + version = "1.19.3"; src = fetchPypi { inherit pname version; - sha256 = "0q2w3aid6xsn1ibpsl3wf6m7vl0znngz8n717rx1jndz4s6014nj"; + sha256 = "1r63gw9a4n2sd3520zadpn05zxfk45nqrgwxp3zky5nkyrh4qbys"; }; patches = [ diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 19e228b1624..4a14dca660b 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -23,6 +23,15 @@ buildGoModule rec { sed -i "s/CommitID.*/CommitID = \"${src.rev}\"/g" cmd/build-constants.go ''; + postConfigure = '' + export CGO_ENABLED=0 + ''; + + buildFlagsArray = [ + "-tags=kqueue" + "-trimpath" + ]; + passthru.tests.minio = nixosTests.minio; meta = with stdenv.lib; { diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 0bcad77c415..975c0922510 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.1.5"; + version = "7.2.0"; excludedPackages = [ "release_publisher" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "089z2x6jhiv5cx70vm7f1pyj5avappnaxrwah8jbnlkaz2kisp79"; + sha256 = "1pzsg6kr5kq5767plji7m6ssy2z9jxjp9zp182baxjd634mmclcx"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0l1lw3y5w4s6qfkmclzc6h6hqwxqmxlppnwsq1zpm2hmrndy440j"; + sha256 = "003sn06r94m68b6l91cjr3xr3i7hq54ay0gb562i6y5swrfkqqwz"; }; - vendorSha256 = "0i0qdfh6cjdjg2mrrabm42427aaxs6a90ydb554ds14k6r4jdf8b"; + vendorSha256 = "1b33kibvfa1qgalqb9ngxqimcn92cy8sllsc81wc9gmz4giz9mn1"; postPatch = '' substituteInPlace pkg/cmd/grafana-server/main.go \ diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index fa3c9e4dd4e..a1fd3915207 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "10.0.5"; + version = "10.0.6"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "04rjqmlhv55jmdc159q5ckrakq5iwp18wi72lzl6zy21yk5hxmp0"; + sha256 = "1q3xx6jc967nj7h8gvnrqxn8657dn3qy9j802rjzcg6iwlpjack9"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index 168cee9711b..9625c240c5d 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_auto_failover"; - version = "1.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "1si4k37azigp7hqibnkzr1p6zknadxm7pb33lygrxarqkifx67j4"; + sha256 = "1q5gy1jaklk885xjda9dhf6jd5q3sc7jd8p1zdlwv4srxf6sgf10"; }; buildInputs = [ postgresql openssl zlib readline ]; diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index 3f344f673f1..030e5695b22 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, autoreconfHook, fetchurl }: stdenv.mkDerivation rec { - name = "dash-0.5.11.1"; + name = "dash-0.5.11.2"; src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz"; - sha256 = "048n1rbw3v1ffzsw5mkc6zzvvf1csq7pcri7jraaqag38vqq3j3k"; + sha256 = "0pvdpm1cgfbc25ramn4305a0158yq031q1ain4dc972rnxl7vyq0"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 97deab47cfb..cc4c7903360 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,15 +4,15 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2020-09-14"; + version = "2020-09-20"; pname = "oh-my-zsh"; - rev = "2bc1da7f377e78cdfa74190ffe5baf6c814d0fce"; + rev = "93c837fec8e9fe61509b9dff9e909e84f7ebe32d"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "1xr5nmd3q8yapc0yzx7cv9qh8gvgvn2rf2z3fhwxrap3z77jp5fv"; + sha256 = "1ww50c1xf64z1m0sy30xaf2adr87cqr5yyv9jrqr227j97vrwj04"; }; installPhase = '' diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 77779c39f50..7d2523b4073 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,58 +1,178 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "2.6.1"; + version = "2.10.2"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.6.1-linux-x64.tar.gz"; - sha256 = "12f81wj8r3pmxj2l8qhcgnmy2m0a6bfzrvq9avl3444h2w29qpy2"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.10.2-linux-x64.tar.gz"; + sha256 = "0pxm90vmha265zc4b1ip2f3iryslkwxznn4kb8l3ma6gibz1zav3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v2.13.0-linux-amd64.tar.gz"; - sha256 = "03l7ybc9ca63vdm7a2zsvgc8zz8ip973sfxsjqf3bb277r04mnpb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.1.0-linux-amd64.tar.gz"; + sha256 = "1l4kszzw1w862sfd4jnz66lwnp02p4kl1fwvj5ab81qfwzwg0cfx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.13.0-linux-amd64.tar.gz"; - sha256 = "0ivdiib3a1c1r2ppxmj6blgq26s05s3081969j0j9jlscpa79lap"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.4.0-linux-amd64.tar.gz"; + sha256 = "1gzjdafx5zsqrb5r3amskak51ajcpqbbfw45939jdsdll8vclw7g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.2.0-linux-amd64.tar.gz"; - sha256 = "0w6ys5bmry1b8ndzj167cz3a8fc6mbl5v9v2almrmd3q6fycm4gj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.6.0-linux-amd64.tar.gz"; + sha256 = "0myvx2glqnx29l4wd5vx4gm773zrcmwcjvs2b1yv63fl10md9sv7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.4.0-linux-amd64.tar.gz"; - sha256 = "0id3mji08hk76kffz46dlbl2r11kgv5jvlmw869dssg2d0wliv82"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.5.0-linux-amd64.tar.gz"; + sha256 = "12cajd8jiqy11s880vsv20gqfm44g160x7fxm93agjl7wng32ad6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.2.2-linux-amd64.tar.gz"; - sha256 = "07asdmmacxazg65d5hphjxzb5j5d2dcc95wjbxx3wwc1swqma4aq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.8.0-linux-amd64.tar.gz"; + sha256 = "0k429fh477f84kmnhyl5s9p0yym7d6sdq7hy7wqx6psxp4rf5h9x"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v2.8.0-linux-amd64.tar.gz"; + sha256 = "045z7qj23bq71nxfjk1vvnfbjcnqfkcbxbpjz72q0hw4xn7dq6jz"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.3.0-linux-amd64.tar.gz"; + sha256 = "16d0jd3429pr4vlrzrv32w2fa53j7gyqq5lc78gw9j4v3mc3scvz"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.25.0-linux-amd64.tar.gz"; + sha256 = "0gz4kpddaf9p25lfnp70p6197wrfgsiys7s4vdy75z8dyd4sbiv0"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.0.0-linux-amd64.tar.gz"; + sha256 = "0n2532gfb5i53raya07rn8wcp15rc07jfg8wsm2lfzj7a4mp2p6c"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v2.6.0-linux-amd64.tar.gz"; + sha256 = "16l1a30rkg9l6yh68qv61dgm3h3gdgpsdacvnfg1ra0fvvfs9477"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.2.0-linux-amd64.tar.gz"; + sha256 = "1m2w8gsksr36pprxr6v3v4y3n7x5ycbcdfywv67yxmbi4lxyy3ar"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.6.1-linux-amd64.tar.gz"; + sha256 = "01vnbgck1ffj4jg8ghmkjp63xq3r9q3459vy03xpzm14l1i6agwv"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.2.0-linux-amd64.tar.gz"; + sha256 = "1g05kqymbkrxf48iskn9w12kxy880allhqm9a7p4g7mx0174yfhm"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.2.1-linux-amd64.tar.gz"; + sha256 = "1fa5i283nisa6cq02fcrsgwkw7bwnh2j3agjbqyvv2xiss34i7hw"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.6.0-linux-amd64.tar.gz"; + sha256 = "0ihiag248c30dz4z2b559689zqwp52p0m7pv7jqpk86xwvimbsn1"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.1.0-linux-amd64.tar.gz"; + sha256 = "0jwvdsb26bhsqcbrsw9ss54xgpccl830hhbwnbz8ql8yndd35srg"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.4.0-linux-amd64.tar.gz"; + sha256 = "1wr4p312xwqi0icn153iv2j88rp37wkf8hc5y4pmdr61vd0kpw7w"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.3.1-linux-amd64.tar.gz"; + sha256 = "0xq3as94i9ah9dv1cabgdqjg68yg7laksfzpf81s6kcv742cnnqi"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v2.4.0-linux-amd64.tar.gz"; + sha256 = "1av7fj1jlhhqplqq60d6hzzidlhsvr41z9p1x3mvz5frwijxr1ab"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.10.0-linux-amd64.tar.gz"; + sha256 = "1bgw5xw6f01whxlm5358xn6v9wqz9mxg3dvb5vi7rfs9wwxykr4g"; } ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.6.1-darwin-x64.tar.gz"; - sha256 = "17jf9xwpwpbqk5r20i14j1z4i4rbbx781k0zqyc9yskmv5q4mmwr"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.10.2-darwin-x64.tar.gz"; + sha256 = "1fzqylx7pmrpvsxrmhlx56v9i9zkid96zrj9hsc26qhx5w7k600w"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.1.0-darwin-amd64.tar.gz"; + sha256 = "05dxpdwdg8cd1a6d3xh8dkns5wkvpr0v11bb4zdzv38x6wxnqx0z"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.4.0-darwin-amd64.tar.gz"; + sha256 = "1jbnx1wpzh2k127ixh9j0ghlqhj3sc1s17cp3ax3q9gq3cadcl5i"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.6.0-darwin-amd64.tar.gz"; + sha256 = "0lpf3cqi3kss7hmr8a3y6gmwjl854vmva4f9p9q7147rxr8aw5f9"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v2.5.0-darwin-amd64.tar.gz"; + sha256 = "0qwjrhmspibjr17kgswfcgbdhmkicqrjd1md6azingdr5wp7cwwm"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v2.8.0-darwin-amd64.tar.gz"; + sha256 = "0rwgbpif7l3ayh363cz0k2dir36a87x0bszspq3nm3xbwmd190f0"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v2.8.0-darwin-amd64.tar.gz"; + sha256 = "0943r8x70gxxkfn0rhcx2b9zya44k28j5s8z2m8jn2i1fvqvahq5"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.3.0-darwin-amd64.tar.gz"; + sha256 = "1nvqjc1zrxfn2r1wdh2sdr2vimar5836bhscqsiaw4i6mjdsggfy"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.25.0-darwin-amd64.tar.gz"; + sha256 = "05x0qlv3xkkvs71ixzmc21ck85w9f4a4dxrwmgkq6c0nhy3npbnj"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v2.0.0-darwin-amd64.tar.gz"; + sha256 = "1m80l75r2w46m7191igjan4ipfkhc9ld1xlybncd628qlcf2jpqz"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v2.6.0-darwin-amd64.tar.gz"; + sha256 = "0dan0qqvaxfh90db14s7adjjy670lz15bbm6a8fjfyj4fdhsbwyn"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v0.2.0-darwin-amd64.tar.gz"; + sha256 = "1gznv5d10pxbkyl4hbd4c9skkgkypfs1xg0jjmszkwxcjzvhc4l3"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.6.1-darwin-amd64.tar.gz"; + sha256 = "08w8by7h9nlgvyap2in6yy21dk46fxvl93h4ghaw7xxjjs2l3dfi"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v2.2.0-darwin-amd64.tar.gz"; + sha256 = "0qjszd30r3094p5m7v5gynx2kxh9xf9878mxdc2wnswpkpw3v5pb"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v2.2.1-darwin-amd64.tar.gz"; + sha256 = "1a19lmxi8r8h4yfll0k97kvq0lgkzwvrwf52ny4zl67bc9g4jr5p"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v2.6.0-darwin-amd64.tar.gz"; + sha256 = "11vfjkmhrq7q4j6h5d2sdzan3ziyhl5qhc0fhfnsz2pxss549zab"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v2.13.0-darwin-amd64.tar.gz"; - sha256 = "18mjf9gm8siskg9jh65x4qp4w8p4wnp19bxxk4jfbq27icdk7ws9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-packet-v3.1.0-darwin-amd64.tar.gz"; + sha256 = "1ny1m6pb44k77gqf97km3gkb7dwhilkmqi2zy4hdl20js1ijsh7p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v3.13.0-darwin-amd64.tar.gz"; - sha256 = "14iwz1gm34irs9jlpwc4ig1wc8k4aaxq8mz3g22yrvwddrsc4rcw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.4.0-darwin-amd64.tar.gz"; + sha256 = "1vm2pfj93wi6q7kcrqwy9190mx0jn2p96algcd5gms48a4m8bgpb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.2.0-darwin-amd64.tar.gz"; - sha256 = "0zaxp2n1w5djwyq1afhd3v887dh0yj53jz449riqp19dpyfqf7h7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v2.3.1-darwin-amd64.tar.gz"; + sha256 = "0mnmlvyppfndq1rwy4k40j0syy590v2lg75kg0rnf16qlpffskn9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v2.4.0-darwin-amd64.tar.gz"; - sha256 = "1kzs7k7as9r1vbj746wqz9iph13zfzzw8nsk3waq8aq1hmgh2g1q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v2.4.0-darwin-amd64.tar.gz"; + sha256 = "0q9qbqalask628cbi3347pjbnm3304c8qhx7h8icqxxh59mjnhr7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.2.2-darwin-amd64.tar.gz"; - sha256 = "0hwdghij7g9h58nwimfmaz91lz38wibkrdzwqhi7d426m53g6f5c"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v2.10.0-darwin-amd64.tar.gz"; + sha256 = "1gxiqq6hk77s1n3q3p92p0yykpihw2k8lv01dra015fjha6pyl19"; } ]; }; diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index c0547f0c0c8..231bdc09965 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -29,6 +29,7 @@ in stdenv.mkDerivation { license = with licenses; [ asl20 ]; platforms = builtins.attrNames data.pulumiPkgs; maintainers = with maintainers; [ + ghuntley peterromfeldhk jlesquembre ]; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index cc31bce849b..5e0c721959c 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -1,19 +1,34 @@ #!/usr/bin/env bash +# Bash 3 compatible for Darwin -VERSION="2.6.1" +# Version of Pulumi from +# https://www.pulumi.com/docs/get-started/install/versions/ +VERSION="2.10.2" -# Bash 3 compatible for Darwin +# Grab latest release ${VERSION} from +# https://github.com/pulumi/pulumi-${NAME}/releases plugins=( - # https://github.com/pulumi/pulumi-aws/releases - "aws=2.13.0" - # https://github.com/pulumi/pulumi-gcp/releases - "gcp=3.13.0" - # https://github.com/pulumi/pulumi-random/releases - "random=2.2.0" - # https://github.com/pulumi/pulumi-kubernetes/releases - "kubernetes=2.4.0" - # https://github.com/pulumi/pulumi-postgresql/releases - "postgresql=2.2.2"); + "auth0=1.1.0" + "aws=3.4.0" + "cloudflare=2.6.0" + "consul=2.5.0" + "datadog=2.8.0" + "digitalocean=2.8.0" + "docker=2.3.0" + "gcp=3.25.0" + "github=2.0.0" + "gitlab=2.6.0" + "hcloud=0.2.0" + "kubernetes=2.6.1" + "mailgun=2.2.0" + "mysql=2.2.1" + "openstack=2.6.0" + "packet=3.1.0" + "postgresql=2.4.0" + "random=2.3.1" + "vault=2.4.0" + "vsphere=2.10.0" + ); function genMainSrc() { local url="https://get.pulumi.com/releases/sdk/pulumi-v${VERSION}-$1-x64.tar.gz" diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 776eca99998..56551891a4a 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -31,6 +31,7 @@ , enableAlternatives ? false , enableCheck ? false, liboggz ? null , enableCopyArtifacts ? false +, enableExtraFiles ? false , bashInteractive, bash-completion }: @@ -100,6 +101,7 @@ let externalTestArgs.beets = (beets.override { enableAlternatives = false; enableCopyArtifacts = false; + enableExtraFiles = false; }).overrideAttrs (stdenv.lib.const { doInstallCheck = false; }); @@ -110,6 +112,7 @@ let alternatives = callPackage ./alternatives-plugin.nix pluginArgs; check = callPackage ./check-plugin.nix pluginArgs; copyartifacts = callPackage ./copyartifacts-plugin.nix pluginArgs; + extrafiles = callPackage ./extrafiles-plugin.nix pluginArgs; }; in pythonPackages.buildPythonApplication rec { @@ -156,7 +159,9 @@ in pythonPackages.buildPythonApplication rec { ++ optional enableThumbnails pythonPackages.pyxdg ++ optional enableWeb pythonPackages.flask ++ optional enableAlternatives plugins.alternatives - ++ optional enableCopyArtifacts plugins.copyartifacts; + ++ optional enableCopyArtifacts plugins.copyartifacts + ++ optional enableExtraFiles plugins.extrafiles + ; buildInputs = [ imagemagick diff --git a/pkgs/tools/audio/beets/extrafiles-plugin.nix b/pkgs/tools/audio/beets/extrafiles-plugin.nix new file mode 100644 index 00000000000..7d0e446ce60 --- /dev/null +++ b/pkgs/tools/audio/beets/extrafiles-plugin.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, beets, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + pname = "beets-extrafiles"; + version = "0.0.7"; + + src = fetchFromGitHub { + repo = "beets-extrafiles"; + owner = "Holzhaus"; + rev = "v${version}"; + sha256 = "0ah7mgax9zrhvvd5scf2z0v0bhd6xmmv5sdb6av840ixpl6vlvm6"; + }; + + postPatch = '' + sed -i -e '/install_requires/,/\]/{/beets/d}' setup.py + sed -i -e '/namespace_packages/d' setup.py + ''; + + nativeBuildInputs = [ beets ]; + + preCheck = '' + HOME=$TEMPDIR + ''; + + meta = { + homepage = "https://github.com/Holzhaus/beets-extrafiles"; + description = "A plugin for beets that copies additional files and directories during the import process"; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 6d6da3c9874..c12cc1198c9 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -46,9 +46,8 @@ pythonPackages.buildPythonApplication rec { librsync ]; - propagatedBuildInputs = [ - backblaze-b2 - ] ++ (with pythonPackages; [ + propagatedBuildInputs = with pythonPackages; [ + b2sdk boto cffi cryptography @@ -65,7 +64,7 @@ pythonPackages.buildPythonApplication rec { future ] ++ stdenv.lib.optionals (!isPy3k) [ enum - ]); + ]; checkInputs = [ gnupg # Add 'gpg' to PATH. diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index 889598b0798..bfeafd0875f 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kopia"; - version = "0.6.4"; + version = "0.7.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1mq3vx8vrvvh3jrdqhrkbnnfkjsjw5ipw15d0602i1x05fxah4v4"; + sha256 = "1ngm0vbx6ryks68bp0zarvncc36gbpkkqavxb3sfph9p959b9hif"; }; - vendorSha256 = "1npxr7gp59xv38zdx1diilfxij6lb0cmvsnzvjx6n8g0326gf2ii"; + vendorSha256 = "07p2ka5rbasrgjfd4k2jn0ffshjp39kilz9b714ykyi1qflczr9b"; doCheck = false; diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/tools/filesystems/bashmount/default.nix index 70a4c1419c8..bab8df1280d 100644 --- a/pkgs/tools/filesystems/bashmount/default.nix +++ b/pkgs/tools/filesystems/bashmount/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bashmount"; - version = "4.3.1"; + version = "4.3.2"; src = fetchFromGitHub { owner = "jamielinux"; repo = "bashmount"; rev = version; - sha256 = "0pqjaib0qiwjq0ral5yjz4iq8hpaj9mqkhlihgfz0xigcn9lxwpf"; + sha256 = "1irw47s6i1qwxd20cymzlfw5sv579cw877l27j3p66qfhgadwxrl"; }; installPhase = '' diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 767730c4030..9b9fe9a5aaf 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -121,10 +121,10 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "15.2.4"; + version = "15.2.5"; src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "0jy5dp4r1bqk1l7nrv8l8zpl984k61p3vkvf73ygcn03bxyjjlax"; + sha256 = "05p7ssbfypf5x8bry361rrnyaihf89xzbqzhygdyrg7w1rxpna8d"; }; in rec { ceph = stdenv.mkDerivation { diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix index 3559579fe80..e8d60f835bf 100644 --- a/pkgs/tools/filesystems/f3/default.nix +++ b/pkgs/tools/filesystems/f3/default.nix @@ -1,13 +1,11 @@ -{ stdenv, fetchFromGitHub -, parted, udev +{ stdenv, lib, fetchFromGitHub +, parted, systemd ? null }: stdenv.mkDerivation rec { pname = "f3"; version = "7.2"; - enableParallelBuilding = true; - src = fetchFromGitHub { owner = "AltraMayor"; repo = pname; @@ -15,24 +13,45 @@ stdenv.mkDerivation rec { sha256 = "1iwdg0r4wkgc8rynmw1qcqz62l0ldgc8lrazq33msxnk5a818jgy"; }; - buildInputs = [ parted udev ]; + postPatch = '' + sed -i 's/-oroot -groot//' Makefile + + for f in f3write.h2w log-f3wr; do + substituteInPlace $f \ + --replace '$(dirname $0)' $out/bin + done + ''; + + buildInputs = [ + parted + ] + ++ lib.optional stdenv.isLinux systemd; + + enableParallelBuilding = true; + + buildFlags = [ + "all" # f3read, f3write + ] + ++ lib.optional stdenv.isLinux "extra"; # f3brew, f3fix, f3probe - patchPhase = "sed -i 's/-oroot -groot//' Makefile"; + installFlags = [ + "PREFIX=${placeholder "out"}" + ]; - buildFlags = [ "all" # f3read, f3write - "extra" # f3brew, f3fix, f3probe - ]; + installTargets = [ + "install" + ] + ++ lib.optional stdenv.isLinux "install-extra"; - installFlags = [ "PREFIX=$(out)" - "install" - "install-extra" - ]; + postInstall = '' + install -Dm555 -t $out/bin f3write.h2w log-f3wr + install -Dm444 -t $out/share/doc/${pname} LICENSE README.rst + ''; - meta = { + meta = with lib; { description = "Fight Flash Fraud"; homepage = "http://oss.digirati.com.br/f3/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ makefu ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ makefu ]; }; } diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix index 3ae898d4ba8..e2cb603ca3d 100644 --- a/pkgs/tools/filesystems/lizardfs/default.nix +++ b/pkgs/tools/filesystems/lizardfs/default.nix @@ -47,6 +47,12 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/debian/lizardfs/raw/bfcd5bcf/debian/patches/spdlog.patch"; sha256 = "0j44rb816i6kfh3y2qdha59c4ja6wmcnlrlq29il4ybxn42914md"; }) + # Fix https://github.com/lizardfs/lizardfs/issues/655 + # (Remove upon update to 3.13) + (fetchpatch { + url = "https://github.com/lizardfs/lizardfs/commit/5d20c95179be09241b039050bceda3c46980c004.patch"; + sha256 = "185bfcz2rjr4cnxld2yc2nxwzz0rk4x1fl1sd25g8gr5advllmdv"; + }) ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/filesystems/orangefs/default.nix b/pkgs/tools/filesystems/orangefs/default.nix index 37f4026799b..8c1378d97bc 100644 --- a/pkgs/tools/filesystems/orangefs/default.nix +++ b/pkgs/tools/filesystems/orangefs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "orangefs"; - version = "2.9.7"; + version = "2.9.8"; src = fetchurl { url = "http://download.orangefs.org/current/source/orangefs-${version}.tar.gz"; - sha256 = "15669f5rcvn44wkas0mld0qmyclrmhbrw4bbbp66sw3a12vgn4sm"; + sha256 = "0c2yla615j04ygclfavh8g5miqhbml2r0zs2c5mvkacf9in7p7sq"; }; nativeBuildInputs = [ bison flex perl autoreconfHook ]; diff --git a/pkgs/tools/filesystems/ubidump/default.nix b/pkgs/tools/filesystems/ubidump/default.nix new file mode 100644 index 00000000000..4feca6a040b --- /dev/null +++ b/pkgs/tools/filesystems/ubidump/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, python3, makeWrapper }: + +python3.pkgs.buildPythonApplication rec { + + pname = "ubidump"; + version = "unstable-2019-09-11"; + + src = fetchFromGitHub { + owner = "nlitsme"; + repo = pname; + rev = "0691f1a9a38604c2baf8c9af6b826eb2632af74a"; + sha256 = "1hiivlgni4r3nd5n2rzl5qzw6y2wpjpmyls5lybrc8imd6rmj3w2"; + }; + + propagatedBuildInputs = with python3.pkgs; [ crcmod python-lzo ]; + + phases = [ "unpackPhase" "patchPhase" "installPhase" "installCheckPhase" ]; + + patchPhase = '' + sed -i '1s;^;#!${python3.interpreter}\n;' ubidump.py + patchShebangs ubidump.py + ''; + + installPhase = '' + install -D -m755 ubidump.py $out/bin/ubidump + wrapProgram $out/bin/ubidump --set PYTHONPATH $PYTHONPATH + ''; + + installCheckPhase = '' + $out/bin/ubidump -h > /dev/null + ''; + + meta = with stdenv.lib; { + description = "View or extract the contents of UBIFS images"; + homepage = "https://github.com/nlitsme/ubidump"; + license = licenses.mit; + maintainers = with maintainers; [ sgo ]; + }; +} + diff --git a/pkgs/tools/graphics/amber/default.nix b/pkgs/tools/graphics/amber/default.nix new file mode 100644 index 00000000000..1b8c90c8fb7 --- /dev/null +++ b/pkgs/tools/graphics/amber/default.nix @@ -0,0 +1,95 @@ +{ stdenv +, fetchFromGitHub +, cmake +, pkg-config +, python3 +, vulkan-headers +, vulkan-loader +}: +let + glslang = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "glslang"; + rev = "3ee5f2f1d3316e228916788b300d786bb574d337"; + sha256 = "1l5h9d92mzd35pgs0wibqfg7vbl771lwnvdlcsyhf6999khn5dzv"; + }; + + lodepng = fetchFromGitHub { + owner = "lvandeve"; + repo = "lodepng"; + rev = "34628e89e80cd007179b25b0b2695e6af0f57fac"; + sha256 = "10yaf218xnmhv7rsq6dysqrps43r30cgrs1z63h47z40x43ikia0"; + }; + + shaderc = fetchFromGitHub { + owner = "google"; + repo = "shaderc"; + rev = "ba92b11e1fcaf4c38a64f84d643d6429175bf650"; + sha256 = "041hip43siy2sr7h6habk9sxdmd45ag4kqgi8jk0vm1b8pqzkhqn"; + }; + + spirv-headers = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Headers"; + rev = "3fdabd0da2932c276b25b9b4a988ba134eba1aa6"; + sha256 = "17h5cn4dyw8ixp1cpw8vf1z90m0fn1hhlvh0iycmknccbb1z34q7"; + }; + + spirv-tools = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Tools"; + rev = "fd3cabd8b5fc43ce83884ac06486c283b9902b4f"; + sha256 = "1h3smicw5gzpa17syb30085zccydzs4f41fl30bcmiipdn2xfpjr"; + }; + +in +stdenv.mkDerivation rec { + pname = "amber"; + version = "unstable-2020-09-23"; + + src = fetchFromGitHub { + owner = "google"; + repo = pname; + rev = "0eee2d45d053dfc566baa58442a9b1b708e4f2a7"; + sha256 = "1rrbvmn9hvhj7xj89yqvy9mx0vg1qapdm5fkca8mkd3516d9f5pw"; + }; + + buildInputs = [ + vulkan-headers + vulkan-loader + ]; + + nativeBuildInputs = [ + cmake + pkg-config + python3 + ]; + + # Tests are disabled so we do not have to pull in googletest and more dependencies + cmakeFlags = [ "-DAMBER_SKIP_TESTS=ON" ]; + + prePatch = '' + cp -r ${glslang}/ third_party/glslang + cp -r ${lodepng}/ third_party/lodepng + cp -r ${shaderc}/ third_party/shaderc + cp -r ${spirv-tools}/ third_party/spirv-tools + cp -r ${spirv-headers}/ third_party/spirv-headers + chmod u+w -R third_party + + substituteInPlace CMakeLists.txt \ + --replace "-Werror" "" + substituteInPlace tools/update_build_version.py \ + --replace "not os.path.exists(directory)" "True" + ''; + + installPhase = '' + install -Dm755 -t $out/bin amber image_diff + ''; + + meta = with stdenv.lib; { + description = "Multi-API shader test framework"; + homepage = "https://github.com/google/amber"; + license = licenses.asl20; + maintainers = with maintainers; [ Flakebi ]; + }; +} diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index b167a73466d..ccc4a23cb55 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "gmic"; - version = "2.9.1"; + version = "2.9.2"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "13axx7nwchn6ysgpvlw3fib474q4nrwv3qn20g3q03ldid0xvjah"; + sha256 = "14acph914a8lp6qqfmp319ggqjg3i3hmalmnpk3mp07m7vpv2p9q"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix index 374e090af6a..a8850609944 100644 --- a/pkgs/tools/graphics/svgbob/default.nix +++ b/pkgs/tools/graphics/svgbob/default.nix @@ -10,8 +10,11 @@ rustPlatform.buildRustPackage rec { rev = "0febc4377134a2ea3b3cd43ebdf5ea688a0e7432"; sha256 = "1n0w5b3fjgbczy1iw52172x1p3y1bvw1qpz77fkaxkhrkgfd7vwr"; }; - sourceRoot = "source/svgbob_cli"; + postPatch = '' + substituteInPlace ../svgbob/src/lib.rs \ + --replace '#![deny(warnings)]' "" + ''; cargoSha256 = "1y9jsnxmz51zychmmzp6mi29pb5ks2qww7lk5bshkhp56v51sm8d"; diff --git a/pkgs/tools/graphics/viu/default.nix b/pkgs/tools/graphics/viu/default.nix index 2b332bd3256..a434b38453e 100644 --- a/pkgs/tools/graphics/viu/default.nix +++ b/pkgs/tools/graphics/viu/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "viu"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "atanunq"; repo = "viu"; rev = "v${version}"; - sha256 = "1ivhm6js0ylnxwp84jmm2vmnl4iy1cwr3m9imx7lmcl0i3c8b9if"; + sha256 = "1algvndpl63g3yzp3hhbgm7839njpbmw954nsiwf0j591spz4lph"; }; # tests are failing, reported at upstream: https://github.com/atanunq/viu/issues/40 doCheck = false; - cargoSha256 = "15zdnr95a363w4rddv1fbz796m01430gzly5p953m23g2mbxdmp0"; + cargoSha256 = "1jccaln72aqa9975nbs95gimndqx5kgfkjmh40z6chx1hvn4m2ga"; meta = with lib; { description = "A command-line application to view images from the terminal written in Rust"; diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index bdf68d708a5..7cec0cab996 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -14,7 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3 pkgconfig vala_0_44 gobject-introspection wrapGAppsHook ]; buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ]; - postPatch = "patchShebangs ."; + postPatch = '' + substituteInPlace install.py \ + --replace 'platform.version()' '"Nix"' + + patchShebangs . + ''; buildPhase = "./build.py"; diff --git a/pkgs/tools/misc/birdfont/xmlbird.nix b/pkgs/tools/misc/birdfont/xmlbird.nix index e5ad56376ca..eddcba1c9c8 100644 --- a/pkgs/tools/misc/birdfont/xmlbird.nix +++ b/pkgs/tools/misc/birdfont/xmlbird.nix @@ -13,7 +13,11 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; - postPatch = "patchShebangs ."; + postPatch = '' + substituteInPlace configure \ + --replace 'platform.dist()[0]' '"nix"' + patchShebangs . + ''; buildPhase = "./build.py"; diff --git a/pkgs/tools/misc/catimg/default.nix b/pkgs/tools/misc/catimg/default.nix index ac2f3f3411a..30845759a28 100644 --- a/pkgs/tools/misc/catimg/default.nix +++ b/pkgs/tools/misc/catimg/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "catimg"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "posva"; repo = pname; rev = version; - sha256 = "0g9ywbgy162wiam9hc3yqpq5q4gyxa8fj4jskr3fdz8z8jjaabzz"; + sha256 = "0a2dswbv4xddb2l2d55hc43lzvjwrjs5z9am7v6i0p0mi2fmc89s"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/misc/diskonaut/default.nix b/pkgs/tools/misc/diskonaut/default.nix index 1eb3dd7a0f7..20b955f877e 100644 --- a/pkgs/tools/misc/diskonaut/default.nix +++ b/pkgs/tools/misc/diskonaut/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "diskonaut"; - version = "0.9.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "imsnif"; repo = "diskonaut"; rev = version; - sha256 = "125ba9qwh7j8bz74w2zbw729s1wfnjg6dg8yicqrp6559x9k7gq5"; + sha256 = "1pmbag3r2ka30zmy2rs9jps2qxj2zh0gy4a774v9yhf0b6qjid54"; }; - cargoSha256 = "0vvbrlmviyn9w8i416767vhvd1gqm3qjvia730m0rs0w5h8khiqf"; + cargoSha256 = "0y86ikf235lp5j85fgzawgp4vx66rmzqd6p5n8iy3mqwn3c1ggb8"; meta = with stdenv.lib; { description = "Terminal disk space navigator"; diff --git a/pkgs/tools/misc/duf/default.nix b/pkgs/tools/misc/duf/default.nix new file mode 100644 index 00000000000..2ed6f0ef7cb --- /dev/null +++ b/pkgs/tools/misc/duf/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "duf"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "muesli"; + repo = "duf"; + rev = "v${version}"; + sha256 = "08vmhcvqn9g86iqwk42bj0i09lmchhdgha1xaj1jw1ci4k7s9vrf"; + }; + + vendorSha256 = "1jmj46yami37r2wmiprpwyljcmj7dir9mcccx5is1jbiai6sx79i"; + + meta = with lib; { + homepage = "https://github.com/muesli/duf/"; + description = "Disk Usage/Free Utility"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ petabyteboy ]; + }; +} diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 89a05815f51..31b47a31ca8 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; preFixup = '' - installManPage "$src/doc/fd.1" + installManPage doc/fd.1 installShellCompletion $releaseDir/build/fd-find-*/out/fd.{bash,fish} installShellCompletion --zsh $releaseDir/build/fd-find-*/out/_fd diff --git a/pkgs/tools/misc/fet-sh/default.nix b/pkgs/tools/misc/fet-sh/default.nix index 3419a8d2850..4041a9abdba 100644 --- a/pkgs/tools/misc/fet-sh/default.nix +++ b/pkgs/tools/misc/fet-sh/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "fet-sh"; - version = "1.5"; + version = "1.7"; src = fetchFromGitHub { owner = "6gk"; repo = "fet.sh"; rev = "v${version}"; - sha256 = "15336cayv3rb79y7f0v0qvn6nhr5aqr8479ayp0r0sihn5mkfg35"; + sha256 = "02izkwfph4i62adwns4q4w1pfcmdsczm8ghagx5yb9315ww3adzn"; }; dontBuild = true; diff --git a/pkgs/tools/misc/ili2c/default.nix b/pkgs/tools/misc/ili2c/default.nix index 43eed8367c4..2bda116e66c 100644 --- a/pkgs/tools/misc/ili2c/default.nix +++ b/pkgs/tools/misc/ili2c/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchFromGitHub, jdk, ant, makeWrapper, jre }: +{ stdenv, fetchFromGitHub, jdk8, ant, makeWrapper, jre8 }: +let jdk = jdk8; jre = jre8; in stdenv.mkDerivation rec { pname = "ili2c"; version = "5.0.8"; diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index aab980d76e7..9e5fad26988 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "tstack"; repo = "lnav"; rev = "v${meta.version}"; - sha256 = "0z8bsr0falxlkmd1b5gy871vyafyih0sw7lgg858lqnbsy0q2m4i"; + sha256 = "1frdrr3yjlk2fns3ny0qbr30rpswhwlvv3kyhdl3l6a0q5cqaqsg"; inherit name; }; @@ -25,6 +25,10 @@ stdenv.mkDerivation rec { curl ]; + postPatch = '' + sed -ie '/DUMP_INTERNALS/d' src/Makefile.am + ''; + preConfigure = '' ./autogen.sh ''; @@ -43,7 +47,7 @@ stdenv.mkDerivation rec { ''; downloadPage = "https://github.com/tstack/lnav/releases"; license = licenses.bsd2; - version = "0.8.5"; + version = "0.9.0"; maintainers = with maintainers; [ dochang ma27 ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 5da2a366cf8..8e2503d06d4 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -3,27 +3,26 @@ , fetchFromGitHub , pkg-config , zlib -, openssl , Security }: rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "1h4872jb0xz8yzs02q8wfvqrp20y7kdva5ka6bh6nq4jrnnky8zb"; + sha256 = "1abmg2zk1qipqdl1yfj8ibm1w8n7fazxqccsg1gq4xzlhhfp3m2l"; }; - cargoSha256 = "1vq1rrav9r9z4y0v7hpn0fcq64slq4zrm2pybmnmb7h9nfxxyr6k"; + cargoSha256 = "0l750067x8k92ngg32bb8mnbq09aj65sdnpzdhij9n1mh90rkck9"; RUSTC_BOOTSTRAP = 1; nativeBuildInputs = [ pkg-config zlib ]; - buildInputs = if stdenv.isDarwin then [ Security ] else [ openssl ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; meta = with stdenv.lib; { description = "For when you really just want to serve some files over HTTP right now!"; @@ -31,5 +30,6 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ mit ]; maintainers = with maintainers; [ nequissimus zowoq ]; platforms = platforms.unix; + broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/98181 }; } diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index 3b9623d5ad0..5429ecea2c6 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -1,8 +1,8 @@ -{ stdenv, autoconf, automake, curl, fetchurl, jdk, jre, makeWrapper, nettools +{ stdenv, autoconf, automake, curl, fetchurl, jdk8, makeWrapper, nettools , python, git }: -with stdenv.lib; +let jdk = jdk8; jre = jdk8.jre; in stdenv.mkDerivation rec { pname = "opentsdb"; diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/tools/misc/wootility/default.nix index c07de47e477..91203e5f7be 100644 --- a/pkgs/tools/misc/wootility/default.nix +++ b/pkgs/tools/misc/wootility/default.nix @@ -9,14 +9,14 @@ }: let pname = "wootility"; - version = "3.5.10"; + version = "3.5.12"; in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-linux-latest/wootility-${version}.AppImage"; - sha256 = "1bhk4jcziis01lyn8dmx93abd6p41gmbrysphcd5810l7zcfz59y"; + sha256 = "13bhckk25fzq9r9cdsg3yqjd4kn47asqdx8kw0in8iky4ri41vnc"; }; profile = '' diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index aa502f8521a..e3b64939a0a 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2020.09.14"; + version = "2020.09.20"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "18wfhprbaszpxgqkac3hb050ngvdsaibbcifg88rkv5vc6bc2mq6"; + sha256 = "1pkw3hnkddk1kqv0in152q1k4jjgbmf2xvc9j3r5nd38z6f7j6mc"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index 4740b3ac55f..a6b0a93324f 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -3,11 +3,11 @@ python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "3.1.0"; + version = "3.1.1"; srcs = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "0nb3qzpggyp61lchvprnklby5mf5n0xpn9z8vlhh99pz1k9sqdq1"; + sha256 = "1yhc8j67phrj5xgx09b5h7c67pgc4wj4jnkmkq0r3s6j7jn43vv8"; }; propagatedBuildInputs = diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index d3aa432a45e..61746ebfcc5 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,24 +5,22 @@ buildGoModule rec { pname = "amass"; - version = "3.10.1"; + version = "3.10.3"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "1djkryx8bz2rg0iqqb30jb122ydiyli2i9xsvcdmd42c47hxg46y"; + sha256 = "1vjplwjv0vwwxdpbky7i6dz3phl7yfcbr8fwrbsb47bmj0ldkapc"; }; vendorSha256 = "0c3hyvy8s470zvrv49fx0iil59z0xq10dw4vnr55qgbm2k2pay6w"; - doCheck = false; - outputs = [ "out" "wordlists" ]; postInstall = '' mkdir -p $wordlists - cp -R $src/examples/wordlists/*.txt $wordlists + cp -R examples/wordlists/*.txt $wordlists gzip $wordlists/*.txt ''; diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/tools/networking/curlie/default.nix index b2c4d46a8ce..f8147cb1611 100644 --- a/pkgs/tools/networking/curlie/default.nix +++ b/pkgs/tools/networking/curlie/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "curlie"; - version = "1.3.1"; + version = "1.5.4"; src= fetchFromGitHub { owner = "rs"; repo = pname; rev = "v${version}"; - sha256 = "09v8alrbw6qva3q3bcqxnyjm7svagfxqvhdff7cqf5pbmkxnhln9"; + sha256 = "0z92gz39m0gk8j7l2nwa5vrfr3mq160vr1b15sy13jwi1zspc7hx"; }; - vendorSha256 = "1mxgf004czf65a2mv99gfp27g98xhllmfcz4ynfv66nfkbfz6a8n"; + vendorSha256 = "1qnl15b9cs6xi8z368a9n34v3wr2adwp376cjzhyllni7sf6v1mm"; doCheck = false; diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix index 63e19e924fc..a3d819e8dcf 100644 --- a/pkgs/tools/networking/dnsperf/default.nix +++ b/pkgs/tools/networking/dnsperf/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "dnsperf"; - version = "2.3.1"; + version = "2.3.4"; # The same as the initial commit of the new GitHub repo (only readme changed). src = fetchFromGitHub { owner = "DNS-OARC"; repo = "dnsperf"; rev = "v${version}"; - sha256 = "0yxwm5xi9ry154ayzn2h27bnwwc202bsna8h6i4a65pn76nrn81w"; + sha256 = "1lyci2vdl6g0s5pqs7dkq7pxdahcpkzh614wmy5fwi2f3334y0d1"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index 07c7dda6446..2caf18d9a4b 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "2.1.1"; + version = "2.1.3"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "0v6m0c329wmba2fihnqvrmfnrb5b1l4nm6xr0dsjiwsjpclrmy86"; + sha256 = "112w4x79zywy6i5vfr04057p9vschflhdhs7b2mhkcba5gigkrxx"; }; - cargoSha256 = "130kjjig5jsv3kdywj6ag2s55d5hwsslpcnaanrqyl70a6pvgpb2"; + cargoSha256 = "1bfbg5fzwp8drm0vp16503qd5mgjfw7z9p292xgdx0i20s4wfrkk"; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index ae5695537af..6b8b2f92374 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -1,27 +1,19 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config , libcap, ncurses -, withGtk ? false, gtk2 ? null }: +, withGtk ? false, gtk3 ? null }: -assert withGtk -> gtk2 != null; +assert withGtk -> gtk3 != null; stdenv.mkDerivation rec { pname = "mtr${lib.optionalString withGtk "-gui"}"; - version = "0.93"; + version = "0.94"; src = fetchFromGitHub { owner = "traviscross"; repo = "mtr"; rev = "v${version}"; - sha256 = "0n0zr9k61w7a9psnzgp7xnc7ll1ic2xzcvqsbbbyndg3v9rff6bw"; + sha256 = "0wnz87cr2lcl74bj8qxq9xgai40az3pk9k0z893scyc8svd61xz6"; }; - - patches = [ - # https://github.com/traviscross/mtr/pull/315 - (fetchpatch { - url = "https://github.com/traviscross/mtr/pull/315.patch?full_index=1"; - sha256 = "18qcsj9058snc2qhq6v6gdbqhz021gi5fgw9h7vfczv45gf0qasa"; - }) - ]; # we need this before autoreconfHook does its thing postPatch = '' @@ -36,10 +28,10 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional (!withGtk) "--without-gtk"; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ncurses ] - ++ stdenv.lib.optional withGtk gtk2 + ++ stdenv.lib.optional withGtk gtk3 ++ stdenv.lib.optional stdenv.isLinux libcap; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 1748a2d21d0..64e6757891e 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { src = if hpnSupport then fetchurl { url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-${replaceStrings [ "." "p" ] [ "_" "_P" ] version}.tar.gz"; - sha256 = "0lwr7xzhy8m4y0vzi1a78ddhag3qp6cba0c37mnhivbhb67dkywp"; + sha256 = "1ssdwgdxnvjwigisqi8c053znps5a4jf7bzsi99y0xyfzbw0x55k"; } else fetchurl { diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/tools/networking/phodav/default.nix index c6b479dd250..4939e75661e 100644 --- a/pkgs/tools/networking/phodav/default.nix +++ b/pkgs/tools/networking/phodav/default.nix @@ -2,14 +2,14 @@ , pkgconfig, libsoup, meson, ninja }: let - version = "2.4"; + version = "2.5"; in stdenv.mkDerivation rec { pname = "phodav"; inherit version; src = fetchurl { url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${pname}-${version}.tar.xz"; - sha256 = "1hxq8c5qfah3w7mxcyy3yhzdgswplll31a69p5mqdl04bsvw5pbx"; + sha256 = "045rdzf8isqmzix12lkz6z073b5qvcqq6ad028advm5gf36skw3i"; }; mesonFlags = [ diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index e9e09e8cdff..9726cde61e5 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.8.17"; + version = "1.8.18"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "1fl23q4hccwdapknj7yd8294jil15758k1r6ljbms2gijlly9lg3"; + sha256 = "1kxf0qcyg5mhddrzwv0hd1fy901wl0ydmxi6b1k2217xmgiyi2s6"; }; - cargoSha256 = "0jgzh9p6ziq3337461cj4fkbghks3bq8dnrn6ab8dkynjwvd47bx"; + cargoSha256 = "0vmd4sjagyhrc7q7fszwcjh4nhhmhckmx48i1h2xhr68bwncmyif"; SODIUM_USE_PKG_CONFIG = 1; diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix index 5dd5f3c153f..f0d2cd9a0df 100644 --- a/pkgs/tools/networking/tridactyl-native/default.nix +++ b/pkgs/tools/networking/tridactyl-native/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "tridactyl-native"; # this is actually the version of tridactyl itself; the native messenger will # probably not change with every tridactyl version - version = "1.20.0"; + version = "1.20.1"; src = fetchFromGitHub { owner = "tridactyl"; repo = "tridactyl"; rev = version; - sha256 = "14p6jadw4yij45rrwjbyf1lq3zpsni4sph88c6mlwlf8w830s3q8"; + sha256 = "108zx2x5q23cq0fzxmix31xcw62k3r1wlb55612c15ilz9c5xm32"; }; sourceRoot = "source/native"; diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix index 2d8902f6909..f12578b2733 100644 --- a/pkgs/tools/networking/zap/default.nix +++ b/pkgs/tools/networking/zap/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchFromGitHub, jdk, ant, runtimeShell }: +{ stdenv, fetchFromGitHub, jdk8, ant, runtimeShell }: +let jdk = jdk8; in stdenv.mkDerivation rec { pname = "zap"; version = "2.7.0"; diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/tools/package-management/nix-prefetch/default.nix index edc8e8bf1a1..f1f575a81b9 100644 --- a/pkgs/tools/package-management/nix-prefetch/default.nix +++ b/pkgs/tools/package-management/nix-prefetch/default.nix @@ -21,10 +21,16 @@ in stdenv.mkDerivation rec { }; patches = [ - # Fix compatibility with nixUnstable: https://github.com/msteen/nix-prefetch/pull/8 + # Fix compatibility with nixUnstable + # https://github.com/msteen/nix-prefetch/pull/9 (fetchpatch { - url = "https://github.com/msteen/nix-prefetch/commit/817a7695d98663386fa27a6c04d1617e0a83e1ab.patch"; - sha256 = "1zfgvafg30frwrh56k2wj4g76cljyjylm47ll60ms0yfx55spa7x"; + url = "https://github.com/msteen/nix-prefetch/commit/2722cda48ab3f4795105578599b29fc99518eff4.patch"; + sha256 = "037m388sbl72kyqnk86mw7lhjhj9gzfglw3ri398ncfmmkq8b7r4"; + }) + # https://github.com/msteen/nix-prefetch/pull/12 + (fetchpatch { + url = "https://github.com/msteen/nix-prefetch/commit/de96564e9f28df82bccd0584953094e7dbe87e20.patch"; + sha256 = "0mxai6w8cfs7k8wfbsrpg5hwkyb0fj143nm0v142am0ky8ahn0d9"; }) ]; diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index fe7f41c4d08..02bc599f47d 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -1,18 +1,24 @@ -{ stdenv, lib, buildPythonApplication, fetchFromGitHub -, setuptools_scm, vdf -, wine, winetricks, zenity +{ stdenv +, lib +, buildPythonApplication +, fetchFromGitHub +, setuptools_scm +, vdf +, wine +, winetricks +, zenity , pytest }: buildPythonApplication rec { pname = "protontricks"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - sha256 = "083ncg6yjd7s3dx91zd52w166x709mnxknwwr78ggka8d8vlyi0b"; + sha256 = "0ri4phi1rna9snrxa6gl23walyack09mgax7zpjqfpxivwls3ach"; }; # Fix interpreter in mock run.sh for tests @@ -47,7 +53,7 @@ buildPythonApplication rec { description = "A simple wrapper for running Winetricks commands for Proton-enabled games"; homepage = "https://github.com/Matoking/protontricks"; license = licenses.gpl3; - platforms = with platforms; linux; maintainers = with maintainers; [ metadark ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix index 17064cf913e..ad3bb6eeb1b 100644 --- a/pkgs/tools/security/1password-gui/default.nix +++ b/pkgs/tools/security/1password-gui/default.nix @@ -13,11 +13,11 @@ in stdenv.mkDerivation rec { pname = "1password"; - version = "0.8.6-2"; + version = "0.8.7"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - sha256 = "1m7sql2y2kj94gr607n48m0h4b3rijyzvxrssyizv75spmxr4d5r"; + sha256 = "1101q5yavzl8imf8gqa3h929gcyy6lh7dy2dw0zs52qdcrb4z49j"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index 8a6d008551e..4eb88211d6d 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -2,21 +2,14 @@ buildGoModule rec { pname = "age"; - version = "1.0.0-beta4"; + version = "1.0.0-beta5"; vendorSha256 = "0km7a2826j3fk2nrkmgc990chrkcfz006wfw14yilsa4p2hmfl7m"; - doCheck = false; - - subPackages = [ - "cmd/age" - "cmd/age-keygen" - ]; - src = fetchFromGitHub { owner = "FiloSottile"; repo = "age"; rev = "v${version}"; - sha256 = "0pp6zn4rdypyxn1md9ppisiwiapkfkbh08rzfl3qwn0998wx6gnb"; + sha256 = "1hdbxd359z8zvnz7h8c4pa16nc7r8db36lx3gpks38lpi0r8hzqk"; }; meta = with lib; { diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix index a8ca38e1f1d..17cb0308a16 100644 --- a/pkgs/tools/security/bettercap/default.nix +++ b/pkgs/tools/security/bettercap/default.nix @@ -1,4 +1,4 @@ -{ lib +{ stdenv , buildGoModule , fetchFromGitHub , pkg-config @@ -24,9 +24,10 @@ buildGoModule rec { doCheck = false; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libpcap libnfnetlink libnetfilter_queue libusb1 ]; + buildInputs = [ libpcap libusb1 ] + ++ stdenv.lib.optionals stdenv.isLinux [ libnfnetlink libnetfilter_queue ]; - meta = with lib; { + meta = with stdenv.lib; { description = "A man in the middle tool"; longDescription = '' BetterCAP is a powerful, flexible and portable tool created to perform various types of MITM attacks against a network, manipulate HTTP, HTTPS and TCP traffic in realtime, sniff for credentials and much more. diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index d383a00a7f2..d10a938ea02 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -17,11 +17,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.20.1"; + x86_64-linux = "1.22.1"; }.${system} or ""; sha256 = { - x86_64-linux = "1lywslkpgg9rxwz7kwfknkgdi0r47j14i420r5yxgkaizb7ww27z"; + x86_64-linux = "1pbcrkafyjjcsd27s99g511llkz05d9qkny7g15wp6piyyv89k3n"; }.${system} or ""; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix index 2ac50912c05..8efa1e4bfd3 100644 --- a/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/pkgs/tools/security/bitwarden_rs/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bitwarden_rs-vault"; - version = "2.15.1"; + version = "2.16.0b"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "1wvpg2awdbpbzhxhrf1iv1mjjc1ah54kswnznc7w5zbh9512dyx8"; + sha256 = "1p10a5rp2ymx675sbigwrkkfjvpk1lz3d43l2p2i1vbw153py3p1"; }; buildCommand = '' diff --git a/pkgs/tools/security/fierce/default.nix b/pkgs/tools/security/fierce/default.nix index 5d12a000815..13146c3373e 100644 --- a/pkgs/tools/security/fierce/default.nix +++ b/pkgs/tools/security/fierce/default.nix @@ -11,8 +11,16 @@ python3.pkgs.buildPythonApplication rec { sha256 = "11yaz8ap9swx95j3wpqh0b6jhw6spqgfnsyn1liw9zqi4jwgiax7"; }; + postPatch = '' + substituteInPlace requirements.txt --replace 'dnspython==1.16.0' 'dnspython' + ''; + propagatedBuildInputs = [ python3.pkgs.dns ]; + # tests require network access + doCheck = false; + pythonImportsCheck = [ "fierce" ]; + meta = with stdenv.lib; { homepage = "https://github.com/mschwager/fierce"; description = "DNS reconnaissance tool for locating non-contiguous IP space"; diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 01fd10d6777..170f3109a0a 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "facter"; - version = "3.14.12"; + version = "3.14.13"; src = fetchFromGitHub { - sha256 = "1n0m2w133bpbbpc1imp89xlinmny7xaz1w87cs18p1lnk2w043lc"; + sha256 = "1rink4xxh7f2ckqfl4pc3ljm9rfb5c4npsqzlys4f2snmq4d0h39"; rev = version; repo = pname; owner = "puppetlabs"; diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 35fb630d238..76654d14539 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, libgcrypt, readline, libgpgerror }: stdenv.mkDerivation rec { - version = "1.6.5"; + version = "1.6.6"; pname = "freeipmi"; src = fetchurl { url = "mirror://gnu/freeipmi/${pname}-${version}.tar.gz"; - sha256 = "1ncf1s84752xaq07h36wrxa5ww1167s2bizkww0igxv8djyddwk1"; + sha256 = "1ava5s0babfwx6dqi87phzyzjjgyah7avhljrxrjwn2cniwh38yg"; }; buildInputs = [ libgcrypt readline libgpgerror ]; diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index cd9ec7c7082..59636fb5dc8 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, nvidia_x11, cudatoolkit, ncurses }: +{ stdenv, fetchFromGitHub, cmake, cudatoolkit, ncurses, addOpenGLRunpath }: stdenv.mkDerivation rec { pname = "nvtop"; @@ -6,22 +6,26 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Syllo"; - repo = "nvtop"; + repo = "nvtop"; rev = version; sha256 = "1b6yz54xddip1r0k8cbqg41dpyhds18fj29bj3yf40xvysklb0f4"; }; cmakeFlags = [ "-DNVML_INCLUDE_DIRS=${cudatoolkit}/include" - "-DNVML_LIBRARIES=${nvidia_x11}/lib/libnvidia-ml.so" + "-DNVML_LIBRARIES=${cudatoolkit}/targets/x86_64-linux/lib/stubs/libnvidia-ml.so" "-DCMAKE_BUILD_TYPE=Release" ]; - nativeBuildInputs = [ cmake ]; - buildInputs = [ ncurses nvidia_x11 cudatoolkit ]; + nativeBuildInputs = [ cmake addOpenGLRunpath ]; + buildInputs = [ ncurses cudatoolkit ]; + + postFixup = '' + addOpenGLRunpath $out/bin/nvtop + ''; meta = with stdenv.lib; { - description = "A (h)top like like task monitor for NVIDIA GPUs"; + description = "A (h)top like task monitor for NVIDIA GPUs"; homepage = "https://github.com/Syllo/nvtop"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index 8cbc56e0468..69f52377310 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "rocm-smi"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index c0a94457e6a..ae9e29b6f1d 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -1,34 +1,64 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool -, pkgconfig, dbus, dbus-glib, libxml2, autoconf-archive }: +{ autoconf +, autoconf-archive +, automake +, dbus +, dbus-glib +, docbook_xml_dtd_412 +, docbook-xsl-nons +, fetchFromGitHub +, gtk-doc +, libevdev +, libtool +, libxml2 +, lzma +, pkgconfig +, stdenv +, upower +}: stdenv.mkDerivation rec { pname = "thermald"; - version = "2.2"; + version = "2.3"; + + outputs = [ "out" "devdoc" ]; src = fetchFromGitHub { owner = "intel"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "1nrhv3bypyc48h9smj5cpq63rawm6vqyg3cwkhpz69rgjnf1283m"; + sha256 = "0cisaca2c2z1x9xvxc4lr6nl6yqx5bww6brh73m0p1n643jgq1dl"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool dbus dbus-glib libxml2 autoconf-archive ]; - - patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am''; + nativeBuildInputs = [ + autoconf + autoconf-archive + automake + docbook-xsl-nons + docbook_xml_dtd_412 + gtk-doc + libtool + pkgconfig + ]; - preConfigure = '' - export PKG_CONFIG_PATH="${dbus.dev}/lib/pkgconfig:$PKG_CONFIG_PATH" - ./autogen.sh - ''; + buildInputs = [ + dbus + dbus-glib + libevdev + libxml2 + lzma + upower + ]; configureFlags = [ "--sysconfdir=${placeholder "out"}/etc" "--localstatedir=/var" + "--enable-gtk-doc" "--with-dbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d" "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" ]; + preConfigure = "NO_CONFIGURE=1 ./autogen.sh"; + postInstall = '' cp ./data/thermal-conf.xml $out/etc/thermald/ ''; @@ -36,7 +66,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Thermal Daemon"; homepage = "https://01.org/linux-thermal-daemon"; - license = licenses.gpl2; + changelog = "https://github.com/intel/thermal_daemon/blob/master/README.txt"; + license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/tools/text/csvkit/default.nix b/pkgs/tools/text/csvkit/default.nix index 95ef4f22b77..9e02265e2dc 100644 --- a/pkgs/tools/text/csvkit/default.nix +++ b/pkgs/tools/text/csvkit/default.nix @@ -1,44 +1,34 @@ -{ lib, python3, glibcLocales }: +{ lib, fetchpatch, python3 }: python3.pkgs.buildPythonApplication rec { pname = "csvkit"; - version = "1.0.4"; + version = "1.0.5"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "1830lb95rh1iyi3drlwxzb6y3pqkii0qiyzd40c1kvhvaf1s6lqk"; + sha256 = "1ffmbzk4rxnl1yhqfl58v7kvl5m9cbvjm8v7xp4mvr00sgs91lvv"; }; + patches = [ + # Fixes a failing dbf related test. Won't be needed on 1.0.6 or later. + (fetchpatch{ + url = "https://github.com/wireservice/csvkit/commit/5f22e664121b13d9ff005a9206873a8f97431dca.patch"; + sha256 = "1kg00z65x7l6dnm5nfsr5krs8m7mv23hhb1inkaqf5m5fpkpnvv7"; + }) + ]; + propagatedBuildInputs = with python3.pkgs; [ agate agate-excel - # dbf test fail with agate-dbf-0.2.2 - (agate-dbf.overridePythonAttrs(old: rec { - version = "0.2.1"; - src = python3.pkgs.fetchPypi { - inherit (old) pname; - inherit version; - sha256 = "0brprva3vjypb5r9lk6zy10jazp681rxsqxzhz2lr869ir4krj80"; - };})) - # sql test fail with agate-sql-0.5.4 - (agate-sql.overridePythonAttrs(old: rec { - version = "0.5.3"; - src = python3.pkgs.fetchPypi { - inherit (old) pname; - inherit version; - sha256 = "1d6rbahmdix7xi7ma2v86fpk5yi32q5dba5vama35w5mmn2pnyw7"; - };})) + agate-dbf + agate-sql six ]; checkInputs = with python3.pkgs; [ - glibcLocales nose + nose pytestCheckHook ]; - checkPhase = '' - LC_ALL="en_US.UTF-8" nosetests -e test_csvsql - ''; - meta = with lib; { description = "A suite of command-line tools for converting to and working with CSV"; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix index 5a4dfd5de85..a2c6ec8a9e0 100644 --- a/pkgs/tools/text/discount/default.nix +++ b/pkgs/tools/text/discount/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2.2.6"; + version = "2.2.7"; pname = "discount"; src = fetchFromGitHub { owner = "Orc"; repo = pname; rev = "v${version}"; - sha256 = "1y066jkxfas0vdixbqq66j9p00a102sbfgq5gbrblfczqjrmc38w"; + sha256 = "0p2gznrsvv82zxbajqir8y2ap1ribbgagqg1bzhv3i81p2byhjh7"; }; patches = ./fix-configure-path.patch; diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index 9c0526c3e63..9921862b798 100644 --- a/pkgs/tools/text/kdiff3/default.nix +++ b/pkgs/tools/text/kdiff3/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "kdiff3"; - version = "1.8.3"; + version = "1.8.4"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1awb62y09kbkjhz22mdkrppd6w5aihd3l0ssvpil8c9hg8syjd9g"; + sha256 = "1f1vyhvc31yfxspv5lzw8qjd2w8x74s2fmij1921m307g84qxqbn"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 9a72e023d6d..7bd8a74f458 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { installManPage $releaseDir/build/ripgrep-*/out/rg.1 installShellCompletion $releaseDir/build/ripgrep-*/out/rg.{bash,fish} - installShellCompletion --zsh "$src/complete/_rg" + installShellCompletion --zsh complete/_rg ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/video/untrunc/default.nix b/pkgs/tools/video/untrunc/default.nix index 728b4ff0118..1918f4e5974 100644 --- a/pkgs/tools/video/untrunc/default.nix +++ b/pkgs/tools/video/untrunc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "untrunc"; - version = "2018.01.13"; + version = "2020.02.09"; src = fetchFromGitHub { owner = "ponchio"; repo = "untrunc"; - rev = "3a2e6d0718faf06589f7b9d95c8f966348e537f7"; - sha256 = "03ka4lr69k7mikfpcpd95smzdj62v851ididnjyps5a0j06f8087"; + rev = "4eed44283168c727ace839ff7590092fda2e0848"; + sha256 = "0nfj67drc6bxqlkf8a1iazqhi0w38a7rjrb2bpa74gwq6xzygvbr"; }; buildInputs = [ gcc libav_12 ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3337b66e9fb..79af098b702 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -173,6 +173,7 @@ mapAliases ({ gnome-themes-standard = gnome-themes-extra; # added 2018-03-14 gnome_doc_utils = gnome-doc-utils; # added 2018-02-25 gnome_themes_standard = gnome-themes-standard; # added 2018-02-25 + gnunet_git = throw "gnunet_git was removed due to gnunet becoming stable"; # added 2019-05-27 gnuradio-nacl = gr-nacl; # added 2019-05-27 gnuradio-gsm = gr-gsm; # added 2019-05-27 gnuradio-ais = gr-ais; # added 2019-05-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04e0f41e13e..a56aeb9efd7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -266,6 +266,8 @@ in dotnet-sdk_3 = dotnetCorePackages.sdk_3_1; + dotnet-sdk_5 = dotnetCorePackages.sdk_5_0; + dotnet-netcore = dotnetCorePackages.netcore_2_1; dotnet-aspnetcore = dotnetCorePackages.aspnetcore_2_1; @@ -1099,6 +1101,8 @@ in glyr = callPackage ../tools/audio/glyr { }; + google-amber = callPackage ../tools/graphics/amber { }; + hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { }; http2tcp = callPackage ../tools/networking/http2tcp { }; @@ -1260,6 +1264,7 @@ in axoloti = callPackage ../applications/audio/axoloti { gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc; binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; dfu-util-axoloti = callPackage ../applications/audio/axoloti/dfu-util.nix { }; libusb1-axoloti = callPackage ../applications/audio/axoloti/libusb1.nix { @@ -1267,7 +1272,10 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; - azureus = callPackage ../tools/networking/p2p/azureus { }; + azureus = callPackage ../tools/networking/p2p/azureus { + jdk = jdk8; + swt = swt_jdk8; + }; b3sum = callPackage ../tools/security/b3sum {}; @@ -1838,6 +1846,8 @@ in dosage = callPackage ../applications/graphics/dosage { }; + dot-merlin-reader = callPackage ../development/tools/ocaml/merlin/dot-merlin-reader.nix { }; + dozenal = callPackage ../applications/misc/dozenal { }; dpic = callPackage ../tools/graphics/dpic { }; @@ -1854,6 +1864,8 @@ in dua = callPackage ../tools/misc/dua { }; + duf = callPackage ../tools/misc/duf { }; + inherit (ocamlPackages) dune dune_2 dune-release; duperemove = callPackage ../tools/filesystems/duperemove { }; @@ -1969,7 +1981,9 @@ in fsql = callPackage ../tools/misc/fsql { }; - fop = callPackage ../tools/typesetting/fop { }; + fop = callPackage ../tools/typesetting/fop { + jdk = openjdk8; + }; fondu = callPackage ../tools/misc/fondu { }; @@ -2560,7 +2574,7 @@ in biblatex-check = callPackage ../tools/typesetting/biblatex-check { }; birdfont = callPackage ../tools/misc/birdfont { }; - xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { }; + xmlbird = callPackage ../tools/misc/birdfont/xmlbird.nix { stdenv = gccStdenv; }; blastem = callPackage ../misc/emulators/blastem { inherit (python27Packages) pillow; @@ -2764,6 +2778,7 @@ in collectd = callPackage ../tools/system/collectd { libsigrok = libsigrok-0-3-0; # not compatible with >= 0.4.0 yet + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; collectd-data = callPackage ../tools/system/collectd/data.nix { }; @@ -3038,9 +3053,7 @@ in davfs2 = callPackage ../tools/filesystems/davfs2 { }; - dbeaver = callPackage ../applications/misc/dbeaver { - jdk = jdk11; - }; + dbeaver = callPackage ../applications/misc/dbeaver { }; dbench = callPackage ../development/tools/misc/dbench { }; @@ -3439,17 +3452,21 @@ in elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { utillinux = utillinuxMinimal; + jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch6-oss = callPackage ../servers/search/elasticsearch/6.x.nix { enableUnfree = false; utillinux = utillinuxMinimal; + jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix { utillinux = utillinuxMinimal; + jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix { enableUnfree = false; utillinux = utillinuxMinimal; + jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch = elasticsearch6; elasticsearch-oss = elasticsearch6-oss; @@ -3743,7 +3760,7 @@ in fontforge-fonttools = callPackage ../tools/misc/fontforge/fontforge-fonttools.nix {}; - fontmatrix = callPackage ../applications/graphics/fontmatrix {}; + fontmatrix = libsForQt514.callPackage ../applications/graphics/fontmatrix {}; foremost = callPackage ../tools/system/foremost { }; @@ -3817,7 +3834,9 @@ in fusuma = callPackage ../tools/inputmethods/fusuma {}; - fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { }); + fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { + openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }); inherit (fdbPackages) foundationdb51 @@ -4378,11 +4397,11 @@ in })); hdfview = callPackage ../tools/misc/hdfview { - javac = jdk; + javac = jdk8; # TODO: https://github.com/NixOS/nixpkgs/pull/89731 }; hdf_java = callPackage ../tools/misc/hdfjava { - javac = jdk; + javac = jdk8; # TODO: https://github.com/NixOS/nixpkgs/pull/89731 }; hecate = callPackage ../applications/editors/hecate { }; @@ -4466,7 +4485,10 @@ in i2c-tools = callPackage ../os-specific/linux/i2c-tools { }; - i2p = callPackage ../tools/networking/i2p {}; + i2p = callPackage ../tools/networking/i2p { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; i2pd = callPackage ../tools/networking/i2pd { }; @@ -4589,9 +4611,7 @@ in iperf3 = callPackage ../tools/networking/iperf/3.nix { }; iperf = iperf3; - ipfs = callPackage ../applications/networking/ipfs { - buildGoModule = buildGo114Module; - }; + ipfs = callPackage ../applications/networking/ipfs { }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { buildGoModule = buildGo114Module; @@ -4664,7 +4684,9 @@ in jid = callPackage ../development/tools/jid { }; jing = res.jing-trang; - jing-trang = callPackage ../tools/text/xml/jing-trang { }; + jing-trang = callPackage ../tools/text/xml/jing-trang { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; jira-cli = callPackage ../development/tools/jira_cli { }; @@ -6399,7 +6421,10 @@ in profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { }; - projectlibre = callPackage ../applications/misc/projectlibre { }; + projectlibre = callPackage ../applications/misc/projectlibre { + jre = jre8; + jdk = jdk8; + }; projectm = libsForQt5.callPackage ../applications/audio/projectm { }; @@ -6498,7 +6523,9 @@ in ucx = callPackage ../development/libraries/ucx {}; - openmodelica = callPackage ../applications/science/misc/openmodelica { }; + openmodelica = callPackage ../applications/science/misc/openmodelica { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; qarte = libsForQt514.callPackage ../applications/video/qarte { }; @@ -6754,9 +6781,7 @@ in rubocop = callPackage ../development/tools/rubocop { }; - runelite = callPackage ../games/runelite { - jre = openjdk11; - }; + runelite = callPackage ../games/runelite { }; runningx = callPackage ../tools/X11/runningx { }; @@ -7576,6 +7601,8 @@ in ua = callPackage ../tools/networking/ua { }; + ubidump = python3Packages.callPackage ../tools/filesystems/ubidump { }; + ubridge = callPackage ../tools/networking/ubridge { }; ucl = callPackage ../development/libraries/ucl { }; @@ -8170,6 +8197,7 @@ in xtreemfs = callPackage ../tools/filesystems/xtreemfs { boost = boost165; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; xurls = callPackage ../tools/text/xurls {}; @@ -8384,7 +8412,10 @@ in ### DEVELOPMENT / COMPILERS - abcl = callPackage ../development/compilers/abcl {}; + abcl = callPackage ../development/compilers/abcl { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; adoptopenjdk-bin-13-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk13-linux.nix; adoptopenjdk-bin-13-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk13-darwin.nix; @@ -8464,6 +8495,7 @@ in avian = callPackage ../development/compilers/avian { inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; bigloo = callPackage ../development/compilers/bigloo { }; @@ -9173,6 +9205,11 @@ in else openjdk8.override { headless = true; }; + jdk8 = openjdk8; + jdk8_headless = openjdk8_headless; + jre8 = openjdk8.jre; + jre8_headless = openjdk8_headless.jre; + openjdk11-bootstrap = if adoptopenjdk-hotspot-bin-11.meta.available then adoptopenjdk-hotspot-bin-11 @@ -9213,7 +9250,10 @@ in }; }; - /* current JDK */ + jdk11 = openjdk11; + jdk11_headless = openjdk11_headless; + + /* Latest JDK */ openjdk14 = if stdenv.isDarwin then callPackage ../development/compilers/openjdk/darwin { } @@ -9229,23 +9269,18 @@ in else openjdk14.override { headless = true; }; - openjdk = openjdk8; - openjdk_headless = openjdk8_headless; - - jdk8 = openjdk8; - jdk8_headless = openjdk8_headless; - jre8 = openjdk8.jre; - jre8_headless = openjdk8_headless.jre; - - jdk11 = openjdk11; - jdk11_headless = openjdk11_headless; - jdk14 = openjdk14; jdk14_headless = openjdk14_headless; - jdk = jdk8; - jre = jre8; - jre_headless = jre8_headless; + /* default JDK */ + + jdk = jdk14; + # jdk14 lacks a jre output. See https://github.com/NixOS/nixpkgs/issues/79490 + jre = jdk14; + jre_headless = jdk14_headless; + + openjdk = openjdk14; + openjdk_headless = openjdk14_headless; inherit (callPackages ../development/compilers/graalvm { gcc = if stdenv.targetPlatform.isDarwin then gcc8 else gcc; @@ -9289,7 +9324,9 @@ in jasmin = callPackage ../development/compilers/jasmin { }; - java-service-wrapper = callPackage ../tools/system/java-service-wrapper { }; + java-service-wrapper = callPackage ../tools/system/java-service-wrapper { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; @@ -9345,6 +9382,12 @@ in lizardfs = callPackage ../tools/filesystems/lizardfs { }; + lobster = callPackage ../development/compilers/lobster { + inherit (darwin) cf-private; + inherit (darwin.apple_sdk.frameworks) + Cocoa AudioToolbox OpenGL Foundation ForceFeedback; + }; + lld = llvmPackages.lld; lld_5 = llvmPackages_5.lld; lld_6 = llvmPackages_6.lld; @@ -9430,7 +9473,9 @@ in manticore = callPackage ../development/compilers/manticore { }; - mercury = callPackage ../development/compilers/mercury { }; + mercury = callPackage ../development/compilers/mercury { + jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; microscheme = callPackage ../development/compilers/microscheme { }; @@ -9485,6 +9530,7 @@ in mozart2 = callPackage ../development/compilers/mozart { emacs = emacs-nox; + jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { }; @@ -9517,10 +9563,15 @@ in ocaml-crunch = ocamlPackages.crunch.bin; - ocamlformat = callPackage ../development/tools/ocaml/ocamlformat { }; + inherit (callPackage ../development/tools/ocaml/ocamlformat { }) + ocamlformat # latest version + ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0 + ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_15_0; orc = callPackage ../development/compilers/orc { }; + orocos-kdl = callPackage ../development/libraries/orocos-kdl { }; + metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { }; ber_metaocaml = callPackage ../development/compilers/ocaml/ber-metaocaml.nix { }; @@ -9687,6 +9738,7 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; + cargo-sync-readme = callPackage ../development/tools/rust/cargo-sync-readme {}; cargo-udeps = callPackage ../development/tools/rust/cargo-udeps { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; @@ -9731,7 +9783,10 @@ in metal = callPackage ../development/libraries/metal { }; metals = callPackage ../development/tools/metals { }; - scalafix = callPackage ../development/tools/scalafix { }; + scalafix = callPackage ../development/tools/scalafix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; scalafmt = callPackage ../development/tools/scalafmt { }; sdcc = callPackage ../development/compilers/sdcc { @@ -9773,6 +9828,7 @@ in swiProlog = callPackage ../development/compilers/swi-prolog { inherit (darwin.apple_sdk.frameworks) Security; + jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; swiPrologWithGui = swiProlog.override { withGui = true; }; @@ -9941,7 +9997,7 @@ in inherit (beam.interpreters) erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 - elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6; + elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; inherit (beam.packages.erlang) rebar rebar3 @@ -9963,7 +10019,9 @@ in guile = guile_2_2; - inherit (callPackages ../applications/networking/cluster/hadoop { }) + inherit (callPackages ../applications/networking/cluster/hadoop { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }) hadoop_2_7 hadoop_2_8 hadoop_2_9 @@ -10070,16 +10128,21 @@ in octave = callPackage ../development/interpreters/octave { python = python3; + mkDerivation = stdenv.mkDerivation; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; octave-jit = callPackage ../development/interpreters/octave { python = python3; enableJIT = true; + mkDerivation = stdenv.mkDerivation; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - octaveFull = (lowPrio (libsForQt512.callPackage ../development/interpreters/octave { + octaveFull = libsForQt5.callPackage ../development/interpreters/octave { python = python3; enableQt = true; overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; - })); + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; ocropus = callPackage ../applications/misc/ocropus { }; @@ -10169,10 +10232,10 @@ in pythonInterpreters = callPackage ./../development/interpreters/python { # Overrides that apply to all Python interpreters - pkgs = pkgs // { - qt5 = pkgs.qt514; - libsForQt5 = pkgs.libsForQt514; - }; + pkgs = pkgs.extend (final: _: { + qt5 = final.qt514; + libsForQt5 = final.libsForQt514; + }); }; inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36; @@ -10441,7 +10504,9 @@ in adtool = callPackage ../tools/admin/adtool { }; - inherit (callPackage ../development/tools/alloy { }) + inherit (callPackage ../development/tools/alloy { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }) alloy4 alloy5 alloy; @@ -10458,20 +10523,28 @@ in ansible-lint = with python3.pkgs; toPythonApplication ansible-lint; - antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; + antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { + jdk = jdk8; # todo: remove override https://github.com/nixos/nixpkgs/pull/89731 + }; - antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { }; - antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { }; + antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; + antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; antlr3 = antlr3_5; - antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix { }; + antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; antlr4 = antlr4_7; apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; ant = apacheAnt; - apacheKafka = apacheKafka_2_4; + apacheKafka = apacheKafka_2_5; apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; }; apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; }; @@ -10482,6 +10555,7 @@ in apacheKafka_2_2 = callPackage ../servers/apache-kafka { majorVersion = "2.2"; }; apacheKafka_2_3 = callPackage ../servers/apache-kafka { majorVersion = "2.3"; }; apacheKafka_2_4 = callPackage ../servers/apache-kafka { majorVersion = "2.4"; }; + apacheKafka_2_5 = callPackage ../servers/apache-kafka { majorVersion = "2.5"; }; kt = callPackage ../tools/misc/kt {}; @@ -10634,7 +10708,9 @@ in wxGTK = wxGTK30; }; - buck = callPackage ../development/tools/build-managers/buck { }; + buck = callPackage ../development/tools/build-managers/buck { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; buildkite-agent = buildkite-agent3; buildkite-agent2 = throw "pkgs.buildkite-agent2 has been discontinued. Please use pkgs.buildkite-agent (v3.x)"; @@ -10807,8 +10883,8 @@ in if stdenv.targetPlatform.isi686 then gcc6.cc else if stdenv.targetPlatform == stdenv.hostPlatform && targetPackages.stdenv.cc.isGNU - # Can only do this is in the native case, otherwise we might get infinite - # recursion if `targetPackages.stdenv.cc.cc` itself uses `gccForLibs`. + # Can only do this is in the native case, otherwise we might get infinite + # recursion if `targetPackages.stdenv.cc.cc` itself uses `gccForLibs`. then targetPackages.stdenv.cc.cc else gcc.cc; @@ -10978,11 +11054,15 @@ in gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { }; - pmd = callPackage ../development/tools/analysis/pmd { }; + pmd = callPackage ../development/tools/analysis/pmd { + openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; pmdk = callPackage ../development/libraries/pmdk { }; - jdepend = callPackage ../development/tools/analysis/jdepend { }; + jdepend = callPackage ../development/tools/analysis/jdepend { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; fedpkg = pythonPackages.callPackage ../development/tools/fedpkg { }; @@ -11013,6 +11093,8 @@ in gnome-latex = callPackage ../applications/editors/gnome-latex/default.nix { }; + gnome-network-displays = callPackage ../applications/networking/gnome-network-displays { }; + gnome-multi-writer = callPackage ../applications/misc/gnome-multi-writer {}; gnome-online-accounts = callPackage ../development/libraries/gnome-online-accounts { }; @@ -11040,7 +11122,7 @@ in gputils = callPackage ../development/tools/misc/gputils { }; gradleGen = callPackage ../development/tools/build-managers/gradle { - java = jdk; + java = jdk8; # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731 }; gradle = res.gradleGen.gradle_latest; gradle_4_10 = res.gradleGen.gradle_4_10; @@ -11219,7 +11301,9 @@ in massif-visualizer = libsForQt514.callPackage ../development/tools/analysis/massif-visualizer { }; maven = maven3; - maven3 = callPackage ../development/tools/build-managers/apache-maven { }; + maven3 = callPackage ../development/tools/build-managers/apache-maven { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; mavproxy = python3Packages.callPackage ../applications/science/robotics/mavproxy { }; @@ -11739,10 +11823,7 @@ in yodl = callPackage ../development/tools/misc/yodl { }; - yq = callPackage ../development/tools/yq { - inherit (python3Packages) - buildPythonApplication fetchPypi argcomplete pyyaml xmltodict pytest coverage flake8 toml; - }; + yq = python3.pkgs.toPythonApplication python3.pkgs.yq; yq-go = callPackage ../development/tools/yq-go { }; @@ -11850,6 +11931,8 @@ in aubio = callPackage ../development/libraries/aubio { }; + audiality2 = callPackage ../development/libraries/audiality2 { }; + audiofile = callPackage ../development/libraries/audiofile { inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices; }; @@ -11888,6 +11971,7 @@ in belle-sip = callPackage ../development/libraries/belle-sip { stdenv = gcc8Stdenv; + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; libbfd = callPackage ../development/libraries/libbfd { }; @@ -12340,7 +12424,9 @@ in freeimage = callPackage ../development/libraries/freeimage { }; - freetts = callPackage ../development/libraries/freetts { }; + freetts = callPackage ../development/libraries/freetts { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; frog = res.languageMachines.frog; @@ -12403,7 +12489,9 @@ in gecode_6 = qt5.callPackage ../development/libraries/gecode { }; gecode = gecode_6; - gephi = callPackage ../applications/science/misc/gephi { }; + gephi = callPackage ../applications/science/misc/gephi { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; gegl = callPackage ../development/libraries/gegl { inherit (darwin.apple_sdk.frameworks) OpenGL; @@ -13209,6 +13297,8 @@ in libb2 = callPackage ../development/libraries/libb2 { }; + libbacktrace = callPackage ../development/libraries/libbacktrace { }; + libbap = callPackage ../development/libraries/libbap { inherit (ocaml-ng.ocamlPackages_4_06) bap ocaml findlib ctypes; }; @@ -13822,7 +13912,9 @@ in guile = guile_2_0; }; - libmatthew_java = callPackage ../development/libraries/java/libmatthew-java { }; + libmatthew_java = callPackage ../development/libraries/java/libmatthew-java { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; libmatroska = callPackage ../development/libraries/libmatroska { }; @@ -14539,9 +14631,7 @@ in nvidia-optical-flow-sdk = callPackage ../development/libraries/nvidia-optical-flow-sdk { }; - nvtop = callPackage ../tools/system/nvtop { - nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; }; - }; + nvtop = callPackage ../tools/system/nvtop { }; ocl-icd = callPackage ../development/libraries/ocl-icd { }; @@ -14574,7 +14664,9 @@ in openbabel = callPackage ../development/libraries/openbabel { }; - opencascade = callPackage ../development/libraries/opencascade { }; + opencascade = callPackage ../development/libraries/opencascade { + inherit (darwin.apple_sdk.frameworks) OpenCL Cocoa; + }; opencascade-occt = callPackage ../development/libraries/opencascade-occt { }; opencl-headers = callPackage ../development/libraries/opencl-headers { }; @@ -15085,7 +15177,10 @@ in range-v3 = callPackage ../development/libraries/range-v3 {}; - rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {}; + rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; rapidcheck = callPackage ../development/libraries/rapidcheck {}; @@ -15155,8 +15250,8 @@ in resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; rhino = callPackage ../development/libraries/java/rhino { - javac = jdk; - jvm = jre; + javac = jdk8; + jvm = jre8; }; rlog = callPackage ../development/libraries/rlog { }; @@ -16015,7 +16110,9 @@ in gwtwidgets = callPackage ../development/libraries/java/gwt-widgets { }; - javaCup = callPackage ../development/libraries/java/cup { }; + javaCup = callPackage ../development/libraries/java/cup { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; jdom = callPackage ../development/libraries/java/jdom { }; @@ -16046,6 +16143,9 @@ in smack = callPackage ../development/libraries/java/smack { }; swt = callPackage ../development/libraries/java/swt { }; + swt_jdk8 = callPackage ../development/libraries/java/swt { + jdk = jdk8; + }; ### DEVELOPMENT / LIBRARIES / JAVASCRIPT @@ -16155,6 +16255,7 @@ in withRecommendedPackages = false; inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; inherit (darwin) libobjc; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; rWrapper = callPackage ../development/r-modules/wrapper.nix { @@ -16239,18 +16340,26 @@ in cadvisor = callPackage ../servers/monitoring/cadvisor { }; - cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { }; - cassandra_2_2 = callPackage ../servers/nosql/cassandra/2.2.nix { }; - cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { }; - cassandra_3_11 = callPackage ../servers/nosql/cassandra/3.11.nix { }; + cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; + cassandra_2_2 = callPackage ../servers/nosql/cassandra/2.2.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; + cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; + cassandra_3_11 = callPackage ../servers/nosql/cassandra/3.11.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; cassandra = cassandra_3_11; apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix { - java = jdk; + java = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; apache-jena-fuseki = callPackage ../servers/nosql/apache-jena/fuseki-binary.nix { - java = jdk; + java = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; apcupsd = callPackage ../servers/apcupsd { }; @@ -16354,9 +16463,14 @@ in biboumi = callPackage ../servers/xmpp/biboumi { }; - elasticmq = callPackage ../servers/elasticmq { }; + elasticmq = callPackage ../servers/elasticmq { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; - elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin { }; + elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; eventstore = callPackage ../servers/nosql/eventstore { Nuget = dotnetPackages.Nuget; @@ -17139,7 +17253,9 @@ in xinetd = callPackage ../servers/xinetd { }; - zookeeper = callPackage ../servers/zookeeper { }; + zookeeper = callPackage ../servers/zookeeper { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { }; @@ -17369,6 +17485,8 @@ in fwupd = callPackage ../os-specific/linux/firmware/fwupd { }; + firmware-manager = callPackage ../os-specific/linux/firmware/firmware-manager { }; + fwts = callPackage ../os-specific/linux/fwts { }; gobi_loader = callPackage ../os-specific/linux/gobi_loader { }; @@ -17807,11 +17925,12 @@ in nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { }); - nvidia_x11_legacy304 = nvidiaPackages.legacy_304; - nvidia_x11_legacy340 = nvidiaPackages.legacy_340; - nvidia_x11_legacy390 = nvidiaPackages.legacy_390; - nvidia_x11_beta = nvidiaPackages.beta; - nvidia_x11 = nvidiaPackages.stable; + nvidia_x11_legacy304 = nvidiaPackages.legacy_304; + nvidia_x11_legacy340 = nvidiaPackages.legacy_340; + nvidia_x11_legacy390 = nvidiaPackages.legacy_390; + nvidia_x11_beta = nvidiaPackages.beta; + nvidia_x11_vulkan_beta = nvidiaPackages.vulkan_beta; + nvidia_x11 = nvidiaPackages.stable; openrazer = callPackage ../os-specific/linux/openrazer/driver.nix { }; @@ -18177,6 +18296,8 @@ in nvme-cli = callPackage ../os-specific/linux/nvme-cli { }; + system76-firmware = callPackage ../os-specific/linux/firmware/system76-firmware { }; + open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { }; open-vm-tools-headless = open-vm-tools.override { withX = false; }; @@ -19744,6 +19865,10 @@ in gtk = gtk3; }; + bluej = callPackage ../applications/editors/bluej/default.nix { + jdk = jetbrains.jdk; + }; + bluejeans-gui = callPackage ../applications/networking/instant-messengers/bluejeans { }; blugon = callPackage ../applications/misc/blugon { }; @@ -20679,9 +20804,14 @@ in python3Packages = python37Packages; }; - freemind = callPackage ../applications/misc/freemind { }; + freemind = callPackage ../applications/misc/freemind { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; - freenet = callPackage ../applications/networking/p2p/freenet { }; + freenet = callPackage ../applications/networking/p2p/freenet { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix {}; @@ -20840,8 +20970,6 @@ in gnunet = callPackage ../applications/networking/p2p/gnunet { }; - gnunet_git = lowPrio (callPackage ../applications/networking/p2p/gnunet/git.nix { }); - gnunet-gtk = callPackage ../applications/networking/p2p/gnunet/gtk.nix { }; gocr = callPackage ../applications/graphics/gocr { }; @@ -21347,7 +21475,7 @@ in joe = callPackage ../applications/editors/joe { }; - josm = callPackage ../applications/misc/josm { jre = jdk11; }; + josm = callPackage ../applications/misc/josm { }; jwm = callPackage ../applications/window-managers/jwm { }; @@ -21530,6 +21658,8 @@ in k9s = callPackage ../applications/networking/cluster/k9s { }; + popeye = callPackage ../applications/networking/cluster/popeye { }; + fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; linkerd = callPackage ../applications/networking/cluster/linkerd { }; @@ -21628,6 +21758,7 @@ in (libreoffice-args // { icu = icu64; variant = "still"; + jdk = jdk8; }); }); libreoffice-still-unwrapped = libreoffice-still.libreoffice; @@ -21646,6 +21777,10 @@ in linuxband = callPackage ../applications/audio/linuxband { }; + littlegptracker = callPackage ../applications/audio/littlegptracker { + inherit (darwin.apple_sdk.frameworks) Foundation; + }; + ledger = callPackage ../applications/office/ledger { }; ledger-autosync = callPackage ../applications/office/ledger-autosync { }; @@ -21803,7 +21938,7 @@ in mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; - mediathekview = callPackage ../applications/video/mediathekview { jre = openjdk11; }; + mediathekview = callPackage ../applications/video/mediathekview { }; meteo = callPackage ../applications/networking/weather/meteo { }; @@ -22509,7 +22644,9 @@ in }; pdfcpu = callPackage ../applications/graphics/pdfcpu { }; - pdftk = callPackage ../tools/typesetting/pdftk { }; + pdftk = callPackage ../tools/typesetting/pdftk { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; pdftk-legacy = lowPrio (callPackage ../tools/typesetting/pdftk/legacy.nix { }); pdfgrep = callPackage ../tools/typesetting/pdfgrep { }; @@ -22631,7 +22768,9 @@ in pommed_light = callPackage ../os-specific/linux/pommed-light {}; - polymake = callPackage ../applications/science/math/polymake { }; + polymake = callPackage ../applications/science/math/polymake { + openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; pond = callPackage ../applications/networking/instant-messengers/pond { }; @@ -22843,19 +22982,14 @@ in quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; qutebrowser = let - libsForQt5 = libsForQt515; - qt5 = qt515; - python = python3.override { - packageOverrides = self: super: { - pkgs = pkgs // { - inherit libsForQt5 qt5; - }; - }; - self = python3; - }; - in libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { - python3 = python; - }; + pkgs_ = pkgs.extend(_: prev: { + pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: { + pkgs = oldAttrs.pkgs.extend(_: _: { + inherit (pkgs) qt5 libsForQt5; + }); + }); + }); + in pkgs_.libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { }; rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; @@ -22944,6 +23078,7 @@ in rstudio = libsForQt514.callPackage ../applications/editors/rstudio { boost = boost166; llvmPackages = llvmPackages_7; + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; rsync = callPackage ../applications/networking/sync/rsync (config.rsync or {}); @@ -23105,8 +23240,13 @@ in linuxstopmotion = callPackage ../applications/video/linuxstopmotion { }; - sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d { }) + sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }) // (callPackage ../applications/misc/sweethome3d/editors.nix { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 sweethome3dApp = sweethome3d.application; }) ); @@ -23123,7 +23263,7 @@ in maestral = with python3Packages; toPythonApplication maestral; - maestral-gui = libsForQt514.callPackage ../applications/networking/maestral-qt { }; + maestral-gui = libsForQt5.callPackage ../applications/networking/maestral-qt { }; insync = callPackage ../applications/networking/insync { }; @@ -23218,7 +23358,7 @@ in spek = callPackage ../applications/audio/spek { }; - spotify = callPackage ../applications/audio/spotify { + spotify-unwrapped = callPackage ../applications/audio/spotify { libgcrypt = libgcrypt_1_5; libpng = libpng12; curl = curl.override { @@ -23226,6 +23366,8 @@ in }; }; + spotify = callPackage ../applications/audio/spotify/wrapper.nix { }; + libspotify = callPackage ../development/libraries/libspotify (config.libspotify or {}); sourcetrail = callPackage ../development/tools/sourcetrail { }; @@ -23315,9 +23457,7 @@ in # this can be changed to python3 once pyside2 is updated to support the latest python version syncplay = python37.pkgs.callPackage ../applications/networking/syncplay { }; - inherit (callPackages ../applications/networking/syncthing { - buildGoModule = buildGo114Module; - }) + inherit (callPackages ../applications/networking/syncthing { }) syncthing syncthing-cli syncthing-discovery @@ -23638,6 +23778,8 @@ in vcprompt = callPackage ../applications/version-management/vcprompt { }; + vcs = callPackage ../applications/video/vcs { }; + vcv-rack = callPackage ../applications/audio/vcv-rack { }; vdirsyncer = with python3Packages; toPythonApplication vdirsyncer; @@ -23729,6 +23871,7 @@ in virtualbox = libsForQt514.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; + jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; virtualboxHardened = lowPrio (virtualbox.override { @@ -23815,7 +23958,10 @@ in vue = callPackage ../applications/misc/vue { }; - vuze = callPackage ../applications/networking/p2p/vuze { }; + vuze = callPackage ../applications/networking/p2p/vuze { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; vwm = callPackage ../applications/window-managers/vwm { }; @@ -24118,11 +24264,19 @@ in gtk = gtk2; }; - kodiPlain = callPackage ../applications/video/kodi { }; + kodiPlain = callPackage ../applications/video/kodi { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; - kodiPlainWayland = callPackage ../applications/video/kodi { useWayland = true; }; + kodiPlainWayland = callPackage ../applications/video/kodi { + useWayland = true; + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; - kodiGBM = callPackage ../applications/video/kodi { useGbm = true; }; + kodiGBM = callPackage ../applications/video/kodi { + useGbm = true; + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {}); @@ -24934,6 +25088,12 @@ in kobodeluxe = callPackage ../games/kobodeluxe { }; + koboredux = callPackage ../games/koboredux { }; + + koboredux-free = callPackage ../games/koboredux { + useProprietaryAssets = false; + }; + leela-zero = libsForQt5.callPackage ../games/leela-zero { }; legendary-gl = python38Packages.callPackage ../games/legendary-gl { }; @@ -25653,7 +25813,9 @@ in gwyddion = callPackage ../applications/science/chemistry/gwyddion {}; - jmol = callPackage ../applications/science/chemistry/jmol { }; + jmol = callPackage ../applications/science/chemistry/jmol { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; marvin = callPackage ../applications/science/chemistry/marvin { }; @@ -25825,6 +25987,8 @@ in manta = callPackage ../applications/science/biology/manta { }; + obitools3 = callPackage ../applications/science/biology/obitools/obitools3.nix { }; + octopus-caller = callPackage ../applications/science/biology/octopus { }; paml = callPackage ../applications/science/biology/paml { }; @@ -26142,8 +26306,11 @@ in cvc3 = callPackage ../applications/science/logic/cvc3 { gmp = lib.overrideDerivation gmp (a: { dontDisableStatic = true; }); + stdenv = gccStdenv; + }; + cvc4 = callPackage ../applications/science/logic/cvc4 { + jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - cvc4 = callPackage ../applications/science/logic/cvc4 {}; drat-trim = callPackage ../applications/science/logic/drat-trim {}; @@ -26277,7 +26444,9 @@ in z3 = callPackage ../applications/science/logic/z3 { python = python2; }; z3-tptp = callPackage ../applications/science/logic/z3/tptp.nix {}; - tlaplus = callPackage ../applications/science/logic/tlaplus {}; + tlaplus = callPackage ../applications/science/logic/tlaplus { + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix { inherit (ocaml-ng.ocamlPackages_4_05) ocaml; }; @@ -26598,7 +26767,11 @@ in auctex = callPackage ../tools/typesetting/tex/auctex { }; - areca = callPackage ../applications/backup/areca { }; + areca = callPackage ../applications/backup/areca { + jdk = jdk8; + jre = jre8; + swt = swt_jdk8; + }; attract-mode = callPackage ../misc/emulators/attract-mode { }; @@ -26805,7 +26978,7 @@ in helmsman = callPackage ../applications/networking/cluster/helmsman { }; - heptio-ark = callPackage ../applications/networking/cluster/heptio-ark { }; + velero = callPackage ../applications/networking/cluster/velero { }; hplip = callPackage ../misc/drivers/hplip { }; @@ -27174,6 +27347,7 @@ in gdal = gdal.override {libmysqlclient = mysql // {lib = {dev = mysql;};};}; mysql = mysql; pcre = pcre-cpp; + jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }); r128gain = callPackage ../applications/audio/r128gain { }; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 84d2a4e3116..139749e7d39 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -97,7 +97,7 @@ rec { # Other Beam languages. These are built with `beam.interpreters.erlang`. To # access for example elixir built with different version of Erlang, use # `beam.packages.erlangR22.elixir`. - inherit (packages.erlang) elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6; + inherit (packages.erlang) elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7; inherit (packages.erlang) lfe lfe_1_2 lfe_1_3; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 9ea32ed8e9e..ae1fe050b8e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -352,8 +352,6 @@ let ipaddr-sexp = callPackage ../development/ocaml-modules/ipaddr/sexp.nix { }; - irmin_1 = callPackage ../development/ocaml-modules/irmin/1.4.nix { }; - iso8601 = callPackage ../development/ocaml-modules/iso8601 { }; iter = callPackage ../development/ocaml-modules/iter { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index dcdb0e699d6..64fc2011ff1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8809,6 +8809,21 @@ let }; }; + HamAPRSFAP = buildPerlPackage { + pname = "Ham-APRS-FAP"; + version = "1.21"; + src = fetchurl { + url = "mirror://cpan/authors/id/H/HE/HESSU/Ham-APRS-FAP-1.21.tar.gz"; + sha256 = "e01b455d46f44710dbcf21b6fa843f09358ce60eee1c4141bc74e0a204d3a020"; + }; + propagatedBuildInputs = [ DateCalc ]; + meta = with stdenv.lib; { + description = "Finnish APRS Parser (Fabulous APRS Parser)"; + maintainers = with maintainers; [ andrew-d ]; + license = with licenses; [ artistic1 gpl1Plus ]; + }; + }; + HashDiff = buildPerlPackage { pname = "Hash-Diff"; version = "0.010"; @@ -10230,7 +10245,8 @@ let propagatedBuildInputs = [ Inline ]; - makeMakerFlags = "J2SDK=${pkgs.jdk}"; + # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731 + makeMakerFlags = "J2SDK=${pkgs.jdk8}"; # FIXME: Apparently tests want to access the network. doCheck = false; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7f8eb5647e3..af2ec27f733 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -150,6 +150,8 @@ in { accupy = callPackage ../development/python-modules/accupy { }; + acebinf = callPackage ../development/python-modules/acebinf { }; + acme = callPackage ../development/python-modules/acme { }; acme-tiny = callPackage ../development/python-modules/acme-tiny { }; @@ -713,6 +715,8 @@ in { azure-synapse-spark = callPackage ../development/python-modules/azure-synapse-spark { }; + b2sdk = callPackage ../development/python-modules/b2sdk { }; + Babel = callPackage ../development/python-modules/Babel { }; babelfish = callPackage ../development/python-modules/babelfish { }; @@ -979,6 +983,8 @@ in { bx-python = callPackage ../development/python-modules/bx-python { inherit (pkgs) zlib; }; + bwapy = callPackage ../development/python-modules/bwapy { }; + bytecode = callPackage ../development/python-modules/bytecode { }; bz2file = callPackage ../development/python-modules/bz2file { }; @@ -1186,6 +1192,8 @@ in { clize = callPackage ../development/python-modules/clize { }; + clldutils = callPackage ../development/python-modules/clldutils { }; + closure-linter = callPackage ../development/python-modules/closure-linter { }; cloudflare = callPackage ../development/python-modules/cloudflare { }; @@ -1311,6 +1319,8 @@ in { crashtest = callPackage ../development/python-modules/crashtest { }; + crate = callPackage ../development/python-modules/crate { }; + crayons = callPackage ../development/python-modules/crayons { }; crc16 = callPackage ../development/python-modules/crc16 { }; @@ -1351,6 +1361,8 @@ in { csvs-to-sqlite = callPackage ../development/python-modules/csvs-to-sqlite { }; + csvw = callPackage ../development/python-modules/csvw { }; + cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { }; cufflinks = callPackage ../development/python-modules/cufflinks { }; @@ -1458,6 +1470,8 @@ in { dbfread = callPackage ../development/python-modules/dbfread { }; + dbus-next = callPackage ../development/python-modules/dbus-next { }; + dbus-python = callPackage ../development/python-modules/dbus { inherit (pkgs) dbus pkgconfig; }; dcmstack = callPackage ../development/python-modules/dcmstack { }; @@ -2457,6 +2471,10 @@ in { google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; + google-crc32c = callPackage ../development/python-modules/google-crc32c { + inherit (pkgs) crc32c; + }; + google-i18n-address = callPackage ../development/python-modules/google-i18n-address { }; google-music = callPackage ../development/python-modules/google-music { }; @@ -2714,6 +2732,8 @@ in { httplib2 = callPackage ../development/python-modules/httplib2 { }; + http-parser = callPackage ../development/python-modules/http-parser { }; + httpretty = if isPy3k then callPackage ../development/python-modules/httpretty { } else @@ -3704,6 +3724,8 @@ in { modestmaps = callPackage ../development/python-modules/modestmaps { }; + mohawk = callPackage ../development/python-modules/mohawk { }; + moinmoin = callPackage ../development/python-modules/moinmoin { }; # Needed here because moinmoin is loaded as a Python library. @@ -5005,6 +5027,8 @@ in { pyjwt = callPackage ../development/python-modules/pyjwt { }; + pykdl = callPackage ../development/python-modules/pykdl { }; + pykdtree = callPackage ../development/python-modules/pykdtree { inherit (pkgs.llvmPackages) openmp; }; pykeepass = callPackage ../development/python-modules/pykeepass { }; @@ -5381,6 +5405,8 @@ in { pyspf = callPackage ../development/python-modules/pyspf { }; + pyspice = callPackage ../development/python-modules/pyspice { }; + pyspinel = callPackage ../development/python-modules/pyspinel { }; pyspotify = callPackage ../development/python-modules/pyspotify { }; @@ -5413,6 +5439,8 @@ in { pysvn = callPackage ../development/python-modules/pysvn { }; + pytabix = callPackage ../development/python-modules/pytabix { }; + pytado = callPackage ../development/python-modules/pytado { }; pytaglib = callPackage ../development/python-modules/pytaglib { }; @@ -5906,6 +5934,8 @@ in { pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml { }); + pyxnat = callPackage ../development/python-modules/pyxnat { }; + pyyaml = callPackage ../development/python-modules/pyyaml { }; pyzmq = callPackage ../development/python-modules/pyzmq { }; @@ -6107,6 +6137,8 @@ in { ripser = callPackage ../development/python-modules/ripser { }; + rising = callPackage ../development/python-modules/rising { }; + rivet = disabledIf (!isPy3k) (toPythonModule (pkgs.rivet.override { python3 = python; })); rjsmin = callPackage ../development/python-modules/rjsmin { }; @@ -6339,6 +6371,8 @@ in { seekpath = callPackage ../development/python-modules/seekpath { }; + segments = callPackage ../development/python-modules/segments { }; + selectors2 = callPackage ../development/python-modules/selectors2 { }; selectors34 = callPackage ../development/python-modules/selectors34 { }; @@ -6463,7 +6497,9 @@ in { six = callPackage ../development/python-modules/six { }; - skein = callPackage ../development/python-modules/skein { }; + skein = callPackage ../development/python-modules/skein { + jre = pkgs.jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + }; sklearn-deap = callPackage ../development/python-modules/sklearn-deap { }; @@ -7610,6 +7646,8 @@ in { yowsup = callPackage ../development/python-modules/yowsup { }; + yq = callPackage ../development/python-modules/yq { }; + yt = callPackage ../development/python-modules/yt { }; yubico-client = callPackage ../development/python-modules/yubico-client { }; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index ca64c4d975c..4fa5b92e951 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -191,6 +191,9 @@ in { gsm = super.gsm.override { staticSupport = true; }; + crc32c = super.crc32c.override { + staticOnly = true; + }; parted = super.parted.override { enableStatic = true; }; |